diff --git a/.circleci/scripts/run_integration.sh b/.circleci/scripts/run_integration.sh
index 1380b07de53..fb91bcce77f 100644
--- a/.circleci/scripts/run_integration.sh
+++ b/.circleci/scripts/run_integration.sh
@@ -128,6 +128,8 @@ fi
 sudo iptables -L integration_only -n -v -x > "$results/egress-guard.txt"
 awk '$3 == "REJECT" && $1 > 0 { rejected=1 } END { exit !rejected }' "$results/egress-guard.txt"
 
+export UV_OFFLINE=true
+
 if [ "$mode" = parity ]; then
   export INTEGRATION_WORKERS=1
 else
diff --git a/.github/workflows/compat-matrix-image.yml b/.github/workflows/compat-matrix-image.yml
index f08792c904c..ddd2aa1a50b 100644
--- a/.github/workflows/compat-matrix-image.yml
+++ b/.github/workflows/compat-matrix-image.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - tests/e2e/claude_code/cron_vm/**
-      - tests/e2e/claude_code/pr_gate_version_resolver.py
+      - tests/e2e/cli_harness/npm_version_resolver.py
       - .github/workflows/compat-matrix-image.yml
   workflow_dispatch:
 
@@ -36,7 +36,7 @@ jobs:
             whoami
             gh --version
             uv --version
-            version="$(uv run --no-project --python 3.12 python /opt/litellm/tests/e2e/claude_code/pr_gate_version_resolver.py)"
+            version="$(uv run --no-project --python 3.12 python /opt/litellm/tests/e2e/cli_harness/npm_version_resolver.py @anthropic-ai/claude-code)"
             /opt/litellm/tests/e2e/claude_code/cron_vm/install_claude_code.sh "${version}" /tmp/claude-cli
             /tmp/claude-cli/claude --version
           '
diff --git a/.github/workflows/deploy-dev-on-main.yml b/.github/workflows/deploy-dev-on-main.yml
deleted file mode 100644
index 1208a2dbbdb..00000000000
--- a/.github/workflows/deploy-dev-on-main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Deploy main to gateway-dev
-
-on:
-  push:
-    branches: [main]
-
-permissions: {}
-
-concurrency:
-  group: deploy-dev-dispatch
-  cancel-in-progress: true
-
-jobs:
-  dispatch:
-    if: github.repository == 'BerriAI/litellm'
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349 # v2.2.2
-        id: token
-        with:
-          app-id: ${{ secrets.LITELLM_OPS_DISPATCH_APP_ID }}
-          private-key: ${{ secrets.LITELLM_OPS_DISPATCH_APP_PRIVATE_KEY }}
-          owner: BerriAI
-          repositories: litellm-ops
-          permission-actions: write
-      - name: Dispatch the litellm-ops dev deploy
-        env:
-          GH_TOKEN: ${{ steps.token.outputs.token }}
-        run: gh api --method POST repos/BerriAI/litellm-ops/actions/workflows/deploy-dev.yml/dispatches -f ref=main
diff --git a/.github/workflows/test-linting.yml b/.github/workflows/test-linting.yml
index c3388430589..cbeea71ad0f 100644
--- a/.github/workflows/test-linting.yml
+++ b/.github/workflows/test-linting.yml
@@ -208,7 +208,7 @@ jobs:
             exit 0
           fi
           retry() { "$@" || { sleep 15; "$@"; } || { sleep 30; "$@"; }; }
-          CLAUDE_VERSION="$(retry uv run --no-sync python tests/e2e/claude_code/pr_gate_version_resolver.py)"
+          CLAUDE_VERSION="$(retry uv run --no-sync python tests/e2e/cli_harness/npm_version_resolver.py @anthropic-ai/claude-code)"
           tests/e2e/claude_code/cron_vm/install_claude_code.sh "$CLAUDE_VERSION" "$RUNNER_TEMP/claude-cli"
           PATH="$RUNNER_TEMP/claude-cli:$PATH" uv run --no-sync pytest -q tests/e2e_harness
           uv run --no-sync pytest --tb=short -q --noconftest -o addopts= -o "pythonpath=tests/e2e tests/e2e_harness" -p no:rerunfailures \
diff --git a/.github/workflows/weekly_load_anomaly.yml b/.github/workflows/weekly_load_anomaly.yml
deleted file mode 100644
index 0ba4df89cc4..00000000000
--- a/.github/workflows/weekly_load_anomaly.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: "Weekly Load Anomaly Check"
-
-on:
-  schedule:
-    - cron: "0 12 * * 6"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  weekly-load-anomaly:
-    if: github.event_name != 'schedule' || github.repository == 'BerriAI/litellm'
-    runs-on: ubuntu-latest
-    timeout-minutes: 45
-    services:
-      postgres:
-        image: postgres:16.6
-        env:
-          POSTGRES_USER: llmproxy
-          POSTGRES_PASSWORD: dbpassword9090
-          POSTGRES_DB: litellm
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd "pg_isready -U llmproxy"
-          --health-interval 5s
-          --health-timeout 5s
-          --health-retries 10
-    env:
-      DATABASE_URL: postgresql://llmproxy:dbpassword9090@localhost:5432/litellm
-      LITELLM_MASTER_KEY: sk-weekly-anomaly-check
-      ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-      AWS_BEARER_TOKEN_BEDROCK: ${{ secrets.AWS_BEARER_TOKEN_BEDROCK }}
-    steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-        with:
-          persist-credentials: false
-
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.12"
-
-      - name: Set up uv
-        uses: ./.github/actions/setup-uv-with-retries
-        with:
-          version: "0.10.9"
-
-      - name: Cache the Rust build
-        uses: ./.github/actions/cache-cargo-build
-
-      - name: Install dependencies
-        run: |
-          .github/scripts/uv_sync_with_retries.sh --frozen --group ci --group proxy-dev --extra proxy
-
-      - name: Cache Prisma binaries
-        uses: ./.github/actions/cache-prisma-binaries
-
-      - name: Generate Prisma client
-        run: |
-          uv run --no-sync prisma generate --schema litellm/proxy/schema.prisma
-
-      - name: Start the proxy
-        run: |
-          nohup uv run --no-sync litellm --config tests/e2e/perf/weekly_anomaly_config.yml --port 4000 > proxy.log 2>&1 &
-          for _ in $(seq 1 90); do
-            if curl -fs http://localhost:4000/health/liveliness > /dev/null; then
-              exit 0
-            fi
-            sleep 2
-          done
-          echo "proxy never became live"
-          tail -n 100 proxy.log
-          exit 1
-
-      - name: Run the weekly session anomaly test
-        env:
-          E2E_WEEKLY_ANOMALY: "1"
-        run: |
-          uv run --no-sync pytest tests/e2e/perf/test_weekly_session_anomaly_e2e.py -v --tb=short -rA
-
-      - name: Show proxy log on failure
-        if: failure()
-        run: tail -n 300 proxy.log
diff --git a/enterprise/litellm_enterprise/proxy/hooks/managed_files.py b/enterprise/litellm_enterprise/proxy/hooks/managed_files.py
index 0d46efbbb08..91c5e2c5f39 100644
--- a/enterprise/litellm_enterprise/proxy/hooks/managed_files.py
+++ b/enterprise/litellm_enterprise/proxy/hooks/managed_files.py
@@ -3,9 +3,11 @@
 
 import asyncio
 import base64
+import copy
 import json
 import time
 from collections.abc import Awaitable, Callable, Iterator, Mapping, Sequence
+from dataclasses import dataclass
 from datetime import datetime, timedelta
 from itertools import chain
 from types import MappingProxyType
@@ -34,7 +36,7 @@ from typing_extensions import ReadOnly, Unpack
 
 import litellm
 from litellm import Router, verbose_logger
-from litellm._internal_context import with_service_target
+from litellm._internal_context import internal_sub_call, post_response_phase, with_service_target
 from litellm._uuid import uuid
 from litellm.caching.caching import DualCache
 from litellm.constants import (
@@ -95,6 +97,7 @@ from litellm.proxy.pass_through_endpoints.llm_provider_handlers.batch_attributio
     request_tags_from_metadata,
 )
 from litellm.repositories.managed_file_repository import ManagedFileRepository
+from litellm.responses.streaming_iterator import spawn_logging_task
 from litellm.responses.utils import ResponsesAPIRequestUtils
 from litellm.types.llms.openai import (  # pyright: ignore[reportAttributeAccessIssue]
     AllMessageValues,
@@ -395,6 +398,134 @@ class _RouterFileCallKwargs(TypedDict, total=False):
     custom_llm_provider: ReadOnly[str | None]
 
 
+_MODEL_FILE_ID_MAPPING: Final = TypeAdapter(dict[str, str])
+_FILE_UPLOAD_ONLY_FIELDS: Final = frozenset({"file", "purpose", "expires_after", "extra_body"})
+_FILE_DELETE_RESERVED_FIELDS: Final = frozenset({"model", "file_id", "_litellm_internal_model_credentials"})
+
+
+@dataclass(frozen=True, slots=True)
+class _ProviderUpload:
+    model_id: str
+    provider_file_id: str
+    upload_call_id: str | None = None
+
+
+def _provider_uploads(file_object: OpenAIFileObject) -> tuple[_ProviderUpload, ...]:
+    file_hidden_params: Final = cast(  # cast-ok: preserve mapping operations on dynamic file metadata
+        dict[str, object], getattr(file_object, HIDDEN_PARAMS_ATTR)
+    )
+    model_file_id_mapping: Final = _MODEL_FILE_ID_MAPPING.validate_python(
+        file_hidden_params.get("model_file_id_mapping") or {}
+    )
+    upload_call_id: Final = file_hidden_params.get("litellm_call_id")
+    return tuple(
+        _ProviderUpload(
+            model_id=model_id,
+            provider_file_id=provider_file_id,
+            upload_call_id=upload_call_id if isinstance(upload_call_id, str) else None,
+        )
+        for model_id, provider_file_id in model_file_id_mapping.items()
+    )
+
+
+def _keeps_one_upload_per_target(llm_router: Router, model_id: str) -> bool:
+    credentials: Final = _provider_file_retrieve_credentials(llm_router=llm_router, model_id=model_id)
+    return (credentials or {}).get("custom_llm_provider") == LlmProviders.LITELLM_PROXY.value
+
+
+def _is_kept_upload(uploads: Sequence[_ProviderUpload], index: int, per_target_model_ids: frozenset[str]) -> bool:
+    upload: Final = uploads[index]
+    other_uploads: Final = uploads[index + 1 :] if upload.model_id in per_target_model_ids else uploads[:index]
+    return all(other.model_id != upload.model_id for other in other_uploads)
+
+
+def _upload_from_trailing_id_fields(decoded_unified_file_id: str) -> _ProviderUpload:
+    trailing_fields: Final = decoded_unified_file_id.rpartition(";llm_output_file_id,")[2]
+    provider_file_id, _, model_id = trailing_fields.partition(";llm_output_file_model_id,")
+    return _ProviderUpload(model_id=model_id, provider_file_id=provider_file_id)
+
+
+def _carried_upload_missing_from(unified_file_id: str, model_file_ids: Mapping[str, str]) -> _ProviderUpload | None:
+    decoded: Final = _is_base64_encoded_unified_file_id(unified_file_id)
+    carried: Final = _upload_from_trailing_id_fields(decoded) if decoded else None
+    if carried is None or model_file_ids.get(carried.model_id) in (None, carried.provider_file_id):
+        return None
+    return carried
+
+
+async def _delete_provider_file(
+    llm_router: Router,
+    model_id: str,
+    provider_file_id: str,
+    request_data: Mapping[str, object],
+) -> None:
+    credentials: Final = llm_router.registry().credentials(model_id, form="with_provider")
+    delete_data: Final = {
+        **{k: v for k, v in request_data.items() if k not in _FILE_DELETE_RESERVED_FIELDS},
+        **(
+            {"_litellm_internal_model_credentials": MappingProxyType(dict(credentials))}
+            if credentials is not None
+            else {}
+        ),
+    }
+    await llm_router.afile_delete(
+        model=model_id,
+        file_id=provider_file_id,
+        **cast(_RouterFileCallKwargs, delete_data),
+    )
+
+
+def _with_own_nested_dicts(request_data: Mapping[str, object]) -> MappingProxyType[str, object]:
+    return MappingProxyType({k: copy.copy(v) if isinstance(v, dict) else v for k, v in request_data.items()})
+
+
+async def _delete_redundant_upload(
+    llm_router: Router,
+    upload: _ProviderUpload,
+    delete_request: Mapping[str, object],
+    parent_call_id: str | None,
+) -> None:
+    try:
+        with internal_sub_call(parent_call_id):
+            await _delete_provider_file(
+                llm_router, upload.model_id, upload.provider_file_id, _with_own_nested_dicts(delete_request)
+            )
+    except Exception as error:
+        verbose_logger.warning(
+            f"Could not delete the redundant upload provider_file_id={sanitize_for_log(upload.provider_file_id)} "
+            f"at deployment model_id={sanitize_for_log(upload.model_id)}: "
+            f"{type(error).__name__} {sanitize_for_log(error)}"
+        )
+
+
+async def _delete_redundant_uploads(
+    llm_router: Router,
+    uploads: Sequence[_ProviderUpload],
+    delete_request: Mapping[str, object],
+) -> None:
+    await asyncio.gather(
+        *(_delete_redundant_upload(llm_router, upload, delete_request, upload.upload_call_id) for upload in uploads)
+    )
+
+
+def _start_deleting_redundant_uploads(
+    llm_router: Router,
+    uploads: Sequence[_ProviderUpload],
+    create_file_request: CreateFileRequest,
+) -> None:
+    if not uploads:
+        return
+    delete_request: Final = MappingProxyType(
+        {k: v for k, v in create_file_request.items() if k not in _FILE_UPLOAD_ONLY_FIELDS}
+    )
+    with post_response_phase():
+        spawn_logging_task(
+            asyncio.get_running_loop(),
+            _delete_redundant_uploads(llm_router, uploads, delete_request),
+            task_name="managed file repeat upload cleanup",
+        )
+
+
 def _managed_database(prisma_client: _ManagedResourcePrismaClient) -> _ManagedResourceDatabase:
     return prisma_client.db
 
@@ -2034,16 +2165,16 @@ class _PROXY_LiteLLMManagedFiles(CustomLogger, BaseFileEndpoints):
             target_model_names_list=target_model_names_list,
         )
 
-        ## STORE MODEL MAPPINGS IN DB
-        model_mappings: Dict[str, str] = {}
-
-        for file_object in responses:
-            file_hidden_params = cast(  # cast-ok: preserve mapping operations on dynamic file metadata
-                dict[str, object], getattr(file_object, HIDDEN_PARAMS_ATTR)
-            )
-            model_file_id_mapping = file_hidden_params.get("model_file_id_mapping")
-            if model_file_id_mapping and isinstance(model_file_id_mapping, dict):
-                model_mappings.update(model_file_id_mapping)
+        uploads: Final = tuple(chain.from_iterable(map(_provider_uploads, responses)))
+        per_target_model_ids: Final = frozenset(
+            model_id
+            for model_id in {upload.model_id for upload in uploads}
+            if _keeps_one_upload_per_target(llm_router, model_id)
+        )
+        kept_uploads: Final = tuple(
+            upload for index, upload in enumerate(uploads) if _is_kept_upload(uploads, index, per_target_model_ids)
+        )
+        model_mappings: Final = {upload.model_id: upload.provider_file_id for upload in kept_uploads}
 
         await self.store_unified_file_id(
             file_id=response.id,
@@ -2052,6 +2183,15 @@ class _PROXY_LiteLLMManagedFiles(CustomLogger, BaseFileEndpoints):
             model_mappings=model_mappings,
             user_api_key_dict=user_api_key_dict,
         )
+        _start_deleting_redundant_uploads(
+            llm_router,
+            tuple(
+                upload
+                for upload in uploads
+                if upload not in kept_uploads and upload.model_id not in per_target_model_ids
+            ),
+            create_file_request,
+        )
 
         # Emit Prometheus metrics for managed file creation
         prom_logger = self._get_prometheus_logger()
@@ -2692,23 +2832,13 @@ class _PROXY_LiteLLMManagedFiles(CustomLogger, BaseFileEndpoints):
         specific_model_file_id_mapping: Final = model_file_id_mapping.get(file_id)
         if not specific_model_file_id_mapping:
             return
-        filtered_data: Final = {
-            k: v for k, v in data.items() if k not in ("model", "file_id", "_litellm_internal_model_credentials")
-        }
         for model_id, model_file_id in specific_model_file_id_mapping.items():
-            credentials = llm_router.registry().credentials(model_id, form="with_provider")
-            delete_data = {
-                **filtered_data,
-                **(
-                    {"_litellm_internal_model_credentials": MappingProxyType(dict(credentials))}
-                    if credentials is not None
-                    else {}
-                ),
-            }
-            await llm_router.afile_delete(
-                model=model_id,
-                file_id=model_file_id,
-                **cast(_RouterFileCallKwargs, delete_data),
+            await _delete_provider_file(llm_router, model_id, model_file_id, data)
+        unrecorded_upload: Final = _carried_upload_missing_from(file_id, specific_model_file_id_mapping)
+        delete_call_id: Final = data.get("litellm_call_id")
+        if unrecorded_upload is not None:
+            await _delete_redundant_upload(
+                llm_router, unrecorded_upload, data, delete_call_id if isinstance(delete_call_id, str) else None
             )
 
     async def afile_content(
diff --git a/litellm-rust/crates/llms-types/src/providers/anthropic/beta.rs b/litellm-rust/crates/llms-types/src/providers/anthropic/beta.rs
index 01ed023999d..46c14a21c59 100644
--- a/litellm-rust/crates/llms-types/src/providers/anthropic/beta.rs
+++ b/litellm-rust/crates/llms-types/src/providers/anthropic/beta.rs
@@ -124,12 +124,86 @@ pub enum AnthropicBeta {
     ToolSearchTool20251019,
     #[strum(serialize = "inline-tools-2026-09-15")]
     InlineTools20260915,
+    #[strum(serialize = "afk-mode-2026-01-31")]
+    AfkMode20260131,
+    #[strum(serialize = "agent-memory-2026-07-22")]
+    AgentMemory20260722,
+    #[strum(serialize = "analytics-usage-cost-2026-08-24")]
+    AnalyticsUsageCost20260824,
+    #[strum(serialize = "cache-diagnosis-2026-04-07")]
+    CacheDiagnosis20260407,
+    #[strum(serialize = "ce-plugins-2026-09-01")]
+    CePlugins20260901,
+    #[strum(serialize = "ce-user-management-2026-07-13")]
+    CeUserManagement20260713,
+    #[strum(serialize = "code-execution-2025-05-22")]
+    CodeExecution20250522,
+    #[strum(serialize = "computer-use-2024-10-22")]
+    ComputerUse20241022,
+    #[strum(serialize = "dev-full-thinking-2025-05-14")]
+    DevFullThinking20250514,
+    #[strum(serialize = "dreaming-2026-04-21")]
+    Dreaming20260421,
+    #[strum(serialize = "experimental-claude-tag-2026-10-21")]
+    ExperimentalClaudeTag20261021,
+    #[strum(serialize = "extended-cache-ttl-2025-04-11")]
+    ExtendedCacheTtl20250411,
+    #[strum(serialize = "fallback-credit-2026-06-01")]
+    FallbackCredit20260601,
+    #[strum(serialize = "fallback-credit-2026-07-01")]
+    FallbackCredit20260701,
+    #[strum(serialize = "managed-agents-2026-04-01")]
+    ManagedAgents20260401,
+    #[strum(serialize = "mcp-client-2026-09-15")]
+    McpClient20260915,
+    #[strum(serialize = "mcp-tunnels-2026-06-22")]
+    McpTunnels20260622,
+    #[strum(serialize = "message-batches-2024-09-24")]
+    MessageBatches20240924,
+    #[strum(serialize = "message-threads-2026-08-12")]
+    MessageThreads20260812,
+    #[strum(serialize = "mid-conversation-system-clear-at-2026-08-21")]
+    MidConversationSystemClearAt20260821,
+    #[strum(serialize = "model-context-window-exceeded-2025-08-26")]
+    ModelContextWindowExceeded20250826,
+    #[strum(serialize = "output-300k-2026-03-24")]
+    Output300k20260324,
+    #[strum(serialize = "pdfs-2024-09-25")]
+    Pdfs20240925,
+    #[strum(serialize = "prompt-caching-2024-07-31")]
+    PromptCaching20240731,
+    #[strum(serialize = "redact-thinking-2026-02-12")]
+    RedactThinking20260212,
+    #[strum(serialize = "server-side-fallback-2026-06-01")]
+    ServerSideFallback20260601,
+    #[strum(serialize = "server-side-fallback-2026-07-01")]
+    ServerSideFallback20260701,
+    #[strum(serialize = "spend-limit-reads-2026-09-26")]
+    SpendLimitReads20260926,
+    #[strum(serialize = "structured-outputs-2025-12-15")]
+    StructuredOutputs20251215,
+    #[strum(serialize = "task-budgets-2026-03-13")]
+    TaskBudgets20260313,
+    #[strum(serialize = "telemetry-destinations-2026-08-11")]
+    TelemetryDestinations20260811,
+    #[strum(serialize = "thinking-token-count-2026-05-13")]
+    ThinkingTokenCount20260513,
+    #[strum(serialize = "token-counting-2024-11-01")]
+    TokenCounting20241101,
+    #[strum(serialize = "user-profiles-2026-03-24")]
+    UserProfiles20260324,
+    #[strum(serialize = "user-profiles-2026-08-18")]
+    UserProfiles20260818,
+    #[strum(serialize = "user-profiles-2026-09-04")]
+    UserProfiles20260904,
+    #[strum(serialize = "webhooks-2026-10-07")]
+    Webhooks20261007,
     #[strum(default, transparent)]
     Other(String),
 }
 
 impl AnthropicBeta {
-    pub const KNOWN: [Self; 40] = [
+    pub const KNOWN: [Self; 77] = [
         Self::Oauth20250420,
         Self::WebFetch20250910,
         Self::WebSearch20250305,
@@ -170,6 +244,43 @@ impl AnthropicBeta {
         Self::ToolExamples20251029,
         Self::ToolSearchTool20251019,
         Self::InlineTools20260915,
+        Self::AfkMode20260131,
+        Self::AgentMemory20260722,
+        Self::AnalyticsUsageCost20260824,
+        Self::CacheDiagnosis20260407,
+        Self::CePlugins20260901,
+        Self::CeUserManagement20260713,
+        Self::CodeExecution20250522,
+        Self::ComputerUse20241022,
+        Self::DevFullThinking20250514,
+        Self::Dreaming20260421,
+        Self::ExperimentalClaudeTag20261021,
+        Self::ExtendedCacheTtl20250411,
+        Self::FallbackCredit20260601,
+        Self::FallbackCredit20260701,
+        Self::ManagedAgents20260401,
+        Self::McpClient20260915,
+        Self::McpTunnels20260622,
+        Self::MessageBatches20240924,
+        Self::MessageThreads20260812,
+        Self::MidConversationSystemClearAt20260821,
+        Self::ModelContextWindowExceeded20250826,
+        Self::Output300k20260324,
+        Self::Pdfs20240925,
+        Self::PromptCaching20240731,
+        Self::RedactThinking20260212,
+        Self::ServerSideFallback20260601,
+        Self::ServerSideFallback20260701,
+        Self::SpendLimitReads20260926,
+        Self::StructuredOutputs20251215,
+        Self::TaskBudgets20260313,
+        Self::TelemetryDestinations20260811,
+        Self::ThinkingTokenCount20260513,
+        Self::TokenCounting20241101,
+        Self::UserProfiles20260324,
+        Self::UserProfiles20260818,
+        Self::UserProfiles20260904,
+        Self::Webhooks20261007,
     ];
 
     pub fn as_str(&self) -> &str {
@@ -195,10 +306,9 @@ impl AnthropicBeta {
 
     fn rejected_by(&self) -> &'static [BetaProvider] {
         match self {
-            Self::AdvancedToolUse20251120 => {
+            Self::AdvancedToolUse20251120 | Self::ToolSearchTool20251019 => {
                 &[BetaProvider::BedrockConverse, BetaProvider::Databricks]
             }
-            Self::ContextManagement20250627 => &[BetaProvider::BedrockConverse],
             Self::AdvisorTool20260301 => &[
                 BetaProvider::AzureAi,
                 BetaProvider::BedrockConverse,
@@ -207,98 +317,99 @@ impl AnthropicBeta {
                 BetaProvider::VertexAi,
                 BetaProvider::Databricks,
             ],
-            Self::Compact20260904 => &[
+            Self::AfkMode20260131
+            | Self::CePlugins20260901
+            | Self::CeUserManagement20260713
+            | Self::Compact20260904
+            | Self::Dreaming20260421
+            | Self::ExperimentalClaudeTag20261021
+            | Self::ExtendedCacheTtl20250411
+            | Self::FallbackCredit20260601
+            | Self::FallbackCredit20260701
+            | Self::InlineTools20260915
+            | Self::ManagedAgents20260401
+            | Self::McpTunnels20260622
+            | Self::MidConversationSystemClearAt20260821
+            | Self::ModelContextWindowExceeded20250826
+            | Self::Oauth20250420
+            | Self::Pdfs20240925
+            | Self::PromptCaching20240731
+            | Self::PromptCachingScope20260105
+            | Self::RedactThinking20260212
+            | Self::ServerSideFallback20260601
+            | Self::SpendLimitReads20260926
+            | Self::StructuredOutputs20251215
+            | Self::TaskBudgets20260313
+            | Self::TelemetryDestinations20260811
+            | Self::ThinkingTokenCount20260513
+            | Self::TokenCounting20241101
+            | Self::UserProfiles20260324
+            | Self::UserProfiles20260818
+            | Self::UserProfiles20260904 => &[
                 BetaProvider::BedrockConverse,
                 BetaProvider::Bedrock,
                 BetaProvider::BedrockMantle,
                 BetaProvider::Databricks,
             ],
-            Self::Bash20241022
+            Self::AgentMemory20260722
+            | Self::Bash20241022
             | Self::Bash20250124
+            | Self::DevFullThinking20250514
             | Self::McpServers20251204
             | Self::StructuredOutput20240301
             | Self::TextEditor20241022
             | Self::TextEditor20250124 => BetaProvider::VARIANTS,
-            Self::ClaudeCode20250219 | Self::ToolExamples20251029 => &[
-                BetaProvider::Anthropic,
-                BetaProvider::AzureAi,
-                BetaProvider::BedrockConverse,
-                BetaProvider::Bedrock,
-                BetaProvider::VertexAi,
-                BetaProvider::Databricks,
-            ],
-            Self::CodeExecution20250825
+            Self::AnalyticsUsageCost20260824
+            | Self::CacheDiagnosis20260407
+            | Self::CodeExecution20250522
+            | Self::CodeExecution20250825
+            | Self::ComputerUse20241022
+            | Self::FastMode20260201
             | Self::FilesApi20250414
             | Self::McpClient20250404
             | Self::McpClient20251120
-            | Self::PromptCachingScope20260105
+            | Self::McpClient20260915
+            | Self::MessageBatches20240924
+            | Self::MessageThreads20260812
+            | Self::Output300k20260324
+            | Self::ServerSideFallback20260701
             | Self::Skills20251002
-            | Self::WebFetch20250910 => &[
+            | Self::WebFetch20250910
+            | Self::Webhooks20261007 => &[
                 BetaProvider::BedrockConverse,
                 BetaProvider::Bedrock,
                 BetaProvider::BedrockMantle,
                 BetaProvider::VertexAi,
                 BetaProvider::Databricks,
             ],
-            Self::Compact20260112 => &[BetaProvider::AzureAi, BetaProvider::BedrockConverse],
+            Self::ClaudeCode20250219
+            | Self::PerTurnControl20260701
+            | Self::ToolExamples20251029 => &[
+                BetaProvider::BedrockConverse,
+                BetaProvider::Bedrock,
+                BetaProvider::Databricks,
+            ],
+            Self::Compact20260112
+            | Self::ContextManagement20250627
+            | Self::DangerousToolUse20260903 => &[BetaProvider::BedrockConverse],
             Self::ComputerUse20250124
             | Self::ComputerUse20251124
             | Self::Context1m20250807
+            | Self::Effort20251124
+            | Self::FineGrainedToolStreaming20250514
             | Self::ThinkingBindingControls20260801
             | Self::ThinkingDisplayUpdates20260818 => &[],
-            Self::DangerousToolUse20260903 => &[BetaProvider::BedrockConverse],
-            Self::Effort20251124 => &[BetaProvider::VertexAi],
-            Self::FastMode20260201 | Self::Oauth20250420 => &[
-                BetaProvider::AzureAi,
-                BetaProvider::BedrockConverse,
-                BetaProvider::Bedrock,
-                BetaProvider::BedrockMantle,
-                BetaProvider::VertexAi,
-                BetaProvider::Databricks,
-            ],
-            Self::FineGrainedToolStreaming20250514 => {
-                &[BetaProvider::AzureAi, BetaProvider::VertexAi]
-            }
-            Self::InterleavedThinking20250514 | Self::WebSearch20250305 => {
-                &[BetaProvider::BedrockConverse, BetaProvider::Bedrock]
-            }
-            Self::MidConversationOutputConfig20260701 => &[
-                BetaProvider::AzureAi,
-                BetaProvider::BedrockConverse,
-                BetaProvider::BedrockMantle,
-                BetaProvider::VertexAi,
-                BetaProvider::Databricks,
-            ],
-            Self::MidConversationToolChanges20260701 => &[
+            Self::InterleavedThinking20250514
+            | Self::Output128k20250219
+            | Self::TokenEfficientTools20250219
+            | Self::WebSearch20250305 => &[BetaProvider::BedrockConverse, BetaProvider::Bedrock],
+            Self::MidConversationOutputConfig20260701
+            | Self::MidConversationToolChanges20260701 => &[
                 BetaProvider::BedrockConverse,
                 BetaProvider::BedrockMantle,
                 BetaProvider::Databricks,
             ],
-            Self::Output128k20250219 | Self::TokenEfficientTools20250219 => &[
-                BetaProvider::AzureAi,
-                BetaProvider::BedrockConverse,
-                BetaProvider::Bedrock,
-                BetaProvider::VertexAi,
-            ],
-            Self::PerTurnControl20260701 => &[
-                BetaProvider::BedrockConverse,
-                BetaProvider::Bedrock,
-                BetaProvider::Databricks,
-            ],
-            Self::StructuredOutputs20251113 => &[BetaProvider::Bedrock, BetaProvider::VertexAi],
-            Self::ToolSearchTool20251019 => &[
-                BetaProvider::Anthropic,
-                BetaProvider::AzureAi,
-                BetaProvider::BedrockConverse,
-                BetaProvider::Databricks,
-            ],
-            Self::InlineTools20260915 => &[
-                BetaProvider::AzureAi,
-                BetaProvider::BedrockConverse,
-                BetaProvider::Bedrock,
-                BetaProvider::BedrockMantle,
-                BetaProvider::Databricks,
-            ],
+            Self::StructuredOutputs20251113 => &[BetaProvider::Bedrock],
             Self::Other(_) => BetaProvider::VARIANTS,
         }
     }
@@ -451,7 +562,44 @@ mod tests {
             AnthropicBeta::TokenEfficientTools20250219,
             AnthropicBeta::ToolExamples20251029,
             AnthropicBeta::ToolSearchTool20251019,
-            AnthropicBeta::InlineTools20260915
+            AnthropicBeta::InlineTools20260915,
+            AnthropicBeta::AfkMode20260131,
+            AnthropicBeta::AgentMemory20260722,
+            AnthropicBeta::AnalyticsUsageCost20260824,
+            AnthropicBeta::CacheDiagnosis20260407,
+            AnthropicBeta::CePlugins20260901,
+            AnthropicBeta::CeUserManagement20260713,
+            AnthropicBeta::CodeExecution20250522,
+            AnthropicBeta::ComputerUse20241022,
+            AnthropicBeta::DevFullThinking20250514,
+            AnthropicBeta::Dreaming20260421,
+            AnthropicBeta::ExperimentalClaudeTag20261021,
+            AnthropicBeta::ExtendedCacheTtl20250411,
+            AnthropicBeta::FallbackCredit20260601,
+            AnthropicBeta::FallbackCredit20260701,
+            AnthropicBeta::ManagedAgents20260401,
+            AnthropicBeta::McpClient20260915,
+            AnthropicBeta::McpTunnels20260622,
+            AnthropicBeta::MessageBatches20240924,
+            AnthropicBeta::MessageThreads20260812,
+            AnthropicBeta::MidConversationSystemClearAt20260821,
+            AnthropicBeta::ModelContextWindowExceeded20250826,
+            AnthropicBeta::Output300k20260324,
+            AnthropicBeta::Pdfs20240925,
+            AnthropicBeta::PromptCaching20240731,
+            AnthropicBeta::RedactThinking20260212,
+            AnthropicBeta::ServerSideFallback20260601,
+            AnthropicBeta::ServerSideFallback20260701,
+            AnthropicBeta::SpendLimitReads20260926,
+            AnthropicBeta::StructuredOutputs20251215,
+            AnthropicBeta::TaskBudgets20260313,
+            AnthropicBeta::TelemetryDestinations20260811,
+            AnthropicBeta::ThinkingTokenCount20260513,
+            AnthropicBeta::TokenCounting20241101,
+            AnthropicBeta::UserProfiles20260324,
+            AnthropicBeta::UserProfiles20260818,
+            AnthropicBeta::UserProfiles20260904,
+            AnthropicBeta::Webhooks20261007
         )]
         beta: AnthropicBeta,
     ) {
@@ -551,7 +699,7 @@ mod tests {
         BetaProvider::Anthropic,
         Some(AnthropicBeta::Oauth20250420)
     )]
-    #[case::rejected("effort-2025-11-24", BetaProvider::VertexAi, None)]
+    #[case::rejected("skills-2025-10-02", BetaProvider::VertexAi, None)]
     #[case::unknown("example-beta-2099-01-01", BetaProvider::Anthropic, None)]
     fn on_resolves_known_spellings_held_as_other(
         #[case] raw: &str,
@@ -580,12 +728,11 @@ mod tests {
 
     #[test]
     fn unknown_values_are_kept_verbatim() {
-        let parsed: AnthropicBeta = "claude-code-20250219".parse().unwrap();
-        assert_eq!(
-            parsed,
-            AnthropicBeta::Other("claude-code-20250219".to_string())
+        let parsed: AnthropicBeta = "example-beta-2099-01-01".parse().unwrap();
+        assert!(
+            matches!(&parsed, AnthropicBeta::Other(value) if value == "example-beta-2099-01-01")
         );
-        assert_eq!(parsed.to_string(), "claude-code-20250219");
+        assert_eq!(parsed.to_string(), "example-beta-2099-01-01");
     }
 
     #[test]
diff --git a/litellm-rust/crates/llms/src/anthropic/beta_headers.rs b/litellm-rust/crates/llms/src/anthropic/beta_headers.rs
index a0843621043..7842b478dce 100644
--- a/litellm-rust/crates/llms/src/anthropic/beta_headers.rs
+++ b/litellm-rust/crates/llms/src/anthropic/beta_headers.rs
@@ -96,7 +96,10 @@ mod tests {
     }
 
     #[rstest]
-    #[case::azure_ai(BetaProvider::AzureAi, "fast-mode-2026-02-01,example-beta-2099-01-01")]
+    #[case::azure_ai(
+        BetaProvider::AzureAi,
+        "advisor-tool-2026-03-01,example-beta-2099-01-01"
+    )]
     #[case::anthropic(BetaProvider::Anthropic, "bash_20241022")]
     #[case::vertex_ai(BetaProvider::VertexAi, " , ")]
     fn filter_removes_header_when_nothing_survives(
diff --git a/litellm-rust/crates/model-catalog/src/model_info.rs b/litellm-rust/crates/model-catalog/src/model_info.rs
index 8f7549c1c6d..141702bf857 100644
--- a/litellm-rust/crates/model-catalog/src/model_info.rs
+++ b/litellm-rust/crates/model-catalog/src/model_info.rs
@@ -186,6 +186,9 @@ pub struct ModelInfoFields {
     pub supports_image_size: Option<bool>,
     pub supported_audio_formats: Option<Value>,
     pub token_count_framing: Option<i64>,
+    pub token_count_tool_framing: Option<i64>,
+    pub token_count_responses_framing: Option<i64>,
+    pub token_count_responses_tool_framing: Option<i64>,
     pub token_count_model: Option<Value>,
     pub token_count_tokenizer: Option<Value>,
     pub vertex_ai_audio_api: Option<Value>,
diff --git a/litellm-rust/crates/model-catalog/src/wire/attributes.rs b/litellm-rust/crates/model-catalog/src/wire/attributes.rs
index 93c10a81524..307f25f0bda 100644
--- a/litellm-rust/crates/model-catalog/src/wire/attributes.rs
+++ b/litellm-rust/crates/model-catalog/src/wire/attributes.rs
@@ -11,7 +11,7 @@ use crate::error::{DateCause, Error, Repr};
 use crate::vocabulary::{
     AudioFormat, EffortLevel, Endpoint, InputModality, Mode, OutputModality, VertexAiAudioApi,
 };
-use crate::wire::lax::Count;
+use crate::wire::lax::{Count, NumericCount};
 
 macro_rules! attributes {
     ($($(#[$doc:meta])* $name:ident: $ty:ty $(as $via:ty)?),* $(,)?) => {
@@ -104,9 +104,14 @@ attributes! {
     /// Cloud regions the model is available in ('global' or region ids).
     supported_regions: Vec<String>,
     thinking_always_on: bool,
-    token_count_framing: u64 as Count,
+    /// Whether the model thinks when the request carries no thinking param.
+    thinking_on_by_default: bool,
+    token_count_framing: u64 as NumericCount,
     token_count_model: TokenCountModel,
+    token_count_responses_framing: u64 as NumericCount,
+    token_count_responses_tool_framing: u64 as NumericCount,
     token_count_tokenizer: TokenCountTokenizer,
+    token_count_tool_framing: u64 as NumericCount,
     /// Provider default tokens-per-minute limit.
     tpm: u64 as Count,
     use_openai_responses_path: bool,
@@ -298,10 +303,24 @@ mod tests {
     #[case::known_mode("mode", json!("chat"), true)]
     #[case::unknown_mode("mode", json!("chatt"), false)]
     #[case::negative_dbu("input_dbu_cost_per_token", json!(-1), false)]
+    #[case::thinking_on_by_default("thinking_on_by_default", json!(true), true)]
+    #[case::thinking_on_by_default_not_a_flag("thinking_on_by_default", json!("yes"), false)]
     #[case::reasoning_contexts("reasoning_contexts", json!(["reasoning", "non_reasoning"]), true)]
     #[case::reasoning_modes("reasoning_modes", json!(["none", "adaptive"]), true)]
     #[case::reasoning_context_not_a_list("reasoning_contexts", json!("reasoning"), false)]
     #[case::reasoning_mode_not_a_string("reasoning_modes", json!([1]), false)]
+    #[case::framing("token_count_framing", json!(12), true)]
+    #[case::framing_written_as_text("token_count_framing", json!("12"), false)]
+    #[case::framing_written_as_whole_float("token_count_framing", json!(12.0), true)]
+    #[case::fractional_tool_framing("token_count_tool_framing", json!(1.5), false)]
+    #[case::tool_framing("token_count_tool_framing", json!(214), true)]
+    #[case::tool_framing_written_as_text("token_count_tool_framing", json!("214"), false)]
+    #[case::tool_framing_as_a_flag("token_count_tool_framing", json!(true), false)]
+    #[case::negative_tool_framing("token_count_tool_framing", json!(-1), false)]
+    #[case::responses_framing("token_count_responses_framing", json!(38), true)]
+    #[case::responses_framing_as_a_flag("token_count_responses_framing", json!(false), false)]
+    #[case::responses_tool_framing("token_count_responses_tool_framing", json!(267), true)]
+    #[case::responses_tool_framing_written_as_text("token_count_responses_tool_framing", json!("267"), false)]
     fn each_attribute_reads_its_own_type(
         #[case] key: &str,
         #[case] value: Value,
diff --git a/litellm-rust/crates/model-catalog/src/wire/lax.rs b/litellm-rust/crates/model-catalog/src/wire/lax.rs
index d514a6a82c1..d98a601e8c1 100644
--- a/litellm-rust/crates/model-catalog/src/wire/lax.rs
+++ b/litellm-rust/crates/model-catalog/src/wire/lax.rs
@@ -8,6 +8,8 @@ pub(crate) struct LaxI64;
 
 pub(crate) struct Count;
 
+pub(crate) struct NumericCount;
+
 impl<'de> DeserializeAs<'de, i64> for LaxI64 {
     fn deserialize_as<D: Deserializer<'de>>(deserializer: D) -> Result<i64, D::Error> {
         deserializer.deserialize_any(Self)
@@ -52,6 +54,34 @@ impl<'de> DeserializeAs<'de, u64> for Count {
     }
 }
 
+impl<'de> DeserializeAs<'de, u64> for NumericCount {
+    fn deserialize_as<D: Deserializer<'de>>(deserializer: D) -> Result<u64, D::Error> {
+        deserializer.deserialize_any(Self)
+    }
+}
+
+impl Visitor<'_> for NumericCount {
+    type Value = u64;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("a whole number of zero or more")
+    }
+
+    fn visit_u64<E: de::Error>(self, value: u64) -> Result<u64, E> {
+        Ok(value)
+    }
+
+    fn visit_i64<E: de::Error>(self, value: i64) -> Result<u64, E> {
+        u64::try_from(value).map_err(|_| E::invalid_value(de::Unexpected::Signed(value), &self))
+    }
+
+    fn visit_f64<E: de::Error>(self, value: f64) -> Result<u64, E> {
+        integral_float(value)
+            .and_then(|whole| u64::try_from(whole).ok())
+            .ok_or_else(|| E::invalid_value(de::Unexpected::Float(value), &self))
+    }
+}
+
 fn integer_string(value: &str) -> Option<i64> {
     let integer = match value.split_once('.') {
         Some((integer, fraction)) => {
@@ -99,6 +129,12 @@ mod tests {
             .map(DeserializeAsWrap::into_inner)
     }
 
+    fn numeric_count(value: Value) -> Option<u64> {
+        DeserializeAsWrap::<u64, NumericCount>::deserialize(value)
+            .ok()
+            .map(DeserializeAsWrap::into_inner)
+    }
+
     use serde::Deserialize;
 
     #[rstest]
@@ -125,4 +161,23 @@ mod tests {
     ) {
         assert_eq!(count(written), expected);
     }
+
+    #[rstest]
+    #[case::integer(json!(214), Some(214))]
+    #[case::zero(json!(0), Some(0))]
+    #[case::whole_float(json!(214.0), Some(214))]
+    #[case::negative_zero(json!(-0.0), Some(0))]
+    #[case::above_i64(json!(u64::MAX), Some(u64::MAX))]
+    #[case::negative(json!(-1), None)]
+    #[case::negative_whole_float(json!(-1.0), None)]
+    #[case::fraction(json!(1.5), None)]
+    #[case::string(json!("214"), None)]
+    #[case::boolean(json!(true), None)]
+    #[case::list(json!([214]), None)]
+    fn numeric_counts_accept_only_whole_json_numbers(
+        #[case] written: Value,
+        #[case] expected: Option<u64>,
+    ) {
+        assert_eq!(numeric_count(written), expected);
+    }
 }
diff --git a/litellm/__init__.py b/litellm/__init__.py
index 0e5101b49c3..baee4e9f7ba 100644
--- a/litellm/__init__.py
+++ b/litellm/__init__.py
@@ -2374,6 +2374,7 @@ if TYPE_CHECKING:
     supports_web_search: Callable[..., bool]
     supports_tool_search: Callable[..., bool]
     supports_url_context: Callable[..., bool]
+    supports_continuation: Callable[..., bool]
     supports_response_schema: Callable[..., bool]
     supports_parallel_function_calling: Callable[..., bool]
     supports_vision: Callable[..., bool]
diff --git a/litellm/_lazy_imports_registry.py b/litellm/_lazy_imports_registry.py
index de290070ed3..c9949613303 100644
--- a/litellm/_lazy_imports_registry.py
+++ b/litellm/_lazy_imports_registry.py
@@ -33,6 +33,7 @@ UTILS_NAMES: Final = (
     "supports_web_search",
     "supports_tool_search",
     "supports_url_context",
+    "supports_continuation",
     "supports_response_schema",
     "supports_parallel_function_calling",
     "supports_vision",
@@ -488,6 +489,7 @@ _UTILS_IMPORT_MAP: Final = {
     "supports_web_search": (".utils", "supports_web_search"),
     "supports_tool_search": (".utils", "supports_tool_search"),
     "supports_url_context": (".utils", "supports_url_context"),
+    "supports_continuation": (".utils", "supports_continuation"),
     "supports_response_schema": (".utils", "supports_response_schema"),
     "supports_parallel_function_calling": (
         ".utils",
diff --git a/litellm/anthropic_beta_headers_config.json b/litellm/anthropic_beta_headers_config.json
index 253074b0e1f..bdfddb48522 100644
--- a/litellm/anthropic_beta_headers_config.json
+++ b/litellm/anthropic_beta_headers_config.json
@@ -37,7 +37,47 @@
     "mid-conversation-output-config-2026-07-01": "mid-conversation-output-config-2026-07-01",
     "thinking-display-updates-2026-08-18": "thinking-display-updates-2026-08-18",
     "mid-conversation-tool-changes-2026-07-01": "mid-conversation-tool-changes-2026-07-01",
-    "inline-tools-2026-09-15": "inline-tools-2026-09-15"
+    "inline-tools-2026-09-15": "inline-tools-2026-09-15",
+    "agent-memory-2026-07-22": null,
+    "analytics-usage-cost-2026-08-24": "analytics-usage-cost-2026-08-24",
+    "cache-diagnosis-2026-04-07": "cache-diagnosis-2026-04-07",
+    "ce-plugins-2026-09-01": "ce-plugins-2026-09-01",
+    "ce-user-management-2026-07-13": "ce-user-management-2026-07-13",
+    "claude-code-20250219": "claude-code-20250219",
+    "code-execution-2025-05-22": "code-execution-2025-05-22",
+    "computer-use-2024-10-22": "computer-use-2024-10-22",
+    "dev-full-thinking-2025-05-14": null,
+    "dreaming-2026-04-21": "dreaming-2026-04-21",
+    "experimental-claude-tag-2026-10-21": "experimental-claude-tag-2026-10-21",
+    "extended-cache-ttl-2025-04-11": "extended-cache-ttl-2025-04-11",
+    "fallback-credit-2026-06-01": "fallback-credit-2026-06-01",
+    "fallback-credit-2026-07-01": "fallback-credit-2026-07-01",
+    "managed-agents-2026-04-01": "managed-agents-2026-04-01",
+    "mcp-client-2026-09-15": "mcp-client-2026-09-15",
+    "mcp-tunnels-2026-06-22": "mcp-tunnels-2026-06-22",
+    "message-batches-2024-09-24": "message-batches-2024-09-24",
+    "message-threads-2026-08-12": "message-threads-2026-08-12",
+    "mid-conversation-system-clear-at-2026-08-21": "mid-conversation-system-clear-at-2026-08-21",
+    "model-context-window-exceeded-2025-08-26": "model-context-window-exceeded-2025-08-26",
+    "output-300k-2026-03-24": "output-300k-2026-03-24",
+    "pdfs-2024-09-25": "pdfs-2024-09-25",
+    "prompt-caching-2024-07-31": "prompt-caching-2024-07-31",
+    "server-side-fallback-2026-06-01": "server-side-fallback-2026-06-01",
+    "server-side-fallback-2026-07-01": "server-side-fallback-2026-07-01",
+    "spend-limit-reads-2026-09-26": "spend-limit-reads-2026-09-26",
+    "task-budgets-2026-03-13": "task-budgets-2026-03-13",
+    "telemetry-destinations-2026-08-11": "telemetry-destinations-2026-08-11",
+    "thinking-token-count-2026-05-13": "thinking-token-count-2026-05-13",
+    "token-counting-2024-11-01": "token-counting-2024-11-01",
+    "tool-examples-2025-10-29": "tool-examples-2025-10-29",
+    "tool-search-tool-2025-10-19": "tool-search-tool-2025-10-19",
+    "user-profiles-2026-03-24": "user-profiles-2026-03-24",
+    "user-profiles-2026-08-18": "user-profiles-2026-08-18",
+    "user-profiles-2026-09-04": "user-profiles-2026-09-04",
+    "webhooks-2026-10-07": "webhooks-2026-10-07",
+    "afk-mode-2026-01-31": "afk-mode-2026-01-31",
+    "redact-thinking-2026-02-12": "redact-thinking-2026-02-12",
+    "structured-outputs-2025-12-15": "structured-outputs-2025-12-15"
   },
   "azure_ai": {
     "advisor-tool-2026-03-01": null,
@@ -45,23 +85,21 @@
     "bash_20241022": null,
     "bash_20250124": null,
     "code-execution-2025-08-25": "code-execution-2025-08-25",
-    "compact-2026-01-12": null,
-    "compact-2026-09-04": "compact-2026-09-04",
+    "compact-2026-01-12": "compact-2026-01-12",
     "computer-use-2025-01-24": "computer-use-2025-01-24",
     "computer-use-2025-11-24": "computer-use-2025-11-24",
     "context-1m-2025-08-07": "context-1m-2025-08-07",
     "context-management-2025-06-27": "context-management-2025-06-27",
     "dangerous-tool-use-2026-09-03": "dangerous-tool-use-2026-09-03",
     "effort-2025-11-24": "effort-2025-11-24",
-    "fast-mode-2026-02-01": null,
+    "fast-mode-2026-02-01": "fast-mode-2026-02-01",
     "files-api-2025-04-14": "files-api-2025-04-14",
-    "fine-grained-tool-streaming-2025-05-14": null,
+    "fine-grained-tool-streaming-2025-05-14": "fine-grained-tool-streaming-2025-05-14",
     "interleaved-thinking-2025-05-14": "interleaved-thinking-2025-05-14",
     "mcp-client-2025-11-20": "mcp-client-2025-11-20",
     "mcp-client-2025-04-04": "mcp-client-2025-04-04",
     "mcp-servers-2025-12-04": null,
-    "mid-conversation-tool-changes-2026-07-01": "mid-conversation-tool-changes-2026-07-01",
-    "output-128k-2025-02-19": null,
+    "output-128k-2025-02-19": "output-128k-2025-02-19",
     "structured-output-2024-03-01": null,
     "per-turn-control-2026-07-01": "per-turn-control-2026-07-01",
     "prompt-caching-scope-2026-01-05": "prompt-caching-scope-2026-01-05",
@@ -71,9 +109,54 @@
     "text_editor_20250124": null,
     "thinking-binding-controls-2026-08-01": "thinking-binding-controls-2026-08-01",
     "thinking-display-updates-2026-08-18": "thinking-display-updates-2026-08-18",
-    "token-efficient-tools-2025-02-19": null,
+    "token-efficient-tools-2025-02-19": "token-efficient-tools-2025-02-19",
     "web-fetch-2025-09-10": "web-fetch-2025-09-10",
-    "web-search-2025-03-05": "web-search-2025-03-05"
+    "web-search-2025-03-05": "web-search-2025-03-05",
+    "agent-memory-2026-07-22": null,
+    "analytics-usage-cost-2026-08-24": "analytics-usage-cost-2026-08-24",
+    "cache-diagnosis-2026-04-07": "cache-diagnosis-2026-04-07",
+    "ce-plugins-2026-09-01": "ce-plugins-2026-09-01",
+    "ce-user-management-2026-07-13": "ce-user-management-2026-07-13",
+    "claude-code-20250219": "claude-code-20250219",
+    "code-execution-2025-05-22": "code-execution-2025-05-22",
+    "compact-2026-09-04": "compact-2026-09-04",
+    "computer-use-2024-10-22": "computer-use-2024-10-22",
+    "dev-full-thinking-2025-05-14": null,
+    "dreaming-2026-04-21": "dreaming-2026-04-21",
+    "experimental-claude-tag-2026-10-21": "experimental-claude-tag-2026-10-21",
+    "extended-cache-ttl-2025-04-11": "extended-cache-ttl-2025-04-11",
+    "fallback-credit-2026-06-01": "fallback-credit-2026-06-01",
+    "fallback-credit-2026-07-01": "fallback-credit-2026-07-01",
+    "inline-tools-2026-09-15": "inline-tools-2026-09-15",
+    "managed-agents-2026-04-01": "managed-agents-2026-04-01",
+    "mcp-client-2026-09-15": "mcp-client-2026-09-15",
+    "mcp-tunnels-2026-06-22": "mcp-tunnels-2026-06-22",
+    "message-batches-2024-09-24": "message-batches-2024-09-24",
+    "message-threads-2026-08-12": "message-threads-2026-08-12",
+    "mid-conversation-output-config-2026-07-01": "mid-conversation-output-config-2026-07-01",
+    "mid-conversation-system-clear-at-2026-08-21": "mid-conversation-system-clear-at-2026-08-21",
+    "mid-conversation-tool-changes-2026-07-01": "mid-conversation-tool-changes-2026-07-01",
+    "model-context-window-exceeded-2025-08-26": "model-context-window-exceeded-2025-08-26",
+    "oauth-2025-04-20": "oauth-2025-04-20",
+    "output-300k-2026-03-24": "output-300k-2026-03-24",
+    "pdfs-2024-09-25": "pdfs-2024-09-25",
+    "prompt-caching-2024-07-31": "prompt-caching-2024-07-31",
+    "server-side-fallback-2026-06-01": "server-side-fallback-2026-06-01",
+    "server-side-fallback-2026-07-01": "server-side-fallback-2026-07-01",
+    "spend-limit-reads-2026-09-26": "spend-limit-reads-2026-09-26",
+    "task-budgets-2026-03-13": "task-budgets-2026-03-13",
+    "telemetry-destinations-2026-08-11": "telemetry-destinations-2026-08-11",
+    "thinking-token-count-2026-05-13": "thinking-token-count-2026-05-13",
+    "token-counting-2024-11-01": "token-counting-2024-11-01",
+    "tool-examples-2025-10-29": "tool-examples-2025-10-29",
+    "tool-search-tool-2025-10-19": "tool-search-tool-2025-10-19",
+    "user-profiles-2026-03-24": "user-profiles-2026-03-24",
+    "user-profiles-2026-08-18": "user-profiles-2026-08-18",
+    "user-profiles-2026-09-04": "user-profiles-2026-09-04",
+    "webhooks-2026-10-07": "webhooks-2026-10-07",
+    "afk-mode-2026-01-31": "afk-mode-2026-01-31",
+    "redact-thinking-2026-02-12": "redact-thinking-2026-02-12",
+    "structured-outputs-2025-12-15": "structured-outputs-2025-12-15"
   },
   "bedrock_converse": {
     "advisor-tool-2026-03-01": null,
@@ -196,34 +279,92 @@
     "context-1m-2025-08-07": "context-1m-2025-08-07",
     "context-management-2025-06-27": "context-management-2025-06-27",
     "dangerous-tool-use-2026-09-03": "dangerous-tool-use-2026-09-03",
-    "effort-2025-11-24": null,
+    "effort-2025-11-24": "effort-2025-11-24",
     "fast-mode-2026-02-01": null,
     "files-api-2025-04-14": null,
-    "fine-grained-tool-streaming-2025-05-14": null,
+    "fine-grained-tool-streaming-2025-05-14": "fine-grained-tool-streaming-2025-05-14",
     "interleaved-thinking-2025-05-14": "interleaved-thinking-2025-05-14",
     "mcp-client-2025-11-20": null,
     "mcp-client-2025-04-04": null,
     "mcp-servers-2025-12-04": null,
-    "mid-conversation-tool-changes-2026-07-01": "mid-conversation-tool-changes-2026-07-01",
-    "output-128k-2025-02-19": null,
+    "output-128k-2025-02-19": "output-128k-2025-02-19",
     "structured-output-2024-03-01": null,
     "per-turn-control-2026-07-01": "per-turn-control-2026-07-01",
     "prompt-caching-scope-2026-01-05": null,
     "skills-2025-10-02": null,
-    "structured-outputs-2025-11-13": null,
+    "structured-outputs-2025-11-13": "structured-outputs-2025-11-13",
     "text_editor_20241022": null,
     "text_editor_20250124": null,
     "thinking-binding-controls-2026-08-01": "thinking-binding-controls-2026-08-01",
     "thinking-display-updates-2026-08-18": "thinking-display-updates-2026-08-18",
-    "token-efficient-tools-2025-02-19": null,
+    "token-efficient-tools-2025-02-19": "token-efficient-tools-2025-02-19",
     "tool-search-tool-2025-10-19": "tool-search-tool-2025-10-19",
     "web-fetch-2025-09-10": null,
     "web-search-2025-03-05": "web-search-2025-03-05",
-    "inline-tools-2026-09-15": "inline-tools-2026-09-15"
+    "inline-tools-2026-09-15": "inline-tools-2026-09-15",
+    "agent-memory-2026-07-22": null,
+    "analytics-usage-cost-2026-08-24": null,
+    "cache-diagnosis-2026-04-07": null,
+    "ce-plugins-2026-09-01": null,
+    "ce-user-management-2026-07-13": null,
+    "claude-code-20250219": "claude-code-20250219",
+    "code-execution-2025-05-22": null,
+    "compact-2026-09-04": null,
+    "computer-use-2024-10-22": null,
+    "dev-full-thinking-2025-05-14": null,
+    "dreaming-2026-04-21": null,
+    "experimental-claude-tag-2026-10-21": null,
+    "extended-cache-ttl-2025-04-11": null,
+    "fallback-credit-2026-06-01": "fallback-credit-2026-06-01",
+    "fallback-credit-2026-07-01": "fallback-credit-2026-07-01",
+    "managed-agents-2026-04-01": null,
+    "mcp-client-2026-09-15": null,
+    "mcp-tunnels-2026-06-22": null,
+    "message-batches-2024-09-24": null,
+    "message-threads-2026-08-12": null,
+    "mid-conversation-output-config-2026-07-01": "mid-conversation-output-config-2026-07-01",
+    "mid-conversation-system-clear-at-2026-08-21": "mid-conversation-system-clear-at-2026-08-21",
+    "mid-conversation-tool-changes-2026-07-01": "mid-conversation-tool-changes-2026-07-01",
+    "model-context-window-exceeded-2025-08-26": "model-context-window-exceeded-2025-08-26",
+    "oauth-2025-04-20": null,
+    "output-300k-2026-03-24": null,
+    "pdfs-2024-09-25": "pdfs-2024-09-25",
+    "prompt-caching-2024-07-31": null,
+    "server-side-fallback-2026-06-01": "server-side-fallback-2026-06-01",
+    "server-side-fallback-2026-07-01": null,
+    "spend-limit-reads-2026-09-26": null,
+    "task-budgets-2026-03-13": "task-budgets-2026-03-13",
+    "telemetry-destinations-2026-08-11": null,
+    "thinking-token-count-2026-05-13": "thinking-token-count-2026-05-13",
+    "token-counting-2024-11-01": "token-counting-2024-11-01",
+    "tool-examples-2025-10-29": "tool-examples-2025-10-29",
+    "user-profiles-2026-03-24": null,
+    "user-profiles-2026-08-18": null,
+    "user-profiles-2026-09-04": null,
+    "webhooks-2026-10-07": null,
+    "afk-mode-2026-01-31": "afk-mode-2026-01-31",
+    "redact-thinking-2026-02-12": null,
+    "structured-outputs-2025-12-15": "structured-outputs-2025-12-15"
   },
   "vertex_ai_header_only": {
+    "ce-plugins-2026-09-01": "ce-plugins-2026-09-01",
+    "ce-user-management-2026-07-13": "ce-user-management-2026-07-13",
     "compact-2026-09-04": "compact-2026-09-04",
-    "inline-tools-2026-09-15": "inline-tools-2026-09-15"
+    "dreaming-2026-04-21": "dreaming-2026-04-21",
+    "experimental-claude-tag-2026-10-21": "experimental-claude-tag-2026-10-21",
+    "extended-cache-ttl-2025-04-11": "extended-cache-ttl-2025-04-11",
+    "inline-tools-2026-09-15": "inline-tools-2026-09-15",
+    "managed-agents-2026-04-01": "managed-agents-2026-04-01",
+    "mcp-tunnels-2026-06-22": "mcp-tunnels-2026-06-22",
+    "oauth-2025-04-20": "oauth-2025-04-20",
+    "prompt-caching-2024-07-31": "prompt-caching-2024-07-31",
+    "prompt-caching-scope-2026-01-05": "prompt-caching-scope-2026-01-05",
+    "redact-thinking-2026-02-12": "redact-thinking-2026-02-12",
+    "spend-limit-reads-2026-09-26": "spend-limit-reads-2026-09-26",
+    "telemetry-destinations-2026-08-11": "telemetry-destinations-2026-08-11",
+    "user-profiles-2026-03-24": "user-profiles-2026-03-24",
+    "user-profiles-2026-08-18": "user-profiles-2026-08-18",
+    "user-profiles-2026-09-04": "user-profiles-2026-09-04"
   },
   "databricks": {
     "advisor-tool-2026-03-01": null,
diff --git a/litellm/anthropic_beta_headers_manager.py b/litellm/anthropic_beta_headers_manager.py
index be2ff07e088..e284845b2ff 100644
--- a/litellm/anthropic_beta_headers_manager.py
+++ b/litellm/anthropic_beta_headers_manager.py
@@ -31,6 +31,7 @@ from concurrent.futures import ThreadPoolExecutor
 from functools import cache
 from importlib.resources import files
 from typing import Final, Literal, TypeAlias
+from urllib.parse import urlparse
 
 import httpx
 from pydantic import TypeAdapter
@@ -48,6 +49,7 @@ _BETA_HEADERS_CONFIG_ADAPTER: Final = TypeAdapter(BetaHeadersConfig)
 _DECODED_JSON: Final = TypeAdapter(object)
 
 BetaPlacement: TypeAlias = Literal["header", "body"]
+UnlistedBetas: TypeAlias = Literal["drop", "forward"]
 _HEADER_ONLY_COLUMN_SUFFIX: Final = "_header_only"
 
 
@@ -280,12 +282,13 @@ def filter_and_transform_beta_headers(
     beta_headers: list[str],
     provider: str,
     placement: BetaPlacement = "header",
+    unlisted: UnlistedBetas = "drop",
 ) -> list[str]:
     """
     Filter and transform beta headers based on provider's mapping configuration.
 
     This function:
-    1. Only allows headers that are present in the provider's mapping keys
+    1. Only allows headers that are present in the provider's mapping keys, unless ``unlisted`` is "forward"
     2. Filters out headers with null values (unsupported)
     3. Maps headers to provider-specific names (e.g., advanced-tool-use -> tool-search-tool)
 
@@ -293,6 +296,7 @@ def filter_and_transform_beta_headers(
         beta_headers: List of Anthropic beta header values
         provider: Provider name (e.g., "anthropic", "bedrock", "vertex_ai")
         placement: Whether the betas travel as the anthropic-beta header or the anthropic_beta body field
+        unlisted: Whether a beta missing from the mapping is dropped or forwarded as sent
 
     Returns:
         List of filtered and transformed beta headers for the provider
@@ -307,6 +311,10 @@ def filter_and_transform_beta_headers(
     for header in beta_headers:
         header = header.strip()
 
+        if header not in provider_mapping and unlisted == "forward":
+            filtered_headers.add(header)
+            continue
+
         # Check if header is in the mapping
         if header not in provider_mapping:
             verbose_logger.debug(
@@ -388,9 +396,38 @@ def get_provider_beta_header(
     return provider_mapping[anthropic_beta_header]
 
 
+FOUNDRY_API_BASE_HOST_SUFFIXES: Final[tuple[str, ...]] = (
+    "services.ai.azure.com",
+    "openai.azure.com",
+    "cognitiveservices.azure.com",
+)
+
+
+def is_foundry_api_base(api_base: str | None) -> bool:
+    """Whether ``api_base`` points at an Azure AI Foundry host, where Claude is served by Microsoft."""
+    if not api_base:
+        return False
+    host: Final = urlparse(api_base if "://" in api_base else f"https://{api_base}").hostname or ""
+    return any(host == suffix or host.endswith(f".{suffix}") for suffix in FOUNDRY_API_BASE_HOST_SUFFIXES)
+
+
+def resolve_beta_provider(provider: str, api_base: str | None = None) -> str:
+    """
+    Pick the beta allowlist row for one deployment, not one provider string.
+
+    An ``anthropic`` deployment whose ``api_base`` is a Foundry host is served by Microsoft and
+    gets the ``azure_ai`` row, since Foundry accepts a different set of betas than api.anthropic.com.
+    """
+    if provider == "anthropic" and is_foundry_api_base(api_base):
+        return "azure_ai"
+    return provider
+
+
 def update_headers_with_filtered_beta(
     headers: dict,
     provider: str,
+    api_base: str | None = None,
+    unlisted: UnlistedBetas = "drop",
 ) -> dict:
     """
     Update headers dict by filtering and transforming anthropic-beta header values.
@@ -399,6 +436,8 @@ def update_headers_with_filtered_beta(
     Args:
         headers: Request headers dict (will be modified in place)
         provider: Provider name
+        api_base: Deployment api_base, used to pick the allowlist row (Foundry hosts use ``azure_ai``)
+        unlisted: Whether a beta missing from the row is dropped or forwarded as sent
 
     Returns:
         Updated headers dict
@@ -413,7 +452,8 @@ def update_headers_with_filtered_beta(
     # Filter and transform based on provider
     filtered_beta_values: Final = filter_and_transform_beta_headers(
         beta_headers=beta_values,
-        provider=provider,
+        provider=resolve_beta_provider(provider, api_base),
+        unlisted=unlisted,
     )
 
     # Update or remove the header
@@ -430,6 +470,7 @@ def update_request_with_filtered_beta(
     headers: dict,
     request_data: dict,
     provider: str,
+    api_base: str | None = None,
 ) -> tuple[dict[str, str], dict[str, object]]:
     """
     Update both headers and request body beta fields based on provider support.
@@ -439,11 +480,12 @@ def update_request_with_filtered_beta(
         headers: Request headers dict (will be modified in place)
         request_data: Request body dict (will be modified in place)
         provider: Provider name
+        api_base: Deployment api_base, used to pick the allowlist row (Foundry hosts use ``azure_ai``)
 
     Returns:
         Tuple of (updated headers, updated request_data)
     """
-    headers = update_headers_with_filtered_beta(headers=headers, provider=provider)
+    headers = update_headers_with_filtered_beta(headers=headers, provider=provider, api_base=api_base)
 
     existing_body_betas: Final = request_data.get("anthropic_beta")
     if not existing_body_betas:
@@ -451,7 +493,7 @@ def update_request_with_filtered_beta(
 
     filtered_body_betas: Final = filter_and_transform_beta_headers(
         beta_headers=existing_body_betas,
-        provider=provider,
+        provider=resolve_beta_provider(provider, api_base),
         placement="body",
     )
 
diff --git a/litellm/anthropic_interface/exceptions/exception_mapping_utils.py b/litellm/anthropic_interface/exceptions/exception_mapping_utils.py
index d8198e41239..b4c95fafff3 100644
--- a/litellm/anthropic_interface/exceptions/exception_mapping_utils.py
+++ b/litellm/anthropic_interface/exceptions/exception_mapping_utils.py
@@ -16,7 +16,7 @@ from .exceptions import AnthropicErrorDetail, AnthropicErrorResponse, AnthropicE
 _PARSED_ERROR_BODY: Final = TypeAdapter(object)
 
 # HTTP status code -> Anthropic error type
-# Source: https://docs.anthropic.com/en/api/errors
+# Source: https://platform.claude.com/docs/en/api/errors
 ANTHROPIC_ERROR_TYPE_MAP: Final[dict[int, AnthropicErrorType]] = {
     400: "invalid_request_error",
     401: "authentication_error",
@@ -46,6 +46,7 @@ class AnthropicExceptionMapping:
         status_code: int,
         message: str,
         request_id: str | None = None,
+        error_type: AnthropicErrorType | None = None,
     ) -> AnthropicErrorResponse:
         """
         Create an Anthropic-formatted error response dict.
@@ -57,12 +58,10 @@ class AnthropicExceptionMapping:
             "request_id": "req_..."
         }
         """
-        error_type: Final = AnthropicExceptionMapping.get_error_type(status_code)
-
         response: Final[AnthropicErrorResponse] = {
             "type": "error",
             "error": {
-                "type": error_type,
+                "type": error_type or AnthropicExceptionMapping.get_error_type(status_code),
                 "message": message,
             },
         }
@@ -131,6 +130,7 @@ class AnthropicExceptionMapping:
         status_code: int,
         raw_message: str,
         request_id: str | None = None,
+        error_type: AnthropicErrorType | None = None,
     ) -> AnthropicErrorResponse:
         """
         Transform an error message to Anthropic format.
@@ -144,6 +144,7 @@ class AnthropicExceptionMapping:
             status_code: HTTP status code
             raw_message: Raw error message (may be JSON string or plain text)
             request_id: Optional request ID to include
+            error_type: Anthropic error type to use instead of the one the status maps to
 
         Returns:
             AnthropicErrorResponse dict
@@ -169,6 +170,7 @@ class AnthropicExceptionMapping:
             status_code=status_code,
             message=message,
             request_id=request_id,
+            error_type=error_type,
         )
 
 
diff --git a/litellm/anthropic_interface/exceptions/exceptions.py b/litellm/anthropic_interface/exceptions/exceptions.py
index b48cd2fee6f..18b3ca37a3b 100644
--- a/litellm/anthropic_interface/exceptions/exceptions.py
+++ b/litellm/anthropic_interface/exceptions/exceptions.py
@@ -6,15 +6,18 @@ from typing import Literal
 from typing_extensions import NotRequired, ReadOnly, Required, TypedDict
 
 # Known Anthropic error types
-# Source: https://docs.anthropic.com/en/api/errors
+# Source: https://platform.claude.com/docs/en/api/errors
 AnthropicErrorType = Literal[
     "invalid_request_error",
     "authentication_error",
+    "billing_error",
     "permission_error",
     "not_found_error",
+    "conflict_error",
     "request_too_large",
     "rate_limit_error",
     "api_error",
+    "timeout_error",
     "overloaded_error",
 ]
 
@@ -25,6 +28,7 @@ class AnthropicErrorDetail(TypedDict):
     type: AnthropicErrorType
     message: str
     provider_specific_fields: NotRequired[ReadOnly[Mapping[str, object]]]
+    litellm_error_type: NotRequired[ReadOnly[str]]
     litellm_call_id: NotRequired[ReadOnly[str]]
 
 
diff --git a/litellm/caching/caching.py b/litellm/caching/caching.py
index 91cf9bb2cfe..3b7ea66ad6b 100644
--- a/litellm/caching/caching.py
+++ b/litellm/caching/caching.py
@@ -45,13 +45,27 @@ from .redis_semantic_cache import RedisSemanticCache
 from .s3_cache import S3Cache
 
 RESPONSE_CACHE_TARGET: Final = "llm_response"
-_ALWAYS_KEYED_PROVIDER_PARAMS: Final = frozenset({"continuation_token"})
+_ALWAYS_KEYED_PROVIDER_PARAMS: Final = frozenset({"continuation_token", "return_token_ids"})
 _DECODED_LITERAL: Final = TypeAdapter(object)
 _REDIS_STARTUP_NODES_ADAPTER: Final = TypeAdapter(
     list[dict[str, object]], config=ConfigDict(strict=True, hide_input_in_errors=True)
 )
 
 
+def _keyed_provider_params_in_extra_body(kwargs: Mapping[str, object]) -> str:
+    raw_extra_body: Final = kwargs.get("extra_body")
+    if not isinstance(raw_extra_body, dict):
+        return ""
+    extra_body: Final = cast(  # cast-ok: isinstance leaves the key and value types unknown
+        Mapping[str, object], raw_extra_body
+    )
+    return "".join(
+        f"extra_body.{param}: {extra_body[param]}"
+        for param in sorted(_ALWAYS_KEYED_PROVIDER_PARAMS)
+        if extra_body.get(param)
+    )
+
+
 @contextmanager
 def response_cache_phase(operation: Literal["get", "set"]) -> Generator[None]:
     """The ``cache.get llm_response`` / ``cache.set llm_response`` span a response-cache read or write runs
@@ -429,7 +443,10 @@ class Cache:
             "" if embeds_thought_signature_in_tool_call_id(kwargs) else "thought_signature_in_tool_call_id: False"
         )
         hashed_cache_key = Cache._get_hashed_cache_key(
-            cache_key + reasoning_summary_material + tool_call_id_shape_material
+            cache_key
+            + _keyed_provider_params_in_extra_body(kwargs)
+            + reasoning_summary_material
+            + tool_call_id_shape_material
         )
         hashed_cache_key = self._add_namespace_to_cache_key(hashed_cache_key, **kwargs)
         verbose_logger.debug(
diff --git a/litellm/caching/dual_cache.py b/litellm/caching/dual_cache.py
index e6214a3650c..c82d25c9425 100644
--- a/litellm/caching/dual_cache.py
+++ b/litellm/caching/dual_cache.py
@@ -673,7 +673,7 @@ class DualCache(BaseCache):
         if self.redis_cache is not None:
             self.redis_cache.flush_cache()
 
-    def delete_cache(self, key):
+    def delete_cache(self, key: str) -> None:
         """
         Delete a key from the cache
         """
diff --git a/litellm/completion_extras/litellm_responses_transformation/transformation.py b/litellm/completion_extras/litellm_responses_transformation/transformation.py
index bb59b4617af..c9d9cc25049 100644
--- a/litellm/completion_extras/litellm_responses_transformation/transformation.py
+++ b/litellm/completion_extras/litellm_responses_transformation/transformation.py
@@ -34,10 +34,12 @@ from litellm.completion_extras.litellm_responses_transformation.history import (
     requested_phase,
 )
 from litellm.integrations.anthropic_cache_control_hook import supports_openai_prompt_cache_breakpoint
+from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
 from litellm.litellm_core_utils.hidden_params import get_hidden_params, get_or_create_hidden_params
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
-    prompt_cache_breakpoint_for_wire,
+    prompt_cache_breakpoint_with_readable_mode,
     responses_reasoning_items_from_thinking_blocks,
+    whole_prompt_cache_breakpoint_or_none,
     with_prompt_cache_breakpoint,
 )
 from litellm.llms.base_llm.base_model_iterator import BaseModelResponseIterator
@@ -97,6 +99,12 @@ _RESPONSES_API_ONLY_FIELDS: Final = frozenset((*Response.model_fields, *Response
 )
 
 
+def _bridged_prompt_cache_breakpoint(marker: object, drop_params: bool, target_trims_breakpoints: bool) -> object:
+    if target_trims_breakpoints:
+        return prompt_cache_breakpoint_with_readable_mode(marker, drop_params)
+    return whole_prompt_cache_breakpoint_or_none(marker) if drop_params else marker
+
+
 def _strip_prompt_cache_breakpoint_from_content_block(value: object) -> object:
     if not isinstance(value, dict):
         return value
@@ -844,6 +852,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
         messages: list["AllMessageValues"],
         *,
         drop_params: bool = False,
+        target_trims_breakpoints: bool = True,
         keep_prompt_cache_breakpoints: bool = False,
         replay_tool_search: bool = False,
         include_namespace: bool = False,
@@ -852,6 +861,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
         converted_input_items, instructions = self._convert_chat_completion_messages_to_responses_input(
             messages,
             drop_params=drop_params,
+            target_trims_breakpoints=target_trims_breakpoints,
             replay_tool_search=replay_tool_search,
             include_namespace=include_namespace,
             replay_openai_history=replay_openai_history,
@@ -868,6 +878,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
         messages: list["AllMessageValues"],
         *,
         drop_params: bool = False,
+        target_trims_breakpoints: bool = True,
         replay_tool_search: bool = False,
         include_namespace: bool = False,
         replay_openai_history: bool = False,
@@ -921,6 +932,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                                 content,
                                 role,
                                 drop_params=drop_params,
+                                target_trims_breakpoints=target_trims_breakpoints,
                             ),
                         }
                     )
@@ -940,6 +952,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                         content,
                         "user",  # Use "user" role to get input_* types
                         drop_params=drop_params,
+                        target_trims_breakpoints=target_trims_breakpoints,
                     )
                 else:
                     # Fallback: convert unexpected types to input_text
@@ -968,7 +981,10 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                             "type": "message",
                             "role": "assistant",
                             "content": self._convert_content_to_responses_format(
-                                content, "assistant", drop_params=drop_params
+                                content,
+                                "assistant",
+                                drop_params=drop_params,
+                                target_trims_breakpoints=target_trims_breakpoints,
                             ),
                             **_assistant_phase_field(msg, replay_openai_history, drop_params),
                         }
@@ -1009,7 +1025,10 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                         "type": "message",
                         "role": role,
                         "content": self._convert_content_to_responses_format(
-                            content, cast(str, role), drop_params=drop_params
+                            content,
+                            cast(str, role),
+                            drop_params=drop_params,
+                            target_trims_breakpoints=target_trims_breakpoints,
                         ),
                         **_assistant_phase_field(msg, replay_openai_history and role == "assistant", drop_params),
                     }
@@ -1135,6 +1154,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
         converted_input_items, converted_instructions = self.convert_chat_completion_messages_to_responses_api(
             messages,
             drop_params=bool(litellm_params.get("drop_params") or litellm.drop_params),
+            target_trims_breakpoints=drops_unsupported_params(litellm_params.get("drop_params")),
             keep_prompt_cache_breakpoints=supports_prompt_cache_breakpoint,
             replay_tool_search=_requests_tool_search(cast(object, optional_params)),  # cast-ok: upcast
             include_namespace=True,
@@ -1640,6 +1660,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
         | None,
         role: str,
         drop_params: bool = False,
+        target_trims_breakpoints: bool = True,
     ) -> list[dict[str, object]]:
         """Convert chat completion content to responses API format"""
         from litellm.types.llms.openai import ChatCompletionImageObject
@@ -1666,7 +1687,9 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                     if original_type == "text":
                         converted = with_prompt_cache_breakpoint(
                             self._convert_content_str_to_input_text(item.get("text", ""), role),
-                            prompt_cache_breakpoint_for_wire(item.get("prompt_cache_breakpoint"), drop_params),
+                            _bridged_prompt_cache_breakpoint(
+                                item.get("prompt_cache_breakpoint"), drop_params, target_trims_breakpoints
+                            ),
                         )
                         result.append(converted)
                         verbose_logger.debug("Chat provider:   text -> %s", converted)
@@ -1679,14 +1702,18 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                                     cast(ChatCompletionImageObject, item), role
                                 ),
                             ),
-                            prompt_cache_breakpoint_for_wire(item.get("prompt_cache_breakpoint"), drop_params),
+                            _bridged_prompt_cache_breakpoint(
+                                item.get("prompt_cache_breakpoint"), drop_params, target_trims_breakpoints
+                            ),
                         )
                         result.append(converted)
                         verbose_logger.debug("Chat provider:   image_url -> %s", converted)
                     elif original_type == "input_audio":
                         converted = with_prompt_cache_breakpoint(
                             {"type": "input_audio", "input_audio": item.get("input_audio")},
-                            prompt_cache_breakpoint_for_wire(item.get("prompt_cache_breakpoint"), drop_params),
+                            _bridged_prompt_cache_breakpoint(
+                                item.get("prompt_cache_breakpoint"), drop_params, target_trims_breakpoints
+                            ),
                         )
                         result.append(converted)
                         verbose_logger.debug("Chat provider:   input_audio -> %s", converted)
@@ -1702,7 +1729,9 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                                 _input_file_from_file_value(
                                     cast("ChatCompletionFileObject", item).get("file"),  # cast-ok: type tag checked
                                 ),
-                                prompt_cache_breakpoint_for_wire(item.get("prompt_cache_breakpoint"), drop_params),
+                                _bridged_prompt_cache_breakpoint(
+                                    item.get("prompt_cache_breakpoint"), drop_params, target_trims_breakpoints
+                                ),
                             )
                             result.append(converted)
                             verbose_logger.debug("Chat provider:   file -> %s", converted)
@@ -1726,7 +1755,9 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
                             # Default to input_text for unknown types
                             converted = with_prompt_cache_breakpoint(
                                 self._convert_content_str_to_input_text(str(item.get("text", item)), role),
-                                prompt_cache_breakpoint_for_wire(item.get("prompt_cache_breakpoint"), drop_params),
+                                _bridged_prompt_cache_breakpoint(
+                                    item.get("prompt_cache_breakpoint"), drop_params, target_trims_breakpoints
+                                ),
                             )
                             result.append(converted)
                             verbose_logger.debug("Chat provider:   unknown(%s) -> %s", original_type, converted)
diff --git a/litellm/constants.py b/litellm/constants.py
index cd7c0176428..14a2a9f9eca 100644
--- a/litellm/constants.py
+++ b/litellm/constants.py
@@ -699,6 +699,9 @@ STREAM_SSE_DONE_STRING: Final[str] = "[DONE]"
 STREAM_SSE_DATA_PREFIX: Final[str] = "data: "
 STREAM_SSE_KEEPALIVE_PING_CHUNK: Final[str] = 'event: ping\ndata: {"type": "ping"}\n\n'
 STREAM_SSE_KEEPALIVE_PING_BYTES: Final[bytes] = STREAM_SSE_KEEPALIVE_PING_CHUNK.encode("utf-8")
+STREAM_FINISH_CHOICE_FIELDS: Final = ("stop_reason",)
+STREAM_CHUNK_CHOICE_FIELDS: Final = ("token_ids",)
+VLLM_CHOICE_FIELDS: Final = STREAM_FINISH_CHOICE_FIELDS + STREAM_CHUNK_CHOICE_FIELDS
 ### SPEND TRACKING ###
 DEFAULT_REPLICATE_GPU_PRICE_PER_SECOND: Final = get_env_float(
     "DEFAULT_REPLICATE_GPU_PRICE_PER_SECOND", 0.001400
diff --git a/litellm/cost_calculator.py b/litellm/cost_calculator.py
index e66be233be4..3c028278b2d 100644
--- a/litellm/cost_calculator.py
+++ b/litellm/cost_calculator.py
@@ -6,6 +6,7 @@ import time
 from collections.abc import Mapping, Sequence
 from datetime import datetime
 from functools import lru_cache
+from itertools import accumulate
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, Literal, TypeAlias, cast
 
@@ -3850,44 +3851,65 @@ def handle_realtime_transcription_cost_calculation(
       - {"type": "duration", "seconds": <float>}  → priced via input_cost_per_second
       - {"type": "tokens", "input_tokens": ...}    → priced via input/audio token cost
     """
-    completed_events: Final = [
-        cast(dict, result) for result in results if result.get("type") == _TRANSCRIPTION_COMPLETED_EVENT_TYPE
-    ]
-    if not completed_events:
+    configured_models: Final = tuple(accumulate(map(_session_transcription_model, results), _newer_model))
+    clips: Final = tuple(
+        (as_str_mapping(result.get("usage")) or {}, configured)
+        for result, configured in zip(results, configured_models, strict=True)
+        if result.get("type") == _TRANSCRIPTION_COMPLETED_EVENT_TYPE
+    )
+    if not clips:
         return 0.0
 
-    model_name: Final = _get_transcription_model_name_from_results(results) or litellm_model_name
-    model_info: Final = _cost_map_model_info(model_name, custom_llm_provider)
+    fallback_model: Final = _get_transcription_model_name_from_results(results) or litellm_model_name
+    clip_models: Final = tuple((usage, configured or fallback_model) for usage, configured in clips)
+    model_infos: Final = MappingProxyType(
+        {model: _cost_map_model_info(model, custom_llm_provider) for model in frozenset(m for _, m in clip_models)}
+    )
     override_info: Final = (
         _cost_map_model_info(custom_pricing_model, custom_llm_provider) if custom_pricing_model is not None else None
     )
+    return sum(
+        (_transcription_usage_cost(dict(usage), model_infos[model], override_info) for usage, model in clip_models),
+        0.0,
+    )
 
-    total_cost = 0.0
-    for event in completed_events:
-        usage = event.get("usage") or {}
-        total_cost += _transcription_usage_cost(usage, model_info, override_info)
-    return total_cost
+
+_TRANSCRIPTION_SESSION_EVENT_TYPES: Final = frozenset(
+    {"transcription_session.created", "transcription_session.updated", "session.created", "session.updated"}
+)
+
+
+def _str_field(mapping: Mapping[str, object] | None, key: str) -> str | None:
+    value: Final = None if mapping is None else mapping.get(key)
+    return value if isinstance(value, str) and value else None
+
+
+def _configured_transcription_model(session: Mapping[str, object]) -> str | None:
+    audio_input: Final = as_str_mapping((as_str_mapping(session.get("audio")) or {}).get("input"))
+    nested: Final = _str_field(as_str_mapping((audio_input or {}).get("transcription")), "model")
+    return nested or _str_field(as_str_mapping(session.get("input_audio_transcription")), "model")
+
+
+def _session_of(result: Mapping[str, object]) -> Mapping[str, object] | None:
+    return as_str_mapping(result.get("session")) if result.get("type") in _TRANSCRIPTION_SESSION_EVENT_TYPES else None
+
+
+def _session_transcription_model(result: Mapping[str, object]) -> str | None:
+    session: Final = _session_of(result)
+    return None if session is None else _configured_transcription_model(session)
+
+
+def _newer_model(current: str | None, newer: str | None) -> str | None:
+    return newer or current
 
 
 def _get_transcription_model_name_from_results(
     results: OpenAIRealtimeStreamList,
 ) -> str | None:
-    """Resolve the ASR model from a transcription_session.* / session.* event."""
-    for result in results:
-        if result.get("type") in (
-            "transcription_session.created",
-            "transcription_session.updated",
-            "session.created",
-            "session.updated",
-        ):
-            session = cast(dict, result).get("session", {}) or {}
-            transcription = ((session.get("audio", {}) or {}).get("input", {}) or {}).get(
-                "transcription", {}
-            ) or session.get("input_audio_transcription", {})
-            model = (transcription or {}).get("model") or session.get("model")
-            if model:
-                return model
-    return None
+    return next(
+        (model for result in results if (model := _str_field(_session_of(result), "model"))),
+        None,
+    )
 
 
 _TranscriptionRateKey: TypeAlias = Literal[
diff --git a/litellm/integrations/anthropic_cache_control_hook.py b/litellm/integrations/anthropic_cache_control_hook.py
index c05407b7972..01be455e229 100644
--- a/litellm/integrations/anthropic_cache_control_hook.py
+++ b/litellm/integrations/anthropic_cache_control_hook.py
@@ -17,7 +17,7 @@ from collections.abc import Callable, Container, Iterable, Iterator, Mapping, Se
 from typing import TYPE_CHECKING, Any, Final, TypeAlias, TypeVar, cast
 from urllib.parse import urlparse
 
-from pydantic import TypeAdapter, ValidationError
+from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError
 
 from litellm._logging import verbose_logger
 from litellm.integrations.custom_logger import CustomLogger
@@ -73,7 +73,7 @@ MAX_CACHE_CONTROL_BLOCKS: Final = 4
 
 CACHE_BREAKPOINT_KEYS: Final = ("cache_control", "prompt_cache_breakpoint")
 OPENAI_PROMPT_CACHE_BREAKPOINT_MIN_GPT_VERSION: Final = (5, 6)
-_GPT_VERSION_PATTERN: Final = re.compile(r"^gpt-(\d+)(?:\.(\d+))?")
+_GPT_VERSION_PATTERN: Final = re.compile(r"^gpt-(\d+)(?:\.(\d+)|-(0|[1-9]\d?)(?![\da-z]))?")
 _FINE_TUNED_BASE_PATTERN: Final = re.compile(r"^ft:([^:]+)")
 _O_SERIES_PATTERN: Final = re.compile(r"^o\d+(?:-|$)")
 OPENAI_PROMPT_CACHE_BREAKPOINT_BLOCK_TYPES: Final = frozenset(
@@ -335,6 +335,30 @@ def openai_prompt_cache_breakpoint_support(model: str, custom_llm_provider: str
     return _named_model_breakpoint_support(model)
 
 
+class _DeclaredBaseModels(BaseModel):
+    model_config = ConfigDict(frozen=True, extra="ignore", from_attributes=True)
+
+    base_model: object = None
+    model_info: object = None
+
+    def names(self) -> tuple[str, ...]:
+        model_info: Final = _validated_object_mapping(self.model_info) or {}
+        candidates: Final = (self.base_model, model_info.get("base_model"))
+        return tuple(name for name in candidates if isinstance(name, str) and name)
+
+
+def deployment_prompt_cache_breakpoint_support(
+    model: str, custom_llm_provider: str, litellm_params: object
+) -> bool | None:
+    """``openai_prompt_cache_breakpoint_support`` for a deployment, read from its declared base model first."""
+    declared: Final = _DeclaredBaseModels.model_validate(litellm_params)
+    supports: Final = (
+        openai_prompt_cache_breakpoint_support(name, custom_llm_provider)
+        for name in dict.fromkeys((*declared.names(), model))
+    )
+    return next((support for support in supports if support is not None), None)
+
+
 def _named_model_breakpoint_support(model: str) -> bool | None:
     bare_model: Final = model.rsplit("/", 1)[-1].lower()
     if _O_SERIES_PATTERN.match(bare_model) is not None:
@@ -342,7 +366,7 @@ def _named_model_breakpoint_support(model: str) -> bool | None:
     version_match: Final = _GPT_VERSION_PATTERN.match(bare_model)
     if version_match is None:
         return None
-    version: Final = (int(version_match.group(1)), int(version_match.group(2) or 0))
+    version: Final = (int(version_match.group(1)), int(version_match.group(2) or version_match.group(3) or 0))
     return version >= OPENAI_PROMPT_CACHE_BREAKPOINT_MIN_GPT_VERSION
 
 
diff --git a/litellm/integrations/azure_storage/azure_storage.py b/litellm/integrations/azure_storage/azure_storage.py
index 37b4d2d3937..2ff523571f2 100644
--- a/litellm/integrations/azure_storage/azure_storage.py
+++ b/litellm/integrations/azure_storage/azure_storage.py
@@ -1,7 +1,8 @@
 import asyncio
 import os
 import time
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
+from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
 from functools import cache
 from typing import Final
@@ -15,6 +16,7 @@ from litellm.constants import (
     AZURE_STORAGE_MSFT_VERSION,
 )
 from litellm.integrations.custom_batch_logger import CustomBatchLogger
+from litellm.litellm_core_utils.internal_call_metadata import logged_event_key
 from litellm.litellm_core_utils.safe_json_dumps import safe_dumps
 from litellm.llms.azure.common_utils import get_azure_ad_token_from_entra_id
 from litellm.llms.custom_httpx.http_handler import (
@@ -47,6 +49,20 @@ def adls_safe_file_name(payload_id: str | None) -> str:
     return f"{name.translate(_ADLS_SAFE_NAME)}.json"
 
 
+@dataclass(frozen=True, slots=True)
+class AzureStorageLogQueueItem:
+    payload: StandardLoggingPayload
+    file_name: str
+
+
+def _queued_log(kwargs: Mapping[str, object], payload: StandardLoggingPayload) -> AzureStorageLogQueueItem:
+    payload_id: Final = payload.get("id")
+    return AzureStorageLogQueueItem(
+        payload=payload,
+        file_name=adls_safe_file_name(payload_id and logged_event_key(kwargs, payload_id)),
+    )
+
+
 @cache
 def _cached_credential_chain_token_provider() -> Callable[[], str]:
     return get_azure_ad_token_provider(
@@ -99,7 +115,7 @@ class AzureBlobStorageLogger(CustomBatchLogger):
 
             asyncio.create_task(self.periodic_flush())
             self.flush_lock = asyncio.Lock()
-            self.log_queue: list[StandardLoggingPayload] = []
+            self.log_queue: list[AzureStorageLogQueueItem] = []
             super().__init__(**kwargs, flush_lock=self.flush_lock)
         except Exception as e:
             verbose_logger.exception(
@@ -115,7 +131,7 @@ class AzureBlobStorageLogger(CustomBatchLogger):
     def azure_storage_blob_endpoint(self) -> str:
         return f"https://{self.azure_storage_account_name}.blob.{self.azure_storage_endpoint_suffix}"
 
-    async def async_log_success_event(self, kwargs, response_obj, start_time, end_time):
+    async def async_log_success_event(self, kwargs, response_obj: object, start_time: datetime, end_time: datetime):
         """
         Async Log success events to Azure Blob Storage
 
@@ -133,12 +149,12 @@ class AzureBlobStorageLogger(CustomBatchLogger):
             if standard_logging_payload is None:
                 raise ValueError("standard_logging_payload is not set")
 
-            self.log_queue.append(standard_logging_payload)
+            self.log_queue.append(_queued_log(kwargs, standard_logging_payload))
 
         except Exception as e:
             verbose_logger.exception("AzureBlobStorageLogger Layer Error - %s", e)
 
-    async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time):
+    async def async_log_failure_event(self, kwargs, response_obj: object, start_time: datetime, end_time: datetime):
         """
         Async Log failure events to Azure Blob Storage
 
@@ -156,7 +172,7 @@ class AzureBlobStorageLogger(CustomBatchLogger):
             if standard_logging_payload is None:
                 raise ValueError("standard_logging_payload is not set")
 
-            self.log_queue.append(standard_logging_payload)
+            self.log_queue.append(_queued_log(kwargs, standard_logging_payload))
         except Exception as e:
             verbose_logger.exception("AzureBlobStorageLogger Layer Error - %s", e)
 
@@ -195,13 +211,15 @@ class AzureBlobStorageLogger(CustomBatchLogger):
                 len(self.log_queue),
             )
 
-            for payload in self.log_queue:
-                await self.async_upload_payload_to_azure_blob_storage(payload=payload)
+            for item in self.log_queue:
+                await self.async_upload_payload_to_azure_blob_storage(payload=item.payload, file_name=item.file_name)
 
         except Exception as e:
             verbose_logger.exception("AzureBlobStorageLogger Error sending batch API - %s", e)
 
-    async def async_upload_payload_to_azure_blob_storage(self, payload: StandardLoggingPayload):
+    async def async_upload_payload_to_azure_blob_storage(
+        self, payload: StandardLoggingPayload, file_name: str | None = None
+    ):
         """
         Uploads the payload to Azure Blob Storage using a 3-step process:
         1. Create file resource
@@ -210,14 +228,14 @@ class AzureBlobStorageLogger(CustomBatchLogger):
         """
         try:
             if self.azure_storage_account_key:
-                await self.upload_to_azure_data_lake_with_azure_account_key(payload=payload)
+                await self.upload_to_azure_data_lake_with_azure_account_key(payload=payload, file_name=file_name)
             else:
                 # Get a valid token instead of always requesting a new one
                 await self.set_valid_azure_ad_token()
                 async_client: Final = get_async_httpx_client(llm_provider=httpxSpecialProvider.LoggingCallback)
                 json_payload: Final = safe_dumps(payload) + "\n"  # Add newline for each log entry
                 payload_bytes: Final = json_payload.encode("utf-8")
-                filename: Final = adls_safe_file_name(payload.get("id"))
+                filename: Final = file_name or adls_safe_file_name(payload.get("id"))
                 base_url = f"{self.azure_storage_dfs_endpoint}/{self.azure_storage_file_system}/{filename}"
 
                 # Execute the 3-step upload process
@@ -377,7 +395,9 @@ class AzureBlobStorageLogger(CustomBatchLogger):
             self._service_client_timeout = self._clock() + _DEFAULT_TTL_FOR_HTTPX_CLIENTS
         return self._service_client
 
-    async def upload_to_azure_data_lake_with_azure_account_key(self, payload: StandardLoggingPayload):
+    async def upload_to_azure_data_lake_with_azure_account_key(
+        self, payload: StandardLoggingPayload, file_name: str | None = None
+    ):
         """
         Uploads the payload to Azure Data Lake using the Azure SDK
 
@@ -386,11 +406,11 @@ class AzureBlobStorageLogger(CustomBatchLogger):
 
         try:
             today: Final = datetime.now().strftime("%Y-%m-%d")
-            file_name: Final = adls_safe_file_name(payload.get("id"))
+            resolved_file_name: Final = file_name or adls_safe_file_name(payload.get("id"))
             await self._upload_bytes_with_account_key(
-                file_path=f"{today}/{file_name}", content=safe_dumps(payload).encode("utf-8")
+                file_path=f"{today}/{resolved_file_name}", content=safe_dumps(payload).encode("utf-8")
             )
-            verbose_logger.debug("Successfully uploaded and wrote to %s/%s", today, file_name)
+            verbose_logger.debug("Successfully uploaded and wrote to %s/%s", today, resolved_file_name)
 
         except Exception as e:
             verbose_logger.exception("Error occurred: %s", e)
diff --git a/litellm/integrations/clickhouse/clickhouse_spend_logger.py b/litellm/integrations/clickhouse/clickhouse_spend_logger.py
index 1d01965cd2c..c8453456052 100644
--- a/litellm/integrations/clickhouse/clickhouse_spend_logger.py
+++ b/litellm/integrations/clickhouse/clickhouse_spend_logger.py
@@ -19,6 +19,7 @@ from litellm._logging import verbose_logger
 from litellm.integrations.clickhouse.clickhouse_batch_logger import ClickHouseBatchLogger
 from litellm.integrations.clickhouse.context import is_lens_analysis
 from litellm.integrations.clickhouse.schema import SPEND_LOGS_TABLE
+from litellm.litellm_core_utils.internal_call_metadata import logged_event_key
 from litellm.litellm_core_utils.llm_response_utils.get_headers import get_provider_request_id
 from litellm.litellm_core_utils.sensitive_data_masker import redact_credentials_in_payload
 from litellm.tracing.types import SpendLogPayload, SpendLogRecord
@@ -134,7 +135,7 @@ def spend_log_row_from_payload(
     usage: Mapping[str, Any] = metadata.get("usage_object") or hidden_params.get("usage_object") or MappingProxyType({})
     cache_read_tokens, cache_write_tokens = _cache_tokens(usage)
     trace_id, span_id = _find_traceparent(metadata, kwargs)
-    request_id = str(payload.get("id") or "")
+    response_id: Final = str(payload.get("id") or "")
     redact = litellm.turn_off_message_logging is True
     track_end_user: Final = not litellm.disable_end_user_cost_tracking
     completion_start_ms = _to_ms(payload.get("completionStartTime"))
@@ -157,8 +158,8 @@ def spend_log_row_from_payload(
         )
     )
     return SpendLogRecord(
-        request_id=request_id,
-        response_id=strip_cache_hit_suffix(request_id),
+        request_id=logged_event_key(kwargs, response_id),
+        response_id=strip_cache_hit_suffix(response_id),
         provider_request_id=(
             get_provider_request_id(kwargs.get("response_headers"))
             or get_provider_request_id(hidden_params.get("additional_headers"))
diff --git a/litellm/integrations/deepeval/deepeval.py b/litellm/integrations/deepeval/deepeval.py
index 71d149e4014..e38b987d46f 100644
--- a/litellm/integrations/deepeval/deepeval.py
+++ b/litellm/integrations/deepeval/deepeval.py
@@ -15,6 +15,7 @@ from litellm.integrations.deepeval.utils import (
     to_zod_compatible_iso,
     validate_environment,
 )
+from litellm.litellm_core_utils.internal_call_metadata import logged_event_key
 
 
 # This file includes the custom callbacks for LiteLLM Proxy
@@ -109,8 +110,10 @@ class DeepEvalLogger(CustomLogger):
             )
         else:
             output = str(standard_logging_object.get("error_string", ""))
+        logged_id: Final = standard_logging_object.get("id", uuid.uuid4())
+        span_id: Final = logged_event_key(kwargs, logged_id) if isinstance(logged_id, str) else logged_id
         return BaseApiSpan(
-            uuid=standard_logging_object.get("id", uuid.uuid4()),
+            uuid=span_id,
             name=("litellm_success_callback" if is_success else "litellm_failure_callback"),
             status=(TraceSpanApiStatus.SUCCESS if is_success else TraceSpanApiStatus.ERRORED),
             type=SpanApiType.LLM,
diff --git a/litellm/integrations/dynamodb.py b/litellm/integrations/dynamodb.py
index 6569e70329b..8672eb00ce5 100644
--- a/litellm/integrations/dynamodb.py
+++ b/litellm/integrations/dynamodb.py
@@ -9,6 +9,8 @@ from typing import Final, Protocol
 
 import litellm
 from litellm._uuid import uuid
+from litellm.litellm_core_utils.core_helpers import as_str_mapping
+from litellm.litellm_core_utils.internal_call_metadata import logged_event_key
 
 
 class _DynamoTable(Protocol):
@@ -22,11 +24,13 @@ class _DynamoResource(Protocol):
 class DyanmoDBLogger:
     # Class variables or attributes
 
-    def __init__(self):
+    def __init__(self, dynamodb: _DynamoResource | None = None):
         # Instance variables
         import boto3
 
-        self.dynamodb: Final[_DynamoResource] = boto3.resource("dynamodb", region_name=os.environ["AWS_REGION_NAME"])
+        self.dynamodb: Final[_DynamoResource] = dynamodb or boto3.resource(
+            "dynamodb", region_name=os.environ["AWS_REGION_NAME"]
+        )
         if litellm.dynamodb_table_name is None:
             raise ValueError(
                 "LiteLLM Error, trying to use DynamoDB but not table name passed. Create a table and set `litellm.dynamodb_table_name=<your-table>`"
@@ -45,23 +49,23 @@ class DyanmoDBLogger:
 
     _async_log_event = async_log_event
 
-    def log_event(self, kwargs, response_obj, start_time, end_time, print_verbose):
+    def log_event(self, kwargs: Mapping[str, object], response_obj, start_time, end_time, print_verbose):
         try:
             print_verbose(f"DynamoDB Logging - Enters logging function for model {kwargs}")
 
             # construct payload to send to DynamoDB
             # follows the same params as langfuse.py
-            litellm_params: Final = kwargs.get("litellm_params", {})
-            metadata: Final = litellm_params.get("metadata", {}) or {}  # if litellm_params['metadata'] == None
+            litellm_params: Final = as_str_mapping(kwargs.get("litellm_params")) or {}
+            metadata: Final = as_str_mapping(litellm_params.get("metadata")) or {}
             messages: Final = kwargs.get("messages")
             optional_params: Final = kwargs.get("optional_params", {})
             call_type: Final = kwargs.get("call_type", "litellm.completion")
             usage: Final = response_obj["usage"]
-            id: Final = response_obj.get("id", str(uuid.uuid4()))
+            response_id: Final = response_obj.get("id", str(uuid.uuid4()))
 
             # Build the initial payload
             payload: Final[dict[str, object]] = {
-                "id": id,
+                "id": logged_event_key(kwargs, response_id) if isinstance(response_id, str) else response_id,
                 "call_type": call_type,
                 "startTime": start_time,
                 "endTime": end_time,
diff --git a/litellm/integrations/gcs_bucket/gcs_bucket.py b/litellm/integrations/gcs_bucket/gcs_bucket.py
index 99cd8b31b63..7057e719764 100644
--- a/litellm/integrations/gcs_bucket/gcs_bucket.py
+++ b/litellm/integrations/gcs_bucket/gcs_bucket.py
@@ -17,6 +17,7 @@ from litellm.litellm_core_utils.cloud_storage_security import (
     sanitize_cloud_object_component,
 )
 from litellm.litellm_core_utils.core_helpers import as_str_mapping
+from litellm.litellm_core_utils.internal_call_metadata import logged_event_key
 from litellm.types.integrations.base_health_check import IntegrationHealthCheckStatus
 from litellm.types.integrations.gcs_bucket import *
 from litellm.types.utils import StandardBatchLineItemsPayload, StandardLoggingPayload
@@ -296,30 +297,28 @@ class GCSBucketLogger(GCSBucketBase, AdditionalLoggingUtils):
         else:
             await self._send_individual_logs(items_to_process)
 
-    def _get_object_name(self, kwargs: dict, logging_payload: StandardLoggingPayload, response_obj: Any) -> str:
+    def _get_object_name(
+        self, kwargs: Mapping[str, object], logging_payload: StandardLoggingPayload, response_obj: Any
+    ) -> str:
         """
         Get the object name to use for the current payload
         """
         current_date: Final = self._get_object_date_from_datetime(datetime.now(timezone.utc))
+        metadata: Final = as_str_mapping((as_str_mapping(kwargs.get("litellm_params")) or {}).get("metadata")) or {}
+        gcs_log_id: Final = metadata.get("gcs_log_id")
+        safe_log_id: Final = sanitize_cloud_object_component(
+            gcs_log_id if isinstance(gcs_log_id, str) else None, fallback=""
+        )
+        if safe_log_id:
+            return f"{current_date}/custom-{uuid.uuid4().hex}-{safe_log_id}"
         if logging_payload.get("error_str", None) is not None:
-            object_name = self._generate_failure_object_name(
-                request_date_str=current_date,
-            )
-        else:
-            object_name = self._generate_success_object_name(
-                request_date_str=current_date,
-                response_id=response_obj.get("id", ""),
-            )
-
-        # used for testing
-        _litellm_params: Final = kwargs.get("litellm_params", None) or {}
-        _metadata: Final = _litellm_params.get("metadata", None) or {}
-        if "gcs_log_id" in _metadata:
-            safe_log_id: Final = sanitize_cloud_object_component(_metadata.get("gcs_log_id"), fallback="")
-            if safe_log_id:
-                object_name = f"{current_date}/custom-{uuid.uuid4().hex}-{safe_log_id}"
-
-        return object_name
+            return self._generate_failure_object_name(request_date_str=current_date)
+        raw_response_id: Final[object] = response_obj.get("id", "")
+        response_id: Final = raw_response_id if isinstance(raw_response_id, str) else ""
+        return self._generate_success_object_name(
+            request_date_str=current_date,
+            response_id=logged_event_key(kwargs, response_id),
+        )
 
     async def get_request_response_payload(
         self,
diff --git a/litellm/integrations/openmeter.py b/litellm/integrations/openmeter.py
index db2fe386dec..918e849a086 100644
--- a/litellm/integrations/openmeter.py
+++ b/litellm/integrations/openmeter.py
@@ -3,12 +3,15 @@
 
 import json
 import os
+from collections.abc import Mapping
 from typing import Final
 
 import httpx
 
 import litellm
 from litellm.integrations.custom_logger import CustomLogger
+from litellm.litellm_core_utils.core_helpers import as_str_mapping
+from litellm.litellm_core_utils.internal_call_metadata import logged_event_key
 from litellm.llms.custom_httpx.http_handler import (
     HTTPHandler,
     get_async_httpx_client,
@@ -48,7 +51,7 @@ class OpenMeterLogger(CustomLogger):
         if len(missing_keys) > 0:
             raise Exception(f"Missing keys={missing_keys} in environment.")
 
-    def _common_logic(self, kwargs: dict, response_obj):
+    def _common_logic(self, kwargs: Mapping[str, object], response_obj):
         call_id: Final = response_obj.get("id", kwargs.get("litellm_call_id"))
         dt: Final = get_utc_datetime().isoformat()
         cost: Final = kwargs.get("response_cost", None)
@@ -74,8 +77,8 @@ class OpenMeterLogger(CustomLogger):
         # If no user provided directly, try to get it from token user_id
         if user_param is None:
             # Check if user_id is available from the API key metadata
-            litellm_params: Final = kwargs.get("litellm_params", {})
-            metadata: Final = litellm_params.get("metadata", {})
+            litellm_params: Final = as_str_mapping(kwargs.get("litellm_params")) or {}
+            metadata: Final = as_str_mapping(litellm_params.get("metadata")) or {}
             user_api_key_user_id: Final = metadata.get("user_api_key_user_id", None)
 
             if user_api_key_user_id is not None:
@@ -89,7 +92,7 @@ class OpenMeterLogger(CustomLogger):
         return {
             "specversion": "1.0",
             "type": os.getenv("OPENMETER_EVENT_TYPE", "litellm_tokens"),
-            "id": call_id,
+            "id": logged_event_key(kwargs, call_id) if isinstance(call_id, str) else call_id,
             "time": dt,
             "subject": subject,
             "source": "litellm-proxy",
diff --git a/litellm/integrations/prometheus.py b/litellm/integrations/prometheus.py
index 42fe0837c29..1c9a443b546 100644
--- a/litellm/integrations/prometheus.py
+++ b/litellm/integrations/prometheus.py
@@ -3036,7 +3036,7 @@ class PrometheusLogger(CustomLogger):
 
     async def async_post_call_failure_hook(
         self,
-        request_data: dict,
+        request_data: dict[str, object],
         original_exception: Exception,
         user_api_key_dict: UserAPIKeyAuth,
         traceback_str: str | None = None,
@@ -3059,10 +3059,14 @@ class PrometheusLogger(CustomLogger):
         try:
             _tags: Final = StandardLoggingPayloadSetup.get_request_tags(
                 litellm_params=request_data,
-                proxy_server_request=request_data.get("proxy_server_request", {}),
+                proxy_server_request=_logged_fields(request_data.get("proxy_server_request")),
+            )
+            _metadata: Final = _logged_fields(request_data.get("metadata"))
+            model_id: Final = (
+                _logged_fields(_metadata.get("model_info")).get("id")
+                or _logged_fields(request_data.get("model_info")).get("id")
+                or _logged_fields(request_data.get("standard_logging_object")).get("model_id")
             )
-            _metadata: Final = request_data.get("metadata", {}) or {}
-            model_id: Final = _metadata.get("model_info", {}).get("id") or request_data.get("model_info", {}).get("id")
             rate_limit_category, rate_limit_type = self._extract_rate_limit_labels(original_exception)
             api_provider: Final = self._extract_api_provider_from_request_data(
                 request_data
diff --git a/litellm/litellm_core_utils/core_helpers.py b/litellm/litellm_core_utils/core_helpers.py
index 58189140a98..6fd6e91a627 100644
--- a/litellm/litellm_core_utils/core_helpers.py
+++ b/litellm/litellm_core_utils/core_helpers.py
@@ -4,7 +4,7 @@ import copy
 import logging
 import math
 import re
-from collections.abc import Collection, Iterable, Iterator, Mapping
+from collections.abc import Collection, Iterable, Iterator, Mapping, Sequence
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, Literal, Protocol, TypeVar, cast, runtime_checkable
 
@@ -104,6 +104,10 @@ def as_str_mapping(value: object) -> Mapping[str, object] | None:
     return value if isinstance(value, Mapping) else None
 
 
+def as_object_list(value: object) -> Sequence[object] | None:
+    return value if isinstance(value, list) else None
+
+
 def decoded_json_object(value: object) -> Mapping[str, object]:
     mapping: Final = as_str_mapping(value)
     if mapping is not None:
diff --git a/litellm/litellm_core_utils/exception_mapping_utils.py b/litellm/litellm_core_utils/exception_mapping_utils.py
index 85c232ad3f4..f1195802fc5 100644
--- a/litellm/litellm_core_utils/exception_mapping_utils.py
+++ b/litellm/litellm_core_utils/exception_mapping_utils.py
@@ -107,6 +107,7 @@ class ExceptionCheckers:
             "exceeds the available context size",  # llama.cpp/Lemonade
             "exceeds the maximum number of tokens allowed",  # Gemini
             '"code": "context_length_exceeded"',
+            "prompt is too long",
         ]
         for substring in known_exception_substrings:
             if substring in _error_str_lowercase:
diff --git a/litellm/litellm_core_utils/get_llm_provider_logic.py b/litellm/litellm_core_utils/get_llm_provider_logic.py
index 38242291b71..94ba02bfbd7 100644
--- a/litellm/litellm_core_utils/get_llm_provider_logic.py
+++ b/litellm/litellm_core_utils/get_llm_provider_logic.py
@@ -146,6 +146,10 @@ def handle_anthropic_text_model_custom_llm_provider(
     return model, custom_llm_provider
 
 
+def declared_provider(model: str | None, custom_llm_provider: str | None = None) -> str | None:
+    return custom_llm_provider or (model.split("/", 1)[0] if model and "/" in model else None)
+
+
 def declared_authenticating_provider(model: str | None, custom_llm_provider: str | None = None) -> str | None:
     """The authenticating provider this pair already names, or None.
 
@@ -154,7 +158,7 @@ def declared_authenticating_provider(model: str | None, custom_llm_provider: str
     and for a declared pair the resolver's answer is the declaration itself, so metadata callers
     adopt the declaration instead of resolving.
     """
-    declared: Final = custom_llm_provider or (model.split("/", 1)[0] if model and "/" in model else None)
+    declared: Final = declared_provider(model, custom_llm_provider)
     return declared if declared in PROVIDERS_THAT_AUTHENTICATE_ON_PROVIDER_INFO else None
 
 
diff --git a/litellm/litellm_core_utils/internal_call_metadata.py b/litellm/litellm_core_utils/internal_call_metadata.py
index 453d4358b35..138a01c6524 100644
--- a/litellm/litellm_core_utils/internal_call_metadata.py
+++ b/litellm/litellm_core_utils/internal_call_metadata.py
@@ -26,7 +26,12 @@ from litellm.constants import (
     MANAGED_BACKGROUND_RESPONSE_METADATA_KEY,
     NON_INFERENCE_CALL_TYPES,
 )
+from litellm.litellm_core_utils.core_helpers import as_str_mapping
 from litellm.litellm_core_utils.initialize_dynamic_callback_params import initialize_standard_callback_dynamic_params
+from litellm.types.passthrough_endpoints.pass_through_endpoints import (
+    SETTLES_BACKGROUND_RESPONSE_KWARG,
+    BackgroundResponseSettlement,
+)
 from litellm.types.utils import (
     BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN,
     BACKGROUND_RESPONSE_STATUS_POLL_CALL_ORIGIN,
@@ -35,6 +40,8 @@ from litellm.types.utils import (
 
 BUDGET_RESERVATION_METADATA_KEYS: Final = frozenset({"user_api_key_budget_reservation"})
 
+BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX: Final = "_background_cost"
+
 ITPM_RESERVED_KEY: Final = "_litellm_itpm_reserved"
 OTPM_RESERVED_KEY: Final = "_litellm_otpm_reserved"
 ITPM_CACHE_KEY: Final = "_litellm_itpm_cache_key"
@@ -151,6 +158,26 @@ def is_unbilled_non_inference_call_from_params(
     return is_unbilled_non_inference_call(call_type, metadata, response)
 
 
+def settles_background_response(call_type: str, metadata: Mapping[str, object], kwargs: Mapping[str, object]) -> bool:
+    return kwargs.get(SETTLES_BACKGROUND_RESPONSE_KWARG) is BackgroundResponseSettlement.SETTLES or (
+        call_type in NON_INFERENCE_CALL_TYPES
+        and metadata.get(INTERNAL_CALL_ORIGIN_METADATA_KEY) == BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN
+    )
+
+
+def logged_event_key(kwargs: Mapping[str, object], event_id: str) -> str:
+    call_type: Final = kwargs.get("call_type")
+    litellm_params: Final = as_str_mapping(kwargs.get("litellm_params")) or {}
+    metadata: Final = (
+        as_str_mapping(litellm_params.get("litellm_metadata")) or as_str_mapping(litellm_params.get("metadata")) or {}
+    )
+    if not event_id or not settles_background_response(
+        call_type if isinstance(call_type, str) else "", metadata, kwargs
+    ):
+        return event_id
+    return f"{event_id}{BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX}"
+
+
 def sanitize_user_api_key_auth(auth: object) -> object:
     """Copy of the auth object with its budget reservation removed; the cost callback
     falls back to reading the reservation from inside the auth object."""
diff --git a/litellm/litellm_core_utils/litellm_logging.py b/litellm/litellm_core_utils/litellm_logging.py
index 639003c9a6a..37657a94f16 100644
--- a/litellm/litellm_core_utils/litellm_logging.py
+++ b/litellm/litellm_core_utils/litellm_logging.py
@@ -872,6 +872,7 @@ class Logging(LiteLLMLoggingBaseClass):
         # The model the proxy shows the client on streamed chunks. The logged streamed response carries it
         # once that response is priced, the same way a non-streamed response is logged
         self.client_facing_stream_model: str | None = None
+        self.client_facing_response_id: str | None = None
         self.zero_cost_warned: bool = False
         self.llm_caching_handler: LLMCachingHandler | None = None
 
@@ -918,6 +919,7 @@ class Logging(LiteLLMLoggingBaseClass):
         # post_call guardrails have run; the @client decorator then stores the
         # enqueue closure here instead of firing it immediately.
         self.defer_async_logging: bool = False
+        self.drops_stream_token_ids: bool = False
         self.enqueue_deferred_logging: Callable[[], None] | None = None
         self._async_success_scheduled: bool = False
         self._async_success_enqueued: bool = False
@@ -3237,6 +3239,23 @@ class Logging(LiteLLMLoggingBaseClass):
             return response
         return response.model_copy(update={"id": response_id})
 
+    def _with_client_facing_response_id(
+        self,
+        response: ModelResponse | TextCompletionResponse | ResponsesAPIResponse | InteractionsAPIResponse,
+    ) -> ModelResponse | TextCompletionResponse | ResponsesAPIResponse | InteractionsAPIResponse:
+        response_id: Final = self.client_facing_response_id
+        if response_id is None or getattr(response, "id", None) == response_id:
+            return response
+        return response.model_copy(update={"id": response_id})
+
+    def _client_facing_streaming_response(
+        self,
+        response: ModelResponse | TextCompletionResponse | ResponsesAPIResponse | InteractionsAPIResponse,
+    ) -> ModelResponse | TextCompletionResponse | ResponsesAPIResponse | InteractionsAPIResponse:
+        return self._with_client_facing_response_id(
+            self._with_continued_response_id(self._with_client_facing_stream_model(response))
+        )
+
     def _success_handler_helper_fn(
         self,
         result: object = None,
@@ -3640,9 +3659,7 @@ class Logging(LiteLLMLoggingBaseClass):
                 )
                 self._add_continued_partial_spend(complete_streaming_response)
                 self._merge_hidden_params_from_response_into_metadata(complete_streaming_response)
-                logged_streaming_response: Final = self._with_continued_response_id(
-                    self._with_client_facing_stream_model(complete_streaming_response)
-                )
+                logged_streaming_response: Final = self._client_facing_streaming_response(complete_streaming_response)
                 self.model_call_details["complete_streaming_response"] = logged_streaming_response
                 self.capture_usage_before_logging(logged_streaming_response, start_time, end_time)
                 ## STANDARDIZED LOGGING PAYLOAD
@@ -4239,9 +4256,7 @@ class Logging(LiteLLMLoggingBaseClass):
 
             await self._prepare_baseline_cache_estimate(complete_streaming_response)
 
-            logged_streaming_response: Final = self._with_continued_response_id(
-                self._with_client_facing_stream_model(complete_streaming_response)
-            )
+            logged_streaming_response: Final = self._client_facing_streaming_response(complete_streaming_response)
             self.model_call_details["async_complete_streaming_response"] = logged_streaming_response
 
             ## STANDARDIZED LOGGING PAYLOAD
diff --git a/litellm/litellm_core_utils/llm_response_utils/convert_dict_to_response.py b/litellm/litellm_core_utils/llm_response_utils/convert_dict_to_response.py
index 58fe5b4297f..6bb036e9080 100644
--- a/litellm/litellm_core_utils/llm_response_utils/convert_dict_to_response.py
+++ b/litellm/litellm_core_utils/llm_response_utils/convert_dict_to_response.py
@@ -3,7 +3,8 @@ import json
 import re
 import time
 import traceback
-from collections.abc import Generator, Iterator, Mapping, Sequence
+from collections.abc import Generator, Iterable, Iterator, Mapping, Sequence
+from types import MappingProxyType
 from typing import Final, Literal, cast
 
 from pydantic import ConfigDict, TypeAdapter, ValidationError, with_config
@@ -11,7 +12,12 @@ from typing_extensions import ReadOnly, TypedDict
 
 import litellm
 from litellm._logging import verbose_logger
-from litellm.constants import RESPONSE_FORMAT_TOOL_NAME
+from litellm.constants import (
+    RESPONSE_FORMAT_TOOL_NAME,
+    STREAM_CHUNK_CHOICE_FIELDS,
+    STREAM_FINISH_CHOICE_FIELDS,
+    VLLM_CHOICE_FIELDS,
+)
 from litellm.litellm_core_utils.hidden_params import get_hidden_params
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
     extract_reasoning_content,
@@ -170,6 +176,28 @@ def _split_assembled_content_for_replay(content: str | None) -> list[str]:
     return _REPLAY_CONTENT_SLICE_RE.findall(content)
 
 
+def _drop_choice_fields(choice: StreamingChoices, fields: Iterable[str]) -> None:
+    for field in fields:
+        if hasattr(choice, field):
+            delattr(choice, field)
+
+
+def _vllm_choice_fields(choice: Mapping[str, object]) -> Mapping[str, object]:
+    cached_fields: Final = _choice_provider_specific_fields(choice)
+    return MappingProxyType(
+        {
+            field: choice[field] if field in choice else cached_fields[field]
+            for field in VLLM_CHOICE_FIELDS
+            if field in choice or field in cached_fields
+        }
+    )
+
+
+def _choice_provider_specific_fields(choice: Mapping[str, object]) -> Mapping[str, object]:
+    fields: Final = choice.get("provider_specific_fields")
+    return _FIELD_MAP.validate_python(fields) if isinstance(fields, dict) else MappingProxyType({})
+
+
 _REPLAY_REASONING_FIELDS: Final = frozenset({"reasoning_content", "thinking_blocks", "reasoning_items"})
 _REPLAY_LEAD_FIELDS: Final = _REPLAY_REASONING_FIELDS | {"role", "provider_specific_fields"}
 _REPLAY_TOOL_FIELDS: Final = frozenset({"tool_calls", "function_call"})
@@ -220,8 +248,9 @@ def _replay_frame(
     choice.finish_reason = finish_reason
     if not keeps_choice_metadata:
         choice.logprobs = None
-        if hasattr(choice, "enhancements"):
-            del choice.enhancements
+        _drop_choice_fields(choice, ("enhancements", *STREAM_CHUNK_CHOICE_FIELDS))
+    if finish_reason is None:
+        _drop_choice_fields(choice, STREAM_FINISH_CHOICE_FIELDS)
     return frame
 
 
@@ -325,7 +354,9 @@ async def convert_to_streaming_response_async(
 
         logprobs = choice.get("logprobs", None)
 
-        choice = StreamingChoices(finish_reason=finish_reason, index=idx, delta=delta, logprobs=logprobs)
+        choice = StreamingChoices(
+            finish_reason=finish_reason, index=idx, delta=delta, logprobs=logprobs, **_vllm_choice_fields(choice)
+        )
         choice_list.append(choice)
 
     model_response_object.choices = choice_list
@@ -388,6 +419,7 @@ def convert_to_streaming_response(
             delta=delta,
             logprobs=logprobs,
             enhancements=enhancements,
+            **_vllm_choice_fields(choice),
         )
 
         choice_list.append(choice)
@@ -872,6 +904,7 @@ def convert_to_model_response_object(
                     logprobs=logprobs,
                     enhancements=enhancements,
                     provider_specific_fields=provider_specific_fields,
+                    **_vllm_choice_fields(choice),
                 )
                 if provider_sent_logprobs and logprobs is None:
                     choice.logprobs = None
diff --git a/litellm/litellm_core_utils/prompt_templates/chat_template_tools.py b/litellm/litellm_core_utils/prompt_templates/chat_template_tools.py
index 60134456577..49ffae03c40 100644
--- a/litellm/litellm_core_utils/prompt_templates/chat_template_tools.py
+++ b/litellm/litellm_core_utils/prompt_templates/chat_template_tools.py
@@ -10,12 +10,18 @@ class ChatTemplateToolSection:
     preamble_tokens: int
     implicit_system_turn_tokens: int
     render_tool_schemas: Callable[[Sequence[Mapping[str, object]]], str]
+    counts_tool_choice: bool = False
+    renders_strict_only_when_true: bool = False
 
 
-def _deepseek_v4_tool_schemas(functions: Sequence[Mapping[str, object]]) -> str:
+def _json_line_tool_schemas(functions: Sequence[Mapping[str, object]]) -> str:
     return "\n".join(json.dumps(function, ensure_ascii=False) for function in functions)
 
 
+def _compact_json_line_tool_schemas(functions: Sequence[Mapping[str, object]]) -> str:
+    return "\n".join(json.dumps(function, ensure_ascii=False, separators=(",", ":")) for function in functions)
+
+
 def _qwen3_5_tool_schemas(functions: Sequence[Mapping[str, object]]) -> str:
     return "".join(
         "\n" + json.dumps({"type": "function", "function": function}, ensure_ascii=False) for function in functions
@@ -23,13 +29,29 @@ def _qwen3_5_tool_schemas(functions: Sequence[Mapping[str, object]]) -> str:
 
 
 _TOOL_SECTIONS: Final = (
+    (
+        re.compile(r"deepseek-v4(?:[-._]|p)1(?!\d)", re.IGNORECASE),
+        ChatTemplateToolSection(211, 0, _json_line_tool_schemas),
+    ),
     (
         re.compile(
             r"deepseek-v4(?![.\d]|p\d)|^(?:deepseek/)?deepseek-(?:chat|reasoner|flash)(?::free)?$", re.IGNORECASE
         ),
-        ChatTemplateToolSection(222, 0, _deepseek_v4_tool_schemas),
+        ChatTemplateToolSection(222, 0, _json_line_tool_schemas),
     ),
     (re.compile(r"qwen3[._]?5(?!\d)", re.IGNORECASE), ChatTemplateToolSection(196, 5, _qwen3_5_tool_schemas)),
+    (
+        re.compile(r"grok-4[-.]1(?![.\d])", re.IGNORECASE),
+        ChatTemplateToolSection(
+            0, 0, _compact_json_line_tool_schemas, counts_tool_choice=True, renders_strict_only_when_true=True
+        ),
+    ),
+    (
+        re.compile(r"grok-4[-.]3(?![.\d])", re.IGNORECASE),
+        ChatTemplateToolSection(
+            0, 0, _json_line_tool_schemas, counts_tool_choice=True, renders_strict_only_when_true=True
+        ),
+    ),
 )
 
 
diff --git a/litellm/litellm_core_utils/prompt_templates/common_utils.py b/litellm/litellm_core_utils/prompt_templates/common_utils.py
index 938ab585b72..6287dc17e8f 100644
--- a/litellm/litellm_core_utils/prompt_templates/common_utils.py
+++ b/litellm/litellm_core_utils/prompt_templates/common_utils.py
@@ -29,6 +29,7 @@ from litellm.types.llms.openai import (
     ChatCompletionAudioObject,
     ChatCompletionFileObject,
     ChatCompletionImageObject,
+    ChatCompletionPromptCacheBreakpoint,
     ChatCompletionReasoningItem,
     ChatCompletionReasoningSummaryTextBlock,
     ChatCompletionRedactedThinkingBlock,
@@ -2193,16 +2194,62 @@ def with_prompt_cache_breakpoint(target: _MarkedT, marker: object) -> _MarkedT:
 
 
 _PROMPT_CACHE_BREAKPOINT: Final = TypeAdapter(PromptCacheBreakpoint)
+_CHAT_COMPLETION_PROMPT_CACHE_BREAKPOINT: Final = TypeAdapter(ChatCompletionPromptCacheBreakpoint)
+_AcceptedBreakpointT: Final = TypeVar("_AcceptedBreakpointT", bound=Mapping[str, object])
+
+
+def _accepted_prompt_cache_breakpoint(
+    accepted: TypeAdapter[_AcceptedBreakpointT], marker: object
+) -> _AcceptedBreakpointT | None:
+    try:
+        return accepted.validate_python(marker)
+    except ValidationError:
+        return None
+
+
+def prompt_cache_breakpoint_within(
+    accepted: TypeAdapter[_AcceptedBreakpointT], marker: object
+) -> _AcceptedBreakpointT | None:
+    """The client's marker cut down to the ``accepted`` shape: an unsupported ttl is dropped and the mode kept,
+    and a marker whose mode the target cannot read is dropped whole."""
+    whole: Final = _accepted_prompt_cache_breakpoint(accepted, marker)
+    if whole is not None:
+        return whole
+    fields: Final = _breakpoint_fields_or_none(marker)
+    without_ttl: Final = (
+        None
+        if fields is None
+        else _accepted_prompt_cache_breakpoint(accepted, {key: item for key, item in fields.items() if key != "ttl"})
+    )
+    verbose_logger.debug(
+        "Dropping malformed prompt_cache_breakpoint %r under drop_params"
+        if without_ttl is None
+        else "Dropping the unsupported ttl of prompt_cache_breakpoint %r under drop_params",
+        marker,
+    )
+    return without_ttl
 
 
 def prompt_cache_breakpoint_for_wire(marker: object, drop_params: bool) -> object:
     if marker is None or not drop_params:
         return marker
-    try:
-        return _PROMPT_CACHE_BREAKPOINT.validate_python(marker)
-    except ValidationError:
-        verbose_logger.debug("Dropping malformed prompt_cache_breakpoint %r under drop_params", marker)
-        return None
+    return prompt_cache_breakpoint_within(_PROMPT_CACHE_BREAKPOINT, marker)
+
+
+def prompt_cache_breakpoint_with_readable_mode(marker: object, drop_params: bool) -> object:
+    """The client's marker as written, or None under drop_params when no target could read its mode, so the
+    target's own config decides which ttl and keys it keeps."""
+    return None if prompt_cache_breakpoint_for_wire(marker, drop_params) is None else marker
+
+
+def whole_prompt_cache_breakpoint_or_none(marker: object) -> PromptCacheBreakpoint | None:
+    return _accepted_prompt_cache_breakpoint(_PROMPT_CACHE_BREAKPOINT, marker)
+
+
+def chat_completion_prompt_cache_breakpoint_for_wire(marker: object, drop_params: bool) -> object:
+    if marker is None or not drop_params:
+        return marker
+    return prompt_cache_breakpoint_within(_CHAT_COMPLETION_PROMPT_CACHE_BREAKPOINT, marker)
 
 
 def cache_control_as_prompt_cache_breakpoint(block: _MarkedT) -> _MarkedT:
@@ -2220,6 +2267,13 @@ _BREAKPOINT_FIELDS: Final = TypeAdapter(Mapping[str, object])
 _BREAKPOINT_BLOCKS: Final = TypeAdapter(list[object])
 
 
+def _breakpoint_fields_or_none(value: object) -> Mapping[str, object] | None:
+    try:
+        return _BREAKPOINT_FIELDS.validate_python(value)
+    except ValidationError:
+        return None
+
+
 def _without_prompt_cache_breakpoint(value: object) -> object:
     if not isinstance(value, Mapping):
         return value
@@ -2242,6 +2296,27 @@ def without_prompt_cache_breakpoints(block: _MarkedT) -> _MarkedT:
     return cast(_MarkedT, stripped)  # cast-ok: same block shape as the input minus the marker keys
 
 
+def _part_with_chat_completion_prompt_cache_breakpoint(part: object) -> object:
+    if not isinstance(part, Mapping):
+        return part
+    fields: Final = _BREAKPOINT_FIELDS.validate_python(part)
+    marker: Final = fields.get("prompt_cache_breakpoint")
+    if marker is None:
+        return fields
+    unmarked: Final = {key: item for key, item in fields.items() if key != "prompt_cache_breakpoint"}
+    return with_prompt_cache_breakpoint(unmarked, chat_completion_prompt_cache_breakpoint_for_wire(marker, True))
+
+
+def chat_completion_prompt_cache_breakpoints_for_wire(message: _MarkedT, drop_params: bool) -> _MarkedT:
+    content: Final = message.get("content")
+    if not drop_params or not isinstance(content, list):
+        return message
+    parts: Final = [
+        _part_with_chat_completion_prompt_cache_breakpoint(part) for part in _BREAKPOINT_BLOCKS.validate_python(content)
+    ]
+    return cast(_MarkedT, {**message, "content": parts})  # cast-ok: same message shape with its parts' markers trimmed
+
+
 LITELLM_RESPONSE_ONLY_MESSAGE_FIELDS: Final = frozenset(
     {"thinking_blocks", "reasoning_items", "provider_specific_fields"}
 )
diff --git a/litellm/litellm_core_utils/prompt_templates/factory.py b/litellm/litellm_core_utils/prompt_templates/factory.py
index 98348e434b2..d6d753635f6 100644
--- a/litellm/litellm_core_utils/prompt_templates/factory.py
+++ b/litellm/litellm_core_utils/prompt_templates/factory.py
@@ -34,6 +34,7 @@ from litellm.litellm_core_utils.prompt_templates.mid_conversation_system import
     split_leading_system_run,
     string_field,
 )
+from litellm.litellm_core_utils.tool_fields import tools_without_hosted_mcp
 from litellm.litellm_core_utils.url_utils import async_safe_get, safe_get
 from litellm.llms.custom_httpx.http_handler import HTTPHandler, get_async_httpx_client, header_value
 from litellm.types.files import get_file_extension_from_mime_type
@@ -1328,7 +1329,7 @@ def get_thought_signature_from_tool(tool: Mapping[str, object]) -> str | None:
 _get_thought_signature_from_tool = get_thought_signature_from_tool
 
 
-def _get_dummy_thought_signature() -> str:
+def get_dummy_thought_signature() -> str:
     """Generate a dummy thought signature for models that require it.
 
     This is used when transferring conversation history from older models
@@ -1415,7 +1416,7 @@ def convert_to_gemini_tool_call_invoke(
                         # https://docs.cloud.google.com/gemini-enterprise-agent-platform/models/thinking/thought-signatures#parallel_function_calling_example
                         is_first_function_call = len(_parts_list) == 0
                         if not thought_signature and is_first_function_call and needs_dummy_signature:
-                            thought_signature = _get_dummy_thought_signature()
+                            thought_signature = get_dummy_thought_signature()
                         if thought_signature:
                             part_dict["thoughtSignature"] = thought_signature
 
@@ -1439,7 +1440,7 @@ def convert_to_gemini_tool_call_invoke(
 
                 # If no signature found and model is gemini-3, use dummy signature
                 if not thought_signature and needs_dummy_signature:
-                    thought_signature = _get_dummy_thought_signature()
+                    thought_signature = get_dummy_thought_signature()
 
                 if thought_signature:
                     part_dict_function["thoughtSignature"] = thought_signature
@@ -5916,8 +5917,13 @@ def function_call_prompt(
     llm_provider: str,
     drop_params: bool,
 ) -> list[dict[str, object]]:
+    prompt_functions: Final = tools_without_hosted_mcp(
+        functions, model=model, route=llm_provider, drop_params=drop_params
+    )
+    if not prompt_functions:
+        return messages
     header: Final = """To call a function, reply with JSON ONLY in this format {"name": "function_name", "arguments":{"argument_name": "argument_value"}}. Once a function result answers the request, reply to the user in plain text instead of calling a function again. The following functions are available to you:"""
-    function_prompt: Final = header + "".join(f"\n{function}\n" for function in functions)
+    function_prompt: Final = header + "".join(f"\n{function}\n" for function in prompt_functions)
     if not any(_is_system_message(message) for message in messages):
         return [*messages, {"role": "system", "content": function_prompt}]
     return [
diff --git a/litellm/litellm_core_utils/redact_messages.py b/litellm/litellm_core_utils/redact_messages.py
index 981859c620b..2f8ecdcc9b9 100644
--- a/litellm/litellm_core_utils/redact_messages.py
+++ b/litellm/litellm_core_utils/redact_messages.py
@@ -196,6 +196,9 @@ def _redact_function_call(function_call) -> None:
 
 def _redact_choice_content(choice):
     """Helper to redact content in a choice (message or delta)."""
+    if isinstance(choice, (litellm.Choices, litellm.utils.StreamingChoices, litellm.utils.TextChoices)):
+        drop_token_ids(choice)
+        _redact_provider_specific_fields(choice)
     if isinstance(choice, litellm.Choices):
         if choice.message.content is not None:
             choice.message.content = REDACTED_BY_LITELLM
@@ -216,6 +219,9 @@ def _redact_choice_content(choice):
         _redact_provider_specific_fields(choice.delta)
         _redact_tool_calls(getattr(choice.delta, "tool_calls", None))
         _redact_function_call(getattr(choice.delta, "function_call", None))
+    elif isinstance(choice, litellm.utils.TextChoices):
+        _redact_field_when_present(choice, "text")
+        _redact_field_when_present(choice, "reasoning_content")
 
 
 def _as_mapping(value: object) -> Mapping[str, object] | None:
@@ -227,14 +233,27 @@ def _redact_provider_specific_fields(message: object) -> None:
         setattr(message, "provider_specific_fields", _redacted_provider_specific_fields(fields))  # noqa: B010  # typed as object
 
 
+def _drop_provider_specific_token_ids(holder: object) -> None:
+    fields: Final = _as_mapping(getattr(holder, "provider_specific_fields", None))
+    if fields is not None and fields.get("token_ids") is not None:
+        setattr(holder, "provider_specific_fields", {**fields, "token_ids": None})  # noqa: B010  # typed as object
+
+
+def drop_token_ids(choice: object) -> None:
+    if getattr(choice, "token_ids", None) is not None:
+        setattr(choice, "token_ids", None)  # noqa: B010  # pydantic extra, not a declared field
+    for holder in (choice, getattr(choice, "delta", None), getattr(choice, "message", None)):
+        _drop_provider_specific_token_ids(holder)
+
+
 def _redact_provider_specific_fields_dict(choice: Mapping[str, object]) -> None:
-    for message in (choice.get("message"), choice.get("delta")):
+    for holder in (choice, choice.get("message"), choice.get("delta")):
         if (
-            (readable := _as_mapping(message)) is not None
+            (readable := _as_mapping(holder)) is not None
             and (fields := _as_mapping(readable.get("provider_specific_fields"))) is not None
-            and isinstance(message, dict)
+            and isinstance(holder, dict)
         ):
-            message["provider_specific_fields"] = _redacted_provider_specific_fields(fields)
+            holder["provider_specific_fields"] = _redacted_provider_specific_fields(fields)
 
 
 def _redacted_provider_specific_fields(fields: Mapping[str, object]) -> Mapping[str, object]:
@@ -251,6 +270,7 @@ def _redacted_provider_specific_fields(fields: Mapping[str, object]) -> Mapping[
                 "compaction_blocks",
                 "compaction_start",
                 "compaction_delta",
+                "token_ids",
             )
             if key in fields
         },
@@ -422,6 +442,8 @@ def _redact_model_response_dict_choices(choices, redacted_str: str):
     for choice in choices:
         if isinstance(choice, dict):
             _redact_provider_specific_fields_dict(choice)
+            if choice.get("token_ids") is not None:
+                choice["token_ids"] = None
             if "message" in choice and isinstance(choice["message"], dict):
                 if choice["message"].get("content") is not None:
                     choice["message"]["content"] = redacted_str
diff --git a/litellm/litellm_core_utils/stream_usage_chunks.py b/litellm/litellm_core_utils/stream_usage_chunks.py
index eda57c7ea12..d073ddc2724 100644
--- a/litellm/litellm_core_utils/stream_usage_chunks.py
+++ b/litellm/litellm_core_utils/stream_usage_chunks.py
@@ -1,6 +1,7 @@
 from collections.abc import Iterable
 from typing import Final
 
+from litellm.constants import VLLM_CHOICE_FIELDS
 from litellm.types.utils import ModelResponseStream, StreamingChoices
 
 
@@ -9,12 +10,19 @@ def is_empty_streaming_choice(choice: StreamingChoices) -> bool:
         return False
     if getattr(choice, "logprobs", None) is not None:
         return False
+    if not _all_values_none(_vllm_choice_values(choice)):
+        return False
     delta: Final = choice.delta if hasattr(choice, "delta") else None
     if delta is None:
         return True
     return _all_values_none(delta.model_dump().values())
 
 
+def _vllm_choice_values(choice: StreamingChoices) -> Iterable[object]:
+    choice_extras: Final = choice.model_extra or {}
+    return (choice_extras.get(field) for field in VLLM_CHOICE_FIELDS)
+
+
 def _all_values_none(values: Iterable[object]) -> bool:
     return all(value is None for value in values)
 
diff --git a/litellm/litellm_core_utils/streaming_chunk_builder_utils.py b/litellm/litellm_core_utils/streaming_chunk_builder_utils.py
index 7191b2ce8e8..c87357122ce 100644
--- a/litellm/litellm_core_utils/streaming_chunk_builder_utils.py
+++ b/litellm/litellm_core_utils/streaming_chunk_builder_utils.py
@@ -12,6 +12,7 @@ from typing_extensions import ReadOnly, Required
 
 import litellm
 from litellm._logging import verbose_logger
+from litellm.constants import VLLM_CHOICE_FIELDS
 from litellm.litellm_core_utils.core_helpers import (
     PROVIDERS_BILLED_FROM_THEIR_OWN_USAGE_FIELDS,
     UPSTREAM_USAGE_COST,
@@ -31,6 +32,7 @@ from litellm.litellm_core_utils.llm_response_utils.convert_dict_to_response impo
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
     get_content_from_model_response,  # pyright: ignore[reportUnknownVariableType]  # response param accepts an untyped dict
 )
+from litellm.litellm_core_utils.redact_messages import drop_token_ids
 from litellm.litellm_core_utils.token_counter import usage_tokenizer_model
 from litellm.types.llms.openai import (
     AllMessageValues,
@@ -434,6 +436,8 @@ class ChunkProcessor:
                 chunks, unreported="tool_calls" if _carries_tool_calls(chunks) else "stop"
             ),
             message={"role": ChunkProcessor._get_role_from_chunks(chunks), "content": ""},
+            provider_specific_fields=None,
+            **_streamed_vllm_choice_fields(chain.from_iterable(chunk.get("choices") or () for chunk in chunks)),
         )
 
     @staticmethod
@@ -504,6 +508,7 @@ class ChunkProcessor:
                             "index": 0,
                             "message": {"role": role, "content": ""},
                             "finish_reason": finish_reason,
+                            **_streamed_vllm_choice_fields(_first_choices(chunks)),
                         }
                     ]
                 ),
@@ -1371,6 +1376,7 @@ def _rebuilt_text_choice(index: int, choices: Sequence[TextChoices]) -> TextChoi
         index=index,
         logprobs=_merged_logprobs(choices),
         finish_reason=next((choice.finish_reason for choice in reversed(choices) if choice.finish_reason), None),
+        **_streamed_vllm_choice_fields(choices),
     )
 
 
@@ -1504,6 +1510,31 @@ def _field_of(value: object, name: str) -> object:
     return getattr(value, name, None)
 
 
+def _first_choices(chunks: Iterable[object]) -> tuple[object, ...]:
+    return tuple(next(iter(object_items(_field_of(chunk, "choices"))), None) for chunk in chunks)
+
+
+def _choice_extras(choice: object) -> Mapping[str, object]:
+    if isinstance(choice, BaseModel):
+        return choice.model_extra or {}
+    return object_mapping(choice) or {}
+
+
+def _streamed_vllm_choice_fields(choices: Iterable[object]) -> Mapping[str, object]:
+    extras: Final = tuple(map(_choice_extras, choices))
+    token_id_runs: Final = tuple(object_items(fields.get("token_ids")) for fields in extras)
+    stop_reasons: Final = tuple(reason for fields in extras if (reason := fields.get("stop_reason")) is not None)
+    has_token_ids: Final = any(fields.get("token_ids") is not None for fields in extras)
+    streamed_values: Final[Mapping[str, object]] = MappingProxyType(
+        {
+            "token_ids": list(chain.from_iterable(token_id_runs)) if has_token_ids else None,
+            "stop_reason": stop_reasons[-1] if stop_reasons else None,
+        }
+    )
+    present_fields: Final = frozenset(chain.from_iterable(fields.keys() for fields in extras))
+    return MappingProxyType({field: streamed_values[field] for field in VLLM_CHOICE_FIELDS if field in present_fields})
+
+
 def _delta_reasoning_items(delta: object) -> Sequence[object]:
     items: Final = _field_of(delta, "reasoning_items")
     return cast(Sequence[object], items) if isinstance(items, list) else ()  # cast-ok: items forwarded verbatim
@@ -1776,6 +1807,19 @@ def stream_chunk_builder(
     end_time: object = None,
     logging_obj: Optional["Logging"] = None,
     count_prompt_tokens: Callable[[], int] | None = None,
+) -> ModelResponse | TextCompletionResponse | None:
+    response: Final = _assembled_stream_response(chunks, messages, logging_obj, count_prompt_tokens)
+    if response is not None and getattr(logging_obj, "drops_stream_token_ids", False) is True:
+        for choice in response.choices:
+            drop_token_ids(choice)
+    return response
+
+
+def _assembled_stream_response(
+    chunks: Sequence[object],
+    messages: Sequence[AllMessageValues | Message] | None,
+    logging_obj: Optional["Logging"],
+    count_prompt_tokens: Callable[[], int] | None,
 ) -> ModelResponse | TextCompletionResponse | None:
     try:
         if chunks is None:
@@ -1788,7 +1832,7 @@ def stream_chunk_builder(
         if not chunks:
             return None
 
-        processor: Final = ChunkProcessor(chunks, messages)
+        processor: Final = ChunkProcessor(list(chunks), messages)
         chunks = processor.chunks
 
         ### BASE-CASE ###
diff --git a/litellm/litellm_core_utils/streaming_handler.py b/litellm/litellm_core_utils/streaming_handler.py
index 9bb5b761fd5..a9ef06c3b4f 100644
--- a/litellm/litellm_core_utils/streaming_handler.py
+++ b/litellm/litellm_core_utils/streaming_handler.py
@@ -23,6 +23,7 @@ from typing_extensions import NotRequired, TypedDict
 import litellm
 from litellm import verbose_logger
 from litellm._uuid import uuid
+from litellm.constants import STREAM_CHUNK_CHOICE_FIELDS, STREAM_FINISH_CHOICE_FIELDS
 from litellm.litellm_core_utils.asyncify import asyncify
 from litellm.litellm_core_utils.core_helpers import (
     UPSTREAM_USAGE_COST,
@@ -37,10 +38,11 @@ from litellm.litellm_core_utils.hidden_params import (
     set_hidden_param,
     stored_attribute,
 )
+from litellm.litellm_core_utils.llm_cost_calc.guardrail_cost import object_items
 from litellm.litellm_core_utils.model_response_utils import (
     is_model_response_stream_empty,
 )
-from litellm.litellm_core_utils.redact_messages import LiteLLMLoggingObject
+from litellm.litellm_core_utils.redact_messages import LiteLLMLoggingObject, drop_token_ids
 from litellm.litellm_core_utils.thread_pool_executor import executor
 from litellm.llms.ollama.common_utils import OllamaResponseIdNormalizer
 from litellm.types.llms.base import LiteLLMBaseModel
@@ -137,6 +139,70 @@ def _prepend_upstream_choice_extras(
     choice.__pydantic_fields_set__.update(upstream_extras)
 
 
+_NO_UPSTREAM_CHOICE_FIELDS: Final[Mapping[str, object]] = MappingProxyType({})
+_NO_CHOICE_FIELDS_BY_INDEX: Final[Mapping[int, Mapping[str, object]]] = MappingProxyType({})
+
+
+def _upstream_first_choice(upstream_chunk: object) -> BaseModel | None:
+    match getattr(upstream_chunk, "choices", None):
+        case [BaseModel() as first_choice, *_]:
+            return first_choice
+        case _:
+            return None
+
+
+def _upstream_choice_fields(upstream_chunk: object, fields: Sequence[str]) -> Mapping[str, object]:
+    first_choice: Final = _upstream_first_choice(upstream_chunk)
+    if first_choice is None:
+        return _NO_UPSTREAM_CHOICE_FIELDS
+    upstream_extras: Final[Mapping[str, object]] = first_choice.model_extra or {}
+    return MappingProxyType({field: upstream_extras[field] for field in fields if field in upstream_extras})
+
+
+def _upstream_choice_index(upstream_chunk: object) -> int:
+    upstream_index: Final[object] = getattr(_upstream_first_choice(upstream_chunk), "index", 0)
+    return upstream_index if isinstance(upstream_index, int) else 0
+
+
+def _response_choice_index(response_obj: Mapping[str, object]) -> int:
+    choice_index: Final = response_obj.get("choice_index")
+    if isinstance(choice_index, int):
+        return choice_index
+    return _upstream_choice_index(response_obj.get("original_chunk"))
+
+
+def _non_null_upstream_choice_fields(upstream_chunk: object, fields: Sequence[str]) -> Mapping[str, object]:
+    first_choice: Final = _upstream_first_choice(upstream_chunk)
+    upstream_extras: Final = first_choice.model_extra if first_choice is not None else None
+    if not upstream_extras:
+        return _NO_UPSTREAM_CHOICE_FIELDS
+    return MappingProxyType(
+        {field: upstream_extras[field] for field in fields if upstream_extras.get(field) is not None}
+    )
+
+
+def _apply_choice_fields(choice: StreamingChoices, fields: Mapping[str, object]) -> None:
+    for field, value in fields.items():
+        setattr(choice, field, value)
+
+
+def _choice_fields_chunk(
+    model_response: ModelResponseStream, upstream_index: int, fields: Mapping[str, object]
+) -> ModelResponseStream:
+    model_response.choices[0].delta = Delta(content="")  # rebind-ok: chunks are built in place here
+    model_response.choices[0].index = upstream_index  # rebind-ok: chunks are built in place here
+    _apply_choice_fields(model_response.choices[0], fields)
+    return model_response
+
+
+def _without_token_ids_under_post_call_rules(chunk: ModelResponseStream | None) -> ModelResponseStream | None:
+    if chunk is None or not litellm.post_call_rules:
+        return chunk
+    for choice in chunk.choices:
+        drop_token_ids(choice)
+    return chunk
+
+
 def _holds_only_scalars(fields: Iterable[tuple[str, object]]) -> bool:
     return all(value is None or isinstance(value, (str, int, float, bool)) for _, value in fields)
 
@@ -378,6 +444,8 @@ class CustomStreamWrapper:
         self._provider_response_model: str | None = None
         self._upstream_provider: str | None = None
         self.received_finish_reason: str | None = None
+        self.received_finish_choice_fields: Mapping[int, Mapping[str, object]] = _NO_CHOICE_FIELDS_BY_INDEX
+        self.carried_chunk_choice_fields: Mapping[int, Mapping[str, object]] = _NO_CHOICE_FIELDS_BY_INDEX
         self.intermittent_finish_reason: str | None = None  # finish reasons that show up mid-stream
         self.received_any_finish_reason = False  # a later chunk can reset intermittent_finish_reason
         self.special_tokens = [
@@ -823,6 +891,7 @@ class CustomStreamWrapper:
                 "logprobs": logprobs,
                 "original_chunk": str_line,
                 "usage": usage,
+                "chunk_choice_fields": _non_null_upstream_choice_fields(str_line, STREAM_CHUNK_CHOICE_FIELDS),
             }
         except Exception as e:
             raise e
@@ -847,7 +916,7 @@ class CustomStreamWrapper:
         except Exception as e:
             raise e
 
-    def handle_openai_text_completion_chunk(self, chunk):
+    def handle_openai_text_completion_chunk(self, chunk: object):
         try:
             text = ""
             is_finished = False
@@ -860,11 +929,15 @@ class CustomStreamWrapper:
                     is_finished = True
                     finish_reason = choices[0].finish_reason
             usage = getattr(chunk, "usage", None)
+            choice_index: Final = _upstream_choice_index(chunk)
             return {
                 "text": text,
                 "is_finished": is_finished,
                 "finish_reason": finish_reason,
                 "usage": usage,
+                "chunk_choice_fields": _non_null_upstream_choice_fields(chunk, STREAM_CHUNK_CHOICE_FIELDS),
+                "choice_index": choice_index,
+                "sibling_finish_reason": finish_reason if choice_index != 0 else None,
             }
 
         except Exception as e:
@@ -1183,6 +1256,13 @@ class CustomStreamWrapper:
         )
 
         is_chunk_non_empty: Final = self.is_chunk_non_empty(completion_obj, model_response, response_obj)
+        upstream_chunk_choice_fields: Final[Mapping[str, object]] = (
+            _NO_UPSTREAM_CHOICE_FIELDS
+            if litellm.post_call_rules
+            else response_obj.get("chunk_choice_fields", _NO_UPSTREAM_CHOICE_FIELDS)
+        )
+        chunk_choice_fields: Final = self._take_carried_chunk_choice_fields(response_obj, upstream_chunk_choice_fields)
+        sibling_finish_reason: Final[str | None] = response_obj.get("sibling_finish_reason")
 
         if is_chunk_non_empty:  # cannot set content of an OpenAI Object to be an empty string
             self.raise_on_model_repetition()
@@ -1270,16 +1350,40 @@ class CustomStreamWrapper:
                     if response_obj.get("provider_specific_fields") is not None:
                         completion_obj["provider_specific_fields"] = response_obj["provider_specific_fields"]
                     model_response.choices[0].delta = Delta(**completion_obj)
-                    _index: Final[int | None] = completion_obj.get("index")
+                    _index: Final[int | None] = completion_obj.get("index", response_obj.get("choice_index"))
                     if _index is not None:
                         model_response.choices[0].index = _index
 
+                _apply_choice_fields(model_response.choices[0], chunk_choice_fields)
+                if sibling_finish_reason is not None:
+                    self._finish_sibling_choice(model_response.choices[0], sibling_finish_reason)
+                elif response_obj.get("is_finished"):
+                    self._apply_finish_choice_fields(model_response.choices[0])
                 self._optional_combine_thinking_block_in_choices(model_response=model_response)
 
                 return model_response
             else:
                 return
+        elif sibling_finish_reason is not None:
+            sibling_chunk: Final = _choice_fields_chunk(
+                model_response, _response_choice_index(response_obj), chunk_choice_fields
+            )
+            self._finish_sibling_choice(sibling_chunk.choices[0], sibling_finish_reason)
+            return sibling_chunk
         elif self.received_finish_reason is not None:
+            chunk_upstream_index: Final = _response_choice_index(response_obj)
+            if chunk_choice_fields and self._streams_past_the_pending_finish(
+                model_response, response_obj, chunk_upstream_index
+            ):
+                self.carried_chunk_choice_fields = MappingProxyType(
+                    {**self.carried_chunk_choice_fields, chunk_upstream_index: chunk_choice_fields}
+                )
+            else:
+                another_choice_fields_chunk: Final = self._another_choice_fields_chunk(
+                    model_response, response_obj, chunk_choice_fields
+                )
+                if another_choice_fields_chunk is not None:
+                    return another_choice_fields_chunk
             if self.sent_last_chunk is True:
                 # Bedrock returns the guardrail trace in the last chunk - we want to return this here
                 if self.custom_llm_provider == "bedrock" and "trace" in model_response:
@@ -1317,12 +1421,20 @@ class CustomStreamWrapper:
                 model_response.choices[0].finish_reason = self._normalize_tool_call_finish_reason(
                     map_finish_reason(finish_reason=self.received_finish_reason)
                 )  # ensure consistent output to openai
+                self._apply_finish_choice_fields(model_response.choices[0])
+                if (
+                    response_obj.get("is_finished")
+                    and _response_choice_index(response_obj) == model_response.choices[0].index
+                ):
+                    _apply_choice_fields(model_response.choices[0], chunk_choice_fields)
 
                 self.sent_last_chunk = True
 
             return model_response
         elif self._has_special_delta_content(model_response):
             return self._handle_special_delta_content(model_response)
+        elif chunk_choice_fields:
+            return _choice_fields_chunk(model_response, _response_choice_index(response_obj), chunk_choice_fields)
         else:
             if hasattr(model_response, "usage"):
                 self.chunks.append(model_response)
@@ -1545,6 +1657,8 @@ class CustomStreamWrapper:
             completion_obj["content"] = response_obj["text"]
             print_verbose(f"completion obj content: {completion_obj['content']}")
             if response_obj["is_finished"]:
+                self._record_finish_choice_fields(chunk)
+            if response_obj["is_finished"] and response_obj["sibling_finish_reason"] is None:
                 self.received_finish_reason = response_obj["finish_reason"]
             if response_obj["usage"] is not None:
                 _text_completion_usage: Final[Usage] = response_obj["usage"]
@@ -1608,6 +1722,7 @@ class CustomStreamWrapper:
                 self.system_fingerprint = cached_chunk.system_fingerprint
             if response_obj["is_finished"]:
                 self.received_finish_reason = response_obj["finish_reason"]
+                self._record_finish_choice_fields(cached_chunk)
         else:  # openai / azure chat model
             self.uses_openai_chat_stream = True
             if isinstance(chunk, ChatCompletionChunk):
@@ -1637,6 +1752,7 @@ class CustomStreamWrapper:
                         f"{self.custom_llm_provider} raised a streaming error - finish_reason: error, no content string given. Received Chunk={response_obj}"
                     )
                 self.received_finish_reason = response_obj["finish_reason"]
+                self._record_finish_choice_fields(chunk)
             if response_obj.get("original_chunk", None) is not None:
                 if hasattr(response_obj["original_chunk"], "id"):
                     model_response = self.set_model_id(response_obj["original_chunk"].id, model_response)
@@ -1704,7 +1820,7 @@ class CustomStreamWrapper:
                 completion_obj=completion_obj,
             )
             if isinstance(dispatch_result, _ProviderChunkEarlyReturn):
-                return dispatch_result.value
+                return _without_token_ids_under_post_call_rules(dispatch_result.value)
             response_obj = dispatch_result.response_obj
 
             model_response.model = self._served_openrouter_model() or self.model
@@ -1794,7 +1910,7 @@ class CustomStreamWrapper:
                 response_obj=response_obj,
                 plain_delta_created=plain_delta_created,
             )
-            return result
+            return _without_token_ids_under_post_call_rules(result)
 
         except StopIteration:
             raise StopIteration
@@ -1987,6 +2103,75 @@ class CustomStreamWrapper:
             return "tool_calls"
         return finish_reason
 
+    def _record_finish_choice_fields(self, upstream_chunk: object) -> None:
+        self.received_finish_choice_fields = MappingProxyType(
+            {
+                **self.received_finish_choice_fields,
+                _upstream_choice_index(upstream_chunk): _upstream_choice_fields(
+                    upstream_chunk, STREAM_FINISH_CHOICE_FIELDS
+                ),
+            }
+        )
+
+    def _apply_finish_choice_fields(self, choice: StreamingChoices) -> None:
+        _apply_choice_fields(choice, self.received_finish_choice_fields.get(choice.index, _NO_UPSTREAM_CHOICE_FIELDS))
+
+    def _finish_sibling_choice(self, choice: StreamingChoices, finish_reason: str) -> None:
+        choice.finish_reason = map_finish_reason(finish_reason)  # rebind-ok: chunks are built in place here
+        self._apply_finish_choice_fields(choice)
+
+    def _streams_past_the_pending_finish(
+        self, model_response: ModelResponseStream, response_obj: Mapping[str, object], upstream_index: int
+    ) -> bool:
+        finishing_index: Final = model_response.choices[0].index
+        return (
+            not self.sent_last_chunk
+            and not response_obj.get("is_finished")
+            and upstream_index != finishing_index
+            and finishing_index in self.received_finish_choice_fields
+        )
+
+    def _take_carried_chunk_choice_fields(
+        self, response_obj: Mapping[str, object], chunk_choice_fields: Mapping[str, object]
+    ) -> Mapping[str, object]:
+        if not self.carried_chunk_choice_fields:
+            return chunk_choice_fields
+        upstream_index: Final = _response_choice_index(response_obj)
+        carried: Final = self.carried_chunk_choice_fields.get(upstream_index)
+        if carried is None:
+            return chunk_choice_fields
+        self.carried_chunk_choice_fields = MappingProxyType(
+            {index: fields for index, fields in self.carried_chunk_choice_fields.items() if index != upstream_index}
+        )
+        return MappingProxyType(
+            {
+                field: [*object_items(carried.get(field)), *object_items(chunk_choice_fields.get(field))]
+                for field in STREAM_CHUNK_CHOICE_FIELDS
+                if field in carried or field in chunk_choice_fields
+            }
+        )
+
+    def _another_choice_fields_chunk(
+        self,
+        model_response: ModelResponseStream,
+        response_obj: Mapping[str, object],
+        chunk_choice_fields: Mapping[str, object],
+    ) -> ModelResponseStream | None:
+        upstream_index: Final = _response_choice_index(response_obj)
+        is_finished: Final = bool(response_obj.get("is_finished"))
+        if is_finished and upstream_index == model_response.choices[0].index and not self.sent_last_chunk:
+            return None
+        finish_fields: Final = (
+            self.received_finish_choice_fields.get(upstream_index, _NO_UPSTREAM_CHOICE_FIELDS)
+            if is_finished
+            else _NO_UPSTREAM_CHOICE_FIELDS
+        )
+        if not chunk_choice_fields and all(value is None for value in finish_fields.values()):
+            return None
+        return _choice_fields_chunk(
+            model_response, upstream_index, MappingProxyType({**finish_fields, **chunk_choice_fields})
+        )
+
     def finish_reason_handler(self):
         model_response: Final = self.model_response_creator(
             hidden_params=None if self.received_model_id is None else {"received_model_id": self.received_model_id}
@@ -2005,6 +2190,7 @@ class CustomStreamWrapper:
         model_response.choices[0].finish_reason = self._normalize_tool_call_finish_reason(
             _finish_reason if _finish_reason is not None else "stop"
         )
+        self._apply_finish_choice_fields(model_response.choices[0])
         close_tag: Final = self._close_open_think_block()
         if close_tag is not None:
             model_response.choices[0].delta.content = close_tag
diff --git a/litellm/litellm_core_utils/token_counter.py b/litellm/litellm_core_utils/token_counter.py
index 323af72940a..df8038e756c 100644
--- a/litellm/litellm_core_utils/token_counter.py
+++ b/litellm/litellm_core_utils/token_counter.py
@@ -990,7 +990,11 @@ def _count_extra(
         tool_section (Optional[ChatTemplateToolSection]): How the model's chat template renders tools, if known.
     """
     reply_primer_tokens: Final = 3
-    tool_choice_tokens: Final = 0 if tool_section is not None else _count_tool_choice(count_function, tool_choice)
+    tool_choice_tokens: Final = (
+        _count_tool_choice(count_function, tool_choice)
+        if tool_section is None or tool_section.counts_tool_choice
+        else 0
+    )
     return (
         reply_primer_tokens
         + _count_tool_definitions(count_function, tools, includes_system_message, tool_section)
@@ -1029,14 +1033,29 @@ def _count_tool_choice(
             return 0
 
 
+def _named_function_definitions(tools: Sequence[object]) -> Iterable[Mapping[str, object]]:
+    return (function for function in _function_definitions(_tools_sent_as_functions(tools)) if function.get("name"))
+
+
+def sends_function_tools(tools: Sequence[object] | None) -> bool:
+    return tools is not None and any(_named_function_definitions(tools))
+
+
+def _without_false_strict(function: Mapping[str, object]) -> Mapping[str, object]:
+    return {key: value for key, value in function.items() if key != "strict" or value}
+
+
 def _count_chat_template_tools(
     count_function: TokenCounterFunction,
     tools: Sequence[object],
     includes_system_message: bool,
     tool_section: ChatTemplateToolSection,
 ) -> int:
-    functions: Final = tuple(
-        function for function in _function_definitions(_tools_sent_as_functions(tools)) if function.get("name")
+    named_functions: Final = tuple(_named_function_definitions(tools))
+    functions: Final = (
+        tuple(map(_without_false_strict, named_functions))
+        if tool_section.renders_strict_only_when_true
+        else named_functions
     )
     if not functions:
         return 0
diff --git a/litellm/litellm_core_utils/tool_fields.py b/litellm/litellm_core_utils/tool_fields.py
index f90c8f5d174..5ee96ea9133 100644
--- a/litellm/litellm_core_utils/tool_fields.py
+++ b/litellm/litellm_core_utils/tool_fields.py
@@ -1,13 +1,16 @@
-from collections.abc import Callable, Mapping
+from collections.abc import Callable, Mapping, Sequence
+from copy import copy
 from dataclasses import dataclass
 from functools import reduce
-from typing import Annotated, Final, TypeAlias
+from typing import Annotated, Final, TypeAlias, TypeVar
 
 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
+from litellm._logging import verbose_logger
+from litellm.exceptions import UnsupportedParamsError
+from litellm.litellm_core_utils.core_helpers import drops_unsupported_params, normalize_drop_params
 
 ROUTES_WITH_TOOLS: Final = frozenset(
     {
@@ -162,3 +165,145 @@ def resolve_deployment_tool_fields(
     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),))
+
+
+_ToolT: Final = TypeVar("_ToolT")
+
+HOSTED_MCP_DROP_WARNING: Final = (
+    "Dropping the hosted MCP tool(s) %s for model=%s on %s (drop_params=True) because this route cannot run a "
+    "hosted MCP tool."
+)
+
+
+def _hosted_mcp_server_label(tool: object) -> str | None:
+    match tool:
+        case {"type": "mcp", "server_label": str() as server_label}:
+            return server_label
+        case {"type": "mcp"}:
+            return "unlabeled"
+        case _:
+            return None
+
+
+def _drop_params_hint(dropped: str) -> str:
+    return (
+        f"To drop {dropped} instead, set `litellm.drop_params=True` or for proxy:\n\n"
+        "`litellm_settings:\n drop_params: true`\n"
+    )
+
+
+def _one_log_line(text: str) -> str:
+    return text.replace("\r", "").replace("\n", "")
+
+
+def _unrunnable_mcp_error(message: str, model: str, route: str) -> UnsupportedParamsError:
+    return UnsupportedParamsError(message=message, model=model, llm_provider=route, status_code=400)
+
+
+def tools_without_hosted_mcp(tools: Sequence[_ToolT], model: str, route: str, drop_params: bool) -> Sequence[_ToolT]:
+    server_labels: Final = tuple(label for label in map(_hosted_mcp_server_label, tools) if label is not None)
+    if not server_labels:
+        return tools
+    named_servers: Final = ", ".join(f"`{label}`" for label in server_labels)
+    if not drops_unsupported_params(drop_params):
+        raise _unrunnable_mcp_error(
+            f'{model} on {route} cannot run the hosted MCP tool {named_servers} (`type: "mcp"`). To have LiteLLM '
+            "run the MCP server for this model, register it on the LiteLLM MCP gateway and send "
+            '`server_url: "litellm_proxy/mcp/<server name>"`. ' + _drop_params_hint("hosted MCP tools"),
+            model=model,
+            route=route,
+        )
+    verbose_logger.warning(
+        HOSTED_MCP_DROP_WARNING, _one_log_line(named_servers), _one_log_line(model), _one_log_line(route)
+    )
+    return [tool for tool in tools if _hosted_mcp_server_label(tool) is None]
+
+
+MCP_SERVERS_DROP_WARNING: Final = (
+    "Dropping mcp_servers %s and their mcp_toolset tools for model=%s on %s (drop_params=True) because LiteLLM "
+    "cannot pass mcp_servers to this route."
+)
+
+ROUTES_WITHOUT_MCP_SERVERS: Final = frozenset(
+    {"bedrock", "databricks", "deepseek", "gemini", "gigachat", "ollama", "ollama_chat", "vertex_ai", "vertex_ai_beta"}
+)
+
+
+def _mcp_server_name(server: object) -> str:
+    match server:
+        case {"name": str() as name}:
+            return name
+        case _:
+            return "unnamed"
+
+
+def _mcp_server_names(mcp_servers: object) -> tuple[str, ...]:
+    if not mcp_servers:
+        return ()
+    if not isinstance(mcp_servers, list):
+        return ("unnamed",)
+    return tuple(map(_mcp_server_name, _TOOLS.validate_python(mcp_servers)))
+
+
+def _is_mcp_toolset(tool: object) -> bool:
+    match tool:
+        case {"type": "mcp_toolset"}:
+            return True
+        case _:
+            return False
+
+
+def drops_mcp_servers(request_kwargs: Mapping[str, object]) -> bool:
+    additional_drop_params: Final = request_kwargs.get("additional_drop_params")
+    return drops_unsupported_params(request_kwargs.get("drop_params")) or (
+        isinstance(additional_drop_params, list) and "mcp_servers" in additional_drop_params
+    )
+
+
+def tools_without_mcp_servers(
+    mcp_servers: object, tools: Sequence[_ToolT], model: str, route: str, drop_params: bool
+) -> Sequence[_ToolT]:
+    server_names: Final = _mcp_server_names(mcp_servers)
+    if not server_names:
+        return tools
+    named_servers: Final = ", ".join(f"`{name}`" for name in server_names)
+    if not drops_unsupported_params(drop_params):
+        raise _unrunnable_mcp_error(
+            f"LiteLLM cannot pass `mcp_servers` to {model} on {route}, so the MCP server {named_servers} would not "
+            'run. To have LiteLLM run it for this model, register it on the LiteLLM MCP gateway and send a `type: "mcp"` '
+            'tool with `server_url: "litellm_proxy/mcp/<server name>"`. ' + _drop_params_hint("`mcp_servers`"),
+            model=model,
+            route=route,
+        )
+    verbose_logger.warning(
+        MCP_SERVERS_DROP_WARNING, _one_log_line(named_servers), _one_log_line(model), _one_log_line(route)
+    )
+    return [tool for tool in tools if not _is_mcp_toolset(tool)]
+
+
+_TOOL_SELECTION_PARAMS: Final = frozenset({"tools", "tool_choice", "parallel_tool_calls"})
+_ParamsT: Final = TypeVar("_ParamsT", bound=dict[str, object])
+
+
+def tool_params_without_hosted_mcp(
+    params: _ParamsT, model: str, route: str, drop_params: bool, runs_hosted_mcp: Callable[[], bool] | None = None
+) -> _ParamsT:
+    tools: Final = params.get("tools")
+    if not isinstance(tools, list) or not tools:
+        return params
+    sent_tools: Final = _TOOLS.validate_python(tools)
+    if all(_hosted_mcp_server_label(tool) is None for tool in sent_tools) or (
+        runs_hosted_mcp is not None and runs_hosted_mcp()
+    ):
+        return params
+    kept_tools: Final = tools_without_hosted_mcp(tools=sent_tools, model=model, route=route, drop_params=drop_params)
+    if len(kept_tools) == len(sent_tools):
+        return params
+    kept_params: Final = copy(params)
+    if kept_tools:
+        kept_params["tools"] = list(kept_tools)
+        return kept_params
+    dropped_keys: Final = ("tools",) if params.get("functions") else _TOOL_SELECTION_PARAMS
+    for key in dropped_keys:
+        _ = kept_params.pop(key, None)
+    return kept_params
diff --git a/litellm/llms/anthropic/chat/handler.py b/litellm/llms/anthropic/chat/handler.py
index 75f88355652..4eae06dbcdf 100644
--- a/litellm/llms/anthropic/chat/handler.py
+++ b/litellm/llms/anthropic/chat/handler.py
@@ -516,6 +516,7 @@ class AnthropicChatCompletion(BaseLLM):
                 headers=headers,
                 request_data=request_data,
                 provider=custom_llm_provider,
+                api_base=api_base,
             )
             data: Final = dict(
                 strip_beta_gated_request_body(
@@ -1194,6 +1195,9 @@ class ModelResponseIterator:
                 start_message: Final = message_start_block["message"]
                 if "model" in start_message:
                     self.served_model = start_message["model"]
+                input_transformations: Final = start_message.get("input_transformations")
+                if input_transformations is not None:
+                    provider_specific_fields["input_transformations"] = input_transformations
                 if "usage" in message_start_block["message"]:
                     usage = self._handle_usage(anthropic_usage_chunk=message_start_block["message"]["usage"])
             elif type_chunk == "error":
diff --git a/litellm/llms/anthropic/chat/transformation.py b/litellm/llms/anthropic/chat/transformation.py
index f198d76f72a..2e908e66626 100644
--- a/litellm/llms/anthropic/chat/transformation.py
+++ b/litellm/llms/anthropic/chat/transformation.py
@@ -13,6 +13,7 @@ from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError
 from typing_extensions import ReadOnly, TypedDict
 
 import litellm
+from litellm.anthropic_beta_headers_manager import get_unsupported_headers
 from litellm.constants import (
     ANTHROPIC_BILLING_METADATA_PREFIX,
     ANTHROPIC_MIN_THINKING_BUDGET_TOKENS,
@@ -56,6 +57,7 @@ from litellm.litellm_core_utils.prompt_templates.mid_conversation_system import
     split_leading_system_run,
 )
 from litellm.litellm_core_utils.reasoning_effort_utils import OPAQUE_VALUE, warn_non_string_reasoning_effort
+from litellm.litellm_core_utils.tool_fields import tool_params_without_hosted_mcp
 from litellm.llms.base_llm.base_utils import (
     ResponseFormatSchema,
     as_json_object,
@@ -1315,6 +1317,11 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
             *(tool for tool in tools[first_search_tool_index + 1 :] if not _is_openai_tool_search_tool(tool)),
         ]
 
+    def runs_hosted_mcp(self) -> bool:
+        return ANTHROPIC_BETA_HEADER_VALUES.MCP_CLIENT_2025_04_04.value not in get_unsupported_headers(
+            self._resolved_provider
+        )
+
     def _tools_param_with_openai_tool_search_mapped(
         self, non_default_params: Mapping[str, object], model: str, drop_params: bool
     ) -> Mapping[str, object]:
@@ -1903,7 +1910,14 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
         model: str,
         drop_params: bool,
     ) -> dict:
-        is_thinking_enabled: Final = self.is_thinking_enabled(non_default_params=non_default_params)
+        request_params: Final = tool_params_without_hosted_mcp(
+            non_default_params,
+            model=model,
+            route=self._resolved_provider,
+            drop_params=drop_params,
+            runs_hosted_mcp=self.runs_hosted_mcp,
+        )
+        is_thinking_enabled: Final = self.is_thinking_enabled(non_default_params=request_params)
 
         # NB: ``map_openai_params`` deliberately does NOT sanitize tool names
         # here. Names are the *original* OpenAI names at this stage, and must
@@ -1916,7 +1930,7 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
         #      via ``data = {**optional_params}`` and would 400 with
         #      ``Extra inputs are not permitted``).
 
-        for param, value in non_default_params.items():
+        for param, value in request_params.items():
             if param == "max_tokens" or param == "max_completion_tokens":
                 optional_params["max_tokens"] = value if isinstance(value, int) else max(1, int(round(value)))
             elif param == "tools":
@@ -1930,8 +1944,8 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
                     optional_params["mcp_servers"] = mcp_servers
             elif param == "tool_choice" or param == "parallel_tool_calls":
                 _tool_choice: AnthropicMessagesToolChoice | None = self._map_tool_choice(
-                    tool_choice=non_default_params.get("tool_choice"),
-                    parallel_tool_use=non_default_params.get("parallel_tool_calls"),
+                    tool_choice=request_params.get("tool_choice"),
+                    parallel_tool_use=request_params.get("parallel_tool_calls"),
                 )
 
                 if _tool_choice is not None:
@@ -1957,7 +1971,7 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
                 if self.uses_native_structured_output_for_schema(
                     model,
                     self._extract_json_schema_from_response_format(value),
-                    REQUEST_PARAMS.validate_python(non_default_params),
+                    REQUEST_PARAMS.validate_python(request_params),
                 ):
                     _output_format = self.map_response_format_to_anthropic_output_format(value)
                     if _output_format is not None:
@@ -1993,7 +2007,7 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
                     # `thinking={type: enabled, budget_tokens}` interface a
                     # pre-4.6 model actually supports instead of forwarding a
                     # shape the model will reject.
-                    max_tokens = non_default_params.get("max_completion_tokens") or non_default_params.get("max_tokens")
+                    max_tokens = request_params.get("max_completion_tokens") or request_params.get("max_tokens")
                     legacy_thinking = AnthropicConfig._map_reasoning_effort(
                         reasoning_effort="medium",
                         model=model,
@@ -2087,7 +2101,7 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
 
         ## handle thinking tokens
         self.update_optional_params_with_thinking_tokens(
-            non_default_params=non_default_params, optional_params=optional_params
+            non_default_params=request_params, optional_params=optional_params
         )
 
         return optional_params
@@ -3028,7 +3042,7 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
 
     def _build_provider_specific_fields(
         self,
-        completion_response: dict,
+        completion_response: Mapping[str, object],
         citations: Sequence[object] | None,
         thinking_blocks: list[ChatCompletionThinkingBlock | ChatCompletionRedactedThinkingBlock] | None,
         web_search_results: Sequence[object] | None,
@@ -3045,6 +3059,10 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
         if context_management is not None:
             provider_specific_fields["context_management"] = context_management
 
+        input_transformations: Final = completion_response.get("input_transformations")
+        if input_transformations is not None:
+            provider_specific_fields["input_transformations"] = input_transformations
+
         if web_search_results is not None:
             provider_specific_fields["web_search_results"] = web_search_results
 
@@ -3055,17 +3073,15 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
         if tool_results is not None:
             provider_specific_fields["tool_results"] = tool_results
 
+        container: Final = completion_response.get("container")
+        container_fields: Final[Mapping[str, object] | None] = container if isinstance(container, dict) else None
         if tool_results is not None and any(result.get("type") != "tool_search_tool_result" for result in tool_results):
-            container_id: Final = (
-                completion_response.get("container", {}).get("id")
-                if isinstance(completion_response.get("container"), dict)
-                else None
-            )
+            raw_container_id: Final = container_fields.get("id") if container_fields is not None else None
+            container_id: Final = raw_container_id if isinstance(raw_container_id, str) else None
             code_by_id: Final = self._build_code_by_id_map(tool_calls)
             code_interpreter_results = self._build_code_interpreter_results(tool_results, code_by_id, container_id)
             provider_specific_fields["code_interpreter_results"] = code_interpreter_results
 
-        container: Final = completion_response.get("container")
         if container is not None:
             provider_specific_fields["container"] = container
 
@@ -3166,8 +3182,13 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
                 STOP_REASON_FIELDS.validate_python(completion_response)
             )
             completion_response["stop_reason"] = "stop"
-            if stop_reason_fields:
-                json_mode_message.provider_specific_fields = dict(stop_reason_fields)
+            input_transformations: Final = provider_specific_fields.get("input_transformations")
+            json_mode_fields: Final = {
+                **stop_reason_fields,
+                **({} if input_transformations is None else {"input_transformations": input_transformations}),
+            }
+            if json_mode_fields:
+                json_mode_message.provider_specific_fields = json_mode_fields
             if "refusal" in refusal_fields:
                 json_mode_message.refusal = refusal_fields["refusal"]
             if thinking_blocks:
diff --git a/litellm/llms/anthropic/common_utils.py b/litellm/llms/anthropic/common_utils.py
index 4f5dc678bae..c9df903cbd6 100644
--- a/litellm/llms/anthropic/common_utils.py
+++ b/litellm/llms/anthropic/common_utils.py
@@ -1297,7 +1297,7 @@ class AnthropicModelInfo(BaseLLMModelInfo):
             return None
         return anthropic_beta_header.split(",")
 
-    def get_computer_tool_beta_header(self, computer_tool_version: str) -> str:
+    def get_computer_tool_beta_header(self, computer_tool_version: str) -> str | None:
         """
         Get the appropriate beta header for a given computer tool version.
 
@@ -1305,16 +1305,14 @@ class AnthropicModelInfo(BaseLLMModelInfo):
             computer_tool_version: The computer tool version (e.g., 'computer_20250124', 'computer_20241022')
 
         Returns:
-            The corresponding beta header string
+            The corresponding beta header string, or None for a version with no known beta
         """
         computer_tool_beta_mapping: Final = {
+            "computer_20251124": "computer-use-2025-11-24",
             "computer_20250124": "computer-use-2025-01-24",
             "computer_20241022": "computer-use-2024-10-22",
         }
-        return computer_tool_beta_mapping.get(
-            computer_tool_version,
-            "computer-use-2024-10-22",  # Default fallback
-        )
+        return computer_tool_beta_mapping.get(computer_tool_version)
 
     def get_anthropic_beta_list(
         self,
@@ -1346,9 +1344,8 @@ class AnthropicModelInfo(BaseLLMModelInfo):
         if effort_used:
             betas.append(ANTHROPIC_EFFORT_BETA_HEADER)  # effort-2025-11-24
 
-        if computer_tool_used:
-            beta_header: Final = self.get_computer_tool_beta_header(computer_tool_used)
-            betas.append(beta_header)
+        if computer_tool_used and (computer_tool_beta := self.get_computer_tool_beta_header(computer_tool_used)):
+            betas.append(computer_tool_beta)
 
         # Anthropic no longer requires the prompt-caching beta header
         # Prompt caching now works automatically when cache_control is used in messages
@@ -1437,9 +1434,8 @@ class AnthropicModelInfo(BaseLLMModelInfo):
         # Anthropic no longer requires the prompt-caching beta header
         # Prompt caching now works automatically when cache_control is used in messages
         # Reference: https://docs.anthropic.com/en/docs/build-with-claude/prompt-caching
-        if computer_tool_used:
-            beta_header: Final = self.get_computer_tool_beta_header(computer_tool_used)
-            betas.add(beta_header)
+        if computer_tool_used and (computer_tool_beta := self.get_computer_tool_beta_header(computer_tool_used)):
+            betas.add(computer_tool_beta)
         # if pdf_used:
         #     betas.add("pdfs-2024-09-25")
         if file_id_used:
diff --git a/litellm/llms/anthropic/messages/adapters/handler.py b/litellm/llms/anthropic/messages/adapters/handler.py
index bd9d63305c3..dff5eccb76e 100644
--- a/litellm/llms/anthropic/messages/adapters/handler.py
+++ b/litellm/llms/anthropic/messages/adapters/handler.py
@@ -15,6 +15,11 @@ from litellm._logging import verbose_logger
 from litellm.litellm_core_utils.asyncify import run_async_function
 from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObject
+from litellm.litellm_core_utils.tool_fields import (
+    ROUTES_WITHOUT_MCP_SERVERS,
+    drops_mcp_servers,
+    tools_without_mcp_servers,
+)
 from litellm.llms.anthropic.messages.adapters.transformation import (
     AnthropicAdapter,
 )
@@ -623,6 +628,23 @@ class LiteLLMMessagesToCompletionTransformationHandler:
             Logging as LiteLLMLoggingObject,
         )
 
+        provider_kwargs: Final = extra_kwargs or {}
+        custom_llm_provider: Final = provider_kwargs.get("custom_llm_provider")
+        target_provider: Final = custom_llm_provider if isinstance(custom_llm_provider, str) else None
+        drop_params: Final = drops_unsupported_params(provider_kwargs.get("drop_params"))
+        strips_mcp_servers: Final = target_provider in ROUTES_WITHOUT_MCP_SERVERS
+        request_tools: Final = (
+            tools_without_mcp_servers(
+                provider_kwargs.get("mcp_servers"),
+                tools or (),
+                model=model,
+                route=target_provider,
+                drop_params=drops_mcp_servers(provider_kwargs),
+            )
+            if strips_mcp_servers
+            else tools
+        )
+
         request_data: Final[dict[str, object]] = {
             "model": model,
             "messages": messages,
@@ -639,10 +661,10 @@ class LiteLLMMessagesToCompletionTransformationHandler:
             request_data["temperature"] = temperature
         if thinking:
             request_data["thinking"] = thinking
-        if tool_choice:
+        if tool_choice and (request_tools or not tools):
             request_data["tool_choice"] = tool_choice
-        if tools:
-            request_data["tools"] = tools
+        if request_tools:
+            request_data["tools"] = request_tools
         if top_k is not None:
             request_data["top_k"] = top_k
         if top_p is not None:
@@ -660,16 +682,15 @@ class LiteLLMMessagesToCompletionTransformationHandler:
         if "output_config" in extra_kwargs:
             request_data["output_config"] = extra_kwargs["output_config"]
 
-        custom_llm_provider: Final = extra_kwargs.get("custom_llm_provider")
         api_base: Final = extra_kwargs.get("api_base")
         (
             openai_request,
             tool_name_mapping,
         ) = ANTHROPIC_ADAPTER.translate_completion_input_params_with_tool_mapping(
             request_data,
-            custom_llm_provider=custom_llm_provider if isinstance(custom_llm_provider, str) else None,
+            custom_llm_provider=target_provider,
             api_base=api_base if isinstance(api_base, str) else None,
-            drop_params=drops_unsupported_params(extra_kwargs.get("drop_params")),
+            drop_params=drop_params,
         )
 
         if openai_request is None:
@@ -697,7 +718,11 @@ class LiteLLMMessagesToCompletionTransformationHandler:
         # Maintainability: when adding a new Anthropic-only request param to
         # ``AnthropicMessagesRequestOptionalParams``, also extend
         # ``ANTHROPIC_ONLY_REQUEST_KEYS`` here so it doesn't silently leak.
-        excluded_keys: Final = ANTHROPIC_ONLY_REQUEST_KEYS | CONVERTED_STREAM_KEYS | {"anthropic_messages"}
+        excluded_keys: Final = (
+            ANTHROPIC_ONLY_REQUEST_KEYS
+            | CONVERTED_STREAM_KEYS
+            | ({"anthropic_messages", "mcp_servers"} if strips_mcp_servers else {"anthropic_messages"})
+        )
         # NOTE: extra_kwargs was already coerced from None to {} at the top of
         # this method (line ~220). It is guaranteed to be a dict here.
         for key, value in extra_kwargs.items():
diff --git a/litellm/llms/anthropic/messages/adapters/streaming_iterator.py b/litellm/llms/anthropic/messages/adapters/streaming_iterator.py
index 61d23c2de0d..c41deb00f1d 100644
--- a/litellm/llms/anthropic/messages/adapters/streaming_iterator.py
+++ b/litellm/llms/anthropic/messages/adapters/streaming_iterator.py
@@ -493,10 +493,23 @@ class _CombinedChunkSplitter:
             for position, block in enumerate(blocks)
         )
 
+    @staticmethod
+    def _without_sibling_finish(chunk: "ModelResponseStream") -> "ModelResponseStream":
+        choices: Final = _optional_attr_sequence(chunk, "choices")
+        if (
+            len(choices) != 1
+            or _optional_attr(choices[0], "index") in (None, 0)
+            or _optional_attr(choices[0], "finish_reason") is None
+        ):
+            return chunk
+        unfinished: Final = copy.deepcopy(chunk)
+        unfinished.choices[0].finish_reason = None
+        return unfinished
+
     def _expand(self, chunk: "ModelResponseStream") -> "tuple[ModelResponseStream, ...]":
         split_chunks: Final = tuple(
             split_chunk
-            for combined_chunk in self._split(chunk)
+            for combined_chunk in self._split(self._without_sibling_finish(chunk))
             for split_chunk in self._split_by_payload_kind(combined_chunk)  # comprehension-ok: flattens nested splits
         )
         block_chunks: Final = tuple(itertools.chain.from_iterable(map(self._split_thinking_blocks, split_chunks)))
diff --git a/litellm/llms/anthropic/messages/context_management/inference_view.py b/litellm/llms/anthropic/messages/context_management/inference_view.py
new file mode 100644
index 00000000000..004beebe838
--- /dev/null
+++ b/litellm/llms/anthropic/messages/context_management/inference_view.py
@@ -0,0 +1,138 @@
+from collections.abc import Mapping, Sequence
+from dataclasses import dataclass
+from typing import Final
+
+from pydantic import JsonValue, TypeAdapter, ValidationError
+from typing_extensions import assert_never
+
+from litellm.types.llms.anthropic import AnthropicMessagesTextParam
+from litellm.types.utils import CountContextManagement, TokenCountMessagesFormat
+
+
+@dataclass(frozen=True, slots=True)
+class InferenceRequestView:
+    messages: Sequence[Mapping[str, object]]
+    system: object | None
+
+
+@dataclass(frozen=True, slots=True)
+class InferenceRequestViewError:
+    error_message: str
+    status_code: int
+
+
+@dataclass(frozen=True, slots=True)
+class CountContextEdits:
+    spec: JsonValue
+    model: str
+    tools: tuple[Mapping[str, object], ...] | None
+    drop_invalid_edits: bool = False
+
+
+_CONTEXT_MANAGEMENT_SPEC: Final[TypeAdapter[Mapping[str, object] | tuple[Mapping[str, object], ...]]] = TypeAdapter(
+    Mapping[str, object] | tuple[Mapping[str, object], ...]
+)
+_SYSTEM_BLOCKS: Final = TypeAdapter(tuple[AnthropicMessagesTextParam, ...])
+
+
+def count_context_edits(
+    context_management: CountContextManagement | None,
+    tools: Sequence[Mapping[str, object]] | None,
+    litellm_params: Mapping[str, object],
+    fallback_model: str,
+) -> CountContextEdits:
+    model: Final = litellm_params.get("model")
+    return CountContextEdits(
+        spec=None if context_management is None else context_management.spec,
+        model=model if isinstance(model, str) else fallback_model,
+        tools=None if tools is None else tuple(tools),
+        drop_invalid_edits=context_management is not None and context_management.drop_invalid_edits,
+    )
+
+
+def _typed_spec(spec: JsonValue) -> Mapping[str, object] | tuple[Mapping[str, object], ...] | None:
+    try:
+        return _CONTEXT_MANAGEMENT_SPEC.validate_python(spec)
+    except ValidationError:
+        return None
+
+
+def _typed_system(system: object | None) -> str | tuple[AnthropicMessagesTextParam, ...] | None | ValidationError:
+    if system is None or isinstance(system, str):
+        return system
+    try:
+        return _SYSTEM_BLOCKS.validate_python(system)
+    except ValidationError as error:
+        return error
+
+
+def _view_without_edits(
+    messages: Sequence[Mapping[str, object]],
+    system: object | None,
+    typed_system: str | Sequence[Mapping[str, object]] | None,
+) -> InferenceRequestView:
+    from litellm.llms.anthropic.messages.context_management.editors.compact import (
+        apply_client_compaction_block_history,
+    )
+
+    history: Final = apply_client_compaction_block_history(
+        messages=[dict(message) for message in messages],
+        system=typed_system
+        if typed_system is None or isinstance(typed_system, str)
+        else [dict(block) for block in typed_system],
+    )
+    if history is None:
+        return InferenceRequestView(messages=messages, system=system)
+    return InferenceRequestView(messages=history.messages, system=history.system)
+
+
+async def _anthropic_inference_view(
+    messages: Sequence[Mapping[str, object]], system: object | None, edits: CountContextEdits
+) -> InferenceRequestView | InferenceRequestViewError:
+    from litellm.llms.anthropic.messages.adapters.handler import prepare_context_managed_request
+    from litellm.llms.anthropic.messages.context_management import AnthropicContextManagementError
+    from litellm.llms.anthropic.messages.native.utils import normalize_native_messages
+
+    typed_system: Final = _typed_system(system)
+    if isinstance(typed_system, ValidationError):
+        return InferenceRequestView(messages=messages, system=system)
+    normalized: Final = normalize_native_messages(messages)
+    spec: Final = _typed_spec(edits.spec)
+    try:
+        prepared: Final = await prepare_context_managed_request(
+            model=edits.model,
+            messages=normalized,
+            tools=None if edits.tools is None else [dict(tool) for tool in edits.tools],
+            system=[dict(block) for block in typed_system] if isinstance(typed_system, tuple) else typed_system,
+            context_management_spec=(
+                None if spec is None else dict(spec) if isinstance(spec, Mapping) else [dict(edit) for edit in spec]
+            ),
+            litellm_metadata=None,
+            additional_drop_params=None,
+            llm_router=None,
+            count_only=True,
+            drop_invalid_edits=edits.drop_invalid_edits,
+        )
+    except AnthropicContextManagementError as error:
+        if error.status_code >= 500:
+            return _view_without_edits(normalized, system, typed_system)
+        return InferenceRequestViewError(error_message=error.message, status_code=error.status_code)
+    if prepared is None:
+        return InferenceRequestView(messages=normalized, system=system)
+    return InferenceRequestView(messages=prepared.messages, system=prepared.system)
+
+
+async def inference_request_view(
+    messages: Sequence[Mapping[str, object]],
+    system: object | None,
+    messages_format: TokenCountMessagesFormat,
+    edits: CountContextEdits,
+) -> InferenceRequestView | InferenceRequestViewError:
+    """Apply the history rewrites and context edits /v1/messages runs before it converts a body for another provider."""
+    match messages_format:
+        case "openai":
+            return InferenceRequestView(messages=messages, system=system)
+        case "anthropic":
+            return await _anthropic_inference_view(messages, system, edits)
+        case _:
+            assert_never(messages_format)
diff --git a/litellm/llms/anthropic/messages/native/handler.py b/litellm/llms/anthropic/messages/native/handler.py
index 1bf00cbdb2f..922de386fe4 100644
--- a/litellm/llms/anthropic/messages/native/handler.py
+++ b/litellm/llms/anthropic/messages/native/handler.py
@@ -8,6 +8,7 @@
 import asyncio
 import contextvars
 from collections.abc import AsyncIterator, Awaitable, Callable, Coroutine, Iterator, Mapping, Sequence
+from dataclasses import dataclass
 from functools import partial
 from typing import Final, cast
 
@@ -15,6 +16,7 @@ from pydantic import TypeAdapter
 
 import litellm
 from litellm.anthropic_beta_headers_manager import aload_beta_headers_config
+from litellm.constants import PROVIDERS_THAT_AUTHENTICATE_ON_PROVIDER_INFO
 from litellm.integrations.anthropic_cache_control_hook import AnthropicCacheControlHook
 from litellm.litellm_core_utils.core_helpers import as_str_mapping
 from litellm.litellm_core_utils.exception_mapping_utils import exception_type
@@ -44,7 +46,7 @@ from litellm.types.llms.anthropic_messages.anthropic_response import (
     AnthropicMessagesResponse,
 )
 from litellm.types.router import GenericLiteLLMParams
-from litellm.types.utils import CallTypes, LlmProviders
+from litellm.types.utils import CallTypes, LlmProviders, LlmProvidersSet
 from litellm.utils import ProviderConfigManager, client
 
 from ..adapters.handler import LiteLLMMessagesToCompletionTransformationHandler, request_safeguards_evaluator
@@ -94,6 +96,68 @@ def _responses_mode_is_lost_by_prefix_strip(
     ) and not _bridges_to_responses_api(resolved_model, custom_llm_provider, deployment_model_info)
 
 
+@dataclass(frozen=True, slots=True)
+class _BridgeTarget:
+    model: str
+    api_key: str | None
+    api_base: str | None
+
+
+def _resolve_requested_provider(
+    model: str, custom_llm_provider: str | None, litellm_params: GenericLiteLLMParams
+) -> tuple[str, str, str | None, str | None]:
+    resolved: Final = litellm.get_llm_provider(
+        model=model,
+        custom_llm_provider=custom_llm_provider,
+        api_base=litellm_params.api_base,
+        api_key=litellm_params.api_key,
+        litellm_params=litellm_params,
+    )
+    requested_provider: Final = model.partition("/")[0]
+    if (
+        custom_llm_provider in (None, requested_provider)
+        or requested_provider not in LlmProvidersSet
+        or requested_provider in PROVIDERS_THAT_AUTHENTICATE_ON_PROVIDER_INFO
+    ):
+        return resolved
+    own: Final = _resolve_by_model_prefix(model, litellm_params)
+    return own if own is not None and own[1] == custom_llm_provider else resolved
+
+
+def _resolve_by_model_prefix(
+    model: str, litellm_params: GenericLiteLLMParams
+) -> tuple[str, str, str | None, str | None] | None:
+    try:
+        return litellm.get_llm_provider(
+            model=model,
+            api_base=litellm_params.api_base,
+            api_key=litellm_params.api_key,
+            litellm_params=litellm_params.model_copy(update={"custom_llm_provider": None}),
+        )
+    except litellm.BadRequestError:
+        return None
+
+
+def _sets_own_entra_credential(litellm_params: GenericLiteLLMParams) -> bool:
+    return bool(
+        litellm_params.azure_ad_token
+        or (litellm_params.model_extra or {}).get("azure_ad_token_provider") is not None
+        or (litellm_params.tenant_id and litellm_params.client_id and litellm_params.client_secret)
+        or (litellm_params.azure_username and litellm_params.azure_password and litellm_params.client_id)
+    )
+
+
+def _bridge_target(requested: _BridgeTarget, resolved: _BridgeTarget, custom_llm_provider: str) -> _BridgeTarget:
+    requested_provider: Final = requested.model.partition("/")[0]
+    if requested_provider == custom_llm_provider or requested_provider not in LlmProvidersSet:
+        return requested
+    return _BridgeTarget(
+        model=f"{custom_llm_provider}/{resolved.model}",
+        api_key=requested.api_key if requested.api_base else requested.api_key or resolved.api_key,
+        api_base=resolved.api_base,
+    )
+
+
 def _should_route_to_responses_api(
     custom_llm_provider: str | None,
     requested_model: str | None = None,
@@ -624,13 +688,7 @@ def anthropic_messages_handler(
         custom_llm_provider,
         dynamic_api_key,
         dynamic_api_base,
-    ) = litellm.get_llm_provider(
-        model=model,
-        custom_llm_provider=custom_llm_provider,
-        api_base=litellm_params.api_base,
-        api_key=litellm_params.api_key,
-        litellm_params=litellm_params,
-    )
+    ) = _resolve_requested_provider(model, custom_llm_provider, litellm_params)
 
     # Store agentic loop params in logging object for agentic hooks
     # This provides original request context needed for follow-up calls
@@ -656,6 +714,16 @@ def anthropic_messages_handler(
             mock_response=litellm_params.mock_response,
         )
 
+    bridge: Final = _bridge_target(
+        _BridgeTarget(model=original_model, api_key=api_key, api_base=api_base),
+        _BridgeTarget(
+            model=model,
+            api_key=None if _sets_own_entra_credential(litellm_params) else dynamic_api_key,
+            api_base=dynamic_api_base,
+        ),
+        custom_llm_provider,
+    )
+
     # Expand litellm_proxy MCP references through the MCP gateway before dispatch, so every
     # downstream path (native passthrough and both bridges) gets real tools rather than a
     # reference the provider cannot resolve. Popped from kwargs so it never reaches the provider.
@@ -682,8 +750,8 @@ def anthropic_messages_handler(
             top_k=top_k,
             top_p=top_p,
             container=container,
-            api_key=api_key,
-            api_base=api_base,
+            api_key=bridge.api_key,
+            api_base=bridge.api_base,
             client=client,
             custom_llm_provider=custom_llm_provider,
             **kwargs,
@@ -700,7 +768,7 @@ def anthropic_messages_handler(
             return LiteLLMMessagesToResponsesAPIHandler.anthropic_messages_handler(
                 max_tokens=max_tokens,
                 messages=messages,
-                model=original_model,
+                model=bridge.model,
                 metadata=metadata,
                 stop_sequences=stop_sequences,
                 stream=stream,
@@ -716,8 +784,8 @@ def anthropic_messages_handler(
                 top_k=top_k,
                 top_p=top_p,
                 _is_async=is_async,
-                api_key=api_key,
-                api_base=api_base,
+                api_key=bridge.api_key,
+                api_base=bridge.api_base,
                 client=client,
                 custom_llm_provider=custom_llm_provider,
                 **kwargs,
@@ -730,7 +798,7 @@ def anthropic_messages_handler(
         return LiteLLMMessagesToCompletionTransformationHandler.anthropic_messages_handler(
             max_tokens=max_tokens,
             messages=messages,
-            model=original_model,
+            model=bridge.model,
             metadata=metadata,
             stop_sequences=stop_sequences,
             stream=stream,
@@ -744,8 +812,8 @@ def anthropic_messages_handler(
             top_k=top_k,
             top_p=top_p,
             _is_async=is_async,
-            api_key=api_key,
-            api_base=api_base,
+            api_key=bridge.api_key,
+            api_base=bridge.api_base,
             client=client,
             custom_llm_provider=custom_llm_provider,
             **kwargs,
diff --git a/litellm/llms/anthropic/messages/responses_adapters/handler.py b/litellm/llms/anthropic/messages/responses_adapters/handler.py
index 0eef3fd87c0..8b638f2c03a 100644
--- a/litellm/llms/anthropic/messages/responses_adapters/handler.py
+++ b/litellm/llms/anthropic/messages/responses_adapters/handler.py
@@ -21,9 +21,10 @@ from litellm.litellm_core_utils.asyncify import (
 from litellm.litellm_core_utils.core_helpers import as_str_mapping, drops_unsupported_params
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
     cache_control_as_prompt_cache_breakpoint,
-    prompt_cache_breakpoint_for_wire,
+    prompt_cache_breakpoint_with_readable_mode,
     with_prompt_cache_breakpoint,
 )
+from litellm.litellm_core_utils.tool_fields import drops_mcp_servers, tools_without_mcp_servers
 from litellm.responses.utils import auto_reasoning_summary
 from litellm.types.integrations.custom_logger import CONVERTED_STREAM_KEYS
 from litellm.types.llms.anthropic import (
@@ -207,7 +208,7 @@ def _without_prompt_cache_breakpoint(block: Mapping[str, object]) -> Mapping[str
 def _cache_control_as_wire_safe_prompt_cache_breakpoint(block: Mapping[str, object]) -> Mapping[str, object]:
     if "prompt_cache_breakpoint" not in block:
         return cache_control_as_prompt_cache_breakpoint(block)
-    wire_marker: Final = prompt_cache_breakpoint_for_wire(block["prompt_cache_breakpoint"], drop_params=True)
+    wire_marker: Final = prompt_cache_breakpoint_with_readable_mode(block["prompt_cache_breakpoint"], drop_params=True)
     return cache_control_as_prompt_cache_breakpoint(
         with_prompt_cache_breakpoint(_without_prompt_cache_breakpoint(block), wire_marker)
     )
@@ -272,6 +273,14 @@ def _build_responses_kwargs(
     """
     forwarded_kwargs: Final = _forwarded_kwargs(extra_kwargs)
     reject_malformed_tool_result_text(messages, model, forwarded_kwargs)
+    target_provider: Final = forwarded_kwargs.get("custom_llm_provider")
+    request_tools: Final = tools_without_mcp_servers(
+        forwarded_kwargs.get("mcp_servers"),
+        tools or (),
+        model=model,
+        route=target_provider if isinstance(target_provider, str) else "this route",
+        drop_params=drops_mcp_servers(forwarded_kwargs),
+    )
     block_rewrite: Final = _prompt_cache_block_rewrite(model, forwarded_kwargs)
     request_messages: Final[AnthropicRequestMessages] = (
         [
@@ -304,10 +313,10 @@ def _build_responses_kwargs(
         request_data["temperature"] = temperature
     if thinking:
         request_data["thinking"] = thinking
-    if tool_choice:
+    if tool_choice and (request_tools or not tools):
         request_data["tool_choice"] = tool_choice
-    if tools:
-        request_data["tools"] = tools
+    if request_tools:
+        request_data["tools"] = list(request_tools)
     if top_p is not None:
         request_data["top_p"] = top_p
     if output_format:
@@ -347,7 +356,7 @@ def _build_responses_kwargs(
         responses_kwargs["stream"] = True
 
     # Forward litellm-specific kwargs (api_key, api_base, logging obj, etc.)
-    excluded: Final = CONVERTED_STREAM_KEYS | {"anthropic_messages"}
+    excluded: Final = CONVERTED_STREAM_KEYS | {"anthropic_messages", "mcp_servers"}
     for key, value in forwarded_kwargs.items():
         if key == "litellm_logging_obj" and value is not None:
             from litellm.litellm_core_utils.litellm_logging import (
diff --git a/litellm/llms/azure/chat/gpt_reasoning_transformation.py b/litellm/llms/azure/chat/gpt_reasoning_transformation.py
index 72a0500e0af..29305866e23 100644
--- a/litellm/llms/azure/chat/gpt_reasoning_transformation.py
+++ b/litellm/llms/azure/chat/gpt_reasoning_transformation.py
@@ -1,6 +1,6 @@
 """Support for Azure OpenAI gpt-5 model family."""
 
-from collections.abc import Collection
+from collections.abc import Collection, Mapping
 from typing import ClassVar, Final
 
 import litellm
@@ -105,7 +105,7 @@ class AzureOpenAIGPT5Config(AzureOpenAIConfig, OpenAIGPT5Config):
         model: str,
         messages: list[AllMessageValues],
         optional_params: dict,
-        litellm_params: dict,
+        litellm_params: Mapping[str, object],
         headers: dict,
     ) -> dict:
         model = model.replace(self.GPT5_SERIES_ROUTE, "")
diff --git a/litellm/llms/azure/chat/gpt_transformation.py b/litellm/llms/azure/chat/gpt_transformation.py
index 990c8869de3..fdb012756fc 100644
--- a/litellm/llms/azure/chat/gpt_transformation.py
+++ b/litellm/llms/azure/chat/gpt_transformation.py
@@ -5,12 +5,16 @@ from typing import TYPE_CHECKING, Any, Final
 from httpx._models import Headers, Response
 
 import litellm
+from litellm.integrations.anthropic_cache_control_hook import deployment_prompt_cache_breakpoint_support
+from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
+    chat_completion_prompt_cache_breakpoints_for_wire,
     drop_tool_reference_parts_from_tool_messages,
     flatten_combinators_and_drop_non_python_regex_patterns,
     hoist_images_from_tool_messages,
     system_messages_first,
     tool_with_sanitized_parameters,
+    without_prompt_cache_breakpoints,
 )
 from litellm.litellm_core_utils.prompt_templates.factory import (
     convert_to_azure_openai_messages,
@@ -290,11 +294,16 @@ class AzureOpenAIConfig(BaseConfig):
         model: str,
         messages: list[AllMessageValues],
         optional_params: dict,
-        litellm_params: dict,
+        litellm_params: Mapping[str, object],
         headers: dict,
     ) -> dict:
         ordered_messages: Final = system_messages_first(messages) if litellm.openai_system_messages_first else messages
-        stripped_messages: Final = drop_tool_reference_parts_from_tool_messages(ordered_messages)
+        wire_messages: Final = (
+            self._with_wire_safe_prompt_cache_breakpoints(model, ordered_messages, litellm_params)
+            if drops_unsupported_params(litellm_params.get("drop_params"))
+            else ordered_messages
+        )
+        stripped_messages: Final = drop_tool_reference_parts_from_tool_messages(wire_messages)
         azure_messages: Final = convert_to_azure_openai_messages(hoist_images_from_tool_messages(stripped_messages))
         request_params: Final = MappingProxyType(
             {
@@ -310,6 +319,14 @@ class AzureOpenAIConfig(BaseConfig):
             **sanitized_tools_update(optional_params),
         }
 
+    @staticmethod
+    def _with_wire_safe_prompt_cache_breakpoints(
+        model: str, messages: list[AllMessageValues], litellm_params: Mapping[str, object]
+    ) -> list[AllMessageValues]:
+        if deployment_prompt_cache_breakpoint_support(model, "azure", litellm_params) is False:
+            return [without_prompt_cache_breakpoints(message) for message in messages]
+        return [chat_completion_prompt_cache_breakpoints_for_wire(message, drop_params=True) for message in messages]
+
     def transform_response(
         self,
         model: str,
diff --git a/litellm/llms/azure/responses/transformation.py b/litellm/llms/azure/responses/transformation.py
index 2b757bb10d9..6c954d00e64 100644
--- a/litellm/llms/azure/responses/transformation.py
+++ b/litellm/llms/azure/responses/transformation.py
@@ -1,6 +1,7 @@
 import re
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 from copy import deepcopy
+from functools import partial
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, Literal
 from urllib.parse import urlsplit
@@ -11,6 +12,7 @@ from pydantic import TypeAdapter
 
 from litellm._logging import verbose_logger
 from litellm.constants import AZURE_DEFAULT_RESPONSES_API_VERSION
+from litellm.litellm_core_utils.prompt_templates.common_utils import prompt_cache_breakpoint_within
 from litellm.litellm_core_utils.url_utils import encode_url_path_segment
 from litellm.llms.azure.chat.gpt_reasoning_transformation import AzureOpenAIGPT5Config
 from litellm.llms.azure.common_utils import BaseAzureLLM
@@ -29,6 +31,7 @@ else:
     LiteLLMLoggingObj = Any
 
 _DECODED_JSON: Final = TypeAdapter(object)
+_AZURE_RESPONSES_PROMPT_CACHE_BREAKPOINT: Final = TypeAdapter(AzureResponsesPromptCacheBreakpoint)
 
 
 _DATED_GA_API_VERSION: Final = re.compile(r"\d{4}-\d{2}-\d{2}")
@@ -81,6 +84,13 @@ class AzureOpenAIResponsesAPIConfig(OpenAIResponsesAPIConfig):
     def _is_gpt_5_model(model: str) -> bool:
         return AzureOpenAIGPT5Config.is_model_gpt_5_model(model)
 
+    def _prompt_cache_breakpoint_to_wire(
+        self, litellm_params: GenericLiteLLMParams, reads_breakpoints: bool, known_support: bool | None
+    ) -> Callable[[object], object]:
+        if reads_breakpoints or known_support is True:
+            return partial(prompt_cache_breakpoint_within, _AZURE_RESPONSES_PROMPT_CACHE_BREAKPOINT)
+        return super()._prompt_cache_breakpoint_to_wire(litellm_params, reads_breakpoints, known_support)
+
     @staticmethod
     def _supports_reasoning_effort_none(model: str) -> bool:
         return AzureOpenAIGPT5Config.supports_reasoning_effort_level(model, "none")
diff --git a/litellm/llms/azure_ai/anthropic/count_tokens/handler.py b/litellm/llms/azure_ai/anthropic/count_tokens/handler.py
index c324f0f0980..97ee44bd3bb 100644
--- a/litellm/llms/azure_ai/anthropic/count_tokens/handler.py
+++ b/litellm/llms/azure_ai/anthropic/count_tokens/handler.py
@@ -12,6 +12,7 @@ from pydantic import JsonValue
 
 import litellm
 from litellm._logging import verbose_logger
+from litellm.anthropic_beta_headers_manager import aload_beta_headers_config
 from litellm.litellm_core_utils.asyncify import asyncify
 from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
 from litellm.llms.anthropic.common_utils import AnthropicError
@@ -39,6 +40,7 @@ class AzureAIAnthropicCountTokensHandler(AzureAIAnthropicCountTokensConfig):
         tools: list[dict[str, JsonValue]] | None = None,
         system: object = None,
         optional_params: Mapping[str, JsonValue] | None = None,
+        context_management: JsonValue = None,
     ) -> dict[str, object]:
         """
         Handle a CountTokens request using httpx with Azure authentication.
@@ -70,6 +72,7 @@ class AzureAIAnthropicCountTokensHandler(AzureAIAnthropicCountTokensConfig):
                 tools=tools,
                 system=system,
                 optional_params=optional_params,
+                context_management=context_management,
                 drop_params=drops_unsupported_params((litellm_params or {}).get("drop_params")),
             )
 
@@ -80,11 +83,14 @@ class AzureAIAnthropicCountTokensHandler(AzureAIAnthropicCountTokensConfig):
 
             verbose_logger.debug("Making request to: %s", endpoint_url)
 
+            if context_management is not None:
+                await aload_beta_headers_config()
             # Get required headers with Azure authentication
             headers: Final = self.get_required_headers(
                 api_key=api_key,
                 litellm_params=litellm_params,
                 messages=messages,
+                context_management=context_management,
             )
             if not {"x-api-key", "Authorization"} & headers.keys():
                 raise AnthropicError(
diff --git a/litellm/llms/azure_ai/anthropic/count_tokens/token_counter.py b/litellm/llms/azure_ai/anthropic/count_tokens/token_counter.py
index af7cf9d81ce..14f7d4bfd2b 100644
--- a/litellm/llms/azure_ai/anthropic/count_tokens/token_counter.py
+++ b/litellm/llms/azure_ai/anthropic/count_tokens/token_counter.py
@@ -135,6 +135,7 @@ class AzureAIAnthropicTokenCounter(BaseTokenCounter):
                 tools=tools,
                 system=system,
                 optional_params=count_options,
+                context_management=None if context_management is None else context_management.spec,
             )
 
             if result is not None:
diff --git a/litellm/llms/azure_ai/anthropic/count_tokens/transformation.py b/litellm/llms/azure_ai/anthropic/count_tokens/transformation.py
index c02c92a95d6..91ed40d9271 100644
--- a/litellm/llms/azure_ai/anthropic/count_tokens/transformation.py
+++ b/litellm/llms/azure_ai/anthropic/count_tokens/transformation.py
@@ -8,9 +8,16 @@ from collections.abc import Sequence
 from typing import Final
 from urllib.parse import urlsplit
 
+from pydantic import JsonValue
+
+from litellm.anthropic_beta_headers_manager import filter_and_transform_beta_headers
 from litellm.constants import ANTHROPIC_TOKEN_COUNTING_BETA_VERSION
 from litellm.litellm_core_utils.url_utils import join_api_base
-from litellm.llms.anthropic.common_utils import count_tokens_feature_betas, merge_anthropic_beta_headers
+from litellm.llms.anthropic.common_utils import (
+    context_management_betas,
+    count_tokens_feature_betas,
+    merge_anthropic_beta_headers,
+)
 from litellm.llms.anthropic.count_tokens.transformation import (
     AnthropicCountTokensConfig,
 )
@@ -31,6 +38,7 @@ class AzureAIAnthropicCountTokensConfig(AnthropicCountTokensConfig):
         api_key: str | None,
         litellm_params: dict[str, object] | None = None,
         messages: Sequence[object] = (),
+        context_management: JsonValue = None,
     ) -> dict[str, str]:
         """
         Get the required headers for the Azure AI Anthropic CountTokens API.
@@ -42,6 +50,7 @@ class AzureAIAnthropicCountTokensConfig(AnthropicCountTokensConfig):
             api_key: The Azure AI API key
             litellm_params: Optional LiteLLM parameters for additional auth config
             messages: The request messages, read for betas the counted features need
+            context_management: The edit spec the count forwards, read for the betas its edits need
 
         Returns:
             Dictionary of required headers with both x-api-key and Azure authentication
@@ -51,7 +60,11 @@ class AzureAIAnthropicCountTokensConfig(AnthropicCountTokensConfig):
             "Content-Type": "application/json",
             "anthropic-version": "2023-06-01",
             "anthropic-beta": merge_anthropic_beta_headers(
-                ANTHROPIC_TOKEN_COUNTING_BETA_VERSION, count_tokens_feature_betas("azure_ai", {}, messages)
+                ANTHROPIC_TOKEN_COUNTING_BETA_VERSION,
+                (
+                    *count_tokens_feature_betas("azure_ai", {}, messages),
+                    *filter_and_transform_beta_headers(list(context_management_betas(context_management)), "azure_ai"),
+                ),
             ),
             **({"x-api-key": api_key} if api_key else {}),
         }
diff --git a/litellm/llms/base_llm/google_genai/transformation.py b/litellm/llms/base_llm/google_genai/transformation.py
index 232d9d8eb42..0c7054326b7 100644
--- a/litellm/llms/base_llm/google_genai/transformation.py
+++ b/litellm/llms/base_llm/google_genai/transformation.py
@@ -164,7 +164,7 @@ class BaseGoogleGenAIGenerateContentConfig(ABC):
         tools: ToolConfigDict | None,
         generate_content_config_dict: dict,
         system_instruction: object | None = None,
-    ) -> dict:
+    ) -> dict[str, object]:
         """
         Transform the request parameters for the generate content API.
 
diff --git a/litellm/llms/bedrock/chat/converse_transformation.py b/litellm/llms/bedrock/chat/converse_transformation.py
index 21af97e523e..2d185068815 100644
--- a/litellm/llms/bedrock/chat/converse_transformation.py
+++ b/litellm/llms/bedrock/chat/converse_transformation.py
@@ -52,6 +52,7 @@ from litellm.litellm_core_utils.prompt_templates.mid_conversation_system import
     parts_of,
 )
 from litellm.litellm_core_utils.reasoning_effort_utils import OPAQUE_VALUE, warn_dropped_reasoning
+from litellm.litellm_core_utils.tool_fields import tool_params_without_hosted_mcp
 from litellm.llms.anthropic.chat.transformation import (
     DROP_UNSUPPORTED_ADAPTIVE_THINKING_WARNING,
     DROP_UNSUPPORTED_OUTPUT_CONFIG_WARNING,
@@ -63,6 +64,7 @@ from litellm.llms.anthropic.common_utils import AnthropicModelInfo
 from litellm.llms.base_llm.chat.transformation import REQUEST_PARAMS, BaseConfig, BaseLLMException
 from litellm.llms.bedrock.chat.tool_result_images import place_tool_result_images
 from litellm.llms.bedrock.common_utils import (
+    bedrock_chat_opts_into_native_structured_output,
     bedrock_chat_uses_native_structured_output,
     bedrock_cleaned_output_schema,
     bedrock_model_is_unknown,
@@ -933,8 +935,9 @@ class AmazonConverseConfig(BaseConfig):
         """Check if the Bedrock model takes native structured outputs (outputConfig.textFormat) for this request.
 
         ``supports_native_structured_output`` in ``litellm.model_cost`` turns it on for every request, and
-        ``supports_bedrock_native_structured_output`` (the deployment's ``model_info`` first) only when the
-        request asks for thinking, which the json tool path would drop.
+        ``supports_bedrock_native_structured_output`` (the deployment's ``model_info`` first) also when the
+        request asks for thinking, which the json tool path would drop. Without thinking, a model that cannot
+        force the json tool gets it unless that key is false.
         Ref: https://docs.aws.amazon.com/bedrock/latest/userguide/structured-output.html
         """
         return bedrock_chat_uses_native_structured_output(
@@ -1068,20 +1071,23 @@ class AmazonConverseConfig(BaseConfig):
         drop_params: bool,
         model_info: Mapping[str, object] | None = None,
     ) -> dict:
-        is_thinking_enabled: Final = self.is_thinking_enabled(non_default_params)
+        request_params: Final = tool_params_without_hosted_mcp(
+            non_default_params, model=model, route="bedrock", drop_params=drop_params
+        )
+        is_thinking_enabled: Final = self.is_thinking_enabled(request_params)
         base_model: Final = BedrockModelInfo.get_base_model(model)
         drop_thinking_param: Final = self._is_deepseek_model(model=model, base_model=base_model)
         drop_reasoning_effort_param: Final = self._model_rejects_reasoning_effort_param(
             model=model, base_model=base_model
         )
 
-        for param, value in non_default_params.items():
+        for param, value in request_params.items():
             if param == "response_format" and isinstance(value, dict):
                 optional_params = self._translate_response_format_param(
                     value=value,
                     model=model,
                     optional_params=optional_params,
-                    non_default_params=non_default_params,
+                    non_default_params=request_params,
                     is_thinking_enabled=is_thinking_enabled,
                     model_info=model_info,
                 )
@@ -1135,7 +1141,7 @@ class AmazonConverseConfig(BaseConfig):
                         ),
                     ),
                     model=model,
-                    non_default_params=non_default_params,
+                    non_default_params=request_params,
                     optional_params=optional_params,
                 )
             if param == "tool_choice":
@@ -1160,7 +1166,7 @@ class AmazonConverseConfig(BaseConfig):
                     and value.get("type") == "adaptive"
                     and not AnthropicConfig.is_adaptive_thinking_model(model, "bedrock")
                 ):
-                    max_tokens = non_default_params.get("max_completion_tokens") or non_default_params.get("max_tokens")
+                    max_tokens = request_params.get("max_completion_tokens") or request_params.get("max_tokens")
                     legacy_thinking = AnthropicConfig.map_reasoning_effort(
                         reasoning_effort="medium",
                         model=model,
@@ -1230,7 +1236,7 @@ class AmazonConverseConfig(BaseConfig):
         # Nova 2 handles token budgeting differently through reasoningConfig
         if "gpt-oss" not in model and not self._is_nova_2_model(model):
             self.update_optional_params_with_thinking_tokens(
-                non_default_params=non_default_params, optional_params=optional_params
+                non_default_params=request_params, optional_params=optional_params
             )
 
         final_is_thinking_enabled: Final = self.is_thinking_enabled(optional_params)
@@ -1312,19 +1318,15 @@ class AmazonConverseConfig(BaseConfig):
         if "type" in value and value["type"] == "text":
             return optional_params
 
+        thinking_requested: Final = self.is_thinking_requested(REQUEST_PARAMS.validate_python(non_default_params))
         native_schema: Final = (
-            self._native_output_schema(
-                model,
-                json_schema,
-                self.is_thinking_requested(REQUEST_PARAMS.validate_python(non_default_params)),
-                model_info,
-            )
+            self._native_output_schema(model, json_schema, thinking_requested, model_info)
             if json_schema is not None
             else None
         )
         if native_schema is not None:
             # Use Bedrock's native structured outputs API (outputConfig.textFormat)
-            # No synthetic tool injection, no fake_stream needed.
+            # No synthetic tool injection.
             # Requires an explicit schema — json_object with no schema falls through
             # to the tool-call path below.
             output_config: Final = self._create_output_config_for_response_format(
@@ -1350,8 +1352,6 @@ class AmazonConverseConfig(BaseConfig):
                 optional_params["tool_choice"] = ToolChoiceValuesBlock(
                     tool=SpecificToolChoiceBlock(name=RESPONSE_FORMAT_TOOL_NAME)
                 )
-            if non_default_params.get("stream", False) is True:
-                optional_params["fake_stream"] = True
         # else: response_format=json_object with no schema.
         # Don't inject the synthetic json_tool_call tool here. When no
         # schema is given, _create_json_tool_call_for_response_format
@@ -1359,6 +1359,13 @@ class AmazonConverseConfig(BaseConfig):
         # returns {} instead of the requested JSON. The model already
         # returns JSON when the prompt asks for it.
 
+        # A request that goes native only because the model can't force the json tool keeps the json tool's faked
+        # stream, so it still needs only bedrock:InvokeModel.
+        streams_natively: Final = native_schema is not None and bedrock_chat_opts_into_native_structured_output(
+            model, thinking_requested, self.custom_llm_provider or "bedrock_converse", model_info
+        )
+        if json_schema is not None and not streams_natively and non_default_params.get("stream", False) is True:
+            optional_params["fake_stream"] = True
         optional_params["json_mode"] = True
         return optional_params
 
diff --git a/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude_transformation.py b/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude_transformation.py
index e32df0bbdbb..e2f12b123de 100644
--- a/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude_transformation.py
+++ b/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude_transformation.py
@@ -1,11 +1,13 @@
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 from typing import TYPE_CHECKING, Any, Final
 
 import httpx
 from pydantic import TypeAdapter
 
+import litellm
 from litellm.anthropic_beta_gated_fields import strip_beta_gated_request_body
 from litellm.anthropic_beta_headers_manager import filter_and_transform_beta_headers
+from litellm.constants import DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS
 from litellm.litellm_core_utils.llm_cost_calc.guardrail_cost import object_mapping
 from litellm.litellm_core_utils.prompt_templates.factory import (
     convert_to_anthropic_image_obj,
@@ -25,7 +27,9 @@ from litellm.llms.bedrock.chat.invoke_transformations.base_invoke_transformation
 )
 from litellm.llms.bedrock.common_utils import (
     BEDROCK_INVOKE_TRACE_FIELD,
+    BedrockModelInfo,
     apply_bedrock_invoke_structured_output,
+    bedrock_capability_model,
     bedrock_chat_uses_native_structured_output,
     bedrock_cleaned_output_schema,
     bedrock_supports_tool_search,
@@ -35,6 +39,7 @@ from litellm.llms.bedrock.common_utils import (
     normalize_custom_field_on_tools,
     normalize_tool_input_schema_types_for_bedrock_invoke,
     requests_opt_in_native_output,
+    strip_bedrock_routing_prefix,
     strip_unsupported_bedrock_invoke_output_config_keys,
     tools_without_eager_input_streaming,
 )
@@ -59,6 +64,19 @@ _NON_DEFAULT_PARAMS: Final = TypeAdapter(Mapping[str, object])
 _LITELLM_PARAMS: Final = TypeAdapter(Mapping[str, object])
 
 
+def _anthropic_config_max_tokens() -> int | None:
+    return litellm.AnthropicConfig.max_tokens
+
+
+def _mapped_max_tokens(model: str) -> int | None:
+    row: Final = object_mapping(litellm.model_cost.get(model)) or {}  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]  # cost map rows are untyped JSON
+    match row.get("max_output_tokens"):
+        case int() as max_tokens:
+            return max_tokens
+        case _:
+            return None
+
+
 class AmazonAnthropicClaudeConfig(AmazonInvokeConfig, AnthropicConfig):
     """
     Reference:
@@ -79,9 +97,18 @@ class AmazonAnthropicClaudeConfig(AmazonInvokeConfig, AnthropicConfig):
 
     anthropic_version: str = "bedrock-2023-05-31"
 
-    def __init__(self, model_info: Mapping[str, object] | None = None) -> None:
+    def __init__(
+        self,
+        model_info: Mapping[str, object] | None = None,
+        read_configured_max_tokens: Callable[[], int | None] = _anthropic_config_max_tokens,
+    ) -> None:
         super().__init__()
         self._deployment_model_info: Final = model_info
+        self._read_configured_max_tokens: Final = read_configured_max_tokens
+
+    @classmethod
+    def get_config(cls, *, model: str | None = None) -> dict[str, object]:  # mutable-ok: overrides BaseConfig's dict
+        return {key: value for key, value in super().get_config(model=model).items() if key != "max_tokens"}
 
     @property
     def custom_llm_provider(self) -> str | None:
@@ -102,10 +129,15 @@ class AmazonAnthropicClaudeConfig(AmazonInvokeConfig, AnthropicConfig):
         json_schema: Mapping[str, object] | None,
         request_params: Mapping[str, object],
     ) -> bool:
-        return bedrock_chat_uses_native_structured_output(
-            model, self.is_thinking_requested(request_params), model_info=self._deployment_model_info
+        return self.chat_uses_native_structured_output(
+            model, self.is_thinking_requested(request_params), self._deployment_model_info
         ) and (json_schema is None or bedrock_cleaned_output_schema(model, json_schema) is not None)
 
+    def chat_uses_native_structured_output(
+        self, model: str, thinking_requested: bool, model_info: Mapping[str, object] | None
+    ) -> bool:
+        return bedrock_chat_uses_native_structured_output(model, thinking_requested, model_info=model_info)
+
     def uses_opt_in_native_output(
         self, model: str, optional_params: Mapping[str, object], litellm_params: Mapping[str, object]
     ) -> bool:
@@ -241,6 +273,36 @@ class AmazonAnthropicClaudeConfig(AmazonInvokeConfig, AnthropicConfig):
             headers=headers,
         )
 
+    def _default_max_tokens_models(self, model: str, litellm_params: Mapping[str, object]) -> tuple[str, ...]:
+        return (
+            BedrockModelInfo.get_base_model(
+                bedrock_capability_model(strip_bedrock_routing_prefix(model), litellm_params.get("base_model"))
+            ),
+        )
+
+    def _default_max_tokens(self, model: str, litellm_params: Mapping[str, object]) -> int:
+        configured_max_tokens: Final = self._read_configured_max_tokens()
+        match deployment_model_info(litellm_params).get("max_output_tokens"):
+            case int() as deployment_max_tokens:
+                return (
+                    deployment_max_tokens
+                    if configured_max_tokens is None
+                    else min(deployment_max_tokens, configured_max_tokens)
+                )
+            case _ if configured_max_tokens is not None:
+                return configured_max_tokens
+            case _:
+                return next(
+                    (
+                        max_tokens
+                        for max_tokens in map(
+                            _mapped_max_tokens, self._default_max_tokens_models(model, litellm_params)
+                        )
+                        if max_tokens is not None
+                    ),
+                    DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS,
+                )
+
     def _build_bedrock_anthropic_request_base(
         self,
         model: str,
@@ -257,23 +319,35 @@ class AmazonAnthropicClaudeConfig(AmazonInvokeConfig, AnthropicConfig):
                 model=model,
                 output_config=filtered_params["output_config"],
             )
-        filtered_params = self._normalize_bedrock_tool_search_tools(filtered_params)
+        normalized_params: Final = self._normalize_bedrock_tool_search_tools(filtered_params)
+        default_max_tokens: Final = (
+            None
+            if "max_tokens" in normalized_params
+            else self._default_max_tokens(model, _LITELLM_PARAMS.validate_python(litellm_params))
+        )
+        request_params: Final = (
+            normalized_params if default_max_tokens is None else {**normalized_params, "max_tokens": default_max_tokens}
+        )
 
         anthropic_request: Final = AnthropicConfig.transform_request(
             self,
             model=model,
             messages=messages,
-            optional_params=filtered_params,
+            optional_params=request_params,
             litellm_params=litellm_params,
             headers=headers,
         )
 
         anthropic_request.pop("model", None)
         anthropic_request.pop("stream", None)
+        model_info: Final = deployment_model_info(_LITELLM_PARAMS.validate_python(litellm_params))
         apply_bedrock_invoke_structured_output(
             model=model,
             request_body=anthropic_request,
-            model_info=deployment_model_info(_LITELLM_PARAMS.validate_python(litellm_params)),
+            model_info=model_info,
+            chat_uses_native_output=lambda: self.chat_uses_native_structured_output(
+                model, self.is_thinking_requested(_NON_DEFAULT_PARAMS.validate_python(filtered_params)), model_info
+            ),
         )
         strip_unsupported_bedrock_invoke_output_config_keys(
             model=model,
@@ -377,7 +451,7 @@ class AmazonAnthropicClaudeConfig(AmazonInvokeConfig, AnthropicConfig):
                     "data": image_chunk["data"],
                 }
 
-    def _normalize_bedrock_tool_search_tools(self, optional_params: dict) -> dict:
+    def _normalize_bedrock_tool_search_tools(self, optional_params: dict) -> dict[str, object]:
         """
         Convert tool search entries to the format supported by the Bedrock Invoke API.
         """
diff --git a/litellm/llms/bedrock/chat/mantle/transformation.py b/litellm/llms/bedrock/chat/mantle/transformation.py
index b5a352bab48..952ca7a2cd4 100644
--- a/litellm/llms/bedrock/chat/mantle/transformation.py
+++ b/litellm/llms/bedrock/chat/mantle/transformation.py
@@ -15,7 +15,7 @@ from litellm.llms.anthropic.chat.transformation import JsonModeRequest
 from litellm.llms.bedrock.chat.invoke_transformations.anthropic_claude_transformation import (
     AmazonAnthropicClaudeConfig,
 )
-from litellm.llms.bedrock.common_utils import build_mantle_messages_url
+from litellm.llms.bedrock.common_utils import bedrock_chat_opts_into_native_structured_output, build_mantle_messages_url
 from litellm.types.llms.openai import AllMessageValues
 from litellm.types.utils import ModelResponse
 
@@ -54,6 +54,14 @@ class AmazonMantleConfig(AmazonAnthropicClaudeConfig):
             region=region,
         )
 
+    def chat_uses_native_structured_output(
+        self, model: str, thinking_requested: bool, model_info: Mapping[str, object] | None
+    ) -> bool:
+        return bedrock_chat_opts_into_native_structured_output(model, thinking_requested, model_info=model_info)
+
+    def _default_max_tokens_models(self, model: str, litellm_params: Mapping[str, object]) -> tuple[str, ...]:
+        return (f"bedrock_mantle/{model}", *super()._default_max_tokens_models(model, litellm_params))
+
     def validate_environment(
         self,
         headers: dict,
diff --git a/litellm/llms/bedrock/claude_platform/transformation.py b/litellm/llms/bedrock/claude_platform/transformation.py
index a5ecc37d394..6efc4b506e8 100644
--- a/litellm/llms/bedrock/claude_platform/transformation.py
+++ b/litellm/llms/bedrock/claude_platform/transformation.py
@@ -30,6 +30,9 @@ class BedrockClaudePlatformConfig(BedrockClaudePlatformMixin, AnthropicConfig):
     def should_strip_billing_metadata(self) -> bool:
         return True
 
+    def runs_hosted_mcp(self) -> bool:
+        return True
+
     def validate_environment(
         self,
         headers: dict,
diff --git a/litellm/llms/bedrock/common_utils.py b/litellm/llms/bedrock/common_utils.py
index d6f5d5b6bd7..3126450b287 100644
--- a/litellm/llms/bedrock/common_utils.py
+++ b/litellm/llms/bedrock/common_utils.py
@@ -10,7 +10,7 @@ import json
 import os
 import re
 import warnings
-from collections.abc import Iterator, Mapping, Sequence
+from collections.abc import Callable, Iterator, Mapping, Sequence
 from dataclasses import dataclass
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, Literal, TypeAlias
@@ -36,6 +36,7 @@ from litellm.litellm_core_utils.aws_partition import get_aws_dns_suffix
 from litellm.litellm_core_utils.optional_imports import ensure_optional_import
 from litellm.litellm_core_utils.prompt_templates.common_utils import schema_property_count
 from litellm.litellm_core_utils.url_utils import ensure_api_route
+from litellm.llms.anthropic.common_utils import AnthropicModelInfo
 from litellm.llms.base_llm.anthropic_messages.transformation import (
     BaseAnthropicMessagesConfig,
 )
@@ -43,6 +44,7 @@ from litellm.llms.base_llm.base_utils import BaseLLMModelInfo, BaseTokenCounter
 from litellm.llms.base_llm.chat.transformation import BaseLLMException
 from litellm.llms.bedrock.request_metadata import bedrock_request_metadata_is_owned
 from litellm.secret_managers.main import get_secret, get_secret_str
+from litellm.types.llms.anthropic import ANTHROPIC_BETA_HEADER_VALUES
 from litellm.types.llms.bedrock import AWS_AUTH_PARAM_KEYS, AwsAuthParams
 
 if TYPE_CHECKING:
@@ -50,6 +52,12 @@ if TYPE_CHECKING:
     from litellm.types.llms.openai import AllMessageValues
 
 BEDROCK_INVOKE_TRACE_FIELD: Final = "amazon-bedrock-trace"
+BEDROCK_INVOKE_CONTEXT_MANAGEMENT_EDIT_BETAS: Final[Mapping[str, str]] = MappingProxyType(
+    {
+        "compact_20260112": ANTHROPIC_BETA_HEADER_VALUES.COMPACT_2026_01_12.value,
+        "clear_tool_uses_20250919": ANTHROPIC_BETA_HEADER_VALUES.CONTEXT_MANAGEMENT_2025_06_27.value,
+    }
+)
 
 
 _ERROR_REQUEST_URL: Final = "https://docs.litellm.ai/docs"
@@ -308,7 +316,33 @@ def bedrock_supports_native_structured_output(
     ) or _bedrock_native_output_opt_in(model, custom_llm_provider, model_info)
 
 
-def bedrock_chat_uses_native_structured_output(
+def _bedrock_map_native_output_flag(model: str) -> object:
+    routed: Final = strip_bedrock_routing_prefix(model)
+    flags: Final = (
+        (entry or {}).get("supports_bedrock_native_structured_output")
+        for entry in (
+            _model_cost_entry(f"bedrock/{routed}"),
+            _model_cost_entry(routed),
+            _model_cost_entry(split_bedrock_region_path(model)[1]),
+        )
+    )
+    return next((flag for flag in flags if isinstance(flag, bool)), None)
+
+
+def _bedrock_native_output_opted_out(model: str, model_info: Mapping[str, object] | None) -> bool:
+    deployment_flag: Final = (model_info or {}).get("supports_bedrock_native_structured_output")
+    if isinstance(deployment_flag, bool):
+        return not deployment_flag
+    return _bedrock_map_native_output_flag(model) is False
+
+
+def _bedrock_native_output_replaces_unforceable_tool(model: str, model_info: Mapping[str, object] | None) -> bool:
+    return AnthropicModelInfo.forced_tool_use_unsupported(model) and not _bedrock_native_output_opted_out(
+        model, model_info
+    )
+
+
+def bedrock_chat_opts_into_native_structured_output(
     model: str,
     thinking_requested: bool,
     custom_llm_provider: str = "bedrock",
@@ -319,7 +353,18 @@ def bedrock_chat_uses_native_structured_output(
     )
 
 
-def bedrock_native_output_is_opt_in(
+def bedrock_chat_uses_native_structured_output(
+    model: str,
+    thinking_requested: bool,
+    custom_llm_provider: str = "bedrock",
+    model_info: Mapping[str, object] | None = None,
+) -> bool:
+    return bedrock_chat_opts_into_native_structured_output(
+        model, thinking_requested, custom_llm_provider, model_info
+    ) or (not thinking_requested and _bedrock_native_output_replaces_unforceable_tool(model, model_info))
+
+
+def bedrock_native_output_is_deployment_opt_in(
     model: str, custom_llm_provider: str = "bedrock", model_info: Mapping[str, object] | None = None
 ) -> bool:
     return not _bedrock_model_supports(
@@ -327,6 +372,15 @@ def bedrock_native_output_is_opt_in(
     ) and _bedrock_native_output_opt_in(model, custom_llm_provider, model_info)
 
 
+def bedrock_native_output_is_opt_in(
+    model: str, custom_llm_provider: str = "bedrock", model_info: Mapping[str, object] | None = None
+) -> bool:
+    return not _bedrock_model_supports(model, "supports_native_structured_output", custom_llm_provider) and (
+        _bedrock_native_output_opt_in(model, custom_llm_provider, model_info)
+        or _bedrock_native_output_replaces_unforceable_tool(model, model_info)
+    )
+
+
 def without_bedrock_native_output_opt_in(litellm_params: Mapping[str, object]) -> Mapping[str, object]:
     return {
         **litellm_params,
@@ -417,13 +471,18 @@ def requests_output_config_format(optional_params: Mapping[str, object]) -> bool
             return False
 
 
+def requests_native_output(anthropic_optional_params: Mapping[str, object]) -> bool:
+    return isinstance(anthropic_optional_params.get("output_format"), Mapping) or requests_output_config_format(
+        anthropic_optional_params
+    )
+
+
 def requests_opt_in_native_output(
     model: str, anthropic_optional_params: Mapping[str, object], model_info: Mapping[str, object] | None
 ) -> bool:
-    native_output_requested: Final = isinstance(
-        anthropic_optional_params.get("output_format"), Mapping
-    ) or requests_output_config_format(anthropic_optional_params)
-    return native_output_requested and bedrock_native_output_is_opt_in(model, model_info=model_info)
+    return requests_native_output(anthropic_optional_params) and bedrock_native_output_is_opt_in(
+        model, model_info=model_info
+    )
 
 
 _JSON_OBJECT: Final = TypeAdapter(dict[str, object])
@@ -484,6 +543,7 @@ def apply_bedrock_invoke_structured_output(
     model: str,
     request_body: dict[str, object],  # mutable-ok: edited in place like siblings
     model_info: Mapping[str, object] | None = None,
+    chat_uses_native_output: Callable[[], bool] = lambda: False,
 ) -> None:
     """
     Route Anthropic structured-output params to what the Bedrock model supports.
@@ -495,7 +555,8 @@ def apply_bedrock_invoke_structured_output(
     forwarded as ``output_config.format``, which Bedrock relays to the model for
     enforced structured output. For every other model the schema is inlined into
     the last user message as best-effort text, with a warning because nothing
-    enforces it.
+    enforces it. ``chat_uses_native_output`` is asked only when a schema is
+    present, and a true answer sends it natively after the same cleanup.
     """
     legacy_output_format: Final = request_body.pop("output_format", None)
     output_config_format: Final = pop_bedrock_invoke_output_config_format(request_body)
@@ -504,7 +565,15 @@ def apply_bedrock_invoke_structured_output(
     if schema_format is None:
         return
 
-    native_format: Final = bedrock_native_output_format(model, schema_format, model_info=model_info)
+    native_format: Final = bedrock_native_output_format(
+        model,
+        schema_format,
+        model_info=(
+            {**(model_info or {}), "supports_bedrock_native_structured_output": True}
+            if chat_uses_native_output()
+            else model_info
+        ),
+    )
     if native_format is not None:
         existing_output_config: Final = request_body.get("output_config")
         if isinstance(existing_output_config, dict):
diff --git a/litellm/llms/bedrock/count_tokens/bedrock_token_counter.py b/litellm/llms/bedrock/count_tokens/bedrock_token_counter.py
index 26bc5904e06..dec099f37c0 100644
--- a/litellm/llms/bedrock/count_tokens/bedrock_token_counter.py
+++ b/litellm/llms/bedrock/count_tokens/bedrock_token_counter.py
@@ -13,9 +13,14 @@ from typing_extensions import assert_never
 import litellm
 from litellm._logging import verbose_logger
 from litellm.llms.anthropic.chat.transformation import AnthropicConfig
+from litellm.llms.anthropic.common_utils import context_management_betas, context_management_with_edits
 from litellm.llms.anthropic.count_tokens.transformation import ChatCountTranslationError, anthropic_count_fields
 from litellm.llms.base_llm.base_utils import BaseTokenCounter
-from litellm.llms.bedrock.common_utils import BedrockError, get_bedrock_base_model
+from litellm.llms.bedrock.common_utils import (
+    BEDROCK_INVOKE_CONTEXT_MANAGEMENT_EDIT_BETAS,
+    BedrockError,
+    get_bedrock_base_model,
+)
 from litellm.llms.bedrock.count_tokens.handler import BedrockCountTokensHandler
 from litellm.llms.bedrock.count_tokens.mantle_handler import BedrockMantleCountTokensHandler
 from litellm.llms.bedrock_mantle.common_utils import is_mantle_claude_model
@@ -74,6 +79,16 @@ def _runtime_rejected_claude_model(outcome: CountTokensOutcome, resolved_model:
     )
 
 
+def _mantle_retry_outcome(
+    runtime: CountTokensOutcome, mantle: CountTokensOutcome, carried_edits: bool
+) -> CountTokensOutcome:
+    match runtime, mantle:
+        case CountTokensFailure(status_code=400), CountTokensFailure(status_code=404) if carried_edits:
+            return runtime
+        case _:
+            return mantle
+
+
 def _request_data(
     model: str, messages: Sequence[Mapping[str, object]], tools: Sequence[Mapping[str, object]] | None, system: object
 ) -> Mapping[str, object]:
@@ -85,6 +100,33 @@ def _request_data(
     }
 
 
+def _invoke_model_message(message: Mapping[str, object]) -> Mapping[str, object]:
+    content: Final = message.get("content")
+    return (
+        {**message, "content": [{"type": "text", "text": content}]} if isinstance(content, str) and content else message
+    )
+
+
+def _invoke_supports_edit(edit: JsonValue) -> bool:
+    edit_type: Final = edit.get("type") if isinstance(edit, dict) else None
+    return isinstance(edit_type, str) and edit_type in BEDROCK_INVOKE_CONTEXT_MANAGEMENT_EDIT_BETAS
+
+
+def _invoke_context_management(context_management: CountContextManagement | None) -> Mapping[str, JsonValue]:
+    spec: Final = context_management_with_edits(None if context_management is None else context_management.spec)
+    edits: Final = spec.get("edits") if isinstance(spec, dict) else None
+    supported_edits: Final = tuple(filter(_invoke_supports_edit, edits if isinstance(edits, list) else ()))
+    if not isinstance(spec, dict) or not supported_edits:
+        return MappingProxyType({})
+    supported_spec: Final[JsonValue] = {**spec, "edits": list(supported_edits)}
+    return MappingProxyType(
+        {
+            "context_management": supported_spec,
+            "anthropic_beta": list(context_management_betas(supported_spec)),
+        }
+    )
+
+
 class BedrockTokenCounter(BaseTokenCounter):
     """Counts on the configured Bedrock endpoint, with Mantle retry when Runtime rejects a Claude model"""
 
@@ -167,11 +209,19 @@ class BedrockTokenCounter(BaseTokenCounter):
         )
         if isinstance(translated, ChatCountTranslationError):
             return translated.response(request_model, model_to_use, primary_tokenizer)
-        runtime_request: Final = (
-            _request_data(model_to_use, messages, tools, system)
-            if translated is None
-            else _request_data(model_to_use, translated.messages, translated.tools, translated.system)
+        native_context_management: Final = _invoke_context_management(
+            context_management if is_mantle_claude_model(resolved_model) else None
         )
+        counted_messages: Final = messages if translated is None else translated.messages
+        runtime_request: Final = {
+            **_request_data(
+                model_to_use,
+                tuple(map(_invoke_model_message, counted_messages)) if native_context_management else counted_messages,
+                tools if translated is None else translated.tools,
+                system if translated is None else translated.system,
+            ),
+            **native_context_management,
+        }
         mantle_request: Final = runtime_request if translated is None else {**runtime_request, **translated.options}
 
         primary: Final = (
@@ -184,8 +234,12 @@ class BedrockTokenCounter(BaseTokenCounter):
             )
         )
         outcome: Final = (
-            await self._count_with(
-                self._mantle_handler, MANTLE_TOKENIZER_TYPE, mantle_request, litellm_params, resolved_model
+            _mantle_retry_outcome(
+                primary,
+                await self._count_with(
+                    self._mantle_handler, MANTLE_TOKENIZER_TYPE, mantle_request, litellm_params, resolved_model
+                ),
+                carried_edits=bool(native_context_management),
             )
             if not use_mantle and _runtime_rejected_claude_model(primary, resolved_model)
             else primary
diff --git a/litellm/llms/bedrock/count_tokens/mantle_handler.py b/litellm/llms/bedrock/count_tokens/mantle_handler.py
index 5cd26235ba2..5e5c5516b94 100644
--- a/litellm/llms/bedrock/count_tokens/mantle_handler.py
+++ b/litellm/llms/bedrock/count_tokens/mantle_handler.py
@@ -8,7 +8,7 @@ from typing_extensions import NotRequired, ReadOnly, TypedDict
 import litellm
 from litellm._logging import verbose_logger
 from litellm.litellm_core_utils.url_utils import join_api_base
-from litellm.llms.anthropic.common_utils import tools_without_custom_field
+from litellm.llms.anthropic.common_utils import context_management_betas, tools_without_custom_field
 from litellm.llms.anthropic.count_tokens.transformation import COUNT_TOKEN_OPTION_NAMES, AnthropicCountTokensConfig
 from litellm.llms.bedrock.base_aws_llm import BaseAWSLLM, run_aws_signing
 from litellm.llms.bedrock.common_utils import BedrockError, build_mantle_messages_url
@@ -22,6 +22,7 @@ class MantleCountTokensRequest(TypedDict):
     messages: ReadOnly[list[dict[str, JsonValue]]]
     system: ReadOnly[NotRequired[JsonValue]]
     tools: ReadOnly[NotRequired[list[dict[str, JsonValue]]]]
+    context_management: ReadOnly[NotRequired[JsonValue]]
 
 
 _COUNT_REQUEST: Final = TypeAdapter(MantleCountTokensRequest)
@@ -74,13 +75,19 @@ class BedrockMantleCountTokensHandler(BaseAWSLLM):
                 optional_params=_COUNT_OPTIONS.validate_python(
                     {name: value for name, value in request_data.items() if name in COUNT_TOKEN_OPTION_NAMES}
                 ),
+                context_management=request.get("context_management"),
             )
+            betas: Final = context_management_betas(request.get("context_management"))
             verbose_logger.debug("Making bedrock-mantle count_tokens request to: %s", endpoint_url)
             api_key: Final = litellm_params.get("api_key")
             signed_headers, signed_body = await run_aws_signing(
                 self._sign_request,
                 service_name="bedrock",
-                headers={"Content-Type": "application/json", "anthropic-version": MANTLE_ANTHROPIC_VERSION},
+                headers={
+                    "Content-Type": "application/json",
+                    "anthropic-version": MANTLE_ANTHROPIC_VERSION,
+                    **({"anthropic-beta": ",".join(betas)} if betas else {}),
+                },
                 optional_params=litellm_params,
                 request_data=body,
                 api_base=endpoint_url,
diff --git a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude_transformation.py b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude_transformation.py
index e5d6a168d57..8b4e2e5b5c5 100644
--- a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude_transformation.py
+++ b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude_transformation.py
@@ -37,8 +37,10 @@ from litellm.llms.bedrock.chat.invoke_transformations.base_invoke_transformation
     bedrock_invoke_guardrail_headers,
 )
 from litellm.llms.bedrock.common_utils import (
+    BEDROCK_INVOKE_CONTEXT_MANAGEMENT_EDIT_BETAS,
     BedrockError,
     apply_bedrock_invoke_structured_output,
+    bedrock_native_output_is_deployment_opt_in,
     bedrock_supports_tool_search,
     ensure_bedrock_anthropic_messages_tool_names,
     get_anthropic_beta_from_headers,
@@ -46,7 +48,7 @@ from litellm.llms.bedrock.common_utils import (
     normalize_bedrock_opus_output_config_effort,
     normalize_custom_field_on_tools,
     normalize_tool_input_schema_types_for_bedrock_invoke,
-    requests_opt_in_native_output,
+    requests_native_output,
     requests_output_config_format,
     strip_unsupported_bedrock_invoke_output_config_keys,
     supports_bedrock_prompt_cache_ttl,
@@ -130,7 +132,10 @@ class AmazonAnthropicClaudeMessagesConfig(
         litellm_params: GenericLiteLLMParams,
     ) -> GenericLiteLLMParams | None:
         model_info: Final = _MODEL_INFO.validate_python(litellm_params.model_info)
-        if not requests_opt_in_native_output(model, anthropic_messages_optional_request_params, model_info):
+        if not (
+            requests_native_output(anthropic_messages_optional_request_params)
+            and bedrock_native_output_is_deployment_opt_in(model, model_info=model_info)
+        ):
             return None
         return litellm_params.model_copy(
             update={"model_info": {**(model_info or {}), "supports_bedrock_native_structured_output": False}}
@@ -499,12 +504,7 @@ class AmazonAnthropicClaudeMessagesConfig(
     # Bedrock InvokeModel DOES support ``clear_tool_uses_20250919`` under the
     # ``context-management-2025-06-27`` beta. AWS docs:
     # https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters-anthropic-claude-messages-tool-use.md
-    _BEDROCK_INVOKE_SUPPORTED_CONTEXT_MANAGEMENT_EDITS: Mapping[str, str] = MappingProxyType(
-        {
-            "compact_20260112": ANTHROPIC_BETA_HEADER_VALUES.COMPACT_2026_01_12.value,
-            "clear_tool_uses_20250919": ANTHROPIC_BETA_HEADER_VALUES.CONTEXT_MANAGEMENT_2025_06_27.value,
-        }
-    )
+    _BEDROCK_INVOKE_SUPPORTED_CONTEXT_MANAGEMENT_EDITS: Mapping[str, str] = BEDROCK_INVOKE_CONTEXT_MANAGEMENT_EDIT_BETAS
 
     @classmethod
     def _filter_context_management_for_bedrock_invoke(
diff --git a/litellm/llms/bedrock_mantle/responses/transformation.py b/litellm/llms/bedrock_mantle/responses/transformation.py
index 05855c307e9..1f7b1712d68 100644
--- a/litellm/llms/bedrock_mantle/responses/transformation.py
+++ b/litellm/llms/bedrock_mantle/responses/transformation.py
@@ -15,7 +15,8 @@ role / access key / profile / web identity), signed via the shared
 BaseAWSLLM._sign_request after the request body is finalized.
 """
 
-from collections.abc import Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
+from functools import partial
 from typing import Final, cast  # noqa: TID251  # map_openai_params returns the filtered params as a bare dict
 
 import httpx
@@ -23,6 +24,7 @@ import httpx
 import litellm
 from litellm._logging import verbose_logger
 from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
+from litellm.litellm_core_utils.prompt_templates.common_utils import chat_completion_prompt_cache_breakpoint_for_wire
 from litellm.litellm_core_utils.url_utils import join_api_base
 from litellm.llms.base_llm.chat.transformation import BaseLLMException
 from litellm.llms.base_llm.responses.codex_compat import drop_unsupported_tools, normalize_codex_input_items
@@ -62,6 +64,10 @@ _BEDROCK_MANTLE_SUPPORTED_SERVICE_TIERS: Final = frozenset({"auto", "default"})
 _BEDROCK_MANTLE_OPENAI_PATH_SUPPORTED_REASONING_SUMMARIES: Final = frozenset({"auto"})
 
 
+def _prompt_cache_breakpoint_as_sent_or_none(marker: object) -> object:
+    return marker if chat_completion_prompt_cache_breakpoint_for_wire(marker, drop_params=True) == marker else None
+
+
 class BedrockMantleResponsesAPIConfig(BedrockMantleAuthMixin, OpenAIResponsesAPIConfig):
     def __init__(
         self,
@@ -113,6 +119,13 @@ class BedrockMantleResponsesAPIConfig(BedrockMantleAuthMixin, OpenAIResponsesAPI
             headers["OpenAI-Project"] = litellm_params.aws_bedrock_project_id
         return headers
 
+    def _prompt_cache_breakpoint_to_wire(
+        self, litellm_params: GenericLiteLLMParams, reads_breakpoints: bool, known_support: bool | None
+    ) -> Callable[[object], object]:
+        if reads_breakpoints or known_support is True:
+            return partial(chat_completion_prompt_cache_breakpoint_for_wire, drop_params=True)
+        return _prompt_cache_breakpoint_as_sent_or_none
+
     def supports_native_file_search(self) -> bool:
         return False
 
diff --git a/litellm/llms/cohere/chat/v2_transformation.py b/litellm/llms/cohere/chat/v2_transformation.py
index cf033e10b41..141a174e558 100644
--- a/litellm/llms/cohere/chat/v2_transformation.py
+++ b/litellm/llms/cohere/chat/v2_transformation.py
@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Any, Final
 import httpx
 
 import litellm
+from litellm.litellm_core_utils.core_helpers import map_finish_reason
 from litellm.llms.base_llm.chat.transformation import BaseLLMException
 from litellm.llms.openai.chat.gpt_transformation import OpenAIGPTConfig
 from litellm.types.llms.cohere import CohereV2ChatResponse
@@ -248,6 +249,9 @@ class CohereV2ChatConfig(OpenAIGPTConfig):
         prompt_tokens: Final = token_usage.get("input_tokens", 0)
         completion_tokens: Final = token_usage.get("output_tokens", 0)
 
+        model_response.choices[0].finish_reason = map_finish_reason(  # rebind-ok: ModelResponse is filled in place
+            cohere_v2_chat_response.get("finish_reason", "COMPLETE")
+        )
         model_response.created = int(time.time())
         model_response.model = model
         usage: Final = Usage(
diff --git a/litellm/llms/custom_httpx/llm_http_handler.py b/litellm/llms/custom_httpx/llm_http_handler.py
index 8a094cc6424..437944f8e03 100644
--- a/litellm/llms/custom_httpx/llm_http_handler.py
+++ b/litellm/llms/custom_httpx/llm_http_handler.py
@@ -38,7 +38,11 @@ import litellm.litellm_core_utils
 import litellm.types
 import litellm.types.utils
 from litellm._logging import redact_string, verbose_logger
-from litellm.anthropic_beta_headers_manager import aload_beta_headers_config, update_headers_with_filtered_beta
+from litellm.anthropic_beta_headers_manager import (
+    aload_beta_headers_config,
+    resolve_beta_provider,
+    update_headers_with_filtered_beta,
+)
 from litellm.constants import MAX_FILE_LIST_LIMIT, REALTIME_WEBSOCKET_MAX_MESSAGE_SIZE_BYTES
 from litellm.files.types import FileContentStreamingResult
 from litellm.litellm_core_utils.agentic_followup_kwargs import build_agentic_followup_kwargs
@@ -455,6 +459,20 @@ def _google_genai_streaming_hidden_params(
     }
 
 
+def _log_generate_content_request(
+    logging_obj: LiteLLMLoggingObj,
+    contents: object,
+    api_base: str,
+    headers: Mapping[str, object],
+    body: Mapping[str, object],
+) -> None:
+    logging_obj.pre_call(
+        input=contents,
+        api_key="",
+        additional_args={"complete_input_dict": body, "api_base": api_base, "headers": headers},
+    )
+
+
 @lru_cache(maxsize=None)
 def _responses_api_optional_request_param_names() -> frozenset[str]:
     return frozenset(get_type_hints(ResponsesAPIOptionalRequestParams).keys())
@@ -2581,14 +2599,16 @@ class BaseLLMHTTPHandler:
             litellm_params.get("additional_drop_params") or (),
             anthropic_messages_optional_request_params,
         )
-        if (
-            request_params.get("safeguards") is not None
-            and anthropic_messages_provider_config.should_filter_anthropic_beta_headers()
-        ):
-            await aload_beta_headers_config()
         affinity_api_base: Final = (
             AnthropicModelInfo.get_api_base(api_base) if custom_llm_provider == "anthropic" else api_base
         )
+        takes_another_beta_row: Final = (
+            resolve_beta_provider(custom_llm_provider, affinity_api_base) != custom_llm_provider
+        )
+        provider_filters_betas: Final = anthropic_messages_provider_config.should_filter_anthropic_beta_headers()
+        filters_beta_headers: Final = provider_filters_betas or takes_another_beta_row
+        if request_params.get("safeguards") is not None and filters_beta_headers:
+            await aload_beta_headers_config()
         default_affinity_header: Final = get_provider_affinity_header(affinity_api_base)
         (
             headers,
@@ -2607,8 +2627,14 @@ class BaseLLMHTTPHandler:
             api_base=api_base,
         )
 
-        if anthropic_messages_provider_config.should_filter_anthropic_beta_headers():
-            headers = update_headers_with_filtered_beta(headers=headers, provider=custom_llm_provider)
+        if filters_beta_headers and headers.get("anthropic-beta") is not None:
+            await aload_beta_headers_config()
+            headers = update_headers_with_filtered_beta(
+                headers=headers,
+                provider=custom_llm_provider,
+                api_base=affinity_api_base,
+                unlisted="drop" if provider_filters_betas else "forward",
+            )
 
         from litellm.llms.vertex_ai.vertex_llm_base import VertexBase
 
@@ -12443,6 +12469,10 @@ class BaseLLMHTTPHandler:
         from litellm.google_genai.streaming_iterator import (
             GoogleGenAIGenerateContentStreamingIterator,
         )
+        from litellm.llms.vertex_ai.gemini.rejected_thought_signature_retry import (
+            post_with_accepted_thought_signatures_sync,
+            with_placeholder_native_thought_signatures,
+        )
 
         if _is_async:
             return self.async_generate_content_handler(
@@ -12494,27 +12524,19 @@ class BaseLLMHTTPHandler:
         if extra_body:
             data.update(extra_body)
 
-        ## LOGGING
-        logging_obj.pre_call(
-            input=contents,
-            api_key="",
-            additional_args={
-                "complete_input_dict": data,
-                "api_base": api_base,
-                "headers": headers,
-            },
-        )
+        log_request: Final = partial(_log_generate_content_request, logging_obj, contents, api_base, headers)
+        log_request(data)
+
+        def post(body: Mapping[str, object]) -> httpx.Response:
+            return sync_httpx_client.post(
+                url=api_base, headers=headers, json=dict(body), timeout=timeout, stream=stream
+            )
 
         try:
+            sent_body, response = post_with_accepted_thought_signatures_sync(
+                data, with_placeholder_native_thought_signatures, None, post, log_request
+            )
             if stream:
-                response = sync_httpx_client.post(
-                    url=api_base,
-                    headers=headers,
-                    json=data,
-                    timeout=timeout,
-                    stream=True,
-                )
-                # Return streaming iterator
                 return GoogleGenAIGenerateContentStreamingIterator(
                     response=response,
                     model=model,
@@ -12522,7 +12544,7 @@ class BaseLLMHTTPHandler:
                     generate_content_provider_config=generate_content_provider_config,
                     litellm_metadata=litellm_metadata or {},
                     custom_llm_provider=custom_llm_provider,
-                    request_body=data,
+                    request_body=dict(sent_body),
                     hidden_params=_google_genai_streaming_hidden_params(
                         api_base=api_base,
                         litellm_params=litellm_params,
@@ -12530,13 +12552,6 @@ class BaseLLMHTTPHandler:
                         response_headers=response.headers,
                     ),
                 )
-            else:
-                response = sync_httpx_client.post(
-                    url=api_base,
-                    headers=headers,
-                    json=data,
-                    timeout=timeout,
-                )
         except Exception as e:
             raise self._handle_error(
                 e=e,
@@ -12574,6 +12589,10 @@ class BaseLLMHTTPHandler:
         from litellm.google_genai.streaming_iterator import (
             AsyncGoogleGenAIGenerateContentStreamingIterator,
         )
+        from litellm.llms.vertex_ai.gemini.rejected_thought_signature_retry import (
+            post_with_accepted_thought_signatures_async,
+            with_placeholder_native_thought_signatures,
+        )
 
         if client is None or not isinstance(client, AsyncHTTPHandler):
             async_httpx_client = get_async_httpx_client(
@@ -12609,27 +12628,19 @@ class BaseLLMHTTPHandler:
         if extra_body:
             data.update(extra_body)
 
-        ## LOGGING
-        logging_obj.pre_call(
-            input=contents,
-            api_key="",
-            additional_args={
-                "complete_input_dict": data,
-                "api_base": api_base,
-                "headers": headers,
-            },
-        )
+        log_request: Final = partial(_log_generate_content_request, logging_obj, contents, api_base, headers)
+        log_request(data)
+
+        async def post(body: Mapping[str, object]) -> httpx.Response:
+            return await async_httpx_client.post(
+                url=api_base, headers=headers, json=dict(body), timeout=timeout, stream=stream
+            )
 
         try:
+            sent_body, response = await post_with_accepted_thought_signatures_async(
+                data, with_placeholder_native_thought_signatures, None, post, log_request
+            )
             if stream:
-                response = await async_httpx_client.post(
-                    url=api_base,
-                    headers=headers,
-                    json=data,
-                    timeout=timeout,
-                    stream=True,
-                )
-                # Return async streaming iterator
                 return AsyncGoogleGenAIGenerateContentStreamingIterator(
                     response=response,
                     model=model,
@@ -12637,7 +12648,7 @@ class BaseLLMHTTPHandler:
                     generate_content_provider_config=generate_content_provider_config,
                     litellm_metadata=litellm_metadata or {},
                     custom_llm_provider=custom_llm_provider,
-                    request_body=data,
+                    request_body=dict(sent_body),
                     hidden_params=_google_genai_streaming_hidden_params(
                         api_base=api_base,
                         litellm_params=litellm_params,
@@ -12645,13 +12656,6 @@ class BaseLLMHTTPHandler:
                         response_headers=response.headers,
                     ),
                 )
-            else:
-                response = await async_httpx_client.post(
-                    url=api_base,
-                    headers=headers,
-                    json=data,
-                    timeout=timeout,
-                )
         except Exception as e:
             raise self._handle_error(
                 e=e,
diff --git a/litellm/llms/databricks/chat/transformation.py b/litellm/llms/databricks/chat/transformation.py
index 60081c38073..b5393fa1603 100644
--- a/litellm/llms/databricks/chat/transformation.py
+++ b/litellm/llms/databricks/chat/transformation.py
@@ -4,6 +4,7 @@ Translates from OpenAI's `/v1/chat/completions` to Databricks' `/chat/completion
 
 import os
 from collections.abc import AsyncIterator, Coroutine, Iterator, Mapping, Sequence
+from itertools import chain, takewhile
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, Literal, cast, overload
 
@@ -12,6 +13,7 @@ from pydantic import BaseModel, ConfigDict, TypeAdapter
 
 from litellm.anthropic_beta_gated_fields import log_beta_gated_strips, strip_beta_gated_thinking
 from litellm.constants import RESPONSE_FORMAT_TOOL_NAME
+from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
 from litellm.litellm_core_utils.llm_response_utils.convert_dict_to_response import (
     handle_invalid_parallel_tool_calls,
     should_convert_tool_call_to_json_mode,
@@ -23,6 +25,7 @@ from litellm.litellm_core_utils.prompt_templates.common_utils import (
     strip_name_from_message,
     strip_prefill_prefix_field,
 )
+from litellm.litellm_core_utils.tool_fields import tool_params_without_hosted_mcp
 from litellm.litellm_core_utils.url_utils import join_api_base
 from litellm.llms.base_llm.base_model_iterator import BaseModelResponseIterator
 from litellm.llms.base_llm.base_utils import (
@@ -65,7 +68,7 @@ from ...anthropic.chat.transformation import (
     tools_without_unsupported_tool_search,
 )
 from ...openai_like.chat.transformation import OpenAILikeChatConfig
-from ..common_utils import DatabricksBase, DatabricksException
+from ..common_utils import DATABRICKS_HOSTED_MODEL_PREFIXES, DatabricksBase, DatabricksException
 
 _RESPONSE_FORMAT_ADAPTER: (  # mutable-ok: mirrors the dict return contract of get_json_schema_from_pydantic_object
     Final[TypeAdapter[dict[str, object] | None]]
@@ -81,15 +84,139 @@ def _is_bare_assistant_message(message_dict: Mapping[str, object]) -> bool:
     )
 
 
+_CONTENT_BLOCKS: Final = TypeAdapter(tuple[object, ...])
+
+
+def _content_blocks(message: object) -> tuple[object, ...]:
+    match message.model_dump(exclude_none=True) if isinstance(message, BaseModel) else message:
+        case {"content": list() as content}:
+            return _CONTENT_BLOCKS.validate_python(content)
+        case _:
+            return ()
+
+
+def _plain_text(block: object) -> str | None:
+    match block:
+        case {"type": "text", "text": str() as text} if block == {"type": "text", "text": text}:
+            return text
+        case _:
+            return None
+
+
+def _plain_texts(message: Mapping[str, object]) -> tuple[str, ...]:
+    blocks: Final = _content_blocks(message)
+    texts: Final = tuple(text for block in blocks if (text := _plain_text(block)) is not None)
+    return texts if len(texts) == len(blocks) else ()
+
+
 def _collapse_single_text_block(message: Mapping[str, object]) -> Mapping[str, object]:
-    content: Final = message.get("content")
-    match content:
-        case [{"type": "text", "text": str() as text}] if content == [{"type": "text", "text": text}]:
+    match _plain_texts(message):
+        case (text,):
             return {**message, "content": text}
         case _:
             return message
 
 
+def _without_text_cache_control(block: object) -> object:
+    match block:
+        case {"type": "text", "text": str() as text, "cache_control": object() as cache_control} if block == {
+            "type": "text",
+            "text": text,
+            "cache_control": cache_control,
+        }:
+            return {"type": "text", "text": text}
+        case _:
+            return block
+
+
+def _without_cache_control(message: AllMessageValues) -> AllMessageValues:
+    uncached: Final = {key: value for key, value in message.items() if key != "cache_control"}
+    match content := uncached.get("content"):
+        case list():
+            blocks: Final = [_without_text_cache_control(block) for block in _CONTENT_BLOCKS.validate_python(content)]
+            return cast(AllMessageValues, {**uncached, "content": blocks})  # cast-ok: spread keeps the shape
+        case _:
+            return cast(AllMessageValues, uncached)  # cast-ok: only cache_control was left out
+
+
+def _has_string_content(message: Mapping[str, object]) -> bool:
+    return isinstance(message.get("content"), str)
+
+
+def _is_system(message: Mapping[str, object]) -> bool:
+    return message.get("role") == "system"
+
+
+def _json_mode_message(message: AllMessageValues, drop_params: bool) -> AllMessageValues:
+    candidate: Final = _without_cache_control(message) if drop_params else message
+    texts: Final = _plain_texts(candidate)
+    if "cache_control" in candidate or not (texts or _has_string_content(candidate)):
+        return message
+    if sum(1 for text in texts if text.strip()) < 2:
+        return candidate
+    return cast(AllMessageValues, {**candidate, "content": "".join(texts)})  # cast-ok: spread keeps the shape
+
+
+def _is_dropped_on_send(message: Mapping[str, object]) -> bool:
+    sanitized: Final = {**message}
+    _sanitize_empty_content(sanitized)
+    return _is_bare_assistant_message(sanitized)
+
+
+def _is_system_or_dropped(message: Mapping[str, object]) -> bool:
+    return _is_system(message) or _is_dropped_on_send(message)
+
+
+def _json_checked_start(messages: Sequence[AllMessageValues]) -> int:
+    trailing: Final = tuple(takewhile(_is_system_or_dropped, reversed(messages)))
+    last_sent_offset: Final = 0 if any(_is_system(message) for message in trailing) else 1
+    return max(len(messages) - len(trailing) - last_sent_offset, 0)
+
+
+def _json_object_ready_messages(
+    model: str,
+    messages: list[AllMessageValues],  # mutable-ok: inherited transform_request contract
+    response_format: object,
+    drop_params: bool,
+) -> list[AllMessageValues]:  # mutable-ok: inherited transform_request contract
+    match response_format:
+        case {"type": "json_object"} if "claude" not in model and model.startswith(DATABRICKS_HOSTED_MODEL_PREFIXES):
+            checked_start: Final = _json_checked_start(messages)
+            return [
+                *messages[:checked_start],
+                *(_json_mode_message(message, drop_params) for message in messages[checked_start:]),
+            ]
+        case _:
+            return messages
+
+
+def _is_empty_text_block(block: object) -> bool:
+    match block:
+        case {"type": "text", "text": str() as text}:
+            return not text.strip()
+        case {"type": "text", "text": object() as text}:
+            return not text
+        case {"type": "text"}:
+            return True
+        case _:
+            return False
+
+
+def _non_string_text_type(block: object) -> str | None:
+    match block:
+        case {"type": "text", "text": str()}:
+            return None
+        case {"type": "text", "text": object() as text} if text:
+            return type(text).__name__
+        case _:
+            return None
+
+
+def _first_non_string_text_type(messages: Sequence[AllMessageValues]) -> str | None:
+    blocks: Final = chain.from_iterable(map(_content_blocks, messages))
+    return next((type_name for block in blocks if (type_name := _non_string_text_type(block))), None)
+
+
 def _sanitize_empty_content(message_dict: dict[str, object]) -> None:
     """
     Remove or filter content so empty text blocks are not sent.
@@ -108,9 +235,7 @@ def _sanitize_empty_content(message_dict: dict[str, object]) -> None:
             message_dict.pop("content")
             return
         filtered: Final = [
-            block
-            for block in content
-            if not (isinstance(block, dict) and block.get("type") == "text" and not (block.get("text") or "").strip())
+            block for block in _CONTENT_BLOCKS.validate_python(content) if not _is_empty_text_block(block)
         ]
         if not filtered:
             message_dict.pop("content")
@@ -343,7 +468,7 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
         use_ai_gateway: Final = self.uses_ai_gateway(model)
         return join_api_base(self._get_api_base(api_base, use_ai_gateway=use_ai_gateway), "chat/completions")
 
-    def get_supported_openai_params(self, model: str | None = None) -> list:
+    def get_supported_openai_params(self, model: str | None = None) -> list[str]:
         return [
             "stream",
             "stop",
@@ -449,8 +574,13 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
         drop_params: bool,
         replace_max_completion_tokens_with_max_tokens: bool = True,
     ) -> dict:
-        is_thinking_enabled: Final = self.is_thinking_enabled(non_default_params)
-        mapped_params: Final = super().map_openai_params(non_default_params, optional_params, model, drop_params)
+        request_params: Final = (
+            tool_params_without_hosted_mcp(non_default_params, model=model, route="databricks", drop_params=drop_params)
+            if "claude" in model
+            else non_default_params
+        )
+        is_thinking_enabled: Final = self.is_thinking_enabled(request_params)
+        mapped_params: Final = super().map_openai_params(request_params, optional_params, model, drop_params)
         if "claude" in model:
             AnthropicConfig.translate_legacy_thinking_for_adaptive_model(
                 model=model, optional_params=mapped_params, custom_llm_provider="databricks", drop_params=drop_params
@@ -459,16 +589,16 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
             mapped_params["tools"] = self._map_openai_to_dbrx_tool(
                 model=model, tools=mapped_params["tools"], drop_params=drop_params
             )
-        if "max_completion_tokens" in non_default_params and replace_max_completion_tokens_with_max_tokens:
-            mapped_params["max_tokens"] = non_default_params[
+        if "max_completion_tokens" in request_params and replace_max_completion_tokens_with_max_tokens:
+            mapped_params["max_tokens"] = request_params[
                 "max_completion_tokens"
             ]  # most openai-compatible providers support 'max_tokens' not 'max_completion_tokens'
             mapped_params.pop("max_completion_tokens", None)
 
-        if "response_format" in non_default_params and "claude" in model:
+        if "response_format" in request_params and "claude" in model:
             _tool: Final = self.map_response_format_to_databricks_tool(
                 model,
-                non_default_params["response_format"],
+                request_params["response_format"],
                 mapped_params,
                 is_thinking_enabled,
             )
@@ -486,8 +616,8 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
                 "response_format", None
             )  # unsupported for claude models - if json_schema -> convert to tool call
 
-        if "reasoning_effort" in non_default_params and self._uses_anthropic_thinking_param(model):
-            reasoning_effort_value: Final = non_default_params.get("reasoning_effort")
+        if "reasoning_effort" in request_params and self._uses_anthropic_thinking_param(model):
+            reasoning_effort_value: Final = request_params.get("reasoning_effort")
             mapped_thinking: Final = AnthropicConfig._map_reasoning_effort(
                 reasoning_effort=reasoning_effort_value,
                 model=model,
@@ -513,7 +643,7 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
             optional_params.pop("reasoning_effort", None)
         ## handle thinking tokens
         self.update_optional_params_with_thinking_tokens(
-            non_default_params=non_default_params, optional_params=mapped_params
+            non_default_params=request_params, optional_params=mapped_params
         )
         gated_thinking: Final = strip_beta_gated_thinking(
             mapped_params.get("thinking"),  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]  # mapped_params is the base config's bare dict
@@ -535,6 +665,35 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
 
         return False
 
+    def transform_request(
+        self,
+        model: str,
+        messages: list[AllMessageValues],  # mutable-ok: inherited contract
+        optional_params: dict[str, object],  # mutable-ok: inherited contract
+        litellm_params: dict[str, object],  # mutable-ok: inherited contract
+        headers: dict[str, object],  # mutable-ok: inherited contract
+    ) -> dict[str, object]:  # mutable-ok: inherited contract
+        match _first_non_string_text_type(messages):
+            case str() as type_name:
+                raise DatabricksException(
+                    status_code=400,
+                    message=f"A text content block needs a string 'text', got {type_name}",
+                )
+            case None:
+                pass
+        return super().transform_request(
+            model=model,
+            messages=_json_object_ready_messages(
+                model,
+                messages,
+                optional_params.get("response_format"),
+                drop_params=drops_unsupported_params(litellm_params.get("drop_params")),
+            ),
+            optional_params=optional_params,
+            litellm_params=litellm_params,
+            headers=headers,
+        )
+
     @overload
     def _transform_messages(
         self, messages: list[AllMessageValues], model: str, is_async: Literal[True]
diff --git a/litellm/llms/databricks/common_utils.py b/litellm/llms/databricks/common_utils.py
index b1562bef6b8..e8313d9a003 100644
--- a/litellm/llms/databricks/common_utils.py
+++ b/litellm/llms/databricks/common_utils.py
@@ -56,6 +56,7 @@ DATABRICKS_WORKSPACE_ROUTE_PREFIXES: Final = (
     DATABRICKS_AI_GATEWAY_MESSAGES_PATH,
 )
 DATABRICKS_NATIVE_MESSAGES_MODEL_PREFIXES: Final = ("databricks-claude-", "system.ai.claude-")
+DATABRICKS_HOSTED_MODEL_PREFIXES: Final = ("databricks-", "system.ai.")
 DATABRICKS_ENDPOINT_PATHS: Final = MappingProxyType(
     {
         "chat_completions": "/chat/completions",
diff --git a/litellm/llms/deepseek/chat/transformation.py b/litellm/llms/deepseek/chat/transformation.py
index 5b7c2a2c410..9c222f03c8c 100644
--- a/litellm/llms/deepseek/chat/transformation.py
+++ b/litellm/llms/deepseek/chat/transformation.py
@@ -12,6 +12,7 @@ from litellm.litellm_core_utils.prompt_templates.common_utils import (
     extract_search_results_text,
 )
 from litellm.litellm_core_utils.reasoning_effort_utils import OPAQUE_VALUE, warn_dropped_reasoning
+from litellm.litellm_core_utils.tool_fields import tool_params_without_hosted_mcp
 from litellm.litellm_core_utils.url_utils import ensure_api_route
 from litellm.secret_managers.main import get_secret_str
 from litellm.types.llms.openai import AllMessageValues
@@ -33,17 +34,15 @@ def _warn_on_dropped_budget(thinking: object, model: str) -> None:
 
 
 class DeepSeekChatConfig(OpenAIGPTConfig):
-    def get_supported_openai_params(self, model: str) -> list:
+    def get_supported_openai_params(self, model: str) -> list[str]:
         """
         DeepSeek reasoner models support thinking parameter.
         """
-        params: Final = super().get_supported_openai_params(model)
-        params.extend(["thinking", "reasoning_effort"])
-        return params
+        return [*super().get_supported_openai_params(model), "thinking", "reasoning_effort"]
 
     def map_openai_params(
         self,
-        non_default_params: dict,
+        non_default_params: dict[str, object],
         optional_params: dict,
         model: str,
         drop_params: bool,
@@ -59,7 +58,12 @@ class DeepSeekChatConfig(OpenAIGPTConfig):
         Reference: https://api-docs.deepseek.com/guides/thinking_mode
         """
         # Let parent handle standard params first
-        optional_params = super().map_openai_params(non_default_params, optional_params, model, drop_params)
+        optional_params = super().map_openai_params(
+            tool_params_without_hosted_mcp(non_default_params, model=model, route="deepseek", drop_params=drop_params),
+            optional_params,
+            model,
+            drop_params,
+        )
 
         # Pop thinking/reasoning_effort from optional_params first (parent may have added them)
         # Then re-add only if valid for DeepSeek
@@ -265,6 +269,7 @@ class DeepSeekChatConfig(OpenAIGPTConfig):
         tools: Final = optional_params.get("tools")
         if not isinstance(tools, list) or not tools:
             return optional_params
+        sent_tools: Final[tuple[object, ...]] = tuple(tools)
 
         def _is_function_tool(tool: object) -> bool:
             return isinstance(tool, dict) and tool.get("type") == "function"
@@ -289,14 +294,14 @@ class DeepSeekChatConfig(OpenAIGPTConfig):
             name: Final = function.get("name")
             return isinstance(name, str) and name in function_tool_names
 
-        function_tools: Final = [tool for tool in tools if _is_function_tool(tool)]
-        if len(function_tools) == len(tools):
+        function_tools: Final = [tool for tool in sent_tools if _is_function_tool(tool)]
+        if len(function_tools) == len(sent_tools):
             return optional_params
 
         dropped_types: Final = sorted(
             {
                 str(tool.get("type")) if isinstance(tool, dict) else type(tool).__name__
-                for tool in tools
+                for tool in sent_tools
                 if not _is_function_tool(tool)
             }
         )
diff --git a/litellm/llms/fireworks_ai/responses/transformation.py b/litellm/llms/fireworks_ai/responses/transformation.py
index 463b9cbfc9a..d599f0b65f7 100644
--- a/litellm/llms/fireworks_ai/responses/transformation.py
+++ b/litellm/llms/fireworks_ai/responses/transformation.py
@@ -29,6 +29,7 @@ from litellm.utils import (
     declared_mid_conversation_system_support,
     deployment_declared_mid_conversation_system_support,
     deployment_model_info,
+    get_bundled_model_cost_map,
 )
 
 if TYPE_CHECKING:
@@ -54,6 +55,15 @@ def _forwarded_user_params(litellm_params: GenericLiteLLMParams) -> Mapping[str,
     )
 
 
+def _bundled_cost_map_declares_mid_conversation_system(model: str) -> bool:
+    bundled_cost_map: Final[Mapping[str, object]] = get_bundled_model_cost_map()
+    names: Final = (model.removeprefix("fireworks_ai/"), resolve_fireworks_resource_name(model))
+    return any(
+        deployment_declared_mid_conversation_system_support(bundled_cost_map.get(f"fireworks_ai/{name}")) is True
+        for name in names
+    )
+
+
 class FireworksAIResponsesAPIConfig(OpenAIResponsesAPIConfig):
     @property
     def custom_llm_provider(self) -> LlmProviders:
@@ -90,9 +100,13 @@ class FireworksAIResponsesAPIConfig(OpenAIResponsesAPIConfig):
         validated_input: Final = self._validate_input_param(input)
         model_info: Final = deployment_model_info(litellm_params)
         declared: Final = declared_mid_conversation_system_support(model, self.custom_llm_provider.value, model_info)
+        keeps_developer_items_in_place: Final = declared is True and (
+            deployment_declared_mid_conversation_system_support(model_info) is True
+            or _bundled_cost_map_declares_mid_conversation_system(model)
+        )
         folded: Final = (
             None
-            if deployment_declared_mid_conversation_system_support(model_info) is True
+            if keeps_developer_items_in_place
             else instruction_items_folded(
                 validated_input, response_api_optional_request_params, "user" if declared is False else "system"
             )
diff --git a/litellm/llms/gemini/chat/transformation.py b/litellm/llms/gemini/chat/transformation.py
index 936919af83d..1539f13455f 100644
--- a/litellm/llms/gemini/chat/transformation.py
+++ b/litellm/llms/gemini/chat/transformation.py
@@ -1,5 +1,5 @@
 from collections.abc import Mapping
-from typing import Final, cast
+from typing import ClassVar, Final, cast
 
 import litellm
 from litellm.litellm_core_utils.prompt_templates.factory import (
@@ -49,6 +49,8 @@ class GoogleAIStudioGeminiConfig(VertexGeminiConfig):
     Note: Please make sure to modify the default parameters as required for your use case.
     """
 
+    _route: ClassVar[str] = "gemini"
+
     temperature: float | None = None
     max_output_tokens: int | None = None
     top_p: float | None = None
diff --git a/litellm/llms/gemini/common_utils.py b/litellm/llms/gemini/common_utils.py
index 88c6494e3f7..74cd6f22704 100644
--- a/litellm/llms/gemini/common_utils.py
+++ b/litellm/llms/gemini/common_utils.py
@@ -537,13 +537,16 @@ class GoogleAIStudioTokenCounter(BaseTokenCounter):
     ) -> TokenCountResponse | None:
         import copy
 
+        from litellm.llms.anthropic.messages.context_management.inference_view import (
+            InferenceRequestViewError,
+            count_context_edits,
+            inference_request_view,
+        )
         from litellm.llms.gemini.count_tokens.handler import GoogleAIStudioTokenCounter
         from litellm.llms.vertex_ai.count_tokens.context import (
             VertexGeminiCountContextError,
-            count_context_edits,
             count_context_error_response,
             gemini_count_contents,
-            inference_request_view,
             malformed_tool_result_text_count_error,
             provider_error_response,
             unconvertible_messages_error,
@@ -556,7 +559,7 @@ class GoogleAIStudioTokenCounter(BaseTokenCounter):
             messages_format,
             count_context_edits(context_management, tools, (deployment or {}).get("litellm_params", {}), model_to_use),
         )
-        if isinstance(request_view, VertexGeminiCountContextError):
+        if isinstance(request_view, InferenceRequestViewError):
             return count_context_error_response(request_view, request_model, model_to_use)
         count_context: Final = vertex_gemini_count_context(system=request_view.system, tools=tools, model=model_to_use)
         if isinstance(count_context, VertexGeminiCountContextError):
diff --git a/litellm/llms/gigachat/chat/transformation.py b/litellm/llms/gigachat/chat/transformation.py
index 81a186eadf4..7bc783b960f 100644
--- a/litellm/llms/gigachat/chat/transformation.py
+++ b/litellm/llms/gigachat/chat/transformation.py
@@ -17,6 +17,7 @@ import httpx
 from pydantic import TypeAdapter
 
 from litellm._logging import verbose_logger
+from litellm.litellm_core_utils.tool_fields import tool_params_without_hosted_mcp
 from litellm.litellm_core_utils.url_utils import join_api_base
 from litellm.llms.base_llm.chat.transformation import BaseConfig, BaseLLMException
 from litellm.llms.gigachat.utils import convert_usage, get_api_base
@@ -169,7 +170,10 @@ class GigaChatConfig(BaseConfig):
         drop_params: bool,
     ) -> dict:  # mutable-ok: base class contract returns dict
         """Map OpenAI parameters to GigaChat parameters."""
-        for param, value in non_default_params.items():
+        request_params: Final = tool_params_without_hosted_mcp(
+            dict(non_default_params), model=model, route="gigachat", drop_params=drop_params
+        )
+        for param, value in request_params.items():
             if param == "stream":
                 optional_params["stream"] = value
             elif param == "temperature":
diff --git a/litellm/llms/ollama/chat/transformation.py b/litellm/llms/ollama/chat/transformation.py
index 168b562b358..59020b058a2 100644
--- a/litellm/llms/ollama/chat/transformation.py
+++ b/litellm/llms/ollama/chat/transformation.py
@@ -4,7 +4,7 @@ from collections.abc import AsyncIterator, Iterator, Mapping
 from typing import TYPE_CHECKING, Any, Final, cast
 
 from httpx._models import Headers, Response
-from pydantic import BaseModel
+from pydantic import BaseModel, TypeAdapter
 
 import litellm
 from litellm._uuid import uuid
@@ -15,6 +15,7 @@ from litellm.litellm_core_utils.prompt_templates.common_utils import (
     extract_reasoning_content,
 )
 from litellm.litellm_core_utils.reasoning_effort_utils import OPAQUE_VALUE
+from litellm.litellm_core_utils.tool_fields import tool_params_without_hosted_mcp
 from litellm.litellm_core_utils.url_utils import ensure_api_route
 from litellm.llms.base_llm.base_model_iterator import BaseModelResponseIterator
 from litellm.llms.base_llm.chat.transformation import BaseConfig, BaseLLMException
@@ -40,6 +41,8 @@ if TYPE_CHECKING:
 else:
     LiteLLMLoggingObj = Any
 
+_REQUEST_PARAMS: Final = TypeAdapter(dict[str, object])
+
 
 class OllamaChatConfig(BaseConfig):
     """
@@ -152,7 +155,13 @@ class OllamaChatConfig(BaseConfig):
         model: str,
         drop_params: bool,
     ) -> dict:
-        for param, value in non_default_params.items():
+        request_params: Final = tool_params_without_hosted_mcp(
+            _REQUEST_PARAMS.validate_python(non_default_params),
+            model=model,
+            route="ollama_chat",
+            drop_params=drop_params,
+        )
+        for param, value in request_params.items():
             if param == "max_tokens" or param == "max_completion_tokens":
                 optional_params["num_predict"] = value
             if param == "stream":
diff --git a/litellm/llms/openai/chat/gpt_transformation.py b/litellm/llms/openai/chat/gpt_transformation.py
index 9d551f6f859..4bfc9f28939 100644
--- a/litellm/llms/openai/chat/gpt_transformation.py
+++ b/litellm/llms/openai/chat/gpt_transformation.py
@@ -21,6 +21,7 @@ from litellm.litellm_core_utils.llm_response_utils.convert_dict_to_response impo
     should_convert_tool_call_to_json_mode,
 )
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
+    chat_completion_prompt_cache_breakpoints_for_wire,
     drop_non_python_regex_patterns,
     drop_tool_reference_parts_from_tool_messages,
     flatten_combinators_and_drop_non_python_regex_patterns,
@@ -556,9 +557,10 @@ class OpenAIGPTConfig(BaseLLMModelInfo, BaseConfig):
         """
         A deployment that reads OpenAI's ``prompt_cache_breakpoint`` (gpt-5.6+ on
         api.openai.com, or one opted in through ``prompt_cache_options`` or the cost
-        map) gets each Anthropic ``cache_control`` mark rewritten in place. Any other
-        endpoint keeps or strips the marks as before, and under drop_params also loses
-        every ``prompt_cache_breakpoint`` it cannot read.
+        map) gets each Anthropic ``cache_control`` mark rewritten in place, and under
+        drop_params each content part's ``prompt_cache_breakpoint`` cut down to what chat
+        completions accepts. Any other endpoint keeps or strips the marks as before, and
+        under drop_params also loses every ``prompt_cache_breakpoint`` it cannot read.
         """
         from litellm.integrations.anthropic_cache_control_hook import AnthropicCacheControlHook
 
@@ -572,9 +574,15 @@ class OpenAIGPTConfig(BaseLLMModelInfo, BaseConfig):
                 _claude_messages_within_cache_control_cap(model, messages, tools, litellm_params, request_params),
                 tools,
             )
-        drops_breakpoints: Final = not reads_breakpoints and _drops_params(litellm_params)
+        drop_params: Final = _drops_params(litellm_params)
+        drops_breakpoints: Final = not reads_breakpoints and drop_params
         renamed: Final = (
-            [AnthropicCacheControlHook.cache_control_as_prompt_cache_breakpoints(message) for message in messages]
+            [
+                AnthropicCacheControlHook.cache_control_as_prompt_cache_breakpoints(
+                    chat_completion_prompt_cache_breakpoints_for_wire(message, drop_params)
+                )
+                for message in messages
+            ]
             if reads_breakpoints
             else [without_prompt_cache_breakpoints(message) for message in messages]
             if drops_breakpoints
diff --git a/litellm/llms/openai/responses/guardrail_translation/handler.py b/litellm/llms/openai/responses/guardrail_translation/handler.py
index a905bff3521..a18cbe13925 100644
--- a/litellm/llms/openai/responses/guardrail_translation/handler.py
+++ b/litellm/llms/openai/responses/guardrail_translation/handler.py
@@ -1988,7 +1988,7 @@ class OpenAIResponsesHandler(BaseTranslation):
             "annotations": (),
             "logprobs": None,
         }
-        return (
+        events: Final = (
             *_open_item_closing_events(responses_so_far),
             OutputItemAddedEvent(
                 type=ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED,
@@ -2033,6 +2033,10 @@ class OpenAIResponsesHandler(BaseTranslation):
                 response=_blocked_response(exc, response_id=response_id, model=model, output_item=item),
             ),
         )
+        return tuple(
+            event.model_copy(update={"sequence_number": number})
+            for number, event in enumerate(events, start=_next_stream_sequence_number(responses_so_far))
+        )
 
 
 class _BlockedContentPart(TypedDict):
diff --git a/litellm/llms/openai/responses/transformation.py b/litellm/llms/openai/responses/transformation.py
index 7cca31c5d3f..ef3b468dc1a 100644
--- a/litellm/llms/openai/responses/transformation.py
+++ b/litellm/llms/openai/responses/transformation.py
@@ -1,5 +1,5 @@
 from collections.abc import Callable, Collection, Iterable, Mapping, Sequence
-from functools import lru_cache
+from functools import lru_cache, partial
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, Protocol, cast, get_type_hints
 
@@ -12,7 +12,7 @@ import litellm
 from litellm._logging import verbose_logger
 from litellm.integrations.anthropic_cache_control_hook import (
     AnthropicCacheControlHook,
-    openai_prompt_cache_breakpoint_support,
+    deployment_prompt_cache_breakpoint_support,
     targets_openai_api,
 )
 from litellm.litellm_core_utils.core_helpers import normalize_drop_params, process_response_headers
@@ -25,6 +25,7 @@ from litellm.litellm_core_utils.prompt_templates.common_utils import (
     drop_non_python_regex_patterns,
     flatten_combinators_and_drop_non_python_regex_patterns,
     prompt_cache_breakpoint_for_wire,
+    whole_prompt_cache_breakpoint_or_none,
     with_prompt_cache_breakpoint,
 )
 from litellm.litellm_core_utils.safe_json_loads import safe_json_loads
@@ -103,13 +104,6 @@ _INPUT_ITEM: Final[TypeAdapter[Mapping[str, object]]] = TypeAdapter(Mapping[str,
 _CONTENT_PARTS: Final[TypeAdapter[Sequence[Mapping[str, object]]]] = TypeAdapter(Sequence[Mapping[str, object]])
 
 
-class _DeclaredModel(BaseModel):
-    model_config = ConfigDict(frozen=True, extra="ignore", from_attributes=True)
-
-    base_model: object = None
-    model_info: object = None
-
-
 class _DeploymentHost(BaseModel):
     """`responses()` builds the params from raw kwargs, where callers may spell the host `base_url`."""
 
@@ -241,12 +235,12 @@ def _json_array_or_empty(value: object) -> Sequence[object]:
     return value if isinstance(value, (list, tuple)) else ()
 
 
-def _item_with_wire_safe_prompt_cache_breakpoints(item: object, keeps_markers: bool) -> object:
+def _item_with_wire_safe_prompt_cache_breakpoints(item: object, to_wire: Callable[[object], object] | None) -> object:
     fields: Final = _json_object_or_none(item)
     if fields is None or not _carries_prompt_cache_breakpoint(fields):
         return item
     wire_safe_fields: Final = {
-        key: _parts_with_wire_safe_prompt_cache_breakpoints(key, value, keeps_markers)
+        key: _parts_with_wire_safe_prompt_cache_breakpoints(key, value, to_wire)
         for key, value in fields.items()
         if key != "prompt_cache_breakpoint"
     }
@@ -270,21 +264,23 @@ def _parts_carry_prompt_cache_breakpoint(parts: object) -> bool:
     return any(isinstance(part, Mapping) and "prompt_cache_breakpoint" in part for part in _json_array_or_empty(parts))
 
 
-def _parts_with_wire_safe_prompt_cache_breakpoints(key: str, value: object, keeps_markers: bool) -> object:
+def _parts_with_wire_safe_prompt_cache_breakpoints(
+    key: str, value: object, to_wire: Callable[[object], object] | None
+) -> object:
     if key not in _INPUT_PART_LIST_KEYS or not _parts_carry_prompt_cache_breakpoint(value):
         return value
     parts: Final = _json_array_or_empty(value)
-    wire_safe_parts: Final = tuple(_part_with_wire_safe_prompt_cache_breakpoint(part, keeps_markers) for part in parts)
+    wire_safe_parts: Final = tuple(_part_with_wire_safe_prompt_cache_breakpoint(part, to_wire) for part in parts)
     return value if _same_objects(wire_safe_parts, parts) else list(wire_safe_parts)
 
 
-def _part_with_wire_safe_prompt_cache_breakpoint(part: object, keeps_markers: bool) -> object:
+def _part_with_wire_safe_prompt_cache_breakpoint(part: object, to_wire: Callable[[object], object] | None) -> object:
     fields: Final = _json_object_or_none(part)
     if fields is None or "prompt_cache_breakpoint" not in fields:
         return part
     marker: Final = fields["prompt_cache_breakpoint"]
-    wire_marker: Final = prompt_cache_breakpoint_for_wire(marker, drop_params=True) if keeps_markers else None
-    if keeps_markers and wire_marker == marker:
+    wire_marker: Final = None if to_wire is None else to_wire(marker)
+    if to_wire is not None and wire_marker == marker:
         return part
     unmarked: Final = {key: value for key, value in fields.items() if key != "prompt_cache_breakpoint"}
     return with_prompt_cache_breakpoint(unmarked, wire_marker)
@@ -681,24 +677,31 @@ class OpenAIResponsesAPIConfig(BaseResponsesAPIConfig):
     ) -> str | ResponseInputParam:
         if not isinstance(input, list) or not drops_params(litellm_params):
             return input
-        keeps_markers: Final = reads_breakpoints or self._keeps_prompt_cache_breakpoints(
-            model=model, litellm_params=litellm_params
-        )
-        wire_safe_items: Final = tuple(
-            _item_with_wire_safe_prompt_cache_breakpoints(item, keeps_markers) for item in input
+        known_support: Final = self._prompt_cache_breakpoint_support(model=model, litellm_params=litellm_params)
+        to_wire: Final = (
+            self._prompt_cache_breakpoint_to_wire(litellm_params, reads_breakpoints, known_support)
+            if reads_breakpoints or known_support is not False
+            else None
         )
+        wire_safe_items: Final = tuple(_item_with_wire_safe_prompt_cache_breakpoints(item, to_wire) for item in input)
         if _same_objects(wire_safe_items, input):
             return input
         wire_safe_input: Final = list(wire_safe_items)
         return cast("ResponseInputParam", wire_safe_input)  # cast-ok: items keep their shape, minus a rejected marker
 
-    def _keeps_prompt_cache_breakpoints(self, model: str, litellm_params: GenericLiteLLMParams) -> bool:
-        provider: Final = _provider_name(self.custom_llm_provider)
-        base_model: Final = self._declared_base_model(model=model, litellm_params=litellm_params)
-        known_support: Final = (
-            openai_prompt_cache_breakpoint_support(name, provider) for name in dict.fromkeys((base_model, model))
+    def _prompt_cache_breakpoint_to_wire(
+        self, litellm_params: GenericLiteLLMParams, reads_breakpoints: bool, known_support: bool | None
+    ) -> Callable[[object], object]:
+        opted_in_openai_host: Final = reads_breakpoints and self.custom_llm_provider == LlmProviders.OPENAI
+        known_openai_reader: Final = known_support is True and self._targets_openai_api(litellm_params)
+        if opted_in_openai_host or known_openai_reader:
+            return partial(prompt_cache_breakpoint_for_wire, drop_params=True)
+        return whole_prompt_cache_breakpoint_or_none
+
+    def _prompt_cache_breakpoint_support(self, model: str, litellm_params: GenericLiteLLMParams) -> bool | None:
+        return deployment_prompt_cache_breakpoint_support(
+            model, _provider_name(self.custom_llm_provider), litellm_params
         )
-        return next((support for support in known_support if support is not None), None) is not False
 
     def _targets_openai_api(self, litellm_params: GenericLiteLLMParams) -> bool:
         host: Final = _DeploymentHost.model_validate(litellm_params)
@@ -872,13 +875,6 @@ class OpenAIResponsesAPIConfig(BaseResponsesAPIConfig):
         base_model: Final[object] = model_info.get("base_model") if isinstance(model_info, dict) else None
         return base_model if isinstance(base_model, str) and base_model else model
 
-    @staticmethod
-    def _declared_base_model(model: str, litellm_params: GenericLiteLLMParams) -> str:
-        declared: Final = _DeclaredModel.model_validate(litellm_params)
-        model_info: Final = _json_object_or_none(declared.model_info)
-        candidates: Final = (declared.base_model, None if model_info is None else model_info.get("base_model"))
-        return next((name for name in candidates if isinstance(name, str) and name), model)
-
     @staticmethod
     def _sanitized_tool_entry(
         entry: Mapping[str, object],
diff --git a/litellm/llms/opencode/chat/transformation.py b/litellm/llms/opencode/chat/transformation.py
index dcb30b5835c..7e16f93d7cb 100644
--- a/litellm/llms/opencode/chat/transformation.py
+++ b/litellm/llms/opencode/chat/transformation.py
@@ -1,5 +1,5 @@
 from collections.abc import AsyncIterator, Iterator, Mapping, Sequence
-from typing import TYPE_CHECKING, Final
+from typing import TYPE_CHECKING, ClassVar, Final
 
 import httpx
 from pydantic import TypeAdapter
@@ -159,6 +159,7 @@ class OpenCodeGoMessagesChatConfig(_GoReportedCostMixin, AnthropicConfig):
 
 class OpenCodeGoGeminiChatConfig(_GoReportedCostMixin, GoogleAIStudioGeminiConfig):
     go_usage_key: str = "usageMetadata"
+    _route: ClassVar[str] = "opencode_go"
 
     @property
     def supports_stream_param_in_request_body(self) -> bool:
diff --git a/litellm/llms/vertex_ai/common_utils.py b/litellm/llms/vertex_ai/common_utils.py
index ad64d852ef9..52345e1ff40 100644
--- a/litellm/llms/vertex_ai/common_utils.py
+++ b/litellm/llms/vertex_ai/common_utils.py
@@ -1458,6 +1458,7 @@ class VertexAITokenCounter(BaseTokenCounter):
     ) -> TokenCountResponse | None:
         import copy
 
+        from litellm.llms.anthropic.common_utils import context_management_with_edits
         from litellm.llms.vertex_ai.vertex_ai_partner_models.count_tokens.handler import count_tokens_publisher
         from litellm.llms.vertex_ai.vertex_ai_partner_models.main import (
             VertexAIError as PartnerVertexAIError,
@@ -1539,6 +1540,9 @@ class VertexAITokenCounter(BaseTokenCounter):
                     system=system,
                     tools=tools,
                     count_options=count_options,
+                    context_management=(
+                        None if context_management is None else context_management_with_edits(context_management.spec)
+                    ),
                 )
             except (PartnerVertexAIError, httpx.HTTPStatusError) as e:
                 status_code: Final = e.response.status_code
@@ -1565,12 +1569,15 @@ class VertexAITokenCounter(BaseTokenCounter):
                     original_response=result,
                 )
         else:
+            from litellm.llms.anthropic.messages.context_management.inference_view import (
+                InferenceRequestViewError,
+                count_context_edits,
+                inference_request_view,
+            )
             from litellm.llms.vertex_ai.count_tokens.context import (
                 VertexGeminiCountContextError,
-                count_context_edits,
                 count_context_error_response,
                 gemini_count_contents,
-                inference_request_view,
                 malformed_tool_result_text_count_error,
                 provider_error_response,
                 unconvertible_messages_error,
@@ -1584,7 +1591,7 @@ class VertexAITokenCounter(BaseTokenCounter):
                 messages_format,
                 count_context_edits(context_management, tools, count_tokens_params_request, model_to_use),
             )
-            if isinstance(request_view, VertexGeminiCountContextError):
+            if isinstance(request_view, InferenceRequestViewError):
                 return count_context_error_response(request_view, request_model, model_to_use)
             count_context: Final = vertex_gemini_count_context(
                 system=request_view.system, tools=tools, model=model_to_use
diff --git a/litellm/llms/vertex_ai/context_caching/rejected_cache_retry.py b/litellm/llms/vertex_ai/context_caching/rejected_cache_retry.py
index 43e4ee8dc84..7334fb0520a 100644
--- a/litellm/llms/vertex_ai/context_caching/rejected_cache_retry.py
+++ b/litellm/llms/vertex_ai/context_caching/rejected_cache_retry.py
@@ -1,4 +1,4 @@
-from collections.abc import Awaitable, Callable
+from collections.abc import Awaitable, Callable, Mapping, Sequence
 from copy import deepcopy
 from functools import partial
 from typing import Final, TypeVar
@@ -17,16 +17,27 @@ Built: Final = TypeVar("Built")
 Sent: Final = TypeVar("Sent")
 
 
-def cache_rebuild(
+def _build_from_copies(
+    build: Callable[..., Built], messages: Sequence[AllMessageValues], optional_params: Mapping[str, object]
+) -> Built:
+    return build(messages=deepcopy(list(messages)), optional_params=independent_snapshot(dict(optional_params)))
+
+
+def cache_rebuilds(
     build: Callable[..., Built], messages: list[AllMessageValues], optional_params: dict
-) -> Callable[[], Built] | None:
-    """Copies the inputs before the first transform, which pops keys from ``optional_params`` and ``messages``."""
+) -> tuple[Callable[[], Built], Callable[[], Built]] | tuple[None, None]:
+    """Returns one build with a fresh cache and one with the history inline, both over a snapshot of the inputs
+    taken before the first transform, which pops keys from ``optional_params`` and ``messages``. Each call
+    copies the snapshot again, since every transform consumes the inputs it is given."""
     if not any(map(is_cached_message, messages)):
-        return None
-    return partial(build, messages=deepcopy(messages), optional_params=independent_snapshot(optional_params))
+        return None, None
+    from_snapshot: Final = partial(
+        _build_from_copies, messages=deepcopy(messages), optional_params=independent_snapshot(optional_params)
+    )
+    return partial(from_snapshot, build), partial(from_snapshot, partial(build, context_caching=False))
 
 
-def _status_and_message(error: httpx.HTTPStatusError | BaseLLMException) -> tuple[int, str]:
+def status_and_message(error: httpx.HTTPStatusError | BaseLLMException) -> tuple[int, str]:
     match error:
         case httpx.HTTPStatusError():
             return error.response.status_code, error.response.text
@@ -35,7 +46,7 @@ def _status_and_message(error: httpx.HTTPStatusError | BaseLLMException) -> tupl
 
 
 def _cache_rejected(body: RequestBody, error: httpx.HTTPStatusError | BaseLLMException) -> bool:
-    return body.get("cachedContent") is not None and names_rejected_cache(*_status_and_message(error))
+    return body.get("cachedContent") is not None and names_rejected_cache(*status_and_message(error))
 
 
 async def post_with_fresh_cache_async(
diff --git a/litellm/llms/vertex_ai/context_caching/vertex_ai_context_caching.py b/litellm/llms/vertex_ai/context_caching/vertex_ai_context_caching.py
index 884c82fe331..4603f612926 100644
--- a/litellm/llms/vertex_ai/context_caching/vertex_ai_context_caching.py
+++ b/litellm/llms/vertex_ai/context_caching/vertex_ai_context_caching.py
@@ -425,6 +425,7 @@ class ContextCachingEndpoints(VertexBase):
         vertex_auth_header: str | None,
         extra_headers: dict | None = None,
         cached_content: str | None = None,
+        context_caching: bool = True,
     ) -> tuple[list[AllMessageValues], dict, str | None]:
         """
         Receives
@@ -436,7 +437,7 @@ class ContextCachingEndpoints(VertexBase):
 
         Follows - https://ai.google.dev/api/caching#request-body
         """
-        if cached_content is not None:
+        if cached_content is not None or not context_caching:
             return messages, optional_params, cached_content
 
         cached_messages, non_cached_messages = separate_cached_messages(messages=messages)
@@ -573,6 +574,7 @@ class ContextCachingEndpoints(VertexBase):
         vertex_auth_header: str | None,
         extra_headers: dict | None = None,
         cached_content: str | None = None,
+        context_caching: bool = True,
     ) -> tuple[list[AllMessageValues], dict, str | None]:
         """
         Receives
@@ -584,7 +586,7 @@ class ContextCachingEndpoints(VertexBase):
 
         Follows - https://ai.google.dev/api/caching#request-body
         """
-        if cached_content is not None:
+        if cached_content is not None or not context_caching:
             return messages, optional_params, cached_content
 
         cached_messages, non_cached_messages = separate_cached_messages(messages=messages)
diff --git a/litellm/llms/vertex_ai/count_tokens/context.py b/litellm/llms/vertex_ai/count_tokens/context.py
index fc7d6545624..c29f2ecbcf8 100644
--- a/litellm/llms/vertex_ai/count_tokens/context.py
+++ b/litellm/llms/vertex_ai/count_tokens/context.py
@@ -11,10 +11,11 @@ from litellm.litellm_core_utils.prompt_templates.factory import chat_completion_
 from litellm.types.llms.anthropic import AnthropicMessagesTextParam
 from litellm.types.llms.openai import AllMessageValues
 from litellm.types.llms.vertex_ai import ContentType
-from litellm.types.utils import CountContextManagement, TokenCountMessagesFormat, TokenCountResponse
+from litellm.types.utils import TokenCountMessagesFormat, TokenCountResponse
 
 if TYPE_CHECKING:
     from litellm.exceptions import APIError
+    from litellm.llms.anthropic.messages.context_management.inference_view import InferenceRequestViewError
 
 
 @dataclass(frozen=True, slots=True)
@@ -152,7 +153,7 @@ def malformed_tool_result_text_count_error(
 
 
 def count_context_error_response(
-    error: VertexGeminiCountContextError, request_model: str, model_used: str
+    error: "VertexGeminiCountContextError | InferenceRequestViewError", request_model: str, model_used: str
 ) -> TokenCountResponse:
     return TokenCountResponse(
         total_tokens=0,
@@ -178,130 +179,6 @@ def provider_error_response(error: "APIError", request_model: str, model_used: s
     )
 
 
-@dataclass(frozen=True, slots=True)
-class InferenceRequestView:
-    messages: Sequence[Mapping[str, object]]
-    system: object | None
-
-
-@dataclass(frozen=True, slots=True)
-class CountContextEdits:
-    spec: JsonValue
-    model: str
-    tools: tuple[Mapping[str, object], ...] | None
-    drop_invalid_edits: bool = False
-
-
-_CONTEXT_MANAGEMENT_SPEC: Final[TypeAdapter[Mapping[str, object] | tuple[Mapping[str, object], ...]]] = TypeAdapter(
-    Mapping[str, object] | tuple[Mapping[str, object], ...]
-)
-
-
-def count_context_edits(
-    context_management: CountContextManagement | None,
-    tools: Sequence[Mapping[str, object]] | None,
-    litellm_params: Mapping[str, object],
-    fallback_model: str,
-) -> CountContextEdits:
-    model: Final = litellm_params.get("model")
-    return CountContextEdits(
-        spec=None if context_management is None else context_management.spec,
-        model=model if isinstance(model, str) else fallback_model,
-        tools=None if tools is None else tuple(tools),
-        drop_invalid_edits=context_management is not None and context_management.drop_invalid_edits,
-    )
-
-
-def _typed_spec(spec: JsonValue) -> Mapping[str, object] | tuple[Mapping[str, object], ...] | None:
-    try:
-        return _CONTEXT_MANAGEMENT_SPEC.validate_python(spec)
-    except ValidationError:
-        return None
-
-
-def _typed_system(
-    system: object | None,
-) -> str | tuple[AnthropicMessagesTextParam, ...] | None | VertexGeminiCountContextError:
-    if system is None or isinstance(system, str):
-        return system
-    try:
-        return _SYSTEM_BLOCKS.validate_python(system)
-    except ValidationError:
-        return _INVALID_SYSTEM
-
-
-def _view_without_edits(
-    messages: Sequence[Mapping[str, object]],
-    system: object | None,
-    typed_system: str | Sequence[Mapping[str, object]] | None,
-) -> InferenceRequestView:
-    from litellm.llms.anthropic.messages.context_management.editors.compact import (
-        apply_client_compaction_block_history,
-    )
-
-    history: Final = apply_client_compaction_block_history(
-        messages=[dict(message) for message in messages],
-        system=typed_system
-        if typed_system is None or isinstance(typed_system, str)
-        else [dict(block) for block in typed_system],
-    )
-    if history is None:
-        return InferenceRequestView(messages=messages, system=system)
-    return InferenceRequestView(messages=history.messages, system=history.system)
-
-
-async def _anthropic_inference_view(
-    messages: Sequence[Mapping[str, object]], system: object | None, edits: CountContextEdits
-) -> InferenceRequestView | VertexGeminiCountContextError:
-    from litellm.llms.anthropic.messages.adapters.handler import prepare_context_managed_request
-    from litellm.llms.anthropic.messages.context_management import AnthropicContextManagementError
-    from litellm.llms.anthropic.messages.native.utils import normalize_native_messages
-
-    typed_system: Final = _typed_system(system)
-    if isinstance(typed_system, VertexGeminiCountContextError):
-        return typed_system
-    normalized: Final = normalize_native_messages(messages)
-    spec: Final = _typed_spec(edits.spec)
-    try:
-        prepared: Final = await prepare_context_managed_request(
-            model=edits.model,
-            messages=normalized,
-            tools=None if edits.tools is None else [dict(tool) for tool in edits.tools],
-            system=[dict(block) for block in typed_system] if isinstance(typed_system, tuple) else typed_system,
-            context_management_spec=(
-                None if spec is None else dict(spec) if isinstance(spec, Mapping) else [dict(edit) for edit in spec]
-            ),
-            litellm_metadata=None,
-            additional_drop_params=None,
-            llm_router=None,
-            count_only=True,
-            drop_invalid_edits=edits.drop_invalid_edits,
-        )
-    except AnthropicContextManagementError as error:
-        if error.status_code >= 500:
-            return _view_without_edits(normalized, system, typed_system)
-        return VertexGeminiCountContextError(error_message=error.message, status_code=error.status_code)
-    if prepared is None:
-        return InferenceRequestView(messages=normalized, system=system)
-    return InferenceRequestView(messages=prepared.messages, system=prepared.system)
-
-
-async def inference_request_view(
-    messages: Sequence[Mapping[str, object]],
-    system: object | None,
-    messages_format: TokenCountMessagesFormat,
-    edits: CountContextEdits,
-) -> InferenceRequestView | VertexGeminiCountContextError:
-    """Apply the history rewrites and context edits /v1/messages runs before it converts a body for Gemini."""
-    match messages_format:
-        case "openai":
-            return InferenceRequestView(messages=messages, system=system)
-        case "anthropic":
-            return await _anthropic_inference_view(messages, system, edits)
-        case _:
-            assert_never(messages_format)
-
-
 def _chat_messages(
     messages: Sequence[Mapping[str, object]],
     messages_format: TokenCountMessagesFormat,
diff --git a/litellm/llms/vertex_ai/gemini/rejected_thought_signature_retry.py b/litellm/llms/vertex_ai/gemini/rejected_thought_signature_retry.py
new file mode 100644
index 00000000000..32893471c11
--- /dev/null
+++ b/litellm/llms/vertex_ai/gemini/rejected_thought_signature_retry.py
@@ -0,0 +1,235 @@
+from collections.abc import Awaitable, Callable, Iterator, Mapping, Sequence
+from typing import Final, TypeVar
+
+import httpx
+from pydantic import TypeAdapter, ValidationError
+
+from litellm import verbose_logger
+from litellm.litellm_core_utils.prompt_templates.factory import get_dummy_thought_signature
+from litellm.llms.base_llm.chat.transformation import BaseLLMException
+from litellm.types.llms.vertex_ai import ContentType, PartType, RequestBody
+
+from ..context_caching.rejected_cache_retry import status_and_message
+
+Body: Final = TypeVar("Body", bound=Mapping[str, object])
+Sent: Final = TypeVar("Sent")
+
+_REJECTED_SIGNATURE_MARKER: Final = "thought signature"
+_SIGNATURE_KEYS: Final = frozenset({"thoughtSignature", "thought_signature"})
+_ENTRIES: Final = TypeAdapter(list[dict[str, object]])
+
+
+def names_rejected_thought_signature(status_code: int, message: str) -> bool:
+    """A signature only validates on the backend that minted it. AI Studio answers a replayed Vertex signature
+    with ``400 Corrupted thought signature.`` and Vertex answers an AI Studio one with ``400 Invalid thought
+    signature.``"""
+    return status_code == 400 and _REJECTED_SIGNATURE_MARKER in message.lower()
+
+
+def _is_rejected_signature(error: httpx.HTTPStatusError | BaseLLMException) -> bool:
+    return names_rejected_thought_signature(*status_and_message(error))
+
+
+def _entries(value: object) -> Sequence[Mapping[str, object]]:
+    try:
+        return _ENTRIES.validate_python(value)
+    except ValidationError:
+        return []
+
+
+def _foreign_signatures(body: Mapping[str, object], placeholder: str) -> Iterator[object]:
+    for content in _entries(body.get("contents")):
+        for part in _entries(content.get("parts")):
+            yield from (
+                value for key, value in part.items() if key in _SIGNATURE_KEYS and value and value != placeholder
+            )
+
+
+def _foreign_signature_count(body: Mapping[str, object]) -> int:
+    return sum(1 for _ in _foreign_signatures(body, get_dummy_thought_signature()))
+
+
+def _part_with_placeholder(part: PartType, placeholder: str) -> PartType:
+    if not part.get("thoughtSignature"):
+        return part
+    return {**part, "thoughtSignature": placeholder}
+
+
+def _content_with_placeholders(content: ContentType, placeholder: str) -> ContentType:
+    return {**content, "parts": [_part_with_placeholder(part, placeholder) for part in content["parts"]]}
+
+
+def with_placeholder_thought_signatures(body: RequestBody) -> RequestBody | None:
+    """Swaps every thought signature in the history for Google's documented skip-validator placeholder, or
+    returns ``None`` when the body carries nothing the backend could have rejected."""
+    placeholder: Final = get_dummy_thought_signature()
+    if next(_foreign_signatures(body, placeholder), None) is None:
+        return None
+    return {**body, "contents": [_content_with_placeholders(content, placeholder) for content in body["contents"]]}
+
+
+def _native_part_with_placeholder(part: Mapping[str, object], placeholder: str) -> Mapping[str, object]:
+    return {key: placeholder if key in _SIGNATURE_KEYS and value else value for key, value in part.items()}
+
+
+def _native_content_with_placeholders(content: Mapping[str, object], placeholder: str) -> Mapping[str, object]:
+    parts: Final = _entries(content.get("parts"))
+    if not parts:
+        return content
+    return {**content, "parts": [_native_part_with_placeholder(part, placeholder) for part in parts]}
+
+
+def with_placeholder_native_thought_signatures(body: Mapping[str, object]) -> Mapping[str, object] | None:
+    """The same swap on a ``generateContent`` body as the client sent it, whose parts may spell the key
+    ``thoughtSignature`` or ``thought_signature``."""
+    placeholder: Final = get_dummy_thought_signature()
+    if next(_foreign_signatures(body, placeholder), None) is None:
+        return None
+    return {
+        **body,
+        "contents": [
+            _native_content_with_placeholders(content, placeholder) for content in _entries(body.get("contents"))
+        ],
+    }
+
+
+async def _inline_history_async(body: Body, uncached: Callable[[], Awaitable[Body]] | None) -> Body | None:
+    if uncached is None or body.get("cachedContent") is None:
+        return None
+    inline: Final = await uncached()
+    return inline if _foreign_signature_count(inline) > _foreign_signature_count(body) else None
+
+
+def _inline_history_sync(body: Body, uncached: Callable[[], Body] | None) -> Body | None:
+    if uncached is None or body.get("cachedContent") is None:
+        return None
+    inline: Final = uncached()
+    return inline if _foreign_signature_count(inline) > _foreign_signature_count(body) else None
+
+
+def _resend_body(signed: Body, placeholders: Callable[[Body], Body | None]) -> Body | None:
+    resend_body: Final = placeholders(signed)
+    if resend_body is not None:
+        verbose_logger.warning(
+            "Gemini rejected a replayed thought signature, resending with the skip_thought_signature_validator"
+            " placeholder in place of the replayed signatures"
+        )
+    return resend_body
+
+
+async def build_with_accepted_thought_signatures_async(
+    build: Callable[[], Awaitable[Body]],
+    placeholders: Callable[[Body], Body | None],
+    uncached: Callable[[], Awaitable[Body]] | None,
+) -> Body:
+    """Vertex validates the signatures in a cache's contents when it creates the cache, so a rejected one there
+    sends the history inline with the placeholder instead."""
+    try:
+        return await build()
+    except BaseLLMException as error:
+        if uncached is None or not _is_rejected_signature(error):
+            raise
+        inline_body: Final = _resend_body(await uncached(), placeholders)
+        if inline_body is None:
+            raise
+    return inline_body
+
+
+def build_with_accepted_thought_signatures_sync(
+    build: Callable[[], Body],
+    placeholders: Callable[[Body], Body | None],
+    uncached: Callable[[], Body] | None,
+) -> Body:
+    try:
+        return build()
+    except BaseLLMException as error:
+        if uncached is None or not _is_rejected_signature(error):
+            raise
+        inline_body: Final = _resend_body(uncached(), placeholders)
+        if inline_body is None:
+            raise
+    return inline_body
+
+
+async def _post_inline_async(
+    body: Body,
+    placeholders: Callable[[Body], Body | None],
+    uncached: Callable[[], Awaitable[Body]] | None,
+    post: Callable[[Body], Awaitable[Sent]],
+    log_request: Callable[[Body], None],
+    rejection: httpx.HTTPStatusError | BaseLLMException,
+) -> tuple[Body, Sent]:
+    inline: Final = await _inline_history_async(body, uncached)
+    resend_body: Final = None if inline is None else _resend_body(inline, placeholders)
+    if resend_body is None:
+        raise rejection
+    log_request(resend_body)
+    return resend_body, await post(resend_body)
+
+
+def _post_inline_sync(
+    body: Body,
+    placeholders: Callable[[Body], Body | None],
+    uncached: Callable[[], Body] | None,
+    post: Callable[[Body], Sent],
+    log_request: Callable[[Body], None],
+    rejection: httpx.HTTPStatusError | BaseLLMException,
+) -> tuple[Body, Sent]:
+    inline: Final = _inline_history_sync(body, uncached)
+    resend_body: Final = None if inline is None else _resend_body(inline, placeholders)
+    if resend_body is None:
+        raise rejection
+    log_request(resend_body)
+    return resend_body, post(resend_body)
+
+
+async def post_with_accepted_thought_signatures_async(
+    body: Body,
+    placeholders: Callable[[Body], Body | None],
+    uncached: Callable[[], Awaitable[Body]] | None,
+    post: Callable[[Body], Awaitable[Sent]],
+    log_request: Callable[[Body], None],
+) -> tuple[Body, Sent]:
+    """Innermost retry around the raw post, so a cache rebuild (which re-transforms the messages and brings
+    the rejected signatures back) is itself wrapped by it. The resend keeps the cache and swaps the signatures
+    the body carries, and sends the history inline only when that is rejected too and the cache holds one.
+    Returns the body the backend accepted."""
+    try:
+        return body, await post(body)
+    except (httpx.HTTPStatusError, BaseLLMException) as error:
+        if not _is_rejected_signature(error):
+            raise
+        resend_body: Final = _resend_body(body, placeholders)
+        if resend_body is None:
+            return await _post_inline_async(body, placeholders, uncached, post, log_request, error)
+    log_request(resend_body)
+    try:
+        return resend_body, await post(resend_body)
+    except (httpx.HTTPStatusError, BaseLLMException) as error:
+        if not _is_rejected_signature(error):
+            raise
+        return await _post_inline_async(body, placeholders, uncached, post, log_request, error)
+
+
+def post_with_accepted_thought_signatures_sync(
+    body: Body,
+    placeholders: Callable[[Body], Body | None],
+    uncached: Callable[[], Body] | None,
+    post: Callable[[Body], Sent],
+    log_request: Callable[[Body], None],
+) -> tuple[Body, Sent]:
+    try:
+        return body, post(body)
+    except (httpx.HTTPStatusError, BaseLLMException) as error:
+        if not _is_rejected_signature(error):
+            raise
+        resend_body: Final = _resend_body(body, placeholders)
+        if resend_body is None:
+            return _post_inline_sync(body, placeholders, uncached, post, log_request, error)
+    log_request(resend_body)
+    try:
+        return resend_body, post(resend_body)
+    except (httpx.HTTPStatusError, BaseLLMException) as error:
+        if not _is_rejected_signature(error):
+            raise
+        return _post_inline_sync(body, placeholders, uncached, post, log_request, error)
diff --git a/litellm/llms/vertex_ai/gemini/transformation.py b/litellm/llms/vertex_ai/gemini/transformation.py
index bbd4a96980a..3244e0ae15b 100644
--- a/litellm/llms/vertex_ai/gemini/transformation.py
+++ b/litellm/llms/vertex_ai/gemini/transformation.py
@@ -1256,6 +1256,7 @@ def sync_transform_request_body(
     vertex_project: str | None,
     vertex_location: str | None,
     vertex_auth_header: str | None,
+    context_caching: bool = True,
 ) -> RequestBody:
     from ..context_caching.vertex_ai_context_caching import ContextCachingEndpoints
 
@@ -1275,6 +1276,7 @@ def sync_transform_request_body(
         timeout=timeout,
         extra_headers=extra_headers,
         cached_content=optional_params.pop("cached_content", None),
+        context_caching=context_caching,
         logging_obj=logging_obj,
         custom_llm_provider=custom_llm_provider,
         vertex_project=vertex_project,
@@ -1390,6 +1392,7 @@ async def async_transform_request_body(
     vertex_project: str | None,
     vertex_location: str | None,
     vertex_auth_header: str | None,
+    context_caching: bool = True,
 ) -> RequestBody:
     from ..context_caching.vertex_ai_context_caching import ContextCachingEndpoints
 
@@ -1409,6 +1412,7 @@ async def async_transform_request_body(
         timeout=timeout,
         extra_headers=extra_headers,
         cached_content=optional_params.pop("cached_content", None),
+        context_caching=context_caching,
         logging_obj=logging_obj,
         custom_llm_provider=custom_llm_provider,
         vertex_project=vertex_project,
diff --git a/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py b/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py
index 69580687048..32d7b39a20e 100644
--- a/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py
+++ b/litellm/llms/vertex_ai/gemini/vertex_and_google_ai_studio_gemini.py
@@ -9,7 +9,7 @@ from collections.abc import Awaitable, Callable, Mapping, Sequence
 from copy import deepcopy
 from functools import lru_cache, partial
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, Final, Literal, Optional, Protocol, Union, cast, get_args
+from typing import TYPE_CHECKING, Any, ClassVar, Final, Literal, Optional, Protocol, Union, cast, get_args
 
 import httpx
 from pydantic import JsonValue, TypeAdapter
@@ -34,6 +34,7 @@ from litellm.litellm_core_utils.json_fragment_accumulator import JSONFragmentAcc
 from litellm.litellm_core_utils.model_param_helper import embeds_thought_signature_in_tool_call_id
 from litellm.litellm_core_utils.prompt_templates.factory import encode_tool_call_id_with_signature
 from litellm.litellm_core_utils.reasoning_effort_utils import warn_dropped_reasoning
+from litellm.litellm_core_utils.tool_fields import tool_params_without_hosted_mcp
 from litellm.llms.base_llm.chat.transformation import BaseConfig, BaseLLMException
 from litellm.llms.custom_httpx.http_handler import (
     AsyncHTTPHandler,
@@ -103,7 +104,7 @@ from ..common_utils import (
 )
 from ..context_caching.known_cached_contents import known_cached_contents
 from ..context_caching.rejected_cache_retry import (
-    cache_rebuild,
+    cache_rebuilds,
     post_with_fresh_cache_async,
     post_with_fresh_cache_sync,
 )
@@ -134,6 +135,13 @@ from .long_decode import (
     with_initial_prompt_tokens,
     with_spans_shifted,
 )
+from .rejected_thought_signature_retry import (
+    build_with_accepted_thought_signatures_async,
+    build_with_accepted_thought_signatures_sync,
+    post_with_accepted_thought_signatures_async,
+    post_with_accepted_thought_signatures_sync,
+    with_placeholder_thought_signatures,
+)
 from .transformation import (
     async_transform_request_body,
     gemini_convert_messages_with_history,
@@ -437,6 +445,8 @@ _NAMED_UNKNOWN_VOICE_KEYS: Final = 10
 
 _NAMED_VOICE_KEY_CHARS: Final = 100
 
+_NAMED_AUDIO_FORMAT_CHARS: Final = 100
+
 
 def _gemini_speech_config_wrapper(value: Mapping[str, object]) -> Mapping[str, object] | None:
     camel_config: Final = as_str_mapping(value.get("speechConfig"))
@@ -473,6 +483,31 @@ def reject_unknown_gemini_tts_voice_keys(
     )
 
 
+def _named_audio_format(audio_format: object) -> str:
+    if isinstance(audio_format, str):
+        return repr(audio_format[:_NAMED_AUDIO_FORMAT_CHARS])
+    return repr(audio_format)[:_NAMED_AUDIO_FORMAT_CHARS]
+
+
+def unsupported_gemini_tts_audio_format(
+    model: str, audio: Mapping[str, object], drop_params: bool, llm_provider: str | None
+) -> UnsupportedParamsError | None:
+    nested_config: Final = _gemini_speech_config_wrapper(audio) or {}
+    audio_format: Final = next(
+        (item for item in (audio.get("format"), nested_config.get("format")) if item not in (None, "pcm16")), None
+    )
+    if audio_format is None or drops_unsupported_params(drop_params):
+        return None
+    return UnsupportedParamsError(
+        message=(
+            f"{model} does not take the audio format {_named_audio_format(audio_format)}. Set format "
+            "to 'pcm16' or leave it out, or set drop_params to drop it."
+        ),
+        model=model,
+        llm_provider=llm_provider,
+    )
+
+
 def normalize_gemini_speech_config(
     value: Mapping[str, object], drop_unknown_fields: bool = False
 ) -> dict[str, object]:  # mutable-ok: provider request serialization requires a concrete dict
@@ -587,6 +622,8 @@ class VertexGeminiConfig(VertexAIBaseConfig, BaseConfig):
     Note: Please make sure to modify the default parameters as required for your use case.
     """
 
+    _route: ClassVar[str] = "vertex_ai"
+
     temperature: float | None = None
     max_output_tokens: int | None = None
     top_p: float | None = None
@@ -1555,15 +1592,11 @@ class VertexGeminiConfig(VertexAIBaseConfig, BaseConfig):
             languageCode: "en-US",
         }
         """
-        # Validate audio format - Gemini TTS only supports pcm16
-        audio_format: Final = value.get("format")
-        if audio_format is not None and audio_format != "pcm16":
-            raise ValueError(
-                f"Unsupported audio format for Gemini TTS models: {audio_format}. "
-                f"Gemini TTS models only support 'pcm16' format as they return audio data in L16 PCM format. "
-                f"Please set audio format to 'pcm16'."
-            )
-
+        audio_format_error: Final = unsupported_gemini_tts_audio_format(
+            "Gemini TTS", value, drop_unknown_fields, self.custom_llm_provider
+        )
+        if audio_format_error is not None:
+            raise audio_format_error
         camel_speech_config: Final = value.get("speechConfig")
         snake_speech_config: Final = value.get("speech_config")
         speech_config_value: Final = (
@@ -1601,6 +1634,11 @@ class VertexGeminiConfig(VertexAIBaseConfig, BaseConfig):
     def _map_chat_audio_params(
         self, model: str, value: Mapping[str, object], drop_params: bool
     ) -> dict[str, object]:  # mutable-ok: the public forwarding interface returns a concrete request dictionary
+        audio_format_error: Final = unsupported_gemini_tts_audio_format(
+            model, value, drop_params, self.custom_llm_provider
+        )
+        if audio_format_error is not None:
+            raise audio_format_error
         if _gemini_speech_config_wrapper(value) is not None:
             reject_unknown_gemini_tts_voice_keys(model, value, drop_params, self.custom_llm_provider)
         return self._map_audio_params(value, drop_unknown_fields=drops_unsupported_params(drop_params))
@@ -1639,9 +1677,12 @@ class VertexGeminiConfig(VertexAIBaseConfig, BaseConfig):
         drop_params: bool,
         allow_integer_enums: bool = True,
     ) -> dict:
-        self._apply_include_server_side_tool_invocations(non_default_params, optional_params)
+        request_params: Final = tool_params_without_hosted_mcp(
+            non_default_params, model=model, route=self._route, drop_params=drop_params
+        )
+        self._apply_include_server_side_tool_invocations(request_params, optional_params)
         supports_sampling_params: Final = self.supports_sampling_params(model)
-        for param, value in non_default_params.items():
+        for param, value in request_params.items():
             if param in ("temperature", "top_p", "top_k") and not supports_sampling_params:
                 continue
             if param == "temperature":
@@ -1705,7 +1746,7 @@ class VertexGeminiConfig(VertexAIBaseConfig, BaseConfig):
                 if _tool_choice_value is not None:
                     optional_params["tool_choice"] = _tool_choice_value
             elif param == "parallel_tool_calls":
-                tools_list = non_default_params.get("tools", non_default_params.get("functions"))
+                tools_list = request_params.get("tools", request_params.get("functions"))
                 num_tools = len(tools_list) if isinstance(tools_list, list) else 0
                 # Gemini does not support parallel_tool_calls=False with multiple
                 # tools. Drop the param instead of failing — Responses API clients
@@ -3466,23 +3507,17 @@ class VertexLLM(VertexBase):
             litellm_params=litellm_params,
         )
 
-        rebuild: Final = cache_rebuild(
-            partial(
-                async_transform_request_body,
-                **data,
-                vertex_project=vertex_project,
-                vertex_location=vertex_location,
-                vertex_auth_header=auth_header,
-            ),
-            messages,
-            optional_params,
-        )
-        request_body: Final = await async_transform_request_body(
+        transform: Final = partial(
+            async_transform_request_body,
             **data,
             vertex_project=vertex_project,
             vertex_location=vertex_location,
             vertex_auth_header=auth_header,
         )
+        rebuild, uncached = cache_rebuilds(transform, messages, optional_params)
+        request_body: Final = await build_with_accepted_thought_signatures_async(
+            transform, with_placeholder_thought_signatures, uncached
+        )
 
         ## LOGGING
         log_request: Final = partial(_log_generate_request, logging_obj, messages, api_base, headers)
@@ -3511,7 +3546,14 @@ class VertexLLM(VertexBase):
             async def post(body: RequestBody) -> ModelResponseIterator:
                 return await open_stream(client=client, data=json.dumps(body), request_body=body)
 
-            return (await post_with_fresh_cache_async(request_body, rebuild, post, log_request))[1]
+            accepted: Final = partial(
+                post_with_accepted_thought_signatures_async,
+                placeholders=with_placeholder_thought_signatures,
+                uncached=uncached,
+                post=post,
+                log_request=log_request,
+            )
+            return (await post_with_fresh_cache_async(request_body, rebuild, accepted, log_request))[1][1]
 
         streaming_response: Final = CustomStreamWrapper(
             completion_stream=None,
@@ -3578,23 +3620,17 @@ class VertexLLM(VertexBase):
             litellm_params=litellm_params,
         )
 
-        rebuild: Final = cache_rebuild(
-            partial(
-                async_transform_request_body,
-                **data,
-                vertex_project=vertex_project,
-                vertex_location=vertex_location,
-                vertex_auth_header=auth_header,
-            ),
-            messages,
-            optional_params,
-        )
-        request_body: Final = await async_transform_request_body(
+        transform: Final = partial(
+            async_transform_request_body,
             **data,
             vertex_project=vertex_project,
             vertex_location=vertex_location,
             vertex_auth_header=auth_header,
         )
+        rebuild, uncached = cache_rebuilds(transform, messages, optional_params)
+        request_body: Final = await build_with_accepted_thought_signatures_async(
+            transform, with_placeholder_thought_signatures, uncached
+        )
 
         _async_client_params: Final = {}
         if timeout:
@@ -3635,7 +3671,14 @@ class VertexLLM(VertexBase):
                 )
             return response
 
-        sent_body, first_response = await post_with_fresh_cache_async(request_body, rebuild, post, log_request)
+        accepted: Final = partial(
+            post_with_accepted_thought_signatures_async,
+            placeholders=with_placeholder_thought_signatures,
+            uncached=uncached,
+            post=post,
+            log_request=log_request,
+        )
+        _, (sent_body, first_response) = await post_with_fresh_cache_async(request_body, rebuild, accepted, log_request)
         return _transform_long_decode_hops(
             model=model,
             hops=await collect_hops_async(parse_body(first_response), sent_body, post),
@@ -3767,23 +3810,17 @@ class VertexLLM(VertexBase):
         )
 
         ## TRANSFORMATION ##
-        rebuild: Final = cache_rebuild(
-            partial(
-                sync_transform_request_body,
-                **transform_request_params,
-                vertex_project=vertex_project,
-                vertex_location=vertex_location,
-                vertex_auth_header=auth_header,
-            ),
-            messages,
-            optional_params,
-        )
-        data: Final = sync_transform_request_body(
+        transform: Final = partial(
+            sync_transform_request_body,
             **transform_request_params,
             vertex_project=vertex_project,
             vertex_location=vertex_location,
             vertex_auth_header=auth_header,
         )
+        rebuild, uncached = cache_rebuilds(transform, messages, optional_params)
+        data: Final = build_with_accepted_thought_signatures_sync(
+            transform, with_placeholder_thought_signatures, uncached
+        )
 
         ## LOGGING
         log_request: Final = partial(_log_generate_request, logging_obj, messages, url, headers)
@@ -3811,7 +3848,14 @@ class VertexLLM(VertexBase):
                 def post(body: RequestBody) -> ModelResponseIterator:
                     return open_stream(client=client, data=json.dumps(body), request_body=body)
 
-                return post_with_fresh_cache_sync(data, rebuild, post, log_request)[1]
+                accepted: Final = partial(
+                    post_with_accepted_thought_signatures_sync,
+                    placeholders=with_placeholder_thought_signatures,
+                    uncached=uncached,
+                    post=post,
+                    log_request=log_request,
+                )
+                return post_with_fresh_cache_sync(data, rebuild, accepted, log_request)[1][1]
 
             streaming_response: Final = CustomStreamWrapper(
                 completion_stream=None,
@@ -3855,7 +3899,14 @@ class VertexLLM(VertexBase):
                 )
             return response
 
-        sent_body, first_response = post_with_fresh_cache_sync(data, rebuild, post, log_request)
+        accepted: Final = partial(
+            post_with_accepted_thought_signatures_sync,
+            placeholders=with_placeholder_thought_signatures,
+            uncached=uncached,
+            post=post,
+            log_request=log_request,
+        )
+        _, (sent_body, first_response) = post_with_fresh_cache_sync(data, rebuild, accepted, log_request)
         return _transform_long_decode_hops(
             model=model,
             hops=collect_hops_sync(parse_body(first_response), sent_body, post),
diff --git a/litellm/llms/vertex_ai/vertex_ai_partner_models/count_tokens/handler.py b/litellm/llms/vertex_ai/vertex_ai_partner_models/count_tokens/handler.py
index e341c8f5f48..8d39ae76456 100644
--- a/litellm/llms/vertex_ai/vertex_ai_partner_models/count_tokens/handler.py
+++ b/litellm/llms/vertex_ai/vertex_ai_partner_models/count_tokens/handler.py
@@ -9,12 +9,14 @@ their respective publisher-specific count-tokens endpoints.
 from collections.abc import Mapping, Sequence
 from typing import Any, Final
 
-from pydantic import TypeAdapter
+from pydantic import JsonValue, TypeAdapter
 
+from litellm.anthropic_beta_headers_manager import aload_beta_headers_config, filter_and_transform_beta_headers
 from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
 from litellm.litellm_core_utils.url_utils import join_api_base
 from litellm.llms.anthropic.common_utils import (
     OBJECT_LIST_ADAPTER,
+    context_management_betas,
     count_tokens_feature_betas,
     is_claude_model_target,
     tools_without_custom_field,
@@ -31,6 +33,7 @@ _COUNT_TOKENS_PUBLISHERS: Final = (
 
 
 _REQUEST_MESSAGES: Final = TypeAdapter(Sequence[object])
+_CONTEXT_MANAGEMENT: Final[TypeAdapter[JsonValue]] = TypeAdapter(JsonValue)
 
 
 def count_tokens_request_body(
@@ -55,8 +58,14 @@ def count_tokens_publisher(model: str) -> str | None:
 
 def count_tokens_headers(access_token: str, request_data: Mapping[str, object]) -> Mapping[str, str]:
     authorization: Final = {"Authorization": f"Bearer {access_token}"}
-    betas: Final = count_tokens_feature_betas(
-        "vertex_ai", request_data, _REQUEST_MESSAGES.validate_python(request_data["messages"])
+    betas: Final = (
+        *count_tokens_feature_betas(
+            "vertex_ai", request_data, _REQUEST_MESSAGES.validate_python(request_data["messages"])
+        ),
+        *filter_and_transform_beta_headers(
+            list(context_management_betas(_CONTEXT_MANAGEMENT.validate_python(request_data.get("context_management")))),
+            "vertex_ai",
+        ),
     )
     return {**authorization, "anthropic-beta": ",".join(betas)} if betas else authorization
 
@@ -193,6 +202,8 @@ class VertexAIPartnerModelsTokenCounter(VertexBase):
             api_base=litellm_params.get("api_base"),
         )
 
+        if request_data.get("context_management") is not None:
+            await aload_beta_headers_config()
         headers: Final = dict(count_tokens_headers(access_token, request_data))
 
         # Get async HTTP client
diff --git a/litellm/llms/vertex_ai/vertex_ai_partner_models/main.py b/litellm/llms/vertex_ai/vertex_ai_partner_models/main.py
index a3a3427670d..c298ca404e2 100644
--- a/litellm/llms/vertex_ai/vertex_ai_partner_models/main.py
+++ b/litellm/llms/vertex_ai/vertex_ai_partner_models/main.py
@@ -268,6 +268,7 @@ class VertexAIPartnerModels(VertexBase):
         system: object | None = None,
         tools: list[dict[str, object]] | None = None,
         count_options: Mapping[str, object] = MappingProxyType({}),
+        context_management: object = None,
     ):
         """
         Count tokens for Vertex AI partner models (Anthropic Claude, Mistral, etc.)
@@ -302,7 +303,15 @@ class VertexAIPartnerModels(VertexBase):
                 "model": model,
                 "messages": messages,
                 **MappingProxyType(
-                    {key: value for key, value in (("system", system), ("tools", tools)) if value is not None}
+                    {
+                        key: value
+                        for key, value in (
+                            ("system", system),
+                            ("tools", tools),
+                            ("context_management", context_management),
+                        )
+                        if value is not None
+                    }
                 ),
                 **count_options,
             }
diff --git a/litellm/messages/dispatch.py b/litellm/messages/dispatch.py
index 35136c41dc2..4c94f26c6c1 100644
--- a/litellm/messages/dispatch.py
+++ b/litellm/messages/dispatch.py
@@ -75,9 +75,7 @@ def _public_request(
     return native_call(legacy, args, _native_kwargs(fields, kwargs))
 
 
-def _resolved(request: NativeCall) -> tuple[str, str | None]:
-    model: Final = str(request.resolved["model"])
-    provider: Final = optional_str(request.resolved.get("custom_llm_provider"))
+def _resolved_model(model: str, provider: str | None) -> tuple[str, str | None]:
     try:
         resolved_model, resolved_provider, _, _ = get_llm_provider(model, provider)
     except BadRequestError:
@@ -85,21 +83,43 @@ def _resolved(request: NativeCall) -> tuple[str, str | None]:
     return resolved_model, resolved_provider
 
 
-def _target(request: NativeCall, model: str, provider: str | None) -> Target:
-    requested_model: Final = str(request.resolved["model"])
-    model_info: Final = request.resolved.get("model_info")
-    api_base: Final = request.resolved.get("api_base")
-    native_config: Final = main._native_messages_config(  # pyright: ignore[reportPrivateUsage]  # the handler's own passthrough lookup
-        model, provider, model_info, api_base if isinstance(api_base, str) else None
-    )
+def _resolved(request: NativeCall) -> tuple[str, str | None]:
+    return _resolved_model(str(request.resolved["model"]), optional_str(request.resolved.get("custom_llm_provider")))
+
+
+def _route_target(
+    requested_model: str,
+    model: str,
+    provider: str | None,
+    model_info: object,
+    api_base: str | None,
+    compacting: bool,
+) -> Target:
+    native_config: Final = main._native_messages_config(model, provider, model_info, api_base)  # pyright: ignore[reportPrivateUsage]  # the handler's own passthrough lookup
     if native_config is not None:
         return Target.MESSAGES
-    compacting: Final = request.resolved.get("compaction") is not None
     if not compacting and main._should_route_to_responses_api(provider, requested_model, model, model_info):  # pyright: ignore[reportPrivateUsage]  # the handler's own translation choice
         return Target.RESPONSES
     return Target.CHAT_COMPLETIONS
 
 
+def _target(request: NativeCall, model: str, provider: str | None) -> Target:
+    api_base: Final = request.resolved.get("api_base")
+    return _route_target(
+        str(request.resolved["model"]),
+        model,
+        provider,
+        request.resolved.get("model_info"),
+        api_base if isinstance(api_base, str) else None,
+        compacting=request.resolved.get("compaction") is not None,
+    )
+
+
+def messages_target(model: str, custom_llm_provider: str | None, model_info: object, api_base: str | None) -> Target:
+    resolved_model, resolved_provider = _resolved_model(model, custom_llm_provider)
+    return _route_target(model, resolved_model, resolved_provider, model_info, api_base, compacting=False)
+
+
 _FEATURES: Final[detectors.Detectors] = MappingProxyType(
     {
         **detectors.COMMON,
@@ -119,6 +139,7 @@ _ASYNC_FEATURES: Final[detectors.Detectors] = MappingProxyType(
     {
         **_FEATURES,
         Feature.PRE_REQUEST_HOOK: route_detectors.pre_request_hook,
+        Feature.FOUNDRY_BETA_ROW: route_detectors.foundry_beta_row,
         Feature.WEBSEARCH_INTERCEPTION: route_detectors.websearch_interception,
         Feature.MESSAGES_INTERCEPTOR: route_detectors.intercepted,
         Feature.STRICT_TOOLS_RETRY: route_detectors.strict_tools_retry,
diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index e1fdfc89a9f..cf8544316e9 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -13478,6 +13478,10 @@
         "input_cost_per_token": 2e-07,
         "output_cost_per_token": 5e-07,
         "litellm_provider": "azure_ai",
+        "token_count_framing": 149,
+        "token_count_tool_framing": 302,
+        "token_count_responses_framing": 145,
+        "token_count_responses_tool_framing": 100,
         "max_input_tokens": 128000,
         "max_output_tokens": 128000,
         "mode": "chat",
@@ -13831,7 +13835,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -13845,7 +13849,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/ap-northeast-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -14002,7 +14006,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -14016,7 +14020,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/ap-south-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -14140,12 +14144,12 @@
         "input_cost_per_token": 7.4e-07,
         "input_cost_per_token_flex": 3.7e-07,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
         "output_cost_per_token_flex": 1.11e-06,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.html",
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_native_structured_output": true,
@@ -14250,7 +14254,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -14264,7 +14268,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/eu-north-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -14786,7 +14790,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -14800,7 +14804,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/sa-east-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -15035,7 +15039,7 @@
         "input_cost_per_token_flex": 3.1e-07,
         "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -15049,7 +15053,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/us-east-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -15156,7 +15160,7 @@
         "input_cost_per_token_flex": 3.1e-07,
         "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -15170,7 +15174,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/us-east-2/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -15552,6 +15556,7 @@
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-sonnet-4-5.md"
     },
     "bedrock/us-gov-west-1/meta.llama3-70b-instruct-v1:0": {
+        "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.65e-06,
         "litellm_provider": "bedrock",
         "max_input_tokens": 8000,
@@ -15562,6 +15567,7 @@
         "supports_pdf_input": true
     },
     "bedrock/us-gov-west-1/meta.llama3-8b-instruct-v1:0": {
+        "deprecation_date": "2027-03-30",
         "input_cost_per_token": 3e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 8000,
@@ -15708,7 +15714,7 @@
         "input_cost_per_token_flex": 3.1e-07,
         "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -15722,7 +15728,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/us-west-2/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -23519,12 +23525,12 @@
         ]
     },
     "deepgram/streaming/nova-3": {
-        "input_cost_per_second": 8e-05,
+        "input_cost_per_second": 0.00012833,
         "litellm_provider": "deepgram",
         "metadata": {
-            "calculation": "$0.0048/60 seconds = $0.00008000 per second",
+            "calculation": "$0.0077/60 seconds = $0.00012833 per second",
             "note": "Nova-3 monolingual streaming, pay as you go",
-            "original_pricing_per_minute": 0.0048
+            "original_pricing_per_minute": 0.0077
         },
         "mode": "audio_transcription",
         "output_cost_per_second": 0.0,
@@ -23533,13 +23539,28 @@
             "/v1/listen"
         ]
     },
-    "deepgram/streaming/nova-3-multilingual": {
-        "input_cost_per_second": 9.667e-05,
+    "deepgram/streaming/nova-3-medical": {
+        "input_cost_per_second": 0.00012833,
         "litellm_provider": "deepgram",
         "metadata": {
-            "calculation": "$0.0058/60 seconds = $0.00009667 per second",
+            "calculation": "$0.0077/60 seconds = $0.00012833 per second",
+            "note": "Nova-3 Medical streaming, launch price from Deepgram's 2025-03-03 announcement. deepgram.com/pricing does not list Nova-3 Medical, and this matches its current Nova-3 monolingual streaming pay as you go rate",
+            "original_pricing_per_minute": 0.0077
+        },
+        "mode": "audio_transcription",
+        "output_cost_per_second": 0.0,
+        "source": "https://www.businesswire.com/news/home/20250303470439/en",
+        "supported_endpoints": [
+            "/v1/listen"
+        ]
+    },
+    "deepgram/streaming/nova-3-multilingual": {
+        "input_cost_per_second": 0.00015333,
+        "litellm_provider": "deepgram",
+        "metadata": {
+            "calculation": "$0.0092/60 seconds = $0.00015333 per second",
             "note": "Nova-3 multilingual (language=multi) streaming, pay as you go",
-            "original_pricing_per_minute": 0.0058
+            "original_pricing_per_minute": 0.0092
         },
         "mode": "audio_transcription",
         "output_cost_per_second": 0.0,
@@ -24519,7 +24540,7 @@
         "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_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -24530,7 +24551,7 @@
         "supports_reasoning": true,
         "supports_native_structured_output": true,
         "supports_tool_choice": true,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -49614,6 +49635,7 @@
         "supports_max_reasoning_effort": true,
         "supports_mid_conversation_system": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_output_config": true,
         "supports_parallel_tool_use_config": true,
         "supports_pdf_input": true,
@@ -49658,6 +49680,7 @@
         "supports_vision": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
         "bedrock_output_config_effort_ceiling": "xhigh",
@@ -53957,23 +53980,23 @@
         "supports_vision": true
     },
     "wandb/meta-llama/Llama-3.1-8B-Instruct": {
-        "max_input_tokens": 131000,
+        "max_input_tokens": 128000,
         "max_output_tokens": 128000,
         "input_cost_per_token": 2.2e-07,
         "output_cost_per_token": 2.2e-07,
         "litellm_provider": "wandb",
         "mode": "chat",
-        "source": "https://wandb.ai/site/pricing/tokens/"
+        "source": "https://www.coreweave.com/products/coreweave-forge/serverless-inference"
     },
     "wandb/deepseek-ai/DeepSeek-V3.1": {
         "supports_reasoning": true,
-        "max_input_tokens": 161000,
+        "max_input_tokens": 128000,
         "max_output_tokens": 128000,
         "input_cost_per_token": 5.5e-07,
         "output_cost_per_token": 1.65e-06,
         "litellm_provider": "wandb",
         "mode": "chat",
-        "source": "https://wandb.ai/site/pricing/tokens/"
+        "source": "https://www.coreweave.com/products/coreweave-forge/serverless-inference"
     },
     "wandb/meta-llama/Llama-3.3-70B-Instruct": {
         "max_input_tokens": 128000,
@@ -54457,6 +54480,8 @@
         "input_cost_per_token_above_200k_tokens_batches": 2e-06,
         "input_cost_per_token_batches": 1e-06,
         "litellm_provider": "xai",
+        "token_count_framing": 185,
+        "token_count_tool_framing": 214,
         "max_input_tokens": 1000000,
         "max_output_tokens": 1000000,
         "mode": "chat",
@@ -59875,6 +59900,7 @@
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-cyber.html",
         "use_openai_responses_path": true,
         "supported_endpoints": [
@@ -59896,7 +59922,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
-        "supports_vision": true
+        "supports_vision": true,
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-daybreak-blue-5.6-sol": {
         "input_cost_per_token": 4.4e-06,
@@ -59911,6 +59938,7 @@
         "max_input_tokens": 1050000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/responses"
@@ -59930,7 +59958,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-daybreak-blue-56-sol.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-daybreak-blue-56-sol.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-5.6-luna": {
         "input_cost_per_token": 2.2e-07,
@@ -60336,6 +60365,7 @@
         "mode": "responses",
         "output_cost_per_token_above_272k_tokens_ultrafast": 0.000495,
         "output_cost_per_token_ultrafast": 0.00033,
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60359,7 +60389,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-6-sol": {
         "input_cost_per_token": 2.2e-06,
@@ -60374,6 +60405,7 @@
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60397,7 +60429,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-6-luna": {
         "input_cost_per_token": 1.1e-07,
@@ -60412,6 +60445,7 @@
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60435,7 +60469,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html",
+        "supports_web_search": true
     },
     "us.openai.gpt-6-astra": {
         "supports_bedrock_runtime_chat_completions_response_format": true,
@@ -62630,7 +62665,9 @@
         "supports_response_schema": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "supports_vision": true
+        "supports_vision": true,
+        "token_count_framing": 23,
+        "token_count_tool_framing": 12
     },
     "deepseek/deepseek-v4-flash-vision-exp": {
         "cache_creation_input_token_cost": 0.0,
@@ -62736,7 +62773,9 @@
         "supports_response_schema": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "supports_vision": false
+        "supports_vision": false,
+        "token_count_framing": 76,
+        "token_count_tool_framing": 75
     },
     "tencent/deepseek-v4-pro": {
         "cache_creation_input_token_cost": 0.0,
@@ -64022,6 +64061,7 @@
         "input_cost_per_token": 3e-07,
         "input_cost_per_token_priority": 3.75e-07,
         "litellm_provider": "fireworks_ai",
+        "token_count_framing": 23,
         "max_input_tokens": 1048576,
         "max_output_tokens": 393216,
         "mode": "chat",
@@ -64029,6 +64069,7 @@
         "output_cost_per_token_priority": 1.5e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64048,6 +64089,7 @@
         "output_cost_per_token_priority": 2.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64090,6 +64132,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64120,6 +64163,7 @@
         "input_cost_per_token": 3e-07,
         "input_cost_per_token_priority": 3.75e-07,
         "litellm_provider": "fireworks_ai",
+        "token_count_framing": 23,
         "max_input_tokens": 1048576,
         "max_output_tokens": 393216,
         "mode": "chat",
@@ -64127,6 +64171,7 @@
         "output_cost_per_token_priority": 1.5e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64146,6 +64191,7 @@
         "output_cost_per_token_priority": 2.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64220,6 +64266,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64240,6 +64287,7 @@
         ],
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64263,6 +64311,7 @@
         ],
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64338,6 +64387,7 @@
         "output_cost_per_token_priority": 3e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64374,6 +64424,7 @@
         "output_cost_per_token_priority": 6.375e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_vision": true
     },
@@ -64410,6 +64461,7 @@
         "output_cost_per_token_priority": 3e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64480,6 +64532,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64503,6 +64556,7 @@
         ],
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67296,6 +67350,7 @@
         "output_cost_per_token_priority": 5.5e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67314,6 +67369,7 @@
         "output_cost_per_token_priority": 8.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67332,6 +67388,7 @@
         "output_cost_per_token_priority": 5.5e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67350,6 +67407,7 @@
         "output_cost_per_token_priority": 8.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67365,6 +67423,7 @@
         "output_cost_per_token": 6.6e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67407,6 +67466,7 @@
         "output_cost_per_token": 6.6e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67425,6 +67485,7 @@
         "output_cost_per_token_priority": 6.25e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67443,6 +67504,7 @@
         "output_cost_per_token_priority": 9.375e-07,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67460,6 +67522,7 @@
         "output_cost_per_token_priority": 6.25e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67478,6 +67541,7 @@
         "output_cost_per_token_priority": 9.375e-07,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67496,6 +67560,7 @@
         "output_cost_per_token_priority": 4.05e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -68281,6 +68346,7 @@
         "supports_max_reasoning_effort": true,
         "supports_mid_conversation_system": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_output_config": true,
         "supports_parallel_tool_use_config": true,
         "supports_pdf_input": true,
@@ -68326,6 +68392,7 @@
         "supports_vision": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
         "bedrock_output_config_effort_ceiling": "xhigh",
@@ -68554,6 +68621,7 @@
         "supports_max_reasoning_effort": true,
         "supports_mid_conversation_system": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_output_config": true,
         "supports_parallel_tool_use_config": true,
         "supports_pdf_input": true,
@@ -68594,6 +68662,7 @@
         "supports_vision": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
         "bedrock_output_config_effort_ceiling": "xhigh",
@@ -68633,7 +68702,9 @@
         "cache_read_input_token_cost_above_272k_tokens": 5.4e-07,
         "output_cost_per_token": 1.62e-05,
         "output_cost_per_token_above_272k_tokens": 2.43e-05,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-terra.html"
+        "search_context_cost_per_query": {"search_context_size_high":0.0144,"search_context_size_low":0.0144,"search_context_size_medium":0.0144},
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-terra.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/us-gov-west-1/openai.gpt-5.6-luna": {
         "litellm_provider": "bedrock_mantle",
@@ -68668,7 +68739,9 @@
         "cache_read_input_token_cost_above_272k_tokens": 5.4e-08,
         "output_cost_per_token": 1.62e-06,
         "output_cost_per_token_above_272k_tokens": 2.43e-06,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-luna.html"
+        "search_context_cost_per_query": {"search_context_size_high":0.0144,"search_context_size_low":0.0144,"search_context_size_medium":0.0144},
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-luna.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/us-gov-west-1/openai.gpt-5.4": {
         "litellm_provider": "bedrock_mantle",
@@ -68697,7 +68770,9 @@
         "input_cost_per_token": 3.375e-06,
         "cache_read_input_token_cost": 3.375e-07,
         "output_cost_per_token": 2.025e-05,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-54.html"
+        "search_context_cost_per_query": {"search_context_size_high":0.0144,"search_context_size_low":0.0144,"search_context_size_medium":0.0144},
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-54.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/us-gov-west-1/xai.grok-4.3": {
         "use_openai_responses_path": true,
@@ -73731,6 +73806,7 @@
         "output_cost_per_token_priority": 1.875e-05,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -75312,6 +75388,7 @@
         "output_cost_per_token_above_272k_tokens": 1.65e-05,
         "output_cost_per_token_above_272k_tokens_ultrafast": 9.9e-05,
         "output_cost_per_token_ultrafast": 6.6e-05,
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-1-sol.html",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -75334,6 +75411,7 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
+        "supports_web_search": true,
         "supports_xhigh_reasoning_effort": true,
         "use_openai_responses_path": true
     },
@@ -76758,6 +76836,7 @@
         "supports_audio_input": true,
         "supports_audio_output": false,
         "supports_computer_use": true,
+        "supports_continuation": true,
         "supports_function_calling": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
@@ -76817,6 +76896,7 @@
         ],
         "supports_audio_input": true,
         "supports_computer_use": true,
+        "supports_continuation": true,
         "supports_function_calling": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
@@ -76874,6 +76954,7 @@
             "text"
         ],
         "supports_audio_input": true,
+        "supports_continuation": true,
         "supports_function_calling": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
@@ -77231,6 +77312,7 @@
         "output_cost_per_token_priority": 1.5e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -77389,6 +77471,7 @@
         "output_cost_per_token_priority": 9e-07,
         "source": "https://platform.minimax.io/docs/guides/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -79022,6 +79105,7 @@
         "mode": "responses",
         "output_cost_per_token": 5.5e-06,
         "output_cost_per_token_above_272k_tokens": 8.25e-06,
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-1-terra.html",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -79044,6 +79128,7 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
+        "supports_web_search": true,
         "supports_xhigh_reasoning_effort": true,
         "use_openai_responses_path": true
     },
@@ -81164,6 +81249,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -81180,6 +81266,7 @@
         "output_cost_per_token": 3.08e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -81196,6 +81283,7 @@
         "output_cost_per_token": 8.4e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -81212,6 +81300,7 @@
         "output_cost_per_token": 8.4e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
diff --git a/litellm/proxy/anthropic_endpoints/endpoints.py b/litellm/proxy/anthropic_endpoints/endpoints.py
index 0e204cf9211..baa6602b042 100644
--- a/litellm/proxy/anthropic_endpoints/endpoints.py
+++ b/litellm/proxy/anthropic_endpoints/endpoints.py
@@ -13,8 +13,6 @@ from typing_extensions import ReadOnly, TypedDict
 
 import litellm
 from litellm.anthropic_interface.exceptions import (
-    AnthropicErrorDetail,
-    AnthropicErrorResponse,
     AnthropicExceptionMapping,
 )
 from litellm.integrations.custom_guardrail import ModifyResponseException
@@ -34,13 +32,14 @@ from litellm.proxy.common_request_processing import (
     resolve_counted_tool_fields,
     resolve_litellm_call_id,
 )
-from litellm.proxy.common_utils.error_body_call_id import error_body_call_id
+from litellm.proxy.common_utils.anthropic_error_payload import (
+    anthropic_handler_error_json_response,
+)
 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
     read_request_body,
 )
 from litellm.proxy.common_utils.openai_error_payload import (
-    LITELLM_CALL_ID_HEADER,
     error_status_code,
     litellm_call_id_headers,
     openai_error_param,
@@ -61,44 +60,8 @@ router: Final = APIRouter()
 _NO_HEADERS: Final[Mapping[str, str]] = MappingProxyType({})
 
 
-def _with_provider_specific_fields(exc: ProxyException, detail: AnthropicErrorDetail) -> AnthropicErrorDetail:
-    if not exc.provider_specific_fields:
-        return detail
-    with_fields: Final[AnthropicErrorDetail] = {**detail, "provider_specific_fields": exc.provider_specific_fields}
-    return with_fields
-
-
-def _anthropic_error_detail(
-    exc: ProxyException, detail: AnthropicErrorDetail, call_id: str | None
-) -> AnthropicErrorDetail:
-    if call_id is None:
-        return _with_provider_specific_fields(exc, detail)
-    with_call_id: Final[AnthropicErrorDetail] = {
-        **_with_provider_specific_fields(exc, detail),
-        "litellm_call_id": call_id,
-    }
-    return with_call_id
-
-
 def _anthropic_error_json_response(exc: ProxyException, request: Request) -> JSONResponse:
-    from litellm.proxy.proxy_server import (
-        _close_dangling_otel_server_span,  # pyright: ignore[reportPrivateUsage]  # proxy_server keeps the span-close helper private; error JSONResponses returned by the route must stamp the OTel server span like the global ProxyException handler does
-        general_settings_view,
-    )
-
-    status_code: Final = int(exc.code) if exc.code is not None and exc.code.isdigit() else 500
-    _close_dangling_otel_server_span(request, status_code, exc=exc)
-    envelope: Final = AnthropicExceptionMapping.transform_to_anthropic_error(
-        status_code=status_code,
-        raw_message=exc.message,
-        request_id=request.headers.get("x-request-id"),
-    )
-    body_call_id: Final = error_body_call_id(general_settings_view(), exc.headers.get(LITELLM_CALL_ID_HEADER))
-    content: Final[AnthropicErrorResponse] = {
-        **envelope,
-        "error": _anthropic_error_detail(exc, envelope["error"], body_call_id),
-    }
-    return JSONResponse(status_code=status_code, content=content, headers=exc.headers)
+    return anthropic_handler_error_json_response(exc, request)
 
 
 _TOKEN_COUNT_FIELDS: Final = ("model", "messages", "tools", "system")
diff --git a/litellm/proxy/auth/auth_checks.py b/litellm/proxy/auth/auth_checks.py
index e2ae25686da..fdc8aa82268 100644
--- a/litellm/proxy/auth/auth_checks.py
+++ b/litellm/proxy/auth/auth_checks.py
@@ -125,6 +125,7 @@ from litellm.proxy.common_utils.user_api_key_cache import (
     NO_TEAM_MEMBERSHIP_SENTINEL,
     TAG_REGISTRY_OVERFLOW_SENTINEL,
     UserApiKeyCache,
+    budget_windows_absent_cache_key,
     end_user_cache_key,
     end_user_restricted_registry_cache_key,
     get_management_object_ttl,
@@ -3471,11 +3472,22 @@ async def delete_cache_key_object(
         )
 
     await publish_auth_cache_invalidation(cache_key=key)
+    await evict_budget_windows_absent_marker(
+        entity_type=Litellm_EntityType.KEY, entity_id=hashed_token, user_api_key_cache=user_api_key_cache
+    )
 
 
 _delete_cache_key_object: Final = delete_cache_key_object
 
 
+async def evict_budget_windows_absent_marker(
+    entity_type: Litellm_EntityType, entity_id: str, user_api_key_cache: UserApiKeyCache
+) -> None:
+    marker: Final = budget_windows_absent_cache_key(entity_type.value, entity_id)
+    evict_local(cache_keys=(marker,), user_api_key_cache=user_api_key_cache)
+    await publish_auth_cache_invalidation(cache_key=marker)
+
+
 async def delete_cache_key_objects(
     hashed_tokens: Sequence[str],
     user_api_key_cache: UserApiKeyCache,
@@ -5378,79 +5390,6 @@ async def _granted_model_lists(
     )
 
 
-async def _user_object_or_none(
-    valid_token: UserAPIKeyAuth,
-    prisma_client: PrismaClient,
-    user_api_key_cache: UserApiKeyCache,
-    proxy_logging_obj: ProxyLogging,
-) -> LiteLLM_UserTable | None:
-    try:
-        return await get_user_object(
-            user_id=valid_token.user_id,
-            prisma_client=prisma_client,
-            user_api_key_cache=user_api_key_cache,
-            user_id_upsert=False,
-            proxy_logging_obj=proxy_logging_obj,
-        )
-    except UserNotFoundError:
-        return None
-
-
-async def enforced_model_allowlists(
-    valid_token: UserAPIKeyAuth,
-    prisma_client: PrismaClient | None,
-    user_api_key_cache: UserApiKeyCache,
-    proxy_logging_obj: ProxyLogging,
-) -> tuple[Sequence[str], ...]:
-    """One model allowlist per level that ``common_checks`` enforces on a request from this identity."""
-    key_models: Final = _resolve_key_models_for_auth_check(valid_token=valid_token)
-    if prisma_client is None:
-        return (key_models, tuple(valid_token.team_models or ()))
-    team_object: Final = (
-        None
-        if valid_token.team_id is None
-        else await get_team_object(
-            team_id=valid_token.team_id,
-            prisma_client=prisma_client,
-            user_api_key_cache=user_api_key_cache,
-            proxy_logging_obj=proxy_logging_obj,
-        )
-    )
-    user_object: Final = (
-        None
-        if team_object is not None
-        else await _user_object_or_none(
-            valid_token=valid_token,
-            prisma_client=prisma_client,
-            user_api_key_cache=user_api_key_cache,
-            proxy_logging_obj=proxy_logging_obj,
-        )
-    )
-    project_object: Final = (
-        None
-        if valid_token.project_id is None
-        else await get_project_object(
-            project_id=valid_token.project_id,
-            prisma_client=prisma_client,
-            user_api_key_cache=user_api_key_cache,
-            proxy_logging_obj=proxy_logging_obj,
-        )
-    )
-    return (
-        key_models,
-        team_object.models if team_object is not None else (),
-        await _team_member_granted_models(
-            valid_token=valid_token,
-            team_object=team_object,
-            prisma_client=prisma_client,
-            user_api_key_cache=user_api_key_cache,
-            proxy_logging_obj=proxy_logging_obj,
-        ),
-        user_object.models if user_object is not None else (),
-        project_object.models if project_object is not None else (),
-    )
-
-
 async def collect_matched_model_access_groups(
     model: str | Sequence[str] | None,
     valid_token: UserAPIKeyAuth | None,
diff --git a/litellm/proxy/client/cli/commands/agents.py b/litellm/proxy/client/cli/commands/agents.py
index 12d97ef6cce..b70432d1e72 100644
--- a/litellm/proxy/client/cli/commands/agents.py
+++ b/litellm/proxy/client/cli/commands/agents.py
@@ -770,9 +770,10 @@ def codex_model_catalog(
     A model Codex does not know gets the fallback
     entry, with the same base instructions Codex itself uses so the agent never
     runs without a system prompt, and offers the reasoning efforts `groups` gives its model group
-    that the installed Codex, at `client_version`, can parse. Apart from aliases, the catalog is
-    the one `/v1/models?client_version=...` serves, built from the installed Codex's own entries
-    instead of the proxy's vendored ones.
+    that the installed Codex, at `client_version`, can parse. Apart from aliases, and the window the
+    deployments' `model_info.max_input_tokens` gives a model Codex knows, the catalog is the one
+    `/v1/models?client_version=...` serves, built from the installed Codex's own entries instead of
+    the proxy's vendored ones.
     """
     rows: Final = tuple(_codex_row(m, upstreams.get(m.id), groups) for m in models)
     body: Final = codex_models_response_json(
diff --git a/litellm/proxy/common_request_processing.py b/litellm/proxy/common_request_processing.py
index 9282ee7f703..994b3a96799 100644
--- a/litellm/proxy/common_request_processing.py
+++ b/litellm/proxy/common_request_processing.py
@@ -30,6 +30,7 @@ import orjson
 from fastapi import HTTPException, Request, status
 from fastapi.responses import JSONResponse, Response, StreamingResponse
 from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError
+from starlette.exceptions import HTTPException as StarletteHTTPException
 from starlette.types import Receive, Scope, Send
 from typing_extensions import Never
 
@@ -780,7 +781,7 @@ def resolve_counted_tool_fields(
     return resolved
 
 
-def proxy_exception_from_http_exception(exc: HTTPException, headers: dict[str, str]) -> ProxyException:
+def proxy_exception_from_http_exception(exc: StarletteHTTPException, headers: dict[str, str]) -> ProxyException:
     raw_detail: Final = attribute_of(exc, "detail", str(exc))
     message, structured_fields = serialize_http_exception_detail(raw_detail)
     existing_fields: Final = getattr(exc, "provider_specific_fields", None) or {}
diff --git a/litellm/proxy/common_utils/anthropic_error_payload.py b/litellm/proxy/common_utils/anthropic_error_payload.py
new file mode 100644
index 00000000000..89001194f7f
--- /dev/null
+++ b/litellm/proxy/common_utils/anthropic_error_payload.py
@@ -0,0 +1,172 @@
+"""Auth, budget and model-access failures are raised by ``user_api_key_auth`` before the Messages
+handler runs, so the central handlers pick the Anthropic envelope from the request route."""
+
+from collections.abc import Callable, Mapping
+from types import MappingProxyType
+from typing import Final
+
+from fastapi import Request, status
+from fastapi.responses import JSONResponse
+from starlette.types import Scope
+
+from litellm.anthropic_interface.exceptions import (
+    ANTHROPIC_ERROR_TYPE_MAP,
+    AnthropicErrorDetail,
+    AnthropicErrorResponse,
+    AnthropicErrorType,
+    AnthropicExceptionMapping,
+)
+from litellm.proxy._types import ProxyException
+from litellm.proxy.auth.auth_utils import get_request_route
+from litellm.proxy.common_utils.error_body_call_id import error_body_call_id
+from litellm.proxy.common_utils.openai_error_payload import LITELLM_CALL_ID_HEADER, openai_error_type_for_status
+
+ANTHROPIC_MESSAGES_ROUTES: Final[frozenset[str]] = frozenset(
+    {
+        "/v1/messages",
+        "/v1/messages/count_tokens",
+        "/claude_code_gateway/v1/messages",
+        "/claude_code_gateway/v1/messages/count_tokens",
+    }
+)
+ANTHROPIC_PASS_THROUGH_PREFIX: Final = "/anthropic/"
+ANTHROPIC_SHAPED_MODEL_LIST_ROUTES: Final[frozenset[str]] = frozenset(
+    {"/v1/models", "/models", "/claude_code_gateway/v1/models"}
+)
+PROXY_ERROR_TYPE_BY_STATUS: Final[Mapping[int, AnthropicErrorType]] = MappingProxyType(
+    {**ANTHROPIC_ERROR_TYPE_MAP, 402: "billing_error", 409: "conflict_error", 504: "timeout_error"}
+)
+
+
+def proxy_error_type(status_code: int) -> AnthropicErrorType:
+    named: Final = PROXY_ERROR_TYPE_BY_STATUS.get(status_code)
+    if named is not None:
+        return named
+    if status_code == status.HTTP_408_REQUEST_TIMEOUT or not 400 <= status_code < 500:
+        return "api_error"
+    return "invalid_request_error"
+
+
+def uses_anthropic_error_envelope(request: Request) -> bool:
+    route: Final = get_request_route(request)
+    if route in ANTHROPIC_MESSAGES_ROUTES or route.startswith(ANTHROPIC_PASS_THROUGH_PREFIX):
+        return True
+    return route in ANTHROPIC_SHAPED_MODEL_LIST_ROUTES and "anthropic-version" in request.headers
+
+
+def route_error_content(
+    scope: Scope, anthropic_type: AnthropicErrorType, message: str, openai_content: Mapping[str, object]
+) -> Mapping[str, object]:
+    request: Final = Request(scope)
+    if not uses_anthropic_error_envelope(request):
+        return openai_content
+    content: Final[AnthropicErrorResponse] = {"type": "error", "error": {"type": anthropic_type, "message": message}}
+    request_id: Final = request.headers.get("x-request-id")
+    return content if request_id is None else {**content, "request_id": request_id}
+
+
+def anthropic_error_status_code(exc: ProxyException) -> int:
+    code: Final = exc.code
+    if code.isdigit():
+        return int(code)
+    return status.HTTP_500_INTERNAL_SERVER_ERROR
+
+
+def _with_provider_specific_fields(exc: ProxyException, detail: AnthropicErrorDetail) -> AnthropicErrorDetail:
+    if not exc.provider_specific_fields:
+        return detail
+    with_fields: Final[AnthropicErrorDetail] = {**detail, "provider_specific_fields": exc.provider_specific_fields}
+    return with_fields
+
+
+def _with_litellm_error_type(
+    exc: ProxyException, status_code: int, detail: AnthropicErrorDetail
+) -> AnthropicErrorDetail:
+    if not exc.type or exc.type in (detail["type"], openai_error_type_for_status(status_code)):
+        return detail
+    with_type: Final[AnthropicErrorDetail] = {**detail, "litellm_error_type": exc.type}
+    return with_type
+
+
+def _with_call_id(detail: AnthropicErrorDetail, call_id: str | None) -> AnthropicErrorDetail:
+    if call_id is None:
+        return detail
+    with_call_id: Final[AnthropicErrorDetail] = {**detail, "litellm_call_id": call_id}
+    return with_call_id
+
+
+def _anthropic_content(
+    exc: ProxyException,
+    status_code: int,
+    request_id: str | None,
+    general_settings: Mapping[str, object],
+    error_type: AnthropicErrorType | None,
+) -> AnthropicErrorResponse:
+    envelope: Final = AnthropicExceptionMapping.transform_to_anthropic_error(
+        status_code=status_code,
+        raw_message=exc.message,
+        request_id=request_id,
+        error_type=error_type,
+    )
+    body_call_id: Final = error_body_call_id(general_settings, exc.headers.get(LITELLM_CALL_ID_HEADER))
+    content: Final[AnthropicErrorResponse] = {
+        **envelope,
+        "error": _with_call_id(_with_provider_specific_fields(exc, envelope["error"]), body_call_id),
+    }
+    return content
+
+
+def anthropic_handler_error_content(
+    exc: ProxyException,
+    status_code: int,
+    request_id: str | None,
+    general_settings: Mapping[str, object],
+) -> AnthropicErrorResponse:
+    return _anthropic_content(exc, status_code, request_id, general_settings, None)
+
+
+def anthropic_error_content(
+    exc: ProxyException,
+    status_code: int,
+    request_id: str | None,
+    general_settings: Mapping[str, object],
+) -> AnthropicErrorResponse:
+    content: Final = _anthropic_content(exc, status_code, request_id, general_settings, proxy_error_type(status_code))
+    with_type: Final[AnthropicErrorResponse] = {
+        **content,
+        "error": _with_litellm_error_type(exc, status_code, content["error"]),
+    }
+    return with_type
+
+
+def _anthropic_json_response(
+    exc: ProxyException,
+    request: Request,
+    build_content: Callable[[ProxyException, int, str | None, Mapping[str, object]], AnthropicErrorResponse],
+) -> JSONResponse:
+    from litellm.proxy.proxy_server import (
+        _close_dangling_otel_server_span,  # pyright: ignore[reportPrivateUsage]  # proxy_server keeps the span-close helper private; a JSONResponse returned instead of a raised error must stamp the OTel server span like the global ProxyException handler does
+        general_settings_view,
+    )
+
+    status_code: Final = anthropic_error_status_code(exc)
+    _close_dangling_otel_server_span(request, status_code, exc=exc)
+    content: Final = build_content(exc, status_code, request.headers.get("x-request-id"), general_settings_view())
+    return JSONResponse(status_code=status_code, content=content, headers=exc.headers)
+
+
+def anthropic_error_json_response(exc: ProxyException, request: Request) -> JSONResponse:
+    return _anthropic_json_response(exc, request, anthropic_error_content)
+
+
+def anthropic_handler_error_json_response(exc: ProxyException, request: Request) -> JSONResponse:
+    return _anthropic_json_response(exc, request, anthropic_handler_error_content)
+
+
+def anthropic_internal_server_error_response(request: Request) -> JSONResponse:
+    content: Final = AnthropicExceptionMapping.transform_to_anthropic_error(
+        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+        raw_message="Internal server error",
+        request_id=request.headers.get("x-request-id"),
+    )
+    return JSONResponse(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, content=content)
diff --git a/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py b/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py
index b2640d2a765..edc8048ee73 100644
--- a/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py
+++ b/litellm/proxy/common_utils/auth_cache_invalidation_pubsub.py
@@ -183,7 +183,7 @@ def evict_local(cache_keys: Sequence[str], user_api_key_cache: "UserApiKeyCache"
 
 
 def _drop_from_memory(cache_key: str, user_api_key_cache: "UserApiKeyCache") -> None:
-    user_api_key_cache.in_memory_cache_for(cache_key).delete_cache(cache_key)
+    user_api_key_cache.delete_from_memory(cache_key)
 
 
 @with_service_target(AUTH_OBJECTS_TARGET)
diff --git a/litellm/proxy/common_utils/codex_model_catalog.py b/litellm/proxy/common_utils/codex_model_catalog.py
index 63fb27d62cf..7b48aa07365 100644
--- a/litellm/proxy/common_utils/codex_model_catalog.py
+++ b/litellm/proxy/common_utils/codex_model_catalog.py
@@ -7,8 +7,10 @@ never the OpenAI list shape. This module builds that body from the rows ``/v1/mo
 lists: a model Codex knows keeps Codex's own entry for it, any other model gets the fallback entry
 Codex itself uses for an unknown slug, and ``model_info.service_tiers`` becomes the entry's
 ``service_tiers``, which Codex turns into slash commands (``/ultrafast``) that send ``service_tier``
-upstream. A fallback entry offers the model group's ``supported_reasoning_efforts`` as its reasoning
-levels, trimmed to the ones the requesting Codex release can parse.
+upstream. A ``model_info.max_input_tokens`` the operator sets replaces a known model's
+``context_window``, up to the most Codex lets its own ``model_context_window`` raise that model to.
+A fallback entry offers the model group's ``supported_reasoning_efforts`` as its reasoning levels,
+trimmed to the ones the requesting Codex release can parse.
 
 The stock entries are Codex 0.159.3's bundled catalog, vendored unchanged from
 https://github.com/openai/codex/blob/rust-v0.159.3/codex-rs/models-manager/models.json (Apache-2.0)
@@ -158,6 +160,7 @@ class CodexStockModel(LiteLLMBaseModel):
     supports_search_tool: bool = False
     supported_reasoning_levels: tuple[CodexReasoningLevel, ...] = ()
     context_window: int | None = None
+    max_context_window: int | None = None
 
 
 class CodexStockCatalog(LiteLLMBaseModel):
@@ -173,8 +176,9 @@ class CodexCatalogRow:
     """What the catalog needs to know about one listed model: its public id, the listing's mode and
     input limit, the upstream model behind it, the reasoning effort its deployments pin, and the
     `model_info` values the operator set; `service_tiers` holds one raw `model_info.service_tiers`
-    value per deployment behind the id, None where a deployment sets none. `supported_reasoning_efforts`
-    is the model group's, None when unknown."""
+    value per deployment behind the id, None where a deployment sets none, and
+    `configured_max_input_tokens` one `model_info.max_input_tokens` per deployment the same way.
+    `supported_reasoning_efforts` is the model group's, None when unknown."""
 
     id: str
     mode: str | None = None
@@ -185,6 +189,7 @@ class CodexCatalogRow:
     service_tiers: tuple[object, ...] = ()
     supported_reasoning_efforts: tuple[str, ...] | None = None
     search_tool_support: tuple[bool | None, ...] = ()
+    configured_max_input_tokens: tuple[int | None, ...] = ()
 
 
 @cache
@@ -333,6 +338,25 @@ def _alias_context_window(row: CodexCatalogRow, stock_model: CodexStockModel) ->
     return MappingProxyType({"context_window": min(stock_model.context_window, row.max_input_tokens)})
 
 
+def _configured_window(row: CodexCatalogRow, stock_model: CodexStockModel) -> Mapping[str, int]:
+    """The `context_window` the operator's `model_info.max_input_tokens` gives a known model's entry,
+    or nothing, which keeps `stock_model`'s own.
+
+    A request to the row can route to any of its deployments, so the window is the smallest one of them
+    takes: its `max_input_tokens` where the operator set a positive one, Codex's own window where not. A
+    limit set on only some deployments can therefore lower the window but never raise it. The window never
+    goes past `stock_model`'s `max_context_window`, the most Codex lets its own `model_context_window`
+    setting raise that model to."""
+    per_deployment: Final = row.configured_max_input_tokens
+    declared: Final = tuple(limit for limit in per_deployment if limit is not None and limit > 0)
+    unset_window: Final = () if len(declared) == len(per_deployment) else (stock_model.context_window,)
+    if not declared or None in unset_window:
+        return MappingProxyType({})
+    smallest: Final = min(limit for limit in (*declared, *unset_window) if limit is not None)
+    ceiling: Final = stock_model.max_context_window
+    return MappingProxyType({"context_window": smallest if ceiling is None else min(smallest, ceiling)})
+
+
 def _alias_reasoning_level(row: CodexCatalogRow, stock_model: CodexStockModel) -> str | None:
     efforts: Final = frozenset(level.effort for level in stock_model.supported_reasoning_levels)
     return row.reasoning_effort if row.reasoning_effort in efforts else None
@@ -398,6 +422,7 @@ def _entry(
         "upgrade": upgrade,
         **({} if search_tool is None else {"supports_search_tool": search_tool}),
         **(_deployment_defaults(row, stock_model) if is_alias and alias_defaults == "deployment" else {}),
+        **_configured_window(row, stock_model),
     }
     if configured is None:
         return stock_model.model_copy(update=listing)
@@ -473,10 +498,12 @@ def codex_models_response_json(
     byte limit silently and keeps its bundled one, so the body holds only the entries that fit,
     the ones offering a service tier taken first and the rest in listing order, an entry too large
     for the bytes left passed over, every kept entry at its listing position; `byte_limit=None`
-    keeps every entry. A row listed under another name than the Codex model its `upstream_model`
-    names (an alias) takes that model's entry; `alias_defaults="deployment"` drops the defaults
-    Codex picks for that model in favor of what the alias's deployments pin, while `"codex"` keeps
-    them, as Codex would use them for the model's own name. `client_version` is the requesting Codex's version, which decides the reasoning
+    keeps every entry. A row whose deployments set `model_info.max_input_tokens` gets the smallest
+    window any of them takes as its known model's `context_window`, capped at that model's
+    `max_context_window`. A row listed under another name than the Codex model its `upstream_model` names (an alias) takes that model's
+    entry; `alias_defaults="deployment"` drops the defaults Codex picks for that model in favor of
+    what the alias's deployments pin, while `"codex"` keeps them, as Codex would use them for the
+    model's own name. `client_version` is the requesting Codex's version, which decides the reasoning
     levels a fallback entry may offer; None counts as a version too old for custom levels.
     """
     known: Final = bundled_codex_models() if stock is None else stock
@@ -519,6 +546,9 @@ def _catalog_row(
         search_tool_support=(
             registry.resolve(lookup_id, kind="search_tool_support", team_id=team_id) if registry is not None else ()
         ),
+        configured_max_input_tokens=(
+            registry.group(lookup_id, field="max_input_tokens", team_id=team_id) if registry is not None else ()
+        ),
     )
 
 
@@ -532,9 +562,9 @@ def codex_catalog_rows(
     """`rows` joined with the router's configured metadata, looked up by each entry's internal id so
     team-scoped rows resolve the way the Anthropic listing's display names do, a `model_group_alias`
     reading its target's deployments under its own name; `team_id` is the requesting key's team, so the
-    upstream model that picks Codex's stock entry and the tiers are read only off the deployments its
-    requests can route to, and the reasoning efforts are the ones `/model_group/info` reports for the
-    entry. Display names are read under `label_entries`' ids when given."""
+    upstream model that picks Codex's stock entry, the tiers, and the configured input limits are read
+    only off the deployments its requests can route to, and the reasoning efforts are the ones
+    `/model_group/info` reports for the entry. Display names are read under `label_entries`' ids when given."""
     lookup_ids: Final = MappingProxyType(dict(entries))
     label_ids: Final = lookup_ids if label_entries is None else MappingProxyType(dict(label_entries))
     return tuple(
diff --git a/litellm/proxy/common_utils/realtime_utils.py b/litellm/proxy/common_utils/realtime_utils.py
index c641748843e..e96685bdeae 100644
--- a/litellm/proxy/common_utils/realtime_utils.py
+++ b/litellm/proxy/common_utils/realtime_utils.py
@@ -1,3 +1,4 @@
+import json
 from functools import lru_cache
 from typing import Final
 
@@ -10,7 +11,7 @@ def realtime_request_body(model: str | None) -> bytes:
     Generate the realtime websocket request body. Cached with LRU semantics to avoid repeated
     string formatting work while keeping memory usage bounded.
     """
-    return f'{{"model": "{model or ""}"}}'.encode()
+    return json.dumps({"model": model or ""}).encode()
 
 
 _realtime_request_body: Final = realtime_request_body
diff --git a/litellm/proxy/common_utils/token_count_settings.py b/litellm/proxy/common_utils/token_count_settings.py
index dd04e531f2d..4e3059cfe26 100644
--- a/litellm/proxy/common_utils/token_count_settings.py
+++ b/litellm/proxy/common_utils/token_count_settings.py
@@ -56,6 +56,22 @@ class TokenCountSettings:
     framing: int | None
     count_model: TokenCountModel | None
     tokenizer: TokenCountTokenizer | None = None
+    tool_framing: int | None = None
+    responses_framing: int | None = None
+    responses_tool_framing: int | None = None
+
+    @property
+    def frames_counts(self) -> bool:
+        return any(
+            framing is not None
+            for framing in (self.framing, self.tool_framing, self.responses_framing, self.responses_tool_framing)
+        )
+
+    def hidden_prompt_tokens(self, carries_tools: bool, responses_api: bool) -> int:
+        chat: Final = self.tool_framing if carries_tools else None
+        responses: Final = self.responses_tool_framing if carries_tools else self.responses_framing
+        narrower: Final = responses if responses_api else chat
+        return (narrower if narrower is not None else self.framing) or 0
 
 
 @dataclass(frozen=True, slots=True)
@@ -105,6 +121,15 @@ def _framing(value: object) -> int | None:
             return None
 
 
+def _first_framing(source: Mapping[str, object], keys: tuple[str, ...]) -> int | None:
+    return next((framing for framing in map(_framing, map(source.get, keys)) if framing is not None), None)
+
+
+def _configured_framing(configured: Mapping[str, object], default: Mapping[str, object], *keys: str) -> int | None:
+    operator_sets_one: Final = _first_framing(configured, (*keys, "token_count_framing")) is not None
+    return _first_framing(configured if operator_sets_one else default, keys)
+
+
 def _non_blank(value: object) -> str | None:
     return value if isinstance(value, str) and value.strip() else None
 
@@ -175,13 +200,21 @@ def _tokenizer(value: object) -> TokenCountTokenizer | None:
 def resolve_token_count_settings(
     configured: Mapping[str, object], default: Mapping[str, object], deployment_region: Callable[[], str]
 ) -> TokenCountSettings:
-    framing: Final = _framing(configured.get("token_count_framing"))
     return TokenCountSettings(
-        framing=framing if framing is not None else _framing(default.get("token_count_framing")),
+        framing=_configured_framing(configured, default, "token_count_framing"),
         count_model=_resolved_count_model(
             configured.get("token_count_model"), default.get("token_count_model"), deployment_region
         ),
         tokenizer=_tokenizer(default.get("token_count_tokenizer")),
+        tool_framing=_configured_framing(configured, default, "token_count_tool_framing"),
+        responses_framing=_configured_framing(configured, default, "token_count_responses_framing"),
+        responses_tool_framing=_configured_framing(
+            configured,
+            default,
+            "token_count_responses_tool_framing",
+            "token_count_responses_framing",
+            "token_count_tool_framing",
+        ),
     )
 
 
diff --git a/litellm/proxy/common_utils/user_api_key_cache.py b/litellm/proxy/common_utils/user_api_key_cache.py
index e64fd755ef9..a2272c3f73d 100644
--- a/litellm/proxy/common_utils/user_api_key_cache.py
+++ b/litellm/proxy/common_utils/user_api_key_cache.py
@@ -24,6 +24,7 @@ T = TypeVar("T", bound=BaseModel)
 from litellm.constants import AUTH_OBJECTS_TARGET as AUTH_OBJECTS_TARGET  # noqa: E402, PLC0414  # public re-export
 
 _HASHED_TOKEN_CACHE_KEY: Final = re.compile(r"[0-9a-f]{64}")
+_BUDGET_WINDOWS_ABSENT_PREFIX: Final = "budget_windows_absent:"
 
 
 def is_user_key_cache_key(key: str) -> bool:
@@ -70,6 +71,7 @@ class UserApiKeyCache(DualCache):
         default_in_memory_ttl: float | None = None,
         default_redis_ttl: float | None = None,
         key_object_in_memory_cache: InMemoryCache | None = None,
+        budget_windows_absent_in_memory_cache: InMemoryCache | None = None,
     ) -> None:
         super().__init__(
             in_memory_cache=in_memory_cache,
@@ -83,19 +85,33 @@ class UserApiKeyCache(DualCache):
             default_in_memory_ttl=default_in_memory_ttl,
             default_redis_ttl=default_redis_ttl,
         )
+        self.budget_windows_absent_cache: Final = DualCache(
+            in_memory_cache=budget_windows_absent_in_memory_cache
+            or InMemoryCache(default_ttl=DEFAULT_MANAGEMENT_OBJECT_IN_MEMORY_CACHE_TTL),
+            default_in_memory_ttl=default_in_memory_ttl,
+        )
 
     def in_memory_cache_for(self, key: str) -> InMemoryCache:
         return self.key_object_cache.in_memory_cache if is_user_key_cache_key(key) else self.in_memory_cache
 
+    def delete_from_memory(self, key: str) -> None:
+        self.in_memory_cache_for(key).delete_cache(key)
+        if key.startswith(_BUDGET_WINDOWS_ABSENT_PREFIX):
+            self.budget_windows_absent_cache.delete_cache(key)
+
     def update_cache_ttl(self, default_in_memory_ttl: float | None, default_redis_ttl: float | None) -> None:
         super().update_cache_ttl(default_in_memory_ttl=default_in_memory_ttl, default_redis_ttl=default_redis_ttl)
         self.key_object_cache.update_cache_ttl(
             default_in_memory_ttl=default_in_memory_ttl, default_redis_ttl=default_redis_ttl
         )
+        self.budget_windows_absent_cache.update_cache_ttl(
+            default_in_memory_ttl=default_in_memory_ttl, default_redis_ttl=None
+        )
 
     def update_in_memory_max_size(self, max_size: int | None) -> None:
         super().update_in_memory_max_size(max_size)
         self.key_object_cache.update_in_memory_max_size(max_size)
+        self.budget_windows_absent_cache.update_in_memory_max_size(max_size)
 
     def attach_redis_cache(
         self, redis_cache: RedisCache | None = None, *, default_redis_ttl: float | None = None
@@ -272,6 +288,7 @@ class UserApiKeyCache(DualCache):
     def flush_cache(self) -> None:
         super().flush_cache()
         self.key_object_cache.in_memory_cache.flush_cache()
+        self.budget_windows_absent_cache.flush_cache()
 
     async def async_set_cache_pipeline(
         self, cache_list: Sequence[tuple[str, object]], local_only: bool = False, **kwargs: object
@@ -400,6 +417,11 @@ def team_membership_reservation_cache_key(user_id: str, team_id: str) -> str:
 NO_TEAM_MEMBERSHIP_SENTINEL: Final = "__no_team_membership__"
 
 
+def budget_windows_absent_cache_key(entity_type: str, entity_id: str) -> str:
+    """Cache key marking a key or team that holds no budget windows, so the spend fallback skips its row read."""
+    return f"{_BUDGET_WINDOWS_ABSENT_PREFIX}{entity_type}:{entity_id}"
+
+
 def get_management_object_ttl(cache: DualCache) -> float:
     """
     In-memory TTL for management-object cache writes (keys, teams, users, budgets, ...).
diff --git a/litellm/proxy/config_resolvers/settings_store.py b/litellm/proxy/config_resolvers/settings_store.py
index 70486be0068..3be66821915 100644
--- a/litellm/proxy/config_resolvers/settings_store.py
+++ b/litellm/proxy/config_resolvers/settings_store.py
@@ -42,10 +42,12 @@ _EMPTY_ROWS: Final[Mapping[DbRow, Mapping[str, JsonValue]]] = MappingProxyType({
 
 
 class SettingsStore(MutableMapping[str, JsonValue]):
-    def __init__(self, section: Section) -> None:
+    def __init__(self, section: Section, *, managed_db_keys: frozenset[str] | None = None) -> None:
         self._section: Final = section
+        self._managed_db_keys: Final = managed_db_keys
         self._yaml_values: Mapping[str, JsonValue] = _EMPTY_VALUES
         self._database_rows: Mapping[DbRow, Mapping[str, JsonValue]] = _EMPTY_ROWS
+        self._unmanaged_db_keys: frozenset[str] = frozenset()
         self._runtime_values: Mapping[str, JsonValue] = _EMPTY_VALUES
         self._deleted_runtime_keys: frozenset[str] = frozenset()
 
@@ -77,15 +79,24 @@ class SettingsStore(MutableMapping[str, JsonValue]):
         return self.owned_by_config(key) and self._db_value_is_shadowed(key)
 
     def apply_db_row(self, row: DbRow, db_row: Mapping[str, JsonValue]) -> None:
+        applied_row: Final = MappingProxyType({key: db_row[key] for key in db_row if self._db_manages(row, key)})
         previous_row: Final = self._database_rows.get(row, _EMPTY_VALUES)
         changed: Final = frozenset(
             key
-            for key in (*previous_row, *db_row)
-            if previous_row.get(key, ABSENT) != db_row.get(key, ABSENT)  # pyright: ignore[reportUnknownArgumentType]  # JsonValue vs Absent compare
+            for key in (*previous_row, *applied_row)
+            if previous_row.get(key, ABSENT) != applied_row.get(key, ABSENT)  # pyright: ignore[reportUnknownArgumentType]  # JsonValue vs Absent compare
         )
-        self._database_rows = MappingProxyType({**self._database_rows, row: MappingProxyType(dict(db_row))})
+        self._database_rows = MappingProxyType({**self._database_rows, row: applied_row})
+        if row == self._section:
+            self._unmanaged_db_keys = frozenset(key for key in db_row if key not in applied_row)
         self._clear_runtime_keys(changed)
 
+    def unmanaged_db_keys(self) -> tuple[str, ...]:
+        return tuple(sorted(self._unmanaged_db_keys))
+
+    def _db_manages(self, row: DbRow, key: str) -> bool:
+        return row != self._section or self._managed_db_keys is None or key in self._managed_db_keys
+
     def resolved(self) -> Mapping[str, JsonValue]:
         return MappingProxyType(dict(self))
 
diff --git a/litellm/proxy/guardrails/guardrail_hooks/llm_shield_proxy/stream_restorers.py b/litellm/proxy/guardrails/guardrail_hooks/llm_shield_proxy/stream_restorers.py
index ef007155c46..66a2d427944 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/llm_shield_proxy/stream_restorers.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/llm_shield_proxy/stream_restorers.py
@@ -261,7 +261,8 @@ class ResponsesStreamRestorer:
       own window, keyed by the family, the item id and the part index.
     - Any `*.done` event closes the stream of the same family. Whatever its window still
       holds goes out first, as a copy of that stream's last delta event -- so it carries
-      the stream's own ids, and repeats that event's `sequence_number`. Then every text
+      the stream's own ids. It takes the done event's `sequence_number`, and every later
+      event's number moves up by one, so the numbers stay unique and in order. Then every text
       field on the done event is restored in full: its string fields other than
       identifiers, plus any `part` or `item` it repeats.
     - `response.completed` / `response.incomplete` repeat the whole reply, and are
@@ -273,6 +274,8 @@ class ResponsesStreamRestorer:
         self._rehydrate: Final = rehydrate
         self._carries: Final[dict[ResponsesStreamKey, str]] = {}  # mutable-ok: per-stream windows advanced in place.
         self._last_deltas: Final[dict[ResponsesStreamKey, object]] = {}  # mutable-ok: newest delta per stream.
+        self._inserted: int = 0
+        self._last_sequence_number: int | None = None
 
     async def restore(self, event: object) -> tuple[object, ...]:
         """The events to emit in place of `event`: any flush, then the event itself."""
@@ -281,7 +284,7 @@ class ResponsesStreamRestorer:
             return (event,)
         if kind.endswith(".delta") and kind not in RESPONSES_BINARY_DELTAS:
             await self._restore_delta(event, kind)
-            return (event,)
+            return self._numbered((), event)
         slots: Final[SlotSink] = []
         flushed: Final = await self._flush(responses_stream_key(event, kind)) if kind.endswith(".done") else ()
         if kind.endswith(".done"):
@@ -294,12 +297,29 @@ class ResponsesStreamRestorer:
             for item in read_list(read_field(event, "response"), "output"):
                 collect_response_item(item, slots)
         await rehydrate_slots(slots, self._rehydrate)
-        return (*flushed, event)
+        return self._numbered(flushed, event)
 
     async def finish(self) -> tuple[object, ...]:
         """Flushes every stream the provider never closed, e.g. a truncated reply."""
-        flushed: Final = tuple([await self._flush(key) for key in tuple(self._carries)])
-        return tuple(itertools.chain.from_iterable(flushed))
+        flushed: Final = tuple(itertools.chain.from_iterable([await self._flush(key) for key in tuple(self._carries)]))
+        last: Final = self._last_sequence_number
+        if last is not None:
+            for offset, flush in enumerate(flushed, start=1):
+                write_field(flush, "sequence_number", last + offset)
+        return flushed
+
+    def _numbered(self, flushed: tuple[object, ...], event: object) -> tuple[object, ...]:
+        """Gives each flush the slot `event` arrived in and moves `event` and later events up."""
+        number: Final = read_field(event, "sequence_number")
+        if not isinstance(number, int):
+            return (*flushed, event)
+        for offset, flush in enumerate(flushed):
+            write_field(flush, "sequence_number", number + self._inserted + offset)
+        self._inserted += len(flushed)
+        self._last_sequence_number = number + self._inserted
+        if self._inserted:
+            write_field(event, "sequence_number", self._last_sequence_number)
+        return (*flushed, event)
 
     async def _restore_delta(self, event: object, kind: str) -> None:
         text: Final = read_field(event, "delta")
diff --git a/litellm/proxy/guardrails/guardrail_hooks/mcp_security/mcp_security_guardrail.py b/litellm/proxy/guardrails/guardrail_hooks/mcp_security/mcp_security_guardrail.py
index 9c0a574ae3b..b4652e010ff 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/mcp_security/mcp_security_guardrail.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/mcp_security/mcp_security_guardrail.py
@@ -107,9 +107,20 @@ class MCPSecurityGuardrail(CustomGuardrail):
         from litellm.proxy.mcp_server.mcp_server_manager import (
             global_mcp_server_manager,
         )
+        from litellm.proxy.proxy_server import prisma_client
 
         async with global_mcp_server_manager.catalog.operation():
-            registry: Final = global_mcp_server_manager.get_registry()
-            registered_names: Final = set(registry.keys())
-
-            return frozenset(requested_servers - registered_names)
+            not_servers: Final = frozenset(
+                name
+                for name in requested_servers
+                if global_mcp_server_manager.get_mcp_server_by_identifier(name) is None
+            )
+            if prisma_client is None:
+                return not_servers
+            return frozenset(
+                [
+                    name
+                    for name in not_servers
+                    if await global_mcp_server_manager.get_toolset_by_name_cached(prisma_client, name) is None
+                ]
+            )
diff --git a/litellm/proxy/hooks/parallel_request_limiter.py b/litellm/proxy/hooks/parallel_request_limiter.py
index cd01d15d834..f9e85c31d46 100644
--- a/litellm/proxy/hooks/parallel_request_limiter.py
+++ b/litellm/proxy/hooks/parallel_request_limiter.py
@@ -13,7 +13,7 @@ from litellm._internal_context import with_service_target
 from litellm._logging import verbose_proxy_logger
 from litellm.exceptions import RateLimitType
 from litellm.integrations.custom_logger import CustomLogger
-from litellm.litellm_core_utils.core_helpers import get_parent_otel_span_from_kwargs
+from litellm.litellm_core_utils.core_helpers import as_str_mapping, get_parent_otel_span_from_kwargs
 from litellm.proxy._types import CommonProxyErrors, CurrentItemRateLimit, UserAPIKeyAuth
 from litellm.proxy.auth.auth_utils import (
     get_key_model_rpm_limit,
@@ -53,9 +53,16 @@ def _response_total_tokens(kwargs: Mapping[str, object], response_obj: object) -
 _CONNECTION_SCOPED_CALL_TYPES: Final = frozenset({CallTypes.aresponses_websocket.value})
 
 
+def _is_websocket_passthrough_row(kwargs: Mapping[str, object]) -> bool:
+    passthrough_payload: Final = as_str_mapping(kwargs.get("passthrough_logging_payload"))
+    return passthrough_payload is not None and passthrough_payload.get("request_method") == "WEBSOCKET"
+
+
 def _slots_released(kwargs: Mapping[str, object]) -> int:
     """A websocket turn callback releases nothing; the socket's slot is released once at disconnect."""
-    return 0 if kwargs.get("call_type") in _CONNECTION_SCOPED_CALL_TYPES else 1
+    if kwargs.get("call_type") in _CONNECTION_SCOPED_CALL_TYPES or _is_websocket_passthrough_row(kwargs):
+        return 0
+    return 1
 
 
 class CacheObject(TypedDict):
diff --git a/litellm/proxy/hooks/responses_id_security.py b/litellm/proxy/hooks/responses_id_security.py
index 771d68a0ea0..61ab1eb4771 100644
--- a/litellm/proxy/hooks/responses_id_security.py
+++ b/litellm/proxy/hooks/responses_id_security.py
@@ -7,22 +7,25 @@ instead of writing immediately on each request.
 
 from collections.abc import AsyncGenerator, Callable, Mapping
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, Final, cast
+from typing import TYPE_CHECKING, Any, Final, TypeVar
 
 from fastapi import HTTPException
 from pydantic import TypeAdapter, ValidationError
 
 from litellm._logging import verbose_proxy_logger
 from litellm.integrations.custom_logger import CustomLogger
+from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
 from litellm.proxy._types import LitellmUserRoles
 from litellm.proxy.common_utils.encrypt_decrypt_utils import (
     decrypt_value_helper,
     encrypt_value_helper,
 )
+from litellm.responses.utils import ResponsesAPIRequestUtils
 from litellm.types.llms.openai import (
     BaseLiteLLMOpenAIResponseObject,
     ResponsesAPIResponse,
 )
+from litellm.types.responses.main import DeleteResponseResult
 from litellm.types.utils import ADDRESSED_RESPONSE_ID_FIELD, CallTypesLiteral, LLMResponseTypes, SpecialEnums
 
 if TYPE_CHECKING:
@@ -67,6 +70,8 @@ def _proxy_signing_key() -> str | None:
 
 
 _RESPONSE_PAYLOAD_ADAPTER: Final = TypeAdapter(Mapping[str, object])
+_ResponseObjectT = TypeVar("_ResponseObjectT", bound=BaseLiteLLMOpenAIResponseObject)
+_AddressedResultT = TypeVar("_AddressedResultT", bound=ResponsesAPIResponse | DeleteResponseResult)
 
 
 def _response_payload(response_obj: object) -> Mapping[str, object] | None:
@@ -77,9 +82,9 @@ def _response_payload(response_obj: object) -> Mapping[str, object] | None:
 
 
 def _rewrite_advertised_id(
-    event: BaseLiteLLMOpenAIResponseObject,
+    event: _ResponseObjectT,
     rewrite: Callable[[str], str],
-) -> BaseLiteLLMOpenAIResponseObject:
+) -> _ResponseObjectT:
     event_id: Final = getattr(event, "id", None)
     if isinstance(event_id, str) and event_id.startswith("resp_"):
         setattr(event, "id", rewrite(event_id))
@@ -116,6 +121,35 @@ def _streams_response_ids(request_route: str | None) -> bool:
     return canonical in _RESPONSES_API_ROUTES or (parent in _RESPONSES_API_ROUTES and response_id != "")
 
 
+_NO_HELD_IDS: Final[Mapping[str, str]] = MappingProxyType({})
+
+
+def _upstream_response_id(response_id: str) -> str:
+    return ResponsesAPIRequestUtils.decode_previous_response_id_to_original_previous_response_id(response_id)
+
+
+def _names_the_same_response(response_id: str | None, original_response_id: str) -> bool:
+    return response_id is not None and _upstream_response_id(response_id) == _upstream_response_id(original_response_id)
+
+
+def _held_id_naming(response_id: str | None, held_ids: Mapping[str, str]) -> str | None:
+    return next(
+        (
+            held_id
+            for original_response_id, held_id in held_ids.items()
+            if _names_the_same_response(response_id, original_response_id)
+        ),
+        None,
+    )
+
+
+def _id_sent_back(response: ResponsesAPIResponse | DeleteResponseResult, held_ids: Mapping[str, str]) -> str | None:
+    held_id: Final = _held_id_naming(response.id, held_ids)
+    if held_id is not None:
+        return held_id
+    return response.id if isinstance(response, DeleteResponseResult) else None
+
+
 class ResponsesIDSecurity(CustomLogger):
     def __init__(
         self,
@@ -275,10 +309,18 @@ class ResponsesIDSecurity(CustomLogger):
 
     def _encrypt_response_id(
         self,
-        response: BaseLiteLLMOpenAIResponseObject,
+        response: _ResponseObjectT,
         user_api_key_dict: "UserAPIKeyAuth",
         request_cache: dict[str, str] | None = None,
-    ) -> BaseLiteLLMOpenAIResponseObject:
+    ) -> _ResponseObjectT:
+        encrypt: Final = self._response_id_encrypter(user_api_key_dict, request_cache)
+        return response if encrypt is None else _rewrite_advertised_id(response, encrypt)
+
+    def _response_id_encrypter(
+        self,
+        user_api_key_dict: "UserAPIKeyAuth",
+        request_cache: dict[str, str] | None,
+    ) -> Callable[[str], str] | None:
         signing_key: Final = self._get_signing_key()
         if signing_key is None:
             verbose_proxy_logger.debug(
@@ -287,7 +329,7 @@ class ResponsesIDSecurity(CustomLogger):
                 "Skipping response ID encryption. "
                 "See: https://docs.litellm.ai/docs/proxy/prod#5-set-litellm-salt-key"
             )
-            return response
+            return None
 
         def encrypt(original_id: str) -> str:
             cached: Final = request_cache.get(original_id) if request_cache is not None else None
@@ -304,47 +346,73 @@ class ResponsesIDSecurity(CustomLogger):
                 request_cache[original_id] = encrypted_id
             return encrypted_id
 
-        return _rewrite_advertised_id(response, encrypt)
+        return encrypt
+
+    def _streamed_response_id_advertiser(
+        self,
+        user_api_key_dict: "UserAPIKeyAuth",
+        request_data: Mapping[str, object],
+    ) -> Callable[[str], str] | None:
+        if not _streams_response_ids(user_api_key_dict.request_route):
+            return None
+        if self._general_settings_reader().get("disable_responses_id_security", False):
+            return None
+        encrypt: Final = self._response_id_encrypter(user_api_key_dict, request_cache={})
+        if encrypt is None:
+            return None
+        logging_obj: Final = request_data.get("litellm_logging_obj")
+        held_ids: Final = self._ids_the_caller_holds(request_data.get(ADDRESSED_RESPONSE_ID_FIELD))
+
+        def advertise(original_id: str) -> str:
+            logged_id: Final = encrypt(original_id)
+            if isinstance(logging_obj, LiteLLMLoggingObj):
+                logging_obj.client_facing_response_id = logged_id
+            return _held_id_naming(original_id, held_ids) or logged_id
+
+        return advertise
+
+    def _ids_the_caller_holds(self, addressed_id: object) -> Mapping[str, str]:
+        if not isinstance(addressed_id, str) or not self._is_encrypted_response_id(addressed_id):
+            return _NO_HELD_IDS
+        original_response_id, _, _ = self._decrypt_response_id(addressed_id)
+        return MappingProxyType({original_response_id: addressed_id})
+
+    def _advertised_response(
+        self,
+        response: _AddressedResultT,
+        user_api_key_dict: "UserAPIKeyAuth",
+        request_data: Mapping[str, object],
+    ) -> _AddressedResultT:
+        sent_back_id: Final = _id_sent_back(
+            response, self._ids_the_caller_holds(request_data.get(ADDRESSED_RESPONSE_ID_FIELD))
+        )
+        logged_response: Final = self._encrypt_response_id(response, user_api_key_dict, request_cache=None)
+        return logged_response if sent_back_id is None else logged_response.model_copy(update={"id": sent_back_id})
 
     async def async_post_call_success_hook(
         self,
-        data: dict,
+        data: dict[str, object],
         user_api_key_dict: "UserAPIKeyAuth",
         response: LLMResponseTypes,
     ) -> LLMResponseTypes:
-        """
-        Queue response IDs for batch processing instead of writing directly to DB.
-
-        This method adds response IDs to an in-memory queue, which are then
-        batch-processed by the DBSpendUpdateWriter during regular database update cycles.
-        """
         general_settings: Final = self._general_settings_reader()
 
         if general_settings.get("disable_responses_id_security", False):
             return response
-        if isinstance(response, ResponsesAPIResponse):
-            response = cast(
-                ResponsesAPIResponse,
-                self._encrypt_response_id(response, user_api_key_dict, request_cache=None),
-            )
+        if isinstance(response, ResponsesAPIResponse | DeleteResponseResult):
+            return self._advertised_response(response, user_api_key_dict, data)
         return response
 
     async def async_post_call_streaming_iterator_hook(
-        self, user_api_key_dict: "UserAPIKeyAuth", response: Any, request_data: dict
+        self, user_api_key_dict: "UserAPIKeyAuth", response: Any, request_data: dict[str, object]
     ) -> AsyncGenerator[BaseLiteLLMOpenAIResponseObject, None]:
-        general_settings: Final = self._general_settings_reader()
-
-        # Create a request-scoped cache for consistent encryption across streaming chunks.
-        request_encryption_cache: Final[dict[str, str]] = {}
-
+        advertise: Final = self._streamed_response_id_advertiser(user_api_key_dict, request_data)
         async for chunk in response:
-            if (
-                isinstance(chunk, BaseLiteLLMOpenAIResponseObject)
-                and _streams_response_ids(user_api_key_dict.request_route)
-                and not general_settings.get("disable_responses_id_security", False)
-            ):
-                chunk = self._encrypt_response_id(chunk, user_api_key_dict, request_encryption_cache)
-            yield chunk
+            yield (
+                _rewrite_advertised_id(chunk, advertise)
+                if advertise is not None and isinstance(chunk, BaseLiteLLMOpenAIResponseObject)
+                else chunk
+            )
 
 
 def decrypted_response_id(response_id: str) -> str:
diff --git a/litellm/proxy/image_endpoints/endpoints.py b/litellm/proxy/image_endpoints/endpoints.py
index 6244e5025ce..95816edfecb 100644
--- a/litellm/proxy/image_endpoints/endpoints.py
+++ b/litellm/proxy/image_endpoints/endpoints.py
@@ -37,6 +37,7 @@ from litellm.proxy.common_utils.openai_error_payload import (
 from litellm.proxy.route_llm_request import route_request
 from litellm.types.images.main import ImageEditRequestParams
 from litellm.types.llms.openai import ChatCompletionUserMessage
+from litellm.types.utils import CallTypes
 
 router: Final = APIRouter()
 _IMAGE_GENERATION_MODEL_ADAPTER: Final[TypeAdapter[object]] = TypeAdapter(object)
@@ -221,7 +222,10 @@ async def image_generation(
         return response
     except Exception as e:
         await proxy_logging_obj.post_call_failure_hook(
-            user_api_key_dict=user_api_key_dict, original_exception=e, request_data=data
+            user_api_key_dict=user_api_key_dict,
+            original_exception=e,
+            request_data=data,
+            dispatched_call_type=CallTypes.aimage_generation.value,
         )
         log_llm_api_exception(e, litellm_call_id)
         if isinstance(e, HTTPException):
diff --git a/litellm/proxy/management_endpoints/team_endpoints.py b/litellm/proxy/management_endpoints/team_endpoints.py
index b712ba42a6a..f505406fe0e 100644
--- a/litellm/proxy/management_endpoints/team_endpoints.py
+++ b/litellm/proxy/management_endpoints/team_endpoints.py
@@ -109,6 +109,7 @@ from litellm.proxy.auth.auth_checks import (  # noqa: F401  # legacy module expo
     can_org_access_model,
     delete_cache_key_objects,
     delete_cache_team_object,
+    evict_budget_windows_absent_marker,
     get_jwt_key_mapping_cache_keys_for_tokens,
     get_org_object,
     get_team_membership,
@@ -612,6 +613,9 @@ async def refresh_cached_team(
     await publish_auth_cache_invalidation(cache_key=f"team_id:{team_row.team_id}")
     if team_table.team_alias is not None:
         await publish_auth_cache_invalidation(cache_key=f"team_alias:{team_table.team_alias}")
+    await evict_budget_windows_absent_marker(
+        entity_type=Litellm_EntityType.TEAM, entity_id=team_row.team_id, user_api_key_cache=user_api_key_cache
+    )
 
 
 _refresh_cached_team: Final = refresh_cached_team
diff --git a/litellm/proxy/mcp_server/server.py b/litellm/proxy/mcp_server/server.py
index aeb640a7c8b..bbbbd09e527 100644
--- a/litellm/proxy/mcp_server/server.py
+++ b/litellm/proxy/mcp_server/server.py
@@ -21,7 +21,7 @@ import httpx
 from fastapi import FastAPI, HTTPException
 from pydantic import ConfigDict, TypeAdapter, ValidationError
 from starlette.requests import Request as StarletteRequest
-from starlette.responses import JSONResponse
+from starlette.responses import JSONResponse, Response
 from starlette.routing import Route
 from starlette.types import Message, Receive, Scope, Send
 
@@ -2489,6 +2489,9 @@ if MCP_AVAILABLE:
                     },
                 )(scope, receive, send)
                 return
+            if scope.get("method") == "OPTIONS":
+                await Response(status_code=204, headers={"Allow": "GET, POST, DELETE, OPTIONS"})(scope, receive, send)
+                return
             path: Final = _scope_path(scope)
             peek: Final = _LazyPeekedBody(receive) if scope.get("method") == "POST" else None
             if peek is not None:
diff --git a/litellm/proxy/middleware/admission_control_middleware.py b/litellm/proxy/middleware/admission_control_middleware.py
index 1bb94e23d15..83503d0c3d4 100644
--- a/litellm/proxy/middleware/admission_control_middleware.py
+++ b/litellm/proxy/middleware/admission_control_middleware.py
@@ -10,6 +10,7 @@ from starlette.responses import JSONResponse
 from starlette.types import ASGIApp, Receive, Scope, Send
 
 from litellm._logging import verbose_proxy_logger
+from litellm.proxy.common_utils.anthropic_error_payload import route_error_content
 
 ADMISSION_LEASE_SCOPE_KEY: Final = "litellm.admission_lease"
 
@@ -175,7 +176,7 @@ class AdmissionControlMiddleware:
             state.record_admission()
         elif state.get_stats().queued >= settings.max_queued_requests:
             state.record_rejection("queue_full")
-            await _overloaded_response(state)(scope, receive, send)
+            await _overloaded_response(state, scope)(scope, receive, send)
             return
         else:
             state.record_queue()
@@ -187,7 +188,7 @@ class AdmissionControlMiddleware:
             except asyncio.TimeoutError:
                 state.record_dequeue()
                 state.record_rejection("queue_timeout")
-                await _overloaded_response(state)(scope, receive, send)
+                await _overloaded_response(state, scope)(scope, receive, send)
                 return
             except asyncio.CancelledError:
                 state.record_dequeue()
@@ -313,18 +314,16 @@ def get_admission_control_settings(settings: Mapping[str, object]) -> AdmissionC
     )
 
 
-def _overloaded_response(state: AdmissionControlState) -> JSONResponse:
+def _overloaded_response(state: AdmissionControlState, scope: Scope) -> JSONResponse:
     stats: Final = state.get_stats()
+    message: Final = f"Worker at capacity: {stats.admitted} in-flight, {stats.queued} queued requests. Retry later."
     return JSONResponse(
         status_code=503,
         headers={"retry-after": "1"},
-        content={
-            "error": {
-                "message": (
-                    f"Worker at capacity: {stats.admitted} in-flight, {stats.queued} queued requests. Retry later."
-                ),
-                "type": "overloaded_error",
-                "code": "503",
-            }
-        },
+        content=route_error_content(
+            scope,
+            "overloaded_error",
+            message,
+            {"error": {"message": message, "type": "overloaded_error", "code": "503"}},
+        ),
     )
diff --git a/litellm/proxy/middleware/request_body_decompression_middleware.py b/litellm/proxy/middleware/request_body_decompression_middleware.py
index 5eb8a9bfc91..3e144d7bf4c 100644
--- a/litellm/proxy/middleware/request_body_decompression_middleware.py
+++ b/litellm/proxy/middleware/request_body_decompression_middleware.py
@@ -12,12 +12,14 @@ from starlette.requests import ClientDisconnect, Request
 from starlette.responses import JSONResponse
 from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
+from litellm.anthropic_interface.exceptions import AnthropicErrorType
 from litellm.constants import (
     MAX_DECOMPRESSED_REQUEST_BODIES_IN_FLIGHT_MB,
     MAX_DECOMPRESSED_REQUEST_BODY_SIZE_MB,
     MAX_REQUEST_BODY_DECOMPRESSION_RATIO,
 )
 from litellm.proxy.auth.auth_utils import get_request_route
+from litellm.proxy.common_utils.anthropic_error_payload import proxy_error_type, route_error_content
 from litellm.proxy.middleware.request_size_limit_middleware import MaxRequestSizeGetter, send_request_too_large
 
 RFC_9659_ZSTD_WINDOW_LOG_MAX: Final = 23
@@ -291,13 +293,22 @@ def _replay_body(body: bytes, receive: Receive, more_body: bool = False) -> Rece
 
 
 def _error_response(
+    scope: Scope,
     message: str,
     status_code: int,
     error_type: str = "invalid_request_error",
     headers: Mapping[str, str] | None = None,
 ) -> JSONResponse:
+    anthropic_type: Final[AnthropicErrorType] = (
+        "overloaded_error" if error_type == "overloaded_error" else proxy_error_type(status_code)
+    )
     return JSONResponse(
-        {"error": {"message": message, "type": error_type, "param": None, "code": str(status_code)}},
+        route_error_content(
+            scope,
+            anthropic_type,
+            message,
+            {"error": {"message": message, "type": error_type, "param": None, "code": str(status_code)}},
+        ),
         status_code=status_code,
         headers=headers,
     )
@@ -356,6 +367,7 @@ class RequestBodyDecompressionMiddleware:
         if codec is None:
             supported: Final = ", ".join(sorted(self.codecs))
             await _error_response(
+                scope,
                 f"This proxy cannot decode {coding} request bodies. Supported encodings: {supported}",
                 415,
                 headers={"accept-encoding": supported},
@@ -372,7 +384,7 @@ class RequestBodyDecompressionMiddleware:
             case _Body(data=data):
                 await self._decode_within_budget(scope, receive, send, codec, data, limits)
             case _TooLarge():
-                await send_request_too_large(send=send, max_request_size_mb=max_mb)
+                await send_request_too_large(scope=scope, send=send, max_request_size_mb=max_mb)
             case _ClientDisconnected():
                 return
 
@@ -382,6 +394,7 @@ class RequestBodyDecompressionMiddleware:
         reservation: Final = _max_decoded_length(codec, data, limits)
         if not self.budget.try_reserve(reservation):
             await _error_response(
+                scope,
                 "The proxy is decoding too many compressed request bodies right now. "
                 "Retry later, or send this body uncompressed",
                 503,
@@ -407,12 +420,12 @@ class RequestBodyDecompressionMiddleware:
             case _Body(data=body):
                 await self.app(_identity_scope(scope, len(body)), _replay_body(body, receive), send)
             case _DecodedTooLarge():
-                await _error_response(f"Request body is larger than {limits.max_mb:g} MB when decoded", 413)(
+                await _error_response(scope, f"Request body is larger than {limits.max_mb:g} MB when decoded", 413)(
                     scope, receive, send
                 )
             case _OverRatio():
-                await _error_response(f"Request body expands more than {limits.max_ratio} times when decoded", 413)(
-                    scope, receive, send
-                )
+                await _error_response(
+                    scope, f"Request body expands more than {limits.max_ratio} times when decoded", 413
+                )(scope, receive, send)
             case _Undecodable(message=message):
-                await _error_response(message, 400)(scope, receive, send)
+                await _error_response(scope, message, 400)(scope, receive, send)
diff --git a/litellm/proxy/middleware/request_size_limit_middleware.py b/litellm/proxy/middleware/request_size_limit_middleware.py
index cbbc79cc2ca..15bbf05bd01 100644
--- a/litellm/proxy/middleware/request_size_limit_middleware.py
+++ b/litellm/proxy/middleware/request_size_limit_middleware.py
@@ -4,6 +4,8 @@ from typing import Final
 
 from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
+from litellm.proxy.common_utils.anthropic_error_payload import route_error_content
+
 MaxRequestSizeGetter = Callable[[], int | float | None]
 RequestSizeLimitEnabledGetter = Callable[[], bool]
 
@@ -44,7 +46,7 @@ class RequestSizeLimitMiddleware:
 
         content_length: Final = _get_content_length(scope=scope)
         if content_length is not None and content_length > max_request_size_bytes:
-            await send_request_too_large(send=send, max_request_size_mb=max_request_size_mb)
+            await send_request_too_large(scope=scope, send=send, max_request_size_mb=max_request_size_mb)
             return
 
         received_body_bytes = 0
@@ -74,7 +76,7 @@ class RequestSizeLimitMiddleware:
         except RequestEntityTooLarge:
             if response_started:
                 raise
-            await send_request_too_large(send=send, max_request_size_mb=max_request_size_mb)
+            await send_request_too_large(scope=scope, send=send, max_request_size_mb=max_request_size_mb)
 
 
 def _mb_to_bytes(max_request_size_mb: float | None) -> int | None:
@@ -98,11 +100,13 @@ def _get_content_length(scope: Scope) -> int | None:
 
 
 async def send_request_too_large(
+    scope: Scope,
     send: Send,
     max_request_size_mb: float | None,
 ) -> None:
+    message: Final = f"Request size is too large. Max size is {max_request_size_mb} MB"
     body: Final = json.dumps(
-        {"error": f"Request size is too large. Max size is {max_request_size_mb} MB"},
+        route_error_content(scope, "request_too_large", message, {"error": message}),
         separators=(",", ":"),
     ).encode("utf-8")
     await send(
diff --git a/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py b/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py
index c7983f40aec..be9f80694b8 100644
--- a/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py
+++ b/litellm/proxy/pass_through_endpoints/llm_passthrough_endpoints.py
@@ -15,11 +15,11 @@ import os
 import posixpath
 import re
 import sys
-from collections.abc import AsyncGenerator, Callable, Mapping, Sequence
+from collections.abc import AsyncGenerator, Awaitable, Callable, Mapping, Sequence
 from dataclasses import dataclass
 from functools import partial
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Annotated, Final, Literal, Protocol, cast
+from typing import TYPE_CHECKING, Annotated, Final, Literal, Protocol, TypeAlias, cast
 
 import httpx
 import openai
@@ -51,6 +51,7 @@ from litellm.constants import (
 from litellm.exceptions import BlockedPiiEntityError, GuardrailRaisedException
 from litellm.integrations.custom_guardrail import guardrail_request_data_with_streaming, is_guardrail_intervention
 from litellm.litellm_core_utils.aws_partition import get_aws_dns_suffix
+from litellm.litellm_core_utils.core_helpers import as_object_list, as_str_mapping, attribute_or_none
 from litellm.litellm_core_utils.fallback_generalizations import match_routing_generalization
 from litellm.llms.anthropic.common_utils import (
     AnthropicModelInfo,
@@ -85,7 +86,12 @@ from litellm.llms.vertex_ai.vertex_llm_base import VertexBase
 from litellm.llms.vllm.common_utils import endpoint_under_api_base
 from litellm.passthrough.main import AsyncPassthroughStreamingResponse, is_provider_error
 from litellm.proxy._types import *
-from litellm.proxy.auth.auth_checks import enforced_model_allowlists
+from litellm.proxy.auth.auth_checks import (
+    can_agent_call_model,
+    can_key_call_resolved_model,
+    key_model_aliases_for_auth_check,
+    team_model_aliases_for_auth_check,
+)
 from litellm.proxy.auth.handle_jwt import JWTHandler
 from litellm.proxy.auth.route_checks import RouteChecks
 from litellm.proxy.auth.user_api_key_auth import (  # noqa: F401  # legacy module exports
@@ -93,6 +99,7 @@ from litellm.proxy.auth.user_api_key_auth import (  # noqa: F401  # legacy modul
     get_bearer_token,
     is_no_auth_dev_mode,
     user_api_key_auth,
+    user_api_key_auth_accepted_websocket_for_model,
     user_api_key_auth_websocket,
     user_api_key_auth_websocket_for_model,
 )
@@ -114,6 +121,7 @@ from litellm.proxy.common_utils.http_parsing_utils import (  # noqa: F401  # leg
     safe_get_request_headers,
     safe_set_request_parsed_body,
 )
+from litellm.proxy.common_utils.model_listing_utils import alias_map
 from litellm.proxy.common_utils.openai_error_payload import LITELLM_CALL_ID_HEADER
 from litellm.proxy.common_utils.resource_ownership import is_proxy_admin
 from litellm.proxy.common_utils.sse_keepalive import (
@@ -129,16 +137,26 @@ from litellm.proxy.pass_through_endpoints.injected_stream_usage import (
     stream_usage_relay,
     without_injected_usage_frames,
 )
+from litellm.proxy.pass_through_endpoints.llm_provider_handlers.openai_websocket_passthrough_logging_handler import (
+    openai_websocket_frame_kind,
+)
 from litellm.proxy.pass_through_endpoints.pass_through_endpoints import (
+    STORED_PROMPT_PROBE_MODEL,
     HttpPassThroughEndpointHelpers,
+    WebsocketFrameModelAllowed,
+    WebsocketFrameModelGate,
+    WebsocketFrameModelRefused,
+    WebsocketFrameModelVerdict,
+    WebsocketUpstreamFrameClassifier,
     YieldsToConfiguredPassThroughRoute,
     create_pass_through_route,
     create_websocket_passthrough_route,
+    refuse_websocket,
     truncated_close_reason,
     websocket_passthrough_request,
 )
 from litellm.proxy.utils import ProxyLogging as ProxyLoggingType
-from litellm.proxy.utils import is_known_model
+from litellm.proxy.utils import is_known_model, normalize_route_for_root_path
 from litellm.proxy.vector_store_endpoints.utils import (
     assert_proxy_admin_for_vector_store_index_management,
     assert_user_can_access_vector_store,
@@ -198,7 +216,7 @@ def is_passthrough_request_using_router_model(request_body: dict, llm_router: li
     """
     try:
         model: Final = request_body.get("model")
-        return is_known_model(model, llm_router)
+        return isinstance(model, str) and is_known_model(model, llm_router)
     except Exception:
         return False
 
@@ -228,9 +246,8 @@ def is_passthrough_request_streaming(request_body: object) -> bool:
     A JSON body need not be an object, so a list or scalar can reach here; it
     carries no streaming flag.
     """
-    if not isinstance(request_body, dict):
-        return False
-    return bool(request_body.get("stream", False))
+    body: Final = as_str_mapping(request_body)
+    return body is not None and bool(body.get("stream", False))
 
 
 def _optional_str(value: object) -> str | None:
@@ -3387,19 +3404,6 @@ def _join_url_paths(base_url: httpx.URL, path: str, custom_llm_provider: litellm
     return joined_path_str
 
 
-_OPENAI_WS_ALL_MODEL_ACCESS: Final = frozenset(
-    {
-        SpecialModelNames.all_proxy_models.value,
-        SpecialModelNames.all_team_models.value,
-        "*",
-    }
-)
-
-
-def _has_model_restrictions(model_allowlists: tuple[Sequence[str], ...]) -> bool:
-    return any(str(model) not in _OPENAI_WS_ALL_MODEL_ACCESS for allowlist in model_allowlists for model in allowlist)
-
-
 @dataclass(frozen=True, slots=True)
 class _OpenAIWebsocketRefusal:
     close_reason: str
@@ -3416,6 +3420,16 @@ class _OpenAIWebsocketErrorFrame(TypedDict):
     error: ReadOnly[_OpenAIWebsocketErrorDetail]
 
 
+_OPENAI_WS_UNAVAILABLE_AUTH_REFUSAL: Final = (
+    "This gateway could not authorize the model named in this frame, so the session was closed. Try again, "
+    "and ask a proxy admin to check the gateway logs if it keeps happening."
+)
+
+_OPENAI_WS_ALIASED_MODEL_REFUSAL: Final = (
+    "This key cannot use a model alias over OpenAI websocket passthrough. The passthrough sends each frame to "
+    "OpenAI unchanged, so name the model this key may use directly."
+)
+
 _OPENAI_WS_DISABLED_REFUSAL: Final = _OpenAIWebsocketRefusal(
     close_reason="OpenAI websocket passthrough is disabled",
     message=(
@@ -3424,14 +3438,6 @@ _OPENAI_WS_DISABLED_REFUSAL: Final = _OpenAIWebsocketRefusal(
     ),
 )
 
-_OPENAI_WS_MODEL_RESTRICTED_REFUSAL: Final = _OpenAIWebsocketRefusal(
-    close_reason="Keys with model restrictions cannot use OpenAI websocket passthrough",
-    message=(
-        "Keys with model restrictions cannot use OpenAI websocket passthrough, because this route "
-        "relays frames to the provider without reading which model they ask for."
-    ),
-)
-
 
 def _is_openai_websocket_passthrough_enabled(general_settings: Mapping[str, object]) -> bool:
     setting: Final = general_settings.get("enable_openai_websocket_passthrough")
@@ -3440,19 +3446,9 @@ def _is_openai_websocket_passthrough_enabled(general_settings: Mapping[str, obje
     return setting is True
 
 
-class _OpenAIWebsocketModelAllowlists(Protocol):
-    async def __call__(self, valid_token: UserAPIKeyAuth, /) -> tuple[Sequence[str], ...]: ...
-
-
-async def _openai_websocket_refusal(
-    user_api_key_dict: UserAPIKeyAuth,
-    general_settings: Mapping[str, object],
-    model_allowlists: _OpenAIWebsocketModelAllowlists,
-) -> _OpenAIWebsocketRefusal | None:
+def _openai_websocket_refusal(general_settings: Mapping[str, object]) -> _OpenAIWebsocketRefusal | None:
     if not _is_openai_websocket_passthrough_enabled(general_settings):
         return _OPENAI_WS_DISABLED_REFUSAL
-    if _has_model_restrictions(await model_allowlists(user_api_key_dict)):
-        return _OPENAI_WS_MODEL_RESTRICTED_REFUSAL
     return None
 
 
@@ -3467,6 +3463,8 @@ class _WebsocketRelay(Protocol):
         forward_headers: bool,
         endpoint: str,
         accept_websocket: bool,
+        client_frame_model_gate: WebsocketFrameModelGate | None = None,
+        upstream_frame_kind: WebsocketUpstreamFrameClassifier | None = None,
         meter: WebSocketSessionMeter | None = None,
     ) -> None: ...
 
@@ -3475,18 +3473,95 @@ def _websocket_relay() -> _WebsocketRelay:
     return websocket_passthrough_request
 
 
-def _proxy_model_allowlists() -> _OpenAIWebsocketModelAllowlists:
-    from litellm.proxy.proxy_server import prisma_client, proxy_logging_obj, user_api_key_cache
+def _proxy_error_type(denial: ProxyException) -> str:
+    return denial.type.value if isinstance(denial.type, ProxyErrorTypes) else denial.type
 
-    async def resolve(valid_token: UserAPIKeyAuth, /) -> tuple[Sequence[str], ...]:
-        return await enforced_model_allowlists(
-            valid_token=valid_token,
-            prisma_client=prisma_client,
-            user_api_key_cache=user_api_key_cache,
-            proxy_logging_obj=proxy_logging_obj,
+
+FrameModelAuthorizer: TypeAlias = Callable[[WebSocket, str], Awaitable[UserAPIKeyAuth]]
+
+
+def _frame_model_authorizer() -> FrameModelAuthorizer:
+    return user_api_key_auth_accepted_websocket_for_model
+
+
+def _proxy_model_list() -> Sequence[object] | None:
+    from litellm.proxy import proxy_server
+
+    return as_object_list(attribute_or_none(proxy_server, "llm_model_list"))
+
+
+def _gateway_remaps_model(model: str, frame_auth: UserAPIKeyAuth, llm_router: Router | None) -> bool:
+    alias_maps: Final = (
+        key_model_aliases_for_auth_check(frame_auth) or {},
+        team_model_aliases_for_auth_check(frame_auth) or {},
+        alias_map(litellm.model_alias_map),
+    )
+    targets: Final = (
+        *(aliases.get(model) for aliases in alias_maps),
+        llm_router.registry().resolve(model, kind="alias") if llm_router is not None else None,
+    )
+    return any(target not in (None, model) for target in targets)
+
+
+def _aliased_model_verdict(
+    allowed: WebsocketFrameModelAllowed, probe: WebsocketFrameModelVerdict
+) -> WebsocketFrameModelVerdict:
+    match probe:
+        case WebsocketFrameModelRefused(error_type=error_type) if error_type.endswith("_model_access_denied"):
+            return WebsocketFrameModelRefused(message=_OPENAI_WS_ALIASED_MODEL_REFUSAL, error_type=error_type)
+        case WebsocketFrameModelRefused():
+            return probe
+        case WebsocketFrameModelAllowed():
+            return allowed
+
+
+def _proxy_frame_model_gate(
+    authorize_frame_model: Annotated[FrameModelAuthorizer, Depends(_frame_model_authorizer)],
+) -> WebsocketFrameModelGate:
+    from litellm.proxy import proxy_server
+    from litellm.proxy.spend_tracking.budget_reservation import release_or_invalidate_budget_reservation
+
+    async def authorize(websocket: WebSocket, model: str) -> WebsocketFrameModelVerdict:
+        connect_reservation: Final = attribute_or_none(websocket.state, "budget_reservation")
+        await release_or_invalidate_budget_reservation(
+            budget_reservation=connect_reservation if isinstance(connect_reservation, dict) else None
         )
+        frame_auth: Final = await authorize_frame_model(websocket, model)
+        access_groups: Final = tuple(frame_auth.matched_model_access_groups or ())
+        llm_router: Final = proxy_server.llm_router
+        try:
+            await can_key_call_resolved_model(
+                model=model, llm_model_list=_proxy_model_list(), valid_token=frame_auth, llm_router=llm_router
+            )
+            await can_agent_call_model(
+                model=model,
+                valid_token=frame_auth,
+                llm_router=llm_router,
+                prisma_client=proxy_server.prisma_client,
+                user_api_key_cache=proxy_server.user_api_key_cache,
+                proxy_logging_obj=proxy_server.proxy_logging_obj,
+            )
+        finally:
+            await release_or_invalidate_budget_reservation(budget_reservation=frame_auth.budget_reservation)
+        allowed: Final = WebsocketFrameModelAllowed(access_groups=access_groups)
+        if not _gateway_remaps_model(model, frame_auth, llm_router):
+            return allowed
+        return _aliased_model_verdict(allowed, await gate(websocket, STORED_PROMPT_PROBE_MODEL))
 
-    return resolve
+    async def gate(websocket: WebSocket, model: str, /) -> WebsocketFrameModelVerdict:
+        try:
+            return await authorize(websocket, model)
+        except ProxyException as denial:
+            return WebsocketFrameModelRefused(message=denial.message, error_type=_proxy_error_type(denial))
+        except HTTPException as denial:
+            return WebsocketFrameModelRefused(message=str(denial.detail), error_type="invalid_request_error")
+        except litellm.BudgetExceededError as exhausted:
+            return WebsocketFrameModelRefused(message=exhausted.message, error_type="budget_exceeded")
+        except Exception:  # noqa: BLE001  # fail closed: a gate that cannot answer refuses, and says so in band
+            verbose_proxy_logger.exception("OpenAI websocket passthrough: the frame model gate failed on %s", model)
+            return WebsocketFrameModelRefused(message=_OPENAI_WS_UNAVAILABLE_AUTH_REFUSAL, error_type="server_error")
+
+    return gate
 
 
 def _negotiated_websocket_subprotocol(websocket: WebSocket) -> str | None:
@@ -3498,6 +3573,14 @@ def _negotiated_websocket_subprotocol(websocket: WebSocket) -> str | None:
     return requested_subprotocols[0] if requested_subprotocols else None
 
 
+async def _opening_model_refusal(
+    websocket: WebSocket, query_string: str, frame_model_gate: WebsocketFrameModelGate
+) -> WebsocketFrameModelRefused | None:
+    opening_models: Final = dict.fromkeys(httpx.QueryParams(query_string).get_list("model"))
+    verdicts: Final = tuple([await frame_model_gate(websocket, model) for model in opening_models])
+    return next((verdict for verdict in verdicts if isinstance(verdict, WebsocketFrameModelRefused)), None)
+
+
 @router.websocket("/openai_passthrough/{endpoint:path}")
 @router.websocket("/openai/{endpoint:path}")
 async def openai_websocket_proxy_route(
@@ -3506,12 +3589,12 @@ async def openai_websocket_proxy_route(
     user_api_key_dict: Annotated[UserAPIKeyAuth, Depends(user_api_key_auth_websocket)],
     general_settings: Annotated[Mapping[str, object], Depends(_proxy_general_settings)],
     relay: Annotated[_WebsocketRelay, Depends(_websocket_relay)],
-    model_allowlists: Annotated[_OpenAIWebsocketModelAllowlists, Depends(_proxy_model_allowlists)],
+    frame_model_gate: Annotated[WebsocketFrameModelGate, Depends(_proxy_frame_model_gate)],
 ) -> None:
     """WebSocket passthrough for OpenAI prefixes (realtime / responses.connect)."""
     negotiated_subprotocol: Final = _negotiated_websocket_subprotocol(websocket)
 
-    refusal: Final = await _openai_websocket_refusal(user_api_key_dict, general_settings, model_allowlists)
+    refusal: Final = _openai_websocket_refusal(general_settings)
     if refusal is not None:
         await websocket.accept(subprotocol=negotiated_subprotocol)
         error_frame: Final[_OpenAIWebsocketErrorFrame] = {
@@ -3557,14 +3640,21 @@ async def openai_websocket_proxy_route(
 
     await websocket.accept(subprotocol=negotiated_subprotocol)
 
+    opening_refusal: Final = await _opening_model_refusal(websocket, query_string, frame_model_gate)
+    if opening_refusal is not None:
+        await refuse_websocket(websocket, opening_refusal)
+        return
+
     await relay(
         websocket=websocket,
         target=wss_target,
         custom_headers=custom_headers,
         user_api_key_dict=user_api_key_dict,
         forward_headers=False,
-        endpoint=websocket.url.path,
+        endpoint=normalize_route_for_root_path(websocket.url.path) or websocket.url.path,
         accept_websocket=False,
+        client_frame_model_gate=frame_model_gate,
+        upstream_frame_kind=openai_websocket_frame_kind,
     )
 
 
@@ -3882,7 +3972,8 @@ async def _tinyfish_json_object_field_names(request: Request) -> frozenset[str]
         parsed: Final = _DECODED_JSON.validate_python(json.loads(raw_body))
     except (json.JSONDecodeError, UnicodeDecodeError):
         return None
-    return frozenset(parsed) if isinstance(parsed, dict) else None
+    fields: Final = as_str_mapping(parsed)
+    return None if fields is None else frozenset(fields)
 
 
 def _tinyfish_route_timeout() -> float | None:
diff --git a/litellm/proxy/pass_through_endpoints/llm_provider_handlers/openai_websocket_passthrough_logging_handler.py b/litellm/proxy/pass_through_endpoints/llm_provider_handlers/openai_websocket_passthrough_logging_handler.py
new file mode 100644
index 00000000000..f3bad54ffb2
--- /dev/null
+++ b/litellm/proxy/pass_through_endpoints/llm_provider_handlers/openai_websocket_passthrough_logging_handler.py
@@ -0,0 +1,262 @@
+from collections.abc import Mapping, Sequence
+from dataclasses import dataclass
+from datetime import datetime
+from types import MappingProxyType
+from typing import Final, Literal, TypeAlias, cast  # noqa: TID251  # cost helpers type raw frames as a TypedDict list
+
+from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError
+
+import litellm
+from litellm._logging import verbose_proxy_logger
+from litellm.cost_calculator import RealtimeAPITokenUsageProcessor, handle_realtime_stream_cost_calculation
+from litellm.litellm_core_utils.core_helpers import as_str_mapping
+from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
+from litellm.proxy._types import PassThroughEndpointLoggingTypedDict
+from litellm.responses.utils import ResponseAPILoggingUtils
+from litellm.types.llms.openai import OpenAIRealtimeStreamList, ResponsesAPIResponse
+from litellm.types.passthrough_endpoints.pass_through_endpoints import WebsocketUpstreamFrameKind
+from litellm.types.utils import LlmProviders, ModelResponse, Usage
+
+WebsocketMessages: TypeAlias = Sequence[Mapping[str, object]]
+
+OPENAI_WEBSOCKET_PROVIDER: Final = LlmProviders.OPENAI.value
+
+_SESSION_CREATED: Final = "session.created"
+_SESSION_UPDATED: Final = "session.updated"
+_RESPONSE_CREATED: Final = "response.created"
+_ERROR: Final = "error"
+_REALTIME_RESPONSE_DONE: Final = "response.done"
+_TRANSCRIPTION_COMPLETED: Final = "conversation.item.input_audio_transcription.completed"
+_RESPONSES_TURN_ENDS: Final = frozenset({"response.completed", "response.incomplete", "response.failed"})
+_TURN_ENDS: Final = _RESPONSES_TURN_ENDS | {_REALTIME_RESPONSE_DONE}
+_MODEL_NAMING_EVENTS: Final = _TURN_ENDS | {_SESSION_CREATED, _SESSION_UPDATED, _RESPONSE_CREATED}
+_REALTIME_BILLED_EVENTS: Final = frozenset({_REALTIME_RESPONSE_DONE, _TRANSCRIPTION_COMPLETED})
+_RESPONSE_COST_HEADER: Final = "llm_provider-x-litellm-response-cost"
+_FRAME_KINDS: Final[Mapping[str, WebsocketUpstreamFrameKind]] = MappingProxyType(
+    {
+        _SESSION_CREATED: "opens_session",
+        _SESSION_UPDATED: "updates_session",
+        _RESPONSE_CREATED: "starts_turn",
+        _TRANSCRIPTION_COMPLETED: "bills_usage",
+        _ERROR: "refuses_turn",
+    }
+)
+
+
+class _NamedModel(BaseModel):
+    model_config = ConfigDict(extra="ignore", frozen=True)
+
+    model: str | None = None
+
+
+class _AudioInput(BaseModel):
+    model_config = ConfigDict(extra="ignore", frozen=True)
+
+    transcription: _NamedModel | None = None
+
+
+class _SessionAudio(BaseModel):
+    model_config = ConfigDict(extra="ignore", frozen=True)
+
+    input: _AudioInput | None = None
+
+
+class _NamedSession(BaseModel):
+    model_config = ConfigDict(extra="ignore", frozen=True)
+
+    model: str | None = None
+    audio: _SessionAudio | None = None
+
+
+class _ModelNamingEvent(BaseModel):
+    model_config = ConfigDict(extra="ignore", frozen=True)
+
+    session: _NamedSession | None = None
+    response: _NamedModel | None = None
+
+
+class _ResponsesTurnEndEvent(BaseModel):
+    model_config = ConfigDict(extra="ignore", frozen=True)
+
+    type: Literal["response.completed", "response.incomplete", "response.failed"]
+    response: ResponsesAPIResponse
+
+
+_MODEL_NAMING_EVENT: Final = TypeAdapter(_ModelNamingEvent)
+_RESPONSES_TURN_END_EVENT: Final = TypeAdapter(_ResponsesTurnEndEvent)
+
+
+@dataclass(frozen=True, slots=True)
+class _Billing:
+    usage: Usage
+    cost: float
+
+
+@dataclass(frozen=True, slots=True)
+class _CompletedTurn:
+    model: str
+    response: ResponsesAPIResponse
+    usage: Usage
+
+
+def _event_model(event: Mapping[str, object]) -> str | None:
+    if event.get("type") not in _MODEL_NAMING_EVENTS:
+        return None
+    try:
+        naming: Final = _MODEL_NAMING_EVENT.validate_python(event)
+    except ValidationError:
+        return None
+    session: Final = naming.session or _NamedSession()
+    response: Final = naming.response or _NamedModel()
+    audio_input: Final = (session.audio or _SessionAudio()).input or _AudioInput()
+    transcription: Final = audio_input.transcription or _NamedModel()
+    return session.model or response.model or transcription.model or None
+
+
+def observed_websocket_model(messages: WebsocketMessages) -> str | None:
+    return next((model for model in map(_event_model, messages) if model is not None), None)
+
+
+def openai_websocket_frame_kind(frame: Mapping[str, object]) -> WebsocketUpstreamFrameKind:
+    frame_type: Final = frame.get("type")
+    if frame_type in _TURN_ENDS:
+        return "ends_turn"
+    if not isinstance(frame_type, str):
+        return "relayed"
+    return _FRAME_KINDS.get(frame_type, "relayed")
+
+
+def _realtime_billing(messages: WebsocketMessages, model: str, logging_obj: LiteLLMLoggingObj) -> _Billing | None:
+    if not any(event.get("type") in _REALTIME_BILLED_EVENTS for event in messages):
+        return None
+    results: Final = cast(  # cast-ok: the realtime cost helpers read raw provider frames through their TypedDict view
+        OpenAIRealtimeStreamList, tuple(event for event in messages if "type" in event)
+    )
+    usage: Final = RealtimeAPITokenUsageProcessor.collect_and_combine_usage_from_realtime_stream_results(results)
+    cost: Final = handle_realtime_stream_cost_calculation(
+        results=results,
+        combined_usage_object=usage,
+        custom_llm_provider=OPENAI_WEBSOCKET_PROVIDER,
+        litellm_model_name=model,
+        litellm_logging_obj=logging_obj,
+    )
+    return _Billing(usage=usage, cost=cost)
+
+
+def _responses_turn(event: Mapping[str, object], session_model: str) -> _CompletedTurn | None:
+    if event.get("type") not in _RESPONSES_TURN_ENDS:
+        return None
+    try:
+        ended: Final = _RESPONSES_TURN_END_EVENT.validate_python(event)
+    except ValidationError:
+        verbose_proxy_logger.warning(
+            "OpenAI websocket passthrough: a %s frame carried no readable usage, so it is not billed", event.get("type")
+        )
+        return None
+    if ended.response.usage is None:
+        return None
+    return _CompletedTurn(
+        model=ended.response.model or session_model,
+        response=ended.response,
+        usage=ResponseAPILoggingUtils._transform_response_api_usage_to_chat_usage(  # pyright: ignore[reportPrivateUsage]  # the one shared Responses usage converter
+            ended.response.usage
+        ),
+    )
+
+
+def _responses_billing(messages: WebsocketMessages, model: str, requested_model: str | None) -> _Billing | None:
+    turns: Final = tuple(turn for turn in (_responses_turn(event, model) for event in messages) if turn is not None)
+    if not turns:
+        return None
+    usage: Final = RealtimeAPITokenUsageProcessor.combine_usage_objects([turn.usage for turn in turns])
+    return _Billing(
+        usage=usage,
+        cost=sum(_responses_cost(turn.response, (turn.model, requested_model)) for turn in turns),
+    )
+
+
+def _model_cost(response: ResponsesAPIResponse, model: str) -> float | None:
+    try:
+        return litellm.completion_cost(
+            completion_response=response,
+            model=model,
+            custom_llm_provider=OPENAI_WEBSOCKET_PROVIDER,
+            call_type="responses",
+        )
+    except Exception:  # noqa: BLE001  # completion_cost raises a bare Exception for an unpriced model, and the turn must still log
+        return None
+
+
+def _responses_cost(response: ResponsesAPIResponse, price_as: Sequence[str | None]) -> float:
+    costs: Final = (_model_cost(response, model) for model in dict.fromkeys(price_as) if model is not None)
+    cost: Final = next((cost for cost in costs if cost), None)
+    if cost is None:
+        verbose_proxy_logger.warning(
+            "OpenAI websocket passthrough: could not price a Responses turn on %s, logging it at zero", price_as
+        )
+        return 0.0
+    return cost
+
+
+def _requested_model(kwargs: Mapping[str, object]) -> str | None:
+    litellm_params: Final = as_str_mapping(kwargs.get("litellm_params"))
+    metadata: Final = None if litellm_params is None else as_str_mapping(litellm_params.get("metadata"))
+    model_group: Final = None if metadata is None else metadata.get("model_group")
+    return model_group if isinstance(model_group, str) else None
+
+
+def _priced_result(model: str, billing: _Billing, start_time: datetime, call_id: str) -> ModelResponse:
+    result: Final = ModelResponse(
+        id=call_id,
+        object="chat.completion",
+        created=int(start_time.timestamp()),
+        model=model,
+        usage=billing.usage,
+    )
+    hidden: Final = {"additional_headers": MappingProxyType({_RESPONSE_COST_HEADER: billing.cost})}
+    result._hidden_params = hidden  # pyright: ignore[reportPrivateUsage]  # the one settled-cost channel
+    return result
+
+
+class OpenAIWebsocketPassthroughLoggingHandler:
+    def openai_websocket_passthrough_handler(
+        self,
+        websocket_messages: WebsocketMessages,
+        logging_obj: LiteLLMLoggingObj,
+        url_route: str,
+        start_time: datetime,
+        kwargs: Mapping[str, object],
+    ) -> PassThroughEndpointLoggingTypedDict:
+        model: Final = observed_websocket_model(websocket_messages)
+        if model is None:
+            verbose_proxy_logger.debug("OpenAI websocket passthrough (%s): no model named, skipping cost", url_route)
+            unpriced: Final[PassThroughEndpointLoggingTypedDict] = {"result": None, "kwargs": {**kwargs}}
+            return unpriced
+
+        logging_obj.model = model  # rebind-ok: the spend logger reads model and cost off the shared logging object
+        logging_obj.model_call_details.update(
+            MappingProxyType({"model": model, "custom_llm_provider": OPENAI_WEBSOCKET_PROVIDER})
+        )
+
+        billing: Final = _realtime_billing(websocket_messages, model, logging_obj) or _responses_billing(
+            websocket_messages, model, _requested_model(kwargs)
+        )
+        if billing is None:
+            verbose_proxy_logger.debug("OpenAI websocket passthrough (%s): no usage reported, skipping cost", url_route)
+            unbilled: Final[PassThroughEndpointLoggingTypedDict] = {
+                "result": None,
+                "kwargs": {**kwargs, "model": model, "custom_llm_provider": OPENAI_WEBSOCKET_PROVIDER},
+            }
+            return unbilled
+
+        logging_obj.model_call_details.update(MappingProxyType({"response_cost": billing.cost}))
+        priced: Final[PassThroughEndpointLoggingTypedDict] = {
+            "result": _priced_result(model, billing, start_time, logging_obj.litellm_call_id),
+            "kwargs": {
+                **kwargs,
+                "model": model,
+                "custom_llm_provider": OPENAI_WEBSOCKET_PROVIDER,
+                "response_cost": billing.cost,
+            },
+        }
+        return priced
diff --git a/litellm/proxy/pass_through_endpoints/pass_through_endpoints.py b/litellm/proxy/pass_through_endpoints/pass_through_endpoints.py
index 970cd466337..7f5983d5799 100644
--- a/litellm/proxy/pass_through_endpoints/pass_through_endpoints.py
+++ b/litellm/proxy/pass_through_endpoints/pass_through_endpoints.py
@@ -6,15 +6,17 @@ import posixpath
 import re
 import traceback
 from base64 import b64encode
-from collections.abc import AsyncGenerator, AsyncIterator, Callable, Iterable, Mapping, Sequence
+from collections.abc import AsyncGenerator, AsyncIterator, Callable, Iterable, Mapping, MutableMapping, Sequence
 from dataclasses import dataclass
 from datetime import datetime
-from itertools import chain, count, groupby
+from functools import reduce
+from itertools import chain, count, groupby, takewhile
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, Final, TypedDict, cast
-from urllib.parse import urlencode, urlparse
+from typing import TYPE_CHECKING, Any, Final, Protocol, TypeAlias, TypedDict, TypeVar, cast
+from urllib.parse import parse_qs, urlencode, urlparse
 
 import httpx
+import orjson
 from fastapi import (
     APIRouter,
     Depends,
@@ -24,6 +26,7 @@ from fastapi import (
     Response,
     UploadFile,
     WebSocket,
+    WebSocketDisconnect,
     status,
 )
 from fastapi.responses import StreamingResponse
@@ -34,7 +37,7 @@ from starlette.routing import BaseRoute, Match, Route
 from starlette.types import Scope
 from starlette.websockets import WebSocketState
 from typing_extensions import ReadOnly
-from websockets.asyncio.client import connect
+from websockets.asyncio.client import ClientConnection, connect
 from websockets.exceptions import (
     ConnectionClosedError,
     ConnectionClosedOK,
@@ -60,6 +63,8 @@ from litellm.integrations.custom_guardrail import (
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.integrations.otel.model.semconv import PASSTHROUGH_OPERATION_KEY, GenAIOperation
 from litellm.litellm_core_utils.core_helpers import (
+    as_object_list,
+    as_str_mapping,
     bind_budget_reservation_to_callbacks,
     get_metadata_variable_name_from_kwargs,
     get_or_create_metadata_bucket,
@@ -69,6 +74,7 @@ from litellm.litellm_core_utils.internal_call_metadata import MODEL_ACCESS_GROUP
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
 from litellm.litellm_core_utils.litellm_logging import get_masked_values
 from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER
+from litellm.litellm_core_utils.realtime_errors import realtime_error_event
 from litellm.litellm_core_utils.redact_messages import should_redact_message_logging
 from litellm.litellm_core_utils.safe_json_dumps import safe_dumps
 from litellm.llms.anthropic.common_utils import (
@@ -154,6 +160,7 @@ from litellm.types.passthrough_endpoints.pass_through_endpoints import (
     PassthroughStandardLoggingPayload,
     WebSocketSessionMeter,
     WebSocketSessionUsage,
+    WebsocketUpstreamFrameKind,
 )
 from litellm.types.utils import TRUSTED_CALLBACK_VARS_FIELD, CallTypes, Usage
 
@@ -2574,11 +2581,16 @@ def _resolved_vertex_live_setup(
     return {**setup_data, "model": setup_model_rewriter(setup_model)}
 
 
+def _decoded_frame(frame: str | bytes) -> object:
+    try:
+        return _DECODED_JSON.validate_python(orjson.loads(frame))
+    except orjson.JSONDecodeError:
+        return _DECODED_JSON.validate_python(json.loads(frame if isinstance(frame, str) else frame.decode("utf-8")))
+
+
 def _json_object_frame(frame: str | bytes) -> dict[str, object] | None:
     try:
-        decoded: Final[object] = _DECODED_JSON.validate_python(
-            json.loads(frame if isinstance(frame, str) else frame.decode("utf-8"))
-        )
+        decoded: Final = _decoded_frame(frame)
     except (json.JSONDecodeError, UnicodeDecodeError):
         return None
     return decoded if isinstance(decoded, dict) else None
@@ -2637,6 +2649,359 @@ def _with_trace_context(headers: Mapping[str, str], parent_span: object) -> dict
     return inject_trace_context(headers, parent_span=parent_span)
 
 
+@dataclass(frozen=True, slots=True)
+class WebsocketFrameModelAllowed:
+    access_groups: tuple[str, ...]
+
+
+@dataclass(frozen=True, slots=True)
+class WebsocketFrameModelRefused:
+    message: str
+    error_type: str
+
+
+WebsocketFrameModelVerdict: TypeAlias = WebsocketFrameModelAllowed | WebsocketFrameModelRefused
+
+
+class WebsocketFrameModelGate(Protocol):
+    async def __call__(self, websocket: WebSocket, model: str, /) -> WebsocketFrameModelVerdict: ...
+
+
+WebsocketUpstreamFrameClassifier: TypeAlias = Callable[[Mapping[str, object]], WebsocketUpstreamFrameKind]
+_SESSION_FRAMES_EVERY_ROW_CARRIES: Final[frozenset[WebsocketUpstreamFrameKind]] = frozenset(
+    {"opens_session", "updates_session"}
+)
+_FrameT: Final = TypeVar("_FrameT", bound=Mapping[str, object])
+
+
+@dataclass(frozen=True, slots=True)
+class _TurnAuthorization:
+    requested_model: str | None
+    access_groups: tuple[str, ...]
+
+
+@dataclass(frozen=True, slots=True)
+class _ForwardClientFrame:
+    starts_turn: bool
+    turn: _TurnAuthorization | None
+    lane: str | None
+
+
+@dataclass(frozen=True, slots=True)
+class _RefuseClientFrame:
+    refusal: WebsocketFrameModelRefused
+
+
+@dataclass(frozen=True, slots=True)
+class _ClientFrameRequests:
+    starts_turn: bool
+    lane: str | None
+    turn_model: str | None
+    models: tuple[str, ...]
+    unverifiable_model_refusal: str | None
+
+
+_NO_CLIENT_FRAME_REQUESTS: Final = _ClientFrameRequests(
+    starts_turn=False, lane=None, turn_model=None, models=(), unverifiable_model_refusal=None
+)
+_FORWARD_WITHOUT_TURN: Final = _ForwardClientFrame(starts_turn=False, turn=None, lane=None)
+_UNREADABLE_CLIENT_FRAME: Final = _RefuseClientFrame(
+    refusal=WebsocketFrameModelRefused(
+        message="The gateway cannot parse this frame, so it cannot check which model it asks for.",
+        error_type="invalid_request_error",
+    )
+)
+_TURN_STARTING_FRAME: Final = "response.create"
+_FRAME_TEXT_WORTH_PARSING: Final = (f'"{_TURN_STARTING_FRAME}"', '"model"', '"prompt"', '"tools"', "\\")
+_TURN_MODEL_PLACEMENTS: Final = (("model",), ("response", "model"), ("session", "model"))
+_TRANSCRIPTION_MODEL_PLACEMENTS: Final = (
+    ("session", "input_audio_transcription", "model"),
+    ("session", "audio", "input", "transcription", "model"),
+)
+_STORED_PROMPT_PLACEMENTS: Final = (("prompt",), ("response", "prompt"), ("session", "prompt"))
+_TOOL_LIST_PLACEMENTS: Final = (("tools",), ("response", "tools"), ("session", "tools"))
+_TOOL_THAT_RUNS_A_MODEL: Final = "image_generation"
+STORED_PROMPT_PROBE_MODEL: Final = "litellm-unverifiable-stored-prompt-model"
+_STORED_PROMPT_REFUSAL: Final = (
+    "This key is limited to specific models, so it cannot run a stored prompt. "
+    "The gateway cannot check which model a stored prompt runs."
+)
+_UNNAMED_TOOL_MODEL_REFUSAL: Final = (
+    "This key is limited to specific models, so an image_generation tool has to name its model. "
+    "The gateway cannot check which model an unnamed one runs."
+)
+_FIRST_SENTENCE: Final = re.compile(r".*?[.!?](?=\s|$)")
+_LANE_NAME: Final = re.compile(r"[A-Za-z0-9_.-]{1,256}")
+_UNROUTABLE_LANE_REFUSAL: Final = _RefuseClientFrame(
+    refusal=WebsocketFrameModelRefused(
+        message=(
+            "This stream_id is not a lane name the provider accepts. "
+            "The provider's error for it names no lane, so the gateway cannot tell which turn it refuses."
+        ),
+        error_type="invalid_request_error",
+    )
+)
+
+
+def _may_name_a_model(text_data: str) -> bool:
+    return any(marker in text_data for marker in _FRAME_TEXT_WORTH_PARSING)
+
+
+def _frame_lane(frame: Mapping[str, object]) -> str | None:
+    stream_id: Final = frame.get("stream_id")
+    return stream_id if isinstance(stream_id, str) else None
+
+
+def _names_an_unroutable_lane(frame: Mapping[str, object]) -> bool:
+    stream_id: Final = frame.get("stream_id")
+    return stream_id is not None and not (isinstance(stream_id, str) and _LANE_NAME.fullmatch(stream_id) is not None)
+
+
+def _frames_of_lane(lane: str | None) -> Callable[[Mapping[str, object]], bool]:
+    def in_lane(frame: Mapping[str, object]) -> bool:
+        return _frame_lane(frame) == lane
+
+    return in_lane
+
+
+def _every_frame(_frame: Mapping[str, object]) -> bool:
+    return True
+
+
+def _without_earlier_session_updates(
+    upstream_frame_kind: WebsocketUpstreamFrameClassifier,
+    frames: Sequence[_FrameT],
+    latest_update: _FrameT,
+) -> tuple[_FrameT, ...]:
+    return tuple(
+        frame
+        for index, frame in enumerate(frames)
+        if frame is latest_update
+        or upstream_frame_kind(frame) != "updates_session"
+        or _unbilled_usage_ran_under(map(upstream_frame_kind, frames[index + 1 :]))
+    )
+
+
+def _unbilled_usage_ran_under(later_kinds: Iterable[WebsocketUpstreamFrameKind]) -> bool:
+    return "bills_usage" in takewhile(lambda kind: kind != "updates_session", later_kinds)
+
+
+def _nested_frame(frame: Mapping[str, object] | None, key: str) -> Mapping[str, object] | None:
+    return None if frame is None else as_str_mapping(frame.get(key))
+
+
+def _placed_value(frame: Mapping[str, object], placement: Sequence[str]) -> object:
+    *parents, leaf = placement
+    container: Final = reduce(_nested_frame, parents, frame)
+    return None if container is None else container.get(leaf)
+
+
+def _placed_models(frame: Mapping[str, object], placements: Iterable[Sequence[str]]) -> tuple[str, ...]:
+    placed: Final = (_placed_value(frame, placement) for placement in placements)
+    return tuple(value for value in placed if isinstance(value, str))
+
+
+def _placed_tools(frame: Mapping[str, object]) -> tuple[Mapping[str, object], ...]:
+    tool_lists: Final = (_placed_value(frame, placement) for placement in _TOOL_LIST_PLACEMENTS)
+    tools: Final = chain.from_iterable(as_object_list(tool_list) or () for tool_list in tool_lists)
+    return tuple(tool for tool in map(as_str_mapping, tools) if tool is not None)
+
+
+def _unverifiable_model_refusal(frame: Mapping[str, object], tools: Sequence[Mapping[str, object]]) -> str | None:
+    prompts: Final = (_placed_value(frame, placement) for placement in _STORED_PROMPT_PLACEMENTS)
+    if any(isinstance(prompt, Mapping) for prompt in prompts):
+        return _STORED_PROMPT_REFUSAL
+    if any(tool.get("type") == _TOOL_THAT_RUNS_A_MODEL and not isinstance(tool.get("model"), str) for tool in tools):
+        return _UNNAMED_TOOL_MODEL_REFUSAL
+    return None
+
+
+def _client_frame_requests(frame_data: str | bytes) -> _ClientFrameRequests | _RefuseClientFrame:
+    if isinstance(frame_data, str) and not _may_name_a_model(frame_data):
+        return _NO_CLIENT_FRAME_REQUESTS
+    try:
+        frame: Final = _json_object_frame(frame_data)
+    except (RecursionError, ValueError):
+        return _UNREADABLE_CLIENT_FRAME
+    if frame is None:
+        return _NO_CLIENT_FRAME_REQUESTS
+    if _names_an_unroutable_lane(frame):
+        return _UNROUTABLE_LANE_REFUSAL
+    turn_models: Final = _placed_models(frame, _TURN_MODEL_PLACEMENTS)
+    tools: Final = _placed_tools(frame)
+    tool_models: Final = (model for model in (tool.get("model") for tool in tools) if isinstance(model, str))
+    return _ClientFrameRequests(
+        starts_turn=frame.get("type") == _TURN_STARTING_FRAME,
+        lane=_frame_lane(frame),
+        turn_model=next(iter(turn_models), None),
+        models=tuple(
+            dict.fromkeys((*turn_models, *_placed_models(frame, _TRANSCRIPTION_MODEL_PLACEMENTS), *tool_models))
+        ),
+        unverifiable_model_refusal=_unverifiable_model_refusal(frame, tools),
+    )
+
+
+def _unverifiable_model_probe_refusal(probe: WebsocketFrameModelRefused, message: str) -> WebsocketFrameModelRefused:
+    if probe.error_type.endswith("_model_access_denied"):
+        return WebsocketFrameModelRefused(message=message, error_type=probe.error_type)
+    return probe
+
+
+async def _client_frame_verdict(
+    websocket: WebSocket, frame_data: str | bytes, gate: WebsocketFrameModelGate | None
+) -> _ForwardClientFrame | _RefuseClientFrame:
+    if gate is None:
+        return _FORWARD_WITHOUT_TURN
+    requests: Final = _client_frame_requests(frame_data)
+    if isinstance(requests, _RefuseClientFrame):
+        return requests
+    verdicts: Final = tuple([await gate(websocket, model) for model in requests.models])
+    refusal: Final = next((verdict for verdict in verdicts if isinstance(verdict, WebsocketFrameModelRefused)), None)
+    if refusal is not None:
+        return _RefuseClientFrame(refusal=refusal)
+    if requests.unverifiable_model_refusal is not None and isinstance(
+        probe := await gate(websocket, STORED_PROMPT_PROBE_MODEL), WebsocketFrameModelRefused
+    ):
+        return _RefuseClientFrame(refusal=_unverifiable_model_probe_refusal(probe, requests.unverifiable_model_refusal))
+    allowed: Final = tuple(verdict for verdict in verdicts if isinstance(verdict, WebsocketFrameModelAllowed))
+    return _ForwardClientFrame(
+        starts_turn=requests.starts_turn,
+        lane=requests.lane,
+        turn=(
+            _TurnAuthorization(requested_model=requests.turn_model, access_groups=allowed[0].access_groups)
+            if requests.turn_model is not None and allowed
+            else None
+        ),
+    )
+
+
+def _refusal_close_reason(message: str) -> str:
+    first_sentence: Final = _FIRST_SENTENCE.match(message)
+    return truncated_close_reason(message if first_sentence is None else first_sentence.group(0))
+
+
+async def refuse_websocket(websocket: WebSocket, refusal: WebsocketFrameModelRefused) -> None:
+    await websocket.send_text(realtime_error_event(refusal.message, error_type=refusal.error_type))
+    await websocket.close(code=CloseCode.POLICY_VIOLATION, reason=_refusal_close_reason(refusal.message))
+
+
+def _stamp_billed_turn(kwargs: Mapping[str, object], turn: _TurnAuthorization) -> None:
+    litellm_params: Final = as_str_mapping(kwargs.get("litellm_params"))
+    metadata: Final = None if litellm_params is None else litellm_params.get("metadata")
+    if not isinstance(metadata, MutableMapping):
+        return
+    metadata[MODEL_ACCESS_GROUP_METADATA_KEY] = list(turn.access_groups)
+    if turn.requested_model is not None:
+        metadata["model_group"] = turn.requested_model
+
+
+def _opening_model(target: str) -> str | None:
+    return next(iter(parse_qs(urlparse(target).query).get("model", ())), None)
+
+
+class _WebsocketTurnLedger:
+    def __init__(self, opening: _TurnAuthorization, started: datetime) -> None:
+        self.opening = opening
+        self.queued_turns: Mapping[str | None, tuple[_TurnAuthorization | None, ...]] = MappingProxyType({})
+        self.session_opened = False
+        self.started = started
+        self.logged_turns = 0
+        self.unstarted_turns = 0
+
+    def current(self, lane: str | None) -> _TurnAuthorization:
+        oldest: Final = next(iter(self.queued_turns.get(lane, ())), None)
+        return self.opening if oldest is None else oldest
+
+    def queue_turn(self, lane: str | None, turn: _TurnAuthorization | None) -> None:
+        self.unstarted_turns += 1
+        if not self.session_opened:
+            self.queued_turns = MappingProxyType({**self.queued_turns, lane: (*self.queued_turns.get(lane, ()), turn)})
+
+    def open_session(self) -> None:
+        self.session_opened = True
+        self.queued_turns = MappingProxyType({})
+
+    def close_turn(self, lane: str | None, end_time: datetime) -> None:
+        self.logged_turns += 1
+        self.started = end_time
+        self._forget_turn(lane, 0)
+
+    def start_turn(self) -> None:
+        self.unstarted_turns = max(0, self.unstarted_turns - 1)
+
+    def drop_refused_turn(self, lane: str | None, lane_is_running_a_turn: bool) -> None:
+        self.start_turn()
+        self._forget_turn(lane, 1 if lane_is_running_a_turn else 0)
+
+    def _forget_turn(self, lane: str | None, position: int) -> None:
+        turns: Final = self.queued_turns.get(lane, ())
+        self.queued_turns = MappingProxyType({**self.queued_turns, lane: (*turns[:position], *turns[position + 1 :])})
+
+
+def _session_end_needs_a_row(
+    upstream_frame_kind: WebsocketUpstreamFrameClassifier | None,
+    unlogged_frames: Sequence[Mapping[str, object]],
+    ledger: _WebsocketTurnLedger,
+) -> bool:
+    if upstream_frame_kind is None:
+        return True
+    kinds: Final = frozenset(map(upstream_frame_kind, unlogged_frames))
+    return "starts_turn" in kinds or (ledger.logged_turns == 0 and bool(kinds - {"opens_session"}))
+
+
+def _turn_in_flight(
+    upstream_frame_kind: WebsocketUpstreamFrameClassifier | None, unlogged_frames: Sequence[Mapping[str, object]]
+) -> bool:
+    return upstream_frame_kind is not None and any(
+        upstream_frame_kind(frame) == "starts_turn" for frame in unlogged_frames
+    )
+
+
+def _turn_owed(
+    upstream_frame_kind: WebsocketUpstreamFrameClassifier | None,
+    unlogged_frames: Sequence[Mapping[str, object]],
+    ledger: _WebsocketTurnLedger,
+) -> bool:
+    return _turn_in_flight(upstream_frame_kind, unlogged_frames) or (
+        upstream_frame_kind is not None and ledger.unstarted_turns > 0
+    )
+
+
+def _lanes_in_flight(
+    upstream_frame_kind: WebsocketUpstreamFrameClassifier, unlogged_frames: Sequence[Mapping[str, object]]
+) -> tuple[str | None, ...]:
+    started: Final = (frame for frame in unlogged_frames if upstream_frame_kind(frame) == "starts_turn")
+    return tuple(dict.fromkeys(map(_frame_lane, started)))
+
+
+async def _relay_client_frame(
+    websocket: WebSocket,
+    upstream_ws: ClientConnection,
+    checked_frame: str | bytes,
+    forwarded_frame: str | bytes,
+    gate: WebsocketFrameModelGate | None,
+    ledger: _WebsocketTurnLedger,
+) -> _ForwardClientFrame | _RefuseClientFrame:
+    verdict: Final = await _client_frame_verdict(websocket, checked_frame, gate)
+    match verdict:
+        case _RefuseClientFrame(refusal=refusal):
+            await refuse_websocket(websocket, refusal)
+        case _ForwardClientFrame(starts_turn=True, turn=turn, lane=lane):
+            ledger.queue_turn(lane, turn)
+            await upstream_ws.send(forwarded_frame)
+        case _ForwardClientFrame():
+            await upstream_ws.send(forwarded_frame)
+    return verdict
+
+
+_EXPLICIT_SUCCESS_KWARGS: Final = frozenset({"logging_obj", "passthrough_logging_payload", "custom_llm_provider"})
+WALKOUT_TURN_DRAIN_SECONDS: Final = 600.0
+
+
+def _metered_client_text(meter: WebSocketSessionMeter | None, client_text: str) -> int:
+    return 0 if meter is None else meter.measure(client_text)
+
+
 def _log_session_usage(logging_obj: LiteLLMLoggingObj, usage: WebSocketSessionUsage) -> None:
     logging_obj.model = usage.model  # rebind-ok: the spend logger reads model and cost off the shared logging object
     logging_obj.model_call_details["model"] = usage.model  # rebind-ok: same shared logging object
@@ -2654,6 +3019,9 @@ async def websocket_passthrough_request(
     cost_per_request: float | None = None,
     accept_websocket: bool = True,
     setup_model_rewriter: Callable[[str], str] | None = None,
+    client_frame_model_gate: WebsocketFrameModelGate | None = None,
+    upstream_frame_kind: WebsocketUpstreamFrameClassifier | None = None,
+    walkout_turn_drain_seconds: float = WALKOUT_TURN_DRAIN_SECONDS,
     builtin_provider_route: bool = False,
     model: str | None = None,
     meter: WebSocketSessionMeter | None = None,
@@ -2670,6 +3038,11 @@ async def websocket_passthrough_request(
         endpoint: The endpoint path (for logging purposes)
         cost_per_request: Optional field - cost per request to the target endpoint
         setup_model_rewriter: Optional rewrite of the setup frame's model before it reaches the upstream
+        client_frame_model_gate: Optional per-frame check of every model a client frame names
+        upstream_frame_kind: Optional sort of upstream frames into the one that ends a billable turn and the ones
+            that open the session, so each turn logs its own spend and keeps the session's provider-named model
+        walkout_turn_drain_seconds: How long to keep reading a turn the provider is still running after the client
+            left or was refused, so the provider's usage for it still reaches spend
         builtin_provider_route: Whether a built-in provider route serves the connection, so its URL names the provider
         model: The model the caller named before connecting, logged on a failure before the setup frame arrives
         meter: Prices the session from the client text frames delivered upstream, for an upstream that reports no usage
@@ -2709,26 +3082,31 @@ async def websocket_passthrough_request(
         proxy_config=proxy_config,
         route_description="websocket_passthrough",
     )
-    logging_obj: Final = Logging(
-        model="unknown",
-        messages=[{"role": "user", "content": "WebSocket connection"}],
-        stream=True,  # WebSockets are inherently streaming
-        call_type="pass_through_endpoint",
-        start_time=start_time,
-        litellm_call_id=litellm_call_id,
-        function_id="websocket_passthrough",
-        dynamic_success_callbacks=team_callbacks.success_callbacks,
-        dynamic_failure_callbacks=team_callbacks.failure_callbacks,
-        kwargs=team_callbacks.logging_kwargs,
-    )
 
-    # Create passthrough logging payload
-    passthrough_logging_payload: Final = PassthroughStandardLoggingPayload(
-        url=target,
-        request_body={},  # WebSocket doesn't have a traditional request body
-        request_method="WEBSOCKET",
-        cost_per_request=cost_per_request,
-    )
+    def new_call_logging(call_start: datetime, call_id: str) -> LiteLLMLoggingObj:
+        return Logging(
+            model="unknown",
+            messages=[{"role": "user", "content": "WebSocket connection"}],
+            stream=True,
+            call_type="pass_through_endpoint",
+            start_time=call_start,
+            litellm_call_id=call_id,
+            function_id="websocket_passthrough",
+            dynamic_success_callbacks=team_callbacks.success_callbacks,
+            dynamic_failure_callbacks=team_callbacks.failure_callbacks,
+            kwargs=team_callbacks.logging_kwargs,
+        )
+
+    def new_call_payload() -> PassthroughStandardLoggingPayload:
+        return PassthroughStandardLoggingPayload(
+            url=target,
+            request_body={},
+            request_method="WEBSOCKET",
+            cost_per_request=cost_per_request,
+        )
+
+    logging_obj: Final = new_call_logging(start_time, litellm_call_id)
+    passthrough_logging_payload: Final = new_call_payload()
 
     # Create a dummy request object for WebSocket connections to maintain compatibility
     # with the existing _init_kwargs_for_pass_through_endpoint function
@@ -2750,38 +3128,136 @@ async def websocket_passthrough_request(
     )
 
     # Initialize kwargs for logging using the same pattern as HTTP passthrough
-    kwargs: Final = HttpPassThroughEndpointHelpers.init_kwargs_for_pass_through_endpoint(
-        user_api_key_dict=user_api_key_dict,
-        _parsed_body={},  # WebSocket doesn't have a traditional request body
-        passthrough_logging_payload=passthrough_logging_payload,
-        litellm_call_id=litellm_call_id,
-        request=dummy_request,
-        logging_obj=logging_obj,
+    def init_call_kwargs(
+        token: UserAPIKeyAuth,
+        call_payload: PassthroughStandardLoggingPayload,
+        call_id: str,
+        call_logging: LiteLLMLoggingObj,
+    ) -> dict[str, object]:  # mutable-ok: the Vertex relay stamps the model from setup frames into these kwargs
+        return HttpPassThroughEndpointHelpers.init_kwargs_for_pass_through_endpoint(
+            user_api_key_dict=token,
+            _parsed_body={},  # WebSocket doesn't have a traditional request body
+            passthrough_logging_payload=call_payload,
+            litellm_call_id=call_id,
+            request=dummy_request,
+            logging_obj=call_logging,
+        )
+
+    kwargs: Final = init_call_kwargs(user_api_key_dict, passthrough_logging_payload, litellm_call_id, logging_obj)
+
+    def start_call_logging(call_logging: LiteLLMLoggingObj, call_kwargs: Mapping[str, object]) -> None:
+        call_logging.update_environment_variables(
+            model="unknown",
+            user="unknown",
+            optional_params={},
+            litellm_params=dict(as_str_mapping(call_kwargs.get("litellm_params")) or {}),
+            call_type="pass_through_endpoint",
+        )
+        call_logging.pre_call(
+            input=[{"role": "user", "content": "WebSocket connection"}],
+            api_key="",
+            additional_args={
+                "complete_input_dict": {},
+                "api_base": target,
+                "headers": upstream_headers,
+            },
+        )
+
+    start_call_logging(logging_obj, kwargs)
+
+    class MockWebSocketRequest:
+        def __init__(self, target_url: str):
+            self.method = "WEBSOCKET"
+            self.url = target_url
+
+    class MockWebSocketResponse:
+        def __init__(self, target_url: str):
+            self.status_code = 200
+            self.text = "WebSocket connection successful"
+            self.headers: dict[str, str] = {}
+            self.request = MockWebSocketRequest(target_url)
+
+    ledger: Final = _WebsocketTurnLedger(
+        opening=_TurnAuthorization(
+            requested_model=_opening_model(target),
+            access_groups=tuple(user_api_key_dict.matched_model_access_groups or ()),
+        ),
+        started=start_time,
     )
 
-    # Update logging environment variables
-    logging_obj.update_environment_variables(
-        model="unknown",
-        user="unknown",
-        optional_params={},
-        litellm_params=dict(kwargs.get("litellm_params", {})),
-        call_type="pass_through_endpoint",
-    )
-    logging_obj.model_call_details["litellm_call_id"] = litellm_call_id
+    def log_frames(
+        call_logging: LiteLLMLoggingObj,
+        call_payload: PassthroughStandardLoggingPayload,
+        call_kwargs: Mapping[str, object],
+        end_time: datetime,
+        lane: str | None,
+        in_row: Callable[[Mapping[str, object]], bool],
+    ) -> None:
+        all_frames: Final = list(websocket_messages)
+        frames: Final = [frame for frame in all_frames if in_row(frame)]
+        websocket_messages[:] = (
+            ()
+            if upstream_frame_kind is None
+            else (
+                frame
+                for frame in all_frames
+                if not in_row(frame) or upstream_frame_kind(frame) in _SESSION_FRAMES_EVERY_ROW_CARRIES
+            )
+        )
+        logged_payload: Final[PassthroughStandardLoggingPayload] = {
+            **call_payload,
+            "response_body": frames,
+            "end_time": end_time,
+        }
+        if client_frame_model_gate is not None:
+            _stamp_billed_turn(call_kwargs, ledger.current(lane))
+        success_kwargs: Final = {
+            key: value for key, value in call_kwargs.items() if key not in _EXPLICIT_SUCCESS_KWARGS
+        }
+        custom_llm_provider: Final = call_kwargs.get("custom_llm_provider")
+        GLOBAL_LOGGING_WORKER.ensure_initialized_and_enqueue(
+            async_coroutine=pass_through_endpoint_logging.pass_through_async_success_handler(
+                httpx_response=MockWebSocketResponse(target),
+                response_body=frames,
+                url_route=endpoint or "",
+                result="websocket_connection_successful",
+                start_time=ledger.started,
+                end_time=end_time,
+                logging_obj=call_logging,
+                cache_hit=False,
+                request_body={},
+                passthrough_logging_payload=logged_payload,
+                custom_llm_provider=custom_llm_provider if isinstance(custom_llm_provider, str) else None,
+                finalize_before_dispatch=False,
+                **success_kwargs,
+            )
+        )
+        bind_budget_reservation_to_callbacks(call_logging.litellm_params)
 
-    # Pre-call logging
-    logging_obj.pre_call(
-        input=[{"role": "user", "content": "WebSocket connection"}],
-        api_key="",
-        additional_args={
-            "complete_input_dict": {},
-            "api_base": target,
-            "headers": upstream_headers,
-        },
-    )
+    def log_turn(lane: str | None, in_row: Callable[[Mapping[str, object]], bool]) -> None:
+        end_time: Final = datetime.now()
+        if upstream_frame_kind is None:
+            log_frames(logging_obj, passthrough_logging_payload, kwargs, end_time, lane, in_row)
+        else:
+            turn_call_id: Final = str(uuid.uuid4())
+            turn_logging: Final = new_call_logging(ledger.started, turn_call_id)
+            turn_payload: Final = new_call_payload()
+            turn_kwargs: Final = init_call_kwargs(
+                user_api_key_dict
+                if ledger.logged_turns == 0
+                else user_api_key_dict.model_copy(update={"budget_reservation": None}),
+                turn_payload,
+                turn_call_id,
+                turn_logging,
+            )
+            start_call_logging(turn_logging, turn_kwargs)
+            log_frames(turn_logging, turn_payload, turn_kwargs, end_time, lane, in_row)
+        ledger.close_turn(lane, end_time)
 
     ### CALL HOOKS ### - modify incoming data / reject request before calling the model
-    websocket_hook_data: Final = guardrail_request_data_with_streaming(MappingProxyType({}), is_streaming=True)
+    websocket_hook_data: Final = guardrail_request_data_with_streaming(
+        MappingProxyType({"litellm_call_id": litellm_call_id}), is_streaming=True
+    )
     await proxy_logging_obj.pre_call_hook(
         user_api_key_dict=user_api_key_dict,
         data=websocket_hook_data,
@@ -2808,7 +3284,6 @@ async def websocket_passthrough_request(
                         message = await websocket.receive()
                         message_type = message.get("type")
                         if message_type == "websocket.disconnect":
-                            await upstream_ws.close()
                             break
 
                         text_data: str | None = message.get("text")
@@ -2871,11 +3346,29 @@ async def websocket_passthrough_request(
                                     )
                                     # Not a JSON message or doesn't contain setup data
 
-                            await upstream_ws.send(_rewrite_vertex_live_setup_model(text_data, setup_model_rewriter))
-                            if meter is not None:
-                                metered_total += meter.measure(text_data)
+                            if isinstance(
+                                await _relay_client_frame(
+                                    websocket,
+                                    upstream_ws,
+                                    text_data,
+                                    _rewrite_vertex_live_setup_model(text_data, setup_model_rewriter),
+                                    client_frame_model_gate,
+                                    ledger,
+                                ),
+                                _RefuseClientFrame,
+                            ):
+                                break
+                            metered_total += _metered_client_text(meter, text_data)
                         elif bytes_data is not None:
-                            await upstream_ws.send(bytes_data)
+                            if isinstance(
+                                await _relay_client_frame(
+                                    websocket, upstream_ws, bytes_data, bytes_data, client_frame_model_gate, ledger
+                                ),
+                                _RefuseClientFrame,
+                            ):
+                                break
+                    if not _turn_owed(upstream_frame_kind, websocket_messages, ledger):
+                        await upstream_ws.close()
                 except asyncio.CancelledError:
                     raise
                 except Exception:
@@ -2902,11 +3395,7 @@ async def websocket_passthrough_request(
             is_vertex_live: Final = bool(endpoint and "/vertex_ai/live" in endpoint)
             json_frame_ordinal: Final = count()
 
-            async def relay_upstream_frame(upstream_message: str | bytes) -> None:
-                if isinstance(upstream_message, bytes):
-                    await websocket.send_bytes(upstream_message)
-                else:
-                    await websocket.send_text(upstream_message)
+            def record_upstream_frame(upstream_message: str | bytes) -> None:
                 message_data: Final = _json_object_frame(upstream_message)
                 if message_data is None:
                     return
@@ -2914,6 +3403,43 @@ async def websocket_passthrough_request(
                     _extract_vertex_live_model_from_setup_response(message_data)
                     return
                 websocket_messages.append(message_data)
+                match None if upstream_frame_kind is None else upstream_frame_kind(message_data):
+                    case "opens_session":
+                        ledger.open_session()
+                    case "starts_turn":
+                        ledger.start_turn()
+                    case "updates_session" if upstream_frame_kind is not None:
+                        websocket_messages[:] = _without_earlier_session_updates(
+                            upstream_frame_kind, websocket_messages, message_data
+                        )
+                    case "ends_turn" if upstream_frame_kind is not None:
+                        if _frame_lane(message_data) not in _lanes_in_flight(upstream_frame_kind, websocket_messages):
+                            ledger.start_turn()
+                        log_turn(_frame_lane(message_data), _frames_of_lane(_frame_lane(message_data)))
+                    case "bills_usage" if not _turn_in_flight(upstream_frame_kind, websocket_messages):
+                        log_turn(_frame_lane(message_data), _frames_of_lane(_frame_lane(message_data)))
+                    case "refuses_turn" if upstream_frame_kind is not None:
+                        lane: Final = _frame_lane(message_data)
+                        ledger.drop_refused_turn(
+                            lane, lane in _lanes_in_flight(upstream_frame_kind, websocket_messages)
+                        )
+                    case _:
+                        pass
+
+            async def relay_upstream_frame(upstream_message: str | bytes) -> None:
+                record_upstream_frame(upstream_message)
+                if not _client_socket_is_open(websocket):
+                    if not _turn_owed(upstream_frame_kind, websocket_messages, ledger):
+                        await upstream_ws.close()
+                    return
+                try:
+                    if isinstance(upstream_message, bytes):
+                        await websocket.send_bytes(upstream_message)
+                    else:
+                        await websocket.send_text(upstream_message)
+                except WebSocketDisconnect:
+                    if not _turn_owed(upstream_frame_kind, websocket_messages, ledger):
+                        raise
 
             async def forward_upstream_to_client() -> Close | None:
                 try:
@@ -2922,6 +3448,11 @@ async def websocket_passthrough_request(
                 except (ConnectionClosedOK, ConnectionClosedError) as e:
                     verbose_proxy_logger.debug("Upstream WebSocket connection closed: %s", e)
                     return e.rcvd
+                except WebSocketDisconnect:
+                    verbose_proxy_logger.debug(
+                        "WebSocket passthrough (%s): client left while upstream was still sending", endpoint
+                    )
+                    return None
                 except asyncio.CancelledError:
                     verbose_proxy_logger.debug("asyncio.CancelledError in forward_upstream_to_client")
                     raise
@@ -2933,12 +3464,15 @@ async def websocket_passthrough_request(
                     raise
 
             # Create tasks for bidirectional message forwarding
-            tasks: Final = [
-                asyncio.create_task(forward_client_to_upstream()),
-                asyncio.create_task(forward_upstream_to_client()),
-            ]
+            client_task: Final = asyncio.create_task(forward_client_to_upstream())
+            upstream_task: Final = asyncio.create_task(forward_upstream_to_client())
+            tasks: Final = (client_task, upstream_task)
 
-            done, pending = await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
+            await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
+            if client_task.done() and _turn_owed(upstream_frame_kind, websocket_messages, ledger):
+                await asyncio.wait((upstream_task,), timeout=walkout_turn_drain_seconds)
+            done: Final = tuple(task for task in tasks if task.done())
+            pending: Final = tuple(task for task in tasks if not task.done())
 
             # Cancel remaining tasks
             for task in pending:
@@ -2961,64 +3495,17 @@ async def websocket_passthrough_request(
                     reason=truncated_close_reason(upstream_close.reason),
                 )
 
-            end_time: Final = datetime.now()
-
-            # Update passthrough logging payload with response data
-            passthrough_logging_payload["response_body"] = websocket_messages
-            passthrough_logging_payload["end_time"] = end_time
-
-            # Remove logging_obj from kwargs to avoid duplicate keyword argument
-            success_kwargs: Final = kwargs.copy()
-            success_kwargs.pop("logging_obj", None)
-
-            # # Add user authentication context for database logging
-            # if user_api_key_dict:
-            #     success_kwargs.setdefault('litellm_params', {})
-            #     success_kwargs['litellm_params'].update({
-            #         'proxy_server_request': {
-            #             'body': {
-            #                 'user': user_api_key_dict.user_id,
-            #                 'team_id': user_api_key_dict.team_id,
-            #                 'end_user_id': user_api_key_dict.end_user_id,
-            #             }
-            #         }
-            #     })
-            #     # Also add the user_api_key for direct access
-            #     success_kwargs['user_api_key'] = user_api_key_dict.api_key
-
-            # Create a dummy httpx.Response for WebSocket connections
-            class MockWebSocketResponse:
-                def __init__(self, target_url: str):
-                    self.status_code = 200
-                    self.text = "WebSocket connection successful"
-                    self.headers: dict[str, str] = {}
-                    self.request = MockWebSocketRequest(target_url)
-
-            class MockWebSocketRequest:
-                def __init__(self, target_url: str):
-                    self.method = "WEBSOCKET"
-                    self.url = target_url
-
-            mock_response: Final = MockWebSocketResponse(target)
             if meter is not None:
                 _log_session_usage(logging_obj, meter.price(metered_total))
 
-            # Use the same success handler as HTTP passthrough endpoints
-            GLOBAL_LOGGING_WORKER.ensure_initialized_and_enqueue(
-                async_coroutine=pass_through_endpoint_logging.pass_through_async_success_handler(
-                    httpx_response=mock_response,
-                    response_body=websocket_messages,
-                    url_route=endpoint or "",
-                    result="websocket_connection_successful",
-                    start_time=start_time,
-                    end_time=end_time,
-                    logging_obj=logging_obj,
-                    cache_hit=False,
-                    request_body={},
-                    **success_kwargs,
+            if _session_end_needs_a_row(upstream_frame_kind, websocket_messages, ledger):
+                lanes_in_flight: Final = (
+                    () if upstream_frame_kind is None else _lanes_in_flight(upstream_frame_kind, websocket_messages)
                 )
-            )
-            bind_budget_reservation_to_callbacks(logging_obj.litellm_params)
+                *earlier_lanes, last_lane = lanes_in_flight or (None,)
+                for lane in earlier_lanes:
+                    log_turn(lane, _frames_of_lane(lane))
+                log_turn(last_lane, _every_frame)
 
             # Call the proxy logging success hook
             if proxy_logging_obj:
@@ -3076,6 +3563,7 @@ async def websocket_passthrough_request(
         if _client_socket_is_open(websocket):
             await websocket.close(code=1011, reason="WebSocket passthrough error")
     finally:
+        await proxy_logging_obj.arelease_responses_websocket_slot(user_api_key_dict)
         if _client_socket_is_open(websocket):
             await websocket.close()
 
diff --git a/litellm/proxy/pass_through_endpoints/success_handler.py b/litellm/proxy/pass_through_endpoints/success_handler.py
index 8b09b1cf7cd..8f55906498b 100644
--- a/litellm/proxy/pass_through_endpoints/success_handler.py
+++ b/litellm/proxy/pass_through_endpoints/success_handler.py
@@ -1,5 +1,6 @@
 import asyncio
 import json
+from collections.abc import Mapping, Sequence
 from contextlib import suppress
 from datetime import datetime
 from types import MappingProxyType
@@ -13,7 +14,7 @@ from litellm._logging import verbose_proxy_logger
 from litellm.constants import AZURE_SPEECH_CUSTOM_LLM_PROVIDER
 from litellm.litellm_core_utils.core_helpers import bind_budget_reservation_to_callbacks
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
-from litellm.proxy._types import PassThroughEndpointLoggingResultValues
+from litellm.proxy._types import PassThroughEndpointLoggingResultValues, PassThroughEndpointLoggingTypedDict
 from litellm.types.passthrough_endpoints.pass_through_endpoints import (
     PassthroughStandardLoggingPayload,
 )
@@ -70,6 +71,14 @@ def _safe_response_text(httpx_response: httpx.Response) -> str:
         return ""
 
 
+def _websocket_frames(
+    response_body: Mapping[str, object] | Sequence[Mapping[str, object]] | None,
+) -> tuple[Mapping[str, object], ...]:
+    return tuple(
+        message for message in (response_body if isinstance(response_body, list) else ()) if isinstance(message, dict)
+    )
+
+
 class PassThroughEndpointLogging:
     def __init__(
         self,
@@ -120,6 +129,7 @@ class PassThroughEndpointLogging:
 
         # Vertex AI Live API WebSocket
         self.TRACKED_VERTEX_AI_LIVE_ROUTES = ["/vertex_ai/live"]
+        self.TRACKED_OPENAI_WEBSOCKET_ROUTES: Final = ("/openai/", "/openai_passthrough/")
 
     @property
     def _log_dispatch(self) -> PassThroughLogDispatch:
@@ -422,21 +432,18 @@ class PassThroughEndpointLogging:
 
             standard_logging_response_object = vertex_ai_live_handler_result["result"]
             kwargs = vertex_ai_live_handler_result["kwargs"]
-        elif DeepgramListenPassthroughLoggingHandler.is_deepgram_listen_route(url_route):
-            deepgram_handler_result: Final = (
-                DeepgramListenPassthroughLoggingHandler().deepgram_listen_passthrough_handler(
-                    websocket_messages=tuple(
-                        message
-                        for message in (response_body if isinstance(response_body, list) else ())
-                        if isinstance(message, dict)
-                    ),
-                    logging_obj=logging_obj,
-                    upstream_url=str(httpx_response.request.url),
-                    kwargs=kwargs,
-                )
+        elif (
+            websocket_relay_result := self._websocket_relay_logging_result(
+                url_route=url_route,
+                websocket_frames=_websocket_frames(response_body),
+                logging_obj=logging_obj,
+                httpx_response=httpx_response,
+                start_time=start_time,
+                kwargs=kwargs,
             )
-            standard_logging_response_object = deepgram_handler_result["result"]  # rebind-ok: elif-chain
-            kwargs = deepgram_handler_result["kwargs"]  # rebind-ok: elif-chain contract
+        ) is not None:
+            standard_logging_response_object = websocket_relay_result["result"]  # rebind-ok: elif-chain
+            kwargs = websocket_relay_result["kwargs"]  # rebind-ok: elif-chain contract
         elif FalAIPassthroughLoggingHandler.is_fal_ai_route(url_route, custom_llm_provider):
             fal_ai_handler_result: Final = FalAIPassthroughLoggingHandler().fal_ai_passthrough_handler(
                 response_body=response_body if isinstance(response_body, dict) else MappingProxyType({}),
@@ -452,6 +459,36 @@ class PassThroughEndpointLogging:
         return_dict["kwargs"] = kwargs
         return return_dict
 
+    def _websocket_relay_logging_result(
+        self,
+        url_route: str,
+        websocket_frames: tuple[Mapping[str, object], ...],
+        logging_obj: LiteLLMLoggingObj,
+        httpx_response: httpx.Response,
+        start_time: datetime,
+        kwargs: Mapping[str, object],
+    ) -> PassThroughEndpointLoggingTypedDict | None:
+        if self.is_openai_websocket_route(url_route):
+            from .llm_provider_handlers.openai_websocket_passthrough_logging_handler import (
+                OpenAIWebsocketPassthroughLoggingHandler,
+            )
+
+            return OpenAIWebsocketPassthroughLoggingHandler().openai_websocket_passthrough_handler(
+                websocket_messages=websocket_frames,
+                logging_obj=logging_obj,
+                url_route=url_route,
+                start_time=start_time,
+                kwargs=kwargs,
+            )
+        if DeepgramListenPassthroughLoggingHandler.is_deepgram_listen_route(url_route):
+            return DeepgramListenPassthroughLoggingHandler().deepgram_listen_passthrough_handler(
+                websocket_messages=websocket_frames,
+                logging_obj=logging_obj,
+                upstream_url=str(httpx_response.request.url),
+                kwargs=kwargs,
+            )
+        return None
+
     async def pass_through_async_success_handler(
         self,
         httpx_response: httpx.Response,
@@ -625,6 +662,9 @@ class PassThroughEndpointLogging:
                 return True
         return False
 
+    def is_openai_websocket_route(self, url_route: str) -> bool:
+        return url_route.startswith(self.TRACKED_OPENAI_WEBSOCKET_ROUTES)
+
     def is_cursor_route(self, url_route: str, custom_llm_provider: str | None = None):
         """Check if the URL route is a Cursor Cloud Agents API route."""
         if custom_llm_provider == "cursor":
diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index c5fcbfb2564..ed65ab71220 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -26,6 +26,7 @@ from collections.abc import (
     Collection,
     Container,
     Iterable,
+    Iterator,
     Mapping,
     MutableMapping,
     Sequence,
@@ -33,7 +34,7 @@ from collections.abc import (
 from collections.abc import (
     Set as AbstractSet,
 )
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from datetime import datetime, timedelta, timezone
 from itertools import chain
 from types import MappingProxyType, TracebackType, UnionType
@@ -61,6 +62,8 @@ import websockets
 import websockets.exceptions
 from pydantic import BaseModel, ConfigDict, Json, JsonValue, TypeAdapter, ValidationError, with_config
 from pydantic.fields import FieldInfo, PydanticUndefined
+from pydantic.main import IncEx
+from pydantic_core import PydanticSerializationError, to_jsonable_python
 from typing_extensions import NotRequired, ReadOnly, TypedDict, assert_never
 
 from litellm._uuid import uuid
@@ -88,6 +91,7 @@ from litellm.constants import (
     LITELLM_UI_SESSION_DURATION,
     OPENAI_LIVE_SESSION_START_TIMEOUT_SECONDS,
     RUNTIME_UPDATABLE_ROUTER_SETTINGS,
+    VLLM_CHOICE_FIELDS,
 )
 from litellm.litellm_core_utils.access_windows import access_windows_config_error
 from litellm.litellm_core_utils.add_retry_fallback_headers import (
@@ -105,6 +109,7 @@ from litellm.litellm_core_utils.litellm_logging import (
     initialize_sentry,
 )
 from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER, LoggingWorker
+from litellm.litellm_core_utils.prompt_templates.chat_template_tools import chat_template_tool_section
 from litellm.litellm_core_utils.routing_common_utils import resolve_model_group_alias
 from litellm.litellm_core_utils.routing_groups import parse_routing_groups
 from litellm.litellm_core_utils.safe_json_dumps import safe_dumps
@@ -113,6 +118,7 @@ from litellm.litellm_core_utils.token_counter import (
     UnsupportedContentTypeError,
     deployment_openai_model,
     offload_token_count,
+    sends_function_tools,
 )
 from litellm.llms.bedrock.count_tokens.kimi_k3 import (
     HUGGING_FACE_SOURCE,
@@ -197,9 +203,11 @@ from litellm.router_strategy.auto_router.auto_router_tuning_baseline import (
     snapshot_tuning_baselines,
     tuning_limit_violation,
 )
+from litellm.rust_bridge.catalog import Target
 from litellm.types.caching import RedisPipelineIncrementOperation
 from litellm.types.utils import (
     PRICING_OVERRIDES_KEY,
+    CallTypes,
     CountContextManagement,
     LlmProviders,
     ModelResponse,
@@ -387,6 +395,12 @@ from litellm.litellm_core_utils.sensitive_data_masker import (
     mask_sensitive_keys,
 )
 from litellm.litellm_core_utils.stream_usage_chunks import is_injected_stream_usage_artifact
+from litellm.llms.anthropic.messages.context_management.inference_view import (
+    InferenceRequestView,
+    InferenceRequestViewError,
+    count_context_edits,
+    inference_request_view,
+)
 from litellm.llms.anthropic.messages.convertible_blocks import (
     deployment_drops_params,
     drop_non_string_tool_result_texts,
@@ -397,6 +411,7 @@ from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler
 from litellm.llms.openai.live import parse_live_session_start
 from litellm.llms.openai_like.model_info import MODEL_INFO_REFRESH_SECONDS
 from litellm.llms.vertex_ai.vertex_llm_base import VertexBase
+from litellm.messages.dispatch import messages_target
 from litellm.proxy._lazy_features import attach_lazy_features, reserve_lazy_slot
 from litellm.proxy._types import *
 from litellm.proxy.agent_endpoints.auth.agent_access_groups import CeilingResolver, resolve_agent_access_group_ceiling
@@ -473,12 +488,18 @@ from litellm.proxy.common_request_processing import (  # noqa: F401, RUF100  # l
     is_azure_model_router_request,
     log_llm_api_exception,
     open_sse_before_first_byte,
+    proxy_exception_from_http_exception,
     proxy_exception_from_route_error,
     resolve_litellm_call_id,
     should_return_raw_model_name,
     sse_error_payload,
     ttft_keepalive_interval,
 )
+from litellm.proxy.common_utils.anthropic_error_payload import (
+    anthropic_error_json_response,
+    anthropic_internal_server_error_response,
+    uses_anthropic_error_envelope,
+)
 from litellm.proxy.common_utils.auth_cache_invalidation_pubsub import (
     AuthCacheInvalidationSubscriber,
 )
@@ -575,6 +596,7 @@ from litellm.proxy.common_utils.token_count_log import (
 )
 from litellm.proxy.common_utils.user_api_key_cache import (
     UserApiKeyCache,
+    budget_windows_absent_cache_key,
     end_user_cache_key,
     get_management_object_ttl,
     model_access_group_cache_key,
@@ -997,6 +1019,7 @@ from litellm.proxy.video_endpoints.endpoints import router as video_router
 from litellm.repositories.base_repository import SupportsModelDump
 from litellm.repositories.credentials_repository import CredentialsRepository
 from litellm.repositories.prisma_protocols import TableActions
+from litellm.responses.main import provider_stores_the_conversation
 from litellm.responses.streaming_iterator import drain_logging_tasks
 from litellm.router import (
     AssistantsTypedDict,
@@ -2258,6 +2281,8 @@ async def openai_exception_handler(request: Request, exc: ProxyException):
     # NOTE: DO NOT MODIFY THIS, its crucial to map to Openai exceptions
     log_model_access_denial(exc)
     headers: Final = exc.headers
+    if uses_anthropic_error_envelope(request):
+        return anthropic_error_json_response(exc, request)
     error_dict: Final = with_call_id(
         JSON_OBJECT.validate_python(exc.to_dict()),
         error_body_call_id(general_settings_view(), headers.get(LITELLM_CALL_ID_HEADER)),
@@ -2293,6 +2318,10 @@ async def otlp_http_exception_handler(connection: Request | WebSocket, exc: Star
     if response is not None:
         _close_dangling_otel_server_span(connection, exc.status_code, exc=exc)
         return response
+    if uses_anthropic_error_envelope(connection):
+        return anthropic_error_json_response(
+            proxy_exception_from_http_exception(exc, dict(exc.headers or {})), connection
+        )
     return await http_exception_handler(connection, exc)
 
 
@@ -2500,6 +2529,8 @@ async def _unhandled_exception_response(request: Request, exc: Exception) -> Res
     otlp_response: Final = tracing_endpoints.otlp_error_response(request, 500)
     if otlp_response is not None:
         return otlp_response
+    if uses_anthropic_error_envelope(request):
+        return anthropic_internal_server_error_response(request)
     return JSONResponse(
         status_code=500,
         content={
@@ -3622,6 +3653,52 @@ def _cached_budget_limits(cached: object) -> object:
     return _UNTYPED_VALUE.validate_python(json.loads(stored)) if isinstance(stored, str) else stored
 
 
+def _has_budget_windows(budget_limits: object) -> bool:
+    return isinstance(budget_limits, list) and budget_limits != []
+
+
+def _budget_windows_absent_marker(absent_key: str) -> object:
+    return _UNTYPED_VALUE.validate_python(user_api_key_cache.budget_windows_absent_cache.get_cache(key=absent_key))
+
+
+def _finish_pending_read(absent_key: str, pending_read: str, remember_absent: bool) -> None:
+    if _budget_windows_absent_marker(absent_key) != pending_read:
+        return
+    if remember_absent:
+        user_api_key_cache.budget_windows_absent_cache.set_cache(key=absent_key, value=True)
+        return
+    user_api_key_cache.budget_windows_absent_cache.delete_cache(absent_key)
+
+
+async def _stored_budget_limits(entity_type: Litellm_EntityType, entity_id: str) -> object:
+    """Read only: caching the row here could race a delete and put a just-deleted key back into the auth cache."""
+    if prisma_client is None:
+        return None
+    absent_key: Final = budget_windows_absent_cache_key(entity_type.value, entity_id)
+    if _budget_windows_absent_marker(absent_key) is True:
+        return None
+    pending_read: Final = f"reading:{secrets.token_hex(8)}"
+    user_api_key_cache.budget_windows_absent_cache.set_cache(key=absent_key, value=pending_read)
+    try:
+        row: Final[SupportsModelDump | None] = (
+            await VerificationTokenRepository(prisma_client).table.find_unique(where={"token": entity_id})
+            if entity_type == Litellm_EntityType.KEY
+            else await TeamRepository(prisma_client).table.find_unique(where={"team_id": entity_id})
+        )
+    except Exception as e:  # noqa: BLE001  # spend tracking must never fail the cost callback
+        verbose_proxy_logger.warning(
+            "Unable to read budget windows for %s=%s; this request's window spend is not counted: %s",
+            entity_type.value,
+            entity_id,
+            e,
+        )
+        _finish_pending_read(absent_key, pending_read, remember_absent=False)
+        return None
+    budget_limits: Final[object] = None if row is None else _cached_budget_limits(row)
+    _finish_pending_read(absent_key, pending_read, remember_absent=not _has_budget_windows(budget_limits))
+    return budget_limits
+
+
 async def _increment_spend_counters_batched(
     token: str | None,
     team_id: str | None,
@@ -3652,7 +3729,68 @@ async def _increment_spend_counters_batched(
 
     cost: Final[float] = response_cost
 
-    async def _key_scope(key_token: str) -> tuple[PendingSpendIncrement | BaseException, ...]:
+    async def _window_increment(
+        entity_type: Litellm_EntityType, entity_id: str, window: object
+    ) -> PendingSpendIncrement | None:
+        duration: Final = (
+            window["budget_duration"] if isinstance(window, dict) else getattr(window, "budget_duration", None)
+        )
+        window_reset_at: Final = (
+            window.get("reset_at") if isinstance(window, dict) else getattr(window, "reset_at", None)
+        )
+        window_counter: Final = f"spend:{entity_type.value}:{entity_id}:window:{duration}"
+        window_start: Final = get_budget_window_start(window)
+        pending_window: Final = (
+            await _prepare_window_spend_counter_increment(
+                counter_key=window_counter,
+                entity_type=entity_type.value.capitalize(),
+                entity_id=entity_id,
+                window_duration=duration,
+                window_start=window_start,
+                increment=cost,
+            )
+            if window_counter not in reserved_counter_keys
+            else None
+        )
+        await _enqueue_window_spend_row_update(
+            entity_type=entity_type,
+            entity_id=entity_id,
+            reset_at=window_reset_at,
+            window_duration=duration,
+            window_start=window_start,
+            increment=cost,
+            request_started_at=request_started_at,
+        )
+        return pending_window
+
+    async def _window_increments(
+        entity_type: Litellm_EntityType, entity_id: str, budget_limits: object
+    ) -> tuple[PendingSpendIncrement | BaseException, ...]:
+        if not isinstance(budget_limits, list):
+            return ()
+        window_pending: Final = await asyncio.gather(
+            *(_window_increment(entity_type, entity_id, window) for window in budget_limits), return_exceptions=True
+        )
+        return tuple(item for item in window_pending if item is not None)
+
+    async def _cached_window_increments(
+        entity_type: Litellm_EntityType, entity_id: str, cache_key: str
+    ) -> tuple[_SpendScopeItem, ...]:
+        cached: Final[object] = _UNTYPED_VALUE.validate_python(await user_api_key_cache.async_get_cache(key=cache_key))
+        if cached is None:
+            return (_UncachedBudgetWindows(entity_type=entity_type, entity_id=entity_id),)
+        return await _window_increments(entity_type, entity_id, _cached_budget_limits(cached))
+
+    async def _stored_window_increments(
+        uncached: _UncachedBudgetWindows,
+    ) -> tuple[PendingSpendIncrement | BaseException, ...]:
+        return await _window_increments(
+            uncached.entity_type,
+            uncached.entity_id,
+            await _stored_budget_limits(uncached.entity_type, uncached.entity_id),
+        )
+
+    async def _key_scope(key_token: str) -> tuple[_SpendScopeItem, ...]:
         # key_token arrives pre-hashed from metadata["user_api_key"] (auth flow
         # hashes raw "sk-..." keys before they reach the callback). The
         # startswith("sk-") check is a safety net matching update_cache —
@@ -3675,52 +3813,9 @@ async def _increment_spend_counters_batched(
             )
         )
 
-        async def _key_window_increment(window: object) -> PendingSpendIncrement | None:
-            duration = (
-                window["budget_duration"] if isinstance(window, dict) else getattr(window, "budget_duration", None)
-            )
-            key_window_reset_at = (
-                window.get("reset_at") if isinstance(window, dict) else getattr(window, "reset_at", None)
-            )
-            key_window_counter: Final = f"spend:key:{hashed_token}:window:{duration}"
-            key_window_start = get_budget_window_start(window)
-            pending_window: Final = (
-                await _prepare_window_spend_counter_increment(
-                    counter_key=key_window_counter,
-                    entity_type="Key",
-                    entity_id=hashed_token,
-                    window_duration=duration,
-                    window_start=key_window_start,
-                    increment=cost,
-                )
-                if key_window_counter not in reserved_counter_keys
-                else None
-            )
-            await _enqueue_window_spend_row_update(
-                entity_type=Litellm_EntityType.KEY,
-                entity_id=hashed_token,
-                reset_at=key_window_reset_at,
-                window_duration=duration,
-                window_start=key_window_start,
-                increment=cost,
-                request_started_at=request_started_at,
-            )
-            return pending_window
+        return key_pending + await _cached_window_increments(Litellm_EntityType.KEY, hashed_token, hashed_token)
 
-        key_obj: Final[object] = _UNTYPED_VALUE.validate_python(
-            await user_api_key_cache.async_get_cache(key=hashed_token)
-        )
-        if key_obj is None:
-            return key_pending
-        key_budget_limits: Final = _cached_budget_limits(key_obj)
-        if not isinstance(key_budget_limits, list):
-            return key_pending
-        window_pending: Final = await asyncio.gather(
-            *(_key_window_increment(window) for window in key_budget_limits), return_exceptions=True
-        )
-        return key_pending + tuple(item for item in window_pending if item is not None)
-
-    async def _team_scope(scope_team_id: str) -> tuple[PendingSpendIncrement | BaseException, ...]:
+    async def _team_scope(scope_team_id: str) -> tuple[_SpendScopeItem, ...]:
         team_counter_key: Final = f"spend:team:{scope_team_id}"
         team_pending: Final[tuple[PendingSpendIncrement, ...]] = (
             ()
@@ -3734,50 +3829,9 @@ async def _increment_spend_counters_batched(
             )
         )
 
-        async def _team_window_increment(window: object) -> PendingSpendIncrement | None:
-            duration = (
-                window["budget_duration"] if isinstance(window, dict) else getattr(window, "budget_duration", None)
-            )
-            team_window_reset_at = (
-                window.get("reset_at") if isinstance(window, dict) else getattr(window, "reset_at", None)
-            )
-            team_window_counter: Final = f"spend:team:{scope_team_id}:window:{duration}"
-            team_window_start = get_budget_window_start(window)
-            pending_window: Final = (
-                await _prepare_window_spend_counter_increment(
-                    counter_key=team_window_counter,
-                    entity_type="Team",
-                    entity_id=scope_team_id,
-                    window_duration=duration,
-                    window_start=team_window_start,
-                    increment=cost,
-                )
-                if team_window_counter not in reserved_counter_keys
-                else None
-            )
-            await _enqueue_window_spend_row_update(
-                entity_type=Litellm_EntityType.TEAM,
-                entity_id=scope_team_id,
-                reset_at=team_window_reset_at,
-                window_duration=duration,
-                window_start=team_window_start,
-                increment=cost,
-                request_started_at=request_started_at,
-            )
-            return pending_window
-
-        team_obj: Final[object] = _UNTYPED_VALUE.validate_python(
-            await user_api_key_cache.async_get_cache(key=f"team_id:{scope_team_id}")
+        return team_pending + await _cached_window_increments(
+            Litellm_EntityType.TEAM, scope_team_id, f"team_id:{scope_team_id}"
         )
-        if team_obj is None:
-            return team_pending
-        team_budget_limits: Final = _cached_budget_limits(team_obj)
-        if not isinstance(team_budget_limits, list):
-            return team_pending
-        window_pending: Final = await asyncio.gather(
-            *(_team_window_increment(window) for window in team_budget_limits), return_exceptions=True
-        )
-        return team_pending + tuple(item for item in window_pending if item is not None)
 
     async def _team_member_scope(
         scope_user_id: str, scope_team_id: str
@@ -3848,22 +3902,30 @@ async def _increment_spend_counters_batched(
     # return_exceptions so a failing scope does not leave its siblings running
     # as orphaned tasks that race the caller's reservation-counter invalidation;
     # all scopes settle, then the first error propagates as before.
-    scope_results: Final = await asyncio.gather(*scope_coros, return_exceptions=True)
-    scope_errors: Final = tuple(
-        item
-        for scope in scope_results
-        for item in (scope if isinstance(scope, tuple) else (scope,))
-        if isinstance(item, BaseException)
+    scope_items: Final = tuple(_flatten_spend_scopes(await asyncio.gather(*scope_coros, return_exceptions=True)))
+    uncached_windows: Final = tuple(item for item in scope_items if isinstance(item, _UncachedBudgetWindows))
+    await _apply_spend_counter_increments(
+        pending=reservation_update.pending
+        + tuple(item for item in scope_items if isinstance(item, PendingSpendIncrement))
     )
-    pending: Final = tuple(
-        item
-        for scope in scope_results
-        if not isinstance(scope, BaseException)
-        for item in scope
-        if not isinstance(item, BaseException)
+    stored_window_items: Final = (
+        tuple(
+            _flatten_spend_scopes(
+                await asyncio.gather(
+                    *(_stored_window_increments(uncached) for uncached in uncached_windows), return_exceptions=True
+                )
+            )
+        )
+        if uncached_windows
+        else ()
     )
-    await _apply_spend_counter_increments(pending=reservation_update.pending + pending)
+    stored_window_pending: Final = tuple(
+        item for item in stored_window_items if isinstance(item, PendingSpendIncrement)
+    )
+    if stored_window_pending:
+        await _apply_spend_counter_increments(pending=stored_window_pending)
     stamp_budget_reservation_actual_cost(budget_reservation=budget_reservation, actual_cost=response_cost)
+    scope_errors: Final = tuple(item for item in scope_items + stored_window_items if isinstance(item, BaseException))
     if scope_errors:
         raise scope_errors[0]
 
@@ -3871,6 +3933,25 @@ async def _increment_spend_counters_batched(
         budget_reservation["finalized"] = True
 
 
+@dataclass(frozen=True, slots=True)
+class _UncachedBudgetWindows:
+    entity_type: Litellm_EntityType
+    entity_id: str
+
+
+_SpendScopeItem: TypeAlias = PendingSpendIncrement | BaseException | _UncachedBudgetWindows
+
+
+def _flatten_spend_scopes(
+    scope_results: Sequence[tuple[_SpendScopeItem, ...] | BaseException],
+) -> Iterator[_SpendScopeItem]:
+    for scope in scope_results:
+        if isinstance(scope, BaseException):
+            yield scope
+            continue
+        yield from scope
+
+
 @dataclass(frozen=True, slots=True)
 class _ReservationCounterUpdate:
     """The reserved counters the direct increment must skip, and the adjustments that settle them on the actual
@@ -5651,11 +5732,18 @@ def _with_config_file_pass_through_endpoints(
 def _reload_settings_store(section: Section, store: SettingsStore, section_config: object) -> None:
     serving_pass_throughs: Final = store.get("pass_through_endpoints")
     store.load_yaml(_as_settings_mapping(section_config))
-    store.apply_db_row(section, _EMPTY_SETTINGS_MAPPING)
     if is_resource_list(section, "pass_through_endpoints") and serving_pass_throughs is not None:
         store["pass_through_endpoints"] = serving_pass_throughs
 
 
+def _general_settings_row_is_readable(row: _ConfigParamValueRow | None) -> bool:
+    return row is None or row.param_value is None or isinstance(row.param_value, Mapping)
+
+
+def _db_managed_general_settings_keys() -> frozenset[str]:
+    return frozenset((*ConfigGeneralSettings.model_fields, *_CLEANUP_SCHEDULE_KEYS, "allowed_ips", "email_settings"))
+
+
 def _bind_general_settings_store(settings: SettingsStore) -> None:
     global general_settings
     general_settings = settings  # pyright: ignore[reportAssignmentType]  # legacy global accepts mappings
@@ -5806,7 +5894,9 @@ class ProxyConfig:
         # whether an existing request predates the prices it just fetched, and re-serving one
         # costs a single fetch where skipping one leaves it priced wrong indefinitely
         self.model_cost_map_applied_revision: int = 0
-        self.settings: Final[SettingsStore] = SettingsStore("general_settings")
+        self.settings: Final[SettingsStore] = SettingsStore(
+            "general_settings", managed_db_keys=_db_managed_general_settings_keys()
+        )
         self.router_settings: Final[SettingsStore] = SettingsStore("router_settings")
         self.litellm_settings: Final[SettingsStore] = SettingsStore("litellm_settings")
         self.environment_variables: Final[SettingsStore] = SettingsStore("environment_variables")
@@ -5817,6 +5907,8 @@ class ProxyConfig:
         self._db_environment_keys: frozenset[str] = frozenset()
         self._sso_environment_removals: frozenset[str] = frozenset()
         self._warned_shadowed_keys: frozenset[tuple[Section, str]] = frozenset()
+        self._warned_unmanaged_keys: frozenset[str] = frozenset()
+        self._warned_unreadable_db_general_settings: bool = False
         self._db_config_callback_entries: Mapping[tuple[str, str], _DbCallbackRegistration] = MappingProxyType({})
         self._settings_stores: Final[Mapping[Section, SettingsStore]] = MappingProxyType(
             {
@@ -6462,6 +6554,9 @@ class ProxyConfig:
                 prisma_client=prisma_client,
                 store_model_in_db=store_model_in_db,
             )
+        else:
+            for section, store in self._settings_stores.items():
+                store.apply_db_row(section, _EMPTY_SETTINGS_MAPPING)
 
         config = self._config_with_resolved_settings(config)
 
@@ -8340,15 +8435,20 @@ class ProxyConfig:
             general_settings.get("maximum_spend_logs_retention_interval", "1d"),
         )
 
-    async def _update_general_settings(self, db_general_settings: Mapping[str, SettingsJsonValue] | None) -> None:
+    async def _update_general_settings(self, db_general_settings: Mapping[str, SettingsJsonValue] | str | None) -> None:
         global general_settings
         if db_general_settings is None:
             return
+        if not isinstance(db_general_settings, Mapping):
+            self._warn_about_unreadable_db_general_settings()
+            return
+        self._warned_unreadable_db_general_settings = False
         if not isinstance(general_settings, SettingsStore):
             self.settings.load_yaml(_as_settings_mapping(general_settings))
         cache_size_was_db: Final = self.settings.source("user_api_key_cache_max_size") == "db"
         previous_cleanup_schedule: Final = self._resolved_cleanup_schedule()
         self.settings.apply_db_row("general_settings", db_general_settings)
+        self._warn_about_unmanaged_db_settings()
         _bind_general_settings_store(self.settings)
         await self._apply_general_settings_side_effects(
             db_general_settings,
@@ -8540,12 +8640,24 @@ class ProxyConfig:
         environment_read: Final = next(self._environment_read_numbers)
         sections: Final = tuple(self._settings_stores)
         responses: Final = await asyncio.gather(*(get_config_param(prisma_client, section) for section in sections))
+        general_settings_response: Final = responses[sections.index("general_settings")]
+        general_settings_value: Final[Mapping[str, SettingsJsonValue]] = (
+            self._prepared_db_settings_values("general_settings", general_settings_response.param_value)
+            if general_settings_response is not None and general_settings_response.param_value is not None
+            else _EMPTY_SETTINGS_MAPPING
+        )
+        self._settings_stores["general_settings"].apply_db_row("general_settings", general_settings_value)
+
         response: _ConfigParamValueRow | None
         for section, response in zip(sections, responses):
+            if section == "general_settings":
+                continue
             if response is None:
+                self._settings_stores[section].apply_db_row(section, _EMPTY_SETTINGS_MAPPING)
                 continue
             param_value: JsonValue = getattr(response, "param_value", None)
             if param_value is None:
+                self._settings_stores[section].apply_db_row(section, _EMPTY_SETTINGS_MAPPING)
                 continue
 
             verbose_proxy_logger.debug(
@@ -8556,6 +8668,7 @@ class ProxyConfig:
             if section == "litellm_settings":
                 self._apply_litellm_settings_db_values(self._prepared_db_settings_values(section, param_value))
             elif section == "environment_variables":
+                self._settings_stores[section].apply_db_row(section, _EMPTY_SETTINGS_MAPPING)
                 await self._apply_db_environment_variables_row(
                     prisma_client, response, environment_before_db, environment_read
                 )
@@ -8566,6 +8679,7 @@ class ProxyConfig:
                 )
 
         self._warn_about_shadowed_db_settings()
+        self._warn_about_unmanaged_db_settings()
         return self._config_with_resolved_settings(config)
 
     async def _apply_db_environment_variables_row(
@@ -8624,6 +8738,30 @@ class ProxyConfig:
             )
         self._warned_shadowed_keys = shadowed
 
+    def _warn_about_unmanaged_db_settings(self) -> None:
+        unmanaged: Final = frozenset(
+            key for key in self.settings.unmanaged_db_keys() if key not in _GENERAL_SETTINGS_UI_LITELLM_FIELDS
+        )
+        for key in sorted(unmanaged - self._warned_unmanaged_keys):
+            verbose_proxy_logger.warning(
+                "general_settings.%s is stored in the database, but the proxy does not apply that stored value, so it "
+                "is ignored. %s",
+                key,
+                "The config file's value applies. Remove the stored copy with POST /config/field/delete."
+                if self.settings.owned_by_config(key)
+                else "Set it in the config file to use it, or remove it with POST /config/field/delete.",
+            )
+        self._warned_unmanaged_keys = unmanaged
+
+    def _warn_about_unreadable_db_general_settings(self) -> None:
+        if self._warned_unreadable_db_general_settings:
+            return
+        verbose_proxy_logger.warning(
+            "general_settings is stored in the database as something other than a JSON object, so the proxy "
+            "ignores every stored general setting."
+        )
+        self._warned_unreadable_db_general_settings = True
+
     def _prepared_db_settings_values(self, section: Section, value: object) -> Mapping[str, SettingsJsonValue]:
         scrubbed: Final = _scrub_db_overlay_remote_module_loads(section=section, db_value=value)
         return _as_settings_mapping(scrubbed)
@@ -8791,7 +8929,10 @@ class ProxyConfig:
                 )
 
             # initialize vector stores, guardrails, etc. table in db
-            await self._init_non_llm_objects_in_db(prisma_client=prisma_client)
+            await self._init_non_llm_objects_in_db(
+                prisma_client=prisma_client,
+                refresh_pass_through_endpoints=_general_settings_row_is_readable(db_general_settings),
+            )
 
         except Exception as e:
             verbose_proxy_logger.exception("litellm.proxy.proxy_server.py::ProxyConfig:add_deployment - %s", e)
@@ -8860,7 +9001,9 @@ class ProxyConfig:
         except Exception as e:  # noqa: BLE001  # best-effort: a failing stop must not break proxy shutdown
             verbose_proxy_logger.error("Error stopping auth cache invalidation subscriber: %s", e)
 
-    async def _init_non_llm_objects_in_db(self, prisma_client: PrismaClient):
+    async def _init_non_llm_objects_in_db(
+        self, prisma_client: PrismaClient, *, refresh_pass_through_endpoints: bool = True
+    ):
         """
         Use this to read non-llm objects from the db and initialize them
 
@@ -8884,7 +9027,7 @@ class ProxyConfig:
         if self._should_load_db_object(object_type="agents"):
             await self._init_agents_in_db(prisma_client=prisma_client)
 
-        if self._should_load_db_object(object_type="pass_through_endpoints"):
+        if refresh_pass_through_endpoints and self._should_load_db_object(object_type="pass_through_endpoints"):
             await self._init_pass_through_endpoints_in_db()
 
         if self._should_load_db_object(object_type="prompts"):
@@ -10186,6 +10329,8 @@ def _event_with_restamped_nested_model(event: Mapping[str, object], target_model
 _SSE_DATA_FIELD: Final = b"data:"
 _SSE_NESTED_RESPONSE_MARKER: Final = b'"response"'
 _SSE_EVENT_OBJECT: Final[TypeAdapter[Mapping[str, object]]] = TypeAdapter(Mapping[str, object])
+_JSON_OBJECT: Final = TypeAdapter(dict[object, object])
+_JSON_ARRAY: Final[TypeAdapter[tuple[object, ...]]] = TypeAdapter(tuple[object, ...])
 
 
 def _restamp_nested_response_model_in_sse_frame(frame: bytes, target_model: str) -> bytes:
@@ -10211,91 +10356,110 @@ def _restamp_nested_response_model_in_sse_line(line: bytes, target_model: str) -
     return _SSE_DATA_FIELD + b" " + serialized_event.encode() + line_ending
 
 
-def _fast_serialize_simple_model_response_stream(
-    chunk: ModelResponseStream,
-) -> bytes | None:
-    """
-    Serialize the common OpenAI text streaming chunk without the full Pydantic
-    serializer. Fall back for richer chunks so tool calls, logprobs, usage, and
-    provider-specific fields keep the canonical model_dump_json behavior.
-    """
-    if (
-        getattr(chunk, "provider_specific_fields", None) is not None
-        or getattr(chunk, "system_fingerprint", None) is not None
-        or getattr(chunk, "usage", None) is not None
-    ):
-        return None
-
-    choices: Final = getattr(chunk, "choices", None)
-    if not isinstance(choices, list) or len(choices) != 1:
-        return None
-
-    choice: Final = choices[0]
-    if getattr(choice, "logprobs", None) is not None or getattr(choice, "enhancements", None) is not None:
-        return None
-
-    delta: Final[object] = getattr(choice, "delta", None)
-    if delta is None:
-        return None
-
-    unsupported_delta_fields: Final = (
-        "function_call",
-        "tool_calls",
-        "audio",
-        "images",
-        "annotations",
-        "reasoning_content",
-        "thinking_blocks",
-        "provider_specific_fields",
-        "refusal",
-    )
-    if any(getattr(delta, field, None) is not None for field in unsupported_delta_fields):
-        return None
-
-    delta_dict: Final[dict] = {}
-    role: Final = getattr(delta, "role", None)
-    content: Final = getattr(delta, "content", None)
-    if role is not None:
-        delta_dict["role"] = role
-    if content is not None:
-        delta_dict["content"] = content
-
-    choice_dict: Final = {"index": getattr(choice, "index", 0), "delta": delta_dict}
-    finish_reason: Final = getattr(choice, "finish_reason", None)
-    if finish_reason is not None:
-        choice_dict["finish_reason"] = finish_reason
-
-    # Match the canonical ``model_dump_json(exclude_none=True)`` shape — if a
-    # field is None, omit it entirely rather than emitting ``"key": null``.
-    # Strict OpenAI-compatible clients reject ``null`` for optional fields like
-    # ``model``, so diverging here would surface as a client-side regression
-    # only on the fast path. Fall back to the slow path if a required-looking
-    # top-level identifier is missing.
-    model: Final = getattr(chunk, "model", None)
-    if model is None:
-        return None
-
-    payload: Final[dict] = {
-        "id": getattr(chunk, "id", None),
-        "object": getattr(chunk, "object", None),
-        "created": getattr(chunk, "created", None),
-        "model": model,
-        "service_tier": getattr(chunk, "service_tier", None),
-        "choices": [choice_dict],
-    }
-    for top_level_key in ("id", "object", "created", "service_tier"):
-        if payload[top_level_key] is None:
-            payload.pop(top_level_key)
-    return orjson.dumps(payload)
+def _vllm_choice_fields(choice: BaseModel) -> Mapping[str, object]:
+    choice_extras: Final = choice.model_extra or {}
+    return MappingProxyType({field: choice_extras[field] for field in VLLM_CHOICE_FIELDS if field in choice_extras})
 
 
-def _serialize_streaming_chunk(chunk: BaseModel) -> str | bytes:
-    if isinstance(chunk, ModelResponseStream):
-        serialized_chunk: Final = _fast_serialize_simple_model_response_stream(chunk)
+def _json_encodes(value: object) -> bool:
+    try:
+        to_jsonable_python(value)
+    except ValueError:
+        return False
+    return True
+
+
+def _unencodable_part(value: object, ancestors: frozenset[int]) -> IncEx | bool:
+    if id(value) in ancestors:
+        return True
+    lineage: Final = ancestors | {id(value)}
+    if isinstance(value, BaseModel):
+        return _unencodable_keys(iter(value), lineage) or True
+    if isinstance(value, dict):
+        return _unencodable_entries(_JSON_OBJECT.validate_python(value), lineage)
+    if isinstance(value, (list, tuple)):
+        return _unencodable_indexes(enumerate(_JSON_ARRAY.validate_python(value)), lineage) or True
+    return True
+
+
+def _unencodable_entries(entries: Mapping[object, object], lineage: frozenset[int]) -> IncEx | bool:
+    by_name: Final = {key: item for key, item in entries.items() if isinstance(key, str)}
+    if len(by_name) == len(entries):
+        return _unencodable_keys(by_name.items(), lineage) or True
+    by_index: Final = {key: item for key, item in entries.items() if isinstance(key, int)}
+    if len(by_index) == len(entries):
+        return _unencodable_indexes(by_index.items(), lineage) or True
+    return True
+
+
+def _unencodable_keys(items: Iterable[tuple[str, object]], lineage: frozenset[int]) -> Mapping[str, IncEx | bool]:
+    return {key: _unencodable_part(item, lineage) for key, item in items if not _json_encodes(item)}
+
+
+def _unencodable_indexes(items: Iterable[tuple[int, object]], lineage: frozenset[int]) -> Mapping[int, IncEx | bool]:
+    return {index: _unencodable_part(item, lineage) for index, item in items if not _json_encodes(item)}
+
+
+def _serialize_chat_chunk_leniently(chunk: ModelResponseStream) -> bytes:
+    exclude: Final = _unencodable_keys(iter(chunk), frozenset({id(chunk)}))
+    if exclude:
+        verbose_proxy_logger.warning("Dropping streamed chunk fields that JSON cannot encode: %s", exclude)
+    jsonable: Final = chunk.model_dump(mode="json", exclude_none=True, exclude_unset=True, exclude=exclude)
+    return json.dumps(jsonable, ensure_ascii=True, separators=(",", ":")).encode()
+
+
+def _serialize_chat_chunk(chunk: ModelResponseStream) -> bytes:
+    try:
+        return chunk.model_dump_json(exclude_none=True, exclude_unset=True).encode()
+    except PydanticSerializationError:
+        return _serialize_chat_chunk_leniently(chunk)
+
+
+def _serialize_streaming_chunk(chunk: BaseModel) -> bytes:
+    choices: Final = _streaming_chunk_choices(chunk)
+    null_choice_fields: Final = tuple(_null_vllm_choice_fields(choice) for choice in choices)
+    if any(null_choice_fields):
+        serialized_chunk: Final = _serialize_keeping_null_choice_fields(chunk, choices, null_choice_fields)
         if serialized_chunk is not None:
             return serialized_chunk
+    if isinstance(chunk, ModelResponseStream):
+        return _serialize_chat_chunk(chunk)
+    return chunk.model_dump_json(exclude_none=True, exclude_unset=True).encode()
 
-    return chunk.model_dump_json(exclude_none=True, exclude_unset=True)
+
+def _serialize_keeping_null_choice_fields(
+    chunk: BaseModel, choices: Sequence[BaseModel], null_choice_fields: Sequence[Mapping[str, None]]
+) -> bytes | None:
+    try:
+        return json.dumps(
+            {
+                **_dump_set_fields(chunk, exclude=frozenset({"choices"})),
+                "choices": [
+                    {**_dump_set_fields(choice), **nulls}
+                    for choice, nulls in zip(choices, null_choice_fields, strict=True)
+                ],
+            },
+            separators=(",", ":"),
+            ensure_ascii=False,
+        ).encode()
+    except ValueError:
+        return None
+
+
+def _streaming_chunk_choices(chunk: BaseModel) -> Sequence[BaseModel]:
+    match chunk:
+        case ModelResponseStream() | TextCompletionResponse():
+            return chunk.choices
+        case _:
+            return ()
+
+
+def _null_vllm_choice_fields(choice: BaseModel) -> Mapping[str, None]:
+    return MappingProxyType({field: None for field, value in _vllm_choice_fields(choice).items() if value is None})
+
+
+def _dump_set_fields(model: BaseModel, exclude: AbstractSet[str] = frozenset()) -> Mapping[str, object]:
+    return model.model_dump(mode="json", exclude_none=True, exclude_unset=True, exclude=set(exclude))
 
 
 async def _apply_streaming_chunk_hooks(
@@ -13411,7 +13575,10 @@ async def moderations(
         return response
     except Exception as e:
         await proxy_logging_obj.post_call_failure_hook(
-            user_api_key_dict=user_api_key_dict, original_exception=e, request_data=data
+            user_api_key_dict=user_api_key_dict,
+            original_exception=e,
+            request_data=data,
+            dispatched_call_type=CallTypes.amoderation.value,
         )
         log_llm_api_exception(e, litellm_call_id)
         if isinstance(e, ProxyException):
@@ -13556,6 +13723,7 @@ async def audio_speech(
             user_api_key_dict=user_api_key_dict,
             original_exception=e,
             request_data=data,
+            dispatched_call_type=CallTypes.aspeech.value,
         )
         log_llm_api_exception(e, litellm_call_id)
         if isinstance(e, ProxyException):
@@ -13707,7 +13875,10 @@ async def audio_transcriptions(
         return response
     except Exception as e:
         await proxy_logging_obj.post_call_failure_hook(
-            user_api_key_dict=user_api_key_dict, original_exception=e, request_data=data
+            user_api_key_dict=user_api_key_dict,
+            original_exception=e,
+            request_data=data,
+            dispatched_call_type=CallTypes.atranscription.value,
         )
         log_llm_api_exception(e, litellm_call_id)
         if isinstance(e, HTTPException):
@@ -14805,6 +14976,7 @@ from litellm.repositories.table_repositories import (
 )
 from litellm.repositories.team_repository import TeamRepository
 from litellm.repositories.user_repository import UserRepository
+from litellm.repositories.verification_token_repository import VerificationTokenRepository
 from litellm.responses.litellm_completion_transformation.count_request import (
     ChatCountBridgeError,
     chat_count_request,
@@ -14950,7 +15122,7 @@ async def _try_provider_token_count(
     deployment: Mapping[str, object] | None,
     request_model: str,
     tools: list | None = None,
-    system: str | None = None,
+    system: object | None = None,
     messages_format: TokenCountMessagesFormat = "openai",
     output_format: JsonValue = None,
     context_management: CountContextManagement | None = None,
@@ -15020,6 +15192,7 @@ async def _provider_token_count(
     request_model: str,
     settings: TokenCountSettings,
     local_estimate_allowed: bool,
+    forwarded_edits: bool = False,
 ) -> Union["TokenCountResponse", ProviderCountFailure, None]:
     """Count with the provider, using the token_count_model in its region when one is set.
 
@@ -15043,7 +15216,7 @@ async def _provider_token_count(
     pinned_count_model: Final = None if count_model is None or count_model.region is None else count_model
     region_hint: Final = (
         None
-        if pinned_count_model is None
+        if pinned_count_model is None or (forwarded_edits and counted.status_code == 400)
         else f"This model counts tokens with {pinned_count_model.model} in {pinned_count_model.region}. "
         "If that region is not enabled for the AWS account, enable it or set token_count_model in model_info"
     )
@@ -15051,7 +15224,7 @@ async def _provider_token_count(
     framing_can_stand_in: Final = (count_model is None or not count_model.configured) and (
         failure.cannot_count_model or (pinned_count_model is not None and failure.denied_in_region)
     )
-    if not (framing_can_stand_in and settings.framing is not None and local_estimate_allowed):
+    if not (framing_can_stand_in and settings.frames_counts and local_estimate_allowed):
         raise failure.to_proxy_exception()
     if pinned_count_model is not None:
         verbose_proxy_logger.warning(
@@ -15251,6 +15424,7 @@ async def _tokenizer_or_provider_error(
 
 async def _local_token_estimate(
     model: str,
+    template_model: str,
     prompt: str | None,
     messages: Sequence[AllMessageValues] | None,
     tools: list[ChatCompletionToolParam] | None,
@@ -15263,7 +15437,7 @@ async def _local_token_estimate(
         else await _tokenizer_or_provider_error(model, custom_tokenizer, provider_failure)
     )
     count: Final = offload_token_count(litellm.token_counter)(
-        model=model,
+        model=template_model,
         text=prompt,
         messages=messages,
         tools=tools,
@@ -15305,6 +15479,9 @@ class _TokenCountDeployment(TypedDict, total=False):
 
 
 _TOKEN_COUNT_DEPLOYMENT: Final = TypeAdapter(_TokenCountDeployment)
+_COUNT_TOOLS: Final[TypeAdapter[tuple[Mapping[str, object], ...] | None]] = TypeAdapter(
+    tuple[Mapping[str, object], ...] | None
+)
 _ROUTED_DEPLOYMENT: Final[TypeAdapter[Mapping[str, object] | None]] = TypeAdapter(Mapping[str, object] | None)
 
 
@@ -15326,10 +15503,15 @@ def _deployment_aws_region(deployment: _TokenCountDeployment) -> str:
     )
 
 
+def _deployment_base_model(deployment: _TokenCountDeployment) -> str | None:
+    return _non_empty_str(deployment.get("model_info", {}).get("base_model")) or _non_empty_str(
+        deployment.get("litellm_params", {}).get("base_model")
+    )
+
+
 def _token_count_settings_model(deployment: _TokenCountDeployment, request_model: str) -> tuple[str, str | None]:
-    model_info: Final = deployment.get("model_info", {})
     params: Final = deployment.get("litellm_params", {})
-    base_model: Final = _non_empty_str(model_info.get("base_model")) or _non_empty_str(params.get("base_model"))
+    base_model: Final = _deployment_base_model(deployment)
     if base_model is not None:
         return base_model, None
     model: Final = _non_empty_str(params.get("model"))
@@ -15374,12 +15556,15 @@ def _count_context_management(
         model, general_settings_view(), user_model if isinstance(user_model, str) else None
     )
     router_defaults: Final = _router_default_litellm_params(llm_router)
-    sent_params: Final = tuple(
-        {**deployment["litellm_params"], **router_defaults, **request_litellm_params}
+    deployment_params: Final = tuple(
+        deployment["litellm_params"]
         for deployment in llm_router.registry().deployments(
             inference_model if isinstance(inference_model, str) else model, source="routable"
         )
     )
+    sent_params: Final = tuple(
+        {**params, **router_defaults, **request_litellm_params} for params in deployment_params or ({},)
+    )
     if any(context_management_explicitly_dropped(params.get("additional_drop_params")) for params in sent_params):
         return None
     return CountContextManagement(
@@ -15389,17 +15574,104 @@ def _count_context_management(
     )
 
 
+_GATEWAY_EDIT_ROUTES: Final = frozenset({Target.CHAT_COMPLETIONS, Target.RESPONSES})
+
+
+def _messages_route(deployment: _TokenCountDeployment, request_model: str) -> Target:
+    params: Final = deployment.get("litellm_params", {})
+    return messages_target(
+        _non_empty_str(params.get("model")) or request_model,
+        _non_empty_str(params.get("custom_llm_provider")),
+        deployment.get("model_info"),
+        _deployment_api_base(deployment),
+    )
+
+
+def _rejected_view(status_code: int, message: str) -> ProxyException:
+    return ProviderCountFailure(
+        status_code=status_code, message=message, rejected_before_provider_call=True
+    ).to_proxy_exception()
+
+
+async def _bridged_request_view(
+    messages: Sequence[Mapping[str, object]],
+    system: object,
+    tools: Sequence[Mapping[str, object]] | None,
+    messages_format: TokenCountMessagesFormat,
+    edits: CountContextManagement | None,
+    deployment: _TokenCountDeployment,
+    fallback_model: str,
+) -> InferenceRequestView | InferenceRequestViewError | None:
+    view: Final = await inference_request_view(
+        messages,
+        system,
+        messages_format,
+        count_context_edits(edits, tools, deployment.get("litellm_params", {}), fallback_model),
+    )
+    return None if isinstance(view, InferenceRequestView) and not view.messages else view
+
+
+async def _responses_request_view(
+    messages: Sequence[Mapping[str, object]],
+    system: object,
+    tools: Sequence[Mapping[str, object]] | None,
+    edits: CountContextManagement,
+    deployment: _TokenCountDeployment,
+    fallback_model: str,
+) -> InferenceRequestView | InferenceRequestViewError:
+    from litellm.llms.anthropic.messages.context_management import AnthropicContextManagementError
+    from litellm.llms.anthropic.messages.responses_adapters.handler import count_view_messages
+
+    try:
+        edited: Final = await count_view_messages(
+            model=_non_empty_str(deployment.get("litellm_params", {}).get("model")) or fallback_model,
+            messages=messages,
+            tools=tools,
+            system=system,
+            context_management=edits,
+        )
+    except AnthropicContextManagementError as error:
+        if error.status_code >= 500:
+            return InferenceRequestView(messages=messages, system=system)
+        return InferenceRequestViewError(error_message=error.message, status_code=error.status_code)
+    return InferenceRequestView(messages=edited, system=system)
+
+
+async def _gateway_request_view(
+    route: Target,
+    messages: Sequence[Mapping[str, object]],
+    system: object,
+    tools: Sequence[Mapping[str, object]] | None,
+    messages_format: TokenCountMessagesFormat,
+    edits: CountContextManagement | None,
+    deployment: _TokenCountDeployment,
+    fallback_model: str,
+) -> InferenceRequestView | InferenceRequestViewError | None:
+    match route:
+        case Target.CHAT_COMPLETIONS:
+            return await _bridged_request_view(
+                messages, system, tools, messages_format, edits, deployment, fallback_model
+            )
+        case Target.RESPONSES if edits is not None:
+            return await _responses_request_view(messages, system, tools, edits, deployment, fallback_model)
+        case _:
+            return None
+
+
 def _responses_routing_kwargs(responses_request: Mapping[str, object] | None) -> Mapping[str, object]:
     previous_response_id: Final = None if responses_request is None else responses_request.get("previous_response_id")
     return {"previous_response_id": previous_response_id} if isinstance(previous_response_id, str) else {}
 
 
+def _inference_params(
+    litellm_params: Mapping[str, object], responses_request: Mapping[str, object]
+) -> Mapping[str, object]:
+    return {**litellm_params, **_router_default_litellm_params(llm_router), **responses_request}
+
+
 def _count_drop_policy(deployment: Mapping[str, object] | None, responses_request: Mapping[str, object]) -> DropPolicy:
     litellm_params: Final = as_str_mapping(None if deployment is None else deployment.get("litellm_params")) or {}
-    router_defaults: Final[Mapping[str, object]] = (
-        {} if llm_router is None else _router_default_litellm_params(llm_router)
-    )
-    return drop_policy({**litellm_params, **router_defaults, **responses_request})
+    return drop_policy(_inference_params(litellm_params, responses_request))
 
 
 def _native_responses_count(
@@ -15422,8 +15694,54 @@ def _native_responses_count(
     )
 
 
-def _deployment_api_base(deployment: _TokenCountDeployment) -> str | None:
-    return _non_empty_str(deployment.get("litellm_params", {}).get("api_base"))
+def _deployment_api_base(
+    deployment: _TokenCountDeployment, responses_request: Mapping[str, object] | None = None
+) -> str | None:
+    return _non_empty_str(
+        _inference_params(deployment.get("litellm_params", {}), responses_request or {}).get("api_base")
+    )
+
+
+def _deployment_provider(
+    deployment: _TokenCountDeployment, request_model: str, responses_request: Mapping[str, object] | None
+) -> str | None:
+    params: Final = deployment.get("litellm_params", {})
+    try:
+        return litellm.get_llm_provider(
+            model=_non_empty_str(params.get("model")) or request_model,
+            custom_llm_provider=_non_empty_str(params.get("custom_llm_provider")),
+            api_base=_deployment_api_base(deployment, responses_request),
+        )[1]
+    except litellm.BadRequestError:
+        return None
+
+
+def _serves_native_responses(
+    deployment: _TokenCountDeployment, request_model: str, responses_request: Mapping[str, object]
+) -> bool:
+    params: Final = deployment.get("litellm_params", {})
+    inference: Final = _inference_params(params, responses_request)
+    try:
+        return provider_stores_the_conversation(
+            _non_empty_str(params.get("model")) or request_model,
+            _non_empty_str(params.get("custom_llm_provider")),
+            {
+                "use_chat_completions_api": bool(inference.get("use_chat_completions_api")),
+                "model_info": dict(deployment.get("model_info", {})),
+                "api_base": _non_empty_str(inference.get("api_base")),
+            },
+        )
+    except litellm.BadRequestError:
+        return False
+
+
+_AZURE_PROVIDERS: Final = frozenset((litellm.LlmProviders.AZURE.value, litellm.LlmProviders.AZURE_AI.value))
+
+
+def _with_strict_by_default(tools: Sequence[Mapping[str, object]]) -> tuple[Mapping[str, object], ...]:
+    return tuple(
+        {**tool, "strict": True} if tool.get("type") == "function" and "strict" not in tool else tool for tool in tools
+    )
 
 
 def _system_message(system: object) -> ChatCompletionSystemMessage | None:
@@ -15582,6 +15900,40 @@ async def _count_request_tokens(
         )
     prompt_only: Final = bool(prompt) and conversation_empty
     request_messages: Final = _counted_request_messages(messages, messages_format, count_deployment)
+    local_count_error: Final = malformed_tool_result_count_error(request_messages, messages_format, count_deployment)
+    malformed_messages: Final = (
+        None
+        if local_count_error is None
+        else ProxyException(message=local_count_error, type="token_counting_error", param="messages", code=400)
+    )
+    context_edits: Final = _count_context_management(context_management, request.model, request_litellm_params)
+    route: Final = (
+        _messages_route(deployment_view, request.model)
+        if request_messages is not None and messages_format == "anthropic"
+        else None
+    )
+    if context_edits is not None and route in _GATEWAY_EDIT_ROUTES and malformed_messages is not None:
+        raise malformed_messages
+    edited_request: Final = (
+        None
+        if route is None or request_messages is None
+        else await _gateway_request_view(
+            route,
+            request_messages,
+            system,
+            _COUNT_TOOLS.validate_python(tools),
+            messages_format,
+            context_edits,
+            deployment_view,
+            model_to_use,
+        )
+    )
+    if isinstance(edited_request, InferenceRequestViewError):
+        raise _rejected_view(edited_request.status_code, edited_request.error_message)
+    inference_messages: Final = (
+        request_messages if edited_request is None else [dict(message) for message in edited_request.messages]
+    )
+    inference_system: Final = system if edited_request is None else edited_request.system
     contents_estimable: Final = not contents or (bool(messages) and _estimable_contents(contents))
     prompt_as_message: Final = prompt_only and custom_llm_provider in _PROVIDERS_COUNTING_WITHOUT_MESSAGES
     routed_deployment: Final = _ROUTED_DEPLOYMENT.validate_python(deployment)
@@ -15594,7 +15946,7 @@ async def _count_request_tokens(
         else await chat_count_request(
             model_to_use,
             custom_llm_provider,
-            _deployment_api_base(deployment_view),
+            _deployment_api_base(deployment_view, routed_request),
             routed_request,
             _count_drop_policy(routed_deployment, routed_request),
         )
@@ -15621,30 +15973,30 @@ async def _count_request_tokens(
                     if chat_count is not None
                     else [{"role": "user", "content": prompt}]
                     if prompt_as_message
-                    else request_messages
+                    else inference_messages
                 ),
                 contents=None if prompt_as_message else contents,
                 deployment=count_deployment,
                 request_model=request.model,
                 tools=tools if chat_count is None else [dict(tool) for tool in chat_count.tools or ()] or None,
-                system=system,
+                system=inference_system,
                 messages_format=messages_format,
                 output_format=output_format,
-                context_management=_count_context_management(context_management, request.model, request_litellm_params),
+                context_management=None if edited_request is not None else context_edits,
                 chat_params=MappingProxyType({}) if chat_count is None else chat_count.params,
             ),
             model_to_use=model_to_use,
             request_model=request.model,
             settings=settings,
             local_estimate_allowed=litellm.disable_token_counter is not True and contents_estimable,
+            forwarded_edits=context_edits is not None and edited_request is None,
         )
     )
     if isinstance(ladder, TokenCountResponse):
         return ladder
 
-    local_count_error: Final = malformed_tool_result_count_error(request_messages, messages_format, count_deployment)
-    if local_count_error is not None:
-        raise ProxyException(message=local_count_error, type="token_counting_error", param="messages", code=400)
+    if malformed_messages is not None:
+        raise malformed_messages
 
     # Check if token counter is disabled before fallback
     if litellm.disable_token_counter is True:
@@ -15655,6 +16007,27 @@ async def _count_request_tokens(
             code=503,
         )
 
+    local_view: Final = (
+        None
+        if route is not Target.MESSAGES or context_edits is None or request_messages is None
+        else await _bridged_request_view(
+            request_messages,
+            system,
+            _COUNT_TOOLS.validate_python(tools),
+            messages_format,
+            replace(context_edits, drop_invalid_edits=False),
+            deployment_view,
+            model_to_use,
+        )
+    )
+    if isinstance(local_view, InferenceRequestViewError):
+        raise _rejected_view(local_view.status_code, local_view.error_message)
+    counted_view: Final = edited_request if local_view is None else local_view
+    local_messages: Final = (
+        request_messages if counted_view is None else [dict(message) for message in counted_view.messages]
+    )
+    local_system: Final = system if counted_view is None else counted_view.system
+
     # Default LiteLLM token counting
     custom_tokenizer: CustomHuggingfaceTokenizer | None = None
     if model_info is not None:
@@ -15662,22 +16035,51 @@ async def _count_request_tokens(
             CustomHuggingfaceTokenizer | None,
             model_info.get("custom_tokenizer", None),
         )
-    system_message: Final = _system_message(system)
+    system_message: Final = _system_message(local_system)
     prompt_turn: Final = prompt_only and not (system_message is None and not tools)
     typed_messages: Final = cast(  # cast-ok: request messages are raw chat-shaped dicts that token_counter normalizes
         Sequence[AllMessageValues] | None,
-        [{"role": "user", "content": prompt}] if prompt_turn else (None if prompt_only else request_messages),
+        [{"role": "user", "content": prompt}] if prompt_turn else (None if prompt_only else local_messages),
     )
     counted_messages: Final = (
         typed_messages if typed_messages is None or system_message is None else (system_message, *typed_messages)
     )
-    counted_tools: Final = cast(  # cast-ok: raw OpenAI or Anthropic tool dicts, both of which token_counter formats
+    native_responses: Final = responses_request is not None and _serves_native_responses(
+        deployment_view, request.model, responses_request
+    )
+    sent_tools: Final = cast(  # cast-ok: raw OpenAI or Anthropic tool dicts, both of which token_counter formats
         list[ChatCompletionToolParam] | None, tools if counted_messages is not None else None
     )
-    framing: Final = settings.framing if counted_messages is not None and settings.framing is not None else 0
+    openai_model: Final = deployment_openai_model(deployment_view)
+    template_model: Final = openai_model or _deployment_base_model(deployment_view) or model_to_use
+    tool_section: Final = chat_template_tool_section(template_model)
+    counted_tools: Final = (
+        cast(list[ChatCompletionToolParam], list(_with_strict_by_default(sent_tools)))  # cast-ok: strict added
+        if sent_tools is not None
+        and native_responses
+        and _deployment_provider(deployment_view, request.model, responses_request) in _AZURE_PROVIDERS
+        and tool_section is not None
+        and tool_section.renders_strict_only_when_true
+        else sent_tools
+    )
+    framing: Final = (
+        0
+        if counted_messages is None
+        else settings.hidden_prompt_tokens(
+            carries_tools=sends_function_tools(counted_tools), responses_api=native_responses
+        )
+    )
     kimi_k3_messages: Final = counted_messages if settings.tokenizer == "kimi_k3" else None
     exact: Final = (
-        await _kimi_k3_count(request, messages_format, model_to_use, kimi_k3_messages, counted_tools)
+        await _kimi_k3_count(
+            request
+            if counted_view is None
+            else request.model_copy(update={"messages": local_messages, "system": local_system}),
+            messages_format,
+            model_to_use,
+            kimi_k3_messages,
+            counted_tools,
+        )
         if kimi_k3_messages is not None and custom_tokenizer is None
         else None
     )
@@ -15690,7 +16092,8 @@ async def _count_request_tokens(
             count_source="local_estimate",
         )
     estimate: Final = await _local_token_estimate(
-        model=deployment_openai_model(deployment_view) or model_to_use,
+        model=openai_model or model_to_use,
+        template_model=template_model,
         prompt=prompt if counted_messages is None else None,
         messages=counted_messages,
         tools=counted_tools,
@@ -20792,53 +21195,56 @@ async def delete_config_general_settings(
     if data.field_name in _GENERAL_SETTINGS_UI_LITELLM_FIELDS:
         return await _reset_general_settings_ui_litellm_field(data.field_name, user_api_key_dict)
 
-    if data.field_name not in ConfigGeneralSettings.model_fields:
+    config_table: Final[TableActions[_ConfigParamValueRow]] = _config_param_table(prisma_client)
+    stored_row: Final = await config_table.find_first(where={"param_name": "general_settings"})
+    stored: Final = (
+        _SETTINGS_MAPPING.validate_python(stored_row.param_value)
+        if stored_row is not None and isinstance(stored_row.param_value, Mapping)
+        else None
+    )
+
+    if not _general_settings_row_is_readable(stored_row):
+        raise HTTPException(
+            status_code=400,
+            detail={
+                "error": "general_settings is stored in the database as something other than a JSON object, so no "
+                "field can be removed from it"
+            },
+        )
+
+    if data.field_name not in ConfigGeneralSettings.model_fields and (stored is None or data.field_name not in stored):
         raise HTTPException(
             status_code=400,
             detail={"error": f"Invalid field={data.field_name} passed in."},
         )
 
-    proxy_config.reject_config_owned_deletes(section_name="general_settings", keys=(data.field_name,))
+    if data.field_name in _db_managed_general_settings_keys():
+        proxy_config.reject_config_owned_deletes(section_name="general_settings", keys=(data.field_name,))
 
-    ## get general settings from db
-    db_general_settings: Final[_ConfigParamRow | None] = await _config_param_table(prisma_client).find_first(
-        where={"param_name": "general_settings"}
-    )
-    ### pop the value
-
-    if db_general_settings is None or db_general_settings.param_value is None:
+    if stored is None:
         raise HTTPException(
             status_code=400,
             detail={"error": f"Field name={data.field_name} not in config"},
         )
-    else:
-        general_settings = dict(db_general_settings.param_value)
-
-    before_general_settings: Final = copy.deepcopy(general_settings)
-
-    ## update db
-
-    general_settings.pop(data.field_name, None)
 
+    remaining: Final = {key: value for key, value in stored.items() if key != data.field_name}
     response: Final = await ConfigRepository(prisma_client).table.upsert(
         where={"param_name": "general_settings"},
         data={
             "create": {
                 "param_name": "general_settings",
-                "param_value": json.dumps(general_settings),
+                "param_value": json.dumps(remaining),
             },
-            "update": {"param_value": json.dumps(general_settings)},
+            "update": {"param_value": json.dumps(remaining)},
         },
     )
     await invalidate_config_param("general_settings")
-    proxy_config.settings.apply_db_row("general_settings", general_settings)
+    proxy_config.settings.apply_db_row("general_settings", remaining)
     if is_resource_list("general_settings", data.field_name):
-        stored_endpoints: Final = general_settings.get("pass_through_endpoints")
+        stored_endpoints: Final = remaining.get("pass_through_endpoints")
         await proxy_config.serve_pass_through_endpoints(stored_endpoints if isinstance(stored_endpoints, list) else ())
     asyncio.create_task(
-        create_config_audit_log(
-            "general_settings", "deleted", before_general_settings, general_settings, user_api_key_dict
-        )
+        create_config_audit_log("general_settings", "deleted", dict(stored), remaining, user_api_key_dict)
     )
 
     return response
diff --git a/litellm/proxy/rerank_endpoints/endpoints.py b/litellm/proxy/rerank_endpoints/endpoints.py
index 4f2daed15ed..4905751a85d 100644
--- a/litellm/proxy/rerank_endpoints/endpoints.py
+++ b/litellm/proxy/rerank_endpoints/endpoints.py
@@ -20,6 +20,7 @@ from litellm.proxy.common_utils.openai_error_payload import (
     openai_error_param,
     openai_error_type,
 )
+from litellm.types.utils import CallTypes
 
 router: Final = APIRouter()
 
@@ -114,7 +115,10 @@ async def rerank(
         return response
     except Exception as e:
         await proxy_logging_obj.post_call_failure_hook(
-            user_api_key_dict=user_api_key_dict, original_exception=e, request_data=data
+            user_api_key_dict=user_api_key_dict,
+            original_exception=e,
+            request_data=data,
+            dispatched_call_type=CallTypes.arerank.value,
         )
         log_llm_api_exception(e, litellm_call_id)
         if isinstance(e, HTTPException):
diff --git a/litellm/proxy/spend_tracking/budget_reservation.py b/litellm/proxy/spend_tracking/budget_reservation.py
index fc6fb266d04..dcfd6148f54 100644
--- a/litellm/proxy/spend_tracking/budget_reservation.py
+++ b/litellm/proxy/spend_tracking/budget_reservation.py
@@ -432,7 +432,7 @@ async def invalidate_budget_reservation_counters(
 
 
 async def release_or_invalidate_budget_reservation(
-    budget_reservation: dict | None,  # mutable-ok: stamps finalized on the caller's shared reservation dict
+    budget_reservation: dict[str, object] | None,  # mutable-ok: stamps finalized on the caller's reservation
 ) -> None:
     """Reconcile a still-open reservation on a terminal path that settles no cost.
 
diff --git a/litellm/proxy/spend_tracking/spend_tracking_utils.py b/litellm/proxy/spend_tracking/spend_tracking_utils.py
index ba5f873c4e9..8b0ff718fec 100644
--- a/litellm/proxy/spend_tracking/spend_tracking_utils.py
+++ b/litellm/proxy/spend_tracking/spend_tracking_utils.py
@@ -20,7 +20,6 @@ from litellm.constants import (
     CALLER_SESSION_ID_METADATA_KEY,
     CLI_SESSION_KEY_PREFIX,
     EMPTY_MAPPING,
-    INTERNAL_CALL_ORIGIN_METADATA_KEY,
     KUBERNETES_POD_ROUTING_KEY,
     LITELLM_PROXY_MASTER_KEY_ALIAS,
     LITELLM_TRUNCATED_PAYLOAD_FIELD,
@@ -30,7 +29,6 @@ from litellm.constants import (
     MAX_SPEND_LOG_MODEL_NAME_LENGTH,
     MAX_STRING_LENGTH_COMPACTION_SUMMARY_IN_DB,
     MCP_SPEND_LOG_MODEL_PREFIX,
-    NON_INFERENCE_CALL_TYPES,
     REDACTED_BY_LITELM_STRING,
     SESSION_ID_OMITTED_METADATA_KEY,
     UNKNOWN_MODEL_SPEND_LOG_MODEL,
@@ -53,7 +51,11 @@ from litellm.litellm_core_utils.core_helpers import (
 )
 from litellm.litellm_core_utils.get_llm_provider_logic import declared_authenticating_provider
 from litellm.litellm_core_utils.hidden_params import served_from_cache
-from litellm.litellm_core_utils.internal_call_metadata import is_unbilled_non_inference_call
+from litellm.litellm_core_utils.internal_call_metadata import (
+    BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX,
+    is_unbilled_non_inference_call,
+    settles_background_response,
+)
 from litellm.litellm_core_utils.litellm_logging import (
     StandardLoggingPayloadSetup,
     UsageObservation,
@@ -79,13 +81,8 @@ from litellm.responses.litellm_completion_transformation.compaction_items import
     summary_only_compaction_content,
     with_compaction_summary,
 )
-from litellm.types.passthrough_endpoints.pass_through_endpoints import (
-    SETTLES_BACKGROUND_RESPONSE_KWARG,
-    BackgroundResponseSettlement,
-)
 from litellm.types.router import DeploymentTypedDict, LiteLLM_Params, SilentExperimentFlag
 from litellm.types.utils import (
-    BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN,
     PROMPT_CARRYING_GUARDRAIL_FIELDS,
     AzureSpillover,
     CallTypes,
@@ -347,24 +344,21 @@ def _get_spend_logs_metadata(
 
 
 BATCH_COST_REQUEST_ID_SUFFIX: Final = "_batch_cost"
-BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX: Final = "_background_cost"
 
 
-def _cost_row_request_id_suffix(
-    call_type: str, metadata: Mapping[str, object], settles_background_response: bool
-) -> str:
+def _cost_row_request_id_suffix(call_type: str, metadata: Mapping[str, object], kwargs: Mapping[str, object]) -> str:
     if call_type == CallTypes.aretrieve_batch.value:
         return BATCH_COST_REQUEST_ID_SUFFIX
-    if settles_background_response or (
-        call_type in NON_INFERENCE_CALL_TYPES
-        and metadata.get(INTERNAL_CALL_ORIGIN_METADATA_KEY) == BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN
-    ):
+    if settles_background_response(call_type, metadata, kwargs):
         return BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX
     return ""
 
 
 def get_spend_logs_id(
-    call_type: str, response_obj: dict, kwargs: Mapping[str, object], metadata: Mapping[str, object] = EMPTY_MAPPING
+    call_type: str,
+    response_obj: Mapping[str, object],
+    kwargs: Mapping[str, object],
+    metadata: Mapping[str, object] = EMPTY_MAPPING,
 ) -> str | None:
     standard_logging_payload = kwargs.get("standard_logging_object")
     candidate_ids: Final = (
@@ -377,10 +371,7 @@ def get_spend_logs_id(
     )
     if resolved_id is None:
         return None
-    settles_background_response: Final = (
-        kwargs.get(SETTLES_BACKGROUND_RESPONSE_KWARG) is BackgroundResponseSettlement.SETTLES
-    )
-    return f"{resolved_id}{_cost_row_request_id_suffix(call_type, metadata, settles_background_response)}"
+    return f"{resolved_id}{_cost_row_request_id_suffix(call_type, metadata, kwargs)}"
 
 
 _MISSING_ATTRIBUTE: Final = object()
diff --git a/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py b/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py
index e5348684d78..6d31fa3f226 100644
--- a/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py
+++ b/litellm/proxy/ui_crud_endpoints/proxy_setting_endpoints.py
@@ -16,6 +16,7 @@ from typing import (
 from urllib.parse import urlparse
 
 from fastapi import APIRouter, Body, Depends, File, HTTPException, UploadFile
+from prisma.errors import PrismaError
 from pydantic import BaseModel, ConfigDict, JsonValue, TypeAdapter, ValidationError, create_model, field_validator
 from pydantic.fields import FieldInfo, PydanticUndefined
 from typing_extensions import NotRequired, ReadOnly, TypedDict
@@ -26,6 +27,7 @@ from litellm._logging import verbose_proxy_logger
 from litellm.litellm_core_utils.sensitive_data_masker import mask_sensitive_keys
 from litellm.proxy._types import *
 from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
+from litellm.proxy.common_utils.encrypt_decrypt_utils import decrypt_value_helper
 from litellm.proxy.common_utils.validation_error_body import public_validation_errors
 from litellm.proxy.config_resolvers import FieldSource, SettingsStore, source_for
 from litellm.proxy.config_resolvers.settings_store import ConfigOwnedKeyError
@@ -1247,6 +1249,37 @@ async def get_sso_settings():
     }
 
 
+_ENVIRONMENT_VARIABLES_PARAM: Final = TypeAdapter(dict[str, object])
+
+
+def _parse_environment_variables_param(param_value: str | Mapping[str, object] | None) -> Mapping[str, object]:
+    if isinstance(param_value, str):
+        return _ENVIRONMENT_VARIABLES_PARAM.validate_python(json.loads(param_value))
+    return param_value or {}
+
+
+async def _load_environment_variables_param(
+    repo: ConfigRepository,
+) -> Mapping[str, object] | None | PrismaError | ValueError:
+    try:
+        entry: Final = await _config_param_db(repo).find_unique(where={"param_name": "environment_variables"})
+        param_value: Final = None if entry is None else _parse_environment_variables_param(entry.param_value)
+    except (PrismaError, ValueError) as e:
+        return e
+    else:
+        return param_value
+
+
+def _decrypted_sso_fields(environment_variables: Mapping[str, object]) -> Mapping[str, str | None]:
+    return MappingProxyType(
+        {
+            field_name: decrypt_value_helper(value=value, key=env_var, return_original_value=True)
+            for field_name, env_var in SSO_FIELD_ENV_VARS.items()
+            if isinstance(value := environment_variables.get(env_var), str)
+        }
+    )
+
+
 @router.patch(
     "/update/sso_settings",
     tags=["SSO Settings"],
@@ -1310,9 +1343,24 @@ async def update_sso_settings(
     if "general_settings" not in config:
         config["general_settings"] = {}
 
-    # Update environment variables in config and in memory
-    sso_data: Final = sso_config.model_dump()
-    for field_name, value in sso_data.items():
+    # PATCH semantics: omitted fields keep their stored value, an explicit null clears it. SSO values that
+    # still live only in the environment_variables row are carried over, since that row is stripped below
+    environment_variables_param: Final = await _load_environment_variables_param(
+        ConfigRepository(prisma_client, use_writer=True)
+    )
+    legacy_env_values: Final[Mapping[str, str | None]] = (
+        _decrypted_sso_fields(environment_variables_param)
+        if isinstance(environment_variables_param, Mapping)
+        else MappingProxyType({})
+    )
+    stored_values: Final = {k: v for k, v in (before_sso_data or {}).items() if v is not None}
+    fallback_values: Final = {**legacy_env_values, **stored_values}
+    submitted: Final = sso_config.model_dump(include=sso_config.model_fields_set)
+    sso_data: Final = {
+        field_name: submitted[field_name] if field_name in submitted else fallback_values.get(field_name)
+        for field_name in SSOConfig.model_fields
+    }
+    for field_name, value in submitted.items():
         if field_name in SSO_FIELD_ENV_VARS:
             env_var_name = SSO_FIELD_ENV_VARS[field_name]
             if value:
@@ -1348,25 +1396,17 @@ async def update_sso_settings(
         )
     )
 
-    # Remove SSO-related env vars from config.environment_variables
-    try:
-        env_var_entry: Final = await _config_param_db(ConfigRepository(prisma_client, use_writer=True)).find_unique(
-            where={"param_name": "environment_variables"}
+    if isinstance(environment_variables_param, (PrismaError, ValueError)):
+        raise HTTPException(
+            status_code=500,
+            detail={"error": f"Error updating environment_variables: {environment_variables_param}"},
         )
 
-        # If no environment_variables entry exists, nothing to clean up
-        if env_var_entry is not None:
-            if env_var_entry.param_value is not None:
-                if isinstance(env_var_entry.param_value, str):
-                    environment_variables: Mapping[str, object] = json.loads(env_var_entry.param_value)
-                else:
-                    environment_variables = dict(env_var_entry.param_value)
-            else:
-                environment_variables = {}
-
+    if environment_variables_param is not None:
+        try:
             env_vars_to_remove: Final = set(SSO_FIELD_ENV_VARS.values())
             filtered_env_vars: Final = {
-                key: value for key, value in environment_variables.items() if key not in env_vars_to_remove
+                key: value for key, value in environment_variables_param.items() if key not in env_vars_to_remove
             }
 
             await _config_param_db(ConfigRepository(prisma_client)).update(
@@ -1376,16 +1416,16 @@ async def update_sso_settings(
                 },
             )
             await invalidate_config_param("environment_variables")
-    except Exception as e:
-        raise HTTPException(
-            status_code=500,
-            detail={"error": f"Error updating environment_variables: {e}"},
-        )
+        except Exception as e:
+            raise HTTPException(
+                status_code=500,
+                detail={"error": f"Error updating environment_variables: {e}"},
+            )
 
     return {
         "message": "SSO settings updated successfully",
         "status": "success",
-        "settings": sso_data,
+        "settings": mask_sensitive_keys(sso_data, set(SSO_SECRET_FIELDS)),
     }
 
 
diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py
index a1b36e5b7a1..837433fd8cc 100644
--- a/litellm/proxy/utils.py
+++ b/litellm/proxy/utils.py
@@ -68,6 +68,7 @@ from litellm.constants import (
     SPEND_LOG_QUEUE_MAX_BYTES,
     SPEND_LOG_WRITE_BATCH_MAX_BYTES,
     SPEND_LOG_WRITE_BATCH_MAX_ROWS,
+    VLLM_CHOICE_FIELDS,
 )
 from litellm.cost_calculator import BaseTokenUsageProcessor
 from litellm.litellm_core_utils.bug_report import (
@@ -170,6 +171,7 @@ from litellm.litellm_core_utils.litellm_logging import (
     deployment_pricing_model_info,
 )
 from litellm.litellm_core_utils.llm_cost_calc.utils import generic_cost_per_token
+from litellm.litellm_core_utils.redact_messages import drop_token_ids
 from litellm.litellm_core_utils.routing_common_utils import resolve_model_group_alias
 from litellm.litellm_core_utils.safe_json_dumps import safe_dumps
 from litellm.litellm_core_utils.safe_json_loads import safe_json_loads
@@ -179,6 +181,7 @@ from litellm.litellm_core_utils.served_output_texts import (
 )
 from litellm.litellm_core_utils.token_counter import offload_token_count, usage_tokenizer_model
 from litellm.llms import load_guardrail_translation_mappings
+from litellm.llms.base_llm.guardrail_translation.utils import stream_item_field, stream_item_items
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
 from litellm.proxy._types import (
     AlertType,
@@ -707,6 +710,56 @@ def _pipeline_step_streams_live(step: "PipelineStep") -> bool:
     return not unified_guardrail.resolve_streaming_flag(callback, "streaming_buffer_until_moderated", True)
 
 
+def _drop_stream_chunk_token_ids(chunk: object) -> None:
+    for choice in stream_item_items(chunk, "choices"):
+        drop_token_ids(choice)
+
+
+def _drop_built_stream_token_ids(request_data: Mapping[str, object]) -> None:
+    logging_obj: Final = request_data.get("litellm_logging_obj")
+    if isinstance(logging_obj, Logging):
+        logging_obj.drops_stream_token_ids = True
+
+
+def _drop_token_ids_ahead_of_chunk_check(
+    callback: CustomLogger, chunk: object, request_data: Mapping[str, object]
+) -> None:
+    if _overrides_hook(callback, "async_post_call_streaming_hook"):
+        _drop_stream_chunk_token_ids(chunk)
+        _drop_built_stream_token_ids(request_data)
+
+
+_PLAIN_STREAM_FIELDS: Final = TypeAdapter(dict[str, object])
+_EMPTY_STREAM_VALUES: Final[tuple[object, ...]] = (None, "", [], {})
+
+
+def _holds_stream_payload(value: object) -> bool:
+    if isinstance(value, dict):
+        nested: Final = _PLAIN_STREAM_FIELDS.validate_python(value).values()
+        return any(item not in _EMPTY_STREAM_VALUES for item in nested)
+    return value not in _EMPTY_STREAM_VALUES
+
+
+def _choice_carries_only_token_ids(choice: object) -> bool:
+    if stream_item_field(choice, "token_ids") is None or not isinstance(choice, BaseModel):
+        return False
+    fields: Final = _PLAIN_STREAM_FIELDS.validate_python(choice.model_dump())
+    return not any(_holds_stream_payload(value) for key, value in fields.items() if key not in ("index", "token_ids"))
+
+
+def _is_token_id_only_chunk(chunk: object) -> bool:
+    choices: Final = stream_item_items(chunk, "choices")
+    return bool(choices) and all(_choice_carries_only_token_ids(choice) for choice in choices)
+
+
+async def _without_token_id_only_chunks(response: AsyncIterable[object]) -> AsyncGenerator[object, None]:
+    async for chunk in response:
+        if _is_token_id_only_chunk(chunk):
+            _drop_stream_chunk_token_ids(chunk)
+            continue
+        yield chunk
+
+
 def _pipelines_stream_live(pipelines: Sequence[tuple[str, "GuardrailPipeline"]]) -> bool:
     return all(_pipeline_step_streams_live(step) for step in _pipeline_steps(pipelines))
 
@@ -1707,7 +1760,10 @@ def _proxy_only_error_log_fields(
 
 
 def _failure_fields_to_lift(
-    request_data: Mapping[str, object], provider_billed: bool = False, dispatched_call_type: str | None = None
+    request_data: Mapping[str, object],
+    provider_billed: bool = False,
+    dispatched_call_type: str | None = None,
+    route_call_type: str | None = None,
 ) -> Mapping[str, object]:
     """Failure-path callbacks run after ``litellm_logging_obj`` is popped from
     request_data (it is not serialisable), so the caller merges these fields
@@ -1717,7 +1773,8 @@ def _failure_fields_to_lift(
     attribution on failed-request spend logs."""
     _logging_obj: Final = request_data.get("litellm_logging_obj")
     if _logging_obj is None:
-        return _EMPTY_LIFT
+        return _EMPTY_LIFT if dispatched_call_type is None else MappingProxyType({"call_type": dispatched_call_type})
+    _estimate_call_type: Final = dispatched_call_type or route_call_type
     _model_call_details: Final = getattr(_logging_obj, "model_call_details", {})
     _first_handoff: Final = _model_call_details.get("first_api_call_start_time")
     _litellm_params: Final = getattr(_logging_obj, "litellm_params", None)
@@ -1732,10 +1789,10 @@ def _failure_fields_to_lift(
         provider_billed=_billed,
         deployment_id=_deployment_id,
         base_model=_base_model,
-        dispatched_call_type=dispatched_call_type,
+        dispatched_call_type=_estimate_call_type,
     )
     _prompt_estimate: Final = (
-        _estimated_prompt_usage(_model_call_details, request_data, dispatched_call_type)
+        _estimated_prompt_usage(_model_call_details, request_data, _estimate_call_type)
         if _billed and _first_handoff is not None and not _model_call_details.get("failed_attempts_usage")
         else None
     )
@@ -1755,7 +1812,7 @@ def _failure_fields_to_lift(
             _billed,
             _deployment_id,
             _base_model,
-            dispatched_call_type,
+            _estimate_call_type,
         )
         if Logging.usage_capture_callback is not None
         and (_billed or _model_call_details.get("combined_usage_object") is not None)
@@ -4051,13 +4108,15 @@ class ProxyLogging:
                 route=route,
                 original_exception=original_exception,
                 error_type=error_type,
+                dispatched_call_type=dispatched_call_type,
             )
 
         request_data.update(
             await offload_token_count(_failure_fields_to_lift)(
                 request_data,
                 provider_billed=_provider_billed_the_failure(original_exception),
-                dispatched_call_type=dispatched_call_type or _call_type_for_route(user_api_key_dict.request_route),
+                dispatched_call_type=dispatched_call_type,
+                route_call_type=_call_type_for_route(user_api_key_dict.request_route),
             )
         )
 
@@ -4146,6 +4205,7 @@ class ProxyLogging:
         route: str | None = None,
         original_exception: Exception | None = None,
         error_type: ProxyErrorTypes | None = None,
+        dispatched_call_type: str | None = None,
     ):
         """
         Handle logging for proxy only errors by calling `litellm_logging_obj.async_failure_handler`
@@ -4245,7 +4305,7 @@ class ProxyLogging:
                 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 (
-                None if set_up_by_request else body_shape_call_type
+                None if set_up_by_request else dispatched_call_type or 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
@@ -4710,6 +4770,7 @@ class ProxyLogging:
                     else:
                         _callback = callback
                     if _callback is not None and isinstance(_callback, CustomLogger):
+                        _drop_token_ids_ahead_of_chunk_check(_callback, response, data)
                         if str_so_far is not None:
                             complete_response = str_so_far + response_str
                         else:
@@ -4731,7 +4792,7 @@ class ProxyLogging:
         self,
         response,
         user_api_key_dict: UserAPIKeyAuth,
-        request_data: dict,
+        request_data: dict[str, object],
     ):
         """
         Allow user to modify outgoing streaming data -> Given a whole response iterator.
@@ -4765,20 +4826,26 @@ class ProxyLogging:
         # Merge model-level guardrails before checking which guardrails to run
         request_data = check_and_merge_model_level_guardrails(data=request_data, llm_router=llm_router)
 
-        current_response = response
         stream_needs_translation: Final = ProxyLogging._stream_requires_guardrail_translation(user_api_key_dict)
 
         pipeline_gated_names: Final = _pipeline_step_guardrail_names(post_call_pipelines)
+        running_overrides: Final = tuple(
+            (callback, kind)
+            for callback, kind in caps.iterator_overrides
+            if not isinstance(callback, CustomGuardrail)
+            or (
+                callback.guardrail_name not in pipeline_gated_names
+                and callback.should_run_guardrail(data=request_data, event_type=GuardrailEventHooks.post_call) is True
+            )
+        )
+        drops_token_ids: Final = bool(post_call_pipelines) or any(
+            isinstance(callback, CustomGuardrail) for callback, _ in running_overrides
+        )
+        if drops_token_ids:
+            _drop_built_stream_token_ids(request_data)
+        current_response = _without_token_id_only_chunks(response) if drops_token_ids else response
         guarded_layers: Final[list[AsyncGenerator[object, None]]] = []  # mutable-ok: closed on disconnect
-        for resolved_callback, kind in caps.iterator_overrides:
-            if isinstance(resolved_callback, CustomGuardrail):
-                if resolved_callback.guardrail_name in pipeline_gated_names:
-                    continue
-                if (
-                    resolved_callback.should_run_guardrail(data=request_data, event_type=GuardrailEventHooks.post_call)
-                    is not True
-                ):
-                    continue
+        for resolved_callback, kind in running_overrides:
             effective_kind = (
                 "apply_guardrail"
                 if (
@@ -4836,6 +4903,8 @@ class ProxyLogging:
         try:
             async for chunk in current_response:
                 served_chunks.append(chunk)
+                if drops_token_ids:
+                    _drop_stream_chunk_token_ids(served_chunks[-1])
                 yield chunk
         except (GeneratorExit, asyncio.CancelledError):
             await ProxyLogging._close_guarded_layers(guarded_layers)
@@ -10203,7 +10272,7 @@ _PRESERVED_NONE_FIELDS: Final[list[tuple[str, str]]] = [
     ("message", "refusal"),
     ("delta", "content"),  # null in streaming chunks
 ]
-_PRESERVED_NONE_CHOICE_FIELDS: Final = ("logprobs",)
+_PRESERVED_NONE_CHOICE_FIELDS: Final = ("logprobs", *VLLM_CHOICE_FIELDS)
 _PRESERVED_NONE_RESPONSE_FIELDS: Final = ("system_fingerprint",)
 
 
diff --git a/litellm/responses/litellm_completion_transformation/session_handler.py b/litellm/responses/litellm_completion_transformation/session_handler.py
index 7cf163e7ce8..7e6ee84e2b2 100644
--- a/litellm/responses/litellm_completion_transformation/session_handler.py
+++ b/litellm/responses/litellm_completion_transformation/session_handler.py
@@ -1,14 +1,16 @@
 import asyncio
 import json
-from collections.abc import Mapping, Sequence
+from collections.abc import Iterable, Iterator, Mapping, Sequence
 from dataclasses import dataclass
 from itertools import chain
+from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, cast
 
 import litellm
 from litellm._logging import verbose_proxy_logger
 from litellm.constants import REDACTED_BY_LITELLM, REDACTED_TOOL_CALL_ARGUMENTS_PLACEHOLDER
 from litellm.litellm_core_utils.cold_storage_handler import ColdStorageHandler
+from litellm.litellm_core_utils.core_helpers import as_str_mapping
 from litellm.responses.litellm_completion_transformation.client_tool_search import (
     bridge_client_tool_search,
     client_tool_search_loaded_tools,
@@ -69,6 +71,90 @@ def _is_a_conversation_turn(spend_log: "SpendLogsPayload") -> bool:
     return spend_log.get("call_type") not in _MCP_TOOL_CALL_TYPES and not _is_a_failed_turn(spend_log)
 
 
+_RESPONSE_READ_CALL_TYPES: Final = frozenset(("aget_responses", "acancel_responses"))
+
+
+def _output_item_id(item: object) -> str | None:
+    match item:
+        case {"id": str() as item_id}:
+            return item_id
+        case _:
+            return None
+
+
+def _is_a_response_read(spend_log: "SpendLogsPayload") -> bool:
+    return "call_type" in spend_log and spend_log["call_type"] in _RESPONSE_READ_CALL_TYPES
+
+
+def _stored_response(spend_log: "SpendLogsPayload") -> object:
+    return spend_log.get("response")
+
+
+def _output_items(spend_log: "SpendLogsPayload") -> Iterator[tuple[str | None, object]]:
+    output: Final = _stored_responses_api_output(_stored_response(spend_log)) or []
+    return zip(map(_output_item_id, output), output)
+
+
+def _identified_output_items(spend_log: "SpendLogsPayload") -> Iterator[tuple[str, object]]:
+    return ((item_id, item) for item_id, item in _output_items(spend_log) if item_id is not None)
+
+
+def _output_item_ids(spend_log: "SpendLogsPayload") -> frozenset[str]:
+    return frozenset(item_id for item_id, _ in _identified_output_items(spend_log))
+
+
+def _first_index_holding_each_item(indexed_turns: Iterable[tuple[int, "SpendLogsPayload"]]) -> Mapping[str, int]:
+    return dict(
+        chain.from_iterable(
+            ((item_id, index) for item_id in _output_item_ids(turn)) for index, turn in reversed(tuple(indexed_turns))
+        )
+    )
+
+
+def _turn_replaying_each_item(turns: Sequence["SpendLogsPayload"]) -> Mapping[str, int]:
+    indexed_turns: Final = tuple(enumerate(turns))
+    first_read_holding: Final = _first_index_holding_each_item(
+        (index, turn) for index, turn in indexed_turns if _is_a_response_read(turn)
+    )
+    first_other_turn_holding: Final = _first_index_holding_each_item(
+        (index, turn) for index, turn in indexed_turns if not _is_a_response_read(turn)
+    )
+    return MappingProxyType({**first_read_holding, **first_other_turn_holding})
+
+
+def _latest_read_copy_of_each_item(turns: Sequence["SpendLogsPayload"]) -> Mapping[str, object]:
+    return MappingProxyType(
+        dict(chain.from_iterable(_identified_output_items(turn) for turn in turns if _is_a_response_read(turn)))
+    )
+
+
+def _with_only_new_output(
+    index: int, turn: "SpendLogsPayload", turn_replaying: Mapping[str, int], latest_copy: Mapping[str, object]
+) -> "SpendLogsPayload | None":
+    if not _is_a_response_read(turn):
+        return turn
+    stored_response: Final = as_str_mapping(_stored_response(turn))
+    new_output: Final = [
+        item if item_id is None else latest_copy[item_id]
+        for item_id, item in _output_items(turn)
+        if item_id is None or turn_replaying.get(item_id) == index
+    ]
+    if stored_response is None or not new_output:
+        return None
+    replayed_turn: Final[SpendLogsPayload] = {**turn, "response": {**stored_response, "output": new_output}}
+    return replayed_turn
+
+
+def _conversation_turns(spend_logs: Sequence["SpendLogsPayload"]) -> tuple["SpendLogsPayload", ...]:
+    turns: Final = tuple(filter(_is_a_conversation_turn, spend_logs))
+    turn_replaying: Final = _turn_replaying_each_item(turns)
+    latest_copy: Final = _latest_read_copy_of_each_item(turns)
+    replayed: Final = (
+        _with_only_new_output(index, turn, turn_replaying, latest_copy) for index, turn in enumerate(turns)
+    )
+    return tuple(turn for turn in replayed if turn is not None)
+
+
 _MCP_AUTO_EXECUTE_OUTPUT_TYPES: Final = frozenset(("mcp_tools_fetched", "tool_execution_results"))
 
 
@@ -101,7 +187,7 @@ class StoredTurns:
 def _compaction_point(
     index: int, spend_log: "SpendLogsPayload", proxy_server_request: Mapping[str, object] | None
 ) -> _ReplayStart | None:
-    if response_holds_compaction_block(spend_log.get("response")):
+    if response_holds_compaction_block(_stored_response(spend_log)):
         return _ReplayStart(index=index, at_output=True)
     if proxy_server_request is not None and holds_compaction_summary(proxy_server_request.get("input")):
         return _ReplayStart(index=index, at_output=False)
@@ -271,12 +357,10 @@ class ResponsesSessionHandler:
         previous_response_id: str,
         client_response_ids: tuple[str, ...] = (),
     ) -> StoredTurns:
-        spend_logs: Final = tuple(
-            spend_log
-            for spend_log in await ResponsesSessionHandler.get_all_spend_logs_for_previous_response_id(
+        spend_logs: Final = _conversation_turns(
+            await ResponsesSessionHandler.get_all_spend_logs_for_previous_response_id(
                 previous_response_id, client_response_ids
             )
-            if _is_a_conversation_turn(spend_log)
         )
         return StoredTurns(
             spend_logs=spend_logs,
@@ -378,7 +462,7 @@ class ResponsesSessionHandler:
         ############################################################
         # Add Output messages for this Spend Log
         ############################################################
-        _response_output: Final[object] = spend_log.get("response", "{}")
+        _response_output: Final = _stored_response(spend_log)
         if (responses_api_output := _stored_responses_api_output(_response_output)) is not None:
             chat_completion_message_history.extend(
                 LiteLLMCompletionResponsesConfig.transform_responses_api_input_to_messages(
diff --git a/litellm/responses/litellm_completion_transformation/streaming_iterator.py b/litellm/responses/litellm_completion_transformation/streaming_iterator.py
index ddcdc66ff20..521a698b276 100644
--- a/litellm/responses/litellm_completion_transformation/streaming_iterator.py
+++ b/litellm/responses/litellm_completion_transformation/streaming_iterator.py
@@ -27,7 +27,11 @@ from litellm.responses.litellm_completion_transformation.tool_search import (
 from litellm.responses.litellm_completion_transformation.transformation import (
     LiteLLMCompletionResponsesConfig,
 )
-from litellm.responses.streaming_iterator import ResponsesAPIStreamingIterator, stamp_responses_usage_cost
+from litellm.responses.streaming_iterator import (
+    SEQUENCE_NUMBER_STAMPED_ON_EMISSION,
+    ResponsesAPIStreamingIterator,
+    stamp_responses_usage_cost,
+)
 from litellm.responses.utils import ResponsesAPIRequestUtils
 from litellm.types.llms.openai import (
     PART_UNION_TYPES,
@@ -239,14 +243,11 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         return execution
 
     def _next_output_item_added(self, output_index: int, item: BaseLiteLLMOpenAIResponseObject) -> OutputItemAddedEvent:
-        self._sequence_number += 1
-        added: Final = OutputItemAddedEvent(
+        return OutputItemAddedEvent(
             type=ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED,
             output_index=output_index,
             item=item,
         )
-        added.__dict__["sequence_number"] = self._sequence_number
-        return added
 
     def _queue_output_item_added(self, output_index: int, item: BaseLiteLLMOpenAIResponseObject) -> None:
         self._pending_tool_events.append(self._next_output_item_added(output_index, item))
@@ -268,12 +269,10 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         item: Final = build_tool_search_call(
             call_id, final_args or self._tool_args_by_call_id.get(call_id, ""), "completed", execution
         )
-        self._sequence_number += 1
         self._pending_tool_events.append(
             OutputItemDoneEvent(
                 type=ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE,
                 output_index=output_index,
-                sequence_number=self._sequence_number,
                 item=BaseLiteLLMOpenAIResponseObject(**item.model_dump()),
             )
         )
@@ -346,12 +345,10 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         if streamed_item is None:
             return
         self._sent_compaction_item_done = True
-        self._sequence_number += 1
         self._pending_response_events.append(
             OutputItemDoneEvent(
                 type=ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE,
                 output_index=self._compaction_output_index,
-                sequence_number=self._sequence_number,
                 item=streamed_item,
             )
         )
@@ -494,15 +491,12 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
                 chunk_size = 10  # Match typical OpenAI delta size
                 for i in range(0, len(fn_args_delta), chunk_size):
                     delta_chunk = fn_args_delta[i : i + chunk_size]
-                    self._sequence_number += 1
                     delta_event: BaseLiteLLMOpenAIResponseObject = FunctionCallArgumentsDeltaEvent(
                         type=ResponsesAPIStreamEvents.FUNCTION_CALL_ARGUMENTS_DELTA,
                         item_id=self._tool_item_id_by_call_id.get(call_id, call_id),
                         output_index=output_index,
                         delta=delta_chunk,
                     )
-                    # Add sequence_number as extra field (BaseLiteLLMOpenAIResponseObject allows extra fields)
-                    delta_event.__dict__["sequence_number"] = self._sequence_number
                     self._pending_tool_events.append(delta_event)
 
     def _queue_final_tool_call_done_events(self, litellm_complete_object: ModelResponse) -> None:
@@ -567,33 +561,27 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
                 chunk_size = 10  # Match typical OpenAI delta size
                 for i in range(0, len(remaining_args), chunk_size):
                     delta_chunk = remaining_args[i : i + chunk_size]
-                    self._sequence_number += 1
                     delta_event = FunctionCallArgumentsDeltaEvent(
                         type=ResponsesAPIStreamEvents.FUNCTION_CALL_ARGUMENTS_DELTA,
                         item_id=self._tool_item_id_by_call_id.get(call_id, call_id),
                         output_index=output_index,
                         delta=delta_chunk,
                     )
-                    delta_event.__dict__["sequence_number"] = self._sequence_number
                     self._pending_tool_events.append(delta_event)
 
-            self._sequence_number += 1
             done_event = FunctionCallArgumentsDoneEvent(
                 type=ResponsesAPIStreamEvents.FUNCTION_CALL_ARGUMENTS_DONE,
                 item_id=self._tool_item_id_by_call_id.get(call_id, call_id),
                 output_index=output_index,
                 arguments=final_args,
             )
-            done_event.__dict__["sequence_number"] = self._sequence_number
             self._pending_tool_events.append(done_event)
 
-            self._sequence_number += 1
             item_kwargs = self._tool_call_item_kwargs(call_id, fn_name, final_args, "completed")
             item_kwargs["id"] = self._tool_item_id_by_call_id.setdefault(call_id, item_kwargs["id"])
             item_done_event = OutputItemDoneEvent(
                 type=ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE,
                 output_index=output_index,
-                sequence_number=self._sequence_number,
                 item=BaseLiteLLMOpenAIResponseObject(
                     **item_kwargs,
                     **(_tool_call_provider_specific_fields(tc) if self.tool_call_provider_fields else {}),
@@ -625,16 +613,11 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
             _WEB_SEARCH_PROGRESS_EVENTS[:1] if item.status == "in_progress" else _WEB_SEARCH_PROGRESS_EVENTS
         )
         for event_type, event_class in progress_events:
-            self._sequence_number += 1
-            event = event_class(type=event_type, output_index=output_index, item_id=item.id)
-            event.__dict__["sequence_number"] = self._sequence_number
-            self._pending_tool_events.append(event)
-        self._sequence_number += 1
+            self._pending_tool_events.append(event_class(type=event_type, output_index=output_index, item_id=item.id))
         self._pending_tool_events.append(
             OutputItemDoneEvent(
                 type=ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE,
                 output_index=output_index,
-                sequence_number=self._sequence_number,
                 item=BaseLiteLLMOpenAIResponseObject(**item.model_dump()),
             )
         )
@@ -770,31 +753,24 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
 
         """
         response_created_event_data: Final = self._default_response_created_event_data()
-        self._sequence_number += 1
-        event: Final = ResponseCreatedEvent(
+        return ResponseCreatedEvent(
             type=ResponsesAPIStreamEvents.RESPONSE_CREATED,
             response=self._with_encoded_response_id(ResponsesAPIResponse(**response_created_event_data)),
         )
-        event.__dict__["sequence_number"] = self._sequence_number
-        return event
 
     def create_response_in_progress_event(self) -> ResponseInProgressEvent:
         response_in_progress_event_data: Final = self._default_response_created_event_data()
         response_in_progress_event_data["status"] = "in_progress"
-        self._sequence_number += 1
-        event: Final = ResponseInProgressEvent(
+        return ResponseInProgressEvent(
             type=ResponsesAPIStreamEvents.RESPONSE_IN_PROGRESS,
             response=self._with_encoded_response_id(ResponsesAPIResponse(**response_in_progress_event_data)),
         )
-        event.__dict__["sequence_number"] = self._sequence_number
-        return event
 
     def create_output_item_added_event(self) -> OutputItemAddedEvent:
         if self._cached_item_id is None:
             self._cached_item_id = f"msg_{uuid.uuid4()}"
 
-        self._sequence_number += 1
-        event: Final = OutputItemAddedEvent(
+        return OutputItemAddedEvent(
             type=ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED,
             output_index=self._message_index(),
             item=BaseLiteLLMOpenAIResponseObject(
@@ -807,23 +783,18 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
                 }
             ),
         )
-        event.__dict__["sequence_number"] = self._sequence_number
-        return event
 
     def create_content_part_added_event(self) -> ContentPartAddedEvent:
         if self._cached_item_id is None:
             self._cached_item_id = f"msg_{uuid.uuid4()}"
 
-        self._sequence_number += 1
-        event: Final = ContentPartAddedEvent(
+        return ContentPartAddedEvent(
             type=ResponsesAPIStreamEvents.CONTENT_PART_ADDED,
             item_id=self._cached_item_id,
             output_index=self._message_index(),
             content_index=0,
             part=BaseLiteLLMOpenAIResponseObject(**{"type": "output_text", "text": "", "annotations": []}),
         )
-        event.__dict__["sequence_number"] = self._sequence_number
-        return event
 
     def _queue_message_item_added_events(self) -> None:
         if not self.sent_message_item_added_event:
@@ -834,7 +805,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
     def _queue_message_item_added_event(self) -> None:
         item_id: Final = self._message_item_id()
         self.sent_message_item_added_event = True
-        self._sequence_number += 1
         event: Final = OutputItemAddedEvent(
             type=ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED,
             output_index=self._message_index(),
@@ -848,7 +818,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
                 }
             ),
         )
-        event.__dict__["sequence_number"] = self._sequence_number
         self._pending_response_events.append(event)
 
     def _queue_refusal_events(self, refusal: str) -> None:
@@ -885,12 +854,7 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
                 part=ContentPartDonePartRefusal(type="refusal", refusal=refusal),
             ),
         )
-        first_sequence_number: Final = self._sequence_number + 1
-        self._sequence_number += len(events)
-        self._pending_response_events.extend(
-            event.model_copy(update={"sequence_number": sequence_number})
-            for sequence_number, event in enumerate(events, start=first_sequence_number)
-        )
+        self._pending_response_events.extend(events)
 
     def _merge_provider_specific_fields(self, src: dict) -> None:
         """Merge provider_specific_fields using last-value-wins for lists.
@@ -944,7 +908,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         self,
         reasoning_item_id: str,
         reasoning_content: str,
-        sequence_number: int,
     ) -> ReasoningSummaryTextDoneEvent:
         """
         Create response.reasoning_summary_text.done event.
@@ -954,7 +917,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
             "type": "response.reasoning_summary_text.done",
             "item_id": "rs_0c5dae30e53172980069708ba2f59c8197b71ca9820edad07c",
             "output_index": 0,
-            "sequence_number": 97,
             "summary_index": 0,
             "text": "**Clarifying the first humans**\n\nThe  I'm addressing the user's specific interest."
         }
@@ -963,7 +925,7 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
             type=ResponsesAPIStreamEvents.REASONING_SUMMARY_TEXT_DONE,
             item_id=reasoning_item_id,
             output_index=self._reasoning_index(),
-            sequence_number=sequence_number,
+            sequence_number=SEQUENCE_NUMBER_STAMPED_ON_EMISSION,
             summary_index=0,
             text=reasoning_content,
         )
@@ -972,7 +934,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         self,
         reasoning_item_id: str,
         reasoning_content: str,
-        sequence_number: int,
     ) -> ReasoningSummaryPartDoneEvent:
         """
         Create response.reasoning_summary_part.done event.
@@ -986,7 +947,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
                 "type": "summary_text",
                 "text": "**Clarifying the first humans**\n\nThe  earlier hominins. It feels important to ensure I'm addressing the user's specific interest."
             },
-            "sequence_number": 98,
             "summary_index": 0
         }
         """
@@ -994,7 +954,7 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
             type=ResponsesAPIStreamEvents.REASONING_SUMMARY_PART_DONE,
             item_id=reasoning_item_id,
             output_index=self._reasoning_index(),
-            sequence_number=sequence_number,
+            sequence_number=SEQUENCE_NUMBER_STAMPED_ON_EMISSION,
             summary_index=0,
             part=BaseLiteLLMOpenAIResponseObject(
                 **{
@@ -1066,7 +1026,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         return OutputItemDoneEvent(
             type=ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE,
             output_index=self._message_index(),
-            sequence_number=1,
             item=BaseLiteLLMOpenAIResponseObject(
                 **{
                     "id": self._cached_item_id,
@@ -1082,7 +1041,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         self,
         reasoning_item_id: str,
         reasoning_content: str,
-        sequence_number: int,
     ) -> OutputItemDoneEvent:
         """
         Create response.output_item.done event for reasoning items.
@@ -1091,7 +1049,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         {
             "type": "response.output_item.done",
             "output_index": 0,
-            "sequence_number": 99,
             "item": {
                 "id": "rs_0c5dae30e53172980069708ba2f59c8197b71ca9820edad07c",
                 "type": "reasoning",
@@ -1107,7 +1064,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         return OutputItemDoneEvent(
             type=ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE,
             output_index=self._reasoning_index(),
-            sequence_number=sequence_number,
             item=BaseLiteLLMOpenAIResponseObject(
                 **{
                     "id": reasoning_item_id,
@@ -1223,7 +1179,6 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         if chunk.choices[0].finish_reason is None and not _delta_carries_output(delta):
             return
 
-        self._sequence_number += 1
         self.sent_output_item_added_event = True
 
         # Reasoning-first
@@ -1233,20 +1188,20 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
                 self._cached_reasoning_item_id = mint_reasoning_item_id()
             self._reasoning_item_id = self._cached_reasoning_item_id
 
-            event = OutputItemAddedEvent(
-                type=ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED,
-                output_index=self._reasoning_index(),
-                item=BaseLiteLLMOpenAIResponseObject(
-                    **{
-                        "id": self._cached_reasoning_item_id,
-                        "type": "reasoning",
-                        "status": "in_progress",
-                        "summary": None,
-                    }
-                ),
+            self._pending_response_events.append(
+                OutputItemAddedEvent(
+                    type=ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED,
+                    output_index=self._reasoning_index(),
+                    item=BaseLiteLLMOpenAIResponseObject(
+                        **{
+                            "id": self._cached_reasoning_item_id,
+                            "type": "reasoning",
+                            "status": "in_progress",
+                            "summary": None,
+                        }
+                    ),
+                )
             )
-            event.__dict__["sequence_number"] = self._sequence_number
-            self._pending_response_events.append(event)
             return
 
         # Tool-first
@@ -1279,30 +1234,34 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
         )
         reasoning_item_id: Final = self._cached_reasoning_item_id
         self._queue_compaction_item_done()
-        self._sequence_number += 1
         text_done_event: Final = self.create_reasoning_summary_text_done_event(
             reasoning_item_id=reasoning_item_id,
             reasoning_content=reasoning_content,
-            sequence_number=self._sequence_number,
         )
-        self._sequence_number += 1
         part_done_event: Final = self.create_reasoning_summary_part_done_event(
             reasoning_item_id=reasoning_item_id,
             reasoning_content=reasoning_content,
-            sequence_number=self._sequence_number,
         )
-        self._sequence_number += 1
         reasoning_output_item_done_event: Final = self.create_reasoning_output_item_done_event(
             reasoning_item_id=reasoning_item_id,
             reasoning_content=reasoning_content,
-            sequence_number=self._sequence_number,
         )
         self._pending_response_events.extend([text_done_event, part_done_event, reasoning_output_item_done_event])
         self._reasoning_done_emitted = True
         self._reasoning_active = False
 
+    def _stamp_sequence_number(self, event: BaseLiteLLMOpenAIResponseObject) -> BaseLiteLLMOpenAIResponseObject:
+        stamped: Final = event.model_copy(update={"sequence_number": self._sequence_number})
+        self._sequence_number += 1
+        return stamped
+
     async def __anext__(
         self,
+    ) -> ResponsesAPIStreamingResponse | ResponseCompletedEvent | BaseLiteLLMOpenAIResponseObject:
+        return self._stamp_sequence_number(await self._anext_unstamped_event())
+
+    async def _anext_unstamped_event(
+        self,
     ) -> ResponsesAPIStreamingResponse | ResponseCompletedEvent | BaseLiteLLMOpenAIResponseObject:
         try:
             while True:
@@ -1363,6 +1322,11 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
 
     def __next__(
         self,
+    ) -> ResponsesAPIStreamingResponse | ResponseCompletedEvent | BaseLiteLLMOpenAIResponseObject:
+        return self._stamp_sequence_number(self._next_unstamped_event())
+
+    def _next_unstamped_event(
+        self,
     ) -> ResponsesAPIStreamingResponse | ResponseCompletedEvent | BaseLiteLLMOpenAIResponseObject:
         try:
             while True:
@@ -1504,16 +1468,13 @@ class LiteLLMCompletionStreamingIterator(ResponsesAPIStreamingIterator):
             if not self.sent_content_part_added_event:
                 self._queue_message_item_added_events()
             self._hold_tool_calls_behind_text(getattr(chunk.choices[0].delta, "tool_calls", None))
-            self._sequence_number += 1
-            text_delta_event: Final = OutputTextDeltaEvent(
+            return OutputTextDeltaEvent(
                 type=ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA,
                 item_id=item_id,
                 output_index=self._message_index(),
                 content_index=0,
                 delta=delta_content,
             )
-            text_delta_event.__dict__["sequence_number"] = self._sequence_number
-            return text_delta_event
 
         # Priority 3: Handle tool call deltas (if any) -> queue events and emit them
         # For each tool call delta, we emit events one at a time to match OpenAI's streaming behavior
diff --git a/litellm/responses/streaming_iterator.py b/litellm/responses/streaming_iterator.py
index 09ee6828157..da8ff2cd207 100644
--- a/litellm/responses/streaming_iterator.py
+++ b/litellm/responses/streaming_iterator.py
@@ -379,6 +379,7 @@ def _mid_stream_fallback_eligible(mapped_exception: Exception) -> bool:
 
 
 PRE_OUTPUT_LIFECYCLE_EVENT_TYPES: Final = frozenset({"response.created", "response.in_progress", "response.queued"})
+SEQUENCE_NUMBER_STAMPED_ON_EMISSION: Final = -1
 
 
 class BaseResponsesAPIStreamingIterator:
@@ -1933,7 +1934,6 @@ def build_synthetic_response_events(
         _build_response_status_event(openai_types.ResponsesAPIStreamEvents.RESPONSE_IN_PROGRESS, transformed),
     ]
 
-    sequence_number = 0
     output_items: Final[Sequence[object]] = getattr(transformed, "output", []) or []
     for output_index, output_item in enumerate(output_items):
         output_item_payload = _dump_response_object(output_item)
@@ -2043,35 +2043,31 @@ def build_synthetic_response_events(
                             delta=summary_text[i : i + chunk_size],
                         )
                     )
-                sequence_number += 1
                 events.append(
                     openai_types.ReasoningSummaryTextDoneEvent(
                         type=openai_types.ResponsesAPIStreamEvents.REASONING_SUMMARY_TEXT_DONE,
                         item_id=item_id,
                         output_index=output_index,
-                        sequence_number=sequence_number,
+                        sequence_number=SEQUENCE_NUMBER_STAMPED_ON_EMISSION,
                         summary_index=summary_index,
                         text=summary_text,
                     )
                 )
-                sequence_number += 1
                 events.append(
                     openai_types.ReasoningSummaryPartDoneEvent(
                         type=openai_types.ResponsesAPIStreamEvents.REASONING_SUMMARY_PART_DONE,
                         item_id=item_id,
                         output_index=output_index,
-                        sequence_number=sequence_number,
+                        sequence_number=SEQUENCE_NUMBER_STAMPED_ON_EMISSION,
                         summary_index=summary_index,
                         part=openai_types.BaseLiteLLMOpenAIResponseObject(**summary_payload),
                     )
                 )
 
-        sequence_number += 1
         events.append(
             openai_types.OutputItemDoneEvent(
                 type=openai_types.ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE,
                 output_index=output_index,
-                sequence_number=sequence_number,
                 item=openai_types.BaseLiteLLMOpenAIResponseObject(**output_item_payload),
             )
         )
@@ -2082,7 +2078,7 @@ def build_synthetic_response_events(
             response=transformed,
         )
     )
-    return events
+    return [event.model_copy(update={"sequence_number": number}) for number, event in enumerate(events)]
 
 
 # ---------------------------------------------------------------------------
diff --git a/litellm/responses/utils.py b/litellm/responses/utils.py
index 1a97c1cb48c..43ed9a3b96f 100644
--- a/litellm/responses/utils.py
+++ b/litellm/responses/utils.py
@@ -678,20 +678,25 @@ class ResponsesAPIRequestUtils:
             return
         items: Final = cast(list[object], request_input)  # cast-ok: untyped client json
         stripped: Final = tuple(
-            ResponsesAPIRequestUtils._without_encrypted_reasoning(item)
-            if should_strip is None or (isinstance(item, Mapping) and should_strip(cast(Mapping[str, object], item)))
+            ResponsesAPIRequestUtils._without_encrypted_reasoning(reasoning)
+            if (reasoning := ResponsesAPIRequestUtils._encrypted_reasoning_item(item)) is not None
+            and (should_strip is None or should_strip(reasoning))
             else item
             for item in items
         )
         items[:] = (item for item in stripped if item is not None)
 
     @staticmethod
-    def _without_encrypted_reasoning(item: object) -> object | None:
+    def _encrypted_reasoning_item(item: object) -> Mapping[str, object] | None:
         if not isinstance(item, dict):
-            return item
+            return None
         reasoning: Final = cast(Mapping[str, object], item)  # cast-ok: untyped client json
         if reasoning.get("type") != "reasoning" or not reasoning.get("encrypted_content"):
-            return reasoning
+            return None
+        return reasoning
+
+    @staticmethod
+    def _without_encrypted_reasoning(reasoning: Mapping[str, object]) -> object | None:
         readable: Final = any(
             ResponsesAPIRequestUtils._has_readable_text(reasoning.get(key)) for key in ("summary", "content")
         )
diff --git a/litellm/router_api.py b/litellm/router_api.py
index c013a99573f..3007b5345c7 100644
--- a/litellm/router_api.py
+++ b/litellm/router_api.py
@@ -155,6 +155,7 @@ GroupField: TypeAlias = Literal[
     "display_name",
     "mode",
     "service_tiers",
+    "max_input_tokens",
     "token_limits",
     "listing_info",
 ]
@@ -855,6 +856,16 @@ class RouterRegistry:
         team_id: str | None = None,
     ) -> tuple[object, ...]: ...
 
+    @overload
+    def group(
+        self,
+        name: str,
+        *,
+        field: Literal["max_input_tokens"],
+        include_hidden: bool = False,
+        team_id: str | None = None,
+    ) -> tuple[int | None, ...]: ...
+
     @overload
     def group(
         self,
@@ -882,9 +893,7 @@ class RouterRegistry:
         field: GroupField = "info",
         include_hidden: bool = False,
         team_id: str | None = None,
-    ) -> (
-        "ModelGroupInfo | DeploymentModelListingInfo | tuple[int | None, int | None] | tuple[object, ...] | str | None"
-    ):
+    ) -> "ModelGroupInfo | DeploymentModelListingInfo | tuple[int | None, ...] | tuple[object, ...] | str | None":
         """
         What the router knows about a model group. ``field``:
 
@@ -894,6 +903,7 @@ class RouterRegistry:
           (were ``get_configured_display_name``, ``get_configured_mode``,
           ``get_configured_token_limits``, ``get_model_listing_info``)
         - ``service_tiers``: (was ``get_configured_service_tiers``)
+        - ``max_input_tokens``: each routable deployment's own ``model_info.max_input_tokens``
         """
         r: Final = self._router
         if field == "info":
@@ -906,6 +916,8 @@ class RouterRegistry:
             return r._core_get_configured_mode(name)
         if field == "service_tiers":
             return r._core_get_configured_service_tiers(name, team_id=team_id)
+        if field == "max_input_tokens":
+            return r._core_get_configured_max_input_tokens(name, team_id=team_id)
         if field == "token_limits":
             return r._core_get_configured_token_limits(name)
         if field == "listing_info":
diff --git a/litellm/router_python_core.py b/litellm/router_python_core.py
index 30b05456987..2235abc9897 100644
--- a/litellm/router_python_core.py
+++ b/litellm/router_python_core.py
@@ -141,6 +141,7 @@ from litellm.litellm_core_utils.get_llm_provider_logic import (
     is_registered_custom_provider,
     resolve_model_and_provider_for_metadata,
 )
+from litellm.litellm_core_utils.get_model_cost_map import GetModelCostMap
 from litellm.litellm_core_utils.get_retry_from_policy import (
     get_num_retries_from_retry_policy as _get_num_retries_from_retry_policy,
 )
@@ -475,6 +476,7 @@ from litellm.types.router import (
 from litellm.types.services import ServiceTypes
 from litellm.types.utils import (
     AUTOROUTER_CLASSIFIER_CALL_ORIGIN,
+    COST_MAP_LOOKUP_KEY,
     PROMPT_QUOTING_ROUTING_DECISION_FIELDS,
     CustomPricingLiteLLMParams,
     GenericBudgetConfigType,
@@ -486,6 +488,7 @@ from litellm.types.utils import (
     StandardLoggingRoutingDecision,
     Usage,
     all_litellm_params,
+    echoed_cost_map_fields,
     is_server_derived_pricing_key,
     shared_backend_model_info,
 )
@@ -544,6 +547,7 @@ if TYPE_CHECKING:
         ResponseAPIUsage,
         ResponseIncompleteEvent,
         ResponsesAPIResponse,
+        ResponsesAPIStreamingResponse,
     )
 
     Span = _Span
@@ -771,6 +775,17 @@ def _configured_model_info(deployment: Mapping[str, object]) -> Mapping[str, obj
     return _MODEL_INFO_ADAPTER.validate_python(deployment.get("model_info") or {})
 
 
+def _operator_max_input_tokens(deployment: Mapping[str, object]) -> int | None:
+    model_info: Final = _configured_model_info(deployment)
+    catalog_key: Final = model_info.get(COST_MAP_LOOKUP_KEY)
+    catalog_entry: Final = (
+        GetModelCostMap.loaded_model_cost_map().get(catalog_key) if isinstance(catalog_key, str) else None
+    )
+    if catalog_entry is not None and "max_input_tokens" in echoed_cost_map_fields(model_info, catalog_entry):
+        return None
+    return coerce_token_limit(model_info.get("max_input_tokens"))
+
+
 def _search_tool_support(deployment: DeploymentTypedDict) -> bool | None:
     from litellm.responses.litellm_completion_transformation.tool_search import chat_config_builds_anthropic_request
 
@@ -4385,12 +4400,13 @@ class PythonCore(DeprecatedRouterMembers):
 
             fallback_headers_adopted: bool = False
 
-            def __init__(self, async_generator: AsyncGenerator):
+            def __init__(self, async_generator: "AsyncGenerator[ResponsesAPIStreamingResponse, None]"):
                 import time
                 from datetime import datetime
 
                 self._async_generator = async_generator
                 self._billing_source: object = source_iterator
+                self._last_sequence_number = -1
                 # Mirror every attribute BaseResponsesAPIStreamingIterator.__init__
                 # would have set. The wrapper bypasses super().__init__ (it has no
                 # httpx.Response of its own and no provider config to drive), so
@@ -4497,7 +4513,16 @@ class PythonCore(DeprecatedRouterMembers):
                 if self.completed_response is None and getattr(chunk, "type", None) in _RESPONSES_TERMINAL_EVENT_TYPES:
                     self.completed_response = chunk
                 self._yielded_first_chunk = True
-                return chunk
+                sequence_number: Final = getattr(chunk, "sequence_number", None)
+                if not isinstance(sequence_number, int):
+                    return chunk
+                if not self.fallback_headers_adopted:
+                    self._last_sequence_number = max(self._last_sequence_number, sequence_number)
+                    return chunk
+                self._last_sequence_number = max(self._last_sequence_number + 1, sequence_number)
+                if self._last_sequence_number == sequence_number:
+                    return chunk
+                return chunk.model_copy(update={"sequence_number": self._last_sequence_number})
 
             async def aclose(self):
                 # async generators always expose aclose — no defensive check needed.
@@ -4559,7 +4584,9 @@ class PythonCore(DeprecatedRouterMembers):
                                 exc,
                             )
 
-        wrapper: Final = FallbackResponsesStreamWrapper(stream_with_fallbacks())
+        wrapper: Final = FallbackResponsesStreamWrapper(
+            stream_with_fallbacks()  # pyright: ignore[reportArgumentType]  # relays response events typed as object
+        )
         return wrapper
 
     def _aresponses_background_stream_can_release(
@@ -12680,6 +12707,24 @@ class PythonCore(DeprecatedRouterMembers):
             for deployment in self._routable_deployments(model_name, team_id)
         )
 
+    def _core_get_configured_max_input_tokens(
+        self, model_name: str, team_id: str | None = None
+    ) -> tuple[int | None, ...]:
+        """
+        Return the max_input_tokens each deployment a request from team_id to
+        model_name can route to (see _routable_deployments) sets in its own
+        model_info, in model_list order, None for a deployment that sets none
+        or a malformed one. Unlike get_model_listing_info, neither the cost map
+        nor a discovered limit is read, so only an operator's own value counts,
+        and a value a saved /model/info response copied from the cost map is
+        skipped too.
+
+        Returns an empty tuple for wildcard-expanded or unknown names.
+        """
+        return tuple(
+            _operator_max_input_tokens(deployment) for deployment in self._routable_deployments(model_name, team_id)
+        )
+
     def _core_get_search_tool_support(self, model_name: str, team_id: str | None = None) -> tuple[bool | None, ...]:
         """
         Whether each deployment a request from team_id to model_name can route
@@ -13202,6 +13247,7 @@ class PythonCore(DeprecatedRouterMembers):
                         "providers": [llm_provider],
                         "description": model_group_description,
                         **model_info,
+                        "supports_continuation": model_info.get("supports_continuation") is True,
                         "supports_fast_mode": True,
                         "supported_reasoning_efforts": None,
                         "supported_endpoints": None,
@@ -13269,6 +13315,8 @@ class PythonCore(DeprecatedRouterMembers):
                     and model_info["supports_url_context"] is True
                 ):
                     model_group_info.supports_url_context = True
+                if model_info.get("supports_continuation") is True:
+                    model_group_info.supports_continuation = True
 
                 if model_info.get("supports_reasoning", None) is not None and model_info["supports_reasoning"] is True:
                     model_group_info.supports_reasoning = True
diff --git a/litellm/router_utils/pre_call_checks/encrypted_content_affinity_check.py b/litellm/router_utils/pre_call_checks/encrypted_content_affinity_check.py
index 6f3f0794371..f3425596afa 100644
--- a/litellm/router_utils/pre_call_checks/encrypted_content_affinity_check.py
+++ b/litellm/router_utils/pre_call_checks/encrypted_content_affinity_check.py
@@ -36,31 +36,75 @@ Safe to enable globally:
 - No cache required.
 """
 
-from collections.abc import Iterator, Mapping, Sequence
-from functools import cache
+import hashlib
+from collections.abc import Callable, Iterator, Mapping, Sequence
+from dataclasses import dataclass, field
+from functools import cache, lru_cache, partial
+from time import monotonic
 from typing import TYPE_CHECKING, Final, Optional, cast
 
-from pydantic import TypeAdapter
+from pydantic import BaseModel, TypeAdapter, ValidationError
 
+import litellm
 from litellm._logging import verbose_router_logger
+from litellm.exceptions import AuthenticationError, BadRequestError
 from litellm.integrations.custom_logger import CustomLogger, Span
-from litellm.litellm_core_utils.credential_accessor import CredentialAccessor
+from litellm.litellm_core_utils.get_llm_provider_logic import declared_provider, get_llm_provider
+from litellm.litellm_core_utils.litellm_logging import has_sensitive_keyword
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
     anthropic_content_lists,
     encrypted_content_of_block,
     strip_encrypted_reasoning_from_messages,
 )
 from litellm.litellm_core_utils.routing_common_utils import as_excluded_deployment_ids, as_retry_skipped_deployment_ids
+from litellm.llms.base_llm.chat.transformation import BaseLLMException
 from litellm.responses.utils import ResponsesAPIRequestUtils
 from litellm.router_deprecated import RenamedRouterAttribute, renamed_router_param
+from litellm.secret_managers.main import secret_manager_would_be_consulted
 from litellm.types.llms.openai import AllMessageValues
-from litellm.types.router import Deployment
-from litellm.utils import get_order_filtered_deployments
+from litellm.types.router import Deployment, GenericLiteLLMParams
+from litellm.types.utils import LlmProviders
+from litellm.utils import ProviderConfigManager, get_order_filtered_deployments, with_named_credential
 
 if TYPE_CHECKING:
     from litellm.router_api import RoutingContext
 
 _REQUEST_KWARGS_ADAPTER: Final = TypeAdapter(Mapping[str, object])
+_HEADERS_ADAPTER: Final = TypeAdapter(Mapping[object, object])
+_ACCOUNT_SCOPE_HEADERS: Final = frozenset({"openai-organization", "openai-project", "cookie"})
+_SINGLE_VENDOR_PROVIDERS: Final = frozenset({LlmProviders.OPENAI.value})
+_DEFAULT_ROUTE_SECRETS: Final = ("USE_LITELLM_PROXY", "OPENAI_API_KEY", "OPENAI_BASE_URL", "OPENAI_API_BASE")
+_SECRET_MANAGER_REFRESH_SECONDS: Final = 60
+
+
+@dataclass(frozen=True, slots=True)
+class _ProviderRoute:
+    model: str
+    provider: str
+    api_base: str | None
+
+
+@dataclass(frozen=True, slots=True)
+class _EncryptionBoundary:
+    api_base: object
+    api_key: object
+    model: Callable[[], str | None] = field(compare=False)
+    account_scope: frozenset[tuple[str, object]]
+    explicit_pair: bool
+
+    def is_shared_with(self, other: "_EncryptionBoundary") -> bool:
+        if (self.api_base, self.api_key) != (other.api_base, other.api_key):
+            return False
+        if self.explicit_pair and other.explicit_pair:
+            return True
+        return self.account_scope == other.account_scope and self.model() == other.model()
+
+
+@dataclass(frozen=True, slots=True)
+class _ParamsInRefreshWindow:
+    digest: str
+    window: int
+    params: Mapping[str, object] = field(compare=False)
 
 
 class EncryptedContentAffinityCheck(CustomLogger):
@@ -83,9 +127,11 @@ class EncryptedContentAffinityCheck(CustomLogger):
         ctx: Optional["RoutingContext"] = None,
         enable_global_affinity: bool = True,
         model_group_affinity_config: dict[str, list[str]] | None = None,
+        clock: Callable[[], float] = monotonic,
     ) -> None:
         super().__init__()
         self.ctx = ctx
+        self._clock = clock
         self.enable_global_affinity = enable_global_affinity
         self.model_group_affinity_config: dict[str, list[str]] = model_group_affinity_config or {}
 
@@ -209,44 +255,156 @@ class EncryptedContentAffinityCheck(CustomLogger):
     @staticmethod
     def _encryption_boundary_key(
         litellm_params: object,
-    ) -> tuple[object, object] | None:
+        clock: Callable[[], float] = monotonic,
+    ) -> _EncryptionBoundary | None:
         """
-        ``(api_base, api_key)`` identifies an upstream encryption boundary.
-        The values are resolved from the deployment and its named credential
-        without modifying the deployment.
+        The upstream encryption boundary a deployment's encrypted reasoning belongs to. The values
+        are resolved the way the request resolves them, the deployment's own values winning over its
+        named credential's, without modifying the deployment. Two explicit ``(api_base, api_key)``
+        pairs match on those values alone. On a provider that serves one vendor's models, a deployment
+        with no ``api_key`` takes the provider's default key, one with no ``api_base`` takes the endpoint
+        its Responses URL builder resolves, and a match involving either also needs the same model and
+        the same headers that pick an account.
 
-        Accepts any object exposing dict-style ``.get(key, default)``: plain
-        dicts (the common case in ``healthy_deployments``) as well as
-        ``LiteLLM_Params``-style Pydantic instances, which define a custom
-        ``.get()``. A stricter ``isinstance(dict)`` guard would silently drop
-        the latter from boundary matching and fall back to the full pool —
-        i.e. trigger the exact ``invalid_encrypted_content`` failure this
-        check exists to prevent.
+        Accepts plain dicts (the common case in ``healthy_deployments``) as
+        well as ``LiteLLM_Params`` Pydantic instances. A stricter
+        ``isinstance(dict)`` guard would silently drop the latter from
+        boundary matching and fall back to the full pool — i.e. trigger the
+        exact ``invalid_encrypted_content`` failure this check exists to prevent.
+
+        When a secret manager would be asked for the provider defaults, the boundary of one set of
+        deployment and named credential values is reused for up to a minute, so a run of pin misses
+        does not ask it again for every candidate, while a changed credential resolves at once.
         """
-        getter: Final = getattr(litellm_params, "get", None)
-        if not callable(getter):
+        params: Final = EncryptedContentAffinityCheck._params_mapping(litellm_params)
+        if params is None:
             return None
-        api_base: Final = getter("api_base")
-        api_key: Final = getter("api_key")
-        credential_name: Final = getter("litellm_credential_name")
-        credential_values: Final[Mapping[str, object] | None] = (
-            CredentialAccessor.get_credential_values(credential_name)
-            if isinstance(credential_name, str) and credential_name
-            else None
+        effective_params: Final = with_named_credential(params)
+        if not any(secret_manager_would_be_consulted(name) for name in _DEFAULT_ROUTE_SECRETS):
+            return EncryptedContentAffinityCheck._resolve_encryption_boundary(effective_params)
+        return EncryptedContentAffinityCheck._encryption_boundary_in_refresh_window(
+            _ParamsInRefreshWindow(
+                hashlib.sha256(repr(effective_params).encode()).hexdigest(),
+                int(clock() // _SECRET_MANAGER_REFRESH_SECONDS),
+                effective_params,
+            )
         )
-        effective_api_base: Final = (
-            credential_values.get("api_base")
-            if credential_values is not None and "api_base" in credential_values
-            else api_base
-        )
-        effective_api_key: Final = (
-            credential_values.get("api_key")
-            if credential_values is not None and "api_key" in credential_values
-            else api_key
-        )
-        if not effective_api_base or not effective_api_key:
+
+    @staticmethod
+    @lru_cache(maxsize=1024)
+    def _encryption_boundary_in_refresh_window(key: _ParamsInRefreshWindow) -> _EncryptionBoundary | None:
+        return EncryptedContentAffinityCheck._resolve_encryption_boundary(key.params)
+
+    @staticmethod
+    def _resolve_encryption_boundary(effective_params: Mapping[str, object]) -> _EncryptionBoundary | None:
+        explicit_api_key: Final = effective_params.get("api_key")
+        explicit_api_base: Final = effective_params.get("api_base")
+        account_scope: Final = EncryptedContentAffinityCheck._account_scope(effective_params)
+        if explicit_api_key and explicit_api_base:
+            return _EncryptionBoundary(
+                explicit_api_base,
+                explicit_api_key,
+                cache(partial(EncryptedContentAffinityCheck._single_vendor_model, effective_params)),
+                account_scope,
+                explicit_pair=True,
+            )
+        route: Final = EncryptedContentAffinityCheck._single_vendor_route(effective_params)
+        if route is None:
+            return None
+        api_key: Final = explicit_api_key or EncryptedContentAffinityCheck._default_api_key(route)
+        if not api_key:
+            return None
+        api_base: Final = explicit_api_base or EncryptedContentAffinityCheck._default_responses_endpoint(
+            route, effective_params
+        )
+        if not api_base:
+            return None
+        return _EncryptionBoundary(api_base, api_key, lambda: route.model, account_scope, explicit_pair=False)
+
+    @staticmethod
+    def _params_mapping(litellm_params: object) -> Mapping[str, object] | None:
+        if isinstance(litellm_params, BaseModel):
+            return litellm_params.model_dump(exclude_none=True)
+        if isinstance(litellm_params, Mapping):
+            return _REQUEST_KWARGS_ADAPTER.validate_python(litellm_params)
+        return None
+
+    @staticmethod
+    def _account_scope(litellm_params: Mapping[str, object]) -> frozenset[tuple[str, object]]:
+        return frozenset(
+            (name.lower(), str(value))
+            for name, value in EncryptedContentAffinityCheck._header_items(litellm_params)
+            if name.lower() in _ACCOUNT_SCOPE_HEADERS or has_sensitive_keyword(name)
+        )
+
+    @staticmethod
+    def _header_items(litellm_params: Mapping[str, object]) -> Iterator[tuple[str, object]]:
+        headers: Final = EncryptedContentAffinityCheck._header_mapping(litellm_params.get("headers"))
+        extra_headers: Final = EncryptedContentAffinityCheck._header_mapping(litellm_params.get("extra_headers"))
+        overridden: Final = frozenset(name.lower() for name in extra_headers)
+        yield from ((name, value) for name, value in headers.items() if name.lower() not in overridden)
+        yield from extra_headers.items()
+
+    @staticmethod
+    def _header_mapping(headers: object) -> Mapping[str, object]:
+        if isinstance(headers, Mapping):
+            return {str(name): value for name, value in _HEADERS_ADAPTER.validate_python(headers).items()}
+        return {}
+
+    @staticmethod
+    def _single_vendor_route(litellm_params: Mapping[str, object]) -> _ProviderRoute | None:
+        route: Final = EncryptedContentAffinityCheck._provider_route(litellm_params)
+        return route if route is not None and route.provider in _SINGLE_VENDOR_PROVIDERS else None
+
+    @staticmethod
+    def _single_vendor_model(litellm_params: Mapping[str, object]) -> str | None:
+        route: Final = EncryptedContentAffinityCheck._single_vendor_route(litellm_params)
+        return route.model if route is not None else None
+
+    @staticmethod
+    def _provider_route(litellm_params: Mapping[str, object]) -> _ProviderRoute | None:
+        model: Final = litellm_params.get("model")
+        if not isinstance(model, str):
+            return None
+        custom_llm_provider: Final = litellm_params.get("custom_llm_provider")
+        declared: Final = declared_provider(
+            model, custom_llm_provider if isinstance(custom_llm_provider, str) else None
+        )
+        if declared in litellm.provider_list and declared not in _SINGLE_VENDOR_PROVIDERS:
+            return None
+        try:
+            provider_model, provider, _, provider_api_base = get_llm_provider(
+                model=model, litellm_params=GenericLiteLLMParams.model_validate(dict(litellm_params))
+            )
+        except (BadRequestError, ValidationError):
+            return None
+        return _ProviderRoute(provider_model, provider, provider_api_base)
+
+    @staticmethod
+    def _default_api_key(route: _ProviderRoute) -> str | None:
+        model_info: Final = ProviderConfigManager.get_provider_model_info(
+            model=route.model, provider=LlmProviders(route.provider)
+        )
+        if model_info is None:
+            return None
+        try:
+            return model_info.get_api_key()
+        except NotImplementedError:
+            return None
+
+    @staticmethod
+    def _default_responses_endpoint(route: _ProviderRoute, litellm_params: Mapping[str, object]) -> str | None:
+        responses_config: Final = ProviderConfigManager.get_provider_responses_api_config(
+            provider=route.provider, model=route.model
+        )
+        if responses_config is None:
+            return None
+        try:
+            return responses_config.get_complete_url(  # pyright: ignore[reportUnknownMemberType]  # the base types litellm_params as a bare dict
+                api_base=route.api_base, litellm_params=dict(litellm_params)
+            )
+        except (ValueError, BaseLLMException, AuthenticationError):
             return None
-        return (effective_api_base, effective_api_key)
 
     def _find_deployments_on_same_encryption_boundary(
         self,
@@ -255,7 +413,7 @@ class EncryptedContentAffinityCheck(CustomLogger):
     ) -> tuple[list[dict], Deployment | None]:
         """
         Deployments in ``healthy_deployments`` sharing the originating
-        deployment's ``(api_base, api_key)``, alongside the originating
+        deployment's encryption boundary, alongside the originating
         deployment object (or ``None`` if it was removed / router unavailable).
         """
         if self.ctx is None:
@@ -263,11 +421,16 @@ class EncryptedContentAffinityCheck(CustomLogger):
         originating: Final = self.ctx.registry().deployment(model_id)
         if originating is None:
             return [], None
-        boundary: Final = self._encryption_boundary_key(originating.litellm_params.model_dump(exclude_none=True))
+        boundary: Final = self._encryption_boundary_key(
+            originating.litellm_params.model_dump(exclude_none=True), self._clock
+        )
         if boundary is None:
             return [], originating
         matches: Final = [
-            d for d in healthy_deployments if self._encryption_boundary_key(d.get("litellm_params", {})) == boundary
+            d
+            for d in healthy_deployments
+            if (candidate := self._encryption_boundary_key(d.get("litellm_params", {}), self._clock)) is not None
+            and boundary.is_shared_with(candidate)
         ]
         return matches, originating
 
@@ -280,6 +443,7 @@ class EncryptedContentAffinityCheck(CustomLogger):
         target_deployments: Sequence[Mapping[str, object]],
         *,
         unmarked_origin: str | None,
+        clock: Callable[[], float] = monotonic,
     ) -> None:
         """
         Drop the encrypted reasoning that none of ``target_deployments`` minted or shares an
@@ -293,12 +457,19 @@ class EncryptedContentAffinityCheck(CustomLogger):
             for target in target_deployments
             if isinstance((model_info := target.get("model_info")), Mapping) and model_info.get("id") is not None
         )
-        target_boundaries: Final = frozenset(
-            boundary
-            for target in target_deployments
-            if (boundary := EncryptedContentAffinityCheck._encryption_boundary_key(target.get("litellm_params")))
-            is not None
-        )
+
+        @cache
+        def target_boundaries() -> tuple[_EncryptionBoundary, ...]:
+            return tuple(
+                boundary
+                for target in target_deployments
+                if (
+                    boundary := EncryptedContentAffinityCheck._encryption_boundary_key(
+                        target.get("litellm_params"), clock
+                    )
+                )
+                is not None
+            )
 
         @cache
         def target_can_decrypt(marked_origin: str | None) -> bool:
@@ -312,12 +483,14 @@ class EncryptedContentAffinityCheck(CustomLogger):
             origin: Final = ctx.registry().deployment(origin_model_id)
             origin_boundary: Final = (
                 EncryptedContentAffinityCheck._encryption_boundary_key(
-                    origin.litellm_params.model_dump(exclude_none=True)
+                    origin.litellm_params.model_dump(exclude_none=True), clock
                 )
                 if origin is not None
                 else None
             )
-            return origin_boundary is not None and origin_boundary in target_boundaries
+            return origin_boundary is not None and any(
+                origin_boundary.is_shared_with(target_boundary) for target_boundary in target_boundaries()
+            )
 
         def should_strip_input_item(item: Mapping[str, object]) -> bool:
             return not target_can_decrypt(EncryptedContentAffinityCheck._model_id_of_input_item(item))
@@ -424,7 +597,12 @@ class EncryptedContentAffinityCheck(CustomLogger):
             )
             request_kwargs["_encrypted_content_affinity_pinned"] = True
             self.strip_reasoning_the_targets_cannot_decrypt(
-                self.ctx, request_input, anthropic_messages, (deployment,), unmarked_origin=model_id
+                self.ctx,
+                request_input,
+                anthropic_messages,
+                (deployment,),
+                unmarked_origin=model_id,
+                clock=self._clock,
             )
             return [deployment]
 
@@ -442,7 +620,12 @@ class EncryptedContentAffinityCheck(CustomLogger):
             )
             request_kwargs["_encrypted_content_affinity_pinned"] = True
             self.strip_reasoning_the_targets_cannot_decrypt(
-                self.ctx, request_input, anthropic_messages, boundary_matches, unmarked_origin=model_id
+                self.ctx,
+                request_input,
+                anthropic_messages,
+                boundary_matches,
+                unmarked_origin=model_id,
+                clock=self._clock,
             )
             return boundary_matches
 
diff --git a/litellm/rust_bridge/catalog.py b/litellm/rust_bridge/catalog.py
index 629d9098970..9ba8cbc35a7 100644
--- a/litellm/rust_bridge/catalog.py
+++ b/litellm/rust_bridge/catalog.py
@@ -66,6 +66,8 @@ class Feature(str, Enum):
     """Extra body fields that Python transforms and merges into the provider request."""
     PROVIDER_AFFINITY = "provider_affinity"
     """A provider affinity header that Python validates and populates from the session id."""
+    FOUNDRY_BETA_ROW = "foundry_beta_row"
+    """A Foundry api_base, where Python drops the anthropic-beta values Foundry rejects."""
     PRE_REQUEST_HOOK = "pre_request_hook"
     """A logger overriding async_pre_request_hook, which may rewrite the request."""
     WEBSEARCH_INTERCEPTION = "websearch_interception"
@@ -170,6 +172,7 @@ CHAT_PYTHON_FEATURES: Final = COMMON_PYTHON_FEATURES | {
 
 MESSAGES_PYTHON_FEATURES: Final = COMMON_PYTHON_FEATURES | {
     Feature.PROVIDER_AFFINITY,
+    Feature.FOUNDRY_BETA_ROW,
     Feature.SAFEGUARDS_CLASSIFIER,
     Feature.PRE_REQUEST_HOOK,
     Feature.WEBSEARCH_INTERCEPTION,
diff --git a/litellm/rust_bridge/messages/detectors.py b/litellm/rust_bridge/messages/detectors.py
index 8edd2707405..6a0c867979b 100644
--- a/litellm/rust_bridge/messages/detectors.py
+++ b/litellm/rust_bridge/messages/detectors.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from typing import Final
 
 import litellm
+from litellm.anthropic_beta_headers_manager import is_foundry_api_base
 from litellm.litellm_core_utils.core_helpers import drops_unsupported_params
 from litellm.llms.opencode.common_utils import is_opencode_api_base
 from litellm.rust_bridge.detectors import api_base, overridden, present, streaming
@@ -15,6 +16,12 @@ def provider_affinity(request: NativeCall) -> bool:
     return is_opencode_api_base(api_base(request))
 
 
+def foundry_beta_row(request: NativeCall) -> bool:
+    from litellm.llms.anthropic.common_utils import AnthropicModelInfo
+
+    return is_foundry_api_base(AnthropicModelInfo.get_api_base(api_base(request)))
+
+
 def anthropic_workload_identity(request: NativeCall) -> bool:
     """Python mints an Anthropic federation token when no static credential is configured."""
     from litellm.llms.anthropic.common_utils import AnthropicModelInfo
diff --git a/litellm/text_completions/streaming_iterator.py b/litellm/text_completions/streaming_iterator.py
index 61e47e9d7af..6bba56a5afe 100644
--- a/litellm/text_completions/streaming_iterator.py
+++ b/litellm/text_completions/streaming_iterator.py
@@ -1,5 +1,6 @@
 from typing import Final
 
+from litellm.constants import VLLM_CHOICE_FIELDS
 from litellm.litellm_core_utils.stream_usage_chunks import is_injected_stream_usage_artifact
 from litellm.types.utils import Choices, ModelResponse, ModelResponseStream, TextChoices, TextCompletionResponse
 
@@ -37,16 +38,19 @@ class TextCompletionStreamWrapper:
             response["object"] = "text_completion"
             response["created"] = chunk.get("created", None)
             response["model"] = chunk.get("model", None)
-            text_choices: Final = TextChoices()
             if isinstance(chunk, Choices):  # chunk should always be of type StreamingChoices
                 raise Exception
 
             if chunk["choices"]:
-                delta: Final = chunk["choices"][0]["delta"]
+                chat_choice: Final = chunk["choices"][0]
+                text_choices: Final = TextChoices(
+                    **{field: chat_choice[field] for field in VLLM_CHOICE_FIELDS if field in chat_choice}
+                )
+                delta: Final = chat_choice["delta"]
                 text_choices["text"] = delta["content"]
                 text_choices["reasoning_content"] = delta.get("reasoning_content")
-                text_choices["index"] = chunk["choices"][0]["index"]
-                text_choices["finish_reason"] = chunk["choices"][0]["finish_reason"]
+                text_choices["index"] = chat_choice["index"]
+                text_choices["finish_reason"] = chat_choice["finish_reason"]
                 response["choices"] = [text_choices]
             else:
                 response["choices"] = []
diff --git a/litellm/types/llms/anthropic.py b/litellm/types/llms/anthropic.py
index dc35af81091..802f6794839 100644
--- a/litellm/types/llms/anthropic.py
+++ b/litellm/types/llms/anthropic.py
@@ -660,6 +660,7 @@ class MessageChunk(TypedDict, total=False):
     stop_sequence: str | None
     usage: UsageDelta
     safeguard_results: ReadOnly[Sequence[SafeguardResult]]
+    input_transformations: ReadOnly[Sequence[Mapping[str, object]]]
 
 
 class MessageStartBlock(TypedDict):
@@ -849,6 +850,7 @@ class ANTHROPIC_BETA_HEADER_VALUES(str, Enum):
     ADVISOR_TOOL_2026_03_01 = "advisor-tool-2026-03-01"
     PER_TURN_CONTROL_2026_07_01 = "per-turn-control-2026-07-01"
     DANGEROUS_TOOL_USE_2026_09_03 = "dangerous-tool-use-2026-09-03"
+    MCP_CLIENT_2025_04_04 = "mcp-client-2025-04-04"
 
 
 # Tool search beta header constant (for Anthropic direct API and Microsoft Foundry)
diff --git a/litellm/types/llms/anthropic_messages/anthropic_response.py b/litellm/types/llms/anthropic_messages/anthropic_response.py
index 4f419385630..51168071c85 100644
--- a/litellm/types/llms/anthropic_messages/anthropic_response.py
+++ b/litellm/types/llms/anthropic_messages/anthropic_response.py
@@ -1,4 +1,4 @@
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence
 from typing import Literal, TypeAlias
 
 from typing_extensions import NotRequired, ReadOnly, TypedDict
@@ -106,3 +106,4 @@ class AnthropicMessagesResponse(TypedDict, total=False):
     usage: AnthropicUsage | None
     context_management: NotRequired[ContextManagementResponse]
     safeguard_results: NotRequired[ReadOnly[Sequence[SafeguardResult]]]
+    input_transformations: NotRequired[ReadOnly[Sequence[Mapping[str, object]]]]
diff --git a/litellm/types/llms/openai.py b/litellm/types/llms/openai.py
index d7e55b57a07..1d1628035ec 100644
--- a/litellm/types/llms/openai.py
+++ b/litellm/types/llms/openai.py
@@ -1,8 +1,9 @@
 import builtins
 import math
-from collections.abc import Iterable, Mapping, Sequence
+from collections.abc import ItemsView, Iterable, Mapping, Sequence
 from enum import Enum
 from os import PathLike
+from types import MappingProxyType
 from typing import IO, TYPE_CHECKING, Any, Final, Generic, Literal, Optional, TypeAlias, Union
 
 import httpx
@@ -692,6 +693,15 @@ class PromptCacheBreakpoint(TypedDict):
     ttl: NotRequired[ReadOnly[Literal["30m", "12h"]]]
 
 
+class ChatCompletionPromptCacheBreakpoint(TypedDict):
+    mode: ReadOnly[Literal["explicit"]]
+
+
+class AzureResponsesPromptCacheBreakpoint(TypedDict):
+    mode: ReadOnly[Literal["explicit"]]
+    ttl: NotRequired[ReadOnly[Literal["30m"]]]
+
+
 class PromptCacheOptions(TypedDict, total=False):
     mode: ReadOnly[Literal["implicit", "explicit"]]
     ttl: ReadOnly[Literal["30m", "12h"]]
@@ -1754,17 +1764,40 @@ class ResponsesAPIStreamEvents(str, Enum):
     ERROR = "error"
 
 
-class ResponseCreatedEvent(BaseLiteLLMOpenAIResponseObject):
+_NO_EXTRAS: Final[Mapping[str, object]] = MappingProxyType({})
+
+
+class BaseResponsesStreamEvent(BaseLiteLLMOpenAIResponseObject):  # frozen-ok: guardrails rewrite events in place
+    def __getitem__(self, key: str) -> object:
+        return self._mapping_holding(key)[key]
+
+    def get(self, key: str, default: object = None) -> object:
+        return self._mapping_holding(key).get(key, default)
+
+    def __contains__(self, key: object) -> bool:
+        return key in self.__dict__ or key in self._extras()
+
+    def items(self) -> ItemsView[str, object]:
+        return MappingProxyType({**self.__dict__, **self._extras()}).items()
+
+    def _extras(self) -> Mapping[str, object]:
+        return self.__pydantic_extra__ or _NO_EXTRAS
+
+    def _mapping_holding(self, key: str) -> Mapping[str, object]:
+        return self.__dict__ if key in self.__dict__ else self._extras()
+
+
+class ResponseCreatedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.RESPONSE_CREATED]
     response: ResponsesAPIResponse
 
 
-class ResponseInProgressEvent(BaseLiteLLMOpenAIResponseObject):
+class ResponseInProgressEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.RESPONSE_IN_PROGRESS]
     response: ResponsesAPIResponse
 
 
-class ResponseCompletedEvent(BaseLiteLLMOpenAIResponseObject):
+class ResponseCompletedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.RESPONSE_COMPLETED]
     response: ResponsesAPIResponse
     _hidden_params: dict = PrivateAttr(default_factory=dict)
@@ -1778,12 +1811,12 @@ class ResponseCompletedEvent(BaseLiteLLMOpenAIResponseObject):
         self._hidden_params = hidden_params
 
 
-class ResponseFailedEvent(BaseLiteLLMOpenAIResponseObject):
+class ResponseFailedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.RESPONSE_FAILED]
     response: ResponsesAPIResponse
 
 
-class ResponseIncompleteEvent(BaseLiteLLMOpenAIResponseObject):
+class ResponseIncompleteEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.RESPONSE_INCOMPLETE]
     response: ResponsesAPIResponse
 
@@ -1791,7 +1824,7 @@ class ResponseIncompleteEvent(BaseLiteLLMOpenAIResponseObject):
 ResponsesTerminalEvent: TypeAlias = ResponseCompletedEvent | ResponseIncompleteEvent | ResponseFailedEvent
 
 
-class ResponsePartAddedEvent(BaseLiteLLMOpenAIResponseObject):
+class ResponsePartAddedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.RESPONSE_PART_ADDED]
     item_id: str
     output_index: int
@@ -1799,7 +1832,7 @@ class ResponsePartAddedEvent(BaseLiteLLMOpenAIResponseObject):
     part: dict
 
 
-class ReasoningSummaryTextDeltaEvent(BaseLiteLLMOpenAIResponseObject):
+class ReasoningSummaryTextDeltaEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.REASONING_SUMMARY_TEXT_DELTA]
     item_id: str
     output_index: int
@@ -1807,7 +1840,7 @@ class ReasoningSummaryTextDeltaEvent(BaseLiteLLMOpenAIResponseObject):
     delta: str
 
 
-class ReasoningSummaryTextDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class ReasoningSummaryTextDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.REASONING_SUMMARY_TEXT_DONE]
     item_id: str
     output_index: int
@@ -1816,7 +1849,7 @@ class ReasoningSummaryTextDoneEvent(BaseLiteLLMOpenAIResponseObject):
     text: str
 
 
-class ReasoningSummaryPartDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class ReasoningSummaryPartDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.REASONING_SUMMARY_PART_DONE]
     item_id: str
     output_index: int
@@ -1825,13 +1858,13 @@ class ReasoningSummaryPartDoneEvent(BaseLiteLLMOpenAIResponseObject):
     part: BaseLiteLLMOpenAIResponseObject
 
 
-class OutputItemAddedEvent(BaseLiteLLMOpenAIResponseObject):
+class OutputItemAddedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED]
     output_index: int
     item: BaseLiteLLMOpenAIResponseObject | None
 
 
-class OutputItemDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class OutputItemDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE]
     output_index: int
     sequence_number: int = 1
@@ -1851,7 +1884,7 @@ class OpenAIChatCompletionLogprobsContent(TypedDict, total=False):
     top_logprobs: list[OpenAIChatCompletionLogprobsContentTopLogprobs]
 
 
-class ContentPartAddedEvent(BaseLiteLLMOpenAIResponseObject):
+class ContentPartAddedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.CONTENT_PART_ADDED]
     item_id: str
     output_index: int
@@ -1879,7 +1912,7 @@ class ContentPartDonePartReasoningText(BaseLiteLLMOpenAIResponseObject):
 PART_UNION_TYPES = ContentPartDonePartOutputText | ContentPartDonePartRefusal | ContentPartDonePartReasoningText
 
 
-class ContentPartDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class ContentPartDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.CONTENT_PART_DONE]
     item_id: str
     output_index: int
@@ -1887,7 +1920,7 @@ class ContentPartDoneEvent(BaseLiteLLMOpenAIResponseObject):
     part: PART_UNION_TYPES
 
 
-class OutputTextDeltaEvent(BaseLiteLLMOpenAIResponseObject):
+class OutputTextDeltaEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA]
     item_id: str
     output_index: int
@@ -1895,7 +1928,7 @@ class OutputTextDeltaEvent(BaseLiteLLMOpenAIResponseObject):
     delta: str
 
 
-class OutputTextAnnotationAddedEvent(BaseLiteLLMOpenAIResponseObject):
+class OutputTextAnnotationAddedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.OUTPUT_TEXT_ANNOTATION_ADDED]
     item_id: str
     output_index: int
@@ -1904,7 +1937,7 @@ class OutputTextAnnotationAddedEvent(BaseLiteLLMOpenAIResponseObject):
     annotation: dict
 
 
-class OutputTextDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class OutputTextDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.OUTPUT_TEXT_DONE]
     item_id: str
     output_index: int
@@ -1912,7 +1945,7 @@ class OutputTextDoneEvent(BaseLiteLLMOpenAIResponseObject):
     text: str
 
 
-class RefusalDeltaEvent(BaseLiteLLMOpenAIResponseObject):
+class RefusalDeltaEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.REFUSAL_DELTA]
     item_id: str
     output_index: int
@@ -1920,7 +1953,7 @@ class RefusalDeltaEvent(BaseLiteLLMOpenAIResponseObject):
     delta: str
 
 
-class RefusalDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class RefusalDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.REFUSAL_DONE]
     item_id: str
     output_index: int
@@ -1928,72 +1961,72 @@ class RefusalDoneEvent(BaseLiteLLMOpenAIResponseObject):
     refusal: str
 
 
-class FunctionCallArgumentsDeltaEvent(BaseLiteLLMOpenAIResponseObject):
+class FunctionCallArgumentsDeltaEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.FUNCTION_CALL_ARGUMENTS_DELTA]
     item_id: str
     output_index: int
     delta: str
 
 
-class FunctionCallArgumentsDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class FunctionCallArgumentsDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.FUNCTION_CALL_ARGUMENTS_DONE]
     item_id: str
     output_index: int
     arguments: str
 
 
-class FileSearchCallInProgressEvent(BaseLiteLLMOpenAIResponseObject):
+class FileSearchCallInProgressEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.FILE_SEARCH_CALL_IN_PROGRESS]
     output_index: int
     item_id: str
 
 
-class FileSearchCallSearchingEvent(BaseLiteLLMOpenAIResponseObject):
+class FileSearchCallSearchingEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.FILE_SEARCH_CALL_SEARCHING]
     output_index: int
     item_id: str
 
 
-class FileSearchCallCompletedEvent(BaseLiteLLMOpenAIResponseObject):
+class FileSearchCallCompletedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.FILE_SEARCH_CALL_COMPLETED]
     output_index: int
     item_id: str
 
 
-class WebSearchCallInProgressEvent(BaseLiteLLMOpenAIResponseObject):
+class WebSearchCallInProgressEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.WEB_SEARCH_CALL_IN_PROGRESS]
     output_index: int
     item_id: str
 
 
-class WebSearchCallSearchingEvent(BaseLiteLLMOpenAIResponseObject):
+class WebSearchCallSearchingEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.WEB_SEARCH_CALL_SEARCHING]
     output_index: int
     item_id: str
 
 
-class WebSearchCallCompletedEvent(BaseLiteLLMOpenAIResponseObject):
+class WebSearchCallCompletedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.WEB_SEARCH_CALL_COMPLETED]
     output_index: int
     item_id: str
 
 
 # MCP List Tools Events
-class MCPListToolsInProgressEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPListToolsInProgressEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_LIST_TOOLS_IN_PROGRESS]
     sequence_number: int
     output_index: int
     item_id: str
 
 
-class MCPListToolsCompletedEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPListToolsCompletedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_LIST_TOOLS_COMPLETED]
     sequence_number: int
     output_index: int
     item_id: str
 
 
-class MCPListToolsFailedEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPListToolsFailedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_LIST_TOOLS_FAILED]
     sequence_number: int
     output_index: int
@@ -2001,14 +2034,14 @@ class MCPListToolsFailedEvent(BaseLiteLLMOpenAIResponseObject):
 
 
 # MCP Call Events
-class MCPCallInProgressEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPCallInProgressEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_CALL_IN_PROGRESS]
     sequence_number: int
     output_index: int
     item_id: str
 
 
-class MCPCallArgumentsDeltaEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPCallArgumentsDeltaEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_CALL_ARGUMENTS_DELTA]
     output_index: int
     item_id: str
@@ -2016,7 +2049,7 @@ class MCPCallArgumentsDeltaEvent(BaseLiteLLMOpenAIResponseObject):
     sequence_number: int
 
 
-class MCPCallArgumentsDoneEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPCallArgumentsDoneEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_CALL_ARGUMENTS_DONE]
     output_index: int
     item_id: str
@@ -2024,21 +2057,21 @@ class MCPCallArgumentsDoneEvent(BaseLiteLLMOpenAIResponseObject):
     sequence_number: int
 
 
-class MCPCallCompletedEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPCallCompletedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_CALL_COMPLETED]
     sequence_number: int
     item_id: str
     output_index: int
 
 
-class MCPCallFailedEvent(BaseLiteLLMOpenAIResponseObject):
+class MCPCallFailedEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.MCP_CALL_FAILED]
     sequence_number: int
     item_id: str
     output_index: int
 
 
-class ImageGenerationPartialImageEvent(BaseLiteLLMOpenAIResponseObject):
+class ImageGenerationPartialImageEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.IMAGE_GENERATION_PARTIAL_IMAGE]
     partial_image_index: int
     b64_json: str
@@ -2053,7 +2086,7 @@ class ErrorEventError(BaseLiteLLMOpenAIResponseObject):
     param: str | dict[str, object] | None = None
 
 
-class ErrorEvent(BaseLiteLLMOpenAIResponseObject):
+class ErrorEvent(BaseResponsesStreamEvent):
     type: Literal[ResponsesAPIStreamEvents.ERROR]
     sequence_number: int
     error: ErrorEventError | None = None
@@ -2062,7 +2095,7 @@ class ErrorEvent(BaseLiteLLMOpenAIResponseObject):
     param: str | Mapping[str, object] | None = None
 
 
-class GenericEvent(BaseLiteLLMOpenAIResponseObject):
+class GenericEvent(BaseResponsesStreamEvent):
     type: str
 
     model_config = ConfigDict(extra="allow", protected_namespaces=())
diff --git a/litellm/types/passthrough_endpoints/pass_through_endpoints.py b/litellm/types/passthrough_endpoints/pass_through_endpoints.py
index 2f269dc87d9..b6bab77ab33 100644
--- a/litellm/types/passthrough_endpoints/pass_through_endpoints.py
+++ b/litellm/types/passthrough_endpoints/pass_through_endpoints.py
@@ -1,9 +1,11 @@
+from collections.abc import Mapping, Sequence
 from dataclasses import dataclass
+from datetime import datetime
 from enum import Enum
-from typing import Final, Protocol
+from typing import Final, Literal, Protocol, TypeAlias
 
 from pydantic import Field
-from typing_extensions import TypedDict
+from typing_extensions import ReadOnly, TypedDict
 
 from litellm.types.llms.base import LiteLLMPydanticObjectBase
 
@@ -28,6 +30,10 @@ LITELLM_PASS_THROUGH_ENDPOINT_MARKER: Final = "__litellm_pass_through_endpoint__
 
 SETTLES_BACKGROUND_RESPONSE_KWARG: Final = "settles_background_response"
 
+WebsocketUpstreamFrameKind: TypeAlias = Literal[
+    "starts_turn", "ends_turn", "opens_session", "updates_session", "bills_usage", "refuses_turn", "relayed"
+]
+
 
 class BackgroundResponseSettlement(str, Enum):
     SETTLES = "settles"
@@ -63,7 +69,7 @@ class PassthroughStandardLoggingPayload(TypedDict, total=False):
     """
     The body of the request
     """
-    response_body: dict | None  # only tracked for non-streaming responses
+    response_body: dict | Sequence[Mapping[str, object]] | None  # only tracked for non-streaming responses
     """
     The body of the response
     """
@@ -75,6 +81,8 @@ class PassthroughStandardLoggingPayload(TypedDict, total=False):
     Optional field, we use this for cost tracking only if it's set.
     """
 
+    end_time: ReadOnly[datetime]
+
 
 @dataclass(frozen=True, slots=True)
 class WebSocketSessionUsage:
diff --git a/litellm/types/router.py b/litellm/types/router.py
index 41a986837da..4e3e4d92b3c 100644
--- a/litellm/types/router.py
+++ b/litellm/types/router.py
@@ -1061,6 +1061,7 @@ class ModelGroupInfo(LiteLLMBaseModel):
     supports_vision: bool = Field(default=False)
     supports_web_search: bool = Field(default=False)
     supports_url_context: bool = Field(default=False)
+    supports_continuation: bool = Field(default=False)
     supports_reasoning: bool = Field(default=False)
     supports_function_calling: bool = Field(default=False)
     supports_fast_mode: bool = Field(default=False)
diff --git a/litellm/types/utils.py b/litellm/types/utils.py
index da1d99957a7..eeb0956a06b 100644
--- a/litellm/types/utils.py
+++ b/litellm/types/utils.py
@@ -227,6 +227,7 @@ class ProviderSpecificModelInfo(TypedDict, total=False):
     supports_tool_search: bool | None
     supports_mid_conversation_system: bool | None
     supports_url_context: bool | None
+    supports_continuation: ReadOnly[bool | None]
     supports_none_reasoning_effort: bool | None
     supports_minimal_reasoning_effort: bool | None
     supports_low_reasoning_effort: bool | None
@@ -246,6 +247,9 @@ class ProviderSpecificModelInfo(TypedDict, total=False):
     bedrock_converse_supports_strict_tools: bool | None
     supports_regex_lookaround: ReadOnly[bool | None]
     token_count_framing: ReadOnly[int | None]
+    token_count_tool_framing: ReadOnly[int | None]
+    token_count_responses_framing: ReadOnly[int | None]
+    token_count_responses_tool_framing: ReadOnly[int | None]
     token_count_model: ReadOnly[TokenCountModelInfo | None]
     token_count_tokenizer: ReadOnly[TokenCountTokenizer | None]
 
@@ -4231,12 +4235,21 @@ DEPLOYMENT_SCOPED_CAPABILITY_FIELDS: Final[frozenset[str]] = frozenset(
         "supports_assistant_prefill",
         "supports_bedrock_native_structured_output",
         "supports_pdf_input",
+        "supports_continuation",
         "reasoning_modes",
         "reasoning_contexts",
     }
 )
 
-DEPLOYMENT_SCOPED_TOKEN_COUNT_FIELDS: Final[frozenset[str]] = frozenset({"token_count_framing", "token_count_model"})
+DEPLOYMENT_SCOPED_TOKEN_COUNT_FIELDS: Final[frozenset[str]] = frozenset(
+    {
+        "token_count_framing",
+        "token_count_tool_framing",
+        "token_count_responses_framing",
+        "token_count_responses_tool_framing",
+        "token_count_model",
+    }
+)
 
 SHARED_BACKEND_MODEL_INFO_FIELDS: Final[frozenset[str]] = (
     frozenset(ModelInfoBase.__required_keys__ | ModelInfoBase.__optional_keys__)
diff --git a/litellm/utils.py b/litellm/utils.py
index b0826f84006..55423a42260 100644
--- a/litellm/utils.py
+++ b/litellm/utils.py
@@ -98,7 +98,11 @@ from litellm.litellm_core_utils.model_retirement import is_hidden_as_retired
 from litellm.litellm_core_utils.offline_mode import is_offline_mode
 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.litellm_core_utils.tool_fields import (
+    MalformedField,
+    resolve_deployment_tool_fields,
+    tools_without_hosted_mcp,
+)
 from litellm.rust_bridge import tokenizer as tokenizer_dispatch
 from litellm.rust_bridge.catalog import decision
 from litellm.rust_bridge.configuration import Decision
@@ -3183,6 +3187,14 @@ def supports_url_context(model: str, custom_llm_provider: str | None = None) ->
     )
 
 
+def supports_continuation(model: str, custom_llm_provider: str | None = None) -> bool:
+    return supports_factory(
+        model=model,
+        custom_llm_provider=custom_llm_provider,
+        key="supports_continuation",
+    )
+
+
 def supports_native_streaming(model: str, custom_llm_provider: str | None) -> bool:
     """
     Check if the given model supports native streaming and return a boolean value.
@@ -5186,7 +5198,12 @@ def remove_sensitive_keys_from_dict(d: dict) -> dict:
     return d
 
 
-def pre_process_optional_params(passed_params: dict, non_default_params: dict, custom_llm_provider: str) -> dict:
+_TOOL_LIST: Final = TypeAdapter(list[object])
+
+
+def pre_process_optional_params(
+    passed_params: dict, non_default_params: dict, custom_llm_provider: str, model: str, drop_params: bool | None
+) -> dict:
     """For .completion(), preprocess optional params"""
     optional_params: dict = {}
 
@@ -5243,14 +5260,20 @@ def pre_process_optional_params(passed_params: dict, non_default_params: dict, c
             and custom_llm_provider not in litellm.openai_compatible_providers
         ):
             if custom_llm_provider == "ollama":
+                if "tools" in non_default_params:
+                    sent_tools: Final = _TOOL_LIST.validate_python(non_default_params.pop("tools"))
+                    non_default_params.pop("tool_choice", None)  # causes ollama requests to hang
+                    prompt_tools: Final = tools_without_hosted_mcp(
+                        sent_tools, model=model, route=custom_llm_provider, drop_params=bool(drop_params)
+                    )
+                    if sent_tools and not prompt_tools:
+                        return optional_params
+                    optional_params["functions_unsupported_model"] = prompt_tools
+                elif "functions" in non_default_params:
+                    optional_params["functions_unsupported_model"] = non_default_params.pop("functions")
                 # ollama actually supports json output
                 optional_params["format"] = "json"
                 litellm.add_function_to_prompt = True  # so that main.py adds the function call to the prompt
-                if "tools" in non_default_params:
-                    optional_params["functions_unsupported_model"] = non_default_params.pop("tools")
-                    non_default_params.pop("tool_choice", None)  # causes ollama requests to hang
-                elif "functions" in non_default_params:
-                    optional_params["functions_unsupported_model"] = non_default_params.pop("functions")
             elif litellm.add_function_to_prompt:  # if user opts to add it to prompt instead
                 optional_params["functions_unsupported_model"] = non_default_params.pop(
                     "tools", non_default_params.pop("functions", None)
@@ -5385,6 +5408,8 @@ def get_optional_params(
         passed_params=passed_params,
         non_default_params=non_default_params,
         custom_llm_provider=custom_llm_provider,
+        model=model,
+        drop_params=drop_params,
     )
 
     def _check_valid_arg(supported_params: list[str]):
@@ -7360,6 +7385,7 @@ def get_model_info_helper(
                 ),
                 supports_web_search=_model_info.get("supports_web_search", None),
                 supports_url_context=_model_info.get("supports_url_context", None),
+                supports_continuation=_model_info.get("supports_continuation", None),
                 supports_reasoning=_model_info.get("supports_reasoning", None),
                 supports_adaptive_thinking=_model_info.get("supports_adaptive_thinking", None),
                 supports_legacy_thinking=_model_info.get("supports_legacy_thinking", None),
@@ -7398,6 +7424,9 @@ def get_model_info_helper(
                 supports_image_size=_model_info.get("supports_image_size", None),
                 supported_audio_formats=_model_info.get("supported_audio_formats", None),
                 token_count_framing=_model_info.get("token_count_framing", None),
+                token_count_tool_framing=_model_info.get("token_count_tool_framing", None),
+                token_count_responses_framing=_model_info.get("token_count_responses_framing", None),
+                token_count_responses_tool_framing=_model_info.get("token_count_responses_tool_framing", None),
                 token_count_model=_model_info.get("token_count_model", None),
                 token_count_tokenizer=_model_info.get("token_count_tokenizer", None),
                 vertex_ai_audio_api=_model_info.get("vertex_ai_audio_api", None),
@@ -7516,6 +7545,7 @@ def get_model_info(
             supports_pdf_input: Optional[bool]
             supports_web_search: Optional[bool]
             supports_url_context: Optional[bool]
+            supports_continuation: Optional[bool]
             supports_reasoning: Optional[bool]
     Raises:
         Exception: If the model is not mapped yet.
diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index e1fdfc89a9f..cf8544316e9 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -13478,6 +13478,10 @@
         "input_cost_per_token": 2e-07,
         "output_cost_per_token": 5e-07,
         "litellm_provider": "azure_ai",
+        "token_count_framing": 149,
+        "token_count_tool_framing": 302,
+        "token_count_responses_framing": 145,
+        "token_count_responses_tool_framing": 100,
         "max_input_tokens": 128000,
         "max_output_tokens": 128000,
         "mode": "chat",
@@ -13831,7 +13835,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -13845,7 +13849,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/ap-northeast-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -14002,7 +14006,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -14016,7 +14020,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/ap-south-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -14140,12 +14144,12 @@
         "input_cost_per_token": 7.4e-07,
         "input_cost_per_token_flex": 3.7e-07,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
         "output_cost_per_token_flex": 1.11e-06,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.html",
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_native_structured_output": true,
@@ -14250,7 +14254,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -14264,7 +14268,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/eu-north-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -14786,7 +14790,7 @@
         "input_cost_per_token_flex": 3.7e-07,
         "input_cost_per_token_priority": 1.295e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.22e-06,
@@ -14800,7 +14804,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/sa-east-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -15035,7 +15039,7 @@
         "input_cost_per_token_flex": 3.1e-07,
         "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -15049,7 +15053,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/us-east-1/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -15156,7 +15160,7 @@
         "input_cost_per_token_flex": 3.1e-07,
         "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -15170,7 +15174,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/us-east-2/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -15552,6 +15556,7 @@
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-anthropic-claude-sonnet-4-5.md"
     },
     "bedrock/us-gov-west-1/meta.llama3-70b-instruct-v1:0": {
+        "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.65e-06,
         "litellm_provider": "bedrock",
         "max_input_tokens": 8000,
@@ -15562,6 +15567,7 @@
         "supports_pdf_input": true
     },
     "bedrock/us-gov-west-1/meta.llama3-8b-instruct-v1:0": {
+        "deprecation_date": "2027-03-30",
         "input_cost_per_token": 3e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 8000,
@@ -15708,7 +15714,7 @@
         "input_cost_per_token_flex": 3.1e-07,
         "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock",
-        "max_input_tokens": 163840,
+        "max_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -15722,7 +15728,7 @@
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md"
     },
     "bedrock/us-west-2/minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
@@ -23519,12 +23525,12 @@
         ]
     },
     "deepgram/streaming/nova-3": {
-        "input_cost_per_second": 8e-05,
+        "input_cost_per_second": 0.00012833,
         "litellm_provider": "deepgram",
         "metadata": {
-            "calculation": "$0.0048/60 seconds = $0.00008000 per second",
+            "calculation": "$0.0077/60 seconds = $0.00012833 per second",
             "note": "Nova-3 monolingual streaming, pay as you go",
-            "original_pricing_per_minute": 0.0048
+            "original_pricing_per_minute": 0.0077
         },
         "mode": "audio_transcription",
         "output_cost_per_second": 0.0,
@@ -23533,13 +23539,28 @@
             "/v1/listen"
         ]
     },
-    "deepgram/streaming/nova-3-multilingual": {
-        "input_cost_per_second": 9.667e-05,
+    "deepgram/streaming/nova-3-medical": {
+        "input_cost_per_second": 0.00012833,
         "litellm_provider": "deepgram",
         "metadata": {
-            "calculation": "$0.0058/60 seconds = $0.00009667 per second",
+            "calculation": "$0.0077/60 seconds = $0.00012833 per second",
+            "note": "Nova-3 Medical streaming, launch price from Deepgram's 2025-03-03 announcement. deepgram.com/pricing does not list Nova-3 Medical, and this matches its current Nova-3 monolingual streaming pay as you go rate",
+            "original_pricing_per_minute": 0.0077
+        },
+        "mode": "audio_transcription",
+        "output_cost_per_second": 0.0,
+        "source": "https://www.businesswire.com/news/home/20250303470439/en",
+        "supported_endpoints": [
+            "/v1/listen"
+        ]
+    },
+    "deepgram/streaming/nova-3-multilingual": {
+        "input_cost_per_second": 0.00015333,
+        "litellm_provider": "deepgram",
+        "metadata": {
+            "calculation": "$0.0092/60 seconds = $0.00015333 per second",
             "note": "Nova-3 multilingual (language=multi) streaming, pay as you go",
-            "original_pricing_per_minute": 0.0058
+            "original_pricing_per_minute": 0.0092
         },
         "mode": "audio_transcription",
         "output_cost_per_second": 0.0,
@@ -24519,7 +24540,7 @@
         "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_input_tokens": 156000,
         "max_output_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
@@ -24530,7 +24551,7 @@
         "supports_reasoning": true,
         "supports_native_structured_output": true,
         "supports_tool_choice": true,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-2.md",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -49614,6 +49635,7 @@
         "supports_max_reasoning_effort": true,
         "supports_mid_conversation_system": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_output_config": true,
         "supports_parallel_tool_use_config": true,
         "supports_pdf_input": true,
@@ -49658,6 +49680,7 @@
         "supports_vision": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
         "bedrock_output_config_effort_ceiling": "xhigh",
@@ -53957,23 +53980,23 @@
         "supports_vision": true
     },
     "wandb/meta-llama/Llama-3.1-8B-Instruct": {
-        "max_input_tokens": 131000,
+        "max_input_tokens": 128000,
         "max_output_tokens": 128000,
         "input_cost_per_token": 2.2e-07,
         "output_cost_per_token": 2.2e-07,
         "litellm_provider": "wandb",
         "mode": "chat",
-        "source": "https://wandb.ai/site/pricing/tokens/"
+        "source": "https://www.coreweave.com/products/coreweave-forge/serverless-inference"
     },
     "wandb/deepseek-ai/DeepSeek-V3.1": {
         "supports_reasoning": true,
-        "max_input_tokens": 161000,
+        "max_input_tokens": 128000,
         "max_output_tokens": 128000,
         "input_cost_per_token": 5.5e-07,
         "output_cost_per_token": 1.65e-06,
         "litellm_provider": "wandb",
         "mode": "chat",
-        "source": "https://wandb.ai/site/pricing/tokens/"
+        "source": "https://www.coreweave.com/products/coreweave-forge/serverless-inference"
     },
     "wandb/meta-llama/Llama-3.3-70B-Instruct": {
         "max_input_tokens": 128000,
@@ -54457,6 +54480,8 @@
         "input_cost_per_token_above_200k_tokens_batches": 2e-06,
         "input_cost_per_token_batches": 1e-06,
         "litellm_provider": "xai",
+        "token_count_framing": 185,
+        "token_count_tool_framing": 214,
         "max_input_tokens": 1000000,
         "max_output_tokens": 1000000,
         "mode": "chat",
@@ -59875,6 +59900,7 @@
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-cyber.html",
         "use_openai_responses_path": true,
         "supported_endpoints": [
@@ -59896,7 +59922,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
-        "supports_vision": true
+        "supports_vision": true,
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-daybreak-blue-5.6-sol": {
         "input_cost_per_token": 4.4e-06,
@@ -59911,6 +59938,7 @@
         "max_input_tokens": 1050000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/responses"
@@ -59930,7 +59958,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-daybreak-blue-56-sol.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-daybreak-blue-56-sol.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-5.6-luna": {
         "input_cost_per_token": 2.2e-07,
@@ -60336,6 +60365,7 @@
         "mode": "responses",
         "output_cost_per_token_above_272k_tokens_ultrafast": 0.000495,
         "output_cost_per_token_ultrafast": 0.00033,
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60359,7 +60389,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-astra.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-6-sol": {
         "input_cost_per_token": 2.2e-06,
@@ -60374,6 +60405,7 @@
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60397,7 +60429,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/openai.gpt-6-luna": {
         "input_cost_per_token": 1.1e-07,
@@ -60412,6 +60445,7 @@
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "mode": "responses",
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60435,7 +60469,8 @@
         "supports_tool_choice": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html"
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-cards-openai.html",
+        "supports_web_search": true
     },
     "us.openai.gpt-6-astra": {
         "supports_bedrock_runtime_chat_completions_response_format": true,
@@ -62630,7 +62665,9 @@
         "supports_response_schema": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "supports_vision": true
+        "supports_vision": true,
+        "token_count_framing": 23,
+        "token_count_tool_framing": 12
     },
     "deepseek/deepseek-v4-flash-vision-exp": {
         "cache_creation_input_token_cost": 0.0,
@@ -62736,7 +62773,9 @@
         "supports_response_schema": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "supports_vision": false
+        "supports_vision": false,
+        "token_count_framing": 76,
+        "token_count_tool_framing": 75
     },
     "tencent/deepseek-v4-pro": {
         "cache_creation_input_token_cost": 0.0,
@@ -64022,6 +64061,7 @@
         "input_cost_per_token": 3e-07,
         "input_cost_per_token_priority": 3.75e-07,
         "litellm_provider": "fireworks_ai",
+        "token_count_framing": 23,
         "max_input_tokens": 1048576,
         "max_output_tokens": 393216,
         "mode": "chat",
@@ -64029,6 +64069,7 @@
         "output_cost_per_token_priority": 1.5e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64048,6 +64089,7 @@
         "output_cost_per_token_priority": 2.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64090,6 +64132,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64120,6 +64163,7 @@
         "input_cost_per_token": 3e-07,
         "input_cost_per_token_priority": 3.75e-07,
         "litellm_provider": "fireworks_ai",
+        "token_count_framing": 23,
         "max_input_tokens": 1048576,
         "max_output_tokens": 393216,
         "mode": "chat",
@@ -64127,6 +64171,7 @@
         "output_cost_per_token_priority": 1.5e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64146,6 +64191,7 @@
         "output_cost_per_token_priority": 2.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -64220,6 +64266,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64240,6 +64287,7 @@
         ],
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64263,6 +64311,7 @@
         ],
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64338,6 +64387,7 @@
         "output_cost_per_token_priority": 3e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64374,6 +64424,7 @@
         "output_cost_per_token_priority": 6.375e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_vision": true
     },
@@ -64410,6 +64461,7 @@
         "output_cost_per_token_priority": 3e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64480,6 +64532,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -64503,6 +64556,7 @@
         ],
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67296,6 +67350,7 @@
         "output_cost_per_token_priority": 5.5e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67314,6 +67369,7 @@
         "output_cost_per_token_priority": 8.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67332,6 +67388,7 @@
         "output_cost_per_token_priority": 5.5e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67350,6 +67407,7 @@
         "output_cost_per_token_priority": 8.25e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67365,6 +67423,7 @@
         "output_cost_per_token": 6.6e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67407,6 +67466,7 @@
         "output_cost_per_token": 6.6e-06,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -67425,6 +67485,7 @@
         "output_cost_per_token_priority": 6.25e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67443,6 +67504,7 @@
         "output_cost_per_token_priority": 9.375e-07,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67460,6 +67522,7 @@
         "output_cost_per_token_priority": 6.25e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67478,6 +67541,7 @@
         "output_cost_per_token_priority": 9.375e-07,
         "source": "https://docs.fireworks.ai/serverless/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -67496,6 +67560,7 @@
         "output_cost_per_token_priority": 4.05e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
@@ -68281,6 +68346,7 @@
         "supports_max_reasoning_effort": true,
         "supports_mid_conversation_system": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_output_config": true,
         "supports_parallel_tool_use_config": true,
         "supports_pdf_input": true,
@@ -68326,6 +68392,7 @@
         "supports_vision": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
         "bedrock_output_config_effort_ceiling": "xhigh",
@@ -68554,6 +68621,7 @@
         "supports_max_reasoning_effort": true,
         "supports_mid_conversation_system": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_output_config": true,
         "supports_parallel_tool_use_config": true,
         "supports_pdf_input": true,
@@ -68594,6 +68662,7 @@
         "supports_vision": true,
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": false,
+        "supports_bedrock_native_structured_output": false,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
         "bedrock_output_config_effort_ceiling": "xhigh",
@@ -68633,7 +68702,9 @@
         "cache_read_input_token_cost_above_272k_tokens": 5.4e-07,
         "output_cost_per_token": 1.62e-05,
         "output_cost_per_token_above_272k_tokens": 2.43e-05,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-terra.html"
+        "search_context_cost_per_query": {"search_context_size_high":0.0144,"search_context_size_low":0.0144,"search_context_size_medium":0.0144},
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-terra.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/us-gov-west-1/openai.gpt-5.6-luna": {
         "litellm_provider": "bedrock_mantle",
@@ -68668,7 +68739,9 @@
         "cache_read_input_token_cost_above_272k_tokens": 5.4e-08,
         "output_cost_per_token": 1.62e-06,
         "output_cost_per_token_above_272k_tokens": 2.43e-06,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-luna.html"
+        "search_context_cost_per_query": {"search_context_size_high":0.0144,"search_context_size_low":0.0144,"search_context_size_medium":0.0144},
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-56-luna.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/us-gov-west-1/openai.gpt-5.4": {
         "litellm_provider": "bedrock_mantle",
@@ -68697,7 +68770,9 @@
         "input_cost_per_token": 3.375e-06,
         "cache_read_input_token_cost": 3.375e-07,
         "output_cost_per_token": 2.025e-05,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-54.html"
+        "search_context_cost_per_query": {"search_context_size_high":0.0144,"search_context_size_low":0.0144,"search_context_size_medium":0.0144},
+        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-54.html",
+        "supports_web_search": true
     },
     "bedrock_mantle/us-gov-west-1/xai.grok-4.3": {
         "use_openai_responses_path": true,
@@ -73731,6 +73806,7 @@
         "output_cost_per_token_priority": 1.875e-05,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -75312,6 +75388,7 @@
         "output_cost_per_token_above_272k_tokens": 1.65e-05,
         "output_cost_per_token_above_272k_tokens_ultrafast": 9.9e-05,
         "output_cost_per_token_ultrafast": 6.6e-05,
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-1-sol.html",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -75334,6 +75411,7 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
+        "supports_web_search": true,
         "supports_xhigh_reasoning_effort": true,
         "use_openai_responses_path": true
     },
@@ -76758,6 +76836,7 @@
         "supports_audio_input": true,
         "supports_audio_output": false,
         "supports_computer_use": true,
+        "supports_continuation": true,
         "supports_function_calling": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
@@ -76817,6 +76896,7 @@
         ],
         "supports_audio_input": true,
         "supports_computer_use": true,
+        "supports_continuation": true,
         "supports_function_calling": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
@@ -76874,6 +76954,7 @@
             "text"
         ],
         "supports_audio_input": true,
+        "supports_continuation": true,
         "supports_function_calling": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
@@ -77231,6 +77312,7 @@
         "output_cost_per_token_priority": 1.5e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models?format=nested",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -77389,6 +77471,7 @@
         "output_cost_per_token_priority": 9e-07,
         "source": "https://platform.minimax.io/docs/guides/pricing",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
@@ -79022,6 +79105,7 @@
         "mode": "responses",
         "output_cost_per_token": 5.5e-06,
         "output_cost_per_token_above_272k_tokens": 8.25e-06,
+        "search_context_cost_per_query": {"search_context_size_high":0.012,"search_context_size_low":0.012,"search_context_size_medium":0.012},
         "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-6-1-terra.html",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -79044,6 +79128,7 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
+        "supports_web_search": true,
         "supports_xhigh_reasoning_effort": true,
         "use_openai_responses_path": true
     },
@@ -81164,6 +81249,7 @@
         ],
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -81180,6 +81266,7 @@
         "output_cost_per_token": 3.08e-06,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -81196,6 +81283,7 @@
         "output_cost_per_token": 8.4e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -81212,6 +81300,7 @@
         "output_cost_per_token": 8.4e-07,
         "source": "https://api.fireworks.ai/v1/serverless/models",
         "supports_function_calling": true,
+        "supports_mid_conversation_system": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
diff --git a/pyproject.toml b/pyproject.toml
index 5c23a64ebb3..7a653b28f81 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
     "tiktoken>=0.12.0,<1.0; python_version == '3.14'",
     "tiktoken>=0.14.0,<1.0; python_version >= '3.15'",
     "tokenizers>=0.21.0,<1.0",
-    "huggingface-hub>=0.34.0,<2.0",
+    "huggingface-hub>=0.34.0,<3.0",
     "click>=8.0.0,<9.0",
     "jinja2>=3.1.6,<4.0",
     "aiohttp>=3.14.2,<4.0",
diff --git a/tests/code_coverage_tests/check_e2e_no_raw_requests.py b/tests/code_coverage_tests/check_e2e_no_raw_requests.py
index bea177d3b7d..94cba6334e0 100644
--- a/tests/code_coverage_tests/check_e2e_no_raw_requests.py
+++ b/tests/code_coverage_tests/check_e2e_no_raw_requests.py
@@ -3,7 +3,7 @@ raw HTTP client imports (requests, urllib.request, httpx, aiohttp, http.client)
 banned in suite code, and tests/e2e_harness, which tests that harness, is held to the
 same ban. Importing requests' exception types for catching is fine anywhere; a small
 allowlist grandfathers the files that legitimately make raw calls (the transport
-itself, the root conftest liveness probe, the claude_code version resolver's constant
+itself, the root conftest liveness probe, the cli_harness npm version resolver's constant
 registry URL fetch, and the mcp OAuth client, whose httpx client is the object the
 official mcp SDK's streamable_http_client requires and so cannot go through the sync
 requests transport). Referenced by tests/e2e/AGENTS.md."""
@@ -24,7 +24,7 @@ BANNED_MODULES = ("requests", "urllib.request", "http.client", "httpx", "aiohttp
 ALLOWED_RAW_CLIENT_FILES = {
     "e2e/e2e_http.py": ("requests",),
     "e2e/conftest.py": ("requests",),
-    "e2e/claude_code/pr_gate_version_resolver.py": ("urllib.request",),
+    "e2e/cli_harness/npm_version_resolver.py": ("urllib.request",),
 }
 
 EXCEPTION_ONLY_NAMES = frozenset({"RequestException", "ConnectionError", "Timeout", "HTTPError"})
diff --git a/tests/e2e/AGENTS.md b/tests/e2e/AGENTS.md
index cf1e41a59a6..7843c1a4091 100644
--- a/tests/e2e/AGENTS.md
+++ b/tests/e2e/AGENTS.md
@@ -44,11 +44,13 @@ Each subdirectory under `tests/e2e/` is one suite, scoped to an endpoint family
 - `logging/` - logging-integration delivery (datadog and friends)
 - `security/` - secret handling and log-leak protection
 - `router/` - routing and reliability behavior (fallbacks, cooldowns) plus the memory tests (`test_reliability_memory_e2e.py`: every worker's RSS as read at collection time, before any test traffic, must sit under a fixed idle budget, the release-gate check for a DB-backed boot that idles near the pod limit the way v1.100.x did, and a few hundred failing requests with retries and fallbacks must not grow proxy RSS past a loose ceiling over the measured batches nor store a request snapshot past a fixed size, the release-gate check for the v1.100.0 retry-breadcrumb leak)
-- `perf/` - performance-category tests, kept OUT of the main suite: throughput/load SLO tests are a different testing category from functional e2e (variance-driven, historically flaky) and live outside this suite until re-implemented as their own pipeline (LIT-5163). Do not add a live load test that runs in the default collection. What lives here: the weekly session-anomaly test (`test_weekly_session_anomaly_e2e.py`, Claude Code-shaped multi-turn sessions against real providers with ceilings on error rate, cache read/write, turn time, and spend, marked `weekly` and deselected unless `E2E_WEEKLY_ANOMALY` is set, driven by `.github/workflows/weekly_load_anomaly.yml`), the Redis chaos test (`test_redis_chaos_e2e.py`, locust load against mock deployments split round robin over `/chat/completions` and `/v1/messages`, one endpoint per simulated user, with `CLIENT PAUSE ALL` on the proxy's Redis mid-run to simulate it being down outright, asserting zero failed requests on every endpoint, budgeting RSS and CPU-per-request as ratios against the same run's healthy phase, and holding p50/p90/p99 latency and log-bytes-per-request to flat ceilings (a ratio cannot bound those two: an open breaker skips Redis instead of waiting on it, so the chaos phase can measure cheaper than baseline while still being far slower than a user should see), needs a proxy booted from `gateway/redis_chaos_ci_config.yml` on the same host with `E2E_PROXY_PID` and `E2E_PROXY_LOG` set, marked `redis_chaos`, deselected unless `E2E_PERF_TESTS` is set and excluded from the per-PR selector like the rest of `perf/`, driven by `.github/workflows/test-e2e-redis-chaos.yml` and by the Buildkite `e2e-redis-chaos` step in project-releaser, which runs the proxy, Postgres and Valkey co-located with pytest in one pod and sets the opt-in). New perf tests go here too, marked `perf`, behind the same `E2E_PERF_TESTS` opt-in. The perf cases (`test_perf_cases.py`, one `PerformanceTestCase` per module in `perf/cases/`, no `_e2e` suffix) are the request-performance runs. A case names what the gateway was deployed with (model groups and guardrails, written out in the gateway's config: the `proxy_config` block of project-releaser's perf helm values in the lane, `gateway/perf_ci_config.yml` locally, with each deployment's mock knobs in an `x-mock-knobs` extra header so the model ids are real ones like `gpt-6-luna` and `anthropic.claude-sonnet-5`) and lists what the test creates and sends: teams, Keycloak JWT users, virtual keys, `RequestShape`s (a coding-agent session from `perf/setup/corpus/` whose input-token size is drawn per request from the shape's range, with or without tools, and the output cap), a `Traffic` plan (seed, rps, request count, endpoint, shape and stream shares, or a `Ramp` that steps the rate up through the run, built with `ramped()`, whose plan carries each request's send second and whose run reports `sustained_rps`, the last step the pod held, scored in `perf/setup/ramp.py`, with every step's latency, completed rate, non-200s, CPU per request, Redis latency and Postgres connections cut from the samplers' time-stamped `Series` (`perf/setup/series.py`) to the step's window and emitted as `perf_ramp_step_<rps>_<reading>` JUnit properties for the dashboard) and `Limit`s (one metric at one percentile under one ceiling, or over one floor for `sustained_rps`). The infra side lives in `perf/setup/`: `provision.py` checks the deployed config matches the case and builds the callers, `plan.py` draws the request list from the seed, `run.py` replays it from a separate Locust process (`locustfile.py`) that builds each body right before sending and records status, header, first-byte, first-token and total time per request, and `observe.py` joins all of that with what the mocks received and the workers' RSS to score every `Limit`. Limits are about what the caller sees and what the gateway costs: every non-blocked request is a 200 (`unexpected_status_count`), the seconds the gateway added per request at p50 and p99 (`gateway_added_seconds`, to the first token on streams), the client's time to the first token of a stream at p50 and p99 (`time_to_first_token_seconds`, mock delay included), worker memory growth (`memory_growth_megabytes`), and the Postgres statements and Redis commands a request waits on before it is forwarded (`postgres_calls_per_request`, `redis_calls_per_request`: auth and routing reads, the rate-limiter script), with the work the gateway does after the response or on a timer (spend writes, daily aggregates, config reloads) reported separately as `postgres_background_calls_per_request` and `redis_background_calls_per_request`; the same overhead as the gateway itself reports it, read from the `x-litellm-overhead-duration-ms` header per request (`litellm_overhead_seconds`, gated next to `gateway_added_seconds`, the outside reading of the same thing, so the two can be charted together) and the gateway's own end-to-end time from `x-litellm-response-duration-ms` (`litellm_response_seconds`), the run mean of the gateway's `litellm_redis_latency` histogram from a `/metrics` scrape before and after the run (`telemetry.py`, `prometheus_redis_latency_mean_seconds`), and the database's own view of the run from the same `pg_stat_statements` rows and a once-a-second `pg_stat_activity` sample: execution seconds per wall second (`postgres_active_sessions`, the average-active-sessions number RDS reports as DB load), the slowest statement's mean (`postgres_slowest_statement_seconds`, named in the detail) and the peak client connection count (`postgres_peak_connections`), each under a ceiling set from the first local runs and due a retune once the lane has its ten-run baseline; `datastore.py` reads `pg_stat_statements` before and after the run and holds a Redis `MONITOR` connection during it, sorts each statement by verb and table and each command by key, and the run output lists the top statements and commands per bucket so a red run names what grew. Whether a body, a guardrail call or a spend row is right is printed as a diagnostic, never a limit, that is the functional suites' job. The providers and the guardrail are out-of-process servers in `perf/setup/mocks/` (`server.py openai|anthropic|bedrock|guardrail`, each answering with a reply generated for the request in that provider's wire format, sized from the prompt and output cap, a tool call when tools were offered, waiting the case's `mock_latency` first, request logs at `/mock/requests` and `/mock/calls`), reached through `E2E_PERF_MOCK_*_URL` by both the gateway config and the test. Adding a perf test is adding a module with a `CASE` to `perf/cases/`; a new deployment or guardrail is a config change; a new metric is a name in `Metric` plus a branch in `observe.observe`
+- `perf/` - performance-category tests, kept OUT of the main suite: throughput/load SLO tests are a different testing category from functional e2e (variance-driven, historically flaky) and live outside this suite until re-implemented as their own pipeline (LIT-5163). Do not add a live load test that runs in the default collection. What lives here: the weekly session-anomaly test (`test_weekly_session_anomaly_e2e.py`, Claude Code-shaped multi-turn sessions against real providers with ceilings on error rate, cache read/write, turn time, and spend, marked `weekly` and deselected unless `E2E_WEEKLY_ANOMALY` is set, run by hand since its weekly workflow never had working Bedrock credentials), the Redis chaos test (`test_redis_chaos_e2e.py`, locust load against mock deployments split round robin over `/chat/completions` and `/v1/messages`, one endpoint per simulated user, with `CLIENT PAUSE ALL` on the proxy's Redis mid-run to simulate it being down outright, asserting zero failed requests on every endpoint, budgeting RSS and CPU-per-request as ratios against the same run's healthy phase, and holding p50/p90/p99 latency and log-bytes-per-request to flat ceilings (a ratio cannot bound those two: an open breaker skips Redis instead of waiting on it, so the chaos phase can measure cheaper than baseline while still being far slower than a user should see), needs a proxy booted from `gateway/redis_chaos_ci_config.yml` on the same host with `E2E_PROXY_PID` and `E2E_PROXY_LOG` set, marked `redis_chaos`, deselected unless `E2E_PERF_TESTS` is set and excluded from the per-PR selector like the rest of `perf/`, driven by `.github/workflows/test-e2e-redis-chaos.yml` and by the Buildkite `e2e-redis-chaos` step in project-releaser, which runs the proxy, Postgres and Valkey co-located with pytest in one pod and sets the opt-in). New perf tests go here too, marked `perf`, behind the same `E2E_PERF_TESTS` opt-in. The perf cases (`test_perf_cases.py`, one `PerformanceTestCase` per module in `perf/cases/`, no `_e2e` suffix) are the request-performance runs. A case names what the gateway was deployed with (model groups and guardrails, written out in the gateway's config: the `proxy_config` block of project-releaser's perf helm values in the lane, `gateway/perf_ci_config.yml` locally, with each deployment's mock knobs in an `x-mock-knobs` extra header so the model ids are real ones like `gpt-6-luna` and `anthropic.claude-sonnet-5`) and lists what the test creates and sends: teams, Keycloak JWT users, virtual keys, `RequestShape`s (a coding-agent session from `perf/setup/corpus/` whose input-token size is drawn per request from the shape's range, with or without tools, and the output cap), a `Traffic` plan (seed, rps, request count, endpoint, shape and stream shares, or a `Ramp` that steps the rate up through the run, built with `ramped()`, whose plan carries each request's send second and whose run reports `sustained_rps`, the last step the pod held, scored in `perf/setup/ramp.py`, with every step's latency, completed rate, non-200s, CPU per request, Redis latency and Postgres connections cut from the samplers' time-stamped `Series` (`perf/setup/series.py`) to the step's window and emitted as `perf_ramp_step_<rps>_<reading>` JUnit properties for the dashboard) and `Limit`s (one metric at one percentile under one ceiling, or over one floor for `sustained_rps`). The infra side lives in `perf/setup/`: `provision.py` checks the deployed config matches the case and builds the callers, `plan.py` draws the request list from the seed, `run.py` replays it from a separate Locust process (`locustfile.py`) that builds each body right before sending and records status, header, first-byte, first-token and total time per request, and `observe.py` joins all of that with what the mocks received and the workers' RSS to score every `Limit`. Limits are about what the caller sees and what the gateway costs: every non-blocked request is a 200 (`unexpected_status_count`), the seconds the gateway added per request at p50 and p99 (`gateway_added_seconds`, to the first token on streams), the client's time to the first token of a stream at p50 and p99 (`time_to_first_token_seconds`, mock delay included), worker memory growth (`memory_growth_megabytes`), and the Postgres statements and Redis commands a request waits on before it is forwarded (`postgres_calls_per_request`, `redis_calls_per_request`: auth and routing reads, the rate-limiter script), with the work the gateway does after the response or on a timer (spend writes, daily aggregates, config reloads) reported separately as `postgres_background_calls_per_request` and `redis_background_calls_per_request`; the same overhead as the gateway itself reports it, read from the `x-litellm-overhead-duration-ms` header per request (`litellm_overhead_seconds`, gated next to `gateway_added_seconds`, the outside reading of the same thing, so the two can be charted together) and the gateway's own end-to-end time from `x-litellm-response-duration-ms` (`litellm_response_seconds`), the run mean of the gateway's `litellm_redis_latency` histogram from a `/metrics` scrape before and after the run (`telemetry.py`, `prometheus_redis_latency_mean_seconds`), and the database's own view of the run from the same `pg_stat_statements` rows and a once-a-second `pg_stat_activity` sample: execution seconds per wall second (`postgres_active_sessions`, the average-active-sessions number RDS reports as DB load), the slowest statement's mean (`postgres_slowest_statement_seconds`, named in the detail) and the peak client connection count (`postgres_peak_connections`), each under a ceiling set from the first local runs and due a retune once the lane has its ten-run baseline; `datastore.py` reads `pg_stat_statements` before and after the run and holds a Redis `MONITOR` connection during it, sorts each statement by verb and table and each command by key, and the run output lists the top statements and commands per bucket so a red run names what grew. Whether a body, a guardrail call or a spend row is right is printed as a diagnostic, never a limit, that is the functional suites' job. The providers and the guardrail are out-of-process servers in `perf/setup/mocks/` (`server.py openai|anthropic|bedrock|guardrail`, each answering with a reply generated for the request in that provider's wire format, sized from the prompt and output cap, a tool call when tools were offered, waiting the case's `mock_latency` first, request logs at `/mock/requests` and `/mock/calls`), reached through `E2E_PERF_MOCK_*_URL` by both the gateway config and the test. Adding a perf test is adding a module with a `CASE` to `perf/cases/`; a new deployment or guardrail is a config change; a new metric is a name in `Metric` plus a branch in `observe.observe`
 - `other/` - the holding-pen suite for the `other.*` registry cluster with no home of its own yet: the master-key auth gate, JWT auth (access tokens issued by a real Keycloak realm, `idp.py` plus `idp_realm.json`, whose JWKS the proxy's `JWT_PUBLIC_KEY_URL` points at, see CONTRIBUTING.md for the start command and config block), and the process-lifecycle health probes (liveness, public readiness, authenticated readiness diagnostics). Promote a cluster out once it is large/stable enough for its own suite
 - `secret_manager/` - the gateway's `key_management_system` against a real secret manager: deployment keys resolved from it (`os.environ/<name>` where the name exists only in the manager) and virtual keys written to and deleted from it. The tests are backend-agnostic and each backend is its own lane, because the setting is global to the proxy: `E2E_SECRET_MANAGER=<system>` opts in and picks the backend from `secret_backends.BACKENDS`, the proxy is booted from `gateway/secret_manager_<system>_ci_config.yml` against the live manager, and the tests reach that manager through the backend's `SecretStore` (`secret_store_<system>.py`). A test needing something not every backend does carries `requires_capability(...)` and is deselected on lanes that lack it. `secret_manager/backend.sh up <system>` runs a backend in Docker and writes the proxy's and the tests' env. Marked `secret_manager`, deselected unless `E2E_SECRET_MANAGER` is set, and kept out of the per-PR selector. Backends today: `hashicorp_vault` and `cyberark` (CyberArk Conjur, which cannot delete, so the delete test is Vault-only)
 - `gateway/` - proxy configuration only (`litellm-config.yml`). No tests
-- `claude_code/` - the Claude Code compatibility matrix: drives the real `claude` CLI (and HTTP probes) against a proxy for each feature x provider cell, reporting tagged-union outcomes via the `compat_result` fixture. Ships its own driver/builder/publisher, covered by `tests/e2e_harness/claude_code/`. The HTTP probes ride the shared transport (`ProxyClient.count_tokens` / `ProxyClient.messages`). The CLI-driving path stays bespoke
+- `claude_code/` - the Claude Code compatibility matrix: drives the real `claude` CLI (and HTTP probes) against a proxy for each feature x provider cell, reporting tagged-union outcomes via the `compat_result` fixture. Ships its own driver/builder/publisher, covered by `tests/e2e_harness/claude_code/`. The HTTP probes ride the shared transport (`ProxyClient.count_tokens` / `ProxyClient.messages`). The CLI-driving path stays bespoke. `pr_gate_version_resolver.py` only forwards to `cli_harness/npm_version_resolver.py`, because the Buildkite runner images still run that path and install @latest without it
+- `cli_harness/` - no tests, only the plumbing every suite that drives a real coding-agent CLI shares: `npm_version_resolver.py` picks the CLI release to install (the newest npm release at least three days old, run by CI as `python tests/e2e/cli_harness/npm_version_resolver.py <npm package>`, stdlib only), `lockdown.py` gives the CLI subprocess an allowlisted env and a fresh empty HOME so it never sees the runner's credentials or dotfiles, and `rate_limiter.py` is the cross-process token bucket per upstream that keeps parallel CLI runs under one request rate. Covered by `tests/e2e_harness/cli_harness/`. Code only one CLI suite needs stays in that suite
+- `codex/` - the Codex compatibility suite: drives the real `codex exec --json` CLI through the gateway, one class per row (the command round trip, a file edit with the patch tool, a long session that follows a chain of files one command at a time, and auto-compaction, where Codex reads a random value, compacts through the gateway and is asked for the value after the file is deleted), each row parametrized over `SETUPS` in `setups.py`, one `pytest.param` per setup (GPT on Bedrock Mantle, Bedrock Runtime, Azure OpenAI and OpenAI, plus Claude on Bedrock). A row with one setup broken by a known bug parametrizes over `with_expected_failure(<setup id>, reason=...)`, which is `SETUPS` with a strict xfail on that one setup. The `setup` fixture registers that setup's deployment under a fresh name via `/model/new` and the `codex` fixture makes a key scoped to it, and both are deleted on teardown. `harness.py` gives each test a throwaway HOME and CODEX_HOME whose `config.toml` points a custom `responses` provider at the gateway and has Codex read its model list from the gateway's `/v1/models` (`model_catalog_url` on the provider), with the sandbox on (`workspace-write`) and approvals off, and runs the CLI under `cli_harness`'s env lockdown and rate limiter. `run.py` reads the JSONL events into a `CodexRun`: the commands with their output, the patched files, the last agent message as `answer`, the usage and the errors, where an error's `status_code` is what lets the suite's 5xx rerun rule catch a turn Codex gave up on. `codex exec --json` prints nothing when Codex compacts, so `rollout.py` reads the compactions from the thread's rollout file under CODEX_HOME/sessions, and a compaction is remote when its replacement history kept the provider's `compaction` item. `exec` and `resume` take `compact_after_tokens`, which forces Codex's remote compaction (`compaction_trigger` items over `/v1/responses`, the path Codex otherwise only takes for OpenAI and Azure) on the gateway provider and compacts once the context grows past that many tokens. A test passes on a random value the model can only learn through the gateway, never on the model's wording or the exact command it typed. It needs `codex` on PATH and fails without it. Covered by `tests/e2e_harness/codex/`
 - `ui/` - the Admin UI browser suite: Playwright in TypeScript, driving the dashboard served by a live proxy on port 4000 (seeded postgres + mock LLM upstream, see its `run_e2e.sh`). It is a self-contained npm package with its own lockfile and does not use the Python harness, pytest markers, or the shared transport. The Python rules in this file (typed models, `Result` unions, basedpyright zero-error gate) do not apply inside it. Its only Python file, `fixtures/mock_llm_server/server.py`, is excluded from the e2e basedpyright gate via the root `pyrightconfig.json`. Its specs follow the dashboard's rule against testing what shadcn and Base UI already guarantee, in `ui/litellm-dashboard/AGENTS.md`
 
 ## MCP suite: real Datadog only
@@ -324,5 +326,6 @@ other.<area>.<case>.<assertion>
 - spin up a local proxy by running the litellm proxy locally (`litellm --config <your-e2e-config>.yml --port 4000`, see CONTRIBUTING.md), make sure all tests pass. if a test fails due to an internally found issue, let users know to create a linear ticket for it. 
 
 - do not use xfail markers, tests should be written in a form that the end user expects it to pass
+- the `codex/` suite is the one exception: a single setup that a LiteLLM or provider bug breaks may carry `pytest.mark.xfail(strict=True, reason=...)` with a plain one-sentence reason on that setup's `pytest.param`, so it keeps running and goes red once the bug is fixed. Strict only, and never on a flaky setup (one that passes some runs and fails others)
 
 - a cell addresses the stack through its front door (`PROXY_BASE_URL`) the way a customer does, never a gateway pod by address, and proves a cross-replica property with N independent calls through that door, naming the miss odds (2^-N at two pods) in its docstring. `PROXY_REPLICA_URLS` is for read-backs that are per pod by nature (polling until a management write has converged on every replica, `/metrics`, RSS), never for steering the scenario a cell asserts on at a chosen pod
diff --git a/tests/e2e/claude_code/cli_driver.py b/tests/e2e/claude_code/cli_driver.py
index 6f7a7b39a39..599cfe6aa75 100644
--- a/tests/e2e/claude_code/cli_driver.py
+++ b/tests/e2e/claude_code/cli_driver.py
@@ -16,23 +16,18 @@ from __future__ import annotations
 import json
 import os
 import re
-import shutil
 import subprocess
 import sys
 import tempfile
 import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass, field
-from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence, Tuple, Union
+from typing import Any, Callable, Dict, Final, List, Mapping, Optional, Sequence, Tuple, Union
 
+from cli_harness.lockdown import isolated_home, locked_down_env
+from cli_harness.rate_limiter import RateBucket, RateLimiter, get_default_limiter
 from e2e_metadata import step
 
-from claude_code.rate_limiter import (
-    RateLimiter,
-    get_default_limiter,
-    infer_provider,
-)
-
 CLAUDE_CLI_DEFAULT = "claude"
 # 120s is fine for a single isolated CLI call against an unloaded
 # upstream, but the matrix run launches up to 75 concurrent calls and
@@ -77,61 +72,36 @@ Anthropic / Bedrock / Vertex) to reset. Both knobs are env-tunable so
 a matrix run can trade wall time for resilience without code edits;
 retries=0 disables the behavior entirely."""
 
-# Env vars the `claude` Node CLI legitimately needs to function:
-# locating its own binary + node, basic locale/terminal plumbing.
-# Deliberately excludes every credential-bearing var that the
-# surrounding CI job sets for the proxy (ANTHROPIC_API_KEY, AWS_*,
-# AZURE_*, VERTEXAI_CREDENTIALS, GITHUB_TOKEN, OPENAI_API_KEY,
-# DATABASE_URL, ...). The CLI talks to the proxy via the explicit
-# ANTHROPIC_BASE_URL/ANTHROPIC_AUTH_TOKEN we set below — it has no
-# business reading the proxy's upstream credentials, and a
-# compromised CLI release shouldn't be able to exfiltrate them out
-# of the CI environment.
-#
-# `HOME` is intentionally NOT in this list: see `_make_isolated_home`
-# below. We give the CLI a fresh empty per-invocation HOME so a
-# compromised claude package or a model-directed `Read` tool call
-# can't reach files like `~/.config/gh/hosts.yml`, `~/.ssh/id_rsa`,
-# or `~/.bash_history` on the cron VM (and on the CircleCI executor
-# the same isolation prevents accidentally exposing checkout-adjacent
-# files even though the runner home is ephemeral there).
-_CLI_ENV_ALLOWLIST: tuple = (
-    "PATH",
-    "USER",
-    "LOGNAME",
-    "SHELL",
-    "TERM",
-    "TMPDIR",
-    "LANG",
-    "LC_ALL",
-    "LC_CTYPE",
-    "NODE_PATH",
-    "NVM_DIR",
-    "NVM_BIN",
-)
 
+def infer_provider(model: str) -> RateBucket:
+    """Map a model alias to its compat-matrix rate bucket.
 
-def _make_isolated_home() -> str:
-    """Create a fresh empty HOME directory for a single `claude` subprocess.
-
-    The CLI needs *a* writable HOME (it caches per-session state under
-    `$HOME/.claude/projects/<sha>/`), but it has no legitimate need
-    for the *user's* HOME. Handing it the real one means a compromised
-    `@anthropic-ai/claude-code` release, or a model-directed `Read`
-    tool call during a PDF/vision cell, can read host files like
-    `~/.config/gh/hosts.yml` (GitHub CLI host token), `~/.ssh/`,
-    `~/.bash_history`, or any other dotfile under the runtime user's
-    home. On the cron VM the runtime user is a real interactive
-    account (`mateo`) with a populated home directory, so this is a
-    real exfiltration surface.
-
-    The directory is created under `tempfile.gettempdir()` (which is
-    `/tmp` on Linux; under systemd's `PrivateTmp=true` that's a
-    per-service tmpfs that the service user can't otherwise reach).
-    Caller is responsible for `shutil.rmtree`-ing it after the
-    subprocess exits.
+    The matrix column layout is fixed; aliases registered in the proxy
+    encode the provider via a suffix (`-bedrock-converse`,
+    `-bedrock-invoke`, `-azure`, `-vertex`, `-openai`, `-azure-openai`,
+    `-bedrock-mantle`) or its absence (Anthropic). Order matters:
+    `-azure-openai` also ends with `-openai`, and the bedrock suffixes
+    all contain `bedrock`, so the more-specific suffixes are tested
+    first.
     """
-    return tempfile.mkdtemp(prefix="claude-cli-home-")
+    if not model:
+        raise ValueError("model must be a non-empty string")
+    lower: Final = model.lower()
+    if lower.endswith("-azure-openai"):
+        return RateBucket.AZURE_OPENAI
+    if lower.endswith("-openai"):
+        return RateBucket.OPENAI
+    if lower.endswith("-bedrock-mantle"):
+        return RateBucket.BEDROCK_MANTLE
+    if lower.endswith("-bedrock-converse"):
+        return RateBucket.BEDROCK_CONVERSE
+    if lower.endswith("-bedrock-invoke"):
+        return RateBucket.BEDROCK_INVOKE
+    if lower.endswith("-azure"):
+        return RateBucket.AZURE
+    if lower.endswith("-vertex"):
+        return RateBucket.VERTEX_AI
+    return RateBucket.ANTHROPIC
 
 
 _FIXED_CLI_USER_ID = "0" * 64
@@ -176,7 +146,7 @@ def _stable_cli_state() -> Tuple[str, str]:
     Pinning both makes the bodies repeatable across builds.
 
     This narrows what survives rather than widening it: HOME stays fresh and
-    empty per invocation, so the isolation `_make_isolated_home` describes is
+    empty per invocation, so the isolation `cli_harness.lockdown` describes is
     unchanged, and the CLI's own state no longer outlives the pod either. The
     working directory is deliberately not the checkout, so a model-directed
     `Read` sees an empty directory instead of the repository.
@@ -291,38 +261,26 @@ def run_claude(
         cmd.append("--")
         cmd.append(prompt)
 
-    # Build a minimal env for the CLI subprocess: only the allowlisted
-    # process-runtime vars from os.environ, plus the explicit proxy
-    # creds, plus any caller-supplied overrides. See _CLI_ENV_ALLOWLIST
-    # above for the security rationale.
-    env: Dict[str, str] = {
-        key: os.environ[key] for key in _CLI_ENV_ALLOWLIST if key in os.environ
-    }
-    env["ANTHROPIC_BASE_URL"] = base_url
-    env["ANTHROPIC_AUTH_TOKEN"] = api_key
-    env["DISABLE_AUTOUPDATER"] = "1"
-    # Hand the CLI a fresh empty HOME so a compromised claude package
-    # or a model-directed Read tool call can't see the runtime user's
-    # real dotfiles. Created here, removed in the `finally` below
-    # regardless of how the subprocess exits.
-    isolated_home = _make_isolated_home()
-    env["HOME"] = isolated_home
-    config_dir, workspace = _stable_cli_state()
-    env["CLAUDE_CONFIG_DIR"] = config_dir
-    if extra_env:
-        env.update(extra_env)
-
     # Throttle by provider *before* launching the CLI. Doing this here
     # (rather than per-test) means every code path that lands on
     # `run_claude` is rate-limited automatically — including
     # `run_claude_models_parallel`, which is the hot path during the
     # full matrix run.
     limiter = rate_limiter if rate_limiter is not None else get_default_limiter()
-    provider = infer_provider(model)
-    limiter.acquire(provider)
-
     run_fn = runner or subprocess.run
-    try:
+    with isolated_home("claude-cli-home-") as home:
+        config_dir, workspace = _stable_cli_state()
+        env = locked_down_env(
+            home=home,
+            overrides={
+                "ANTHROPIC_BASE_URL": base_url,
+                "ANTHROPIC_AUTH_TOKEN": api_key,
+                "DISABLE_AUTOUPDATER": "1",
+                "CLAUDE_CONFIG_DIR": config_dir,
+                **(extra_env or {}),
+            },
+        )
+        limiter.acquire(infer_provider(model))
         try:
             completed = run_fn(
                 cmd,
@@ -340,15 +298,6 @@ def run_claude(
             ) from exc
         except subprocess.TimeoutExpired as exc:
             raise ClaudeCLIError(f"claude CLI timed out after {timeout}s") from exc
-    finally:
-        # Best-effort cleanup. If the subprocess wrote a `.claude/`
-        # session dir under the isolated HOME, we remove it here so
-        # parallel matrix runs don't accumulate per-call tmpdirs.
-        # `ignore_errors=True` because rmtree races with any
-        # not-yet-reaped child (SIGTERM'd `claude` on a host-side
-        # timeout) are benign — the next matrix run starts from a
-        # fresh tmpdir anyway.
-        shutil.rmtree(isolated_home, ignore_errors=True)
 
     events = _parse_stream_json(completed.stdout or "")
     text = _extract_assistant_text(events)
diff --git a/tests/e2e/claude_code/cron_vm/README.md b/tests/e2e/claude_code/cron_vm/README.md
index 4c16b6e237a..7451e86e09b 100644
--- a/tests/e2e/claude_code/cron_vm/README.md
+++ b/tests/e2e/claude_code/cron_vm/README.md
@@ -52,7 +52,7 @@ than as a GitHub Action or on a dedicated VM. Trade-offs:
    the stable venv doesn't install) is never loaded. The tag's own
    `tests/e2e/` is deliberately not used.
 3. **Resolves and installs the Claude Code CLI under test**:
-   `pr_gate_version_resolver.py` (run on the venv, the image has no
+   `tests/e2e/cli_harness/npm_version_resolver.py` (run on the venv, the image has no
    Python of its own) picks the newest `@anthropic-ai/claude-code` npm
    release published at least 3 days ago, the same buffer the PR gate
    uses, unless `CLAUDE_CODE_VERSION` pins one, and
diff --git a/tests/e2e/claude_code/cron_vm/run_daily.sh b/tests/e2e/claude_code/cron_vm/run_daily.sh
index 17b628b8c78..749d5166a34 100755
--- a/tests/e2e/claude_code/cron_vm/run_daily.sh
+++ b/tests/e2e/claude_code/cron_vm/run_daily.sh
@@ -8,7 +8,7 @@
 #      Releases API.
 #   2. Update a long-lived worktree at $WORKTREE to that tag and `uv sync` it.
 #   3. Resolve the Claude Code CLI version under test (the newest npm
-#      release at least 3 days old, via pr_gate_version_resolver.py, or
+#      release at least 3 days old, via cli_harness/npm_version_resolver.py, or
 #      $CLAUDE_CODE_VERSION when set) and download that release's
 #      linux-x64 binary into the run's scratch dir, checksum-verified
 #      against the vendor's release manifest (install_claude_code.sh).
@@ -329,7 +329,7 @@ PROXY_CONFIG="${WORKTREE}/tests/e2e/claude_code/test_config.yaml"
 if [[ -z "${CLAUDE_CODE_VERSION}" ]]; then
   CLAUDE_CODE_VERSION="$(
     cd "${WORKTREE}" \
-      && "${WORKTREE_UV}" run --no-sync python "${POPULATOR_DIR}/../pr_gate_version_resolver.py"
+      && "${WORKTREE_UV}" run --no-sync python "${POPULATOR_DIR}/../../cli_harness/npm_version_resolver.py" @anthropic-ai/claude-code
   )" || die "could not resolve the Claude Code version to test"
   log "resolved claude code: ${CLAUDE_CODE_VERSION}"
 else
diff --git a/tests/e2e/claude_code/http_probe.py b/tests/e2e/claude_code/http_probe.py
index a6c587f98cf..390ef4c24d4 100644
--- a/tests/e2e/claude_code/http_probe.py
+++ b/tests/e2e/claude_code/http_probe.py
@@ -31,8 +31,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from pydantic import BaseModel
-
+from cli_harness.rate_limiter import RateLimiter, get_default_limiter
 from e2e_http import (
     NetworkError,
     RateLimitedError,
@@ -59,12 +58,9 @@ from models import (
     JsonSchemaProperty,
     ToolInputSchema,
 )
+from pydantic import BaseModel
 
-from claude_code.rate_limiter import (
-    RateLimiter,
-    get_default_limiter,
-    infer_provider,
-)
+from claude_code.cli_driver import infer_provider
 
 if TYPE_CHECKING:
     from proxy_client import ProxyClient
diff --git a/tests/e2e/claude_code/pr_gate_version_resolver.py b/tests/e2e/claude_code/pr_gate_version_resolver.py
index 756dafb7d73..72392f8a0ae 100644
--- a/tests/e2e/claude_code/pr_gate_version_resolver.py
+++ b/tests/e2e/claude_code/pr_gate_version_resolver.py
@@ -1,155 +1,16 @@
-"""Claude Code PR-Gate Version Resolver.
-
-Resolves the `@anthropic-ai/claude-code` npm version that the PR-gate CI
-job installs. Selects the newest version (by publish timestamp) whose
-publish timestamp is at least 3 days old. The 3-day window is a security
-review buffer — see PRD #26476, "Version resolvers".
-
-Two surfaces:
-
-- ``resolve_pr_gate_version(...)`` — the importable function. Accepts
-  pre-fetched npm metadata (for unit tests) or a custom ``fetcher``
-  callable. The default fetcher hits the public npm registry.
-- ``python -m claude_code.pr_gate_version_resolver`` — prints the
-  resolved version string to stdout, suitable for piping into a shell
-  ``$(...)`` substitution inside the CircleCI job.
-
-The CLI form is what CircleCI runs at job start; engineers reading the
-job log can see the selected version on a single line above the
-``npm install -g`` step (acceptance criterion: "the selected Claude
-Code version is logged in the CI output").
-"""
+"""The path the Buildkite runner images run (`python3 tests/e2e/claude_code/pr_gate_version_resolver.py`) to pick the
+Claude Code release they install. They fall back to @latest when this file is missing, so keep it until they call
+`cli_harness/npm_version_resolver.py` themselves."""
 
 from __future__ import annotations
 
-import json
+import subprocess
 import sys
-import urllib.request
-from datetime import datetime, timedelta, timezone
-from typing import Callable, Mapping, Optional
-
-PACKAGE_NAME = "@anthropic-ai/claude-code"
-NPM_REGISTRY_URL = "https://registry.npmjs.org/{package}"
-DEFAULT_MIN_AGE = timedelta(days=3)
-DEFAULT_FETCH_TIMEOUT_SECONDS = 30
-
-# npm's `time` map mixes per-version timestamps with these meta keys.
-_TIME_META_KEYS = frozenset({"created", "modified"})
-
-
-class NoEligibleVersionError(RuntimeError):
-    """Raised when no version in the npm metadata satisfies the min-age cutoff."""
-
-
-def _parse_npm_timestamp(value: str) -> datetime:
-    """Parse the ISO-8601 timestamps npm emits (always UTC, may use ``Z``)."""
-    if value.endswith("Z"):
-        value = value[:-1] + "+00:00"
-    parsed = datetime.fromisoformat(value)
-    if parsed.tzinfo is None:
-        parsed = parsed.replace(tzinfo=timezone.utc)
-    return parsed
-
-
-def _default_fetcher(package_name: str) -> dict:
-    """Fetch the npm packument for ``package_name`` over HTTPS.
-
-    Uses urllib (stdlib) so this module has no extra dependencies in the
-    CI environment. Returns the raw JSON dict.
-    """
-    # urllib.parse.quote would encode the leading '@' / '/' which the
-    # npm registry expects literally; do a minimal hand-roll instead.
-    url = NPM_REGISTRY_URL.format(package=package_name.replace("/", "%2F"))
-    req = urllib.request.Request(url, headers={"Accept": "application/json"})
-    with urllib.request.urlopen(  # noqa: S310 — registry URL is constant
-        req, timeout=DEFAULT_FETCH_TIMEOUT_SECONDS
-    ) as response:
-        body = response.read().decode("utf-8")
-    return json.loads(body)
-
-
-def resolve_pr_gate_version(
-    *,
-    metadata: Optional[Mapping] = None,
-    fetcher: Optional[Callable[[str], Mapping]] = None,
-    as_of: Optional[datetime] = None,
-    min_age: timedelta = DEFAULT_MIN_AGE,
-    package_name: str = PACKAGE_NAME,
-) -> str:
-    """Return the newest npm version of ``package_name`` published >= ``min_age`` ago.
-
-    "Newest" means newest by **publish time**, not semver string order —
-    if a patch lands on an older major after a newer release, the
-    patched line is the eligible one. A version npm has unpublished keeps
-    its ``time`` entry but drops out of ``versions``, so only versions
-    still present in ``versions`` are candidates.
-
-    Args:
-        metadata: Pre-fetched npm packument (skips the HTTP call). Useful
-            for unit tests.
-        fetcher: Callable taking a package name and returning the
-            packument. Defaults to a stdlib HTTPS fetcher.
-        as_of: The clock used to decide whether a version is "old
-            enough". Defaults to ``datetime.now(timezone.utc)``.
-        min_age: Minimum publish age. Defaults to 3 days.
-        package_name: Defaults to ``@anthropic-ai/claude-code``.
-
-    Raises:
-        NoEligibleVersionError: when no version in the registry meets
-            the age cutoff.
-    """
-    if metadata is None:
-        fetch = fetcher or _default_fetcher
-        metadata = fetch(package_name)
-
-    times = metadata.get("time") or {}
-    versions = metadata.get("versions") or {}
-    if as_of is None:
-        as_of = datetime.now(timezone.utc)
-    cutoff = as_of - min_age
-
-    eligible: list[tuple[datetime, str]] = []
-    for version, raw_ts in times.items():
-        if version in _TIME_META_KEYS:
-            continue
-        if version not in versions:
-            continue
-        if not isinstance(raw_ts, str):
-            continue
-        if "-" in version:
-            continue
-        published = _parse_npm_timestamp(raw_ts)
-        if published <= cutoff:
-            eligible.append((published, version))
-
-    if not eligible:
-        raise NoEligibleVersionError(
-            f"no version of {package_name} is at least {min_age} old "
-            f"as of {as_of.isoformat()}"
-        )
-
-    eligible.sort(key=lambda pair: pair[0], reverse=True)
-    return eligible[0][1]
-
-
-def _main(argv: list[str]) -> int:
-    """Print the resolved version to stdout. Exit code 0 on success.
-
-    Stderr carries the human-readable announcement so the version can be
-    captured cleanly with ``$(python -m ...)`` in shell.
-    """
-    try:
-        version = resolve_pr_gate_version()
-    except Exception as exc:  # noqa: BLE001 — CLI surface, want everything
-        print(f"pr_gate_version_resolver: {exc}", file=sys.stderr)  # noqa: T201
-        return 1
-    print(  # noqa: T201
-        f"pr_gate_version_resolver: selected {PACKAGE_NAME}@{version}",
-        file=sys.stderr,
-    )
-    print(version)  # noqa: T201
-    return 0
+from pathlib import Path
+from typing import Final
 
+_RESOLVER: Final = Path(__file__).resolve().parent.parent / "cli_harness" / "npm_version_resolver.py"
+_PACKAGE: Final = "@anthropic-ai/claude-code"
 
 if __name__ == "__main__":
-    raise SystemExit(_main(sys.argv[1:]))
+    raise SystemExit(subprocess.run((sys.executable, "-I", str(_RESOLVER), _PACKAGE), check=False).returncode)
diff --git a/tests/e2e/claude_code/rate_limiter.py b/tests/e2e/claude_code/rate_limiter.py
deleted file mode 100644
index 5818338ff7f..00000000000
--- a/tests/e2e/claude_code/rate_limiter.py
+++ /dev/null
@@ -1,378 +0,0 @@
-"""Cross-process token-bucket rate limiter for the Claude Code compat suite.
-
-The compat matrix runs 75 live `claude` CLI invocations (25 cells × 3
-Claude tiers per cell). When pytest-xdist fans these out across worker
-processes, each worker would maintain its own in-memory rate limiter
-and the *aggregate* request rate hitting any one upstream provider
-would be `workers × per-worker rate` — exactly the situation that
-trips Anthropic / Azure / Bedrock / Vertex 429s in the middle of a
-matrix run and silently flips green cells red.
-
-The fix is a **shared, cross-process** token bucket per provider,
-backed by a small JSON state file and an OS-level `flock`. Each
-`run_claude` invocation acquires one token (sleeping if the bucket is
-empty) before launching the CLI; refills happen lazily based on wall
-time, so workers can be killed and restarted without losing or
-double-spending budget.
-
-Configuration is driven entirely by environment variables so a
-binary-search workflow can shift per-provider rates without code
-edits:
-
-    LITELLM_COMPAT_RATE_ANTHROPIC          (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_AZURE              (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_VERTEX_AI          (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_BEDROCK_CONVERSE   (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_BEDROCK_INVOKE     (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_OPENAI             (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_AZURE_OPENAI       (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_BEDROCK_MANTLE     (req/s, default 5.0)
-    LITELLM_COMPAT_RATE_BURST              (per-bucket burst override;
-                                            default = rate)
-    LITELLM_COMPAT_RATE_STATE_DIR          (state file directory;
-                                            default = $TMPDIR/litellm-claude-compat-ratelimit)
-
-A rate of 0 (or any non-positive value) disables throttling for that
-provider — useful when you trust the upstream to handle the burst or
-when running unit-test-shaped workloads that never actually hit the
-network.
-
-The provider id is inferred from the model id by `infer_provider`,
-mirroring the matrix's column layout (`anthropic`, `azure`,
-`vertex_ai`, `bedrock_converse`, `bedrock_invoke`, `openai`,
-`azure_openai`, `bedrock_mantle`). The `vertex_ai_gpt` matrix column
-has no bucket: its cells are static not_applicable stubs that never
-reach the network.
-"""
-
-from __future__ import annotations
-
-import contextlib
-import json
-import math
-import os
-import tempfile
-import time
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Dict, Iterator, Mapping, Optional
-
-# `fcntl` is POSIX-only; the suite is Linux/macOS only, so we don't
-# attempt a Windows fallback. Importing at module load fails fast on
-# the (currently non-existent) Windows runner so we don't silently
-# degrade to no-locking behavior.
-import fcntl
-
-PROVIDER_ANTHROPIC = "anthropic"
-PROVIDER_AZURE = "azure"
-PROVIDER_VERTEX_AI = "vertex_ai"
-PROVIDER_BEDROCK_CONVERSE = "bedrock_converse"
-PROVIDER_BEDROCK_INVOKE = "bedrock_invoke"
-PROVIDER_OPENAI = "openai"
-PROVIDER_AZURE_OPENAI = "azure_openai"
-PROVIDER_BEDROCK_MANTLE = "bedrock_mantle"
-
-ALL_PROVIDERS = (
-    PROVIDER_ANTHROPIC,
-    PROVIDER_AZURE,
-    PROVIDER_VERTEX_AI,
-    PROVIDER_BEDROCK_CONVERSE,
-    PROVIDER_BEDROCK_INVOKE,
-    PROVIDER_OPENAI,
-    PROVIDER_AZURE_OPENAI,
-    PROVIDER_BEDROCK_MANTLE,
-)
-
-DEFAULT_RATE = 5.0  # req/s per provider, conservative starting point
-RATE_ENV_PREFIX = "LITELLM_COMPAT_RATE_"
-BURST_ENV = "LITELLM_COMPAT_RATE_BURST"
-STATE_DIR_ENV = "LITELLM_COMPAT_RATE_STATE_DIR"
-DEFAULT_STATE_DIR_NAME = "litellm-claude-compat-ratelimit"
-
-
-def infer_provider(model: str) -> str:
-    """Map a model alias to its compat-matrix provider id.
-
-    The matrix column layout is fixed; aliases registered in the proxy
-    encode the provider via a suffix (`-bedrock-converse`,
-    `-bedrock-invoke`, `-azure`, `-vertex`, `-openai`, `-azure-openai`,
-    `-bedrock-mantle`) or its absence (Anthropic). Order matters:
-    `-azure-openai` also ends with `-openai`, and the bedrock suffixes
-    all contain `bedrock`, so the more-specific suffixes are tested
-    first.
-    """
-    if not model:
-        raise ValueError("model must be a non-empty string")
-    lower = model.lower()
-    if lower.endswith("-azure-openai"):
-        return PROVIDER_AZURE_OPENAI
-    if lower.endswith("-openai"):
-        return PROVIDER_OPENAI
-    if lower.endswith("-bedrock-mantle"):
-        return PROVIDER_BEDROCK_MANTLE
-    if lower.endswith("-bedrock-converse"):
-        return PROVIDER_BEDROCK_CONVERSE
-    if lower.endswith("-bedrock-invoke"):
-        return PROVIDER_BEDROCK_INVOKE
-    if lower.endswith("-azure"):
-        return PROVIDER_AZURE
-    if lower.endswith("-vertex"):
-        return PROVIDER_VERTEX_AI
-    return PROVIDER_ANTHROPIC
-
-
-@dataclass(frozen=True)
-class ProviderConfig:
-    """Static config snapshot for one provider's bucket.
-
-    Captured up front (rather than re-read per acquire) so the limiter's
-    behavior in a single process is stable even if env vars are mutated
-    mid-run. A fresh `RateLimiter` picks up env changes on construction.
-    """
-
-    rate_per_sec: float
-    burst: float
-
-    @property
-    def enabled(self) -> bool:
-        return self.rate_per_sec > 0 and self.burst > 0
-
-
-def load_config(
-    env: Optional[Mapping[str, str]] = None,
-) -> Dict[str, ProviderConfig]:
-    """Build a {provider: ProviderConfig} from env, applying defaults.
-
-    Parsing failures fall back to the default rate rather than
-    crashing the test session — a typo in `LITELLM_COMPAT_RATE_AZURE`
-    should not silently disable throttling, but it also shouldn't
-    abort 75 live tests with a `ValueError` ten minutes in.
-    """
-    src = env if env is not None else os.environ
-
-    def _as_float(value: Optional[str], default: float) -> float:
-        if value is None or value == "":
-            return default
-        try:
-            return float(value)
-        except (TypeError, ValueError):
-            return default
-
-    burst_override = _as_float(src.get(BURST_ENV), -1.0)
-
-    out: Dict[str, ProviderConfig] = {}
-    for provider in ALL_PROVIDERS:
-        env_key = RATE_ENV_PREFIX + provider.upper()
-        rate = _as_float(src.get(env_key), DEFAULT_RATE)
-        burst = burst_override if burst_override > 0 else max(rate, 1.0)
-        out[provider] = ProviderConfig(rate_per_sec=rate, burst=burst)
-    return out
-
-
-def _state_dir(env: Optional[Mapping[str, str]] = None) -> Path:
-    """Resolve the directory holding per-provider state files.
-
-    A user-supplied `LITELLM_COMPAT_RATE_STATE_DIR` wins for tests and
-    container environments where `$TMPDIR` may be ephemeral or shared
-    in surprising ways. The directory is created lazily with
-    `parents=True, exist_ok=True` so first-run setup needs no
-    fixture wiring.
-    """
-    src = env if env is not None else os.environ
-    explicit = src.get(STATE_DIR_ENV)
-    if explicit:
-        return Path(explicit)
-    return Path(tempfile.gettempdir()) / DEFAULT_STATE_DIR_NAME
-
-
-class RateLimiter:
-    """Cross-process token bucket per provider.
-
-    Each `acquire(provider)` call:
-      1. Opens (creating if needed) `<state_dir>/<provider>.json`.
-      2. Holds an exclusive `flock` while reading + updating the
-         {tokens, last_refill} state.
-      3. Refills tokens based on `now - last_refill`, capped at burst.
-      4. If tokens >= 1, subtracts one and returns immediately.
-      5. Otherwise, computes the wall-time delay needed to earn a
-         single token at the configured rate, releases the lock, and
-         sleeps. After sleeping it retries — staying under the lock
-         while sleeping would serialize all workers behind whichever
-         one held it longest.
-
-    This bounds the *aggregate* req/s seen by the upstream, regardless
-    of how many xdist workers, threads, or processes are concurrently
-    running tests against the same provider.
-
-    A `_clock` / `_sleep` injection seam keeps the unit tests fast and
-    deterministic; production callers should never override either.
-    """
-
-    def __init__(
-        self,
-        config: Optional[Mapping[str, ProviderConfig]] = None,
-        state_dir: Optional[Path] = None,
-        clock: Optional[callable] = None,
-        sleep: Optional[callable] = None,
-    ) -> None:
-        self._config = dict(config) if config is not None else load_config()
-        self._state_dir = Path(state_dir) if state_dir is not None else _state_dir()
-        self._clock = clock or time.monotonic
-        self._sleep = sleep or time.sleep
-        # `_state_dir.mkdir` once on construction is fine; concurrent
-        # workers all racing to create the same directory is benign.
-        self._state_dir.mkdir(parents=True, exist_ok=True)
-
-    def acquire(self, provider: str) -> float:
-        """Block until one token is available for `provider`.
-
-        Returns the cumulative wall-time spent waiting (0.0 when the
-        bucket had budget and we returned immediately). Callers can
-        log this to attribute slow cells to throttling vs. upstream
-        latency — same role `DriverResult.duration_ms` plays for the
-        actual CLI invocation.
-        """
-        cfg = self._config.get(provider)
-        if cfg is None or not cfg.enabled:
-            return 0.0
-
-        path = self._state_path(provider)
-        total_waited = 0.0
-        while True:
-            now = self._clock()
-            sleep_for = self._try_consume(path, cfg, now)
-            if sleep_for <= 0:
-                return total_waited
-            self._sleep(sleep_for)
-            total_waited += sleep_for
-
-    def _state_path(self, provider: str) -> Path:
-        return self._state_dir / f"{provider}.json"
-
-    def _try_consume(self, path: Path, cfg: ProviderConfig, now: float) -> float:
-        """Atomically refill and try to take one token.
-
-        Returns 0.0 if a token was consumed, or a positive sleep
-        duration (seconds) if the caller must wait before retrying.
-
-        We hold an exclusive `flock` only across the read-modify-write
-        of the JSON state — never across a `sleep` — so workers don't
-        serialize while one of them is parked.
-        """
-        # `os.open` + `os.O_CREAT | os.O_RDWR` gives us a fd we can
-        # both lock and read/write through. Opening with `"a+"` then
-        # seeking is equivalent but uglier; this version is closer to
-        # the canonical flock recipe.
-        fd = os.open(path, os.O_CREAT | os.O_RDWR, 0o600)
-        try:
-            fcntl.flock(fd, fcntl.LOCK_EX)
-            try:
-                tokens, last_refill = self._read_state(fd, cfg, now)
-                tokens, last_refill = self._refill(tokens, last_refill, now, cfg)
-                if tokens >= 1.0:
-                    tokens -= 1.0
-                    self._write_state(fd, tokens, last_refill)
-                    return 0.0
-                # Not enough budget. Persist the refilled state so a
-                # subsequent caller doesn't have to redo the math, then
-                # release the lock and tell the caller how long to
-                # sleep before retrying.
-                self._write_state(fd, tokens, last_refill)
-                deficit = 1.0 - tokens
-                # `deficit / rate` seconds will earn exactly enough
-                # for one token. Add a tiny safety margin so we don't
-                # wake up nanoseconds early and spin.
-                return (deficit / cfg.rate_per_sec) + 1e-3
-            finally:
-                fcntl.flock(fd, fcntl.LOCK_UN)
-        finally:
-            os.close(fd)
-
-    @staticmethod
-    def _read_state(fd: int, cfg: ProviderConfig, now: float) -> tuple:
-        """Read {tokens, last_refill} from `fd`, defaulting to a full
-        bucket on a missing/empty/corrupt file.
-
-        New files start full so the very first request never waits;
-        corrupt files are treated like new files because the
-        alternative — refusing to run — is worse than briefly
-        over-spending one bucket's worth of budget.
-        """
-        os.lseek(fd, 0, os.SEEK_SET)
-        raw = os.read(fd, 4096).decode("utf-8")
-        if not raw.strip():
-            return cfg.burst, now
-        try:
-            obj = json.loads(raw)
-            tokens = float(obj.get("tokens", cfg.burst))
-            last_refill = float(obj.get("last_refill", now))
-            return tokens, last_refill
-        except (ValueError, TypeError):
-            return cfg.burst, now
-
-    @staticmethod
-    def _refill(
-        tokens: float, last_refill: float, now: float, cfg: ProviderConfig
-    ) -> tuple:
-        """Apply elapsed time to the bucket, capped at burst.
-
-        Negative elapsed (clock went backward, e.g. across host
-        sleep/resume or a manually-tweaked monotonic mock) is clamped
-        to zero so we never *remove* tokens.
-        """
-        elapsed = max(0.0, now - last_refill)
-        tokens = min(cfg.burst, tokens + elapsed * cfg.rate_per_sec)
-        return tokens, now
-
-    @staticmethod
-    def _write_state(fd: int, tokens: float, last_refill: float) -> None:
-        payload = json.dumps({"tokens": tokens, "last_refill": last_refill}).encode(
-            "utf-8"
-        )
-        os.lseek(fd, 0, os.SEEK_SET)
-        os.ftruncate(fd, 0)
-        os.write(fd, payload)
-
-
-# A single process-wide instance is all we need: provider-keyed state
-# is stored in files, so multiple `RateLimiter` instances would just
-# duplicate the in-process bookkeeping. We expose a getter rather than
-# the instance directly so unit tests can install a custom limiter
-# scoped to a tmp directory without monkeypatching globals.
-_default: Optional[RateLimiter] = None
-
-
-def get_default_limiter() -> RateLimiter:
-    global _default
-    if _default is None:
-        _default = RateLimiter()
-    return _default
-
-
-def reset_default_limiter() -> None:
-    """Drop the cached default limiter; the next `get_default_limiter`
-    call rebuilds it from the current environment.
-
-    Useful between unit tests that patch env vars: without this they'd
-    keep reading the stale config snapshot from the first call.
-    """
-    global _default
-    _default = None
-
-
-@contextlib.contextmanager
-def use_limiter(limiter: RateLimiter) -> Iterator[RateLimiter]:
-    """Temporarily install `limiter` as the process default.
-
-    The driver's `run_claude` calls `get_default_limiter()`; tests that
-    want a controlled tmp-dir-backed limiter use this contextmanager
-    to swap one in without touching env vars or the on-disk default
-    state.
-    """
-    global _default
-    previous = _default
-    _default = limiter
-    try:
-        yield limiter
-    finally:
-        _default = previous
diff --git a/tests/e2e/claude_code/run_compat.sh b/tests/e2e/claude_code/run_compat.sh
index c42416283e7..e3410391661 100755
--- a/tests/e2e/claude_code/run_compat.sh
+++ b/tests/e2e/claude_code/run_compat.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Run the Claude Code compat matrix end-to-end against a live LiteLLM
 # proxy, with per-provider rate limits applied via the cross-process
-# token bucket in `tests/e2e/claude_code/rate_limiter.py`.
+# token bucket in `tests/e2e/cli_harness/rate_limiter.py`.
 #
 # Designed for binary-searching the ideal X / Y / Z req/s per provider:
 #   1. Pick an initial rate (e.g. 5/s for everyone).
diff --git a/tests/e2e/cli_harness/__init__.py b/tests/e2e/cli_harness/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/e2e/cli_harness/lockdown.py b/tests/e2e/cli_harness/lockdown.py
new file mode 100644
index 00000000000..1d430529851
--- /dev/null
+++ b/tests/e2e/cli_harness/lockdown.py
@@ -0,0 +1,49 @@
+"""What a coding-agent CLI under test may see of the host.
+
+The CI job holds the proxy's upstream credentials (provider keys, AWS, Azure, the database URL, GitHub tokens) in its
+environment, and the cron VM runs as a real user with a populated home. A compromised CLI release, or a model told to
+read a file, must reach neither, so the CLI gets only the allowlisted runtime variables plus what its suite passes in,
+and a fresh empty HOME that is deleted when it exits.
+"""
+
+from __future__ import annotations
+
+import os
+import shutil
+import tempfile
+from collections.abc import Generator, Mapping
+from contextlib import contextmanager
+from pathlib import Path
+from types import MappingProxyType
+from typing import Final
+
+CLI_ENV_ALLOWLIST: Final = (
+    "PATH",
+    "USER",
+    "LOGNAME",
+    "SHELL",
+    "TERM",
+    "TMPDIR",
+    "LANG",
+    "LC_ALL",
+    "LC_CTYPE",
+    "NODE_PATH",
+    "NVM_DIR",
+    "NVM_BIN",
+)
+
+
+@contextmanager
+def isolated_home(prefix: str) -> Generator[Path]:
+    home: Final = Path(tempfile.mkdtemp(prefix=prefix))
+    try:
+        yield home
+    finally:
+        shutil.rmtree(home, ignore_errors=True)
+
+
+def locked_down_env(
+    *, home: Path, overrides: Mapping[str, str], source: Mapping[str, str] = os.environ
+) -> Mapping[str, str]:
+    allowed: Final = {name: source[name] for name in CLI_ENV_ALLOWLIST if name in source}
+    return MappingProxyType({**allowed, "HOME": str(home), **overrides})
diff --git a/tests/e2e/cli_harness/npm_version_resolver.py b/tests/e2e/cli_harness/npm_version_resolver.py
new file mode 100644
index 00000000000..3c3f9b89ce5
--- /dev/null
+++ b/tests/e2e/cli_harness/npm_version_resolver.py
@@ -0,0 +1,92 @@
+"""The npm release of a coding-agent CLI that CI installs: the newest one published at least three days ago.
+
+The three days are a security review buffer (PRD #26476, "Version resolvers"), so a release that gets pulled or
+patched within days never drives a run. Newest means by publish time, not semver order.
+
+`python tests/e2e/cli_harness/npm_version_resolver.py <npm package>` prints the version on stdout for a shell
+`$(...)`. It is stdlib only because the cron image runs it without the project's dependencies.
+"""
+
+from __future__ import annotations
+
+import json
+import sys
+import urllib.parse
+import urllib.request
+from collections.abc import Mapping
+from dataclasses import dataclass
+from datetime import datetime, timedelta, timezone
+from types import MappingProxyType
+from typing import BinaryIO, Final, cast
+
+MIN_AGE: Final = timedelta(days=3)
+_REGISTRY_URL: Final = "https://registry.npmjs.org/{package}"
+_FETCH_TIMEOUT_SECONDS: Final = 30
+
+
+@dataclass(frozen=True, slots=True)
+class Packument:
+    published_at: Mapping[str, datetime]
+    versions: frozenset[str]
+
+    @classmethod
+    def from_json(cls, raw: object) -> Packument:
+        document: Final = _as_mapping(raw)
+        times: Final = _as_mapping(document.get("time"))
+        return cls(
+            published_at=MappingProxyType({version: _parse_utc(stamp) for version, stamp in _string_values(times)}),
+            versions=frozenset(_as_mapping(document.get("versions"))),
+        )
+
+
+def newest_version_at_least(packument: Packument, *, min_age: timedelta, as_of: datetime) -> str | None:
+    cutoff: Final = as_of - min_age
+    eligible: Final = (
+        (published, version)
+        for version, published in packument.published_at.items()
+        if version in packument.versions and "-" not in version and published <= cutoff
+    )
+    newest: Final = max(eligible, default=None)
+    return None if newest is None else newest[1]
+
+
+def fetch_packument(package: str) -> Packument:
+    url: Final = _REGISTRY_URL.format(package=urllib.parse.quote(package, safe="@"))
+    request: Final = urllib.request.Request(url, headers={"Accept": "application/json"})
+    with cast(BinaryIO, urllib.request.urlopen(request, timeout=_FETCH_TIMEOUT_SECONDS)) as response:
+        return Packument.from_json(cast(object, json.loads(response.read())))
+
+
+def _as_mapping(raw: object) -> Mapping[str, object]:
+    if not isinstance(raw, dict):
+        return {}
+    return {str(key): value for key, value in cast(dict[object, object], raw).items()}
+
+
+def _string_values(raw: Mapping[str, object]) -> tuple[tuple[str, str], ...]:
+    return tuple((key, value) for key, value in raw.items() if isinstance(value, str))
+
+
+def _parse_utc(stamp: str) -> datetime:
+    parsed: Final = datetime.fromisoformat(stamp.replace("Z", "+00:00"))
+    return parsed if parsed.tzinfo is not None else parsed.replace(tzinfo=timezone.utc)
+
+
+def _main(argv: list[str]) -> int:
+    if len(argv) != 1:
+        print("usage: npm_version_resolver.py <npm package>", file=sys.stderr)  # noqa: T201  # CLI surface
+        return 2
+    package: Final = argv[0]
+    version: Final = newest_version_at_least(
+        fetch_packument(package), min_age=MIN_AGE, as_of=datetime.now(timezone.utc)
+    )
+    if version is None:
+        print(f"npm_version_resolver: no release of {package} is at least {MIN_AGE} old", file=sys.stderr)  # noqa: T201  # CLI surface
+        return 1
+    print(f"npm_version_resolver: selected {package}@{version}", file=sys.stderr)  # noqa: T201  # CLI surface
+    print(version)  # noqa: T201  # CLI surface
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(_main(sys.argv[1:]))
diff --git a/tests/e2e/cli_harness/rate_limiter.py b/tests/e2e/cli_harness/rate_limiter.py
new file mode 100644
index 00000000000..bd8119ffe87
--- /dev/null
+++ b/tests/e2e/cli_harness/rate_limiter.py
@@ -0,0 +1,151 @@
+"""A token bucket per upstream, shared by every process on the host, so parallel CLI suites and xdist workers
+together stay under one request rate per provider instead of one rate each.
+
+Each bucket is a small JSON file read and written under an exclusive `flock`, in `LITELLM_COMPAT_RATE_STATE_DIR`
+(default: a fixed folder under `$TMPDIR`). `LITELLM_COMPAT_RATE_<BUCKET>` sets a bucket's req/s (default 5, 0 or less
+turns it off) and `LITELLM_COMPAT_RATE_BURST` overrides every bucket's burst (default: its rate).
+"""
+
+from __future__ import annotations
+
+import fcntl
+import os
+import tempfile
+import time
+from collections.abc import Callable, Iterator, Mapping
+from dataclasses import dataclass, field
+from enum import StrEnum
+from functools import cache
+from pathlib import Path
+from types import MappingProxyType
+from typing import Final
+
+from pydantic import BaseModel, ConfigDict, ValidationError
+
+DEFAULT_RATE: Final = 5.0
+RATE_ENV_PREFIX: Final = "LITELLM_COMPAT_RATE_"
+BURST_ENV: Final = "LITELLM_COMPAT_RATE_BURST"
+STATE_DIR_ENV: Final = "LITELLM_COMPAT_RATE_STATE_DIR"
+DEFAULT_STATE_DIR_NAME: Final = "litellm-claude-compat-ratelimit"
+_WAKE_MARGIN_SECONDS: Final = 1e-3
+
+
+class RateBucket(StrEnum):
+    ANTHROPIC = "anthropic"
+    AZURE = "azure"
+    VERTEX_AI = "vertex_ai"
+    BEDROCK_CONVERSE = "bedrock_converse"
+    BEDROCK_INVOKE = "bedrock_invoke"
+    OPENAI = "openai"
+    AZURE_OPENAI = "azure_openai"
+    BEDROCK_MANTLE = "bedrock_mantle"
+
+
+@dataclass(frozen=True, slots=True)
+class ProviderConfig:
+    rate_per_sec: float
+    burst: float
+
+    @property
+    def enabled(self) -> bool:
+        return self.rate_per_sec > 0 and self.burst > 0
+
+
+class _BucketState(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
+    tokens: float
+    last_refill: float
+
+
+def load_config(env: Mapping[str, str] = os.environ) -> Mapping[RateBucket, ProviderConfig]:
+    burst_override: Final = _as_float(env.get(BURST_ENV), -1.0)
+    return MappingProxyType(
+        {
+            bucket: _bucket_config(_as_float(env.get(_rate_env(bucket)), DEFAULT_RATE), burst_override)
+            for bucket in RateBucket
+        }
+    )
+
+
+def default_state_dir(env: Mapping[str, str] = os.environ) -> Path:
+    explicit: Final = env.get(STATE_DIR_ENV)
+    return Path(explicit) if explicit else Path(tempfile.gettempdir()) / DEFAULT_STATE_DIR_NAME
+
+
+@dataclass(frozen=True, slots=True)
+class RateLimiter:
+    config: Mapping[RateBucket, ProviderConfig] = field(default_factory=load_config)
+    state_dir: Path = field(default_factory=default_state_dir)
+    clock: Callable[[], float] = time.monotonic
+    sleep: Callable[[float], None] = time.sleep
+
+    def __post_init__(self) -> None:
+        self.state_dir.mkdir(parents=True, exist_ok=True)
+
+    def acquire(self, bucket: RateBucket) -> float:
+        cfg: Final = self.config.get(bucket)
+        if cfg is None or not cfg.enabled:
+            return 0.0
+        return sum(self._waits(self.state_dir / f"{bucket.value}.json", cfg))
+
+    def _waits(self, path: Path, cfg: ProviderConfig) -> Iterator[float]:
+        while (wait := _try_consume(path, cfg, self.clock())) > 0:
+            self.sleep(wait)
+            yield wait
+
+
+@cache
+def get_default_limiter() -> RateLimiter:
+    return RateLimiter()
+
+
+def _rate_env(bucket: RateBucket) -> str:
+    return RATE_ENV_PREFIX + bucket.value.upper()
+
+
+def _bucket_config(rate: float, burst_override: float) -> ProviderConfig:
+    return ProviderConfig(rate_per_sec=rate, burst=burst_override if burst_override > 0 else max(rate, 1.0))
+
+
+def _as_float(value: str | None, default: float) -> float:
+    if not value:
+        return default
+    try:
+        return float(value)
+    except ValueError:
+        return default
+
+
+def _try_consume(path: Path, cfg: ProviderConfig, now: float) -> float:
+    fd: Final = os.open(path, os.O_CREAT | os.O_RDWR, 0o600)
+    try:
+        fcntl.flock(fd, fcntl.LOCK_EX)
+        state: Final = _refilled(_read_state(fd, cfg, now), now, cfg)
+        if state.tokens >= 1.0:
+            _write_state(fd, _BucketState(tokens=state.tokens - 1.0, last_refill=state.last_refill))
+            return 0.0
+        _write_state(fd, state)
+        return (1.0 - state.tokens) / cfg.rate_per_sec + _WAKE_MARGIN_SECONDS
+    finally:
+        os.close(fd)
+
+
+def _read_state(fd: int, cfg: ProviderConfig, now: float) -> _BucketState:
+    os.lseek(fd, 0, os.SEEK_SET)
+    raw: Final = os.read(fd, 4096)
+    try:
+        return _BucketState.model_validate_json(raw)
+    except ValidationError:
+        return _BucketState(tokens=cfg.burst, last_refill=now)
+
+
+def _refilled(state: _BucketState, now: float, cfg: ProviderConfig) -> _BucketState:
+    elapsed: Final = max(0.0, now - state.last_refill)
+    return _BucketState(tokens=min(cfg.burst, state.tokens + elapsed * cfg.rate_per_sec), last_refill=now)
+
+
+def _write_state(fd: int, state: _BucketState) -> None:
+    os.lseek(fd, 0, os.SEEK_SET)
+    os.ftruncate(fd, 0)
+    os.write(fd, state.model_dump_json().encode("utf-8"))
diff --git a/tests/e2e/codex/__init__.py b/tests/e2e/codex/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/e2e/codex/conftest.py b/tests/e2e/codex/conftest.py
new file mode 100644
index 00000000000..1ce6f2009a5
--- /dev/null
+++ b/tests/e2e/codex/conftest.py
@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+from collections.abc import Iterator
+from dataclasses import dataclass
+from typing import Final
+
+import pytest
+from cli_harness.rate_limiter import get_default_limiter
+from codex.harness import CodexHarness, codex_harness
+from codex.setups import Deployment, ModelSetup
+from e2e_config import PROXY_BASE_URL, unique_marker
+from lifecycle import ResourceManager
+from proxy_client import ProxyClient
+
+
+@dataclass(frozen=True, slots=True)
+class _Client:
+    proxy: ProxyClient
+
+
+@pytest.fixture(scope="session")
+def client(proxy: ProxyClient) -> _Client:
+    return _Client(proxy)
+
+
+@pytest.fixture
+def setup(deployment: Deployment, proxy: ProxyClient, resources: ResourceManager) -> ModelSetup:
+    model: Final = f"e2e-codex-{unique_marker()}"
+    model_id: Final = proxy.create_model(model, deployment.litellm_params, provider_live=True)
+    resources.defer(lambda: proxy.delete_model(model_id))
+    return ModelSetup(model=model, rate_bucket=deployment.rate_bucket)
+
+
+@pytest.fixture
+def codex(setup: ModelSetup, resources: ResourceManager) -> Iterator[CodexHarness]:
+    with codex_harness(
+        gateway=PROXY_BASE_URL,
+        api_key=resources.key(models=[setup.model], user_id=None),
+        rate_bucket=setup.rate_bucket,
+        limiter=get_default_limiter(),
+    ) as harness:
+        yield harness
diff --git a/tests/e2e/codex/harness.py b/tests/e2e/codex/harness.py
new file mode 100644
index 00000000000..f6dd3700149
--- /dev/null
+++ b/tests/e2e/codex/harness.py
@@ -0,0 +1,121 @@
+from __future__ import annotations
+
+import subprocess
+import tempfile
+from collections.abc import Generator, Mapping
+from contextlib import contextmanager
+from dataclasses import dataclass, field
+from itertools import chain
+from pathlib import Path
+from typing import Final
+
+from cli_harness.lockdown import isolated_home, locked_down_env
+from cli_harness.rate_limiter import RateBucket, RateLimiter
+from codex.rollout import Compaction, rollout_compactions
+from codex.run import CodexRun, codex_run
+from e2e_metadata import step
+
+CODEX_CLI: Final = "codex"
+EXEC_TIMEOUT_SECONDS: Final = 600.0
+_API_KEY_ENV: Final = "LITELLM_API_KEY"
+_PROVIDER: Final = "litellm"
+_CONFIG_TOML: Final = """\
+model_provider = "{provider}"
+approval_policy = "never"
+sandbox_mode = "workspace-write"
+check_for_update_on_startup = false
+
+[analytics]
+enabled = false
+
+[model_providers.{provider}]
+name = "LiteLLM"
+base_url = "{gateway}/v1"
+env_key = "{api_key_env}"
+wire_api = "responses"
+model_catalog_url = "{gateway}/v1/models"
+"""
+
+
+@dataclass(frozen=True, slots=True)
+class CodexHarness:
+    home: Path
+    api_key: str = field(repr=False)
+    rate_bucket: RateBucket
+    limiter: RateLimiter
+    cli: str = CODEX_CLI
+    timeout_seconds: float = EXEC_TIMEOUT_SECONDS
+
+    @property
+    def codex_home(self) -> Path:
+        return self.home / ".codex"
+
+    @step("Create a workspace folder holding the test's files")
+    def new_workspace(self, files: Mapping[str, str]) -> Path:
+        workspace: Final = Path(tempfile.mkdtemp(prefix="workspace-", dir=self.home)).resolve()
+        for name, content in files.items():
+            _ = (workspace / name).write_text(content)
+        return workspace
+
+    @step('Run Codex on {model} through the proxy with the prompt "{prompt}"')
+    def exec(self, prompt: str, *, model: str, cwd: Path, compact_after_tokens: int | None = None) -> CodexRun:
+        return self._run(("exec",), (*_compaction_flags(compact_after_tokens), "--model", model, "--", prompt), cwd)
+
+    @step('Resume Codex thread {thread_id} on {model} through the proxy with the prompt "{prompt}"')
+    def resume(
+        self, thread_id: str, prompt: str, *, model: str, cwd: Path, compact_after_tokens: int | None = None
+    ) -> CodexRun:
+        return self._run(
+            ("exec", "resume"),
+            (*_compaction_flags(compact_after_tokens), "--model", model, "--", thread_id, prompt),
+            cwd,
+        )
+
+    def compactions(self, thread_id: str) -> tuple[Compaction, ...]:
+        rollouts: Final = sorted(self.codex_home.glob(f"sessions/**/rollout-*-{thread_id}.jsonl"))
+        return tuple(chain.from_iterable(rollout_compactions(rollout.read_text()) for rollout in rollouts))
+
+    def _run(self, subcommand: tuple[str, ...], args: tuple[str, ...], cwd: Path) -> CodexRun:
+        _ = self.limiter.acquire(self.rate_bucket)
+        completed: Final = subprocess.run(
+            (self.cli, *subcommand, "--json", "--skip-git-repo-check", *args),
+            cwd=cwd,
+            env=locked_down_env(
+                home=self.home, overrides={"CODEX_HOME": str(self.codex_home), _API_KEY_ENV: self.api_key}
+            ),
+            stdin=subprocess.DEVNULL,
+            capture_output=True,
+            text=True,
+            timeout=self.timeout_seconds,
+            check=False,
+        )
+        return codex_run(exit_code=completed.returncode, stdout=completed.stdout, stderr=completed.stderr)
+
+
+def _compaction_flags(after_tokens: int | None) -> tuple[str, ...]:
+    match after_tokens:
+        case None:
+            return ()
+        case int():
+            return (
+                "--config",
+                f'model_providers.{_PROVIDER}.capabilities.remote_compaction="v2"',
+                "--config",
+                'model_auto_compact_token_limit_scope="body_after_prefix"',
+                "--config",
+                f"model_auto_compact_token_limit={after_tokens}",
+            )
+
+
+@step("Give Codex a fresh empty home whose config sends every request to the proxy")
+@contextmanager
+def codex_harness(
+    *, gateway: str, api_key: str, rate_bucket: RateBucket, limiter: RateLimiter
+) -> Generator[CodexHarness]:
+    with isolated_home("codex-cli-home-") as home:
+        harness: Final = CodexHarness(home=home, api_key=api_key, rate_bucket=rate_bucket, limiter=limiter)
+        harness.codex_home.mkdir()
+        _ = (harness.codex_home / "config.toml").write_text(
+            _CONFIG_TOML.format(provider=_PROVIDER, gateway=gateway, api_key_env=_API_KEY_ENV)
+        )
+        yield harness
diff --git a/tests/e2e/codex/rollout.py b/tests/e2e/codex/rollout.py
new file mode 100644
index 00000000000..fcaeaa7ca42
--- /dev/null
+++ b/tests/e2e/codex/rollout.py
@@ -0,0 +1,49 @@
+"""The compactions Codex recorded in a thread's rollout file, `CODEX_HOME/sessions/**/rollout-*-<thread id>.jsonl`.
+
+`codex exec --json` prints no event for a compaction, so the rollout is the only place it shows. Each line is
+`{"timestamp", "type", "payload"}` (`codex-rs/history/src/rollout_payload.rs`) and only `compacted` lines are read.
+A remote compaction is one whose replacement history carries the provider's `compaction` item, while a local one
+replaces the history with a summary Codex wrote itself.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Final
+
+from pydantic import BaseModel, ConfigDict
+
+_COMPACTED: Final = "compacted"
+_PROVIDER_COMPACTION_ITEM: Final = "compaction"
+
+
+class _Frozen(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
+
+class _Line(_Frozen):
+    type: str
+    payload: object = None
+
+
+class _HistoryItem(_Frozen):
+    type: str
+
+
+class _CompactedPayload(_Frozen):
+    replacement_history: tuple[_HistoryItem, ...] | None = None
+
+
+@dataclass(frozen=True, slots=True)
+class Compaction:
+    remote: bool
+
+
+def rollout_compactions(rollout: str) -> tuple[Compaction, ...]:
+    lines: Final = tuple(_Line.model_validate_json(line) for line in rollout.splitlines() if line.strip())
+    return tuple(_compaction(line.payload) for line in lines if line.type == _COMPACTED)
+
+
+def _compaction(payload: object) -> Compaction:
+    history: Final = _CompactedPayload.model_validate(payload).replacement_history or ()
+    return Compaction(remote=any(item.type == _PROVIDER_COMPACTION_ITEM for item in history))
diff --git a/tests/e2e/codex/run.py b/tests/e2e/codex/run.py
new file mode 100644
index 00000000000..5195da67494
--- /dev/null
+++ b/tests/e2e/codex/run.py
@@ -0,0 +1,187 @@
+"""What one `codex exec --json` run did, read from the JSONL events it printed.
+
+The event shapes are Codex's own (`codex-rs/exec/src/exec_events.rs`). We take the latest codex release > 3 days old, so an event or item
+type this module does not model is skipped, while one it does model is validated strictly and fails loudly when
+Codex changes it.
+"""
+
+from __future__ import annotations
+
+import re
+from collections.abc import Callable, Iterator, Mapping
+from dataclasses import dataclass
+from itertools import chain
+from pathlib import Path
+from typing import Annotated, Final, Literal, cast
+
+from pydantic import BaseModel, ConfigDict, Discriminator, Tag, TypeAdapter
+
+_HTTP_STATUS: Final = re.compile(r"\bstatus:? (\d{3})\b")
+
+
+class _Frozen(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
+
+class TokenUsage(_Frozen):
+    input_tokens: int
+    cached_input_tokens: int
+    cache_write_input_tokens: int = 0
+    output_tokens: int
+    reasoning_output_tokens: int
+
+
+class _AgentMessage(_Frozen):
+    type: Literal["agent_message"]
+    text: str
+
+
+class _CommandExecution(_Frozen):
+    type: Literal["command_execution"]
+    command: str
+    aggregated_output: str
+    exit_code: int | None
+
+
+class _FileUpdate(_Frozen):
+    path: str
+    kind: Literal["add", "delete", "update"]
+
+
+class _FileChange(_Frozen):
+    type: Literal["file_change"]
+    changes: tuple[_FileUpdate, ...]
+    status: Literal["in_progress", "completed", "failed"]
+
+
+class _ErrorItem(_Frozen):
+    type: Literal["error"]
+    message: str
+
+
+class _Unmodelled(_Frozen):
+    type: str
+
+
+class _Message(_Frozen):
+    message: str
+
+
+def _known_or_unmodelled(known: frozenset[str]) -> Callable[[object], str]:
+    def tag(raw: object) -> str:
+        kind: Final = cast("Mapping[str, object]", raw).get("type") if isinstance(raw, Mapping) else None
+        return kind if isinstance(kind, str) and kind in known else "unmodelled"
+
+    return tag
+
+
+_Item = Annotated[
+    Annotated[_AgentMessage, Tag("agent_message")]
+    | Annotated[_CommandExecution, Tag("command_execution")]
+    | Annotated[_FileChange, Tag("file_change")]
+    | Annotated[_ErrorItem, Tag("error")]
+    | Annotated[_Unmodelled, Tag("unmodelled")],
+    Discriminator(_known_or_unmodelled(frozenset({"agent_message", "command_execution", "file_change", "error"}))),
+]
+
+
+class _ThreadStarted(_Frozen):
+    type: Literal["thread.started"]
+    thread_id: str
+
+
+class _ItemCompleted(_Frozen):
+    type: Literal["item.completed"]
+    item: _Item
+
+
+class _TurnCompleted(_Frozen):
+    type: Literal["turn.completed"]
+    usage: TokenUsage
+
+
+class _TurnFailed(_Frozen):
+    type: Literal["turn.failed"]
+    error: _Message
+
+
+class _StreamError(_Frozen):
+    type: Literal["error"]
+    message: str
+
+
+_Event = Annotated[
+    Annotated[_ThreadStarted, Tag("thread.started")]
+    | Annotated[_ItemCompleted, Tag("item.completed")]
+    | Annotated[_TurnCompleted, Tag("turn.completed")]
+    | Annotated[_TurnFailed, Tag("turn.failed")]
+    | Annotated[_StreamError, Tag("error")]
+    | Annotated[_Unmodelled, Tag("unmodelled")],
+    Discriminator(
+        _known_or_unmodelled(frozenset({"thread.started", "item.completed", "turn.completed", "turn.failed", "error"}))
+    ),
+]
+_EVENT: Final = TypeAdapter[_Event](_Event)
+
+
+@dataclass(frozen=True, slots=True)
+class Command:
+    command: str
+    output: str
+    exit_code: int | None
+
+
+@dataclass(frozen=True, slots=True)
+class CodexError:
+    message: str
+    status_code: int | None
+
+
+@dataclass(frozen=True, slots=True)
+class CodexRun:
+    exit_code: int
+    thread_id: str | None
+    commands: tuple[Command, ...]
+    patched_files: tuple[Path, ...]
+    answer: str
+    usage: TokenUsage | None
+    errors: tuple[CodexError, ...]
+    stderr: str
+
+
+def codex_run(*, exit_code: int, stdout: str, stderr: str) -> CodexRun:
+    events: Final = tuple(_EVENT.validate_json(line) for line in stdout.splitlines() if line.strip())
+    items: Final = tuple(event.item for event in events if isinstance(event, _ItemCompleted))
+    patches: Final = tuple(item for item in items if isinstance(item, _FileChange) and item.status == "completed")
+    answers: Final = tuple(item.text for item in items if isinstance(item, _AgentMessage))
+    usages: Final = tuple(event.usage for event in events if isinstance(event, _TurnCompleted))
+    return CodexRun(
+        exit_code=exit_code,
+        thread_id=next((event.thread_id for event in events if isinstance(event, _ThreadStarted)), None),
+        commands=tuple(
+            Command(command=item.command, output=item.aggregated_output, exit_code=item.exit_code)
+            for item in items
+            if isinstance(item, _CommandExecution)
+        ),
+        patched_files=tuple(Path(change.path) for change in chain.from_iterable(patch.changes for patch in patches)),
+        answer=answers[-1] if answers else "",
+        usage=usages[-1] if usages else None,
+        errors=tuple(_errors(events)),
+        stderr=stderr,
+    )
+
+
+def _errors(events: tuple[_Event, ...]) -> Iterator[CodexError]:
+    for event in events:
+        match event:
+            case _TurnFailed(error=_Message(message=message)) | _StreamError(message=message):
+                yield _codex_error(message)
+            case _ItemCompleted(item=_ErrorItem(message=message)):
+                yield _codex_error(message)
+            case _:
+                pass
+
+
+def _codex_error(message: str) -> CodexError:
+    status: Final = _HTTP_STATUS.search(message)
+    return CodexError(message=message, status_code=int(status.group(1)) if status else None)
diff --git a/tests/e2e/codex/setups.py b/tests/e2e/codex/setups.py
new file mode 100644
index 00000000000..4716706c51c
--- /dev/null
+++ b/tests/e2e/codex/setups.py
@@ -0,0 +1,96 @@
+"""The credentials are `os.environ/` references the gateway resolves, the same names the Claude Code matrix's
+`test_config.yaml` uses, and Bedrock rides the gateway's default AWS identity."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Final, Literal
+
+import pytest
+from _pytest.mark.structures import ParameterSet
+from cli_harness.rate_limiter import RateBucket
+from e2e_metadata import Domain, Mode, Provider, Route, Subject, meta
+from models import LiteLLMParamsBody
+
+GPT_ON_BEDROCK_MANTLE: Final = "bedrock_mantle/openai.gpt-6.1-sol"
+GPT_ON_BEDROCK_RUNTIME: Final = "bedrock/us.openai.gpt-6.1-sol"
+GPT_ON_AZURE_OPENAI: Final = "azure/gpt-6.1-sol"
+GPT_ON_OPENAI: Final = "openai/gpt-6.1-sol"
+CLAUDE_ON_BEDROCK: Final = "bedrock/us.anthropic.claude-sonnet-5-5"
+_BEDROCK_REGION: Final = "us-east-1"
+
+type SetupId = Literal["bedrock_mantle", "bedrock_runtime", "azure_openai", "openai", "claude_bedrock"]
+
+
+@dataclass(frozen=True, slots=True)
+class Deployment:
+    litellm_params: LiteLLMParamsBody
+    rate_bucket: RateBucket
+
+
+@dataclass(frozen=True, slots=True)
+class ModelSetup:
+    model: str
+    rate_bucket: RateBucket
+
+
+def _drives(provider: Provider, model: str) -> pytest.MarkDecorator:
+    return meta(
+        Subject(
+            domain=Domain.LLM_TRANSLATION,
+            route=Route.RESPONSES,
+            providers=(provider,),
+            models=(model,),
+            mode=Mode.STREAM,
+        )
+    )
+
+
+SETUPS: Final = (
+    pytest.param(
+        Deployment(
+            LiteLLMParamsBody(model=GPT_ON_BEDROCK_MANTLE, aws_region_name=_BEDROCK_REGION), RateBucket.BEDROCK_MANTLE
+        ),
+        id="bedrock_mantle",
+        marks=_drives(Provider.BEDROCK_MANTLE, GPT_ON_BEDROCK_MANTLE),
+    ),
+    pytest.param(
+        Deployment(
+            LiteLLMParamsBody(model=GPT_ON_BEDROCK_RUNTIME, aws_region_name=_BEDROCK_REGION),
+            RateBucket.BEDROCK_CONVERSE,
+        ),
+        id="bedrock_runtime",
+        marks=_drives(Provider.BEDROCK, GPT_ON_BEDROCK_RUNTIME),
+    ),
+    pytest.param(
+        Deployment(
+            LiteLLMParamsBody(
+                model=GPT_ON_AZURE_OPENAI, api_base="os.environ/AZURE_API_BASE", api_key="os.environ/AZURE_API_KEY"
+            ),
+            RateBucket.AZURE_OPENAI,
+        ),
+        id="azure_openai",
+        marks=_drives(Provider.AZURE, GPT_ON_AZURE_OPENAI),
+    ),
+    pytest.param(
+        Deployment(LiteLLMParamsBody(model=GPT_ON_OPENAI, api_key="os.environ/OPENAI_API_KEY"), RateBucket.OPENAI),
+        id="openai",
+        marks=_drives(Provider.OPENAI, GPT_ON_OPENAI),
+    ),
+    pytest.param(
+        Deployment(
+            LiteLLMParamsBody(model=CLAUDE_ON_BEDROCK, aws_region_name=_BEDROCK_REGION), RateBucket.BEDROCK_CONVERSE
+        ),
+        id="claude_bedrock",
+        marks=_drives(Provider.BEDROCK, CLAUDE_ON_BEDROCK),
+    ),
+)
+
+
+def with_expected_failure(setup_id: SetupId, *, reason: str) -> tuple[ParameterSet, ...]:
+    return tuple(
+        pytest.param(*setup.values, id=setup.id, marks=(*setup.marks, pytest.mark.xfail(strict=True, reason=reason)))
+        if setup.id == setup_id
+        else setup
+        for setup in SETUPS
+    )
diff --git a/tests/e2e/codex/test_auto_compaction_e2e.py b/tests/e2e/codex/test_auto_compaction_e2e.py
new file mode 100644
index 00000000000..5e0b2491002
--- /dev/null
+++ b/tests/e2e/codex/test_auto_compaction_e2e.py
@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+from typing import Final
+
+import pytest
+from codex.harness import CodexHarness
+from codex.setups import ModelSetup, with_expected_failure
+from e2e_config import unique_marker
+
+pytestmark = pytest.mark.e2e
+
+COMPACT_AFTER_TOKENS: Final = 500
+PADDING: Final = "".join(f"line {number}: the quick brown fox jumps over the lazy dog\n" for number in range(400))
+
+
+@pytest.mark.parametrize(
+    "deployment",
+    with_expected_failure(
+        "claude_bedrock",
+        reason="LiteLLM's Responses-to-chat bridge ignores Codex's compaction_trigger item, so Codex gets no"
+        " compaction back and fails the turn",
+    ),
+)
+class TestCodexAutoCompaction:
+    def test_remembers_a_value_after_the_gateway_compacts_the_session(
+        self, codex: CodexHarness, setup: ModelSetup
+    ) -> None:
+        marker: Final = unique_marker()
+        workspace: Final = codex.new_workspace(files={"secret.txt": marker, "padding.txt": PADDING})
+        first: Final = codex.exec(
+            "Run `cat secret.txt` and remember the value it prints. Then run `cat padding.txt`. Then reply with OK.",
+            model=setup.model,
+            cwd=workspace,
+            compact_after_tokens=COMPACT_AFTER_TOKENS,
+        )
+        assert first.thread_id is not None, first
+        (workspace / "secret.txt").unlink()
+        second: Final = codex.resume(
+            first.thread_id,
+            "What value did secret.txt print earlier? Reply with just that value.",
+            model=setup.model,
+            cwd=workspace,
+            compact_after_tokens=COMPACT_AFTER_TOKENS,
+        )
+        assert any(compaction.remote for compaction in codex.compactions(first.thread_id)), (first, second)
+        assert marker in second.answer, second
diff --git a/tests/e2e/codex/test_command_round_trip_e2e.py b/tests/e2e/codex/test_command_round_trip_e2e.py
new file mode 100644
index 00000000000..20beba53cb2
--- /dev/null
+++ b/tests/e2e/codex/test_command_round_trip_e2e.py
@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+from typing import Final
+
+import pytest
+from codex.harness import CodexHarness
+from codex.setups import SETUPS, ModelSetup
+from e2e_config import unique_marker
+
+pytestmark = pytest.mark.e2e
+
+
+@pytest.mark.parametrize("deployment", SETUPS)
+class TestCodexCommandRoundTrip:
+    def test_answers_with_what_a_command_printed(self, codex: CodexHarness, setup: ModelSetup) -> None:
+        marker: Final = unique_marker()
+        workspace: Final = codex.new_workspace(files={"secret.txt": marker})
+        run: Final = codex.exec(
+            "Run `cat secret.txt`, then reply with exactly what it printed.", model=setup.model, cwd=workspace
+        )
+        assert run.exit_code == 0, run
+        assert any(marker in command.output for command in run.commands), run
+        assert marker in run.answer, run
diff --git a/tests/e2e/codex/test_file_edit_e2e.py b/tests/e2e/codex/test_file_edit_e2e.py
new file mode 100644
index 00000000000..5bf544d4eb7
--- /dev/null
+++ b/tests/e2e/codex/test_file_edit_e2e.py
@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from typing import Final
+
+import pytest
+from codex.harness import CodexHarness
+from codex.setups import SETUPS, ModelSetup
+from e2e_config import unique_marker
+
+pytestmark = pytest.mark.e2e
+
+
+@pytest.mark.parametrize("deployment", SETUPS)
+class TestCodexFileEdit:
+    def test_changes_a_file_with_the_patch_tool(self, codex: CodexHarness, setup: ModelSetup) -> None:
+        marker: Final = unique_marker()
+        workspace: Final = codex.new_workspace(files={"config.txt": "name = placeholder\n"})
+        run: Final = codex.exec(
+            f"Use the apply_patch tool to change `placeholder` to `{marker}` in config.txt. Change nothing else.",
+            model=setup.model,
+            cwd=workspace,
+        )
+        assert run.patched_files == (workspace / "config.txt",), run
+        assert (workspace / "config.txt").read_text() == f"name = {marker}\n", run
diff --git a/tests/e2e/codex/test_long_session_e2e.py b/tests/e2e/codex/test_long_session_e2e.py
new file mode 100644
index 00000000000..52769b720e3
--- /dev/null
+++ b/tests/e2e/codex/test_long_session_e2e.py
@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from typing import Final
+
+import pytest
+from codex.harness import CodexHarness
+from codex.setups import SETUPS, ModelSetup
+from e2e_config import unique_marker
+
+pytestmark = pytest.mark.e2e
+
+
+@pytest.mark.parametrize("deployment", SETUPS)
+class TestCodexLongSession:
+    def test_remembers_every_command_output_in_a_chain_of_files(self, codex: CodexHarness, setup: ModelSetup) -> None:
+        codes: Final = (unique_marker(), unique_marker(), unique_marker())
+        second: Final = f"{unique_marker()}.txt"
+        third: Final = f"{unique_marker()}.txt"
+        workspace: Final = codex.new_workspace(
+            files={
+                "start.txt": f"code {codes[0]}\nnext {second}\n",
+                second: f"code {codes[1]}\nnext {third}\n",
+                third: f"code {codes[2]}\nlast file\n",
+            }
+        )
+        run: Final = codex.exec(
+            "Run `cat start.txt`. Each file prints a code and then the name of the next file, until one says last"
+            " file. Run `cat` on each next file, one command per step. Reply with the three codes in the order you"
+            " read them.",
+            model=setup.model,
+            cwd=workspace,
+        )
+        assert len(run.commands) >= 3, run
+        assert all(code in run.answer for code in codes), run
diff --git a/tests/e2e/llm_translation/test_messages_beta_headers_e2e.py b/tests/e2e/llm_translation/test_messages_beta_headers_e2e.py
index 91a31201b0f..59035f8f6b6 100644
--- a/tests/e2e/llm_translation/test_messages_beta_headers_e2e.py
+++ b/tests/e2e/llm_translation/test_messages_beta_headers_e2e.py
@@ -15,48 +15,85 @@ pytestmark = pytest.mark.e2e
 
 _BETA_CONFIG: Final = files("litellm").joinpath("anthropic_beta_headers_config.json")
 _ANTHROPIC_MODEL: Final = "anthropic/claude-sonnet-5-5"
+_VERTEX_MODEL: Final = "vertex_ai/claude-sonnet-5-5"
+_VERTEX_LOCATION: Final = "global"
+_AZURE_AI_MODEL: Final = "azure_ai/claude-fable-5-1"
 _BEDROCK_MODEL_ID: Final = "us.anthropic.claude-fable-5-1"
 _BETA_CONFIG_FILE: Final = TypeAdapter(dict[str, JsonValue])
 _BETA_MAPPING: Final = TypeAdapter(dict[str, str | None])
 _CODE_EXECUTION: Final[ToolUnionParam] = {"type": "code_execution_20250825", "name": "code_execution"}
+# A live Vertex probe on 2026-10-31: each Claude 4.5 and 4.6 model takes one of these and Claude 5.5 takes neither
+_VERTEX_PER_MODEL_BETAS: Final = frozenset({"computer-use-2025-01-24", "computer-use-2025-11-24"})
+_NO_PER_MODEL_BETAS: Final[frozenset[str]] = frozenset()
 
 
-def _mapped_beta_headers(provider: str) -> str:
-    mapping: Final = _BETA_MAPPING.validate_python(_BETA_CONFIG_FILE.validate_json(_BETA_CONFIG.read_text())[provider])
-    return ",".join(name for name, value in mapping.items() if value is not None)
+def _mapped_beta_headers(provider: str, per_model: frozenset[str]) -> str:
+    config: Final = _BETA_CONFIG_FILE.validate_json(_BETA_CONFIG.read_text())
+    mapping: Final = _BETA_MAPPING.validate_python(config[provider])
+    header_only: Final = _BETA_MAPPING.validate_python(config.get(f"{provider}_header_only", {}))
+    forwarded: Final = {name for name, value in {**mapping, **header_only}.items() if value is not None}
+    assert per_model <= forwarded, per_model - forwarded
+    return ",".join(sorted(forwarded - per_model))
 
 
 def _deployment(backend: str) -> LiteLLMParamsBody:
-    if backend.startswith("anthropic/"):
-        return LiteLLMParamsBody(model=backend, api_key="os.environ/ANTHROPIC_API_KEY")
-    return LiteLLMParamsBody(
-        model=backend,
-        aws_access_key_id="os.environ/AWS_ACCESS_KEY_ID",
-        aws_secret_access_key="os.environ/AWS_SECRET_ACCESS_KEY",
-        aws_region_name="us-east-1",
-    )
+    match backend.split("/", 1)[0]:
+        case "anthropic":
+            return LiteLLMParamsBody(model=backend, api_key="os.environ/ANTHROPIC_API_KEY")
+        case "vertex_ai":
+            return LiteLLMParamsBody(
+                model=backend,
+                vertex_project="os.environ/VERTEXAI_PROJECT",
+                vertex_location=_VERTEX_LOCATION,
+                vertex_credentials="os.environ/VERTEXAI_CREDENTIALS",
+            )
+        case "azure_ai":
+            return LiteLLMParamsBody(
+                model=backend,
+                api_base="os.environ/AZURE_AI_API_BASE",
+                api_key="os.environ/AZURE_AI_API_KEY",
+            )
+        case _:
+            return LiteLLMParamsBody(
+                model=backend,
+                aws_access_key_id="os.environ/AWS_ACCESS_KEY_ID",
+                aws_secret_access_key="os.environ/AWS_SECRET_ACCESS_KEY",
+                aws_region_name="us-east-1",
+            )
 
 
 class TestAnthropicBetaHeaders:
     @pytest.mark.parametrize(
-        ("backend", "beta_provider", "tools"),
+        ("backend", "beta_provider", "tools", "per_model"),
         [
-            pytest.param(_ANTHROPIC_MODEL, "anthropic", [_CODE_EXECUTION], id="anthropic"),
-            pytest.param(f"bedrock/invoke/{_BEDROCK_MODEL_ID}", "bedrock", [], id="bedrock-invoke"),
-            pytest.param(f"bedrock/converse/{_BEDROCK_MODEL_ID}", "bedrock_converse", [], id="bedrock-converse"),
+            pytest.param(_ANTHROPIC_MODEL, "anthropic", [_CODE_EXECUTION], _NO_PER_MODEL_BETAS, id="anthropic"),
+            pytest.param(_VERTEX_MODEL, "vertex_ai", [], _VERTEX_PER_MODEL_BETAS, id="vertex-ai"),
+            pytest.param(_AZURE_AI_MODEL, "azure_ai", [], _NO_PER_MODEL_BETAS, id="azure-ai"),
+            pytest.param(
+                f"bedrock/invoke/{_BEDROCK_MODEL_ID}", "bedrock", [], _NO_PER_MODEL_BETAS, id="bedrock-invoke"
+            ),
+            pytest.param(
+                f"bedrock/converse/{_BEDROCK_MODEL_ID}",
+                "bedrock_converse",
+                [],
+                _NO_PER_MODEL_BETAS,
+                id="bedrock-converse",
+            ),
         ],
     )
     @pytest.mark.covers(
         "llm.messages.anthropic.basic.nonstream.works",
         "llm.messages.bedrock_invoke.basic.nonstream.works",
         "llm.messages.bedrock_converse.basic.nonstream.works",
+        "llm.messages.vertex.basic.nonstream.works",
+        "llm.messages.azure_foundry.basic.nonstream.works",
     )
     @meta(
         Subject(
             domain=Domain.LLM_TRANSLATION,
             route=Route.MESSAGES,
-            providers=(Provider.ANTHROPIC, Provider.BEDROCK),
-            models=(_ANTHROPIC_MODEL, _BEDROCK_MODEL_ID),
+            providers=(Provider.ANTHROPIC, Provider.BEDROCK, Provider.VERTEX_AI, Provider.AZURE_AI),
+            models=(_ANTHROPIC_MODEL, _BEDROCK_MODEL_ID, _VERTEX_MODEL, _AZURE_AI_MODEL),
             mode=Mode.NONSTREAM,
         )
     )
@@ -68,6 +105,7 @@ class TestAnthropicBetaHeaders:
         backend: str,
         beta_provider: str,
         tools: list[ToolUnionParam],
+        per_model: frozenset[str],
     ) -> None:
         model: Final = f"e2e-messages-beta-{unique_marker()}"
         model_id: Final = proxy.create_model(model, _deployment(backend))
@@ -78,7 +116,7 @@ class TestAnthropicBetaHeaders:
             max_tokens=64,
             messages=[{"role": "user", "content": "Say 'hello' and nothing else"}],
             tools=tools,
-            extra_headers={"anthropic-beta": _mapped_beta_headers(beta_provider)},
+            extra_headers={"anthropic-beta": _mapped_beta_headers(beta_provider, per_model)},
             extra_body=NO_PROXY_CACHE,
         )
 
diff --git a/tests/e2e/llm_translation/test_responses_retrieve_e2e.py b/tests/e2e/llm_translation/test_responses_retrieve_e2e.py
index 4a08259c028..0e954af0952 100644
--- a/tests/e2e/llm_translation/test_responses_retrieve_e2e.py
+++ b/tests/e2e/llm_translation/test_responses_retrieve_e2e.py
@@ -69,9 +69,6 @@ def _retrieve_response(proxy: ProxyClient, key: str, response_id: str) -> Respon
 
 
 class TestResponsesRetrieve:
-    @pytest.mark.skip(
-        reason="stage red: product gap (LIT-5446), retrieve returns a different id than the stored response (non-idempotent response-id re-encryption)"
-    )
     @pytest.mark.covers("llm.responses.openai.basic.nonstream.works")
     @meta(
         Subject(
diff --git a/tests/e2e_harness/AGENTS.md b/tests/e2e_harness/AGENTS.md
index 65a3b32df96..83e573ae249 100644
--- a/tests/e2e_harness/AGENTS.md
+++ b/tests/e2e_harness/AGENTS.md
@@ -2,7 +2,7 @@
 
 Tests of the harness under `tests/e2e/` (the transport, the clients, the fixture bundle and replay edge, the stack lock, the IdP launcher, the coverage collector, the JUnit properties and the Claude Code driver), not of the product. They live outside `tests/e2e/` because the Buildkite e2e run copies that folder into the runner image and runs every test in it, so a harness test in there counts as a product test in the nightly numbers. Nothing here needs a proxy, provider keys or the network
 
-The layout mirrors `tests/e2e/`: `test_e2e_http.py` covers `tests/e2e/e2e_http.py`, `logging/test_datadog_reader.py` covers `tests/e2e/logging/datadog_reader.py`, and `claude_code/` covers the driver, builder, probe and version resolver. Put a new harness test under the folder that mirrors the suite folder whose module it covers
+The layout mirrors `tests/e2e/`: `test_e2e_http.py` covers `tests/e2e/e2e_http.py`, `logging/test_datadog_reader.py` covers `tests/e2e/logging/datadog_reader.py`, `claude_code/` covers the driver, builder and probe, `cli_harness/` covers the version resolver, the CLI env lockdown and the rate limiter, and `codex/` covers how the Codex driver reads the CLI's JSONL events and the compactions in a thread's rollout file. Put a new harness test under the folder that mirrors the suite folder whose module it covers
 
 Run them from the repo root. `e2e_config` reads `LITELLM_MASTER_KEY` at import and any value will do, the CI lane sets a dummy:
 
diff --git a/tests/e2e_harness/claude_code/test_pr_gate_version_resolver.py b/tests/e2e_harness/claude_code/test_pr_gate_version_resolver.py
deleted file mode 100644
index 0ed7e2bf083..00000000000
--- a/tests/e2e_harness/claude_code/test_pr_gate_version_resolver.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""Unit tests for the Claude Code PR-gate version resolver.
-
-Markerless harness tests: they feed the resolver a hand-built packument and a
-fixed clock, so they run without a proxy, never reach the npm registry, and
-carry no `e2e` marker.
-"""
-
-from __future__ import annotations
-
-from datetime import datetime, timezone
-from typing import Final, Mapping
-
-import pytest
-
-from claude_code.pr_gate_version_resolver import NoEligibleVersionError, resolve_pr_gate_version
-
-NOW: Final = datetime(2026, 4, 25, 12, 0, tzinfo=timezone.utc)
-INSIDE_THE_2_1_88_WINDOW: Final = datetime(2026, 4, 3, 12, 0, tzinfo=timezone.utc)
-
-
-def _packument(times: Mapping[str, str], unpublished: frozenset[str] = frozenset()) -> dict[str, object]:
-    return {
-        "name": "@anthropic-ai/claude-code",
-        "time": {"created": "2024-01-01T00:00:00.000Z", "modified": "2026-04-25T00:00:00.000Z", **times},
-        "versions": {version: {"version": version} for version in times if version not in unpublished},
-    }
-
-
-def test_skips_a_version_npm_has_unpublished() -> None:
-    metadata: Final = _packument(
-        {
-            "2.1.87": "2026-03-28T20:00:00.000Z",
-            "2.1.88": "2026-03-30T22:36:48.424Z",
-            "2.1.89": "2026-03-31T23:32:40.000Z",
-        },
-        unpublished=frozenset({"2.1.88"}),
-    )
-    assert resolve_pr_gate_version(metadata=metadata, as_of=INSIDE_THE_2_1_88_WINDOW) == "2.1.87"
-
-
-def test_raises_when_the_only_old_enough_version_is_unpublished() -> None:
-    metadata: Final = _packument(
-        {"2.1.88": "2026-03-30T22:36:48.424Z", "2.1.89": "2026-03-31T23:32:40.000Z"},
-        unpublished=frozenset({"2.1.88"}),
-    )
-    with pytest.raises(NoEligibleVersionError):
-        resolve_pr_gate_version(metadata=metadata, as_of=INSIDE_THE_2_1_88_WINDOW)
-
-
-def test_picks_the_newest_published_version_at_least_min_age_old() -> None:
-    metadata: Final = _packument(
-        {
-            "2.1.118": "2026-04-15T10:00:00.000Z",
-            "2.1.119": "2026-04-21T10:00:00.000Z",
-            "2.2.0-rc.1": "2026-04-22T10:00:00.000Z",
-            "2.1.120": "2026-04-23T10:00:00.000Z",
-            "2.1.121": "2026-04-25T11:00:00.000Z",
-        }
-    )
-    assert resolve_pr_gate_version(metadata=metadata, as_of=NOW) == "2.1.119"
diff --git a/tests/e2e_harness/claude_code/test_request_determinism.py b/tests/e2e_harness/claude_code/test_request_determinism.py
index b7d330b7da6..c6edb02d1c5 100644
--- a/tests/e2e_harness/claude_code/test_request_determinism.py
+++ b/tests/e2e_harness/claude_code/test_request_determinism.py
@@ -34,7 +34,7 @@ from typing import List, Tuple
 import pytest
 
 from claude_code.cli_driver import _FIXED_CLI_USER_ID, _seed_cli_identity, _stable_cli_state, run_claude
-from claude_code.rate_limiter import RateLimiter
+from cli_harness.rate_limiter import RateLimiter
 
 pytestmark = pytest.mark.cli_determinism
 
diff --git a/tests/e2e_harness/cli_harness/test_lockdown.py b/tests/e2e_harness/cli_harness/test_lockdown.py
new file mode 100644
index 00000000000..fcb24f4a830
--- /dev/null
+++ b/tests/e2e_harness/cli_harness/test_lockdown.py
@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Final
+
+from cli_harness.lockdown import isolated_home, locked_down_env
+
+RUNNER_ENV: Final = {
+    "PATH": "/usr/bin",
+    "LANG": "C.UTF-8",
+    "HOME": "/home/runner",
+    "OPENAI_API_KEY": "sk-runner-secret",
+    "AWS_SECRET_ACCESS_KEY": "runner-aws-secret",
+    "DATABASE_URL": "postgresql://runner",
+}
+
+
+def test_cli_sees_runtime_vars_and_its_overrides_but_no_runner_credentials(tmp_path: Path) -> None:
+    env: Final = locked_down_env(home=tmp_path, overrides={"OPENAI_BASE_URL": "http://gateway"}, source=RUNNER_ENV)
+    assert dict(env) == {
+        "PATH": "/usr/bin",
+        "LANG": "C.UTF-8",
+        "HOME": str(tmp_path),
+        "OPENAI_BASE_URL": "http://gateway",
+    }
+
+
+def test_isolated_home_starts_empty_and_is_gone_after_the_cli_exits() -> None:
+    with isolated_home("cli-harness-test-") as home:
+        assert home.is_dir() and not any(home.iterdir())
+        (home / ".config").mkdir()
+    assert not home.exists()
diff --git a/tests/e2e_harness/cli_harness/test_npm_version_resolver.py b/tests/e2e_harness/cli_harness/test_npm_version_resolver.py
new file mode 100644
index 00000000000..3a84ccd361a
--- /dev/null
+++ b/tests/e2e_harness/cli_harness/test_npm_version_resolver.py
@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+from collections.abc import Mapping
+from datetime import datetime, timedelta, timezone
+from typing import Final
+
+from cli_harness.npm_version_resolver import MIN_AGE, Packument, newest_version_at_least
+
+NOW: Final = datetime(2026, 4, 25, 12, 0, tzinfo=timezone.utc)
+INSIDE_THE_2_1_88_WINDOW: Final = datetime(2026, 4, 3, 12, 0, tzinfo=timezone.utc)
+
+
+def _packument(times: Mapping[str, str], unpublished: frozenset[str] = frozenset()) -> Packument:
+    return Packument.from_json(
+        {
+            "name": "@scope/some-cli",
+            "time": {"created": "2024-01-01T00:00:00.000Z", "modified": "2026-04-25T00:00:00.000Z", **times},
+            "versions": {version: {"version": version} for version in times if version not in unpublished},
+        }
+    )
+
+
+def test_skips_a_version_npm_has_unpublished() -> None:
+    packument: Final = _packument(
+        {
+            "2.1.87": "2026-03-28T20:00:00.000Z",
+            "2.1.88": "2026-03-30T22:36:48.424Z",
+            "2.1.89": "2026-03-31T23:32:40.000Z",
+        },
+        unpublished=frozenset({"2.1.88"}),
+    )
+    assert newest_version_at_least(packument, min_age=MIN_AGE, as_of=INSIDE_THE_2_1_88_WINDOW) == "2.1.87"
+
+
+def test_finds_nothing_when_the_only_old_enough_version_is_unpublished() -> None:
+    packument: Final = _packument(
+        {"2.1.88": "2026-03-30T22:36:48.424Z", "2.1.89": "2026-03-31T23:32:40.000Z"},
+        unpublished=frozenset({"2.1.88"}),
+    )
+    assert newest_version_at_least(packument, min_age=MIN_AGE, as_of=INSIDE_THE_2_1_88_WINDOW) is None
+
+
+def test_picks_the_newest_stable_version_at_least_min_age_old() -> None:
+    packument: Final = _packument(
+        {
+            "2.1.118": "2026-04-15T10:00:00.000Z",
+            "2.1.119": "2026-04-21T10:00:00.000Z",
+            "2.2.0-rc.1": "2026-04-22T10:00:00.000Z",
+            "2.1.120": "2026-04-23T10:00:00.000Z",
+            "2.1.121": "2026-04-25T11:00:00.000Z",
+        }
+    )
+    assert newest_version_at_least(packument, min_age=MIN_AGE, as_of=NOW) == "2.1.119"
+
+
+def test_newest_means_latest_published_not_highest_semver() -> None:
+    packument: Final = _packument(
+        {
+            "3.0.0": "2026-04-01T10:00:00.000Z",
+            "2.9.9": "2026-04-10T10:00:00.000Z",
+        }
+    )
+    assert newest_version_at_least(packument, min_age=timedelta(days=3), as_of=NOW) == "2.9.9"
diff --git a/tests/e2e_harness/cli_harness/test_rate_limiter.py b/tests/e2e_harness/cli_harness/test_rate_limiter.py
new file mode 100644
index 00000000000..78ad3e92450
--- /dev/null
+++ b/tests/e2e_harness/cli_harness/test_rate_limiter.py
@@ -0,0 +1,78 @@
+from __future__ import annotations
+
+import multiprocessing
+from collections.abc import Mapping
+from dataclasses import dataclass
+from multiprocessing.synchronize import Barrier
+from pathlib import Path
+from types import MappingProxyType
+from typing import Final, NoReturn
+
+from cli_harness.rate_limiter import ProviderConfig, RateBucket, RateLimiter
+
+_RACERS: Final = 8
+_ATTEMPTS_PER_RACER: Final = 100
+_BURST: Final = 400
+_NO_REFILL: Final[Mapping[RateBucket, ProviderConfig]] = MappingProxyType(
+    {RateBucket.OPENAI: ProviderConfig(rate_per_sec=1e-9, burst=_BURST)}
+)
+
+
+@dataclass
+class _FakeTime:
+    now: float = 0.0
+
+    def clock(self) -> float:
+        return self.now
+
+    def sleep(self, seconds: float) -> None:
+        self.now += seconds
+
+
+def test_two_processes_on_one_host_share_a_single_budget_per_bucket(tmp_path: Path) -> None:
+    fake_time: Final = _FakeTime()
+    config: Final = {RateBucket.OPENAI: ProviderConfig(rate_per_sec=2.0, burst=1.0)}
+    first_process: Final = RateLimiter(config, tmp_path, fake_time.clock, fake_time.sleep)
+    second_process: Final = RateLimiter(config, tmp_path, fake_time.clock, fake_time.sleep)
+
+    assert first_process.acquire(RateBucket.OPENAI) == 0.0
+    assert 0.5 <= second_process.acquire(RateBucket.OPENAI) < 0.51
+    assert second_process.acquire(RateBucket.BEDROCK_MANTLE) == 0.0
+
+
+def test_processes_racing_for_one_bucket_never_get_more_than_its_burst(tmp_path: Path) -> None:
+    grants: Final = tmp_path / "grants"
+
+    _race(_RACERS, state_dir=tmp_path / "state", grants=grants)
+
+    assert len(grants.read_bytes()) == _BURST
+
+
+def _race(racers: int, *, state_dir: Path, grants: Path) -> None:
+    context: Final = multiprocessing.get_context("spawn")
+    start_line: Final = context.Barrier(racers)
+    processes: Final = tuple(
+        context.Process(target=_take_tokens_until_told_to_wait, args=(state_dir, grants, start_line))
+        for _ in range(racers)
+    )
+    for process in processes:
+        process.start()
+    for process in processes:
+        process.join()
+
+
+def _take_tokens_until_told_to_wait(state_dir: Path, grants: Path, start_line: Barrier) -> None:
+    limiter: Final = RateLimiter(_NO_REFILL, state_dir, _frozen_clock, _exit_instead_of_sleeping)
+    with grants.open("ab", buffering=0) as log:
+        _ = start_line.wait()
+        for _ in range(_ATTEMPTS_PER_RACER):
+            _ = limiter.acquire(RateBucket.OPENAI)
+            _ = log.write(b".")
+
+
+def _frozen_clock() -> float:
+    return 0.0
+
+
+def _exit_instead_of_sleeping(_seconds: float) -> NoReturn:
+    raise SystemExit(0)
diff --git a/tests/e2e_harness/codex/test_codex_rollout.py b/tests/e2e_harness/codex/test_codex_rollout.py
new file mode 100644
index 00000000000..2ef27a8a9c5
--- /dev/null
+++ b/tests/e2e_harness/codex/test_codex_rollout.py
@@ -0,0 +1,77 @@
+from __future__ import annotations
+
+import json
+import time
+from collections.abc import Mapping
+from pathlib import Path
+from typing import Final
+
+from cli_harness.rate_limiter import RateBucket, RateLimiter
+from codex.harness import CodexHarness
+from codex.rollout import Compaction, rollout_compactions
+
+THREAD_ID: Final = "01a18fea-b2e8-7ed2-a29b-1ce4d2b138c3"
+USER_PROMPT: Final = {
+    "type": "message",
+    "role": "user",
+    "content": [{"type": "input_text", "text": "Run `cat secret.txt` and remember the value it prints."}],
+}
+
+
+def _line(record_type: str, payload: Mapping[str, object]) -> str:
+    return json.dumps({"timestamp": "2026-10-31T03:03:32.000Z", "type": record_type, "payload": payload})
+
+
+def _rollout(*compactions: Mapping[str, object]) -> str:
+    return "\n".join(
+        (
+            _line("session_meta", {"id": THREAD_ID, "cli_version": "0.165.0"}),
+            _line("response_item", USER_PROMPT),
+            *(_line("compacted", compaction) for compaction in compactions),
+            _line("event_msg", {"type": "task_complete"}),
+        )
+    )
+
+
+REMOTE: Final = {
+    "message": "",
+    "replacement_history": [USER_PROMPT, {"type": "compaction", "encrypted_content": "gAAAAABq5VrT"}],
+}
+LOCAL: Final = {
+    "message": "The user asked to read secret.txt, which printed 4a6e834a61f8d792.",
+    "replacement_history": [
+        USER_PROMPT,
+        {"type": "message", "role": "user", "content": [{"type": "input_text", "text": "Summary: 4a6e834a61f8d792"}]},
+    ],
+}
+
+
+class TestRolloutCompactions:
+    def test_a_compaction_that_kept_the_providers_compaction_item_is_remote(self) -> None:
+        assert rollout_compactions(_rollout(REMOTE)) == (Compaction(remote=True),)
+
+    def test_a_compaction_that_codex_summarized_itself_is_local(self) -> None:
+        assert rollout_compactions(_rollout(LOCAL, {"message": "an older rollout with no replacement history"})) == (
+            Compaction(remote=False),
+            Compaction(remote=False),
+        )
+
+    def test_a_rollout_without_compactions_has_none(self) -> None:
+        assert rollout_compactions(_rollout()) == ()
+
+
+def test_the_harness_reads_only_the_rollout_of_the_thread_it_is_asked_about(tmp_path: Path) -> None:
+    codex: Final = CodexHarness(
+        home=tmp_path,
+        api_key="unused",
+        rate_bucket=RateBucket.OPENAI,
+        limiter=RateLimiter({}, tmp_path, time.monotonic, time.sleep),
+    )
+    sessions: Final = codex.codex_home / "sessions" / "2026" / "10" / "30"
+    sessions.mkdir(parents=True)
+    _ = (sessions / f"rollout-2026-10-30T20-03-32-{THREAD_ID}.jsonl").write_text(_rollout(REMOTE))
+    _ = (sessions / "rollout-2026-10-30T20-04-00-01a18feb-9d3e-7ee1-b19f-e35d8894e5da.jsonl").write_text(
+        _rollout(LOCAL)
+    )
+
+    assert codex.compactions(THREAD_ID) == (Compaction(remote=True),)
diff --git a/tests/e2e_harness/codex/test_codex_run.py b/tests/e2e_harness/codex/test_codex_run.py
new file mode 100644
index 00000000000..415967da114
--- /dev/null
+++ b/tests/e2e_harness/codex/test_codex_run.py
@@ -0,0 +1,92 @@
+from __future__ import annotations
+
+import configparser
+import json
+import re
+import shlex
+from collections.abc import Mapping
+from pathlib import Path
+from typing import Final
+
+from codex.run import Command, codex_run
+
+E2E_PYTEST_INI: Final = Path(__file__).resolve().parents[2] / "e2e" / "pytest.ini"
+
+ROUND_TRIP: Final = "\n".join(
+    (
+        '{"type":"thread.started","thread_id":"01a18f9f-9d08-72e0-9be3-aa34cf7489d2"}',
+        '{"type":"turn.started"}',
+        '{"type":"item.completed","item":{"id":"item_0","type":"agent_message","text":"I will run it."}}',
+        '{"type":"item.started","item":{"id":"item_1","type":"command_execution","command":"/bin/zsh -lc \'cat'
+        ' secret.txt\'","aggregated_output":"","exit_code":null,"status":"in_progress"}}',
+        '{"type":"item.completed","item":{"id":"item_1","type":"command_execution","command":"/bin/zsh -lc \'cat'
+        ' secret.txt\'","aggregated_output":"marker-7f3a91\\n","exit_code":0,"status":"completed"}}',
+        '{"type":"item.completed","item":{"id":"item_2","type":"agent_message","text":"marker-7f3a91"}}',
+        '{"type":"turn.completed","usage":{"input_tokens":22547,"cached_input_tokens":11227,'
+        '"cache_write_input_tokens":11314,"output_tokens":67,"reasoning_output_tokens":0}}',
+    )
+)
+
+
+def _line(event: Mapping[str, object]) -> str:
+    return json.dumps(event)
+
+
+class TestCodexRun:
+    def test_the_answer_is_the_last_agent_message_and_each_finished_command_keeps_its_output(self) -> None:
+        run: Final = codex_run(exit_code=0, stdout=ROUND_TRIP, stderr="")
+
+        assert run.thread_id == "01a18f9f-9d08-72e0-9be3-aa34cf7489d2"
+        assert run.commands == (
+            Command(command="/bin/zsh -lc 'cat secret.txt'", output="marker-7f3a91\n", exit_code=0),
+        )
+        assert run.answer == "marker-7f3a91"
+        assert run.usage is not None and run.usage.input_tokens == 22547
+        assert run.errors == ()
+
+    def test_only_a_patch_that_applied_counts_as_patching_its_files(self) -> None:
+        def patch(status: str, path: str) -> str:
+            item: Final = {
+                "id": path,
+                "type": "file_change",
+                "status": status,
+                "changes": [{"path": path, "kind": "update"}],
+            }
+            return _line({"type": "item.completed", "item": item})
+
+        run: Final = codex_run(
+            exit_code=0, stdout="\n".join((patch("completed", "/w/app.py"), patch("failed", "/w/other.py"))), stderr=""
+        )
+
+        assert run.patched_files == (Path("/w/app.py"),)
+
+    def test_a_turn_that_gave_up_on_a_5xx_is_rerun_by_the_suites_network_rule(self) -> None:
+        failed: Final = _line(
+            {"type": "turn.failed", "error": {"message": "exceeded retry limit, last status: 502 Bad Gateway"}}
+        )
+
+        run: Final = codex_run(exit_code=1, stdout=failed, stderr="")
+
+        assert run.errors[0].status_code == 502
+        rerun_patterns: Final = _only_rerun_patterns(E2E_PYTEST_INI)
+        assert any(re.search(pattern, repr(run)) for pattern in rerun_patterns), rerun_patterns
+
+    def test_an_event_or_item_type_it_does_not_model_is_skipped(self) -> None:
+        newer_codex: Final = "\n".join(
+            (
+                _line({"type": "thread.goal_set", "goal": "ship it"}),
+                _line({"type": "item.completed", "item": {"id": "item_9", "type": "todo_list", "items": []}}),
+                ROUND_TRIP,
+            )
+        )
+
+        assert codex_run(exit_code=0, stdout=newer_codex, stderr="") == codex_run(
+            exit_code=0, stdout=ROUND_TRIP, stderr=""
+        )
+
+
+def _only_rerun_patterns(ini: Path) -> tuple[str, ...]:
+    parser: Final = configparser.ConfigParser()
+    _ = parser.read(ini)
+    args: Final = shlex.split(parser["pytest"]["addopts"])
+    return tuple(value for flag, value in zip(args, args[1:]) if flag == "--only-rerun")
diff --git a/tests/integration/_support/asgi.py b/tests/integration/_support/asgi.py
index e84dc9439d3..30eb9f21760 100644
--- a/tests/integration/_support/asgi.py
+++ b/tests/integration/_support/asgi.py
@@ -15,7 +15,7 @@ from starlette.types import ASGIApp
 
 @contextmanager
 def asgi_server(
-    app: ASGIApp, *, before_stop: Callable[[], None] | None = None, port: int = 0, keepalive_seconds: int = 1
+    app: ASGIApp, *, before_stop: Callable[[], None] | None = None, port: int = 0, keepalive_seconds: int = 30
 ) -> Iterator[str]:
     with socket.socket() as listener:
         listener.bind(("127.0.0.1", port))
diff --git a/tests/integration/authorization/_hidden_alias_budget.py b/tests/integration/authorization/_hidden_alias_budget.py
index bee2a585cff..5e9c2f1a95a 100644
--- a/tests/integration/authorization/_hidden_alias_budget.py
+++ b/tests/integration/authorization/_hidden_alias_budget.py
@@ -150,6 +150,10 @@ def error_type(response: httpx.Response) -> str:
     return str(object_value(JSON_OBJECT.validate_json(response.content)["error"])["type"])
 
 
+def budget_refusal_error_type(route: str) -> str:
+    return "invalid_request_error" if route == "messages" else "budget_exceeded"
+
+
 def settle(
     send: Callable[[str], httpx.Response], status: int, *, burst: int = GATEWAY_BURST, seconds: float = 60
 ) -> None:
diff --git a/tests/integration/authorization/test_alias_chain_budget_waiver.py b/tests/integration/authorization/test_alias_chain_budget_waiver.py
index 0908fa0691c..e9d922d14f9 100644
--- a/tests/integration/authorization/test_alias_chain_budget_waiver.py
+++ b/tests/integration/authorization/test_alias_chain_budget_waiver.py
@@ -44,6 +44,7 @@ from integration.authorization._hidden_alias_budget import (
     async_anthropic_client,
     async_openai_client,
     base_url,
+    budget_refusal_error_type,
     error_type,
     fresh_chat,
     fresh_message,
@@ -191,17 +192,18 @@ def _assert_refused(
     key: str,
     model: str,
     prefix: str,
+    route: str = "chat",
     send: Callable[[Gateway, str, str, str], httpx.Response] = fresh_chat,
 ) -> None:
     marker: Final = f"{prefix}-" + uuid.uuid4().hex
     refused: Final = send(candidate, model, key, marker)
-    assert _refusal(refused) == (BUDGET_EXCEEDED, "budget_exceeded"), refused.text
+    assert _refusal(refused) == (BUDGET_EXCEEDED, budget_refusal_error_type(route)), refused.text
     assert upstream_hits(upstream_requests(rig.gateway.upstream_url), marker) == 0
 
 
 def _assert_refused_on_every_route(rig: ChainRig, candidate: Gateway, key: str, model: str) -> None:
     for route, send in ROUTES:
-        _assert_refused(rig, candidate, key, model, f"refused-{route}", send)
+        _assert_refused(rig, candidate, key, model, f"refused-{route}", route, send)
 
 
 def _assert_provider_failure(response: httpx.Response) -> None:
diff --git a/tests/integration/authorization/test_claude_code_gateway_oauth.py b/tests/integration/authorization/test_claude_code_gateway_oauth.py
index 23476c439de..11e4485031e 100644
--- a/tests/integration/authorization/test_claude_code_gateway_oauth.py
+++ b/tests/integration/authorization/test_claude_code_gateway_oauth.py
@@ -474,15 +474,15 @@ def test_device_authorization_polls_complete_sso_and_mints_a_model_restricted_be
             )
             assert model_b_response.status_code == 403, model_b_response.text
             assert _JSON_OBJECT.validate_json(model_b_response.content) == {
+                "type": "error",
                 "error": {
+                    "type": "permission_error",
                     "message": (
                         f"The requested model '{model_b}' is not available for this API key, or the model name is "
                         "invalid. Check the models available to you and try again."
                     ),
-                    "type": "team_model_access_denied",
-                    "param": "model",
-                    "code": "403",
-                }
+                    "litellm_error_type": "team_model_access_denied",
+                },
             }, model_b_response.text
             assert upstream.drain() == ()
 
diff --git a/tests/integration/authorization/test_cli_sso_login_ui_disabled.py b/tests/integration/authorization/test_cli_sso_login_ui_disabled.py
index a53fbfacf4c..fd4c7246801 100644
--- a/tests/integration/authorization/test_cli_sso_login_ui_disabled.py
+++ b/tests/integration/authorization/test_cli_sso_login_ui_disabled.py
@@ -695,9 +695,11 @@ def test_cli_session_token_is_denied_once_its_team_budget_is_exhausted(
             key=key,
         )
         assert refused.status_code == 422, f"{refused.status_code} {refused.text}"
-        error: Final = object_value(JSON_OBJECT.validate_json(refused.content)["error"])
-        assert error["type"] == "budget_exceeded", refused.text
-        assert error["code"] == "422", refused.text
+        body: Final = JSON_OBJECT.validate_json(refused.content)
+        assert body["type"] == "error", refused.text
+        error: Final = object_value(body["error"])
+        assert error["type"] == "invalid_request_error", refused.text
+        assert "param" not in error and "code" not in error, refused.text
         message: Final = string_value(error["message"])
         assert "Budget has been exceeded!" in message, refused.text
         assert f"Team={team}" in message, refused.text
diff --git a/tests/integration/authorization/test_hidden_alias_budget_bypass.py b/tests/integration/authorization/test_hidden_alias_budget_bypass.py
index 51b36c145d3..e9e55a6aaf7 100644
--- a/tests/integration/authorization/test_hidden_alias_budget_bypass.py
+++ b/tests/integration/authorization/test_hidden_alias_budget_bypass.py
@@ -38,6 +38,7 @@ from integration.authorization._hidden_alias_budget import (
     async_anthropic_client,
     async_openai_client,
     base_url,
+    budget_refusal_error_type,
     chat_statuses,
     clear_provider_script,
     error_type,
@@ -599,7 +600,7 @@ def _assert_refused_like_target(rig: AliasRig, candidate: Gateway, key: str, sha
         target_marker: Final = f"target-{route}-" + uuid.uuid4().hex
         via_shadow: Final = send(candidate, shadow, key, shadow_marker)
         by_name: Final = send(candidate, target, key, target_marker)
-        assert _refusal(by_name) == (BUDGET_EXCEEDED, "budget_exceeded"), by_name.text
+        assert _refusal(by_name) == (BUDGET_EXCEEDED, budget_refusal_error_type(route)), by_name.text
         assert via_shadow.status_code == by_name.status_code, via_shadow.text
         assert error_type(via_shadow) == error_type(by_name), via_shadow.text
         observed: Final = upstream_requests(rig.gateway.upstream_url)
@@ -621,7 +622,7 @@ def _assert_refused_on_every_route(rig: AliasRig, candidate: Gateway, key: str,
         marker: Final = f"chain-{route}-" + uuid.uuid4().hex
         refused: Final = send(candidate, model, key, marker)
         assert refused.status_code == BUDGET_EXCEEDED, refused.text
-        assert error_type(refused) == "budget_exceeded", refused.text
+        assert error_type(refused) == budget_refusal_error_type(route), refused.text
         assert upstream_hits(upstream_requests(rig.gateway.upstream_url), marker) == 0
 
 
@@ -828,9 +829,9 @@ def _deployment_id(rig: AliasRig, name: str) -> str:
     return identities[0]
 
 
-def _assert_budget_refusal(status_code: int, body: str) -> None:
+def _assert_budget_refusal(status_code: int, body: str, route: str = "chat") -> None:
     assert status_code == BUDGET_EXCEEDED, body
-    assert "budget_exceeded" in body, body
+    assert budget_refusal_error_type(route) in body, body
 
 
 def _assert_no_served_row(key: str, marker: str) -> None:
@@ -881,7 +882,7 @@ async def test_exhausted_key_is_refused_on_shadowing_alias_through_streamed_anth
                     extra_headers=spend_marker(marker),
                 ) as stream:
                     await stream.get_final_message()
-        _assert_budget_refusal(refused.value.status_code, str(refused.value.body))
+        _assert_budget_refusal(refused.value.status_code, str(refused.value.body), route="messages")
         assert upstream_hits(upstream_requests(rig.gateway.upstream_url), marker) == 0
 
 
diff --git a/tests/integration/authorization/test_unknown_key_generic_401.py b/tests/integration/authorization/test_unknown_key_generic_401.py
index 025f11d3973..a9ed4b66f27 100644
--- a/tests/integration/authorization/test_unknown_key_generic_401.py
+++ b/tests/integration/authorization/test_unknown_key_generic_401.py
@@ -50,7 +50,27 @@ class _ErrorResponse(BaseModel):
     error: _ProxyError
 
 
+class _AnthropicErrorDetail(BaseModel):
+    model_config = ConfigDict(frozen=True, extra="forbid")
+
+    type: str
+    message: str
+    litellm_error_type: str
+
+
+class _AnthropicErrorResponse(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
+    type: str
+    error: _AnthropicErrorDetail
+
+
 GENERIC_ERROR: Final = _ProxyError(message=GENERIC_MESSAGE, type="token_not_found_in_db", param="key", code="401")
+MESSAGES_PATH: Final = "/v1/messages"
+ANTHROPIC_ENVELOPE_PATHS: Final = frozenset({MESSAGES_PATH, "/anthropic/v1/messages"})
+ANTHROPIC_GENERIC_ERROR: Final = _AnthropicErrorDetail(
+    type="authentication_error", message=GENERIC_MESSAGE, litellm_error_type=GENERIC_ERROR.type
+)
 
 
 @dataclass(frozen=True, slots=True)
@@ -119,6 +139,22 @@ def _assert_generic_refusal(response: httpx.Response, *secrets: str) -> None:
         assert secret not in response.text, response.text
 
 
+def _assert_messages_refusal(response: httpx.Response, *secrets: str) -> None:
+    assert response.status_code == 401, response.text
+    body: Final = _AnthropicErrorResponse.model_validate_json(response.content)
+    assert body.type == "error", response.text
+    assert body.error == ANTHROPIC_GENERIC_ERROR, response.text
+    for secret in secrets:
+        assert secret not in response.text, response.text
+
+
+def _assert_refusal(path: str, response: httpx.Response, *secrets: str) -> None:
+    if path in ANTHROPIC_ENVELOPE_PATHS:
+        _assert_messages_refusal(response, *secrets)
+    else:
+        _assert_generic_refusal(response, *secrets)
+
+
 def _side(gateway: Gateway, peer: Gateway, side: Side) -> Gateway:
     return gateway if side == "gateway" else peer
 
@@ -129,7 +165,10 @@ def test_an_unknown_key_gets_the_generic_401_without_reaching_the_provider(
     gateway: Gateway, peer: Gateway, provider: SharedProvider, route: str, side: Side
 ) -> None:
     key: Final = _unknown_key()
-    _assert_generic_refusal(_send(_side(gateway, peer, side), ROUTES[route], key), key, key[-4:], _digest(key))
+    request_route: Final = ROUTES[route]
+    _assert_refusal(
+        request_route.path, _send(_side(gateway, peer, side), request_route, key), key, key[-4:], _digest(key)
+    )
     assert provider.received() == ()
 
 
@@ -183,8 +222,9 @@ def test_two_different_unknown_keys_in_both_headers_get_the_generic_401_naming_n
     bearer: Final = _unknown_key()
     api_key: Final = _unknown_key()
     headers: Final = {**_headers("authorization", bearer), **_headers("x-api-key", api_key)}
-    for path, body in (("/v1/chat/completions", CHAT), ("/v1/messages", MESSAGES)):
-        _assert_generic_refusal(
+    for path, body in (("/v1/chat/completions", CHAT), (MESSAGES_PATH, MESSAGES)):
+        _assert_refusal(
+            path,
             gateway.client.post(path, json=dict(body), headers=headers),
             bearer,
             api_key,
@@ -359,16 +399,13 @@ async def _send_async(client: httpx.AsyncClient, route: _Route, key: str) -> htt
     )
 
 
-async def _burst(owned: OwnedProxy, keys: tuple[str, ...]) -> tuple[httpx.Response, ...]:
+async def _burst(owned: OwnedProxy, keys: tuple[str, ...]) -> tuple[tuple[_Route, httpx.Response], ...]:
+    routes: Final = tuple(ROUTES[BURST_ROUTES[index % len(BURST_ROUTES)]] for index in range(len(keys)))
     async with httpx.AsyncClient(base_url=str(owned.gateway.client.base_url), timeout=60, trust_env=False) as client:
-        return tuple(
-            await asyncio.gather(
-                *(
-                    _send_async(client, ROUTES[BURST_ROUTES[index % len(BURST_ROUTES)]], key)
-                    for index, key in enumerate(keys)
-                )
-            )
+        responses: Final = await asyncio.gather(
+            *(_send_async(client, route, key) for route, key in zip(routes, keys, strict=True))
         )
+    return tuple(zip(routes, responses, strict=True))
 
 
 def _log_after(owned: OwnedProxy, offset: int) -> str:
@@ -397,7 +434,7 @@ async def test_a_burst_across_a_worker_kill_answers_every_unknown_key_with_the_g
             lambda text: all(_console_line(key) in text for key in keys),
             30,
         )
-    for response, key in zip((*during, *after), keys, strict=True):
-        _assert_generic_refusal(response, key, _digest(key))
+    for (route, response), key in zip((*during, *after), keys, strict=True):
+        _assert_refusal(route.path, response, key, _digest(key))
     assert [window.count(_console_line(key)) for key in keys] == [1] * len(keys)
     assert [key for key in keys if key in window] == []
diff --git a/tests/integration/caching/test_response_cache_empty_output.py b/tests/integration/caching/test_response_cache_empty_output.py
index ce5a4d64ca7..7a20e712d4e 100644
--- a/tests/integration/caching/test_response_cache_empty_output.py
+++ b/tests/integration/caching/test_response_cache_empty_output.py
@@ -23,7 +23,7 @@ from typing import Final, TypeAlias, TypeVar
 import httpx
 import pytest
 from anthropic import Anthropic, AsyncAnthropic
-from openai import AsyncOpenAI, OpenAI
+from openai import AsyncOpenAI, InternalServerError, OpenAI
 from pydantic import JsonValue
 
 from tests.integration._support.client import JSON_OBJECT, Gateway, eventually, object_value, string_value
@@ -420,14 +420,25 @@ def _streamed_chat(gateway: Gateway, model: str, text: str) -> _Answer:
     return ids, streamed, tuple(chunk.object for chunk in chunks)
 
 
-def test_streamed_chat_without_choices_is_never_assembled_or_cached(gateway: Gateway) -> None:
+def test_streamed_chat_without_choices_fails_and_is_never_cached(gateway: Gateway) -> None:
     upstream: Final = Upstream(gateway.upstream_url)
+    store: Final = redis_store()
     text: Final = prompt()
     with gateway.scenario() as scenario:
         handle: Final = scripted(scenario, CHAT_STREAM_WITHOUT_CHOICES)
         model: Final = scenario.model(api_base=handle.api_base())
-        empty: Final = _never_replayed(partial(_streamed_chat, gateway, model, text), upstream, handle.scenario_id)
-        assert all(answer.text == "" for answer in empty), empty
+        stream: Final = partial(_streamed_chat, gateway, model, text)
+        for attempt in range(1, EMPTY_STREAMS + 1):
+            with pytest.raises(InternalServerError, match="Stream ended before a finish_reason was received"):
+                stream()
+            _assert_prompt_reached_upstream(upstream, handle.scenario_id, text, attempt)
+        rescript(handle, CHAT_STREAM)
+        real_ids, real_text, _ = stream()
+        assert real_text == "streamed response" and len(real_ids) == 1, (real_ids, real_text)
+        _assert_prompt_reached_upstream(upstream, handle.scenario_id, text, EMPTY_STREAMS + 1)
+        await_entry(store, next(iter(real_ids)))
+        replay: Final = _replayed(stream, upstream, handle.scenario_id, real_ids)
+        assert replay.text == real_text, replay
 
 
 def _streamed_text(gateway: Gateway, model: str, text: str) -> _Answer:
diff --git a/tests/integration/compatibility/test_a2a_wire_versions.py b/tests/integration/compatibility/test_a2a_wire_versions.py
index 4471322d1e9..b3ca0c99392 100644
--- a/tests/integration/compatibility/test_a2a_wire_versions.py
+++ b/tests/integration/compatibility/test_a2a_wire_versions.py
@@ -1023,9 +1023,18 @@ def test_a2a_task_methods_pass_through_verbatim_and_push_callbacks_are_validated
                 {"taskId": "t1", "url": callback},
             ):
                 rejected = call("tasks/pushNotificationConfig/set", params)
-                assert (rejected.status_code, rejected.json()) == (400, {"detail": detail}), (
-                    f"{params}: {rejected.text}"
-                )
+                assert (rejected.status_code, rejected.json()) == (
+                    400,
+                    {
+                        "jsonrpc": "2.0",
+                        "id": marker + "tasks/pushNotificationConfig/set",
+                        "error": {
+                            "code": -32000,
+                            "message": detail,
+                            "data": {"type": "invalid_request_error", "param": None, "code": "400"},
+                        },
+                    },
+                ), f"{params}: {rejected.text}"
         assert tuple(item for item in wire.drain() if item.method == "POST") == ()
 
         public: Final = {"taskId": "t1", "pushNotificationConfig": {"url": "https://1.1.1.1/callback"}}
@@ -1118,7 +1127,15 @@ def test_a2a_v1_task_methods_and_extended_card_lower_to_0_3_upstream_and_answer_
             rejected = call("CreateTaskPushNotificationConfig", params)
             assert (rejected.status_code, rejected.json()) == (
                 400,
-                {"detail": "Push notification URL must use HTTPS"},
+                {
+                    "jsonrpc": "2.0",
+                    "id": marker + "CreateTaskPushNotificationConfig",
+                    "error": {
+                        "code": -32000,
+                        "message": "Push notification URL must use HTTPS",
+                        "data": {"type": "invalid_request_error", "param": None, "code": "400"},
+                    },
+                },
             ), f"{params}: {rejected.text}"
         assert forwarded() == ()
 
diff --git a/tests/integration/compatibility/test_codex_model_catalog.py b/tests/integration/compatibility/test_codex_model_catalog.py
index a3ba032e612..fbf05b0f526 100644
--- a/tests/integration/compatibility/test_codex_model_catalog.py
+++ b/tests/integration/compatibility/test_codex_model_catalog.py
@@ -351,6 +351,41 @@ def test_stock_model_keeps_codex_entry(gateway: Gateway) -> None:
         assert catalog[name] == expected, catalog[name]
 
 
+def test_stock_model_alias_takes_configured_max_input_tokens(gateway: Gateway) -> None:
+    with gateway.scenario() as scenario:
+        stock: Final = _bundled_stock()["gpt-6-sol"]
+        stock_window: Final = stock["context_window"]
+        ceiling: Final = stock["max_context_window"]
+        assert isinstance(stock_window, int) and isinstance(ceiling, int) and stock_window < ceiling, stock
+        raised: Final = _model_name("codex-raised-window")
+        lowered: Final = _model_name("codex-lowered-window")
+        half_set: Final = _model_name("codex-half-set-window")
+        half_lowered: Final = _model_name("codex-half-lowered-window")
+        unset: Final = _model_name("codex-unset-window")
+        names: Final = (raised, lowered, half_set, half_lowered, unset)
+        _new_model(scenario, raised, model="openai/gpt-6-sol", model_info={"max_input_tokens": ceiling + 50000})
+        _new_model(scenario, lowered, model="openai/gpt-6-sol", model_info={"max_input_tokens": stock_window // 2})
+        _new_model(scenario, half_set, model="openai/gpt-6-sol", model_info={"max_input_tokens": ceiling})
+        _new_model(scenario, half_set, model="openai/gpt-6-sol")
+        _new_model(scenario, half_lowered, model="openai/gpt-6-sol", model_info={"max_input_tokens": stock_window // 3})
+        _new_model(scenario, half_lowered, model="openai/gpt-6-sol")
+        _new_model(scenario, unset, model="openai/gpt-6-sol")
+        expected: Final = {
+            raised: ceiling,
+            lowered: stock_window // 2,
+            half_set: stock_window,
+            half_lowered: stock_window // 3,
+            unset: stock_window,
+        }
+        windows: Final = _settled(
+            lambda: {
+                slug: entry["context_window"] for slug, entry in _by_slug(_catalog(gateway)).items() if slug in names
+            },
+            lambda value: value == expected,
+        )
+        assert windows == expected, windows
+
+
 def test_stock_model_configured_tiers_override(gateway: Gateway) -> None:
     with gateway.scenario() as scenario:
         stock: Final = _bundled_stock()["gpt-6-sol"]
diff --git a/tests/integration/compatibility/test_openai_sdk_client_paths.py b/tests/integration/compatibility/test_openai_sdk_client_paths.py
index f8d7449038a..d6b6d1d460d 100644
--- a/tests/integration/compatibility/test_openai_sdk_client_paths.py
+++ b/tests/integration/compatibility/test_openai_sdk_client_paths.py
@@ -630,19 +630,6 @@ def _spend_row(identity: str) -> Mapping[str, JsonValue]:
     return rows[0]
 
 
-def _spend_row_keyed_by_any(identities: frozenset[str]) -> Mapping[str, JsonValue]:
-    keys: Final = tuple(sorted(identities))
-    placeholders: Final = ", ".join("%s" for _ in keys)
-    rows: Final = eventually(
-        lambda: read_rows(
-            f'SELECT request_id, call_type, model FROM "LiteLLM_SpendLogs" WHERE request_id IN ({placeholders})', keys
-        ),
-        lambda rows: len(rows) == 1,
-        seconds=70,
-    )
-    return rows[0]
-
-
 def _spend_request_ids(identities: tuple[str, str, str]) -> frozenset[str]:
     rows: Final = eventually(
         lambda: read_rows('SELECT request_id FROM "LiteLLM_SpendLogs" WHERE request_id IN (%s, %s, %s)', identities),
@@ -815,7 +802,7 @@ def test_r07_responses_stream_through_the_async_openai_sdk(gateway: Gateway) ->
         served: Final = _served(wire)
         assert _routes(served) == (("POST", "/v1/responses"),), served
         assert _body(served[0])["stream"] is True, served[0].body
-        assert _spend_row_keyed_by_any(response_identities(last.response.id))["model"] == DEPLOYMENT_MODEL
+        assert _spend_row(last.response.id)["model"] == DEPLOYMENT_MODEL
 
 
 def test_r08_completions_non_stream_through_the_sync_openai_sdk(gateway: Gateway) -> None:
diff --git a/tests/integration/configuration/test_effective_settings.py b/tests/integration/configuration/test_effective_settings.py
index 07477f1f048..1b0086c619a 100644
--- a/tests/integration/configuration/test_effective_settings.py
+++ b/tests/integration/configuration/test_effective_settings.py
@@ -20,7 +20,7 @@ from pydantic import BaseModel, JsonValue, TypeAdapter
 
 from tests.integration._support.client import Gateway, eventually, object_value, string_value
 from tests.integration._support.database import read_rows, scratch_database
-from tests.integration._support.process import owned_proxy
+from tests.integration._support.process import owned_proxy, owned_proxy_process
 from tests.integration._support.wire import Reply, Request, Wire, wire_server
 
 pytestmark: Final = pytest.mark.shares_worker_state
@@ -1701,3 +1701,57 @@ def test_db_environment_variables_saved_from_a_session_outside_the_tables_schema
 
         assert isinstance(first, int) and isinstance(second, int)
         assert 0 < first < second
+
+
+def test_a_stored_general_setting_no_settings_api_manages_stays_off_and_the_rest_of_the_row_applies(
+    gateway: Gateway, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    alias: Final = "stale-database-setting-" + uuid.uuid4().hex
+    with scratch_database() as database_url, wire_server(lambda _request: _completion_reply("pong")) as provider:
+        monkeypatch.setenv("DATABASE_URL", database_url)
+        _push_schema()
+        with psycopg.connect(database_url, autocommit=True) as writer:
+            writer.execute(
+                'INSERT INTO "LiteLLM_Config" (param_name, param_value) VALUES (%s, %s)',
+                ("general_settings", Jsonb({"enforce_user_param": True, "store_prompts_in_spend_logs": True})),
+            )
+        config: Final = tmp_path / "stale-database-setting.yaml"
+        config.write_text(
+            json.dumps(
+                {
+                    "model_list": [
+                        {
+                            "model_name": alias,
+                            "litellm_params": {
+                                "model": "openai/gpt-4o-mini",
+                                "api_base": provider.url + "/v1",
+                                "api_key": "integration-provider-key",
+                            },
+                        }
+                    ],
+                    "general_settings": {"master_key": gateway.key, "store_model_in_db": True},
+                }
+            )
+        )
+        with owned_proxy_process(
+            gateway,
+            tmp_path / "stale-database-setting",
+            {"DATABASE_URL": database_url, "DISABLE_SCHEMA_UPDATE": "true"},
+            config=config,
+            database_setup=(),
+        ) as owned:
+            answer: Final = owned.gateway.request(
+                "POST", "/v1/chat/completions", {"model": alias, "messages": [{"role": "user", "content": "ping"}]}
+            )
+            listed: Final = owned.gateway.request("GET", "/config/list", params={"config_type": "general_settings"})
+            log: Final = owned.log.read_text()
+
+    assert answer.status_code == 200, answer.text
+    assert listed.status_code == 200, listed.text
+    stored_prompts: Final = next(
+        entry
+        for entry in TypeAdapter(list[dict[str, JsonValue]]).validate_json(listed.content)
+        if entry["field_name"] == "store_prompts_in_spend_logs"
+    )
+    assert (stored_prompts["field_value"], stored_prompts["source"]) == (True, "db")
+    assert "general_settings.enforce_user_param is stored in the database, but the proxy does not apply" in log
diff --git a/tests/integration/cost_calculation/cases/azure.py b/tests/integration/cost_calculation/cases/azure.py
index d9f17c12bda..6495199b8bb 100644
--- a/tests/integration/cost_calculation/cases/azure.py
+++ b/tests/integration/cost_calculation/cases/azure.py
@@ -1588,6 +1588,7 @@ AZURE_PINNED_GPT_5_4_MINI_STREAM: Final = CostTrackingTestCase(
         content_type="text/event-stream",
         frames=(
             'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1,"model":"$MODEL","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":"$MODEL","choices":[{"index":0,"delta":{},"finish_reason":"stop"}]}\n\n',
             'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1,"model":"$MODEL","choices":[],"usage":{"prompt_tokens":1840,"completion_tokens":412,"total_tokens":2252}}\n\n',
             "data: [DONE]\n\n",
         ),
diff --git a/tests/integration/cost_calculation/cases/openai.py b/tests/integration/cost_calculation/cases/openai.py
index bc7fb3486be..270bb6e105d 100644
--- a/tests/integration/cost_calculation/cases/openai.py
+++ b/tests/integration/cost_calculation/cases/openai.py
@@ -7952,6 +7952,7 @@ GPT_5_6_STREAM_USAGE_IN_EMPTY_CHOICES_CHUNK: Final = CostTrackingTestCase(
         frames=(
             'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1789788263,"model":"gpt-5.6","choices":[{"index":0,"delta":{"role":"assistant"},"finish_reason":null}],"usage":null}',
             'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1789788263,"model":"gpt-5.6","choices":[{"index":0,"delta":{"content":"scripted answer"},"finish_reason":null}],"usage":null}',
+            'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1789788263,"model":"gpt-5.6","choices":[{"index":0,"delta":{},"finish_reason":"stop"}],"usage":null}',
             'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1789788263,"model":"gpt-5.6","choices":[],"usage":{"prompt_tokens":1840,"completion_tokens":412,"total_tokens":2252}}',
             "data: [DONE]",
         ),
diff --git a/tests/integration/database/test_prisma_migration_lock.py b/tests/integration/database/test_prisma_migration_lock.py
index 7482e96d3d3..f4a2a022668 100644
--- a/tests/integration/database/test_prisma_migration_lock.py
+++ b/tests/integration/database/test_prisma_migration_lock.py
@@ -19,7 +19,8 @@ def _can_take_prismas_session_lock(connection: psycopg.Connection[tuple[object,
 
 def _granted_advisory_keys(connection: psycopg.Connection[tuple[object, ...]]) -> frozenset[int]:
     rows: Final = connection.execute(
-        "SELECT (classid::bigint << 32) | objid::bigint FROM pg_locks WHERE locktype = 'advisory' AND granted"
+        "SELECT (classid::bigint << 32) | objid::bigint FROM pg_locks WHERE locktype = 'advisory' AND granted "
+        "AND database = (SELECT oid FROM pg_database WHERE datname = current_database())"
     ).fetchall()
     return frozenset(int(row[0]) for row in rows)
 
diff --git a/tests/integration/management/test_agent_management.py b/tests/integration/management/test_agent_management.py
index 5c0fdc68e09..a4c2650ffdd 100644
--- a/tests/integration/management/test_agent_management.py
+++ b/tests/integration/management/test_agent_management.py
@@ -5,12 +5,14 @@ from typing import Final
 from integration._support.client import Gateway, Scenario
 from integration._support.database import read_rows
 from integration._support.wire import Reply, Request, wire_server
-from pydantic import BaseModel, JsonValue
+from pydantic import BaseModel, ConfigDict, JsonValue
 
 _REDACTED: Final = "REDACTED_BY_LITELM"
 
 
 class _AgentRead(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
     agent_id: str
     agent_name: str
     litellm_params: dict[str, JsonValue] | None
@@ -84,7 +86,8 @@ def test_agent_reads_redact_credentials_filter_by_key_permission_and_keep_the_st
         visible: Final = _register_agent(gateway, scenario, marker + "-visible", wire.url, secret)
         hidden: Final = _register_agent(gateway, scenario, marker + "-hidden", wire.url, secret)
         restricted: Final = scenario.key(object_permission={"agents": [visible]})
-        redacted_params: Final = {"api_key": _REDACTED, "cost_per_query": 0.1, "is_public": False}
+        stored_params: Final = {"api_key": _REDACTED, "cost_per_query": 0.1}
+        redacted_params: Final = {**stored_params, "is_public": False}
 
         listed: Final = gateway.client.get("/v1/agents", headers={"Authorization": f"Bearer {restricted}"})
         assert listed.status_code == 200, listed.text
@@ -98,9 +101,8 @@ def test_agent_reads_redact_credentials_filter_by_key_permission_and_keep_the_st
         assert fetched.status_code == 200, fetched.text
         assert secret not in fetched.text, fetched.text
         read: Final = _AgentRead.model_validate_json(fetched.content)
-        assert (read.agent_id, read.litellm_params, read.static_headers) == (visible, redacted_params, None), (
-            fetched.text
-        )
+        assert (read.agent_id, read.static_headers) == (visible, None), fetched.text
+        assert read.litellm_params in (stored_params, redacted_params), fetched.text
 
         refused: Final = gateway.client.get(f"/v1/agents/{hidden}", headers={"Authorization": f"Bearer {restricted}"})
         assert (refused.status_code, refused.json()) == (
diff --git a/tests/integration/management/test_team_delete_large_membership.py b/tests/integration/management/test_team_delete_large_membership.py
index 8b3c6b06bba..2a8508ff3c9 100644
--- a/tests/integration/management/test_team_delete_large_membership.py
+++ b/tests/integration/management/test_team_delete_large_membership.py
@@ -24,6 +24,7 @@ import yaml
 from pydantic import JsonValue
 from redis import Redis
 
+from litellm.constants import TEAM_DELETE_TRANSACTION_TIMEOUT_SECONDS
 from tests.integration._support.client import (
     Gateway,
     Scenario,
@@ -166,19 +167,11 @@ def _remove_team_by_sql(team_id: str) -> None:
     assert _team_rows(team_id) == []
 
 
-def _remove_team_if_present(gateway: Gateway, team_id: str) -> None:
-    """Cleanup for teams the test deletes itself: the API delete first, SQL for anything it leaves."""
-    if not _team_rows(team_id):
-        return
-    gateway.request("POST", "/team/delete", {"team_ids": [team_id]})
-    _remove_team_by_sql(team_id)
-
-
 def _create_team(scenario: Scenario, **fields: JsonValue) -> str:
     """A team the test deletes itself; cleanup only removes it if the test left it behind."""
     created: Final = scenario.gateway.post("/team/new", {"team_alias": f"integration-{uuid.uuid4().hex}", **fields})
     team_id: Final = string_value(created["team_id"])
-    scenario.cleanups.callback(_remove_team_if_present, scenario.gateway, team_id)
+    scenario.cleanups.callback(_remove_team_by_sql, team_id)
     return team_id
 
 
@@ -783,7 +776,9 @@ def test_deleting_a_team_with_more_keys_than_the_publish_cap_revokes_every_key_o
         keys: Final = _seeded_team_keys(team, KEYS_WELL_PAST_THE_PUBLISH_CAP)
         assert _statuses(peer, keys) == {200: len(keys)}
 
-        response: Final = _delete_teams(gateway, [team])
+        response: Final = _post_with_timeout(
+            gateway, "/team/delete", {"team_ids": [team]}, timeout=2 * TEAM_DELETE_TRANSACTION_TIMEOUT_SECONDS
+        )
         assert response.status_code == 200, response.text
         assert read_rows('SELECT token FROM "LiteLLM_VerificationToken" WHERE team_id = %s', (team,)) == []
 
diff --git a/tests/integration/management/test_user_updates_wedged_coordination_redis.py b/tests/integration/management/test_user_updates_wedged_coordination_redis.py
index 2b05d35d553..bb5766e5816 100644
--- a/tests/integration/management/test_user_updates_wedged_coordination_redis.py
+++ b/tests/integration/management/test_user_updates_wedged_coordination_redis.py
@@ -193,8 +193,10 @@ def test_user_budget_updates_return_promptly_while_coordination_redis_is_wedged(
                     timings["s6_customer_update"] = _timed_post(
                         candidate, "/customer/update", {"user_id": customer_id, "max_budget": 6.0}
                     )
-                    assert timings["s6_customer_update"] < _HANDLER_BUDGET_SECONDS, (
-                        f"/customer/update took {timings['s6_customer_update']:.3f}s with a wedged coordination Redis"
+                    assert timings["s6_customer_update"] < _SHORTEST_REDIS_WAIT_SECONDS, (
+                        f"/customer/update took {timings['s6_customer_update']:.3f}s, reaching the "
+                        f"{_SHORTEST_REDIS_WAIT_SECONDS}s shortest wait the proxy puts on Redis, so it waited on the "
+                        "wedged coordination Redis"
                     )
                     timings["s7_reset_spend"] = _timed_post(candidate, f"/key/{key}/reset_spend", {"reset_to": 0})
                     assert timings["s7_reset_spend"] < _HANDLER_BUDGET_SECONDS, (
diff --git a/tests/integration/management/test_vector_store_file_list_managed_ids.py b/tests/integration/management/test_vector_store_file_list_managed_ids.py
index 16d33ee83af..5ef709d7365 100644
--- a/tests/integration/management/test_vector_store_file_list_managed_ids.py
+++ b/tests/integration/management/test_vector_store_file_list_managed_ids.py
@@ -9,6 +9,7 @@ from concurrent.futures import ThreadPoolExecutor
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import partial
+from itertools import count
 from pathlib import Path
 from queue import SimpleQueue
 from types import MappingProxyType
@@ -1042,6 +1043,77 @@ def test_multi_model_upload_maps_only_the_provider_id_the_managed_id_carries(gat
         assert second_ids == ((managed_a,) if carried == second.file_id("a.txt") else (second.file_id("a.txt"),))
 
 
+def _team_wildcard(scenario: Scenario, pattern: str, api_base: str, bearer: str, team: str) -> str:
+    identity: Final = f"wildcard-{uuid.uuid4().hex}"
+    scenario.gateway.post(
+        "/model/new",
+        {
+            "model_name": pattern,
+            "litellm_params": {"model": "openai/*", "api_key": bearer, "api_base": api_base},
+            "model_info": {"id": identity, "team_id": team},
+        },
+    )
+    scenario.cleanups.callback(scenario.delete_model, identity)
+    eventually(lambda: _every_worker_has_deployment(scenario.gateway, identity), lambda served: served, seconds=90)
+    return identity
+
+
+def test_two_targets_served_by_one_team_wildcard_keep_one_upload_that_delete_removes(gateway: Gateway) -> None:
+    store: Final = "vs_" + uuid.uuid4().hex
+    bearer: Final = "provider-key-" + uuid.uuid4().hex[:8]
+    prefix: Final = f"wc-{uuid.uuid4().hex}"
+    upload_numbers: Final = count(1)
+    first_upload: Final = f"file-{prefix}-1"
+    second_upload: Final = f"file-{prefix}-2"
+    served: Final = _provider(store, _constant_listing(store, first_upload))
+
+    def respond(request: Request) -> Reply:
+        if (request.method, urlsplit(request.target).path) != ("POST", "/v1/files"):
+            return served(request)
+        _assert_provider_upload(request, bearer, "a.txt")
+        return _json_reply(_file_object(f"file-{prefix}-{next(upload_numbers)}"))
+
+    with gateway.scenario() as scenario, wire_server(respond) as wire:
+        team: Final = scenario.team(models=[])
+        _team_wildcard(scenario, f"{prefix}/*", f"{wire.url}/v1", bearer, team)
+        key: Final = scenario.key(team_id=team, user_id=scenario.member(team))
+        wire.drain()
+
+        managed: Final = _upload(gateway, key, f"{prefix}/gpt-one,{prefix}/gpt-two", "a.txt")
+        assert _carried_provider_file_id(managed) == first_upload, _decoded(managed)
+        assert [row["flat_model_file_ids"] for row in read_rows(MANAGED_FILE_ROW, (managed,))] == [[first_upload]]
+        eventually(lambda: wire.received.qsize(), lambda received: received >= 3)
+        create_requests: Final = wire.drain()
+        assert [(request.method, request.target) for request in create_requests] == [
+            ("POST", "/v1/files"),
+            ("POST", "/v1/files"),
+            ("DELETE", f"/v1/files/{second_upload}"),
+        ], create_requests
+        assert create_requests[2].headers["authorization"] == f"Bearer {bearer}", create_requests[2].headers
+
+        attached: Final = gateway.request(
+            "POST", f"/v1/vector_stores/{store}/files", {"file_id": managed}, key=key, params={"model": f"{prefix}/*"}
+        )
+        assert attached.status_code == 200, attached.text
+        listed: Final = gateway.request(
+            "GET", f"/v1/vector_stores/{store}/files", key=key, params={"model": f"{prefix}/*"}
+        )
+        assert _ids(_listed(listed)) == (managed,), listed.text
+        attach_bodies: Final = [
+            JSON_OBJECT.validate_json(request.body) for request in wire.drain() if request.method == "POST"
+        ]
+        assert attach_bodies == [{"file_id": first_upload}], attach_bodies
+
+        deleted: Final = gateway.request("DELETE", f"/v1/files/{managed}", key=key)
+        assert deleted.status_code == 200, deleted.text
+        assert read_rows(MANAGED_FILE_ROW, (managed,)) == []
+        delete_requests: Final = wire.drain()
+        assert [(request.method, request.target) for request in delete_requests] == [
+            ("DELETE", f"/v1/files/{first_upload}")
+        ], delete_requests
+        assert delete_requests[0].headers["authorization"] == f"Bearer {bearer}", delete_requests[0].headers
+
+
 def test_deleting_the_managed_file_makes_its_listing_raw_again(gateway: Gateway) -> None:
     with _rig(gateway, "a.txt") as rig:
         member: Final = _member(rig.scenario, rig.model)
diff --git a/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_gateway_wire.py b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_gateway_wire.py
index e159573e9fd..1f57584572b 100644
--- a/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_gateway_wire.py
+++ b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_gateway_wire.py
@@ -97,9 +97,10 @@ def test_shared_gateway_route_is_disabled_without_reaching_provider(gateway: Gat
             headers=_cli_bearer_headers(gateway.key),
         )
         assert response.status_code == 404, response.text
-        assert _JSON_OBJECT.validate_json(response.content) == {"detail": "Claude Code gateway is not enabled"}, (
-            response.text
-        )
+        assert _JSON_OBJECT.validate_json(response.content) == {
+            "type": "error",
+            "error": {"type": "not_found_error", "message": "Claude Code gateway is not enabled"},
+        }, response.text
         assert wire.drain() == ()
 
 
@@ -268,15 +269,15 @@ def test_enabled_gateway_count_tokens_alias_matches_native_count_tokens_route(en
         )
         assert restricted_response.status_code == 403, restricted_response.text
         assert _JSON_OBJECT.validate_json(restricted_response.content) == {
+            "type": "error",
             "error": {
+                "type": "permission_error",
                 "message": (
                     f"The requested model '{restricted_model}' is not available for this API key, or the model name "
                     "is invalid. Check the models available to you and try again."
                 ),
-                "type": "key_model_access_denied",
-                "param": "model",
-                "code": "403",
-            }
+                "litellm_error_type": "key_model_access_denied",
+            },
         }, restricted_response.text
         assert wire.drain() == ()
 
@@ -285,15 +286,15 @@ def test_enabled_gateway_count_tokens_alias_matches_native_count_tokens_route(en
 def test_enabled_gateway_refuses_model_outside_virtual_key(enabled_gateway: Gateway) -> None:
     result: Final = _restricted_model_responses(enabled_gateway)
     expected_body: Final = {
+        "type": "error",
         "error": {
+            "type": "permission_error",
             "message": (
                 f"The requested model '{result[4]}' is not available for this API key, or the model name is invalid. "
                 "Check the models available to you and try again."
             ),
-            "type": "key_model_access_denied",
-            "param": "model",
-            "code": "403",
-        }
+            "litellm_error_type": "key_model_access_denied",
+        },
     }
     assert result[0] == result[2] == 403, (result[1], result[3])
     assert _JSON_OBJECT.validate_json(result[1]) == expected_body, result[1]
diff --git a/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_input_transformations_wire.py b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_input_transformations_wire.py
new file mode 100644
index 00000000000..6b9739def8c
--- /dev/null
+++ b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_input_transformations_wire.py
@@ -0,0 +1,91 @@
+"""Anthropic's ``input_transformations`` report reaches the caller on chat completions and ``/v1/messages``."""
+
+import json
+from typing import Final
+
+import pytest
+from integration._support import claude_code as cc
+from integration._support.client import Gateway
+from integration._support.wire import Reply, Request, wire_server
+from pydantic import JsonValue, TypeAdapter
+
+_BACKEND: Final = "claude-sonnet-4-6"
+_API_KEY: Final = "scripted-anthropic-key"
+_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
+_CHOICES: Final = TypeAdapter(list[dict[str, JsonValue]])
+_INPUT_TRANSFORMATIONS: Final[list[JsonValue]] = [{"type": "prefix_binding_mismatch", "index": 1}]
+_CONTENT: Final[tuple[dict[str, JsonValue], ...]] = ({"type": "text", "text": "Ok"},)
+_USAGE: Final[dict[str, JsonValue]] = {"input_tokens": 8, "output_tokens": 2}
+_IDENTITY: Final = "msg_input_transformations"
+
+
+def _reply_body() -> bytes:
+    body: Final = _JSON_OBJECT.validate_json(cc.message_reply(_IDENTITY, _BACKEND, _CONTENT, _USAGE))
+    return json.dumps({**body, "input_transformations": _INPUT_TRANSFORMATIONS}).encode()
+
+
+def _stream_reply() -> tuple[bytes, ...]:
+    start, *rest = cc.message_stream(_IDENTITY, _BACKEND, _CONTENT, _USAGE)
+    event_name, data = cc.sse_events(start.decode())[0]
+    message: Final = _JSON_OBJECT.validate_python(data["message"])
+    started: Final = cc.sse_frame(
+        event_name, {**data, "message": {**message, "input_transformations": _INPUT_TRANSFORMATIONS}}
+    )
+    return (started, *rest)
+
+
+def _anthropic_upstream(request: Request) -> Reply:
+    assert request.method == "POST" and request.target == "/v1/messages", request.target
+    assert request.headers["x-api-key"] == _API_KEY, request.headers
+    body: Final = _JSON_OBJECT.validate_json(request.body)
+    if body.get("stream") is True:
+        return Reply(content_type="text/event-stream", chunks=_stream_reply())
+    return Reply(body=_reply_body())
+
+
+def test_chat_completion_message_carries_input_transformations(gateway: Gateway) -> None:
+    with wire_server(_anthropic_upstream) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(model=f"anthropic/{_BACKEND}", api_base=wire.url, api_key=_API_KEY)
+        response: Final = gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {"model": model, "max_tokens": 16, "messages": [{"role": "user", "content": "Say ok"}]},
+        )
+        assert response.status_code == 200, response.text
+        message: Final = response.json()["choices"][0]["message"]
+        assert message["provider_specific_fields"]["input_transformations"] == _INPUT_TRANSFORMATIONS, response.text
+
+
+def test_first_chat_completion_chunk_carries_input_transformations(gateway: Gateway) -> None:
+    with wire_server(_anthropic_upstream) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(model=f"anthropic/{_BACKEND}", api_base=wire.url, api_key=_API_KEY)
+        response: Final = gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {"model": model, "max_tokens": 16, "stream": True, "messages": [{"role": "user", "content": "Say ok"}]},
+        )
+        assert response.status_code == 200, response.text
+        chunks: Final = [
+            _JSON_OBJECT.validate_json(line[len("data: ") :])
+            for line in response.text.splitlines()
+            if line.startswith("data: {")
+        ]
+        first_delta: Final = _JSON_OBJECT.validate_python(_CHOICES.validate_python(chunks[0]["choices"])[0]["delta"])
+        assert first_delta["provider_specific_fields"] == {"input_transformations": _INPUT_TRANSFORMATIONS}, chunks[0]
+
+
+@pytest.mark.parametrize("stream", [False, True], ids=["non_stream", "stream"])
+def test_messages_endpoint_keeps_input_transformations(gateway: Gateway, stream: bool) -> None:
+    with wire_server(_anthropic_upstream) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(model=f"anthropic/{_BACKEND}", api_base=wire.url, api_key=_API_KEY)
+        response: Final = gateway.request(
+            "POST",
+            "/v1/messages",
+            {"model": model, "max_tokens": 16, "stream": stream, "messages": [{"role": "user", "content": "Say ok"}]},
+        )
+        assert response.status_code == 200, response.text
+        if stream:
+            started: Final = next(data for name, data in cc.sse_events(response.text) if name == "message_start")
+            assert _JSON_OBJECT.validate_python(started["message"])["input_transformations"] == _INPUT_TRANSFORMATIONS
+        else:
+            assert response.json()["input_transformations"] == _INPUT_TRANSFORMATIONS, response.text
diff --git a/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_safeguards_beta_wire.py b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_safeguards_beta_wire.py
index 3ac1bdb0334..a1c5f6964bf 100644
--- a/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_safeguards_beta_wire.py
+++ b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_safeguards_beta_wire.py
@@ -3,7 +3,7 @@ import json
 import re
 import time
 import uuid
-from collections.abc import Callable, Mapping
+from collections.abc import Callable, Iterator, Mapping
 from dataclasses import dataclass
 from pathlib import Path
 from types import MappingProxyType
@@ -13,7 +13,7 @@ import anthropic
 import httpx
 import openai
 import pytest
-from integration._support.client import Gateway, eventually, object_value
+from integration._support.client import Gateway, eventually, gateway_from_environment, object_value
 from integration._support.database import read_rows
 from integration._support.process import owned_proxy
 from integration._support.vertex import service_account_json
@@ -417,14 +417,31 @@ def test_a_deployment_dropping_context_management_sends_neither_the_field_nor_it
         _spend_row(f"msg_{marker}")
 
 
+@pytest.fixture(scope="module")
+def local_beta_map_gateway(tmp_path_factory: pytest.TempPathFactory) -> Iterator[Gateway]:
+    with (
+        gateway_from_environment() as shared,
+        owned_proxy(
+            shared,
+            tmp_path_factory.mktemp("safeguards-local-beta-map"),
+            {"LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS": "true"},
+        ) as owned,
+    ):
+        yield owned
+
+
 @pytest.mark.parametrize("row", tuple(_FOUNDRY_SHAPES))
-def test_azure_ai_messages_forward_the_mapped_client_betas_beside_the_derived_one(gateway: Gateway, row: str) -> None:
+def test_azure_ai_messages_forward_the_mapped_client_betas_beside_the_derived_one(
+    local_beta_map_gateway: Gateway, row: str
+) -> None:
     case: Final = _FOUNDRY_SHAPES[row]
     marker: Final = uuid.uuid4().hex
-    with wire_server(anthropic_peer) as wire, gateway.scenario() as scenario:
+    with wire_server(anthropic_peer) as wire, local_beta_map_gateway.scenario() as scenario:
         model: Final = scenario.model(model=_FOUNDRY_MODEL, api_base=wire.url, api_key=_FOUNDRY_KEY)
         response: Final = _post(
-            gateway, messages_body(model, marker, safeguards=case.sent, stream=case.stream), beta=case.client_beta
+            local_beta_map_gateway,
+            messages_body(model, marker, safeguards=case.sent, stream=case.stream),
+            beta=case.client_beta,
         )
         if case.stream:
             _assert_streamed(response, marker)
diff --git a/tests/integration/messages_endpoint/providers/anthropic/test_pdf_document_count_tokens_wire.py b/tests/integration/messages_endpoint/providers/anthropic/test_pdf_document_count_tokens_wire.py
index 8eeaab66553..210b754f626 100644
--- a/tests/integration/messages_endpoint/providers/anthropic/test_pdf_document_count_tokens_wire.py
+++ b/tests/integration/messages_endpoint/providers/anthropic/test_pdf_document_count_tokens_wire.py
@@ -199,14 +199,14 @@ def test_utils_token_counter_adds_title_and_context_once_per_document(
 
 
 @pytest.mark.parametrize("label", list(_UNREADABLE))
-def test_utils_token_counter_prices_unreadable_pdf_bytes_like_one_image(
+def test_utils_token_counter_uses_the_same_bounded_fallback_for_unreadable_pdf_bytes(
     gateway: Gateway, provider: SharedProvider, label: str
 ) -> None:
     data: Final = _UNREADABLE[label]
     as_pdf: Final = _local(gateway, provider, [document(base64_source(data))])
-    as_png: Final = _local(gateway, provider, [document(base64_source(data, media_type="image/png"))])
+    fallback: Final = _local(gateway, provider, [document(base64_source(encoded(b"unreadable-document")))])
     without: Final = _local(gateway, provider, [])
-    assert as_pdf == as_png, (as_pdf, as_png)
+    assert as_pdf == fallback, (as_pdf, fallback)
     assert 0 <= as_pdf - without < rendered_tokens((LETTER,)), (as_pdf, without)
 
 
diff --git a/tests/integration/messages_endpoint/test_beta_gated_fields_wire.py b/tests/integration/messages_endpoint/test_beta_gated_fields_wire.py
index 26ad9f20897..fc1e91c79d7 100644
--- a/tests/integration/messages_endpoint/test_beta_gated_fields_wire.py
+++ b/tests/integration/messages_endpoint/test_beta_gated_fields_wire.py
@@ -16,7 +16,8 @@ pytestmark: Final = pytest.mark.shares_worker_state
 
 ANTHROPIC_MODEL: Final = "beta-gated-anthropic"
 FOUNDRY_MODEL: Final = "beta-gated-foundry"
-FOUNDRY_DROP_PARAMS_MODEL: Final = "beta-gated-foundry-drop-params"
+DATABRICKS_MODEL: Final = "beta-gated-databricks"
+DATABRICKS_DROP_PARAMS_MODEL: Final = "beta-gated-databricks-drop-params"
 CLEAR_AT_BETA: Final = "mid-conversation-system-clear-at-2026-08-21"
 _JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
 _NONCE: Final = re.compile(rb"nonce-([0-9a-f]{32})")
@@ -73,7 +74,15 @@ def write_config(directory: Path, wire_url: str) -> Path:
                     deployment(ANTHROPIC_MODEL, "anthropic/claude-opus-4-8", f"{wire_url}/anthropic"),
                     deployment(FOUNDRY_MODEL, "azure_ai/claude-opus-4-8", f"{wire_url}/foundry"),
                     deployment(
-                        FOUNDRY_DROP_PARAMS_MODEL, "azure_ai/claude-opus-4-8", f"{wire_url}/foundry", drop_params=True
+                        DATABRICKS_MODEL,
+                        "databricks/databricks-claude-opus-4-8",
+                        f"{wire_url}/databricks/serving-endpoints",
+                    ),
+                    deployment(
+                        DATABRICKS_DROP_PARAMS_MODEL,
+                        "databricks/databricks-claude-opus-4-8",
+                        f"{wire_url}/databricks/serving-endpoints",
+                        drop_params=True,
                     ),
                 ],
                 "general_settings": {
@@ -150,7 +159,7 @@ def system_message(body: bytes) -> dict[str, JsonValue]:
 
 def test_a_drop_params_leg_whose_row_lacks_the_beta_sends_neither_the_beta_nor_clear_at(rig: Rig) -> None:
     request_nonce: Final = nonce()
-    status, raw = rig.send(FOUNDRY_DROP_PARAMS_MODEL, request_nonce)
+    status, raw = rig.send(DATABRICKS_DROP_PARAMS_MODEL, request_nonce)
     assert reply_text(status, raw) == f"answered {request_nonce.removeprefix('nonce-')}"
     upstream: Final = rig.received(request_nonce)
     assert CLEAR_AT_BETA not in beta_header(upstream.headers), upstream.headers
@@ -159,7 +168,7 @@ def test_a_drop_params_leg_whose_row_lacks_the_beta_sends_neither_the_beta_nor_c
 
 def test_a_leg_whose_row_lacks_the_beta_forwards_clear_at_as_sent_without_drop_params(rig: Rig) -> None:
     request_nonce: Final = nonce()
-    status, raw = rig.send(FOUNDRY_MODEL, request_nonce)
+    status, raw = rig.send(DATABRICKS_MODEL, request_nonce)
     assert reply_text(status, raw) == f"answered {request_nonce.removeprefix('nonce-')}"
     upstream: Final = rig.received(request_nonce)
     assert CLEAR_AT_BETA not in beta_header(upstream.headers), upstream.headers
@@ -170,9 +179,10 @@ def test_a_leg_whose_row_lacks_the_beta_forwards_clear_at_as_sent_without_drop_p
     }
 
 
-def test_a_leg_that_carries_the_beta_forwards_clear_at_untouched(rig: Rig) -> None:
+@pytest.mark.parametrize("model", (ANTHROPIC_MODEL, FOUNDRY_MODEL))
+def test_a_leg_that_carries_the_beta_forwards_clear_at_untouched(rig: Rig, model: str) -> None:
     request_nonce: Final = nonce()
-    status, raw = rig.send(ANTHROPIC_MODEL, request_nonce)
+    status, raw = rig.send(model, request_nonce)
     assert reply_text(status, raw) == f"answered {request_nonce.removeprefix('nonce-')}"
     upstream: Final = rig.received(request_nonce)
     assert CLEAR_AT_BETA in beta_header(upstream.headers), upstream.headers
diff --git a/tests/integration/observability/_logging_only_scope_support.py b/tests/integration/observability/_logging_only_scope_support.py
index 3d29f7ab8c5..3b14c502623 100644
--- a/tests/integration/observability/_logging_only_scope_support.py
+++ b/tests/integration/observability/_logging_only_scope_support.py
@@ -22,7 +22,7 @@ import yaml
 from anthropic import Anthropic, AsyncAnthropic
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
-from integration._support.client import Gateway, Scenario, eventually, object_value
+from integration._support.client import Gateway, Scenario, eventually, object_value, string_value
 from integration._support.database import read_rows, write_rows
 from integration._support.upstream import delete_scenario, register_scenario
 from integration._support.wire import Reply, Request, Wire
@@ -798,6 +798,7 @@ def _insert_database_guardrail(
 
 @contextmanager
 def _database_guardrail(
+    gateway: Gateway,
     identity: str,
     policy_url: str,
     scope: str | None,
@@ -809,11 +810,15 @@ def _database_guardrail(
     try:
         yield
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
 
 
-def _delete_database_guardrail(identity: str) -> None:
-    write_rows('DELETE FROM "LiteLLM_GuardrailsTable" WHERE guardrail_name=%s', (identity,))
+def _delete_database_guardrail(gateway: Gateway, identity: str) -> None:
+    rows: Final = read_rows('SELECT guardrail_id FROM "LiteLLM_GuardrailsTable" WHERE guardrail_name=%s', (identity,))
+    responses: Final = tuple(
+        gateway.request("DELETE", f"/guardrails/{string_value(row['guardrail_id'])}") for row in rows
+    )
+    assert all(response.status_code == 200 for response in responses), [response.text for response in responses]
 
 
 def _post_guardrail_body(
diff --git a/tests/integration/observability/test_cache_hit_guardrail_metrics.py b/tests/integration/observability/test_cache_hit_guardrail_metrics.py
index c52649c46df..13cd2133d4f 100644
--- a/tests/integration/observability/test_cache_hit_guardrail_metrics.py
+++ b/tests/integration/observability/test_cache_hit_guardrail_metrics.py
@@ -253,6 +253,16 @@ def _count(samples: tuple, name: str, model_id: str) -> float:
     )
 
 
+def _deployment_states(rig: Rig) -> tuple[float, ...]:
+    return tuple(
+        sample.value
+        for sample in _metric_samples(rig.candidate, rig.model_name)
+        if sample.name == DEPLOYMENT_STATE
+        and sample.labels.get("model_id") == rig.deployment_id
+        and sample.labels.get("api_base") == rig.provider.url + "/v1"
+    )
+
+
 def _populated_failures(samples: tuple, rig: Rig, api_provider: str) -> float:
     return float(
         sum(
@@ -558,7 +568,8 @@ def test_cache_hit_post_call_guardrail_outage_keeps_deployment_labels(
         )
         assert reject.status_code >= 400, reject.text
         assert rig.provider.received.qsize() == 1, rig.provider.drain()
-        _expect_metrics(rig, 0, 0, pf_populated=1, pf_blank=0)
+        _expect_metrics(rig, 1, 0)
+        _assert_spend(_call_id(reject), rig)
 
 
 def test_two_identical_cache_hit_rejects_increment_populated_series(gateway: Gateway, tmp_path: Path) -> None:
@@ -635,6 +646,7 @@ def test_cache_hit_reject_deployment_metric_set_diff(gateway: Gateway, tmp_path:
         text: Final = "cache hit control e4 " + marker
         warm: Final = rig.candidate.request("POST", "/v1/chat/completions", _chat_body(rig.model_name, text, None))
         assert warm.status_code == 200, warm.text
+        eventually(lambda: _deployment_states(rig), lambda states: states == (0.0,))
         reject: Final = rig.candidate.request(
             "POST", "/v1/chat/completions", _chat_body(rig.model_name, text, rig.guardrail_name)
         )
@@ -642,11 +654,4 @@ def test_cache_hit_reject_deployment_metric_set_diff(gateway: Gateway, tmp_path:
         samples: Final = _expect_metrics(rig, 1, 0)
         blank: Final = tuple(sample for sample in samples if sample.labels.get("model_id") == "")
         assert blank == (), blank
-        states: Final = tuple(
-            sample.value
-            for sample in samples
-            if sample.name == DEPLOYMENT_STATE
-            and sample.labels.get("model_id") == rig.deployment_id
-            and sample.labels.get("api_base") == ""
-        )
-        assert states == (1.0,), states
+        eventually(lambda: _deployment_states(rig), lambda states: states == (1.0,))
diff --git a/tests/integration/observability/test_langfuse_otel_metadata_chaos.py b/tests/integration/observability/test_langfuse_otel_metadata_chaos.py
index bb386f6d41e..15bc076b8ba 100644
--- a/tests/integration/observability/test_langfuse_otel_metadata_chaos.py
+++ b/tests/integration/observability/test_langfuse_otel_metadata_chaos.py
@@ -107,9 +107,11 @@ def test_langfuse_otel_sink_outage_mid_burst_lands_every_response_id_once(gatewa
                     )
                 payloads: Final = tuple(json.loads(line) for line in events)
                 found: Final = next(
-                    payload.get("response_id") or (payload.get("message") or {}).get("id") or payload.get("id")
+                    (payload.get("response") or {}).get("id")
+                    or (payload.get("message") or {}).get("id")
+                    or payload.get("id")
                     for payload in payloads
-                    if payload.get("response_id") or payload.get("message") or payload.get("id")
+                    if payload.get("response") or payload.get("message") or payload.get("id")
                 )
                 return str(found)
             response: Final = rig.candidate.client.post(path, json=body, headers={"Authorization": f"Bearer {key}"})
diff --git a/tests/integration/observability/test_langfuse_otel_metadata_clients.py b/tests/integration/observability/test_langfuse_otel_metadata_clients.py
index c2e0573b48a..fd2b9758449 100644
--- a/tests/integration/observability/test_langfuse_otel_metadata_clients.py
+++ b/tests/integration/observability/test_langfuse_otel_metadata_clients.py
@@ -162,8 +162,13 @@ def test_langfuse_otel_metadata_reaches_langfuse_for_responses_sse_stream(gatewa
                 for line in stream.iter_lines()
                 if line.startswith("data: ") and line != "data: [DONE]"
             )
-        response_id: Final = next(
-            event["response_id"] for event in events if event.get("type") == "response.output_text.delta"
+        advertised: Final = frozenset(
+            event["response"]["id"]
+            for event in events
+            if event.get("type") in ("response.created", "response.completed")
         )
+        assert len(advertised) == 1, events
+        response_id: Final = next(iter(advertised))
         attrs: Final = exported_llm_span(rig.collector, response_id)
+        assert attrs["gen_ai.response.id"] == response_id, attrs
         assert_identity(attrs, chat_identity_fields(identity))
diff --git a/tests/integration/observability/test_logging_only_scope_config.py b/tests/integration/observability/test_logging_only_scope_config.py
index 0841c91f8ca..ea524c15c92 100644
--- a/tests/integration/observability/test_logging_only_scope_config.py
+++ b/tests/integration/observability/test_logging_only_scope_config.py
@@ -115,7 +115,7 @@ def test_G7_database_invalid_scope_reads_preserve_pre_call_blocking(gateway: Gat
                     assert blocked_response.status_code == 400, blocked_response.text
                     assert _upstream_requests(gateway.upstream_url) == ()
             finally:
-                _delete_database_guardrail(identity)
+                _delete_database_guardrail(gateway, identity)
     finally:
         delete_scenario(upstream_handle)
 
@@ -678,7 +678,7 @@ def test_database_guardrail_load_keeps_pre_call_blocking(
                             for entry in entries
                         ) == ((identity, "pre_call", "guardrail_intervened"),), entries
                 finally:
-                    _delete_database_guardrail(identity)
+                    _delete_database_guardrail(gateway, identity)
     finally:
         delete_scenario(upstream_handle)
 
@@ -799,7 +799,7 @@ def test_G6_database_guardrail_polling_normalizes_invalid_scope_without_reinitia
                             ) == ((identity, "pre_call", "guardrail_intervened"),), (call_id, entries)
                         assert _upstream_requests(gateway.upstream_url) == ()
                 finally:
-                    _delete_database_guardrail(identity)
+                    _delete_database_guardrail(gateway, identity)
     finally:
         delete_scenario(upstream_handle)
 
@@ -952,7 +952,7 @@ def test_management_post_validates_logging_only_scope(
                 assert isinstance(after_list, list), after_list
                 assert identity not in {object_value(item)["guardrail_name"] for item in after_list}, after_list
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
 
 
 def test_H5_management_put_rejection_preserves_database_and_runtime(gateway: Gateway, tmp_path: Path) -> None:
@@ -1074,7 +1074,7 @@ def test_H5_management_put_rejection_preserves_database_and_runtime(gateway: Gat
                         for entry in entries
                     ) == ((identity, "pre_call", "guardrail_intervened"),), (call_id, entries)
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
         delete_scenario(upstream_handle)
 
 
@@ -1153,7 +1153,7 @@ def test_H6_management_patch_clears_scope_when_switching_to_blocking_only_mode(
                     for entry in entries
                 ) == ((identity, ("pre_call",), "guardrail_intervened"),), entries
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
         delete_scenario(upstream_handle)
 
 
@@ -1240,7 +1240,7 @@ def test_H7_management_patch_rejection_preserves_pre_call_guardrail(gateway: Gat
                         for entry in entries
                     ) == ((identity, "pre_call", "guardrail_intervened"),), (call_id, entries)
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
         delete_scenario(upstream_handle)
 
 
@@ -1331,7 +1331,7 @@ def test_management_patch_default_on_heals_stored_scope(
                             for entry in entries
                         ) == ((identity, "pre_call", "guardrail_intervened"),), entries
                 finally:
-                    _delete_database_guardrail(identity)
+                    _delete_database_guardrail(gateway, identity)
     finally:
         delete_scenario(upstream_handle)
 
@@ -1429,7 +1429,7 @@ def test_H10_management_patch_null_scope_restores_both_directions(gateway: Gatew
                     (identity, "logging_only", "guardrail_intervened"),
                 ), entries
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
         delete_scenario(upstream_handle)
 
 
@@ -1517,7 +1517,7 @@ def test_H11_management_patch_same_scope_is_idempotent_and_output_only(gateway:
                     (entry["guardrail_name"], entry["guardrail_mode"], entry["guardrail_status"]) for entry in entries
                 ) == tuple((identity, "logging_only", "guardrail_intervened") for _ in expected_directions), entries
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
         delete_scenario(upstream_handle)
 
 
@@ -1550,7 +1550,7 @@ def test_H12_management_reads_expose_typed_logging_only_scope(gateway: Gateway,
             assert object_value(info["litellm_params"])["logging_only_scope"] == "input", info
             assert object_value(matches[0]["litellm_params"])["logging_only_scope"] == "input", matches
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
 
 
 def test_H13_unauthenticated_management_and_chat_requests_do_not_scan(gateway: Gateway, tmp_path: Path) -> None:
@@ -1629,7 +1629,7 @@ def test_K1_post_rejects_continue_flag_outside_logging_only(gateway: Gateway, tm
             assert after_list == before_list, (before_list, after_list)
             assert identity not in {object_value(item)["guardrail_name"] for item in after_list}, after_list
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
 
 
 def test_K3_patch_flag_rejection_preserves_raw_stored_row(gateway: Gateway, tmp_path: Path) -> None:
@@ -1675,7 +1675,7 @@ def test_K3_patch_flag_rejection_preserves_raw_stored_row(gateway: Gateway, tmp_
             } == {key: after_params[key] for key in after_params if key != "api_key"}, (before_params, after_params)
             assert str(after_params["api_key"]).startswith("litellm_enc::"), after_params
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
 
 
 def test_K4_patch_dropping_logging_only_mode_clears_stored_flag(gateway: Gateway, tmp_path: Path) -> None:
@@ -1713,7 +1713,7 @@ def test_K4_patch_dropping_logging_only_mode_clears_stored_flag(gateway: Gateway
             assert params.get("logging_only_continue_on_input_failure") is None, persisted
             assert params["mode"] == ["pre_call"], persisted
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
 
 
 def test_K5_yaml_flag_on_blocking_guardrail_boots_and_keeps_blocking(gateway: Gateway, tmp_path: Path) -> None:
@@ -1759,5 +1759,5 @@ def test_K5_yaml_flag_on_blocking_guardrail_boots_and_keeps_blocking(gateway: Ga
                     log_text: Final = owned.log.read_text()
                     assert "Ignoring logging_only_continue_on_input_failure" in log_text, log_text
     finally:
-        _delete_database_guardrail(identity)
+        _delete_database_guardrail(gateway, identity)
         delete_scenario(upstream_handle)
diff --git a/tests/integration/observability/test_logging_only_scope_runtime.py b/tests/integration/observability/test_logging_only_scope_runtime.py
index 8da26f20eae..271d8d0e24d 100644
--- a/tests/integration/observability/test_logging_only_scope_runtime.py
+++ b/tests/integration/observability/test_logging_only_scope_runtime.py
@@ -1098,7 +1098,7 @@ def test_X2_scope_patch_toggles_during_concurrent_requests_keep_one_scan_per_res
         with wire_server(policy) as edge:
             config: Final = _empty_proxy_configuration(tmp_path, identity)
             with (
-                _database_guardrail(identity, edge.url, "output", mode="logging_only"),
+                _database_guardrail(gateway, identity, edge.url, "output", mode="logging_only"),
                 owned_proxy(gateway, tmp_path, {}, config=config, workers=1) as candidate,
             ):
                 guardrails: Final = candidate.get("/v2/guardrails/list")["guardrails"]
diff --git a/tests/integration/observability/test_otel_conversation_id.py b/tests/integration/observability/test_otel_conversation_id.py
index d7f4de2961b..cd095991e53 100644
--- a/tests/integration/observability/test_otel_conversation_id.py
+++ b/tests/integration/observability/test_otel_conversation_id.py
@@ -1,5 +1,4 @@
 import asyncio
-import base64
 import json
 import re
 import signal
@@ -118,17 +117,6 @@ def _responses_reply(identity: str, stream: bool) -> Reply:
     )
 
 
-def _decoded_responses_id(identity: str) -> str:
-    try:
-        return base64.b64decode(identity.removeprefix("resp_").encode()).decode()
-    except (ValueError, UnicodeDecodeError):
-        return identity
-
-
-def _canonical_id(identity: str) -> str:
-    return _decoded_responses_id(identity).rpartition("response_id:")[2]
-
-
 def _sse_events(text: str) -> tuple[dict[str, JsonValue], ...]:
     return tuple(
         json.loads(line[6:]) for line in text.splitlines() if line.startswith("data: ") and line != "data: [DONE]"
@@ -170,8 +158,7 @@ class Collector:
         return tuple(
             attributes
             for attributes in self.attributes()
-            if isinstance(logged := attributes.get("gen_ai.response.id", {}).get("stringValue"), str)
-            and _canonical_id(logged) == _canonical_id(response_id)
+            if attributes.get("gen_ai.response.id", {}).get("stringValue") == response_id
         )
 
     def conversation_ids(self, response_id: str) -> tuple[str | None, ...]:
@@ -183,10 +170,6 @@ class Collector:
     def single_span(self, response_id: str) -> str | None:
         return eventually(lambda: self.conversation_ids(response_id), lambda values: len(values) == 1, seconds=30)[0]
 
-    def logged_id(self, response_id: str) -> str:
-        spans: Final = eventually(lambda: self.spans(response_id), lambda values: len(values) == 1, seconds=30)
-        return str(spans[0]["gen_ai.response.id"]["stringValue"])
-
 
 @pytest.fixture(scope="session")
 def collector() -> Iterator[Collector]:
@@ -437,12 +420,13 @@ def test_responses_stream_raw_metadata_session_id_lands_as_conversation_id(rig:
     completed: Final = tuple(event for event in events if event["type"] == "response.completed")
     assert len(completed) == 1, events
     assert completed[0]["response"]["output"][0]["id"] == f"msg_resp_{marker}", completed
-    assert str(completed[0]["response"]["id"]).startswith("resp_"), completed
+    client_id: Final = str(completed[0]["response"]["id"])
+    assert client_id.startswith("resp_"), completed
     assert rig.upstream_bodies(marker) == (
         {"model": "gpt-4o-mini", "input": marker, "metadata": {"session_id": session}, "stream": True},
     )
-    assert rig.sink.single_span(f"resp_{marker}") == session
-    assert rig.spend_session(rig.sink.logged_id(f"resp_{marker}")) == session
+    assert rig.sink.single_span(client_id) == session
+    assert rig.spend_session(client_id) == session
 
 
 @pytest.mark.covers("other.observability.otel.conversation_id_from_metadata_chat_raw")
@@ -689,15 +673,11 @@ def _burst(rig: Rig, count: int, session_for: Mapping[int, str]) -> tuple[tuple[
         return tuple(pool.map(one, range(count)))
 
 
-def _is_encrypted_responses_id(identity: str) -> bool:
-    return identity.startswith("resp_") and _decoded_responses_id(identity) == identity
-
-
 def _landed(rig: Rig, expected: Mapping[str, str]) -> dict[str, tuple[str, ...]]:
     spans: Final = rig.sink.attributes()
     return {
         session: tuple(
-            _canonical_id(str(attributes["gen_ai.response.id"]["stringValue"]))
+            str(attributes["gen_ai.response.id"]["stringValue"])
             for attributes in spans
             if attributes.get(CONVERSATION, {}).get("stringValue") == session and "gen_ai.response.id" in attributes
         )
@@ -707,21 +687,13 @@ def _landed(rig: Rig, expected: Mapping[str, str]) -> dict[str, tuple[str, ...]]
 
 def _assert_exactly_once(rig: Rig, expected: Mapping[str, str], landed: Mapping[str, tuple[str, ...]]) -> None:
     spend: Final = eventually(
-        lambda: {
-            session: tuple(_canonical_id(identity) for identity in rig.spend_request_ids(session))
-            for session in expected.values()
-        },
+        lambda: {session: rig.spend_request_ids(session) for session in expected.values()},
         lambda rows: all(len(values) >= 1 for values in rows.values()),
         seconds=70,
     )
     assert landed == spend, (landed, spend)
     assert all(len(values) == 1 for values in landed.values()), landed
-    caller_visible: Final = {
-        session: (_canonical_id(identity),)
-        for identity, session in expected.items()
-        if not _is_encrypted_responses_id(identity)
-    }
-    assert {session: landed[session] for session in caller_visible} == caller_visible, landed
+    assert landed == {session: (identity,) for identity, session in expected.items()}, landed
 
 
 @pytest.mark.covers("other.observability.otel.conversation_id_sink_outage_recovers_exactly_once")
diff --git a/tests/integration/observability/test_prometheus_provider_auth_failure.py b/tests/integration/observability/test_prometheus_provider_auth_failure.py
index 13d264ca6b0..de1f19bc523 100644
--- a/tests/integration/observability/test_prometheus_provider_auth_failure.py
+++ b/tests/integration/observability/test_prometheus_provider_auth_failure.py
@@ -995,7 +995,7 @@ def _gated(gateway: Gateway, cell: str, key: str | None) -> httpx.Response:
 
 
 def recorded_before(cell: str) -> list[tuple[str, str, str, float]]:
-    if cell in ("invalid-key", "expired-key"):
+    if cell in ("invalid-key", "missing-key", "expired-key", "blocked-key"):
         return []
     return sorted([(FAILURES, "", "", 1.0), (TOTALS, "", "", 1.0), (LLM_FAILED, identity(cell), "", 1.0)])
 
@@ -1020,7 +1020,9 @@ def test_a_request_the_proxy_rejects_itself_never_marks_the_deployment_down_and_
         assert response.status_code == (403 if cell == "no-model-access" else 401), response.text
         assert rig.upstream.drain() == ()
         samples: Final = until(rig.gateway, PROXY_FAILED, requested_model=name(cell))
+        assert values(samples, PROXY_FAILED, requested_model=name(cell)) == [1.0], recorded(samples)
         assert deployment_rows(samples, cell) == recorded_before(cell), recorded(samples, requested_model=name(cell))
+        assert values(samples, STATE, model_id=identity(cell)) == [], recorded(samples)
 
 
 def test_a_key_rate_limit_rejected_at_the_proxy_is_still_counted_as_before(rig: Rig) -> None:
diff --git a/tests/integration/observability/test_signoz_delivery.py b/tests/integration/observability/test_signoz_delivery.py
index e25126e4fa8..93539d7641b 100644
--- a/tests/integration/observability/test_signoz_delivery.py
+++ b/tests/integration/observability/test_signoz_delivery.py
@@ -1,5 +1,4 @@
 import asyncio
-import base64
 import json
 import re
 import signal
@@ -9,7 +8,6 @@ from collections import deque
 from collections.abc import Iterator, Mapping, Sequence
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
-from functools import partial
 from pathlib import Path
 from typing import Final
 
@@ -137,17 +135,6 @@ def _upstream(request: Request) -> Reply:
     return _chat_reply(f"chatcmpl-{marker}", stream)
 
 
-def _decoded_responses_id(identity: str) -> str:
-    try:
-        return base64.b64decode(identity.removeprefix("resp_").encode()).decode()
-    except (ValueError, UnicodeDecodeError):
-        return identity
-
-
-def _canonical_id(identity: str) -> str:
-    return _decoded_responses_id(identity).rpartition("response_id:")[2]
-
-
 def _sse_events(text: str) -> tuple[dict[str, JsonValue], ...]:
     return tuple(
         object_value(JSON.validate_json(line[6:]))
@@ -232,8 +219,7 @@ class Collector:
         return tuple(
             span
             for span in self.spans()
-            if RESPONSE_ID in span.attributes
-            and _canonical_id(span.attributes[RESPONSE_ID]) == _canonical_id(response_id)
+            if RESPONSE_ID in span.attributes and span.attributes[RESPONSE_ID] == response_id
         )
 
     def single_span(self, response_id: str, *, elsewhere: "Collector | None" = None) -> Span:
@@ -249,11 +235,8 @@ class Collector:
     def landed(self, response_ids: Sequence[str]) -> dict[str, int]:
         spans: Final = self.spans()
         return {
-            _canonical_id(identity): sum(
-                1
-                for span in spans
-                if RESPONSE_ID in span.attributes
-                and _canonical_id(span.attributes[RESPONSE_ID]) == _canonical_id(identity)
+            identity: sum(
+                1 for span in spans if RESPONSE_ID in span.attributes and span.attributes[RESPONSE_ID] == identity
             )
             for identity in response_ids
         }
@@ -448,7 +431,7 @@ def _assert_operator_span(rig: Rig, response_id: str, marker: str) -> Span:
     span: Final = rig.sink.single_span(response_id)
     assert span.target == "/v1/traces", span
     assert span.ingestion_key == OPERATOR_KEY, span
-    assert rig.tenant_sink.landed((response_id,)) == {_canonical_id(response_id): 0}
+    assert rig.tenant_sink.landed((response_id,)) == {response_id: 0}
     bodies: Final = rig.upstream_bodies(marker)
     assert len(bodies) == 1, bodies
     assert "signoz" not in json.dumps(bodies[0]).replace(marker, ""), bodies[0]
@@ -522,7 +505,7 @@ def test_responses_stream_raw_httpx_span_lands_once_after_the_stream_is_consumed
     marker: Final = _marker()
     response: Final = rig.proxy.request("POST", "/v1/responses", {"model": rig.model, "input": marker, "stream": True})
     assert response.status_code == 200, response.text
-    _assert_operator_span(rig, _responses_id(response, marker), marker)
+    _assert_operator_span(rig, _responses_id(response), marker)
 
 
 def test_v2_flag_on_still_delivers_the_operator_span_with_the_ingestion_key(v2_rig: Rig) -> None:
@@ -821,7 +804,7 @@ def _chat_id(response: httpx.Response) -> str:
     return next(iter(identities))
 
 
-def _responses_id(response: httpx.Response, marker: str) -> str:
+def _responses_id(response: httpx.Response) -> str:
     if not _is_event_stream(response):
         return _body_id(response)
     completed: Final = tuple(
@@ -830,7 +813,7 @@ def _responses_id(response: httpx.Response, marker: str) -> str:
         if event.get("type") == "response.completed"
     )
     assert len(completed) == 1 and completed[0].startswith("resp_"), response.text
-    return f"resp_{marker}"
+    return completed[0]
 
 
 def _message_id(response: httpx.Response) -> str:
@@ -852,7 +835,7 @@ def _burst(rig: Rig, count: int) -> tuple[tuple[int, str, str | None], ...]:
         stream: Final = index % 2 == 0
         path, body, identity_of = (
             ("/v1/chat/completions", {"model": rig.model, "messages": [{"role": "user", "content": marker}]}, _chat_id),
-            ("/v1/responses", {"model": rig.model, "input": marker}, partial(_responses_id, marker=marker)),
+            ("/v1/responses", {"model": rig.model, "input": marker}, _responses_id),
             (
                 "/v1/messages",
                 {"model": rig.model, "max_tokens": 16, "messages": [{"role": "user", "content": marker}]},
@@ -874,8 +857,8 @@ def _assert_exactly_once(rig: Rig, identities: Sequence[str]) -> None:
     landed: Final = eventually(
         lambda: rig.sink.landed(identities), lambda seen: all(count >= 1 for count in seen.values()), seconds=80
     )
-    assert landed == {_canonical_id(identity): 1 for identity in identities}, landed
-    charged: Final = frozenset(identity for identity in identities if not identity.startswith("resp_"))
+    assert landed == {identity: 1 for identity in identities}, landed
+    charged: Final = frozenset(identities)
     spend: Final = eventually(
         lambda: read_rows(
             'SELECT request_id FROM "LiteLLM_SpendLogs" WHERE request_id = ANY(%s::text[])',
diff --git a/tests/integration/pricing/test_price_data_reload_prices.py b/tests/integration/pricing/test_price_data_reload_prices.py
index 0aa3a3bcba2..a91f5cba1ad 100644
--- a/tests/integration/pricing/test_price_data_reload_prices.py
+++ b/tests/integration/pricing/test_price_data_reload_prices.py
@@ -284,7 +284,7 @@ def _charged_as_listed(proxy: Gateway, deployment: _Deployment, scale: float) ->
     assert _listed_rates(proxy, deployment.name) == _expected_listing(rates), deployment.name
     request_id, charged = _billed(proxy.client, proxy.key, deployment)
     expected: Final = _expected_cost(rates, deployment.usage)
-    assert charged == (None if rates is None else pytest.approx(expected, rel=1e-6)), deployment.name
+    assert charged == pytest.approx(expected, rel=1e-6), deployment.name
     return _Charge(request_id=request_id, expected=expected)
 
 
diff --git a/tests/integration/providers/test_anthropic_refusal_stop_details_wire.py b/tests/integration/providers/test_anthropic_refusal_stop_details_wire.py
index c9a85545d8b..8774d590b37 100644
--- a/tests/integration/providers/test_anthropic_refusal_stop_details_wire.py
+++ b/tests/integration/providers/test_anthropic_refusal_stop_details_wire.py
@@ -201,20 +201,27 @@ def _marker() -> str:
     return uuid.uuid4().hex
 
 
+def _bedrock_invoke_deployment(
+    scenario: Scenario, wire_url: str, model_info: Mapping[str, JsonValue] | None = None
+) -> str:
+    return scenario.model(
+        model=f"bedrock/invoke/{BEDROCK_MODEL}",
+        model_info=model_info,
+        api_base=wire_url,
+        aws_access_key_id="AKIASCRIPTEDPROVIDER",
+        aws_secret_access_key="scripted-secret",
+        aws_region_name="us-east-1",
+        aws_bedrock_runtime_endpoint=wire_url,
+    )
+
+
 def _deployment(scenario: Scenario, provider: Provider, rig: Rig) -> str:
     wire_url: Final = rig.wire.url
     match provider:
         case "anthropic":
             return scenario.model(model=f"anthropic/{MODEL}", api_base=wire_url, api_key=_ANTHROPIC_KEY)
         case "bedrock_invoke":
-            return scenario.model(
-                model=f"bedrock/invoke/{BEDROCK_MODEL}",
-                api_base=wire_url,
-                aws_access_key_id="AKIASCRIPTEDPROVIDER",
-                aws_secret_access_key="scripted-secret",
-                aws_region_name="us-east-1",
-                aws_bedrock_runtime_endpoint=wire_url,
-            )
+            return _bedrock_invoke_deployment(scenario, wire_url)
         case "claude_platform":
             return scenario.model(
                 model=f"bedrock/claude_platform/{MODEL}",
@@ -1184,7 +1191,7 @@ def test_stream_cache_hit_skips_cached_provider_fields_that_are_not_an_object(ri
         assert tuple(_message_fields(event["response"]) for event in stale_logs) == ((),) * len(stale_logs), stale_logs
 
 
-JsonModeRoute: TypeAlias = Literal["anthropic_native", "anthropic_tool", "bedrock_invoke"]
+JsonModeRoute: TypeAlias = Literal["anthropic_native", "anthropic_tool", "bedrock_invoke_native", "bedrock_invoke_tool"]
 _UNMAPPED_MODEL: Final = "claude-scripted-9"
 _JSON_ANSWER: Final = json.dumps({"answer": DOCS_PARTIAL_TEXT})
 
@@ -1216,11 +1223,20 @@ _JSON_MODE_CASES: Final[Mapping[str, JsonModeCase]] = {
     "anthropic_tool_enveloped": JsonModeCase(
         "anthropic_tool", "jsonheld", ENVELOPED_PARTIAL_JSON, _JSON_ANSWER, "content_filter", "stop", "json_tool"
     ),
+    "bedrock_invoke_native": JsonModeCase(
+        "bedrock_invoke_native",
+        "partial",
+        DOCS_PARTIAL_TEXT,
+        DOCS_PARTIAL_TEXT,
+        "content_filter",
+        "content_filter",
+        "native",
+    ),
     "bedrock_invoke_declared": JsonModeCase(
-        "bedrock_invoke", "jsontool", DECLARED_PARTIAL_JSON, _JSON_ANSWER, "content_filter", "stop", "json_tool"
+        "bedrock_invoke_tool", "jsontool", DECLARED_PARTIAL_JSON, _JSON_ANSWER, "content_filter", "stop", "json_tool"
     ),
     "bedrock_invoke_enveloped": JsonModeCase(
-        "bedrock_invoke", "jsonheld", ENVELOPED_PARTIAL_JSON, _JSON_ANSWER, "content_filter", "stop", "json_tool"
+        "bedrock_invoke_tool", "jsonheld", ENVELOPED_PARTIAL_JSON, _JSON_ANSWER, "content_filter", "stop", "json_tool"
     ),
 }
 
@@ -1234,8 +1250,15 @@ def _json_mode_deployment(scenario: Scenario, route: JsonModeRoute, rig: Rig) ->
                 scenario.model(model=f"anthropic/{_UNMAPPED_MODEL}", api_base=rig.wire.url, api_key=_ANTHROPIC_KEY),
                 "anthropic",
             )
-        case "bedrock_invoke":
+        case "bedrock_invoke_native":
             return _deployment(scenario, "bedrock_invoke", rig), "bedrock_invoke"
+        case "bedrock_invoke_tool":
+            return (
+                _bedrock_invoke_deployment(
+                    scenario, rig.wire.url, {"supports_bedrock_native_structured_output": False}
+                ),
+                "bedrock_invoke",
+            )
 
 
 def _requested_format(body: Mapping[str, JsonValue]) -> tuple[bool, bool]:
diff --git a/tests/integration/providers/test_azure_ai_claude_messages_wire.py b/tests/integration/providers/test_azure_ai_claude_messages_wire.py
index c150de7520b..d39c6d2d2c1 100644
--- a/tests/integration/providers/test_azure_ai_claude_messages_wire.py
+++ b/tests/integration/providers/test_azure_ai_claude_messages_wire.py
@@ -1,10 +1,12 @@
+from collections.abc import Iterator
 from typing import Final
 
 import anthropic
 import pytest
 from anthropic.types import Message
 from integration._support import claude_code as cc
-from integration._support.client import Gateway
+from integration._support.client import Gateway, gateway_from_environment
+from integration._support.process import owned_proxy
 from integration._support.wire import Reply, Request, wire_server
 from pydantic import JsonValue, TypeAdapter
 
@@ -144,8 +146,23 @@ def test_azure_ai_claude_messages_preserves_target_auth_beta_and_typed_response(
         assert _JSON_OBJECT.validate_json(provider_request.body) == expected_provider_body, provider_request.body
 
 
+@pytest.fixture(scope="module")
+def local_beta_map_gateway(tmp_path_factory: pytest.TempPathFactory) -> Iterator[Gateway]:
+    with (
+        gateway_from_environment() as shared,
+        owned_proxy(
+            shared,
+            tmp_path_factory.mktemp("azure-ai-local-beta-map"),
+            {"LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS": "true"},
+        ) as owned,
+    ):
+        yield owned
+
+
 @pytest.mark.parametrize("stream", [False, True], ids=["non_stream", "stream"])
-def test_azure_ai_claude_messages_filters_auto_injected_betas_by_azure_support(gateway: Gateway, stream: bool) -> None:
+def test_azure_ai_claude_messages_forwards_the_auto_injected_betas_azure_accepts(
+    local_beta_map_gateway: Gateway, stream: bool
+) -> None:
     identity: Final = f"msg_azure_claude_beta_filter_{stream}"
     api_path: Final = "/anthropic/v1/messages"
     reply_body: Final = cc.message_reply(identity, _BACKEND, _CONTENT, _USAGE)
@@ -172,7 +189,7 @@ def test_azure_ai_claude_messages_filters_auto_injected_betas_by_azure_support(g
         "context_management": context_management,
     }
     expected_provider_body: Final = {**request_body_template, "model": _BACKEND}
-    expected_beta: Final = "structured-outputs-2025-11-13"
+    expected_beta: Final = "compact-2026-01-12,structured-outputs-2025-11-13"
 
     def respond(request: Request) -> Reply:
         assert request.method == "POST" and request.target == api_path, request.target
@@ -185,7 +202,7 @@ def test_azure_ai_claude_messages_filters_auto_injected_betas_by_azure_support(g
             return Reply(content_type="text/event-stream", chunks=stream_reply)
         return Reply(body=reply_body)
 
-    with wire_server(respond) as wire, gateway.scenario() as scenario:
+    with wire_server(respond) as wire, local_beta_map_gateway.scenario() as scenario:
         model: Final = scenario.model(
             model=f"azure_ai/{_BACKEND}",
             api_base=wire.url,
@@ -193,8 +210,8 @@ def test_azure_ai_claude_messages_filters_auto_injected_betas_by_azure_support(g
             num_retries=0,
         )
         with anthropic.Anthropic(
-            api_key=gateway.key,
-            base_url=str(gateway.client.base_url),
+            api_key=local_beta_map_gateway.key,
+            base_url=str(local_beta_map_gateway.client.base_url),
             max_retries=0,
         ) as client:
             if stream:
diff --git a/tests/integration/providers/test_bedrock_converse_missing_content_wire.py b/tests/integration/providers/test_bedrock_converse_missing_content_wire.py
index 3baeebcd74a..1f3bded035b 100644
--- a/tests/integration/providers/test_bedrock_converse_missing_content_wire.py
+++ b/tests/integration/providers/test_bedrock_converse_missing_content_wire.py
@@ -547,7 +547,7 @@ def test_r21_responses_stream_input_item_without_content_after_an_assistant_item
         assert received["messages"] == [_CONVERSE_QUESTION, _CONVERSE_ANSWERED], received
         (row,) = _success_rows(marker, 1)
         assert row["call_type"] == "aresponses" and row["end_user"] == marker, row
-        assert row["request_id"] == _inner_response_id(str(completed["response"]["id"])), (row, completed)
+        assert row["request_id"] == str(completed["response"]["id"]), (row, completed)
 
 
 def test_r22_passthrough_converse_forwards_a_message_without_content_verbatim(gateway: Gateway) -> None:
diff --git a/tests/integration/providers/test_bedrock_converse_stream_event_frames_wire.py b/tests/integration/providers/test_bedrock_converse_stream_event_frames_wire.py
index a1432ffd7a0..19aa11a8e36 100644
--- a/tests/integration/providers/test_bedrock_converse_stream_event_frames_wire.py
+++ b/tests/integration/providers/test_bedrock_converse_stream_event_frames_wire.py
@@ -1,7 +1,6 @@
 import asyncio
 import base64
 import json
-import os
 import re
 import threading
 import uuid
@@ -26,8 +25,6 @@ from integration._support.upstream import _aws_event_frame, aws_event_stream_fra
 from integration._support.wire import Reply, Request, Wire, wire_server
 from pydantic import JsonValue, TypeAdapter
 
-from litellm.proxy.common_utils.encrypt_decrypt_utils import decrypt_if_encrypted_with
-
 pytestmark: Final = pytest.mark.shares_worker_state
 
 _MODEL_ID: Final = "global.moonshotai.kimi-k3"
@@ -43,7 +40,6 @@ _REJECTION: Final = "structured output schema uses unsupported regex negative lo
 _THROTTLED: Final = "Too many requests, please wait before trying again"
 _UNKNOWN_TYPE: Final = "somethingBedrockAddedLater"
 _UNKNOWN_ONLY: Final = "none of its 1 events carried a known event type"
-_SIGNING_KEY: Final = os.environ.get("LITELLM_SALT_KEY", "sk-integration-salt")
 _JSON_HEADERS: Final = MappingProxyType({":content-type": "application/json", ":message-type": "event"})
 _USAGE: Final[dict[str, JsonValue]] = {"usage": {"inputTokens": 11, "outputTokens": 4, "totalTokens": 15}}
 _RESPONSE: Final = json.dumps(
@@ -277,17 +273,9 @@ def _responses_text(events: Iterable[dict[str, JsonValue]]) -> str:
     )
 
 
-def _inner_response_id(identity: str) -> str:
-    managed: Final = decrypt_if_encrypted_with(identity.removeprefix("resp_"), _SIGNING_KEY)
-    assert managed is not None, identity
-    issued: Final = managed.split(";", 1)[0].rsplit("response_id:", 1)[1]
-    decoded: Final = base64.b64decode(issued.removeprefix("resp_")).decode()
-    return decoded.rsplit("response_id:", 1)[1]
-
-
 def _completed_response_id(events: Iterable[dict[str, JsonValue]]) -> str:
     (completed,) = tuple(event for event in events if event.get("type") == "response.completed")
-    return _inner_response_id(str(_JSON.validate_python(completed["response"])["id"]))
+    return str(_JSON.validate_python(completed["response"])["id"])
 
 
 def _only_received(wire: Wire) -> tuple[str, dict[str, JsonValue]]:
diff --git a/tests/integration/providers/test_bedrock_gpt_responses_native_wire.py b/tests/integration/providers/test_bedrock_gpt_responses_native_wire.py
index 3d6eb7fcaff..0788b9ac85a 100644
--- a/tests/integration/providers/test_bedrock_gpt_responses_native_wire.py
+++ b/tests/integration/providers/test_bedrock_gpt_responses_native_wire.py
@@ -62,12 +62,12 @@ def _body(request: Request) -> dict[str, JsonValue]:
 # ciphertext the caller received, because the spend row id is read from response_obj["id"] before the
 # ResponsesIDSecurity hook rewrites it in place; the row is looked up under both ids until that ordering is fixed on
 # main
-def _spend_row(client_id: str, issued_id: str) -> dict[str, JsonValue]:
+def _spend_row(*request_ids: str) -> dict[str, JsonValue]:
     rows: Final = eventually(
         lambda: read_rows(
             'SELECT model_group, status, prompt_tokens, completion_tokens FROM "LiteLLM_SpendLogs" '
             "WHERE request_id = ANY(%s)",
-            ([client_id, issued_id],),  # pyright: ignore[reportArgumentType]  # psycopg adapts the list to a text array
+            (list(request_ids),),  # pyright: ignore[reportArgumentType]  # psycopg adapts the list to a text array
         ),
         lambda found: len(found) == 1,
         seconds=70,
@@ -120,4 +120,4 @@ async def test_async_openai_sdk_responses_stream_is_served_by_the_native_respons
         assert issued.upstream == f"resp_upstream_{marker}", completed.response.id
         request: Final = _native_request(wire)
         assert _body(request) == {"model": GPT, "input": _prompt(marker), "stream": True}, request.body
-        assert _spend_row(completed.response.id, issued.issued) == _success_row(model)
+        assert _spend_row(completed.response.id) == _success_row(model)
diff --git a/tests/integration/providers/test_bedrock_kimi_k3_cache_point_wire.py b/tests/integration/providers/test_bedrock_kimi_k3_cache_point_wire.py
index 4441582fb6b..a6714979c8e 100644
--- a/tests/integration/providers/test_bedrock_kimi_k3_cache_point_wire.py
+++ b/tests/integration/providers/test_bedrock_kimi_k3_cache_point_wire.py
@@ -456,7 +456,7 @@ def _inner_response_id(identity: str) -> str:
 
 def _completed_response_id(events: Iterable[dict[str, JsonValue]]) -> str:
     (completed,) = tuple(event for event in events if event.get("type") == "response.completed")
-    return _inner_response_id(str(_JSON.validate_python(completed["response"])["id"]))
+    return str(_JSON.validate_python(completed["response"])["id"])
 
 
 def _chat_text(body: Mapping[str, JsonValue]) -> str:
@@ -911,7 +911,7 @@ async def test_k06_openai_sdk_async_responses_stream_reaches_kimi_without_a_cach
     received: Final = _only_received(rig.wire)
     assert received.model == _KIMI_US and received.streaming, received
     assert received.cache_points == 0, received.body
-    _success_row(_inner_response_id(completed[0].id))
+    _success_row(completed[0].id)
 
 
 _LOCATIONS: Final = (
diff --git a/tests/integration/providers/test_bedrock_mantle_claude_chat_wire.py b/tests/integration/providers/test_bedrock_mantle_claude_chat_wire.py
index d4f9533fcdc..32b6c4f1690 100644
--- a/tests/integration/providers/test_bedrock_mantle_claude_chat_wire.py
+++ b/tests/integration/providers/test_bedrock_mantle_claude_chat_wire.py
@@ -70,10 +70,18 @@ def _chat_messages(marker: str) -> list[JsonValue]:
     return [{"role": "user", "content": _prompt(marker)}]
 
 
-def _outbound(backend: str, messages: list[JsonValue], **fields: JsonValue) -> dict[str, JsonValue]:
+def _default_max_tokens(gateway: Gateway, backend: str) -> int:
+    match gateway.get("/public/litellm_model_cost_map").get(f"bedrock_mantle/{backend}"):
+        case {"max_output_tokens": int() as mapped}:
+            return mapped
+        case _:
+            return DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS
+
+
+def _outbound(gateway: Gateway, backend: str, messages: list[JsonValue], **fields: JsonValue) -> dict[str, JsonValue]:
     return {
         "messages": messages,
-        "max_tokens": DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS,
+        "max_tokens": _default_max_tokens(gateway, backend),
         "anthropic_version": _BRIDGE_VERSION,
         "model": backend,
         **fields,
@@ -290,7 +298,7 @@ def test_chat_completion_on_a_mantle_claude_id_posts_native_messages_and_spends_
     gateway: Gateway, backend: str
 ) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(backend, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, backend, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker, backend))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{backend}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -314,7 +322,7 @@ def test_chat_stream_on_a_mantle_claude_id_relays_openai_chunks_from_the_native_
     gateway: Gateway, stream_options: dict[str, JsonValue], usage_chunks: list[tuple[JsonValue, ...]]
 ) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)], stream=True)
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)], stream=True)
     with wire_server(_bearer_peer(expected, _text_stream(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -355,7 +363,7 @@ def test_chat_request_fields_are_translated_to_the_native_messages_shape(
     outbound_fields: dict[str, JsonValue],
 ) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)], **outbound_fields)
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)], **outbound_fields)
     with wire_server(_bearer_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -377,7 +385,7 @@ def test_chat_tools_reach_mantle_as_input_schema_and_the_tool_use_block_returns_
     marker: Final = uuid4().hex
     backend: Final = _mantle_claude_where(gateway, "supports_forced_tool_use", disabled=False)
     expected: Final = _outbound(
-        backend, [_user_turn(marker)], tools=[_WEATHER_TOOL_OUTBOUND], tool_choice=outbound_choice
+        gateway, backend, [_user_turn(marker)], tools=[_WEATHER_TOOL_OUTBOUND], tool_choice=outbound_choice
     )
     reply: Final = _tool_reply(marker, backend, "get_weather")
     with wire_server(_bearer_peer(expected, reply)) as wire, gateway.scenario() as scenario:
@@ -407,7 +415,7 @@ def test_chat_tools_reach_mantle_as_input_schema_and_the_tool_use_block_returns_
 
 def test_chat_stream_relays_a_native_tool_use_block_as_tool_call_chunks(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)], tools=[_WEATHER_TOOL_OUTBOUND], stream=True)
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)], tools=[_WEATHER_TOOL_OUTBOUND], stream=True)
     with wire_server(_bearer_peer(expected, _tool_stream(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -439,7 +447,7 @@ def test_chat_tool_result_turn_reaches_mantle_as_tool_use_and_tool_result_blocks
     marker: Final = uuid4().hex
     tool_call: Final = f"toolu_{marker}"
     expected: Final = _outbound(
-        _HAIKU,
+        gateway, _HAIKU,
         [
             _user_turn(marker),
             {
@@ -484,7 +492,7 @@ def test_chat_json_schema_response_format_is_sent_as_a_forced_tool_and_returned_
 ) -> None:
     marker: Final = uuid4().hex
     expected: Final = _outbound(
-        _HAIKU,
+        gateway, _HAIKU,
         [_user_turn(marker)],
         tools=[{"name": "json_tool_call", "input_schema": _CITY_SCHEMA}],
         tool_choice={"name": "json_tool_call", "type": "tool"},
@@ -537,7 +545,7 @@ def _sigv4_peer(expected: Mapping[str, JsonValue], reply: Reply) -> Callable[[Re
 
 def test_chat_completion_signs_the_native_messages_request_with_the_deployment_aws_keys(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)])
     with wire_server(_sigv4_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(
             model=f"bedrock_mantle/{_HAIKU}",
@@ -556,7 +564,7 @@ def test_chat_completion_signs_the_native_messages_request_with_the_deployment_a
 
 def test_region_prefix_in_a_mantle_claude_id_is_routing_only_and_keeps_the_mantle_price(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/us-east-2/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -577,7 +585,7 @@ def test_region_prefix_in_a_mantle_claude_id_is_routing_only_and_keeps_the_mantl
 
 def test_openai_sdk_chat_completion_on_a_mantle_claude_id(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         with OpenAI(
@@ -606,7 +614,7 @@ def test_openai_sdk_chat_completion_on_a_mantle_claude_id(gateway: Gateway) -> N
 
 def test_openai_sdk_chat_stream_on_a_mantle_claude_id(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)], stream=True)
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)], stream=True)
     with wire_server(_bearer_peer(expected, _text_stream(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         with OpenAI(
@@ -645,7 +653,7 @@ def test_openai_sdk_chat_stream_on_a_mantle_claude_id(gateway: Gateway) -> None:
 
 async def test_async_openai_sdk_chat_completion_on_a_mantle_claude_id(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         async with AsyncOpenAI(
@@ -674,7 +682,7 @@ async def test_async_openai_sdk_chat_completion_on_a_mantle_claude_id(gateway: G
 
 async def test_async_openai_sdk_chat_stream_on_a_mantle_claude_id(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)], stream=True)
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)], stream=True)
     with wire_server(_bearer_peer(expected, _text_stream(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         async with AsyncOpenAI(
@@ -714,7 +722,7 @@ def test_identical_chat_request_is_served_from_the_response_cache_and_logged_as_
     gateway: Gateway,
 ) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         request: Final[dict[str, JsonValue]] = {"model": model, "messages": _chat_messages(marker)}
@@ -802,7 +810,7 @@ def test_open_weight_mantle_id_keeps_the_openai_compatible_chat_route_and_its_sa
 )
 def test_api_base_with_a_route_suffix_still_posts_to_the_native_messages_path(gateway: Gateway, suffix: str) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url + suffix, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -814,7 +822,7 @@ def test_api_base_with_a_route_suffix_still_posts_to_the_native_messages_path(ga
 
 def test_responses_api_on_a_mantle_claude_id_bridges_to_native_messages(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request("POST", "/v1/responses", {"model": model, "input": _prompt(marker)})
@@ -839,7 +847,7 @@ def test_responses_api_on_a_mantle_claude_id_bridges_to_native_messages(gateway:
 
 def test_responses_api_stream_on_a_mantle_claude_id_bridges_to_the_native_stream(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
-    expected: Final = _outbound(_HAIKU, [_user_turn(marker)], stream=True)
+    expected: Final = _outbound(gateway, _HAIKU, [_user_turn(marker)], stream=True)
     with wire_server(_bearer_peer(expected, _text_stream(marker))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{_HAIKU}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -996,7 +1004,7 @@ def test_unsupported_claude_param_is_dropped_under_drop_params(
 ) -> None:
     marker: Final = uuid4().hex
     backend: Final = _backend_without(gateway, flag)
-    expected: Final = _outbound(backend, [_user_turn(marker)], **outbound_fields)
+    expected: Final = _outbound(gateway, backend, [_user_turn(marker)], **outbound_fields)
     with wire_server(_bearer_peer(expected, _text_reply(marker, backend))) as wire, gateway.scenario() as scenario:
         model: Final = scenario.model(model=f"bedrock_mantle/{backend}", api_base=wire.url, api_key=_API_KEY)
         response: Final = gateway.request(
@@ -1114,7 +1122,7 @@ def _wildcard_prefix(gateway: Gateway, scenario: Scenario, api_base: str) -> str
 def test_uppercase_claude_id_through_a_mantle_wildcard_is_sent_to_native_messages(gateway: Gateway) -> None:
     marker: Final = uuid4().hex
     backend: Final = _HAIKU.upper()
-    expected: Final = _outbound(backend, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, backend, [_user_turn(marker)])
     with wire_server(_bearer_peer(expected, _text_reply(marker, backend))) as wire, gateway.scenario() as scenario:
         model: Final = f"{_wildcard_prefix(gateway, scenario, wire.url)}/{backend}"
         response: Final = gateway.request(
@@ -1129,7 +1137,7 @@ def test_five_kilobyte_claude_id_through_a_mantle_wildcard_reaches_mantle_and_it
 ) -> None:
     marker: Final = uuid4().hex
     backend: Final = f"{_HAIKU}-{'x' * 5000}"
-    expected: Final = _outbound(backend, [_user_turn(marker)])
+    expected: Final = _outbound(gateway, backend, [_user_turn(marker)])
     unknown: Final = _error_reply(404, "not_found_error", "model: synthetic unknown model")
     with wire_server(_bearer_peer(expected, unknown)) as wire, gateway.scenario() as scenario:
         model: Final = f"{_wildcard_prefix(gateway, scenario, wire.url)}/{backend}"
diff --git a/tests/integration/providers/test_bedrock_mantle_output_limit_wire.py b/tests/integration/providers/test_bedrock_mantle_output_limit_wire.py
index 89ad226761e..5aede070896 100644
--- a/tests/integration/providers/test_bedrock_mantle_output_limit_wire.py
+++ b/tests/integration/providers/test_bedrock_mantle_output_limit_wire.py
@@ -516,7 +516,7 @@ def test_responses_max_output_tokens_is_forwarded_natively_on_both_legs(gateway:
         for attempt in attempts:
             assert attempt.body["max_output_tokens"] == 1000 and _limits(attempt.body) == (None, None), attempt.body
         _assert_logged(issued, model, "success")
-        _assert_logged(_managed_response_id(streamed_issued), model, "success")
+        _assert_logged(streamed_issued, model, "success")
 
 
 def test_region_prefixed_deployment_on_a_v1_base_sends_the_bare_model_with_max_completion_tokens(
diff --git a/tests/integration/providers/test_bedrock_model_discovery_wire.py b/tests/integration/providers/test_bedrock_model_discovery_wire.py
index 3bf4583e736..2871e51de5e 100644
--- a/tests/integration/providers/test_bedrock_model_discovery_wire.py
+++ b/tests/integration/providers/test_bedrock_model_discovery_wire.py
@@ -301,11 +301,7 @@ def _spend_row_id(rows: Sequence[Mapping[str, JsonValue]], tag: str) -> str:
 
 
 def _landed_once(served: tuple[tuple[str, str, bool], ...], tags: tuple[str, ...]) -> None:
-    """One spend row per tagged call, carrying the id the client saw.
-
-    FIXME: a streamed /v1/responses row carries the managed `resp_` id LiteLLM built before the proxy encrypted the
-    advertised one, so that row is matched by tag alone until the spend log reads the id the client received.
-    """
+    """One spend row per tagged call, carrying the id the client saw."""
     rows: Final = eventually(
         lambda: read_rows(
             'SELECT request_id, request_tags FROM "LiteLLM_SpendLogs" WHERE request_tags ?| %s',
@@ -316,9 +312,6 @@ def _landed_once(served: tuple[tuple[str, str, bool], ...], tags: tuple[str, ...
     )
     for (identity, path, stream), tag in zip(served, tags, strict=True):
         row_id: Final = _spend_row_id(rows, tag)
-        if path == "/v1/responses" and stream:
-            assert row_id.startswith("resp_"), (row_id, identity)
-            continue
         assert row_id == identity, (path, stream, row_id, identity)
 
 
diff --git a/tests/integration/providers/test_bedrock_native_structured_output_wire.py b/tests/integration/providers/test_bedrock_native_structured_output_wire.py
index 5803d1dee44..67edcf7f3e4 100644
--- a/tests/integration/providers/test_bedrock_native_structured_output_wire.py
+++ b/tests/integration/providers/test_bedrock_native_structured_output_wire.py
@@ -20,6 +20,7 @@ _FABLE: Final = "us.anthropic.claude-fable-5"
 _SONNET: Final = "us.anthropic.claude-sonnet-4-6"
 _OPUS: Final = "us.anthropic.claude-opus-5-5"
 _OPT_IN: Final = _OPUS
+_UNFORCEABLE_TOOL: Final = _OPUS
 _OPUS_4_8: Final = "us.anthropic.claude-opus-4-8"
 _DEEPSEEK: Final = "deepseek.v3.2"
 _AWS: Final[dict[str, JsonValue]] = {
@@ -536,6 +537,12 @@ def _resolves(schema: Mapping[str, JsonValue], ref: str) -> bool:
     return ref.startswith(prefix) and ref.removeprefix(prefix) in object_value(schema.get("$defs") or {})
 
 
+def _tool_choice(body: Mapping[str, JsonValue], invoke: bool) -> JsonValue:
+    if invoke:
+        return body.get("tool_choice")
+    return object_value(body.get("toolConfig") or {}).get("toolChoice")
+
+
 def _assert_native_without_tools(body: Mapping[str, JsonValue], invoke: bool, schema: Mapping[str, JsonValue]) -> None:
     assert _native_schema(body, invoke) == schema, body
     assert _JSON_TOOL not in _tools(body, invoke), body
@@ -631,6 +638,40 @@ def test_bedrock_native_model_without_thinking_keeps_the_forced_json_tool(gatewa
         assert _tools(body, invoke)[_JSON_TOOL]["properties"] == _SCHEMA["properties"], body
 
 
+@pytest.mark.parametrize("route", ["converse", "invoke"])
+def test_json_schema_without_thinking_on_a_model_that_cannot_force_the_json_tool_gets_native_output(
+    gateway: Gateway, route: str
+) -> None:
+    marker, marker_hex = _marker()
+    with wire_server(_bedrock) as wire, gateway.scenario() as scenario:
+        model: Final = _deployment(scenario, wire, route, _UNFORCEABLE_TOOL)
+        response: Final = gateway.request(
+            "POST", "/v1/chat/completions", _chat_body(model, marker, response_format=_response_format(_SCHEMA))
+        )
+        assert _content_json(_chat_message(response)) == _payload(marker_hex), response.text
+        _, body = _one_call(wire, marker_hex)
+        _assert_native_without_tools(body, route == "invoke", _SCHEMA)
+
+
+@pytest.mark.parametrize("route", ["converse", "invoke"])
+def test_a_model_that_cannot_force_the_json_tool_retries_a_rejected_native_output_with_an_unforced_json_tool(
+    gateway: Gateway, route: str
+) -> None:
+    marker, marker_hex = _marker()
+    invoke: Final = route == "invoke"
+    with wire_server(_rejecting_native_output(_FABLE_REJECTION)) as wire, gateway.scenario() as scenario:
+        model: Final = _deployment(scenario, wire, route, _UNFORCEABLE_TOOL)
+        response: Final = gateway.request(
+            "POST", "/v1/chat/completions", _chat_body(model, marker, response_format=_response_format(_SCHEMA))
+        )
+        assert _content_json(_chat_message(response)) == _payload(marker_hex), response.text
+        rejected, retried = (_JSON.validate_json(request.body) for request in wire.drain())
+        assert _native_schema(rejected, invoke) == _SCHEMA, rejected
+        assert _native_schema(retried, invoke) is None, retried
+        assert _tools(retried, invoke)[_JSON_TOOL]["properties"] == _SCHEMA["properties"], retried
+        assert _tool_choice(retried, invoke) is None, retried
+
+
 @pytest.mark.parametrize(
     ("backend", "model_info", "native"),
     [
@@ -797,6 +838,25 @@ def test_thinking_with_a_caller_tool_on_a_bedrock_native_model_sends_only_the_ca
         assert _thinking_requested(body, False), body
 
 
+def test_a_caller_tool_next_to_json_schema_without_thinking_on_a_model_that_cannot_force_the_json_tool(
+    gateway: Gateway,
+) -> None:
+    marker, marker_hex = _marker()
+    with wire_server(_bedrock) as wire, gateway.scenario() as scenario:
+        model: Final = _deployment(scenario, wire, "converse", _UNFORCEABLE_TOOL)
+        response: Final = gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            _chat_body(model, marker, tools=[_USER_TOOL_SPEC], response_format=_response_format(_SCHEMA)),
+        )
+        (call,) = list_value(_chat_message(response)["tool_calls"])
+        function: Final = object_value(object_value(call)["function"])
+        assert function["name"] == _USER_TOOL, response.text
+        _, body = _one_call(wire, marker_hex)
+        assert _tools(body, False).keys() == {_USER_TOOL}, body
+        assert _native_schema(body, False) == _SCHEMA, body
+
+
 @pytest.mark.parametrize(
     ("schema", "expected"),
     [(_UNCLEANED_SCHEMA, _UNCLEANED_SCHEMA), (_NULLABLE_SCHEMA, _CLOSED_NULLABLE_SCHEMA)],
diff --git a/tests/integration/providers/test_bedrock_runtime_chat_completions_chaos.py b/tests/integration/providers/test_bedrock_runtime_chat_completions_chaos.py
index 3cadc1b5ccf..42950fb18c3 100644
--- a/tests/integration/providers/test_bedrock_runtime_chat_completions_chaos.py
+++ b/tests/integration/providers/test_bedrock_runtime_chat_completions_chaos.py
@@ -172,7 +172,11 @@ def _upstream_id_inside(row_id: str) -> str | None:
 def _row_belongs_to(row_id: str, served: _Served) -> bool:
     if row_id == _response_id(served):
         return True
-    return served.call.endpoint == "responses" and _upstream_id_inside(row_id) == f"resp_upstream_{served.call.marker}"
+    return (
+        served.call.endpoint == "responses"
+        and not served.call.stream
+        and _upstream_id_inside(row_id) == f"resp_upstream_{served.call.marker}"
+    )
 
 
 def _assert_each_success_landed_once(rows: list[dict[str, JsonValue]], served: tuple[_Served, ...]) -> None:
diff --git a/tests/integration/providers/test_chat_template_tool_count_wire.py b/tests/integration/providers/test_chat_template_tool_count_wire.py
index a8b97fa732e..552df3a87bc 100644
--- a/tests/integration/providers/test_chat_template_tool_count_wire.py
+++ b/tests/integration/providers/test_chat_template_tool_count_wire.py
@@ -39,7 +39,7 @@ _API_KEY: Final = "scripted-provider-key"
 _DEEPSEEK_V4: Final = "azure_ai/DeepSeek-V4-Flash-0731"
 _DEEPSEEK_R1: Final = "azure_ai/DeepSeek-R1-0528"
 _QWEN3_5: Final = "databricks/databricks-qwen35-122b-a10b"
-_GROK: Final = "azure_ai/grok-4-1"
+_GROK_3: Final = "azure_ai/grok-3"
 _DEEPSEEK_V4_TOOL_PREAMBLE: Final = 222
 _QWEN3_5_TOOL_PREAMBLE: Final = 196
 _QWEN3_5_OPENED_SYSTEM_TURN: Final = 5
@@ -250,7 +250,7 @@ def test_messages_count_tokens_skips_web_search_and_counts_unmapped_tool_keys_fo
 
 def test_messages_count_tokens_keeps_openai_tool_framing_for_other_models(gateway: Gateway) -> None:
     with wire_server(_completion) as wire, gateway.scenario() as scenario:
-        model: Final = _deployment(scenario, "count", _GROK, wire.url)
+        model: Final = _deployment(scenario, "count", _GROK_3, wire.url)
         without_tools: Final = _count(gateway, _MESSAGES_COUNT, _MESSAGES_COUNT.body(model, ()))
         plain: Final = _count(gateway, _MESSAGES_COUNT, _MESSAGES_COUNT.body(model, (_ANTHROPIC_TOOL,)))
         deferred: Final = _count(
@@ -428,7 +428,7 @@ def test_project_itpm_reserves_deepseek_v4_tools_the_way_its_chat_template_rende
 def test_project_itpm_keeps_openai_tool_framing_for_other_models(gateway: Gateway) -> None:
     chat: Final = _ENDPOINTS["chat-completions"]
     with wire_server(_completion) as wire, gateway.scenario() as scenario:
-        group: Final = _deployment(scenario, "grok-4-1", _GROK, wire.url)
+        group: Final = _deployment(scenario, "grok-3", _GROK_3, wire.url)
         response: Final = gateway.request(
             "POST",
             chat.path,
@@ -504,8 +504,8 @@ def _agent_body(group: str, marker: str, file_body: str, trigger: int) -> dict[s
 
 @pytest.mark.parametrize(
     ("model", "files_kept"),
-    ((_DEEPSEEK_V4, (False, False, True)), (_GROK, (True, True, True))),
-    ids=("deepseek-v4", "grok-4-1"),
+    ((_DEEPSEEK_V4, (False, False, True)), (_GROK_3, (True, True, True))),
+    ids=("deepseek-v4", "grok-3"),
 )
 def test_messages_context_management_trigger_counts_tools_the_way_the_models_chat_template_renders_them(
     gateway: Gateway, model: str, files_kept: tuple[bool, ...]
diff --git a/tests/integration/providers/test_databricks_chat_wire.py b/tests/integration/providers/test_databricks_chat_wire.py
index b93cebdbc4c..3d9d749eb04 100644
--- a/tests/integration/providers/test_databricks_chat_wire.py
+++ b/tests/integration/providers/test_databricks_chat_wire.py
@@ -353,9 +353,172 @@ def _shape_reply(identity: str, stream: bool) -> Reply:
             "/chat/completions",
             id="A5-responses-list-input",
         ),
+        pytest.param(
+            "json-object-two-blocks",
+            "/v1/chat/completions",
+            "databricks-meta-llama-3-3-70b-instruct",
+            {
+                "messages": [
+                    {"role": "user", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]}
+                ],
+                "response_format": {"type": "json_object"},
+            },
+            [{"role": "user", "content": "Reply in JSON"}],
+            False,
+            "/chat/completions",
+            id="A6-chat-json-object-two-blocks-joined",
+        ),
+        pytest.param(
+            "json-object-two-blocks-stream",
+            "/v1/chat/completions",
+            "databricks-qwen35-122b-a10b",
+            {
+                "messages": [
+                    {"role": "user", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]}
+                ],
+                "response_format": {"type": "json_object"},
+                "stream": True,
+            },
+            [{"role": "user", "content": "Reply in JSON"}],
+            False,
+            "/chat/completions",
+            id="A7-chat-stream-json-object-two-blocks-joined",
+        ),
+        pytest.param(
+            "json-object-history",
+            "/v1/chat/completions",
+            "databricks-meta-llama-3-3-70b-instruct",
+            {
+                "messages": [
+                    {"role": "user", "content": [{"type": "text", "text": "Code: A"}, {"type": "text", "text": "BC"}]},
+                    {"role": "assistant", "content": "Got it."},
+                    {"role": "user", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]},
+                ],
+                "response_format": {"type": "json_object"},
+            },
+            [
+                {"role": "user", "content": [{"type": "text", "text": "Code: A"}, {"type": "text", "text": "BC"}]},
+                {"role": "assistant", "content": "Got it."},
+                {"role": "user", "content": "Reply in JSON"},
+            ],
+            False,
+            "/chat/completions",
+            id="A8-chat-json-object-earlier-turns-kept",
+        ),
+        pytest.param(
+            "json-object-trailing-system",
+            "/v1/chat/completions",
+            "databricks-meta-llama-3-3-70b-instruct",
+            {
+                "messages": [
+                    {"role": "user", "content": "Say hi"},
+                    {"role": "system", "content": [{"type": "text", "text": "Alpha"}, {"type": "text", "text": " rule."}]},
+                    {"role": "system", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]},
+                ],
+                "response_format": {"type": "json_object"},
+            },
+            [{"role": "user", "content": "Say hi"}, {"role": "system", "content": "Alpha rule.\n\nReply in JSON"}],
+            False,
+            "/chat/completions",
+            id="A8b-chat-json-object-trailing-system-keeps-break",
+        ),
+        pytest.param(
+            "json-object-drop-params-cache-control",
+            "/v1/chat/completions",
+            "databricks-meta-llama-3-3-70b-instruct",
+            {
+                "messages": [
+                    {
+                        "role": "user",
+                        "content": [
+                            {"type": "text", "text": "Reply"},
+                            {"type": "text", "text": " in JSON", "cache_control": {"type": "ephemeral"}},
+                        ],
+                    }
+                ],
+                "response_format": {"type": "json_object"},
+                "drop_params": True,
+            },
+            [{"role": "user", "content": "Reply in JSON"}],
+            False,
+            "/chat/completions",
+            id="A8c-chat-json-object-drop-params-drops-cache-control",
+        ),
+        pytest.param(
+            "json-object-trailing-thinking-turn",
+            "/v1/chat/completions",
+            "databricks-meta-llama-3-3-70b-instruct",
+            {
+                "messages": [
+                    {"role": "user", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]},
+                    {
+                        "role": "assistant",
+                        "content": "",
+                        "thinking_blocks": [{"type": "thinking", "thinking": "Plan.", "signature": "sig"}],
+                    },
+                ],
+                "response_format": {"type": "json_object"},
+            },
+            [{"role": "user", "content": "Reply in JSON"}],
+            False,
+            "/chat/completions",
+            id="A8d-chat-json-object-trailing-thinking-turn-dropped",
+        ),
+        pytest.param(
+            "json-object-external-endpoint",
+            "/v1/chat/completions",
+            "openai-gpt-external",
+            {
+                "messages": [
+                    {"role": "user", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]}
+                ],
+                "response_format": {"type": "json_object"},
+            },
+            [{"role": "user", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]}],
+            False,
+            "/chat/completions",
+            id="A8e-chat-json-object-external-endpoint-kept-as-sent",
+        ),
+        pytest.param(
+            "json-object-responses-two-parts",
+            "/v1/responses",
+            "databricks-qwen35-122b-a10b",
+            {
+                "input": [
+                    {
+                        "role": "user",
+                        "content": [{"type": "input_text", "text": "Reply"}, {"type": "input_text", "text": " in JSON"}],
+                    }
+                ],
+                "text": {"format": {"type": "json_object"}},
+            },
+            [{"role": "user", "content": "Reply in JSON"}],
+            False,
+            "/chat/completions",
+            id="A9-responses-json-object-two-parts-joined",
+        ),
+        pytest.param(
+            "json-object-responses-trailing-reasoning",
+            "/v1/responses",
+            "databricks-qwen35-122b-a10b",
+            {
+                "input": [
+                    {
+                        "role": "user",
+                        "content": [{"type": "input_text", "text": "Reply"}, {"type": "input_text", "text": " in JSON"}],
+                    },
+                    {"type": "reasoning", "id": "rs_1", "summary": [{"type": "summary_text", "text": "Plan."}]},
+                ],
+                "text": {"format": {"type": "json_object"}},
+            },
+            [{"role": "user", "content": "Reply in JSON"}],
+            False,
+            "/chat/completions",
+            id="A9b-responses-json-object-trailing-reasoning-dropped",
+        ),
     ],
 )
-def test_databricks_non_claude_single_text_block_reaches_upstream_as_string(
+def test_databricks_non_claude_plain_text_content_reaches_upstream_as_string(
     gateway: Gateway,
     case: str,
     endpoint: str,
@@ -365,7 +528,7 @@ def test_databricks_non_claude_single_text_block_reaches_upstream_as_string(
     responses_mode: bool,
     upstream_path: str,
 ) -> None:
-    identity: Final = f"databricks-single-text-{case}-{uuid.uuid4().hex}"
+    identity: Final = f"databricks-plain-text-{case}-{uuid.uuid4().hex}"
     streaming: Final = request_body.get("stream") is True
 
     def respond(request: Request) -> Reply:
@@ -1453,7 +1616,7 @@ def test_databricks_non_string_text_block_is_rejected_before_reaching_upstream(g
         )
         received: Final = wire.drain()
     assert response.status_code == 400, response.text
-    assert "'int' object has no attribute 'strip'" in response.text
+    assert "A text content block needs a string 'text', got int" in response.text
     assert received == ()
 
 
diff --git a/tests/integration/providers/test_decisions_wire.py b/tests/integration/providers/test_decisions_wire.py
index 5af1532e9ed..4e091460667 100644
--- a/tests/integration/providers/test_decisions_wire.py
+++ b/tests/integration/providers/test_decisions_wire.py
@@ -262,11 +262,28 @@ def _upstream_calls(gateway: Gateway, handle: ScenarioHandle) -> list[dict[str,
     return _calls_to(_observed_requests(gateway), handle)
 
 
-def _sdk_inference_call(gateway: Gateway, handle: ScenarioHandle, provider: _Provider) -> dict[str, JsonValue]:
+def _sdk_inference_call(
+    gateway: Gateway,
+    handle: ScenarioHandle,
+    provider: _Provider,
+    *,
+    metadata_authorization: str | None = None,
+) -> dict[str, JsonValue]:
     observed: Final = _upstream_calls(gateway, handle)
     inference_path: Final = f"/{handle.scenario_id}/v1/systemone"
     (call,) = tuple(request for request in observed if request["path"] == inference_path)
-    metadata_calls: Final = tuple(request for request in observed if request["path"] != inference_path)
+    environment_metadata: Final = {
+        "path": f"/{handle.scenario_id}/api/show",
+        "authorization": metadata_authorization,
+        "body": {"name": provider.body_model},
+        "method": "POST",
+        "api_key": "",
+    }
+    metadata_calls: Final = tuple(
+        request
+        for request in observed
+        if request["path"] != inference_path and (metadata_authorization is None or request != environment_metadata)
+    )
     assert metadata_calls in (
         (),
         (
@@ -556,7 +573,9 @@ def test_ollama_decisions_sdk_respects_environment_and_explicit_auth(
             api_key=api_key,
         )
         assert response.model_dump(mode="json") == _answer_body(provider)
-        call: Final = _sdk_inference_call(gateway, handle, provider)
+        call: Final = _sdk_inference_call(
+            gateway, handle, provider, metadata_authorization=authorization if environment_base else None
+        )
         assert (call["path"], call["authorization"], call["body"]) == (
             f"/{handle.scenario_id}/v1/systemone",
             authorization,
diff --git a/tests/integration/providers/test_device_code_login_guard_boot.py b/tests/integration/providers/test_device_code_login_guard_boot.py
index 8aba6841cf9..91f502179f3 100644
--- a/tests/integration/providers/test_device_code_login_guard_boot.py
+++ b/tests/integration/providers/test_device_code_login_guard_boot.py
@@ -28,7 +28,6 @@ from pydantic import JsonValue, TypeAdapter
 pytestmark: Final = [pytest.mark.timeout(900), pytest.mark.shares_worker_state]
 
 _STARTED_WORKER: Final = re.compile(r"Started server process \[(\d+)\]")
-_DROPPED: Final = re.compile(r"original model: (\S+), ignoring and continuing")
 _FIXED: Final[Mapping[str, str]] = MappingProxyType(
     {"chatgpt-fixed": "chatgpt/gpt-5.6-terra", "copilot-fixed": "github_copilot/gpt-5.4"}
 )
@@ -41,8 +40,6 @@ _CONTROL_CALLS_BEFORE_THE_RELOAD: Final = 1
 _SHAPES: Final[Mapping[str, bool]] = MappingProxyType(
     {"docs-shapes": False, "docs-shapes-beside-a-universal-wildcard": True}
 )
-_NOT_FOUND: Final = "Invalid model name passed in model="
-_NO_HEALTHY: Final = "There are no healthy deployments for this model"
 _CONTROL: Final = "device-login-boot-control"
 _EXTRA: Final[Mapping[str, JsonValue]] = MappingProxyType({"num_retries": 0, "cache": {"no-cache": True}})
 _CALL_ID: Final = "x-litellm-call-id"
@@ -174,15 +171,11 @@ def _lists_login_models(listed: tuple[str, ...]) -> bool:
     )
 
 
-def _every_worker_lists(
-    owned: OwnedProxy, workers: tuple[int, ...], *, login_models: bool
-) -> Mapping[int, tuple[str, ...]]:
+def _every_worker_lists(owned: OwnedProxy, workers: tuple[int, ...]) -> Mapping[int, tuple[str, ...]]:
     def settled(by_worker: Mapping[int, tuple[str, ...]]) -> bool:
         if set(by_worker) != set(workers):
             return False
-        if login_models:
-            return all(_lists_login_models(listed) for listed in by_worker.values())
-        return all(_login_names_listed(listed) == frozenset() for listed in by_worker.values())
+        return all(_lists_login_models(listed) for listed in by_worker.values())
 
     return eventually(lambda: _listing_by_worker(owned, workers), settled, seconds=90)
 
@@ -212,16 +205,8 @@ def _reload(owned: OwnedProxy) -> None:
     assert response.status_code == 200, response.text
 
 
-def _refusal_before_the_reload(name: str, universal: bool) -> str:
-    if name in _FIXED:
-        return _NO_HEALTHY
-    if not universal:
-        return _NOT_FOUND
-    return dl.CHATGPT_REFUSAL if name.startswith("chatgpt/") else dl.COPILOT_REFUSAL
-
-
 @pytest.mark.parametrize("universal", _SHAPES.values(), ids=_SHAPES.keys())
-def test_booting_without_tokens_drops_the_login_deployments_and_a_reload_after_mounting_brings_them_back(
+def test_booting_without_tokens_lists_login_deployments_and_serves_only_after_tokens_are_mounted(
     gateway: Gateway, tmp_path: Path, universal: bool
 ) -> None:
     dirs: Final = _token_dirs(tmp_path)
@@ -240,20 +225,18 @@ def test_booting_without_tokens_drops_the_login_deployments_and_a_reload_after_m
             workers=2,
         ) as owned:
             workers: Final = _workers(owned)
-            _every_worker_lists(owned, workers, login_models=False)
+            _every_worker_lists(owned, workers)
             boot_log: Final = owned.log.read_text()
             assert peers.auth_connections() == ()
             assert dl.CHATGPT_USER_CODE not in boot_log and dl.COPILOT_USER_CODE not in boot_log, boot_log[-3000:]
-            dropped_models: Final = _DROPPED.findall(boot_log)
-            expected_drops: Final = frozenset((*_FIXED.values(), *_WILDCARDS))
-            assert frozenset(dropped_models) == expected_drops, boot_log[-3000:]
-            assert all(dropped_models.count(model) >= len(workers) for model in expected_drops), boot_log[-3000:]
             with owned.gateway.scenario() as scenario:
                 key: Final = scenario.key()
                 for name in _LOGIN_NAMES:
                     refused: Final = _chat(_base_url(owned), key, name, uuid.uuid4().hex)
                     assert refused.status == 400, refused.text
-                    assert _refusal_before_the_reload(name, universal) in refused.message(), refused.text
+                    refusal: Final = dl.CHATGPT_REFUSAL if name.startswith("chatgpt") else dl.COPILOT_REFUSAL
+                    assert refusal in refused.message(), refused.text
+                assert peers.api.drain() == ()
                 control: Final = _chat(_base_url(owned), key, _CONTROL, uuid.uuid4().hex)
                 assert control.status == 200, control.text
                 assert peers.auth_connections() == ()
@@ -261,7 +244,7 @@ def test_booting_without_tokens_drops_the_login_deployments_and_a_reload_after_m
 
                 dirs.store_valid_tokens(peers.api.url)
                 _reload(owned)
-                _every_worker_lists(owned, workers, login_models=True)
+                _every_worker_lists(owned, workers)
                 for served_logins, name in enumerate(_LOGIN_NAMES, start=1):
                     served: Final = _chat(_base_url(owned), key, name, uuid.uuid4().hex)
                     assert served.status == 200, served.text
diff --git a/tests/integration/providers/test_device_code_login_guard_wire.py b/tests/integration/providers/test_device_code_login_guard_wire.py
index b4044674ed5..39e36fd95fa 100644
--- a/tests/integration/providers/test_device_code_login_guard_wire.py
+++ b/tests/integration/providers/test_device_code_login_guard_wire.py
@@ -746,10 +746,7 @@ def test_a_recent_device_code_request_does_not_hold_the_worker_for_the_rest_of_t
     assert scene.rig.peers.auth_connections() == ()
 
 
-_NOT_LIVE: Final = re.compile(r"saved to the database, but the model id\(s\) \['([0-9a-f-]+)'\] are not live")
-
-
-def test_model_created_without_a_token_is_saved_not_live_and_serves_once_the_token_is_mounted(scene: _Scene) -> None:
+def test_model_created_without_a_token_refuses_requests_and_serves_once_the_token_is_mounted(scene: _Scene) -> None:
     gateway: Final = scene.rig.owned.gateway
     name: Final = f"device-login-db-{uuid.uuid4().hex}"
     identity: Final = str(uuid.uuid4())
@@ -763,14 +760,18 @@ def test_model_created_without_a_token_is_saved_not_live_and_serves_once_the_tok
         },
     )
     try:
-        assert created.status_code == 500, created.text
-        not_live: Final = _NOT_LIVE.search(created.text)
-        assert not_live is not None and not_live.group(1) == identity, created.text
+        assert created.status_code == 200, created.text
+        assert created.json()["model_info"]["id"] == identity, created.text
         assert scene.rig.peers.auth_connections() == ()
-        scene.store_valid_token("chatgpt")
         call: Final = _Call(
             scene.rig.base_url(), scene.key, name, "responses", False, "httpx", uuid.uuid4().hex, SimpleQueue()
         )
+        refused: Final = _serve(call)
+        assert refused.status == 400, refused.text
+        assert dl.CHATGPT_REFUSAL in _error_message(refused.text), refused.text
+        assert scene.rig.peers.auth_connections() == ()
+        assert scene.rig.peers.api.drain() == ()
+        scene.store_valid_token("chatgpt")
         served: Final = eventually(lambda: _serve(call), lambda answer: answer.status == 200, seconds=90)
         assert set(rv.MARKER.findall(served.text)) == {call.marker}, served.text
         assert scene.rig.peers.auth_connections() == ()
diff --git a/tests/integration/providers/test_gemini_long_decode_wire.py b/tests/integration/providers/test_gemini_long_decode_wire.py
index 5ecb5e2a942..90e7616e26c 100644
--- a/tests/integration/providers/test_gemini_long_decode_wire.py
+++ b/tests/integration/providers/test_gemini_long_decode_wire.py
@@ -380,7 +380,9 @@ def test_cut_chat_stream_hands_its_token_on_a_chunk_with_empty_vertex_ai_lists_a
         chunks: Final = payloads(post(gateway, "chat", request_body("chat", model, True)).text, True)
         carriers: Final = [chunk for chunk in chunks if "continuation_token" in json.dumps(chunk)]
         assert [_vertex_lists(chunk) for chunk in carriers] == [dict(_EMPTY_VERTEX_LISTS)], chunks
-        assert [_vertex_lists(chunk) for chunk in chunks if chunk not in carriers] == [{}] * (len(chunks) - 1), chunks
+        assert [_vertex_lists(chunk) for chunk in chunks] == [
+            dict(_EMPTY_VERTEX_LISTS) if at(chunk, "choices", 0, "delta", "content") else {} for chunk in chunks
+        ], chunks
         metered: Final = [chunk for chunk in chunks if isinstance(chunk.get("usage"), dict)]
         assert [at(chunk, "usage", "completion_tokens_details") for chunk in metered] == [
             {"text_tokens": CUT.output_tokens}
diff --git a/tests/integration/providers/test_gemini_thinking_replay_chaos.py b/tests/integration/providers/test_gemini_thinking_replay_chaos.py
index f8bb52ef60a..fb3092adfc3 100644
--- a/tests/integration/providers/test_gemini_thinking_replay_chaos.py
+++ b/tests/integration/providers/test_gemini_thinking_replay_chaos.py
@@ -233,6 +233,18 @@ def _assert_answered_with_its_own_marker(served: _Served) -> None:
     assert set(_MARKER.findall(served.text)) == {served.call.marker}, served.text
 
 
+def _spend_id(served: _Served) -> str:
+    if served.call.endpoint == "responses" and served.call.stream:
+        payloads: Final = (
+            _JSON_OBJECT.validate_json(line.removeprefix("data: "))
+            for line in served.text.splitlines()
+            if line.startswith("data: {")
+        )
+        (completed,) = tuple(event for event in payloads if event.get("type") == "response.completed")
+        return str(_JSON_OBJECT.validate_python(completed["response"])["id"])
+    return _response_id(served.call.marker)
+
+
 async def test_concurrent_thinking_replays_across_endpoints_reach_gemini_signature_free(gateway: Gateway) -> None:
     calls: Final = _calls(30, ("chat", "messages", "responses"), lambda index: index % 2 == 0)
     with wire_server(_echo) as wire, gateway.scenario() as scenario:
@@ -244,7 +256,7 @@ async def test_concurrent_thinking_replays_across_endpoints_reach_gemini_signatu
         _assert_no_bleed(wire.drain(), frozenset(call.marker for call in calls))
         landed: Final = _spend_request_ids(model, 30)
         assert landed >= {
-            _response_id(call.marker) for call in calls if not (call.endpoint == "messages" and call.stream)
+            _spend_id(item) for item in served if not (item.call.endpoint == "messages" and item.call.stream)
         }
 
 
diff --git a/tests/integration/providers/test_gemini_thinking_replay_wire.py b/tests/integration/providers/test_gemini_thinking_replay_wire.py
index 4f965f079ec..70e339ed8b7 100644
--- a/tests/integration/providers/test_gemini_thinking_replay_wire.py
+++ b/tests/integration/providers/test_gemini_thinking_replay_wire.py
@@ -2,6 +2,7 @@ import base64
 import itertools
 import json
 import os
+import re
 import uuid
 from collections.abc import Iterator, Mapping, Sequence
 from collections.abc import Set as AbstractSet
@@ -679,9 +680,70 @@ def test_gemini_own_tool_call_signature_is_still_replayed_on_the_function_call_p
         assert _spend_row(rounds[1])["status"] == "success"
 
 
-def test_responses_previous_response_id_replays_gemini_session_history(
-    gateway: Gateway, tmp_path: Path
+_PLACEHOLDER_SIGNATURE: Final = base64.b64encode(b"skip_thought_signature_validator").decode()
+_ISSUED_ID: Final = re.compile(r'"id":\s*"([^"]+)"')
+_PLACEHOLDER_TOOL_TURN: Final = _model_turn(
+    _thought("I should count."),
+    {"function_call": {"name": "count_fruit", "args": {"kind": "apple"}}, "thoughtSignature": _PLACEHOLDER_SIGNATURE},
+)
+# Wording AI Studio answers with when a Vertex-minted signature is replayed to it, captured live on 2026-10-27
+_FOREIGN_SIGNATURE_REJECTED: Final = Reply(
+    status=400,
+    body=json.dumps(
+        {"error": {"code": 400, "message": "Corrupted thought signature.", "status": "INVALID_ARGUMENT"}}
+    ).encode(),
+)
+
+
+@pytest.mark.parametrize("stream", (False, True))
+@pytest.mark.parametrize("endpoint", _ENDPOINTS)
+def test_gemini_tool_call_signature_the_backend_rejects_is_resent_once_with_the_placeholder(
+    gateway: Gateway, endpoint: Endpoint, stream: bool
 ) -> None:
+    rounds: Final = (f"gemini-reply-{uuid.uuid4().hex}", f"gemini-reply-{uuid.uuid4().hex}")
+    calls: Final = itertools.count()
+
+    def respond(request: Request) -> Reply:
+        match next(calls):
+            case 0:
+                return _reply(rounds[0], stream=False, parts=_GEMINI_TOOL_REPLY_PARTS)
+            case 1:
+                return _FOREIGN_SIGNATURE_REJECTED
+            case _:
+                return _reply(rounds[1], stream=stream, parts=({"text": "Twelve apples."},))
+
+    with wire_server(respond) as wire, gateway.scenario() as scenario:
+        model: Final = _register(gateway, scenario, "gemini", wire)
+        first: Final = _tool_round_one(endpoint, model)
+        headers: Final = {"anthropic-version": "2023-06-01"}
+        opened: Final = gateway.request("POST", _path(endpoint), first, headers=headers)
+        assert opened.status_code == 200, opened.text
+        second: Final = {
+            **_tool_round_two(endpoint, first, _JSON_OBJECT.validate_json(opened.content)),
+            "stream": stream,
+        }
+        closed: Final = gateway.request("POST", _path(endpoint), second, headers=headers)
+        assert closed.status_code == 200, closed.text
+        assert "Twelve apples." in closed.text, closed.text
+        received: Final = wire.drain()
+        assert [(request.method, request.target) for request in received] == [
+            ("POST", _target("gemini", False)),
+            ("POST", _target("gemini", stream)),
+            ("POST", _target("gemini", stream)),
+        ], received
+        rejected, resent = (_JSON_OBJECT.validate_json(request.body) for request in received[1:])
+        assert rejected == {
+            **_expected_body(endpoint, _user("Count the apples."), _GEMINI_TOOL_REPLAYED_TURN, _FUNCTION_RESPONSE_TURN),
+            **_DECLARATIONS,
+        }, rejected
+        assert resent == {
+            **_expected_body(endpoint, _user("Count the apples."), _PLACEHOLDER_TOOL_TURN, _FUNCTION_RESPONSE_TURN),
+            **_DECLARATIONS,
+        }, resent
+        assert _spend_row(rounds[1], *_ISSUED_ID.findall(closed.text))["status"] == "success"
+
+
+def test_responses_previous_response_id_replays_gemini_session_history(gateway: Gateway, tmp_path: Path) -> None:
     first_prompt: Final = f"gemini-session-first-{uuid.uuid4().hex}"
     second_prompt: Final = f"gemini-session-second-{uuid.uuid4().hex}"
     first_answer: Final = f"gemini-answer-first-{uuid.uuid4().hex}"
diff --git a/tests/integration/providers/test_gemini_tool_result_part_reference_chaos.py b/tests/integration/providers/test_gemini_tool_result_part_reference_chaos.py
index ead83ed66aa..c185c968be9 100644
--- a/tests/integration/providers/test_gemini_tool_result_part_reference_chaos.py
+++ b/tests/integration/providers/test_gemini_tool_result_part_reference_chaos.py
@@ -301,6 +301,18 @@ def _assert_answered_with_its_own_marker(served: _Served) -> None:
     assert set(_MARKER.findall(served.text)) == {served.call.marker}, served.text
 
 
+def _spend_id(served: _Served) -> str:
+    if served.call.endpoint == "responses" and served.call.stream:
+        payloads: Final = (
+            _JSON_OBJECT.validate_json(line.removeprefix("data: "))
+            for line in served.text.splitlines()
+            if line.startswith("data: {")
+        )
+        (completed,) = tuple(event for event in payloads if event.get("type") == "response.completed")
+        return str(_JSON_OBJECT.validate_python(completed["response"])["id"])
+    return _response_id(served.call.marker)
+
+
 async def test_a_concurrent_mixed_burst_reaches_gemini_with_each_tool_result_in_its_own_form(gateway: Gateway) -> None:
     calls: Final = _calls(
         30, ("chat", "messages", "responses"), lambda index: index % 2 == 0, lambda index: (index // 2) % 2 == 0
@@ -314,7 +326,7 @@ async def test_a_concurrent_mixed_burst_reaches_gemini_with_each_tool_result_in_
         _assert_each_in_its_own_form(wire.drain(), calls)
         landed: Final = _spend_rows_by_model(model, 30)
         assert landed >= {
-            _response_id(call.marker) for call in calls if not (call.endpoint == "messages" and call.stream)
+            _spend_id(item) for item in served if not (item.call.endpoint == "messages" and item.call.stream)
         }
 
 
diff --git a/tests/integration/providers/test_openai_chat_prompt_cache_breakpoint_wire.py b/tests/integration/providers/test_openai_chat_prompt_cache_breakpoint_wire.py
index 807a7461675..858599829ad 100644
--- a/tests/integration/providers/test_openai_chat_prompt_cache_breakpoint_wire.py
+++ b/tests/integration/providers/test_openai_chat_prompt_cache_breakpoint_wire.py
@@ -41,6 +41,7 @@ class _Proxy:
     openai: Wire
     gpt_5_6_with_prompt_cache_options: str
     gpt_5_6_without_prompt_cache_options: str
+    gpt_5_6_dropping_params: str
 
     def openai_receives(
         self, model: str, messages: Sequence[JsonValue], *, stream: bool = False, tools: Sequence[JsonValue] = ()
@@ -79,6 +80,9 @@ def proxy() -> Iterator[_Proxy]:
                 model="openai/gpt-5.6", api_base=api_base, prompt_cache_options={"mode": "explicit"}
             ),
             gpt_5_6_without_prompt_cache_options=scenario.model(model="openai/gpt-5.6", api_base=api_base),
+            gpt_5_6_dropping_params=scenario.model(
+                model="openai/gpt-5.6", api_base=api_base, prompt_cache_options={"mode": "explicit"}, drop_params=True
+            ),
         )
 
 
@@ -202,3 +206,56 @@ def test_custom_api_base_without_prompt_cache_options_forwards_cache_control_unc
     assert received["messages"] == _SYSTEM_AND_USER_WITH_CACHE_CONTROL
     assert "prompt_cache_options" not in received
     assert "prompt_cache_breakpoint" not in str(received)
+
+
+_CLIENT_BREAKPOINTS_ON_PARTS: Final[list[JsonValue]] = [
+    {"type": "text", "text": "Stable rules", "prompt_cache_breakpoint": {"mode": "explicit", "ttl": "1h"}},
+    {"type": "text", "text": "More rules", "prompt_cache_breakpoint": {"mode": "implicit"}},
+    {"type": "text", "text": "Describe this", "prompt_cache_breakpoint": {"mode": "explicit"}},
+]
+_CLIENT_BREAKPOINTS_AS_CHAT_COMPLETIONS_TAKES_THEM: Final[list[JsonValue]] = [
+    {"type": "text", "text": "Stable rules", "prompt_cache_breakpoint": {"mode": "explicit"}},
+    {"type": "text", "text": "More rules"},
+    {"type": "text", "text": "Describe this", "prompt_cache_breakpoint": {"mode": "explicit"}},
+]
+_CHAT_COMPLETIONS_REJECTS_TTL_AND_IMPLICIT: Final = (
+    "live gpt-6.1-sol Chat Completions answers 400 on a part breakpoint with any ttl or mode implicit (2026-10-28)"
+)
+
+
+@pytest.mark.parametrize("stream", [False, True], ids=["unary", "stream"])
+def test_drop_params_cuts_client_breakpoints_down_to_what_chat_completions_takes(proxy: _Proxy, stream: bool) -> None:
+    received: Final = proxy.openai_receives(
+        proxy.gpt_5_6_dropping_params, [{"role": "user", "content": _CLIENT_BREAKPOINTS_ON_PARTS}], stream=stream
+    )
+
+    assert received["messages"] == [
+        {"role": "user", "content": _CLIENT_BREAKPOINTS_AS_CHAT_COMPLETIONS_TAKES_THEM}
+    ], _CHAT_COMPLETIONS_REJECTS_TTL_AND_IMPLICIT
+
+
+def test_without_drop_params_client_breakpoints_reach_openai_unchanged(proxy: _Proxy) -> None:
+    received: Final = proxy.openai_receives(
+        proxy.gpt_5_6_with_prompt_cache_options, [{"role": "user", "content": _CLIENT_BREAKPOINTS_ON_PARTS}]
+    )
+
+    assert received["messages"] == [{"role": "user", "content": _CLIENT_BREAKPOINTS_ON_PARTS}]
+
+
+def test_drop_params_cuts_client_breakpoints_on_v1_messages_routed_to_chat_completions(proxy: _Proxy) -> None:
+    _ = proxy.openai.drain()
+    response: Final = proxy.gateway.request(
+        "POST",
+        "/v1/messages",
+        {
+            "model": proxy.gpt_5_6_dropping_params,
+            "max_tokens": 16,
+            "stop_sequences": ["END"],
+            "messages": [{"role": "user", "content": _CLIENT_BREAKPOINTS_ON_PARTS}],
+        },
+    )
+    assert response.status_code == 200, response.text
+
+    assert proxy.received_by_openai()["messages"] == [
+        {"role": "user", "content": _CLIENT_BREAKPOINTS_AS_CHAT_COMPLETIONS_TAKES_THEM}
+    ], _CHAT_COMPLETIONS_REJECTS_TTL_AND_IMPLICIT
diff --git a/tests/integration/providers/test_responses_bridge_prompt_cache_breakpoint_wire.py b/tests/integration/providers/test_responses_bridge_prompt_cache_breakpoint_wire.py
index 33338cae95d..7ea02435369 100644
--- a/tests/integration/providers/test_responses_bridge_prompt_cache_breakpoint_wire.py
+++ b/tests/integration/providers/test_responses_bridge_prompt_cache_breakpoint_wire.py
@@ -27,8 +27,9 @@ _MALFORMED: Final[tuple[tuple[str, JsonValue], ...]] = (
     ("5kb-string", "x" * 5000),
     ("empty-object", {}),
     ("bogus-mode", {"mode": "bogus"}),
-    ("bad-ttl", {"mode": "explicit", "ttl": "1h"}),
+    ("bogus-mode-with-ttl", {"mode": "bogus", "ttl": "30m"}),
 )
+_UNSUPPORTED_TTL: Final[Mapping[str, JsonValue]] = {"mode": "explicit", "ttl": "1h"}
 _MALFORMED_IDS: Final = tuple(name for name, _ in _MALFORMED)
 _MALFORMED_VALUES: Final = tuple(value for _, value in _MALFORMED)
 _CASES: Final[tuple[tuple[str, Mode, JsonValue, JsonValue], ...]] = (
@@ -192,6 +193,27 @@ def test_marker_with_an_unknown_key(bridge: _Bridge, mode: Mode, expected: JsonV
     bridge.spend.landed(bridge.model(mode), call_id, marker)
 
 
+@pytest.mark.parametrize(
+    ("mode", "expected"), (("on", None), ("off", _UNSUPPORTED_TTL)), ids=("dropped-on", "verbatim-off")
+)
+def test_marker_with_an_unsupported_ttl(bridge: _Bridge, mode: Mode, expected: JsonValue) -> None:
+    marker: Final = uuid.uuid4().hex
+    call_id: Final = _completion(_chat(bridge, bridge.model(mode), [_user(marker, _UNSUPPORTED_TTL)]), marker)
+    pcb.assert_marker(_user_block_on_wire(bridge, marker), expected)
+    bridge.spend.landed(bridge.model(mode), call_id, marker)
+
+
+def test_marker_with_an_unsupported_ttl_keeps_its_mode_on_a_host_opted_in_with_prompt_cache_options(
+    bridge: _Bridge,
+) -> None:
+    marker: Final = uuid.uuid4().hex
+    with bridge.gateway.scenario() as scenario:
+        model: Final = scenario.model(model=pcb.MODEL, api_base=bridge.api_base, drop_params=True, **_OPTED_IN)
+        call_id: Final = _completion(_chat(bridge, model, [_user(marker, _UNSUPPORTED_TTL)]), marker)
+        pcb.assert_marker(_user_block_on_wire(bridge, marker), pcb.EXPLICIT)
+        bridge.spend.landed(model, call_id, marker)
+
+
 def _second_block_on_wire(bridge: _Bridge, marker: str) -> dict[str, JsonValue]:
     request: Final = pcb.posted(bridge.wire, marker)
     _wire_body(request)
diff --git a/tests/integration/providers/test_responses_lifecycle_wire.py b/tests/integration/providers/test_responses_lifecycle_wire.py
index 02269885b44..ac5b4dc6d5c 100644
--- a/tests/integration/providers/test_responses_lifecycle_wire.py
+++ b/tests/integration/providers/test_responses_lifecycle_wire.py
@@ -203,9 +203,6 @@ def test_retrieve_routes_to_the_deployment_that_created_the_response(
 
 @pytest.mark.parametrize("prefix", _ALIASES)
 def test_retrieve_returns_the_id_the_client_holds(gateway: Gateway, prefix: str) -> None:
-    pytest.skip(
-        "BUG: GET /v1/responses/{id} returns a re-encrypted id that differs byte-for-byte from the id the client sent"
-    )
     raw_id: Final = f"resp_retrieve_id_{uuid.uuid4().hex}"
 
     def respond(request: Request) -> Reply:
@@ -697,7 +694,6 @@ def test_delete_returns_the_client_held_id_not_the_provider_id(
     gateway: Gateway,
     prefix: str,
 ) -> None:
-    pytest.skip("BUG: DELETE /v1/responses/{id} returns the raw provider id instead of the proxy-issued id")
     raw_id: Final = f"resp_delete_id_{uuid.uuid4().hex}"
 
     def respond(request: Request) -> Reply:
diff --git a/tests/integration/providers/test_vertex_anthropic_inline_tools_beta_wire.py b/tests/integration/providers/test_vertex_anthropic_inline_tools_beta_wire.py
index 3175f2ec075..00f861678cb 100644
--- a/tests/integration/providers/test_vertex_anthropic_inline_tools_beta_wire.py
+++ b/tests/integration/providers/test_vertex_anthropic_inline_tools_beta_wire.py
@@ -25,7 +25,7 @@ from pydantic import JsonValue, TypeAdapter
 
 _INLINE_TOOLS: Final = "inline-tools-2026-09-15"
 _THINKING: Final = "interleaved-thinking-2025-05-14"
-_VERTEX_UNSUPPORTED: Final = "effort-2025-11-24"
+_VERTEX_UNSUPPORTED: Final = "skills-2025-10-02"
 _UNKNOWN: Final = "not-a-beta-2099-01-01"
 _BACKEND: Final = "claude-opus-5-5"
 _PROJECT: Final = "scripted-project"
diff --git a/tests/integration/routing/test_fallback_hop_foreign_encrypted_reasoning.py b/tests/integration/routing/test_fallback_hop_foreign_encrypted_reasoning.py
index e6ec3444369..ef2a9e5b72f 100644
--- a/tests/integration/routing/test_fallback_hop_foreign_encrypted_reasoning.py
+++ b/tests/integration/routing/test_fallback_hop_foreign_encrypted_reasoning.py
@@ -303,7 +303,7 @@ def scenario_api_base(scenario: Scenario, scenario_id: str, response: StoredResp
 def deployment(
     scenario: Scenario,
     group: str,
-    api_base: str,
+    api_base: str | None,
     *,
     order: int | None,
     model: str = RESPONSES_MODEL,
@@ -316,7 +316,7 @@ def deployment(
             "litellm_params": {
                 "model": model,
                 "api_key": PROVIDER_KEY,
-                "api_base": api_base,
+                **({} if api_base is None else {"api_base": api_base}),
                 **({} if order is None else {"order": order}),
                 **extra_params,
             },
@@ -863,6 +863,38 @@ def test_hop_inside_one_encryption_boundary_keeps_the_reasoning(gateway: Gateway
         assert [body.get("input") for body in bodies] == [history(mark), history(mark)], bodies
 
 
+def test_hop_between_same_key_deployments_on_the_providers_default_endpoint_keeps_the_reasoning(
+    gateway: Gateway, tmp_path: Path
+) -> None:
+    shared: Final = f"default-{uuid.uuid4().hex[:12]}"
+    with (
+        scratch_database() as database,
+        owned_proxy_process(
+            gateway,
+            tmp_path,
+            {"DATABASE_URL": database, "OPENAI_BASE_URL": f"{gateway.upstream_url}/{shared}"},
+            remove_environment=("DIRECT_URL", "DATABASE_URL_READ_REPLICA", "OPENAI_API_BASE"),
+        ) as owned,
+        owned.gateway.scenario() as scenario,
+    ):
+        owned.gateway.post("/config/update", {"router_settings": {"num_retries": 0}})
+        one: Final = scenario_api_base(scenario, f"{shared}-o1", failing()).rsplit("/", 1)[-1]
+        two: Final = scenario_api_base(scenario, f"{shared}-o2", healthy_json()).rsplit("/", 1)[-1]
+        order_one: Final = deployment(
+            scenario, shared, None, order=1, extra_params={"extra_headers": {"x-scripted-scenario": one}}
+        )
+        order_two: Final = deployment(
+            scenario, shared, None, order=2, extra_params={"extra_headers": {"x-scripted-scenario": two}}
+        )
+        mark: Final = marker()
+        answer: Final = responses_answer(
+            owned.gateway, HTTPX, Target(shared, frozenset({order_one, order_two})), history(mark)
+        )
+        assert_served_by(answer, order_two)
+        bodies: Final = bodies_for(observed(owned.gateway), shared)
+        assert [body.get("input") for body in bodies] == [history(mark), history(mark)], bodies
+
+
 def assert_cross_group_hop_stripped(gateway: Gateway, source_scenario: str, target_scenario: str, mark: str) -> None:
     records: Final = observed(gateway)
     assert [body.get("input") for body in bodies_for(records, source_scenario)] == [history(mark)], records
diff --git a/tests/integration/sdk/test_anthropic_json_tool_cut_stream_sync_sdk.py b/tests/integration/sdk/test_anthropic_json_tool_cut_stream_sync_sdk.py
index da091b1c12e..54a6df02edf 100644
--- a/tests/integration/sdk/test_anthropic_json_tool_cut_stream_sync_sdk.py
+++ b/tests/integration/sdk/test_anthropic_json_tool_cut_stream_sync_sdk.py
@@ -10,6 +10,7 @@ from integration._support.wire import Reply, Request, wire_server
 from pydantic import JsonValue
 
 import litellm
+from litellm.exceptions import MidStreamFallbackError
 from litellm.litellm_core_utils.streaming_handler import CustomStreamWrapper
 
 _JSON_TOOL: Final = "json_tool_call"
@@ -122,12 +123,10 @@ def _credentials(model: str) -> dict[str, str]:
 @pytest.mark.parametrize("model", [_ANTHROPIC_MODEL, _BEDROCK_INVOKE_MODEL], ids=["anthropic", "bedrock_invoke"])
 @pytest.mark.parametrize(
     ("shape", "cut"),
-    [("plain", False), ("plain", True), ("wrapped", True)],
-    ids=["plain_complete", "plain_cut", "wrapped_cut"],
+    [("plain", False), ("wrapped", False), ("plain", True), ("wrapped", True)],
+    ids=["plain_complete", "wrapped_complete", "plain_cut", "wrapped_cut"],
 )
-def test_sync_stream_cut_before_the_json_tool_block_closes_still_yields_the_whole_answer(
-    model: str, shape: str, cut: bool
-) -> None:
+def test_sync_json_tool_stream_requires_a_provider_finish_reason(model: str, shape: str, cut: bool) -> None:
     marker_hex: Final = uuid.uuid4().hex
     with wire_server(_peer(marker_hex, shape, cut)) as wire:
         response: Final = litellm.completion(
@@ -141,6 +140,11 @@ def test_sync_stream_cut_before_the_json_tool_block_closes_still_yields_the_whol
             **_credentials(model),
         )
         assert isinstance(response, CustomStreamWrapper), type(response)
+        if cut:
+            with pytest.raises(MidStreamFallbackError, match="Stream ended before a finish_reason was received"):
+                tuple(response)
+            assert len(wire.drain()) == 1
+            return
         text: Final = "".join(str(chunk.choices[0].delta.content or "") for chunk in tuple(response))
         assert len(wire.drain()) == 1
     assert json.loads(text) == _payload(marker_hex), text
diff --git a/tests/integration/security/test_files_batches_access.py b/tests/integration/security/test_files_batches_access.py
index 119055c64c7..93ccc742d58 100644
--- a/tests/integration/security/test_files_batches_access.py
+++ b/tests/integration/security/test_files_batches_access.py
@@ -25,7 +25,7 @@ from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 from integration._support.client import Gateway, Scenario, eventually, object_value, string_value
 from integration._support.database import read_rows
-from integration._support.process import owned_proxy
+from integration._support.process import OwnedState, owned_proxy
 from integration._support.tls import server_context, write_self_signed_cert
 from integration._support.wire import Reply, Request, Wire, wire_server
 from openai import OpenAI, PermissionDeniedError
@@ -250,15 +250,20 @@ def test_stranger_cannot_read_download_or_delete_another_teams_managed_file(gate
         assert _drained_other_than_model_list_probes(wire) == ()
 
 
-def test_stranger_cannot_retrieve_or_cancel_another_teams_managed_batch(gateway: Gateway) -> None:
+@pytest.mark.timeout(180)
+def test_stranger_cannot_retrieve_or_cancel_another_teams_managed_batch(gateway: Gateway, tmp_path: Path) -> None:
     key: Final = "provider-key-" + uuid.uuid4().hex[:8]
-    with wire_server(_openai_backend()) as wire, gateway.scenario() as scenario:
+    with (
+        owned_proxy(gateway, tmp_path, {"PROXY_BATCH_POLLING_ENABLED": "false"}, state=OwnedState.PRIVATE) as candidate,
+        wire_server(_openai_backend()) as wire,
+        candidate.scenario() as scenario,
+    ):
         model: Final = scenario.model(model="openai/gpt-4o-mini", api_base=wire.url + "/v1", api_key=key)
-        _wait_until_every_worker_serves(gateway, model)
+        _wait_until_every_worker_serves(candidate, model)
         owner: Final = _member(scenario, model)
         stranger: Final = _member(scenario, model)
 
-        uploaded: Final = gateway.request_multipart(
+        uploaded: Final = candidate.request_multipart(
             "/v1/files",
             {"purpose": "batch", "target_model_names": model},
             {"file": (INPUT_FILENAME, _jsonl(model), "application/jsonl")},
@@ -266,7 +271,7 @@ def test_stranger_cannot_retrieve_or_cancel_another_teams_managed_batch(gateway:
         )
         assert uploaded.status_code == 200, uploaded.text
         managed_input: Final = string_value(_json(uploaded)["id"])
-        created: Final = gateway.request(
+        created: Final = candidate.request(
             "POST",
             "/v1/batches",
             {"input_file_id": managed_input, "endpoint": "/v1/chat/completions", "completion_window": "24h"},
@@ -277,13 +282,13 @@ def test_stranger_cannot_retrieve_or_cancel_another_teams_managed_batch(gateway:
         wire.drain()
 
         expected_message: Final = f"User {stranger.user} does not have access to the object {unified_batch}"
-        stranger_get: Final = gateway.request("GET", f"/v1/batches/{unified_batch}", key=stranger.key)
+        stranger_get: Final = candidate.request("GET", f"/v1/batches/{unified_batch}", key=stranger.key)
         assert _error_message(stranger_get, 403) == expected_message, stranger_get.text
-        stranger_cancel: Final = gateway.request("POST", f"/v1/batches/{unified_batch}/cancel", {}, key=stranger.key)
+        stranger_cancel: Final = candidate.request("POST", f"/v1/batches/{unified_batch}/cancel", {}, key=stranger.key)
         assert _error_message(stranger_cancel, 403) == expected_message, stranger_cancel.text
         assert _drained_other_than_model_list_probes(wire) == (), "stranger batch calls must not reach the provider"
 
-        owner_cancel: Final = gateway.request("POST", f"/v1/batches/{unified_batch}/cancel", {}, key=owner.key)
+        owner_cancel: Final = candidate.request("POST", f"/v1/batches/{unified_batch}/cancel", {}, key=owner.key)
         assert owner_cancel.status_code == 200, owner_cancel.text
         assert string_value(_json(owner_cancel)["id"]) == unified_batch, owner_cancel.text
         (cancel_request,) = _drained_other_than_model_list_probes(wire)
diff --git a/tests/integration/spend/test_end_user_budget_enforcement.py b/tests/integration/spend/test_end_user_budget_enforcement.py
index 02c8aee8f5e..92259d463b9 100644
--- a/tests/integration/spend/test_end_user_budget_enforcement.py
+++ b/tests/integration/spend/test_end_user_budget_enforcement.py
@@ -258,9 +258,20 @@ def _observed(upstream: httpx.Client) -> list[JsonValue]:
     return requests
 
 
-def _denial_error(denied: httpx.Response) -> dict[str, JsonValue]:
+def _denial_error(denied: httpx.Response, route: str) -> dict[str, JsonValue]:
     assert denied.status_code == 422, denied.text
-    return object_value(object_value(denied.json())["error"])
+    if route == "/v1/messages":
+        body: Final = object_value(denied.json())
+        assert body["type"] == "error", denied.text
+        anthropic_error: Final = object_value(body["error"])
+        assert anthropic_error["type"] == "invalid_request_error", denied.text
+        assert "param" not in anthropic_error and "code" not in anthropic_error, denied.text
+        return anthropic_error
+    openai_error: Final = object_value(object_value(denied.json())["error"])
+    assert openai_error["type"] == "budget_exceeded", denied.text
+    assert openai_error["param"] is None
+    assert openai_error["code"] == "422"
+    return openai_error
 
 
 def _prove_end_user_budget_lockout(
@@ -304,8 +315,7 @@ def _prove_end_user_budget_lockout(
     upstream.delete("/__observations").raise_for_status()
     denied: Final = _send(gateway, spelling, deployment, key, end_user_id, f"denied {end_user_id}")
     assert _observed(upstream) == [], denied.text
-    error: Final = _denial_error(denied)
-    assert error["type"] == "budget_exceeded", denied.text
+    error: Final = _denial_error(denied, spelling.route)
     matched: Final = re.fullmatch(
         rf"ExceededBudget: End User={re.escape(end_user_id)} over budget\. "
         rf"Spend=([-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?), Budget=0\.05",
diff --git a/tests/integration/spend/test_end_user_spend_without_proxy_user.py b/tests/integration/spend/test_end_user_spend_without_proxy_user.py
index 94884717092..725c809006a 100644
--- a/tests/integration/spend/test_end_user_spend_without_proxy_user.py
+++ b/tests/integration/spend/test_end_user_spend_without_proxy_user.py
@@ -120,6 +120,18 @@ def _assert_budget_refusal(response: httpx.Response, end_user: str) -> None:
     ]
 
 
+def _assert_messages_budget_refusal(response: httpx.Response, end_user: str) -> None:
+    assert response.status_code == 422, response.text
+    body: Final = _json_object(response.content)
+    assert body["type"] == "error", response.text
+    error: Final = object_value(body["error"])
+    assert error["type"] == "invalid_request_error"
+    assert "param" not in error and "code" not in error, response.text
+    assert str(error["message"]).startswith(f"ExceededBudget: End User={end_user} over budget. Spend="), error[
+        "message"
+    ]
+
+
 def _json_object(raw: bytes) -> dict[str, JsonValue]:
     return _JSON_OBJECT.validate_json(raw)
 
@@ -345,7 +357,7 @@ def test_anthropic_messages_metadata_user_id_is_charged_and_budget_enforced(gate
             json={**body, "messages": [{"role": "user", "content": f"again {uuid.uuid4().hex}"}]},
             headers={"x-api-key": key, "anthropic-version": "2023-06-01"},
         )
-        _assert_budget_refusal(denied, end_user)
+        _assert_messages_budget_refusal(denied, end_user)
         assert _observed(upstream) == []
 
 
diff --git a/tests/integration/spend/test_responses_stream_spend_row_id.py b/tests/integration/spend/test_responses_stream_spend_row_id.py
new file mode 100644
index 00000000000..58ed9f7785f
--- /dev/null
+++ b/tests/integration/spend/test_responses_stream_spend_row_id.py
@@ -0,0 +1,465 @@
+import json
+from collections.abc import Mapping
+from datetime import datetime, timedelta, timezone
+from hashlib import sha256
+from pathlib import Path
+from types import MappingProxyType
+from typing import Final
+from uuid import uuid4
+
+import httpx
+import pytest
+import yaml
+from integration._support.client import JSON_OBJECT, Gateway, eventually, list_value, object_value, string_value
+from integration._support.process import owned_proxy
+from integration._support.responses_stream import frame, response_object
+from integration._support.wire import Reply, Request, wire_server
+from pydantic import JsonValue, TypeAdapter
+
+_NATIVE_MODEL: Final = "openai/gpt-5.6"
+_BRIDGED_MODEL: Final = "deepseek/deepseek-v4-pro"
+_ANSWER: Final = "streamed answer"
+_USAGE: Final[dict[str, JsonValue]] = {"input_tokens": 30, "output_tokens": 5, "total_tokens": 35}
+_JSON_LIST: Final = TypeAdapter(list[dict[str, JsonValue]])
+
+
+def _sse(payload: dict[str, JsonValue]) -> bytes:
+    return f"data: {json.dumps(payload)}\n\n".encode()
+
+
+def _native_completed(upstream_id: str) -> dict[str, JsonValue]:
+    message: Final[dict[str, JsonValue]] = {
+        "type": "message",
+        "id": "msg_1",
+        "status": "completed",
+        "role": "assistant",
+        "content": [{"type": "output_text", "text": _ANSWER, "annotations": []}],
+    }
+    return response_object(upstream_id, "completed", output=[message], usage=_USAGE)
+
+
+def _native_stream(upstream_id: str) -> Reply:
+    return Reply(
+        content_type="text/event-stream",
+        chunks=(
+            frame(
+                {
+                    "type": "response.created",
+                    "sequence_number": 0,
+                    "response": response_object(upstream_id, "in_progress"),
+                }
+            ),
+            frame(
+                {
+                    "type": "response.output_text.delta",
+                    "sequence_number": 1,
+                    "item_id": "msg_1",
+                    "output_index": 0,
+                    "content_index": 0,
+                    "delta": _ANSWER,
+                }
+            ),
+            frame({"type": "response.completed", "sequence_number": 2, "response": _native_completed(upstream_id)}),
+        ),
+    )
+
+
+def _chat_stream(upstream_id: str, model: str) -> Reply:
+    def chunk(delta: dict[str, JsonValue], finish_reason: str | None) -> dict[str, JsonValue]:
+        return {
+            "id": upstream_id,
+            "object": "chat.completion.chunk",
+            "created": 1,
+            "model": model,
+            "choices": [{"index": 0, "delta": delta, "finish_reason": finish_reason}],
+        }
+
+    return Reply(
+        content_type="text/event-stream",
+        chunks=(
+            _sse(chunk({"role": "assistant", "content": _ANSWER}, None)),
+            _sse(
+                {
+                    **chunk({}, "stop"),
+                    "usage": {"prompt_tokens": 30, "completion_tokens": 5, "total_tokens": 35},
+                }
+            ),
+            b"data: [DONE]\n\n",
+        ),
+    )
+
+
+def _respond(request: Request) -> Reply:
+    if request.method == "GET" and request.target == "/v1/models":
+        return Reply(body=json.dumps({"object": "list", "data": []}).encode())
+    if request.method == "GET":
+        stored_id: Final = request.target.removeprefix("/v1/responses/")
+        assert stored_id.startswith("resp_upstream-"), request.target
+        return Reply(body=json.dumps(_native_completed(stored_id)).encode())
+    if request.target.endswith("/cancel"):
+        cancelled_id: Final = request.target.removeprefix("/v1/responses/").removesuffix("/cancel")
+        assert cancelled_id.startswith("resp_upstream-"), request.target
+        return Reply(body=json.dumps(response_object(cancelled_id, "cancelled")).encode())
+    body: Final = JSON_OBJECT.validate_json(request.body)
+    upstream_id: Final = f"upstream-{uuid4().hex}"
+    if request.target == "/v1/responses" and body.get("stream") is not True:
+        return Reply(body=json.dumps(_native_completed(f"resp_{upstream_id}")).encode())
+    assert body.get("stream") is True, body
+    if request.target == "/v1/responses":
+        return _native_stream(f"resp_{upstream_id}")
+    assert request.target == "/v1/chat/completions", request.target
+    return _chat_stream(f"chatcmpl-{upstream_id}", string_value(body["model"]))
+
+
+def _terminal_response_id(
+    gateway: Gateway, key: str, body: dict[str, JsonValue], headers: Mapping[str, str] | None = None
+) -> str:
+    response: Final = gateway.request("POST", "/v1/responses", body, key=key, headers=headers)
+    assert response.status_code == 200, response.text
+    frames: Final = tuple(
+        JSON_OBJECT.validate_json(line.removeprefix("data: "))
+        for line in response.text.splitlines()
+        if line.startswith("data: ") and line != "data: [DONE]"
+    )
+    assert frames and frames[-1]["type"] == "response.completed", response.text
+    advertised: Final = tuple(
+        dict.fromkeys(string_value(object_value(event["response"])["id"]) for event in frames if "response" in event)
+    )
+    assert len(advertised) == 1, advertised
+    return advertised[0]
+
+
+def _created_response_id(
+    gateway: Gateway, key: str, body: dict[str, JsonValue], headers: Mapping[str, str] | None = None
+) -> str:
+    if body.get("stream") is True:
+        return _terminal_response_id(gateway, key, body, headers)
+    response: Final = gateway.request("POST", "/v1/responses", body, key=key, headers=headers)
+    assert response.status_code == 200, response.text
+    return string_value(JSON_OBJECT.validate_json(response.content)["id"])
+
+
+def _read_and_cancel(
+    gateway: Gateway, key: str, response_id: str, headers: Mapping[str, str] | None = None
+) -> tuple[httpx.Response, ...]:
+    responses: Final = tuple(
+        gateway.request(method, path, key=key, headers=headers)
+        for method, path in (
+            ("GET", f"/v1/responses/{response_id}"),
+            ("GET", f"/v1/responses/{response_id}"),
+            ("POST", f"/v1/responses/{response_id}/cancel"),
+        )
+    )
+    assert [response.status_code for response in responses] == [200, 200, 200], [r.text for r in responses]
+    return responses
+
+
+def _spend_logs_lookup(gateway: Gateway, request_id: str) -> list[JsonValue]:
+    response: Final = gateway.request("GET", "/spend/logs", params={"request_id": request_id})
+    assert response.status_code == 200, response.text
+    return [row["request_id"] for row in _JSON_LIST.validate_json(response.content)]
+
+
+def _request_ids_for_key(gateway: Gateway, key: str, count: int) -> list[str]:
+    rows: Final = eventually(
+        lambda: gateway.rows(
+            'SELECT request_id FROM "LiteLLM_SpendLogs" WHERE api_key=%s ORDER BY "endTime"',
+            (sha256(key.encode()).hexdigest(),),
+        ),
+        lambda found: len(found) >= count,
+        seconds=70,
+    )
+    return [string_value(row["request_id"]) for row in rows]
+
+
+def _logs_page_search(gateway: Gateway, client_id: str) -> list[str]:
+    now: Final = datetime.now(timezone.utc)
+    page: Final = gateway.get(
+        "/spend/logs/ui",
+        params={
+            "search": client_id,
+            "start_date": (now - timedelta(days=1)).strftime("%Y-%m-%d %H:%M:%S"),
+            "end_date": (now + timedelta(days=1)).strftime("%Y-%m-%d %H:%M:%S"),
+        },
+    )
+    return [string_value(object_value(row)["request_id"]) for row in list_value(page["data"])]
+
+
+@pytest.mark.timeout(120)
+@pytest.mark.parametrize("litellm_model", [_NATIVE_MODEL, _BRIDGED_MODEL], ids=["native", "bridge"])
+def test_streamed_responses_spend_row_is_filed_under_the_id_the_client_saw(
+    gateway: Gateway, litellm_model: str
+) -> None:
+    with wire_server(_respond) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(model=litellm_model, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        key: Final = scenario.key(models=[model])
+
+        client_id: Final = _terminal_response_id(
+            gateway, key, {"model": model, "input": f"marker-{uuid4().hex}", "stream": True}
+        )
+
+        assert client_id.startswith("resp_"), client_id
+        assert _request_ids_for_key(gateway, key, 1) == [client_id]
+        assert _logs_page_search(gateway, client_id) == [client_id]
+        assert _spend_logs_lookup(gateway, client_id) == [client_id]
+
+
+def _proxy_config(
+    directory: Path,
+    general_settings: Mapping[str, JsonValue],
+    litellm_settings: Mapping[str, JsonValue] = MappingProxyType({}),
+) -> Path:
+    stock: Final = JSON_OBJECT.validate_python(yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()))
+    path: Final = directory / "responses-spend.yaml"
+    path.write_text(
+        yaml.safe_dump(
+            {
+                **stock,
+                "general_settings": {**object_value(stock["general_settings"]), **general_settings},
+                "litellm_settings": {**object_value(stock["litellm_settings"]), **litellm_settings},
+            }
+        )
+    )
+    return path
+
+
+def _prompt_storing_config(directory: Path) -> Path:
+    return _proxy_config(directory, {"store_prompts_in_spend_logs": True})
+
+
+def test_a_follow_up_turn_on_a_streamed_bridged_response_replays_the_first_turn(
+    gateway: Gateway, tmp_path: Path
+) -> None:
+    first_prompt: Final = f"first turn {uuid4().hex}"
+    with (
+        wire_server(_respond) as wire,
+        owned_proxy(gateway, tmp_path, {}, config=_prompt_storing_config(tmp_path)) as storing,
+        storing.scenario() as scenario,
+    ):
+        model: Final = scenario.model(model=_BRIDGED_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        key: Final = scenario.key(models=[model])
+        first_id: Final = _terminal_response_id(storing, key, {"model": model, "input": first_prompt, "stream": True})
+        assert _request_ids_for_key(storing, key, 1) == [first_id]
+        wire.drain()
+
+        second_id: Final = _terminal_response_id(
+            storing,
+            key,
+            {"model": model, "input": "second turn", "previous_response_id": first_id, "stream": True},
+        )
+
+        replayed: Final = _JSON_LIST.validate_python(JSON_OBJECT.validate_json(wire.drain()[-1].body)["messages"])
+        assert [(message["role"], message["content"]) for message in replayed] == [
+            ("user", first_prompt),
+            ("assistant", _ANSWER),
+            ("user", "second turn"),
+        ], replayed
+        assert _request_ids_for_key(storing, key, 2) == [first_id, second_id]
+
+
+@pytest.mark.timeout(180)
+@pytest.mark.parametrize("stream_first_turn", [True, False], ids=["streamed-first-turn", "non-streamed-first-turn"])
+def test_a_follow_up_through_the_id_a_retrieve_returned_replays_the_first_turn_once(
+    gateway: Gateway, tmp_path: Path, stream_first_turn: bool
+) -> None:
+    first_prompt: Final = f"first turn {uuid4().hex}"
+    with (
+        wire_server(_respond) as wire,
+        owned_proxy(gateway, tmp_path, {}, config=_prompt_storing_config(tmp_path)) as storing,
+        storing.scenario() as scenario,
+    ):
+        native: Final = scenario.model(model=_NATIVE_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        bridged: Final = scenario.model(model=_BRIDGED_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        key: Final = scenario.key(models=[native, bridged])
+        first_id: Final = _created_response_id(
+            storing, key, {"model": native, "input": first_prompt, "stream": stream_first_turn}
+        )
+
+        retrieved: Final = storing.request("GET", f"/v1/responses/{first_id}", key=key)
+
+        assert retrieved.status_code == 200, retrieved.text
+        retrieved_id: Final = string_value(JSON_OBJECT.validate_json(retrieved.content)["id"])
+        assert retrieved_id == first_id
+        stored: Final = _request_ids_for_key(storing, key, 2)
+        assert stored.count(first_id) == 1, stored
+        assert len(set(stored)) == 2, stored
+        assert _spend_logs_lookup(storing, first_id) == [first_id]
+        wire.drain()
+
+        _terminal_response_id(
+            storing,
+            key,
+            {"model": bridged, "input": "second turn", "previous_response_id": retrieved_id, "stream": True},
+        )
+
+        replayed: Final = _JSON_LIST.validate_python(JSON_OBJECT.validate_json(wire.drain()[-1].body)["messages"])
+        assert [(message["role"], message["content"]) for message in replayed] == [
+            ("user", first_prompt),
+            ("assistant", _ANSWER),
+            ("user", "second turn"),
+        ], replayed
+
+
+def _replayed_turns(wire_body: bytes) -> list[tuple[JsonValue, JsonValue]]:
+    replayed: Final = _JSON_LIST.validate_python(JSON_OBJECT.validate_json(wire_body)["messages"])
+    return [(message["role"], message["content"]) for message in replayed]
+
+
+@pytest.mark.timeout(180)
+@pytest.mark.parametrize("reader", ["proxy-admin", "master-key"])
+def test_a_reader_other_than_the_creator_continues_through_the_id_its_retrieve_returned(
+    gateway: Gateway, tmp_path: Path, reader: str
+) -> None:
+    first_prompt: Final = f"first turn {uuid4().hex}"
+    with (
+        wire_server(_respond) as wire,
+        owned_proxy(gateway, tmp_path, {}, config=_prompt_storing_config(tmp_path)) as storing,
+        storing.scenario() as scenario,
+    ):
+        native: Final = scenario.model(model=_NATIVE_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        bridged: Final = scenario.model(model=_BRIDGED_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        creator: Final = scenario.key(user_id=scenario.user(), models=[native, bridged])
+        reader_key: Final = (
+            scenario.key(user_id=scenario.user(user_role="proxy_admin"), models=[native, bridged])
+            if reader == "proxy-admin"
+            else storing.key
+        )
+        first_id: Final = _terminal_response_id(
+            storing, creator, {"model": native, "input": first_prompt, "stream": True}
+        )
+        assert _request_ids_for_key(storing, creator, 1) == [first_id]
+
+        retrieved: Final = storing.request("GET", f"/v1/responses/{first_id}", key=reader_key)
+
+        assert retrieved.status_code == 200, retrieved.text
+        retrieved_id: Final = string_value(JSON_OBJECT.validate_json(retrieved.content)["id"])
+        wire.drain()
+        _terminal_response_id(
+            storing,
+            reader_key,
+            {"model": bridged, "input": "second turn", "previous_response_id": retrieved_id, "stream": True},
+        )
+        assert _replayed_turns(wire.drain()[-1].body) == [
+            ("user", first_prompt),
+            ("assistant", _ANSWER),
+            ("user", "second turn"),
+        ]
+        assert retrieved_id == first_id
+
+
+@pytest.mark.timeout(180)
+def test_reads_and_cancels_sent_with_a_session_header_add_no_replayed_turns(gateway: Gateway, tmp_path: Path) -> None:
+    first_prompt: Final = f"first turn {uuid4().hex}"
+    session: Final = {"x-litellm-session-id": f"session-{uuid4().hex}"}
+    with (
+        wire_server(_respond) as wire,
+        owned_proxy(gateway, tmp_path, {}, config=_prompt_storing_config(tmp_path)) as storing,
+        storing.scenario() as scenario,
+    ):
+        native: Final = scenario.model(model=_NATIVE_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        bridged: Final = scenario.model(model=_BRIDGED_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        key: Final = scenario.key(models=[native, bridged])
+        first_id: Final = _created_response_id(storing, key, {"model": native, "input": first_prompt}, session)
+
+        _read_and_cancel(storing, key, first_id, session)
+
+        assert len(_request_ids_for_key(storing, key, 4)) == 4
+        wire.drain()
+        _terminal_response_id(
+            storing,
+            key,
+            {"model": bridged, "input": "second turn", "previous_response_id": first_id, "stream": True},
+            session,
+        )
+        assert _replayed_turns(wire.drain()[-1].body) == [
+            ("user", first_prompt),
+            ("assistant", _ANSWER),
+            ("user", "second turn"),
+        ]
+
+
+@pytest.mark.timeout(180)
+def test_each_read_and_cancel_reaches_callbacks_and_spend_logs_under_an_id_of_its_own(
+    gateway: Gateway, tmp_path: Path
+) -> None:
+    logged_call_types: Final = frozenset({"aresponses", "aget_responses", "acancel_responses"})
+    with (
+        wire_server(_respond) as wire,
+        wire_server(lambda _: Reply()) as sink,
+        owned_proxy(
+            gateway,
+            tmp_path,
+            {"GENERIC_LOGGER_ENDPOINT": sink.url},
+            config=_proxy_config(tmp_path, {}, {"callbacks": ["generic_api"], "DEFAULT_FLUSH_INTERVAL_SECONDS": 1}),
+        ) as logging_proxy,
+        logging_proxy.scenario() as scenario,
+    ):
+        model: Final = scenario.model(model=_NATIVE_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        key: Final = scenario.key(models=[model])
+        first_id: Final = _created_response_id(logging_proxy, key, {"model": model, "input": f"marker-{uuid4().hex}"})
+
+        reads: Final = _read_and_cancel(logging_proxy, key, first_id)
+
+        assert [string_value(JSON_OBJECT.validate_json(read.content)["id"]) for read in reads] == [first_id] * 3
+        batches: Final[list[bytes]] = []  # mutable-ok: drain() consumes, later polls keep earlier batches
+
+        def delivered() -> tuple[tuple[str, str], ...]:
+            batches.extend(batch.body for batch in sink.drain())
+            return tuple(
+                (string_value(event["call_type"]), string_value(event["id"]))
+                for event in (object_value(item) for batch in batches for item in _JSON_LIST.validate_json(batch))
+                if event["call_type"] in logged_call_types
+            )
+
+        events: Final = eventually(delivered, lambda found: len(found) >= 4, seconds=30)
+        read_ids: Final = [logged_id for call_type, logged_id in events if call_type != "aresponses"]
+        assert [logged_id for call_type, logged_id in events if call_type == "aresponses"] == [first_id], events
+        assert len(read_ids) == 3, events
+        assert first_id not in read_ids, events
+        assert len(set(read_ids)) == 3, events
+        assert sorted(_request_ids_for_key(logging_proxy, key, 4)) == sorted([first_id, *read_ids])
+
+
+@pytest.mark.timeout(240)
+def test_with_id_security_off_reads_and_cancels_add_no_rows_and_no_replayed_turns(
+    gateway: Gateway, tmp_path: Path
+) -> None:
+    first_prompt: Final = f"first turn {uuid4().hex}"
+    session: Final = {"x-litellm-session-id": f"session-{uuid4().hex}"}
+    with (
+        wire_server(_respond) as wire,
+        owned_proxy(
+            gateway,
+            tmp_path,
+            {},
+            config=_proxy_config(
+                tmp_path, {"store_prompts_in_spend_logs": True, "disable_responses_id_security": True}
+            ),
+        ) as insecure,
+        insecure.scenario() as scenario,
+    ):
+        native: Final = scenario.model(model=_NATIVE_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        bridged: Final = scenario.model(model=_BRIDGED_MODEL, api_base=f"{wire.url}/v1", api_key="synthetic-key")
+        key: Final = scenario.key(models=[native, bridged])
+        first_id: Final = _created_response_id(insecure, key, {"model": native, "input": first_prompt}, session)
+
+        reads: Final = _read_and_cancel(insecure, key, first_id, session)
+
+        assert [string_value(JSON_OBJECT.validate_json(read.content)["id"]) for read in reads] == [first_id] * 3
+        later_id: Final = _created_response_id(insecure, key, {"model": native, "input": "a later request"})
+        assert _request_ids_for_key(insecure, key, 2) == [first_id, later_id]
+        wire.drain()
+
+        _terminal_response_id(
+            insecure,
+            key,
+            {"model": bridged, "input": "second turn", "previous_response_id": first_id, "stream": True},
+            session,
+        )
+
+        replayed: Final = _JSON_LIST.validate_python(JSON_OBJECT.validate_json(wire.drain()[-1].body)["messages"])
+        assert [(message["role"], message["content"]) for message in replayed] == [
+            ("user", first_prompt),
+            ("assistant", _ANSWER),
+            ("user", "second turn"),
+        ], replayed
diff --git a/tests/test_litellm_rust/messages/test_dispatch.py b/tests/test_litellm_rust/messages/test_dispatch.py
index 5b11e628b8d..6d65f289524 100644
--- a/tests/test_litellm_rust/messages/test_dispatch.py
+++ b/tests/test_litellm_rust/messages/test_dispatch.py
@@ -569,6 +569,12 @@ async def test_strict_tools_stay_native_unless_python_could_drop_strict(
 
 ASYNC_ONLY_FEATURES: Final = (
     pytest.param(Feature.PRE_REQUEST_HOOK, {}, {"callbacks": [_Rewrite()]}, id="pre-request-hook"),
+    pytest.param(
+        Feature.FOUNDRY_BETA_ROW,
+        {"api_base": "https://team.services.ai.azure.com/anthropic"},
+        {},
+        id="foundry-beta-row",
+    ),
     pytest.param(
         Feature.WEBSEARCH_INTERCEPTION, {}, {"callbacks": [WebSearchInterceptionLogger()]}, id="websearch-interception"
     ),
diff --git a/tests/unit/anthropic_interface/exceptions/test_exception_mapping_utils.py b/tests/unit/anthropic_interface/exceptions/test_exception_mapping_utils.py
index 0d8e7674e7d..210ab6717aa 100644
--- a/tests/unit/anthropic_interface/exceptions/test_exception_mapping_utils.py
+++ b/tests/unit/anthropic_interface/exceptions/test_exception_mapping_utils.py
@@ -63,10 +63,16 @@ class TestCreateErrorResponse:
         )
         assert response["request_id"] == "req_123"
 
-    def test_unknown_status_defaults_to_api_error(self):
-        """Test unknown status code defaults to api_error."""
-        response = AnthropicExceptionMapping.create_error_response(418, "I'm a teapot")
+    @pytest.mark.parametrize("status_code", [402, 405, 409, 418, 422, 504])
+    def test_a_status_outside_the_table_stays_an_api_error_for_the_sdk_and_stream_frames(self, status_code: int):
+        response: Final = AnthropicExceptionMapping.create_error_response(status_code, "scripted status")
+        frame: Final = anthropic_error_sse_frame(status_code=status_code, raw_message="scripted status")
         assert response["error"]["type"] == "api_error"
+        assert frame.error_response["error"]["type"] == "api_error"
+
+    def test_an_explicit_error_type_wins_over_the_status_table(self):
+        response: Final = AnthropicExceptionMapping.create_error_response(402, "Budget exceeded", error_type="billing_error")
+        assert response["error"]["type"] == "billing_error"
 
 
 class TestExtractErrorMessage:
diff --git a/tests/unit/caching/test_caching.py b/tests/unit/caching/test_caching.py
index 0f6ef2304fb..0911d5ef888 100644
--- a/tests/unit/caching/test_caching.py
+++ b/tests/unit/caching/test_caching.py
@@ -472,6 +472,30 @@ def test_cache_key_tells_apart_requests_that_differ_only_in_continuation_token()
     assert cache.get_cache_key(**request, continuation_token="") == first_segment_key
 
 
+def test_cache_key_tells_apart_requests_that_ask_for_token_ids() -> None:
+    cache: Final = Cache(type=LiteLLMCacheType.LOCAL)
+    request: Final = {"model": "hosted_vllm/qwen3", "messages": [{"role": "user", "content": "count"}]}
+
+    plain_key: Final = cache.get_cache_key(**request)
+
+    assert cache.get_cache_key(**request, return_token_ids=True) != plain_key
+    assert cache.get_cache_key(**request, return_token_ids=False) == plain_key
+    assert cache.get_cache_key(**request, return_token_ids=None) == plain_key
+
+
+def test_cache_key_tells_apart_requests_that_ask_for_token_ids_through_extra_body() -> None:
+    cache: Final = Cache(type=LiteLLMCacheType.LOCAL)
+    request: Final = {"model": "hosted_vllm/qwen3", "messages": [{"role": "user", "content": "count"}]}
+
+    plain_key: Final = cache.get_cache_key(**request)
+    other_extra_body_key: Final = cache.get_cache_key(**request, extra_body={"top_k": 5})
+
+    assert cache.get_cache_key(**request, extra_body={"return_token_ids": True}) != plain_key
+    assert cache.get_cache_key(**request, extra_body={"top_k": 5, "return_token_ids": True}) != other_extra_body_key
+    assert cache.get_cache_key(**request, extra_body={"return_token_ids": False}) == plain_key
+    assert cache.get_cache_key(**request, extra_body={"continuation_token": "abc"}) != plain_key
+
+
 def test_cache_key_tells_apart_requests_that_differ_only_in_tool_call_id_shape() -> None:
     cache: Final = Cache(type=LiteLLMCacheType.LOCAL)
     request: Final = {
diff --git a/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py b/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py
index 4e6ed16e360..558350a790a 100644
--- a/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py
+++ b/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py
@@ -5884,9 +5884,9 @@ _HAND_WRITTEN_PROMPT_CACHE_BREAKPOINT_BLOCKS: Final = (
 )
 
 
-def test_convert_chat_completion_messages_to_responses_api_drops_malformed_prompt_cache_breakpoint_under_drop_params():
-    """OpenAI's Responses API answered "Supported values are: '30m'" for a 1h breakpoint ttl on 2026-10-07,
-    so an unsupported ttl drops the marker as a unit while an unknown key is dropped from a valid one."""
+def test_convert_chat_completion_messages_to_responses_api_drops_only_an_unreadable_prompt_cache_breakpoint_under_drop_params():
+    """The target's Responses config decides which ttl and keys its API takes, so the bridge keeps every marker
+    whose mode some target reads."""
     handler = LiteLLMResponsesTransformationHandler()
     messages = [{"role": "user", "content": list(_HAND_WRITTEN_PROMPT_CACHE_BREAKPOINT_BLOCKS)}]
 
@@ -5899,12 +5899,12 @@ def test_convert_chat_completion_messages_to_responses_api_drops_malformed_promp
         None,
         None,
         None,
-        None,
-        {"mode": "explicit"},
+        {"mode": "explicit", "ttl": "1h"},
+        {"mode": "explicit", "scope": "all"},
         {"mode": "explicit", "ttl": "30m"},
         {"mode": "explicit"},
     ]
-    assert all("prompt_cache_breakpoint" not in block for block in content[:4])
+    assert all("prompt_cache_breakpoint" not in block for block in content[:3])
 
 
 def test_convert_chat_completion_messages_to_responses_api_keeps_malformed_prompt_cache_breakpoint_by_default():
@@ -5937,6 +5937,41 @@ def test_transform_request_drop_params_in_litellm_params_gates_the_prompt_cache_
     assert "prompt_cache_breakpoint" not in result["input"][0]["content"][0]
 
 
+_TTL_MARKED_CONTENT: Final = (
+    {"type": "text", "text": "unsupported ttl", "prompt_cache_breakpoint": {"mode": "explicit", "ttl": "1h"}},
+    {"type": "text", "text": "well formed", "prompt_cache_breakpoint": {"mode": "explicit"}},
+)
+
+
+@pytest.mark.parametrize(
+    "global_drop_params,deployment_drop_params,expected",
+    [
+        ("true", None, [None, {"mode": "explicit"}]),
+        (False, True, [{"mode": "explicit", "ttl": "1h"}, {"mode": "explicit"}]),
+        (True, None, [{"mode": "explicit", "ttl": "1h"}, {"mode": "explicit"}]),
+    ],
+    ids=("string-global-target-keeps-raw-markers", "deployment-drop-params", "global-drop-params"),
+)
+def test_transform_request_hands_a_marker_to_the_target_whole_only_when_the_target_trims_it(
+    monkeypatch: pytest.MonkeyPatch,
+    global_drop_params: object,
+    deployment_drop_params: bool | None,
+    expected: list[object],
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", global_drop_params)
+    request: Final = LiteLLMResponsesTransformationHandler().transform_request(
+        model="gpt-6.1-sol",
+        messages=[{"role": "user", "content": list(_TTL_MARKED_CONTENT)}],
+        optional_params={},
+        litellm_params={"custom_llm_provider": "openai", "drop_params": deployment_drop_params},
+        headers={},
+        litellm_logging_obj=Mock(),
+    )
+    (item,) = cast(list[dict[str, object]], request["input"])  # cast-ok: the bridge emits message item mappings
+    parts: Final = cast(list[dict[str, object]], item["content"])  # cast-ok: message items carry content parts
+    assert [part.get("prompt_cache_breakpoint") for part in parts] == expected
+
+
 def test_convert_response_output_folds_two_messages_and_function_call_into_one_choice() -> None:
     first: Final = ResponseOutputMessage.model_validate(
         {
diff --git a/tests/unit/enterprise/proxy/test_managed_files_hook.py b/tests/unit/enterprise/proxy/test_managed_files_hook.py
index 89fff365c3f..942433b39fb 100644
--- a/tests/unit/enterprise/proxy/test_managed_files_hook.py
+++ b/tests/unit/enterprise/proxy/test_managed_files_hook.py
@@ -9,18 +9,24 @@ import asyncio
 import base64
 import json
 import logging
+from collections.abc import Callable, Mapping
 from types import MappingProxyType
 
 import pytest
-from typing import Final, Optional
+from typing import TYPE_CHECKING, Final, Optional
 from unittest.mock import AsyncMock, MagicMock, patch
 
+from litellm._internal_context import internal_parent_request_id, is_internal_call
 from litellm.llms.base_llm.files.transformation import FileListModelScope
 from litellm.proxy._types import LitellmUserRoles, ProxyException, UserAPIKeyAuth
 from litellm.proxy.openai_files_endpoints.common_utils import BATCH_CREATE_HIDDEN_PARAM
+from litellm.responses.streaming_iterator import drain_logging_tasks
 from litellm.types.llms.openai import FileListPage, OpenAIFileObject
 from litellm.types.utils import LiteLLMBatch
 
+if TYPE_CHECKING:
+    from litellm_enterprise.proxy.hooks.managed_files import PROXY_LiteLLMManagedFiles
+
 
 def _make_file_object(file_id: str = "file-output-abc") -> OpenAIFileObject:
     return OpenAIFileObject(
@@ -2268,3 +2274,324 @@ async def test_batch_create_hook_passes_the_router_deployment_as_creating_model_
     first, second = managed_files.store_unified_object_id.await_args_list
     assert first.kwargs["creating_model_id"] == "deploy-team-b"
     assert second.kwargs["creating_model_id"] is None
+
+
+class _FakeFilesRouter:
+    def __init__(
+        self,
+        deployments_by_model: Mapping[str, tuple[str, ...]],
+        delete_error: Exception | None = None,
+        delete_gate: asyncio.Event | None = None,
+        provider: str = "openai",
+        gone_file_ids: frozenset[str] = frozenset(),
+    ) -> None:
+        self.deployments_by_model = deployments_by_model
+        self.delete_error = delete_error
+        self.gone_file_ids = gone_file_ids
+        self.delete_gate = delete_gate
+        self.provider = provider
+        self.upload_count = 0
+        self.deletes: tuple[tuple[str, str, Mapping[str, object], Mapping[str, str]], ...] = ()
+        self.deletes_marked_internal: tuple[bool, ...] = ()
+        self.delete_parent_request_ids: tuple[str | None, ...] = ()
+
+    async def acreate_file(
+        self,
+        model: str,
+        file: tuple[str, bytes, str],
+        purpose: str,
+        litellm_metadata: Mapping[str, object],
+    ) -> OpenAIFileObject:
+        deployment_ids: Final = self.deployments_by_model[model]
+        provider_file_ids: Final = tuple(
+            f"file-upload-{self.upload_count + offset + 1}" for offset in range(len(deployment_ids))
+        )
+        self.upload_count += len(deployment_ids)
+        response: Final = _make_file_object(provider_file_ids[0]).model_copy(update={"purpose": purpose})
+        response._hidden_params = {
+            "model_id": deployment_ids[0],
+            "custom_llm_provider": self.provider,
+            "model_file_id_mapping": dict(zip(deployment_ids, provider_file_ids)),
+            "litellm_call_id": f"call-of-{provider_file_ids[0]}",
+        }
+        return response
+
+    def registry(self) -> "_FakeFilesRouter":
+        return self
+
+    def credentials(self, model_id: str, form: str) -> dict[str, str]:
+        assert form == "with_provider"
+        return {"custom_llm_provider": self.provider, "api_key": f"key-of-{model_id}"}
+
+    async def afile_delete(
+        self,
+        model: str,
+        file_id: str,
+        litellm_metadata: Mapping[str, object],
+        _litellm_internal_model_credentials: Mapping[str, str],
+        litellm_call_id: str | None = None,
+    ) -> None:
+        if self.delete_gate is not None:
+            await self.delete_gate.wait()
+        if isinstance(litellm_metadata, dict):
+            litellm_metadata.update({"model_info": {"id": model}})
+        self.deletes = (*self.deletes, (model, file_id, litellm_metadata, _litellm_internal_model_credentials))
+        self.deletes_marked_internal = (*self.deletes_marked_internal, is_internal_call.get())
+        self.delete_parent_request_ids = (*self.delete_parent_request_ids, internal_parent_request_id.get())
+        if file_id in self.gone_file_ids:
+            raise RuntimeError(f"No such File object: {file_id}")
+        if self.delete_error is not None:
+            raise self.delete_error
+
+
+_REQUEST_METADATA: Final = MappingProxyType({"user_api_key_team_id": "test-team"})
+
+
+async def _eventually(condition: Callable[[], bool]) -> None:
+    async def _poll() -> None:
+        while not condition():
+            await asyncio.sleep(0)
+
+    await asyncio.wait_for(_poll(), timeout=1)
+
+
+async def _upload(
+    managed_files: "PROXY_LiteLLMManagedFiles",
+    router: _FakeFilesRouter,
+    target_model_names: list[str],
+    litellm_metadata: Mapping[str, object] = _REQUEST_METADATA,
+    content_type: str = "text/plain",
+) -> OpenAIFileObject:
+    return await managed_files.acreate_file(
+        create_file_request={
+            "file": ("notes.txt", b"the launch code is ORCHID-42\n", content_type),
+            "purpose": "user_data",
+            "litellm_metadata": litellm_metadata,
+        },
+        llm_router=router,
+        target_model_names_list=target_model_names,
+        litellm_parent_otel_span=None,
+        user_api_key_dict=_make_team_member_api_key_dict(),
+    )
+
+
+async def _create_managed_file(
+    router: _FakeFilesRouter, target_model_names: list[str]
+) -> tuple[dict[str, str], list[str], tuple[str, str]]:
+    managed_files, mock_prisma = _make_real_managed_files_instance()
+    response: Final = await _upload(managed_files, router, target_model_names)
+    stored: Final = mock_prisma.db.litellm_managedfiletable.upsert.await_args.kwargs["data"]["create"]
+    decoded: Final = base64.urlsafe_b64decode(response.id + "=" * (-len(response.id) % 4)).decode()
+    carried: Final = (
+        managed_files.get_model_id_from_unified_file_id(decoded),
+        managed_files.get_output_file_id_from_unified_file_id(decoded),
+    )
+    return json.loads(stored["model_mappings"]), stored["flat_model_file_ids"], carried
+
+
+@pytest.mark.asyncio
+async def test_acreate_file_keeps_the_upload_the_managed_id_carries_when_two_targets_share_a_deployment():
+    router: Final = _FakeFilesRouter({"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",)})
+
+    model_mappings, flat_ids, carried = await _create_managed_file(router, ["gpt-a", "gpt-b"])
+    await _eventually(lambda: len(router.deletes) == 1)
+
+    assert carried == ("wildcard-dep", "file-upload-1")
+    assert model_mappings == {"wildcard-dep": "file-upload-1"}
+    assert flat_ids == ["file-upload-1"]
+    assert router.deletes == (
+        (
+            "wildcard-dep",
+            "file-upload-2",
+            _REQUEST_METADATA,
+            {"custom_llm_provider": "openai", "api_key": "key-of-wildcard-dep"},
+        ),
+    )
+    assert isinstance(router.deletes[0][3], MappingProxyType)
+
+
+@pytest.mark.asyncio
+async def test_acreate_file_deletes_only_the_repeat_upload_and_keeps_every_deployment_reached_once():
+    router: Final = _FakeFilesRouter({"gpt-a": ("dep-1", "dep-2"), "gpt-b": ("dep-2",), "gpt-c": ("dep-3",)})
+
+    model_mappings, flat_ids, carried = await _create_managed_file(router, ["gpt-a", "gpt-b", "gpt-c"])
+    await _eventually(lambda: len(router.deletes) == 1)
+
+    assert carried == ("dep-1", "file-upload-1")
+    assert list(model_mappings.items()) == [
+        ("dep-1", "file-upload-1"),
+        ("dep-2", "file-upload-2"),
+        ("dep-3", "file-upload-4"),
+    ]
+    assert flat_ids == ["file-upload-1", "file-upload-2", "file-upload-4"]
+    assert [delete[:2] for delete in router.deletes] == [("dep-2", "file-upload-3")]
+
+
+@pytest.mark.asyncio
+async def test_acreate_file_still_returns_the_managed_file_when_deleting_the_repeat_upload_fails(caplog: pytest.LogCaptureFixture):
+    router: Final = _FakeFilesRouter(
+        {"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",)},
+        delete_error=RuntimeError("provider unavailable"),
+    )
+
+    with caplog.at_level(logging.WARNING):
+        model_mappings, flat_ids, carried = await _create_managed_file(router, ["gpt-a", "gpt-b"])
+        await _eventually(lambda: "provider unavailable" in caplog.text)
+
+    assert carried == ("wildcard-dep", "file-upload-1")
+    assert model_mappings == {"wildcard-dep": "file-upload-1"}
+    assert flat_ids == ["file-upload-1"]
+    assert [delete[:2] for delete in router.deletes] == [("wildcard-dep", "file-upload-2")]
+    assert "file-upload-2" in caplog.text and "wildcard-dep" in caplog.text
+    assert "provider unavailable" in caplog.text
+
+
+@pytest.mark.asyncio
+async def test_acreate_file_answers_before_deleting_the_repeat_upload_finishes():
+    delete_gate: Final = asyncio.Event()
+    router: Final = _FakeFilesRouter({"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",)}, delete_gate=delete_gate)
+
+    model_mappings, flat_ids, carried = await asyncio.wait_for(
+        _create_managed_file(router, ["gpt-a", "gpt-b"]), timeout=1
+    )
+
+    assert carried == ("wildcard-dep", "file-upload-1")
+    assert model_mappings == {"wildcard-dep": "file-upload-1"}
+    assert flat_ids == ["file-upload-1"]
+    assert router.deletes == ()
+    delete_gate.set()
+    await _eventually(lambda: len(router.deletes) == 1)
+    assert router.deletes[0][:2] == ("wildcard-dep", "file-upload-2")
+
+
+@pytest.mark.asyncio
+async def test_shutdown_drain_waits_for_the_repeat_upload_delete():
+    delete_gate: Final = asyncio.Event()
+    router: Final = _FakeFilesRouter({"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",)}, delete_gate=delete_gate)
+
+    await _create_managed_file(router, ["gpt-a", "gpt-b"])
+    asyncio.get_running_loop().call_later(0.05, delete_gate.set)
+    await drain_logging_tasks(timeout=1)
+
+    assert [delete[:2] for delete in router.deletes] == [("wildcard-dep", "file-upload-2")]
+
+
+@pytest.mark.asyncio
+async def test_each_repeat_upload_delete_runs_as_an_internal_call_of_the_upload_that_made_the_copy():
+    router: Final = _FakeFilesRouter(
+        {"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",), "gpt-c": ("wildcard-dep",)}
+    )
+
+    await _create_managed_file(router, ["gpt-a", "gpt-b", "gpt-c"])
+    await drain_logging_tasks(timeout=1)
+
+    assert router.deletes_marked_internal == (True, True)
+    assert sorted(zip((delete[1] for delete in router.deletes), router.delete_parent_request_ids)) == [
+        ("file-upload-2", "call-of-file-upload-2"),
+        ("file-upload-3", "call-of-file-upload-3"),
+    ]
+    assert is_internal_call.get() is False
+    assert internal_parent_request_id.get() is None
+
+
+@pytest.mark.asyncio
+async def test_litellm_proxy_wildcard_keeps_its_last_per_target_upload_and_deletes_nothing():
+    router: Final = _FakeFilesRouter(
+        {"gpt-a": ("proxy-wildcard-dep",), "gpt-b": ("proxy-wildcard-dep",)}, provider="litellm_proxy"
+    )
+
+    model_mappings, flat_ids, _ = await _create_managed_file(router, ["gpt-a", "gpt-b"])
+    await drain_logging_tasks(timeout=1)
+
+    assert model_mappings == {"proxy-wildcard-dep": "file-upload-2"}
+    assert flat_ids == ["file-upload-2"]
+    assert router.deletes == ()
+
+
+async def _upload_then_delete(
+    router: _FakeFilesRouter, target_model_names: list[str], content_type: str = "text/plain"
+) -> tuple[str, ...]:
+    managed_files, mock_prisma = _make_real_managed_files_instance()
+    response: Final = await _upload(managed_files, router, target_model_names, content_type=content_type)
+    await drain_logging_tasks(timeout=1)
+    deletes_during_upload: Final = len(router.deletes)
+    managed_files.internal_usage_cache.async_get_cache = AsyncMock(
+        return_value=managed_files.internal_usage_cache.async_set_cache.await_args.kwargs["value"]
+    )
+    mock_prisma.db.litellm_managedfiletable.find_first = AsyncMock(return_value=MagicMock())
+    mock_prisma.db.litellm_managedfiletable.delete = AsyncMock()
+
+    deleted: Final = await managed_files.afile_delete(
+        file_id=response.id,
+        litellm_parent_otel_span=None,
+        llm_router=router,
+        litellm_metadata=_REQUEST_METADATA,
+        litellm_call_id="delete-call",
+    )
+
+    assert deleted.deleted is True
+    mock_prisma.db.litellm_managedfiletable.delete.assert_awaited_once_with(where={"unified_file_id": response.id})
+    return tuple(delete[1] for delete in router.deletes[deletes_during_upload:])
+
+
+@pytest.mark.asyncio
+async def test_deleting_a_litellm_proxy_wildcard_file_removes_the_upload_its_id_carries_too():
+    router: Final = _FakeFilesRouter(
+        {"gpt-a": ("proxy-wildcard-dep",), "gpt-b": ("proxy-wildcard-dep",)}, provider="litellm_proxy"
+    )
+
+    assert await _upload_then_delete(router, ["gpt-a", "gpt-b"]) == ("file-upload-2", "file-upload-1")
+
+
+@pytest.mark.asyncio
+async def test_deleting_a_wildcard_file_removes_its_kept_upload_once():
+    router: Final = _FakeFilesRouter({"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",)})
+
+    assert await _upload_then_delete(router, ["gpt-a", "gpt-b"]) == ("file-upload-1",)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "content_type",
+    [
+        "text/plain;llm_output_file_id,file-of-another-team;llm_output_file_model_id,wildcard-dep",
+        "text/plain;llm_output_file_id,file-of-another-team",
+    ],
+)
+async def test_deleting_a_file_removes_only_the_uploads_the_gateway_made_for_it(content_type: str):
+    router: Final = _FakeFilesRouter({"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",)})
+
+    assert await _upload_then_delete(router, ["gpt-a", "gpt-b"], content_type) == ("file-upload-1",)
+
+
+@pytest.mark.asyncio
+async def test_deleting_a_file_still_succeeds_when_the_upload_its_id_carries_is_already_gone(
+    caplog: pytest.LogCaptureFixture,
+):
+    router: Final = _FakeFilesRouter(
+        {"gpt-a": ("proxy-wildcard-dep",), "gpt-b": ("proxy-wildcard-dep",)},
+        provider="litellm_proxy",
+        gone_file_ids=frozenset({"file-upload-1"}),
+    )
+
+    with caplog.at_level(logging.WARNING):
+        assert await _upload_then_delete(router, ["gpt-a", "gpt-b"]) == ("file-upload-2", "file-upload-1")
+
+    assert "file-upload-1" in caplog.text and "No such File object" in caplog.text
+    assert router.deletes_marked_internal == (False, True)
+    assert router.delete_parent_request_ids == (None, "delete-call")
+
+
+@pytest.mark.asyncio
+async def test_repeat_upload_delete_leaves_the_upload_request_metadata_unchanged():
+    router: Final = _FakeFilesRouter({"gpt-a": ("wildcard-dep",), "gpt-b": ("wildcard-dep",)})
+    upload_metadata: Final = {"user_api_key_team_id": "test-team"}
+    managed_files, _ = _make_real_managed_files_instance()
+
+    await _upload(managed_files, router, ["gpt-a", "gpt-b"], upload_metadata)
+    await drain_logging_tasks(timeout=1)
+
+    assert upload_metadata == {"user_api_key_team_id": "test-team"}
+    assert [delete[2] for delete in router.deletes] == [
+        {"user_api_key_team_id": "test-team", "model_info": {"id": "wildcard-dep"}}
+    ]
diff --git a/tests/unit/integrations/azure_storage/test_azure_storage.py b/tests/unit/integrations/azure_storage/test_azure_storage.py
index 0f0ce24ff84..ee12291e7a0 100644
--- a/tests/unit/integrations/azure_storage/test_azure_storage.py
+++ b/tests/unit/integrations/azure_storage/test_azure_storage.py
@@ -5,19 +5,28 @@ import re
 import sys
 import threading
 from datetime import datetime, timedelta, timezone
+from typing import Final
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
-from litellm.constants import _DEFAULT_TTL_FOR_HTTPX_CLIENTS
+from litellm.constants import _DEFAULT_TTL_FOR_HTTPX_CLIENTS, INTERNAL_CALL_ORIGIN_METADATA_KEY
 from litellm.integrations.azure_storage import azure_storage as azure_storage_module
 from litellm.integrations.azure_storage.azure_storage import (
     AzureBlobStorageLogger,
     _cached_credential_chain_token_provider,
     adls_safe_file_name,
 )
+from litellm.types.passthrough_endpoints.pass_through_endpoints import (
+    SETTLES_BACKGROUND_RESPONSE_KWARG,
+    BackgroundResponseSettlement,
+)
 from litellm.types.secret_managers.get_azure_ad_token_provider import AzureCredentialType
-from litellm.types.utils import StandardAuditLogPayload, StandardLoggingPayload
+from litellm.types.utils import (
+    BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN,
+    StandardAuditLogPayload,
+    StandardLoggingPayload,
+)
 
 
 @pytest.fixture
@@ -648,3 +657,171 @@ async def test_audit_log_is_uploaded_to_a_dated_audit_logs_path_with_an_account_
     assert json.loads(uploaded) == audit_log
     assert file_client.append_data.await_args.kwargs == {"data": uploaded, "offset": 0, "length": len(uploaded)}
     file_client.flush_data.assert_awaited_once_with(position=len(uploaded), offset=0)
+
+
+BACKGROUND_RESPONSE_ID: Final = "resp_YWJjZA=="
+BACKGROUND_COST_POLL_KWARGS: Final = {
+    "call_type": "aget_responses",
+    "litellm_params": {
+        "metadata": {INTERNAL_CALL_ORIGIN_METADATA_KEY: BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN},
+    },
+}
+PASSTHROUGH_SETTLEMENT_KWARGS: Final = {
+    "call_type": "pass_through_endpoint",
+    "litellm_params": {"metadata": {}},
+    SETTLES_BACKGROUND_RESPONSE_KWARG: BackgroundResponseSettlement.SETTLES,
+}
+
+
+def _background_create_cost_and_other_events(
+    cost_kwargs: dict[str, object],
+) -> tuple[tuple[dict[str, object], StandardLoggingPayload], ...]:
+    create: Final = StandardLoggingPayload(
+        id=BACKGROUND_RESPONSE_ID,
+        call_type="aresponses",
+        messages=[{"role": "user", "content": "background create input"}],
+    )
+    cost: Final = StandardLoggingPayload(id=BACKGROUND_RESPONSE_ID, call_type="aget_responses", response_cost=0.42)
+    ordinary: Final = StandardLoggingPayload(id="chatcmpl-ordinary", call_type="acompletion")
+    batch_retrieve: Final = StandardLoggingPayload(id="batch_abc123", call_type="aretrieve_batch", response_cost=0.07)
+    return (
+        ({"call_type": "aresponses", "litellm_params": {"metadata": {}}, "standard_logging_object": create}, create),
+        ({**cost_kwargs, "standard_logging_object": cost}, cost),
+        (
+            {"call_type": "acompletion", "litellm_params": {"metadata": {}}, "standard_logging_object": ordinary},
+            ordinary,
+        ),
+        (
+            {
+                "call_type": "aretrieve_batch",
+                "litellm_params": {"metadata": {}},
+                "standard_logging_object": batch_retrieve,
+            },
+            batch_retrieve,
+        ),
+    )
+
+
+def _expected_files(
+    events: tuple[tuple[dict[str, object], StandardLoggingPayload], ...],
+) -> dict[str, StandardLoggingPayload]:
+    create, cost, ordinary, batch_retrieve = (payload for _, payload in events)
+    return {
+        "resp_YWJjZA.json": create,
+        "resp_YWJjZA_background_cost.json": cost,
+        "chatcmpl-ordinary.json": ordinary,
+        "batch_abc123.json": batch_retrieve,
+    }
+
+
+async def _log_and_flush(
+    logger: AzureBlobStorageLogger, events: tuple[tuple[dict[str, object], StandardLoggingPayload], ...]
+) -> None:
+    for kwargs, payload in events:
+        await logger.async_log_success_event(kwargs, {"id": payload["id"]}, None, None)
+    await logger.async_send_batch()
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "cost_kwargs",
+    (
+        pytest.param(BACKGROUND_COST_POLL_KWARGS, id="cost-poll"),
+        pytest.param(PASSTHROUGH_SETTLEMENT_KWARGS, id="passthrough-settlement"),
+    ),
+)
+async def test_background_cost_event_keeps_its_own_file_beside_the_create_on_the_entra_path(
+    mock_env_vars, monkeypatch, cost_kwargs
+):
+    monkeypatch.setattr("litellm.proxy.proxy_server.premium_user", True)
+    events: Final = _background_create_cost_and_other_events(cost_kwargs)
+    with patch(  # test-quality-ok: REST client is created inside the method; assert emitted requests
+        "litellm.integrations.azure_storage.azure_storage.get_async_httpx_client"
+    ) as mock_get_client:
+        mock_http_client = AsyncMock()
+        mock_http_client.put.return_value = MagicMock()
+        mock_http_client.patch.return_value = MagicMock()
+        mock_get_client.return_value = mock_http_client
+
+        logger = AzureBlobStorageLogger()
+        logger.azure_auth_token = "mock-azure-ad-token"
+        logger.token_expiry = None
+        await _log_and_flush(logger, events)
+
+    base_url: Final = "https://test-account.dfs.core.windows.net/test-container/"
+    appends: Final = [call for call in mock_http_client.patch.call_args_list if "action=append" in call.args[0]]
+    uploaded: Final = {
+        call.args[0].removeprefix(base_url).split("?")[0]: json.loads(call.kwargs["data"]) for call in appends
+    }
+    assert uploaded == _expected_files(events), (
+        "the create, its background cost event and every other event must each keep their own file"
+    )
+
+
+@pytest.mark.asyncio
+async def test_failure_event_is_uploaded_to_a_file_named_after_its_id(mock_env_vars, monkeypatch):
+    monkeypatch.setattr("litellm.proxy.proxy_server.premium_user", True)
+    failure: Final = StandardLoggingPayload(id="chatcmpl-failed", call_type="acompletion", error_str="provider failure")
+    with patch(  # test-quality-ok: REST client is created inside the method; assert emitted requests
+        "litellm.integrations.azure_storage.azure_storage.get_async_httpx_client"
+    ) as mock_get_client:
+        mock_http_client = AsyncMock()
+        mock_http_client.put.return_value = MagicMock()
+        mock_http_client.patch.return_value = MagicMock()
+        mock_get_client.return_value = mock_http_client
+
+        logger = AzureBlobStorageLogger()
+        logger.azure_auth_token = "mock-azure-ad-token"
+        logger.token_expiry = None
+        await logger.async_log_failure_event(
+            {"call_type": "acompletion", "litellm_params": {"metadata": {}}, "standard_logging_object": failure},
+            None,
+            None,
+            None,
+        )
+        await logger.async_send_batch()
+
+    base_url: Final = "https://test-account.dfs.core.windows.net/test-container/"
+    appends: Final = [call for call in mock_http_client.patch.call_args_list if "action=append" in call.args[0]]
+    assert {call.args[0].removeprefix(base_url).split("?")[0]: json.loads(call.kwargs["data"]) for call in appends} == {
+        "chatcmpl-failed.json": failure
+    }
+
+
+@pytest.mark.asyncio
+async def test_background_cost_event_keeps_its_own_file_beside_the_create_with_an_account_key(
+    workload_identity_env_vars, monkeypatch
+):
+    monkeypatch.setenv("AZURE_STORAGE_ACCOUNT_KEY", "dGVzdC1rZXk=")
+    monkeypatch.setattr("litellm.proxy.proxy_server.premium_user", True)
+    monkeypatch.setattr(azure_storage_module, "datetime", _FrozenDatetime)
+    events: Final = _background_create_cost_and_other_events(BACKGROUND_COST_POLL_KWARGS)
+
+    uploaded: Final[dict[str, StandardLoggingPayload]] = {}
+
+    def file_client_for(file_path: str) -> MagicMock:
+        file_client = MagicMock()
+        file_client.create_file = AsyncMock()
+        file_client.flush_data = AsyncMock()
+
+        async def append_data(data: bytes, offset: int, length: int) -> None:
+            uploaded[file_path] = json.loads(data)
+
+        file_client.append_data = append_data
+        return file_client
+
+    file_system_client = MagicMock()
+    file_system_client.get_file_client = MagicMock(side_effect=file_client_for)
+    service_client = MagicMock()
+    service_client.get_file_system_client = MagicMock(return_value=file_system_client)
+    fake_aio_module = MagicMock()
+    fake_aio_module.DataLakeServiceClient = MagicMock(return_value=service_client)
+
+    with patch.dict(sys.modules, {"azure.storage.filedatalake.aio": fake_aio_module}):
+        logger = AzureBlobStorageLogger()
+        await _log_and_flush(logger, events)
+
+    today: Final = _FrozenDatetime.now().strftime("%Y-%m-%d")
+    assert uploaded == {f"{today}/{name}": payload for name, payload in _expected_files(events).items()}, (
+        "the create, its background cost event and every other event must each keep their own file"
+    )
diff --git a/tests/unit/integrations/clickhouse/test_clickhouse_spend_logger.py b/tests/unit/integrations/clickhouse/test_clickhouse_spend_logger.py
index f94d7bbee37..42e69f95bb4 100644
--- a/tests/unit/integrations/clickhouse/test_clickhouse_spend_logger.py
+++ b/tests/unit/integrations/clickhouse/test_clickhouse_spend_logger.py
@@ -20,10 +20,16 @@ from litellm.integrations.clickhouse.clickhouse_spend_logger import (
     strip_cache_hit_suffix,
 )
 from litellm.integrations.clickhouse.context import lens_analysis
+from litellm.constants import INTERNAL_CALL_ORIGIN_METADATA_KEY
+from litellm.litellm_core_utils.internal_call_metadata import BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX
 from litellm.litellm_core_utils import litellm_logging
 from litellm.litellm_core_utils.secret_redaction import REDACTED
 from litellm.tracing.types import SpendLogRecord
-from litellm.types.utils import StandardLoggingPayload
+from litellm.types.passthrough_endpoints.pass_through_endpoints import (
+    SETTLES_BACKGROUND_RESPONSE_KWARG,
+    BackgroundResponseSettlement,
+)
+from litellm.types.utils import BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN, StandardLoggingPayload
 
 _JSON_OBJECT_ADAPTER: Final = TypeAdapter(Mapping[str, JsonValue])
 
@@ -349,6 +355,41 @@ def test_cache_hit_id_is_stripped_for_response_id():
     assert strip_cache_hit_suffix("chatcmpl-xyz") == "chatcmpl-xyz"
 
 
+@pytest.mark.parametrize(
+    "cost_kwargs",
+    (
+        pytest.param(
+            {
+                "call_type": "aget_responses",
+                "litellm_params": {
+                    "metadata": {INTERNAL_CALL_ORIGIN_METADATA_KEY: BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN}
+                },
+            },
+            id="cost-poll",
+        ),
+        pytest.param(
+            {
+                "call_type": "pass_through_endpoint",
+                "litellm_params": {"metadata": {}},
+                SETTLES_BACKGROUND_RESPONSE_KWARG: BackgroundResponseSettlement.SETTLES,
+            },
+            id="passthrough-settlement",
+        ),
+    ),
+)
+def test_background_cost_row_keeps_its_own_request_id_beside_its_create(cost_kwargs: Mapping[str, object]) -> None:
+    payload: Final = cast(StandardLoggingPayload, _payload(id="resp_YWJjZA", call_type="aresponses"))
+    create_kwargs: Final[Mapping[str, object]] = {"call_type": "aresponses", "litellm_params": {"metadata": {}}}
+
+    rows: Final = [spend_log_row_from_payload(payload, kwargs) for kwargs in (create_kwargs, cost_kwargs)]
+
+    assert [row["request_id"] for row in rows] == [
+        "resp_YWJjZA",
+        f"resp_YWJjZA{BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX}",
+    ]
+    assert [row["response_id"] for row in rows] == ["resp_YWJjZA", "resp_YWJjZA"]
+
+
 def test_parse_traceparent_valid_missing_malformed():
     assert parse_traceparent(TRACEPARENT) == (TRACE_ID, SPAN_ID)
     assert parse_traceparent(None) == ("", "")
diff --git a/tests/unit/integrations/conftest.py b/tests/unit/integrations/conftest.py
index 48a01ed8d48..9278a280fe7 100644
--- a/tests/unit/integrations/conftest.py
+++ b/tests/unit/integrations/conftest.py
@@ -1,14 +1,18 @@
 import functools
 import http.server
+import importlib.abc
 import ipaddress
 import os
 import queue
 import ssl
+import sys
 import threading
-from collections.abc import Iterator
+from collections.abc import Iterator, Sequence
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
+from importlib.machinery import ModuleSpec
 from pathlib import Path
+from types import ModuleType
 from typing import Final
 
 import pytest
@@ -75,6 +79,36 @@ def write_self_signed_cert(directory: Path, stem: str) -> tuple[Path, Path]:
     return certificate_path, key_path
 
 
+PROXY_ONLY_PACKAGES: Final = frozenset({"fastapi", "starlette"})
+
+
+class _ProxyOnlyPackageBlocker(importlib.abc.MetaPathFinder):
+    def find_spec(
+        self,
+        fullname: str,
+        path: Sequence[str] | None = None,
+        target: ModuleType | None = None,
+    ) -> ModuleSpec | None:
+        if fullname.partition(".")[0] in PROXY_ONLY_PACKAGES:
+            raise ModuleNotFoundError(f"No module named {fullname!r}")
+        return None
+
+
+def _needs_proxy_extras(module_name: str) -> bool:
+    return (
+        module_name.partition(".")[0] in PROXY_ONLY_PACKAGES
+        or module_name == "litellm.proxy"
+        or module_name.startswith("litellm.proxy.")
+    )
+
+
+@pytest.fixture
+def sdk_only_install(monkeypatch: pytest.MonkeyPatch) -> None:
+    for module_name in tuple(filter(_needs_proxy_extras, sys.modules)):
+        monkeypatch.delitem(sys.modules, module_name)
+    monkeypatch.setattr(sys, "meta_path", [_ProxyOnlyPackageBlocker(), *sys.meta_path])
+
+
 @pytest.fixture(autouse=True)
 def restore_process_environment() -> Iterator[None]:
     original: Final = dict(os.environ)
diff --git a/tests/unit/integrations/gcs_bucket/test_gcs_bucket.py b/tests/unit/integrations/gcs_bucket/test_gcs_bucket.py
index 6f143a244f6..c29985b1e41 100644
--- a/tests/unit/integrations/gcs_bucket/test_gcs_bucket.py
+++ b/tests/unit/integrations/gcs_bucket/test_gcs_bucket.py
@@ -13,9 +13,11 @@ import litellm
 import pytest
 import respx
 
+from litellm.constants import INTERNAL_CALL_ORIGIN_METADATA_KEY
 from litellm.integrations.gcs_bucket.gcs_bucket import GCSBucketLogger
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
 from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER
+from litellm.types.utils import BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN
 
 
 mock_response_data: Final = {
@@ -172,9 +174,7 @@ async def test_get_payload_not_found(monkeypatch):
     assert payload is None
 
 
-def _gcs_logger_with_upload_status(
-    monkeypatch: pytest.MonkeyPatch, status_code: int
-) -> tuple[GCSBucketLogger, Mock]:
+def _gcs_logger_with_upload_status(monkeypatch: pytest.MonkeyPatch, status_code: int) -> tuple[GCSBucketLogger, Mock]:
     monkeypatch.setattr("litellm.proxy.proxy_server.premium_user", True)
     monkeypatch.setattr(google.auth, "default", _google_default_credentials)
     monkeypatch.setenv("GCS_FLUSH_INTERVAL", "3600")
@@ -394,3 +394,98 @@ async def test_batch_line_items_are_serialized_off_the_event_loop(monkeypatch: p
 
     (thread,) = threads
     assert thread is not threading.main_thread()
+
+
+@pytest.mark.asyncio
+async def test_unbatched_background_cost_event_keeps_its_own_object_readable_by_its_spend_log_id(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("GCS_USE_BATCHED_LOGGING", "false")
+    logger, _ = _gcs_logger_with_upload_status(monkeypatch, 200)
+    object_prefix: Final = "/storage/v1/b/test-bucket/o/"
+    stored: Final[dict[str, object]] = {}
+
+    def bucket(request: httpx.Request) -> httpx.Response:
+        if request.method == "POST":
+            stored[request.url.params["name"]] = json.loads(request.content)
+            return httpx.Response(200, json={"name": request.url.params["name"]})
+        name: Final = request.url.path.removeprefix(object_prefix)
+        if name not in stored:
+            return httpx.Response(404, text="No such object")
+        return httpx.Response(200, content=json.dumps(stored[name]).encode("utf-8"))
+
+    logger.async_httpx_client = AsyncHTTPHandler(transport=httpx.MockTransport(bucket))
+    response_id: Final = "resp_YmFja2dyb3VuZA"
+    create: Final = {
+        "id": response_id,
+        "messages": [{"role": "user", "content": "background create input"}],
+        "error_str": None,
+    }
+    cost: Final = {"id": response_id, "response_cost": 0.42, "error_str": None}
+    ordinary: Final = {"id": "chatcmpl-ordinary", "error_str": None}
+    batch_retrieve: Final = {"id": "batch_abc123", "response_cost": 0.07, "error_str": None}
+    events: Final = (
+        ({"call_type": "aresponses", "litellm_params": {"metadata": {}}}, create),
+        (
+            {
+                "call_type": "aget_responses",
+                "litellm_params": {
+                    "metadata": {INTERNAL_CALL_ORIGIN_METADATA_KEY: BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN}
+                },
+            },
+            cost,
+        ),
+        ({"call_type": "acompletion", "litellm_params": {"metadata": {}}}, ordinary),
+        ({"call_type": "aretrieve_batch", "litellm_params": {"metadata": {}}}, batch_retrieve),
+    )
+
+    for kwargs, payload in events:
+        await logger.async_log_success_event(
+            {**kwargs, "standard_logging_object": payload}, {"id": payload["id"]}, None, None
+        )
+    await logger.flush_queue()
+
+    assert {name.split("/", maxsplit=1)[1]: payload for name, payload in stored.items()} == {
+        response_id: create,
+        f"{response_id}_background_cost": cost,
+        "chatcmpl-ordinary": ordinary,
+        "batch_abc123": batch_retrieve,
+    }, "the create, its background cost event and every other event must each keep their own object"
+    now: Final = datetime.now(timezone.utc)
+    assert await logger.get_request_response_payload(f"{response_id}_background_cost", now, None) == cost
+    assert await logger.get_request_response_payload(response_id, now, None) == create
+
+
+@pytest.mark.asyncio
+async def test_unbatched_gcs_log_id_still_names_a_background_cost_event_object(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("GCS_USE_BATCHED_LOGGING", "false")
+    logger, _ = _gcs_logger_with_upload_status(monkeypatch, 200)
+    stored: Final[dict[str, object]] = {}
+
+    def bucket(request: httpx.Request) -> httpx.Response:
+        stored[request.url.params["name"]] = json.loads(request.content)
+        return httpx.Response(200, json={"name": request.url.params["name"]})
+
+    logger.async_httpx_client = AsyncHTTPHandler(transport=httpx.MockTransport(bucket))
+    cost: Final = {"id": "resp_YmFja2dyb3VuZA", "response_cost": 0.42, "error_str": None}
+    await logger.async_log_success_event(
+        {
+            "call_type": "aget_responses",
+            "litellm_params": {
+                "metadata": {
+                    INTERNAL_CALL_ORIGIN_METADATA_KEY: BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN,
+                    "gcs_log_id": "qa-run-7",
+                }
+            },
+            "standard_logging_object": cost,
+        },
+        {"id": cost["id"]},
+        None,
+        None,
+    )
+    await logger.flush_queue()
+
+    ((name, payload),) = stored.items()
+    object_name: Final = name.split("/", maxsplit=1)[1]
+    assert object_name.startswith("custom-") and object_name.endswith("-qa-run-7"), object_name
+    assert payload == cost
diff --git a/tests/unit/integrations/test_anthropic_cache_control_hook.py b/tests/unit/integrations/test_anthropic_cache_control_hook.py
index 778c8dfe2f5..0a6f37e4c15 100644
--- a/tests/unit/integrations/test_anthropic_cache_control_hook.py
+++ b/tests/unit/integrations/test_anthropic_cache_control_hook.py
@@ -3485,12 +3485,23 @@ class TestOpenAIPromptCacheBreakpoint:
             ("gpt-5.6-sol", True),
             ("gpt-5.6-luna", True),
             ("gpt-5.7", True),
+            ("gpt-5.6o", True),
+            ("gpt-5.10", True),
+            ("gpt-5.06", True),
             ("gpt-6", True),
             ("GPT-5.6", True),
             ("gpt-5.5", False),
             ("gpt-5", False),
             ("gpt-5-chat-latest", False),
             ("gpt-4.1", False),
+            ("gpt-5-6-sol", True),
+            ("gpt-6-1", True),
+            ("gpt-5-4-mini", False),
+            ("gpt-5-32k", False),
+            ("gpt-5-6b", False),
+            ("gpt-5-06", False),
+            ("gpt-5-2026-03-01", False),
+            ("gpt-4-1106-preview", False),
             ("o3", False),
             ("claude-sonnet-4-5", False),
         ],
diff --git a/tests/unit/integrations/test_deepeval.py b/tests/unit/integrations/test_deepeval.py
index 6dd3aef0a03..4523a9c61d2 100644
--- a/tests/unit/integrations/test_deepeval.py
+++ b/tests/unit/integrations/test_deepeval.py
@@ -2,11 +2,15 @@ import os
 import unittest
 from litellm._uuid import uuid
 from datetime import datetime, timezone
+from typing import Final
 from unittest.mock import MagicMock, patch
 
 from litellm.integrations.deepeval.api import Endpoints, HttpMethods
 from litellm.integrations.deepeval.deepeval import DeepEvalLogger
 from litellm.integrations.deepeval.types import SpanApiType, TraceSpanApiStatus
+from litellm.constants import INTERNAL_CALL_ORIGIN_METADATA_KEY
+from litellm.litellm_core_utils.internal_call_metadata import BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX
+from litellm.types.utils import BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN
 
 
 class TestDeepEvalLogger(unittest.TestCase):
@@ -94,6 +98,37 @@ class TestDeepEvalLogger(unittest.TestCase):
         self.assertEqual(llm_span["inputTokenCount"], 10)
         self.assertEqual(llm_span["outputTokenCount"], 20)
 
+    def test_background_cost_span_keeps_its_own_uuid_beside_its_create(self) -> None:
+        standard_logging_object: Final = {
+            "id": "resp_YWJjZA",
+            "trace_id": self.trace_id,
+            "model": self.model,
+            "response": {"usage": {}, "choices": [{"message": {"content": "OK"}}]},
+        }
+        create_kwargs: Final = {
+            "input": self.input_str,
+            "call_type": "aresponses",
+            "litellm_params": {"metadata": {}},
+            "standard_logging_object": standard_logging_object,
+        }
+        cost_kwargs: Final = {
+            "input": self.input_str,
+            "call_type": "aget_responses",
+            "litellm_params": {
+                "metadata": {INTERNAL_CALL_ORIGIN_METADATA_KEY: BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN}
+            },
+            "standard_logging_object": standard_logging_object,
+        }
+
+        for kwargs in (create_kwargs, cost_kwargs):
+            self.logger.log_success_event(kwargs, self.mock_response_obj, self.start_time, self.end_time)
+
+        span_uuids: Final = [
+            call.kwargs["body"]["llmSpans"][0]["uuid"]
+            for call in self.mock_api_instance.send_request.call_args_list
+        ]
+        self.assertEqual(span_uuids, ["resp_YWJjZA", f"resp_YWJjZA{BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX}"])
+
     def test_log_failure_event(self):
         error_message = "This is an error."
         kwargs = {
diff --git a/tests/unit/integrations/test_dynamodb.py b/tests/unit/integrations/test_dynamodb.py
new file mode 100644
index 00000000000..d139c49a49e
--- /dev/null
+++ b/tests/unit/integrations/test_dynamodb.py
@@ -0,0 +1,52 @@
+from collections.abc import Mapping
+from datetime import datetime, timezone
+from typing import Final
+from unittest.mock import MagicMock
+
+import pytest
+
+import litellm
+from litellm.constants import INTERNAL_CALL_ORIGIN_METADATA_KEY
+from litellm.integrations.dynamodb import DyanmoDBLogger
+from litellm.litellm_core_utils.internal_call_metadata import BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX
+from litellm.types.passthrough_endpoints.pass_through_endpoints import (
+    SETTLES_BACKGROUND_RESPONSE_KWARG,
+    BackgroundResponseSettlement,
+)
+from litellm.types.utils import BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN
+
+BACKGROUND_COST_POLL_KWARGS: Final[Mapping[str, object]] = {
+    "call_type": "aget_responses",
+    "litellm_params": {"metadata": {INTERNAL_CALL_ORIGIN_METADATA_KEY: BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN}},
+}
+PASSTHROUGH_SETTLEMENT_KWARGS: Final[Mapping[str, object]] = {
+    "call_type": "pass_through_endpoint",
+    "litellm_params": {"metadata": {}},
+    SETTLES_BACKGROUND_RESPONSE_KWARG: BackgroundResponseSettlement.SETTLES,
+}
+
+
+@pytest.mark.parametrize(
+    "cost_kwargs",
+    (
+        pytest.param(BACKGROUND_COST_POLL_KWARGS, id="cost-poll"),
+        pytest.param(PASSTHROUGH_SETTLEMENT_KWARGS, id="passthrough-settlement"),
+    ),
+)
+@pytest.mark.usefixtures("sdk_only_install")
+def test_background_cost_event_keeps_its_own_item_beside_its_create(
+    monkeypatch: pytest.MonkeyPatch, cost_kwargs: Mapping[str, object]
+) -> None:
+    monkeypatch.setattr(litellm, "dynamodb_table_name", "litellm-logs")
+    dynamodb: Final = MagicMock()
+    logger: Final = DyanmoDBLogger(dynamodb=dynamodb)
+    response_obj: Final = {"id": "resp_YWJjZA", "usage": {"total_tokens": 3}}
+    now: Final = datetime.now(timezone.utc)
+    create_kwargs: Final[Mapping[str, object]] = {"call_type": "aresponses", "litellm_params": {"metadata": {}}}
+
+    for kwargs in (create_kwargs, cost_kwargs):
+        logger.log_event(kwargs, response_obj, now, now, print_verbose=print)
+
+    dynamodb.Table.assert_called_with("litellm-logs")
+    written_ids: Final = [call.kwargs["Item"]["id"] for call in dynamodb.Table.return_value.put_item.call_args_list]
+    assert written_ids == ["resp_YWJjZA", f"resp_YWJjZA{BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX}"]
diff --git a/tests/unit/integrations/test_openmeter.py b/tests/unit/integrations/test_openmeter.py
index 2d09e1572db..fc4e2fcd7a3 100644
--- a/tests/unit/integrations/test_openmeter.py
+++ b/tests/unit/integrations/test_openmeter.py
@@ -1,11 +1,30 @@
 import json
 import os
+from collections.abc import Mapping
+from typing import Final
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
 import litellm
+from litellm.constants import INTERNAL_CALL_ORIGIN_METADATA_KEY
 from litellm.integrations.openmeter import OpenMeterLogger
+from litellm.litellm_core_utils.internal_call_metadata import BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX
+from litellm.types.passthrough_endpoints.pass_through_endpoints import (
+    SETTLES_BACKGROUND_RESPONSE_KWARG,
+    BackgroundResponseSettlement,
+)
+from litellm.types.utils import BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN
+
+BACKGROUND_COST_POLL_KWARGS: Final[Mapping[str, object]] = {
+    "call_type": "aget_responses",
+    "litellm_params": {"metadata": {INTERNAL_CALL_ORIGIN_METADATA_KEY: BACKGROUND_RESPONSE_COST_POLL_CALL_ORIGIN}},
+}
+PASSTHROUGH_SETTLEMENT_KWARGS: Final[Mapping[str, object]] = {
+    "call_type": "pass_through_endpoint",
+    "litellm_params": {"metadata": {}},
+    SETTLES_BACKGROUND_RESPONSE_KWARG: BackgroundResponseSettlement.SETTLES,
+}
 
 
 class TestOpenMeterIntegration:
@@ -36,6 +55,31 @@ class TestOpenMeterIntegration:
         with pytest.raises(Exception, match=r"Missing keys.*OPENMETER_API_KEY"):
             OpenMeterLogger()
 
+    @pytest.mark.parametrize(
+        "cost_kwargs",
+        (
+            pytest.param(BACKGROUND_COST_POLL_KWARGS, id="cost-poll"),
+            pytest.param(PASSTHROUGH_SETTLEMENT_KWARGS, id="passthrough-settlement"),
+        ),
+    )
+    @pytest.mark.usefixtures("sdk_only_install")
+    def test_background_cost_event_gets_its_own_event_id_beside_its_create(
+        self, cost_kwargs: Mapping[str, object]
+    ) -> None:
+        logger: Final = OpenMeterLogger()
+        response_obj: Final = {"id": "resp_YWJjZA"}
+        create_kwargs: Final[Mapping[str, object]] = {
+            "user": "user-1",
+            "call_type": "aresponses",
+            "litellm_params": {"metadata": {}},
+        }
+
+        create_event: Final = logger._common_logic(create_kwargs, response_obj)
+        cost_event: Final = logger._common_logic({**cost_kwargs, "user": "user-1", "response_cost": 0.42}, response_obj)
+
+        assert create_event["id"] == "resp_YWJjZA"
+        assert cost_event["id"] == f"resp_YWJjZA{BACKGROUND_RESPONSE_COST_REQUEST_ID_SUFFIX}"
+
     def test_common_logic_with_string_user(self):
         """Test that _common_logic correctly handles string user parameter"""
         logger = OpenMeterLogger()
diff --git a/tests/unit/integrations/test_prometheus_labels.py b/tests/unit/integrations/test_prometheus_labels.py
index 878f19c66f8..04eb7c3a5a4 100644
--- a/tests/unit/integrations/test_prometheus_labels.py
+++ b/tests/unit/integrations/test_prometheus_labels.py
@@ -5,6 +5,7 @@ Unit tests for prometheus metric labels configuration
 from typing import Final, Literal
 
 import pytest
+from pydantic import JsonValue
 
 import litellm
 from litellm.types.integrations.prometheus import (
@@ -802,6 +803,47 @@ async def test_failure_hook_emits_api_provider_value_on_failed_requests_metric()
         _clear_prometheus_registry()
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("metadata_id", "request_id", "logged_id", "expected"),
+    (
+        (None, None, "logged-deployment", "logged-deployment"),
+        ("", None, "logged-deployment", "logged-deployment"),
+        ("metadata-deployment", "request-deployment", "logged-deployment", "metadata-deployment"),
+        (None, "request-deployment", "logged-deployment", "request-deployment"),
+        (None, None, None, "None"),
+    ),
+)
+async def test_failure_counters_keep_logged_deployment_attribution(
+    metadata_id: str | None, request_id: str | None, logged_id: str | None, expected: str
+) -> None:
+    from fastapi import HTTPException
+
+    from litellm.integrations.prometheus import PrometheusLogger
+    from litellm.proxy._types import UserAPIKeyAuth
+
+    request_data: Final[dict[str, JsonValue]] = {
+        "model": "metric-test-alias",
+        "metadata": {"model_info": {"id": metadata_id}},
+        "model_info": {"id": request_id},
+        "standard_logging_object": {"model_id": logged_id, "custom_llm_provider": "openai"},
+    }
+    _clear_prometheus_registry()
+    try:
+        await PrometheusLogger().async_post_call_failure_hook(
+            request_data=request_data,
+            original_exception=HTTPException(status_code=400, detail="guardrail rejected"),
+            user_api_key_dict=UserAPIKeyAuth(token="metric-test-token"),
+        )
+        for metric_name in ("litellm_proxy_failed_requests_metric_total", "litellm_proxy_total_requests_metric_total"):
+            samples: Final = _collected_samples(metric_name)
+            assert [(sample.labels["model_id"], sample.value) for sample in samples] == [
+                (expected, 1.0)
+            ]
+    finally:
+        _clear_prometheus_registry()
+
+
 @pytest.mark.asyncio
 async def test_failure_hook_labels_a_cli_session_with_the_per_user_alias_not_the_login_token():
     from litellm.integrations.prometheus import PrometheusLogger
diff --git a/tests/unit/litellm_core_utils/llm_response_utils/test_convert_dict_to_response.py b/tests/unit/litellm_core_utils/llm_response_utils/test_convert_dict_to_response.py
index d0f5bfc6b9f..3e197740e98 100644
--- a/tests/unit/litellm_core_utils/llm_response_utils/test_convert_dict_to_response.py
+++ b/tests/unit/litellm_core_utils/llm_response_utils/test_convert_dict_to_response.py
@@ -3089,6 +3089,73 @@ def test_convert_to_model_response_object_function_output():
     assert result._hidden_params is not None
 
 
+@pytest.mark.parametrize(
+    "vllm_choice_fields",
+    [{"stop_reason": ", 5", "token_ids": [16, 11, 220]}, {"stop_reason": 151645}, {"stop_reason": None, "token_ids": None}],
+    ids=["stop-string-with-token-ids", "stop-token", "natural-stop"],
+)
+def test_vllm_choice_fields_stay_on_the_choice_through_a_cache_round_trip(
+    vllm_choice_fields: dict[str, object],
+) -> None:
+    upstream: Final = {
+        "id": "chatcmpl-1",
+        "object": "chat.completion",
+        "created": 1,
+        "model": "Qwen/Qwen3-0.6B",
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": "1, 2, 3, 4"},
+                "finish_reason": "stop",
+                **vllm_choice_fields,
+            }
+        ],
+    }
+    response: Final = convert_to_model_response_object(response_object=upstream, model_response_object=ModelResponse())
+    assert isinstance(response, ModelResponse)
+    cache_hit: Final = convert_to_model_response_object(
+        response_object=json.loads(response.model_dump_json()), model_response_object=ModelResponse()
+    )
+    assert isinstance(cache_hit, ModelResponse)
+
+    dumped_choices: Final = [json.loads(rebuilt.model_dump_json())["choices"][0] for rebuilt in (response, cache_hit)]
+    assert [{field: choice.get(field, "missing") for field in vllm_choice_fields} for choice in dumped_choices] == [
+        vllm_choice_fields,
+        vllm_choice_fields,
+    ]
+
+
+@pytest.mark.parametrize(
+    "vllm_choice_fields",
+    [{"stop_reason": ", 5", "token_ids": [16, 11, 220]}, {"stop_reason": None, "token_ids": None}],
+    ids=["stop-string-with-token-ids", "natural-stop"],
+)
+def test_vllm_choice_fields_cached_only_under_provider_specific_fields_come_back_on_the_choice(
+    vllm_choice_fields: dict[str, object],
+) -> None:
+    cached_before_upgrade: Final = {
+        "id": "chatcmpl-1",
+        "object": "chat.completion",
+        "created": 1,
+        "model": "Qwen/Qwen3-0.6B",
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": "1, 2, 3, 4"},
+                "finish_reason": "stop",
+                "provider_specific_fields": vllm_choice_fields,
+            }
+        ],
+    }
+    cache_hit: Final = convert_to_model_response_object(
+        response_object=cached_before_upgrade, model_response_object=ModelResponse()
+    )
+    assert isinstance(cache_hit, ModelResponse)
+
+    dumped_choice: Final = json.loads(cache_hit.model_dump_json())["choices"][0]
+    assert {field: dumped_choice.get(field, "missing") for field in vllm_choice_fields} == vllm_choice_fields
+
+
 @pytest.mark.parametrize(
     "reported_cost",
     [
diff --git a/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_chat_template_tools.py b/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_chat_template_tools.py
index 51249e01d4d..a8162860684 100644
--- a/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_chat_template_tools.py
+++ b/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_chat_template_tools.py
@@ -9,7 +9,10 @@ _BARE_FUNCTION: Final = {"name": "g", "parameters": {}}
 
 
 # Tool schemas as rendered by render_tools in encoding/encoding_dsv4.py (deepseek-ai/DeepSeek-V4-Flash) and by
-# chat_template.jinja (Qwen/Qwen3.5-122B-A10B), both read on Hugging Face on 2026-10-17
+# chat_template.jinja (Qwen/Qwen3.5-122B-A10B), both read on Hugging Face on 2026-10-17, and by chat_template.jinja
+# (deepseek-ai/DeepSeek-V4.1-Flash) read on 2026-10-29. Grok's template is closed, so its two renderings are the ones
+# whose token counts left a constant preamble across seven tool shapes billed by Azure AI Foundry
+# grok-4-1-fast-reasoning and xAI grok-4.3 on 2026-10-29
 @pytest.mark.parametrize(
     ("model", "rendered"),
     [
@@ -17,6 +20,18 @@ _BARE_FUNCTION: Final = {"name": "g", "parameters": {}}
             "DeepSeek-V4-Flash-0731",
             '{"name": "f", "description": "é", "parameters": {}}\n{"name": "g", "parameters": {}}',
         ),
+        (
+            "DeepSeek-V4.1-Flash",
+            '{"name": "f", "description": "é", "parameters": {}}\n{"name": "g", "parameters": {}}',
+        ),
+        (
+            "grok-4-1-fast-reasoning",
+            '{"name":"f","description":"é","parameters":{}}\n{"name":"g","parameters":{}}',
+        ),
+        (
+            "grok-4.3",
+            '{"name": "f", "description": "é", "parameters": {}}\n{"name": "g", "parameters": {}}',
+        ),
         (
             "databricks-qwen35-122b-a10b",
             '\n{"type": "function", "function": {"name": "f", "description": "é", "parameters": {}}}'
diff --git a/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py b/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py
index 1ef97370b2b..146bb08a4fd 100644
--- a/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py
+++ b/tests/unit/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_common_utils.py
@@ -2343,7 +2343,8 @@ _MALFORMED_PROMPT_CACHE_BREAKPOINTS: Final = (
     "",
     {},
     {"mode": "bogus"},
-    {"mode": "explicit", "ttl": "1h"},
+    {"mode": "bogus", "ttl": "30m"},
+    {1: "explicit"},
 )
 _MALFORMED_PROMPT_CACHE_BREAKPOINT_IDS: Final = (
     "string",
@@ -2352,7 +2353,8 @@ _MALFORMED_PROMPT_CACHE_BREAKPOINT_IDS: Final = (
     "empty-string",
     "empty-object",
     "bogus-mode",
-    "bad-ttl",
+    "bogus-mode-with-ttl",
+    "non-string-key",
 )
 _VALID_PROMPT_CACHE_BREAKPOINTS: Final = ({"mode": "explicit"}, {"mode": "explicit", "ttl": "30m"})
 
@@ -2382,6 +2384,18 @@ def test_prompt_cache_breakpoint_for_wire_strips_an_unknown_key_under_drop_param
     assert prompt_cache_breakpoint_for_wire({"mode": "explicit", "note": "kept"}, True) == {"mode": "explicit"}
 
 
+@pytest.mark.parametrize(
+    "marker",
+    ({"mode": "explicit", "ttl": "1h"}, {"mode": "explicit", "ttl": "1h", "note": "kept"}),
+    ids=("bad-ttl", "bad-ttl-and-unknown-key"),
+)
+def test_prompt_cache_breakpoint_for_wire_drops_an_unsupported_ttl_and_keeps_the_mode_under_drop_params(
+    marker: dict[str, str],
+) -> None:
+    assert prompt_cache_breakpoint_for_wire(marker, True) == {"mode": "explicit"}
+    assert prompt_cache_breakpoint_for_wire(marker, False) is marker
+
+
 def test_cache_control_is_replaced_by_an_explicit_prompt_cache_breakpoint_on_the_same_block() -> None:
     marked: Final = {"type": "text", "text": "rules", "cache_control": {"type": "ephemeral", "ttl": "1h"}}
 
diff --git a/tests/unit/litellm_core_utils/test_exception_mapping_utils.py b/tests/unit/litellm_core_utils/test_exception_mapping_utils.py
index 2b1e4a5eed3..1b00a32d31d 100644
--- a/tests/unit/litellm_core_utils/test_exception_mapping_utils.py
+++ b/tests/unit/litellm_core_utils/test_exception_mapping_utils.py
@@ -603,6 +603,26 @@ def test_anthropic_context_window_error_mapping(error_message):
     assert excinfo.value.llm_provider == "anthropic"
 
 
+@pytest.mark.parametrize("upstream_status_code", [400, 500])
+def test_vertex_ai_anthropic_prompt_too_long_maps_to_context_window_exceeded(upstream_status_code: int) -> None:
+    original_exception: Final = VertexAIError(
+        status_code=upstream_status_code,
+        message='{"type":"error","error":{"type":"invalid_request_error",'
+        '"message":"prompt is too long: 210123 tokens > 200000 maximum"}}',
+    )
+
+    with pytest.raises(litellm.ContextWindowExceededError) as excinfo:
+        exception_type(
+            model="claude-opus-5-5",
+            original_exception=original_exception,
+            custom_llm_provider="vertex_ai",
+        )
+
+    assert excinfo.value.status_code == 400
+    assert excinfo.value.llm_provider == "vertex_ai"
+    assert excinfo.value.model == "claude-opus-5-5"
+
+
 # Test cases for Vertex AI RateLimitError mapping
 # As per https://github.com/BerriAI/litellm/issues/16189
 vertex_rate_limit_test_cases = [
diff --git a/tests/unit/litellm_core_utils/test_litellm_logging.py b/tests/unit/litellm_core_utils/test_litellm_logging.py
index f1854563cd5..13e181b2b92 100644
--- a/tests/unit/litellm_core_utils/test_litellm_logging.py
+++ b/tests/unit/litellm_core_utils/test_litellm_logging.py
@@ -11090,6 +11090,40 @@ def test_get_assembled_streaming_response_bills_a_provider_reported_usage_cost()
     assert logging_obj.response_cost_calculator(result=assembled) == 0.0042
 
 
+@pytest.mark.parametrize("continued_response_id", ["resp_continuedafteracutstream", None])
+@pytest.mark.parametrize("client_facing_response_id", ["resp_encryptedidtheclientsaw", None])
+def test_sync_success_handler_logs_a_stream_under_the_id_the_client_saw(
+    client_facing_response_id, continued_response_id
+):
+    class Recorder(CustomLogger):
+        def __init__(self):
+            super().__init__()
+            self.logged = []
+
+        def log_success_event(self, kwargs, response_obj, start_time, end_time):
+            self.logged.append((response_obj.id, kwargs["standard_logging_object"]["id"]))
+
+    recorder: Final = Recorder()
+    logging_obj: Final = _responses_stream_logging_obj()
+    logging_obj.dynamic_success_callbacks = [recorder]
+    logging_obj.client_facing_response_id = client_facing_response_id
+    if continued_response_id is not None:
+        logging_obj.record_continued_partial(
+            Usage(prompt_tokens=1, completion_tokens=1, total_tokens=2), 0.0, continued_response_id
+        )
+    now: Final = datetime.datetime.now()
+
+    logging_obj.success_handler(
+        result=_completed_responses_event(ResponseAPIUsage(input_tokens=3, output_tokens=2, total_tokens=5)),
+        start_time=now,
+        end_time=now,
+        cache_hit=False,
+    )
+
+    expected_id: Final = client_facing_response_id or continued_response_id or "resp-1"
+    assert recorder.logged == [(expected_id, expected_id)]
+
+
 def test_response_cost_calculator_prices_terminal_responses_event_from_its_response():
     logging_obj: Final = _responses_stream_logging_obj()
     inner_response: Final = ResponsesAPIResponse(
diff --git a/tests/unit/litellm_core_utils/test_redact_messages.py b/tests/unit/litellm_core_utils/test_redact_messages.py
index 9e385c588ae..0aee61d8365 100644
--- a/tests/unit/litellm_core_utils/test_redact_messages.py
+++ b/tests/unit/litellm_core_utils/test_redact_messages.py
@@ -561,6 +561,83 @@ class TestPerformRedaction:
             {"text": "redacted-by-litellm", "finish_reason": "length", "index": 1},
         ]
 
+    def test_redacts_token_ids_that_decode_to_the_completion(self):
+        details = {
+            "stream": True,
+            "complete_streaming_response": litellm.ModelResponse(
+                choices=[
+                    litellm.Choices(message=litellm.Message(content="secret", role="assistant"), token_ids=[20, 11])
+                ]
+            ),
+            "standard_logging_object": {
+                "response": {
+                    "choices": [
+                        {
+                            "token_ids": [20, 11],
+                            "message": {"content": "secret", "provider_specific_fields": {"token_ids": [20, 11]}},
+                        },
+                        {"text": " Paris.", "token_ids": [20, 11], "index": 1},
+                    ]
+                }
+            },
+        }
+
+        perform_redaction(details, None)
+
+        logged_choices = details["standard_logging_object"]["response"]["choices"]
+        assert [choice["token_ids"] for choice in logged_choices] == [None, None]
+        assert logged_choices[0]["message"]["provider_specific_fields"]["token_ids"] is None
+        assert details["complete_streaming_response"].choices[0].get("token_ids") is None
+
+    def test_redacts_text_completion_stream_text_and_the_token_ids_that_decode_to_it(self):
+        details = {
+            "stream": True,
+            "async_complete_streaming_response": litellm.TextCompletionResponse(
+                choices=[
+                    litellm.utils.TextChoices(
+                        index=0, text=" Paris.", reasoning_content="thinking", token_ids=[20, 11], finish_reason="stop"
+                    )
+                ]
+            ),
+        }
+
+        perform_redaction(details, None)
+
+        logged_choice = details["async_complete_streaming_response"].choices[0]
+        assert (logged_choice.text, logged_choice.reasoning_content) == ("redacted-by-litellm", "redacted-by-litellm")
+        assert logged_choice.get("token_ids") is None
+        assert logged_choice.finish_reason == "stop"
+
+    def test_redacts_token_ids_a_cache_hit_keeps_on_the_choice_provider_specific_fields(self):
+        result = litellm.ModelResponse(
+            choices=[
+                litellm.Choices(
+                    message=litellm.Message(content="secret", role="assistant"),
+                    provider_specific_fields={"token_ids": [20, 11], "stop_reason": "END"},
+                )
+            ]
+        )
+        details = {
+            "standard_logging_object": {
+                "response": {
+                    "choices": [
+                        {
+                            "message": {"content": "secret"},
+                            "provider_specific_fields": {"token_ids": [20, 11], "stop_reason": "END"},
+                        }
+                    ]
+                }
+            }
+        }
+
+        redacted = perform_redaction(details, result)
+
+        logged_fields = details["standard_logging_object"]["response"]["choices"][0]["provider_specific_fields"]
+        assert logged_fields == {"token_ids": None, "stop_reason": "END"}
+        assert redacted.choices[0].provider_specific_fields["token_ids"] is None
+        assert redacted.choices[0].provider_specific_fields["stop_reason"] == "END"
+        assert result.choices[0].provider_specific_fields["token_ids"] == [20, 11]
+
     def test_redacts_object_choices_inside_model_response_dict(self):
         result = {
             "choices": [
diff --git a/tests/unit/litellm_core_utils/test_streaming_chunk_builder_utils.py b/tests/unit/litellm_core_utils/test_streaming_chunk_builder_utils.py
index bbf1897b3a7..527c83d5760 100644
--- a/tests/unit/litellm_core_utils/test_streaming_chunk_builder_utils.py
+++ b/tests/unit/litellm_core_utils/test_streaming_chunk_builder_utils.py
@@ -2757,6 +2757,95 @@ def test_stream_chunk_builder_carries_the_bedrock_guardrail_trace_and_records_it
     assert entry["guardrail_cost"] == pytest.approx(2 * 0.00015)
 
 
+def _vllm_chat_chunk(index: int, content: str, finish_reason: str | None = None, **fields: object) -> ModelResponseStream:
+    return ModelResponseStream(
+        id="chatcmpl-1",
+        created=1,
+        model="qwen3",
+        choices=[StreamingChoices(index=index, delta=Delta(content=content), finish_reason=finish_reason, **fields)],
+    )
+
+
+@pytest.mark.parametrize("finish_content", ["", "4"], ids=["finish-only", "content-then-finish"])
+def test_stream_chunk_builder_keeps_the_vllm_stop_reason_and_every_token_id_of_each_choice(
+    finish_content: str,
+) -> None:
+    built: Final = stream_chunk_builder(
+        chunks=[
+            _vllm_chat_chunk(0, "1,", stop_reason=None, token_ids=[16, 11]),
+            _vllm_chat_chunk(1, "7,", stop_reason=None, token_ids=[22, 11]),
+            _vllm_chat_chunk(0, "2,3", stop_reason=None, token_ids=[17, 11, 18]),
+            _vllm_chat_chunk(0, finish_content, "stop", stop_reason=",5", token_ids=[19]),
+        ]
+    )
+
+    assert built is not None
+    assert [
+        {field: choice[field] for field in ("index", "stop_reason", "token_ids")}
+        for choice in built.model_dump()["choices"]
+    ] == [
+        {"index": 0, "stop_reason": ",5", "token_ids": [16, 11, 17, 11, 18, 19]},
+        {"index": 1, "stop_reason": None, "token_ids": [22, 11]},
+    ]
+
+
+def test_stream_chunk_builder_keeps_the_vllm_fields_of_a_sole_choice_streamed_on_a_nonzero_index() -> None:
+    built: Final = stream_chunk_builder(
+        chunks=[
+            _vllm_chat_chunk(1, "7,", stop_reason=None, token_ids=[22, 11]),
+            _vllm_chat_chunk(1, "8", "stop", stop_reason=",9", token_ids=[23]),
+        ]
+    )
+
+    assert built is not None
+    assert {field: built.model_dump()["choices"][0].get(field) for field in ("stop_reason", "token_ids")} == {
+        "stop_reason": ",9",
+        "token_ids": [22, 11, 23],
+    }
+
+
+def test_stream_chunk_builder_keeps_null_vllm_fields_and_adds_none_for_other_providers() -> None:
+    vllm_built: Final = stream_chunk_builder(
+        chunks=[
+            _vllm_chat_chunk(0, "hi", stop_reason=None, token_ids=None),
+            _vllm_chat_chunk(0, "", "stop", stop_reason=None, token_ids=None),
+        ]
+    )
+    other_built: Final = stream_chunk_builder(
+        chunks=[_vllm_chat_chunk(0, "hi"), _vllm_chat_chunk(0, "", "stop")]
+    )
+
+    assert vllm_built is not None and other_built is not None
+    assert {
+        field: vllm_built.model_dump()["choices"][0][field] for field in ("stop_reason", "token_ids")
+    } == {"stop_reason": None, "token_ids": None}
+    assert {"stop_reason", "token_ids"}.isdisjoint(other_built.model_dump()["choices"][0])
+
+
+def test_stream_chunk_builder_text_completion_keeps_each_choices_vllm_stop_reason_and_token_ids() -> None:
+    def text_chunk(index: int, text: str, **fields: object) -> TextCompletionResponse:
+        return TextCompletionResponse(
+            id="cmpl-1",
+            object="text_completion",
+            created=1,
+            model="qwen3",
+            choices=[TextChoices(index=index, text=text, **fields)],
+        )
+
+    built: Final = stream_chunk_builder_text_completion(
+        chunks=[
+            text_chunk(0, "1,", token_ids=[16, 11], stop_reason=None),
+            text_chunk(1, "7,", token_ids=[22, 11], stop_reason=None),
+            text_chunk(0, "2", token_ids=[17], stop_reason=", 3"),
+            text_chunk(1, "8", token_ids=[23], stop_reason=151645),
+        ]
+    )
+
+    assert [
+        (choice["index"], choice["stop_reason"], choice["token_ids"]) for choice in built.model_dump()["choices"]
+    ] == [(0, ", 3", [16, 11, 17]), (1, 151645, [22, 11, 23])]
+
+
 @pytest.mark.parametrize(
     ("base_model", "counted_as"), [("azure/gpt-6.1-sol", "azure/gpt-6.1-sol"), ("claude-sonnet-4-5", "my-gpt-6")]
 )
diff --git a/tests/unit/litellm_core_utils/test_streaming_handler.py b/tests/unit/litellm_core_utils/test_streaming_handler.py
index da88f1358ad..cf8de9c40f5 100644
--- a/tests/unit/litellm_core_utils/test_streaming_handler.py
+++ b/tests/unit/litellm_core_utils/test_streaming_handler.py
@@ -10,6 +10,7 @@ import threading
 import time
 from collections.abc import Mapping, Sequence
 from dataclasses import dataclass
+from itertools import chain
 from pathlib import Path
 from types import CodeType, FrameType, MappingProxyType, TracebackType
 from typing import AsyncIterator, Callable, Final, Iterator, Literal, NoReturn, Optional, cast
@@ -27,6 +28,10 @@ from litellm.exceptions import MidStreamFallbackError
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.litellm_core_utils.get_litellm_params import get_litellm_params
 from litellm.litellm_core_utils.litellm_logging import Logging
+from litellm.litellm_core_utils.llm_response_utils.convert_dict_to_response import (
+    convert_to_streaming_response,
+    convert_to_streaming_response_async,
+)
 from litellm.litellm_core_utils.streaming_handler import (
     CustomStreamWrapper,
     _ProviderChunkEarlyReturn,
@@ -34,6 +39,7 @@ from litellm.litellm_core_utils.streaming_handler import (
 )
 from litellm.llms.anthropic.chat.handler import ModelResponseIterator as AnthropicModelResponseIterator
 from litellm.llms.custom_httpx.http_handler import HTTPHandler
+from litellm.llms.hosted_vllm.chat.transformation import HostedVLLMChatConfig
 from litellm.llms.openai.chat.gpt_transformation import OpenAIChatCompletionStreamingHandler
 from litellm.llms.vertex_ai.gemini.vertex_and_google_ai_studio_gemini import (
     ModelResponseIterator as GeminiModelResponseIterator,
@@ -6971,6 +6977,327 @@ def test_chunk_creator_keeps_upstream_index_on_single_choice_chunk(logging_obj:
     assert result.choices[0].delta.content == "hello"
 
 
+_TOKEN_IDS: Final = TypeAdapter(list[int] | None)
+_CHOICE_INDEX: Final = TypeAdapter(int)
+_DELTA: Final = TypeAdapter(Mapping[str, object])
+
+
+def _joined_token_ids(choices: Sequence[Mapping[str, object]]) -> tuple[int, ...]:
+    return tuple(chain.from_iterable(_TOKEN_IDS.validate_python(choice.get("token_ids")) or () for choice in choices))
+
+
+def _hosted_vllm_stream(
+    logging_obj: Logging, upstream_choices: Sequence[Mapping[str, object]]
+) -> CustomStreamWrapper:
+    sse_lines: Final = (
+        *(
+            "data: " + json.dumps({"id": "chatcmpl-1", "object": "chat.completion.chunk", "model": "m", "choices": [c]})
+            for c in upstream_choices
+        ),
+        "data: [DONE]",
+    )
+    completion_stream: Final = HostedVLLMChatConfig().get_model_response_iterator(
+        streaming_response=iter(sse_lines), sync_stream=True, json_mode=False
+    )
+    return CustomStreamWrapper(
+        completion_stream=completion_stream, model="m", custom_llm_provider="hosted_vllm", logging_obj=logging_obj
+    )
+
+
+def _hosted_vllm_stream_choices(
+    logging_obj: Logging, upstream_choices: Sequence[Mapping[str, object]]
+) -> tuple[dict[str, object], ...]:
+    return tuple(chunk.choices[0].model_dump() for chunk in _hosted_vllm_stream(logging_obj, upstream_choices))
+
+
+@pytest.mark.parametrize("stop_reason", [",5", 151645])
+@pytest.mark.parametrize("final_content", [",3", ""], ids=["content-then-finish", "finish-only"])
+def test_hosted_vllm_stream_keeps_stop_reason_and_every_token_id(
+    logging_obj: Logging, final_content: str, stop_reason: str | int
+) -> None:
+    emitted: Final = _hosted_vllm_stream_choices(
+        logging_obj,
+        (
+            {"index": 0, "delta": {"role": "assistant", "content": ""}, "finish_reason": None},
+            {"index": 0, "delta": {"content": ""}, "finish_reason": None, "token_ids": [16]},
+            {"index": 0, "delta": {"content": "1,2"}, "finish_reason": None, "token_ids": [11, 17]},
+            {
+                "index": 0,
+                "delta": {"content": final_content},
+                "finish_reason": "stop",
+                "stop_reason": stop_reason,
+                "token_ids": [20],
+            },
+        ),
+    )
+
+    assert [choice.get("stop_reason") for choice in emitted if choice["finish_reason"] is not None] == [stop_reason]
+    assert [
+        (_DELTA.validate_python(choice["delta"]).get("content"), choice["stop_reason"])
+        for choice in emitted
+        if choice["finish_reason"] is None and choice.get("stop_reason") is not None
+    ] == ([(final_content, stop_reason)] if final_content else [])
+    assert _joined_token_ids(emitted) == (16, 11, 17, 20)
+
+
+def test_hosted_vllm_stream_sends_empty_content_on_token_id_only_chunks(logging_obj: Logging) -> None:
+    emitted: Final = _hosted_vllm_stream_choices(
+        logging_obj,
+        (
+            {"index": 0, "delta": {"role": "assistant", "content": ""}, "finish_reason": None},
+            {"index": 0, "delta": {"content": ""}, "finish_reason": None, "token_ids": [11]},
+            {"index": 0, "delta": {"content": ""}, "finish_reason": None, "token_ids": [220]},
+            {"index": 0, "delta": {"content": "1"}, "finish_reason": None, "token_ids": [16]},
+        ),
+    )
+
+    assert [
+        (_DELTA.validate_python(choice["delta"]).get("content"), choice.get("token_ids"))
+        for choice in emitted
+        if choice.get("token_ids")
+    ] == [("", [11]), ("", [220]), ("1", [16])]
+
+
+def test_hosted_vllm_stream_keeps_held_back_token_ids_on_their_own_choice(logging_obj: Logging) -> None:
+    emitted: Final = _hosted_vllm_stream_choices(
+        logging_obj,
+        (
+            {"index": 0, "delta": {"role": "assistant", "content": ""}, "finish_reason": None},
+            {"index": 1, "delta": {"role": "assistant", "content": ""}, "finish_reason": None},
+            {"index": 1, "delta": {"content": ""}, "finish_reason": None, "token_ids": [16]},
+            {"index": 0, "delta": {"content": "1"}, "finish_reason": None, "token_ids": [17]},
+            {"index": 1, "delta": {"content": "2"}, "finish_reason": None, "token_ids": [18]},
+        ),
+    )
+
+    assert [(choice["index"], choice.get("token_ids")) for choice in emitted if choice.get("token_ids")] == [
+        (1, [16]),
+        (0, [17]),
+        (1, [18]),
+    ]
+
+
+def _rejects_a_two(text: str) -> bool:
+    return "2" not in text
+
+
+def _choices_sent_before_rule_failure(stream: CustomStreamWrapper) -> Iterator[dict[str, object]]:
+    try:
+        yield from (chunk.choices[0].model_dump() for chunk in stream)
+    except MidStreamFallbackError:
+        return
+
+
+def test_hosted_vllm_stream_sends_no_token_ids_ahead_of_a_failing_post_call_rule(
+    logging_obj: Logging, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(litellm, "post_call_rules", [_rejects_a_two])
+    stream: Final = _hosted_vllm_stream(
+        logging_obj,
+        (
+            {"index": 0, "delta": {"role": "assistant", "content": ""}, "finish_reason": None},
+            {"index": 0, "delta": {"content": ""}, "finish_reason": None, "token_ids": [16]},
+            {"index": 0, "delta": {"content": "1"}, "finish_reason": None, "token_ids": [11, 17]},
+            {"index": 0, "delta": {"content": ",2"}, "finish_reason": "stop", "stop_reason": None, "token_ids": [20]},
+        ),
+    )
+
+    assert [
+        (_DELTA.validate_python(choice["delta"]).get("content"), choice.get("token_ids"))
+        for choice in _choices_sent_before_rule_failure(stream)
+    ] == [("", None), ("1", None)]
+
+
+def _held_back_stop_string_stream(token_ids: Mapping[str, None]) -> tuple[Mapping[str, object], ...]:
+    return (
+        {"index": 0, "delta": {"role": "assistant", "content": ""}, "finish_reason": None},
+        {"index": 0, "delta": {"content": ""}, "finish_reason": None, **token_ids},
+        {"index": 0, "delta": {"content": "1,2"}, "finish_reason": None, **token_ids},
+        {"index": 0, "delta": {"content": ""}, "finish_reason": "stop", "stop_reason": ",3", **token_ids},
+    )
+
+
+def test_hosted_vllm_stream_with_null_token_ids_emits_the_same_chunks_as_without_them(logging_obj: Logging) -> None:
+    with_null_ids: Final = _hosted_vllm_stream_choices(logging_obj, _held_back_stop_string_stream({"token_ids": None}))
+    without_ids: Final = _hosted_vllm_stream_choices(logging_obj, _held_back_stop_string_stream({}))
+
+    assert [(c["delta"], c["finish_reason"]) for c in with_null_ids] == [
+        (c["delta"], c["finish_reason"]) for c in without_ids
+    ]
+
+
+_TWO_CHOICE_STOP_REASONS: Final[Mapping[int, str | int]] = MappingProxyType({0: ", 3", 1: 151645})
+_TWO_CHOICE_TOKEN_IDS: Final[Mapping[int, tuple[int, int]]] = MappingProxyType({0: (16, 17), 1: (26, 27)})
+
+
+def _two_choice_stream(first_finished: int, finish_contents: tuple[str, str]) -> tuple[Mapping[str, object], ...]:
+    return (
+        *({"index": index, "delta": {"role": "assistant", "content": ""}, "finish_reason": None} for index in (0, 1)),
+        *(
+            {"index": index, "delta": {"content": "1"}, "finish_reason": None, "token_ids": [ids[0]]}
+            for index, ids in _TWO_CHOICE_TOKEN_IDS.items()
+        ),
+        *(
+            {
+                "index": index,
+                "delta": {"content": content},
+                "finish_reason": "stop",
+                "stop_reason": _TWO_CHOICE_STOP_REASONS[index],
+                "token_ids": [_TWO_CHOICE_TOKEN_IDS[index][1]],
+            }
+            for index, content in zip((first_finished, 1 - first_finished), finish_contents)
+        ),
+    )
+
+
+def _carries_another_choices_fields(choice: Mapping[str, object]) -> bool:
+    own_index: Final = _CHOICE_INDEX.validate_python(choice["index"])
+    token_ids: Final = _TOKEN_IDS.validate_python(choice.get("token_ids")) or ()
+    return not set(token_ids) <= set(_TWO_CHOICE_TOKEN_IDS[own_index]) or choice.get("stop_reason") not in (
+        None,
+        _TWO_CHOICE_STOP_REASONS[own_index],
+    )
+
+
+@pytest.mark.parametrize("first_finished", [0, 1])
+@pytest.mark.parametrize(
+    "finish_contents",
+    [("", ""), ("2", ""), ("2", "2")],
+    ids=["both-finish-only", "content-then-finish-only", "both-content-then-finish"],
+)
+def test_hosted_vllm_stream_with_two_choices_keeps_ids_and_stop_reason_on_their_own_choice(
+    logging_obj: Logging, first_finished: int, finish_contents: tuple[str, str]
+) -> None:
+    emitted: Final = _hosted_vllm_stream_choices(logging_obj, _two_choice_stream(first_finished, finish_contents))
+
+    assert [
+        (choice["index"], choice.get("token_ids"), choice.get("stop_reason"))
+        for choice in emitted
+        if _carries_another_choices_fields(choice)
+    ] == []
+
+
+@pytest.mark.parametrize("first_finished", [0, 1])
+@pytest.mark.parametrize(
+    "finish_contents", [("2", ""), ("2", "2")], ids=["content-then-finish-only", "both-content-then-finish"]
+)
+def test_hosted_vllm_stream_with_two_choices_keeps_each_stop_reason_on_its_final_content_chunk(
+    logging_obj: Logging, first_finished: int, finish_contents: tuple[str, str]
+) -> None:
+    emitted: Final = _hosted_vllm_stream_choices(logging_obj, _two_choice_stream(first_finished, finish_contents))
+    content_chunk_stop_reasons: Final = frozenset(
+        (choice["index"], choice["stop_reason"])
+        for choice in emitted
+        if _DELTA.validate_python(choice["delta"]).get("content") and choice.get("stop_reason") is not None
+    )
+    finished_with_content: Final = frozenset(
+        (index, _TWO_CHOICE_STOP_REASONS[index])
+        for index, content in zip((first_finished, 1 - first_finished), finish_contents)
+        if content
+    )
+
+    assert content_chunk_stop_reasons == finished_with_content
+
+
+@pytest.mark.parametrize("first_finished", [0, 1])
+@pytest.mark.parametrize(
+    "finish_contents",
+    [("", ""), ("2", ""), ("", "2"), ("2", "2")],
+    ids=["both-finish-only", "content-then-finish-only", "finish-only-then-content", "both-content-then-finish"],
+)
+def test_hosted_vllm_stream_with_two_choices_delivers_every_token_id_and_stop_reason_of_each_choice(
+    logging_obj: Logging, first_finished: int, finish_contents: tuple[str, str]
+) -> None:
+    emitted: Final = _hosted_vllm_stream_choices(logging_obj, _two_choice_stream(first_finished, finish_contents))
+
+    assert {
+        index: _joined_token_ids([choice for choice in emitted if choice["index"] == index])
+        for index in _TWO_CHOICE_TOKEN_IDS
+    } == _TWO_CHOICE_TOKEN_IDS
+    assert frozenset(
+        (choice["index"], choice["stop_reason"]) for choice in emitted if choice.get("stop_reason") is not None
+    ) == frozenset(_TWO_CHOICE_STOP_REASONS.items())
+
+
+def test_hosted_vllm_stream_with_two_choices_finishes_the_first_choice_before_the_other_choice_streams_on(
+    logging_obj: Logging,
+) -> None:
+    emitted: Final = _hosted_vllm_stream_choices(
+        logging_obj,
+        (
+            *({"index": index, "delta": {"role": "assistant", "content": ""}, "finish_reason": None} for index in (0, 1)),
+            {"index": 0, "delta": {"content": "1"}, "finish_reason": "stop", "stop_reason": ",2", "token_ids": [16]},
+            {"index": 1, "delta": {"content": ""}, "finish_reason": None, "token_ids": [26]},
+            {"index": 1, "delta": {"content": ""}, "finish_reason": None, "token_ids": [11]},
+            {"index": 1, "delta": {"content": "1,"}, "finish_reason": None, "token_ids": [27]},
+            {"index": 1, "delta": {"content": "3"}, "finish_reason": "stop", "stop_reason": 151645, "token_ids": [28]},
+        ),
+    )
+    first_choice_finish: Final = next(
+        position for position, choice in enumerate(emitted) if choice["index"] == 0 and choice["finish_reason"]
+    )
+
+    assert emitted[first_choice_finish]["stop_reason"] == ",2"
+    assert _joined_token_ids([choice for choice in emitted[first_choice_finish:] if choice["index"] == 1]) == (
+        26,
+        11,
+        27,
+        28,
+    )
+
+
+_CACHED_VLLM_TOKEN_IDS: Final = (16, 11, 220, 17, 11, 220, 18, 11, 220, 19)
+
+
+def _cached_vllm_completion() -> dict[str, object]:
+    return {
+        "id": "chatcmpl-1",
+        "object": "chat.completion",
+        "created": 1,
+        "model": "Qwen/Qwen3-0.6B",
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": "1, 2, 3, 4"},
+                "finish_reason": "stop",
+                "stop_reason": ", 5",
+                "token_ids": list(_CACHED_VLLM_TOKEN_IDS),
+            }
+        ],
+    }
+
+
+async def _replayed_cache_hit_choices(logging_obj: Logging, replay: str) -> tuple[dict[str, object], ...]:
+    if replay == "async":
+        async_wrapper: Final = CustomStreamWrapper(
+            completion_stream=convert_to_streaming_response_async(_cached_vllm_completion()),
+            model="m",
+            custom_llm_provider="cached_response",
+            logging_obj=logging_obj,
+        )
+        return tuple([chunk.choices[0].model_dump() async for chunk in async_wrapper if chunk.choices])
+    sync_wrapper: Final = CustomStreamWrapper(
+        completion_stream=convert_to_streaming_response(_cached_vllm_completion()),
+        model="m",
+        custom_llm_provider="cached_response",
+        logging_obj=logging_obj,
+    )
+    return tuple(chunk.choices[0].model_dump() for chunk in sync_wrapper if chunk.choices)
+
+
+@pytest.mark.parametrize("replay", ["sync", "async"])
+@pytest.mark.asyncio
+async def test_a_streamed_cache_hit_keeps_the_vllm_stop_reason_and_every_token_id(
+    logging_obj: Logging, replay: str
+) -> None:
+    emitted: Final = await _replayed_cache_hit_choices(logging_obj, replay)
+
+    assert [
+        (choice["finish_reason"], choice["stop_reason"]) for choice in emitted if choice.get("stop_reason") is not None
+    ] == [("stop", ", 5")]
+    assert _joined_token_ids(emitted) == _CACHED_VLLM_TOKEN_IDS
+
+
 def _later_chunk_outputs(
     custom_llm_provider: str, later_chunks: Sequence[ChatCompletionChunk], logging_obj: Logging
 ) -> tuple[ModelResponseStream, ...]:
diff --git a/tests/unit/litellm_core_utils/test_token_counter.py b/tests/unit/litellm_core_utils/test_token_counter.py
index 697ac76b4e5..8ef118154d1 100644
--- a/tests/unit/litellm_core_utils/test_token_counter.py
+++ b/tests/unit/litellm_core_utils/test_token_counter.py
@@ -638,8 +638,14 @@ def test_token_counter_tools_match_billed_prompt_for_json_tool_chat_templates(
         ("deepseek/deepseek-chat:free", "DeepSeek-V4-Flash-0731"),
         ("deepseek-reasoner", "DeepSeek-V4-Flash-0731"),
         ("deepseek/deepseek-flash", "DeepSeek-V4-Flash-0731"),
-        ("DeepSeek-V4.1-Flash", "deepseek-v3.2"),
-        ("accounts/fireworks/models/deepseek-v4p1-flash", "deepseek-v3.2"),
+        ("DeepSeek-V4.1-Flash", "accounts/fireworks/models/deepseek-v4p1-flash"),
+        ("databricks-deepseek-v4-1-flash", "accounts/fireworks/models/deepseek-v4p1-flash"),
+        ("deepseek-ai/deepseek-v4.1-flash-maas", "accounts/fireworks/models/deepseek-v4p1-flash"),
+        ("deepseek-v4p1-flash-1017", "accounts/fireworks/models/deepseek-v4p1-flash"),
+        ("grok-4.1-fast-non-reasoning", "grok-4-1-fast-reasoning"),
+        ("xai.grok-4.1-fast", "grok-4-1-fast-reasoning"),
+        ("grok-4.3-latest", "grok-4.3"),
+        ("xai.grok-4-3", "grok-4.3"),
         ("Qwen/Qwen3.5-122B-A10B", "databricks-qwen35-122b-a10b"),
         ("qwen3-235b-a22b", "mistral-large-latest"),
     ],
@@ -704,6 +710,48 @@ def test_token_counter_tool_choice_adds_nothing_for_deepseek_v4(tool_choice: obj
     ) == token_counter_new(model="DeepSeek-V4-Flash-0731", messages=list(_USER_MESSAGES), tools=tools)
 
 
+# A request with a one-function tool billed 283 prompt tokens on xAI grok-4.3 without tool_choice and 297 with a
+# named one, and 357 and 358 on Azure AI Foundry grok-4-1-fast-reasoning, on 2026-10-29
+@pytest.mark.parametrize("model", ["grok-4.3", "grok-4-1-fast-reasoning"])
+def test_token_counter_counts_a_named_tool_choice_for_grok(model: str):
+    tools: Final = [_openai_tool(_WEATHER_FUNCTION)]
+    named: Final = {"type": "function", "function": {"name": "get_weather"}}
+
+    assert token_counter_new(
+        model=model, messages=list(_USER_MESSAGES), tools=tools, tool_choice=named
+    ) > token_counter_new(model=model, messages=list(_USER_MESSAGES), tools=tools)
+
+
+def _counted_with_strict(model: str, **strict: bool) -> int:
+    return token_counter_new(
+        model=model, messages=list(_USER_MESSAGES), tools=[_openai_tool({**_WEATHER_FUNCTION, **strict})]
+    )
+
+
+# A one-function tool billed the same prompt tokens with strict unset and false on 2026-10-29: 357 through Azure AI
+# Foundry grok-4-1-fast-reasoning chat and 283 through xAI grok-4.3
+@pytest.mark.parametrize("model", ["grok-4-1-fast-reasoning", "grok-4.3"])
+def test_token_counter_renders_a_false_strict_like_an_unset_one_for_grok(model: str):
+    assert (
+        _counted_with_strict(model, strict=False)
+        == _counted_with_strict(model)
+        < _counted_with_strict(model, strict=True)
+    )
+
+
+# A one-function tool billed 5 prompt tokens more with strict false than unset, the same as with strict true, on
+# 2026-10-30: 310 against 305 through Baseten DeepSeek-V4.1-Flash and 309 against 304 through Together
+@pytest.mark.parametrize(
+    "model", ["accounts/fireworks/models/deepseek-v4p1-flash", "deepseek-v4-flash", "qwen3.5-plus"]
+)
+def test_token_counter_renders_a_false_strict_like_a_true_one_for_other_chat_templates(model: str):
+    assert (
+        _counted_with_strict(model, strict=False)
+        == _counted_with_strict(model, strict=True)
+        > _counted_with_strict(model)
+    )
+
+
 @pytest.mark.parametrize(
     ("tool_choice", "expected_tool_choice"),
     [
@@ -759,9 +807,17 @@ def test_token_counter_counts_anthropic_tools_as_sent_to_chat_template_families(
 
 # Qwen3.5's chat_template.jinja opens a system turn for the tool schemas when the request has none, 5 tokens that a
 # request with a system message already pays, while DeepSeek V4's encoding_dsv4.py appends them to the first turn
-# either way (both read on Hugging Face on 2026-10-17)
+# either way (both read on Hugging Face on 2026-10-17). A system message cost the same with and without a tool on
+# Fireworks deepseek-v4p1-flash, Azure AI Foundry grok-4-1-fast-reasoning and xAI grok-4.3 on 2026-10-29
 @pytest.mark.parametrize(
-    ("model", "implicit_system_turn_tokens"), [("DeepSeek-V4-Flash-0731", 0), ("databricks-qwen35-122b-a10b", 5)]
+    ("model", "implicit_system_turn_tokens"),
+    [
+        ("DeepSeek-V4-Flash-0731", 0),
+        ("databricks-qwen35-122b-a10b", 5),
+        ("accounts/fireworks/models/deepseek-v4p1-flash", 0),
+        ("grok-4-1-fast-reasoning", 0),
+        ("grok-4.3", 0),
+    ],
 )
 def test_token_counter_counts_the_tools_system_turn_only_without_a_system_message(
     model: str, implicit_system_turn_tokens: int
diff --git a/tests/unit/litellm_core_utils/test_tool_fields.py b/tests/unit/litellm_core_utils/test_tool_fields.py
index 23d7de98fbc..a99278d18dd 100644
--- a/tests/unit/litellm_core_utils/test_tool_fields.py
+++ b/tests/unit/litellm_core_utils/test_tool_fields.py
@@ -1,4 +1,5 @@
 import datetime
+import logging
 from collections.abc import Callable, Mapping
 from typing import Final
 
@@ -6,7 +7,13 @@ import pytest
 
 import litellm
 from litellm import Router
+from litellm._logging import verbose_logger
 from litellm.litellm_core_utils.litellm_logging import Logging
+from litellm.litellm_core_utils.tool_fields import (
+    tool_params_without_hosted_mcp,
+    tools_without_hosted_mcp,
+    tools_without_mcp_servers,
+)
 from litellm.utils import async_pre_call_deployment_hook
 
 _GOOD_TOOL: Final = {"type": "function", "function": {"name": "get_weather", "parameters": {"type": "object"}}}
@@ -185,3 +192,92 @@ 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
+
+
+def test_a_hosted_mcp_error_names_every_server_and_marks_an_unlabeled_one(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.UnsupportedParamsError) as raised:
+        tools_without_hosted_mcp(
+            tools=[
+                {"type": "mcp", "server_label": "deepwiki", "server_url": "https://mcp.deepwiki.com/mcp"},
+                {"type": "mcp", "server_url": "https://mcp.example.com/mcp"},
+            ],
+            model="gemini-3.8-flash",
+            route="gemini",
+            drop_params=False,
+        )
+    assert "the hosted MCP tool `deepwiki`, `unlabeled` " in str(raised.value)
+
+
+_HOSTED_MCP_TOOL: Final = {"type": "mcp", "server_label": "deepwiki", "server_url": "https://mcp.deepwiki.com/mcp"}
+
+
+def test_dropping_a_hosted_mcp_tool_keeps_the_other_tool_params_and_leaves_the_caller_dict_alone() -> None:
+    tool_choice: Final = {"type": "function", "function": {"name": "get_weather"}}
+    sent: Final = {
+        "tools": [_HOSTED_MCP_TOOL, _GOOD_TOOL],
+        "tool_choice": tool_choice,
+        "parallel_tool_calls": False,
+        "temperature": 0.2,
+    }
+    params: Final = tool_params_without_hosted_mcp(sent, model="deepseek-v4-flash", route="deepseek", drop_params=True)
+
+    assert params == {
+        "tools": [_GOOD_TOOL],
+        "tool_choice": tool_choice,
+        "parallel_tool_calls": False,
+        "temperature": 0.2,
+    }
+    assert sent["tools"] == [_HOSTED_MCP_TOOL, _GOOD_TOOL]
+
+
+def test_dropping_every_hosted_mcp_tool_clears_the_tool_selection_params() -> None:
+    params: Final = tool_params_without_hosted_mcp(
+        {"tools": [_HOSTED_MCP_TOOL], "tool_choice": "required", "parallel_tool_calls": True, "temperature": 0.2},
+        model="deepseek-v4-flash",
+        route="deepseek",
+        drop_params=True,
+    )
+
+    assert params == {"temperature": 0.2}
+
+
+class _Records(logging.Handler):
+    def __init__(self) -> None:
+        super().__init__(level=logging.WARNING)
+        self.messages: Final[list[str]] = []
+
+    def emit(self, record: logging.LogRecord) -> None:
+        self.messages.append(record.getMessage())
+
+
+@pytest.mark.parametrize(
+    "drop",
+    [
+        lambda model: tools_without_hosted_mcp(
+            [{"type": "mcp", "server_label": "wiki\r\nFORGED", "server_url": "https://mcp.example.com/mcp"}],
+            model=model,
+            route="deepseek",
+            drop_params=True,
+        ),
+        lambda model: tools_without_mcp_servers(
+            [{"type": "url", "name": "wiki\r\nFORGED", "url": "https://mcp.example.com/mcp"}],
+            tools=[],
+            model=model,
+            route="bedrock",
+            drop_params=True,
+        ),
+    ],
+    ids=["hosted_mcp_tool", "mcp_servers"],
+)
+def test_a_drop_warning_stays_on_one_log_line(drop: Callable[[str], object]) -> None:
+    records: Final = _Records()
+    verbose_logger.addHandler(records)
+    try:
+        drop("deepseek-v4-flash\nFORGED level=CRITICAL")
+    finally:
+        verbose_logger.removeHandler(records)
+
+    assert len(records.messages) == 1
+    assert "\n" not in records.messages[0] and "\r" not in records.messages[0]
+    assert "FORGED level=CRITICAL" in records.messages[0]
diff --git a/tests/unit/llms/anthropic/chat/test_anthropic_chat_handler.py b/tests/unit/llms/anthropic/chat/test_anthropic_chat_handler.py
index 95068008d25..ce14adab4a0 100644
--- a/tests/unit/llms/anthropic/chat/test_anthropic_chat_handler.py
+++ b/tests/unit/llms/anthropic/chat/test_anthropic_chat_handler.py
@@ -3705,6 +3705,40 @@ def test_streamed_end_turn_carries_no_stop_details():
     assert "stop_reason" not in provider_fields
 
 
+def test_message_start_surfaces_input_transformations_on_the_first_chunk() -> None:
+    input_transformations: Final = [{"type": "thinking_block_binding", "count": 2}]
+    chunk: Final = {
+        "type": "message_start",
+        "message": {
+            "id": "msg_1",
+            "type": "message",
+            "role": "assistant",
+            "model": "claude-sonnet-4-6",
+            "content": [],
+            "stop_reason": None,
+            "stop_sequence": None,
+            "usage": {"input_tokens": 12, "output_tokens": 1},
+            "input_transformations": input_transformations,
+        },
+    }
+    iterator: Final = ModelResponseIterator(streaming_response=MagicMock(), sync_stream=True, json_mode=False)
+
+    first_chunk: Final = iterator.chunk_parser(chunk=chunk)
+
+    assert first_chunk.choices[0].delta.provider_specific_fields == {"input_transformations": input_transformations}
+    assert first_chunk.model == "claude-sonnet-4-6"
+
+
+def test_message_start_without_input_transformations_has_no_provider_specific_fields() -> None:
+    chunk: Final = {
+        "type": "message_start",
+        "message": {"id": "msg_1", "type": "message", "role": "assistant", "model": "claude-sonnet-4-6", "content": []},
+    }
+    iterator: Final = ModelResponseIterator(streaming_response=MagicMock(), sync_stream=True, json_mode=False)
+
+    assert iterator.chunk_parser(chunk=chunk).choices[0].delta.provider_specific_fields is None
+
+
 def _anthropic_chat_request_for_bound_thinking(
     extra_headers: dict[str, str] | None, drop_params: bool | None = None
 ) -> httpx.Request:
@@ -3779,3 +3813,76 @@ def test_anthropic_chat_sends_block_binding_as_is_without_drop_params(monkeypatc
     monkeypatch.setattr(litellm, "drop_params", False)
     body: Final = _anthropic_chat_body_for_bound_thinking(None)
     assert body["thinking"] == {"type": "adaptive", "block_binding": {"prefix_mismatch_behavior": "error"}}
+
+
+class _AnthropicChatUpstream:
+    def __init__(self) -> None:
+        self.anthropic_beta: tuple[str, ...] = ()
+
+    def respond(self, request: httpx.Request) -> httpx.Response:
+        self.anthropic_beta = tuple(request.headers.get_list("anthropic-beta"))
+        return httpx.Response(
+            200,
+            json={
+                "id": "msg_beta_row",
+                "type": "message",
+                "role": "assistant",
+                "model": "claude-sonnet-4-6",
+                "content": [{"type": "text", "text": "ok"}],
+                "stop_reason": "end_turn",
+                "stop_sequence": None,
+                "usage": {"input_tokens": 1, "output_tokens": 1},
+            },
+        )
+
+
+_BETAS_FOUNDRY_REJECTS_AND_ACCEPTS: Final = "advisor-tool-2026-03-01,thinking-binding-controls-2026-08-01"
+
+
+@pytest.mark.parametrize(
+    ("api_base", "forwarded_betas"),
+    [
+        pytest.param(
+            "https://res.services.ai.azure.com/anthropic",
+            frozenset({"thinking-binding-controls-2026-08-01"}),
+            id="foundry",
+        ),
+        pytest.param(
+            "https://res.cognitiveservices.azure.com/anthropic",
+            frozenset({"thinking-binding-controls-2026-08-01"}),
+            id="foundry-cognitiveservices",
+        ),
+        pytest.param(
+            "https://res.openai.azure.com/anthropic",
+            frozenset({"thinking-binding-controls-2026-08-01"}),
+            id="foundry-openai",
+        ),
+        pytest.param(
+            "https://api.anthropic.com",
+            frozenset(_BETAS_FOUNDRY_REJECTS_AND_ACCEPTS.split(",")),
+            id="anthropic",
+        ),
+    ],
+)
+def test_anthropic_chat_completion_picks_the_beta_row_by_api_base(
+    monkeypatch: pytest.MonkeyPatch, api_base: str, forwarded_betas: frozenset[str]
+) -> None:
+    from litellm import anthropic_beta_headers_manager
+
+    monkeypatch.setenv("LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS", "True")
+    monkeypatch.setattr(anthropic_beta_headers_manager, "_BETA_HEADERS_CONFIG", None)
+    upstream: Final = _AnthropicChatUpstream()
+    client: Final = HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(upstream.respond)))
+    try:
+        litellm.completion(
+            model="anthropic/claude-sonnet-4-6",
+            messages=[{"role": "user", "content": "Say ok"}],
+            api_base=api_base,
+            api_key="test-key",
+            extra_headers={"anthropic-beta": _BETAS_FOUNDRY_REJECTS_AND_ACCEPTS},
+            client=client,
+        )
+    finally:
+        client.close()
+
+    assert frozenset(",".join(upstream.anthropic_beta).split(",")) == forwarded_betas
diff --git a/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py b/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py
index 636e23168cf..13ff11e8a3f 100644
--- a/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py
+++ b/tests/unit/llms/anthropic/chat/test_anthropic_chat_transformation.py
@@ -40,6 +40,7 @@ from litellm.llms.vertex_ai.vertex_ai_partner_models.anthropic.transformation im
     VertexAIAnthropicConfig,
 )
 from litellm.types.llms.anthropic import ANTHROPIC_BETA_HEADER_VALUES, ANTHROPIC_TOOL_SEARCH_TOOL_TYPES
+from litellm.types.llms.anthropic_messages.anthropic_response import AnthropicMessagesResponse
 from litellm.types.llms.openai import ChatCompletionToolCallFunctionChunk
 from litellm.types.utils import ChatCompletionToolCallChunk, ModelResponse, ServerToolUse, Usage
 from tests.unit.llms.anthropic.anthropic_docs_refusal import ANTHROPIC_DOCS_REFUSAL_MESSAGE
@@ -6788,6 +6789,34 @@ def test_eager_input_streaming_not_set_on_computer_use_tool():
     assert "eager_input_streaming" not in mapped_tool
 
 
+def _computer_tool_with_defer_loading_and_allowed_callers(tool_type: str) -> dict[str, object]:
+    return {
+        "type": tool_type,
+        "function": {"name": "computer", "parameters": {"display_width_px": 1024, "display_height_px": 768}},
+        "defer_loading": True,
+        "allowed_callers": ["code_execution_20250825"],
+    }
+
+
+@pytest.mark.parametrize("tool_type", ["computer_20241022", "computer_20250124"])
+def test_legacy_computer_tools_drop_defer_loading_and_allowed_callers(tool_type: str):
+    mapped_tool, _ = AnthropicConfig().map_tool_helper(_computer_tool_with_defer_loading_and_allowed_callers(tool_type))
+
+    assert mapped_tool["type"] == tool_type
+    assert "defer_loading" not in mapped_tool
+    assert "allowed_callers" not in mapped_tool
+
+
+def test_computer_20251124_keeps_defer_loading_and_allowed_callers():
+    mapped_tool, _ = AnthropicConfig().map_tool_helper(
+        _computer_tool_with_defer_loading_and_allowed_callers("computer_20251124")
+    )
+
+    assert mapped_tool["type"] == "computer_20251124"
+    assert mapped_tool["defer_loading"] is True
+    assert mapped_tool["allowed_callers"] == ["code_execution_20250825"]
+
+
 def test_eager_input_streaming_reaches_anthropic_request_tools():
     result = AnthropicConfig().map_openai_params(
         non_default_params={"tools": [_eager_chat_tool(eager_input_streaming=True)], "stream": True},
@@ -7520,10 +7549,10 @@ def test_process_anthropic_headers_with_no_matching_headers():
 @pytest.mark.parametrize(
     "computer_tool_used, prompt_caching_set, expected_beta_header",
     [
-        (True, False, True),
-        (False, True, False),
-        (True, True, True),
-        (False, False, False),
+        ("computer_20250124", False, True),
+        (None, True, False),
+        ("computer_20250124", True, True),
+        (None, False, False),
     ],
 )
 def test_anthropic_beta_header(computer_tool_used, prompt_caching_set, expected_beta_header):
@@ -9233,6 +9262,7 @@ async def test_litellm_anthropic_prompt_caching_system(
     }
 
 
+@pytest.mark.usefixtures("local_beta_headers_config")
 def test_completion_forwards_caller_anthropic_beta_header_with_computer_tool(respx_mock: respx.MockRouter):
     route: Final = respx_mock.post("https://api.anthropic.com/v1/messages").mock(
         return_value=httpx.Response(
@@ -9271,7 +9301,7 @@ def test_completion_forwards_caller_anthropic_beta_header_with_computer_tool(res
     sent_betas: Final = frozenset(
         beta.strip() for beta in route.calls.last.request.headers["anthropic-beta"].split(",")
     )
-    assert sent_betas == frozenset({"computer-use-2025-01-24"})
+    assert sent_betas == frozenset({"computer-use-2024-10-22", "computer-use-2025-01-24"})
     assert json.loads(route.calls.last.request.content)["tools"] == [
         {
             "type": "computer_20241022",
@@ -9283,6 +9313,69 @@ def test_completion_forwards_caller_anthropic_beta_header_with_computer_tool(res
     ]
 
 
+# Tool-to-beta pairs from Anthropic's computer use docs; api.anthropic.com answered 400 to
+# computer_20251124 without computer-use-2025-11-24 and 200 with it on 2026-10-31
+@pytest.mark.usefixtures("local_beta_headers_config")
+@pytest.mark.parametrize(
+    ("tool_type", "expected_beta"),
+    [
+        ("computer_20241022", "computer-use-2024-10-22"),
+        ("computer_20250124", "computer-use-2025-01-24"),
+        ("computer_20251124", "computer-use-2025-11-24"),
+    ],
+)
+def test_completion_adds_the_beta_matching_the_computer_tool_version(
+    respx_mock: respx.MockRouter, tool_type: str, expected_beta: str
+):
+    route: Final = respx_mock.post("https://api.anthropic.com/v1/messages").mock(
+        return_value=httpx.Response(200, json=_anthropic_message_body([{"type": "text", "text": "hi"}], "end_turn"))
+    )
+
+    litellm.completion(
+        model="anthropic/claude-opus-5",
+        api_key="mock_api_key",
+        messages=[{"role": "user", "content": "Say hi"}],
+        tools=[
+            {
+                "type": tool_type,
+                "function": {
+                    "name": "computer",
+                    "parameters": {"display_height_px": 768, "display_width_px": 1024},
+                },
+            }
+        ],
+    )
+
+    sent_betas: Final = frozenset(
+        beta.strip() for beta in route.calls.last.request.headers["anthropic-beta"].split(",")
+    )
+    assert sent_betas == frozenset({expected_beta})
+
+
+@pytest.mark.usefixtures("local_beta_headers_config")
+def test_completion_sends_no_computer_use_beta_for_an_unknown_computer_tool_version(respx_mock: respx.MockRouter):
+    route: Final = respx_mock.post("https://api.anthropic.com/v1/messages").mock(
+        return_value=httpx.Response(200, json=_anthropic_message_body([{"type": "text", "text": "hi"}], "end_turn"))
+    )
+
+    litellm.completion(
+        model="anthropic/claude-opus-5",
+        api_key="mock_api_key",
+        messages=[{"role": "user", "content": "Say hi"}],
+        tools=[
+            {
+                "type": "computer_20991231",
+                "function": {
+                    "name": "computer",
+                    "parameters": {"display_height_px": 768, "display_width_px": 1024},
+                },
+            }
+        ],
+    )
+
+    assert "anthropic-beta" not in route.calls.last.request.headers
+
+
 def _anthropic_message_body(content: list[dict[str, object]], stop_reason: str) -> dict[str, object]:
     return {
         "id": "msg_01XrAv7gc5tQNDuoADra7vB4",
@@ -9922,6 +10015,160 @@ def test_transform_request_tool_config_point_without_tools_drops_the_key():
     assert litellm_params["metadata"] == {}
 
 
+_INPUT_TRANSFORMATIONS: Final = [{"type": "thinking_block_binding", "count": 2}]
+
+
+def _input_transformations_response() -> AnthropicMessagesResponse:
+    return AnthropicMessagesResponse(
+        id="msg_input_transformations",
+        type="message",
+        role="assistant",
+        model="claude-sonnet-4-6",
+        content=[{"type": "text", "text": "ok"}],
+        stop_reason="end_turn",
+        stop_sequence=None,
+        usage={"input_tokens": 12, "output_tokens": 3},
+        input_transformations=_INPUT_TRANSFORMATIONS,
+    )
+
+
+def test_chat_response_surfaces_input_transformations_in_provider_specific_fields() -> None:
+    result: Final = AnthropicConfig().transform_response(
+        model="claude-sonnet-4-6",
+        raw_response=httpx.Response(200, json=_input_transformations_response()),
+        model_response=ModelResponse(),
+        logging_obj=MagicMock(),
+        request_data={},
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={},
+        encoding=None,
+    )
+
+    assert result.choices[0].message.provider_specific_fields["input_transformations"] == _INPUT_TRANSFORMATIONS
+
+
+def test_chat_response_without_input_transformations_adds_no_key() -> None:
+    completion_response: Final = {
+        key: value for key, value in _input_transformations_response().items() if key != "input_transformations"
+    }
+    result: Final = AnthropicConfig().transform_response(
+        model="claude-sonnet-4-6",
+        raw_response=httpx.Response(200, json=completion_response),
+        model_response=ModelResponse(),
+        logging_obj=MagicMock(),
+        request_data={},
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={},
+        encoding=None,
+    )
+
+    assert "input_transformations" not in result.choices[0].message.provider_specific_fields
+
+
+def test_json_mode_chat_response_keeps_input_transformations() -> None:
+    completion_response: Final = {
+        **_input_transformations_response(),
+        "content": [{"type": "tool_use", "id": "toolu_json", "name": RESPONSE_FORMAT_TOOL_NAME, "input": {"answer": 42}}],
+        "stop_reason": "tool_use",
+    }
+    result: Final = AnthropicConfig().transform_response(
+        model="claude-sonnet-4-6",
+        raw_response=httpx.Response(200, json=completion_response),
+        model_response=ModelResponse(),
+        logging_obj=MagicMock(),
+        request_data={},
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={},
+        encoding=None,
+        json_mode=True,
+    )
+
+    assert json.loads(result.choices[0].message.content) == {"answer": 42}
+    assert result.choices[0].message.provider_specific_fields["input_transformations"] == _INPUT_TRANSFORMATIONS
+
+
+_HOSTED_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+_WEATHER_FUNCTION_TOOL: Final = {
+    "type": "function",
+    "function": {"name": "get_weather", "parameters": {"type": "object", "properties": {}}},
+}
+_ROUTES_WITHOUT_THE_MCP_CONNECTOR: Final = (
+    pytest.param(AmazonAnthropicClaudeConfig, "bedrock", id="bedrock_invoke"),
+    pytest.param(VertexAIAnthropicConfig, "vertex_ai", id="vertex_ai"),
+)
+
+
+@pytest.mark.parametrize("config_class", [AnthropicConfig, AzureAnthropicConfig, BedrockClaudePlatformConfig])
+def test_routes_with_the_mcp_connector_send_a_hosted_mcp_tool_as_an_mcp_server(monkeypatch, config_class):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    mapped: Final = config_class().map_openai_params(
+        non_default_params={"tools": [_WEATHER_FUNCTION_TOOL, _HOSTED_MCP_TOOL]},
+        optional_params={},
+        model="claude-haiku-5-5",
+        drop_params=False,
+    )
+    assert [server["url"] for server in mapped["mcp_servers"]] == [_HOSTED_MCP_TOOL["server_url"]]
+    assert [tool["name"] for tool in mapped["tools"]] == ["get_weather"]
+
+
+@pytest.mark.parametrize(("config_class", "route"), _ROUTES_WITHOUT_THE_MCP_CONNECTOR)
+def test_a_hosted_mcp_tool_answers_400_on_claude_routes_without_the_mcp_connector(monkeypatch, config_class, route):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.utils.UnsupportedParamsError) as raised:
+        config_class().map_openai_params(
+            non_default_params={"tools": [_WEATHER_FUNCTION_TOOL, _HOSTED_MCP_TOOL]},
+            optional_params={},
+            model="claude-haiku-5-5",
+            drop_params=False,
+        )
+    assert raised.value.status_code == 400
+    assert f"claude-haiku-5-5 on {route} " in str(raised.value)
+    assert "`deepwiki`" in str(raised.value)
+
+
+@pytest.mark.parametrize(("config_class", "route"), _ROUTES_WITHOUT_THE_MCP_CONNECTOR)
+def test_claude_routes_without_the_mcp_connector_drop_a_hosted_mcp_tool_under_drop_params(
+    monkeypatch, caplog, config_class, route
+):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with caplog.at_level("WARNING"):
+        mapped: Final = config_class().map_openai_params(
+            non_default_params={"tools": [_HOSTED_MCP_TOOL, _WEATHER_FUNCTION_TOOL]},
+            optional_params={},
+            model="claude-haiku-5-5",
+            drop_params=True,
+        )
+    assert [tool["name"] for tool in mapped["tools"]] == ["get_weather"]
+    assert "mcp_servers" not in mapped
+    assert any(
+        "`deepwiki`" in record.getMessage() and f" on {route} (" in record.getMessage() for record in caplog.records
+    )
+
+
+@pytest.mark.parametrize(("config_class", "route"), _ROUTES_WITHOUT_THE_MCP_CONNECTOR)
+def test_claude_routes_without_the_mcp_connector_send_no_tools_when_drop_params_drops_every_one(
+    monkeypatch, config_class, route
+):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    mapped: Final = config_class().map_openai_params(
+        non_default_params={"tools": [_HOSTED_MCP_TOOL], "tool_choice": "required"},
+        optional_params={},
+        model="claude-haiku-5-5",
+        drop_params=True,
+    )
+    assert "tools" not in mapped
+    assert "mcp_servers" not in mapped
+    assert "tool_choice" not in mapped
+
+
 _KEPT_SEARCH_CALL: Final = {
     "role": "assistant",
     "content": None,
diff --git a/tests/unit/llms/anthropic/messages/adapters/test_handler_output_config_passthrough.py b/tests/unit/llms/anthropic/messages/adapters/test_handler_output_config_passthrough.py
index c34cb686928..12769e78329 100644
--- a/tests/unit/llms/anthropic/messages/adapters/test_handler_output_config_passthrough.py
+++ b/tests/unit/llms/anthropic/messages/adapters/test_handler_output_config_passthrough.py
@@ -27,11 +27,14 @@ Tests cover (consolidating PRs #23706 and #22727):
 
 import os
 import sys
+from collections.abc import Mapping
 from typing import Final
 from unittest.mock import MagicMock, patch
 
 import pytest
 
+import litellm
+
 # Anchor sys.path to this file's location — not the working-directory-relative
 # pattern Greptile flagged on PR #23706. Resolves correctly regardless of
 # where pytest is invoked from.
@@ -67,8 +70,8 @@ def _call_prepare(extra_kwargs, model="gpt-4o", output_format=None, **overrides)
         system=None,
         temperature=None,
         thinking=None,
-        tool_choice=None,
-        tools=None,
+        tool_choice=overrides.get("tool_choice"),
+        tools=overrides.get("tools"),
         top_k=None,
         top_p=None,
         output_format=output_format,
@@ -263,3 +266,112 @@ async def test_messages_layer_converted_stream_flag_still_gets_a_message_back(co
     )
 
     assert response["content"][0]["text"] == "hi"
+
+
+_DEEPWIKI_SERVER: Final = {"type": "url", "url": "https://mcp.deepwiki.com/mcp", "name": "deepwiki"}
+
+
+@pytest.mark.parametrize(
+    ("mcp_servers", "named"),
+    [
+        ([_DEEPWIKI_SERVER], "`deepwiki`"),
+        ([_DEEPWIKI_SERVER, {"type": "url", "url": "https://mcp.example.com/mcp"}], "`deepwiki`, `unnamed`"),
+        ({"name": "deepwiki"}, "`unnamed`"),
+    ],
+    ids=["named", "one-unnamed", "not-a-list"],
+)
+def test_mcp_servers_a_chat_route_cannot_run_answer_400_naming_each_server(
+    monkeypatch: pytest.MonkeyPatch, mcp_servers: object, named: str
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.UnsupportedParamsError) as raised:
+        _call_prepare(
+            extra_kwargs={"mcp_servers": mcp_servers, "custom_llm_provider": "gemini"}, model="gemini-3.8-flash"
+        )
+
+    assert raised.value.status_code == 400
+    assert f"to gemini-3.8-flash on gemini, so the MCP server {named} would not run" in str(raised.value)
+
+
+@pytest.mark.parametrize(
+    ("route", "forwards"),
+    [("litellm_proxy", True), ("hosted_vllm", True), ("bedrock", False), ("vertex_ai", False)],
+)
+def test_mcp_servers_reach_routes_that_carry_them_and_answer_400_elsewhere(
+    monkeypatch: pytest.MonkeyPatch, route: str, forwards: bool
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    extra_kwargs: Final = {"mcp_servers": [_DEEPWIKI_SERVER], "custom_llm_provider": route}
+    if not forwards:
+        with pytest.raises(litellm.UnsupportedParamsError, match=f"on {route}, so the MCP server `deepwiki`"):
+            _call_prepare(extra_kwargs=extra_kwargs, model="some-model")
+        return
+
+    completion_kwargs, _ = _call_prepare(extra_kwargs=extra_kwargs, model="some-model")
+
+    assert completion_kwargs["mcp_servers"] == [_DEEPWIKI_SERVER]
+
+
+_DEEPWIKI_TOOLSET: Final = {"type": "mcp_toolset", "mcp_server_name": "deepwiki"}
+_WEATHER_TOOL: Final = {
+    "name": "get_weather",
+    "description": "Get the weather for a city",
+    "input_schema": {"type": "object", "properties": {"city": {"type": "string"}}},
+}
+
+
+@pytest.mark.parametrize(
+    ("tools", "kept_tool_names"),
+    [([_DEEPWIKI_TOOLSET, _WEATHER_TOOL], ["get_weather"]), ([_DEEPWIKI_TOOLSET], None)],
+    ids=["with-function", "toolset-only"],
+)
+def test_drop_params_drops_the_mcp_toolset_tools_of_dropped_mcp_servers(
+    monkeypatch: pytest.MonkeyPatch, tools: list[dict[str, object]], kept_tool_names: list[str] | None
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", True)
+    completion_kwargs, _ = _call_prepare(
+        extra_kwargs={"mcp_servers": [_DEEPWIKI_SERVER], "custom_llm_provider": "gemini"},
+        model="gemini-3.8-flash",
+        tools=tools,
+        tool_choice={"type": "auto"},
+    )
+
+    sent_tools: Final = completion_kwargs.get("tools")
+    sent_names: Final = [tool["function"]["name"] for tool in sent_tools] if sent_tools else None
+    assert sent_names == kept_tool_names
+    assert ("tool_choice" in completion_kwargs) == bool(kept_tool_names)
+
+
+_DROP_FORMS: Final[Mapping[str, Mapping[str, object]]] = {
+    "request": {"drop_params": True},
+    "global": {},
+    "additional_drop_params": {"additional_drop_params": ["mcp_servers"]},
+}
+
+
+@pytest.mark.parametrize("drop_params", list(_DROP_FORMS))
+def test_drop_params_drops_mcp_servers_instead_of_forwarding_them(
+    monkeypatch: pytest.MonkeyPatch, drop_params: str
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", drop_params == "global")
+    completion_kwargs, _ = _call_prepare(
+        extra_kwargs={
+            "mcp_servers": [_DEEPWIKI_SERVER],
+            "custom_llm_provider": "gemini",
+            **_DROP_FORMS[drop_params],
+        },
+        model="gemini-3.8-flash",
+    )
+
+    assert "mcp_servers" not in completion_kwargs
+    assert completion_kwargs["messages"] == MESSAGES
+
+
+@pytest.mark.parametrize("mcp_servers", [None, []], ids=["absent", "empty"])
+def test_no_mcp_servers_needs_no_drop_params(monkeypatch: pytest.MonkeyPatch, mcp_servers: object) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    completion_kwargs, _ = _call_prepare(
+        extra_kwargs={"mcp_servers": mcp_servers, "custom_llm_provider": "gemini"}, model="gemini-3.8-flash"
+    )
+
+    assert "mcp_servers" not in completion_kwargs
diff --git a/tests/unit/llms/anthropic/messages/adapters/test_streaming_iterator_combined_chunk.py b/tests/unit/llms/anthropic/messages/adapters/test_streaming_iterator_combined_chunk.py
index d4911427e73..a57011b6410 100644
--- a/tests/unit/llms/anthropic/messages/adapters/test_streaming_iterator_combined_chunk.py
+++ b/tests/unit/llms/anthropic/messages/adapters/test_streaming_iterator_combined_chunk.py
@@ -204,6 +204,20 @@ def test_splitter_splits_combined_chunk_into_content_then_finish():
     assert finish_chunk.choices[0].delta.content is None
 
 
+def test_a_finish_on_another_choice_index_does_not_end_the_message():
+    chunks: Final = [
+        ModelResponseStream(choices=[StreamingChoices(index=0, delta=Delta(content="Hello"))]),
+        ModelResponseStream(choices=[StreamingChoices(index=1, delta=Delta(content="Hi"))]),
+        ModelResponseStream(choices=[StreamingChoices(index=1, delta=Delta(content=""), finish_reason="length")]),
+        ModelResponseStream(choices=[StreamingChoices(index=0, delta=Delta(content=""), finish_reason="stop")]),
+    ]
+
+    events: Final = list(AnthropicStreamWrapper(completion_stream=iter(chunks), model="qwen3"))
+
+    stop_reasons: Final = [event["delta"]["stop_reason"] for event in events if event.get("type") == "message_delta"]
+    assert stop_reasons == ["end_turn"]
+
+
 def test_is_combined_false_when_choices_empty():
     """A metadata-only chunk with no choices is never treated as combined."""
     assert _CombinedChunkSplitter._is_combined(SimpleNamespace(choices=[])) is False
diff --git a/tests/unit/llms/anthropic/messages/context_management/test_inference_view.py b/tests/unit/llms/anthropic/messages/context_management/test_inference_view.py
new file mode 100644
index 00000000000..8c2747592cc
--- /dev/null
+++ b/tests/unit/llms/anthropic/messages/context_management/test_inference_view.py
@@ -0,0 +1,239 @@
+import logging
+from typing import Final
+from unittest.mock import patch
+
+import pytest
+from pydantic import JsonValue, TypeAdapter
+
+import litellm
+from litellm.llms.anthropic.messages.context_management.inference_view import (
+    CountContextEdits,
+    InferenceRequestView,
+    InferenceRequestViewError,
+    inference_request_view,
+)
+
+_NO_EDITS: Final = CountContextEdits(spec=None, model="gemini/gemini-2.5-flash", tools=None)
+
+
+@pytest.mark.parametrize(
+    "system", ("Be brief.", [{"type": "text", "text": "Be brief."}]), ids=("string-system", "text-block-system")
+)
+async def test_anthropic_view_keeps_only_the_turns_after_a_client_compaction_block(system: JsonValue) -> None:
+    view: Final = await inference_request_view(
+        (
+            {"role": "user", "content": "first question " * 50},
+            {"role": "assistant", "content": [{"type": "compaction", "content": "Summary of the earlier turns."}]},
+            {"role": "user", "content": "latest question"},
+        ),
+        system,
+        "anthropic",
+        _NO_EDITS,
+    )
+
+    assert isinstance(view, InferenceRequestView)
+    assert view.messages == [{"role": "user", "content": "latest question"}]
+    assert "Summary of the earlier turns." in str(view.system)
+    assert "Be brief." in str(view.system)
+
+
+async def test_anthropic_view_flattens_a_replayed_web_search_result_into_text() -> None:
+    snippet: Final = "LiteLLM ships a weekly release candidate and a stable line."
+    view: Final = await inference_request_view(
+        (
+            {"role": "user", "content": "What is new?"},
+            {
+                "role": "assistant",
+                "content": [
+                    {"type": "server_tool_use", "id": "srvtoolu_01", "name": "web_search", "input": {"query": "news"}},
+                    {
+                        "type": "web_search_tool_result",
+                        "tool_use_id": "srvtoolu_01",
+                        "content": [
+                            {
+                                "type": "web_search_result",
+                                "url": "https://docs.litellm.ai/release_notes",
+                                "title": "Release notes",
+                                "encrypted_content": "",
+                                "snippet": snippet,
+                            }
+                        ],
+                    },
+                ],
+            },
+        ),
+        None,
+        "anthropic",
+        _NO_EDITS,
+    )
+
+    assert isinstance(view, InferenceRequestView)
+    assistant_blocks: Final = TypeAdapter(list[dict[str, str]]).validate_python(view.messages[1]["content"])
+    assert [block["type"] for block in assistant_blocks] == ["text"]
+    assert snippet in assistant_blocks[0]["text"]
+
+
+async def test_openai_view_is_the_request_unchanged() -> None:
+    messages: Final = ({"role": "user", "content": [{"type": "compaction", "content": "kept"}]},)
+
+    view: Final = await inference_request_view(messages, "Be brief.", "openai", _NO_EDITS)
+
+    assert isinstance(view, InferenceRequestView)
+    assert view.messages == messages
+    assert view.system == "Be brief."
+
+
+_TOOL_OUTPUT: Final = "line of a long file that the agent read earlier. " * 180
+_READ_FILE_TOOL: Final[dict[str, object]] = {
+    "name": "read_file",
+    "description": "Read a file",
+    "input_schema": {"type": "object", "properties": {"path": {"type": "string"}}},
+}
+_CLEAR_EDIT: Final[JsonValue] = {
+    "type": "clear_tool_uses_20250919",
+    "trigger": {"type": "input_tokens", "value": 500},
+    "keep": {"type": "tool_uses", "value": 1},
+}
+_CLEAR_OLD_TOOL_RESULTS: Final[JsonValue] = {"edits": [_CLEAR_EDIT]}
+
+
+def _agent_turns(rounds: int, first_round: int = 0) -> tuple[dict[str, JsonValue], ...]:
+    return (
+        *(
+            turn
+            for index in range(first_round, first_round + rounds)
+            for turn in (
+                {"role": "user", "content": f"Read file {index}."},
+                {
+                    "role": "assistant",
+                    "content": [
+                        {"type": "tool_use", "id": f"toolu_{index}", "name": "read_file", "input": {"path": f"{index}"}}
+                    ],
+                },
+                {
+                    "role": "user",
+                    "content": [{"type": "tool_result", "tool_use_id": f"toolu_{index}", "content": _TOOL_OUTPUT}],
+                },
+            )
+        ),  # comprehension-ok: flattens each round into its three turns
+        {"role": "user", "content": "Summarize what you read."},
+    )
+
+
+def _tool_outputs_kept(view: InferenceRequestView) -> tuple[bool, ...]:
+    return tuple(
+        _TOOL_OUTPUT in str(message["content"]) for message in view.messages if "tool_result" in str(message["content"])
+    )
+
+
+def _edits(spec: JsonValue) -> CountContextEdits:
+    return CountContextEdits(spec=spec, model="gemini/gemini-2.5-flash", tools=(_READ_FILE_TOOL,))
+
+
+async def test_anthropic_view_clears_the_tool_results_inference_clears() -> None:
+    view: Final = await inference_request_view(_agent_turns(3), None, "anthropic", _edits(_CLEAR_OLD_TOOL_RESULTS))
+
+    assert isinstance(view, InferenceRequestView)
+    assert _tool_outputs_kept(view) == (False, False, True)
+
+
+async def test_anthropic_view_applies_clear_edits_without_calling_the_compaction_summary_model() -> None:
+    spec: Final[JsonValue] = {
+        "edits": [{"type": "compact_20260112", "trigger": {"type": "input_tokens", "value": 50000}}, _CLEAR_EDIT]
+    }
+    turns: Final = (
+        {"role": "user", "content": "first question " * 30000},
+        {"role": "assistant", "content": "first answer"},
+        *_agent_turns(3),
+    )
+
+    with (
+        patch(
+            "litellm.llms.anthropic.messages.context_management.editors.compact._read_summary_model_setting",
+            return_value="gemini/gemini-2.5-flash",
+        ),
+        patch.object(litellm, "acompletion", side_effect=AssertionError("count_tokens must not summarize")) as summary,
+    ):
+        view: Final = await inference_request_view(turns, None, "anthropic", _edits(spec))
+
+    assert summary.call_count == 0
+    assert isinstance(view, InferenceRequestView)
+    assert _tool_outputs_kept(view) == (False, False, True)
+
+
+async def test_anthropic_view_counts_the_unedited_body_without_an_error_log_when_an_edit_fails(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    with (
+        patch.object(litellm, "token_counter", side_effect=RuntimeError("tokenizer unavailable")),
+        caplog.at_level(logging.DEBUG, logger="LiteLLM"),
+    ):
+        view: Final = await inference_request_view(_agent_turns(3), None, "anthropic", _edits(_CLEAR_OLD_TOOL_RESULTS))
+
+    assert isinstance(view, InferenceRequestView)
+    assert _tool_outputs_kept(view) == (True, True, True)
+    assert any("skipping edits" in record.getMessage() for record in caplog.records)
+    assert not any(record.levelno >= logging.ERROR for record in caplog.records)
+
+
+async def test_anthropic_view_counts_the_turns_after_a_compaction_block_when_an_edit_fails() -> None:
+    turns: Final = (
+        *_agent_turns(3)[:-1],
+        {"role": "assistant", "content": [{"type": "compaction", "content": "Read files 0 to 2."}]},
+        *_agent_turns(2, first_round=3),
+    )
+
+    with patch.object(litellm, "token_counter", side_effect=RuntimeError("tokenizer unavailable")):
+        view: Final = await inference_request_view(turns, None, "anthropic", _edits(_CLEAR_OLD_TOOL_RESULTS))
+
+    assert isinstance(view, InferenceRequestView)
+    assert _tool_outputs_kept(view) == (True, True)
+    assert "Read files 0 to 2." in str(view.system)
+
+
+async def test_anthropic_view_clears_only_the_turns_after_a_compaction_block_when_clear_runs_before_compact() -> None:
+    clear_before_compact: Final[JsonValue] = {
+        "edits": [
+            {
+                "type": "clear_tool_uses_20250919",
+                "trigger": {"type": "tool_uses", "value": 3},
+                "keep": {"type": "tool_uses", "value": 1},
+            },
+            {"type": "compact_20260112"},
+        ]
+    }
+    turns: Final = (
+        *_agent_turns(3)[:-1],
+        {"role": "assistant", "content": [{"type": "compaction", "content": "Read files 0 to 2."}]},
+        *_agent_turns(2, first_round=3),
+    )
+
+    with patch.object(litellm, "token_counter", side_effect=RuntimeError("tokenizer unavailable")):
+        view: Final = await inference_request_view(turns, None, "anthropic", _edits(clear_before_compact))
+
+    assert isinstance(view, InferenceRequestView)
+    assert _tool_outputs_kept(view) == (True, True)
+    assert "Read files 0 to 2." in str(view.system)
+
+
+async def test_anthropic_view_leaves_a_system_that_is_not_text_blocks_and_its_turns_to_the_provider_check() -> None:
+    image_system: Final[JsonValue] = [{"type": "image", "source": {"type": "url", "url": "https://example.com/a.png"}}]
+
+    view: Final = await inference_request_view(
+        _agent_turns(3), image_system, "anthropic", _edits(_CLEAR_OLD_TOOL_RESULTS)
+    )
+
+    assert isinstance(view, InferenceRequestView)
+    assert _tool_outputs_kept(view) == (True, True, True)
+    assert view.system == image_system
+
+
+async def test_anthropic_view_rejects_a_compact_trigger_inference_rejects() -> None:
+    low_trigger: Final[JsonValue] = {
+        "edits": [{"type": "compact_20260112", "trigger": {"type": "input_tokens", "value": 1000}}]
+    }
+
+    view: Final = await inference_request_view(_agent_turns(1), None, "anthropic", _edits(low_trigger))
+
+    assert isinstance(view, InferenceRequestViewError)
+    assert view.status_code == 400
diff --git a/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_handler.py b/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_handler.py
index 660f6865e7b..bd8f3d53157 100644
--- a/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_handler.py
+++ b/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_handler.py
@@ -3,12 +3,14 @@ import copy
 import json
 import os
 import uuid
-from collections.abc import Iterator
+from collections.abc import Iterator, Mapping
 from datetime import datetime
 from dataclasses import dataclass
+from pathlib import Path
 from typing import Any, Dict, Final, List
 
 import httpx
+import openai
 import responses
 import respx
 import pytest
@@ -1140,6 +1142,260 @@ async def test_messages_strips_provider_prefix_exactly_once(requested_model, exp
     assert captured["url"] == expected_url
 
 
+_GET_WEATHER_TOOL: Final = {
+    "name": "get_weather",
+    "description": "Get the current weather for a city",
+    "input_schema": {"type": "object", "properties": {"city": {"type": "string"}}, "required": ["city"]},
+}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "tools, expected_path",
+    [
+        ([_GET_WEATHER_TOOL], "/openai/v1/responses"),
+        (None, "/openai/deployments/gpt-6-luna/chat/completions"),
+    ],
+    ids=["function_tool_bridged_to_responses", "no_tools_on_chat"],
+)
+@pytest.mark.parametrize("credentials_from_env", [False, True], ids=["credentials_in_params", "credentials_from_env"])
+async def test_azure_ai_on_azure_openai_host_streams_natively_with_the_bare_deployment(
+    tools: list[dict[str, object]] | None,
+    expected_path: str,
+    credentials_from_env: bool,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    litellm.in_memory_llm_clients_cache.flush_cache()
+    monkeypatch.delenv("AZURE_API_BASE", raising=False)
+    monkeypatch.delenv("AZURE_API_KEY", raising=False)
+    monkeypatch.setenv("AZURE_AI_API_BASE", "https://qa-resource.cognitiveservices.azure.com")
+    monkeypatch.setenv("AZURE_AI_API_KEY", "env-api-key")
+    credentials: Final = (
+        {}
+        if credentials_from_env
+        else {"api_base": "https://qa-resource.cognitiveservices.azure.com", "api_key": "params-api-key"}
+    )
+
+    with respx.mock(assert_all_called=True) as respx_mock:
+        upstream: Final = respx_mock.route(host="qa-resource.cognitiveservices.azure.com").mock(
+            side_effect=httpx.ConnectError("cut at the wire")
+        )
+        with pytest.raises(openai.APIError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "What is the weather in Berlin?"}],
+                model="azure_ai/gpt-6-luna",
+                stream=True,
+                tools=tools,
+                **credentials,
+            )
+
+    bodies: Final = [json.loads(call.request.content) for call in upstream.calls]
+    assert {call.request.url.path for call in upstream.calls} == {expected_path}
+    assert {call.request.headers["api-key"] for call in upstream.calls} == {credentials.get("api_key", "env-api-key")}
+    assert {body["model"] for body in bodies} == {"gpt-6-luna"}
+    assert all(body["stream"] is True for body in bodies)
+
+
+@pytest.mark.asyncio
+async def test_bridged_messages_keep_the_region_of_a_regional_bedrock_mantle_model(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    litellm.in_memory_llm_clients_cache.flush_cache()
+
+    with respx.mock(assert_all_called=True) as respx_mock:
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(litellm.exceptions.ServiceUnavailableError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model="bedrock_mantle/eu-west-1/openai.gpt-oss-120b",
+                api_key="test-api-key",
+            )
+
+    assert {call.request.url.host for call in upstream.calls} == {"bedrock-mantle.eu-west-1.api.aws"}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("model", ["anthropic/claude-sonnet-5-5", "ragflow/gpt-4o"])
+async def test_bridged_messages_keep_the_callers_explicit_provider_over_the_model_prefix(
+    model: str, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    litellm.in_memory_llm_clients_cache.flush_cache()
+
+    with respx.mock(assert_all_called=True) as respx_mock:
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(openai.APIError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model=model,
+                custom_llm_provider="openai",
+                api_base="https://gateway.example.com/v1",
+                api_key="test-api-key",
+            )
+
+    assert {call.request.url.host for call in upstream.calls} == {"gateway.example.com"}
+    assert {json.loads(call.request.content)["model"] for call in upstream.calls} == {model}
+
+
+@pytest.mark.parametrize("model", ["chatgpt/gpt-5", "github_copilot/gpt-5"])
+def test_bridged_messages_reach_the_callers_provider_without_signing_in_to_the_prefix_provider(
+    model: str, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.setenv("OPENAI_API_KEY", "server-openai-key")
+    monkeypatch.setenv("CHATGPT_TOKEN_DIR", str(tmp_path))
+    monkeypatch.setenv("GITHUB_COPILOT_TOKEN_DIR", str(tmp_path))
+    litellm.in_memory_llm_clients_cache.flush_cache()
+
+    with respx.mock(assert_all_called=True) as respx_mock:
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(openai.APIError):
+            litellm.anthropic.messages.create(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model=model,
+                custom_llm_provider="openai",
+            )
+
+    assert {call.request.url.host for call in upstream.calls} == {"api.openai.com"}
+    assert {call.request.headers["authorization"] for call in upstream.calls} == {"Bearer server-openai-key"}
+
+
+@pytest.mark.asyncio
+async def test_bridged_messages_send_the_deployments_key_for_azure_models_served_as_openai(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.setenv("OPENAI_API_KEY", "server-openai-key")
+    litellm.in_memory_llm_clients_cache.flush_cache()
+
+    with respx.mock(assert_all_called=True) as respx_mock:
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(openai.APIError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model="azure/mistral-large-latest",
+                api_base="https://example-resource.services.ai.azure.com/models",
+                api_key="deployment-key",
+            )
+
+    assert {call.request.headers["authorization"] for call in upstream.calls} == {"Bearer deployment-key"}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "entra_credential",
+    [
+        {"azure_ad_token": "entra-token"},
+        {"azure_ad_token_provider": lambda: "entra-token"},
+        {"tenant_id": "tenant", "client_id": "client", "client_secret": "secret"},
+        {"azure_username": "user", "azure_password": "password", "client_id": "client"},
+    ],
+)
+@pytest.mark.parametrize("api_base_from_env", [False, True], ids=["api_base_in_params", "api_base_from_env"])
+async def test_bridged_messages_keep_the_deployments_entra_credential_over_the_env_key(
+    monkeypatch: pytest.MonkeyPatch, entra_credential: Mapping[str, object], api_base_from_env: bool
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.setenv("AZURE_AI_API_BASE", "https://example-resource.cognitiveservices.azure.com")
+    monkeypatch.setenv("AZURE_AI_API_KEY", "azure-env-key")
+    litellm.in_memory_llm_clients_cache.flush_cache()
+    api_base: Final = {} if api_base_from_env else {"api_base": "https://example-resource.cognitiveservices.azure.com"}
+
+    with (
+        patch("litellm.llms.azure.common_utils.get_azure_ad_token_from_entra_id", return_value=lambda: "entra-token"),  # test-quality-ok: stands in for the Entra token fetch so the test can see which credential reaches Azure
+        patch(
+            "litellm.llms.azure.common_utils.get_azure_ad_token_from_username_password",
+            return_value=lambda: "entra-token",
+        ),  # test-quality-ok: stands in for the Entra token fetch so the test can see which credential reaches Azure
+        respx.mock(assert_all_called=True) as respx_mock,
+    ):
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(openai.APIError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model="azure_ai/gpt-6-luna",
+                tools=[{"name": "get_weather", "input_schema": {"type": "object", "properties": {}}}],
+                **api_base,
+                **entra_credential,
+            )
+
+    assert {call.request.headers.get("authorization") for call in upstream.calls} == {"Bearer entra-token"}
+    assert {call.request.headers.get("api-key") for call in upstream.calls} == {None}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "azure_env_credential, expected_header, expected_value",
+    [
+        ({"AZURE_API_KEY": "azure-env-key"}, "api-key", "azure-env-key"),
+        (
+            {"AZURE_TENANT_ID": "tenant", "AZURE_CLIENT_ID": "client", "AZURE_CLIENT_SECRET": "secret"},
+            "authorization",
+            "Bearer entra-token",
+        ),
+    ],
+    ids=["azure_env_key", "azure_env_entra"],
+)
+async def test_bridged_messages_keep_the_azure_env_credential_when_the_deployment_sets_its_own_api_base(
+    azure_env_credential: Mapping[str, str], expected_header: str, expected_value: str, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    for name in ("AZURE_API_KEY", "AZURE_OPENAI_API_KEY", "AZURE_AD_TOKEN", "AZURE_TENANT_ID", "AZURE_CLIENT_ID"):
+        monkeypatch.delenv(name, raising=False)
+    monkeypatch.setenv("AZURE_AI_API_KEY", "key-for-another-resource")
+    for name, value in azure_env_credential.items():
+        monkeypatch.setenv(name, value)
+    litellm.in_memory_llm_clients_cache.flush_cache()
+
+    with (
+        patch("litellm.llms.azure.common_utils.get_azure_ad_token_from_entra_id", return_value=lambda: "entra-token"),  # test-quality-ok: stands in for the Entra token fetch so the test can see which credential reaches Azure
+        respx.mock(assert_all_called=True) as respx_mock,
+    ):
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(openai.APIError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model="azure_ai/gpt-6-luna",
+                api_base="https://example-resource.cognitiveservices.azure.com",
+                tools=[{"name": "get_weather", "input_schema": {"type": "object", "properties": {}}}],
+            )
+
+    assert {call.request.headers.get(expected_header) for call in upstream.calls} == {expected_value}
+
+
+@pytest.mark.asyncio
+async def test_bridged_messages_still_route_through_the_litellm_proxy_when_asked(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.setenv("LITELLM_PROXY_API_BASE", "https://proxy.example.com")
+    monkeypatch.setenv("LITELLM_PROXY_API_KEY", "proxy-key")
+    monkeypatch.setenv("AZURE_AI_API_BASE", "https://example-resource.cognitiveservices.azure.com")
+    monkeypatch.setenv("AZURE_AI_API_KEY", "azure-env-key")
+    litellm.in_memory_llm_clients_cache.flush_cache()
+
+    with respx.mock(assert_all_called=True) as respx_mock:
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(openai.APIError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model="azure_ai/gpt-6-luna",
+                use_litellm_proxy=True,
+            )
+
+    assert {call.request.url.host for call in upstream.calls} == {"proxy.example.com"}
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "model_info, expected_url",
diff --git a/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_transformation.py b/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_transformation.py
index 8fa9d534a8c..54b29ca6aa7 100644
--- a/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_transformation.py
+++ b/tests/unit/llms/anthropic/messages/native/test_anthropic_messages_transformation.py
@@ -563,6 +563,36 @@ def test_drop_params_forwards_a_non_object_message_item_as_sent_on_the_native_re
     assert request["messages"][2]["content"][0]["content"] == [{"type": "text", "text": "sunny"}]
 
 
+def test_native_response_keeps_input_transformations() -> None:
+    input_transformations: Final[list[JsonValue]] = [{"type": "thinking_block_binding", "count": 2}]
+    upstream: Final[dict[str, JsonValue]] = {
+        "id": "msg_test",
+        "type": "message",
+        "role": "assistant",
+        "model": "claude-sonnet-4-6",
+        "content": [{"type": "text", "text": "ok"}],
+        "stop_reason": "end_turn",
+        "stop_sequence": None,
+        "usage": {"input_tokens": 19, "output_tokens": 42},
+        "input_transformations": input_transformations,
+    }
+    logging_obj: Final = Logging(
+        model="claude-sonnet-4-6",
+        messages=[],
+        stream=False,
+        call_type="anthropic_messages",
+        start_time=datetime(2026, 1, 1, tzinfo=timezone.utc),
+        litellm_call_id="test-call",
+        function_id="test-function",
+    )
+
+    response: Final = AnthropicMessagesConfig().transform_anthropic_messages_response(
+        model="claude-sonnet-4-6", raw_response=httpx.Response(200, json=upstream), logging_obj=logging_obj
+    )
+
+    assert response["input_transformations"] == input_transformations
+
+
 BINDING_AND_DISPLAY_BETAS: Final = "thinking-binding-controls-2026-08-01,thinking-display-updates-2026-08-18"
 
 
diff --git a/tests/unit/llms/anthropic/messages/native/test_mcp_handler.py b/tests/unit/llms/anthropic/messages/native/test_mcp_handler.py
index 73c2edbce19..c0e0ea9f803 100644
--- a/tests/unit/llms/anthropic/messages/native/test_mcp_handler.py
+++ b/tests/unit/llms/anthropic/messages/native/test_mcp_handler.py
@@ -2,8 +2,12 @@ from importlib import import_module
 from typing import Final
 from unittest.mock import AsyncMock, patch
 
+import httpx
+import openai
 import pytest
+import respx
 
+import litellm
 from litellm.llms.anthropic.messages.adapters.transformation import (
     LiteLLMAnthropicMessagesAdapter,
 )
@@ -56,6 +60,30 @@ def test_anthropic_messages_handler_routes_litellm_proxy_mcp_to_the_gateway():
     assert result is not None
 
 
+@pytest.mark.asyncio
+async def test_anthropic_messages_with_mcp_reaches_an_env_only_deployment_with_its_env_credentials(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.setenv("AZURE_AI_API_BASE", "https://example-resource.cognitiveservices.azure.com")
+    monkeypatch.setenv("AZURE_AI_API_KEY", "azure-env-key")
+    litellm.in_memory_llm_clients_cache.flush_cache()
+
+    with respx.mock(assert_all_called=True) as respx_mock:
+        upstream: Final = respx_mock.route().mock(side_effect=httpx.ConnectError("cut at the wire"))
+        with pytest.raises(openai.APIError):
+            await litellm.anthropic.messages.acreate(
+                max_tokens=100,
+                messages=[{"role": "user", "content": "ping"}],
+                model="azure_ai/gpt-6-luna",
+                tools=[{**MCP_REFERENCE, "server_url": "litellm_proxy"}],
+            )
+
+    assert {call.request.url.host for call in upstream.calls} == {"example-resource.cognitiveservices.azure.com"}
+    assert {call.request.headers.get("api-key") for call in upstream.calls} == {"azure-env-key"}
+    assert not any(b"litellm_proxy" in call.request.content for call in upstream.calls)
+
+
 def test_anthropic_messages_handler_skips_the_gateway_on_recursion():
     """The gateway's own follow-up call must not re-enter the gateway."""
     with patch(
diff --git a/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py b/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py
index 382917fc756..c06c9d721ac 100644
--- a/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py
+++ b/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py
@@ -764,6 +764,57 @@ async def test_recomputed_cost_of_a_served_bridge_response_prices_the_reasoning_
     assert logging_obj.cost_breakdown["reasoning_cost"] == pytest.approx(expected_reasoning)
 
 
+_DEEPWIKI_SERVER: Final = {"type": "url", "url": "https://mcp.deepwiki.com/mcp", "name": "deepwiki"}
+
+
+def test_mcp_servers_the_responses_bridge_cannot_run_answer_400(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.UnsupportedParamsError) as rejected:
+        _build_responses_kwargs(
+            model="gpt-5.6",
+            extra_kwargs={**OPENAI_API, "mcp_servers": [_DEEPWIKI_SERVER]},
+            max_tokens=1024,
+            messages=MESSAGES,
+        )
+
+    assert rejected.value.status_code == 400
+    assert "to gpt-5.6 on openai, so the MCP server `deepwiki` would not run" in rejected.value.message
+
+
+@pytest.mark.parametrize(
+    "drop_form",
+    [{"drop_params": True}, {"additional_drop_params": ["mcp_servers"]}],
+    ids=["drop_params", "additional_drop_params"],
+)
+def test_drop_params_keeps_mcp_servers_off_the_responses_request(
+    monkeypatch: pytest.MonkeyPatch, drop_form: Mapping[str, object]
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    responses_kwargs: Final = _build_responses_kwargs(
+        model="gpt-5.6",
+        extra_kwargs={**OPENAI_API, "mcp_servers": [_DEEPWIKI_SERVER], **drop_form},
+        max_tokens=1024,
+        messages=MESSAGES,
+    )
+
+    assert "mcp_servers" not in responses_kwargs
+    assert responses_kwargs["input"]
+
+
+def test_drop_params_drops_the_mcp_toolset_tools_of_dropped_mcp_servers(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    weather_tool: Final = {"name": "get_weather", "input_schema": {"type": "object", "properties": {}}}
+    responses_kwargs: Final = _build_responses_kwargs(
+        model="gpt-5.6",
+        extra_kwargs={**OPENAI_API, "mcp_servers": [_DEEPWIKI_SERVER], "drop_params": True},
+        max_tokens=1024,
+        messages=MESSAGES,
+        tools=[{"type": "mcp_toolset", "mcp_server_name": "deepwiki"}, weather_tool],
+    )
+
+    assert [tool["name"] for tool in responses_kwargs["tools"]] == ["get_weather"]
+
+
 TEXT_RESPONSE: Final = {
     "id": "resp_cleared",
     "object": "response",
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 f6dae2c304f..1f1ff6a5748 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
@@ -806,3 +806,89 @@ def test_azure_keeps_a_later_developer_message_in_place_as_system(config: AzureO
     )
     assert [message["role"] for message in messages] == ["system", "user", "assistant", "system", "user"]
     assert messages[3]["content"] == "Answer with exactly one word."
+
+
+_MARKED_AZURE_PARTS: Final = (
+    {"type": "text", "text": "Stable prefix", "prompt_cache_breakpoint": {"mode": "explicit", "ttl": "30m"}},
+    {"type": "text", "text": "Implicit", "prompt_cache_breakpoint": {"mode": "implicit"}},
+)
+_TRIMMED_AZURE_PARTS: Final = [
+    {"type": "text", "text": "Stable prefix", "prompt_cache_breakpoint": {"mode": "explicit"}},
+    {"type": "text", "text": "Implicit"},
+]
+
+
+@pytest.fixture
+def registered_azure_breakpoint_reader(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setitem(
+        litellm.model_cost,
+        "azure/unit-breakpoint-reader",
+        {"litellm_provider": "azure", "mode": "chat", "supports_prompt_cache_breakpoint": True},
+    )
+    monkeypatch.setitem(
+        litellm.model_cost,
+        "azure/unit-breakpoint-ignorer",
+        {"litellm_provider": "azure", "mode": "chat", "supports_prompt_cache_breakpoint": False},
+    )
+
+
+def _azure_request_parts(
+    config: AzureOpenAIConfig, model: str, litellm_params: dict[str, object]
+) -> object:
+    request: Final = config.transform_request(
+        model=model,
+        messages=[{"role": "user", "content": list(_MARKED_AZURE_PARTS)}],
+        optional_params={},
+        litellm_params=litellm_params,
+        headers={},
+    )
+    return request["messages"][0]["content"]
+
+
+@pytest.mark.parametrize("config", [AzureOpenAIConfig(), AzureOpenAIGPT5Config()])
+@pytest.mark.parametrize(
+    "model, litellm_params",
+    [
+        ("unit-breakpoint-reader", {"drop_params": True}),
+        ("my-azure-alias", {"drop_params": True, "base_model": "azure/unit-breakpoint-reader"}),
+        ("my-azure-alias", {"drop_params": True, "model_info": {"base_model": "azure/unit-breakpoint-reader"}}),
+        ("my-azure-alias", {"drop_params": True}),
+    ],
+    ids=("deployment-name", "litellm-params-base-model", "model-info-base-model", "unknown-deployment"),
+)
+def test_azure_drop_params_cuts_part_breakpoints_down_to_what_azure_chat_accepts(
+    registered_azure_breakpoint_reader: None,
+    config: AzureOpenAIConfig,
+    model: str,
+    litellm_params: dict[str, object],
+) -> None:
+    """Azure OpenAI chat answered 400 for a content part's breakpoint ttl and for implicit mode on 2026-10-29,
+    the same as OpenAI chat completions."""
+    assert _azure_request_parts(config, model, litellm_params) == _TRIMMED_AZURE_PARTS
+
+
+@pytest.mark.parametrize("litellm_params", [{}, {"drop_params": False}], ids=("no-drop-params", "drop-params-false"))
+def test_azure_sends_part_breakpoints_as_written_without_drop_params(
+    registered_azure_breakpoint_reader: None, litellm_params: dict[str, object]
+) -> None:
+    assert _azure_request_parts(AzureOpenAIConfig(), "unit-breakpoint-reader", litellm_params) == list(
+        _MARKED_AZURE_PARTS
+    )
+
+
+@pytest.mark.parametrize(
+    "model, litellm_params",
+    [
+        ("unit-breakpoint-ignorer", {"drop_params": True}),
+        ("unit-breakpoint-reader", {"drop_params": True, "base_model": "azure/unit-breakpoint-ignorer"}),
+        ("my-azure-alias", {"drop_params": True, "model_info": {"base_model": "azure/unit-breakpoint-ignorer"}}),
+    ],
+    ids=("known-non-reader", "base-model-known-non-reader", "model-info-base-model-known-non-reader"),
+)
+def test_azure_drop_params_strips_part_breakpoints_from_a_known_non_reader(
+    registered_azure_breakpoint_reader: None, model: str, litellm_params: dict[str, object]
+) -> None:
+    assert _azure_request_parts(AzureOpenAIConfig(), model, litellm_params) == [
+        {"type": "text", "text": "Stable prefix"},
+        {"type": "text", "text": "Implicit"},
+    ]
diff --git a/tests/unit/llms/azure_ai/anthropic/count_tokens/test_token_counter.py b/tests/unit/llms/azure_ai/anthropic/count_tokens/test_token_counter.py
index 7807975be24..faa33e559ca 100644
--- a/tests/unit/llms/azure_ai/anthropic/count_tokens/test_token_counter.py
+++ b/tests/unit/llms/azure_ai/anthropic/count_tokens/test_token_counter.py
@@ -1,5 +1,7 @@
 import json
 import operator
+import threading
+from collections.abc import Mapping
 from typing import Final
 
 import httpx
@@ -8,8 +10,9 @@ import respx
 from pydantic import ValidationError
 
 import litellm
+from litellm import anthropic_beta_headers_manager
 from litellm.llms.azure_ai.anthropic.count_tokens.token_counter import AzureAIAnthropicTokenCounter
-from litellm.types.utils import TokenCountResponse
+from litellm.types.utils import CountContextManagement, TokenCountResponse
 
 API_BASE: Final = "https://my-resource.services.ai.azure.com"
 COUNT_URL: Final = f"{API_BASE}/anthropic/v1/messages/count_tokens"
@@ -268,3 +271,92 @@ async def test_count_sends_the_tool_change_beta_when_the_history_adds_a_tool(mon
     assert result is not None
     assert result.total_tokens == 541
     assert route.calls.last.request.headers["anthropic-beta"] == "mid-conversation-tool-changes-2026-07-01,token-counting-2024-11-01"
+
+
+async def _betas_azure_inference_sends(context_management: Mapping[str, object]) -> frozenset[str]:
+    with respx.mock:
+        route: Final = respx.post(f"{API_BASE}/anthropic/v1/messages").mock(
+            return_value=httpx.Response(
+                200,
+                json={
+                    "id": "msg_1",
+                    "type": "message",
+                    "role": "assistant",
+                    "model": "claude-sonnet-5-5",
+                    "content": [{"type": "text", "text": "ok"}],
+                    "stop_reason": "end_turn",
+                    "stop_sequence": None,
+                    "usage": {"input_tokens": 12, "output_tokens": 2},
+                },
+            )
+        )
+        await litellm.anthropic.messages.acreate(
+            max_tokens=64,
+            messages=[{"role": "user", "content": "Summarize the thread."}],
+            model="azure_ai/claude-sonnet-5-5",
+            api_key="azure-key",
+            api_base=API_BASE,
+            context_management=context_management,
+        )
+    return frozenset(filter(None, route.calls.last.request.headers.get("anthropic-beta", "").split(",")))
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("local_beta_headers_config")
+@pytest.mark.parametrize("edit_type", ["clear_tool_uses_20250919", "compact_20260112"])
+async def test_count_forwards_the_context_edits_with_the_betas_azure_inference_sends(
+    monkeypatch: pytest.MonkeyPatch, edit_type: str
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    spec: Final = {"edits": [{"type": edit_type}]}
+    inference_betas: Final = await _betas_azure_inference_sends(spec)
+    with respx.mock:
+        route: Final = respx.post(COUNT_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 88}))
+        result: Final = await AzureAIAnthropicTokenCounter().count_tokens(
+            model_to_use="claude-sonnet-5-5",
+            messages=[{"role": "user", "content": "Summarize the thread."}],
+            contents=None,
+            deployment={"litellm_params": {"api_key": "azure-key", "api_base": API_BASE}},
+            request_model="azure_ai/claude-sonnet-5-5",
+            context_management=CountContextManagement(spec=spec, drop_invalid_edits=False),
+        )
+    assert result is not None
+    assert result.total_tokens == 88
+    assert json.loads(route.calls.last.request.content)["context_management"] == spec
+    assert frozenset(route.calls.last.request.headers["anthropic-beta"].split(",")) == inference_betas | {
+        "token-counting-2024-11-01"
+    }
+
+
+class _FetchThreads:
+    seen: tuple[int, ...] = ()
+
+    def __call__(self, request: httpx.Request) -> httpx.Response:
+        self.seen = (*self.seen, threading.get_ident())
+        return httpx.Response(200, json={})
+
+
+@pytest.mark.asyncio
+async def test_count_with_an_edit_fetches_the_remote_beta_config_off_the_event_loop(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.delenv("LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS", raising=False)
+    monkeypatch.setattr(anthropic_beta_headers_manager, "_BETA_HEADERS_CONFIG", None)
+    fetch_threads: Final = _FetchThreads()
+    with respx.mock:
+        respx.get(litellm.anthropic_beta_headers_url).mock(side_effect=fetch_threads)
+        respx.post(COUNT_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 88}))
+        result: Final = await AzureAIAnthropicTokenCounter().count_tokens(
+            model_to_use="claude-sonnet-5-5",
+            messages=[{"role": "user", "content": "Summarize the thread."}],
+            contents=None,
+            deployment={"litellm_params": {"api_key": "azure-key", "api_base": API_BASE}},
+            request_model="azure_ai/claude-sonnet-5-5",
+            context_management=CountContextManagement(
+                spec={"edits": [{"type": "clear_tool_uses_20250919"}]}, drop_invalid_edits=False
+            ),
+        )
+    assert result is not None
+    assert len(fetch_threads.seen) == 1
+    assert threading.get_ident() not in fetch_threads.seen
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 9f68a4fb73f..b1d52c9dd51 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
@@ -1271,6 +1271,12 @@ def test_azure_ai_falls_back_to_the_model_name_when_the_base_model_row_does_not_
             {"type": "text", "text": "stable", "prompt_cache_breakpoint": {"mode": "explicit"}},
         ),
         ({"type": "ephemeral"}, {"drop_params": True}, {"type": "text", "text": "stable"}),
+        ({"mode": "implicit"}, {"drop_params": True}, {"type": "text", "text": "stable"}),
+        (
+            {"mode": "explicit", "ttl": "1h"},
+            {"drop_params": True},
+            {"type": "text", "text": "stable", "prompt_cache_breakpoint": {"mode": "explicit"}},
+        ),
         (
             {"mode": "explicit", "ttl": "30m"},
             {},
diff --git a/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude_transformation.py b/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude_transformation.py
index d40abb4860b..05d755b1215 100644
--- a/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude_transformation.py
+++ b/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude_transformation.py
@@ -3,7 +3,7 @@ import copy
 import json
 import uuid
 from types import SimpleNamespace
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 from typing import Final
 from unittest.mock import MagicMock, patch
 
@@ -14,11 +14,13 @@ from pydantic import BaseModel, ConfigDict
 # Ensure the project root is on the import path so `litellm` can be imported when
 # tests are executed from any working directory.
 import litellm
+from litellm.constants import DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS
 from litellm.llms.bedrock.chat.invoke_transformations.anthropic_claude_transformation import (
     AmazonAnthropicClaudeConfig,
 )
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
 from tests._vcr_conftest_common import install_live_call_probe, record_vcr_outcome
+from tests.unit.conftest import NativeStructuredOutputKey
 from tests.unit.llms.anthropic.anthropic_docs_refusal import ANTHROPIC_DOCS_REFUSAL_MESSAGE
 
 ONE_PIXEL_PNG = base64.b64decode(
@@ -635,7 +637,6 @@ def test_shared_defs_reach_native_output_once_instead_of_inlined_per_use(set_nat
     assert "tools" not in result
 
 
-
 class Relabel(BaseModel):
     model_config = ConfigDict(frozen=True)
 
@@ -672,6 +673,7 @@ def test_nested_pydantic_response_format_reaches_native_output_with_refs_that_re
     assert item_ref.removeprefix("#/$defs/") in sent["$defs"]
     assert "tools" not in result
 
+
 def test_output_config_format_forwarded_for_bedrock_chat_invoke_request(local_model_cost_map):
     """Bedrock Invoke chat path forwards ``output_config.format`` alongside effort
     for models with native structured-output support (Claude Sonnet 4.6)."""
@@ -1384,6 +1386,7 @@ def _vcr_outcome_gate(request, vcr):
     yield
     record_vcr_outcome(request, vcr)
 
+
 @pytest.fixture(scope="session")
 def event_loop():
     try:
@@ -1393,6 +1396,7 @@ def event_loop():
     yield loop
     loop.close()
 
+
 @pytest.fixture(scope="function")
 def setup_and_teardown(event_loop):
     import litellm
@@ -1426,6 +1430,7 @@ def setup_and_teardown(event_loop):
     if pending:
         event_loop.run_until_complete(asyncio.gather(*pending, return_exceptions=True))
 
+
 _SCALAR_DEFAULTS = {
     "num_retries": getattr(litellm, "num_retries", None),
     "set_verbose": getattr(litellm, "set_verbose", False),
@@ -1497,6 +1502,7 @@ IN WITNESS WHEREOF, the parties have executed this Agreement.
     * 8
 )  # Repeat to ensure we have enough tokens (need 1024+ for Claude models)
 
+
 @pytest.mark.usefixtures("_vcr_outcome_gate", "setup_and_teardown")
 class TestBedrockAnthropicPromptCachingRegression:
     """
@@ -1659,6 +1665,7 @@ class TestBedrockAnthropicPromptCachingRegression:
             if "anthropic_beta" in additional_fields:
                 assert "prompt-caching-2024-07-31" not in additional_fields["anthropic_beta"]
 
+
 @pytest.mark.usefixtures("_vcr_outcome_gate", "setup_and_teardown")
 class TestBedrockAnthropic1MContextRegression:
     """
@@ -1844,6 +1851,7 @@ class TestBedrockAnthropic1MContextRegression:
         assert "context-1m-2025-08-07" in beta_headers
         assert "computer-use-2024-10-22" in beta_headers
 
+
 @pytest.mark.usefixtures("_vcr_outcome_gate", "setup_and_teardown")
 class TestBedrockAnthropicCombinedRegressions:
     """
@@ -2010,6 +2018,225 @@ def test_invoke_uses_opt_in_native_output_is_false_when_native_output_did_not_co
     )
 
 
+@pytest.mark.parametrize(
+    ("forced_tool_use", "map_flag", "model_info", "thinking_params", "native"),
+    [
+        (False, None, None, {}, True),
+        (False, None, None, {"thinking": {"type": "adaptive"}}, False),
+        (False, True, None, {"thinking": {"type": "adaptive"}}, True),
+        (False, False, None, {}, False),
+        (False, None, {"supports_bedrock_native_structured_output": False}, {}, False),
+        (True, True, None, {}, False),
+    ],
+    ids=[
+        "cannot-force-tool",
+        "cannot-force-tool-thinking",
+        "cannot-force-tool-thinking-key-true",
+        "cannot-force-tool-key-false",
+        "cannot-force-tool-deployment-opt-out",
+        "can-force-tool",
+    ],
+)
+def test_invoke_model_that_cannot_force_the_json_tool_gets_native_output_without_thinking_unless_opted_out(
+    set_native_structured_output: Callable[[str, NativeStructuredOutputKey], None],
+    monkeypatch: pytest.MonkeyPatch,
+    forced_tool_use: bool,
+    map_flag: bool | None,
+    model_info: Mapping[str, object] | None,
+    thinking_params: Mapping[str, object],
+    native: bool,
+) -> None:
+    model: Final = "us.anthropic.claude-haiku-5-5"
+    monkeypatch.setitem(litellm.model_cost[model], "supports_forced_tool_use", forced_tool_use)
+    set_native_structured_output(model, "bedrock" if map_flag else None)
+    if map_flag is None:
+        monkeypatch.delitem(litellm.model_cost[model], "supports_bedrock_native_structured_output")
+
+    config: Final = AmazonAnthropicClaudeConfig(model_info=model_info)
+    optional_params: Final = config.map_openai_params(
+        non_default_params={"response_format": _CITY_RESPONSE_FORMAT, "max_tokens": 2048, **thinking_params},
+        optional_params={},
+        model=model,
+        drop_params=False,
+    )
+    body: Final = config.transform_request(
+        model=model,
+        messages=[{"role": "user", "content": "Capital of France?"}],
+        optional_params=optional_params,
+        litellm_params={} if model_info is None else {"model_info": model_info},
+        headers={},
+    )
+
+    assert (body.get("output_config", {}).get("format", {}).get("schema") == _CITY_SCHEMA) is native
+    assert ("tools" in body) is not native
+
+
+@pytest.mark.parametrize(
+    "caller_schema_param",
+    [
+        lambda schema: {"output_format": {"type": "json_schema", "schema": schema}},
+        lambda schema: {"output_config": {"format": {"type": "json_schema", "schema": schema}}},
+    ],
+    ids=["output_format", "output_config.format"],
+)
+@pytest.mark.parametrize(
+    ("model", "forced_tool_use", "native_key"),
+    [("us.anthropic.claude-opus-4-8", True, "legacy"), ("us.anthropic.claude-haiku-5-5", False, None)],
+    ids=["native-key", "cannot-force-tool"],
+)
+def test_invoke_caller_schema_drops_unsupported_constraints_before_going_native(
+    set_native_structured_output: Callable[[str, NativeStructuredOutputKey], None],
+    monkeypatch: pytest.MonkeyPatch,
+    model: str,
+    forced_tool_use: bool,
+    native_key: NativeStructuredOutputKey,
+    caller_schema_param: Callable[[Mapping[str, object]], dict[str, object]],
+) -> None:
+    monkeypatch.setitem(litellm.model_cost[model], "supports_forced_tool_use", forced_tool_use)
+    set_native_structured_output(model, native_key)
+    if native_key is None:
+        monkeypatch.delitem(litellm.model_cost[model], "supports_bedrock_native_structured_output")
+    schema: Final = {
+        "type": "object",
+        "properties": {"age": {"type": "integer", "minimum": 0}},
+        "required": ["age"],
+        "additionalProperties": False,
+    }
+
+    body: Final = AmazonAnthropicClaudeConfig().transform_request(
+        model=model,
+        messages=[{"role": "user", "content": "How old is the oldest tree?"}],
+        optional_params={**caller_schema_param(schema), "max_tokens": 2048},
+        litellm_params={},
+        headers={},
+    )
+
+    sent_age: Final = body["output_config"]["format"]["schema"]["properties"]["age"]
+    assert sent_age["type"] == "integer"
+    assert "minimum" not in sent_age
+
+
+BEDROCK_HAIKU_45_BASE_ID: Final = "anthropic.claude-haiku-4-5-20251001-v1:0"
+
+
+@pytest.mark.parametrize(
+    "model",
+    [
+        f"invoke/us.{BEDROCK_HAIKU_45_BASE_ID}",
+        f"invoke/{BEDROCK_HAIKU_45_BASE_ID}",
+    ],
+)
+def test_bedrock_invoke_claude_default_max_tokens_comes_from_base_model(local_model_cost_map, model: str):
+    mapped_cap: Final = litellm.get_max_tokens(BEDROCK_HAIKU_45_BASE_ID)
+    assert mapped_cap != DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS, "the model's mapped cap must differ from the fallback"
+
+    body: Final = AmazonAnthropicClaudeConfig().transform_request(
+        model=model,
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={},
+        headers={},
+    )
+
+    assert body["max_tokens"] == mapped_cap, (
+        f"default max_tokens should be the base model's cap, got {body['max_tokens']}"
+    )
+
+
+def test_bedrock_invoke_claude_explicit_max_tokens_is_kept(local_model_cost_map):
+    body: Final = AmazonAnthropicClaudeConfig().transform_request(
+        model=f"invoke/us.{BEDROCK_HAIKU_45_BASE_ID}",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={"max_tokens": 123},
+        litellm_params={},
+        headers={},
+    )
+
+    assert body["max_tokens"] == 123, f"explicit max_tokens must not be overridden, got {body['max_tokens']}"
+
+
+def test_bedrock_invoke_claude_default_max_tokens_takes_the_deployments_own_cap(local_model_cost_map):
+    deployment_cap: Final = 8192
+    assert litellm.get_max_tokens(BEDROCK_HAIKU_45_BASE_ID) != deployment_cap
+
+    body: Final = AmazonAnthropicClaudeConfig().transform_request(
+        model=f"invoke/us.{BEDROCK_HAIKU_45_BASE_ID}",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={"model_info": {"max_output_tokens": deployment_cap}},
+        headers={},
+    )
+
+    assert body["max_tokens"] == deployment_cap, f"the deployment's own cap should win, got {body['max_tokens']}"
+
+
+def test_bedrock_invoke_claude_default_max_tokens_ignores_a_sibling_deployments_cap(local_model_cost_map):
+    regional_id: Final = f"us.{BEDROCK_HAIKU_45_BASE_ID}"
+    mapped_cap: Final = litellm.get_max_tokens(BEDROCK_HAIKU_45_BASE_ID)
+    litellm.register_model(model_cost={regional_id: {"max_output_tokens": 50}}, persist_across_reloads=False)
+
+    body: Final = AmazonAnthropicClaudeConfig().transform_request(
+        model=f"invoke/{regional_id}",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={},
+        headers={},
+    )
+
+    assert body["max_tokens"] == mapped_cap, f"a sibling's cap on the shared id leaked, got {body['max_tokens']}"
+
+
+def test_bedrock_invoke_claude_default_max_tokens_yields_to_anthropic_config(local_model_cost_map):
+    configured_max_tokens: Final = 1000
+    assert litellm.get_max_tokens(BEDROCK_HAIKU_45_BASE_ID) != configured_max_tokens
+
+    body: Final = AmazonAnthropicClaudeConfig(
+        read_configured_max_tokens=lambda: configured_max_tokens
+    ).transform_request(
+        model=f"invoke/us.{BEDROCK_HAIKU_45_BASE_ID}",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={},
+        headers={},
+    )
+
+    assert body["max_tokens"] == configured_max_tokens, (
+        f"AnthropicConfig(max_tokens) was ignored, got {body['max_tokens']}"
+    )
+
+
+@pytest.mark.parametrize(("configured_max_tokens", "deployment_cap"), [(100000, 50), (1000, 8192)])
+def test_bedrock_invoke_claude_default_max_tokens_is_the_lower_of_anthropic_config_and_the_deployments_cap(
+    local_model_cost_map, configured_max_tokens: int, deployment_cap: int
+):
+    body: Final = AmazonAnthropicClaudeConfig(
+        read_configured_max_tokens=lambda: configured_max_tokens
+    ).transform_request(
+        model=f"invoke/us.{BEDROCK_HAIKU_45_BASE_ID}",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={"model_info": {"max_output_tokens": deployment_cap}},
+        headers={},
+    )
+
+    assert body["max_tokens"] == min(configured_max_tokens, deployment_cap), f"got {body['max_tokens']}"
+
+
+def test_bedrock_invoke_claude_default_max_tokens_reads_an_inference_profile_arns_base_model(local_model_cost_map):
+    mapped_cap: Final = litellm.get_max_tokens(BEDROCK_HAIKU_45_BASE_ID)
+    assert mapped_cap != DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS, "the model's mapped cap must differ from the fallback"
+
+    body: Final = AmazonAnthropicClaudeConfig().transform_request(
+        model="invoke/anthropic/arn:aws:bedrock:us-east-1:123456789012:application-inference-profile/abc123",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={"base_model": BEDROCK_HAIKU_45_BASE_ID},
+        headers={},
+    )
+
+    assert body["max_tokens"] == mapped_cap, f"an ARN should take its base_model's cap, got {body['max_tokens']}"
+
+
 @pytest.mark.usefixtures("local_model_cost_map", "local_beta_headers_config")
 @pytest.mark.parametrize("drop_params", [True, False])
 def test_bedrock_chat_invoke_adds_the_binding_beta_so_block_binding_is_kept(
diff --git a/tests/unit/llms/bedrock/chat/mantle/test_bedrock_chat_mantle_transformation.py b/tests/unit/llms/bedrock/chat/mantle/test_bedrock_chat_mantle_transformation.py
index 154be9f0370..154a102fe34 100644
--- a/tests/unit/llms/bedrock/chat/mantle/test_bedrock_chat_mantle_transformation.py
+++ b/tests/unit/llms/bedrock/chat/mantle/test_bedrock_chat_mantle_transformation.py
@@ -2,6 +2,8 @@ import base64
 import json
 import uuid
 from types import SimpleNamespace
+from typing import Final
+from unittest.mock import MagicMock
 
 import httpx
 import pytest
@@ -243,3 +245,54 @@ async def test_mantle_claude_async_completion_streams_a_wrapped_json_schema_answ
     chunks = tuple([chunk async for chunk in stream])
 
     assert _streamed_answer(chunks) == BARE_STREAMED_ANSWER
+
+
+def _json_tool_message(request: httpx.Request) -> httpx.Response:
+    return httpx.Response(
+        200,
+        json={
+            "id": "msg_1",
+            "type": "message",
+            "role": "assistant",
+            "model": "anthropic.claude-opus-5-5",
+            "content": [{"type": "tool_use", "id": "toolu_1", "name": "json_tool_call", "input": RISK_ANSWER}],
+            "stop_reason": "tool_use",
+            "stop_sequence": None,
+            "usage": {"input_tokens": 1, "output_tokens": 9},
+        },
+    )
+
+
+@pytest.mark.usefixtures("local_model_cost_map")
+@pytest.mark.parametrize("model", ("bedrock_mantle/anthropic.claude-opus-5-5", "bedrock/mantle/anthropic.claude-opus-5-5"))
+def test_mantle_claude_that_cannot_force_a_tool_keeps_json_schema_on_the_json_tool(model: str) -> None:
+    respond: Final = MagicMock(wraps=_json_tool_message)
+
+    response: Final = litellm.completion(
+        **{**_json_schema_stream_kwargs(model), "stream": False},
+        client=HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(respond))),
+    )
+
+    sent: Final = tuple(json.loads(call.args[0].content) for call in respond.call_args_list)
+    assert json.loads(response.choices[0].message.content) == RISK_ANSWER
+    assert [(body.get("output_config", {}).get("format"), [tool["name"] for tool in body["tools"]]) for body in sent] == [
+        (None, ["json_tool_call"])
+    ]
+
+
+def test_mantle_claude_default_max_tokens_comes_from_the_mantle_row(local_model_cost_map):
+    from litellm.constants import DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS
+    from litellm.llms.bedrock.chat.mantle.transformation import AmazonMantleConfig
+
+    mapped_cap: Final = litellm.get_max_tokens("bedrock_mantle/anthropic.claude-haiku-4-5")
+    assert mapped_cap != DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS, "the model's mapped cap must differ from the fallback"
+
+    body: Final = AmazonMantleConfig().transform_request(
+        model="mantle/anthropic.claude-haiku-4-5",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={},
+        litellm_params={},
+        headers={},
+    )
+
+    assert body["max_tokens"] == mapped_cap, f"Mantle should send its mapped cap, got {body['max_tokens']}"
diff --git a/tests/unit/llms/bedrock/chat/test_converse_transformation.py b/tests/unit/llms/bedrock/chat/test_converse_transformation.py
index 9ab7060d766..8cab1018d25 100644
--- a/tests/unit/llms/bedrock/chat/test_converse_transformation.py
+++ b/tests/unit/llms/bedrock/chat/test_converse_transformation.py
@@ -4,7 +4,7 @@ import json
 import logging
 import os
 import re
-from collections.abc import Iterator, Mapping
+from collections.abc import Callable, Iterator, Mapping
 from typing import Final
 from unittest.mock import MagicMock, Mock, patch
 
@@ -20,6 +20,7 @@ from litellm.litellm_core_utils.prompt_templates.factory import (
     _bedrock_tools_pt,
 )
 from litellm.litellm_core_utils.prompt_templates.mid_conversation_system import CONVERTED_SYSTEM_NOTE
+from litellm.litellm_core_utils.streaming_handler import CustomStreamWrapper
 from litellm.llms.anthropic.chat.transformation import (
     NATIVE_OUTPUT_MAX_GRAMMAR_BRANCHES,
     NATIVE_OUTPUT_MAX_OPTIONAL_PARAMETERS,
@@ -31,6 +32,7 @@ from litellm.llms.bedrock.common_utils import BEDROCK_NATIVE_OUTPUT_MAX_PROPERTI
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler
 from litellm.types.llms.bedrock import ContentBlock, ConverseTokenUsageBlock, RequestObject
 from litellm.types.llms.openai import AllMessageValues
+from tests.unit.conftest import NativeStructuredOutputKey
 
 
 def test_transform_usage():
@@ -4981,7 +4983,10 @@ ADAPTIVE_THINKING: Final = {"type": "adaptive"}
 
 
 def _converse_request_for_json_schema(
-    model: str, stream: bool, thinking_params: Mapping[str, object] | None = None
+    model: str,
+    stream: bool,
+    thinking_params: Mapping[str, object] | None = None,
+    model_info: Mapping[str, object] | None = None,
 ) -> tuple[Mapping[str, object], RequestObject]:
     config = AmazonConverseConfig()
     optional_params = config.map_openai_params(
@@ -4989,12 +4994,13 @@ def _converse_request_for_json_schema(
         optional_params={},
         model=model,
         drop_params=False,
+        model_info=model_info,
     )
     request = config._transform_request(
         model=model,
         messages=[{"role": "user", "content": "Name the capital of France."}],
         optional_params=optional_params,
-        litellm_params={},
+        litellm_params={} if model_info is None else {"model_info": model_info},
         headers={},
     )
     return optional_params, request
@@ -5061,6 +5067,115 @@ def test_bedrock_native_output_key_applies_only_when_thinking_is_requested(
     assert ("toolConfig" in request) is not native
 
 
+_FORCED_JSON_TOOL_CHOICE: Final = {"tool": {"name": "json_tool_call"}}
+
+
+@pytest.mark.parametrize(
+    ("forced_tool_use", "map_flag", "model_info", "thinking_params", "native", "tool_choice"),
+    [
+        (False, None, None, None, True, None),
+        (False, None, None, {"thinking": {"type": "adaptive"}}, False, None),
+        (False, True, None, {"thinking": {"type": "adaptive"}}, True, None),
+        (False, False, None, None, False, None),
+        (False, None, {"supports_bedrock_native_structured_output": False}, None, False, None),
+        (True, True, None, None, False, _FORCED_JSON_TOOL_CHOICE),
+    ],
+    ids=[
+        "cannot-force-tool",
+        "cannot-force-tool-thinking",
+        "cannot-force-tool-thinking-key-true",
+        "cannot-force-tool-key-false",
+        "cannot-force-tool-deployment-opt-out",
+        "can-force-tool",
+    ],
+)
+def test_a_model_that_cannot_force_the_json_tool_gets_native_output_without_thinking_unless_opted_out(
+    set_native_structured_output: Callable[[str, NativeStructuredOutputKey], None],
+    monkeypatch: pytest.MonkeyPatch,
+    forced_tool_use: bool,
+    map_flag: bool | None,
+    model_info: Mapping[str, object] | None,
+    thinking_params: Mapping[str, object] | None,
+    native: bool,
+    tool_choice: Mapping[str, object] | None,
+) -> None:
+    model: Final = "us.anthropic.claude-haiku-5-5"
+    monkeypatch.setitem(litellm.model_cost[model], "supports_forced_tool_use", forced_tool_use)
+    set_native_structured_output(model, "bedrock" if map_flag else None)
+    if map_flag is None:
+        monkeypatch.delitem(litellm.model_cost[model], "supports_bedrock_native_structured_output")
+
+    _, request = _converse_request_for_json_schema(model, False, thinking_params, model_info=model_info)
+
+    assert ("outputConfig" in request) is native
+    assert ("toolConfig" in request) is not native
+    assert request.get("toolConfig", {}).get("toolChoice") == tool_choice
+
+
+@pytest.mark.usefixtures("local_model_cost_map")
+@pytest.mark.parametrize(
+    ("model", "thinking_params", "native"),
+    [
+        ("us.anthropic.claude-opus-5-5", None, True),
+        ("us.anthropic.claude-opus-5-5", {"thinking": {"type": "adaptive"}}, False),
+        ("global.anthropic.claude-fable-5-1", None, True),
+        ("global.anthropic.claude-fable-5-1", {"reasoning_effort": "low"}, False),
+        ("us-gov.anthropic.claude-opus-5-5", None, False),
+        ("us-gov.anthropic.claude-fable-5-1", None, False),
+        ("us-gov-west-1/anthropic.claude-opus-5-5", None, False),
+        ("converse/us-gov-east-1/anthropic.claude-fable-5-1", None, False),
+        ("us-east-1/anthropic.claude-opus-5-5", None, True),
+    ],
+)
+def test_models_whose_thinking_stops_under_native_output_keep_the_json_tool_only_when_thinking(
+    model: str, thinking_params: Mapping[str, object] | None, native: bool
+) -> None:
+    _, request = _converse_request_for_json_schema(model, False, thinking_params)
+
+    assert ("outputConfig" in request) is native
+    assert ("toolConfig" in request) is not native
+
+
+def _converse_capital_answer(request: httpx.Request) -> httpx.Response:
+    return httpx.Response(
+        200,
+        json={
+            "output": {"message": {"role": "assistant", "content": [{"text": '{"city":"Paris","country":"France"}'}]}},
+            "stopReason": "end_turn",
+            "usage": {"inputTokens": 1, "outputTokens": 12, "totalTokens": 13},
+        },
+        request=request,
+    )
+
+
+@pytest.mark.usefixtures("local_model_cost_map")
+@pytest.mark.parametrize(
+    "model", ["us.anthropic.claude-opus-5-5", "global.anthropic.claude-sonnet-5-5", "global.anthropic.claude-fable-5-1"]
+)
+def test_streamed_json_schema_on_a_model_that_cannot_force_a_tool_still_calls_converse_without_streaming(
+    model: str,
+) -> None:
+    respond: Final = MagicMock(wraps=_converse_capital_answer)
+
+    stream: Final = litellm.completion(
+        model=f"bedrock/{model}",
+        messages=[{"role": "user", "content": "Name the capital of France."}],
+        response_format=CAPITAL_RESPONSE_FORMAT,
+        stream=True,
+        aws_access_key_id="AKIAEXAMPLE",
+        aws_secret_access_key="fake-secret",
+        aws_region_name="us-east-1",
+        client=HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(respond))),
+    )
+
+    assert isinstance(stream, CustomStreamWrapper)
+    streamed: Final = "".join(chunk.choices[0].delta.content or "" for chunk in stream)
+    sent: Final = respond.call_args.args[0]
+    assert sent.url.path.endswith("/converse")
+    assert "textFormat" in json.loads(sent.content)["outputConfig"]
+    assert json.loads(streamed) == {"city": "Paris", "country": "France"}
+
+
 def test_adaptive_thinking_is_kept_next_to_json_schema_on_a_native_output_profile(set_native_structured_output):
     model: Final = "us.anthropic.claude-opus-5"
     set_native_structured_output(model, "bedrock")
@@ -11097,6 +11212,70 @@ def test_a_deployment_with_a_batch_control_plane_endpoint_keeps_it_out_of_chat_r
     assert "aws_bedrock_control_plane_endpoint" not in route.calls[0].request.content.decode()
 
 
+_HOSTED_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+_WEATHER_FUNCTION_TOOL: Final = {
+    "type": "function",
+    "function": {"name": "get_weather", "parameters": {"type": "object", "properties": {}}},
+}
+
+
+def _converse_request_for_tools(
+    model: str, non_default_params: Mapping[str, object], drop_params: bool
+) -> Mapping[str, object]:
+    config: Final = AmazonConverseConfig()
+    return config._transform_request_helper(
+        model=model,
+        system_content_blocks=[],
+        optional_params=config.map_openai_params(
+            non_default_params=dict(non_default_params), optional_params={}, model=model, drop_params=drop_params
+        ),
+        messages=[{"role": "user", "content": "hi"}],
+    )
+
+
+@pytest.mark.parametrize(
+    "model", ["us.openai.gpt-oss-120b-1:0", "us.anthropic.claude-haiku-5-5", "us.amazon.nova-2-lite-v1:0"]
+)
+def test_a_hosted_mcp_tool_answers_400_on_converse_without_drop_params(monkeypatch, model):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.utils.UnsupportedParamsError) as raised:
+        _converse_request_for_tools(model, {"tools": [_WEATHER_FUNCTION_TOOL, _HOSTED_MCP_TOOL]}, drop_params=False)
+    assert raised.value.status_code == 400
+    assert model in str(raised.value)
+    assert "`deepwiki`" in str(raised.value)
+    assert 'server_url: "litellm_proxy/mcp/<server name>"' in str(raised.value)
+    assert "drop_params: true" in str(raised.value)
+
+
+def test_converse_drops_a_hosted_mcp_tool_under_drop_params_and_keeps_the_function_tool(monkeypatch, caplog):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    model: Final = "us.openai.gpt-oss-120b-1:0"
+    with caplog.at_level("WARNING"):
+        request: Final = _converse_request_for_tools(
+            model, {"tools": [_HOSTED_MCP_TOOL, _WEATHER_FUNCTION_TOOL]}, drop_params=True
+        )
+    assert [tool["toolSpec"]["name"] for tool in request["toolConfig"]["tools"]] == ["get_weather"]
+    assert any(
+        "`deepwiki`" in record.getMessage() and f"model={model} on bedrock (" in record.getMessage()
+        for record in caplog.records
+    )
+
+
+def test_converse_sends_no_tools_when_drop_params_drops_every_hosted_mcp_tool(monkeypatch):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    request: Final = _converse_request_for_tools(
+        "us.openai.gpt-oss-120b-1:0", {"tools": [_HOSTED_MCP_TOOL], "tool_choice": "auto"}, drop_params=True
+    )
+    assert "toolConfig" not in request
+    assert "toolChoice" not in json.dumps(request)
+    assert "tool_choice" not in json.dumps(request)
+
+
 def _warnings_naming(caplog: pytest.LogCaptureFixture, param: str) -> tuple[str, ...]:
     return tuple(
         r.getMessage() for r in caplog.records if r.levelno == logging.WARNING and f"Dropping {param}=" in r.getMessage()
diff --git a/tests/unit/llms/bedrock/count_tokens/test_bedrock_count_tokens_transformation.py b/tests/unit/llms/bedrock/count_tokens/test_bedrock_count_tokens_transformation.py
index 8ac35caba9d..d5b57e42146 100644
--- a/tests/unit/llms/bedrock/count_tokens/test_bedrock_count_tokens_transformation.py
+++ b/tests/unit/llms/bedrock/count_tokens/test_bedrock_count_tokens_transformation.py
@@ -1,6 +1,8 @@
 import base64
 import json
 
+import pytest
+
 from litellm.llms.bedrock.count_tokens.transformation import (
     DEFAULT_ANTHROPIC_INVOKE_MODEL_MAX_TOKENS,
     BedrockCountTokensConfig,
@@ -53,6 +55,22 @@ def test_detect_input_type_converse_blocks_route_to_converse():
     assert config._detect_input_type(request) == "converse"
 
 
+@pytest.mark.parametrize("content", [[{"text": "hi"}], "hi"])
+@pytest.mark.parametrize(
+    "context_management", [None, {"edits": [{"type": "clear_tool_uses_20250919"}]}]
+)
+def test_a_pass_through_body_with_context_management_keeps_its_converse_input(content, context_management):
+    request = {
+        "model": "bedrock/us.anthropic.claude-haiku-4-5-20251001-v1:0",
+        "messages": [{"role": "user", "content": content}],
+        "context_management": context_management,
+    }
+
+    transformed = BedrockCountTokensConfig().transform_anthropic_to_bedrock_count_tokens(request)
+
+    assert transformed["input"]["converse"]["messages"] == [{"role": "user", "content": [{"text": "hi"}]}]
+
+
 def test_transform_to_invoke_model_format_base64_encodes_body():
     """The CountTokens API expects invokeModel.body as a base64-encoded blob;
     Anthropic Messages bodies additionally need anthropic_version/max_tokens
diff --git a/tests/unit/llms/bedrock/count_tokens/test_bedrock_token_counter.py b/tests/unit/llms/bedrock/count_tokens/test_bedrock_token_counter.py
index cec7950b859..30063936b2b 100644
--- a/tests/unit/llms/bedrock/count_tokens/test_bedrock_token_counter.py
+++ b/tests/unit/llms/bedrock/count_tokens/test_bedrock_token_counter.py
@@ -9,6 +9,7 @@ from pydantic import JsonValue, TypeAdapter
 import litellm
 from litellm.llms.bedrock.count_tokens.bedrock_token_counter import BedrockTokenCounter
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
+from litellm.types.utils import CountContextManagement
 
 RUNTIME_HOST: Final = "bedrock-runtime.us-east-1.amazonaws.com"
 MANTLE_HOST: Final = "bedrock-mantle.us-east-1.api.aws"
@@ -144,6 +145,104 @@ async def test_mantle_failure_is_reported_with_its_status() -> None:
     assert bedrock.posted_hosts() == (RUNTIME_HOST, MANTLE_HOST)
 
 
+@pytest.mark.asyncio
+async def test_runtime_rejection_of_an_edit_stands_when_mantle_does_not_serve_the_model() -> None:
+    rejection: Final = "'claude-haiku-4-5-20251001' does not support the 'compact_20260112' context management strategy"
+    bedrock: Final = _Bedrock(
+        runtime=(400, {"message": rejection}),
+        mantle=(404, {"type": "error", "error": {"type": "not_found_error", "message": "does not exist"}}),
+    )
+
+    result: Final = await _counter(bedrock).count_tokens(
+        model_to_use="us.anthropic.claude-haiku-4-5-20251001-v1:0",
+        messages=MESSAGES,
+        contents=None,
+        deployment=DEPLOYMENT,
+        request_model="claude-haiku-4-5",
+        context_management=CountContextManagement(
+            spec={"edits": [{"type": "compact_20260112"}]}, drop_invalid_edits=False
+        ),
+    )
+
+    assert result is not None
+    assert result.error is True
+    assert result.status_code == 400
+    assert result.tokenizer_type == "bedrock_api"
+    assert rejection in (result.error_message or "")
+    assert bedrock.posted_hosts() == (RUNTIME_HOST, MANTLE_HOST)
+
+
+@pytest.mark.asyncio
+async def test_runtime_400_without_an_edit_still_reports_the_mantle_failure() -> None:
+    bedrock: Final = _Bedrock(
+        runtime=(400, {"message": "The provided model identifier is invalid."}),
+        mantle=(404, {"type": "error", "error": {"type": "not_found_error", "message": "does not exist"}}),
+    )
+
+    result: Final = await _counter(bedrock).count_tokens(
+        model_to_use="us.anthropic.claude-haiku-4-5-20251001-v1:0",
+        messages=MESSAGES,
+        contents=None,
+        deployment=DEPLOYMENT,
+        request_model="claude-haiku-4-5",
+    )
+
+    assert result is not None
+    assert result.status_code == 404
+    assert result.tokenizer_type == "bedrock_mantle_api"
+    assert "does not exist" in (result.error_message or "")
+    assert bedrock.posted_hosts() == (RUNTIME_HOST, MANTLE_HOST)
+
+
+@pytest.mark.asyncio
+async def test_plain_text_history_with_an_edit_is_counted_through_invoke_carrying_the_edit() -> None:
+    bedrock: Final = _Bedrock(runtime=(200, {"inputTokens": 57}), mantle=(200, {"input_tokens": 1}))
+    spec: Final[dict[str, JsonValue]] = {"edits": [{"type": "clear_tool_uses_20250919"}]}
+
+    result: Final = await _counter(bedrock).count_tokens(
+        model_to_use="global.anthropic.claude-opus-4-8",
+        messages=MESSAGES,
+        contents=None,
+        deployment=DEPLOYMENT,
+        request_model="claude-opus-4-8",
+        context_management=CountContextManagement(spec=spec, drop_invalid_edits=False),
+    )
+
+    assert result is not None
+    assert result.total_tokens == 57
+    assert bedrock.posted_hosts() == (RUNTIME_HOST,)
+    invoke_body: Final = _invoke_body(bedrock.requests[0])
+    assert invoke_body["context_management"] == spec
+    assert invoke_body["anthropic_beta"] == ["context-management-2025-06-27"]
+
+
+@pytest.mark.asyncio
+async def test_an_empty_string_turn_with_an_edit_is_sent_as_an_empty_string_not_an_empty_text_block() -> None:
+    bedrock: Final = _Bedrock(runtime=(200, {"inputTokens": 16}), mantle=(200, {"input_tokens": 1}))
+    spec: Final[dict[str, JsonValue]] = {"edits": [{"type": "clear_tool_uses_20250919"}]}
+
+    result: Final = await _counter(bedrock).count_tokens(
+        model_to_use="global.anthropic.claude-opus-4-8",
+        messages=[
+            {"role": "user", "content": "first"},
+            {"role": "assistant", "content": ""},
+            {"role": "user", "content": "third question here"},
+        ],
+        contents=None,
+        deployment=DEPLOYMENT,
+        request_model="claude-opus-4-8",
+        context_management=CountContextManagement(spec=spec, drop_invalid_edits=False),
+    )
+
+    assert result is not None
+    assert result.total_tokens == 16
+    assert _invoke_body(bedrock.requests[0])["messages"] == [
+        {"role": "user", "content": [{"type": "text", "text": "first"}]},
+        {"role": "assistant", "content": ""},
+        {"role": "user", "content": [{"type": "text", "text": "third question here"}]},
+    ]
+
+
 @pytest.mark.asyncio
 async def test_claude_runtime_404_retries_with_system_and_tools_on_mantle() -> None:
     bedrock: Final = _Bedrock(runtime=(404, UNSUPPORTED), mantle=(200, {"input_tokens": 2177}))
diff --git a/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude_transformation.py b/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude_transformation.py
index 0bd480dcdbc..07fabbf2393 100644
--- a/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude_transformation.py
+++ b/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude_transformation.py
@@ -4175,6 +4175,43 @@ async def test_bedrock_messages_400_is_not_retried_unless_it_rejects_opt_in_nati
     assert len(bedrock.bodies) == 1
 
 
+@pytest.mark.usefixtures("local_model_cost_map")
+@pytest.mark.parametrize(
+    ("model", "model_info"),
+    [
+        ("us.anthropic.claude-opus-5-5", None),
+        ("global.anthropic.claude-fable-5-1", None),
+        ("us.anthropic.claude-opus-4-8", None),
+        ("us.anthropic.claude-opus-5-5", {"supports_bedrock_native_structured_output": True}),
+    ],
+    ids=["opus_5_5_inlined", "fable_5_1_inlined", "mapped_opt_in", "deployment_opt_in"],
+)
+def test_bedrock_messages_offers_a_native_output_retry_only_when_it_sends_native_output(
+    model: str, model_info: Mapping[str, object] | None
+) -> None:
+    from litellm.types.router import GenericLiteLLMParams
+
+    config: Final = AmazonAnthropicClaudeMessagesConfig()
+    litellm_params: Final = GenericLiteLLMParams(model_info=model_info)
+    optional_params: Final = {
+        "max_tokens": 100,
+        "output_config": {"format": {"type": "json_schema", "schema": _CONSTRAINED_SCHEMA}},
+    }
+
+    body: Final = REASONING_BODY_ADAPTER.validate_python(
+        config.transform_anthropic_messages_request(
+            model=model,
+            messages=[{"role": "user", "content": [{"type": "text", "text": "say hello"}]}],
+            anthropic_messages_optional_request_params=optional_params,
+            litellm_params=litellm_params,
+            headers={},
+        )
+    )
+    retry_params: Final = config.native_output_fallback_litellm_params(model, optional_params, litellm_params)
+
+    assert (retry_params is not None) is ("format" in REASONING_BODY_ADAPTER.validate_python(body.get("output_config", {})))
+
+
 # Bedrock's 400 bodies for requests past Claude's strict tool limits, seen live on us.anthropic.claude-sonnet-4-6 on 2026-10-29
 _STRICT_TOOLS_REJECTIONS: Final = (
     {
diff --git a/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_responses_transformation.py b/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_responses_transformation.py
index 0ae6a73968d..f8f18852543 100644
--- a/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_responses_transformation.py
+++ b/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_responses_transformation.py
@@ -1922,3 +1922,68 @@ class TestBedrockMantleResponsesPricing:
     def test_models_registered(self, local_cost_map):
         assert "bedrock_mantle/openai.gpt-5.5" in litellm.bedrock_mantle_models
         assert "bedrock_mantle/openai.gpt-5.4" in litellm.bedrock_mantle_models
+
+
+def _mantle_marked_part(
+    litellm_params: GenericLiteLLMParams, marker: object, model: str = "openai.gpt-6.1-sol"
+) -> object:
+    body: Final = BedrockMantleResponsesAPIConfig().transform_responses_api_request(
+        model=model,
+        input=[
+            {
+                "type": "message",
+                "role": "user",
+                "content": [{"type": "input_text", "text": "Stable prefix", "prompt_cache_breakpoint": marker}],
+            }
+        ],
+        response_api_optional_request_params={},
+        litellm_params=litellm_params,
+        headers={},
+    )
+    return body["input"][0]["content"][0]
+
+
+@pytest.mark.parametrize(
+    "marker, wire_part",
+    [
+        (
+            {"mode": "explicit", "ttl": "30m"},
+            {"type": "input_text", "text": "Stable prefix", "prompt_cache_breakpoint": {"mode": "explicit"}},
+        ),
+        ({"mode": "implicit"}, {"type": "input_text", "text": "Stable prefix"}),
+    ],
+    ids=("ttl-dropped", "implicit-dropped"),
+)
+def test_mantle_drop_params_cuts_a_responses_breakpoint_down_to_its_mode(
+    monkeypatch: pytest.MonkeyPatch, marker: dict[str, str], wire_part: dict[str, object]
+) -> None:
+    """Bedrock Mantle Responses answered 400 for a 30m breakpoint ttl and 200 for a bare explicit mode on 2026-10-29."""
+    monkeypatch.setattr(litellm, "drop_params", False)
+    assert _mantle_marked_part(GenericLiteLLMParams(drop_params=True), marker) == wire_part
+    assert _mantle_marked_part(GenericLiteLLMParams(), marker) == {
+        "type": "input_text",
+        "text": "Stable prefix",
+        "prompt_cache_breakpoint": marker,
+    }
+
+
+@pytest.mark.parametrize(
+    "marker, wire_part",
+    [
+        ({"mode": "explicit", "ttl": "1h"}, {"type": "input_text", "text": "Stable prefix"}),
+        ({"mode": "explicit", "ttl": "30m"}, {"type": "input_text", "text": "Stable prefix"}),
+        (
+            {"mode": "explicit"},
+            {"type": "input_text", "text": "Stable prefix", "prompt_cache_breakpoint": {"mode": "explicit"}},
+        ),
+    ],
+    ids=("1h-dropped", "30m-dropped", "explicit-kept"),
+)
+def test_mantle_drop_params_sends_an_unlisted_model_only_a_bare_explicit_breakpoint(
+    monkeypatch: pytest.MonkeyPatch, marker: dict[str, str], wire_part: dict[str, object]
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    assert (
+        _mantle_marked_part(GenericLiteLLMParams(drop_params=True), marker, model="openai.not-in-the-cost-map")
+        == wire_part
+    )
diff --git a/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_transformation.py b/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_transformation.py
index f252d9886d3..6005acffc0a 100644
--- a/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_transformation.py
+++ b/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_transformation.py
@@ -1096,6 +1096,25 @@ class TestBedrockMantleClaudeChatRoute:
         )
         assert response._hidden_params["response_cost"] != pytest.approx(_row_cost("anthropic.claude-opus-5-5", 10, 5))
 
+    def test_claude_completion_without_max_tokens_sends_the_mantle_rows_output_limit(self, monkeypatch, local_cost_map):
+        from litellm.constants import DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS
+        from litellm.llms.custom_httpx.http_handler import HTTPHandler
+
+        mapped_cap: Final = litellm.model_cost["bedrock_mantle/anthropic.claude-haiku-4-5"]["max_output_tokens"]
+        assert mapped_cap != DEFAULT_ANTHROPIC_CHAT_MAX_TOKENS, "the model's mapped cap must differ from the fallback"
+        monkeypatch.setenv("BEDROCK_MANTLE_API_KEY", "mantle-key")
+        monkeypatch.delenv("BEDROCK_MANTLE_API_BASE", raising=False)
+        handler: Final = Mock(side_effect=_anthropic_message)
+
+        litellm.completion(
+            model="bedrock_mantle/anthropic.claude-haiku-4-5",
+            messages=[{"role": "user", "content": "hello"}],
+            aws_region_name="us-east-1",
+            client=HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(handler))),
+        )
+
+        assert json.loads(handler.call_args.args[0].content)["max_tokens"] == mapped_cap
+
     def test_claude_streaming_completion_uses_native_messages_endpoint(self, monkeypatch, local_cost_map):
         from litellm.llms.custom_httpx.http_handler import HTTPHandler
 
diff --git a/tests/unit/llms/cohere/chat/test_cohere_transformation.py b/tests/unit/llms/cohere/chat/test_cohere_transformation.py
index d32b3bcbeca..fcb3d3f1cc0 100644
--- a/tests/unit/llms/cohere/chat/test_cohere_transformation.py
+++ b/tests/unit/llms/cohere/chat/test_cohere_transformation.py
@@ -576,6 +576,54 @@ def test_cohere_v2_tool_calling(respx_mock: respx.MockRouter) -> None:
     assert [(call.id, call.function.name, call.function.arguments) for call in tool_calls] == [
         ("get_weather_k9q2xw1n", "get_weather", '{"location":"New York, NY"}')
     ]
+    assert response.choices[0].finish_reason == "tool_calls"
+
+
+@pytest.mark.usefixtures("_cohere_httpx_transport")
+@pytest.mark.respx(assert_all_called=True)
+@pytest.mark.parametrize(
+    ("cohere_finish_reason", "expected_finish_reason"),
+    [("COMPLETE", "stop"), ("MAX_TOKENS", "length"), ("STOP_SEQUENCE", "stop")],
+)
+def test_cohere_v2_maps_finish_reason(
+    respx_mock: respx.MockRouter, cohere_finish_reason: str, expected_finish_reason: str
+) -> None:
+    respx_mock.post(COHERE_V2_CHAT_URL).mock(
+        return_value=httpx.Response(
+            200,
+            json=_cohere_v2_response(
+                {"content": [{"type": "text", "text": "Hello"}]},
+                finish_reason=cohere_finish_reason,
+            ),
+        )
+    )
+
+    response: Final = litellm.completion(
+        model="cohere_chat/v2/command-a-03-2025",
+        messages=[{"role": "user", "content": "Say hello"}],
+        api_key="cohere-test-key",
+    )
+
+    assert response.choices[0].finish_reason == expected_finish_reason
+
+
+@pytest.mark.usefixtures("_cohere_httpx_transport")
+@pytest.mark.respx(assert_all_called=True)
+def test_cohere_v2_missing_finish_reason_defaults_to_stop(respx_mock: respx.MockRouter) -> None:
+    body_without_finish_reason: Final = {
+        key: value
+        for key, value in _cohere_v2_response({"content": [{"type": "text", "text": "Hello"}]}).items()
+        if key != "finish_reason"
+    }
+    respx_mock.post(COHERE_V2_CHAT_URL).mock(return_value=httpx.Response(200, json=body_without_finish_reason))
+
+    response: Final = litellm.completion(
+        model="cohere_chat/v2/command-a-03-2025",
+        messages=[{"role": "user", "content": "Say hello"}],
+        api_key="cohere-test-key",
+    )
+
+    assert (response.choices[0].message.content, response.choices[0].finish_reason) == ("Hello", "stop")
 
 
 @pytest.mark.usefixtures("_cohere_httpx_transport")
diff --git a/tests/unit/llms/custom_httpx/test_llm_http_handler.py b/tests/unit/llms/custom_httpx/test_llm_http_handler.py
index a8f6772a76e..01760572f33 100644
--- a/tests/unit/llms/custom_httpx/test_llm_http_handler.py
+++ b/tests/unit/llms/custom_httpx/test_llm_http_handler.py
@@ -1668,7 +1668,7 @@ _BOTH_FOUNDRY_BETAS: Final = ("context-1m-2025-08-07,context-management-2025-06-
         pytest.param(
             None,
             {"anthropic-beta": "context-1m-2025-08-07"},
-            "claude-code-20250219",
+            "mcp-servers-2025-12-04",
             ("context-1m-2025-08-07",),
             id="unsupported-client-beta-is-dropped-and-deployment-beta-kept",
         ),
@@ -6243,6 +6243,142 @@ async def test_non_chatgpt_responses_preserves_caller_headers_after_validation(
             client.client.close()
 
 
+_BETA_THE_TABLE_DOES_NOT_LIST: Final = "not-in-the-beta-table-2099-01-01"
+
+
+def _anthropic_messages_logging_obj():
+    from datetime import datetime, timezone
+
+    from litellm.litellm_core_utils.litellm_logging import Logging
+
+    return Logging(
+        model="claude-sonnet-4-6",
+        messages=[{"role": "user", "content": "Hello"}],
+        stream=False,
+        call_type="anthropic_messages",
+        start_time=datetime(2026, 1, 1, tzinfo=timezone.utc),
+        litellm_call_id="foundry-beta-row",
+        function_id="foundry-beta-row",
+    )
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("custom_llm_provider", "messages_config", "foundry_api_base", "forwarded_betas"),
+    [
+        pytest.param(
+            "anthropic",
+            "anthropic",
+            "https://my-resource.services.ai.azure.com/anthropic",
+            f"thinking-binding-controls-2026-08-01,{_BETA_THE_TABLE_DOES_NOT_LIST}",
+            id="anthropic-drops-what-the-azure-ai-row-rejects",
+        ),
+        pytest.param(
+            "anthropic",
+            "anthropic",
+            "https://my-resource.cognitiveservices.azure.com/anthropic",
+            f"thinking-binding-controls-2026-08-01,{_BETA_THE_TABLE_DOES_NOT_LIST}",
+            id="anthropic-on-a-cognitiveservices-host",
+        ),
+        pytest.param(
+            "azure_ai",
+            "azure_ai",
+            "https://my-resource.services.ai.azure.com/anthropic",
+            "thinking-binding-controls-2026-08-01",
+            id="azure-ai-keeps-dropping-unlisted-betas",
+        ),
+        pytest.param(
+            "openai",
+            "pass_through",
+            "https://my-resource.services.ai.azure.com/anthropic",
+            f"advisor-tool-2026-03-01,thinking-binding-controls-2026-08-01,{_BETA_THE_TABLE_DOES_NOT_LIST}",
+            id="messages-pass-through-forwards-as-sent",
+        ),
+    ],
+)
+async def test_async_anthropic_messages_handler_picks_the_beta_row_by_deployment_on_a_foundry_api_base(
+    monkeypatch: pytest.MonkeyPatch,
+    custom_llm_provider: str,
+    messages_config: str,
+    foundry_api_base: str,
+    forwarded_betas: str,
+) -> None:
+    from litellm import anthropic_beta_headers_manager
+    from litellm.llms.anthropic.messages.native.transformation import AnthropicMessagesConfig
+    from litellm.llms.azure_ai.anthropic.messages_transformation import AzureAnthropicMessagesConfig
+    from litellm.llms.openai_like.messages.transformation import OpenAILikeAnthropicMessagesConfig
+
+    monkeypatch.setenv("LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS", "True")
+    monkeypatch.setattr(anthropic_beta_headers_manager, "_BETA_HEADERS_CONFIG", None)
+    assert _BETA_THE_TABLE_DOES_NOT_LIST not in anthropic_beta_headers_manager._load_beta_headers_config()["azure_ai"]
+    configs: Final = {
+        "anthropic": AnthropicMessagesConfig,
+        "azure_ai": AzureAnthropicMessagesConfig,
+        "pass_through": OpenAILikeAnthropicMessagesConfig,
+    }
+    upstream: Final = _AnthropicMessagesUpstream()
+
+    await BaseLLMHTTPHandler().async_anthropic_messages_handler(
+        model="claude-sonnet-4-6",
+        messages=[{"role": "user", "content": "Hello"}],
+        anthropic_messages_provider_config=configs[messages_config](),
+        anthropic_messages_optional_request_params={"max_tokens": 8},
+        custom_llm_provider=custom_llm_provider,
+        litellm_params=GenericLiteLLMParams(api_base=foundry_api_base),
+        logging_obj=_anthropic_messages_logging_obj(),
+        api_key="sk-test",
+        api_base=foundry_api_base,
+        client=AsyncHTTPHandler(transport=httpx.MockTransport(upstream.respond)),
+        kwargs={
+            "extra_headers": {
+                "anthropic-beta": (
+                    f"advisor-tool-2026-03-01,thinking-binding-controls-2026-08-01,{_BETA_THE_TABLE_DOES_NOT_LIST}"
+                )
+            }
+        },
+    )
+
+    assert set(",".join(upstream.anthropic_beta).split(",")) == set(forwarded_betas.split(","))
+
+
+@pytest.mark.asyncio
+async def test_first_foundry_request_with_betas_fetches_the_beta_table_off_the_event_loop(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from litellm import anthropic_beta_headers_manager, anthropic_beta_headers_url
+    from litellm.llms.anthropic.messages.native.transformation import AnthropicMessagesConfig
+
+    monkeypatch.delenv("LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS", raising=False)
+    monkeypatch.delenv("LITELLM_OFFLINE_MODE", raising=False)
+    monkeypatch.setattr(anthropic_beta_headers_manager, "_BETA_HEADERS_CONFIG", None)
+    bundled_table: Final = anthropic_beta_headers_manager.GetAnthropicBetaHeadersConfig.load_local_beta_headers_config()
+    foundry_api_base: Final = "https://my-resource.services.ai.azure.com/anthropic"
+    upstream: Final = _AnthropicMessagesUpstream()
+
+    with respx.mock(assert_all_called=True) as router:
+        table_route: Final = router.get(anthropic_beta_headers_url).mock(
+            side_effect=lambda request: httpx.Response(
+                200, json=bundled_table, headers={"x-fetch-thread": str(threading.get_ident())}
+            )
+        )
+        await BaseLLMHTTPHandler().async_anthropic_messages_handler(
+            model="claude-sonnet-4-6",
+            messages=[{"role": "user", "content": "Hello"}],
+            anthropic_messages_provider_config=AnthropicMessagesConfig(),
+            anthropic_messages_optional_request_params={"max_tokens": 8},
+            custom_llm_provider="anthropic",
+            litellm_params=GenericLiteLLMParams(api_base=foundry_api_base),
+            logging_obj=_anthropic_messages_logging_obj(),
+            api_key="sk-test",
+            api_base=foundry_api_base,
+            client=AsyncHTTPHandler(transport=httpx.MockTransport(upstream.respond)),
+            kwargs={"extra_headers": {"anthropic-beta": "advisor-tool-2026-03-01,compact-2026-01-12"}},
+        )
+
+    assert table_route.calls.last.response.headers["x-fetch-thread"] != str(threading.get_ident())
+    assert upstream.anthropic_beta == ("compact-2026-01-12",)
+
+
 @pytest.mark.asyncio
 async def test_a_stream_answered_with_one_json_body_is_not_replayed_for_a_provider_that_does_not_opt_in(
     httpx_transport: None,
diff --git a/tests/unit/llms/databricks/chat/test_databricks_chat_transformation.py b/tests/unit/llms/databricks/chat/test_databricks_chat_transformation.py
index 7a6f9c7dc18..d2b78235c29 100644
--- a/tests/unit/llms/databricks/chat/test_databricks_chat_transformation.py
+++ b/tests/unit/llms/databricks/chat/test_databricks_chat_transformation.py
@@ -1,14 +1,14 @@
 import copy
 import json
 from collections.abc import AsyncIterator, Iterator
-from typing import Final
+from typing import Final, cast
 from unittest.mock import MagicMock, patch
 
 import httpx
 import pytest
 import respx
 from openai.lib.streaming.chat import ChatCompletionStreamState
-from openai.types.chat import ChatCompletionChunk
+from openai.types.chat import ChatCompletionChunk, ChatCompletionMessage
 from pydantic import TypeAdapter
 from fastapi.testclient import TestClient
 from pydantic import BaseModel, ConfigDict
@@ -21,6 +21,7 @@ from litellm.constants import (
     DEFAULT_REASONING_EFFORT_MEDIUM_THINKING_BUDGET,
 )
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler
+from litellm.llms.databricks.common_utils import DatabricksException
 from litellm.llms.databricks.chat.transformation import (
     DatabricksChatResponseIterator,
     DatabricksConfig,
@@ -539,13 +540,6 @@ def test_transform_request_preserves_unity_model_service_name():
             [{"type": "text", "text": "Reply in JSON", "cache_control": {"type": "ephemeral"}}],
             id="cache-control",
         ),
-        pytest.param(
-            "databricks-meta-llama-3-3-70b-instruct",
-            [{"role": "user", "content": [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]}],
-            {"response_format": {"type": "json_object"}},
-            [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}],
-            id="multiple-text-blocks",
-        ),
         pytest.param(
             "databricks-meta-llama-3-3-70b-instruct",
             [
@@ -603,6 +597,283 @@ def test_transform_request_collapses_single_plain_text_block_for_non_claude_mode
     assert outgoing_messages == [{**messages[0], "content": expected_content}]
 
 
+_TWO_TEXT_BLOCKS: Final = [{"type": "text", "text": "Reply"}, {"type": "text", "text": " in JSON"}]
+_JSON_OBJECT: Final = {"response_format": {"type": "json_object"}}
+_IMAGE_BLOCK: Final = {"type": "image_url", "image_url": {"url": "https://example.com/image.png"}}
+_CACHED_BLOCK: Final = {"type": "text", "text": " in JSON", "cache_control": {"type": "ephemeral"}}
+
+
+def _outgoing_messages(
+    model: str, messages: list[AllMessageValues], optional_params: dict[str, object], drop_params: bool = False
+) -> list[dict[str, object]]:
+    request: Final = TypeAdapter(dict[str, object]).validate_python(
+        DatabricksConfig().transform_request(  # pyright: ignore[reportUnknownMemberType]  # inherited hook is untyped
+            model=model,
+            messages=messages,
+            optional_params=optional_params,
+            litellm_params={"drop_params": True} if drop_params else {},
+            headers={},
+        )
+    )
+    return TypeAdapter(list[dict[str, object]]).validate_python(request["messages"])
+
+
+@pytest.mark.parametrize(
+    "model,messages,optional_params,expected_content",
+    [
+        pytest.param(
+            "databricks-meta-llama-3-3-70b-instruct",
+            [{"role": "user", "content": _TWO_TEXT_BLOCKS}],
+            _JSON_OBJECT,
+            "Reply in JSON",
+            id="json-object-two-blocks-joined",
+        ),
+        pytest.param(
+            "databricks-qwen35-122b-a10b",
+            [{"role": "user", "content": [{"type": "text", "text": "A"}, {"type": "text", "text": "B json"}] * 2}],
+            _JSON_OBJECT,
+            "AB jsonAB json",
+            id="json-object-four-blocks-joined-as-sent",
+        ),
+        pytest.param(
+            "databricks-meta-llama-3-3-70b-instruct",
+            [{"role": "user", "content": _TWO_TEXT_BLOCKS}],
+            {},
+            _TWO_TEXT_BLOCKS,
+            id="no-response-format-stays-list",
+        ),
+        pytest.param(
+            "databricks-meta-llama-3-3-70b-instruct",
+            [{"role": "user", "content": _TWO_TEXT_BLOCKS}],
+            {"response_format": {"type": "json_schema", "json_schema": {"name": "r", "schema": {"type": "object"}}}},
+            _TWO_TEXT_BLOCKS,
+            id="json-schema-stays-list",
+        ),
+        pytest.param(
+            "databricks-meta-llama-3-3-70b-instruct",
+            [{"role": "user", "content": [{"type": "text", "text": "Reply"}, _CACHED_BLOCK]}],
+            _JSON_OBJECT,
+            [{"type": "text", "text": "Reply"}, _CACHED_BLOCK],
+            id="json-object-cache-control-stays-list",
+        ),
+        pytest.param(
+            "databricks-meta-llama-3-3-70b-instruct",
+            [{"role": "user", "content": "Reply in JSON", "cache_control": {"type": "ephemeral"}}],
+            _JSON_OBJECT,
+            [{"type": "text", "text": "Reply in JSON", "cache_control": {"type": "ephemeral"}}],
+            id="json-object-message-cache-control-stays-block",
+        ),
+        pytest.param(
+            "databricks-meta-llama-3-3-70b-instruct",
+            [{"role": "user", "content": [{"type": "text", "text": "Reply in JSON"}, _IMAGE_BLOCK]}],
+            _JSON_OBJECT,
+            [{"type": "text", "text": "Reply in JSON"}, _IMAGE_BLOCK],
+            id="json-object-text-and-image-stays-list",
+        ),
+        pytest.param(
+            "databricks-claude-sonnet-5",
+            [{"role": "user", "content": _TWO_TEXT_BLOCKS}],
+            _JSON_OBJECT,
+            _TWO_TEXT_BLOCKS,
+            id="json-object-claude-stays-list",
+        ),
+        pytest.param(
+            "system.ai.deepseek-v4-flash-0731",
+            [{"role": "user", "content": _TWO_TEXT_BLOCKS}],
+            _JSON_OBJECT,
+            "Reply in JSON",
+            id="json-object-ai-gateway-model-joined",
+        ),
+        pytest.param(
+            "openai-gpt-external",
+            [{"role": "user", "content": _TWO_TEXT_BLOCKS}],
+            _JSON_OBJECT,
+            _TWO_TEXT_BLOCKS,
+            id="json-object-external-endpoint-stays-list",
+        ),
+    ],
+)
+def test_transform_request_joins_plain_text_blocks_only_for_hosted_non_claude_json_object(
+    model: str,
+    messages: list[AllMessageValues],
+    optional_params: dict[str, object],
+    expected_content: object,
+) -> None:
+    assert _outgoing_messages(model, messages, optional_params) == [{"role": "user", "content": expected_content}]
+
+
+@pytest.mark.parametrize("response_format", [None, {"type": "json_object"}], ids=["no-response-format", "json-object"])
+def test_transform_request_rejects_a_text_block_whose_text_is_a_truthy_non_string(
+    response_format: dict[str, str] | None,
+) -> None:
+    with pytest.raises(DatabricksException) as error:
+        _outgoing_messages(
+            "databricks-meta-llama-3-3-70b-instruct",
+            [{"role": "user", "content": [{"type": "text", "text": "Reply in JSON"}, {"type": "text", "text": 7}]}],
+            {} if response_format is None else {"response_format": response_format},
+        )
+
+    assert error.value.status_code == 400
+
+
+def test_transform_request_accepts_an_openai_message_object_in_history() -> None:
+    earlier_answer: Final = ChatCompletionMessage(role="assistant", content="Earlier answer")
+
+    outgoing: Final = _outgoing_messages(
+        "databricks-meta-llama-3-3-70b-instruct",
+        [
+            {"role": "user", "content": "Earlier question"},
+            cast(AllMessageValues, earlier_answer),  # cast-ok: SDK callers pass response messages back as history
+            {"role": "user", "content": "Next question"},
+        ],
+        {},
+    )
+
+    assert [message.get("content") for message in outgoing] == ["Earlier question", "Earlier answer", "Next question"]
+
+
+def test_transform_request_json_object_keeps_earlier_turns_as_sent() -> None:
+    earlier_turn: Final[AllMessageValues] = {
+        "role": "user",
+        "content": [{"type": "text", "text": "Code: A"}, {"type": "text", "text": "BC"}],
+    }
+    reply: Final[AllMessageValues] = {"role": "assistant", "content": "Got it."}
+
+    assert _outgoing_messages(
+        "databricks-meta-llama-3-3-70b-instruct",
+        [earlier_turn, reply, {"role": "user", "content": _TWO_TEXT_BLOCKS}],
+        _JSON_OBJECT,
+    ) == [earlier_turn, reply, {"role": "user", "content": "Reply in JSON"}]
+
+
+def test_transform_request_json_object_joins_a_trailing_system_run_and_keeps_its_break() -> None:
+    messages: Final[list[AllMessageValues]] = [
+        {"role": "user", "content": "Say hi"},
+        {"role": "system", "content": [{"type": "text", "text": "Alpha"}, {"type": "text", "text": " rule."}]},
+        {"role": "system", "content": _TWO_TEXT_BLOCKS},
+    ]
+
+    assert _outgoing_messages("databricks-meta-llama-3-3-70b-instruct", messages, _JSON_OBJECT) == [
+        {"role": "user", "content": "Say hi"},
+        {"role": "system", "content": "Alpha rule.\n\nReply in JSON"},
+    ]
+
+
+_CACHED_TEXT_AND_IMAGE: Final = [{**_CACHED_BLOCK, "text": "Reply in JSON"}, _IMAGE_BLOCK]
+
+
+@pytest.mark.parametrize(
+    "message,expected",
+    [
+        pytest.param(
+            {"role": "user", "content": [{"type": "text", "text": "Reply"}, _CACHED_BLOCK]},
+            {"role": "user", "content": "Reply in JSON"},
+            id="block-cache-control-dropped-and-joined",
+        ),
+        pytest.param(
+            {"role": "user", "content": "Reply in JSON", "cache_control": {"type": "ephemeral"}},
+            {"role": "user", "content": "Reply in JSON"},
+            id="message-cache-control-dropped",
+        ),
+        pytest.param(
+            {"role": "user", "content": _CACHED_TEXT_AND_IMAGE},
+            {"role": "user", "content": _CACHED_TEXT_AND_IMAGE},
+            id="image-keeps-cache-control",
+        ),
+    ],
+)
+def test_transform_request_json_object_drops_last_message_cache_control_under_drop_params(
+    message: AllMessageValues, expected: dict[str, object]
+) -> None:
+    assert _outgoing_messages("databricks-meta-llama-3-3-70b-instruct", [message], _JSON_OBJECT, drop_params=True) == [
+        expected
+    ]
+
+
+_THINKING_BLOCK: Final = {"type": "thinking", "thinking": "Plan the reply.", "signature": "sig"}
+
+
+@pytest.mark.parametrize(
+    "dropped_turn",
+    [
+        pytest.param({"role": "assistant", "content": "", "thinking_blocks": [_THINKING_BLOCK]}, id="thinking-only"),
+        pytest.param({"role": "assistant", "content": None, "reasoning_content": "Plan."}, id="reasoning-only"),
+        pytest.param({"role": "assistant", "content": [{"type": "text", "text": " "}]}, id="blank-text-part"),
+    ],
+)
+def test_transform_request_json_object_joins_the_message_before_a_dropped_assistant_turn(
+    dropped_turn: AllMessageValues,
+) -> None:
+    assert _outgoing_messages(
+        "databricks-meta-llama-3-3-70b-instruct",
+        [{"role": "user", "content": _TWO_TEXT_BLOCKS}, dropped_turn],
+        _JSON_OBJECT,
+    ) == [{"role": "user", "content": "Reply in JSON"}]
+
+
+def test_transform_request_json_object_joins_a_system_run_split_by_a_dropped_assistant_turn() -> None:
+    earlier_turn: Final[AllMessageValues] = {
+        "role": "user",
+        "content": [{"type": "text", "text": "Say"}, {"type": "text", "text": " hi"}],
+    }
+    messages: Final[list[AllMessageValues]] = [
+        earlier_turn,
+        {"role": "system", "content": [{"type": "text", "text": "Alpha"}, {"type": "text", "text": " rule."}]},
+        {"role": "assistant", "content": "", "thinking_blocks": [_THINKING_BLOCK]},
+        {"role": "system", "content": _TWO_TEXT_BLOCKS},
+    ]
+
+    assert _outgoing_messages("databricks-meta-llama-3-3-70b-instruct", messages, _JSON_OBJECT) == [
+        earlier_turn,
+        {"role": "system", "content": "Alpha rule.\n\nReply in JSON"},
+    ]
+
+
+@pytest.mark.parametrize(
+    "content,expected_content",
+    [
+        pytest.param(
+            [{"type": "text", "text": "Reply in JSON"}, {"type": "text", "text": "\n\n"}],
+            "Reply in JSON",
+            id="one-non-blank-part-goes-out-as-before",
+        ),
+        pytest.param(
+            [{"type": "text", "text": "Reply"}, {"type": "text", "text": " "}, {"type": "text", "text": "in JSON"}],
+            "Reply in JSON",
+            id="blank-separator-between-parts-kept",
+        ),
+    ],
+)
+def test_transform_request_json_object_joins_only_two_or_more_non_blank_parts(
+    content: list[object], expected_content: str
+) -> None:
+    assert _outgoing_messages(
+        "databricks-meta-llama-3-3-70b-instruct", [{"role": "user", "content": content}], _JSON_OBJECT
+    ) == [{"role": "user", "content": expected_content}]
+
+
+def test_transform_request_json_object_keeps_message_cache_control_parts_as_sent_without_drop_params() -> None:
+    message: Final[AllMessageValues] = {
+        "role": "user",
+        "content": _TWO_TEXT_BLOCKS,
+        "cache_control": {"type": "ephemeral"},
+    }
+
+    assert _outgoing_messages("databricks-meta-llama-3-3-70b-instruct", [message], {}) == _outgoing_messages(
+        "databricks-meta-llama-3-3-70b-instruct", [message], _JSON_OBJECT
+    )
+
+
+def test_transform_request_json_object_reads_the_global_drop_params(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(litellm, "drop_params", True)
+
+    assert _outgoing_messages(
+        "databricks-meta-llama-3-3-70b-instruct",
+        [{"role": "user", "content": [{"type": "text", "text": "Reply"}, _CACHED_BLOCK]}],
+        _JSON_OBJECT,
+    ) == [{"role": "user", "content": "Reply in JSON"}]
+
+
 def test_transform_request_strips_thinking_blocks_and_reasoning_content():
     """Regression for LIT-6762: replaying an assistant turn that litellm decorated with
     `thinking_blocks` / `reasoning_content` made Databricks 400 with
@@ -2775,6 +3046,74 @@ def test_claude_json_schema_stream_split_across_json_tools_keeps_the_non_stream_
     assert [choice.finish_reason for choice in choices if choice.finish_reason] == [answer.finish_reason]
 
 
+_HOSTED_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+_WEATHER_FUNCTION_TOOL: Final = {
+    "type": "function",
+    "function": {"name": "get_weather", "parameters": {"type": "object", "properties": {}}},
+}
+
+
+def test_databricks_claude_answers_400_for_a_hosted_mcp_tool_without_drop_params(monkeypatch):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.utils.UnsupportedParamsError) as raised:
+        DatabricksConfig().map_openai_params(
+            non_default_params={"tools": [_WEATHER_FUNCTION_TOOL, _HOSTED_MCP_TOOL]},
+            optional_params={},
+            model="databricks-claude-opus-5-5",
+            drop_params=False,
+        )
+    assert raised.value.status_code == 400
+    assert "databricks-claude-opus-5-5 on databricks " in str(raised.value)
+    assert "`deepwiki`" in str(raised.value)
+
+
+def test_databricks_claude_drops_a_hosted_mcp_tool_under_drop_params_and_keeps_the_function_tool(monkeypatch, caplog):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with caplog.at_level("WARNING"):
+        mapped: Final = DatabricksConfig().map_openai_params(
+            non_default_params={"tools": [_HOSTED_MCP_TOOL, _WEATHER_FUNCTION_TOOL]},
+            optional_params={},
+            model="databricks-claude-opus-5-5",
+            drop_params=True,
+        )
+    assert [tool["function"]["name"] for tool in mapped["tools"]] == ["get_weather"]
+    assert any(
+        "`deepwiki`" in record.getMessage() and " on databricks (" in record.getMessage() for record in caplog.records
+    )
+
+
+def test_databricks_claude_sends_no_tools_when_drop_params_drops_every_hosted_mcp_tool(monkeypatch):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    mapped: Final = DatabricksConfig().map_openai_params(
+        non_default_params={"tools": [_HOSTED_MCP_TOOL], "tool_choice": "required"},
+        optional_params={},
+        model="databricks-claude-opus-5-5",
+        drop_params=True,
+    )
+    assert "tools" not in mapped
+    assert "tool_choice" not in mapped
+
+
+def test_databricks_claude_still_sends_max_completion_tokens_as_max_tokens_when_dropping_a_hosted_mcp_tool(
+    monkeypatch,
+):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    mapped: Final = DatabricksConfig().map_openai_params(
+        non_default_params={"tools": [_HOSTED_MCP_TOOL, _WEATHER_FUNCTION_TOOL], "max_completion_tokens": 64},
+        optional_params={},
+        model="databricks-claude-opus-5-5",
+        drop_params=True,
+    )
+    assert mapped["max_tokens"] == 64
+    assert "max_completion_tokens" not in mapped
+    assert [tool["function"]["name"] for tool in mapped["tools"]] == ["get_weather"]
+
+
 @pytest.mark.parametrize(
     ("model", "base_model"),
     [("databricks-claude-haiku-5-5", None), ("support-bot-endpoint", "databricks/databricks-claude-haiku-5-5")],
diff --git a/tests/unit/llms/deepgram/test_deepgram_common_utils.py b/tests/unit/llms/deepgram/test_deepgram_common_utils.py
index 4c1b4603076..a1672e965bb 100644
--- a/tests/unit/llms/deepgram/test_deepgram_common_utils.py
+++ b/tests/unit/llms/deepgram/test_deepgram_common_utils.py
@@ -285,6 +285,9 @@ NOVA_2_URL: Final = "wss://api.deepgram.com/v1/listen?model=nova-2"
     [
         pytest.param(NOVA_3_URL, (), True, id="streaming entry present"),
         pytest.param(f"{NOVA_3_URL}&language=multi", (), True, id="multilingual entry present"),
+        pytest.param(
+            "wss://api.deepgram.com/v1/listen?model=nova-3-medical", (), True, id="medical streaming entry present"
+        ),
         pytest.param(NOVA_2_URL, (), False, id="only the pre-recorded entry"),
         pytest.param(f"{NOVA_2_URL}&language=multi", ("deepgram/streaming/nova-2",), False, id="needs multilingual"),
         pytest.param("wss://api.deepgram.com/v1/listen?model=nova-99-unmapped", (), False, id="nothing priced"),
@@ -295,7 +298,8 @@ NOVA_2_URL: Final = "wss://api.deepgram.com/v1/listen?model=nova-2"
 def test_deepgram_listen_is_priced(
     monkeypatch: pytest.MonkeyPatch, upstream_url: str, extra_rows: tuple[str, ...], expected: bool
 ):
-    """The bundled map prices only nova-3 for streaming; nova-2 has a pre-recorded row, which must never count."""
+    """The bundled map prices nova-3 and nova-3-medical for streaming; nova-2 has only a pre-recorded row, which must
+    never count."""
     monkeypatch.delitem(litellm.model_cost, "deepgram/streaming/nova-2", raising=False)
     assert "deepgram/nova-2" in litellm.model_cost
     for row in extra_rows:
diff --git a/tests/unit/llms/deepseek/chat/test_deepseek_chat_transformation.py b/tests/unit/llms/deepseek/chat/test_deepseek_chat_transformation.py
index 56af47aeebe..160ed3950b3 100644
--- a/tests/unit/llms/deepseek/chat/test_deepseek_chat_transformation.py
+++ b/tests/unit/llms/deepseek/chat/test_deepseek_chat_transformation.py
@@ -955,6 +955,51 @@ def test_get_complete_url_ignores_a_trailing_slash_on_api_base(api_base: str):
     )
 
 
+_HOSTED_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+
+
+def test_a_hosted_mcp_tool_answers_400_on_deepseek_without_drop_params(monkeypatch):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.utils.UnsupportedParamsError) as raised:
+        DeepSeekChatConfig().map_openai_params(
+            {"tools": [_function_tool("shell"), _HOSTED_MCP_TOOL]}, {}, "deepseek-v4-flash", False
+        )
+    assert raised.value.status_code == 400
+    assert "deepseek-v4-flash on deepseek " in str(raised.value)
+    assert "`deepwiki`" in str(raised.value)
+
+
+def test_deepseek_drops_a_hosted_mcp_tool_under_drop_params_and_keeps_the_function_tool(monkeypatch, caplog):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with caplog.at_level("WARNING"):
+        result: Final = DeepSeekChatConfig().map_openai_params(
+            {"tools": [_HOSTED_MCP_TOOL, _function_tool("shell")], "tool_choice": "auto"}, {}, "deepseek-v4-flash", True
+        )
+    assert result["tools"] == [_function_tool("shell")]
+    assert result["tool_choice"] == "auto"
+    assert any(
+        "`deepwiki`" in record.getMessage() and " on deepseek (" in record.getMessage() for record in caplog.records
+    )
+
+
+def test_deepseek_sends_no_tools_when_drop_params_drops_every_hosted_mcp_tool(monkeypatch):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    result: Final = DeepSeekChatConfig().map_openai_params(
+        {"tools": [_HOSTED_MCP_TOOL], "tool_choice": "required", "parallel_tool_calls": True},
+        {},
+        "deepseek-v4-flash",
+        True,
+    )
+    assert "tools" not in result
+    assert "tool_choice" not in result
+    assert "parallel_tool_calls" not in result
+
+
 def _budget_warnings(caplog: pytest.LogCaptureFixture) -> tuple[str, ...]:
     return tuple(
         r.getMessage()
diff --git a/tests/unit/llms/fireworks_ai/responses/test_fireworks_ai_responses_transformation.py b/tests/unit/llms/fireworks_ai/responses/test_fireworks_ai_responses_transformation.py
index 7fc6ac2c436..6538ccf1cac 100644
--- a/tests/unit/llms/fireworks_ai/responses/test_fireworks_ai_responses_transformation.py
+++ b/tests/unit/llms/fireworks_ai/responses/test_fireworks_ai_responses_transformation.py
@@ -172,10 +172,10 @@ def test_responses_call_forwards_previous_response_id_and_store() -> None:
 
 
 def test_responses_call_folds_developer_items_into_instructions() -> None:
-    client: Final = _mock_http_client(_fireworks_response("accounts/fireworks/models/kimi-k3"))
+    client: Final = _mock_http_client(_fireworks_response("accounts/fireworks/models/qwen3p8-2p4t-a95b"))
     with patch(HTTPX_CLIENT_FACTORY, return_value=client):
         litellm.responses(
-            model="fireworks_ai/accounts/fireworks/models/kimi-k3",
+            model="fireworks_ai/accounts/fireworks/models/qwen3p8-2p4t-a95b",
             input=[
                 {"role": "user", "content": "Hi there"},
                 {"role": "developer", "content": "Answer with exactly one word."},
@@ -214,6 +214,68 @@ def test_responses_call_keeps_developer_items_in_place_for_a_deployment_that_acc
     )
 
 
+@respx.mock
+@pytest.mark.parametrize(
+    "model",
+    [
+        "fireworks_ai/accounts/fireworks/models/kimi-k3",
+        "fireworks_ai/accounts/fireworks/models/glm-5p3",
+        "fireworks_ai/accounts/fireworks/routers/kimi-k3-fast",
+        "fireworks_ai/glm-5p3-us",
+        "fireworks_ai/models/kimi-k3",
+        "fireworks_ai/routers/kimi-k3-fast",
+    ],
+)
+def test_responses_call_keeps_developer_items_in_place_for_a_model_the_cost_map_declares_accepts_them(
+    model: str,
+) -> None:
+    route: Final = _fireworks_responses_route(model.removeprefix("fireworks_ai/"))
+    litellm.responses(
+        model=model,
+        instructions="You are Codex",
+        input=[
+            {"role": "user", "content": "Hi there"},
+            {"role": "developer", "content": "Answer with exactly one word."},
+            {"role": "user", "content": "What is the capital of France?"},
+        ],
+        api_key="fw-test-key",
+    )
+    body: Final = _routed_body(route)
+    assert body["instructions"] == "You are Codex"
+    assert tuple(body["input"]) == (
+        {"role": "user", "content": "Hi there"},
+        {"role": "system", "content": "Answer with exactly one word.", "type": "message"},
+        {"role": "user", "content": "What is the capital of France?"},
+    )
+
+
+@respx.mock
+def test_responses_call_folds_developer_items_when_the_loaded_cost_map_turns_the_flag_off(
+    declare_mid_conversation_system: Callable[[str, bool], None],
+) -> None:
+    declare_mid_conversation_system("fireworks_ai/accounts/fireworks/models/kimi-k3", False)
+    route: Final = _fireworks_responses_route("accounts/fireworks/models/kimi-k3")
+    litellm.responses(
+        model="fireworks_ai/accounts/fireworks/models/kimi-k3",
+        input=[
+            {"role": "user", "content": "Hi there"},
+            {"role": "developer", "content": "Answer with exactly one word."},
+            {"role": "user", "content": "What is the capital of France?"},
+            {"type": "message", "role": "assistant", "content": "Paris"},
+            {"role": "developer", "content": "Reply with PONG."},
+        ],
+        api_key="fw-test-key",
+    )
+    body: Final = _routed_body(route)
+    assert body["instructions"] == "Answer with exactly one word."
+    assert tuple(body["input"]) == (
+        {"role": "user", "content": "Hi there"},
+        {"role": "user", "content": "What is the capital of France?"},
+        {"type": "message", "role": "assistant", "content": "Paris"},
+        {"role": "user", "content": "Reply with PONG.", "type": "message"},
+    )
+
+
 @respx.mock
 @pytest.mark.parametrize(
     ("model_info", "closing_role"),
@@ -222,9 +284,9 @@ def test_responses_call_keeps_developer_items_in_place_for_a_deployment_that_acc
 def test_responses_call_sends_the_closing_developer_item_as_a_user_turn_only_for_a_declared_system_first_deployment(
     model_info: Mapping[str, object] | None, closing_role: str
 ) -> None:
-    route: Final = _fireworks_responses_route("accounts/fireworks/models/kimi-k3")
+    route: Final = _fireworks_responses_route("accounts/fireworks/models/qwen3p8-2p4t-a95b")
     litellm.responses(
-        model="fireworks_ai/accounts/fireworks/models/kimi-k3",
+        model="fireworks_ai/accounts/fireworks/models/qwen3p8-2p4t-a95b",
         input=[
             {"role": "user", "content": "Hi there"},
             {"role": "developer", "content": "Answer with exactly one word."},
@@ -402,7 +464,7 @@ def test_transform_request_forwards_non_string_instructions_and_input_untouched(
     developer_item: Final = {"role": "developer", "content": "Answer with exactly one word."}
     user_item: Final = {"role": "user", "content": "What is the capital of France?"}
     request: Final = FireworksAIResponsesAPIConfig().transform_responses_api_request(
-        model="accounts/fireworks/models/kimi-k3",
+        model="accounts/fireworks/models/qwen3p8-2p4t-a95b",
         input=cast(ResponseInputParam, [developer_item, user_item]),
         response_api_optional_request_params={"instructions": ["not", "a", "string"]},
         litellm_params=GenericLiteLLMParams(),
@@ -416,7 +478,7 @@ def test_transform_request_forwards_non_string_instructions_and_input_untouched(
 
 
 def test_responses_call_maps_pydantic_developer_items_and_replays_pydantic_output_items() -> None:
-    client: Final = _mock_http_client(_fireworks_response("accounts/fireworks/models/kimi-k3"))
+    client: Final = _mock_http_client(_fireworks_response("accounts/fireworks/models/qwen3p8-2p4t-a95b"))
     pydantic_input: Final = cast(
         ResponseInputParam,
         [
@@ -435,7 +497,9 @@ def test_responses_call_maps_pydantic_developer_items_and_replays_pydantic_outpu
     )
     with patch(HTTPX_CLIENT_FACTORY, return_value=client):
         litellm.responses(
-            model="fireworks_ai/accounts/fireworks/models/kimi-k3", input=pydantic_input, api_key="fw-test-key"
+            model="fireworks_ai/accounts/fireworks/models/qwen3p8-2p4t-a95b",
+            input=pydantic_input,
+            api_key="fw-test-key",
         )
     _, _, body = _sent_request(client)
     assert body["instructions"] == "Answer with exactly one word."
diff --git a/tests/unit/llms/gemini/test_gemini_tts.py b/tests/unit/llms/gemini/test_gemini_tts.py
index d0ef04e6372..831808fdc96 100644
--- a/tests/unit/llms/gemini/test_gemini_tts.py
+++ b/tests/unit/llms/gemini/test_gemini_tts.py
@@ -298,11 +298,11 @@ class TestGeminiTTSTransformation:
 
         # Test invalid format
         non_default_params = {
-            "audio": {"voice": "Kore", "format": "wav"}  # Invalid format
+            "audio": {"voice": "Kore", "format": "mp3"}  # Invalid format
         }
         optional_params = {}
 
-        with pytest.raises(ValueError, match="Unsupported audio format for Gemini TTS models"):
+        with pytest.raises(litellm.UnsupportedParamsError, match="audio format 'mp3'"):
             config.map_openai_params(
                 non_default_params=non_default_params,
                 optional_params=optional_params,
diff --git a/tests/unit/llms/gigachat/chat/test_transformation.py b/tests/unit/llms/gigachat/chat/test_transformation.py
index 9116a4d1979..4d8a916ea87 100644
--- a/tests/unit/llms/gigachat/chat/test_transformation.py
+++ b/tests/unit/llms/gigachat/chat/test_transformation.py
@@ -7,10 +7,12 @@ Run with: pytest tests/unit/llms/gigachat/chat/test_transformation.py -v
 
 import asyncio
 import importlib
+from typing import Final
 
 import pytest
 
 import litellm
+from litellm.llms.gigachat.chat.transformation import GigaChatConfig
 from tests._vcr_conftest_common import install_live_call_probe, record_vcr_outcome
 
 
@@ -575,3 +577,56 @@ _SCALAR_DEFAULTS = {
     "api_key": getattr(litellm, "api_key", None),
     "cohere_key": getattr(litellm, "cohere_key", None),
 }
+
+
+_HOSTED_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+_WEATHER_FUNCTION_TOOL: Final = {
+    "type": "function",
+    "function": {"name": "get_weather", "parameters": {"type": "object", "properties": {}}},
+}
+
+
+def test_a_hosted_mcp_tool_answers_400_on_gigachat_without_drop_params(monkeypatch):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.utils.UnsupportedParamsError) as raised:
+        GigaChatConfig().map_openai_params(
+            non_default_params={"tools": [_WEATHER_FUNCTION_TOOL, _HOSTED_MCP_TOOL]},
+            optional_params={},
+            model="GigaChat-2-Max",
+            drop_params=False,
+        )
+    assert raised.value.status_code == 400
+    assert "GigaChat-2-Max on gigachat " in str(raised.value)
+    assert "`deepwiki`" in str(raised.value)
+
+
+def test_gigachat_drops_a_hosted_mcp_tool_under_drop_params_and_keeps_the_function_tool(monkeypatch, caplog):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with caplog.at_level("WARNING"):
+        mapped: Final = GigaChatConfig().map_openai_params(
+            non_default_params={"tools": [_HOSTED_MCP_TOOL, _WEATHER_FUNCTION_TOOL]},
+            optional_params={},
+            model="GigaChat-2-Max",
+            drop_params=True,
+        )
+    assert [function["name"] for function in mapped["functions"]] == ["get_weather"]
+    assert any(
+        "`deepwiki`" in record.getMessage() and " on gigachat (" in record.getMessage() for record in caplog.records
+    )
+
+
+def test_gigachat_sends_no_functions_when_drop_params_drops_every_hosted_mcp_tool(monkeypatch):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    mapped: Final = GigaChatConfig().map_openai_params(
+        non_default_params={"tools": [_HOSTED_MCP_TOOL], "tool_choice": "auto"},
+        optional_params={},
+        model="GigaChat-2-Max",
+        drop_params=True,
+    )
+    assert "functions" not in mapped
+    assert "function_call" not in mapped
diff --git a/tests/unit/llms/hosted_vllm/chat/test_hosted_vllm_chat_transformation.py b/tests/unit/llms/hosted_vllm/chat/test_hosted_vllm_chat_transformation.py
index fc5ae3631ff..94f1873faba 100644
--- a/tests/unit/llms/hosted_vllm/chat/test_hosted_vllm_chat_transformation.py
+++ b/tests/unit/llms/hosted_vllm/chat/test_hosted_vllm_chat_transformation.py
@@ -3,14 +3,15 @@ import json
 from typing import Final
 from unittest.mock import MagicMock, patch
 
+import httpx
 import pytest
 
-
 from litellm.constants import (
     DEFAULT_REASONING_EFFORT_HIGH_THINKING_BUDGET,
     DEFAULT_REASONING_EFFORT_LOW_THINKING_BUDGET,
 )
 from litellm.llms.hosted_vllm.chat.transformation import HostedVLLMChatConfig
+from litellm.types.utils import ModelResponse
 
 
 def test_hosted_vllm_chat_transformation_file_url():
@@ -401,6 +402,64 @@ def test_hosted_vllm_custom_tools_use_top_level_input_schema():
     assert tools[0]["function"]["parameters"] == input_schema
 
 
+def _transform_vllm_chat_response(choice_extras: dict[str, object]) -> ModelResponse:
+    payload: Final = {
+        "id": "chatcmpl-1",
+        "object": "chat.completion",
+        "created": 1,
+        "model": "glm",
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": "1, 2, 3, 4"},
+                "logprobs": None,
+                "finish_reason": "stop",
+                **choice_extras,
+            }
+        ],
+        "usage": {"prompt_tokens": 5, "completion_tokens": 3, "total_tokens": 8},
+    }
+    raw_response: Final = httpx.Response(
+        200, json=payload, request=httpx.Request("POST", "http://vllm.local/v1/chat/completions")
+    )
+    return HostedVLLMChatConfig().transform_response(
+        model="hosted_vllm/glm",
+        raw_response=raw_response,
+        model_response=ModelResponse(),
+        logging_obj=MagicMock(),
+        request_data={},
+        messages=[],
+        optional_params={},
+        litellm_params={},
+        encoding=None,
+    )
+
+
+@pytest.mark.parametrize(
+    "choice_extras",
+    [
+        {"stop_reason": ", 5", "token_ids": [16, 11, 220]},
+        {"stop_reason": 128009},
+        {"stop_reason": None},
+    ],
+)
+def test_hosted_vllm_keeps_vllm_choice_fields_on_the_choice(choice_extras: dict[str, object]):
+    response: Final = _transform_vllm_chat_response(choice_extras)
+
+    dumped_choice: Final[dict[str, dict[str, object]]] = json.loads(response.model_dump_json())["choices"][0]
+    for field, value in choice_extras.items():
+        assert dumped_choice[field] == value
+        assert dumped_choice["provider_specific_fields"][field] == value
+
+
+def test_hosted_vllm_does_not_invent_vllm_choice_fields():
+    response: Final = _transform_vllm_chat_response({})
+
+    dumped_choice: Final[dict[str, object]] = json.loads(response.model_dump_json())["choices"][0]
+    assert "stop_reason" not in dumped_choice
+    assert "token_ids" not in dumped_choice
+
+
 def _strict_weather_tool() -> dict[str, object]:
     return {
         "type": "function",
diff --git a/tests/unit/llms/ollama/test_ollama_chat_transformation.py b/tests/unit/llms/ollama/test_ollama_chat_transformation.py
index 6a80f29ac43..98ca5aee407 100644
--- a/tests/unit/llms/ollama/test_ollama_chat_transformation.py
+++ b/tests/unit/llms/ollama/test_ollama_chat_transformation.py
@@ -6,6 +6,7 @@ import sys
 from typing import Final, cast
 
 import pytest
+import respx
 from pydantic import BaseModel
 
 sys.path.insert(
@@ -1211,6 +1212,72 @@ def test_get_complete_url_ignores_a_trailing_slash_on_api_base(api_base: str):
     )
 
 
+_DEEPWIKI_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+_WEATHER_TOOL: Final = {
+    "type": "function",
+    "function": {"name": "get_weather", "parameters": {"type": "object", "properties": {"city": {"type": "string"}}}},
+}
+
+
+def _ollama_chat_route(respx_mock: respx.MockRouter) -> respx.Route:
+    return respx_mock.post("http://ollama.test:11434/api/chat").respond(
+        json={
+            "model": "qwen3:0.6b",
+            "message": {"role": "assistant", "content": "Sunny"},
+            "done": True,
+            "prompt_eval_count": 5,
+            "eval_count": 3,
+        }
+    )
+
+
+def test_ollama_chat_answers_400_for_a_hosted_mcp_tool_it_cannot_run(
+    respx_mock: respx.MockRouter, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    route: Final = _ollama_chat_route(respx_mock)
+
+    with pytest.raises(litellm.UnsupportedParamsError) as raised:
+        litellm.completion(
+            model="ollama_chat/qwen3:0.6b",
+            messages=[{"role": "user", "content": "weather in Paris?"}],
+            tools=[_DEEPWIKI_MCP_TOOL, _WEATHER_TOOL],
+            api_base="http://ollama.test:11434",
+        )
+
+    assert raised.value.status_code == 400
+    assert "qwen3:0.6b on ollama_chat cannot run the hosted MCP tool `deepwiki`" in str(raised.value)
+    assert not route.called
+
+
+@pytest.mark.parametrize(
+    ("tools", "sent_tools"),
+    [([_DEEPWIKI_MCP_TOOL, _WEATHER_TOOL], [_WEATHER_TOOL]), ([_DEEPWIKI_MCP_TOOL], None)],
+    ids=["beside-a-function", "alone"],
+)
+def test_ollama_chat_drop_params_sends_only_the_tools_ollama_can_call(
+    respx_mock: respx.MockRouter, monkeypatch: pytest.MonkeyPatch, tools: list[object], sent_tools: object
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    route: Final = _ollama_chat_route(respx_mock)
+
+    response: Final = litellm.completion(
+        model="ollama_chat/qwen3:0.6b",
+        messages=[{"role": "user", "content": "weather in Paris?"}],
+        tools=tools,
+        api_base="http://ollama.test:11434",
+        drop_params=True,
+    )
+
+    assert json.loads(route.calls.last.request.content).get("tools") == sent_tools
+    assert response.choices[0].message.content == "Sunny"
+
+
 def _warnings_naming(caplog: pytest.LogCaptureFixture, param: str) -> tuple[str, ...]:
     return tuple(
         r.getMessage() for r in caplog.records if r.levelno == logging.WARNING and f"Dropping {param}=" in r.getMessage()
diff --git a/tests/unit/llms/ollama/test_ollama_completion_transformation.py b/tests/unit/llms/ollama/test_ollama_completion_transformation.py
index edea39bb10c..26addf1b24c 100644
--- a/tests/unit/llms/ollama/test_ollama_completion_transformation.py
+++ b/tests/unit/llms/ollama/test_ollama_completion_transformation.py
@@ -993,6 +993,77 @@ def test_get_complete_url_ignores_a_trailing_slash_on_api_base(api_base: str):
         == "http://gateway.example.com/ollama/api/generate"
     )
 
+
+_DEEPWIKI_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+_WEATHER_TOOL: Final = {
+    "type": "function",
+    "function": {
+        "name": "get_weather",
+        "parameters": {"type": "object", "properties": {"city": {"type": "string"}}},
+    },
+}
+
+
+def _ollama_generate_route(respx_mock: respx.MockRouter) -> respx.Route:
+    return respx_mock.post("http://ollama.test:11434/api/generate").respond(
+        json={"model": "llama3.2", "response": "Sunny", "done": True, "prompt_eval_count": 5, "eval_count": 3}
+    )
+
+
+def test_ollama_answers_400_for_a_hosted_mcp_tool_instead_of_pasting_it_into_the_prompt(
+    respx_mock: respx.MockRouter, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    monkeypatch.setattr(litellm, "add_function_to_prompt", False)
+    route: Final = _ollama_generate_route(respx_mock)
+
+    with pytest.raises(litellm.UnsupportedParamsError) as raised:
+        litellm.completion(
+            model="ollama/llama3.2",
+            messages=[{"role": "user", "content": "weather in Paris?"}],
+            tools=[_DEEPWIKI_MCP_TOOL, _WEATHER_TOOL],
+            api_base="http://ollama.test:11434",
+        )
+
+    assert raised.value.status_code == 400
+    assert "cannot run the hosted MCP tool `deepwiki`" in str(raised.value)
+    assert not route.called
+
+
+@pytest.mark.parametrize(
+    ("tools", "prompt_names_weather"),
+    [([_DEEPWIKI_MCP_TOOL, _WEATHER_TOOL], True), ([_DEEPWIKI_MCP_TOOL], False)],
+    ids=["beside-a-function", "alone"],
+)
+def test_ollama_drop_params_keeps_a_hosted_mcp_tool_out_of_the_prompt(
+    respx_mock: respx.MockRouter, monkeypatch: pytest.MonkeyPatch, tools: list[object], prompt_names_weather: bool
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    monkeypatch.setattr(litellm, "add_function_to_prompt", False)
+    route: Final = _ollama_generate_route(respx_mock)
+
+    litellm.completion(
+        model="ollama/llama3.2",
+        messages=[{"role": "user", "content": "weather in Paris?"}],
+        tools=tools,
+        api_base="http://ollama.test:11434",
+        drop_params=True,
+    )
+
+    body: Final = json.loads(route.calls.last.request.content)
+    prompt: Final = body["prompt"]
+    assert (body.get("format") == "json") is prompt_names_weather
+    assert "deepwiki" not in prompt
+    assert ("get_weather" in prompt) is prompt_names_weather
+    assert prompt.startswith("### User:\nweather in Paris?")
+    assert prompt_names_weather or prompt == "### User:\nweather in Paris?\n\n"
+
+
 def _reasoning_effort_warnings(caplog: pytest.LogCaptureFixture) -> tuple[str, ...]:
     return tuple(
         r.getMessage()
diff --git a/tests/unit/llms/openai/chat/test_openai_gpt_transformation.py b/tests/unit/llms/openai/chat/test_openai_gpt_transformation.py
index 79fe7061297..4aa93848c79 100644
--- a/tests/unit/llms/openai/chat/test_openai_gpt_transformation.py
+++ b/tests/unit/llms/openai/chat/test_openai_gpt_transformation.py
@@ -1659,6 +1659,125 @@ class TestOpenAIPromptCacheBreakpointChatPath:
         ]
 
 
+_CLIENT_BREAKPOINTS_AND_THEIR_CHAT_WIRE_FORM: Final = (
+    ({"mode": "explicit", "ttl": "1h"}, {"mode": "explicit"}),
+    ({"mode": "explicit", "ttl": "30m"}, {"mode": "explicit"}),
+    ({"mode": "explicit"}, {"mode": "explicit"}),
+    ({"mode": "implicit"}, None),
+    ({}, None),
+    ("explicit", None),
+)
+_CLIENT_BREAKPOINT_IDS: Final = ("ttl-1h", "ttl-30m", "explicit", "implicit", "empty", "string")
+
+
+class TestChatCompletionsClientBreakpointUnderDropParams:
+    """
+    Live OpenAI Chat Completions (gpt-6.1-sol, gpt-6.1-terra, gpt-6-sol, gpt-5.6, 2026-10-28) answers 400 on a
+    content part's prompt_cache_breakpoint carrying any ttl or a mode other than "explicit".
+    """
+
+    @staticmethod
+    def _request(marker: object, drop_params: bool) -> dict[str, object]:
+        return OpenAIGPTConfig().transform_request(
+            model="gpt-5.6",
+            messages=[
+                {"role": "system", "content": "Answer briefly"},
+                {
+                    "role": "user",
+                    "content": [
+                        {"type": "text", "text": "Describe this", "prompt_cache_breakpoint": marker},
+                        {"type": "image_url", "image_url": {"url": "https://example.com/a.png"}},
+                        {"type": "text", "text": "and nothing else"},
+                    ],
+                },
+            ],
+            optional_params={},
+            litellm_params={"custom_llm_provider": "openai", "drop_params": drop_params},
+            headers={},
+        )
+
+    @pytest.mark.parametrize(
+        ("marker", "wire_marker"), _CLIENT_BREAKPOINTS_AND_THEIR_CHAT_WIRE_FORM, ids=_CLIENT_BREAKPOINT_IDS
+    )
+    def test_drop_params_cuts_the_breakpoint_down_to_what_chat_completions_accepts(
+        self, marker: object, wire_marker: dict[str, str] | None
+    ):
+        text_part: Final = {"type": "text", "text": "Describe this"}
+
+        assert self._request(marker, drop_params=True)["messages"] == [
+            {"role": "system", "content": "Answer briefly"},
+            {
+                "role": "user",
+                "content": [
+                    text_part if wire_marker is None else {**text_part, "prompt_cache_breakpoint": wire_marker},
+                    {"type": "image_url", "image_url": {"url": "https://example.com/a.png"}},
+                    {"type": "text", "text": "and nothing else"},
+                ],
+            },
+        ]
+
+    @pytest.mark.parametrize(
+        "marker", [marker for marker, _ in _CLIENT_BREAKPOINTS_AND_THEIR_CHAT_WIRE_FORM], ids=_CLIENT_BREAKPOINT_IDS
+    )
+    def test_without_drop_params_the_client_breakpoint_reaches_openai_unchanged(self, marker: object):
+        assert self._request(marker, drop_params=False)["messages"][1]["content"][0] == {
+            "type": "text",
+            "text": "Describe this",
+            "prompt_cache_breakpoint": marker,
+        }
+
+    def test_cache_control_still_marks_a_part_whose_client_breakpoint_was_dropped(self):
+        request: Final = OpenAIGPTConfig().transform_request(
+            model="gpt-5.6",
+            messages=[
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "text",
+                            "text": "Describe this",
+                            "cache_control": {"type": "ephemeral"},
+                            "prompt_cache_breakpoint": {"mode": "implicit"},
+                        }
+                    ],
+                }
+            ],
+            optional_params={},
+            litellm_params={"custom_llm_provider": "openai", "drop_params": True},
+            headers={},
+        )
+
+        assert request["messages"] == [
+            {
+                "role": "user",
+                "content": [{"type": "text", "text": "Describe this", "prompt_cache_breakpoint": {"mode": "explicit"}}],
+            }
+        ]
+
+
+    @pytest.mark.parametrize("stray_part", ["Answer briefly", None], ids=["string", "null"])
+    def test_drop_params_leaves_a_part_that_is_not_an_object_for_openai_to_reject(self, stray_part: object):
+        assert OpenAIGPTConfig().transform_request(
+            model="gpt-5.6",
+            messages=[
+                {
+                    "role": "system",
+                    "content": [
+                        stray_part,
+                        {"type": "text", "text": "and nothing else", "prompt_cache_breakpoint": {"mode": "implicit"}},
+                    ],
+                },
+                {"role": "user", "content": "Describe this"},
+            ],
+            optional_params={},
+            litellm_params={"custom_llm_provider": "openai", "drop_params": True},
+            headers={},
+        )["messages"] == [
+            {"role": "system", "content": [stray_part, {"type": "text", "text": "and nothing else"}]},
+            {"role": "user", "content": "Describe this"},
+        ]
+
+
 _ARTIFACT_FIELD_PATTERN: Final = r'^(?!__.*__$)[^\p{Cc}\p{Cf}\p{Zl}\p{Zp}"\\./[\]]{1,200}$'
 
 
diff --git a/tests/unit/llms/openai/responses/test_openai_responses_guardrail_handler.py b/tests/unit/llms/openai/responses/test_openai_responses_guardrail_handler.py
index d80a5e835c9..d8954c4072a 100644
--- a/tests/unit/llms/openai/responses/test_openai_responses_guardrail_handler.py
+++ b/tests/unit/llms/openai/responses/test_openai_responses_guardrail_handler.py
@@ -4547,6 +4547,34 @@ class TestBuildBlockSseChunks:
         assert completed["output"][0]["content"][0]["text"] == "Blocked by policy."
         assert completed["usage"] == {"input_tokens": 7, "output_tokens": 21, "total_tokens": 28}
 
+    def test_continuation_numbers_every_event_after_the_last_one_relayed(self):
+        yielded: Final = [
+            {"type": "response.created", "sequence_number": 0, "response": {"id": "resp_live", "output": []}},
+            {
+                "type": "response.output_item.added",
+                "sequence_number": 1,
+                "output_index": 0,
+                "item": {"id": "msg_orig", "type": "message", "role": "assistant"},
+            },
+            {
+                "type": "response.output_text.delta",
+                "sequence_number": 2,
+                "item_id": "msg_orig",
+                "output_index": 0,
+                "content_index": 0,
+                "delta": "partial",
+            },
+        ]
+
+        payloads: Final = self._payloads(
+            OpenAIResponsesHandler().build_block_sse_chunks(
+                self._exc(original_response=yielded), stream_started=True, responses_so_far=yielded
+            )
+        )
+
+        assert payloads[-1]["type"] == "response.completed"
+        assert [payload.get("sequence_number") for payload in payloads] == list(range(3, 3 + len(payloads)))
+
     def test_continuation_reads_usage_from_typed_completed_event(self):
         from litellm.types.llms.openai import (
             ResponseCompletedEvent,
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 41c54bf6cc9..6b36a683df7 100644
--- a/tests/unit/llms/openai/responses/test_openai_responses_transformation.py
+++ b/tests/unit/llms/openai/responses/test_openai_responses_transformation.py
@@ -4393,8 +4393,9 @@ async def test_extra_body_merges_with_request_data(extra_body_mock_response_data
         assert request_body["custom_field"] == "custom_value"
 
 
-_MALFORMED_MARKERS: Final = ("yes", 1, {"mode": "bogus"}, {"mode": "explicit", "ttl": "1h"})
-_MALFORMED_MARKER_IDS: Final = ("string", "int", "bogus-mode", "bad-ttl")
+_MALFORMED_MARKERS: Final = ("yes", 1, {"mode": "bogus"}, {"mode": "bogus", "ttl": "30m"})
+_MALFORMED_MARKER_IDS: Final = ("string", "int", "bogus-mode", "bogus-mode-with-ttl")
+_UNSUPPORTED_TTL_MARKER: Final = {"mode": "explicit", "ttl": "1h"}
 _VALID_MARKERS: Final = ({"mode": "explicit"}, {"mode": "explicit", "ttl": "30m"})
 _VALID_MARKER_IDS: Final = ("explicit", "explicit-30m")
 _PARTS: Final[Mapping[str, Mapping[str, object]]] = {
@@ -4480,6 +4481,76 @@ def test_valid_prompt_cache_breakpoint_reaches_the_wire_under_both_settings(
     assert _transformed_input(_CONFIGS[0], input, GenericLiteLLMParams(drop_params=drop_params)) == input
 
 
+@pytest.mark.parametrize("config", _CONFIGS, ids=_CONFIG_IDS)
+@pytest.mark.parametrize("part_type", tuple(_PARTS))
+def test_an_unsupported_ttl_is_dropped_and_the_explicit_mode_kept_under_drop_params(
+    monkeypatch: pytest.MonkeyPatch, config: BaseResponsesAPIConfig, part_type: str
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    input: Final = _marked_message(part_type, _UNSUPPORTED_TTL_MARKER)
+    trimmed: Final = _transformed_input(config, input, GenericLiteLLMParams(drop_params=True))
+    assert _single_part(trimmed) == {**_PARTS[part_type], "prompt_cache_breakpoint": {"mode": "explicit"}}
+    assert _transformed_input(config, input, GenericLiteLLMParams(drop_params=False)) == input
+
+
+@pytest.mark.parametrize(
+    "config, marker, wire_marker",
+    [
+        (OpenAIResponsesAPIConfig(), {"mode": "explicit", "ttl": "12h"}, {"mode": "explicit", "ttl": "12h"}),
+        (AzureOpenAIResponsesAPIConfig(), {"mode": "explicit", "ttl": "30m"}, {"mode": "explicit", "ttl": "30m"}),
+        (AzureOpenAIResponsesAPIConfig(), {"mode": "explicit", "ttl": "12h"}, {"mode": "explicit"}),
+        (AzureAIResponsesAPIConfig(), {"mode": "explicit", "ttl": "12h"}, {"mode": "explicit"}),
+    ],
+    ids=("openai-keeps-12h", "azure-keeps-30m", "azure-drops-12h", "azure-ai-drops-12h"),
+)
+def test_drop_params_keeps_only_a_ttl_the_target_responses_api_accepts(
+    monkeypatch: pytest.MonkeyPatch,
+    config: BaseResponsesAPIConfig,
+    marker: Mapping[str, str],
+    wire_marker: Mapping[str, str],
+) -> None:
+    """Azure OpenAI Responses answered 400 for a 12h breakpoint ttl and 200 for 30m on 2026-10-29, and Azure AI
+    Foundry Responses did the same on 2026-10-30."""
+    monkeypatch.setattr(litellm, "drop_params", False)
+    input: Final = _marked_message("input_text", marker)
+    trimmed: Final = _transformed_input(config, input, GenericLiteLLMParams(drop_params=True))
+    assert _single_part(trimmed) == {**_PARTS["input_text"], "prompt_cache_breakpoint": wire_marker}
+    assert _transformed_input(config, input, GenericLiteLLMParams(drop_params=False)) == input
+
+
+@pytest.mark.parametrize(
+    "config, litellm_params",
+    [
+        (XAIResponsesAPIConfig(), GenericLiteLLMParams(drop_params=True)),
+        (HostedVLLMResponsesAPIConfig(), GenericLiteLLMParams(drop_params=True, api_base="http://localhost:8000/v1")),
+        (OpenAIResponsesAPIConfig(), GenericLiteLLMParams(drop_params=True, api_base="http://localhost:8000/v1")),
+    ],
+    ids=("xai", "hosted-vllm", "openai-compatible-host"),
+)
+def test_a_responses_api_not_known_to_take_breakpoints_gets_a_marker_whole_or_not_at_all(
+    monkeypatch: pytest.MonkeyPatch, config: BaseResponsesAPIConfig, litellm_params: GenericLiteLLMParams
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    unsupported_ttl: Final = _marked_message("input_text", _UNSUPPORTED_TTL_MARKER)
+    assert _single_part(_transformed_input(config, unsupported_ttl, litellm_params)) == _PARTS["input_text"]
+    openai_ttl: Final = _marked_message("input_text", {"mode": "explicit", "ttl": "12h"})
+    assert _transformed_input(config, openai_ttl, litellm_params) == openai_ttl
+
+
+def test_a_custom_host_opted_in_with_prompt_cache_options_keeps_the_mode_of_a_marker_with_an_unsupported_ttl(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    request: Final = OpenAIResponsesAPIConfig().transform_responses_api_request(
+        model="gpt-6.1-sol",
+        input=cast("ResponseInputParam", _marked_message("input_text", _UNSUPPORTED_TTL_MARKER)),
+        response_api_optional_request_params={"prompt_cache_options": {"mode": "explicit"}},
+        litellm_params=GenericLiteLLMParams(drop_params=True, api_base="https://gateway.example/v1"),
+        headers={},
+    )
+    assert _single_part(request["input"]) == {**_PARTS["input_text"], "prompt_cache_breakpoint": {"mode": "explicit"}}
+
+
 def test_prompt_cache_breakpoint_unknown_key_is_trimmed_under_drop_params(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(litellm, "drop_params", False)
     input: Final = _marked_message("input_text", {"mode": "explicit", "note": "kept"})
@@ -4569,12 +4640,43 @@ def test_a_valid_marker_survives_drop_params_on_a_deployment_name_with_unknown_b
     monkeypatch.setattr(litellm, "drop_params", False)
     litellm_params: Final = GenericLiteLLMParams(drop_params=True)
     valid: Final = _marked_message("input_text", {"mode": "explicit"})
-    malformed: Final = _marked_message("input_text", {"mode": "explicit", "ttl": "1h"})
+    malformed: Final = _marked_message("input_text", {"mode": "bogus"})
     assert _transformed_input_for("litellm-qa-sol-alias", valid, litellm_params, config) == valid
     dropped: Final = _transformed_input_for("litellm-qa-sol-alias", malformed, litellm_params, config)
     assert _single_part(dropped) == _PARTS["input_text"]
 
 
+@pytest.mark.parametrize("ttl", ("30m", "12h"))
+@pytest.mark.parametrize(
+    "config",
+    (OpenAIResponsesAPIConfig(), AzureOpenAIResponsesAPIConfig(), AzureAIResponsesAPIConfig()),
+    ids=("openai", "azure", "azure_ai"),
+)
+def test_a_deployment_with_unknown_breakpoint_support_gets_a_marker_whole_or_not_at_all(
+    monkeypatch: pytest.MonkeyPatch, config: BaseResponsesAPIConfig, ttl: str
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    litellm_params: Final = GenericLiteLLMParams(drop_params=True)
+    supported_ttl: Final = _marked_message("input_text", {"mode": "explicit", "ttl": ttl})
+    unsupported_ttl: Final = _marked_message("input_text", _UNSUPPORTED_TTL_MARKER)
+    assert _transformed_input_for("litellm-qa-sol-alias", supported_ttl, litellm_params, config) == supported_ttl
+    dropped: Final = _transformed_input_for("litellm-qa-sol-alias", unsupported_ttl, litellm_params, config)
+    assert _single_part(dropped) == _PARTS["input_text"]
+
+
+@pytest.mark.parametrize(
+    "config", (AzureOpenAIResponsesAPIConfig(), AzureAIResponsesAPIConfig()), ids=("azure", "azure_ai")
+)
+def test_an_azure_deployment_declaring_a_breakpoint_reader_keeps_the_mode_of_a_marker_with_an_unsupported_ttl(
+    monkeypatch: pytest.MonkeyPatch, config: BaseResponsesAPIConfig
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    litellm_params: Final = GenericLiteLLMParams(drop_params=True, base_model="gpt-6.1-sol")
+    unsupported_ttl: Final = _marked_message("input_text", _UNSUPPORTED_TTL_MARKER)
+    trimmed: Final = _transformed_input_for("litellm-qa-sol-alias", unsupported_ttl, litellm_params, config)
+    assert _single_part(trimmed) == {**_PARTS["input_text"], "prompt_cache_breakpoint": {"mode": "explicit"}}
+
+
 def _declaring_base_model(where: str, base_model: str) -> GenericLiteLLMParams:
     if where == "litellm_params":
         return GenericLiteLLMParams(drop_params=True, base_model=base_model)
@@ -4615,10 +4717,10 @@ def test_a_model_that_takes_markers_sends_kept_parts_byte_for_byte_and_drops_onl
         {"prompt_cache_breakpoint": {"mode": "explicit"}, "type": "input_text", "text": "b"},
     ]
     rejected: Final = {"type": "input_text", "text": "c"}
-    bad_ttl: Final = {"prompt_cache_breakpoint": {"mode": "explicit", "ttl": "1h"}}
+    bogus_mode: Final = {"prompt_cache_breakpoint": {"mode": "bogus"}}
     input: Final = [
         {"type": "message", "role": "user", "content": kept},
-        {"type": "message", "role": "user", "content": [{**bad_ttl, **rejected}]},
+        {"type": "message", "role": "user", "content": [{**bogus_mode, **rejected}]},
     ]
     transformed: Final = _transformed_input_for("gpt-6.1-sol", input, GenericLiteLLMParams(drop_params=True))
     assert json.dumps(transformed) == json.dumps(
diff --git a/tests/unit/llms/opencode/chat/test_transformation.py b/tests/unit/llms/opencode/chat/test_transformation.py
index 0a5e49ca1b2..91361a3d81d 100644
--- a/tests/unit/llms/opencode/chat/test_transformation.py
+++ b/tests/unit/llms/opencode/chat/test_transformation.py
@@ -354,6 +354,17 @@ def test_gemini_custom_base_normalizes_version_and_models(go_catalog: None, suff
         assert response.choices[0].message.content == "hello"
 
 
+def test_gemini_hosted_mcp_error_names_the_opencode_go_route(go_catalog: None) -> None:
+    with pytest.raises(litellm.UnsupportedParamsError, match="fixture-gemini on opencode_go cannot run"):
+        litellm.completion(
+            model="opencode_go/fixture-gemini",
+            api_key="fake-go-key",
+            api_base="https://gateway.example/google",
+            messages=[{"role": "user", "content": "hello"}],
+            tools=[{"type": "mcp", "server_label": "deepwiki", "server_url": "https://mcp.deepwiki.com/mcp"}],
+        )
+
+
 def test_gemini_sync_stream_preserves_tool_calls_and_usage(go_catalog: None) -> None:
     chunk: Final = {
         "candidates": [
diff --git a/tests/unit/llms/vertex_ai/count_tokens/test_context.py b/tests/unit/llms/vertex_ai/count_tokens/test_context.py
index 67733884e12..233e5d888fa 100644
--- a/tests/unit/llms/vertex_ai/count_tokens/test_context.py
+++ b/tests/unit/llms/vertex_ai/count_tokens/test_context.py
@@ -1,6 +1,5 @@
 import asyncio
 import base64
-import logging
 import uuid
 from collections.abc import Generator
 from contextlib import contextmanager
@@ -11,20 +10,22 @@ from typing import Final, Literal
 from unittest.mock import patch
 
 import pytest
-from pydantic import JsonValue, TypeAdapter
+from pydantic import JsonValue
 
 import litellm
 from litellm.llms.anthropic.messages.adapters.transformation import (
     LiteLLMAnthropicMessagesAdapter,
     truncate_tool_name,
 )
-from litellm.llms.vertex_ai.count_tokens.context import (
+from litellm.llms.anthropic.messages.context_management.inference_view import (
     CountContextEdits,
     InferenceRequestView,
+    inference_request_view,
+)
+from litellm.llms.vertex_ai.count_tokens.context import (
     VertexGeminiCountContext,
     VertexGeminiCountContextError,
     gemini_count_contents,
-    inference_request_view,
     unconvertible_messages_error,
     vertex_gemini_count_context,
 )
@@ -424,73 +425,6 @@ async def test_image_that_cannot_be_fetched_returns_an_error_value(
     assert isinstance(contents, VertexGeminiCountContextError)
 
 
-@pytest.mark.parametrize(
-    "system", ("Be brief.", [{"type": "text", "text": "Be brief."}]), ids=("string-system", "text-block-system")
-)
-async def test_anthropic_view_keeps_only_the_turns_after_a_client_compaction_block(system: JsonValue) -> None:
-    view: Final = await inference_request_view(
-        (
-            {"role": "user", "content": "first question " * 50},
-            {"role": "assistant", "content": [{"type": "compaction", "content": "Summary of the earlier turns."}]},
-            {"role": "user", "content": "latest question"},
-        ),
-        system,
-        "anthropic",
-        _NO_EDITS,
-    )
-
-    assert isinstance(view, InferenceRequestView)
-    assert view.messages == [{"role": "user", "content": "latest question"}]
-    assert "Summary of the earlier turns." in str(view.system)
-    assert "Be brief." in str(view.system)
-
-
-async def test_anthropic_view_flattens_a_replayed_web_search_result_into_text() -> None:
-    snippet: Final = "LiteLLM ships a weekly release candidate and a stable line."
-    view: Final = await inference_request_view(
-        (
-            {"role": "user", "content": "What is new?"},
-            {
-                "role": "assistant",
-                "content": [
-                    {"type": "server_tool_use", "id": "srvtoolu_01", "name": "web_search", "input": {"query": "news"}},
-                    {
-                        "type": "web_search_tool_result",
-                        "tool_use_id": "srvtoolu_01",
-                        "content": [
-                            {
-                                "type": "web_search_result",
-                                "url": "https://docs.litellm.ai/release_notes",
-                                "title": "Release notes",
-                                "encrypted_content": "",
-                                "snippet": snippet,
-                            }
-                        ],
-                    },
-                ],
-            },
-        ),
-        None,
-        "anthropic",
-        _NO_EDITS,
-    )
-
-    assert isinstance(view, InferenceRequestView)
-    assistant_blocks: Final = TypeAdapter(list[dict[str, str]]).validate_python(view.messages[1]["content"])
-    assert [block["type"] for block in assistant_blocks] == ["text"]
-    assert snippet in assistant_blocks[0]["text"]
-
-
-async def test_openai_view_is_the_request_unchanged() -> None:
-    messages: Final = ({"role": "user", "content": [{"type": "compaction", "content": "kept"}]},)
-
-    view: Final = await inference_request_view(messages, "Be brief.", "openai", _NO_EDITS)
-
-    assert isinstance(view, InferenceRequestView)
-    assert view.messages == messages
-    assert view.system == "Be brief."
-
-
 async def test_gcs_media_type_lookup_uses_the_deployment_vertex_project() -> None:
     with patch(
         "litellm.llms.vertex_ai.gemini.transformation._get_gcs_object_content_type",
@@ -556,138 +490,30 @@ async def test_anthropic_replayed_web_search_result_is_counted_as_its_text(
     assert snippet in str(contents)
 
 
-_TOOL_OUTPUT: Final = "line of a long file that the agent read earlier. " * 180
-_READ_FILE_TOOL: Final[dict[str, object]] = {
-    "name": "read_file",
-    "description": "Read a file",
-    "input_schema": {"type": "object", "properties": {"path": {"type": "string"}}},
-}
-_CLEAR_EDIT: Final[JsonValue] = {
-    "type": "clear_tool_uses_20250919",
-    "trigger": {"type": "input_tokens", "value": 500},
-    "keep": {"type": "tool_uses", "value": 1},
-}
-_CLEAR_OLD_TOOL_RESULTS: Final[JsonValue] = {"edits": [_CLEAR_EDIT]}
-
-
-def _agent_turns(rounds: int, first_round: int = 0) -> tuple[dict[str, JsonValue], ...]:
-    return (
-        *(
-            turn
-            for index in range(first_round, first_round + rounds)
-            for turn in (
-                {"role": "user", "content": f"Read file {index}."},
-                {
-                    "role": "assistant",
-                    "content": [
-                        {"type": "tool_use", "id": f"toolu_{index}", "name": "read_file", "input": {"path": f"{index}"}}
-                    ],
-                },
-                {
-                    "role": "user",
-                    "content": [{"type": "tool_result", "tool_use_id": f"toolu_{index}", "content": _TOOL_OUTPUT}],
-                },
-            )
-        ),  # comprehension-ok: flattens each round into its three turns
-        {"role": "user", "content": "Summarize what you read."},
-    )
-
-
-def _tool_outputs_kept(view: InferenceRequestView) -> tuple[bool, ...]:
-    return tuple(
-        _TOOL_OUTPUT in str(message["content"]) for message in view.messages if "tool_result" in str(message["content"])
-    )
-
-
-def _edits(spec: JsonValue) -> CountContextEdits:
-    return CountContextEdits(spec=spec, model="gemini/gemini-2.5-flash", tools=(_READ_FILE_TOOL,))
-
-
-async def test_anthropic_view_clears_the_tool_results_inference_clears() -> None:
-    view: Final = await inference_request_view(_agent_turns(3), None, "anthropic", _edits(_CLEAR_OLD_TOOL_RESULTS))
-
-    assert isinstance(view, InferenceRequestView)
-    assert _tool_outputs_kept(view) == (False, False, True)
-
-
-async def test_anthropic_view_applies_clear_edits_without_calling_the_compaction_summary_model() -> None:
-    spec: Final[JsonValue] = {
-        "edits": [{"type": "compact_20260112", "trigger": {"type": "input_tokens", "value": 50000}}, _CLEAR_EDIT]
-    }
-    turns: Final = (
-        {"role": "user", "content": "first question " * 30000},
-        {"role": "assistant", "content": "first answer"},
-        *_agent_turns(3),
-    )
-
-    with (
-        patch(
-            "litellm.llms.anthropic.messages.context_management.editors.compact._read_summary_model_setting",
-            return_value="gemini/gemini-2.5-flash",
-        ),
-        patch.object(litellm, "acompletion", side_effect=AssertionError("count_tokens must not summarize")) as summary,
-    ):
-        view: Final = await inference_request_view(turns, None, "anthropic", _edits(spec))
-
-    assert summary.call_count == 0
-    assert isinstance(view, InferenceRequestView)
-    assert _tool_outputs_kept(view) == (False, False, True)
-
-
-async def test_anthropic_view_counts_the_unedited_body_without_an_error_log_when_an_edit_fails(
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    with (
-        patch.object(litellm, "token_counter", side_effect=RuntimeError("tokenizer unavailable")),
-        caplog.at_level(logging.DEBUG, logger="LiteLLM"),
-    ):
-        view: Final = await inference_request_view(_agent_turns(3), None, "anthropic", _edits(_CLEAR_OLD_TOOL_RESULTS))
-
-    assert isinstance(view, InferenceRequestView)
-    assert _tool_outputs_kept(view) == (True, True, True)
-    assert any("skipping edits" in record.getMessage() for record in caplog.records)
-    assert not any(record.levelno >= logging.ERROR for record in caplog.records)
-
-
-async def test_anthropic_view_clears_only_the_turns_after_a_compaction_block_when_clear_runs_before_compact() -> None:
-    clear_before_compact: Final[JsonValue] = {
-        "edits": [
-            {
-                "type": "clear_tool_uses_20250919",
-                "trigger": {"type": "tool_uses", "value": 3},
-                "keep": {"type": "tool_uses", "value": 1},
-            },
-            {"type": "compact_20260112"},
-        ]
-    }
-    turns: Final = (
-        *_agent_turns(3)[:-1],
-        {"role": "assistant", "content": [{"type": "compaction", "content": "Read files 0 to 2."}]},
-        *_agent_turns(2, first_round=3),
-    )
-
-    with patch.object(litellm, "token_counter", side_effect=RuntimeError("tokenizer unavailable")):
-        view: Final = await inference_request_view(turns, None, "anthropic", _edits(clear_before_compact))
-
-    assert isinstance(view, InferenceRequestView)
-    assert _tool_outputs_kept(view) == (True, True)
-    assert "Read files 0 to 2." in str(view.system)
-
-
-async def test_anthropic_view_rejects_a_compact_trigger_inference_rejects() -> None:
-    low_trigger: Final[JsonValue] = {
-        "edits": [{"type": "compact_20260112", "trigger": {"type": "input_tokens", "value": 1000}}]
-    }
-
-    view: Final = await inference_request_view(_agent_turns(1), None, "anthropic", _edits(low_trigger))
-
-    assert isinstance(view, VertexGeminiCountContextError)
-    assert view.status_code == 400
-
-
 async def test_anthropic_view_names_the_block_gemini_cannot_count_when_an_edit_trigger_cannot_tokenize_it() -> None:
+    clear_old_tool_results: Final = CountContextEdits(
+        spec={
+            "edits": [
+                {
+                    "type": "clear_tool_uses_20250919",
+                    "trigger": {"type": "input_tokens", "value": 500},
+                    "keep": {"type": "tool_uses", "value": 1},
+                }
+            ]
+        },
+        model="gemini/gemini-2.5-flash",
+        tools=({"name": "read_file", "input_schema": {"type": "object", "properties": {"path": {"type": "string"}}}},),
+    )
     turns: Final = (
-        *_agent_turns(1)[:-1],
+        {"role": "user", "content": "Read file 0."},
+        {
+            "role": "assistant",
+            "content": [{"type": "tool_use", "id": "toolu_0", "name": "read_file", "input": {"path": "0"}}],
+        },
+        {
+            "role": "user",
+            "content": [{"type": "tool_result", "tool_use_id": "toolu_0", "content": "line of a long file. " * 180}],
+        },
         {
             "role": "user",
             "content": [
@@ -701,7 +527,7 @@ async def test_anthropic_view_names_the_block_gemini_cannot_count_when_an_edit_t
         },
     )
 
-    view: Final = await inference_request_view(turns, None, "anthropic", _edits(_CLEAR_OLD_TOOL_RESULTS))
+    view: Final = await inference_request_view(turns, None, "anthropic", clear_old_tool_results)
 
     assert isinstance(view, InferenceRequestView)
     blocks_error: Final = unconvertible_messages_error(view.messages, "anthropic")
diff --git a/tests/unit/llms/vertex_ai/gemini/test_rejected_thought_signature_retry.py b/tests/unit/llms/vertex_ai/gemini/test_rejected_thought_signature_retry.py
new file mode 100644
index 00000000000..28674ec2621
--- /dev/null
+++ b/tests/unit/llms/vertex_ai/gemini/test_rejected_thought_signature_retry.py
@@ -0,0 +1,496 @@
+import base64
+import json
+from collections.abc import Callable, Mapping, Sequence
+from itertools import chain
+from typing import Final
+
+import httpx
+import pytest
+
+import litellm
+from litellm.google_genai import agenerate_content, agenerate_content_stream, generate_content, generate_content_stream
+from litellm.litellm_core_utils.prompt_templates.factory import get_dummy_thought_signature
+from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler
+from litellm.llms.vertex_ai.gemini.rejected_thought_signature_retry import with_placeholder_thought_signatures
+from litellm.types.llms.vertex_ai import RequestBody
+from litellm.types.utils import Choices, ModelResponse, ModelResponseStream
+from litellm.utils import CustomStreamWrapper
+
+MODEL: Final = "gemini/gemini-3.8-flash"
+VERTEX_MINTED: Final = base64.b64encode(b"minted-by-vertex").decode()
+VERTEX_MINTED_TEXT: Final = base64.b64encode(b"minted-by-vertex-for-text").decode()
+AI_STUDIO_MINTED: Final = base64.b64encode(b"minted-by-ai-studio").decode()
+HISTORY_WITH_FOREIGN_SIGNATURES: Final = (
+    {"role": "user", "content": "What is the weather in Paris?"},
+    {
+        "role": "assistant",
+        "content": None,
+        "tool_calls": [
+            {
+                "id": "call_1",
+                "type": "function",
+                "function": {"name": "get_weather", "arguments": '{"city": "Paris"}'},
+                "provider_specific_fields": {"thought_signature": VERTEX_MINTED},
+            }
+        ],
+    },
+    {"role": "tool", "tool_call_id": "call_1", "content": "18C and sunny"},
+    {
+        "role": "assistant",
+        "content": "It is 18C and sunny in Paris.",
+        "provider_specific_fields": {"thought_signatures": [VERTEX_MINTED_TEXT]},
+    },
+    {"role": "user", "content": "And in Berlin?"},
+)
+HISTORY_WITHOUT_SIGNATURES: Final = (
+    {"role": "user", "content": "What is the weather in Paris?"},
+    {
+        "role": "assistant",
+        "content": None,
+        "tool_calls": [
+            {"id": "call_1", "type": "function", "function": {"name": "get_weather", "arguments": '{"city": "Paris"}'}}
+        ],
+    },
+    {"role": "tool", "tool_call_id": "call_1", "content": "18C and sunny"},
+    {"role": "user", "content": "And in Berlin?"},
+)
+TOOLS: Final = (
+    {
+        "type": "function",
+        "function": {
+            "name": "get_weather",
+            "parameters": {"type": "object", "properties": {"city": {"type": "string"}}},
+        },
+    },
+)
+ANSWER: Final = {
+    "candidates": [{"content": {"role": "model", "parts": [{"text": "Berlin is 12C."}]}, "finishReason": "STOP"}],
+    "usageMetadata": {"promptTokenCount": 40, "candidatesTokenCount": 6, "totalTokenCount": 46},
+}
+# Wording observed from Google on 2026-10-08 when a signature minted by the other backend is replayed
+AI_STUDIO_REJECTION: Final = "Corrupted thought signature."
+VERTEX_REJECTION: Final = "Invalid thought signature."
+UNRELATED_REJECTION: Final = 'Invalid JSON payload received. Unknown name "foo".'
+
+
+def _rejected(message: str) -> httpx.Response:
+    return httpx.Response(400, json={"error": {"code": 400, "message": message, "status": "INVALID_ARGUMENT"}})
+
+
+def _sse(*chunks: Mapping[str, object]) -> httpx.Response:
+    return httpx.Response(
+        200,
+        content="".join(f"data: {json.dumps(chunk)}\r\n\r\n" for chunk in chunks).encode(),
+        headers={"content-type": "text/event-stream"},
+    )
+
+
+def _replay(
+    answers: Sequence[httpx.Response], sent: list[dict[str, object]]
+) -> Callable[[httpx.Request], httpx.Response]:
+    def handler(request: httpx.Request) -> httpx.Response:
+        sent.append(json.loads(request.content))
+        return answers[len(sent) - 1]
+
+    return handler
+
+
+def _signatures_of(body: Mapping[str, object], key: str = "thoughtSignature") -> list[str]:
+    contents: Final = body["contents"]
+    assert isinstance(contents, list)
+    parts: Final = chain.from_iterable(content["parts"] for content in contents)
+    return [part[key] for part in parts if key in part]
+
+
+def _text_of(response: ModelResponse) -> str:
+    choice: Final = response.choices[0]
+    assert isinstance(choice, Choices), choice
+    assert isinstance(choice.message.content, str), choice.message
+    return choice.message.content
+
+
+def _delta_text_of(chunk: object) -> str:
+    assert isinstance(chunk, ModelResponseStream), chunk
+    return chunk.choices[0].delta.content or ""
+
+
+async def _complete(
+    messages: Sequence[Mapping[str, object]],
+    backend: Callable[[httpx.Request], httpx.Response],
+    is_async: bool,
+    stream: bool,
+) -> str:
+    kwargs: Final = {
+        "model": MODEL,
+        "messages": list(messages),
+        "tools": list(TOOLS),
+        "stream": stream,
+        "api_key": "unit-test-key",
+    }
+    response: Final = (
+        await litellm.acompletion(**kwargs, client=AsyncHTTPHandler(transport=httpx.MockTransport(backend)))
+        if is_async
+        else litellm.completion(**kwargs, client=HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(backend))))
+    )
+    if isinstance(response, ModelResponse):
+        return _text_of(response)
+    assert isinstance(response, CustomStreamWrapper), response
+    if is_async:
+        return "".join([_delta_text_of(chunk) async for chunk in response])
+    return "".join(_delta_text_of(chunk) for chunk in response)
+
+
+def _answer(stream: bool) -> httpx.Response:
+    return _sse(ANSWER) if stream else httpx.Response(200, json=ANSWER)
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.parametrize("rejection", [AI_STUDIO_REJECTION, VERTEX_REJECTION])
+@pytest.mark.asyncio
+async def test_signature_rejected_by_the_other_backend_is_resent_once_with_the_placeholder(
+    is_async: bool, stream: bool, rejection: str
+):
+    sent: Final[list[dict[str, object]]] = []
+    answer: Final = await _complete(
+        HISTORY_WITH_FOREIGN_SIGNATURES, _replay((_rejected(rejection), _answer(stream)), sent), is_async, stream
+    )
+    assert answer == "Berlin is 12C."
+    assert len(sent) == 2
+    first_signatures, second_signatures = _signatures_of(sent[0]), _signatures_of(sent[1])
+    assert set(first_signatures) == {VERTEX_MINTED, VERTEX_MINTED_TEXT}
+    assert second_signatures == [get_dummy_thought_signature()] * len(first_signatures)
+    assert {**sent[1], "contents": None} == {**sent[0], "contents": None}
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_placeholder_rejected_too_is_raised_after_the_second_post(is_async: bool, stream: bool):
+    sent: Final[list[dict[str, object]]] = []
+    with pytest.raises(litellm.BadRequestError, match="thought signature"):
+        await _complete(
+            HISTORY_WITH_FOREIGN_SIGNATURES,
+            _replay((_rejected(AI_STUDIO_REJECTION), _rejected(AI_STUDIO_REJECTION)), sent),
+            is_async,
+            stream,
+        )
+    assert len(sent) == 2
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_unrelated_400_is_raised_without_a_resend(is_async: bool, stream: bool):
+    sent: Final[list[dict[str, object]]] = []
+    with pytest.raises(litellm.BadRequestError, match="Unknown name"):
+        await _complete(HISTORY_WITH_FOREIGN_SIGNATURES, _replay((_rejected(UNRELATED_REJECTION),), sent), is_async, stream)
+    assert len(sent) == 1
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_signature_400_on_a_history_carrying_only_the_placeholder_is_raised_without_a_resend(
+    is_async: bool, stream: bool
+):
+    sent: Final[list[dict[str, object]]] = []
+    with pytest.raises(litellm.BadRequestError, match="thought signature"):
+        await _complete(HISTORY_WITHOUT_SIGNATURES, _replay((_rejected(AI_STUDIO_REJECTION),), sent), is_async, stream)
+    assert len(sent) == 1
+    assert set(_signatures_of(sent[0])) <= {get_dummy_thought_signature()}
+
+
+def test_placeholder_body_keeps_the_original_untouched():
+    body: Final[RequestBody] = {
+        "contents": [
+            {"role": "model", "parts": [{"text": "hi", "thoughtSignature": VERTEX_MINTED}, {"text": "unsigned"}]},
+            {"role": "user", "parts": [{"text": "again"}]},
+        ],
+        "generationConfig": {"temperature": 0.1},
+    }
+    resend: Final = with_placeholder_thought_signatures(body)
+    assert resend is not None
+    assert _signatures_of(resend) == [get_dummy_thought_signature()]
+    assert _signatures_of(body) == [VERTEX_MINTED]
+    assert resend.get("generationConfig") == body.get("generationConfig")
+
+
+def test_body_without_a_foreign_signature_has_nothing_to_resend():
+    body: Final[RequestBody] = {
+        "contents": [
+            {"role": "model", "parts": [{"text": "hi", "thoughtSignature": get_dummy_thought_signature()}]},
+            {"role": "user", "parts": [{"text": "again"}]},
+        ]
+    }
+    assert with_placeholder_thought_signatures(body) is None
+
+
+CACHE_CONTROL: Final = {"type": "ephemeral"}
+
+
+def _cached_history(
+    tag: str, cached_signature: str = VERTEX_MINTED, later_signatures: tuple[str, ...] = ()
+) -> tuple[Mapping[str, object], ...]:
+    later_answer: Final = (
+        {"role": "assistant", "content": "Noted.", "provider_specific_fields": {"thought_signatures": [*later_signatures]}}
+        if later_signatures
+        else {"role": "assistant", "content": "Noted."}
+    )
+    prefix: Final = " ".join(f"Reference paragraph {i} for {tag}: weather values are in Celsius." for i in range(600))
+    return (
+        {"role": "system", "content": [{"type": "text", "text": prefix, "cache_control": CACHE_CONTROL}]},
+        {
+            "role": "user",
+            "content": [{"type": "text", "text": "What is the weather in Paris?", "cache_control": CACHE_CONTROL}],
+        },
+        {
+            "role": "assistant",
+            "content": [{"type": "text", "text": "Calling the tool.", "cache_control": CACHE_CONTROL}],
+            "tool_calls": [
+                {
+                    "id": "call_1",
+                    "type": "function",
+                    "function": {"name": "get_weather", "arguments": '{"city": "Paris"}'},
+                    "provider_specific_fields": {"thought_signature": cached_signature},
+                }
+            ],
+        },
+        {
+            "role": "tool",
+            "tool_call_id": "call_1",
+            "content": [{"type": "text", "text": "18C and sunny", "cache_control": CACHE_CONTROL}],
+        },
+        {"role": "user", "content": [{"type": "text", "text": "Got it.", "cache_control": CACHE_CONTROL}]},
+        later_answer,
+        {"role": "user", "content": "And in Berlin?"},
+    )
+
+
+def _google_ai_studio(
+    stream: bool, generated: list[dict[str, object]], minted: frozenset[str] = frozenset()
+) -> Callable[[httpx.Request], httpx.Response]:
+    """Rejects a generateContent call whose own contents or referenced cache carry a signature AI Studio did not mint,
+    the way the live backend answered on 2026-11-02."""
+    caches: Final[dict[str, object]] = {}
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        if request.url.path.endswith("/cachedContents"):
+            if request.method == "GET":
+                return httpx.Response(200, json={})
+            caches["cachedContents/prefix"] = json.loads(request.content)
+            return httpx.Response(
+                200, json={"name": "cachedContents/prefix", "usageMetadata": {"totalTokenCount": 9000}}
+            )
+        body: Final = json.loads(request.content)
+        generated.append(body)
+        cache: Final = caches.get(body.get("cachedContent"), {"contents": []})
+        assert isinstance(cache, dict)
+        signatures: Final = {*_signatures_of(body), *_signatures_of(cache)}
+        if signatures - {get_dummy_thought_signature(), *minted}:
+            return _rejected(AI_STUDIO_REJECTION)
+        return _answer(stream)
+
+    return handler
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_signature_inside_a_cached_prefix_is_resent_inline_with_the_placeholder(is_async: bool, stream: bool):
+    generated: Final[list[dict[str, object]]] = []
+    answer: Final = await _complete(
+        _cached_history(f"async={is_async} stream={stream}"),
+        _google_ai_studio(stream, generated),
+        is_async,
+        stream,
+    )
+    assert answer == "Berlin is 12C."
+    assert len(generated) == 2
+    assert generated[0]["cachedContent"] == "cachedContents/prefix"
+    assert _signatures_of(generated[0]) == []
+    assert "cachedContent" not in generated[1]
+    assert _signatures_of(generated[1]) == [get_dummy_thought_signature()]
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_signature_after_a_cache_the_backend_accepts_is_resent_with_the_cache_kept(is_async: bool, stream: bool):
+    generated: Final[list[dict[str, object]]] = []
+    answer: Final = await _complete(
+        _cached_history(
+            f"own cache async={is_async} stream={stream}", AI_STUDIO_MINTED, later_signatures=(VERTEX_MINTED_TEXT,)
+        ),
+        _google_ai_studio(stream, generated, minted=frozenset({AI_STUDIO_MINTED})),
+        is_async,
+        stream,
+    )
+    assert answer == "Berlin is 12C."
+    assert [body.get("cachedContent") for body in generated] == ["cachedContents/prefix"] * 2
+    assert _signatures_of(generated[0]) == [VERTEX_MINTED_TEXT]
+    assert _signatures_of(generated[1]) == [get_dummy_thought_signature()]
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_signature_inside_and_after_the_cached_prefix_goes_inline_once_the_cache_kept_resend_is_rejected(
+    is_async: bool, stream: bool
+):
+    generated: Final[list[dict[str, object]]] = []
+    answer: Final = await _complete(
+        _cached_history(f"both async={is_async} stream={stream}", later_signatures=(VERTEX_MINTED_TEXT,)),
+        _google_ai_studio(stream, generated),
+        is_async,
+        stream,
+    )
+    assert answer == "Berlin is 12C."
+    assert [body.get("cachedContent") for body in generated] == ["cachedContents/prefix"] * 2 + [None]
+    assert _signatures_of(generated[1]) == [get_dummy_thought_signature()]
+    assert _signatures_of(generated[2]) == [get_dummy_thought_signature()] * 2
+
+
+def _backend_validating_cached_signatures(
+    stream: bool, created: list[dict[str, object]], generated: list[dict[str, object]]
+) -> Callable[[httpx.Request], httpx.Response]:
+    """Rejects creating a cache whose contents carry a signature it did not mint, the way Vertex answered on
+    2026-11-02."""
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        body: Final = json.loads(request.content) if request.content else {}
+        if request.url.path.endswith("/cachedContents"):
+            if request.method == "GET":
+                return httpx.Response(200, json={})
+            created.append(body)
+        else:
+            generated.append(body)
+        if set(_signatures_of(body)) - {get_dummy_thought_signature()}:
+            return _rejected(VERTEX_REJECTION)
+        if request.url.path.endswith("/cachedContents"):
+            return httpx.Response(
+                200, json={"name": "cachedContents/prefix", "usageMetadata": {"totalTokenCount": 9000}}
+            )
+        return _answer(stream)
+
+    return handler
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_signature_rejected_while_creating_the_cache_is_sent_inline_with_the_placeholder(
+    is_async: bool, stream: bool
+):
+    created: Final[list[dict[str, object]]] = []
+    generated: Final[list[dict[str, object]]] = []
+    answer: Final = await _complete(
+        _cached_history(f"cache creation async={is_async} stream={stream}"),
+        _backend_validating_cached_signatures(stream, created, generated),
+        is_async,
+        stream,
+    )
+    assert answer == "Berlin is 12C."
+    assert [_signatures_of(cache) for cache in created] == [[VERTEX_MINTED]]
+    assert len(generated) == 1
+    assert "cachedContent" not in generated[0]
+    assert _signatures_of(generated[0]) == [get_dummy_thought_signature()]
+
+
+NATIVE_QUESTION: Final = {"role": "user", "parts": [{"text": "What is the weather in Paris?"}]}
+NATIVE_TOOL_RESULT: Final = {
+    "role": "user",
+    "parts": [{"functionResponse": {"name": "get_weather", "response": {"result": "18C and sunny"}}}],
+}
+
+
+def _native_contents(signature_key: str) -> list[Mapping[str, object]]:
+    return [
+        NATIVE_QUESTION,
+        {
+            "role": "model",
+            "parts": [{"functionCall": {"name": "get_weather", "args": {"city": "Paris"}}, signature_key: VERTEX_MINTED}],
+        },
+        NATIVE_TOOL_RESULT,
+    ]
+
+
+async def _generate(
+    contents: list[Mapping[str, object]],
+    backend: Callable[[httpx.Request], httpx.Response],
+    is_async: bool,
+    stream: bool,
+) -> str:
+    kwargs: Final = {"model": MODEL, "contents": contents, "api_key": "unit-test-key"}
+    sync_client: Final = HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(backend)))
+    async_client: Final = AsyncHTTPHandler(transport=httpx.MockTransport(backend))
+    match is_async, stream:
+        case True, True:
+            chunks = await agenerate_content_stream(**kwargs, client=async_client)
+            return b"".join([chunk async for chunk in chunks]).decode()
+        case True, False:
+            return json.dumps((await agenerate_content(**kwargs, client=async_client)).model_dump(mode="json"))
+        case False, True:
+            return b"".join(generate_content_stream(**kwargs, client=sync_client)).decode()
+        case False, False:
+            return json.dumps(generate_content(**kwargs, client=sync_client).model_dump(mode="json"))
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.parametrize("signature_key", ["thoughtSignature", "thought_signature"])
+@pytest.mark.asyncio
+async def test_native_generate_content_resends_a_rejected_signature_with_the_placeholder(
+    is_async: bool, stream: bool, signature_key: str
+):
+    sent: Final[list[dict[str, object]]] = []
+    output: Final = await _generate(
+        _native_contents(signature_key),
+        _replay((_rejected(AI_STUDIO_REJECTION), _answer(stream)), sent),
+        is_async,
+        stream,
+    )
+    assert "Berlin is 12C." in output
+    assert len(sent) == 2
+    assert _signatures_of(sent[0], signature_key) == [VERTEX_MINTED]
+    assert _signatures_of(sent[1], signature_key) == [get_dummy_thought_signature()]
+    assert {**sent[1], "contents": None} == {**sent[0], "contents": None}
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_native_generate_content_raises_an_unrelated_400_without_a_resend(is_async: bool, stream: bool):
+    sent: Final[list[dict[str, object]]] = []
+    with pytest.raises(litellm.BadRequestError, match="Unknown name"):
+        await _generate(
+            _native_contents("thoughtSignature"), _replay((_rejected(UNRELATED_REJECTION),), sent), is_async, stream
+        )
+    assert len(sent) == 1
+
+
+def _history_signed_after_the_cached_prefix(tag: str) -> tuple[Mapping[str, object], ...]:
+    prefix: Final = " ".join(f"Reference paragraph {i} for {tag}: weather values are in Celsius." for i in range(600))
+    return (
+        {"role": "system", "content": [{"type": "text", "text": prefix, "cache_control": CACHE_CONTROL}]},
+        {"role": "user", "content": [{"type": "text", "text": "Hello.", "cache_control": CACHE_CONTROL}]},
+        *HISTORY_WITH_FOREIGN_SIGNATURES,
+    )
+
+
+@pytest.mark.parametrize("is_async", [True, False])
+@pytest.mark.parametrize("stream", [True, False])
+@pytest.mark.asyncio
+async def test_signature_after_the_cached_prefix_is_resent_with_the_cache_kept(is_async: bool, stream: bool):
+    generated: Final[list[dict[str, object]]] = []
+    answer: Final = await _complete(
+        _history_signed_after_the_cached_prefix(f"async={is_async} stream={stream}"),
+        _google_ai_studio(stream, generated),
+        is_async,
+        stream,
+    )
+    assert answer == "Berlin is 12C."
+    assert len(generated) == 2
+    assert generated[1]["cachedContent"] == generated[0]["cachedContent"] == "cachedContents/prefix"
+    assert set(_signatures_of(generated[0])) == {VERTEX_MINTED, VERTEX_MINTED_TEXT}
+    assert _signatures_of(generated[1]) == [get_dummy_thought_signature()] * 2
diff --git a/tests/unit/llms/vertex_ai/gemini/test_vertex_ai_gemini_transformation.py b/tests/unit/llms/vertex_ai/gemini/test_vertex_ai_gemini_transformation.py
index c0ff931a41d..2c8c7520c38 100644
--- a/tests/unit/llms/vertex_ai/gemini/test_vertex_ai_gemini_transformation.py
+++ b/tests/unit/llms/vertex_ai/gemini/test_vertex_ai_gemini_transformation.py
@@ -2824,7 +2824,7 @@ def test_gemini_25_text_signature_survives_replay_to_gemini_3():
     """gemini-2.5 history (signed text, unsigned tool call) replayed to gemini-3 keeps the real
     text signature; the dummy signature synthesized for the unsigned tool call must not suppress it."""
     from litellm.litellm_core_utils.prompt_templates.factory import (
-        _get_dummy_thought_signature,
+        get_dummy_thought_signature,
     )
     from litellm.llms.vertex_ai.gemini.transformation import (
         gemini_convert_messages_with_history,
@@ -2848,7 +2848,7 @@ def test_gemini_25_text_signature_survives_replay_to_gemini_3():
     assert parts[0]["text"] == "I will list the directory."
     assert parts[0]["thoughtSignature"] == "real_25_signature"
     assert "function_call" in parts[1]
-    assert parts[1]["thoughtSignature"] == _get_dummy_thought_signature()
+    assert parts[1]["thoughtSignature"] == get_dummy_thought_signature()
 
 
 def test_gemini_function_call_signature_round_trip_no_duplicate():
@@ -2990,7 +2990,7 @@ def test_thinking_block_signature_is_not_forwarded_to_gemini() -> None:
 
 
 def test_anthropic_messages_history_replays_to_gemini_without_claude_signature() -> None:
-    from litellm.litellm_core_utils.prompt_templates.factory import _get_dummy_thought_signature
+    from litellm.litellm_core_utils.prompt_templates.factory import get_dummy_thought_signature
     from litellm.llms.anthropic.messages.adapters.transformation import LiteLLMAnthropicMessagesAdapter
 
     thinking: Final = "I should look the weather up before answering."
@@ -3013,6 +3013,6 @@ def test_anthropic_messages_history_replays_to_gemini_without_claude_signature()
     parts: Final = _parts_of(gemini_convert_messages_with_history(messages=chat_messages, model="gemini-3.8-flash"))
 
     signatures: Final = [part["thoughtSignature"] for part in parts if "thoughtSignature" in part]
-    assert signatures == [_get_dummy_thought_signature()]
+    assert signatures == [get_dummy_thought_signature()]
     assert [part for part in parts if part.get("text") == thinking] == [{"thought": True, "text": thinking}]
-    assert next(part for part in parts if "function_call" in part)["thoughtSignature"] == _get_dummy_thought_signature()
+    assert next(part for part in parts if "function_call" in part)["thoughtSignature"] == get_dummy_thought_signature()
diff --git a/tests/unit/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py b/tests/unit/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py
index 98d1b8f1300..2eecb83e2df 100644
--- a/tests/unit/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py
+++ b/tests/unit/llms/vertex_ai/gemini/test_vertex_and_google_ai_studio_gemini.py
@@ -328,7 +328,9 @@ def test_chat_audio_drop_params_keeps_every_voice_config_field_gemini_accepts(sp
 
 def test_chat_audio_reads_snake_case_wrapper_beside_null_camel_case_wrapper():
     mapped: Final = VertexGeminiConfig().map_openai_params(
-        non_default_params={"audio": {"format": "pcm16", "speechConfig": None, "speech_config": {"voice_name": "Kore"}}},
+        non_default_params={
+            "audio": {"format": "pcm16", "speechConfig": None, "speech_config": {"voice_name": "Kore"}}
+        },
         optional_params={},
         model="gemini-2.5-flash-preview-tts",
         drop_params=False,
@@ -3468,9 +3470,7 @@ async def test_vertex_ai_streaming_bad_request_is_not_wrapped():
         async def dispatch_failure_handlers(self, *args, **kwargs):
             return None
 
-        async def dispatch_attempt_failure_handlers(
-            self, exception: Exception, traceback_exception: str
-        ) -> None:
+        async def dispatch_attempt_failure_handlers(self, exception: Exception, traceback_exception: str) -> None:
             return None
 
         def attempt_scoped_copy(self) -> "DummyLogging":
@@ -3600,9 +3600,7 @@ def test_grounding_annotations_preserve_all_web_sources(indices: list[int], expe
     ]
     metadata: Final = {
         "groundingChunks": chunks,
-        "groundingSupports": [
-            {"segment": {"startIndex": 4, "endIndex": 11}, "groundingChunkIndices": indices}
-        ],
+        "groundingSupports": [{"segment": {"startIndex": 4, "endIndex": 11}, "groundingChunkIndices": indices}],
     }
     annotations: Final = VertexGeminiConfig._convert_grounding_metadata_to_annotations([metadata], "The passage")
     expected: Final = [
@@ -10425,6 +10423,106 @@ def test_map_openai_params_audio_voice_reaches_speech_config_mapped() -> None:
     assert optional_params["speechConfig"]["voiceConfig"]["prebuiltVoiceConfig"]["voiceName"] == "Kore"
 
 
+def _top_level_format_audio(audio_format: str) -> Mapping[str, object]:
+    return {"voice": "Kore", "format": audio_format}
+
+
+def _format_beside_speech_config_audio(audio_format: str) -> Mapping[str, object]:
+    return {"speech_config": {"voice_name": "Kore"}, "format": audio_format}
+
+
+def _format_inside_speech_config_audio(audio_format: str) -> Mapping[str, object]:
+    return {"speech_config": {"voice_name": "Kore", "format": audio_format}}
+
+
+_FORMAT_PLACEMENTS: Final = (
+    _top_level_format_audio,
+    _format_beside_speech_config_audio,
+    _format_inside_speech_config_audio,
+)
+
+
+@pytest.mark.parametrize("audio_format", ("mp3", "opus", "flac", "PCM16"))
+@pytest.mark.parametrize("audio", _FORMAT_PLACEMENTS)
+@pytest.mark.parametrize("model", ("gemini/gemini-3.8-flash-tts", "vertex_ai/gemini-3.8-flash-tts"))
+def test_chat_audio_unsupported_format_is_a_400_naming_the_model_and_format(
+    model: str, audio: Callable[[str], Mapping[str, object]], audio_format: str
+) -> None:
+    with respx.mock, pytest.raises(litellm.BadRequestError) as raised:
+        completion(
+            model=model,
+            messages=[{"role": "user", "content": "Say hello"}],
+            modalities=["audio"],
+            audio=audio(audio_format),
+            api_key="test-key",
+            vertex_project="test-project",
+            vertex_location="us-central1",
+        )
+
+    assert raised.value.status_code == 400
+    assert f"gemini-3.8-flash-tts does not take the audio format '{audio_format}'" in str(raised.value)
+
+
+@pytest.mark.parametrize("audio", _FORMAT_PLACEMENTS)
+@pytest.mark.parametrize("request_drop_params, global_drop_params", ((True, False), (False, True)))
+def test_chat_audio_unsupported_format_is_dropped_under_drop_params(
+    monkeypatch: pytest.MonkeyPatch,
+    request_drop_params: bool,
+    global_drop_params: bool,
+    audio: Callable[[str], Mapping[str, object]],
+) -> None:
+    monkeypatch.setattr(litellm, "drop_params", global_drop_params)
+
+    optional_params: Final = VertexGeminiConfig().map_openai_params(
+        non_default_params={"modalities": ["audio"], "audio": audio("mp3")},
+        optional_params={},
+        model="gemini-3.8-flash-tts",
+        drop_params=request_drop_params,
+    )
+
+    assert optional_params == {
+        "responseModalities": ["AUDIO"],
+        "speechConfig": {"voiceConfig": {"prebuiltVoiceConfig": {"voiceName": "Kore"}}},
+    }
+
+
+def test_chat_audio_unsupported_format_error_caps_the_echoed_format() -> None:
+    with pytest.raises(litellm.UnsupportedParamsError) as raised:
+        VertexGeminiConfig().map_openai_params(
+            non_default_params={"modalities": ["audio"], "audio": {"voice": "Kore", "format": "x" * 300}},
+            optional_params={},
+            model="gemini-3.8-flash-tts",
+            drop_params=False,
+        )
+
+    assert f"audio format '{'x' * 100}'" in str(raised.value)
+    assert "x" * 101 not in str(raised.value)
+
+
+@pytest.mark.parametrize("audio_format", [5, {"codec": "mp3"}, ["x"] * 300])
+def test_chat_audio_non_string_format_error_names_the_value_as_sent(audio_format: object) -> None:
+    with pytest.raises(litellm.UnsupportedParamsError) as raised:
+        VertexGeminiConfig().map_openai_params(
+            non_default_params={"modalities": ["audio"], "audio": {"voice": "Kore", "format": audio_format}},
+            optional_params={},
+            model="gemini-3.8-flash-tts",
+            drop_params=False,
+        )
+
+    assert f"audio format {repr(audio_format)[:100]}. Set format" in str(raised.value)
+
+
+def test_map_audio_params_rejects_an_unsupported_format() -> None:
+    with pytest.raises(litellm.UnsupportedParamsError, match="audio format 'mp3'"):
+        VertexGeminiConfig().map_audio_params({"voice": "Kore", "format": "mp3"})
+
+
+def test_map_audio_params_maps_a_pcm16_voice() -> None:
+    assert VertexGeminiConfig().map_audio_params({"voice": "Kore", "format": "pcm16"}) == {
+        "voiceConfig": {"prebuiltVoiceConfig": {"voiceName": "Kore"}}
+    }
+
+
 _CACHED_PROMPT_USAGE_METADATA = {
     "promptTokenCount": 1536,
     "candidatesTokenCount": 40,
@@ -10763,6 +10861,90 @@ async def test_gemini_sends_a_boolean_for_a_gateway_default_written_as_text_or_n
     assert sent["includeThoughts"] is expected
 
 
+_HOSTED_MCP_TOOL: Final = {
+    "type": "mcp",
+    "server_label": "deepwiki",
+    "server_url": "https://mcp.deepwiki.com/mcp",
+    "require_approval": "never",
+}
+_WEATHER_FUNCTION_TOOL: Final = {
+    "type": "function",
+    "function": {"name": "get_weather", "parameters": {"type": "object", "properties": {}}},
+}
+_GEMINI_ROUTES: Final = (
+    pytest.param(VertexGeminiConfig, "vertex_ai", id="vertex_ai"),
+    pytest.param(GoogleAIStudioGeminiConfig, "gemini", id="gemini"),
+)
+
+
+@pytest.mark.parametrize(("config_class", "route"), _GEMINI_ROUTES)
+def test_a_hosted_mcp_tool_answers_400_on_gemini_without_drop_params(monkeypatch, config_class, route):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.utils.UnsupportedParamsError) as raised:
+        config_class().map_openai_params(
+            non_default_params={"tools": [_WEATHER_FUNCTION_TOOL, _HOSTED_MCP_TOOL]},
+            optional_params={},
+            model="gemini-3.8-flash",
+            drop_params=False,
+        )
+    assert raised.value.status_code == 400
+    assert f"gemini-3.8-flash on {route} " in str(raised.value)
+    assert "`deepwiki`" in str(raised.value)
+    assert "litellm_proxy/mcp/" in str(raised.value)
+
+
+@pytest.mark.parametrize(("config_class", "route"), _GEMINI_ROUTES)
+def test_gemini_drops_a_hosted_mcp_tool_under_drop_params_and_keeps_the_function_tool(
+    monkeypatch, caplog, config_class, route
+):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with caplog.at_level("WARNING"):
+        mapped: Final = config_class().map_openai_params(
+            non_default_params={"tools": [_HOSTED_MCP_TOOL, _WEATHER_FUNCTION_TOOL]},
+            optional_params={},
+            model="gemini-3.8-flash",
+            drop_params=True,
+        )
+    assert "deepwiki" not in json.dumps(mapped)
+    assert "get_weather" in json.dumps(mapped["tools"])
+    assert any(
+        "`deepwiki`" in record.getMessage() and f" on {route} (" in record.getMessage() for record in caplog.records
+    )
+
+
+@pytest.mark.parametrize(("config_class", "route"), _GEMINI_ROUTES)
+def test_gemini_sends_no_tools_when_drop_params_drops_every_hosted_mcp_tool(monkeypatch, config_class, route):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    mapped: Final = config_class().map_openai_params(
+        non_default_params={"tools": [_HOSTED_MCP_TOOL], "tool_choice": "required"},
+        optional_params={},
+        model="gemini-3.8-flash",
+        drop_params=True,
+    )
+    assert "tools" not in mapped
+    assert "tool_choice" not in mapped
+
+
+@pytest.mark.parametrize(("config_class", "route"), _GEMINI_ROUTES)
+def test_gemini_keeps_tool_choice_none_for_legacy_functions_after_dropping_every_hosted_mcp_tool(
+    monkeypatch, config_class, route
+):
+    monkeypatch.setattr(litellm, "drop_params", False)
+    mapped: Final = config_class().map_openai_params(
+        non_default_params={
+            "tools": [_HOSTED_MCP_TOOL],
+            "functions": [_WEATHER_FUNCTION_TOOL["function"]],
+            "tool_choice": "none",
+        },
+        optional_params={},
+        model="gemini-3.8-flash",
+        drop_params=True,
+    )
+    assert "deepwiki" not in json.dumps(mapped)
+    assert "get_weather" in json.dumps(mapped["tools"])
+    assert mapped["tool_choice"] == {"functionCallingConfig": {"mode": "NONE"}}
+
+
 class _BodyInChunks(httpx.SyncByteStream, httpx.AsyncByteStream):
     def __init__(self, chunks: tuple[bytes, ...]) -> None:
         self._chunks: Final = chunks
diff --git a/tests/unit/llms/vertex_ai/test_vertex_ai_common_utils.py b/tests/unit/llms/vertex_ai/test_vertex_ai_common_utils.py
index 3b222be6e5e..32d68249858 100644
--- a/tests/unit/llms/vertex_ai/test_vertex_ai_common_utils.py
+++ b/tests/unit/llms/vertex_ai/test_vertex_ai_common_utils.py
@@ -1,16 +1,19 @@
 import copy
+import threading
 import time
 from collections.abc import Iterator
 from contextlib import contextmanager
 from enum import Enum
 from typing import Final
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import httpx
 import pytest
+import respx
 from pydantic import JsonValue, TypeAdapter
 
 import litellm
+from litellm import anthropic_beta_headers_manager
 from litellm.constants import DEFAULT_MAX_RECURSE_DEPTH
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
 from litellm.llms.gemini.count_tokens import handler as gemini_count_tokens_handler
@@ -1826,6 +1829,100 @@ async def test_vertex_ai_token_counter_forwards_system_and_tools_to_partner_requ
     assert without_optional_fields.total_tokens == 37
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("edit_type", "expected_beta"),
+    [("clear_tool_uses_20250919", "context-management-2025-06-27"), ("compact_20260112", "compact-2026-01-12")],
+)
+async def test_vertex_claude_count_forwards_the_context_edits_and_beta_vertex_inference_sends(
+    edit_type: str, expected_beta: str, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    from litellm.llms.vertex_ai.vertex_ai_partner_models.count_tokens import handler
+
+    class FakeResponse:
+        status_code = 200
+
+        def json(self) -> dict[str, int]:
+            return {"input_tokens": 21}
+
+    class FakeHttpClient:
+        posted: tuple[tuple[dict[str, str], dict[str, object]], ...] = ()
+
+        async def post(
+            self, url: str, headers: dict[str, str], json: dict[str, object], timeout: float
+        ) -> FakeResponse:
+            self.posted = (*self.posted, (headers, json))
+            return FakeResponse()
+
+    fake_http_client: Final = FakeHttpClient()
+    spec: Final[dict[str, JsonValue]] = {"edits": [{"type": edit_type}]}
+    application_default_credentials: Final = MagicMock(token="fake-token", valid=True, expiry=None)
+    monkeypatch.setattr("google.auth.default", lambda *args, **kwargs: (application_default_credentials, "test-project"))
+    with patch.object(handler, "get_async_httpx_client", return_value=fake_http_client):
+        result: Final = await VertexAITokenCounter().count_tokens(
+            model_to_use="claude-opus-4-8",
+            messages=[{"role": "user", "content": "Hello"}],
+            contents=None,
+            deployment={"litellm_params": {"vertex_project": "test-project", "vertex_location": "us-east5"}},
+            messages_format="anthropic",
+            context_management=CountContextManagement(spec=spec, drop_invalid_edits=False),
+        )
+
+    assert result is not None
+    assert result.total_tokens == 21
+    ((headers, body),) = fake_http_client.posted
+    assert body["context_management"] == spec
+    assert headers["anthropic-beta"] == expected_beta
+
+
+@pytest.mark.asyncio
+async def test_vertex_claude_count_with_an_edit_fetches_the_remote_beta_config_off_the_event_loop(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from litellm.llms.vertex_ai.vertex_ai_partner_models.count_tokens import handler
+
+    class FakeResponse:
+        status_code = 200
+
+        def json(self) -> dict[str, int]:
+            return {"input_tokens": 21}
+
+    class FakeHttpClient:
+        async def post(
+            self, url: str, headers: dict[str, str], json: dict[str, object], timeout: float
+        ) -> FakeResponse:
+            return FakeResponse()
+
+    class FetchThreads:
+        seen: tuple[int, ...] = ()
+
+        def __call__(self, request: httpx.Request) -> httpx.Response:
+            self.seen = (*self.seen, threading.get_ident())
+            return httpx.Response(200, json={})
+
+    monkeypatch.delenv("LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS", raising=False)
+    monkeypatch.setattr(anthropic_beta_headers_manager, "_BETA_HEADERS_CONFIG", None)
+    fetch_threads: Final = FetchThreads()
+    application_default_credentials: Final = MagicMock(token="fake-token", valid=True, expiry=None)
+    monkeypatch.setattr("google.auth.default", lambda *args, **kwargs: (application_default_credentials, "test-project"))
+    with patch.object(handler, "get_async_httpx_client", return_value=FakeHttpClient()), respx.mock:
+        respx.get(litellm.anthropic_beta_headers_url).mock(side_effect=fetch_threads)
+        result: Final = await VertexAITokenCounter().count_tokens(
+            model_to_use="claude-opus-4-8",
+            messages=[{"role": "user", "content": "Hello"}],
+            contents=None,
+            deployment={"litellm_params": {"vertex_project": "test-project", "vertex_location": "us-east5"}},
+            messages_format="anthropic",
+            context_management=CountContextManagement(
+                spec={"edits": [{"type": "clear_tool_uses_20250919"}]}, drop_invalid_edits=False
+            ),
+        )
+
+    assert result is not None
+    assert len(fetch_threads.seen) == 1
+    assert threading.get_ident() not in fetch_threads.seen
+
+
 _PARTNER_CHAT_TOOL_TURNS: Final[list[dict[str, object]]] = [
     {"role": "user", "content": "Weather in SF?"},
     {
diff --git a/tests/unit/llms/vertex_ai/vertex_ai_partner_models/anthropic/test_vertex_ai_partner_models_anthropic_transformation.py b/tests/unit/llms/vertex_ai/vertex_ai_partner_models/anthropic/test_vertex_ai_partner_models_anthropic_transformation.py
index 0a582c95749..2be6794186e 100644
--- a/tests/unit/llms/vertex_ai/vertex_ai_partner_models/anthropic/test_vertex_ai_partner_models_anthropic_transformation.py
+++ b/tests/unit/llms/vertex_ai/vertex_ai_partner_models/anthropic/test_vertex_ai_partner_models_anthropic_transformation.py
@@ -640,36 +640,16 @@ async def test_vertex_ai_anthropic_prompt_caching_does_not_add_beta_header(
     assert "anthropic_beta" not in json.loads(request.content)
 
 
-def test_vertex_ai_partner_models_anthropic_remove_prompt_caching_scope_beta_header():
-    """
-    Test that remove_unsupported_beta correctly filters out prompt-caching-scope-2026-01-05
-    from the anthropic-beta headers.
-    """
+def test_vertex_ai_partner_models_anthropic_forwards_prompt_caching_scope_beta_header(
+    local_beta_headers_config: None,
+) -> None:
+    """A live Vertex rawPredict probe on 2026-10-28 accepted prompt-caching-scope-2026-01-05, so it goes upstream
+    while a beta missing from the vertex_ai column is still dropped."""
+    headers: Final = update_headers_with_filtered_beta(
+        {"anthropic-beta": "other-feature,prompt-caching-scope-2026-01-05,web-search-2025-03-05"}, "vertex_ai"
+    )
 
-    # This beta header should be removed
-    PROMPT_CACHING_BETA_HEADER = "prompt-caching-scope-2026-01-05"
-    headers = {
-        "anthropic-beta": f"other-feature,{PROMPT_CACHING_BETA_HEADER},web-search-2025-03-05"
-    }
-
-    headers = update_headers_with_filtered_beta(headers, "vertex_ai")
-
-    beta_header = headers.get("anthropic-beta")
-    assert PROMPT_CACHING_BETA_HEADER not in (
-        beta_header or ""
-    ), f"{PROMPT_CACHING_BETA_HEADER} should be filtered out"
-    assert "other-feature" not in (
-        beta_header or ""
-    ), "Other non-excluded beta headers should remain"
-    assert "web-search-2025-03-05" in (
-        beta_header or ""
-    ), "Other non-excluded beta headers should remain"
-    # If prompt-caching was the only value, header should be removed completely
-    headers2 = {"anthropic-beta": PROMPT_CACHING_BETA_HEADER}
-    headers2 = update_headers_with_filtered_beta(headers2, "vertex_ai")
-    assert (
-        "anthropic-beta" not in headers2
-    ), "Header should be removed if no supported values remain"
+    assert headers == {"anthropic-beta": "prompt-caching-scope-2026-01-05,web-search-2025-03-05"}
 
 
 def test_vertex_ai_anthropic_output_config_effort_only_forwarded():
diff --git a/tests/unit/proxy/anthropic_endpoints/test_endpoints.py b/tests/unit/proxy/anthropic_endpoints/test_endpoints.py
index 604fc84a096..553c3d4a9d7 100644
--- a/tests/unit/proxy/anthropic_endpoints/test_endpoints.py
+++ b/tests/unit/proxy/anthropic_endpoints/test_endpoints.py
@@ -319,6 +319,22 @@ class TestProxyExceptionAnthropicEnvelope:
         assert fallback.status_code == 500
         assert json.loads(fallback.body)["error"]["type"] == "api_error"
 
+    @pytest.mark.parametrize("status_code", [402, 409, 422, 504])
+    def test_a_failure_inside_the_handler_keeps_the_api_error_type_for_a_status_outside_the_table(
+        self, status_code: int
+    ):
+        import litellm.proxy.anthropic_endpoints.endpoints as ep
+        from litellm.proxy._types import ProxyException
+
+        request: Final = MagicMock(headers={})
+
+        response: Final = ep._anthropic_error_json_response(
+            ProxyException(message="scripted", type="budget_exceeded", param=None, code=status_code), request
+        )
+
+        assert response.status_code == status_code
+        assert json.loads(response.body)["error"] == {"type": "api_error", "message": "scripted"}
+
     @staticmethod
     def _call_id_error_response(general_settings, provider_specific_fields=None):
         import litellm.proxy.anthropic_endpoints.endpoints as ep
diff --git a/tests/unit/proxy/auth/test_auth_checks_object_access_and_lookup.py b/tests/unit/proxy/auth/test_auth_checks_object_access_and_lookup.py
index 8e9e87f370a..7a060a214f7 100644
--- a/tests/unit/proxy/auth/test_auth_checks_object_access_and_lookup.py
+++ b/tests/unit/proxy/auth/test_auth_checks_object_access_and_lookup.py
@@ -10998,139 +10998,6 @@ async def test_key_budget_error_keeps_the_masked_key_name(key_name):
     assert f"Key=prod-key ({key_name}) Current cost" in message
 
 
-class _UntouchedPrisma:
-    def __getattr__(self, name: str) -> object:
-        raise AssertionError(f"database reached through {name}")
-
-
-class _MissingUserPrisma:
-    class db:
-        class litellm_usertable:
-            @staticmethod
-            async def find_unique(where: dict[str, str], include: dict[str, bool]) -> None:
-                return None
-
-
-@pytest.mark.asyncio
-async def test_enforced_model_allowlists_treats_a_missing_user_row_as_unrestricted():
-    from litellm.proxy.auth.auth_checks import enforced_model_allowlists
-    from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
-    from litellm.proxy.utils import ProxyLogging
-
-    cache = UserApiKeyCache()
-    scopes = await enforced_model_allowlists(
-        valid_token=UserAPIKeyAuth(token="hashed-fake", user_id="default_user_id"),
-        prisma_client=_MissingUserPrisma(),
-        user_api_key_cache=cache,
-        proxy_logging_obj=ProxyLogging(user_api_key_cache=cache),
-    )
-
-    assert [list(scope) for scope in scopes] == [[], [], [], [], []]
-
-
-class _UnreachableUserPrisma:
-    class db:
-        class litellm_usertable:
-            @staticmethod
-            async def find_unique(where: dict[str, str], include: dict[str, bool]) -> None:
-                raise RuntimeError("database gone")
-
-
-@pytest.mark.asyncio
-async def test_enforced_model_allowlists_surfaces_a_failed_user_lookup():
-    from litellm.proxy.auth.auth_checks import enforced_model_allowlists
-    from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
-    from litellm.proxy.utils import ProxyLogging
-
-    cache = UserApiKeyCache()
-    with pytest.raises(ValueError, match="database gone"):
-        await enforced_model_allowlists(
-            valid_token=UserAPIKeyAuth(token="hashed-fake", user_id="user-fake"),
-            prisma_client=_UnreachableUserPrisma(),
-            user_api_key_cache=cache,
-            proxy_logging_obj=ProxyLogging(user_api_key_cache=cache),
-        )
-
-
-@pytest.mark.asyncio
-async def test_enforced_model_allowlists_reads_every_level_from_cache():
-    from litellm.proxy._types import (
-        LiteLLM_BudgetTable,
-        LiteLLM_ProjectTableCachedObj,
-        LiteLLM_TeamMembership,
-        LiteLLM_TeamTableCachedObj,
-        LiteLLM_UserTable,
-    )
-    from litellm.proxy.auth.auth_checks import enforced_model_allowlists
-    from litellm.proxy.common_utils.user_api_key_cache import (
-        UserApiKeyCache,
-        team_membership_reservation_cache_key,
-    )
-    from litellm.proxy.utils import ProxyLogging
-
-    cache = UserApiKeyCache()
-    proxy_logging_obj = ProxyLogging(user_api_key_cache=cache)
-    await cache.async_set_cache(
-        key="team_id:team-fake", value=LiteLLM_TeamTableCachedObj(team_id="team-fake", models=["gpt-4o"])
-    )
-    await cache.async_set_cache(
-        key=team_membership_reservation_cache_key(user_id="user-fake", team_id="team-fake"),
-        value=LiteLLM_TeamMembership(
-            user_id="user-fake",
-            team_id="team-fake",
-            litellm_budget_table=LiteLLM_BudgetTable(allowed_models=["gpt-4o-mini"]),
-        ),
-    )
-    await cache.async_set_cache(
-        key="project_id:project-fake",
-        value=LiteLLM_ProjectTableCachedObj(project_id="project-fake", models=["gpt-4.1"]),
-    )
-    await cache.async_set_cache(key="user-fake", value=LiteLLM_UserTable(user_id="user-fake", models=["o3"]))
-    prisma_client = _UntouchedPrisma()
-
-    team_scoped = await enforced_model_allowlists(
-        valid_token=UserAPIKeyAuth(
-            token="hashed-fake",
-            models=["all-team-models"],
-            team_models=["gpt-4o", "gpt-4o-mini"],
-            user_id="user-fake",
-            team_id="team-fake",
-            project_id="project-fake",
-        ),
-        prisma_client=prisma_client,
-        user_api_key_cache=cache,
-        proxy_logging_obj=proxy_logging_obj,
-    )
-    personal = await enforced_model_allowlists(
-        valid_token=UserAPIKeyAuth(token="hashed-fake", user_id="user-fake"),
-        prisma_client=prisma_client,
-        user_api_key_cache=cache,
-        proxy_logging_obj=proxy_logging_obj,
-    )
-    without_database = await enforced_model_allowlists(
-        valid_token=UserAPIKeyAuth(
-            token="hashed-fake",
-            models=["gpt-4o"],
-            team_models=["gpt-4o-mini"],
-            user_id="user-fake",
-            team_id="team-fake",
-        ),
-        prisma_client=None,
-        user_api_key_cache=cache,
-        proxy_logging_obj=proxy_logging_obj,
-    )
-
-    assert [list(scope) for scope in team_scoped] == [
-        ["gpt-4o", "gpt-4o-mini"],
-        ["gpt-4o"],
-        ["gpt-4o-mini"],
-        [],
-        ["gpt-4.1"],
-    ]
-    assert [list(scope) for scope in personal] == [[], [], [], ["o3"], []]
-    assert [list(scope) for scope in without_database] == [["gpt-4o"], ["gpt-4o-mini"]]
-
-
 @pytest.mark.asyncio
 @pytest.mark.parametrize("channel", ["team", "key"])
 async def test_access_group_model_fallback_uses_the_injected_database(channel: str) -> None:
diff --git a/tests/unit/proxy/common_utils/test_auth_cache_invalidation_pubsub.py b/tests/unit/proxy/common_utils/test_auth_cache_invalidation_pubsub.py
index 694b817ab86..2dc98b5ca6b 100644
--- a/tests/unit/proxy/common_utils/test_auth_cache_invalidation_pubsub.py
+++ b/tests/unit/proxy/common_utils/test_auth_cache_invalidation_pubsub.py
@@ -3,6 +3,7 @@ import hashlib
 import json
 import time
 from collections.abc import Iterable
+from typing import Final
 from unittest.mock import patch
 
 import pytest
@@ -19,7 +20,11 @@ from litellm.proxy.common_utils.auth_cache_invalidation_pubsub import (
     evict_and_broadcast,
     publish_auth_cache_invalidation,
 )
-from litellm.proxy.common_utils.user_api_key_cache import AUTH_OBJECTS_TARGET, UserApiKeyCache
+from litellm.proxy.common_utils.user_api_key_cache import (
+    AUTH_OBJECTS_TARGET,
+    UserApiKeyCache,
+    budget_windows_absent_cache_key,
+)
 
 
 class _RecordingRedisClient(Redis):
@@ -243,6 +248,28 @@ async def test_subscriber_deletes_key_object_partition_entry_on_message() -> Non
     assert cache.get_cache(hashed_token, model_type=UserAPIKeyAuth) is None
 
 
+@pytest.mark.asyncio
+async def test_subscriber_evicts_a_user_whose_id_looks_like_a_no_window_marker_along_with_the_marker() -> None:
+    user_id: Final = budget_windows_absent_cache_key("key", "alice")
+    cache: Final = UserApiKeyCache()
+    cache.set_cache(user_id, {"user_id": user_id, "models": ["gpt-4o"]})
+    cache.budget_windows_absent_cache.set_cache(key=user_id, value=True)
+
+    pubsub: Final = _QueuePubSub(initial_messages=[_invalidation_message(user_id)])
+    subscriber: Final = AuthCacheInvalidationSubscriber(
+        redis_cache=_FakeRedisCache(client=_ScriptedPubSubRedisClient(pubsubs=[pubsub])),
+        user_api_key_cache=cache,
+    )
+    subscriber.start()
+    try:
+        assert await asyncio.wait_for(pubsub.drained.wait(), timeout=5)
+    finally:
+        await subscriber.stop()
+
+    assert cache.get_cache(user_id) is None
+    assert cache.budget_windows_absent_cache.get_cache(key=user_id) is None
+
+
 @pytest.mark.asyncio
 async def test_subscriber_deletes_additional_in_memory_cache_entry_on_message() -> None:
     """
diff --git a/tests/unit/proxy/common_utils/test_codex_model_catalog.py b/tests/unit/proxy/common_utils/test_codex_model_catalog.py
index 509303d9635..e3d941a6aa4 100644
--- a/tests/unit/proxy/common_utils/test_codex_model_catalog.py
+++ b/tests/unit/proxy/common_utils/test_codex_model_catalog.py
@@ -1,9 +1,12 @@
 import json
+from collections.abc import Mapping
 from types import MappingProxyType
+from typing import Final, Literal
 
 import pytest
 
 import litellm
+from litellm.litellm_core_utils.get_model_cost_map import GetModelCostMap
 from litellm.proxy.common_utils.codex_model_catalog import (
     CODEX_CATALOG_BYTE_LIMIT,
     CodexCatalogRow,
@@ -233,6 +236,140 @@ def test_alias_with_deployment_defaults_caps_codexs_window_at_its_listed_max_inp
     assert json.loads(body.json)["models"][0]["context_window"] == expected
 
 
+_WIDE_STOCK = MappingProxyType(
+    {
+        "gpt-6-sol": _stock("gpt-6-sol").model_copy(update={"context_window": 272000, "max_context_window": 872000}),
+        "gpt-5.5": _stock("gpt-5.5").model_copy(update={"context_window": 272000}),
+    }
+)
+
+
+@pytest.mark.parametrize(
+    ("configured", "expected"),
+    [
+        ((500000,), 500000),
+        ((100000,), 100000),
+        ((1050000,), 872000),
+        ((600000, 400000), 400000),
+        ((600000, None), 272000),
+        ((100000, None), 100000),
+        ((None,), 272000),
+        ((), 272000),
+        ((0,), 272000),
+        ((-5, 400000), 272000),
+        ((0, 100000), 100000),
+    ],
+)
+@pytest.mark.parametrize("alias_defaults", ["codex", "deployment"])
+def test_a_known_model_and_its_alias_take_the_smallest_window_any_deployment_takes(
+    configured: tuple[int | None, ...], expected: int, alias_defaults: Literal["codex", "deployment"]
+) -> None:
+    rows: Final = (
+        _row("gpt-6-sol", max_input_tokens=1050000, configured_max_input_tokens=configured),
+        _row(
+            "sol-1m",
+            upstream_model="openai/gpt-6-sol",
+            max_input_tokens=1050000,
+            configured_max_input_tokens=configured,
+        ),
+    )
+
+    body: Final = codex_models_response_json(
+        rows, stock=_WIDE_STOCK, instructions=_PROMPT, alias_defaults=alias_defaults
+    )
+
+    assert {entry["slug"]: entry["context_window"] for entry in json.loads(body.json)["models"]} == {
+        "gpt-6-sol": expected,
+        "sol-1m": expected,
+    }
+
+
+def test_a_configured_window_goes_past_codexs_own_when_the_stock_entry_sets_no_ceiling() -> None:
+    (entry,) = json.loads(
+        codex_models_response_json(
+            (_row("gpt-5.5", configured_max_input_tokens=(1050000,)),), stock=_WIDE_STOCK, instructions=_PROMPT
+        ).json
+    )["models"]
+
+    assert entry["context_window"] == 1050000
+
+
+def test_a_deployment_without_a_limit_keeps_a_windowless_stock_entry_as_codex_ships_it() -> None:
+    windowless: Final = MappingProxyType({"gpt-5.5": _stock("gpt-5.5").model_copy(update={"context_window": None})})
+
+    (entry,) = json.loads(
+        codex_models_response_json(
+            (_row("gpt-5.5", configured_max_input_tokens=(1050000, None)),), stock=windowless, instructions=_PROMPT
+        ).json
+    )["models"]
+
+    assert entry["context_window"] is None
+
+
+def test_model_list_body_sizes_a_known_models_window_off_the_deployments_the_key_team_routes_to() -> None:
+    router: Final = litellm.Router(
+        model_list=[
+            {
+                "model_name": "gpt-6-astra",
+                "litellm_params": {"model": "openai/gpt-6-astra"},
+                "model_info": {"max_input_tokens": 922000},
+            },
+            {
+                "model_name": "gpt-6-astra",
+                "litellm_params": {"model": "openai/gpt-6-astra", "api_base": "https://team-2.example"},
+                "model_info": {"team_id": "team-2", "max_input_tokens": 400000},
+            },
+            {
+                "model_name": "gpt-6-astra",
+                "litellm_params": {"model": "openai/gpt-6-astra", "api_base": "https://team-3.example"},
+                "model_info": {"team_id": "team-3"},
+            },
+        ],
+        model_group_alias={"astra-1m": "gpt-6-astra"},
+    )
+    listing: Final = tuple(
+        {"id": name, "object": "model", "created": 0, "owned_by": "openai", "mode": "chat"}
+        for name in ("gpt-6-astra", "astra-1m")
+    )
+    entries: Final = (("gpt-6-astra", "gpt-6-astra"), ("astra-1m", "astra-1m"))
+    stock: Final = bundled_codex_models()["gpt-6-astra"]
+    assert stock.context_window is not None and stock.max_context_window is not None
+    assert stock.context_window < 400000 < stock.max_context_window < 922000
+
+    def windows(team_id: str) -> dict[str, int | None]:
+        models: Final = json.loads(codex_model_list_body(listing, entries, router, team_id))["models"]
+        return {entry["slug"]: entry["context_window"] for entry in models}
+
+    assert windows("team-1") == {"gpt-6-astra": stock.max_context_window, "astra-1m": stock.max_context_window}
+    assert windows("team-2") == {"gpt-6-astra": 400000, "astra-1m": 400000}
+    assert windows("team-3") == {"gpt-6-astra": stock.context_window, "astra-1m": stock.context_window}
+
+
+def test_model_list_body_skips_a_limit_a_saved_model_info_response_copied_from_the_cost_map() -> None:
+    catalog_limit: Final = GetModelCostMap.loaded_model_cost_map()["gpt-6-astra"]["max_input_tokens"]
+    stock: Final = bundled_codex_models()["gpt-6-astra"]
+    assert isinstance(catalog_limit, int) and stock.max_context_window is not None
+    assert stock.context_window is not None and stock.context_window < 600000 < stock.max_context_window
+
+    def window(model_info: Mapping[str, object]) -> int | None:
+        router: Final = litellm.Router(
+            model_list=[
+                {
+                    "model_name": "gpt-6-astra",
+                    "litellm_params": {"model": "openai/gpt-6-astra"},
+                    "model_info": dict(model_info),
+                }
+            ]
+        )
+        listing: Final = ({"id": "gpt-6-astra", "object": "model", "created": 0, "owned_by": "openai", "mode": "chat"},)
+        (entry,) = json.loads(codex_model_list_body(listing, (("gpt-6-astra", "gpt-6-astra"),), router))["models"]
+        return entry["context_window"]
+
+    assert window({"key": "gpt-6-astra", "max_input_tokens": catalog_limit}) == stock.context_window
+    assert window({"key": "gpt-6-astra", "max_input_tokens": 600000}) == 600000
+    assert window({"max_input_tokens": catalog_limit}) == min(catalog_limit, stock.max_context_window)
+
+
 def test_alias_with_deployment_defaults_drops_codexs_tier_and_upgrade_while_the_native_name_keeps_them():
     rows = (_row("gpt-6-sol"), _row("team-sol", upstream_model="gpt-6-sol"), _row("team-55", upstream_model="gpt-5.5"))
     codex = {entry["slug"]: entry for entry in _models(*rows)}
@@ -599,9 +736,14 @@ def test_catalog_rows_read_the_router_by_each_entry_lookup_id():
                 "model_name_team-1_c0ffee"
             ).supported_reasoning_efforts,
             search_tool_support=(None, None),
+            configured_max_input_tokens=(None, None),
         ),
         CodexCatalogRow(
-            id="plain", upstream_model="openai/some-unmapped-model", service_tiers=(None,), search_tool_support=(None,)
+            id="plain",
+            upstream_model="openai/some-unmapped-model",
+            service_tiers=(None,),
+            search_tool_support=(None,),
+            configured_max_input_tokens=(None,),
         ),
     )
 
@@ -631,6 +773,7 @@ def test_catalog_rows_read_an_alias_off_its_target_under_the_alias_name():
         service_tiers=(["ultrafast"],),
         supported_reasoning_efforts=router.get_model_group_info("gpt-6-astra").supported_reasoning_efforts,
         search_tool_support=(None,),
+        configured_max_input_tokens=(None,),
     )
     (entry,) = json.loads(codex_model_list_body(listing, (("gpt-6", "gpt-6"),), router))["models"]
     assert (entry["slug"], entry["display_name"], [tier["id"] for tier in entry["service_tiers"]]) == (
diff --git a/tests/unit/proxy/common_utils/test_realtime_cache.py b/tests/unit/proxy/common_utils/test_realtime_cache.py
index 6f5751fa923..9e76caff054 100644
--- a/tests/unit/proxy/common_utils/test_realtime_cache.py
+++ b/tests/unit/proxy/common_utils/test_realtime_cache.py
@@ -1,4 +1,5 @@
-from typing import Any, cast
+import json
+from typing import Any, Final, cast
 
 import pytest
 
@@ -40,6 +41,12 @@ def test_realtime_request_body_caches_each_model_separately():
     assert gpt4o_body_first is not gpt4o_mini_body
 
 
+def test_realtime_request_body_keeps_a_model_name_with_quotes_inside_its_own_field():
+    body: Final = realtime_request_body('gpt-4o", "user": "someone-else')
+
+    assert json.loads(body) == {"model": 'gpt-4o", "user": "someone-else'}
+
+
 def test_realtime_query_params_template_caches_each_pair_separately():
     params_with_intent_first = _realtime_query_params_template("gpt-4o", "intent-a")
     params_with_intent_second = _realtime_query_params_template("gpt-4o", "intent-a")
diff --git a/tests/unit/proxy/common_utils/test_token_count_settings.py b/tests/unit/proxy/common_utils/test_token_count_settings.py
index 43edc7e449f..68910f52b02 100644
--- a/tests/unit/proxy/common_utils/test_token_count_settings.py
+++ b/tests/unit/proxy/common_utils/test_token_count_settings.py
@@ -131,6 +131,107 @@ def test_shipped_australian_count_region_stays_with_an_australian_deployment() -
     assert settings.count_model == TokenCountModel(model="au.anthropic.claude-opus-5-5", region="ap-southeast-4")
 
 
+_ABSENT: Final = object()
+
+
+@pytest.mark.parametrize(
+    ("key", "field"),
+    [
+        ("token_count_tool_framing", "tool_framing"),
+        ("token_count_responses_framing", "responses_framing"),
+        ("token_count_responses_tool_framing", "responses_tool_framing"),
+    ],
+)
+@pytest.mark.parametrize(
+    ("configured", "default", "expected"),
+    [
+        (_ABSENT, 151, 151),
+        (40, 151, 40),
+        (0, 151, 0),
+        (40.0, _ABSENT, 40),
+        (-1, 151, 151),
+        (True, 151, 151),
+        ("40", _ABSENT, None),
+    ],
+)
+def test_each_request_kind_framing_reads_its_value_like_framing(
+    key: str, field: str, configured: object, default: object, expected: int | None
+) -> None:
+    settings: Final = resolve_token_count_settings(
+        configured={} if configured is _ABSENT else {key: configured},
+        default={} if default is _ABSENT else {key: default},
+        deployment_region=_in_us_west_2,
+    )
+    assert getattr(settings, field) == expected
+
+
+def _hidden_prompts(settings: TokenCountSettings) -> tuple[int, int, int, int]:
+    return (
+        settings.hidden_prompt_tokens(carries_tools=False, responses_api=False),
+        settings.hidden_prompt_tokens(carries_tools=True, responses_api=False),
+        settings.hidden_prompt_tokens(carries_tools=False, responses_api=True),
+        settings.hidden_prompt_tokens(carries_tools=True, responses_api=True),
+    )
+
+
+@pytest.mark.parametrize(
+    ("default", "expected"),
+    [
+        ({}, (0, 0, 0, 0)),
+        ({"token_count_framing": 23}, (23, 23, 23, 23)),
+        ({"token_count_framing": 185, "token_count_tool_framing": 214}, (185, 214, 185, 214)),
+        (
+            {
+                "token_count_framing": 149,
+                "token_count_tool_framing": 300,
+                "token_count_responses_framing": 145,
+                "token_count_responses_tool_framing": 104,
+            },
+            (149, 300, 145, 104),
+        ),
+        ({"token_count_framing": 149, "token_count_tool_framing": 0}, (149, 0, 149, 0)),
+        ({"token_count_framing": 149, "token_count_responses_tool_framing": 0}, (149, 149, 149, 0)),
+        ({"token_count_framing": 149, "token_count_responses_framing": 145}, (149, 149, 145, 145)),
+    ],
+)
+def test_hidden_prompt_is_the_most_specific_framing_set_for_the_request_api_and_tools(
+    default: dict[str, object], expected: tuple[int, int, int, int]
+) -> None:
+    settings: Final = resolve_token_count_settings(configured={}, default=default, deployment_region=_in_us_west_2)
+    assert _hidden_prompts(settings) == expected
+
+
+_PER_API_COST_MAP: Final = {
+    "token_count_framing": 149,
+    "token_count_tool_framing": 300,
+    "token_count_responses_framing": 145,
+    "token_count_responses_tool_framing": 104,
+}
+
+
+@pytest.mark.parametrize(
+    ("configured", "expected"),
+    [
+        ({}, (149, 300, 145, 104)),
+        ({"token_count_framing": 500}, (500, 500, 500, 500)),
+        ({"token_count_framing": 0}, (0, 0, 0, 0)),
+        ({"token_count_tool_framing": 250}, (149, 250, 145, 250)),
+        ({"token_count_framing": 500, "token_count_tool_framing": 250}, (500, 250, 500, 250)),
+        ({"token_count_responses_framing": 120}, (149, 300, 120, 120)),
+        ({"token_count_tool_framing": 250, "token_count_responses_framing": 120}, (149, 250, 120, 120)),
+        ({"token_count_responses_tool_framing": 90}, (149, 300, 145, 90)),
+        ({"token_count_framing": -1}, (149, 300, 145, 104)),
+    ],
+)
+def test_an_operator_framing_applies_to_every_request_kind_the_cost_map_splits_more_finely(
+    configured: dict[str, object], expected: tuple[int, int, int, int]
+) -> None:
+    settings: Final = resolve_token_count_settings(
+        configured=configured, default=_PER_API_COST_MAP, deployment_region=_in_us_west_2
+    )
+    assert _hidden_prompts(settings) == expected
+
+
 def test_no_setting_anywhere_means_the_model_counts_itself_without_framing() -> None:
     assert resolve_token_count_settings(
         configured={}, default={}, deployment_region=_in_us_west_2
diff --git a/tests/unit/proxy/common_utils/test_user_api_key_cache.py b/tests/unit/proxy/common_utils/test_user_api_key_cache.py
index 09523cd1901..577e5e5a389 100644
--- a/tests/unit/proxy/common_utils/test_user_api_key_cache.py
+++ b/tests/unit/proxy/common_utils/test_user_api_key_cache.py
@@ -1,6 +1,6 @@
 import hashlib
 import json
-from typing import Any
+from typing import Any, Final
 
 import pytest
 
@@ -11,6 +11,7 @@ from litellm.constants import DEFAULT_MANAGEMENT_OBJECT_IN_MEMORY_CACHE_TTL
 from litellm.proxy._types import UserAPIKeyAuth
 from litellm.proxy.common_utils.user_api_key_cache import (
     UserApiKeyCache,
+    budget_windows_absent_cache_key,
     end_user_cache_key,
     get_management_object_ttl,
     is_user_key_cache_key,
@@ -32,6 +33,17 @@ class CapturingInMemoryCache(InMemoryCache):
         super().set_cache(key, value, **kwargs)
 
 
+class _ManualClock:
+    def __init__(self) -> None:
+        self.seconds = 1000.0
+
+    def __call__(self) -> float:
+        return self.seconds
+
+    def advance(self, seconds: float) -> None:
+        self.seconds += seconds
+
+
 class FakeRedisCache(RedisCache):
     """
     In-memory fake that enforces the UserApiKeyCache Redis payload contract.
@@ -432,6 +444,29 @@ class TestUserKeyObjectPartition:
         assert first_key.token == tokens[0]
         assert cache.get_cache(end_user_cache_key("u0")) == {"user_id": "u0"}
 
+    def test_update_in_memory_max_size_applies_to_no_window_notes(self):
+        cache = UserApiKeyCache()
+        cache.update_in_memory_max_size(1)
+
+        cache.budget_windows_absent_cache.set_cache(key=budget_windows_absent_cache_key("key", "first"), value=True)
+        cache.budget_windows_absent_cache.set_cache(key=budget_windows_absent_cache_key("key", "second"), value=True)
+
+        assert cache.budget_windows_absent_cache.get_cache(key=budget_windows_absent_cache_key("key", "first")) is None
+        assert cache.budget_windows_absent_cache.get_cache(key=budget_windows_absent_cache_key("key", "second")) is True
+
+    def test_update_cache_ttl_applies_to_no_window_notes(self):
+        clock: Final = _ManualClock()
+        cache: Final = UserApiKeyCache(
+            default_in_memory_ttl=60, budget_windows_absent_in_memory_cache=InMemoryCache(clock=clock)
+        )
+        cache.update_cache_ttl(default_in_memory_ttl=5, default_redis_ttl=5)
+        note: Final = budget_windows_absent_cache_key("key", "no-windows")
+
+        cache.budget_windows_absent_cache.set_cache(key=note, value=True)
+        clock.advance(6)
+
+        assert cache.budget_windows_absent_cache.get_cache(key=note) is None
+
     def test_update_in_memory_max_size_none_resets_key_object_partition_to_default(self):
         cache = UserApiKeyCache(key_object_in_memory_cache=InMemoryCache(max_size_in_memory=1))
         cache.update_in_memory_max_size(None)
diff --git a/tests/unit/proxy/config_resolvers/test_settings_store.py b/tests/unit/proxy/config_resolvers/test_settings_store.py
index 7b2cd404b46..76850825937 100644
--- a/tests/unit/proxy/config_resolvers/test_settings_store.py
+++ b/tests/unit/proxy/config_resolvers/test_settings_store.py
@@ -471,3 +471,34 @@ def test_settings_store_truthiness_matches_emptiness() -> None:
     assert bool(store) is True
     del store["max_parallel_requests"]
     assert bool(store) is False
+
+
+def test_settings_store_ignores_stored_keys_outside_its_managed_db_keys_and_still_applies_them_from_yaml() -> None:
+    store: Final = SettingsStore("general_settings", managed_db_keys=frozenset({"max_parallel_requests"}))
+    stored_row: Final[dict[str, JsonValue]] = {"enforce_user_param": True, "max_parallel_requests": 5}
+
+    store.apply_db_row("general_settings", stored_row)
+
+    assert dict(store) == {"max_parallel_requests": 5}
+    assert store.source("enforce_user_param") == "unset"
+    assert store.unmanaged_db_keys() == ("enforce_user_param",)
+
+    store.load_yaml({"enforce_user_param": True})
+    store.apply_db_row("general_settings", stored_row)
+
+    assert dict(store) == {"enforce_user_param": True, "max_parallel_requests": 5}
+    assert store.source("enforce_user_param") == "config"
+    assert store.unmanaged_db_keys() == ("enforce_user_param",)
+
+
+def test_settings_store_managed_db_keys_leave_other_rows_and_unrestricted_stores_whole() -> None:
+    restricted: Final = SettingsStore("general_settings", managed_db_keys=frozenset())
+    unrestricted: Final = SettingsStore("general_settings")
+
+    restricted.apply_db_row("ui_settings", {"disable_custom_api_keys": True})
+    unrestricted.apply_db_row("general_settings", {"enforce_user_param": True})
+
+    assert dict(restricted) == {"disable_custom_api_keys": True}
+    assert restricted.unmanaged_db_keys() == ()
+    assert dict(unrestricted) == {"enforce_user_param": True}
+    assert unrestricted.unmanaged_db_keys() == ()
diff --git a/tests/unit/proxy/guardrails/guardrail_hooks/test_llm_shield_proxy.py b/tests/unit/proxy/guardrails/guardrail_hooks/test_llm_shield_proxy.py
index 3da77a8707e..2603cf92f30 100644
--- a/tests/unit/proxy/guardrails/guardrail_hooks/test_llm_shield_proxy.py
+++ b/tests/unit/proxy/guardrails/guardrail_hooks/test_llm_shield_proxy.py
@@ -1694,6 +1694,48 @@ class TestResponsesStreamRestoration:
 
         assert "".join(e.delta for e in out) == "see a@example.com a["
 
+    @pytest.mark.asyncio
+    async def test_a_flushed_delta_takes_the_done_events_number_and_later_events_move_up(self):
+        guardrail, _ = _shielded(self.VAULT)
+        done = OutputTextDoneEvent(
+            type=ResponsesAPIStreamEvents.OUTPUT_TEXT_DONE,
+            item_id="msg_1",
+            output_index=0,
+            content_index=0,
+            text="Mail [EMAIL_1] x[",
+            sequence_number=3,
+        )
+
+        out = await _restore_stream(
+            guardrail,
+            [
+                self._text_delta("Mail [EMA", 1),
+                self._text_delta("IL_1] x[", 2),
+                done,
+                self._text_delta("next", 4, content_index=1),
+            ],
+        )
+
+        assert [(e.type, e.sequence_number) for e in out] == [
+            (ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA, 1),
+            (ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA, 2),
+            (ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA, 3),
+            (ResponsesAPIStreamEvents.OUTPUT_TEXT_DONE, 4),
+            (ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA, 5),
+        ]
+        assert out[2].delta == "["
+
+    @pytest.mark.asyncio
+    async def test_a_truncated_stream_flush_continues_after_the_last_number(self):
+        guardrail, _ = _shielded(self.VAULT)
+
+        out = await _restore_stream(
+            guardrail, [self._text_delta("see [EMAIL_1] a[", 7), self._text_delta(" b", 8, content_index=1)]
+        )
+
+        assert [e.sequence_number for e in out] == [7, 8, 9]
+        assert out[-1].delta == "["
+
     @pytest.mark.asyncio
     async def test_completed_response_is_restored(self):
         """The terminal event repeats the whole reply, and clients read it as the answer."""
diff --git a/tests/unit/proxy/guardrails/guardrail_hooks/test_mcp_security.py b/tests/unit/proxy/guardrails/guardrail_hooks/test_mcp_security.py
index 0e6670c26e7..43238e37f63 100644
--- a/tests/unit/proxy/guardrails/guardrail_hooks/test_mcp_security.py
+++ b/tests/unit/proxy/guardrails/guardrail_hooks/test_mcp_security.py
@@ -6,19 +6,24 @@ and allows requests with only registered servers. Covers both /chat/completions
 and /responses API paths (same pre_call_hook logic, different call_type).
 """
 
-from typing import Literal
-from unittest.mock import MagicMock, patch
+from typing import Final, Literal
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 from fastapi import HTTPException
 
 import litellm
+from litellm.caching.caching import DualCache
 from litellm.proxy._types import UserAPIKeyAuth
 from litellm.proxy.guardrails.guardrail_hooks.mcp_security import initialize_guardrail
 from litellm.proxy.guardrails.guardrail_hooks.mcp_security.mcp_security_guardrail import (
     MCPSecurityGuardrail,
 )
+from litellm.proxy.mcp_server.mcp_server_manager import MCPServerManager
 from litellm.types.guardrails import Guardrail, GuardrailEventHooks, LitellmParams
+from litellm.types.mcp import MCPTransport
+from litellm.types.mcp_server.mcp_server_manager import MCPServer
+from litellm.types.mcp_server.mcp_toolset import MCPToolset
 
 
 @pytest.fixture
@@ -60,93 +65,67 @@ class TestExtractMCPServerNames:
         assert names == set()
 
 
+def _manager_with_saved_server() -> MCPServerManager:
+    manager: Final = MCPServerManager()
+    server: Final = MCPServer(
+        server_id="3f6b2c1e-saved-zapier",
+        name="zapier",
+        server_name="zapier",
+        alias="zap",
+        transport=MCPTransport.http,
+        url="https://upstream.example/mcp",
+    )
+    manager.registry[server.server_id] = server
+    return manager
+
+
 class TestMCPSecurityGuardrailPreCall:
     @pytest.mark.asyncio
-    @patch(
-        "litellm.proxy.mcp_server.mcp_server_manager.global_mcp_server_manager"
-    )
-    async def test_blocks_unregistered_server_chat_completions(
-        self, mock_manager, guardrail
-    ):
-        """Simulates /chat/completions with an unregistered MCP server."""
-        mock_manager.get_registry.return_value = {"zapier": MagicMock()}
-
+    @pytest.mark.parametrize("call_type", ["acompletion", "aresponses"])
+    async def test_blocks_unregistered_server(self, guardrail, call_type):
         data = {
             "tools": [
                 {"type": "mcp", "server_url": "litellm_proxy/mcp/zapier"},
                 {"type": "mcp", "server_url": "litellm_proxy/mcp/evil_server"},
             ],
             "model": "gpt-4",
-            "messages": [{"role": "user", "content": "hi"}],
             "guardrails": ["test-mcp-security"],
         }
 
-        with pytest.raises(HTTPException) as exc_info:
+        with (
+            patch("litellm.proxy.proxy_server.prisma_client", None),
+            patch("litellm.proxy.mcp_server.mcp_server_manager.global_mcp_server_manager", _manager_with_saved_server()),
+            pytest.raises(HTTPException) as exc_info,
+        ):
             await guardrail.async_pre_call_hook(
                 user_api_key_dict=UserAPIKeyAuth(),
                 cache=MagicMock(),
                 data=data,
-                call_type="acompletion",
+                call_type=call_type,
             )
         assert exc_info.value.status_code == 400
-        assert "evil_server" in str(exc_info.value.detail)
+        assert exc_info.value.detail["unregistered_servers"] == ["evil_server"]
 
     @pytest.mark.asyncio
-    @patch(
-        "litellm.proxy.mcp_server.mcp_server_manager.global_mcp_server_manager"
-    )
-    async def test_blocks_unregistered_server_responses_api(
-        self, mock_manager, guardrail
-    ):
-        """Simulates /responses with an unregistered MCP server."""
-        mock_manager.get_registry.return_value = {"github": MagicMock()}
-
+    @pytest.mark.parametrize("call_type", ["acompletion", "aresponses"])
+    @pytest.mark.parametrize("reference", ["zapier", "zap", "3f6b2c1e-saved-zapier"])
+    async def test_allows_saved_server_by_any_name_the_gateway_routes(self, guardrail, call_type, reference):
         data = {
-            "tools": [
-                {"type": "mcp", "server_url": "litellm_proxy/mcp/unknown_server"},
-            ],
-            "model": "gpt-4o",
-            "input": "What can you do?",
-            "guardrails": ["test-mcp-security"],
-        }
-
-        with pytest.raises(HTTPException) as exc_info:
-            await guardrail.async_pre_call_hook(
-                user_api_key_dict=UserAPIKeyAuth(),
-                cache=MagicMock(),
-                data=data,
-                call_type="aresponses",
-            )
-        assert exc_info.value.status_code == 400
-        assert "unknown_server" in str(exc_info.value.detail)
-
-    @pytest.mark.asyncio
-    @patch(
-        "litellm.proxy.mcp_server.mcp_server_manager.global_mcp_server_manager"
-    )
-    async def test_allows_registered_servers(self, mock_manager, guardrail):
-        """All MCP servers are registered - request passes through."""
-        mock_manager.get_registry.return_value = {
-            "zapier": MagicMock(),
-            "github": MagicMock(),
-        }
-
-        data = {
-            "tools": [
-                {"type": "mcp", "server_url": "litellm_proxy/mcp/zapier"},
-                {"type": "mcp", "server_url": "litellm_proxy/mcp/github"},
-            ],
+            "tools": [{"type": "mcp", "server_url": f"litellm_proxy/mcp/{reference}"}],
             "model": "gpt-4",
-            "messages": [{"role": "user", "content": "hi"}],
             "guardrails": ["test-mcp-security"],
         }
 
-        result = await guardrail.async_pre_call_hook(
-            user_api_key_dict=UserAPIKeyAuth(),
-            cache=MagicMock(),
-            data=data,
-            call_type="acompletion",
-        )
+        with (
+            patch("litellm.proxy.proxy_server.prisma_client", None),
+            patch("litellm.proxy.mcp_server.mcp_server_manager.global_mcp_server_manager", _manager_with_saved_server()),
+        ):
+            result = await guardrail.async_pre_call_hook(
+                user_api_key_dict=UserAPIKeyAuth(),
+                cache=MagicMock(),
+                data=data,
+                call_type=call_type,
+            )
         assert result == data
 
     @pytest.mark.asyncio
@@ -222,11 +201,13 @@ async def test_guardrail_observes_saved_server_creation_and_deletion_on_another_
     prisma.writer_db = prisma.db
     prisma.db.litellm_mcpservertable.find_many = AsyncMock(side_effect=([row], []))
     prisma.db.litellm_config.find_unique = AsyncMock(return_value=None)
+    prisma.db.litellm_mcptoolsettable.find_first = AsyncMock(return_value=None)
     data = {"tools": [{"type": "mcp", "server_url": "litellm_proxy/mcp/peer-server"}],
         "guardrails": ["test-mcp-security"]}
     with (
         patch("litellm.proxy.proxy_server.prisma_client", prisma),
         patch("litellm.proxy.proxy_server.general_settings", {}),
+        patch("litellm.proxy.proxy_server.user_api_key_cache", DualCache()),
         patch("litellm.proxy.mcp_server.mcp_server_manager.global_mcp_server_manager", manager),
     ):
         result = await guardrail.async_pre_call_hook(UserAPIKeyAuth(), MagicMock(), data, call_type)
@@ -235,3 +216,34 @@ async def test_guardrail_observes_saved_server_creation_and_deletion_on_another_
             await guardrail.async_pre_call_hook(UserAPIKeyAuth(), MagicMock(), data, call_type)
     assert exc.value.status_code == 400
     assert exc.value.detail["unregistered_servers"] == ["peer-server"]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("call_type", ["acompletion", "aresponses"])
+async def test_allows_saved_toolset_by_name_and_blocks_unknown_name(guardrail, call_type):
+    saved_toolset: Final = MCPToolset(toolset_id="7c1d-research", toolset_name="research")
+
+    async def find_toolset(*, where: dict[str, str]) -> MCPToolset | None:
+        return saved_toolset if where["toolset_name"] == saved_toolset.toolset_name else None
+
+    prisma: Final = MagicMock()
+    prisma.writer_db = prisma.db
+    prisma.db.litellm_mcpservertable.find_many = AsyncMock(return_value=[])
+    prisma.db.litellm_config.find_unique = AsyncMock(return_value=None)
+    prisma.db.litellm_mcptoolsettable.find_first = AsyncMock(side_effect=find_toolset)
+    data: Final = {
+        "tools": [
+            {"type": "mcp", "server_url": "litellm_proxy/mcp/research"},
+            {"type": "mcp", "server_url": "litellm_proxy/mcp/evil_server"},
+        ],
+        "guardrails": ["test-mcp-security"],
+    }
+    with (
+        patch("litellm.proxy.proxy_server.prisma_client", prisma),
+        patch("litellm.proxy.proxy_server.general_settings", {}),
+        patch("litellm.proxy.proxy_server.user_api_key_cache", DualCache()),
+        patch("litellm.proxy.mcp_server.mcp_server_manager.global_mcp_server_manager", MCPServerManager()),
+        pytest.raises(HTTPException) as exc,
+    ):
+        await guardrail.async_pre_call_hook(UserAPIKeyAuth(), MagicMock(), data, call_type)
+    assert exc.value.detail["unregistered_servers"] == ["evil_server"]
diff --git a/tests/unit/proxy/image_endpoints/test_endpoints.py b/tests/unit/proxy/image_endpoints/test_endpoints.py
index ea37b7b0213..f153a0f6990 100644
--- a/tests/unit/proxy/image_endpoints/test_endpoints.py
+++ b/tests/unit/proxy/image_endpoints/test_endpoints.py
@@ -715,3 +715,29 @@ def test_image_generation_uses_key_num_retries(monkeypatch: pytest.MonkeyPatch)
     router: Final = proxy_server.llm_router
     assert router is not None
     assert get_deployment_failures_for_current_minute(router, "image-regression-failing") == 3
+
+
+def test_failed_image_generation_spend_row_records_aimage_generation(monkeypatch: pytest.MonkeyPatch) -> None:
+    from unittest.mock import AsyncMock, MagicMock
+
+    from litellm.proxy.hooks.proxy_track_cost_callback import ProxyDBLogger
+    from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+
+    spend_writer: Final = MagicMock(update_database=AsyncMock())
+    monkeypatch.setattr(litellm, "callbacks", [ProxyDBLogger(spend_writer=lambda: spend_writer)])
+    client, handler = _image_generation_client(monkeypatch, UserAPIKeyAuth(api_key="sk-test"))
+    try:
+        with client:
+            response: Final = client.post("/v1/images/generations", json={"model": "A", "prompt": "draw a tree"})
+    finally:
+        ProxyLogging._callback_capabilities_cache.clear()
+
+    assert (response.status_code, handler.calls) == (429, ["failing"]), response.text
+    db_call: Final = spend_writer.update_database.call_args.kwargs
+    payload: Final = get_logging_payload(
+        kwargs=db_call["kwargs"],
+        response_obj=db_call["completion_response"],
+        start_time=db_call["start_time"],
+        end_time=db_call["end_time"],
+    )
+    assert (payload["status"], payload["call_type"]) == ("failure", "aimage_generation")
diff --git a/tests/unit/proxy/management_endpoints/test_key_management_endpoints.py b/tests/unit/proxy/management_endpoints/test_key_management_endpoints.py
index 0198f582be7..b453f985512 100644
--- a/tests/unit/proxy/management_endpoints/test_key_management_endpoints.py
+++ b/tests/unit/proxy/management_endpoints/test_key_management_endpoints.py
@@ -6,7 +6,7 @@ from contextlib import ExitStack
 from datetime import datetime, timedelta, timezone
 from types import SimpleNamespace
 from typing import Final
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, call, patch
 from uuid import UUID, uuid4
 
 import pytest
@@ -51,7 +51,11 @@ from litellm.proxy.auth.auth_checks import (
 )
 from litellm.proxy.auth.user_api_key_auth import UserAPIKeyAuth
 from litellm.proxy.common_utils.auth_cache_invalidation_pubsub import AuthCacheInvalidationSubscriber
-from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache, project_cache_key
+from litellm.proxy.common_utils.user_api_key_cache import (
+    UserApiKeyCache,
+    budget_windows_absent_cache_key,
+    project_cache_key,
+)
 from litellm.proxy.db.db_lookup_gate import db_lookup_stall_tracker
 from litellm.proxy.management_endpoints.key_management_endpoints import (
     KeyProjectBindingError,
@@ -8911,7 +8915,10 @@ async def test_delete_cache_key_object_broadcasts_invalidation(monkeypatch):
 
     # Real, observable state: the cache object itself no longer holds the entry.
     assert real_user_api_key_cache.get_cache(key="hashed-broadcast-key") is None
-    mock_publish.assert_awaited_once_with(cache_key="hashed-broadcast-key")
+    assert mock_publish.await_args_list == [
+        call(cache_key="hashed-broadcast-key"),
+        call(cache_key=budget_windows_absent_cache_key("key", "hashed-broadcast-key")),
+    ]
 
 
 @pytest.mark.asyncio
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 ab6cfcfebfe..44c43713438 100644
--- a/tests/unit/proxy/management_endpoints/test_model_management_endpoints.py
+++ b/tests/unit/proxy/management_endpoints/test_model_management_endpoints.py
@@ -4896,6 +4896,9 @@ class TestModelInfoCostMapEchoFilter:
         [
             ("bedrock/us.anthropic.claude-sonnet-5-5", "token_count_model", {}),
             ("bedrock/us.moonshotai.kimi-k3", "token_count_framing", 0),
+            ("azure_ai/grok-4-1-fast-reasoning", "token_count_tool_framing", 0),
+            ("azure_ai/grok-4-1-fast-reasoning", "token_count_responses_framing", 0),
+            ("azure_ai/grok-4-1-fast-reasoning", "token_count_responses_tool_framing", 0),
         ],
     )
     def test_token_count_setting_is_stored_only_when_the_operator_changed_it(
diff --git a/tests/unit/proxy/management_endpoints/test_team_endpoints.py b/tests/unit/proxy/management_endpoints/test_team_endpoints.py
index e33743bb149..2f4dad0ccd7 100644
--- a/tests/unit/proxy/management_endpoints/test_team_endpoints.py
+++ b/tests/unit/proxy/management_endpoints/test_team_endpoints.py
@@ -2684,7 +2684,7 @@ async def test_team_block_unblock_reach_warmed_auth_on_every_worker(
     from litellm.proxy._types import BlockTeamRequest
     from litellm.proxy.auth.auth_checks import get_team_object
     from litellm.proxy.auth.team_grants import team_model_aliases
-    from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
+    from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache, budget_windows_absent_cache_key
     from litellm.proxy.management_endpoints import team_endpoints
 
     team_id: Final = "team-kill-switch"
@@ -2721,7 +2721,11 @@ async def test_team_block_unblock_reach_warmed_auth_on_every_worker(
     seen_by_auth: Final = await get_team_object(team_id=team_id, prisma_client=prisma_client, user_api_key_cache=cache)
     assert seen_by_auth.blocked is blocked
     assert team_model_aliases(seen_by_auth) == {"fast": "gpt-4o"}
-    assert redis.broadcast_keys == [f"team_id:{team_id}", "team_alias:kill-switch"]
+    assert redis.broadcast_keys == [
+        f"team_id:{team_id}",
+        "team_alias:kill-switch",
+        budget_windows_absent_cache_key("team", team_id),
+    ]
     assert (response.blocked, response.litellm_model_table, response.object_permission) == (blocked, None, None)
 
 
diff --git a/tests/unit/proxy/mcp_server/test_mcp_server.py b/tests/unit/proxy/mcp_server/test_mcp_server.py
index 884c82760ea..456b1994e2d 100644
--- a/tests/unit/proxy/mcp_server/test_mcp_server.py
+++ b/tests/unit/proxy/mcp_server/test_mcp_server.py
@@ -3319,3 +3319,35 @@ async def test_mcp_routing_truncated_json_body_is_not_stashed_for_auth():
 
     assert await scope[MCP_PEEKED_BODY_SCOPE_KEY]() == b"{}"
     assert await _read_request_body(_admission_request(scope)) == {}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("path", ["/mcp", "/atlassian/mcp"])
+async def test_bare_options_skips_litellm_auth(path: str):
+    """A bare OPTIONS probe must not run LiteLLM auth, so it never triggers the 401 OAuth challenge."""
+    from litellm.proxy.mcp_server import server as mcp_server
+
+    scope: Scope = {
+        "type": "http",
+        "method": "OPTIONS",
+        "path": path,
+        "headers": [],
+        "query_string": b"",
+        "server": ("localhost", 8000),
+        "scheme": "http",
+    }
+    receive = AsyncMock(return_value={"type": "http.request", "body": b"", "more_body": False})
+    sent: list[dict] = []
+
+    async def send(message: dict) -> None:
+        sent.append(message)
+
+    auth = AsyncMock(side_effect=AssertionError("LiteLLM auth ran on OPTIONS"))
+    with patch.object(mcp_server, "extract_mcp_auth_context", auth):
+        await mcp_server.handle_streamable_http_mcp(scope, receive, send)
+
+    auth.assert_not_awaited()
+    start = next(m for m in sent if m["type"] == "http.response.start")
+    assert start["status"] == 204
+    headers = {k.decode().lower(): v.decode() for k, v in start["headers"]}
+    assert headers["allow"] == "GET, POST, DELETE, OPTIONS"
diff --git a/tests/unit/proxy/middleware/test_admission_control_middleware.py b/tests/unit/proxy/middleware/test_admission_control_middleware.py
index e449ebc83bf..66549b0c351 100644
--- a/tests/unit/proxy/middleware/test_admission_control_middleware.py
+++ b/tests/unit/proxy/middleware/test_admission_control_middleware.py
@@ -510,3 +510,32 @@ async def test_admission_lease_cannot_be_reused_by_another_worker(state: Admissi
     response: Final = await _call(parent)
     assert response[1]["body"] == b"1"
     assert state.get_stats() == other_state.get_stats() == AdmissionControlStats(0, 0, 0)
+
+
+@pytest.mark.asyncio
+async def test_a_messages_request_turned_away_at_capacity_gets_the_anthropic_overloaded_error(
+    state: AdmissionControlState,
+) -> None:
+    started: Final = asyncio.Event()
+    release: Final = asyncio.Event()
+    middleware: Final = AdmissionControlMiddleware(
+        _handler_with_release(started, release),
+        lambda: AdmissionControlSettings(1, 0, 1.0),
+        state,
+    )
+
+    first: Final = asyncio.create_task(_call(middleware, path="/v1/messages"))
+    await started.wait()
+    rejected: Final = await _call(middleware, path="/v1/messages")
+    release.set()
+    await first
+
+    assert rejected[0]["status"] == 503
+    assert dict(rejected[0]["headers"])[b"retry-after"] == b"1"
+    assert json.loads(rejected[1]["body"]) == {
+        "type": "error",
+        "error": {
+            "type": "overloaded_error",
+            "message": "Worker at capacity: 1 in-flight, 0 queued requests. Retry later.",
+        },
+    }
diff --git a/tests/unit/proxy/middleware/test_request_body_decompression_middleware.py b/tests/unit/proxy/middleware/test_request_body_decompression_middleware.py
index ca5774b6be0..2727857c352 100644
--- a/tests/unit/proxy/middleware/test_request_body_decompression_middleware.py
+++ b/tests/unit/proxy/middleware/test_request_body_decompression_middleware.py
@@ -665,3 +665,33 @@ async def test_non_http_scopes_reach_the_app_untouched(scope: Scope):
     [(app_scope, app_receive)] = seen
     assert app_scope is scope
     assert app_receive is receive
+
+
+@pytest.mark.parametrize(
+    ("body", "max_mb", "status_code", "anthropic_type", "message"),
+    [
+        pytest.param(
+            zstd.compress(_low_entropy_text(2 * int(CAP_MB * MIB))),
+            CAP_MB,
+            413,
+            "request_too_large",
+            f"Request body is larger than {CAP_MB:g} MB when decoded",
+            id="decoded-past-the-cap",
+        ),
+        pytest.param(b"not zstd at all", 50.0, 400, "invalid_request_error", None, id="undecodable"),
+    ],
+)
+def test_a_messages_body_the_proxy_cannot_take_gets_the_anthropic_envelope(
+    body: bytes, max_mb: float, status_code: int, anthropic_type: str, message: str | None
+) -> None:
+    response: Final = _post(
+        _client(max_decompressed_body_size_mb=max_mb),
+        ZSTD_FRAME_MAGIC + body if message is None else body,
+        ("zstd",),
+        path="/claude_code_gateway/v1/messages",
+    )
+
+    assert response.status_code == status_code
+    assert response.json()["type"] == "error"
+    assert response.json()["error"]["type"] == anthropic_type
+    assert message is None or response.json()["error"]["message"] == message
diff --git a/tests/unit/proxy/middleware/test_request_size_limit_middleware.py b/tests/unit/proxy/middleware/test_request_size_limit_middleware.py
index 3e8792e0179..0a30b4cf9ef 100644
--- a/tests/unit/proxy/middleware/test_request_size_limit_middleware.py
+++ b/tests/unit/proxy/middleware/test_request_size_limit_middleware.py
@@ -1,7 +1,9 @@
+from typing import Final
+
 import pytest
 from starlette.responses import JSONResponse
 from starlette.testclient import TestClient
-from starlette.types import Message
+from starlette.types import Message, Receive, Scope, Send
 
 from litellm.proxy.middleware.request_size_limit_middleware import (
     RequestSizeLimitMiddleware,
@@ -133,3 +135,22 @@ async def test_request_size_limit_middleware_rejects_streamed_body_without_conte
         "more_body": False,
     }
     assert received_body_bytes == 1024 * 1024
+
+
+def test_an_oversized_messages_request_gets_the_anthropic_request_too_large_error() -> None:
+    async def app(scope: Scope, receive: Receive, send: Send) -> None:
+        await JSONResponse({"ok": True})(scope, receive, send)
+
+    client: Final = TestClient(
+        RequestSizeLimitMiddleware(app, get_max_request_size_mb=lambda: 1, is_request_size_limit_enabled=lambda: True)
+    )
+
+    response: Final = client.post(
+        "/v1/messages", content=b"x" * (1024 * 1024 + 1), headers={"content-type": "application/json"}
+    )
+
+    assert response.status_code == 413
+    assert response.json() == {
+        "type": "error",
+        "error": {"type": "request_too_large", "message": "Request size is too large. Max size is 1 MB"},
+    }
diff --git a/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_openai_websocket_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_openai_websocket_passthrough_logging_handler.py
new file mode 100644
index 00000000000..e7b4d087ed3
--- /dev/null
+++ b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_openai_websocket_passthrough_logging_handler.py
@@ -0,0 +1,520 @@
+import uuid
+from collections.abc import Mapping, Sequence
+from datetime import datetime
+from types import MappingProxyType
+from typing import Final
+from unittest.mock import MagicMock
+
+import httpx
+import pytest
+
+import litellm
+from litellm.proxy.pass_through_endpoints.llm_provider_handlers.openai_passthrough_logging_handler import (
+    OpenAIPassthroughLoggingHandler,
+)
+from litellm.proxy.pass_through_endpoints.llm_provider_handlers.openai_websocket_passthrough_logging_handler import (
+    OpenAIWebsocketPassthroughLoggingHandler,
+    openai_websocket_frame_kind,
+)
+from litellm.proxy.spend_tracking.spend_tracking_utils import get_spend_logs_id
+from litellm.types.utils import CallTypes
+
+REALTIME_MODEL: Final = "gpt-realtime-2.1"
+RESPONSES_MODEL: Final = "gpt-5.4-mini"
+REASONING_MODEL: Final = "gpt-5.4"
+TRANSCRIPTION_MODEL: Final = "gpt-4o-mini-transcribe"
+SESSION_START: Final = datetime(2026, 1, 1, 12, 0, 0)
+
+
+def _logging_obj() -> MagicMock:
+    logging_obj: Final = MagicMock(model_call_details={}, litellm_call_id=str(uuid.uuid4()))
+    return logging_obj
+
+
+def _session_created(model: str) -> dict[str, object]:
+    return {"type": "session.created", "session": {"id": "sess_fake", "model": model}}
+
+
+def _realtime_response_done(text_in: int, audio_in: int, text_out: int, audio_out: int) -> dict[str, object]:
+    return {
+        "type": "response.done",
+        "response": {
+            "id": "resp_fake",
+            "status": "completed",
+            "usage": {
+                "input_tokens": text_in + audio_in,
+                "output_tokens": text_out + audio_out,
+                "total_tokens": text_in + audio_in + text_out + audio_out,
+                "input_token_details": {"text_tokens": text_in, "audio_tokens": audio_in, "cached_tokens": 0},
+                "output_token_details": {"text_tokens": text_out, "audio_tokens": audio_out},
+            },
+        },
+    }
+
+
+def _responses_completed(
+    model: str,
+    input_tokens: int,
+    output_tokens: int,
+    event: str = "response.completed",
+    served: Mapping[str, object] = MappingProxyType({}),
+) -> dict[str, object]:
+    return {
+        "type": event,
+        "response": {
+            "id": "resp_fake",
+            "object": "response",
+            "created_at": 1761700000,
+            "model": model,
+            "status": "completed",
+            "output": [],
+            **served,
+            "usage": {
+                "input_tokens": input_tokens,
+                "output_tokens": output_tokens,
+                "total_tokens": input_tokens + output_tokens,
+                "input_tokens_details": {"cached_tokens": 0},
+                "output_tokens_details": {"reasoning_tokens": 0},
+            },
+        },
+    }
+
+
+def _handle(
+    messages: Sequence[Mapping[str, object]],
+    kwargs: Mapping[str, object] = MappingProxyType({}),
+    logging_obj: MagicMock | None = None,
+    url_route: str = "/openai/v1/realtime",
+):
+    return OpenAIWebsocketPassthroughLoggingHandler().openai_websocket_passthrough_handler(
+        websocket_messages=messages,
+        logging_obj=logging_obj if logging_obj is not None else _logging_obj(),
+        url_route=url_route,
+        start_time=SESSION_START,
+        kwargs=kwargs,
+    )
+
+
+def _realtime_cost(model: str, text_in: int, audio_in: int, text_out: int, audio_out: int) -> float:
+    prices: Final = litellm.model_cost[model]
+    return (
+        text_in * prices["input_cost_per_token"]
+        + audio_in * prices["input_cost_per_audio_token"]
+        + text_out * prices["output_cost_per_token"]
+        + audio_out * prices["output_cost_per_audio_token"]
+    )
+
+
+def test_realtime_session_is_priced_on_the_model_the_session_reported():
+    logging_obj: Final = _logging_obj()
+    messages: Final = [
+        _session_created(REALTIME_MODEL),
+        {"type": "response.created", "response": {"id": "resp_fake"}},
+        _realtime_response_done(text_in=33, audio_in=120, text_out=16, audio_out=240),
+    ]
+
+    handled: Final = _handle(messages, logging_obj=logging_obj)
+
+    expected_cost: Final = _realtime_cost(REALTIME_MODEL, 33, 120, 16, 240)
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+    assert handled["kwargs"]["model"] == REALTIME_MODEL
+    assert handled["kwargs"]["custom_llm_provider"] == "openai"
+    assert handled["result"].model == REALTIME_MODEL
+    assert handled["result"].usage.total_tokens == 409
+    assert logging_obj.model_call_details["response_cost"] == pytest.approx(expected_cost)
+    assert logging_obj.model_call_details["model"] == REALTIME_MODEL
+
+
+def test_realtime_cost_covers_every_turn_of_the_session():
+    one_turn: Final = _handle([_session_created(REALTIME_MODEL), _realtime_response_done(10, 0, 5, 0)])
+    two_turns: Final = _handle(
+        [
+            _session_created(REALTIME_MODEL),
+            _realtime_response_done(10, 0, 5, 0),
+            _realtime_response_done(10, 0, 5, 0),
+        ]
+    )
+
+    assert two_turns["kwargs"]["response_cost"] == pytest.approx(2 * one_turn["kwargs"]["response_cost"])
+    assert two_turns["result"].usage.total_tokens == 30
+
+
+def test_responses_turn_is_priced_on_the_model_the_response_reported():
+    handled: Final = _handle(
+        [_responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5)],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    prices: Final = litellm.model_cost[RESPONSES_MODEL]
+    expected_cost: Final = 13 * prices["input_cost_per_token"] + 5 * prices["output_cost_per_token"]
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+    assert handled["kwargs"]["model"] == RESPONSES_MODEL
+    assert handled["result"].usage.prompt_tokens == 13
+    assert handled["result"].usage.completion_tokens == 5
+
+
+def test_responses_cost_covers_every_turn_of_the_connection():
+    handled: Final = _handle(
+        [
+            _responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5),
+            _responses_completed(RESPONSES_MODEL, input_tokens=20, output_tokens=7),
+        ],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    prices: Final = litellm.model_cost[RESPONSES_MODEL]
+    expected_cost: Final = 33 * prices["input_cost_per_token"] + 12 * prices["output_cost_per_token"]
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+    assert handled["result"].usage.total_tokens == 45
+
+
+def test_a_model_the_caller_asked_for_never_prices_a_session_the_provider_never_named():
+    """
+    The caller picks what to ask for, and the provider picks what to run. Only
+    the provider's own frames may set the price of a session, so a model the
+    caller put in the request cannot stand in for one the provider never named.
+    """
+    logging_obj: Final = _logging_obj()
+
+    handled: Final = _handle(
+        [_realtime_response_done(text_in=10, audio_in=0, text_out=5, audio_out=0)],
+        kwargs=MappingProxyType({"model": REALTIME_MODEL}),
+        logging_obj=logging_obj,
+    )
+
+    assert handled["result"] is None
+    assert handled["kwargs"] == {"model": REALTIME_MODEL}
+    assert logging_obj.model_call_details == {}
+
+
+def test_each_responses_turn_is_priced_on_the_model_that_turn_ran():
+    """
+    One socket can run several models one after another, so a connection that
+    starts on a big model and finishes on a small one has to pay the big
+    model's price for the turn that used it.
+    """
+    handled: Final = _handle(
+        [
+            _responses_completed(REASONING_MODEL, input_tokens=13, output_tokens=5),
+            _responses_completed(RESPONSES_MODEL, input_tokens=20, output_tokens=7),
+        ],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    first: Final = litellm.model_cost[REASONING_MODEL]
+    second: Final = litellm.model_cost[RESPONSES_MODEL]
+    expected_cost: Final = (
+        13 * first["input_cost_per_token"]
+        + 5 * first["output_cost_per_token"]
+        + 20 * second["input_cost_per_token"]
+        + 7 * second["output_cost_per_token"]
+    )
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+    assert handled["result"].usage.total_tokens == 45
+
+
+def test_a_responses_turn_that_names_no_model_is_priced_on_the_session_model():
+    handled: Final = _handle(
+        [
+            _session_created(RESPONSES_MODEL),
+            _responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5, served={"model": None}),
+        ],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    prices: Final = litellm.model_cost[RESPONSES_MODEL]
+    expected_cost: Final = 13 * prices["input_cost_per_token"] + 5 * prices["output_cost_per_token"]
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+
+
+def test_a_session_nobody_named_a_model_for_is_left_unpriced():
+    logging_obj: Final = _logging_obj()
+    handled: Final = _handle(
+        [{"type": "response.done", "response": {"usage": {"input_tokens": 10, "output_tokens": 5}}}],
+        kwargs=MappingProxyType({"litellm_call_id": "call-fake"}),
+        logging_obj=logging_obj,
+    )
+
+    assert handled["result"] is None
+    assert handled["kwargs"] == {"litellm_call_id": "call-fake"}
+    assert logging_obj.model_call_details == {}
+
+
+def test_a_session_that_reported_no_usage_still_records_its_model():
+    logging_obj: Final = _logging_obj()
+
+    handled: Final = _handle([_session_created(REALTIME_MODEL)], logging_obj=logging_obj)
+
+    assert handled["result"] is None
+    assert handled["kwargs"] == {"model": REALTIME_MODEL, "custom_llm_provider": "openai"}
+    assert logging_obj.model_call_details["model"] == REALTIME_MODEL
+    assert logging_obj.model_call_details["custom_llm_provider"] == "openai"
+
+
+def test_a_responses_turn_without_readable_usage_is_not_billed():
+    handled: Final = _handle(
+        [{"type": "response.completed", "response": {"model": RESPONSES_MODEL, "status": "completed"}}],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    assert handled["result"] is None
+    assert handled["kwargs"] == {"model": RESPONSES_MODEL, "custom_llm_provider": "openai"}
+
+
+def test_the_price_of_a_multi_model_connection_reaches_the_spend_row():
+    """
+    The logging layer prices whatever result it is handed, and one result can
+    only name one model, so a connection that ran two models has to carry the
+    price it already worked out or the cheaper model pays for both turns. The
+    row it lands in names the model the connection opened on.
+    """
+    handled: Final = _handle(
+        [
+            _responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5),
+            _responses_completed(REASONING_MODEL, input_tokens=20, output_tokens=7),
+        ],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    logged_cost: Final = litellm.response_cost_calculator(
+        response_object=handled["result"],
+        model=handled["kwargs"]["model"],
+        custom_llm_provider="openai",
+        call_type="completion",
+        optional_params={},
+    )
+
+    session_prices: Final = litellm.model_cost[RESPONSES_MODEL]
+    priced_on_the_session_model: Final = (
+        33 * session_prices["input_cost_per_token"] + 12 * session_prices["output_cost_per_token"]
+    )
+    assert logged_cost == pytest.approx(handled["kwargs"]["response_cost"])
+    assert logged_cost > priced_on_the_session_model
+    assert handled["kwargs"]["model"] == RESPONSES_MODEL
+
+
+def test_turns_that_start_in_the_same_instant_each_keep_their_own_spend_row():
+    """
+    Spend logs key each row by the id its result carries and skip a repeated id
+    without a word, so two turns that start in the same instant, on one socket
+    or on two, each need an id of their own or one of them is never billed.
+    """
+    turns: Final = [
+        _handle(
+            [_responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5)],
+            url_route="/openai_passthrough/v1/responses",
+        )
+        for _ in range(2)
+    ]
+
+    spend_log_ids: Final = {
+        get_spend_logs_id(CallTypes.pass_through.value, turn["result"].model_dump(), turn["kwargs"]) for turn in turns
+    }
+    assert len(spend_log_ids) == 2
+    assert None not in spend_log_ids
+
+
+def test_a_turn_the_caller_walked_out_of_still_names_the_model_it_ran():
+    """
+    A client that closes before response.completed leaves no usage behind to
+    bill, but response.created already named the model, so the row says which
+    model answered instead of falling back to unknown.
+    """
+    logging_obj: Final = _logging_obj()
+
+    handled: Final = _handle(
+        [{"type": "response.created", "response": {"id": "resp_fake", "model": REASONING_MODEL}}],
+        logging_obj=logging_obj,
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    assert handled["result"] is None
+    assert handled["kwargs"] == {"model": REASONING_MODEL, "custom_llm_provider": "openai"}
+    assert logging_obj.model_call_details["model"] == REASONING_MODEL
+
+
+def _transcription_session(model: str) -> tuple[dict[str, object], ...]:
+    return (
+        {"type": "session.created", "session": {"type": "transcription", "audio": {"input": {"transcription": None}}}},
+        {
+            "type": "session.updated",
+            "session": {"type": "transcription", "audio": {"input": {"transcription": {"model": model}}}},
+        },
+    )
+
+
+def _transcription_completed(usage: Mapping[str, object]) -> dict[str, object]:
+    return {
+        "type": "conversation.item.input_audio_transcription.completed",
+        "item_id": "item_fake",
+        "transcript": "hello",
+        "usage": usage,
+    }
+
+
+@pytest.mark.parametrize(
+    ("usage", "billed_units"),
+    [
+        ({"type": "duration", "seconds": 3}, ((3, "input_cost_per_second"),)),
+        (
+            {
+                "type": "tokens",
+                "input_tokens": 30,
+                "output_tokens": 11,
+                "input_token_details": {"text_tokens": 0, "audio_tokens": 30},
+            },
+            ((30, "input_cost_per_audio_token"), (11, "output_cost_per_token")),
+        ),
+    ],
+)
+def test_a_transcription_session_is_billed_for_every_clip_it_transcribed(usage, billed_units):
+    handled: Final = _handle(
+        [
+            *_transcription_session(TRANSCRIPTION_MODEL),
+            _transcription_completed(usage),
+            _transcription_completed(usage),
+        ],
+        url_route="/openai_passthrough/v1/realtime",
+    )
+
+    logged_cost: Final = litellm.response_cost_calculator(
+        response_object=handled["result"],
+        model=handled["kwargs"]["model"],
+        custom_llm_provider="openai",
+        call_type="completion",
+        optional_params={},
+    )
+
+    prices: Final = litellm.model_cost[TRANSCRIPTION_MODEL]
+    expected_cost: Final = 2 * sum(units * prices[rate] for units, rate in billed_units)
+    assert expected_cost > 0
+    assert handled["kwargs"]["model"] == TRANSCRIPTION_MODEL
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+    assert logged_cost == pytest.approx(expected_cost)
+
+
+def test_a_conversation_that_also_transcribes_the_caller_is_logged_on_its_own_model():
+    handled: Final = _handle(
+        [
+            {
+                "type": "session.created",
+                "session": {
+                    "model": REALTIME_MODEL,
+                    "audio": {"input": {"transcription": {"model": TRANSCRIPTION_MODEL}}},
+                },
+            },
+            _realtime_response_done(text_in=10, audio_in=0, text_out=5, audio_out=0),
+        ]
+    )
+
+    assert handled["kwargs"]["model"] == REALTIME_MODEL
+
+
+@pytest.mark.parametrize("event", ["response.incomplete", "response.failed"])
+def test_a_responses_turn_that_ended_early_is_billed_for_the_tokens_it_used(event):
+    """
+    A turn cut short by max_output_tokens or a provider failure still reports
+    the tokens it burned, and OpenAI bills them, so the row has to as well.
+    """
+    handled: Final = _handle(
+        [_responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5, event=event)],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    prices: Final = litellm.model_cost[RESPONSES_MODEL]
+    expected_cost: Final = 13 * prices["input_cost_per_token"] + 5 * prices["output_cost_per_token"]
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+    assert handled["result"].usage.total_tokens == 18
+
+
+def test_a_failed_responses_turn_that_reported_no_usage_is_not_billed():
+    handled: Final = _handle(
+        [{"type": "response.failed", "response": {"model": RESPONSES_MODEL, "status": "failed", "usage": None}}],
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    assert handled["result"] is None
+    assert handled["kwargs"] == {"model": RESPONSES_MODEL, "custom_llm_provider": "openai"}
+
+
+@pytest.mark.parametrize(
+    ("turn_model", "requested_model", "priced_as"),
+    [
+        ("gpt-unreleased-qa-snapshot", RESPONSES_MODEL, RESPONSES_MODEL),
+        ("gpt-5.4-mini-qa-preview", RESPONSES_MODEL, RESPONSES_MODEL),
+        (RESPONSES_MODEL, REASONING_MODEL, RESPONSES_MODEL),
+    ],
+    ids=["unmapped_model", "model_the_cost_map_prices_at_zero", "priced_turn_model"],
+)
+def test_a_responses_turn_falls_back_to_the_requested_model_only_when_its_own_has_no_price(
+    turn_model: str, requested_model: str, priced_as: str
+):
+    """
+    The provider can answer under a model name the cost map does not price
+    yet. That turn still ran the model the key was allowed to ask for, so it is
+    billed at that model's price instead of $0, while a turn whose own model
+    has a price keeps it.
+    """
+    handled: Final = _handle(
+        [_responses_completed(turn_model, input_tokens=13, output_tokens=5)],
+        kwargs=MappingProxyType({"litellm_params": {"metadata": {"model_group": requested_model}}}),
+        url_route="/openai_passthrough/v1/responses",
+    )
+
+    prices: Final = litellm.model_cost[priced_as]
+    expected_cost: Final = 13 * prices["input_cost_per_token"] + 5 * prices["output_cost_per_token"]
+    assert expected_cost > 0
+    assert handled["kwargs"]["response_cost"] == pytest.approx(expected_cost)
+    assert handled["kwargs"]["model"] == turn_model
+
+
+def _http_passthrough_cost(response: Mapping[str, object]) -> float:
+    http_response: Final = httpx.Response(
+        200, json=response, request=httpx.Request("POST", "https://api.openai.com/v1/responses")
+    )
+    _, cost = OpenAIPassthroughLoggingHandler._build_responses_api_response_and_cost(
+        RESPONSES_MODEL, http_response, _logging_obj(), "openai"
+    )
+    return cost
+
+
+@pytest.mark.parametrize(
+    "served",
+    [
+        {"service_tier": "priority"},
+        {"output": [{"type": "web_search_call", "id": "ws_fake", "status": "completed", "action": {"type": "search"}}]},
+    ],
+    ids=["priority_tier", "hosted_web_search"],
+)
+def test_a_responses_turn_costs_what_the_http_passthrough_charges_for_the_same_response(served):
+    """
+    The provider bills a turn by the tier that served it and the hosted tools it
+    called, not only its tokens, so a websocket turn has to cost exactly what the
+    same response costs over HTTP, never the cheaper token-only price.
+    """
+    turn: Final = _responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5, served=served)
+    plain_turn: Final = _responses_completed(RESPONSES_MODEL, input_tokens=13, output_tokens=5)
+
+    handled: Final = _handle([turn], url_route="/openai_passthrough/v1/responses")
+
+    assert handled["kwargs"]["response_cost"] == pytest.approx(_http_passthrough_cost(turn["response"]))
+    assert handled["kwargs"]["response_cost"] > _http_passthrough_cost(plain_turn["response"])
+
+
+@pytest.mark.parametrize(
+    ("frame_type", "kind"),
+    [
+        ("response.completed", "ends_turn"),
+        ("response.incomplete", "ends_turn"),
+        ("response.failed", "ends_turn"),
+        ("response.done", "ends_turn"),
+        ("session.created", "opens_session"),
+        ("session.updated", "updates_session"),
+        ("conversation.item.input_audio_transcription.completed", "bills_usage"),
+        ("response.created", "starts_turn"),
+        ("response.output_text.delta", "relayed"),
+        ("error", "refuses_turn"),
+    ],
+)
+def test_each_frame_is_classified_by_what_it_does_to_a_turn(frame_type, kind):
+    assert openai_websocket_frame_kind({"type": frame_type}) == kind
diff --git a/tests/unit/proxy/pass_through_endpoints/test_pass_through_endpoints.py b/tests/unit/proxy/pass_through_endpoints/test_pass_through_endpoints.py
index 4fe358c38a3..824f04aee75 100644
--- a/tests/unit/proxy/pass_through_endpoints/test_pass_through_endpoints.py
+++ b/tests/unit/proxy/pass_through_endpoints/test_pass_through_endpoints.py
@@ -1,5 +1,6 @@
 import asyncio
 import base64
+import contextvars
 import gzip
 import json
 import logging
@@ -7,20 +8,20 @@ import os
 import sys
 import uuid
 import zlib
-from collections.abc import AsyncIterator, Callable, Mapping
+from collections.abc import AsyncIterator, Callable, Mapping, Sequence
 from contextlib import ExitStack, contextmanager
 from dataclasses import dataclass
 from datetime import datetime
 from io import BytesIO
 from types import MappingProxyType, ModuleType, SimpleNamespace
 from typing import Final, Optional, cast
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, call, patch
 from uuid import UUID
 
 import httpx
 import pytest
 import respx
-from fastapi import APIRouter, FastAPI, HTTPException, Request, Response, UploadFile
+from fastapi import APIRouter, FastAPI, HTTPException, Request, Response, UploadFile, WebSocketDisconnect
 from fastapi.responses import StreamingResponse
 from fastapi.routing import APIRoute
 from fastapi.testclient import TestClient
@@ -35,9 +36,13 @@ from litellm.constants import ANTHROPIC_COMPATIBLE_MAX_USER_ID_LENGTH, ANTHROPIC
 from litellm.integrations.custom_guardrail import CustomGuardrail
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.integrations.prometheus import PrometheusLogger
+from litellm.litellm_core_utils.internal_call_metadata import MODEL_ACCESS_GROUP_METADATA_KEY
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
 from litellm.proxy._lazy_features import LazyFeature, attach_lazy_features
 from litellm.proxy._types import ProxyException, UserAPIKeyAuth
+from litellm.proxy.common_utils.proxy_rate_limit_error import ProxyRateLimitError
+from litellm.proxy.hooks.parallel_request_limiter import PROXY_MaxParallelRequestsHandler
+from litellm.proxy.hooks.parallel_request_limiter_v3 import PROXY_MaxParallelRequestsHandler_v3
 from litellm.proxy.litellm_pre_call_utils import LiteLLMProxyRequestSetup
 from litellm.proxy.pass_through_endpoints.llm_passthrough_endpoints import router as llm_passthrough_router
 from litellm.proxy.pass_through_endpoints.llm_provider_handlers.vertex_passthrough_logging_handler import (
@@ -46,9 +51,15 @@ from litellm.proxy.pass_through_endpoints.llm_provider_handlers.vertex_passthrou
 from litellm.proxy.pass_through_endpoints.pass_through_endpoints import (
     DEFAULT_PASS_THROUGH_REQUEST_TIMEOUT_SECONDS,
     LITELLM_PASS_THROUGH_CUSTOM_BODY_STATE_KEY,
+    STORED_PROMPT_PROBE_MODEL,
+    WALKOUT_TURN_DRAIN_SECONDS,
     HttpPassThroughEndpointHelpers,
     InitPassThroughEndpointHelpers,
     SafeRouteAdder,
+    WebsocketFrameModelAllowed,
+    WebsocketFrameModelGate,
+    WebsocketFrameModelRefused,
+    WebsocketFrameModelVerdict,
     _build_passthrough_failure_request_payload,
     _registered_pass_through_routes,
     _truncate_upstream_error_body,
@@ -63,12 +74,15 @@ from litellm.proxy.pass_through_endpoints.pass_through_endpoints import (
     set_env_variables_in_header,
     websocket_passthrough_request,
 )
+from litellm.proxy.pass_through_endpoints.llm_provider_handlers.openai_websocket_passthrough_logging_handler import (
+    openai_websocket_frame_kind,
+)
 from litellm.proxy.pass_through_endpoints.success_handler import (
     PassThroughEndpointLogging,
 )
 from litellm.proxy.route_llm_request import ProxyModelNotFoundError
 from litellm.proxy.spend_tracking.spend_tracking_utils import get_spend_logs_id
-from litellm.proxy.utils import ProxyLogging
+from litellm.proxy.utils import InternalUsageCache, ProxyLogging, hash_token
 from litellm.types import utils as types_utils
 from litellm.types.guardrails import GuardrailEventHooks
 from litellm.types.utils import CallTypes
@@ -7382,6 +7396,7 @@ async def test_websocket_passthrough_forwards_non_ascii_first_frame():
         mock_proxy_logging.pre_call_hook = AsyncMock(return_value={})
         mock_proxy_logging.post_call_success_hook = AsyncMock()
         mock_proxy_logging.post_call_failure_hook = AsyncMock()
+        mock_proxy_logging.arelease_responses_websocket_slot = AsyncMock()
         mock_worker.ensure_initialized_and_enqueue = MagicMock(
             side_effect=lambda async_coroutine: async_coroutine.close()
         )
@@ -7434,6 +7449,7 @@ async def test_websocket_passthrough_propagates_active_trace_context(
     mock_proxy_logging.pre_call_hook = AsyncMock(return_value={})
     mock_proxy_logging.post_call_success_hook = AsyncMock()
     mock_proxy_logging.post_call_failure_hook = AsyncMock()
+    mock_proxy_logging.arelease_responses_websocket_slot = AsyncMock()
     mock_worker = MagicMock()
     mock_worker.ensure_initialized_and_enqueue = MagicMock(side_effect=lambda async_coroutine: async_coroutine.close())
     monkeypatch.setattr("litellm.proxy.proxy_server.proxy_logging_obj", mock_proxy_logging)
@@ -7500,6 +7516,7 @@ async def test_websocket_passthrough_never_forwards_caller_credentials_upstream(
     mock_proxy_logging.pre_call_hook = AsyncMock(return_value={})
     mock_proxy_logging.post_call_success_hook = AsyncMock()
     mock_proxy_logging.post_call_failure_hook = AsyncMock()
+    mock_proxy_logging.arelease_responses_websocket_slot = AsyncMock()
     mock_worker = MagicMock()
     mock_worker.ensure_initialized_and_enqueue = MagicMock(side_effect=lambda async_coroutine: async_coroutine.close())
     monkeypatch.setattr("litellm.proxy.proxy_server.proxy_logging_obj", mock_proxy_logging)
@@ -7593,10 +7610,11 @@ def _patched_websocket_passthrough_environment(upstream_ws):
         mock_proxy_logging.pre_call_hook = AsyncMock(return_value={})
         mock_proxy_logging.post_call_success_hook = AsyncMock()
         mock_proxy_logging.post_call_failure_hook = AsyncMock()
+        mock_proxy_logging.arelease_responses_websocket_slot = AsyncMock()
         mock_worker.ensure_initialized_and_enqueue = MagicMock(
             side_effect=lambda async_coroutine: async_coroutine.close()
         )
-        yield
+        yield mock_proxy_logging
 
 
 async def _pending_receive():
@@ -7901,6 +7919,1487 @@ async def test_websocket_passthrough_does_not_close_twice_when_success_logging_f
     websocket.close.assert_awaited_once_with(code=1008, reason=upstream_reason)
 
 
+SUCCESS_HANDLER: Final = (
+    "litellm.proxy.pass_through_endpoints.pass_through_endpoints."
+    "pass_through_endpoint_logging.pass_through_async_success_handler"
+)
+
+
+KEY_MODEL_REFUSAL: Final = "key not allowed to access model. This key can only access models=['gpt-5.4-mini']."
+KEY_MODEL_CLOSE_REASON: Final = "key not allowed to access model."
+
+
+class RecordingFrameModelGate:
+    def __init__(
+        self,
+        refusals: Mapping[str, str] = MappingProxyType({}),
+        groups: Mapping[str, tuple[str, ...]] = MappingProxyType({}),
+        error_type: str = "key_model_access_denied",
+    ):
+        self.refusals = refusals
+        self.groups = groups
+        self.error_type = error_type
+        self.checked: list[str] = []
+
+    async def __call__(self, websocket: object, model: str, /) -> WebsocketFrameModelVerdict:
+        self.checked.append(model)
+        refusal: Final = self.refusals.get(model)
+        if refusal is not None:
+            return WebsocketFrameModelRefused(message=refusal, error_type=self.error_type)
+        return WebsocketFrameModelAllowed(access_groups=self.groups.get(model, ()))
+
+
+def _received_frame(frame: str | bytes) -> Mapping[str, str | bytes]:
+    if isinstance(frame, bytes):
+        return {"type": "websocket.receive", "bytes": frame}
+    return {"type": "websocket.receive", "text": frame}
+
+
+async def _relay_client_frames(
+    frames: Sequence[str | bytes],
+    gate: WebsocketFrameModelGate | None,
+    user_api_key_dict: UserAPIKeyAuth | None = None,
+) -> SimpleNamespace:
+    upstream_ws: Final = RecordingUpstreamWebSocket()
+    websocket: Final = _client_websocket(
+        AsyncMock(side_effect=[_received_frame(frame) for frame in frames] + [{"type": "websocket.disconnect"}])
+    )
+
+    with (
+        _patched_websocket_passthrough_environment(upstream_ws),
+        patch(SUCCESS_HANDLER, new_callable=AsyncMock) as success_handler,
+    ):
+        await websocket_passthrough_request(
+            websocket=websocket,
+            target="wss://api.openai.com/v1/realtime?model=gpt-realtime-2.1",
+            custom_headers={"Authorization": "Bearer sk-provider"},
+            user_api_key_dict=user_api_key_dict or UserAPIKeyAuth(),
+            forward_headers=False,
+            endpoint="/openai/v1/realtime",
+            accept_websocket=False,
+            client_frame_model_gate=gate,
+        )
+
+    return SimpleNamespace(upstream=upstream_ws, client=websocket, success_handler=success_handler)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "frame, expected_model",
+    [
+        ({"type": "response.create", "model": "gpt-5.4-mini"}, "gpt-5.4-mini"),
+        ({"type": "response.create", "response": {"model": "gpt-5.4"}}, "gpt-5.4"),
+        ({"type": "session.update", "session": {"model": "gpt-realtime-2.1"}}, "gpt-realtime-2.1"),
+        (
+            {"type": "session.update", "session": {"input_audio_transcription": {"model": "gpt-4o-transcribe"}}},
+            "gpt-4o-transcribe",
+        ),
+        (
+            {
+                "type": "session.update",
+                "session": {"audio": {"input": {"transcription": {"model": "gpt-transcribe"}}}},
+            },
+            "gpt-transcribe",
+        ),
+    ],
+)
+async def test_websocket_passthrough_checks_the_model_a_client_frame_asks_for(frame, expected_model):
+    gate: Final = RecordingFrameModelGate()
+
+    relayed: Final = await _relay_client_frames([json.dumps(frame)], gate)
+
+    assert gate.checked == [expected_model]
+    assert [call.args[0] for call in relayed.upstream.send.await_args_list] == [json.dumps(frame)]
+    assert relayed.client.close.await_args_list == [call()]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_refuses_a_frame_naming_a_model_the_key_cannot_call():
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-realtime-2.1": KEY_MODEL_REFUSAL}))
+    frame: Final = json.dumps({"type": "session.update", "session": {"model": "gpt-realtime-2.1"}})
+
+    relayed: Final = await _relay_client_frames([frame], gate)
+
+    assert relayed.upstream.send.await_args_list == []
+    assert json.loads(relayed.client.send_text.await_args.args[0]) == {
+        "type": "error",
+        "error": {"type": "key_model_access_denied", "message": KEY_MODEL_REFUSAL},
+    }
+    assert relayed.client.close.await_args_list == [call(code=1008, reason=KEY_MODEL_CLOSE_REASON)]
+    relayed.upstream.close.assert_awaited()
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_closes_with_the_whole_first_sentence_of_the_refusal():
+    """
+    The close frame only has room for 123 bytes, so a refusal cut at that limit
+    reads as a truncated number. The first sentence names the reason whole, and
+    the error event before the close still carries every word with its type.
+    """
+    refusal: Final = "Budget has been exceeded! Key=" + "f" * 64 + " Spend=1.23456789, Budget=1.0"
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-5.4": refusal}), error_type="budget_exceeded")
+
+    relayed: Final = await _relay_client_frames([json.dumps({"type": "response.create", "model": "gpt-5.4"})], gate)
+
+    assert relayed.client.close.await_args_list == [call(code=1008, reason="Budget has been exceeded!")]
+    assert json.loads(relayed.client.send_text.await_args.args[0])["error"] == {
+        "type": "budget_exceeded",
+        "message": refusal,
+    }
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_refuses_the_whole_frame_when_any_named_model_is_denied():
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-4o-transcribe": KEY_MODEL_REFUSAL}))
+    frame: Final = json.dumps(
+        {
+            "type": "session.update",
+            "session": {"model": "gpt-realtime-2.1", "input_audio_transcription": {"model": "gpt-4o-transcribe"}},
+        }
+    )
+
+    relayed: Final = await _relay_client_frames([frame], gate)
+
+    assert gate.checked == ["gpt-realtime-2.1", "gpt-4o-transcribe"]
+    assert relayed.upstream.send.await_args_list == []
+    assert relayed.client.close.await_args_list == [call(code=1008, reason=KEY_MODEL_CLOSE_REASON)]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_stops_relaying_after_a_refused_frame():
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-realtime-2.1": KEY_MODEL_REFUSAL}))
+    frames: Final = [
+        json.dumps({"type": "session.update", "session": {"model": "gpt-realtime-2.1"}}),
+        json.dumps({"type": "response.create"}),
+    ]
+
+    relayed: Final = await _relay_client_frames(frames, gate)
+
+    assert relayed.upstream.send.await_args_list == []
+    assert gate.checked == ["gpt-realtime-2.1"]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "frame",
+    [
+        '{"type": "input_audio_buffer.append", "audio": "AAAA"}',
+        '{"type": "response.create", "response": {"modalities": ["audio"]}}',
+        '{"type": "session.update", "session": {"model": 42}}',
+        'not json at all, but it does say "model"',
+        '{"type": "session.update", "session": "model"}',
+    ],
+)
+async def test_websocket_passthrough_forwards_frames_that_name_no_model(frame):
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-realtime-2.1": "denied"}))
+
+    relayed: Final = await _relay_client_frames([frame], gate)
+
+    assert gate.checked == []
+    assert [call_.args[0] for call_ in relayed.upstream.send.await_args_list] == [frame]
+    assert relayed.client.close.await_args_list == [call()]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_never_bills_the_model_a_client_frame_named():
+    """
+    A frame is what the caller asked for, not what the provider ran. A caller
+    who names a cheap model in a frame the provider ignores must not move the
+    session onto that model's price, so only the provider's own frames decide
+    what a session is billed as.
+    """
+    gate: Final = RecordingFrameModelGate()
+    frames: Final = [
+        json.dumps({"type": "session.update", "session": {"model": "gpt-realtime-2.1"}}),
+        json.dumps({"type": "response.create", "response": {"model": "gpt-realtime-2.1-mini"}}),
+    ]
+
+    relayed: Final = await _relay_client_frames(frames, gate)
+
+    assert gate.checked == ["gpt-realtime-2.1", "gpt-realtime-2.1-mini"]
+    assert "model" not in relayed.success_handler.call_args.kwargs
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "frame, expected_model",
+    [
+        ('{"type": "response.create", "\\u006dodel": "gpt-5.4"}', "gpt-5.4"),
+        ('{"type": "session.update", "session": {"\\u006d\\u006fdel": "gpt-realtime-2.1"}}', "gpt-realtime-2.1"),
+    ],
+)
+async def test_websocket_passthrough_checks_a_model_named_with_escaped_json(frame, expected_model):
+    """
+    JSON lets a caller spell the same key several ways, so a frame carrying
+    "\\u006dodel" asks for a model just as plainly as one carrying "model" and
+    has to face the same check.
+    """
+    gate: Final = RecordingFrameModelGate(MappingProxyType({expected_model: KEY_MODEL_REFUSAL}))
+
+    relayed: Final = await _relay_client_frames([frame], gate)
+
+    assert gate.checked == [expected_model]
+    assert relayed.upstream.send.await_args_list == []
+    assert relayed.client.close.await_args_list == [call(code=1008, reason=KEY_MODEL_CLOSE_REASON)]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_checks_the_model_a_binary_frame_asks_for():
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-realtime-2.1": KEY_MODEL_REFUSAL}))
+    frame: Final = json.dumps({"type": "session.update", "session": {"model": "gpt-realtime-2.1"}}).encode()
+
+    relayed: Final = await _relay_client_frames([frame], gate)
+
+    assert gate.checked == ["gpt-realtime-2.1"]
+    assert relayed.upstream.send.await_args_list == []
+    assert relayed.client.close.await_args_list == [call(code=1008, reason=KEY_MODEL_CLOSE_REASON)]
+
+
+STORED_PROMPT_FRAMES: Final = (
+    {"type": "response.create", "prompt": {"id": "pmpt_fake", "version": "2"}},
+    {"type": "response.create", "response": {"prompt": {"id": "pmpt_fake"}}},
+    {"type": "session.update", "session": {"prompt": {"id": "pmpt_fake"}}},
+)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("frame", STORED_PROMPT_FRAMES)
+async def test_websocket_passthrough_refuses_a_stored_prompt_for_a_key_limited_to_some_models(frame):
+    """
+    A stored prompt carries its own model on the provider side, so a key held to
+    a model list could reach any model through one. The gateway cannot see that
+    model, so a key that is not allowed every model cannot run a stored prompt.
+    """
+    gate: Final = RecordingFrameModelGate(MappingProxyType({STORED_PROMPT_PROBE_MODEL: KEY_MODEL_REFUSAL}))
+
+    relayed: Final = await _relay_client_frames([json.dumps(frame)], gate)
+
+    error_message: Final = json.loads(relayed.client.send_text.await_args.args[0])["error"]["message"]
+    close_reason: Final = relayed.client.close.await_args.kwargs["reason"]
+    assert gate.checked == [STORED_PROMPT_PROBE_MODEL]
+    assert relayed.upstream.send.await_args_list == []
+    assert relayed.client.close.await_args.kwargs["code"] == 1008
+    assert "stored prompt" in close_reason
+    assert close_reason.endswith(".") and error_message.startswith(close_reason)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("frame", STORED_PROMPT_FRAMES)
+async def test_websocket_passthrough_forwards_a_stored_prompt_for_a_key_allowed_every_model(frame):
+    gate: Final = RecordingFrameModelGate()
+
+    relayed: Final = await _relay_client_frames([json.dumps(frame)], gate)
+
+    assert [call_.args[0] for call_ in relayed.upstream.send.await_args_list] == [json.dumps(frame)]
+    assert relayed.client.close.await_args_list == [call()]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_keeps_the_budget_reason_when_a_stored_prompt_is_refused_for_spend():
+    refusal: Final = "Budget has been exceeded! Key=hashed Spend=2.0, Budget=1.0"
+    gate: Final = RecordingFrameModelGate(
+        MappingProxyType({STORED_PROMPT_PROBE_MODEL: refusal}), error_type="budget_exceeded"
+    )
+
+    relayed: Final = await _relay_client_frames([json.dumps(STORED_PROMPT_FRAMES[0])], gate)
+
+    assert json.loads(relayed.client.send_text.await_args.args[0])["error"] == {
+        "type": "budget_exceeded",
+        "message": refusal,
+    }
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_checks_the_model_a_hosted_tool_names():
+    """A hosted tool such as image generation runs its own model, so that model gets the same check as the turn's"""
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-image-2": KEY_MODEL_REFUSAL}))
+    frame: Final = {
+        "type": "response.create",
+        "model": "gpt-5.4-mini",
+        "tools": [{"type": "web_search"}, {"type": "image_generation", "model": "gpt-image-2"}],
+    }
+
+    relayed: Final = await _relay_client_frames([json.dumps(frame)], gate)
+
+    assert gate.checked == ["gpt-5.4-mini", "gpt-image-2"]
+    assert relayed.upstream.send.await_args_list == []
+    assert relayed.client.close.await_args.kwargs["code"] == 1008
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "frame",
+    [
+        {"type": "response.create", "model": "gpt-5.4-mini", "tools": [{"type": "image_generation"}]},
+        {"type": "response.create", "response": {"tools": [{"type": "image_generation", "model": None}]}},
+    ],
+)
+async def test_websocket_passthrough_refuses_an_image_tool_without_a_model_for_a_key_limited_to_some_models(frame):
+    gate: Final = RecordingFrameModelGate(MappingProxyType({STORED_PROMPT_PROBE_MODEL: KEY_MODEL_REFUSAL}))
+
+    relayed: Final = await _relay_client_frames([json.dumps(frame)], gate)
+
+    assert gate.checked[-1] == STORED_PROMPT_PROBE_MODEL
+    assert relayed.upstream.send.await_args_list == []
+    assert "image_generation tool has to name its model" in relayed.client.close.await_args.kwargs["reason"]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_checks_a_frame_only_the_standard_json_parser_reads():
+    """A lone surrogate escape is valid JSON syntax the fast parser refuses, so the frame is still checked"""
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-5.4": KEY_MODEL_REFUSAL}))
+    frame: Final = '{"type": "response.create", "model": "gpt-5.4", "metadata": {"note": "\\ud800"}}'
+
+    relayed: Final = await _relay_client_frames([frame], gate)
+
+    assert gate.checked == ["gpt-5.4"]
+    assert relayed.upstream.send.await_args_list == []
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_forwards_binary_audio_untouched():
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-realtime-2.1": "denied"}))
+    audio: Final = bytes(range(256)) * 4
+
+    relayed: Final = await _relay_client_frames([audio], gate)
+
+    assert gate.checked == []
+    assert [call_.args[0] for call_ in relayed.upstream.send.await_args_list] == [audio]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_without_a_frame_gate_forwards_every_frame():
+    frame: Final = json.dumps({"type": "session.update", "session": {"model": "gpt-realtime-2.1"}})
+
+    relayed: Final = await _relay_client_frames([frame], None)
+
+    assert [call_.args[0] for call_ in relayed.upstream.send.await_args_list] == [frame]
+    assert "model" not in relayed.success_handler.call_args.kwargs
+
+
+REALTIME_SESSION_CREATED: Final = json.dumps(
+    {"type": "session.created", "session": {"id": "sess_fake", "model": "gpt-realtime-2.1"}}
+)
+REALTIME_RESPONSE_DONE: Final = json.dumps(
+    {
+        "type": "response.done",
+        "response": {"status": "completed", "usage": {"input_tokens": 10, "output_tokens": 5, "total_tokens": 15}},
+    }
+)
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_still_bills_a_session_the_client_walked_out_of():
+    """
+    A realtime client closes the moment it has the answer it asked for, so the
+    next frame the provider sends lands on a socket that is already gone. That
+    is how a session ends, not a gateway failure, and the turns the caller
+    already used still have to reach spend, including the last frame the client
+    never collected.
+    """
+    upstream_ws: Final = FakeUpstreamWebSocket(
+        REALTIME_SESSION_CREATED,
+        REALTIME_RESPONSE_DONE,
+        json.dumps({"type": "response.output_text.delta", "delta": "too late"}),
+    )
+    websocket: Final = _client_websocket(_pending_receive)
+    websocket.send_text = AsyncMock(side_effect=[None, None, WebSocketDisconnect(code=1006)])
+
+    with (
+        _patched_websocket_passthrough_environment(upstream_ws),
+        patch(SUCCESS_HANDLER, new_callable=AsyncMock) as success_handler,
+    ):
+        await websocket_passthrough_request(
+            websocket=websocket,
+            target="wss://api.openai.com/v1/realtime?model=gpt-realtime-2.1",
+            custom_headers={"Authorization": "Bearer sk-provider"},
+            user_api_key_dict=UserAPIKeyAuth(),
+            forward_headers=False,
+            endpoint="/openai_passthrough/v1/realtime",
+            accept_websocket=False,
+        )
+
+    relayed_frames: Final = success_handler.call_args.kwargs["response_body"]
+    assert [frame["type"] for frame in relayed_frames] == [
+        "session.created",
+        "response.done",
+        "response.output_text.delta",
+    ]
+
+
+class ScriptedUpstreamWebSocket:
+    """Answers each client frame with its scripted reply"""
+
+    def __init__(self, *opening: str, replies: Sequence[Sequence[str]] = ()):
+        self._frames: asyncio.Queue[str | None] = asyncio.Queue()
+        for frame in opening:
+            self._frames.put_nowait(frame)
+        self._replies = iter(replies)
+        self._closed = False
+        self.send = AsyncMock(side_effect=self._reply)
+        self.close = AsyncMock(side_effect=self._flush_and_close)
+
+    async def _reply(self, frame: str | bytes) -> None:
+        for reply in next(self._replies, ()):
+            self._frames.put_nowait(reply)
+
+    async def _flush_and_close(self, *args: object, **kwargs: object) -> None:
+        if self._closed:
+            return
+        self._closed = True
+        self._frames.put_nowait(None)
+        while not self._frames.empty():
+            await asyncio.sleep(0)
+
+    async def recv(self, decode: bool | None = None) -> str:
+        from websockets.exceptions import ConnectionClosedOK
+        from websockets.frames import Close
+
+        frame: Final = await self._frames.get()
+        if frame is None:
+            raise ConnectionClosedOK(rcvd=Close(1000, ""), sent=Close(1000, ""), rcvd_then_sent=True)
+        return frame
+
+
+def _turn_taking_client(
+    frames: Sequence[str], answered_by: str, answers_due: Sequence[int] | None = None
+) -> MagicMock:
+    """A client that sends each frame, and then leaves, once the answers due by then reached it (by default the
+    answer to every earlier frame), and that Starlette refuses to send to once it is closed"""
+    from starlette.websockets import WebSocketState
+
+    delivered: Final[list[str]] = []
+    script: Final = iter(frames)
+    receives: Final = iter(range(len(frames) + 1) if answers_due is None else answers_due)
+
+    async def receive():
+        answers_due: Final = next(receives)
+        while sum(answered_by in text for text in delivered) < answers_due:
+            await asyncio.sleep(0)
+        frame: Final = next(script, None)
+        return {"type": "websocket.disconnect"} if frame is None else _received_frame(frame)
+
+    websocket: Final = _client_websocket(receive)
+
+    async def send_text(text: str) -> None:
+        if websocket.application_state == WebSocketState.DISCONNECTED:
+            raise RuntimeError('Cannot call "send" once a close message has been sent.')
+        delivered.append(text)
+
+    websocket.send_text = AsyncMock(side_effect=send_text)
+    return websocket
+
+
+async def _relay_turns(
+    client: MagicMock,
+    upstream_ws: ScriptedUpstreamWebSocket,
+    gate: WebsocketFrameModelGate,
+    endpoint: str = "/openai_passthrough/v1/responses",
+    target: str = "wss://api.openai.com/v1/responses",
+    opening_access_groups: Sequence[str] = (),
+    walkout_turn_drain_seconds: float = 0.05,
+) -> SimpleNamespace:
+    with (
+        _patched_websocket_passthrough_environment(upstream_ws) as proxy_logging,
+        patch(SUCCESS_HANDLER, new_callable=AsyncMock) as success_handler,
+    ):
+        await asyncio.wait_for(
+            websocket_passthrough_request(
+                websocket=client,
+                target=target,
+                custom_headers={"Authorization": "Bearer sk-provider"},
+                user_api_key_dict=UserAPIKeyAuth(
+                    api_key="hashed-key", matched_model_access_groups=list(opening_access_groups)
+                ),
+                forward_headers=False,
+                endpoint=endpoint,
+                accept_websocket=False,
+                client_frame_model_gate=gate,
+                upstream_frame_kind=openai_websocket_frame_kind,
+                walkout_turn_drain_seconds=walkout_turn_drain_seconds,
+            ),
+            timeout=10,
+        )
+    return SimpleNamespace(success_handler=success_handler, proxy_logging=proxy_logging)
+
+
+def _responses_turn(model: str) -> list[str]:
+    return [_responses_turn_started(model), _responses_turn_ended(model)]
+
+
+def _responses_turn_started(model: str) -> str:
+    return json.dumps({"type": "response.created", "response": {"model": model}})
+
+
+def _responses_turn_ended(model: str) -> str:
+    return (
+
+        json.dumps(
+            {
+                "type": "response.completed",
+                "response": {"model": model, "usage": {"input_tokens": 9, "output_tokens": 3, "total_tokens": 12}},
+            }
+        )
+    )
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_logs_each_turn_on_its_own_row_charged_to_the_groups_that_allowed_it():
+    """
+    One socket can run a model from one access group and then a model from
+    another. Each turn has to reach spend as it finishes, under its own call,
+    and be charged to the group that let its model through, so a group budget
+    sees its share during the session and never pays for the other group's turn.
+    """
+    gate: Final = RecordingFrameModelGate(
+        groups=MappingProxyType({"gpt-5.4-mini": ("tier-a",), "gpt-5.4": ("tier-b",)}),
+    )
+    client: Final = _turn_taking_client(
+        [
+            json.dumps({"type": "response.create", "model": "gpt-5.4-mini"}),
+            json.dumps({"type": "response.create", "model": "gpt-5.4"}),
+        ],
+        answered_by='"response.completed"',
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(replies=[_responses_turn("gpt-5.4-mini"), _responses_turn("gpt-5.4")])
+
+    relayed: Final = await _relay_turns(client, upstream_ws, gate)
+
+    rows: Final = [logged.kwargs for logged in relayed.success_handler.call_args_list]
+    assert [[frame["response"]["model"] for frame in row["response_body"]] for row in rows] == [
+        ["gpt-5.4-mini", "gpt-5.4-mini"],
+        ["gpt-5.4", "gpt-5.4"],
+    ]
+    assert [row["litellm_params"]["metadata"][MODEL_ACCESS_GROUP_METADATA_KEY] for row in rows] == [
+        ["tier-a"],
+        ["tier-b"],
+    ]
+    assert [row["litellm_params"]["metadata"]["user_api_key"] for row in rows] == ["hashed-key", "hashed-key"]
+    assert rows[0]["litellm_call_id"] != rows[1]["litellm_call_id"]
+    assert rows[1]["start_time"] == rows[0]["end_time"]
+    relayed.proxy_logging.post_call_failure_hook.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_holds_the_keys_parallel_slot_until_the_session_ends():
+    """
+    A key allowed one parallel request holds that slot for as long as its
+    socket stays open. A turn that finishes and reaches spend mid-session must
+    not free it, or a second session gets in while the first is still running.
+    """
+    limiter_cache: Final = DualCache()
+    limiter: Final = PROXY_MaxParallelRequestsHandler_v3(internal_usage_cache=InternalUsageCache(limiter_cache))
+    key: Final = UserAPIKeyAuth(api_key=hash_token("sk-one-socket"), max_parallel_requests=1)
+    logged_rows: Final[list[asyncio.Task[None]]] = []
+
+    async def admit(user_api_key_dict: UserAPIKeyAuth, data: dict[str, object], call_type: str) -> None:
+        await limiter.async_pre_call_hook(
+            user_api_key_dict=user_api_key_dict, cache=limiter_cache, data=data, call_type=call_type
+        )
+
+    async def release(data: dict[str, object], user_api_key_dict: UserAPIKeyAuth, response: object) -> None:
+        await limiter.async_post_call_success_hook(data=data, user_api_key_dict=user_api_key_dict, response=response)
+
+    async def log_row(**row: object) -> None:
+        await limiter.async_log_success_event(
+            kwargs=row, response_obj=None, start_time=row["start_time"], end_time=row["end_time"]
+        )
+
+    async def opens_another_session() -> bool:
+        await asyncio.gather(*logged_rows)
+        try:
+            await asyncio.create_task(
+                admit(key, {"litellm_call_id": str(uuid.uuid4())}, "pass_through_endpoint"),
+                context=contextvars.Context(),
+            )
+        except ProxyRateLimitError:
+            return False
+        return True
+
+    client: Final = _turn_taking_client(
+        [json.dumps({"type": "response.create", "model": "gpt-5.4-mini"})], answered_by='"response.completed"'
+    )
+    take_frame: Final = client.receive
+    while_open: Final[list[bool]] = []
+
+    async def receive() -> Mapping[str, str | bytes]:
+        message: Final = await take_frame()
+        if message["type"] == "websocket.disconnect":
+            while_open.append(await opens_another_session())
+        return message
+
+    client.receive = receive
+
+    with (
+        _patched_websocket_passthrough_environment(
+            ScriptedUpstreamWebSocket(replies=[_responses_turn("gpt-5.4-mini")])
+        ) as proxy_logging,
+        patch("litellm.proxy.pass_through_endpoints.pass_through_endpoints.GLOBAL_LOGGING_WORKER") as worker,
+        patch(SUCCESS_HANDLER, new_callable=AsyncMock, side_effect=log_row),
+    ):
+        proxy_logging.pre_call_hook = AsyncMock(side_effect=admit)
+        proxy_logging.post_call_success_hook = AsyncMock(side_effect=release)
+        worker.ensure_initialized_and_enqueue = MagicMock(
+            side_effect=lambda async_coroutine: logged_rows.append(asyncio.create_task(async_coroutine))
+        )
+        await asyncio.wait_for(
+            websocket_passthrough_request(
+                websocket=client,
+                target="wss://api.openai.com/v1/responses",
+                custom_headers={"Authorization": "Bearer sk-provider"},
+                user_api_key_dict=key,
+                forward_headers=False,
+                endpoint="/openai_passthrough/v1/responses",
+                accept_websocket=False,
+                client_frame_model_gate=RecordingFrameModelGate(),
+                upstream_frame_kind=openai_websocket_frame_kind,
+                walkout_turn_drain_seconds=0.05,
+            ),
+            timeout=10,
+        )
+        after_close: Final = await opens_another_session()
+
+    assert len(logged_rows) == 1
+    assert (while_open, after_close) == ([False], True)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "models, upstream_refuses, while_open",
+    [
+        ((), False, [False]),
+        (("gpt-5.4-mini",), False, [False]),
+        (("gpt-5.4-mini", "gpt-5.4"), False, [False]),
+        ((), True, []),
+    ],
+    ids=["no-turn", "one-turn", "two-turns", "upstream-refused"],
+)
+async def test_websocket_passthrough_frees_one_legacy_parallel_slot_only_when_the_session_ends(
+    models: tuple[str, ...], upstream_refuses: bool, while_open: list[bool]
+):
+    limiter: Final = PROXY_MaxParallelRequestsHandler(
+        internal_usage_cache=InternalUsageCache(DualCache()), clock=lambda: datetime(2026, 1, 31, 23, 59, 30)
+    )
+    proxy_logging_obj: Final = ProxyLogging(user_api_key_cache=DualCache())
+    proxy_logging_obj.proxy_hook_mapping["parallel_request_limiter"] = limiter
+    key: Final = UserAPIKeyAuth(api_key=hash_token("sk-legacy-socket"), max_parallel_requests=2)
+    logged_rows: Final[list[asyncio.Task[None]]] = []
+    seen_while_open: Final[list[bool]] = []
+
+    async def admit(user_api_key_dict: UserAPIKeyAuth, data: Mapping[str, object], call_type: str) -> None:
+        await limiter.async_pre_call_hook(
+            user_api_key_dict=user_api_key_dict, cache=DualCache(), data=data, call_type=call_type
+        )
+
+    async def log_row(**row: object) -> None:
+        await limiter.async_log_success_event(
+            kwargs=row, response_obj=None, start_time=row["start_time"], end_time=row["end_time"]
+        )
+
+    async def opens_another_session() -> bool:
+        await asyncio.gather(*logged_rows)
+        try:
+            await admit(key, {}, "pass_through_endpoint")
+        except ProxyRateLimitError:
+            return False
+        return True
+
+    client: Final = _turn_taking_client(
+        [json.dumps({"type": "response.create", "model": model}) for model in models],
+        answered_by='"response.completed"',
+    )
+    take_frame: Final = client.receive
+
+    async def receive() -> Mapping[str, str | bytes]:
+        message: Final = await take_frame()
+        if message["type"] == "websocket.disconnect":
+            seen_while_open.append(await opens_another_session())
+        return message
+
+    client.receive = receive
+    await admit(key, {}, "pass_through_endpoint")
+
+    with ExitStack() as stack:
+        proxy_logging: Final = stack.enter_context(
+            _patched_websocket_passthrough_environment(
+                ScriptedUpstreamWebSocket(replies=[_responses_turn(model) for model in models])
+            )
+        )
+        worker: Final = stack.enter_context(
+            patch("litellm.proxy.pass_through_endpoints.pass_through_endpoints.GLOBAL_LOGGING_WORKER")
+        )
+        stack.enter_context(patch(SUCCESS_HANDLER, new_callable=AsyncMock, side_effect=log_row))
+        if upstream_refuses:
+            stack.enter_context(
+                patch(
+                    "litellm.proxy.pass_through_endpoints.pass_through_endpoints.connect",
+                    side_effect=OSError("upstream refused the socket"),
+                )
+            )
+        proxy_logging.pre_call_hook = AsyncMock(side_effect=admit)
+        proxy_logging.arelease_responses_websocket_slot = proxy_logging_obj.arelease_responses_websocket_slot
+        worker.ensure_initialized_and_enqueue = MagicMock(
+            side_effect=lambda async_coroutine: logged_rows.append(asyncio.create_task(async_coroutine))
+        )
+        await asyncio.wait_for(
+            websocket_passthrough_request(
+                websocket=client,
+                target="wss://api.openai.com/v1/responses",
+                custom_headers={"Authorization": "Bearer sk-provider"},
+                user_api_key_dict=key,
+                forward_headers=False,
+                endpoint="/openai_passthrough/v1/responses",
+                accept_websocket=False,
+                client_frame_model_gate=RecordingFrameModelGate(),
+                upstream_frame_kind=openai_websocket_frame_kind,
+                walkout_turn_drain_seconds=0.05,
+            ),
+            timeout=10,
+        )
+    after_close: Final = (await opens_another_session(), await opens_another_session())
+
+    assert len(logged_rows) == len(models)
+    assert (seen_while_open, after_close) == (while_open, (True, False))
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_charges_pipelined_turns_to_the_frame_that_asked_for_each():
+    """
+    A client can send its next response.create before the provider finished the
+    last one, and the provider then runs them one after the other. Each turn
+    still has to reach spend under the groups that let its own frame through,
+    and under the model that frame asked for, even when the provider answers
+    under a dated snapshot name a per-model budget was never set on.
+    """
+    gate: Final = RecordingFrameModelGate(
+        groups=MappingProxyType({"gpt-5.4-mini": ("tier-a",), "gpt-5.4": ("tier-b",)}),
+    )
+    client: Final = _turn_taking_client(
+        [
+            json.dumps({"type": "response.create", "model": "gpt-5.4-mini"}),
+            json.dumps({"type": "response.create", "model": "gpt-5.4"}),
+        ],
+        answered_by='"response.completed"',
+        answers_due=(0, 0, 2),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        replies=[_responses_turn("gpt-5.4-mini-2099-01-01"), _responses_turn("gpt-5.4-2099-01-01")]
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, gate)
+
+    rows: Final = [logged.kwargs for logged in relayed.success_handler.call_args_list]
+    assert [[frame["response"]["model"] for frame in row["response_body"]] for row in rows] == [
+        ["gpt-5.4-mini-2099-01-01", "gpt-5.4-mini-2099-01-01"],
+        ["gpt-5.4-2099-01-01", "gpt-5.4-2099-01-01"],
+    ]
+    assert [row["litellm_params"]["metadata"][MODEL_ACCESS_GROUP_METADATA_KEY] for row in rows] == [
+        ["tier-a"],
+        ["tier-b"],
+    ]
+    assert [row["litellm_params"]["metadata"]["model_group"] for row in rows] == ["gpt-5.4-mini", "gpt-5.4"]
+
+
+def _responses_error(code: str) -> str:
+    return json.dumps({"type": "error", "status": 400, "error": {"type": "invalid_request_error", "code": code}})
+
+
+def _on_lane(frame: str, stream_id: str) -> str:
+    return json.dumps({**json.loads(frame), "stream_id": stream_id})
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_charges_turns_after_a_refused_frame_to_the_frames_that_asked_for_them():
+    """
+    The provider answers a response.create it cannot run, one naming no model
+    or a stale previous_response_id, with an error event and keeps the socket
+    open. Those frames never run, so each later turn still has to reach spend
+    under the groups and model its own frame asked for.
+    """
+    gate: Final = RecordingFrameModelGate(
+        groups=MappingProxyType({"gpt-5.4-mini": ("tier-a",), "gpt-5.4": ("tier-b",)}),
+    )
+    client: Final = _turn_taking_client(
+        [
+            json.dumps({"type": "response.create", "input": "hi"}),
+            json.dumps({"type": "response.create", "model": "gpt-5.4", "previous_response_id": "resp_gone"}),
+            json.dumps({"type": "response.create", "model": "gpt-5.4-mini"}),
+            json.dumps({"type": "response.create", "model": "gpt-5.4"}),
+        ],
+        answered_by='"response.completed"',
+        answers_due=(0, 0, 0, 0, 2),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        replies=[
+            [_responses_error("missing_required_parameter")],
+            [_responses_error("previous_response_not_found")],
+            _responses_turn("gpt-5.4-mini-2099-01-01"),
+            _responses_turn("gpt-5.4-2099-01-01"),
+        ]
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, gate)
+
+    rows: Final = [logged.kwargs for logged in relayed.success_handler.call_args_list]
+    assert [row["litellm_params"]["metadata"]["model_group"] for row in rows] == ["gpt-5.4-mini", "gpt-5.4"]
+    assert [row["litellm_params"]["metadata"][MODEL_ACCESS_GROUP_METADATA_KEY] for row in rows] == [
+        ["tier-a"],
+        ["tier-b"],
+    ]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_charges_turns_on_parallel_lanes_to_the_frame_that_asked_for_each():
+    """
+    A client can put each response.create on its own stream_id lane, and the
+    provider runs lanes side by side, so a later frame's turn can end first.
+    Each turn still has to reach spend on its own row, under the groups and
+    model its own frame asked for.
+    """
+    gate: Final = RecordingFrameModelGate(
+        groups=MappingProxyType({"gpt-5.4-mini": ("tier-a",), "gpt-5.4": ("tier-b",)}),
+    )
+    client: Final = _turn_taking_client(
+        [
+            json.dumps({"type": "response.create", "stream_id": "slow", "model": "gpt-5.4"}),
+            json.dumps({"type": "response.create", "stream_id": "fast", "model": "gpt-5.4-mini"}),
+        ],
+        answered_by='"response.completed"',
+        answers_due=(0, 0, 2),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        replies=[
+            [_on_lane(_responses_turn_started("gpt-5.4"), "slow")],
+            [
+                *(_on_lane(frame, "fast") for frame in _responses_turn("gpt-5.4-mini")),
+                _on_lane(_responses_turn_ended("gpt-5.4"), "slow"),
+            ],
+        ]
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, gate)
+
+    rows: Final = [logged.kwargs for logged in relayed.success_handler.call_args_list]
+    assert [[(frame["stream_id"], frame["response"]["model"]) for frame in row["response_body"]] for row in rows] == [
+        [("fast", "gpt-5.4-mini"), ("fast", "gpt-5.4-mini")],
+        [("slow", "gpt-5.4"), ("slow", "gpt-5.4")],
+    ]
+    assert [row["litellm_params"]["metadata"]["model_group"] for row in rows] == ["gpt-5.4-mini", "gpt-5.4"]
+    assert [row["litellm_params"]["metadata"][MODEL_ACCESS_GROUP_METADATA_KEY] for row in rows] == [
+        ["tier-a"],
+        ["tier-b"],
+    ]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("stream_id", ["", 7])
+async def test_websocket_passthrough_refuses_a_frame_on_a_lane_the_provider_error_cannot_name(stream_id):
+    """
+    The provider refuses a frame with an invalid stream_id through an error that
+    names no lane (OpenAI WebSocket mode guide, "Errors to handle", read
+    2026-11-02, which also says an empty stream_id is invalid). Relayed, that
+    error would refuse a turn waiting on the default lane instead, and that turn
+    would reach spend without the groups its own frame asked for.
+    """
+    gate: Final = RecordingFrameModelGate()
+    allowed: Final = json.dumps({"type": "response.create", "model": "gpt-5.4-mini"})
+
+    relayed: Final = await _relay_client_frames(
+        [allowed, json.dumps({"type": "response.create", "stream_id": stream_id, "model": "gpt-5.4-mini"})], gate
+    )
+
+    assert [sent.args[0] for sent in relayed.upstream.send.await_args_list] == [allowed]
+    assert json.loads(relayed.client.send_text.await_args.args[0])["type"] == "error"
+    assert relayed.client.close.await_args.kwargs["code"] == 1008
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_charges_realtime_turns_to_the_session_the_key_opened():
+    """
+    A realtime session runs the model it was opened on, so its turns stay
+    charged to the groups and the model the key opened it with, whatever model
+    a later session.update or response.create names.
+    """
+    gate: Final = RecordingFrameModelGate(groups=MappingProxyType({"gpt-realtime-2.1-mini": ("tier-b",)}))
+    client: Final = _turn_taking_client(
+        [
+            json.dumps({"type": "session.update", "session": {"model": "gpt-realtime-2.1-mini"}}),
+            json.dumps({"type": "response.create", "response": {"model": "gpt-realtime-2.1-mini"}}),
+        ],
+        answered_by='"type"',
+        answers_due=(1, 2, 4),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        REALTIME_SESSION_CREATED,
+        replies=[
+            [json.dumps({"type": "session.updated"})],
+            [json.dumps({"type": "response.created", "response": {"status": "in_progress"}}), REALTIME_RESPONSE_DONE],
+        ],
+    )
+
+    relayed: Final = await _relay_turns(
+        client,
+        upstream_ws,
+        gate,
+        "/openai/v1/realtime",
+        target="wss://api.openai.com/v1/realtime?model=gpt-realtime-2.1",
+        opening_access_groups=("tier-a",),
+    )
+
+    assert gate.checked == ["gpt-realtime-2.1-mini", "gpt-realtime-2.1-mini"]
+    rows: Final = [logged.kwargs for logged in relayed.success_handler.call_args_list]
+    assert [row["litellm_params"]["metadata"][MODEL_ACCESS_GROUP_METADATA_KEY] for row in rows] == [["tier-a"]]
+    assert [row["litellm_params"]["metadata"]["model_group"] for row in rows] == ["gpt-realtime-2.1"]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_logs_no_spend_row_for_a_session_refused_before_any_answer():
+    """A session refused at its first frame ran nothing, so its only record is the refusal, not an extra $0 row"""
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-5.4": KEY_MODEL_REFUSAL}))
+    client: Final = _turn_taking_client([json.dumps({"type": "response.create", "model": "gpt-5.4"})], answered_by='"error"')
+
+    relayed: Final = await _relay_turns(client, ScriptedUpstreamWebSocket(), gate)
+
+    assert relayed.success_handler.call_args_list == []
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_logs_the_unfinished_turn_a_client_walked_out_of():
+    """
+    A client can leave while a later turn is still running. That turn never
+    ends, but it was started and may be billed, so it still gets its own row.
+    """
+    client: Final = _turn_taking_client(
+        [
+            json.dumps({"type": "response.create", "model": "gpt-5.4-mini"}),
+            json.dumps({"type": "response.create", "model": "gpt-5.4"}),
+        ],
+        answered_by='"response.created"',
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        replies=[_responses_turn("gpt-5.4-mini"), [_responses_turn_started("gpt-5.4")]]
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate())
+
+    assert [
+        [json.loads(frame)["type"] if isinstance(frame, str) else frame["type"] for frame in logged.kwargs["response_body"]]
+        for logged in relayed.success_handler.call_args_list
+    ] == [["response.created", "response.completed"], ["response.created"]]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_charges_each_lane_a_client_walked_out_of_to_the_frame_that_started_it():
+    """
+    A client can leave while turns on several stream_id lanes are still
+    running. Each unfinished turn still gets its own row, under the groups and
+    model its own frame asked for.
+    """
+    gate: Final = RecordingFrameModelGate(
+        groups=MappingProxyType({"gpt-5.4-mini": ("tier-a",), "gpt-5.4": ("tier-b",)}),
+    )
+    client: Final = _turn_taking_client(
+        [
+            json.dumps({"type": "response.create", "stream_id": "slow", "model": "gpt-5.4"}),
+            json.dumps({"type": "response.create", "stream_id": "fast", "model": "gpt-5.4-mini"}),
+        ],
+        answered_by='"response.created"',
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        replies=[
+            [_on_lane(_responses_turn_started("gpt-5.4"), "slow")],
+            [_on_lane(_responses_turn_started("gpt-5.4-mini"), "fast")],
+        ]
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, gate)
+
+    rows: Final = [logged.kwargs for logged in relayed.success_handler.call_args_list]
+    assert [[frame["stream_id"] for frame in row["response_body"]] for row in rows] == [["slow"], ["fast"]]
+    assert [row["litellm_params"]["metadata"]["model_group"] for row in rows] == ["gpt-5.4", "gpt-5.4-mini"]
+    assert [row["litellm_params"]["metadata"][MODEL_ACCESS_GROUP_METADATA_KEY] for row in rows] == [
+        ["tier-b"],
+        ["tier-a"],
+    ]
+
+
+class UpstreamFinishingTheTurnAfterTheClientLeft:
+    """Starts a turn for each client frame, unless it only answers once the client left, sends the rest of the session
+    once the client left, and stops once closed"""
+
+    def __init__(
+        self,
+        client_left: asyncio.Event,
+        started: str | None,
+        rest_of_the_turn: Sequence[str],
+        opening: Sequence[str] = (),
+    ):
+        self._frames: asyncio.Queue[str | None] = asyncio.Queue()
+        for frame in opening:
+            self._frames.put_nowait(frame)
+        self._client_left = client_left
+        self._started = started
+        self._rest_of_the_turn = rest_of_the_turn
+        self._closed = False
+        self._finishing: list[asyncio.Task[None]] = []
+        self.send = AsyncMock(side_effect=self._start_turn)
+        self.close = AsyncMock(side_effect=self._close)
+
+    def _close(self, *args: object, **kwargs: object) -> None:
+        self._closed = True
+        self._frames.put_nowait(None)
+
+    async def _start_turn(self, frame: str | bytes) -> None:
+        if self._started is not None:
+            self._frames.put_nowait(self._started)
+        if not self._finishing:
+            self._finishing.append(asyncio.create_task(self._finish_once_the_client_left()))
+
+    async def _finish_once_the_client_left(self) -> None:
+        await self._client_left.wait()
+        for frame in self._rest_of_the_turn:
+            await asyncio.sleep(0)
+            if self._closed:
+                return
+            self._frames.put_nowait(frame)
+
+    async def recv(self, decode: bool | None = None) -> str:
+        from websockets.exceptions import ConnectionClosedOK
+        from websockets.frames import Close
+
+        frame: Final = await self._frames.get()
+        if frame is None:
+            raise ConnectionClosedOK(rcvd=Close(1000, ""), sent=Close(1000, ""), rcvd_then_sent=True)
+        return frame
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("hang_up_read_before_the_next_send", [True, False], ids=["read_first", "found_by_a_send"])
+async def test_websocket_passthrough_bills_the_turn_a_client_walked_out_of_once_the_provider_ends_it(
+    hang_up_read_before_the_next_send: bool,
+):
+    """
+    Leaving mid-answer must not make a turn free. The provider keeps running and
+    bills it, so the gateway keeps reading until the turn ends and logs its usage,
+    whether it reads the hang-up first or finds it by failing to relay a frame.
+    """
+    client_left: Final = asyncio.Event()
+    client: Final = _walking_out_client(
+        [json.dumps({"type": "response.create", "model": "gpt-5.4"})],
+        '"response.created"',
+        None,
+        client_left,
+        hang_up_read_before_the_next_send,
+    )
+    upstream_ws: Final = UpstreamFinishingTheTurnAfterTheClientLeft(
+        client_left,
+        _responses_turn_started("gpt-5.4"),
+        (json.dumps({"type": "response.output_text.delta", "delta": "Hi"}), _responses_turn_ended("gpt-5.4")),
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), walkout_turn_drain_seconds=5)
+
+    assert [
+        [json.loads(frame)["type"] if isinstance(frame, str) else frame["type"] for frame in logged.kwargs["response_body"]]
+        for logged in relayed.success_handler.call_args_list
+    ] == [["response.created", "response.output_text.delta", "response.completed"]]
+    upstream_ws.close.assert_awaited()
+
+
+def _walking_out_client(
+    frames: Sequence[str],
+    answered_by: str,
+    answers_due: Sequence[int] | None,
+    client_left: asyncio.Event,
+    hang_up_read_before_the_next_send: bool = True,
+) -> MagicMock:
+    """A turn-taking client that sets client_left as it hangs up, which the gateway either reads at once or only finds
+    when its next send to the client fails"""
+    from starlette.websockets import WebSocketDisconnect, WebSocketState
+
+    send_failed: Final = asyncio.Event()
+    client: Final = _turn_taking_client(frames, answered_by, answers_due)
+    receive: Final = client.receive
+    send_text: Final = client.send_text
+
+    async def receive_until_leaving() -> Mapping[str, object]:
+        message: Final = await receive()
+        if message["type"] == "websocket.disconnect":
+            client_left.set()
+            if not hang_up_read_before_the_next_send:
+                await send_failed.wait()
+            client.client_state = WebSocketState.DISCONNECTED
+        return message
+
+    async def send_text_until_leaving(text: str) -> None:
+        if client_left.is_set():
+            send_failed.set()
+            raise WebSocketDisconnect(code=1006)
+        await send_text(text)
+
+    client.receive = receive_until_leaving
+    client.send_text = AsyncMock(side_effect=send_text_until_leaving)
+    return client
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("turns", [1, 2], ids=["one_turn", "two_turns_asked_at_once"])
+async def test_websocket_passthrough_bills_the_turn_a_client_walked_out_of_before_the_provider_started_it(turns: int):
+    """
+    A client can ask for turns and leave before the provider says they started.
+    The provider still runs and bills each one, so the gateway keeps reading
+    until the last one ends and logs each one's usage.
+    """
+    client_left: Final = asyncio.Event()
+    client: Final = _walking_out_client(
+        [json.dumps({"type": "response.create", "model": "gpt-5.4"})] * turns,
+        '"response.created"',
+        (0,) * (turns + 1),
+        client_left,
+    )
+    upstream_ws: Final = UpstreamFinishingTheTurnAfterTheClientLeft(
+        client_left, None, (_responses_turn_started("gpt-5.4"), _responses_turn_ended("gpt-5.4")) * turns
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), walkout_turn_drain_seconds=5)
+
+    assert _logged_frame_types(relayed) == [["response.created", "response.completed"]] * turns
+    upstream_ws.close.assert_awaited()
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("hang_up_read_before_the_next_send", [True, False], ids=["read_first", "found_by_a_send"])
+async def test_websocket_passthrough_bills_a_realtime_turn_a_client_walked_out_of_while_the_provider_stored_its_input(
+    hang_up_read_before_the_next_send: bool,
+):
+    """
+    A realtime client can add an item, ask for a turn, and leave at once. The
+    provider confirms the item before it starts the turn, and that confirmation
+    must not end the session while the turn it was asked for is still owed.
+    """
+    client_left: Final = asyncio.Event()
+    client: Final = _walking_out_client(
+        [
+            json.dumps({"type": "conversation.item.create", "item": {"type": "message", "role": "user"}}),
+            json.dumps({"type": "response.create"}),
+        ],
+        '"session.created"',
+        (1, 1, 1),
+        client_left,
+        hang_up_read_before_the_next_send,
+    )
+    upstream_ws: Final = UpstreamFinishingTheTurnAfterTheClientLeft(
+        client_left,
+        None,
+        (
+            json.dumps({"type": "conversation.item.created", "item": {"type": "message", "role": "user"}}),
+            json.dumps({"type": "response.created", "response": {"status": "in_progress"}}),
+            REALTIME_RESPONSE_DONE,
+        ),
+        opening=(REALTIME_SESSION_CREATED,),
+    )
+
+    relayed: Final = await _relay_turns(
+        client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime", walkout_turn_drain_seconds=5
+    )
+
+    assert _logged_frame_types(relayed) == [
+        ["session.created", "conversation.item.created", "response.created", "response.done"]
+    ]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_bills_a_realtime_turn_a_client_walked_out_of_after_the_provider_started_one_itself():
+    """
+    A realtime provider can start a turn on its own when voice detection hears
+    the user stop. That turn answers no client frame, so a turn the client asks
+    for next and leaves before it starts is still owed and still billed.
+    """
+    realtime_response_created: Final = json.dumps({"type": "response.created", "response": {"status": "in_progress"}})
+    client_left: Final = asyncio.Event()
+    client: Final = _walking_out_client(
+        [json.dumps({"type": "response.create"})], '"response.done"', (1, 1), client_left
+    )
+    upstream_ws: Final = UpstreamFinishingTheTurnAfterTheClientLeft(
+        client_left,
+        None,
+        (realtime_response_created, REALTIME_RESPONSE_DONE),
+        opening=(REALTIME_SESSION_CREATED, realtime_response_created, REALTIME_RESPONSE_DONE),
+    )
+
+    relayed: Final = await _relay_turns(
+        client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime", walkout_turn_drain_seconds=5
+    )
+
+    assert _logged_frame_types(relayed) == [
+        ["session.created", "response.created", "response.done"],
+        ["session.created", "response.created", "response.done"],
+    ]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "answer",
+    [
+        _responses_turn("gpt-5.4"),
+        [_responses_turn_ended("gpt-5.4")],
+        [_responses_error("previous_response_not_found")],
+    ],
+    ids=["finished", "finished_with_no_start_frame", "refused"],
+)
+async def test_websocket_passthrough_lets_go_of_the_provider_at_once_when_a_client_leaves_owing_no_turn(
+    answer: Sequence[str],
+):
+    """
+    Once every turn a client asked for has ended or been refused, nothing more
+    can be billed, so a client leaving closes the provider socket right away
+    instead of holding it for the walkout drain.
+    """
+    client: Final = _turn_taking_client(
+        [json.dumps({"type": "response.create", "model": "gpt-5.4"})],
+        answered_by=json.dumps(json.loads(answer[-1])["type"]),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(replies=[answer])
+
+    relayed: Final = await _relay_turns(
+        client, upstream_ws, RecordingFrameModelGate(), walkout_turn_drain_seconds=WALKOUT_TURN_DRAIN_SECONDS
+    )
+
+    upstream_ws.close.assert_awaited()
+    assert len(relayed.success_handler.call_args_list) == 1
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_logs_no_extra_row_for_what_the_provider_sends_after_the_last_turn():
+    """
+    A realtime provider follows each finished turn with frames that start no
+    turn, such as rate_limits.updated. The session ends with nothing running,
+    so its turn is its only row and the request count stays one per turn.
+    """
+    client: Final = _turn_taking_client([json.dumps({"type": "response.create"})], answered_by='"rate_limits.updated"')
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        REALTIME_SESSION_CREATED,
+        replies=[[REALTIME_RESPONSE_DONE, json.dumps({"type": "rate_limits.updated", "rate_limits": []})]],
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime")
+
+    assert [
+        [frame["type"] for frame in logged.kwargs["response_body"]]
+        for logged in relayed.success_handler.call_args_list
+    ] == [["session.created", "response.done"]]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_carries_the_session_the_provider_opened_into_every_later_turn():
+    """
+    A realtime provider names the session's model once, when it opens the
+    session, and never again. Each later turn logs on its own, so it has to
+    carry that opening frame or it would be priced as a model nobody named.
+    """
+    client: Final = _turn_taking_client(
+        [json.dumps({"type": "response.create"}), json.dumps({"type": "response.create"})],
+        answered_by='"response.done"',
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        REALTIME_SESSION_CREATED, replies=[[REALTIME_RESPONSE_DONE], [REALTIME_RESPONSE_DONE]]
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime")
+
+    assert [
+        [frame["type"] for frame in logged.kwargs["response_body"]]
+        for logged in relayed.success_handler.call_args_list
+    ] == [["session.created", "response.done"], ["session.created", "response.done"]]
+
+
+REALTIME_TRANSCRIPTION_COMPLETED: Final = json.dumps(
+    {
+        "type": "conversation.item.input_audio_transcription.completed",
+        "item_id": "item_fake",
+        "transcript": "hello",
+        "usage": {"type": "duration", "seconds": 2},
+    }
+)
+TRANSCRIPTION_COMPLETED: Final = "conversation.item.input_audio_transcription.completed"
+
+
+def _transcription_session_update(frame_type: str, model: str) -> str:
+    return json.dumps({"type": frame_type, "session": {"audio": {"input": {"transcription": {"model": model}}}}})
+
+
+def _logged_frame_types(relayed: SimpleNamespace) -> list[list[str]]:
+    return [
+        [frame["type"] for frame in logged.kwargs["response_body"]]
+        for logged in relayed.success_handler.call_args_list
+    ]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_bills_a_clip_transcribed_after_the_last_answer():
+    client: Final = _turn_taking_client(
+        [_transcription_session_update("session.update", "gpt-transcribe"), json.dumps({"type": "response.create"})],
+        answered_by='"type"',
+        answers_due=(1, 2, 4),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        REALTIME_SESSION_CREATED,
+        replies=[
+            [_transcription_session_update("session.updated", "gpt-transcribe")],
+            [REALTIME_RESPONSE_DONE, REALTIME_TRANSCRIPTION_COMPLETED],
+        ],
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime")
+
+    assert _logged_frame_types(relayed) == [
+        ["session.created", "session.updated", "response.done"],
+        ["session.created", "session.updated", TRANSCRIPTION_COMPLETED],
+    ]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_bills_a_clip_transcribed_during_an_answer_in_that_answer_row():
+    client: Final = _turn_taking_client(
+        [json.dumps({"type": "response.create"})], answered_by='"type"', answers_due=(1, 4)
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        REALTIME_SESSION_CREATED,
+        replies=[
+            [
+                json.dumps({"type": "response.created", "response": {"status": "in_progress"}}),
+                REALTIME_TRANSCRIPTION_COMPLETED,
+                REALTIME_RESPONSE_DONE,
+            ]
+        ],
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime")
+
+    assert _logged_frame_types(relayed) == [
+        ["session.created", "response.created", TRANSCRIPTION_COMPLETED, "response.done"]
+    ]
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_carries_only_the_latest_session_update_into_later_rows():
+    client: Final = _turn_taking_client(
+        [
+            _transcription_session_update("session.update", "gpt-transcribe-a"),
+            json.dumps({"type": "response.create"}),
+            _transcription_session_update("session.update", "gpt-transcribe-b"),
+            json.dumps({"type": "response.create"}),
+        ],
+        answered_by='"type"',
+        answers_due=(1, 2, 3, 4, 5),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        REALTIME_SESSION_CREATED,
+        replies=[
+            [_transcription_session_update("session.updated", "gpt-transcribe-a")],
+            [REALTIME_RESPONSE_DONE],
+            [_transcription_session_update("session.updated", "gpt-transcribe-b")],
+            [REALTIME_RESPONSE_DONE],
+        ],
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime")
+
+    last_row: Final = relayed.success_handler.call_args_list[-1].kwargs["response_body"]
+    assert [frame for frame in last_row if frame["type"] == "session.updated"] == [
+        json.loads(_transcription_session_update("session.updated", "gpt-transcribe-b"))
+    ]
+    assert len(relayed.success_handler.call_args_list) == 2
+
+
+@pytest.mark.asyncio
+async def test_websocket_passthrough_keeps_the_session_update_a_clip_ran_under_until_its_answer_is_billed():
+    client: Final = _turn_taking_client(
+        [
+            _transcription_session_update("session.update", "gpt-transcribe-a"),
+            json.dumps({"type": "response.create"}),
+            _transcription_session_update("session.update", "gpt-transcribe-b"),
+        ],
+        answered_by='"type"',
+        answers_due=(1, 2, 4, 6),
+    )
+    upstream_ws: Final = ScriptedUpstreamWebSocket(
+        REALTIME_SESSION_CREATED,
+        replies=[
+            [_transcription_session_update("session.updated", "gpt-transcribe-a")],
+            [
+                json.dumps({"type": "response.created", "response": {"status": "in_progress"}}),
+                REALTIME_TRANSCRIPTION_COMPLETED,
+            ],
+            [_transcription_session_update("session.updated", "gpt-transcribe-b"), REALTIME_RESPONSE_DONE],
+        ],
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, RecordingFrameModelGate(), "/openai/v1/realtime")
+
+    assert _logged_frame_types(relayed) == [
+        [
+            "session.created",
+            "session.updated",
+            "response.created",
+            TRANSCRIPTION_COMPLETED,
+            "session.updated",
+            "response.done",
+        ]
+    ]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "later_frame",
+    [
+        json.dumps({"type": "response.create", "model": "gpt-5.4"}),
+        '{"type": "response.create", "model": "gpt-5.4-mini", "metadata": ' + "[" * 100_000 + "]" * 100_000 + "}",
+        (
+            '{"type": "response.create", "model": "gpt-5.4-mini", "seed": '
+            + "9" * (sys.get_int_max_str_digits() + 1)
+            + "}"
+        ),
+    ],
+    ids=["names_a_denied_model", "nests_too_deep_to_parse", "holds_a_number_too_long_to_parse"],
+)
+async def test_websocket_passthrough_still_bills_the_answer_in_flight_when_a_later_frame_is_refused(later_frame: str):
+    """
+    A refused frame closes the client while the provider may still be sending the
+    answer to an earlier, allowed frame. That answer cannot go to a closed client,
+    but the provider bills it once it ends, so the gateway keeps reading until it
+    ends and its usage reaches spend.
+    """
+    gate: Final = RecordingFrameModelGate(MappingProxyType({"gpt-5.4": KEY_MODEL_REFUSAL}))
+    client: Final = _turn_taking_client(
+        [json.dumps({"type": "response.create", "model": "gpt-5.4-mini"}), later_frame],
+        answered_by='"response.created"',
+    )
+    refused: Final = asyncio.Event()
+    close_client: Final = client.close.side_effect
+
+    def close_client_and_note_the_refusal(*args: object, **kwargs: object) -> None:
+        close_client(*args, **kwargs)
+        refused.set()
+
+    client.close = AsyncMock(side_effect=close_client_and_note_the_refusal)
+    upstream_ws: Final = UpstreamFinishingTheTurnAfterTheClientLeft(
+        refused, _responses_turn_started("gpt-5.4-mini"), (_responses_turn_ended("gpt-5.4-mini"),)
+    )
+
+    relayed: Final = await _relay_turns(client, upstream_ws, gate, walkout_turn_drain_seconds=5)
+
+    assert [json.loads(text.args[0])["type"] for text in client.send_text.await_args_list] == [
+        "response.created",
+        "error",
+    ]
+    assert [
+        [frame["type"] for frame in logged.kwargs["response_body"]]
+        for logged in relayed.success_handler.call_args_list
+    ] == [["response.created", "response.completed"]]
+    relayed.proxy_logging.post_call_failure_hook.assert_not_awaited()
+
+
 DEEPGRAM_LISTEN_TARGET = "wss://api.deepgram.com/v1/listen?model=nova-3&encoding=linear16&sample_rate=16000"
 DEEPGRAM_INTERIM_FRAME = json.dumps(
     {
@@ -8962,6 +10461,32 @@ def test_passthrough_client_cannot_forge_session_id_omission(client_metadata_key
     )
 
 
+async def _billed_metadata(gate: WebsocketFrameModelGate) -> Mapping[str, object]:
+    served: Final = await _relay_client_frames(
+        [json.dumps({"type": "response.create", "model": "gpt-5.4-mini"})],
+        gate,
+        UserAPIKeyAuth(api_key="hashed-key"),
+    )
+    return served.success_handler.call_args.kwargs["litellm_params"]["metadata"]
+
+
+@pytest.mark.asyncio
+async def test_websocket_session_is_charged_to_the_group_its_frames_were_authorized_through():
+    """A websocket names its model in a frame, long after the relay built its logging metadata, so the
+    groups the gate matched have to be picked up at the end or the group pays for nothing it allowed."""
+    metadata: Final = await _billed_metadata(RecordingFrameModelGate(groups=MappingProxyType({"gpt-5.4-mini": ("tier-a",)})))
+
+    assert metadata[MODEL_ACCESS_GROUP_METADATA_KEY] == ["tier-a"]
+    assert metadata["user_api_key"] == "hashed-key"
+
+
+@pytest.mark.asyncio
+async def test_websocket_session_that_matched_no_group_is_charged_to_none():
+    metadata: Final = await _billed_metadata(RecordingFrameModelGate())
+
+    assert not metadata[MODEL_ACCESS_GROUP_METADATA_KEY]
+
+
 _GEMINI_FLASH_TARGET: Final = "https://generativelanguage.googleapis.com/v1beta/models/gemini-3.8-flash:generateContent"
 _VERTEX_FLASH_TARGET: Final = (
     "https://us-east5-aiplatform.googleapis.com/v1/projects/p/locations/us-east5"
diff --git a/tests/unit/proxy/pass_through_endpoints/test_success_handler.py b/tests/unit/proxy/pass_through_endpoints/test_success_handler.py
index cf00545f331..4934573a777 100644
--- a/tests/unit/proxy/pass_through_endpoints/test_success_handler.py
+++ b/tests/unit/proxy/pass_through_endpoints/test_success_handler.py
@@ -652,6 +652,59 @@ def test_vertex_ai_live_route_without_usage_frames_yields_no_logging_response(
     assert normalized["kwargs"] == {"model": _LIVE_MODEL}
 
 
+REALTIME_FRAMES: Final = [
+    {"type": "session.created", "session": {"id": "sess_fake", "model": "gpt-realtime-2.1"}},
+    {
+        "type": "response.done",
+        "response": {
+            "usage": {
+                "input_tokens": 33,
+                "output_tokens": 16,
+                "total_tokens": 49,
+                "input_token_details": {"text_tokens": 33, "audio_tokens": 0, "cached_tokens": 0},
+                "output_token_details": {"text_tokens": 16, "audio_tokens": 0},
+            }
+        },
+    },
+]
+
+
+def _normalize(url_route: str, response_body: dict[str, object] | list[dict[str, object]]) -> dict:
+    logging_obj: Final = MagicMock(model_call_details={}, litellm_call_id="call-fake")
+    return PassThroughEndpointLogging().normalize_llm_passthrough_logging_payload(
+        httpx_response=MagicMock(spec=httpx.Response),
+        response_body=response_body,
+        request_body={},
+        logging_obj=logging_obj,
+        url_route=url_route,
+        result="websocket_connection_successful",
+        start_time=_START,
+        end_time=_END,
+        cache_hit=False,
+        litellm_call_id="call-fake",
+    )
+
+
+@pytest.mark.parametrize("url_route", ["/openai/v1/realtime", "/openai_passthrough/v1/realtime"])
+def test_openai_websocket_frames_reach_the_websocket_cost_handler(url_route):
+    normalized: Final = _normalize(url_route, REALTIME_FRAMES)
+
+    assert normalized["kwargs"]["model"] == "gpt-realtime-2.1"
+    assert normalized["kwargs"]["custom_llm_provider"] == "openai"
+    prices: Final = litellm.model_cost["gpt-realtime-2.1"]
+    assert normalized["kwargs"]["response_cost"] == pytest.approx(
+        33 * prices["input_cost_per_token"] + 16 * prices["output_cost_per_token"]
+    )
+    assert normalized["standard_logging_response_object"].usage.total_tokens == 49
+
+
+def test_openai_http_passthrough_bodies_are_left_to_the_http_handlers():
+    normalized: Final = _normalize("/openai/v1/responses", {"model": "gpt-5.4-mini", "usage": {"input_tokens": 13}})
+
+    assert normalized["standard_logging_response_object"] is None
+    assert normalized["kwargs"] == {"litellm_call_id": "call-fake"}
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("cancel_mode", ["once", "twice", "scope", "none"])
 @pytest.mark.parametrize("cancel_phase", ["allocation", "lock"])
diff --git a/tests/unit/proxy/proxy_server/conftest.py b/tests/unit/proxy/proxy_server/conftest.py
index 6cd9f1cd0ba..fdd251968e5 100644
--- a/tests/unit/proxy/proxy_server/conftest.py
+++ b/tests/unit/proxy/proxy_server/conftest.py
@@ -17,6 +17,8 @@ from unittest.mock import AsyncMock, MagicMock
 import pytest
 
 if TYPE_CHECKING:
+    import respx
+
     from litellm import Router
 
 from tests.unit.proxy.router_entry_point_stubs import route_entry_points_to_stubs
@@ -563,3 +565,72 @@ def openai_only_router(monkeypatch: pytest.MonkeyPatch) -> Router:
     monkeypatch.setattr(proxy_server, "general_settings", {})
     monkeypatch.setattr(proxy_server, "user_model", None)
     return router
+
+
+@pytest.fixture
+def failed_spend_row(
+    monkeypatch: pytest.MonkeyPatch, respx_mock: respx.MockRouter
+) -> Iterator[Callable[[], tuple[str, str]]]:
+    """Route tts-1, whisper-1 and omni-moderation to an OpenAI deployment whose provider answers 400,
+    and return a reader for the (status, call_type) of the spend row the failure wrote."""
+    import litellm
+    from litellm import Router
+    from litellm.proxy import proxy_server
+    from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
+    from litellm.proxy.hooks.proxy_track_cost_callback import ProxyDBLogger
+    from litellm.proxy.proxy_server import ProxyConfig
+    from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+    from litellm.proxy.utils import ProxyLogging
+
+    api_base: Final = "https://failing-provider.example/v1"
+    respx_mock.post(url__startswith=api_base).respond(
+        400, json={"error": {"message": "rejected by the provider", "type": "invalid_request_error"}}
+    )
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": model_name,
+                "litellm_params": {
+                    "model": f"openai/{provider_model}",
+                    "api_base": api_base,
+                    "api_key": "provider-key",
+                    "max_retries": 0,
+                },
+            }
+            for model_name, provider_model in (
+                ("tts-1", "tts-1"),
+                ("whisper-1", "whisper-1"),
+                ("omni-moderation", "omni-moderation-latest"),
+            )
+        ],
+        num_retries=0,
+    )
+    cache: Final = UserApiKeyCache()
+    spend_writer: Final = MagicMock(update_database=AsyncMock())
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.setattr(litellm, "callbacks", [ProxyDBLogger(spend_writer=lambda: spend_writer)])
+    for name, value in (
+        ("llm_router", router),
+        ("llm_model_list", router.model_list),
+        ("prisma_client", None),
+        ("general_settings", {}),
+        ("user_model", None),
+        ("proxy_config", ProxyConfig()),
+        ("proxy_logging_obj", ProxyLogging(user_api_key_cache=cache)),
+        ("user_api_key_cache", cache),
+        ("version", "test-version"),
+    ):
+        monkeypatch.setattr(proxy_server, name, value)
+
+    def last_row() -> tuple[str, str]:
+        db_call: Final = spend_writer.update_database.call_args.kwargs
+        payload: Final = get_logging_payload(
+            kwargs=db_call["kwargs"],
+            response_obj=db_call["completion_response"],
+            start_time=db_call["start_time"],
+            end_time=db_call["end_time"],
+        )
+        return payload["status"], payload["call_type"]
+
+    yield last_row
+    ProxyLogging._callback_capabilities_cache.clear()
diff --git a/tests/unit/proxy/proxy_server/test_exception_handlers.py b/tests/unit/proxy/proxy_server/test_exception_handlers.py
index 0f9d379afa1..341875c7cca 100644
--- a/tests/unit/proxy/proxy_server/test_exception_handlers.py
+++ b/tests/unit/proxy/proxy_server/test_exception_handlers.py
@@ -36,9 +36,9 @@ from litellm.proxy.proxy_server import (
 from .conftest import normalize
 
 
-def _make_request(parent_otel_span=None, path="/chat/completions"):
+def _make_request(parent_otel_span=None, path="/chat/completions", headers=()):
     return Request({
-        "type": "http", "method": "POST", "path": path, "headers": [],
+        "type": "http", "method": "POST", "path": path, "headers": list(headers),
         "state": {"parent_otel_span": parent_otel_span},
     })
 
@@ -168,6 +168,182 @@ async def test_openai_exception_handler_never_fabricates_a_call_id(monkeypatch):
     assert "litellm_call_id" not in body["error"]
 
 
+def _model_access_denied_exception() -> ProxyException:
+    return ProxyException(
+        message="Team not allowed to access model. Tried to access gpt-5.6",
+        type="team_model_access_denied",
+        param="model",
+        code=403,
+    )
+
+
+_MESSAGES_ROUTES: Final = (
+    "/v1/messages",
+    "/v1/messages/count_tokens",
+    "/claude_code_gateway/v1/messages",
+    "/claude_code_gateway/v1/messages/count_tokens",
+)
+_ANTHROPIC_PASS_THROUGH_ROUTES: Final = (
+    "/anthropic/v1/messages",
+    "/anthropic/v1/messages/count_tokens",
+    "/anthropic/v1/models",
+)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("path", (*_MESSAGES_ROUTES, *_ANTHROPIC_PASS_THROUGH_ROUTES))
+async def test_openai_exception_handler_answers_the_anthropic_envelope_on_the_messages_routes(path: str) -> None:
+    response: Final = await openai_exception_handler(
+        request=_make_request(path=path), exc=_model_access_denied_exception()
+    )
+    body: Final = json.loads(response.body)
+
+    assert response.status_code == 403
+    assert body == {
+        "type": "error",
+        "error": {
+            "type": "permission_error",
+            "message": "Team not allowed to access model. Tried to access gpt-5.6",
+            "litellm_error_type": "team_model_access_denied",
+        },
+    }
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "status_code,anthropic_type",
+    [
+        (401, "authentication_error"),
+        (403, "permission_error"),
+        (404, "not_found_error"),
+        (429, "rate_limit_error"),
+        (402, "billing_error"),
+        (409, "conflict_error"),
+        (504, "timeout_error"),
+        (405, "invalid_request_error"),
+        (408, "api_error"),
+        (502, "api_error"),
+    ],
+)
+async def test_openai_exception_handler_maps_messages_failures_to_anthropic_error_types(
+    status_code: int, anthropic_type: str
+) -> None:
+    exc: Final = ProxyException(message="denied", type="key_model_access_denied", param="model", code=status_code)
+
+    response: Final = await openai_exception_handler(request=_make_request(path="/v1/messages"), exc=exc)
+
+    assert response.status_code == status_code
+    assert json.loads(response.body)["error"]["type"] == anthropic_type
+
+
+@pytest.mark.asyncio
+async def test_openai_exception_handler_keeps_the_status_of_a_budget_failure_on_messages() -> None:
+    exc: Final = ProxyException(message="Budget exceeded", type="budget_exceeded", param=None, code=422)
+
+    response: Final = await openai_exception_handler(
+        request=_make_request(path="/v1/messages/count_tokens"), exc=exc
+    )
+    body: Final = json.loads(response.body)
+
+    assert response.status_code == 422
+    assert body["type"] == "error"
+    assert body["error"]["type"] == "invalid_request_error"
+    assert body["error"]["message"] == "Budget exceeded"
+    assert body["error"]["litellm_error_type"] == "budget_exceeded"
+    assert "param" not in body["error"] and "code" not in body["error"]
+
+
+@pytest.mark.asyncio
+async def test_openai_exception_handler_keeps_the_openai_envelope_off_the_messages_routes() -> None:
+    response: Final = await openai_exception_handler(
+        request=_make_request(path="/v1/chat/completions"), exc=_model_access_denied_exception()
+    )
+    body: Final = json.loads(response.body)
+
+    assert response.status_code == 403
+    assert body == {
+        "error": {
+            "message": "Team not allowed to access model. Tried to access gpt-5.6",
+            "type": "team_model_access_denied",
+            "param": "model",
+            "code": "403",
+        }
+    }
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("path", ("/v1/models", "/models", "/claude_code_gateway/v1/models"))
+async def test_a_model_list_request_answers_errors_in_the_shape_its_listing_takes(path: str) -> None:
+    anthropic: Final = await openai_exception_handler(
+        request=_make_request(path=path, headers=[(b"anthropic-version", b"2023-06-01")]),
+        exc=_model_access_denied_exception(),
+    )
+    openai: Final = await openai_exception_handler(
+        request=_make_request(path=path), exc=_model_access_denied_exception()
+    )
+
+    assert json.loads(anthropic.body)["error"]["type"] == "permission_error"
+    assert json.loads(anthropic.body)["type"] == "error"
+    assert json.loads(openai.body)["error"]["type"] == "team_model_access_denied"
+    assert "type" not in json.loads(openai.body)
+
+
+@pytest.mark.asyncio
+async def test_openai_exception_handler_keeps_the_openai_envelope_on_other_anthropic_routes() -> None:
+    response: Final = await openai_exception_handler(
+        request=_make_request(path="/v1/skills"), exc=_model_access_denied_exception()
+    )
+    body: Final = json.loads(response.body)
+
+    assert response.status_code == 403
+    assert "type" not in body
+    assert body["error"]["type"] == "team_model_access_denied"
+
+
+@pytest.mark.asyncio
+async def test_openai_exception_handler_messages_route_copies_the_call_id_when_opted_in(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {"include_call_id_in_error_body": True})
+    exc: Final = ProxyException(
+        message="denied",
+        type="team_model_access_denied",
+        param="model",
+        code=403,
+        headers={"x-litellm-call-id": "call-8302"},
+        provider_specific_fields={"guardrail": "keyword-block"},
+    )
+
+    response: Final = await openai_exception_handler(request=_make_request(path="/v1/messages"), exc=exc)
+    body: Final = json.loads(response.body)
+
+    assert response.headers["x-litellm-call-id"] == "call-8302"
+    assert body["error"] == {
+        "type": "permission_error",
+        "message": "denied",
+        "provider_specific_fields": {"guardrail": "keyword-block"},
+        "litellm_error_type": "team_model_access_denied",
+        "litellm_call_id": "call-8302",
+    }
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("path", ("/v1/messages", "/anthropic/v1/messages"))
+async def test_a_messages_request_with_no_key_answers_the_anthropic_authentication_error(
+    client: TestClient, monkeypatch: pytest.MonkeyPatch, path: str
+) -> None:
+    monkeypatch.setattr("litellm.proxy.proxy_server.master_key", "test-master-key")
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {})
+
+    response: Final = client.post(path, json={"model": "gpt-4", "messages": [{"role": "user", "content": "hi"}]})
+    body: Final = response.json()
+
+    assert response.status_code == 401
+    assert body["type"] == "error"
+    assert body["error"]["type"] == "authentication_error"
+    assert "param" not in body["error"]
+
+
 # ---------------------------------------------------------------------------
 # _close_dangling_otel_server_span
 # ---------------------------------------------------------------------------
@@ -467,6 +643,22 @@ async def test_otel_unhandled_exception_handler_answers_a_db_outage_with_503_no_
     assert json.loads(response.body) == _DB_OUTAGE_503_BODY
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize("path", ("/v1/messages", "/claude_code_gateway/v1/messages", "/anthropic/v1/messages"))
+async def test_otel_unhandled_exception_handler_answers_the_anthropic_api_error_on_the_messages_routes(
+    path: str,
+) -> None:
+    response: Final = await otel_unhandled_exception_handler(
+        request=_make_request(path=path), exc=RuntimeError("kaboom")
+    )
+
+    assert response.status_code == 500
+    assert json.loads(response.body) == {
+        "type": "error",
+        "error": {"type": "api_error", "message": "Internal server error"},
+    }
+
+
 @pytest.mark.asyncio
 async def test_otel_unhandled_exception_handler_reraises_proxy_exception_error():
     """ProxyException / HTTPException / RequestValidationError are re-raised
@@ -541,6 +733,33 @@ async def test_http_exception_on_a_plain_http_request_keeps_the_default_json_bod
     assert json.loads(bytes(response.body)) == {"detail": "not found"}
 
 
+@pytest.mark.asyncio
+async def test_a_disabled_claude_code_gateway_answers_the_anthropic_not_found_error() -> None:
+    request: Final = _make_request(path="/claude_code_gateway/v1/messages")
+
+    response: Final = await otlp_http_exception_handler(
+        request, HTTPException(404, "Claude Code gateway is not enabled")
+    )
+
+    assert response is not None
+    assert response.status_code == 404
+    assert json.loads(bytes(response.body)) == {
+        "type": "error",
+        "error": {"type": "not_found_error", "message": "Claude Code gateway is not enabled"},
+    }
+
+
+def test_a_get_on_messages_answers_the_anthropic_envelope_and_keeps_the_allow_header(client: TestClient) -> None:
+    response: Final = client.get("/v1/messages")
+
+    assert response.status_code == 405
+    assert response.headers["allow"] == "POST"
+    assert response.json() == {
+        "type": "error",
+        "error": {"type": "invalid_request_error", "message": "Method Not Allowed"},
+    }
+
+
 @pytest.mark.asyncio
 async def test_http_exception_on_a_websocket_closed_before_accept_sends_nothing_more() -> None:
     sent: Final[list[Message]] = []
diff --git a/tests/unit/proxy/proxy_server/test_proxy_config.py b/tests/unit/proxy/proxy_server/test_proxy_config.py
index d9ff7fef9f9..55226fc629b 100644
--- a/tests/unit/proxy/proxy_server/test_proxy_config.py
+++ b/tests/unit/proxy/proxy_server/test_proxy_config.py
@@ -32,11 +32,13 @@ import litellm
 from litellm._logging import turn_on_json
 from litellm.proxy._types import CommonProxyErrors, ConfigGeneralSettings
 from litellm.proxy.common_utils.encrypt_decrypt_utils import encrypt_value_helper
+from litellm.proxy.config_resolvers.settings_store import SettingsStore
 from litellm.router_api import ApplyResult, RouterSettings
 from litellm.types.router import Deployment, LiteLLM_Params
 from litellm.proxy.proxy_server import (
     ProxyConfig,
     _is_remote_module_url,
+    _reload_settings_store,
     _scrub_db_overlay_remote_module_loads,
     _scrub_guardrail_inner,
     resolve_complexity_router_plugins,
@@ -70,6 +72,15 @@ def _db_model(model_id: str, model_name: str = "gpt-3.5-turbo") -> SimpleNamespa
     )
 
 
+def test_yaml_settings_reload_keeps_db_general_settings_until_sync() -> None:
+    settings: Final = SettingsStore("general_settings")
+    settings.apply_db_row("general_settings", {"max_file_downloads_per_minute": 2})
+
+    _reload_settings_store("general_settings", settings, {})
+
+    assert settings["max_file_downloads_per_minute"] == 2
+
+
 @pytest.mark.asyncio
 async def test_proxy_config_adds_and_deletes_stale_deployment(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
     from litellm.proxy import proxy_server
@@ -102,7 +113,9 @@ def test_proxy_config_upserts_existing_deployment_without_duplicating_it(monkeyp
 
 
 @pytest.mark.asyncio
-async def test_proxy_config_preserves_models_when_config_read_fails(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+async def test_proxy_config_preserves_models_when_config_read_fails(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
     from litellm.proxy import proxy_server
 
     router = litellm.Router(model_list=[_deployment("config-deployment").to_json(exclude_none=True)])
@@ -135,6 +148,8 @@ async def test_proxy_config_keeps_database_models_and_deletes_stale_models(
 
     assert desired == frozenset({"kept-deployment"})
     assert router.get_model_ids() == ["kept-deployment"]
+
+
 from tests._master_key import MASTER_KEY
 
 
@@ -150,7 +165,6 @@ async def test_proxy_config_loads_lens_store_from_yaml(tmp_path, monkeypatch) ->
     assert is_lens_tracing_enabled(settings["tracing"], {}) is True
 
 
-
 @pytest.mark.asyncio
 @pytest.mark.parametrize("shutdown_error", [False, True])
 async def test_tracing_config_automatically_exports_spend_without_a_storage_dependency(
@@ -176,7 +190,9 @@ async def test_tracing_config_automatically_exports_spend_without_a_storage_depe
     outcome: Final = pytest.raises(RuntimeError, match="shutdown failure") if shutdown_error else nullcontext()
     with outcome:
         async with manage_tracing(enabled=True, client_factory=client):
-            logger: Final = next(callback for callback in litellm._async_success_callback if isinstance(callback, LensExporter))
+            logger: Final = next(
+                callback for callback in litellm._async_success_callback if isinstance(callback, LensExporter)
+            )
             await logger.async_log_success_event(
                 {"standard_logging_object": {"id": "response-1", "response_cost": 0.25}}, None, None, None
             )
@@ -2693,7 +2709,6 @@ async def test_load_config_rejects_non_boolean_deny_by_default(
         await ProxyConfig().load_config(router=None, config_file_path=str(config_file))
 
 
-
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "yaml_value", ["files-api-2025-04-14", "[files-api-2025-04-14, 7]"], ids=["bare-string", "non-string-entry"]
@@ -2713,6 +2728,7 @@ async def test_load_config_rejects_a_malformed_vertex_drop_anthropic_betas_list(
     with pytest.raises(ValidationError, match="vertex_ai_pass_through_drop_anthropic_betas"):
         await ProxyConfig().load_config(router=None, config_file_path=str(config_file))
 
+
 @pytest.mark.asyncio
 async def test_ProxyConfig_load_config_resolves_router_settings_plugins(tmp_path, monkeypatch):
     """Regression: router_settings.plugins dotted-path strings must be resolved to
@@ -4470,6 +4486,86 @@ async def test_ProxyConfig__update_general_settings_updates_health_check_retenti
     reschedule.assert_awaited_once()
 
 
+@pytest.mark.asyncio
+async def test_ProxyConfig__update_general_settings_ignores_a_stored_key_no_settings_api_manages_and_warns_once(
+    monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {})
+    pc: Final = ProxyConfig()
+    stored_row: Final = {"enforce_user_param": True, "store_prompts_in_spend_logs": True}
+
+    with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
+        await pc._update_general_settings(stored_row)
+        await pc._update_general_settings(stored_row)
+    from litellm.proxy import proxy_server
+
+    assert proxy_server.general_settings["store_prompts_in_spend_logs"] is True
+    assert "enforce_user_param" not in proxy_server.general_settings
+    warnings: Final = [record.getMessage() for record in caplog.records if "enforce_user_param" in record.getMessage()]
+    assert warnings == [
+        "general_settings.enforce_user_param is stored in the database, but the proxy does not apply that stored "
+        "value, so it is ignored. Set it in the config file to use it, or remove it with POST /config/field/delete."
+    ]
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig__update_general_settings_warns_about_an_ignored_stored_key_the_config_file_also_sets(
+    monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {"enforce_user_param": False}})
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", pc.settings)
+
+    with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
+        await pc._update_general_settings({"enforce_user_param": True})
+    from litellm.proxy import proxy_server
+
+    assert proxy_server.general_settings["enforce_user_param"] is False
+    warnings: Final = [record.getMessage() for record in caplog.records if "enforce_user_param" in record.getMessage()]
+    assert warnings == [
+        "general_settings.enforce_user_param is stored in the database, but the proxy does not apply that stored "
+        "value, so it is ignored. The config file's value applies. Remove the stored copy with POST "
+        "/config/field/delete."
+    ]
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig__update_general_settings_does_not_warn_about_a_stored_copy_of_an_admin_ui_field(
+    monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {}})
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", pc.settings)
+
+    with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
+        await pc._update_general_settings({"budget_rollover": True, "enforce_user_param": True})
+
+    warned: Final = [record.getMessage().split(" ")[0] for record in caplog.records if "is ignored" in record.getMessage()]
+    assert warned == ["general_settings.enforce_user_param"]
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig__update_general_settings_warns_once_each_time_the_stored_row_stops_being_an_object(
+    monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {}})
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", pc.settings)
+
+    with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
+        await pc._update_general_settings(None)
+        await pc._update_general_settings('{"store_prompts_in_spend_logs": true}')
+        await pc._update_general_settings('{"store_prompts_in_spend_logs": true}')
+        await pc._update_general_settings({"store_prompts_in_spend_logs": True})
+        await pc._update_general_settings('{"store_prompts_in_spend_logs": true}')
+
+    warnings: Final = [record.getMessage() for record in caplog.records if "JSON object" in record.getMessage()]
+    assert warnings == [
+        "general_settings is stored in the database as something other than a JSON object, so the proxy ignores "
+        "every stored general setting."
+    ] * 2
+
+
 def _paused_scheduler(monkeypatch):
     from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
@@ -4918,9 +5014,6 @@ async def test_ProxyConfig__update_general_settings_none_input_noop():
     # None input returns early.
     result = await pc._update_general_settings(db_general_settings=None)
     assert result is None
-    # Error-style: dict() will fail on non-mapping non-None input.
-    with pytest.raises(TypeError):
-        await pc._update_general_settings(db_general_settings=12345)  # type: ignore[arg-type]
 
 
 @pytest.mark.asyncio
@@ -5080,7 +5173,9 @@ async def test_ProxyConfig__update_config_from_db_keeps_keys_the_config_file_omi
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("ui_settings_already_synced", [False, True])
-async def test_ProxyConfig_add_deployment_continues_after_null_pass_through_endpoints(monkeypatch, ui_settings_already_synced):
+async def test_ProxyConfig_add_deployment_continues_after_null_pass_through_endpoints(
+    monkeypatch: pytest.MonkeyPatch, ui_settings_already_synced: bool
+) -> None:
     from litellm.proxy import proxy_server
 
     pc = ProxyConfig()
@@ -5106,6 +5201,32 @@ async def test_ProxyConfig_add_deployment_continues_after_null_pass_through_endp
     assert settings_refresh.await_count == (0 if ui_settings_already_synced else 1)
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "stored_row, rebuilds_routes",
+    [({"pass_through_endpoints": []}, True), ('{"pass_through_endpoints": []}', False), ([], False)],
+    ids=["object", "json-string", "array"],
+)
+async def test_ProxyConfig_add_deployment_rebuilds_pass_through_routes_only_from_an_object_general_settings_row(
+    monkeypatch: pytest.MonkeyPatch, stored_row: object, rebuilds_routes: bool
+) -> None:
+    from litellm.proxy import proxy_server
+    from litellm.proxy.pass_through_endpoints import pass_through_endpoints
+
+    pc: Final = ProxyConfig()
+    rebuild_routes: Final = AsyncMock()
+    monkeypatch.setattr(proxy_server, "general_settings", {})
+    monkeypatch.setattr(proxy_server, "prefetch_config_params", AsyncMock())
+    monkeypatch.setattr(proxy_server, "get_config_param", AsyncMock(return_value=SimpleNamespace(param_value=stored_row)))
+    monkeypatch.setattr(pass_through_endpoints, "initialize_pass_through_endpoints_in_db", rebuild_routes)
+    monkeypatch.setattr(pc, "_should_load_db_object", lambda *, object_type: object_type == "pass_through_endpoints")
+    monkeypatch.setattr(pc, "get_credentials", AsyncMock())
+
+    await pc.add_deployment(prisma_client=MagicMock(), proxy_logging_obj=MagicMock(), ui_settings_already_synced=True)
+
+    assert rebuild_routes.await_count == (1 if rebuilds_routes else 0)
+
+
 # ---------------------------------------------------------------------------
 # ProxyConfig._update_config_from_db
 # ---------------------------------------------------------------------------
@@ -5285,9 +5406,7 @@ def revision_test_environment(monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.delenv(key)
 
 
-def _environment_variables_row(
-    values: Mapping[str, str | None] | None, revision: int | None
-) -> SimpleNamespace | None:
+def _environment_variables_row(values: Mapping[str, str | None] | None, revision: int | None) -> SimpleNamespace | None:
     if values is None:
         return None
     return SimpleNamespace(
@@ -5473,9 +5592,7 @@ async def test_environment_variables_row_read_before_an_overlapping_newer_sync_i
         await newer_sync_finished.wait()
 
     older_sync: Final = asyncio.create_task(
-        _sync_from(
-            pc, _config_database(read_older_row, AsyncMock(return_value=older_row), wait_for_the_newer_sync)
-        )
+        _sync_from(pc, _config_database(read_older_row, AsyncMock(return_value=older_row), wait_for_the_newer_sync))
     )
     await older_environment_row_read.wait()
     await _sync_from(pc, _rows_database(newer_row, newer_row))
diff --git a/tests/unit/proxy/proxy_server/test_routes_audio.py b/tests/unit/proxy/proxy_server/test_routes_audio.py
index 59d9490f786..9b39678f203 100644
--- a/tests/unit/proxy/proxy_server/test_routes_audio.py
+++ b/tests/unit/proxy/proxy_server/test_routes_audio.py
@@ -9,7 +9,9 @@ Pins (PR2):
 
 from __future__ import annotations
 
+import contextlib
 import io
+from typing import TYPE_CHECKING, Callable, Final
 from unittest.mock import AsyncMock, MagicMock
 
 import httpx
@@ -22,6 +24,9 @@ from litellm.proxy._types import ProxyErrorTypes, ProxyException
 from litellm.types.llms.openai import HttpxBinaryResponseContent
 from litellm.types.router import RouterErrors
 
+if TYPE_CHECKING:
+    from fastapi.testclient import TestClient
+
 _TAG_ROUTING_DENIAL = f"{RouterErrors.no_deployments_with_tag_routing.value}. Passed model=tts-1 and tags=['x']"
 
 
@@ -359,3 +364,32 @@ def test_audio_transcription_error(client, auth_as, patched_transcription_error,
         response = client.post(path, files=files, data=data)
     assert response.status_code == 500
     assert len(response.content) > 0
+
+
+def _post_speech(client: TestClient) -> httpx.Response:
+    return client.post("/v1/audio/speech", json={"model": "tts-1", "input": "Hi", "voice": "alloy"})
+
+
+def _post_transcription(client: TestClient) -> httpx.Response:
+    return client.post(
+        "/v1/audio/transcriptions",
+        files={"file": ("audio.mp3", b"\x00\x01\x02", "audio/mpeg")},
+        data={"model": "whisper-1"},
+    )
+
+
+@pytest.mark.parametrize(
+    ("send", "call_type"),
+    [(_post_speech, "aspeech"), (_post_transcription, "atranscription")],
+)
+def test_a_provider_rejection_logs_the_audio_endpoint_call_type(
+    client: TestClient,
+    auth_as: Callable[..., contextlib.AbstractContextManager[object]],
+    failed_spend_row: Callable[[], tuple[str, str]],
+    send: Callable[[TestClient], httpx.Response],
+    call_type: str,
+) -> None:
+    with auth_as():
+        response: Final = send(client)
+    assert response.status_code == 400, response.text
+    assert failed_spend_row() == ("failure", call_type)
diff --git a/tests/unit/proxy/proxy_server/test_routes_models.py b/tests/unit/proxy/proxy_server/test_routes_models.py
index 874f471f3e7..ff74cd3fa1d 100644
--- a/tests/unit/proxy/proxy_server/test_routes_models.py
+++ b/tests/unit/proxy/proxy_server/test_routes_models.py
@@ -58,6 +58,7 @@ def patched_models(monkeypatch):
     router.get_routable_upstream_model = MagicMock(return_value="gpt-4")
     router.get_configured_display_name = MagicMock(return_value=None)
     router.get_configured_service_tiers = MagicMock(return_value=())
+    router.get_configured_max_input_tokens = MagicMock(return_value=())
     router.get_model_group_info = MagicMock(return_value=None)
     router.get_search_tool_support = MagicMock(return_value=())
     route_entry_points_to_stubs(router)
diff --git a/tests/unit/proxy/proxy_server/test_routes_moderations.py b/tests/unit/proxy/proxy_server/test_routes_moderations.py
index 4553a5e7cf4..47452629ebf 100644
--- a/tests/unit/proxy/proxy_server/test_routes_moderations.py
+++ b/tests/unit/proxy/proxy_server/test_routes_moderations.py
@@ -7,12 +7,17 @@ Pins (PR2):
 
 from __future__ import annotations
 
+import contextlib
+from typing import TYPE_CHECKING, Callable, Final
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 
 from litellm.proxy import proxy_server
 
+if TYPE_CHECKING:
+    from fastapi.testclient import TestClient
+
 from .conftest import normalize  # type: ignore[import-not-found]
 
 HAPPY_RESPONSE = {
@@ -109,3 +114,14 @@ def test_moderation_error(client, auth_as, moderation_pipeline_raises, path):
         response = client.post(path, json=payload)
     assert response.status_code == 500
     assert len(response.content) > 0
+
+
+def test_a_provider_rejection_logs_the_moderation_call_type(
+    client: TestClient,
+    auth_as: Callable[..., contextlib.AbstractContextManager[object]],
+    failed_spend_row: Callable[[], tuple[str, str]],
+) -> None:
+    with auth_as():
+        response: Final = client.post("/v1/moderations", json={"model": "omni-moderation", "input": ["one", "two"]})
+    assert response.status_code == 400, response.text
+    assert failed_spend_row() == ("failure", "amoderation")
diff --git a/tests/unit/proxy/proxy_server/test_streaming_helpers.py b/tests/unit/proxy/proxy_server/test_streaming_helpers.py
index c37475bd539..80bed119e79 100644
--- a/tests/unit/proxy/proxy_server/test_streaming_helpers.py
+++ b/tests/unit/proxy/proxy_server/test_streaming_helpers.py
@@ -5,7 +5,6 @@ Pins covered:
 - ``async_assistants_data_generator``
 - ``_get_client_requested_model_for_streaming``
 - ``_restamp_streaming_chunk_model``
-- ``_fast_serialize_simple_model_response_stream``
 - ``_serialize_streaming_chunk``
 - ``_apply_streaming_chunk_hooks``
 - ``_format_streaming_sse_chunk``
@@ -16,8 +15,11 @@ Pins covered:
 from __future__ import annotations
 
 import asyncio
+import hashlib
 import json
-from collections.abc import AsyncIterator, Callable
+import logging
+from collections.abc import AsyncIterator, Callable, Mapping
+from types import MappingProxyType
 from typing import Final, Literal
 from unittest.mock import AsyncMock, MagicMock
 
@@ -36,7 +38,6 @@ from litellm.proxy._types import ProxyException, UserAPIKeyAuth
 from litellm.proxy.common_request_processing import create_response
 from litellm.proxy.proxy_server import (
     _apply_streaming_chunk_hooks,
-    _fast_serialize_simple_model_response_stream,
     _format_fallback_metadata_sse_event,
     _format_streaming_sse_chunk,
     _get_client_requested_model_for_streaming,
@@ -55,7 +56,16 @@ from litellm.types.llms.openai import (
     ResponseFailedEvent,
     ResponsesAPIResponse,
 )
-from litellm.types.utils import Delta, ModelResponseStream, StreamingChoices, Usage
+from litellm.types.utils import (
+    ChatCompletionDeltaToolCall,
+    Delta,
+    Function,
+    ModelResponseStream,
+    StreamingChoices,
+    TextChoices,
+    TextCompletionResponse,
+    Usage,
+)
 from tests._support.clock_loops import AutojumpClockLoop
 
 from .conftest import normalize, route_entry_points_to_stubs
@@ -81,6 +91,10 @@ def _simple_chunk(model: str = "gpt-4", content: str = "hi") -> ModelResponseStr
     )
 
 
+def _sse_text(frame: str | bytes) -> str:
+    return frame.decode() if isinstance(frame, bytes) else frame
+
+
 async def _async_iter(items):
     for it in items:
         yield it
@@ -520,48 +534,13 @@ def test_format_fallback_metadata_sse_event():
     assert isinstance(payload["created"], int)
 
 
-# ---------------------------------------------------------------------------
-# _fast_serialize_simple_model_response_stream
-# ---------------------------------------------------------------------------
-
-
-def test_fast_serialize_simple_model_response_stream_returns_bytes_payload():
-    chunk = _simple_chunk()
-    result = _fast_serialize_simple_model_response_stream(chunk)
-    assert isinstance(result, bytes)
-    payload = json.loads(result)
-    assert normalize(payload) == {
-        "id": "<VOLATILE>",
-        "object": "chat.completion.chunk",
-        "created": "<VOLATILE>",
-        "model": "gpt-4",
-        "choices": [
-            {
-                "index": 0,
-                "delta": {"role": "assistant", "content": "hi"},
-            }
-        ],
-    }
-
-
-def test_fast_serialize_simple_model_response_stream_with_usage_returns_none_invalid():
-    """Fast path bails (returns None) when ``usage`` is populated — the slow
-    path is required to preserve usage fields. Returning None here is the
-    "I cannot handle this" sentinel, not a hard error."""
-    chunk = _simple_chunk()
-    chunk.usage = Usage(prompt_tokens=1, completion_tokens=1, total_tokens=2)
-    assert _fast_serialize_simple_model_response_stream(chunk) is None
-
-
 # ---------------------------------------------------------------------------
 # _serialize_streaming_chunk
 # ---------------------------------------------------------------------------
 
 
-def test_serialize_streaming_chunk_simple_uses_fast_path_bytes():
-    result = _serialize_streaming_chunk(_simple_chunk())
-    assert isinstance(result, bytes)
-    payload = json.loads(result)
+def test_serialize_streaming_chunk_simple_payload():
+    payload = json.loads(_serialize_streaming_chunk(_simple_chunk()))
     assert normalize(payload) == {
         "id": "<VOLATILE>",
         "object": "chat.completion.chunk",
@@ -576,6 +555,102 @@ def test_serialize_streaming_chunk_simple_uses_fast_path_bytes():
     }
 
 
+@pytest.mark.parametrize(
+    ("choice_extras", "serialized_extras"),
+    [
+        ({"stop_reason": ",5", "token_ids": [20]}, {"stop_reason": ",5", "token_ids": [20]}),
+        ({"finish_reason": "stop", "stop_reason": None}, {"finish_reason": "stop", "stop_reason": None}),
+    ],
+    ids=["vllm-fields", "natural-stop"],
+)
+def test_serialize_streaming_chunk_keeps_the_vllm_choice_fields(
+    choice_extras: dict[str, object], serialized_extras: dict[str, object]
+):
+    chunk: Final = ModelResponseStream(
+        id="chatcmpl-test",
+        choices=[StreamingChoices(index=0, delta=Delta(content="1,2,3,4", role="assistant"), **choice_extras)],
+        created=0,
+        model="gpt-4",
+        object="chat.completion.chunk",
+    )
+
+    assert json.loads(_serialize_streaming_chunk(chunk))["choices"] == [
+        {"index": 0, "delta": {"role": "assistant", "content": "1,2,3,4"}, **serialized_extras}
+    ]
+
+
+def _text_completion_chunk(choice_extras: Mapping[str, object]) -> TextCompletionResponse:
+    return TextCompletionResponse(
+        id="cmpl-1",
+        choices=[TextChoices(finish_reason="length", index=0, text="", **choice_extras)],
+        created=1,
+        model="Qwen/Qwen3-0.6B",
+    )
+
+
+def _chat_chunk_with_fingerprint(choice_extras: Mapping[str, object]) -> ModelResponseStream:
+    return ModelResponseStream(
+        id="chatcmpl-1",
+        choices=[StreamingChoices(finish_reason="length", index=0, delta=Delta(content=None), **choice_extras)],
+        created=1,
+        model="Qwen/Qwen3-0.6B",
+        object="chat.completion.chunk",
+        system_fingerprint="fp_1",
+    )
+
+
+_VLLM_SHAPED_CHUNKS: Final = pytest.mark.parametrize(
+    "build_chunk", [_text_completion_chunk, _chat_chunk_with_fingerprint], ids=["text-completion", "chat-fingerprint"]
+)
+
+
+@_VLLM_SHAPED_CHUNKS
+@pytest.mark.parametrize(
+    "vllm_choice_fields",
+    [{"stop_reason": None}, {"stop_reason": None, "token_ids": [21]}, {"stop_reason": None, "token_ids": None}],
+    ids=["null-stop-reason", "null-stop-reason-with-token-ids", "null-stop-reason-and-token-ids"],
+)
+def test_serialize_streaming_chunk_keeps_null_vllm_choice_fields(
+    build_chunk: Callable[[Mapping[str, object]], TextCompletionResponse | ModelResponseStream],
+    vllm_choice_fields: dict[str, object],
+) -> None:
+    chunk: Final = build_chunk(vllm_choice_fields)
+    plain_chunk: Final = json.loads(build_chunk({}).model_dump_json(exclude_none=True, exclude_unset=True))
+
+    assert json.loads(_serialize_streaming_chunk(chunk)) == {
+        **plain_chunk,
+        "choices": [{**plain_chunk["choices"][0], **vllm_choice_fields}],
+    }
+
+
+@_VLLM_SHAPED_CHUNKS
+@pytest.mark.parametrize("choice_extras", [{}, {"stop_reason": ",5", "token_ids": [20]}], ids=["no-vllm", "set-vllm"])
+def test_serialize_streaming_chunk_without_null_vllm_fields_matches_model_dump_json(
+    build_chunk: Callable[[Mapping[str, object]], TextCompletionResponse | ModelResponseStream],
+    choice_extras: dict[str, object],
+) -> None:
+    chunk: Final = build_chunk(choice_extras)
+
+    assert _serialize_streaming_chunk(chunk) == chunk.model_dump_json(exclude_none=True, exclude_unset=True).encode()
+
+
+def test_serialize_streaming_chunk_keeps_streaming_a_null_stop_reason_chunk_with_a_value_json_cannot_encode() -> None:
+    chunk: Final = ModelResponseStream(
+        id="chatcmpl-vllm",
+        choices=[StreamingChoices(index=0, delta=Delta(content="a"), stop_reason=None, token_ids=[21])],
+        created=0,
+        model="Qwen/Qwen3-0.6B",
+        object="chat.completion.chunk",
+    )
+    setattr(chunk, "trace_chunk", hashlib.sha256(b"trace").digest())
+
+    payload: Final = json.loads(_serialize_streaming_chunk(chunk))
+
+    assert payload["choices"][0]["delta"] == {"content": "a"}
+    assert payload["choices"][0]["token_ids"] == [21]
+    assert "trace_chunk" not in payload
+
+
 def test_serialize_streaming_chunk_invalid_input_raises_attribute_error():
     """The helper is typed as ``BaseModel`` — handing it a plain dict trips
     the attribute-access path (no ``model_dump_json``)."""
@@ -700,10 +775,7 @@ async def test_async_data_generator_yields_sse_chunks_and_done(monkeypatch):
         out.append(line)
 
     assert out[-1] == "data: [DONE]\n\n"
-    # First chunk is bytes (fast path) wrapped via _format_streaming_sse_chunk.
-    first = out[0]
-    assert isinstance(first, bytes)
-    payload = json.loads(first.removeprefix(b"data: ").removesuffix(b"\n\n"))
+    payload = json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))
     assert normalize(payload) == {
         "id": "<VOLATILE>",
         "object": "chat.completion.chunk",
@@ -718,6 +790,205 @@ async def test_async_data_generator_yields_sse_chunks_and_done(monkeypatch):
     }
 
 
+_AZURE_CONTENT_FILTER_RESULTS: Final = {
+    "hate": {"filtered": False, "severity": "safe"},
+    "protected_material_text": {"detected": False, "filtered": False},
+}
+
+
+def _azure_chunk(choice_fields: dict[str, object], chunk_fields: dict[str, object]) -> ModelResponseStream:
+    return ModelResponseStream(
+        id="chatcmpl-azure",
+        choices=[StreamingChoices(index=0, delta=Delta(content="Red"), **choice_fields)],
+        created=0,
+        model="gpt-4",
+        object="chat.completion.chunk",
+        **chunk_fields,
+    )
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("chunk", "read_field", "sent"),
+    [
+        pytest.param(
+            _azure_chunk({"content_filter_results": _AZURE_CONTENT_FILTER_RESULTS}, {}),
+            lambda payload: payload["choices"][0]["content_filter_results"],
+            _AZURE_CONTENT_FILTER_RESULTS,
+            id="choice-content-filter-results",
+        ),
+        pytest.param(
+            _azure_chunk({}, {"obfuscation": "Ab3"}),
+            lambda payload: payload["obfuscation"],
+            "Ab3",
+            id="chunk-obfuscation",
+        ),
+        pytest.param(
+            ModelResponseStream(
+                id="chatcmpl-or",
+                choices=[
+                    StreamingChoices(
+                        index=0,
+                        delta=Delta(content="Red", reasoning_details=[{"type": "reasoning.text", "text": "colors"}]),
+                    )
+                ],
+                created=0,
+                model="gpt-4",
+                object="chat.completion.chunk",
+            ),
+            lambda payload: payload["choices"][0]["delta"]["reasoning_details"],
+            [{"type": "reasoning.text", "text": "colors"}],
+            id="delta-reasoning-details",
+        ),
+        pytest.param(
+            ModelResponseStream(
+                id="chatcmpl-resp",
+                choices=[
+                    StreamingChoices(
+                        index=0,
+                        delta=Delta(content="Red", reasoning_items=[{"type": "reasoning", "id": "rs_1", "summary": []}]),
+                    )
+                ],
+                created=0,
+                model="gpt-4",
+                object="chat.completion.chunk",
+            ),
+            lambda payload: payload["choices"][0]["delta"]["reasoning_items"],
+            [{"type": "reasoning", "id": "rs_1", "summary": []}],
+            id="delta-reasoning-items",
+        ),
+    ],
+)
+async def test_async_data_generator_sse_frame_keeps_provider_fields_on_a_text_chunk(
+    monkeypatch, chunk: ModelResponseStream, read_field: Callable[[dict[str, object]], object], sent: object
+):
+    _patch_logging_flags(monkeypatch)
+
+    out = [
+        line
+        async for line in async_data_generator(
+            response=_async_iter([chunk]),
+            user_api_key_dict=_user_auth(),
+            request_data={"model": "gpt-4"},
+        )
+    ]
+
+    assert read_field(json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))) == sent
+
+
+def _circular_dict() -> dict[str, object]:
+    looped: Final[dict[str, object]] = {"keep": 1}  # mutable-ok: a circular dict has to be inserted into itself
+    looped["self"] = looped
+    return looped
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "unencodable",
+    [
+        pytest.param(object(), id="unknown-type"),
+        pytest.param(hashlib.sha256(b"trace").digest(), id="invalid-utf8-bytes"),
+    ],
+)
+async def test_async_data_generator_streams_a_text_chunk_a_hook_tagged_with_a_value_json_cannot_encode(
+    monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture, unencodable: object
+) -> None:
+    _patch_logging_flags(monkeypatch)
+    chunk: Final = _azure_chunk({"content_filter_results": _AZURE_CONTENT_FILTER_RESULTS}, {"obfuscation": "Ab3"})
+    setattr(chunk, "trace_chunk", unencodable)
+    setattr(chunk.choices[0], "trace_choice", unencodable)
+    setattr(chunk.choices[0].delta, "trace_delta", unencodable)
+
+    with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
+        out: Final = [
+            line
+            async for line in async_data_generator(
+                response=_async_iter([chunk]),
+                user_api_key_dict=_user_auth(),
+                request_data={"model": "gpt-4"},
+            )
+        ]
+
+    payload: Final = json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))
+    assert payload["obfuscation"] == "Ab3"
+    assert payload["choices"][0]["content_filter_results"] == _AZURE_CONTENT_FILTER_RESULTS
+    assert payload["choices"][0]["delta"] == {"content": "Red"}
+    assert "trace_chunk" not in payload
+    assert "trace_choice" not in payload["choices"][0]
+    assert all(name in caplog.text for name in ("trace_chunk", "trace_choice", "trace_delta"))
+
+
+def test_serialize_streaming_chunk_keeps_lone_surrogates_a_provider_split_across_frames(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    tool_call: Final = ChatCompletionDeltaToolCall(
+        id="call_1", index=0, type="function", function=Function(name="get_weather", arguments='{"city": "Par\udc00is"}')
+    )
+    chunk: Final = ModelResponseStream(
+        id="chatcmpl-split",
+        choices=[StreamingChoices(index=0, delta=Delta(content="Hi \ud83d", tool_calls=[tool_call]))],
+        created=0,
+        model="gpt-4",
+        object="chat.completion.chunk",
+    )
+
+    with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
+        delta: Final = json.loads(_serialize_streaming_chunk(chunk))["choices"][0]["delta"]
+
+    assert caplog.text == ""
+    assert delta["content"] == "Hi \ud83d"
+    assert delta["tool_calls"][0]["id"] == "call_1"
+    assert delta["tool_calls"][0]["function"] == {"name": "get_weather", "arguments": '{"city": "Par\udc00is"}'}
+
+
+def test_serialize_streaming_chunk_drops_only_the_nested_value_json_cannot_encode() -> None:
+    digest: Final = hashlib.sha256(b"trace").digest()
+    chunk: Final = ModelResponseStream(
+        id="chatcmpl-nested",
+        choices=[
+            StreamingChoices(index=0, delta=Delta(content="a")),
+            StreamingChoices(
+                index=1, delta=Delta(content="b", provider_specific_fields={"citations": ["ok"], "raw": digest})
+            ),
+        ],
+        created=0,
+        model="gpt-4",
+        object="chat.completion.chunk",
+        usage=Usage(prompt_tokens=3, completion_tokens=2, total_tokens=5),
+    )
+    setattr(chunk.usage, "raw", digest)
+    setattr(chunk, "trace_chunk", _circular_dict())
+
+    payload: Final = json.loads(_serialize_streaming_chunk(chunk))
+
+    assert payload["choices"][0]["delta"] == {"content": "a"}
+    assert payload["choices"][1]["delta"] == {"content": "b", "provider_specific_fields": {"citations": ["ok"]}}
+    assert payload["usage"] == {"prompt_tokens": 3, "completion_tokens": 2, "total_tokens": 5}
+    assert payload["trace_chunk"] == {"keep": 1}
+
+
+def test_serialize_streaming_chunk_keeps_streaming_when_unencodable_values_sit_under_non_string_keys() -> None:
+    chunk: Final = ModelResponseStream(
+        id="chatcmpl-keys",
+        choices=[StreamingChoices(index=0, delta=Delta(content="still streaming"))],
+        created=0,
+        model="gpt-4",
+        object="chat.completion.chunk",
+    )
+    setattr(chunk, "by_index", {0: "kept", 1: object()})
+    setattr(chunk, "mixed_keys", {"name": "x", 2: object()})
+    setattr(chunk, "bytes_keys", {b"raw": object()})
+    setattr(chunk, "read_only_view", MappingProxyType({"name": object()}))
+
+    payload: Final = json.loads(_serialize_streaming_chunk(chunk))
+
+    assert payload["choices"][0]["delta"] == {"content": "still streaming"}
+    assert payload["by_index"] == {"0": "kept"}
+    assert "mixed_keys" not in payload
+    assert "bytes_keys" not in payload
+    assert "read_only_view" not in payload
+
+
 @pytest.mark.asyncio
 async def test_async_data_generator_uses_response_fallback_metadata(monkeypatch):
     _patch_logging_flags(monkeypatch)
@@ -739,9 +1010,7 @@ async def test_async_data_generator_uses_response_fallback_metadata(monkeypatch)
     ):
         out.append(line)
 
-    first = out[0]
-    assert isinstance(first, bytes)
-    payload = json.loads(first.removeprefix(b"data: ").removesuffix(b"\n\n"))
+    payload = json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))
     assert payload["model"] == "fallback-model"
 
 
@@ -764,9 +1033,7 @@ async def test_async_data_generator_uses_chunk_fallback_metadata(monkeypatch):
     ):
         out.append(line)
 
-    first = out[0]
-    assert isinstance(first, bytes)
-    payload = json.loads(first.removeprefix(b"data: ").removesuffix(b"\n\n"))
+    payload = json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))
     assert payload["model"] == "fallback-model"
 
 
@@ -793,8 +1060,8 @@ async def test_async_data_generator_switches_model_mid_stream_on_fallback(monkey
     ):
         out.append(line)
 
-    first_payload = json.loads(out[0].removeprefix(b"data: ").removesuffix(b"\n\n"))
-    second_payload = json.loads(out[1].removeprefix(b"data: ").removesuffix(b"\n\n"))
+    first_payload = json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))
+    second_payload = json.loads(_sse_text(out[1]).removeprefix("data: ").removesuffix("\n\n"))
     assert first_payload["model"] == "primary-model"
     assert second_payload["model"] == "fallback-model"
 
@@ -830,8 +1097,7 @@ async def test_async_data_generator_emits_fallback_error_metadata_event(monkeypa
     ):
         out.append(line)
 
-    assert isinstance(out[0], bytes)
-    chunk_payload = json.loads(out[0].removeprefix(b"data: ").removesuffix(b"\n\n"))
+    chunk_payload = json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))
     assert chunk_payload["model"] == "fallback-model"
     assert isinstance(out[1], str)
     assert out[1].startswith("data: ")
@@ -879,8 +1145,7 @@ async def test_async_data_generator_skips_fallback_error_event_without_opt_in(
     ):
         out.append(line)
 
-    assert isinstance(out[0], bytes)
-    payload = json.loads(out[0].removeprefix(b"data: ").removesuffix(b"\n\n"))
+    payload = json.loads(_sse_text(out[0]).removeprefix("data: ").removesuffix("\n\n"))
     assert payload["model"] == "fallback-model"
 
 
@@ -2434,14 +2699,11 @@ async def test_queue_request_stream_is_untouched_while_keepalives_are_unconfigur
     assert chunks[-1] == b"data: [DONE]\n\n"
 
 
-def test_fast_serialize_simple_model_response_stream_keeps_served_service_tier():
+def test_serialize_streaming_chunk_keeps_served_service_tier():
     chunk = _simple_chunk()
     chunk.service_tier = "priority"
 
-    result = _fast_serialize_simple_model_response_stream(chunk)
-
-    assert result is not None
-    assert json.loads(result)["service_tier"] == "priority"
+    assert json.loads(_serialize_streaming_chunk(chunk))["service_tier"] == "priority"
 
 
 @pytest.mark.asyncio
diff --git a/tests/unit/proxy/rerank_endpoints/test_endpoints.py b/tests/unit/proxy/rerank_endpoints/test_endpoints.py
index 52d12dd1813..c1908a97d7e 100644
--- a/tests/unit/proxy/rerank_endpoints/test_endpoints.py
+++ b/tests/unit/proxy/rerank_endpoints/test_endpoints.py
@@ -5,10 +5,13 @@ Tests for rerank_endpoints/endpoints.py response headers.
 import json
 import logging
 from collections.abc import Iterator
+from typing import Final
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
-from fastapi import HTTPException, Request, Response
+import respx
+from fastapi import FastAPI, HTTPException, Request, Response
+from fastapi.testclient import TestClient
 
 import litellm.proxy.common_request_processing as common_request_processing_mod
 import litellm.proxy.proxy_server as proxy_server_mod
@@ -209,3 +212,68 @@ async def test_a_rejection_raised_before_routing_keeps_its_own_status(monkeypatc
     error = await _rerank_failure(rejection, raised_before_routing=True, monkeypatch=monkeypatch)
 
     assert (error.type, error.param, error.code) == ("bad_request_error", "session_id", "400")
+
+
+def test_failed_rerank_spend_row_records_arerank(
+    monkeypatch: pytest.MonkeyPatch, respx_mock: respx.MockRouter
+) -> None:
+    import litellm
+    from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
+    from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
+    from litellm.proxy.hooks.proxy_track_cost_callback import ProxyDBLogger
+    from litellm.proxy.proxy_server import ProxyConfig
+    from litellm.proxy.rerank_endpoints.endpoints import router as rerank_router
+    from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+    from litellm.proxy.utils import ProxyLogging
+
+    provider: Final = respx_mock.post(url__startswith="https://rerank-provider.example").respond(
+        400, json={"message": "invalid documents"}
+    )
+    cache: Final = UserApiKeyCache()
+    spend_writer: Final = MagicMock(update_database=AsyncMock())
+    monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
+    monkeypatch.setattr(litellm, "callbacks", [ProxyDBLogger(spend_writer=lambda: spend_writer)])
+    monkeypatch.setattr(proxy_server_mod, "general_settings", {})
+    monkeypatch.setattr(
+        proxy_server_mod,
+        "llm_router",
+        litellm.Router(
+            model_list=[
+                {
+                    "model_name": "rerank-model",
+                    "litellm_params": {
+                        "model": "cohere/rerank-v3.5",
+                        "api_base": "https://rerank-provider.example",
+                        "api_key": "provider-key",
+                    },
+                }
+            ],
+            num_retries=0,
+        ),
+    )
+    monkeypatch.setattr(proxy_server_mod, "proxy_config", ProxyConfig())
+    monkeypatch.setattr(proxy_server_mod, "proxy_logging_obj", ProxyLogging(user_api_key_cache=cache))
+    monkeypatch.setattr(proxy_server_mod, "user_api_key_cache", cache)
+    monkeypatch.setattr(proxy_server_mod, "user_model", None)
+    monkeypatch.setattr(proxy_server_mod, "version", "1.2.3")
+    app: Final = FastAPI()
+    app.include_router(rerank_router)
+    app.add_exception_handler(ProxyException, proxy_server_mod.openai_exception_handler)
+    app.dependency_overrides[user_api_key_auth] = lambda: UserAPIKeyAuth(api_key="sk-test")
+    try:
+        with TestClient(app, raise_server_exceptions=False) as client:
+            response: Final = client.post(
+                "/v1/rerank", json={"model": "rerank-model", "query": "q", "documents": ["a", "b"]}
+            )
+    finally:
+        ProxyLogging._callback_capabilities_cache.clear()
+
+    assert (response.status_code, provider.call_count) == (400, 1), response.text
+    db_call: Final = spend_writer.update_database.call_args.kwargs
+    payload: Final = get_logging_payload(
+        kwargs=db_call["kwargs"],
+        response_obj=db_call["completion_response"],
+        start_time=db_call["start_time"],
+        end_time=db_call["end_time"],
+    )
+    assert (payload["status"], payload["call_type"]) == ("failure", "arerank")
diff --git a/tests/unit/proxy/router_entry_point_stubs.py b/tests/unit/proxy/router_entry_point_stubs.py
index 6912049d225..51b5bf13f16 100644
--- a/tests/unit/proxy/router_entry_point_stubs.py
+++ b/tests/unit/proxy/router_entry_point_stubs.py
@@ -123,6 +123,8 @@ def route_entry_points_to_stubs(router: _RouterDouble) -> _RouterDouble:
             return router.get_configured_display_name(name)
         if field == "service_tiers":
             return router.get_configured_service_tiers(name, **_given(team_id=team_id))
+        if field == "max_input_tokens":
+            return router.get_configured_max_input_tokens(name, **_given(team_id=team_id))
         if field == "listing_info":
             return router.get_model_listing_info(name)
         if field == "mode":
diff --git a/tests/unit/proxy/spend_tracking/test_spend_tracking_utils.py b/tests/unit/proxy/spend_tracking/test_spend_tracking_utils.py
index f52f40ad55d..f73d33cc93e 100644
--- a/tests/unit/proxy/spend_tracking/test_spend_tracking_utils.py
+++ b/tests/unit/proxy/spend_tracking/test_spend_tracking_utils.py
@@ -5150,6 +5150,23 @@ def test_a_background_response_billing_event_writes_a_row_apart_from_the_read_th
     assert request_ids == ("resp_shared", "resp_shared_background_cost")
 
 
+@pytest.mark.parametrize("call_type", ["aget_responses", "acancel_responses"])
+def test_a_read_or_cancel_row_carries_the_id_its_callbacks_logged(call_type: str):
+    row: Final = get_logging_payload(
+        kwargs={
+            "call_type": call_type,
+            "model": "gpt-5.6",
+            "litellm_call_id": "call-read",
+            "litellm_params": {"metadata": {"user_api_key": "test-key"}},
+        },
+        response_obj={"id": "resp_logged_by_callbacks", "object": "response", "status": "completed"},
+        start_time=datetime.datetime.now(timezone.utc),
+        end_time=datetime.datetime.now(timezone.utc),
+    )
+
+    assert row["request_id"] == "resp_logged_by_callbacks"
+
+
 @pytest.mark.parametrize("forged_marker", [True, BackgroundResponseSettlement.SETTLES.value])
 def test_a_request_body_cannot_move_its_spend_row_onto_a_background_settlement_id(forged_marker):
     """A failed call logs its raw request body as kwargs, so a body field named like the settlement
diff --git a/tests/unit/proxy/test_budget_reservation.py b/tests/unit/proxy/test_budget_reservation.py
index 535c3da8c3a..6ce8d400daf 100644
--- a/tests/unit/proxy/test_budget_reservation.py
+++ b/tests/unit/proxy/test_budget_reservation.py
@@ -66,7 +66,7 @@ def spend_counter_state():
     original_prisma_client = ps.prisma_client
 
     counter_cache = DualCache()
-    key_cache = DualCache()
+    key_cache = UserApiKeyCache()
     ps.spend_counter_cache = counter_cache
     ps.user_api_key_cache = key_cache
     ps.prisma_client = None
diff --git a/tests/unit/proxy/test_model_dump_with_preserved_fields.py b/tests/unit/proxy/test_model_dump_with_preserved_fields.py
index 31531dccd16..92c7e58126b 100644
--- a/tests/unit/proxy/test_model_dump_with_preserved_fields.py
+++ b/tests/unit/proxy/test_model_dump_with_preserved_fields.py
@@ -545,3 +545,31 @@ def test_provider_refusal_string_is_preserved_on_message() -> None:
         "object": "chat.completion",
     }
     assert model_response.choices[0].message.refusal == "I can't help with that."
+
+
+def test_vllm_null_stop_reason_is_kept_only_on_the_choice_that_carries_it() -> None:
+    model_response: Final = convert_to_model_response_object(
+        response_object={
+            "id": "chatcmpl-vllm-natural-stop",
+            "created": 4,
+            "model": "Qwen/Qwen3-0.6B",
+            "object": "chat.completion",
+            "choices": [
+                {
+                    "finish_reason": "stop",
+                    "index": 0,
+                    "message": {"role": "assistant", "content": "1, 2"},
+                    "stop_reason": None,
+                },
+                {"finish_reason": "stop", "index": 1, "message": {"role": "assistant", "content": "1, 2"}},
+            ],
+        },
+        model_response_object=ModelResponse(),
+    )
+
+    dumped_choices: Final = model_dump_with_preserved_fields(model_response, exclude_unset=True)["choices"]
+
+    assert [(choice["index"], "stop_reason" in choice, choice.get("stop_reason")) for choice in dumped_choices] == [
+        (0, True, None),
+        (1, False, None),
+    ]
diff --git a/tests/unit/proxy/test_openai_ws_passthrough_routes.py b/tests/unit/proxy/test_openai_ws_passthrough_routes.py
index 6a9cd972dc2..839ab49408f 100644
--- a/tests/unit/proxy/test_openai_ws_passthrough_routes.py
+++ b/tests/unit/proxy/test_openai_ws_passthrough_routes.py
@@ -1,31 +1,41 @@
-"""OpenAI passthrough WebSocket route: registration, opt-in gating, and refusals."""
+"""OpenAI passthrough WebSocket route: registration, opt-in gating, refusals, and per-frame model checks."""
 
 import json
-from collections.abc import Mapping, Sequence
+from collections.abc import Mapping
 from dataclasses import dataclass
 from types import MappingProxyType, SimpleNamespace
 from typing import Final
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import httpx
 import pytest
 import respx
+from fastapi import HTTPException
 from starlette.routing import WebSocketRoute
+from starlette.websockets import WebSocket
 
 import litellm
 from litellm.llms.openai.workload_identity import _workload_identity_auth
-from litellm.proxy._types import UserAPIKeyAuth
+from litellm.proxy._types import Litellm_EntityType, ProxyErrorTypes, ProxyException, UserAPIKeyAuth
 from litellm.proxy.pass_through_endpoints.llm_passthrough_endpoints import (
+    _OPENAI_WS_ALIASED_MODEL_REFUSAL,
     _OPENAI_WS_DISABLED_REFUSAL,
-    _OPENAI_WS_MODEL_RESTRICTED_REFUSAL,
-    _has_model_restrictions,
+    _OPENAI_WS_UNAVAILABLE_AUTH_REFUSAL,
     _openai_websocket_refusal,
-    _proxy_model_allowlists,
+    _proxy_frame_model_gate,
     openai_websocket_proxy_route,
     router,
 )
-
-Scopes = tuple[Sequence[str], ...]
+from litellm.proxy.pass_through_endpoints.llm_provider_handlers.openai_websocket_passthrough_logging_handler import (
+    openai_websocket_frame_kind,
+)
+from litellm.proxy.pass_through_endpoints.pass_through_endpoints import (
+    WebsocketFrameModelAllowed,
+    WebsocketFrameModelGate,
+    WebsocketFrameModelRefused,
+    WebsocketFrameModelVerdict,
+    WebsocketUpstreamFrameClassifier,
+)
 
 ENABLED: Final = MappingProxyType({"enable_openai_websocket_passthrough": True})
 DISABLED_SETTINGS: Final = (
@@ -76,6 +86,8 @@ class _RelayCall:
     forward_headers: bool
     endpoint: str
     accept_websocket: bool
+    client_frame_model_gate: WebsocketFrameModelGate | None
+    upstream_frame_kind: WebsocketUpstreamFrameClassifier | None
 
 
 class _FakeRelay:
@@ -92,6 +104,8 @@ class _FakeRelay:
         forward_headers: bool,
         endpoint: str,
         accept_websocket: bool,
+        client_frame_model_gate: WebsocketFrameModelGate | None = None,
+        upstream_frame_kind: WebsocketUpstreamFrameClassifier | None = None,
     ) -> None:
         self.calls.append(
             _RelayCall(
@@ -100,24 +114,26 @@ class _FakeRelay:
                 forward_headers=forward_headers,
                 endpoint=endpoint,
                 accept_websocket=accept_websocket,
+                client_frame_model_gate=client_frame_model_gate,
+                upstream_frame_kind=upstream_frame_kind,
             )
         )
 
 
-class _FakeModelAllowlists:
-    def __init__(self, scopes: Scopes) -> None:
-        self.scopes = scopes
-        self.calls: list[UserAPIKeyAuth] = []
+class _FakeFrameModelGate:
+    def __init__(self, refusals: Mapping[str, WebsocketFrameModelRefused] = MappingProxyType({})) -> None:
+        self.refusals = refusals
+        self.checked: list[str] = []
 
-    async def __call__(self, valid_token: UserAPIKeyAuth, /) -> Scopes:
-        self.calls.append(valid_token)
-        return self.scopes
+    async def __call__(self, websocket: object, model: str, /) -> WebsocketFrameModelVerdict:
+        self.checked.append(model)
+        return self.refusals.get(model) or WebsocketFrameModelAllowed(access_groups=())
 
 
 @dataclass(frozen=True, slots=True)
 class _Served:
     relay: _FakeRelay
-    allowlists: _FakeModelAllowlists
+    frame_model_gate: _FakeFrameModelGate
 
 
 async def _serve(
@@ -125,16 +141,16 @@ async def _serve(
     endpoint: str,
     user_api_key_dict: UserAPIKeyAuth,
     general_settings: Mapping[str, object],
-    scopes: Scopes = (),
+    frame_model_gate: _FakeFrameModelGate | None = None,
 ) -> _Served:
-    served = _Served(relay=_FakeRelay(), allowlists=_FakeModelAllowlists(scopes))
+    served: Final = _Served(relay=_FakeRelay(), frame_model_gate=frame_model_gate or _FakeFrameModelGate())
     await openai_websocket_proxy_route(
         websocket=websocket,
         endpoint=endpoint,
         user_api_key_dict=user_api_key_dict,
         general_settings=general_settings,
         relay=served.relay,
-        model_allowlists=served.allowlists,
+        frame_model_gate=served.frame_model_gate,
     )
     return served
 
@@ -143,18 +159,20 @@ async def _serve(
 @pytest.mark.parametrize("prefix", ["openai", "openai_passthrough"])
 async def test_openai_websocket_forwards_query_and_keeps_provider_auth(prefix, monkeypatch):
     monkeypatch.delenv("OPENAI_API_BASE", raising=False)
-    websocket = _FakeWebSocket(f"/{prefix}/v1/realtime", "model=gpt-4o-realtime-preview")
+    websocket: Final = _FakeWebSocket(f"/{prefix}/v1/realtime", "model=gpt-realtime-2.1")
 
     with patch(GET_CREDENTIALS, return_value="sk-provider"):
         served = await _serve(websocket, "v1/realtime", UserAPIKeyAuth(), ENABLED)
 
     assert served.relay.calls == [
         _RelayCall(
-            target="wss://api.openai.com/v1/realtime?model=gpt-4o-realtime-preview",
+            target="wss://api.openai.com/v1/realtime?model=gpt-realtime-2.1",
             custom_headers=MappingProxyType({"Authorization": "Bearer sk-provider"}),
             forward_headers=False,
             endpoint=f"/{prefix}/v1/realtime",
             accept_websocket=False,
+            client_frame_model_gate=served.frame_model_gate,
+            upstream_frame_kind=openai_websocket_frame_kind,
         )
     ]
     assert websocket.accepts == [None]
@@ -162,11 +180,23 @@ async def test_openai_websocket_forwards_query_and_keeps_provider_auth(prefix, m
     assert websocket.closed is None
 
 
+@pytest.mark.asyncio
+async def test_openai_websocket_reports_its_route_without_the_proxy_root_path(monkeypatch):
+    """Route allowlists and spend rows key on the route the proxy serves, which a root path prefix is not part of"""
+    monkeypatch.setenv("SERVER_ROOT_PATH", "/litellm")
+    websocket: Final = _FakeWebSocket("/litellm/openai/v1/responses", "")
+
+    with patch(GET_CREDENTIALS, return_value="sk-provider"):
+        served: Final = await _serve(websocket, "v1/responses", UserAPIKeyAuth(), ENABLED)
+
+    assert [call.endpoint for call in served.relay.calls] == ["/openai/v1/responses"]
+
+
 @pytest.mark.asyncio
 async def test_openai_websocket_accepts_first_client_subprotocol():
     websocket = _FakeWebSocket(
         "/openai/v1/realtime",
-        "model=gpt-4o-realtime-preview",
+        "model=gpt-realtime-2.1",
         subprotocols="realtime, openai-insecure-api-key.sk-abc, openai-beta.realtime-v1",
     )
 
@@ -239,7 +269,7 @@ async def test_openai_websocket_closes_cleanly_when_workload_identity_exchange_f
 
 @pytest.mark.asyncio
 async def test_openai_websocket_closes_cleanly_when_provider_credentials_missing():
-    websocket = _FakeWebSocket("/openai/v1/realtime", "model=gpt-4o-realtime-preview")
+    websocket: Final = _FakeWebSocket("/openai/v1/realtime", "model=gpt-realtime-2.1")
 
     with patch(GET_CREDENTIALS, return_value=None):
         served = await _serve(websocket, "v1/realtime", UserAPIKeyAuth(), ENABLED)
@@ -255,7 +285,7 @@ async def test_openai_websocket_closes_cleanly_when_provider_credentials_missing
 @pytest.mark.parametrize("prefix", ["openai", "openai_passthrough"])
 @pytest.mark.parametrize("general_settings", DISABLED_SETTINGS)
 async def test_openai_websocket_refused_unless_explicitly_enabled(prefix, general_settings):
-    websocket = _FakeWebSocket(f"/{prefix}/v1/realtime", "model=gpt-4o-realtime-preview")
+    websocket: Final = _FakeWebSocket(f"/{prefix}/v1/realtime", "model=gpt-realtime-2.1")
 
     served = await _serve(websocket, "v1/realtime", UserAPIKeyAuth(), general_settings)
 
@@ -265,25 +295,21 @@ async def test_openai_websocket_refused_unless_explicitly_enabled(prefix, genera
     assert served.relay.calls == []
 
 
-@pytest.mark.asyncio
 @pytest.mark.parametrize("general_settings", DISABLED_SETTINGS)
-async def test_openai_websocket_refusal_is_disabled_for_falsy_settings(general_settings):
-    refusal = await _openai_websocket_refusal(UserAPIKeyAuth(), general_settings, _FakeModelAllowlists(()))
-    assert refusal is _OPENAI_WS_DISABLED_REFUSAL
+def test_openai_websocket_refusal_is_disabled_for_falsy_settings(general_settings):
+    assert _openai_websocket_refusal(general_settings) is _OPENAI_WS_DISABLED_REFUSAL
 
 
-@pytest.mark.asyncio
 @pytest.mark.parametrize("value", [True, "true", "True"])
-async def test_openai_websocket_refusal_is_none_for_truthy_settings(value):
-    settings = MappingProxyType({"enable_openai_websocket_passthrough": value})
-    assert await _openai_websocket_refusal(UserAPIKeyAuth(), settings, _FakeModelAllowlists(())) is None
+def test_openai_websocket_refusal_is_none_for_truthy_settings(value):
+    assert _openai_websocket_refusal(MappingProxyType({"enable_openai_websocket_passthrough": value})) is None
 
 
 @pytest.mark.asyncio
 async def test_openai_websocket_refusal_echoes_requested_subprotocol():
     websocket = _FakeWebSocket(
         "/openai_passthrough/v1/realtime",
-        "model=gpt-4o-realtime-preview",
+        "model=gpt-realtime-2.1",
         subprotocols="realtime, openai-beta.realtime-v1",
     )
 
@@ -294,68 +320,303 @@ async def test_openai_websocket_refusal_echoes_requested_subprotocol():
     assert served.relay.calls == []
 
 
-RESTRICTED_SCOPES: Final[tuple[Scopes, ...]] = (
-    (("gpt-4o",),),
-    ((), ("gpt-4o-realtime-preview",)),
-    (("all-team-models",), ("gpt-4o",)),
-    ((), ("all-proxy-models",), ("gpt-4o",)),
-    ((), (), (), ("gpt-4o",)),
-    (("*",), (), (), (), ("gpt-4o",)),
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "key_models",
+    [["gpt-5.4-mini"], ["gpt-realtime-2.1", "gpt-5.4"], []],
 )
-UNRESTRICTED_SCOPES: Final[tuple[Scopes, ...]] = (
-    (),
-    ((),),
-    (("all-proxy-models",),),
-    (("*",),),
-    (("all-team-models",), ("all-proxy-models",)),
-    ((), (), (), (), ()),
-    (("*",), ("all-proxy-models",), ("all-team-models",), (), ()),
-)
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize("scopes", RESTRICTED_SCOPES)
-async def test_openai_websocket_rejects_model_restricted_identities(scopes):
-    websocket = _FakeWebSocket("/openai/v1/realtime", "model=gpt-4o-realtime-preview")
-    user_api_key_dict = UserAPIKeyAuth(token="hashed-fake", user_id="user-fake", team_id="team-fake")
-
-    served = await _serve(websocket, "v1/realtime", user_api_key_dict, ENABLED, scopes)
-
-    assert "model restrictions" in websocket.error_message()
-    assert websocket.closed == (1008, _OPENAI_WS_MODEL_RESTRICTED_REFUSAL.close_reason)
-    assert served.relay.calls == []
-    assert served.allowlists.calls == [user_api_key_dict]
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize("scopes", RESTRICTED_SCOPES)
-async def test_openai_websocket_disabled_refusal_skips_allowlist_lookups(scopes):
-    allowlists = _FakeModelAllowlists(scopes)
-
-    refusal = await _openai_websocket_refusal(UserAPIKeyAuth(), MappingProxyType({}), allowlists)
-
-    assert refusal is _OPENAI_WS_DISABLED_REFUSAL
-    assert allowlists.calls == []
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize("scopes", UNRESTRICTED_SCOPES)
-async def test_openai_websocket_allows_unrestricted_identities(scopes):
-    websocket = _FakeWebSocket("/openai/v1/responses", "")
+async def test_openai_websocket_connects_model_restricted_keys(key_models):
+    websocket: Final = _FakeWebSocket("/openai/v1/responses", "")
+    user_api_key_dict: Final = UserAPIKeyAuth(models=key_models, token="hashed-fake", user_id="user-fake")
 
     with patch(GET_CREDENTIALS, return_value="sk-provider"):
-        served = await _serve(websocket, "v1/responses", UserAPIKeyAuth(), ENABLED, scopes)
+        served: Final = await _serve(websocket, "v1/responses", user_api_key_dict, ENABLED)
 
     assert len(served.relay.calls) == 1
+    assert served.relay.calls[0].client_frame_model_gate is served.frame_model_gate
     assert websocket.sent == []
     assert websocket.closed is None
 
 
-@pytest.mark.asyncio
-async def test_proxy_model_allowlists_reads_the_token_scopes_without_a_database():
-    token: Final = UserAPIKeyAuth(models=[], team_id="team-fake", team_models=["gpt-4o"])
-    with patch("litellm.proxy.proxy_server.prisma_client", None):
-        scopes = await _proxy_model_allowlists()(token)
+ALIAS_REFUSAL: Final = WebsocketFrameModelRefused(
+    message=_OPENAI_WS_ALIASED_MODEL_REFUSAL, error_type=ProxyErrorTypes.key_model_access_denied.value
+)
 
-    assert tuple(tuple(scope) for scope in scopes) == ((), ("gpt-4o",))
-    assert _has_model_restrictions(scopes)
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "query",
+    [
+        "model=gpt-realtime-2.1",
+        "model=gpt-realtime-2.1&model=gpt-realtime-2.1-mini",
+        "model=gpt-realtime-2.1-mini&model=gpt-realtime-2.1",
+    ],
+    ids=["one_model", "refused_model_first", "refused_model_last"],
+)
+async def test_openai_websocket_refuses_an_opening_model_the_frame_gate_refuses(query):
+    """
+    The relay sends the connection URL to OpenAI unchanged, so every model it names has to pass the
+    same gate as a frame, or an alias the upgrade resolves to an allowed model opens the session on the
+    alias name itself
+    """
+    websocket: Final = _FakeWebSocket("/openai/v1/realtime", query)
+    gate: Final = _FakeFrameModelGate(MappingProxyType({"gpt-realtime-2.1": ALIAS_REFUSAL}))
+
+    with patch(GET_CREDENTIALS, return_value="sk-provider"):
+        served: Final = await _serve(
+            websocket, "v1/realtime", UserAPIKeyAuth(models=["gpt-realtime-2.1-mini"]), ENABLED, gate
+        )
+
+    assert websocket.error_message() == _OPENAI_WS_ALIASED_MODEL_REFUSAL
+    assert websocket.closed == (1008, "This key cannot use a model alias over OpenAI websocket passthrough.")
+    assert served.relay.calls == []
+    assert "gpt-realtime-2.1" in gate.checked
+
+
+@pytest.mark.asyncio
+async def test_openai_websocket_relays_a_session_once_every_opening_model_passes_the_frame_gate():
+    websocket: Final = _FakeWebSocket("/openai/v1/realtime", "model=gpt-realtime-2.1-mini")
+
+    with patch(GET_CREDENTIALS, return_value="sk-provider"):
+        served: Final = await _serve(
+            websocket, "v1/realtime", UserAPIKeyAuth(models=["gpt-realtime-2.1-mini"]), ENABLED
+        )
+
+    assert served.frame_model_gate.checked == ["gpt-realtime-2.1-mini"]
+    assert len(served.relay.calls) == 1
+    assert websocket.closed is None
+
+
+class _FrameAuthorizer:
+    """Stands in for the full key, team, user and budget auth the gate re-runs for every model a frame names."""
+
+    def __init__(self, token: UserAPIKeyAuth | None = None, denial: Exception | None = None) -> None:
+        self.token = token or UserAPIKeyAuth()
+        self.denial = denial
+        self.authorized: list[str] = []
+
+    async def __call__(self, websocket: object, model: str) -> UserAPIKeyAuth:
+        self.authorized.append(model)
+        if self.denial is not None:
+            raise self.denial
+        return self.token
+
+
+SOCKET: Final = WebSocket({"type": "websocket"}, receive=AsyncMock(), send=AsyncMock())
+
+
+async def _gate_verdict(authorizer: _FrameAuthorizer, model: str) -> WebsocketFrameModelVerdict:
+    with patch("litellm.proxy.proxy_server.prisma_client", None):  # test-quality-ok: the model checks need no database
+        return await _proxy_frame_model_gate(authorizer)(SOCKET, model)
+
+
+def _refusal(verdict: WebsocketFrameModelVerdict) -> WebsocketFrameModelRefused:
+    assert isinstance(verdict, WebsocketFrameModelRefused)
+    return verdict
+
+
+@pytest.mark.asyncio
+async def test_proxy_frame_model_gate_runs_full_auth_for_the_model_the_frame_names():
+    authorizer: Final = _FrameAuthorizer(UserAPIKeyAuth(models=["gpt-realtime-2.1", "gpt-5.4-mini"]))
+
+    verdict: Final = await _gate_verdict(authorizer, "gpt-realtime-2.1")
+
+    assert verdict == WebsocketFrameModelAllowed(access_groups=())
+    assert authorizer.authorized == ["gpt-realtime-2.1"]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("requested_model", ["gpt-5.4", "gpt-realtime-2.1-mini"])
+async def test_proxy_frame_model_gate_refuses_a_model_the_key_lacks(requested_model):
+    authorizer: Final = _FrameAuthorizer(UserAPIKeyAuth(models=["gpt-realtime-2.1", "gpt-5.4-mini"]))
+
+    refusal: Final = _refusal(await _gate_verdict(authorizer, requested_model))
+
+    assert requested_model in refusal.message
+    assert refusal.error_type == ProxyErrorTypes.key_model_access_denied.value
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "granted_models, refusal_names",
+    [(["gpt-5.4-mini"], "gpt-5.4"), ([], "no model grants")],
+    ids=["model_outside_the_grant", "no_grants"],
+)
+async def test_proxy_frame_model_gate_refuses_a_model_the_agent_was_not_granted(granted_models, refusal_names):
+    from litellm.types.agents import AgentResponse
+
+    token: Final = UserAPIKeyAuth(models=[], agent_id="agent-fake")
+    token.managed_agent_policy = AgentResponse(
+        agent_id="agent-fake",
+        agent_name="Agent",
+        agent_card_params={},
+        object_permission={"object_permission_id": "grant-fake", "models": granted_models},
+    )
+
+    refusal: Final = _refusal(await _gate_verdict(_FrameAuthorizer(token), "gpt-5.4"))
+
+    assert refusal_names in refusal.message
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "token",
+    [
+        UserAPIKeyAuth(models=["gpt-5.4-mini"], aliases={"gpt-5.4": "gpt-5.4-mini"}),
+        UserAPIKeyAuth(models=["gpt-5.4-mini"], team_model_aliases={"gpt-5.4": "gpt-5.4-mini"}),
+    ],
+    ids=["key_alias", "team_alias"],
+)
+async def test_proxy_frame_model_gate_refuses_an_alias_that_would_reach_openai_unchanged(token):
+    """
+    The passthrough sends each frame to OpenAI as written, so OpenAI runs the
+    alias name itself. An alias pointing at an allowed model must not let a key
+    limited to that model run the model the alias is named after.
+    """
+    refusal: Final = _refusal(await _gate_verdict(_FrameAuthorizer(token), "gpt-5.4"))
+
+    assert refusal == WebsocketFrameModelRefused(
+        message=_OPENAI_WS_ALIASED_MODEL_REFUSAL, error_type=ProxyErrorTypes.key_model_access_denied.value
+    )
+
+
+@pytest.mark.asyncio
+async def test_proxy_frame_model_gate_refuses_a_proxy_wide_alias_for_a_key_limited_to_its_target(monkeypatch):
+    monkeypatch.setattr(litellm, "model_alias_map", {"gpt-5.4": "gpt-5.4-mini"})
+
+    refusal: Final = _refusal(
+        await _gate_verdict(_FrameAuthorizer(UserAPIKeyAuth(models=["gpt-5.4-mini"])), "gpt-5.4")
+    )
+
+    assert refusal.message == _OPENAI_WS_ALIASED_MODEL_REFUSAL
+
+
+@pytest.mark.asyncio
+async def test_proxy_frame_model_gate_lets_a_key_that_may_use_any_model_send_an_alias():
+    token: Final = UserAPIKeyAuth(models=[], aliases={"fast": "gpt-5.4-mini"})
+
+    verdict: Final = await _gate_verdict(_FrameAuthorizer(token), "fast")
+
+    assert verdict == WebsocketFrameModelAllowed(access_groups=())
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("unrestricted_models", [[], ["all-proxy-models"], ["*"]])
+async def test_proxy_frame_model_gate_allows_every_model_for_unrestricted_keys(unrestricted_models):
+    verdict: Final = await _gate_verdict(_FrameAuthorizer(UserAPIKeyAuth(models=unrestricted_models)), "gpt-5.4")
+
+    assert verdict == WebsocketFrameModelAllowed(access_groups=())
+
+
+@pytest.mark.asyncio
+async def test_proxy_frame_model_gate_hands_back_the_access_groups_that_authorized_the_model():
+    """The turn a frame starts is billed to the groups that let its model through, so the gate has to report them."""
+    token: Final = UserAPIKeyAuth(models=["gpt-5.4-mini"], matched_model_access_groups=["tier-a"])
+
+    verdict: Final = await _gate_verdict(_FrameAuthorizer(token), "gpt-5.4-mini")
+
+    assert verdict == WebsocketFrameModelAllowed(access_groups=("tier-a",))
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "requested_model",
+    ["gpt-5.4-mini", "gpt-5.4"],
+    ids=["allowed", "refused_by_the_model_check"],
+)
+async def test_proxy_frame_model_gate_releases_the_budget_it_reserved_for_the_check(requested_model):
+    """
+    Full auth reserves budget for the request it authorizes, but a frame check is
+    not a request, so a reservation the gate leaves open would hold the key's
+    spend counter above its real spend and refuse later calls on every route.
+    """
+    reservation: Final[dict[str, object]] = {"reserved_cost": 0.5, "entries": []}
+    token: Final = UserAPIKeyAuth(models=["gpt-5.4-mini"], budget_reservation=reservation)
+
+    await _gate_verdict(_FrameAuthorizer(token), requested_model)
+
+    assert token.budget_reservation == {**reservation, "finalized": True}
+
+
+@pytest.mark.asyncio
+async def test_proxy_frame_model_gate_does_not_count_the_sessions_own_reservation_as_key_spend():
+    """
+    The upgrade reserves up to the key's remaining budget for the session, and the key budget check
+    counts open reservations as spend, so a frame checked while that reservation is open is refused
+    on a key with budget left, where an HTTP call with the same key goes through.
+    """
+    connect_reservation: Final[dict[str, object]] = {"reserved_cost": 0.0001, "entries": []}
+    socket: Final = WebSocket(
+        {"type": "websocket", "state": {"budget_reservation": connect_reservation}}, receive=AsyncMock(), send=AsyncMock()
+    )
+
+    async def key_budget_check(websocket: object, model: str) -> UserAPIKeyAuth:
+        if connect_reservation.get("finalized") is not True:
+            raise litellm.BudgetExceededError(current_cost=0.0001, max_budget=0.0001)
+        return UserAPIKeyAuth(models=["gpt-5.4-mini"])
+
+    with patch("litellm.proxy.proxy_server.prisma_client", None):  # test-quality-ok: the model checks need no database
+        verdict: Final = await _proxy_frame_model_gate(key_budget_check)(socket, "gpt-5.4-mini")
+
+    assert verdict == WebsocketFrameModelAllowed(access_groups=())
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "denial, error_type, message",
+    [
+        (
+            ProxyException(
+                message="Budget has been exceeded! Key=hashed Spend=2.0, Budget=1.0",
+                type=ProxyErrorTypes.budget_exceeded,
+                param=None,
+                code=400,
+            ),
+            "budget_exceeded",
+            "Budget has been exceeded! Key=hashed",
+        ),
+        (
+            litellm.BudgetExceededError(
+                current_cost=2.0,
+                max_budget=1.0,
+                message="Budget has been exceeded! Model access group=tier-a Current cost: 2.0, Max budget: 1.0",
+                entity_type=Litellm_EntityType.MODEL_ACCESS_GROUP.value,
+                entity_id="tier-a",
+            ),
+            "budget_exceeded",
+            "Model access group=tier-a",
+        ),
+        (
+            ProxyException(
+                message="team not allowed to access model. This team can only access models=['gpt-5.4-mini']",
+                type=ProxyErrorTypes.team_model_access_denied,
+                param="model",
+                code=401,
+            ),
+            "team_model_access_denied",
+            "team not allowed to access model",
+        ),
+        (HTTPException(status_code=403, detail="Invalid Authorization header format"), "invalid_request_error", ""),
+    ],
+    ids=["key_budget", "group_budget", "team_allowlist", "malformed_auth"],
+)
+async def test_proxy_frame_model_gate_refuses_what_full_auth_denies_with_its_reason(denial, error_type, message):
+    """A frame is denied for the same reasons a request is, and the caller reads which reason in the error event."""
+    refusal: Final = _refusal(await _gate_verdict(_FrameAuthorizer(denial=denial), "gpt-5.4-mini"))
+
+    assert refusal.error_type == error_type
+    assert message in refusal.message
+
+
+@pytest.mark.asyncio
+async def test_proxy_frame_model_gate_refuses_out_loud_when_auth_cannot_answer():
+    """
+    A gate that cannot answer has to close the session with a reason the caller can read.
+    Letting the failure escape drops the socket with no frame at all, which the caller
+    cannot tell apart from the network going away.
+    """
+    refusal: Final = _refusal(
+        await _gate_verdict(_FrameAuthorizer(denial=ConnectionError("connection pool is exhausted")), "gpt-5.4-mini")
+    )
+
+    assert refusal == WebsocketFrameModelRefused(message=_OPENAI_WS_UNAVAILABLE_AUTH_REFUSAL, error_type="server_error")
diff --git a/tests/unit/proxy/test_proxy_logging_hook_detection.py b/tests/unit/proxy/test_proxy_logging_hook_detection.py
index 182ef833069..afcb89010fe 100644
--- a/tests/unit/proxy/test_proxy_logging_hook_detection.py
+++ b/tests/unit/proxy/test_proxy_logging_hook_detection.py
@@ -347,6 +347,241 @@ async def test_post_call_stream_guardrail_keeps_own_iterator_on_chat_completions
     assert delivered_text != ""
 
 
+async def _served_token_ids(monkeypatch, guardrail_default_on: bool) -> tuple[object, ...]:
+    from litellm.caching.caching import DualCache
+    from litellm.proxy.guardrails.guardrail_hooks.litellm_content_filter.content_filter import (
+        ContentFilterGuardrail,
+    )
+    from litellm.types.guardrails import BlockedWord, ContentFilterAction
+    from litellm.types.utils import Delta, ModelResponseStream, StreamingChoices
+
+    guardrail = ContentFilterGuardrail(
+        guardrail_name="output-filter",
+        blocked_words=[BlockedWord(keyword="zebra", action=ContentFilterAction("MASK"))],
+        event_hook="post_call",
+        default_on=guardrail_default_on,
+    )
+    monkeypatch.setattr(litellm, "callbacks", [guardrail])
+
+    def chunk(content: str, token_ids: list[int], finish_reason: str | None = None) -> ModelResponseStream:
+        streamed = ModelResponseStream(
+            choices=[StreamingChoices(index=0, delta=Delta(content=content), finish_reason=finish_reason)]
+        )
+        setattr(streamed.choices[0], "token_ids", token_ids)
+        return streamed
+
+    async def fake_stream():
+        yield chunk("the zebra runs", [1, 2, 3])
+        yield chunk("", [4], finish_reason="stop")
+
+    served = [
+        served_chunk
+        async for served_chunk in ProxyLogging(user_api_key_cache=DualCache()).async_post_call_streaming_iterator_hook(
+            response=fake_stream(),
+            user_api_key_dict=UserAPIKeyAuth(api_key="sk-9876", request_route="/chat/completions"),
+            request_data={"model": "gpt-4o-mini", "metadata": {}},
+        )
+    ]
+    return tuple(getattr(served_chunk.choices[0], "token_ids", None) for served_chunk in served)
+
+
+@pytest.mark.asyncio
+async def test_post_call_stream_guardrail_drops_token_ids_that_decode_to_the_unmasked_text(monkeypatch):
+    served_token_ids = await _served_token_ids(monkeypatch, guardrail_default_on=True)
+
+    assert served_token_ids
+    assert all(token_ids is None for token_ids in served_token_ids)
+
+
+@pytest.mark.asyncio
+async def test_post_call_stream_keeps_token_ids_when_no_guardrail_runs_on_the_request(monkeypatch):
+    served_token_ids = await _served_token_ids(monkeypatch, guardrail_default_on=False)
+
+    assert served_token_ids == ([1, 2, 3], [4])
+
+
+class _ChecksEachChunkText(CustomGuardrail):
+    async def async_post_call_streaming_hook(self, user_api_key_dict, response):
+        return None
+
+
+async def _per_chunk_hook_token_ids(monkeypatch, guardrail_default_on: bool) -> tuple[object, bool]:
+    import time
+
+    from litellm.litellm_core_utils.litellm_logging import Logging
+    from litellm.types.utils import Delta, ModelResponseStream, StreamingChoices
+
+    monkeypatch.setattr(
+        litellm,
+        "callbacks",
+        [_ChecksEachChunkText(guardrail_name="chunk-check", event_hook="post_call", default_on=guardrail_default_on)],
+    )
+    logging_obj = Logging(
+        model="m",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="acompletion",
+        start_time=time.time(),
+        litellm_call_id="per-chunk-call",
+        function_id="per-chunk-call",
+    )
+    held_back_text_chunk = ModelResponseStream(choices=[StreamingChoices(index=0, delta=Delta(content=""))])
+    setattr(held_back_text_chunk.choices[0], "token_ids", [220, 19, 11])
+
+    served = await ProxyLogging(user_api_key_cache=DualCache()).async_post_call_streaming_hook(
+        data={"model": "m", "metadata": {}, "litellm_logging_obj": logging_obj},
+        response=held_back_text_chunk,
+        user_api_key_dict=UserAPIKeyAuth(api_key="sk-9876", request_route="/chat/completions"),
+    )
+    return getattr(served.choices[0], "token_ids", None), logging_obj.drops_stream_token_ids
+
+
+@pytest.mark.asyncio
+async def test_per_chunk_stream_check_drops_token_ids_served_ahead_of_the_text_it_checks(monkeypatch):
+    assert await _per_chunk_hook_token_ids(monkeypatch, guardrail_default_on=True) == (None, True)
+
+
+@pytest.mark.asyncio
+async def test_per_chunk_stream_keeps_token_ids_when_its_check_does_not_run_on_the_request(monkeypatch):
+    assert await _per_chunk_hook_token_ids(monkeypatch, guardrail_default_on=False) == ([220, 19, 11], False)
+
+
+class _ScansWholeStreamFirst(CustomGuardrail):
+    async def async_post_call_streaming_iterator_hook(self, user_api_key_dict, response, request_data):
+        for chunk in [chunk async for chunk in response]:
+            yield chunk
+
+
+async def _logged_stream_token_ids(monkeypatch, guardrail_default_on: bool) -> object:
+    import asyncio
+    import json
+    import time
+
+    from litellm.litellm_core_utils.litellm_logging import Logging
+    from litellm.litellm_core_utils.streaming_handler import CustomStreamWrapper
+    from litellm.llms.hosted_vllm.chat.transformation import HostedVLLMChatConfig
+
+    guardrail = _ScansWholeStreamFirst(
+        guardrail_name="whole-stream-scan", event_hook="post_call", default_on=guardrail_default_on
+    )
+    monkeypatch.setattr(litellm, "callbacks", [guardrail])
+    logging_obj = Logging(
+        model="m",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="acompletion",
+        start_time=time.time(),
+        litellm_call_id="token-ids-call",
+        function_id="token-ids-call",
+    )
+    logged = asyncio.get_running_loop().create_future()
+
+    async def capture_logged_response(complete_streaming_response, cache_hit):
+        logged.set_result(complete_streaming_response)
+
+    logging_obj._on_deferred_stream_complete = capture_logged_response
+
+    async def sse_lines():
+        for choice in (
+            {"index": 0, "delta": {"role": "assistant", "content": ""}, "finish_reason": None},
+            {"index": 0, "delta": {"content": ""}, "finish_reason": None, "token_ids": [16]},
+            {"index": 0, "delta": {"content": "1,2"}, "finish_reason": None, "token_ids": [11, 17]},
+            {"index": 0, "delta": {"content": ""}, "finish_reason": "stop", "token_ids": [20]},
+        ):
+            yield "data: " + json.dumps(
+                {"id": "chatcmpl-1", "object": "chat.completion.chunk", "model": "m", "choices": [choice]}
+            )
+        yield "data: [DONE]"
+
+    stream = CustomStreamWrapper(
+        completion_stream=HostedVLLMChatConfig().get_model_response_iterator(
+            streaming_response=sse_lines(), sync_stream=False, json_mode=False
+        ),
+        model="m",
+        custom_llm_provider="hosted_vllm",
+        logging_obj=logging_obj,
+    )
+    async for _ in ProxyLogging(user_api_key_cache=DualCache()).async_post_call_streaming_iterator_hook(
+        response=stream,
+        user_api_key_dict=UserAPIKeyAuth(api_key="sk-9876", request_route="/chat/completions"),
+        request_data={"model": "m", "metadata": {}, "litellm_logging_obj": logging_obj},
+    ):
+        pass
+    return (await asyncio.wait_for(logged, timeout=5)).choices[0].token_ids
+
+
+@pytest.mark.asyncio
+async def test_post_call_stream_guardrail_drops_token_ids_from_the_response_it_logs_and_caches(monkeypatch):
+    assert await _logged_stream_token_ids(monkeypatch, guardrail_default_on=True) is None
+
+
+@pytest.mark.asyncio
+async def test_post_call_stream_logs_every_token_id_when_no_guardrail_runs_on_the_request(monkeypatch):
+    assert await _logged_stream_token_ids(monkeypatch, guardrail_default_on=False) == [16, 11, 17, 20]
+
+
+def _completion_chunk(text: str, token_ids: list[int], finish_reason: str | None = None) -> object:
+    from litellm.types.utils import TextChoices, TextCompletionResponse
+
+    return TextCompletionResponse(
+        object="text_completion",
+        choices=[TextChoices(index=0, text=text, finish_reason=finish_reason, token_ids=token_ids)],
+    )
+
+
+def _guarded_completions_stream(monkeypatch, action: str, held_back: tuple[object, ...]):
+    from litellm.proxy.guardrails.guardrail_hooks.litellm_content_filter.content_filter import (
+        ContentFilterGuardrail,
+    )
+    from litellm.types.guardrails import BlockedWord, ContentFilterAction
+
+    monkeypatch.setattr(
+        litellm,
+        "callbacks",
+        [
+            ContentFilterGuardrail(
+                guardrail_name="output-filter",
+                blocked_words=[BlockedWord(keyword="7", action=ContentFilterAction(action))],
+                event_hook="post_call",
+                default_on=True,
+            )
+        ],
+    )
+
+    async def upstream():
+        for chunk in held_back:
+            yield chunk
+        yield _completion_chunk(", 6, 7", [21, 11, 22], finish_reason="stop")
+
+    return ProxyLogging(user_api_key_cache=DualCache()).async_post_call_streaming_iterator_hook(
+        response=upstream(),
+        user_api_key_dict=UserAPIKeyAuth(api_key="sk-9876", request_route="/v1/completions"),
+        request_data={"model": "qwen3", "metadata": {}},
+    )
+
+
+@pytest.mark.asyncio
+async def test_post_call_stream_guardrail_blocks_completions_before_serving_token_id_only_chunks(monkeypatch):
+    stream = _guarded_completions_stream(
+        monkeypatch, "BLOCK", (_completion_chunk("", [11]), _completion_chunk("", [220]))
+    )
+
+    with pytest.raises(HTTPException):
+        await stream.__anext__()
+
+
+@pytest.mark.asyncio
+async def test_post_call_stream_guardrail_serves_no_chunk_left_empty_by_the_token_id_drop(monkeypatch):
+    held_back = (_completion_chunk("", [11]), _completion_chunk("", [220]))
+
+    served = [chunk async for chunk in _guarded_completions_stream(monkeypatch, "MASK", held_back)]
+
+    assert [(chunk.choices[0].text, chunk.choices[0].token_ids) for chunk in served] == [
+        (", 6, [KEYWORD_REDACTED]", None)
+    ]
+    assert [chunk.choices[0].token_ids for chunk in held_back] == [None, None]
+
+
 @pytest.mark.asyncio
 async def test_post_call_stream_records_masked_text_for_deferred_logging(monkeypatch):
     from litellm.caching.caching import DualCache
diff --git a/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py b/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py
index 3647146eb4e..487638d6919 100644
--- a/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py
+++ b/tests/unit/proxy/test_proxy_server_endpoints_and_startup.py
@@ -1,5 +1,6 @@
 import asyncio
 import contextlib
+import dataclasses
 import importlib
 import json
 import logging
@@ -10,9 +11,10 @@ import subprocess
 import sys
 import time
 import types
-from collections.abc import Callable
+from collections.abc import Callable, Iterator, Mapping, Sequence
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
+from types import MappingProxyType
 from typing import Final
 from unittest import mock
 from unittest.mock import AsyncMock, MagicMock, call, create_autospec, mock_open, patch
@@ -48,6 +50,7 @@ from litellm.proxy._types import (
 )
 from litellm.proxy.auth.login_throttle import LoginThrottle
 from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
+from litellm.proxy.db.db_transaction_queue.window_spend_update_queue import WindowSpendUpdateQueue
 from litellm.proxy.hooks.parallel_request_limiter_v3 import RequestRateLimiterStash
 from litellm.proxy.proxy_server import app, aws_error_type_exception_handler, initialize, openai_exception_handler
 from litellm.utils import _invalidate_model_cost_lowercase_map
@@ -1804,9 +1807,7 @@ class _DatabaseWithOneStoredCredential:
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize(
-    "encrypted_with, asks_to_migrate", [(PUBLICLY_KNOWN_KEY, True), ("sk-some-other-key", False)]
-)
+@pytest.mark.parametrize("encrypted_with, asks_to_migrate", [(PUBLICLY_KNOWN_KEY, True), ("sk-some-other-key", False)])
 async def test_proxy_startup_asks_to_migrate_only_when_the_database_holds_values_under_the_unsafe_key(
     monkeypatch, tmp_path, encrypted_with, asks_to_migrate
 ):
@@ -1924,9 +1925,7 @@ async def test_proxy_startup_names_the_config_file_that_set_the_unsafe_key(monke
     from litellm.proxy.auth.master_key_boot_check import UnsafeMasterKeyError
     from litellm.proxy.proxy_server import proxy_startup_event
 
-    config_path, announced = _boot_with_general_settings(
-        monkeypatch, tmp_path, {"master_key": PUBLICLY_KNOWN_KEY}
-    )
+    config_path, announced = _boot_with_general_settings(monkeypatch, tmp_path, {"master_key": PUBLICLY_KNOWN_KEY})
 
     with pytest.raises(UnsafeMasterKeyError):
         async with proxy_startup_event(FastAPI()):
@@ -3807,6 +3806,24 @@ async def test_db_reload_keeps_the_resolved_value_of_a_config_owned_env_referenc
     assert proxy_server_module.store_model_in_db is True
 
 
+@pytest.mark.asyncio
+async def test_db_reload_of_a_json_string_general_settings_row_reports_no_ignored_keys(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from litellm.proxy import proxy_server as proxy_server_module
+    from litellm.proxy.proxy_server import ProxyConfig
+
+    monkeypatch.setattr(proxy_server_module, "user_api_key_cache", MagicMock(), raising=False)
+    proxy_config: Final = ProxyConfig()
+    proxy_config.settings.load_yaml({})
+    monkeypatch.setattr(proxy_server_module, "general_settings", proxy_config.settings, raising=False)
+
+    await proxy_config._update_general_settings('{"budget_rollover": true, "master_key": "sk-stored"}')
+
+    assert proxy_config.settings.unmanaged_db_keys() == ()
+    assert proxy_config.settings.source("master_key") != "db"
+
+
 def test_max_ui_session_budget_default_is_one_dollar():
     """LIT-4662: the dashboard session budget default is a product decision; the
     old 0.25 default locked admins out of auto router Test Connection and the
@@ -7295,7 +7312,7 @@ def test_deep_merge_dicts_skips_none_and_empty_lists(monkeypatch):
     db_param_value = {
         "max_parallel_requests": None,
         "allowed_models": [],
-        "new_key": "new_value",
+        "store_prompts_in_spend_logs": True,
         "nested": {
             "key1": "updated_value1",
             "key3": "value3",
@@ -7308,7 +7325,7 @@ def test_deep_merge_dicts_skips_none_and_empty_lists(monkeypatch):
 
     assert result["max_parallel_requests"] == 10
     assert result["allowed_models"] == ["gpt-3.5-turbo", "gpt-4"]
-    assert result["new_key"] == "new_value"
+    assert result["store_prompts_in_spend_logs"] is True
     assert result["nested"] == {"key1": "value1", "key2": "value2"}
 
 
@@ -8394,10 +8411,18 @@ async def test_update_general_settings_db_pass_through_endpoint_overrides_yaml_e
     request.headers = {}
     request.query_params = {}
 
-    settings: Final = patch("litellm.proxy.proxy_server.general_settings", {"pass_through_endpoints": [yaml_endpoint]})  # test-quality-ok: the method reads this module global; no injection seam
-    yaml_endpoints: Final = patch("litellm.proxy.proxy_server.config_passthrough_endpoints", [yaml_endpoint])  # test-quality-ok: module global holding the YAML endpoints the fix merges in
-    initialize: Final = patch("litellm.proxy.proxy_server.initialize_pass_through_endpoints", AsyncMock())  # test-quality-ok: route registration needs the FastAPI app; auth is the observable here
-    master_key: Final = patch("litellm.proxy.proxy_server.master_key", MASTER_KEY)  # test-quality-ok: a set master key is what makes a missing Authorization header a 401
+    settings: Final = patch(
+        "litellm.proxy.proxy_server.general_settings", {"pass_through_endpoints": [yaml_endpoint]}
+    )  # test-quality-ok: the method reads this module global; no injection seam
+    yaml_endpoints: Final = patch(
+        "litellm.proxy.proxy_server.config_passthrough_endpoints", [yaml_endpoint]
+    )  # test-quality-ok: module global holding the YAML endpoints the fix merges in
+    initialize: Final = patch(
+        "litellm.proxy.proxy_server.initialize_pass_through_endpoints", AsyncMock()
+    )  # test-quality-ok: route registration needs the FastAPI app; auth is the observable here
+    master_key: Final = patch(
+        "litellm.proxy.proxy_server.master_key", MASTER_KEY
+    )  # test-quality-ok: a set master key is what makes a missing Authorization header a 401
     with settings, yaml_endpoints, initialize, master_key:
         await ProxyConfig()._update_general_settings(db_general_settings={"pass_through_endpoints": [db_endpoint]})
 
@@ -13900,7 +13925,7 @@ def _stream_usage_generator_chunks():
 
 def test_is_injected_stream_usage_artifact():
     from litellm.litellm_core_utils.stream_usage_chunks import is_injected_stream_usage_artifact
-    from litellm.types.utils import ModelResponseStream, Usage
+    from litellm.types.utils import Delta, ModelResponseStream, StreamingChoices, Usage
 
     content_chunk, finish_chunk, empty_choices_usage_chunk = _stream_usage_test_chunks()
     assert is_injected_stream_usage_artifact(empty_choices_usage_chunk) is True
@@ -13923,6 +13948,21 @@ def test_is_injected_stream_usage_artifact():
 
     assert is_injected_stream_usage_artifact({"usage": {"prompt_tokens": 1}}) is False
 
+    held_back_token_ids_chunk: Final = ModelResponseStream(
+        model="qwen3", choices=[StreamingChoices(delta=Delta(content=None), token_ids=[16])]
+    )
+    assert is_injected_stream_usage_artifact(held_back_token_ids_chunk) is False
+
+    null_token_ids_chunk: Final = ModelResponseStream(
+        model="qwen3", choices=[StreamingChoices(delta=Delta(content=None), token_ids=None)]
+    )
+    assert is_injected_stream_usage_artifact(null_token_ids_chunk) is True
+
+    unrelated_extra_chunk: Final = ModelResponseStream(
+        model="qwen3", choices=[StreamingChoices(delta=Delta(content=None), text="")]
+    )
+    assert is_injected_stream_usage_artifact(unrelated_extra_chunk) is True
+
 
 async def _collect_async_data_generator_frames(request_data: dict) -> list:
     from litellm.proxy.proxy_server import async_data_generator
@@ -14060,17 +14100,18 @@ def test_startup_is_silent_when_mock_testing_params_disabled(caplog):
 
 
 @contextlib.contextmanager
-def _window_spend_enqueue_env(cached_objects: dict):
+def _window_spend_enqueue_env(
+    cached_objects: Mapping[str, object], prisma_client: MagicMock | None = None
+) -> Iterator[WindowSpendUpdateQueue]:
     """Point increment_spend_counters at throwaway caches and a real
     WindowSpendUpdateQueue, and hand back the queue to inspect."""
     import litellm.proxy.proxy_server as ps
     from litellm.caching.dual_cache import DualCache
-    from litellm.proxy.db.db_transaction_queue.window_spend_update_queue import (
-        WindowSpendUpdateQueue,
-    )
+    from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
 
-    user_api_key_cache = MagicMock()
-    user_api_key_cache.async_get_cache = AsyncMock(side_effect=lambda key, **_: cached_objects.get(key))
+    user_api_key_cache: Final = UserApiKeyCache()
+    for key, value in cached_objects.items():
+        user_api_key_cache.set_cache(key=key, value=value)
 
     queue = WindowSpendUpdateQueue()
     proxy_logging_obj = MagicMock()
@@ -14084,7 +14125,7 @@ def _window_spend_enqueue_env(cached_objects: dict):
     )
     ps.user_api_key_cache = user_api_key_cache
     ps.spend_counter_cache = DualCache()
-    ps.prisma_client = None
+    ps.prisma_client = prisma_client
     ps.proxy_logging_obj = proxy_logging_obj
     try:
         yield queue
@@ -14272,6 +14313,293 @@ async def test_team_window_spend_row_carries_the_request_start_time():
     assert enqueued[0]["started_at"] == "2026-08-10T12:00:00.500000"
 
 
+_WINDOW_RESET_AT: Final = "2026-08-17T00:00:00+00:00"
+
+
+def _window(budget_duration: str, max_budget: float) -> dict[str, object]:
+    return {"budget_duration": budget_duration, "max_budget": max_budget, "reset_at": _WINDOW_RESET_AT}
+
+
+@dataclasses.dataclass(frozen=True, slots=True)
+class _StoredRow:
+    budget_limits: list[dict[str, object]] | None
+
+
+def _prisma_with_rows(
+    keys: Mapping[str, _StoredRow] = MappingProxyType({}),
+    teams: Mapping[str, _StoredRow] = MappingProxyType({}),
+) -> MagicMock:
+    """Key and team tables that answer find_unique from the given rows."""
+    client: Final = MagicMock()
+    client.db.litellm_verificationtoken.find_unique = AsyncMock(side_effect=lambda where: keys.get(where["token"]))
+    client.db.litellm_teamtable.find_unique = AsyncMock(side_effect=lambda where: teams.get(where["team_id"]))
+    return client
+
+
+def _charged_windows(enqueued: Sequence[Mapping[str, object]]) -> list[tuple[object, object, object]]:
+    return [(item["entity_id"], item["window_duration"], item["spend"]) for item in enqueued]
+
+
+@pytest.mark.asyncio
+async def test_key_window_is_charged_when_the_cached_key_expired_before_the_request_ended():
+    """A stream that outlives user_api_key_cache_ttl finds no cached key when its
+    cost lands. Its spend still belongs to the key's budget windows."""
+    import litellm.proxy.proxy_server as ps
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows(keys={"hashed-token": _StoredRow([_window("30d", 100.0)])})
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.25)
+        enqueued: Final = await _drain(queue)
+        assert await ps.user_api_key_cache.async_get_cache(key="hashed-token") is None
+
+    assert [item["entity_type"] for item in enqueued] == ["key"]
+    assert _charged_windows(enqueued) == [("hashed-token", "30d", pytest.approx(0.25))]
+
+
+@pytest.mark.asyncio
+async def test_team_window_is_charged_when_the_cached_team_expired_before_the_request_ended():
+    import litellm.proxy.proxy_server as ps
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows(teams={"team-1": _StoredRow([_window("7d", 50.0)])})
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        await increment_spend_counters(token=None, team_id="team-1", user_id=None, response_cost=1.5)
+        enqueued: Final = await _drain(queue)
+        assert await ps.user_api_key_cache.async_get_cache(key="team_id:team-1") is None
+
+    assert [item["entity_type"] for item in enqueued] == ["team"]
+    assert _charged_windows(enqueued) == [("team-1", "7d", pytest.approx(1.5))]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "token, keys",
+    [
+        pytest.param("litellm_proxy_master_key", {}, id="no-key-row"),
+        pytest.param("hashed-token", {"hashed-token": _StoredRow(budget_limits=None)}, id="key-row-without-windows"),
+    ],
+)
+async def test_a_token_without_budget_windows_reads_the_database_once_across_requests(
+    token: str, keys: Mapping[str, _StoredRow]
+):
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows(keys=keys)
+    find_unique: Final = prisma_client.db.litellm_verificationtoken.find_unique
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        await increment_spend_counters(token=token, team_id=None, user_id=None, response_cost=0.25)
+        reads_after_first_request: Final = find_unique.await_count
+        for _ in range(3):
+            await increment_spend_counters(token=token, team_id=None, user_id=None, response_cost=0.25)
+        enqueued: Final = await _drain(queue)
+
+    assert enqueued == []
+    assert reads_after_first_request > 0
+    assert find_unique.await_count == reads_after_first_request
+
+
+@pytest.mark.asyncio
+async def test_every_cache_miss_charges_the_windows_the_key_row_holds_at_that_moment():
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows(keys={"hashed-token": _StoredRow([_window("30d", 100.0)])})
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.25)
+        prisma_client.db.litellm_verificationtoken.find_unique = AsyncMock(
+            return_value=_StoredRow([_window("7d", 5.0)])
+        )
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.5)
+        enqueued: Final = await _drain(queue)
+
+    assert sorted(_charged_windows(enqueued), key=lambda charge: str(charge[1])) == [
+        ("hashed-token", "30d", pytest.approx(0.25)),
+        ("hashed-token", "7d", pytest.approx(0.5)),
+    ]
+
+
+@pytest.mark.asyncio
+async def test_a_failed_key_row_read_skips_that_request_and_the_next_one_reads_again():
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows()
+    prisma_client.db.litellm_verificationtoken.find_unique = AsyncMock(
+        side_effect=ConnectionError("database is unreachable")
+    )
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.25)
+        after_failure: Final = await _drain(queue)
+        prisma_client.db.litellm_verificationtoken.find_unique = AsyncMock(
+            return_value=_StoredRow([_window("7d", 5.0)])
+        )
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.5)
+        after_recovery: Final = await _drain(queue)
+
+    assert after_failure == []
+    assert _charged_windows(after_recovery) == [("hashed-token", "7d", pytest.approx(0.5))]
+
+
+@pytest.mark.asyncio
+async def test_a_late_request_after_a_key_update_charges_windows_the_key_did_not_have_before():
+    import litellm.proxy.proxy_server as ps
+    from litellm.proxy.auth.auth_checks import delete_cache_key_object
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows(keys={"hashed-token": _StoredRow(budget_limits=None)})
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.25)
+        prisma_client.db.litellm_verificationtoken.find_unique = AsyncMock(
+            return_value=_StoredRow([_window("7d", 5.0)])
+        )
+        await delete_cache_key_object(
+            hashed_token="hashed-token", user_api_key_cache=ps.user_api_key_cache, proxy_logging_obj=None
+        )
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.5)
+        enqueued: Final = await _drain(queue)
+
+    assert _charged_windows(enqueued) == [("hashed-token", "7d", pytest.approx(0.5))]
+
+
+@pytest.mark.asyncio
+async def test_a_key_update_that_lands_during_the_row_read_does_not_hide_the_windows_it_adds():
+    import litellm.proxy.proxy_server as ps
+    from litellm.proxy.auth.auth_checks import delete_cache_key_object
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows()
+    updated_row: Final = _StoredRow([_window("7d", 5.0)])
+
+    async def read_the_row_from_before_the_update(where: Mapping[str, str]) -> _StoredRow:
+        prisma_client.db.litellm_verificationtoken.find_unique = AsyncMock(return_value=updated_row)
+        await delete_cache_key_object(
+            hashed_token=where["token"], user_api_key_cache=ps.user_api_key_cache, proxy_logging_obj=None
+        )
+        return _StoredRow(budget_limits=None)
+
+    prisma_client.db.litellm_verificationtoken.find_unique = read_the_row_from_before_the_update
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        ps.spend_counter_cache.set_cache(key="spend:key:hashed-token", value=0.0)
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.25)
+        _ = await _drain(queue)
+        await increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.5)
+        after_the_update: Final = await _drain(queue)
+
+    assert _charged_windows(after_the_update) == [("hashed-token", "7d", pytest.approx(0.5))]
+
+
+@pytest.mark.asyncio
+async def test_late_requests_from_many_keys_with_windows_do_not_push_out_a_known_no_window_key():
+    import litellm.proxy.proxy_server as ps
+    from litellm.caching.in_memory_cache import DEFAULT_MAX_SIZE_IN_MEMORY
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    windowed_tokens: Final = tuple(f"windowed-{index}" for index in range(DEFAULT_MAX_SIZE_IN_MEMORY))
+    rows: Final = {
+        "no-windows": _StoredRow(budget_limits=None),
+        **{token: _StoredRow([_window("7d", 5.0)]) for token in windowed_tokens},
+    }
+    prisma_client: Final = _prisma_with_rows(keys=rows)
+    find_unique: Final = prisma_client.db.litellm_verificationtoken.find_unique
+
+    def no_window_key_reads() -> int:
+        return sum(1 for call in find_unique.await_args_list if call.kwargs["where"]["token"] == "no-windows")
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client):
+        await increment_spend_counters(token="no-windows", team_id=None, user_id=None, response_cost=0.1)
+        reads_after_the_first_request: Final = no_window_key_reads()
+        for token in windowed_tokens:
+            await increment_spend_counters(token=token, team_id=None, user_id=None, response_cost=0.1)
+        ps.spend_counter_cache.set_cache(key="spend:key:no-windows", value=0.1)
+        await increment_spend_counters(token="no-windows", team_id=None, user_id=None, response_cost=0.1)
+
+    assert no_window_key_reads() == reads_after_the_first_request
+
+
+@pytest.mark.asyncio
+async def test_a_slow_window_row_read_does_not_hold_back_the_key_spend_counter():
+    import litellm.proxy.proxy_server as ps
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows()
+    read_started: Final = asyncio.Event()
+    finish_read: Final = asyncio.Event()
+
+    async def slow_row_read(where: Mapping[str, str]) -> _StoredRow:
+        read_started.set()
+        await finish_read.wait()
+        return _StoredRow([_window("7d", 5.0)])
+
+    prisma_client.db.litellm_verificationtoken.find_unique = slow_row_read
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        ps.spend_counter_cache.set_cache(key="spend:key:hashed-token", value=0.0)
+        ps.spend_counter_cache.set_cache(key="spend:key:hashed-token:window:7d", value=1.0)
+        charge: Final = asyncio.create_task(
+            increment_spend_counters(token="hashed-token", team_id=None, user_id=None, response_cost=0.25)
+        )
+        assert await asyncio.wait_for(read_started.wait(), timeout=5)
+        key_spend_while_the_row_read_waits: Final = ps.spend_counter_cache.get_cache(key="spend:key:hashed-token")
+        finish_read.set()
+        await charge
+        window_spend: Final = ps.spend_counter_cache.get_cache(key="spend:key:hashed-token:window:7d")
+        charged: Final = await _drain(queue)
+
+    assert key_spend_while_the_row_read_waits == pytest.approx(0.25)
+    assert window_spend == pytest.approx(1.25)
+    assert _charged_windows(charged) == [("hashed-token", "7d", pytest.approx(0.25))]
+
+
+@pytest.mark.asyncio
+async def test_a_late_request_that_misses_the_updated_team_charges_windows_the_team_did_not_have_before():
+    """Another worker's /team/update only evicts this worker's cached team, so its next late cost reads the row."""
+    import litellm.proxy.proxy_server as ps
+    from litellm.proxy._types import LiteLLM_TeamTable
+    from litellm.proxy.management_endpoints.team_endpoints import refresh_cached_team
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    prisma_client: Final = _prisma_with_rows(teams={"team-1": _StoredRow(budget_limits=None)})
+    updated_row: Final = _StoredRow([_window("7d", 50.0)])
+
+    with _window_spend_enqueue_env({}, prisma_client=prisma_client) as queue:
+        await increment_spend_counters(token=None, team_id="team-1", user_id=None, response_cost=1.5)
+        prisma_client.db.litellm_teamtable.find_unique = AsyncMock(return_value=updated_row)
+        await refresh_cached_team(
+            team_row=LiteLLM_TeamTable(team_id="team-1", budget_limits=updated_row.budget_limits),
+            user_api_key_cache=ps.user_api_key_cache,
+            proxy_logging_obj=ps.proxy_logging_obj,
+        )
+        ps.user_api_key_cache.delete_cache(key="team_id:team-1")
+        await increment_spend_counters(token=None, team_id="team-1", user_id=None, response_cost=2.0)
+        enqueued: Final = await _drain(queue)
+
+    assert _charged_windows(enqueued) == [("team-1", "7d", pytest.approx(2.0))]
+
+
+@pytest.mark.asyncio
+async def test_late_costs_for_many_tokens_without_windows_leave_the_cached_team_in_place():
+    from litellm.proxy.proxy_server import increment_spend_counters
+
+    team_obj: Final = MagicMock()
+    team_obj.budget_limits = [_window("7d", 50.0)]
+
+    with _window_spend_enqueue_env({"team_id:team-1": team_obj}, prisma_client=_prisma_with_rows()) as queue:
+        for token_number in range(250):
+            await increment_spend_counters(
+                token=f"token-{token_number}", team_id=None, user_id=None, response_cost=0.01
+            )
+        await increment_spend_counters(token=None, team_id="team-1", user_id=None, response_cost=1.5)
+        enqueued: Final = await _drain(queue)
+
+    assert _charged_windows(enqueued) == [("team-1", "7d", pytest.approx(1.5))]
+
+
 def _mock_startup_prisma_client(health_check_error=None, connect_error=None):
     client = MagicMock()
     client.connect = AsyncMock(side_effect=connect_error)
@@ -15829,6 +16157,166 @@ async def test_delete_config_general_settings_still_removes_a_key_the_database_o
     assert "max_request_size_mb" not in pc.settings
 
 
+@pytest.mark.asyncio
+async def test_delete_config_general_settings_removes_a_stored_key_no_settings_api_manages(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from litellm.proxy._types import ConfigFieldDelete
+    from litellm.proxy.proxy_server import ProxyConfig, delete_config_general_settings
+
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {}})
+    stored_row: Final = {"enforce_user_param": True, "store_prompts_in_spend_logs": True}
+    pc.settings.apply_db_row("general_settings", stored_row)
+    fake_prisma: Final = _fake_prisma_with_config(stored_row)
+    monkeypatch.setattr(proxy_server_module, "proxy_config", pc)
+    monkeypatch.setattr(proxy_server_module, "prisma_client", fake_prisma)
+
+    admin: Final = UserAPIKeyAuth(api_key="hashed-admin", user_id="admin-1", user_role=LitellmUserRoles.PROXY_ADMIN)
+    await delete_config_general_settings(
+        data=ConfigFieldDelete(field_name="enforce_user_param", config_type="general_settings"),
+        user_api_key_dict=admin,
+    )
+
+    written: Final = json.loads(fake_prisma.db.litellm_config.upsert.await_args.kwargs["data"]["update"]["param_value"])
+    assert written == {"store_prompts_in_spend_logs": True}
+    assert pc.settings.unmanaged_db_keys() == ()
+
+
+@pytest.mark.asyncio
+async def test_delete_config_general_settings_stops_serving_the_removed_pass_through_routes(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from fastapi import FastAPI
+    from starlette.routing import Route
+
+    from litellm.proxy._types import ConfigFieldDelete
+    from litellm.proxy.pass_through_endpoints.pass_through_endpoints import _registered_pass_through_routes
+    from litellm.proxy.proxy_server import ProxyConfig, delete_config_general_settings
+    from litellm.types.passthrough_endpoints.pass_through_endpoints import LITELLM_PASS_THROUGH_ENDPOINT_MARKER
+
+    endpoint: Final = {"id": "stored-route", "path": "/stored-route", "target": "http://example.com"}
+    stored_row: Final = {"pass_through_endpoints": [endpoint], "store_prompts_in_spend_logs": True}
+    app: Final = FastAPI()
+    monkeypatch.setattr(proxy_server_module, "app", app)
+    monkeypatch.setattr(proxy_server_module, "premium_user", True)
+    monkeypatch.setattr(proxy_server_module, "config_passthrough_endpoints", None)
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {}})
+    pc.settings.apply_db_row("general_settings", stored_row)
+    monkeypatch.setattr(proxy_server_module, "proxy_config", pc)
+    monkeypatch.setattr(proxy_server_module, "prisma_client", _fake_prisma_with_config(stored_row))
+
+    def served_paths() -> frozenset[str]:
+        return frozenset(
+            route.path
+            for route in app.router.routes
+            if isinstance(route, Route) and getattr(route.endpoint, LITELLM_PASS_THROUGH_ENDPOINT_MARKER, False) is True
+        )
+
+    saved_registry: Final = dict(_registered_pass_through_routes)
+    try:
+        _registered_pass_through_routes.clear()
+        await pc.serve_pass_through_endpoints([endpoint])
+        served_before: Final = served_paths()
+        await delete_config_general_settings(
+            data=ConfigFieldDelete(field_name="pass_through_endpoints", config_type="general_settings"),
+            user_api_key_dict=UserAPIKeyAuth(
+                api_key="hashed-admin", user_id="admin-1", user_role=LitellmUserRoles.PROXY_ADMIN
+            ),
+        )
+        served_after: Final = served_paths()
+    finally:
+        _registered_pass_through_routes.clear()
+        _registered_pass_through_routes.update(saved_registry)
+
+    assert "/stored-route" in served_before
+    assert "/stored-route" not in served_after
+
+
+@pytest.mark.asyncio
+async def test_delete_config_general_settings_removes_an_ignored_stored_key_the_config_file_also_sets(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from litellm.proxy._types import ConfigFieldDelete
+    from litellm.proxy.proxy_server import ProxyConfig, delete_config_general_settings
+
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {"enforce_user_param": False}})
+    stored_row: Final = {"enforce_user_param": True, "store_prompts_in_spend_logs": True}
+    pc.settings.apply_db_row("general_settings", stored_row)
+    fake_prisma: Final = _fake_prisma_with_config(stored_row)
+    monkeypatch.setattr(proxy_server_module, "proxy_config", pc)
+    monkeypatch.setattr(proxy_server_module, "prisma_client", fake_prisma)
+
+    admin: Final = UserAPIKeyAuth(api_key="hashed-admin", user_id="admin-1", user_role=LitellmUserRoles.PROXY_ADMIN)
+    await delete_config_general_settings(
+        data=ConfigFieldDelete(field_name="enforce_user_param", config_type="general_settings"),
+        user_api_key_dict=admin,
+    )
+
+    written: Final = json.loads(fake_prisma.db.litellm_config.upsert.await_args.kwargs["data"]["update"]["param_value"])
+    assert written == {"store_prompts_in_spend_logs": True}
+    assert pc.settings["enforce_user_param"] is False
+    assert pc.settings.unmanaged_db_keys() == ()
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("stored_row", ['{"max_request_size_mb": 42, "disable_custom_api_keys": true}', "not json"])
+@pytest.mark.parametrize("field_name", ["max_request_size_mb", "disable_custom_api_keys", "not_a_setting"])
+async def test_delete_config_general_settings_leaves_a_string_row_untouched(
+    monkeypatch: pytest.MonkeyPatch, stored_row: str, field_name: str
+) -> None:
+    from litellm.proxy._types import ConfigFieldDelete
+    from litellm.proxy.proxy_server import ProxyConfig, delete_config_general_settings
+
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {}})
+    fake_prisma: Final = _fake_prisma_with_config(stored_row)
+    monkeypatch.setattr(proxy_server_module, "proxy_config", pc)
+    monkeypatch.setattr(proxy_server_module, "prisma_client", fake_prisma)
+
+    admin: Final = UserAPIKeyAuth(api_key="hashed-admin", user_id="admin-1", user_role=LitellmUserRoles.PROXY_ADMIN)
+    with pytest.raises(HTTPException) as refused:
+        await delete_config_general_settings(
+            data=ConfigFieldDelete(field_name=field_name, config_type="general_settings"),
+            user_api_key_dict=admin,
+        )
+
+    assert (refused.value.status_code, refused.value.detail) == (
+        400,
+        {
+            "error": "general_settings is stored in the database as something other than a JSON object, so no field "
+            "can be removed from it"
+        },
+    )
+    fake_prisma.db.litellm_config.upsert.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_delete_config_general_settings_refuses_a_key_neither_managed_nor_stored(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from litellm.proxy._types import ConfigFieldDelete
+    from litellm.proxy.proxy_server import ProxyConfig, delete_config_general_settings
+
+    pc: Final = ProxyConfig()
+    pc._load_yaml_settings_stores({"general_settings": {}})
+    fake_prisma: Final = _fake_prisma_with_config({"store_prompts_in_spend_logs": True})
+    monkeypatch.setattr(proxy_server_module, "proxy_config", pc)
+    monkeypatch.setattr(proxy_server_module, "prisma_client", fake_prisma)
+
+    admin: Final = UserAPIKeyAuth(api_key="hashed-admin", user_id="admin-1", user_role=LitellmUserRoles.PROXY_ADMIN)
+    with pytest.raises(HTTPException) as refused:
+        await delete_config_general_settings(
+            data=ConfigFieldDelete(field_name="enforce_user_param", config_type="general_settings"),
+            user_api_key_dict=admin,
+        )
+
+    assert refused.value.status_code == 400
+    fake_prisma.db.litellm_config.upsert.assert_not_awaited()
+
+
 @pytest.mark.asyncio
 async def test_config_field_info_reports_the_declared_value_of_a_config_owned_secret(monkeypatch):
     from litellm.proxy.proxy_server import ProxyConfig, get_config_general_settings
diff --git a/tests/unit/proxy/test_proxy_token_counter.py b/tests/unit/proxy/test_proxy_token_counter.py
index 68eb05e60dd..2f85d1c7516 100644
--- a/tests/unit/proxy/test_proxy_token_counter.py
+++ b/tests/unit/proxy/test_proxy_token_counter.py
@@ -25,7 +25,7 @@ import pytest
 import respx
 import tiktoken
 from dotenv import load_dotenv
-from pydantic import BaseModel, ConfigDict, JsonValue
+from pydantic import BaseModel, ConfigDict, Field, JsonValue, TypeAdapter
 from tokenizers import Tokenizer
 from tokenizers.models import WordLevel
 from tokenizers.pre_tokenizers import Whitespace
@@ -82,6 +82,7 @@ from litellm.proxy.proxy_server import (
 )
 from litellm.responses.utils import ResponsesAPIRequestUtils
 from litellm.rust_bridge.fork_guard import ForkedAfterNativeRuntimeStarted
+from litellm.types.llms.anthropic import ANTHROPIC_BETA_HEADER_VALUES
 from litellm.types.secret_managers.main import KeyManagementSettings, KeyManagementSystem
 from litellm.types.utils import (
     ADDRESSED_RESPONSE_ID_FIELD,
@@ -1741,7 +1742,10 @@ _OPUS_IN_US_EAST_1: Final = TokenCountModel(model="us.anthropic.claude-opus-5-5"
 
 
 async def _ladder(
-    counter: _ScriptedCounter, settings: TokenCountSettings, local_estimate_allowed: bool = True
+    counter: _ScriptedCounter,
+    settings: TokenCountSettings,
+    local_estimate_allowed: bool = True,
+    forwarded_edits: bool = False,
 ) -> TokenCountResponse | None:
     return await _provider_token_count(
         count_with=partial(
@@ -1759,6 +1763,7 @@ async def _ladder(
         request_model=_COUNT_REQUEST.model,
         settings=settings,
         local_estimate_allowed=local_estimate_allowed,
+        forwarded_edits=forwarded_edits,
     )
 
 
@@ -1920,6 +1925,23 @@ async def test_uncountable_model_without_framing_raises():
     assert raised.value.code == "404"
 
 
+@pytest.mark.parametrize(
+    "settings",
+    [
+        TokenCountSettings(framing=None, count_model=None, tool_framing=300),
+        TokenCountSettings(framing=None, count_model=None, responses_framing=145),
+        TokenCountSettings(framing=None, count_model=None, responses_tool_framing=100),
+    ],
+)
+@pytest.mark.asyncio
+async def test_uncountable_model_with_only_a_request_kind_framing_falls_through_to_the_local_estimate(
+    settings: TokenCountSettings,
+):
+    counter: Final = _ScriptedCounter({"us.anthropic.claude-sonnet-5-5": _provider_reply("sonnet", status_code=404)})
+
+    assert isinstance(await _ladder(counter, settings), ProviderCountFailure)
+
+
 @pytest.mark.parametrize(
     ("count_model", "counted_as"),
     [
@@ -1986,6 +2008,26 @@ async def test_configured_token_count_model_error_stands_even_with_framing(
     assert raised.value.message.count("counts tokens with us.anthropic.claude-opus-5-5 in us-east-1") == region_hints
 
 
+@pytest.mark.parametrize(("status_code", "region_hints"), [(400, 0), (403, 1)])
+@pytest.mark.asyncio
+async def test_a_pinned_token_count_model_rejecting_forwarded_edits_answers_without_the_region_hint(
+    status_code: int, region_hints: int
+):
+    counter: Final = _ScriptedCounter(
+        {"us.anthropic.claude-opus-5-5": _provider_reply("opus", status_code=status_code)}
+    )
+
+    with pytest.raises(ProxyException) as raised:
+        await _ladder(
+            counter,
+            TokenCountSettings(framing=None, count_model=replace(_OPUS_IN_US_EAST_1, configured=True)),
+            forwarded_edits=True,
+        )
+
+    assert raised.value.code == str(status_code)
+    assert raised.value.message.count("counts tokens with us.anthropic.claude-opus-5-5 in us-east-1") == region_hints
+
+
 @pytest.mark.parametrize(
     ("count_model", "region_hints"),
     [(_OPUS_IN_US_EAST_1, frozenset({True})), (replace(_OPUS_IN_US_EAST_1, region=None), frozenset())],
@@ -2745,6 +2787,480 @@ async def test_framing_comes_from_the_row_the_deployment_provider_or_base_model_
     assert aliased.total_tokens == litellm.token_counter(model="gpt-5.4-mini", messages=messages) + framing
 
 
+@pytest.mark.asyncio
+async def test_a_tool_request_counts_its_framing_in_place_of_the_plain_one_per_api(monkeypatch: pytest.MonkeyPatch):
+    def deployment(name: str, model_info: dict[str, object]) -> dict[str, object]:
+        return {
+            "model_name": name,
+            "litellm_params": {"model": "openai/gpt-5.4-mini", "api_key": f"sk-unused-{name}"},
+            "model_info": model_info,
+        }
+
+    monkeypatch.setattr(
+        litellm.proxy.proxy_server,
+        "llm_router",
+        Router(
+            model_list=[
+                deployment("plain", {}),
+                deployment("chat", {"token_count_framing": 7, "token_count_tool_framing": 50}),
+                deployment(
+                    "per-api",
+                    {
+                        "token_count_framing": 7,
+                        "token_count_tool_framing": 50,
+                        "token_count_responses_framing": 5,
+                        "token_count_responses_tool_framing": 2,
+                    },
+                ),
+            ]
+        ),
+    )
+    messages: Final = [{"role": "user", "content": "What is the weather in Paris?"}]
+    tools: Final = [_KIMI_WEATHER]
+
+    async def count(model: str, request_tools: list[dict[str, object]] | None, responses: bool) -> int:
+        response: Final = await count_request_tokens(
+            request=TokenCountRequest(model=model, messages=messages, tools=request_tools),
+            responses_request={"model": model, "input": "What is the weather in Paris?"} if responses else None,
+        )
+        return response.total_tokens
+
+    plain_with_tools: Final = await count("plain", tools, responses=False)
+    plain_without_tools: Final = await count("plain", None, responses=False)
+
+    assert await count("plain", tools, responses=True) == plain_with_tools
+    assert await count("chat", tools, responses=False) == plain_with_tools + 50
+    assert await count("chat", None, responses=False) == plain_without_tools + 7
+    assert await count("chat", [], responses=False) == plain_without_tools + 7
+    assert await count("chat", tools, responses=True) == plain_with_tools + 50
+    assert await count("chat", None, responses=True) == plain_without_tools + 7
+    assert await count("per-api", tools, responses=False) == plain_with_tools + 50
+    assert await count("per-api", tools, responses=True) == plain_with_tools + 2
+    assert await count("per-api", None, responses=True) == plain_without_tools + 5
+
+
+_GET_WEATHER: Final = {
+    "name": "get_weather",
+    "description": "Get the current weather for a city",
+    "input_schema": {
+        "type": "object",
+        "properties": {"city": {"type": "string", "description": "City name"}},
+        "required": ["city"],
+    },
+}
+_THREE_TOOLS: Final = (
+    _GET_WEATHER,
+    {
+        "name": "get_time",
+        "description": "Get the local time in a timezone",
+        "input_schema": {
+            "type": "object",
+            "properties": {"timezone": {"type": "string", "description": "IANA timezone"}},
+            "required": ["timezone"],
+        },
+    },
+    {
+        "name": "search_docs",
+        "description": "Search internal documents and return the top matches",
+        "input_schema": {
+            "type": "object",
+            "properties": {"query": {"type": "string"}, "limit": {"type": "integer", "description": "Max results"}},
+            "required": ["query"],
+        },
+    },
+)
+_FORM_FIELDS: Final = tuple(f"field_{index}" for index in range(10))
+_FILL_FORM: Final = {
+    "name": "fill_form",
+    "description": "Fill a form",
+    "input_schema": {
+        "type": "object",
+        "properties": {
+            field: {"type": "string", "description": f"Value for field number {index}"}
+            for index, field in enumerate(_FORM_FIELDS)
+        },
+        "required": list(_FORM_FIELDS),
+    },
+}
+_WEATHER_SYSTEM: Final = "You are a helpful assistant that answers weather questions briefly."
+_AZURE_GROK_4_1: Final = "azure_ai/grok-4-1-fast-reasoning"
+_FIREWORKS_DEEPSEEK_V4_1: Final = "fireworks_ai/accounts/fireworks/models/deepseek-v4p1-flash"
+_XAI_GROK_4_3: Final = "xai/grok-4.3"
+_NATIVE_RESPONSES_BASE: Final = {
+    _AZURE_GROK_4_1: "https://unused.services.ai.azure.com/models",
+    _FIREWORKS_DEEPSEEK_V4_1: "https://unused.invalid",
+    _XAI_GROK_4_3: "https://unused.invalid",
+}
+
+
+def _responses_function(tool: Mapping[str, object], **strict: bool | None) -> dict[str, object]:
+    return {
+        "type": "function",
+        "name": tool["name"],
+        "description": tool["description"],
+        "parameters": tool["input_schema"],
+        **strict,
+    }
+
+
+def _get_weather_copies(count: int) -> tuple[dict[str, object], ...]:
+    return tuple({**_GET_WEATHER, "name": f"get_weather_{index}"} for index in range(count))
+
+
+# usage.input_tokens plus cache_read_input_tokens that POST /v1/messages billed for these requests with the user turn
+# "What is the weather in Paris?" through Azure AI Foundry grok-4-1-fast-reasoning, Fireworks deepseek-v4p1-flash and
+# xAI grok-4.3 on 2026-10-29, and usage.prompt_tokens that POST /v1/chat/completions billed through DeepSeek's API on
+# 2026-10-30
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("model", "system", "tools", "billed_prompt_tokens"),
+    [
+        (_AZURE_GROK_4_1, None, (), 163),
+        (_AZURE_GROK_4_1, None, (_GET_WEATHER,), 357),
+        (_AZURE_GROK_4_1, None, _THREE_TOOLS, 445),
+        (_AZURE_GROK_4_1, None, (_FILL_FORM,), 550),
+        (_AZURE_GROK_4_1, _WEATHER_SYSTEM, (_GET_WEATHER,), 368),
+        (_FIREWORKS_DEEPSEEK_V4_1, None, (), 37),
+        (_FIREWORKS_DEEPSEEK_V4_1, None, (_GET_WEATHER,), 304),
+        (_FIREWORKS_DEEPSEEK_V4_1, None, _THREE_TOOLS, 430),
+        (_FIREWORKS_DEEPSEEK_V4_1, None, (_FILL_FORM,), 550),
+        (_FIREWORKS_DEEPSEEK_V4_1, _WEATHER_SYSTEM, (_GET_WEATHER,), 315),
+        (_XAI_GROK_4_3, None, (), 199),
+        (_XAI_GROK_4_3, None, (_GET_WEATHER,), 283),
+        (_XAI_GROK_4_3, None, _THREE_TOOLS, 402),
+        (_XAI_GROK_4_3, None, (_FILL_FORM,), 530),
+        (_XAI_GROK_4_3, _WEATHER_SYSTEM, (_GET_WEATHER,), 297),
+        ("deepseek/deepseek-v4-flash", None, (), 37),
+        ("deepseek/deepseek-v4-flash", None, (_GET_WEATHER,), 304),
+        ("deepseek/deepseek-v4-flash", None, _THREE_TOOLS, 430),
+        ("deepseek/deepseek-v4-flash", _WEATHER_SYSTEM, (_GET_WEATHER,), 315),
+        ("deepseek/deepseek-v4-pro", None, (), 90),
+        ("deepseek/deepseek-v4-pro", None, (_GET_WEATHER,), 367),
+        ("deepseek/deepseek-v4-pro", None, _THREE_TOOLS, 493),
+        ("deepseek/deepseek-v4-pro", _WEATHER_SYSTEM, (_GET_WEATHER,), 378),
+    ],
+)
+async def test_local_estimate_matches_the_billed_prompt_with_the_shipped_framing(
+    monkeypatch: pytest.MonkeyPatch,
+    model: str,
+    system: str | None,
+    tools: tuple[dict[str, object], ...],
+    billed_prompt_tokens: int,
+):
+    monkeypatch.setattr(
+        litellm.proxy.proxy_server,
+        "llm_router",
+        Router(
+            model_list=[
+                {
+                    "model_name": "billed",
+                    "litellm_params": {"model": model, "api_key": "unused", "api_base": "https://unused.invalid"},
+                }
+            ]
+        ),
+    )
+
+    counted: Final = await token_counter(
+        request=TokenCountRequest(
+            model="billed",
+            messages=[{"role": "user", "content": "What is the weather in Paris?"}],
+            tools=list(tools) or None,
+            system=system,
+        )
+    )
+
+    assert counted.count_source == "local_estimate"
+    assert abs(counted.total_tokens - billed_prompt_tokens) <= billed_prompt_tokens * 0.05
+
+
+# usage.input_tokens that POST /v1/responses billed for these requests with the input "What is the weather in Paris?"
+# through Azure AI Foundry grok-4-1-fast-reasoning, Fireworks deepseek-v4p1-flash and xAI grok-4.3 on 2026-10-29
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("model", "system", "tools", "billed_prompt_tokens"),
+    [
+        (_AZURE_GROK_4_1, None, (), 159),
+        (_AZURE_GROK_4_1, None, (_GET_WEATHER,), 159),
+        (_AZURE_GROK_4_1, None, _THREE_TOOLS, 257),
+        (_AZURE_GROK_4_1, None, (_FILL_FORM,), 352),
+        (_AZURE_GROK_4_1, _WEATHER_SYSTEM, (_GET_WEATHER,), 170),
+        (_FIREWORKS_DEEPSEEK_V4_1, None, (_GET_WEATHER,), 304),
+        (_XAI_GROK_4_3, None, (_GET_WEATHER,), 283),
+    ],
+)
+async def test_responses_estimate_matches_the_billed_responses_prompt_with_the_shipped_framing(
+    monkeypatch: pytest.MonkeyPatch,
+    model: str,
+    system: str | None,
+    tools: tuple[dict[str, object], ...],
+    billed_prompt_tokens: int,
+):
+    monkeypatch.setattr(
+        litellm.proxy.proxy_server,
+        "llm_router",
+        Router(
+            model_list=[
+                {
+                    "model_name": "billed",
+                    "litellm_params": {"model": model, "api_key": "unused", "api_base": _NATIVE_RESPONSES_BASE[model]},
+                }
+            ]
+        ),
+    )
+
+    counted: Final = await count_request_tokens(
+        request=TokenCountRequest(
+            model="billed",
+            messages=[{"role": "user", "content": "What is the weather in Paris?"}],
+            tools=[_responses_function(tool) for tool in tools] or None,
+            system=system,
+        ),
+        responses_request={"model": "billed", "input": "What is the weather in Paris?"},
+    )
+
+    assert counted.count_source == "local_estimate"
+    assert abs(counted.total_tokens - billed_prompt_tokens) <= billed_prompt_tokens * 0.05
+
+
+def _single_deployment_router(litellm_params: dict[str, object], model_info: dict[str, object]) -> Router:
+    return Router(
+        model_list=[
+            {
+                "model_name": "counted",
+                "litellm_params": {"api_key": "unused", **litellm_params},
+                "model_info": model_info,
+            }
+        ]
+    )
+
+
+async def _count_with_router(
+    monkeypatch: pytest.MonkeyPatch, router: Router, tools: tuple[dict[str, object], ...], responses: bool
+) -> int:
+    monkeypatch.setattr(litellm.proxy.proxy_server, "llm_router", router)
+    counted: Final = await count_request_tokens(
+        request=TokenCountRequest(
+            model="counted",
+            messages=[{"role": "user", "content": "What is the weather in Paris?"}],
+            tools=list(tools) or None,
+        ),
+        responses_request={"model": "counted", "input": "What is the weather in Paris?"} if responses else None,
+    )
+    return counted.total_tokens
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("tools", [(), (_GET_WEATHER,), _THREE_TOOLS, (_FILL_FORM,)])
+@pytest.mark.parametrize("responses", [False, True])
+async def test_a_custom_deployment_name_counts_like_the_base_model_it_names(
+    monkeypatch: pytest.MonkeyPatch, tools: tuple[dict[str, object], ...], responses: bool
+):
+    api_base: Final = _NATIVE_RESPONSES_BASE[_AZURE_GROK_4_1]
+    custom_name: Final = _single_deployment_router(
+        {"model": "azure_ai/prod-grok", "api_base": api_base}, {"base_model": _AZURE_GROK_4_1}
+    )
+    row_name: Final = _single_deployment_router({"model": _AZURE_GROK_4_1, "api_base": api_base}, {})
+
+    assert await _count_with_router(monkeypatch, custom_name, tools, responses) == await _count_with_router(
+        monkeypatch, row_name, tools, responses
+    )
+
+
+# usage.input_tokens that POST /v1/responses billed through Azure AI Foundry grok-4-1-fast-reasoning on 2026-10-29 for
+# the input "What is the weather in Paris?" with these function tools, strict left unset or sent as false or null,
+# the same on the .services.ai.azure.com and .openai.azure.com hosts
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("tools", "strict", "billed_prompt_tokens"),
+    [
+        ((_GET_WEATHER,), {}, 159),
+        ((_GET_WEATHER,), {"strict": False}, 155),
+        ((_GET_WEATHER,), {"strict": None}, 155),
+        (_THREE_TOOLS, {}, 257),
+        (_get_weather_copies(5), {}, 345),
+        (_get_weather_copies(10), {}, 575),
+        (_get_weather_copies(10), {"strict": False}, 535),
+        (_get_weather_copies(10), {"strict": None}, 535),
+    ],
+)
+@pytest.mark.parametrize(
+    ("litellm_params", "model_info"),
+    [
+        ({"model": _AZURE_GROK_4_1, "api_base": _NATIVE_RESPONSES_BASE[_AZURE_GROK_4_1]}, {}),
+        (
+            {"model": "azure/grok-4-1-fast-reasoning", "api_base": "https://unused.openai.azure.com/openai/v1"},
+            {"base_model": _AZURE_GROK_4_1},
+        ),
+    ],
+)
+async def test_azure_responses_estimate_stays_at_or_just_over_the_billed_prompt_as_function_tools_are_added(
+    monkeypatch: pytest.MonkeyPatch,
+    tools: tuple[dict[str, object], ...],
+    strict: dict[str, bool | None],
+    billed_prompt_tokens: int,
+    litellm_params: dict[str, object],
+    model_info: dict[str, object],
+):
+    router: Final = _single_deployment_router(litellm_params, model_info)
+
+    counted: Final = await _count_with_router(
+        monkeypatch, router, tuple(_responses_function(tool, **strict) for tool in tools), responses=True
+    )
+
+    assert billed_prompt_tokens <= counted <= billed_prompt_tokens * 1.02
+
+
+# POST /v1/responses billed the same usage.input_tokens with strict unset and false on 2026-10-29, 283 for one tool
+# through xAI grok-4.3
+@pytest.mark.asyncio
+async def test_a_responses_host_that_bills_an_unset_strict_like_false_counts_them_alike(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    router: Final = _single_deployment_router(
+        {"model": _XAI_GROK_4_3, "api_base": _NATIVE_RESPONSES_BASE[_XAI_GROK_4_3]}, {}
+    )
+
+    unset: Final = await _count_with_router(monkeypatch, router, (_responses_function(_GET_WEATHER),), responses=True)
+
+    assert unset == await _count_with_router(
+        monkeypatch, router, (_responses_function(_GET_WEATHER, strict=False),), responses=True
+    )
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("built_in_tool", "responses"),
+    [({"type": "web_search"}, True), ({"type": "web_search_20250305", "name": "web_search"}, False)],
+)
+async def test_a_request_whose_only_tools_are_built_in_counts_like_one_without_tools(
+    monkeypatch: pytest.MonkeyPatch, built_in_tool: dict[str, object], responses: bool
+):
+    router: Final = _single_deployment_router(
+        {"model": _AZURE_GROK_4_1, "api_base": _NATIVE_RESPONSES_BASE[_AZURE_GROK_4_1]}, {}
+    )
+
+    assert await _count_with_router(monkeypatch, router, (built_in_tool,), responses) == await _count_with_router(
+        monkeypatch, router, (), responses
+    )
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("tools", [(), (_GET_WEATHER,), _THREE_TOOLS])
+async def test_a_responses_count_the_proxy_bridges_to_chat_completions_frames_like_the_chat_count(
+    monkeypatch: pytest.MonkeyPatch, tools: tuple[dict[str, object], ...]
+):
+    bridged: Final = _single_deployment_router(
+        {"model": _AZURE_GROK_4_1, "api_base": "https://unused.cognitiveservices.azure.com/models"}, {}
+    )
+    native: Final = _single_deployment_router(
+        {"model": _AZURE_GROK_4_1, "api_base": _NATIVE_RESPONSES_BASE[_AZURE_GROK_4_1]}, {}
+    )
+    chat_count: Final = await _count_with_router(monkeypatch, bridged, tools, responses=False)
+
+    assert await _count_with_router(monkeypatch, bridged, tools, responses=True) == chat_count
+    assert await _count_with_router(monkeypatch, native, tools, responses=True) != chat_count
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("from_router_defaults", [False, True])
+async def test_a_responses_count_that_asks_for_the_chat_completions_bridge_frames_like_the_chat_count(
+    monkeypatch: pytest.MonkeyPatch, from_router_defaults: bool
+):
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "counted",
+                "litellm_params": {
+                    "api_key": "unused",
+                    "model": _AZURE_GROK_4_1,
+                    "api_base": _NATIVE_RESPONSES_BASE[_AZURE_GROK_4_1],
+                },
+                "model_info": {},
+            }
+        ],
+        default_litellm_params={"use_chat_completions_api": True} if from_router_defaults else None,
+    )
+    chat_count: Final = await _count_with_router(monkeypatch, router, (_GET_WEATHER,), responses=False)
+
+    counted: Final = await count_request_tokens(
+        request=TokenCountRequest(
+            model="counted",
+            messages=[{"role": "user", "content": "What is the weather in Paris?"}],
+            tools=[_GET_WEATHER],
+        ),
+        responses_request={
+            "model": "counted",
+            "input": "What is the weather in Paris?",
+            **({} if from_router_defaults else {"use_chat_completions_api": True}),
+        },
+    )
+
+    assert counted.total_tokens == chat_count
+
+
+@pytest.mark.asyncio
+async def test_a_responses_count_frames_for_the_api_base_router_defaults_send_inference_to(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "counted",
+                "litellm_params": {
+                    "api_key": "unused",
+                    "model": _AZURE_GROK_4_1,
+                    "api_base": _NATIVE_RESPONSES_BASE[_AZURE_GROK_4_1],
+                },
+                "model_info": {},
+            }
+        ],
+        default_litellm_params={"api_base": "https://unused.cognitiveservices.azure.com/models"},
+    )
+    chat_count: Final = await _count_with_router(monkeypatch, router, (_GET_WEATHER,), responses=False)
+
+    assert await _count_with_router(monkeypatch, router, (_GET_WEATHER,), responses=True) == chat_count
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("use_chat_completions_api", ["maybe", {"a": 1}])
+async def test_a_responses_count_with_a_malformed_bridge_flag_reads_it_the_way_the_responses_route_does(
+    monkeypatch: pytest.MonkeyPatch, use_chat_completions_api: object
+):
+    router: Final = _single_deployment_router(
+        {"model": _AZURE_GROK_4_1, "api_base": _NATIVE_RESPONSES_BASE[_AZURE_GROK_4_1]}, {}
+    )
+    chat_count: Final = await _count_with_router(monkeypatch, router, (_GET_WEATHER,), responses=False)
+
+    counted: Final = await count_request_tokens(
+        request=TokenCountRequest(
+            model="counted",
+            messages=[{"role": "user", "content": "What is the weather in Paris?"}],
+            tools=[_GET_WEATHER],
+        ),
+        responses_request={
+            "model": "counted",
+            "input": "What is the weather in Paris?",
+            "use_chat_completions_api": use_chat_completions_api,
+        },
+    )
+
+    assert counted.total_tokens == chat_count
+
+
+@pytest.mark.asyncio
+async def test_an_azure_responses_count_leaves_strict_unset_for_templates_not_measured_there(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    router: Final = _single_deployment_router(
+        {"model": "azure_ai/deepseek-v4.1-flash", "api_base": "https://unused.services.ai.azure.com/models"}, {}
+    )
+
+    async def counted(**strict: bool) -> int:
+        return await _count_with_router(monkeypatch, router, (_responses_function(_GET_WEATHER, **strict),), True)
+
+    assert await counted() < await counted(strict=True)
+
+
 _KIMI_WEATHER: Final = {
     "type": "function",
     "function": {
@@ -3172,15 +3688,14 @@ _READ_FILE_TOOL: Final[dict[str, JsonValue]] = {
     "name": "read_file",
     "input_schema": {"type": "object", "properties": {"path": {"type": "string"}}},
 }
-_CLEAR_TOOL_USES: Final[dict[str, JsonValue]] = {
-    "edits": [
-        {
-            "type": "clear_tool_uses_20250919",
-            "trigger": {"type": "input_tokens", "value": 500},
-            "keep": {"type": "tool_uses", "value": 1},
-        }
-    ]
-}
+_CLEAR_TOOL_USES_EDITS: Final[list[JsonValue]] = [
+    {
+        "type": "clear_tool_uses_20250919",
+        "trigger": {"type": "input_tokens", "value": 500},
+        "keep": {"type": "tool_uses", "value": 1},
+    }
+]
+_CLEAR_TOOL_USES: Final[dict[str, JsonValue]] = {"edits": _CLEAR_TOOL_USES_EDITS}
 _INVALID_COMPACT_EDIT: Final[dict[str, JsonValue]] = {
     "edits": [{"type": "compact_20260112", "trigger": {"type": "input_tokens", "value": 1000}}]
 }
@@ -3516,6 +4031,28 @@ async def test_gemini_messages_count_tokens_counts_the_unedited_body_when_drop_p
     assert sent_bodies[0].decode().count(_GEMINI_TOOL_OUTPUT) == 3
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("router_defaults", "request_options", "expected_status"),
+    (({}, {"drop_params": True}, None), ({"drop_params": True}, {}, None), ({}, {}, 400)),
+    ids=("request-drop-params", "router-default-drop-params", "no-drop-params"),
+)
+async def test_messages_count_tokens_for_a_model_with_no_deployment_drops_an_invalid_edit_only_under_drop_params(
+    monkeypatch: pytest.MonkeyPatch,
+    router_defaults: dict[str, JsonValue],
+    request_options: dict[str, JsonValue],
+    expected_status: int | None,
+) -> None:
+    monkeypatch.setenv("GEMINI_API_KEY", "test-key")
+    with patch.object(litellm, "drop_params", False):
+        response, _ = await _count_through_the_messages_endpoint(
+            Router(model_list=[_gemini_deployment("gemini-agent", {})], default_litellm_params=router_defaults),
+            {**request_options, "model": "gemini/gemini-3.8-pro", "context_management": _INVALID_COMPACT_EDIT},
+        )
+
+    assert (response.status_code if isinstance(response, JSONResponse) else None) == expected_status
+
+
 @pytest.mark.asyncio
 async def test_gemini_messages_count_tokens_rejects_an_invalid_edit_without_drop_params() -> None:
     with patch.object(litellm, "drop_params", False):
@@ -3529,6 +4066,576 @@ async def test_gemini_messages_count_tokens_rejects_an_invalid_edit_without_drop
     assert sent_bodies == ()
 
 
+_MISTRAL_MODEL: Final = "mistral/mistral-large-latest"
+
+
+def _mistral_router(
+    litellm_params: Mapping[str, JsonValue] = MappingProxyType({}),
+    router_defaults: Mapping[str, JsonValue] = MappingProxyType({}),
+) -> Router:
+    return Router(
+        model_list=[
+            {
+                "model_name": "mistral-agent",
+                "litellm_params": {"model": _MISTRAL_MODEL, "api_key": "test-key", **litellm_params},
+            }
+        ],
+        default_litellm_params=dict(router_defaults),
+    )
+
+
+async def _messages_endpoint_count(router: Router, request_body: Mapping[str, JsonValue]) -> object:
+    import litellm.proxy.anthropic_endpoints.endpoints as anthropic_endpoints
+    import litellm.proxy.proxy_server as proxy_server
+
+    mock_request: Final = MagicMock(spec=Request)
+    mock_request.headers = {}
+    with (
+        patch.object(proxy_server, "llm_router", router),
+        patch.object(anthropic_endpoints, "read_request_body", AsyncMock(return_value=dict(request_body))),
+    ):
+        return await anthropic_count_tokens(mock_request, MagicMock())
+
+
+class _MessagesCountReply(BaseModel):
+    model_config = ConfigDict(frozen=True)
+    input_tokens: int
+
+
+async def _input_tokens(router: Router, request_body: Mapping[str, JsonValue]) -> int:
+    return _MessagesCountReply.model_validate(await _messages_endpoint_count(router, request_body)).input_tokens
+
+
+async def _messages_the_inference_polyfill_sends(model: str) -> list[dict[str, JsonValue]]:
+    from litellm.llms.anthropic.messages.adapters.handler import prepare_context_managed_request
+
+    prepared: Final = await prepare_context_managed_request(
+        model=model,
+        messages=[dict(message) for message in _agent_turns_with_tool_results(3)],
+        tools=[dict(_READ_FILE_TOOL)],
+        system=None,
+        context_management_spec=dict(_CLEAR_TOOL_USES),
+        litellm_metadata=None,
+        additional_drop_params=None,
+        llm_router=None,
+    )
+    assert prepared is not None
+    return TypeAdapter(list[dict[str, JsonValue]]).validate_python(prepared.messages)
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_counts_the_body_the_inference_polyfill_sends_on_a_bridged_provider() -> None:
+    router: Final = _mistral_router()
+    unedited_body: Final[dict[str, JsonValue]] = {
+        "model": "mistral-agent",
+        "messages": _agent_turns_with_tool_results(3),
+        "tools": [_READ_FILE_TOOL],
+    }
+
+    edited: Final = await _input_tokens(router, {**unedited_body, "context_management": _CLEAR_TOOL_USES})
+    unedited: Final = await _input_tokens(router, unedited_body)
+    polyfilled: Final = await _input_tokens(
+        router, {**unedited_body, "messages": await _messages_the_inference_polyfill_sends(_MISTRAL_MODEL)}
+    )
+
+    assert edited < unedited
+    assert edited == polyfilled
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("deployment_params", "router_defaults", "request_options"),
+    (
+        ({"additional_drop_params": ["context_management"]}, {}, {}),
+        ({}, {"additional_drop_params": ["context_management"]}, {}),
+        ({}, {}, {"additional_drop_params": ["context_management"]}),
+    ),
+    ids=("deployment-drops", "router-default-drops", "request-drops"),
+)
+async def test_messages_count_tokens_on_a_bridged_provider_keeps_the_unedited_count_when_context_management_is_dropped(
+    deployment_params: dict[str, JsonValue],
+    router_defaults: dict[str, JsonValue],
+    request_options: dict[str, JsonValue],
+) -> None:
+    router: Final = _mistral_router(deployment_params, router_defaults)
+    unedited_body: Final[dict[str, JsonValue]] = {
+        "model": "mistral-agent",
+        "messages": _agent_turns_with_tool_results(3),
+        "tools": [_READ_FILE_TOOL],
+        **request_options,
+    }
+
+    edited: Final = await _input_tokens(router, {**unedited_body, "context_management": _CLEAR_TOOL_USES})
+
+    assert edited == await _input_tokens(router, unedited_body)
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_on_a_bridged_provider_rejects_an_invalid_edit_without_drop_params() -> None:
+    with patch.object(litellm, "drop_params", False):
+        response: Final = await _messages_endpoint_count(
+            _mistral_router(),
+            {
+                "model": "mistral-agent",
+                "messages": _agent_turns_with_tool_results(3),
+                "tools": [_READ_FILE_TOOL],
+                "context_management": _INVALID_COMPACT_EDIT,
+            },
+        )
+
+    assert isinstance(response, JSONResponse)
+    assert response.status_code == 400
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_on_a_bridged_provider_counts_without_an_invalid_edit_under_drop_params() -> None:
+    router: Final = _mistral_router()
+    unedited_body: Final[dict[str, JsonValue]] = {
+        "model": "mistral-agent",
+        "messages": _agent_turns_with_tool_results(3),
+        "tools": [_READ_FILE_TOOL],
+        "drop_params": True,
+    }
+
+    with patch.object(litellm, "drop_params", False):
+        edited: Final = await _input_tokens(router, {**unedited_body, "context_management": _INVALID_COMPACT_EDIT})
+        unedited: Final = await _input_tokens(router, unedited_body)
+
+    assert edited == unedited
+
+
+def _turns_compacted_by_the_client() -> list[dict[str, JsonValue]]:
+    return [
+        *_agent_turns_with_tool_results(3)[:-1],
+        {"role": "assistant", "content": [{"type": "compaction", "content": "The agent read files 0, 1 and 2."}]},
+        {"role": "user", "content": "Summarize what you read."},
+    ]
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_on_a_bridged_provider_counts_only_what_follows_a_client_compaction_block() -> None:
+    from litellm.llms.anthropic.messages.adapters.handler import prepare_context_managed_request
+
+    router: Final = _mistral_router()
+    sent: Final = await prepare_context_managed_request(
+        model=_MISTRAL_MODEL,
+        messages=[dict(message) for message in _turns_compacted_by_the_client()],
+        tools=[dict(_READ_FILE_TOOL)],
+        system=None,
+        context_management_spec=None,
+        litellm_metadata=None,
+        additional_drop_params=None,
+        llm_router=None,
+    )
+    assert sent is not None
+
+    compacted: Final = await _input_tokens(
+        router, {"model": "mistral-agent", "messages": _turns_compacted_by_the_client(), "tools": [_READ_FILE_TOOL]}
+    )
+    uncompacted: Final = await _input_tokens(
+        router, {"model": "mistral-agent", "messages": _agent_turns_with_tool_results(3), "tools": [_READ_FILE_TOOL]}
+    )
+    sent_body_count: Final = await _input_tokens(
+        router,
+        {
+            "model": "mistral-agent",
+            "messages": TypeAdapter(list[dict[str, JsonValue]]).validate_python(sent.messages),
+            "system": TypeAdapter(JsonValue).validate_python(sent.system),
+            "tools": [_READ_FILE_TOOL],
+        },
+    )
+
+    assert compacted < uncompacted
+    assert compacted == sent_body_count
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_applies_the_edits_a_responses_api_bridge_polyfills_for_a_non_openai_provider() -> (
+    None
+):
+    perplexity_model: Final = "perplexity/perplexity/sonar"
+    router: Final = Router(
+        model_list=[{"model_name": "sonar-agent", "litellm_params": {"model": perplexity_model, "api_key": "test-key"}}]
+    )
+    unedited_body: Final[dict[str, JsonValue]] = {
+        "model": "sonar-agent",
+        "messages": _agent_turns_with_tool_results(3),
+        "tools": [_READ_FILE_TOOL],
+    }
+
+    edited: Final = await _input_tokens(router, {**unedited_body, "context_management": _CLEAR_TOOL_USES})
+    unedited: Final = await _input_tokens(router, unedited_body)
+    polyfilled: Final = await _input_tokens(
+        router, {**unedited_body, "messages": await _messages_the_inference_polyfill_sends(perplexity_model)}
+    )
+
+    assert edited < unedited
+    assert edited == polyfilled
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_on_a_responses_api_bridge_counts_the_unedited_body_when_an_edit_fails() -> None:
+    from litellm.llms.anthropic.messages.responses_adapters import handler as responses_adapters_handler
+
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "sonar-agent",
+                "litellm_params": {"model": "perplexity/perplexity/sonar", "api_key": "test-key"},
+            }
+        ]
+    )
+    unedited_body: Final[dict[str, JsonValue]] = {
+        "model": "sonar-agent",
+        "messages": _agent_turns_with_tool_results(3),
+        "tools": [_READ_FILE_TOOL],
+    }
+
+    with patch.object(
+        responses_adapters_handler, "apply_context_management", AsyncMock(side_effect=RuntimeError("editor bug"))
+    ):
+        edited: Final = await _input_tokens(router, {**unedited_body, "context_management": _CLEAR_TOOL_USES})
+
+    assert edited == await _input_tokens(router, unedited_body)
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_on_a_responses_api_bridge_rejects_an_invalid_edit_without_drop_params() -> None:
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "sonar-agent",
+                "litellm_params": {"model": "perplexity/perplexity/sonar", "api_key": "test-key"},
+            }
+        ]
+    )
+    invalid_clear_edit: Final[dict[str, JsonValue]] = {
+        "edits": [{"type": "clear_tool_uses_20250919", "clear_at_least": "all of them"}]
+    }
+
+    with patch.object(litellm, "drop_params", False):
+        response: Final = await _messages_endpoint_count(
+            router,
+            {
+                "model": "sonar-agent",
+                "messages": _agent_turns_with_tool_results(3),
+                "tools": [_READ_FILE_TOOL],
+                "context_management": invalid_clear_edit,
+            },
+        )
+
+    assert isinstance(response, JSONResponse)
+    assert response.status_code == 400
+    message: Final = json.loads(bytes(response.body))["error"]["message"]
+    assert "context_management.edits.0.clear_tool_uses_20250919.clear_at_least" in message
+
+
+class _CountTokensPeer:
+    def __init__(self, reply: Mapping[str, JsonValue]) -> None:
+        self._reply: Final = reply
+        self.requests: tuple[httpx.Request, ...] = ()
+
+    def __call__(self, request: httpx.Request) -> httpx.Response:
+        self.requests = (*self.requests, request)
+        return httpx.Response(200, json=dict(self._reply), request=request)
+
+
+class _BedrockInvokeModel(BaseModel):
+    model_config = ConfigDict(frozen=True)
+    body: str
+
+
+class _BedrockCountTokensInput(BaseModel):
+    model_config = ConfigDict(frozen=True)
+    invoke_model: _BedrockInvokeModel = Field(alias="invokeModel")
+
+
+class _BedrockCountTokensBody(BaseModel):
+    model_config = ConfigDict(frozen=True)
+    input: _BedrockCountTokensInput
+
+
+def _bedrock_counted_request(request_body: bytes) -> str:
+    invoke_model: Final = _BedrockCountTokensBody.model_validate_json(request_body).input.invoke_model
+    return base64.b64decode(invoke_model.body).decode()
+
+
+async def _count_on_a_bridged_provider_count_api(
+    request_body: Mapping[str, JsonValue],
+    monkeypatch: pytest.MonkeyPatch,
+    bedrock_model: str = "bedrock/us.amazon.nova-2-lite-v1:0",
+    peer_reply: Mapping[str, JsonValue] = MappingProxyType({"inputTokens": 57}),
+    model_info: Mapping[str, JsonValue] = MappingProxyType({}),
+) -> tuple[object, tuple[httpx.Request, ...]]:
+    from litellm.llms.bedrock.count_tokens import handler as bedrock_count_tokens_handler
+    from litellm.llms.bedrock.count_tokens import mantle_handler as bedrock_mantle_count_tokens_handler
+
+    monkeypatch.delenv("AWS_BEARER_TOKEN_BEDROCK", raising=False)
+    peer: Final = _CountTokensPeer(peer_reply)
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "nova-agent",
+                "litellm_params": {
+                    "model": bedrock_model,
+                    "aws_access_key_id": "AKIATESTACCESSKEY",
+                    "aws_secret_access_key": "test-secret",
+                    "aws_region_name": "us-east-1",
+                },
+                "model_info": dict(model_info),
+            }
+        ]
+    )
+    client: Final = AsyncHTTPHandler(transport=httpx.MockTransport(peer))
+    with (
+        patch.object(bedrock_count_tokens_handler, "get_async_httpx_client", return_value=client),
+        patch.object(bedrock_mantle_count_tokens_handler, "get_async_httpx_client", return_value=client),
+    ):
+        response: Final = await _messages_endpoint_count(router, {**request_body, "model": "nova-agent"})
+    return response, peer.requests
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_sends_the_edited_messages_to_a_bridged_provider_count_api(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    response, sent_bodies = await _count_on_a_bridged_provider_count_api(
+        {
+            "messages": _agent_turns_with_tool_results(3),
+            "tools": [_READ_FILE_TOOL],
+            "context_management": _CLEAR_TOOL_USES,
+        },
+        monkeypatch,
+    )
+
+    assert response == {"input_tokens": 57, "litellm_count_source": "provider"}
+    assert len(sent_bodies) == 1
+    assert _bedrock_counted_request(sent_bodies[0].content).count(_GEMINI_TOOL_OUTPUT) == 1
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_sends_a_body_with_only_empty_text_to_the_bridged_provider_count_api(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    empty_turn: Final[dict[str, JsonValue]] = {"role": "user", "content": [{"type": "text", "text": ""}]}
+
+    response, sent_bodies = await _count_on_a_bridged_provider_count_api({"messages": [empty_turn]}, monkeypatch)
+
+    assert response == {"input_tokens": 57, "litellm_count_source": "provider"}
+    assert len(sent_bodies) == 1
+
+
+_BEDROCK_CLAUDE_MODEL: Final = "bedrock/us.anthropic.claude-sonnet-5-5"
+_CLEAR_THINKING_EDIT: Final[dict[str, JsonValue]] = {"type": "clear_thinking_20251015"}
+_COUNTED_ON_MANTLE: Final[Mapping[str, JsonValue]] = MappingProxyType(
+    {"token_count_model": {"model": "us.anthropic.claude-sonnet-5-5", "litellm_provider": "bedrock_mantle"}}
+)
+_COUNTED_ON_RUNTIME: Final[Mapping[str, JsonValue]] = MappingProxyType(
+    {"token_count_model": {"model": "us.anthropic.claude-sonnet-5-5", "litellm_provider": "bedrock"}}
+)
+
+
+def _bedrock_claude_count_request(edits: list[JsonValue]) -> Mapping[str, JsonValue]:
+    return MappingProxyType(
+        {
+            "messages": _agent_turns_with_tool_results(3),
+            "tools": [_READ_FILE_TOOL],
+            "context_management": {"edits": edits},
+        }
+    )
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_forwards_bedrock_supported_edits_and_their_beta_to_the_mantle_count_api(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    response, sent = await _count_on_a_bridged_provider_count_api(
+        _bedrock_claude_count_request([*_CLEAR_TOOL_USES_EDITS, _CLEAR_THINKING_EDIT]),
+        monkeypatch,
+        _BEDROCK_CLAUDE_MODEL,
+        MappingProxyType({"input_tokens": 57, "context_management": {"original_input_tokens": 4100}}),
+        _COUNTED_ON_MANTLE,
+    )
+
+    assert isinstance(response, dict)
+    assert (response["input_tokens"], response["context_management"]) == (57, {"original_input_tokens": 4100})
+    assert len(sent) == 1
+    assert json.loads(sent[0].content)["context_management"] == _CLEAR_TOOL_USES
+    assert sent[0].headers["anthropic-beta"] == ANTHROPIC_BETA_HEADER_VALUES.CONTEXT_MANAGEMENT_2025_06_27.value
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_forwards_bedrock_supported_edits_and_their_beta_to_the_runtime_count_api(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    response, sent = await _count_on_a_bridged_provider_count_api(
+        _bedrock_claude_count_request([*_CLEAR_TOOL_USES_EDITS, _CLEAR_THINKING_EDIT]),
+        monkeypatch,
+        _BEDROCK_CLAUDE_MODEL,
+        model_info=_COUNTED_ON_RUNTIME,
+    )
+
+    assert isinstance(response, dict)
+    assert response["input_tokens"] == 57
+    assert len(sent) == 1
+    invoke_body: Final = json.loads(_bedrock_counted_request(sent[0].content))
+    assert (invoke_body["context_management"], invoke_body["anthropic_beta"]) == (
+        _CLEAR_TOOL_USES,
+        [ANTHROPIC_BETA_HEADER_VALUES.CONTEXT_MANAGEMENT_2025_06_27.value],
+    )
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_sends_no_context_management_to_bedrock_when_no_edit_is_bedrock_supported(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    response, sent = await _count_on_a_bridged_provider_count_api(
+        _bedrock_claude_count_request([_CLEAR_THINKING_EDIT]),
+        monkeypatch,
+        _BEDROCK_CLAUDE_MODEL,
+        MappingProxyType({"input_tokens": 57}),
+        _COUNTED_ON_MANTLE,
+    )
+
+    assert isinstance(response, dict)
+    assert response["input_tokens"] == 57
+    assert len(sent) == 1
+    assert "context_management" not in json.loads(sent[0].content)
+    assert "anthropic-beta" not in sent[0].headers
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_rejects_a_non_string_tool_result_text_before_a_bridged_provider_applies_edits(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    response, sent_bodies = await _count_on_a_bridged_provider_count_api(
+        {"messages": _build_log_messages(5), "context_management": _CLEAR_TOOL_USES}, monkeypatch
+    )
+
+    assert isinstance(response, JSONResponse)
+    assert response.status_code == 400
+    assert "tool_result toolu_log content.1.text" in json.loads(bytes(response.body))["error"]["message"]
+    assert sent_bodies == ()
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_applies_a_responses_api_deployment_edits_once() -> None:
+    peer: Final = _CountTokensPeer({"object": "response.input_tokens", "input_tokens": 71})
+    router: Final = Router(
+        model_list=[{"model_name": "gpt-agent", "litellm_params": {"model": "openai/gpt-5.5", "api_key": "test-key"}}]
+    )
+
+    with patch.object(
+        openai_count_tokens_http,
+        "get_async_httpx_client",
+        return_value=AsyncHTTPHandler(transport=httpx.MockTransport(peer)),
+    ):
+        response: Final = await _messages_endpoint_count(
+            router,
+            {
+                "model": "gpt-agent",
+                "messages": _agent_turns_with_tool_results(3),
+                "tools": [_READ_FILE_TOOL],
+                "context_management": _CLEAR_TOOL_USES,
+            },
+        )
+
+    assert response == {"input_tokens": 71, "litellm_count_source": "provider"}
+    assert len(peer.requests) == 1
+    assert peer.requests[0].content.decode().count(_GEMINI_TOOL_OUTPUT) == 1
+
+
+_DATABRICKS_CLAUDE_MODEL: Final = "databricks/databricks-claude-sonnet-4-6"
+
+
+def _databricks_claude_router() -> Router:
+    return Router(
+        model_list=[
+            {
+                "model_name": "databricks-claude-agent",
+                "litellm_params": {
+                    "model": _DATABRICKS_CLAUDE_MODEL,
+                    "api_key": "test-key",
+                    "api_base": "https://example.cloud.databricks.com/serving-endpoints",
+                },
+            }
+        ]
+    )
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_counts_the_edited_body_on_a_native_messages_deployment_without_a_count_api() -> (
+    None
+):
+    router: Final = _databricks_claude_router()
+    unedited_body: Final[dict[str, JsonValue]] = {
+        "model": "databricks-claude-agent",
+        "messages": _agent_turns_with_tool_results(3),
+        "tools": [_READ_FILE_TOOL],
+    }
+
+    edited: Final = await _input_tokens(router, {**unedited_body, "context_management": _CLEAR_TOOL_USES})
+    unedited: Final = await _input_tokens(router, unedited_body)
+    polyfilled: Final = await _input_tokens(
+        router, {**unedited_body, "messages": await _messages_the_inference_polyfill_sends(_DATABRICKS_CLAUDE_MODEL)}
+    )
+
+    assert edited < unedited
+    assert edited == polyfilled
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("drop_params", [False, True])
+async def test_messages_count_tokens_on_a_native_messages_deployment_without_a_count_api_rejects_an_invalid_edit(
+    drop_params: bool,
+) -> None:
+    with patch.object(litellm, "drop_params", drop_params):
+        response: Final = await _messages_endpoint_count(
+            _databricks_claude_router(),
+            {
+                "model": "databricks-claude-agent",
+                "messages": _agent_turns_with_tool_results(3),
+                "tools": [_READ_FILE_TOOL],
+                "context_management": _INVALID_COMPACT_EDIT,
+            },
+        )
+
+    assert isinstance(response, JSONResponse)
+    assert response.status_code == 400
+
+
+@pytest.mark.asyncio
+async def test_messages_count_tokens_leaves_the_edits_to_a_native_messages_deployment() -> None:
+    peer: Final = _CountTokensPeer({"input_tokens": 63})
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "claude-agent",
+                "litellm_params": {"model": "anthropic/claude-sonnet-5-5", "api_key": "test-key"},
+            }
+        ]
+    )
+
+    with patch.object(
+        anthropic_count_tokens_handler,
+        "get_async_httpx_client",
+        return_value=AsyncHTTPHandler(transport=httpx.MockTransport(peer)),
+    ):
+        response: Final = await _messages_endpoint_count(
+            router,
+            {
+                "model": "claude-agent",
+                "messages": _agent_turns_with_tool_results(3),
+                "tools": [_READ_FILE_TOOL],
+                "context_management": _CLEAR_TOOL_USES,
+            },
+        )
+
+    assert response == {"input_tokens": 63, "litellm_count_source": "provider"}
+    assert len(peer.requests) == 1
+    assert peer.requests[0].content.decode().count(_GEMINI_TOOL_OUTPUT) == 3
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "text", ["hello there", "The quick brown fox jumps over the lazy dog. " * 50], ids=["short", "long"]
diff --git a/tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py b/tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py
index fd98bdcb418..db0db97cd88 100644
--- a/tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py
+++ b/tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py
@@ -818,6 +818,165 @@ class TestPostCallFailureHookLiftsCallTypeAndStartTime:
         assert payload["model"] == "MCP: deepwiki-ask_question"
         assert payload["endTime"] - payload["startTime"] >= real_datetime.timedelta(seconds=2)
 
+    @pytest.mark.asyncio
+    async def test_failed_speech_spend_row_records_the_endpoint_call_type_over_the_body(
+        self, monkeypatch: pytest.MonkeyPatch
+    ):
+        from types import SimpleNamespace
+
+        from litellm.proxy.hooks.proxy_track_cost_callback import ProxyDBLogger
+        from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+
+        rejected: Final = litellm.BadRequestError(
+            message="Voice name nonexistent is not supported", model="gemini-tts", llm_provider="gemini"
+        )
+        request_data: Final = {
+            "model": "gemini-tts",
+            "input": "Hello there",
+            "voice": "nonexistent",
+            "call_type": "acompletion",
+        }
+        proxy_logging_obj: Final = ProxyLogging(user_api_key_cache=DualCache())
+        proxy_logging_obj.alert_types = []
+        spend_writer: Final = SimpleNamespace(update_database=AsyncMock())
+        monkeypatch.setattr(litellm, "callbacks", [ProxyDBLogger(spend_writer=lambda: spend_writer)])
+        try:
+            with patch.object(proxy_logging_obj, "update_request_status", new=AsyncMock()):
+                await proxy_logging_obj.post_call_failure_hook(
+                    request_data=request_data,
+                    original_exception=rejected,
+                    user_api_key_dict=UserAPIKeyAuth(api_key="sk-test", request_route="/v1/audio/speech"),
+                    dispatched_call_type="aspeech",
+                )
+        finally:
+            ProxyLogging._callback_capabilities_cache.clear()
+
+        db_call: Final = spend_writer.update_database.call_args.kwargs
+        payload: Final = get_logging_payload(
+            kwargs=db_call["kwargs"],
+            response_obj=db_call["completion_response"],
+            start_time=db_call["start_time"],
+            end_time=db_call["end_time"],
+        )
+        assert payload["call_type"] == "aspeech"
+
+    @pytest.mark.asyncio
+    async def test_failed_mcp_list_tools_row_inside_a_responses_request_keeps_list_mcp_tools(
+        self, monkeypatch: pytest.MonkeyPatch
+    ):
+        from types import SimpleNamespace
+
+        from litellm.proxy.hooks.proxy_track_cost_callback import ProxyDBLogger
+        from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+
+        request_data: Final = {
+            "model": "MCP: list_tools",
+            "call_type": "list_mcp_tools",
+            "input": [{"role": "system", "content": "list_tools"}],
+        }
+        proxy_logging_obj: Final = ProxyLogging(user_api_key_cache=DualCache())
+        proxy_logging_obj.alert_types = []
+        spend_writer: Final = SimpleNamespace(update_database=AsyncMock())
+        monkeypatch.setattr(litellm, "callbacks", [ProxyDBLogger(spend_writer=lambda: spend_writer)])
+        try:
+            with patch.object(proxy_logging_obj, "update_request_status", new=AsyncMock()):
+                await proxy_logging_obj.post_call_failure_hook(
+                    request_data=request_data,
+                    original_exception=RuntimeError("MCP server unreachable"),
+                    user_api_key_dict=UserAPIKeyAuth(api_key="sk-test", request_route="/v1/responses"),
+                    route="/mcp/list_tools",
+                )
+        finally:
+            ProxyLogging._callback_capabilities_cache.clear()
+
+        db_call: Final = spend_writer.update_database.call_args.kwargs
+        payload: Final = get_logging_payload(
+            kwargs=db_call["kwargs"],
+            response_obj=db_call["completion_response"],
+            start_time=db_call["start_time"],
+            end_time=db_call["end_time"],
+        )
+        assert payload["call_type"] == "list_mcp_tools"
+
+    @pytest.mark.asyncio
+    async def test_failure_without_an_endpoint_call_type_does_not_guess_one_from_a_multi_method_path(
+        self, monkeypatch: pytest.MonkeyPatch
+    ):
+        from types import SimpleNamespace
+
+        from litellm.proxy.hooks.proxy_track_cost_callback import ProxyDBLogger
+        from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+
+        proxy_logging_obj: Final = ProxyLogging(user_api_key_cache=DualCache())
+        proxy_logging_obj.alert_types = []
+        spend_writer: Final = SimpleNamespace(update_database=AsyncMock())
+        monkeypatch.setattr(litellm, "callbacks", [ProxyDBLogger(spend_writer=lambda: spend_writer)])
+        try:
+            with patch.object(proxy_logging_obj, "update_request_status", new=AsyncMock()):
+                await proxy_logging_obj.post_call_failure_hook(
+                    request_data={},
+                    original_exception=RuntimeError("vector store lookup failed"),
+                    user_api_key_dict=UserAPIKeyAuth(api_key="sk-test", request_route="/v1/vector_stores"),
+                )
+        finally:
+            ProxyLogging._callback_capabilities_cache.clear()
+
+        db_call: Final = spend_writer.update_database.call_args.kwargs
+        payload: Final = get_logging_payload(
+            kwargs=db_call["kwargs"],
+            response_obj=db_call["completion_response"],
+            start_time=db_call["start_time"],
+            end_time=db_call["end_time"],
+        )
+        assert payload["call_type"] == ""
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        ("request_data", "route", "endpoint_call_type"),
+        [
+            ({"model": "gemini-tts", "input": "Hello there", "voice": "Kore"}, "/v1/audio/speech", "aspeech"),
+            ({"model": "omni-moderation", "input": ["one", "two"]}, "/v1/moderations", "amoderation"),
+            ({"model": "gpt-transcribe"}, "/v1/audio/transcriptions", "atranscription"),
+        ],
+    )
+    async def test_request_rejected_by_the_proxy_records_the_endpoint_call_type(
+        self,
+        monkeypatch: pytest.MonkeyPatch,
+        request_data: dict[str, object],
+        route: str,
+        endpoint_call_type: str,
+    ):
+        from types import SimpleNamespace
+
+        from fastapi import HTTPException
+
+        from litellm.proxy.hooks.proxy_track_cost_callback import ProxyDBLogger
+        from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+
+        proxy_logging_obj: Final = ProxyLogging(user_api_key_cache=DualCache())
+        proxy_logging_obj.alert_types = []
+        spend_writer: Final = SimpleNamespace(update_database=AsyncMock())
+        monkeypatch.setattr(litellm, "callbacks", [ProxyDBLogger(spend_writer=lambda: spend_writer)])
+        try:
+            with patch.object(proxy_logging_obj, "update_request_status", new=AsyncMock()):
+                await proxy_logging_obj.post_call_failure_hook(
+                    request_data=dict(request_data),
+                    original_exception=HTTPException(status_code=429, detail="Rate limit exceeded"),
+                    user_api_key_dict=UserAPIKeyAuth(api_key="sk-test", request_route=route),
+                    dispatched_call_type=endpoint_call_type,
+                )
+        finally:
+            ProxyLogging._callback_capabilities_cache.clear()
+
+        db_call: Final = spend_writer.update_database.call_args.kwargs
+        payload: Final = get_logging_payload(
+            kwargs=db_call["kwargs"],
+            response_obj=db_call["completion_response"],
+            start_time=db_call["start_time"],
+            end_time=db_call["end_time"],
+        )
+        assert payload["call_type"] == endpoint_call_type
+
 
 class TestPostCallFailureHookEstimatesDispatchedInputTokens:
     """A non-stream request that failed after dispatch (timeout, provider
@@ -3576,6 +3735,44 @@ def test_an_earlier_timed_out_responses_attempt_counts_its_input_from_the_newest
     assert sent == earlier_attempt_prompt_tokens([COMPACTION_INSTRUCTIONS, COMPACTION_ITEM, TURN_AFTER_COMPACTION])
 
 
+@pytest.mark.asyncio
+async def test_a_billed_responses_route_failure_captures_usage_from_the_newest_compaction_item() -> None:
+    from litellm.litellm_core_utils.get_litellm_params import get_litellm_params
+    from litellm.litellm_core_utils.litellm_logging import UsageCaptureObservation
+    from litellm.proxy.db.accounting_ledger import UsageWrite
+    from litellm.proxy.spend_tracking.usage_capture import UsageCaptureRuntime
+    from litellm.proxy.spend_tracking.usage_meter import UsageCaptureSettings
+    from litellm.proxy.utils import _failure_fields_to_lift
+
+    async def persist(_: tuple[UsageWrite, ...]) -> None:
+        return None
+
+    def captured_prompt_tokens(request_input: list[dict[str, str]]) -> int:
+        logging_obj: Final = _dispatched_failure_logging_obj(FAILURE_USAGE_MODEL, get_litellm_params())
+        logging_obj.model_call_details["call_type"] = "aresponses"
+        logging_obj.model_call_details["messages"] = request_input
+        lifted: Final = _failure_fields_to_lift(
+            {"litellm_logging_obj": logging_obj}, provider_billed=True, route_call_type="aresponses"
+        )
+        snapshot: Final = lifted["_accounting_usage_snapshot"]
+        assert isinstance(snapshot, UsageCaptureObservation) and snapshot.usage_json is not None
+        return json.loads(snapshot.usage_json)["prompt_tokens"]
+
+    runtime: Final = UsageCaptureRuntime()
+    runtime.start(persist, UsageCaptureSettings())
+    try:
+        sent: Final = captured_prompt_tokens(
+            [COMPACTION_INSTRUCTIONS, *COMPACTED_HISTORY, COMPACTION_ITEM, TURN_AFTER_COMPACTION]
+        )
+        since_compaction: Final = captured_prompt_tokens(
+            [COMPACTION_INSTRUCTIONS, COMPACTION_ITEM, TURN_AFTER_COMPACTION]
+        )
+    finally:
+        await runtime.stop(1)
+
+    assert sent == since_compaction
+
+
 @pytest.mark.parametrize(
     "current_attempt_api_call_start_time",
     [None, 1700000001.0],
diff --git a/tests/unit/proxy/test_response_model_sanitization.py b/tests/unit/proxy/test_response_model_sanitization.py
index f52736453c1..b3ad53221eb 100644
--- a/tests/unit/proxy/test_response_model_sanitization.py
+++ b/tests/unit/proxy/test_response_model_sanitization.py
@@ -98,42 +98,13 @@ def test_restamp_streaming_chunk_skips_matching_model():
     assert model_mismatch_logged is False
 
 
-def test_fast_serialize_simple_streaming_chunk_matches_model_dump_json():
+def test_serialize_streaming_chunk_omits_a_missing_model_instead_of_null():
     from litellm.proxy.proxy_server import _serialize_streaming_chunk
 
-    chunk = _make_model_response_stream_chunk("client-model")
-
-    assert json.loads(_serialize_streaming_chunk(chunk)) == json.loads(
-        chunk.model_dump_json(exclude_none=True, exclude_unset=True)
-    )
-
-
-def test_fast_serialize_returns_none_when_model_field_is_missing():
-    """
-    The fast path must mirror ``model_dump_json(exclude_none=True)``: when
-    ``chunk.model`` is ``None`` the slow path omits the field entirely.
-    Emitting ``"model": null`` would diverge and trip strict OpenAI-
-    compatible clients that reject ``null`` for optional string fields.
-    Falling back to ``None`` lets the canonical serializer handle the edge.
-    """
-    from litellm.proxy.proxy_server import (
-        _fast_serialize_simple_model_response_stream,
-        _serialize_streaming_chunk,
-    )
-
     chunk = _make_model_response_stream_chunk("client-model")
     chunk.model = None  # type: ignore[assignment]
 
-    assert _fast_serialize_simple_model_response_stream(chunk) is None
-
-    # Going through the public ``_serialize_streaming_chunk`` should still
-    # produce a serialized result via the slow-path fallback, and it must
-    # not contain ``"model": null``.
-    serialized = _serialize_streaming_chunk(chunk)
-    payload_str = serialized.decode("utf-8") if isinstance(serialized, bytes) else serialized
-    assert '"model": null' not in payload_str
-    assert '"model":null' not in payload_str
-    assert json.loads(payload_str) == json.loads(chunk.model_dump_json(exclude_none=True, exclude_unset=True))
+    assert "model" not in json.loads(_serialize_streaming_chunk(chunk))
 
 
 def test_proxy_chat_completion_does_not_return_provider_prefixed_model(tmp_path, monkeypatch):
diff --git a/tests/unit/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py b/tests/unit/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py
index ea39d5d59e2..e66050877df 100644
--- a/tests/unit/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py
+++ b/tests/unit/proxy/ui_crud_endpoints/test_proxy_setting_endpoints.py
@@ -689,16 +689,11 @@ class TestProxySettingEndpoints:
         # Verify settings were updated
         settings = data["settings"]
         assert settings["google_client_id"] == new_sso_settings["google_client_id"]
-        assert (
-            settings["google_client_secret"] == new_sso_settings["google_client_secret"]
-        )
+        assert settings["google_client_secret"] == "new_****************cret"
         assert (
             settings["microsoft_client_id"] == new_sso_settings["microsoft_client_id"]
         )
-        assert (
-            settings["microsoft_client_secret"]
-            == new_sso_settings["microsoft_client_secret"]
-        )
+        assert settings["microsoft_client_secret"] == "new_*******************cret"
         assert settings["proxy_base_url"] == new_sso_settings["proxy_base_url"]
         assert settings["user_email"] == new_sso_settings["user_email"]
 
@@ -722,6 +717,163 @@ class TestProxySettingEndpoints:
         create_sso_settings = json.loads(create_data["sso_settings"])
         assert create_sso_settings["google_client_id"] == "new_google_client_id"
 
+    def _patch_sso_settings(self, monkeypatch, stored, body, environment_variables=None):
+        """PATCH /update/sso_settings against a stored row; returns (response, saved row)."""
+        import json
+        from unittest.mock import AsyncMock, MagicMock
+
+        monkeypatch.setattr("litellm.proxy.proxy_server.store_model_in_db", True)
+        mock_prisma = MagicMock()
+        stored_record = None
+        if stored is not None:
+            stored_record = MagicMock()
+            stored_record.sso_settings = stored
+        mock_prisma.db.litellm_ssoconfig.find_unique = AsyncMock(
+            return_value=stored_record
+        )
+        mock_prisma.db.litellm_ssoconfig.upsert = AsyncMock()
+        env_var_entry = None
+        if environment_variables is not None:
+            env_var_entry = MagicMock()
+            env_var_entry.param_value = environment_variables
+        mock_prisma.writer_db.litellm_config.find_unique = AsyncMock(return_value=env_var_entry)
+        mock_prisma.db.litellm_config.update = AsyncMock()
+        monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", mock_prisma)
+
+        from litellm.proxy.proxy_server import proxy_config
+
+        monkeypatch.setattr(
+            proxy_config, "encrypt_env_variables", lambda environment_variables: environment_variables
+        )
+        monkeypatch.setattr(proxy_config, "decrypt_db_variables", lambda variables: variables)
+
+        response = client.patch("/update/sso_settings", json=body)
+        upsert_kwargs = mock_prisma.db.litellm_ssoconfig.upsert.call_args.kwargs
+        return response, json.loads(upsert_kwargs["data"]["update"]["sso_settings"])
+
+    _STORED_GENERIC_SSO = {
+        "generic_client_id": "stored-client-id",
+        "generic_client_secret": "stored-client-secret",
+        "generic_authorization_endpoint": "https://idp.example.com/authorize",
+        "user_email": "admin@example.com",
+        "role_mappings": {
+            "provider": "generic",
+            "group_claim": "groups",
+            "default_role": "internal_user",
+            "roles": {"proxy_admin": ["admins"]},
+        },
+    }
+
+    def test_update_sso_settings_omitted_fields_keep_stored_values(
+        self, mock_proxy_config, mock_auth, monkeypatch
+    ):
+        monkeypatch.setenv("GENERIC_CLIENT_SECRET", "stored-client-secret")
+        new_role_mappings = {
+            "provider": "generic",
+            "group_claim": "roles",
+            "default_role": "internal_user",
+            "roles": {"proxy_admin": ["platform-admins"]},
+        }
+
+        response, saved = self._patch_sso_settings(
+            monkeypatch, self._STORED_GENERIC_SSO, {"role_mappings": new_role_mappings}
+        )
+
+        assert response.status_code == 200
+        assert saved["generic_client_secret"] == "stored-client-secret"
+        assert saved["generic_client_id"] == "stored-client-id"
+        assert saved["user_email"] == "admin@example.com"
+        assert saved["role_mappings"]["group_claim"] == "roles"
+        assert os.environ["GENERIC_CLIENT_SECRET"] == "stored-client-secret"
+
+    def test_update_sso_settings_null_clears_only_that_field(
+        self, mock_proxy_config, mock_auth, monkeypatch
+    ):
+        monkeypatch.setenv("GENERIC_CLIENT_SECRET", "stored-client-secret")
+        monkeypatch.setenv("GENERIC_CLIENT_ID", "stored-client-id")
+
+        response, saved = self._patch_sso_settings(
+            monkeypatch,
+            self._STORED_GENERIC_SSO,
+            {"generic_client_secret": None, "role_mappings": None},
+        )
+
+        assert response.status_code == 200
+        assert saved["generic_client_secret"] is None
+        assert saved["role_mappings"] is None
+        assert saved["generic_client_id"] == "stored-client-id"
+        assert "GENERIC_CLIENT_SECRET" not in os.environ
+        assert os.environ["GENERIC_CLIENT_ID"] == "stored-client-id"
+
+    def test_update_sso_settings_new_value_replaces_stored_value(
+        self, mock_proxy_config, mock_auth, monkeypatch
+    ):
+        response, saved = self._patch_sso_settings(
+            monkeypatch, self._STORED_GENERIC_SSO, {"generic_client_secret": "rotated-secret"}
+        )
+
+        assert response.status_code == 200
+        assert saved["generic_client_secret"] == "rotated-secret"
+        assert saved["generic_client_id"] == "stored-client-id"
+        assert os.environ["GENERIC_CLIENT_SECRET"] == "rotated-secret"
+
+    def test_update_sso_settings_omitted_field_leaves_env_only_value_alone(
+        self, mock_proxy_config, mock_auth, monkeypatch
+    ):
+        monkeypatch.setenv("GENERIC_CLIENT_SECRET", "env-only-secret")
+
+        response, saved = self._patch_sso_settings(
+            monkeypatch, None, {"user_email": "admin@example.com"}
+        )
+
+        assert response.status_code == 200
+        assert saved["user_email"] == "admin@example.com"
+        assert saved["generic_client_secret"] is None
+        assert os.environ["GENERIC_CLIENT_SECRET"] == "env-only-secret"
+
+    def test_update_sso_settings_response_masks_stored_secrets(
+        self, mock_proxy_config, mock_auth, monkeypatch
+    ):
+        response, saved = self._patch_sso_settings(
+            monkeypatch, self._STORED_GENERIC_SSO, {}
+        )
+
+        assert response.status_code == 200
+        assert saved["generic_client_secret"] == "stored-client-secret"
+        returned = response.json()["settings"]
+        assert returned["generic_client_id"] == "stored-client-id"
+        assert returned["generic_client_secret"] != "stored-client-secret"
+        assert "stored-client-secret" not in response.text
+
+    def test_update_sso_settings_moves_omitted_env_row_values_into_sso_row(
+        self, mock_proxy_config, mock_auth, monkeypatch
+    ):
+        import json
+
+        environment_variables = {
+            "MICROSOFT_TENANT": "env-row-tenant",
+            "MICROSOFT_CLIENT_ID": "env-row-client-id",
+            "GENERIC_CLIENT_ID": "env-row-generic-id",
+            "LANGFUSE_PUBLIC_KEY": "unrelated",
+        }
+
+        response, saved = self._patch_sso_settings(
+            monkeypatch,
+            self._STORED_GENERIC_SSO,
+            {"user_email": "new@example.com", "microsoft_client_id": None},
+            environment_variables=environment_variables,
+        )
+
+        from litellm.proxy.proxy_server import prisma_client
+
+        assert response.status_code == 200
+        assert saved["microsoft_tenant"] == "env-row-tenant"
+        assert saved["microsoft_client_id"] is None
+        assert saved["generic_client_id"] == "stored-client-id"
+        assert saved["user_email"] == "new@example.com"
+        env_row_update = prisma_client.db.litellm_config.update.call_args.kwargs
+        assert json.loads(env_row_update["data"]["param_value"]) == {"LANGFUSE_PUBLIC_KEY": "unrelated"}
+
     def test_update_sso_settings_maps_saml_fields_to_env_vars(
         self, mock_proxy_config, mock_auth, monkeypatch
     ):
@@ -804,7 +956,7 @@ class TestProxySettingEndpoints:
         mock_prisma.db.litellm_ssoconfig.find_unique = AsyncMock(return_value=None)
         mock_prisma.db.litellm_ssoconfig.upsert = AsyncMock()
         mock_prisma.db.litellm_config = MagicMock()
-        mock_prisma.db.litellm_config.find_unique = AsyncMock(
+        mock_prisma.writer_db.litellm_config.find_unique = AsyncMock(
             side_effect=ValueError("cleanup failed")
         )
         mock_prisma.db.litellm_config.update = AsyncMock()
diff --git a/tests/unit/responses/litellm_completion_transformation/test_litellm_completion_responses.py b/tests/unit/responses/litellm_completion_transformation/test_litellm_completion_responses.py
index b4cd606374a..d5619515491 100644
--- a/tests/unit/responses/litellm_completion_transformation/test_litellm_completion_responses.py
+++ b/tests/unit/responses/litellm_completion_transformation/test_litellm_completion_responses.py
@@ -7192,6 +7192,29 @@ async def test_bridge_partial_response_on_disconnect_bills_only_the_input_since_
     ) == await _input_tokens_billed_on_disconnect(since_compaction)
 
 
+def test_a_hosted_mcp_tool_sent_to_responses_on_bedrock_converse_answers_400(monkeypatch) -> None:
+    monkeypatch.setattr(litellm, "drop_params", False)
+    with pytest.raises(litellm.UnsupportedParamsError) as raised:
+        litellm.responses(
+            model="bedrock/converse/us.openai.gpt-oss-120b-1:0",
+            input="What does the deepwiki MCP server say about litellm?",
+            tools=[
+                {
+                    "type": "mcp",
+                    "server_label": "deepwiki",
+                    "server_url": "https://mcp.deepwiki.com/mcp",
+                    "require_approval": "never",
+                }
+            ],
+            aws_access_key_id="AKIAHOSTEDMCP",
+            aws_secret_access_key="hosted-mcp-secret",
+            aws_region_name="us-east-1",
+        )
+    assert raised.value.status_code == 400
+    assert "`deepwiki`" in str(raised.value)
+    assert "litellm_proxy/mcp/" in str(raised.value)
+
+
 _ANTHROPIC_MODEL: Final = "anthropic/claude-sonnet-5-5"
 _WEATHER_ASK: Final = {"role": "user", "content": "Weather in Paris?"}
 
diff --git a/tests/unit/responses/litellm_completion_transformation/test_session_handler.py b/tests/unit/responses/litellm_completion_transformation/test_session_handler.py
index f1d841a8e5e..9a8fa19e2e4 100644
--- a/tests/unit/responses/litellm_completion_transformation/test_session_handler.py
+++ b/tests/unit/responses/litellm_completion_transformation/test_session_handler.py
@@ -1083,6 +1083,128 @@ async def test_previous_response_history_starts_at_a_compaction_item_in_a_stored
     ]
 
 
+def _stored_response_turn(
+    request_id: str, call_type: str, status: str, output: list[dict[str, object]], prompt: str | None = None
+) -> dict[str, object]:
+    return {
+        "request_id": request_id,
+        "call_type": call_type,
+        "session_id": "session-with-reads",
+        "proxy_server_request": json.dumps({} if prompt is None else {"input": [{"role": "user", "content": prompt}]}),
+        "response": {"id": request_id, "object": "response", "status": status, "output": output},
+    }
+
+
+def _identified_output_message(item_id: str, text: str) -> dict[str, object]:
+    return {**_output_message(text), "id": item_id}
+
+
+def _replayed_roles_and_texts(session: ChatCompletionSession) -> list[tuple[object, object]]:
+    return [
+        (role, _text_of(content)) for role, content in (_role_and_content(message) for message in session["messages"])
+    ]
+
+
+@pytest.mark.asyncio
+async def test_reads_and_cancels_of_a_response_the_session_already_holds_replay_no_turns():
+    answer: Final = [_identified_output_message("msg_answer", "OK")]
+    spend_logs: Final = (
+        _stored_response_turn("resp_create", "aresponses", "completed", answer, prompt="Reply with OK"),
+        _stored_response_turn("resp_read", "aget_responses", "completed", answer),
+        _stored_response_turn("resp_streamed_read", "aget_responses", "completed", answer),
+        _stored_response_turn("resp_cancel", "acancel_responses", "completed", answer),
+    )
+
+    session: Final = await _history_from_stored_turns(spend_logs, "resp_create")
+
+    assert _replayed_roles_and_texts(session) == [("user", "Reply with OK"), ("assistant", "OK")]
+
+
+@pytest.mark.asyncio
+async def test_a_polled_background_response_replays_its_finished_output_once():
+    answer: Final = [_identified_output_message("msg_answer", "One, two, three")]
+    spend_logs: Final = (
+        _stored_response_turn("resp_queued", "aresponses", "queued", [], prompt="Count to three"),
+        _stored_response_turn("resp_poll_running", "aget_responses", "in_progress", []),
+        _stored_response_turn("resp_poll_done", "aget_responses", "completed", answer),
+        _stored_response_turn("resp_poll_again", "aget_responses", "completed", answer),
+    )
+
+    session: Final = await _history_from_stored_turns(spend_logs, "resp_queued")
+
+    assert _replayed_roles_and_texts(session) == [("user", "Count to three"), ("assistant", "One, two, three")]
+
+
+@pytest.mark.asyncio
+async def test_a_background_response_that_grows_between_polls_replays_each_output_item_once():
+    first: Final = _identified_output_message("msg_first", "One")
+    second: Final = _identified_output_message("msg_second", "Two")
+    spend_logs: Final = (
+        _stored_response_turn("resp_queued", "aresponses", "queued", [], prompt="Count to two"),
+        _stored_response_turn("resp_poll_partial", "aget_responses", "in_progress", [first]),
+        _stored_response_turn("resp_poll_done", "aget_responses", "completed", [first, second]),
+        _stored_response_turn("resp_poll_again", "aget_responses", "completed", [first, second]),
+    )
+
+    session: Final = await _history_from_stored_turns(spend_logs, "resp_queued")
+
+    assert _replayed_roles_and_texts(session) == [("user", "Count to two"), ("assistant", "One"), ("assistant", "Two")]
+
+
+@pytest.mark.asyncio
+async def test_an_item_a_poll_caught_half_written_replays_its_finished_text_once():
+    spend_logs: Final = (
+        _stored_response_turn("resp_queued", "aresponses", "queued", [], prompt="Count to three"),
+        _stored_response_turn(
+            "resp_poll_partial", "aget_responses", "in_progress", [_identified_output_message("msg_answer", "One, t")]
+        ),
+        _stored_response_turn(
+            "resp_poll_done",
+            "aget_responses",
+            "completed",
+            [_identified_output_message("msg_answer", "One, two, three"), _identified_output_message("msg_more", "Done")],
+        ),
+    )
+
+    session: Final = await _history_from_stored_turns(spend_logs, "resp_queued")
+
+    assert _replayed_roles_and_texts(session) == [
+        ("user", "Count to three"),
+        ("assistant", "One, two, three"),
+        ("assistant", "Done"),
+    ]
+
+
+@pytest.mark.asyncio
+async def test_a_polled_output_item_without_an_id_still_replays_in_order():
+    spend_logs: Final = (
+        _stored_response_turn("resp_queued", "aresponses", "queued", [], prompt="Count to two"),
+        _stored_response_turn(
+            "resp_poll_done",
+            "aget_responses",
+            "completed",
+            [_output_message("One"), _identified_output_message("msg_two", "Two")],
+        ),
+    )
+
+    session: Final = await _history_from_stored_turns(spend_logs, "resp_queued")
+
+    assert _replayed_roles_and_texts(session) == [("user", "Count to two"), ("assistant", "One"), ("assistant", "Two")]
+
+
+@pytest.mark.asyncio
+async def test_a_read_that_ends_before_its_streamed_create_replays_the_answer_once_after_the_prompt():
+    answer: Final = [_identified_output_message("msg_answer", "OK")]
+    spend_logs: Final = (
+        _stored_response_turn("resp_read_mid_stream", "aget_responses", "completed", answer),
+        _stored_response_turn("resp_create", "aresponses", "completed", answer, prompt="Say OK"),
+    )
+
+    session: Final = await _history_from_stored_turns(spend_logs, "resp_create")
+
+    assert _replayed_roles_and_texts(session) == [("user", "Say OK"), ("assistant", "OK")]
+
+
 def _tool_call_ids(message: object) -> tuple[str, ...]:
     tool_calls: Final = message.get("tool_calls") if isinstance(message, dict) else getattr(message, "tool_calls", None)
     return tuple(call["id"] if isinstance(call, dict) else call.id for call in tool_calls or ())
diff --git a/tests/unit/responses/litellm_completion_transformation/test_streaming_iterator_transformation.py b/tests/unit/responses/litellm_completion_transformation/test_streaming_iterator_transformation.py
index 684f5a89e80..87858741908 100644
--- a/tests/unit/responses/litellm_completion_transformation/test_streaming_iterator_transformation.py
+++ b/tests/unit/responses/litellm_completion_transformation/test_streaming_iterator_transformation.py
@@ -477,7 +477,6 @@ def test_tool_call_arguments_are_chunked_to_match_openai_behavior():
     assert evt is not None
     assert evt.type == ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED
     assert evt.output_index == 0
-    assert hasattr(evt, "__dict__") and "sequence_number" in evt.__dict__
 
     # Collect all remaining delta events from the pending queue by creating empty chunks
     delta_events = []
@@ -511,17 +510,11 @@ def test_tool_call_arguments_are_chunked_to_match_openai_behavior():
         assert len(evt.delta) <= 10
         assert evt.item_id == "fc_call_test"
         assert evt.output_index == 0
-        assert hasattr(evt, "__dict__") and "sequence_number" in evt.__dict__
 
     # Verify all deltas concatenated equal the original arguments
     concatenated = "".join(evt.delta for evt in delta_events)
     assert concatenated == large_arguments
 
-    # Verify sequence numbers are increasing
-    sequence_numbers = [evt.__dict__["sequence_number"] for evt in delta_events]
-    assert sequence_numbers == sorted(sequence_numbers)
-    assert len(set(sequence_numbers)) == len(sequence_numbers)  # All unique
-
 
 def test_tool_call_delta_without_id_uses_index_mapping():
     iterator = LiteLLMCompletionStreamingIterator(
@@ -1990,6 +1983,65 @@ def test_the_partial_response_billed_on_disconnect_carries_the_logging_objects_b
     ), "the bill is priced on the partial's own usage"
 
 
+def _serialized_sequence_numbers(events: Iterable[BaseLiteLLMOpenAIResponseObject]) -> list[int]:
+    payloads: Final = tuple(json.loads(event.model_dump_json()) for event in events)
+    assert all("sequence_number" in payload for payload in payloads), [
+        payload["type"] for payload in payloads if "sequence_number" not in payload
+    ]
+    return [payload["sequence_number"] for payload in payloads]
+
+
+def _long_text_chunks() -> tuple[ModelResponseStream, ...]:
+    return (*(_chunk(f"word{i} ") for i in range(300)), _chunk("end", finish_reason="stop"))
+
+
+def _text_then_tool_call_chunks() -> tuple[ModelResponseStream, ...]:
+    return (_text_opening_a_tool_call_chunk("Checking. "), _tool_arguments_chunk('{"x": 1}', finish_reason="tool_calls"))
+
+
+@pytest.mark.parametrize(
+    "stream",
+    [
+        lambda: (_chunk("Hello"), _chunk("!", finish_reason="stop")),
+        _long_text_chunks,
+        _text_then_tool_call_chunks,
+        _reasoning_then_text_chunks,
+        _reasoning_and_text_in_one_chunk,
+        _reasoning_citation_then_tool_call_finishing_chunks,
+        lambda: (_tool_call_chunk(), _chunk("", finish_reason="tool_calls")),
+        lambda: (_refusal_chunk("I can't "), _refusal_chunk("help."), _chunk("", finish_reason="stop")),
+        lambda: (_chunk("Sure. "), _refusal_chunk("I can't help."), _chunk("", finish_reason="stop")),
+    ],
+    ids=[
+        "text",
+        "long_text",
+        "text_then_tool",
+        "reasoning_then_text",
+        "reasoning_and_text",
+        "citation_tool",
+        "tool",
+        "refusal",
+        "text_then_refusal",
+    ],
+)
+@pytest.mark.parametrize("sync_mode", [True, False])
+@pytest.mark.asyncio
+async def test_every_event_serializes_its_position_in_the_stream_from_zero(stream: StreamChunks, sync_mode: bool):
+    iterator: Final = _build_iterator(stream())
+    events: Final = list(iterator) if sync_mode else [event async for event in iterator]
+
+    assert _serialized_sequence_numbers(events) == list(range(len(events)))
+
+
+def test_bridged_events_answer_dict_reads_of_their_number():
+    events: Final = list(_build_iterator((_chunk("Hello"), _chunk("!", finish_reason="stop"))))
+    positions: Final = list(range(len(events)))
+
+    assert [event["sequence_number"] for event in events] == positions
+    assert [event.get("sequence_number") for event in events] == positions
+    assert all("sequence_number" in event for event in events)
+
+
 def _refusal_chunk(refusal: str, finish_reason: str | None = None) -> ModelResponseStream:
     return ModelResponseStream(
         id=CHAT_COMPLETION_ID,
diff --git a/tests/unit/responses/test_streaming_iterator.py b/tests/unit/responses/test_streaming_iterator.py
index f98d7ca188e..5072f3d3108 100644
--- a/tests/unit/responses/test_streaming_iterator.py
+++ b/tests/unit/responses/test_streaming_iterator.py
@@ -2867,3 +2867,54 @@ async def test_websocket_turns_logging_survives_garbage_collection(terminal_even
     await _run_websocket_turn(logger, terminal_event)
 
     assert await _logging_tasks_left_after_garbage_collection(logger) == 1
+
+
+@pytest.mark.parametrize(
+    "output",
+    [
+        [
+            {
+                "type": "message",
+                "id": "msg_seq",
+                "status": "completed",
+                "role": "assistant",
+                "content": [{"type": "output_text", "text": "hello world", "annotations": []}],
+            }
+        ],
+        [
+            {
+                "type": "reasoning",
+                "id": "rs_seq",
+                "summary": [{"type": "summary_text", "text": "thinking about it"}],
+            },
+            {
+                "type": "function_call",
+                "id": "fc_seq",
+                "call_id": "call_seq",
+                "name": "lookup",
+                "arguments": '{"id":1}',
+            },
+        ],
+    ],
+    ids=["message", "reasoning_and_tool"],
+)
+def test_synthetic_stream_serializes_every_event_position_from_zero(output: list[dict[str, object]]):
+    transformed: Final = ResponsesAPIResponse.model_validate(
+        {
+            "id": "resp_seq",
+            "created_at": 1741476542,
+            "status": "completed",
+            "model": "claude-sonnet-5-5",
+            "object": "response",
+            "output": output,
+        }
+    )
+
+    events: Final = streaming_module.build_synthetic_response_events(
+        transformed=transformed,
+        logging_obj=None,
+        chunk_size=5,
+    )
+
+    payloads: Final = tuple(json.loads(event.model_dump_json()) for event in events)
+    assert [payload.get("sequence_number") for payload in payloads] == list(range(len(payloads)))
diff --git a/tests/unit/router_utils/pre_call_checks/test_encrypted_content_affinity_check.py b/tests/unit/router_utils/pre_call_checks/test_encrypted_content_affinity_check.py
index d184bf84035..a4d279e32e6 100644
--- a/tests/unit/router_utils/pre_call_checks/test_encrypted_content_affinity_check.py
+++ b/tests/unit/router_utils/pre_call_checks/test_encrypted_content_affinity_check.py
@@ -15,17 +15,21 @@ The mechanism works without any cache and supports two encoding strategies:
   encrypted_content back to their original forms before sending to the upstream provider.
 """
 
+import datetime
 import time
+from collections.abc import Mapping
 from typing import Final
 from unittest.mock import AsyncMock, patch
 
 import pytest
 
 import litellm
+from litellm.integrations.custom_secret_manager import CustomSecretManager
 from litellm.models.credentials import CredentialItem
 from litellm.responses.utils import ResponsesAPIRequestUtils
 from litellm.router_api import RoutingContext
 from litellm.types.llms.openai import ResponsesAPIResponse
+from litellm.types.secret_managers.main import KeyManagementSettings, KeyManagementSystem
 
 
 @pytest.fixture(autouse=True)
@@ -1100,14 +1104,7 @@ def test_boundary_key_accepts_pydantic_litellm_params_instance():
     plain_key = EncryptedContentAffinityCheck._encryption_boundary_key(plain_params)
 
     assert pydantic_key is not None
-    assert (
-        pydantic_key
-        == plain_key
-        == (
-            "https://mateo-resource.openai.azure.com",
-            "fake-azure-resource-key-a",
-        )
-    )
+    assert pydantic_key == plain_key
 
 
 def test_boundary_key_resolves_missing_values_from_named_credential():
@@ -1131,14 +1128,35 @@ def test_boundary_key_resolves_missing_values_from_named_credential():
     ):
         boundary = EncryptedContentAffinityCheck._encryption_boundary_key({"litellm_credential_name": "account-a"})
 
-    assert boundary == ("https://account-a.example.com", "credential-key-a")
+    assert boundary is not None
+    assert boundary == EncryptedContentAffinityCheck._encryption_boundary_key(
+        {"api_base": "https://account-a.example.com", "api_key": "credential-key-a"}
+    )
+    assert boundary != EncryptedContentAffinityCheck._encryption_boundary_key(
+        {"api_base": "https://account-a.example.com", "api_key": "credential-key-b"}
+    )
 
 
-def test_boundary_key_matches_named_credential_precedence():
+@pytest.mark.parametrize(
+    "deployment_values",
+    [
+        pytest.param({"api_base": "https://deployment.example.com", "api_key": "deployment-key"}, id="set values"),
+        pytest.param({"api_base": "", "api_key": ""}, id="empty values"),
+    ],
+)
+@pytest.mark.usefixtures("no_process_wide_api_base")
+def test_boundary_key_resolves_named_credential_values_the_way_the_request_does(
+    monkeypatch: pytest.MonkeyPatch, deployment_values: dict[str, str]
+):
     from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
         EncryptedContentAffinityCheck,
     )
+    from litellm.utils import with_named_credential
 
+    monkeypatch.setattr(litellm, "api_key", None)
+    monkeypatch.setattr(litellm, "openai_key", None)
+    monkeypatch.setenv("OPENAI_API_KEY", "env-key")
+    deployment: Final = {"model": "openai/gpt-5.5", **deployment_values, "litellm_credential_name": "account-a"}
     with patch.object(
         litellm,
         "credential_list",
@@ -1153,46 +1171,14 @@ def test_boundary_key_matches_named_credential_precedence():
             )
         ],
     ):
-        boundary = EncryptedContentAffinityCheck._encryption_boundary_key(
-            {
-                "api_base": "https://deployment.example.com",
-                "api_key": "deployment-key",
-                "litellm_credential_name": "account-a",
-            }
-        )
+        boundary: Final = EncryptedContentAffinityCheck._encryption_boundary_key(deployment)
+        sent_params: Final = with_named_credential(deployment)
 
-    assert boundary == ("https://credential.example.com", "credential-key-a")
-
-
-def test_boundary_key_resolves_credential_when_explicit_values_are_empty():
-    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
-        EncryptedContentAffinityCheck,
+    assert boundary is not None
+    assert boundary == EncryptedContentAffinityCheck._encryption_boundary_key(
+        {key: value for key, value in sent_params.items() if key != "litellm_credential_name"}
     )
 
-    with patch.object(
-        litellm,
-        "credential_list",
-        [
-            CredentialItem(
-                credential_name="account-a",
-                credential_values={
-                    "api_base": "https://credential.example.com",
-                    "api_key": "credential-key-a",
-                },
-                credential_info={},
-            )
-        ],
-    ):
-        boundary = EncryptedContentAffinityCheck._encryption_boundary_key(
-            {
-                "api_base": "",
-                "api_key": "",
-                "litellm_credential_name": "account-a",
-            }
-        )
-
-    assert boundary == ("https://credential.example.com", "credential-key-a")
-
 
 def test_boundary_fallback_matches_deployments_with_same_named_credential_values():
     from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
@@ -2728,3 +2714,604 @@ async def test_affinity_keeps_reasoning_when_every_deployment_already_refused_th
 
     assert [deployment["model_info"]["id"] for deployment in result] == ["region-a"]
     assert reasoning_input[0] == original_reasoning
+
+
+def _default_endpoint_deployment(model_id: str, litellm_params: Mapping[str, object]) -> dict[str, object]:
+    return {"model_name": "gpt-5.5", "litellm_params": dict(litellm_params), "model_info": {"id": model_id}}
+
+
+def _deployment_of(ctx: RoutingContext, model_id: str) -> dict[str, object]:
+    deployment: Final = ctx.registry().deployment(model_id)
+    assert deployment is not None
+    return deployment.model_dump(exclude_none=True)
+
+
+SUMMARY_ONLY_REASONING: Final = {"type": "reasoning", "summary": [{"type": "summary_text", "text": "scattering"}]}
+UNMARKED_REASONING: Final = {**SUMMARY_ONLY_REASONING, "id": "rs_test", "encrypted_content": "gAAAAA-blob"}
+OPENAI_SHARED_KEY: Final = {"model": "openai/gpt-5.5", "api_key": "shared-key"}
+
+
+@pytest.fixture
+def no_process_wide_api_base(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(litellm, "api_base", None)
+    monkeypatch.delenv("AZURE_API_BASE", raising=False)
+
+
+@pytest.mark.usefixtures("no_process_wide_api_base")
+@pytest.mark.parametrize("marked", [True, False], ids=["marked origin", "unmarked origin"])
+@pytest.mark.parametrize(
+    "origin_params, target_params, target_can_decrypt",
+    [
+        pytest.param(OPENAI_SHARED_KEY, OPENAI_SHARED_KEY, True, id="same key on the provider default endpoint"),
+        pytest.param(
+            {"model": "gpt-5.5", "custom_llm_provider": "openai", "api_key": "shared-key"},
+            OPENAI_SHARED_KEY,
+            True,
+            id="provider named apart from the model",
+        ),
+        pytest.param(OPENAI_SHARED_KEY, {**OPENAI_SHARED_KEY, "api_key": "other-key"}, False, id="different key"),
+        pytest.param(
+            OPENAI_SHARED_KEY,
+            {**OPENAI_SHARED_KEY, "model": "openai/gpt-5.5-mini"},
+            False,
+            id="same key on the default endpoint for another model",
+        ),
+        pytest.param(
+            {"model": "bedrock_mantle/us-west-2/openai.gpt-6-astra", "api_key": "shared-key"},
+            {"model": "bedrock_mantle/us-west-2/openai.gpt-6-astra", "api_key": "shared-key"},
+            False,
+            id="same key on Bedrock Mantle, which serves several vendors",
+        ),
+        pytest.param(
+            {"model": "openrouter/openai/gpt-6.1-sol", "api_key": "shared-key"},
+            {"model": "openrouter/anthropic/claude-haiku-5.5", "api_key": "shared-key"},
+            False,
+            id="same key on an aggregator that serves several vendors",
+        ),
+        pytest.param(
+            {"model": "anthropic/claude-opus-5-5", "api_key": "shared-key"},
+            {"model": "anthropic/claude-opus-5-5", "api_key": "shared-key"},
+            False,
+            id="provider without a Responses URL builder",
+        ),
+        pytest.param(
+            {"model": "azure/gpt-5.5", "api_key": "shared-key"},
+            {"model": "azure/gpt-5.5", "api_key": "shared-key"},
+            False,
+            id="provider whose builder needs an api_base",
+        ),
+        pytest.param(
+            {"model": "github_copilot/gpt-5.5", "api_key": "shared-key"},
+            {"model": "github_copilot/gpt-5.5", "api_key": "shared-key"},
+            False,
+            id="same key on a provider that authenticates with its own token",
+        ),
+        pytest.param(
+            {"model": "groq/llama-4-scout"},
+            {"model": "groq/llama-4-scout"},
+            False,
+            id="provider with no default key",
+        ),
+        pytest.param(
+            {"model": "vertex_ai/gemini-3-pro"},
+            {"model": "vertex_ai/gemini-3-pro"},
+            False,
+            id="provider whose default key is a credentials file",
+        ),
+        pytest.param(
+            {**OPENAI_SHARED_KEY, "api_base": "https://openai-proxy.example.com/v1"},
+            OPENAI_SHARED_KEY,
+            False,
+            id="explicit api_base beside the default endpoint",
+        ),
+        pytest.param(
+            {**OPENAI_SHARED_KEY, "extra_headers": {"OpenAI-Organization": "org-a"}},
+            {**OPENAI_SHARED_KEY, "extra_headers": {"openai-organization": "org-b"}},
+            False,
+            id="same key sent to different OpenAI organizations",
+        ),
+        pytest.param(
+            {**OPENAI_SHARED_KEY, "extra_headers": {"OpenAI-Project": "proj-a"}},
+            OPENAI_SHARED_KEY,
+            False,
+            id="same key with an OpenAI project beside one without",
+        ),
+        pytest.param(
+            {**OPENAI_SHARED_KEY, "extra_headers": {"Cookie": "session=account-a"}},
+            {**OPENAI_SHARED_KEY, "extra_headers": {"cookie": "session=account-b"}},
+            False,
+            id="same key signed in to different accounts by cookie",
+        ),
+        pytest.param(
+            {**OPENAI_SHARED_KEY, "headers": {"api-key": "account-a"}},
+            {**OPENAI_SHARED_KEY, "headers": {"api-key": "account-b"}},
+            False,
+            id="explicit key beside different api-key headers",
+        ),
+        pytest.param(
+            {**OPENAI_SHARED_KEY, "organization": "org-a"},
+            {**OPENAI_SHARED_KEY, "organization": "org-b"},
+            True,
+            id="organization param the Responses request never sends",
+        ),
+        pytest.param(
+            {**OPENAI_SHARED_KEY, "extra_headers": {"x-team": "a", "OpenAI-Organization": "org-a"}},
+            {**OPENAI_SHARED_KEY, "extra_headers": {"x-team": "b", "OpenAI-Organization": "org-a"}},
+            True,
+            id="same OpenAI organization beside unrelated headers",
+        ),
+        pytest.param(
+            {
+                **OPENAI_SHARED_KEY,
+                "headers": {"OpenAI-Organization": "org-a"},
+                "extra_headers": {"openai-organization": "org-b"},
+            },
+            {**OPENAI_SHARED_KEY, "extra_headers": {"OpenAI-Organization": "org-b"}},
+            True,
+            id="extra headers override the organization the headers set",
+        ),
+    ],
+)
+def test_hop_strip_keeps_reasoning_between_same_key_deployments_on_the_default_endpoint(
+    origin_params: dict[str, object], target_params: dict[str, object], target_can_decrypt: bool, marked: bool
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", origin_params),
+            _default_endpoint_deployment("target", target_params),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    reasoning: Final = _reasoning_input_minted_by("origin")[0] if marked else dict(UNMARKED_REASONING)
+    original_reasoning: Final = dict(reasoning)
+    request_input: Final = [reasoning, {"role": "user", "content": "and sunsets?"}]
+
+    EncryptedContentAffinityCheck.strip_reasoning_the_targets_cannot_decrypt(
+        ctx,
+        request_input,
+        None,
+        (_deployment_of(ctx, "target"),),
+        unmarked_origin=None if marked else "origin",
+    )
+
+    assert request_input[0] == (original_reasoning if target_can_decrypt else SUMMARY_ONLY_REASONING)
+
+
+@pytest.mark.usefixtures("no_process_wide_api_base")
+@pytest.mark.parametrize(
+    "target_api_key, target_can_decrypt",
+    [
+        pytest.param(None, True, id="both on the environment key"),
+        pytest.param("env-key", True, id="explicit key equal to the environment key"),
+        pytest.param("other-key", False, id="explicit key other than the environment key"),
+    ],
+)
+def test_hop_strip_resolves_a_missing_key_from_the_environment(
+    monkeypatch: pytest.MonkeyPatch, target_api_key: str | None, target_can_decrypt: bool
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    monkeypatch.setattr(litellm, "api_key", None)
+    monkeypatch.setattr(litellm, "openai_key", None)
+    monkeypatch.setenv("OPENAI_API_KEY", "env-key")
+    target_params: Final = {"model": "openai/gpt-5.5", **({"api_key": target_api_key} if target_api_key else {})}
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", {"model": "openai/gpt-5.5"}),
+            _default_endpoint_deployment("target", target_params),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    reasoning: Final = _reasoning_input_minted_by("origin")[0]
+    original_reasoning: Final = dict(reasoning)
+    request_input: Final = [reasoning, {"role": "user", "content": "and sunsets?"}]
+
+    EncryptedContentAffinityCheck.strip_reasoning_the_targets_cannot_decrypt(
+        ctx, request_input, None, (_deployment_of(ctx, "target"),), unmarked_origin=None
+    )
+
+    assert request_input[0] == (original_reasoning if target_can_decrypt else SUMMARY_ONLY_REASONING)
+
+
+def test_hop_strip_leaves_input_items_that_are_not_objects_as_sent():
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    request_input: Final = ["and sunsets?", *_reasoning_input_minted_by("origin")]
+
+    EncryptedContentAffinityCheck.strip_reasoning_the_targets_cannot_decrypt(
+        None, request_input, None, (), unmarked_origin=None
+    )
+
+    assert request_input == ["and sunsets?", SUMMARY_ONLY_REASONING, {"role": "user", "content": "and sunsets?"}]
+
+
+GATEWAY_BASE: Final = {"model": "openai/gpt-5.5", "api_base": "https://gateway.example.com/v1"}
+
+
+@pytest.mark.parametrize(
+    "origin_params, target_params, target_can_decrypt",
+    [
+        pytest.param(
+            {**GATEWAY_BASE, "extra_headers": {"Authorization": "Bearer sk-account-a"}},
+            {**GATEWAY_BASE, "extra_headers": {"Authorization": "Bearer sk-account-b"}},
+            False,
+            id="environment key replaced by different Authorization headers",
+        ),
+        pytest.param(
+            {**GATEWAY_BASE, "api_key": "shared-key", "extra_headers": {"x-idempotency-key": "a"}},
+            {**GATEWAY_BASE, "api_key": "shared-key", "extra_headers": {"x-idempotency-key": "b"}},
+            True,
+            id="explicit pair beside different tag headers",
+        ),
+        pytest.param(
+            {**GATEWAY_BASE, "extra_headers": {"Authorization": "Bearer sk-account-a"}},
+            {**GATEWAY_BASE, "extra_headers": {"authorization": "Bearer sk-account-a"}},
+            True,
+            id="same Authorization header on both",
+        ),
+    ],
+)
+def test_hop_strip_keeps_accounts_that_sign_in_through_headers_apart(
+    monkeypatch: pytest.MonkeyPatch,
+    origin_params: dict[str, object],
+    target_params: dict[str, object],
+    target_can_decrypt: bool,
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    monkeypatch.setenv("OPENAI_API_KEY", "env-key")
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", origin_params),
+            _default_endpoint_deployment("target", target_params),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    reasoning: Final = _reasoning_input_minted_by("origin")[0]
+    original_reasoning: Final = dict(reasoning)
+    request_input: Final = [reasoning, {"role": "user", "content": "and sunsets?"}]
+
+    EncryptedContentAffinityCheck.strip_reasoning_the_targets_cannot_decrypt(
+        ctx, request_input, None, (_deployment_of(ctx, "target"),), unmarked_origin=None
+    )
+
+    assert request_input[0] == (original_reasoning if target_can_decrypt else SUMMARY_ONLY_REASONING)
+
+
+@pytest.mark.parametrize(
+    "environment_key, target_model, target_can_decrypt",
+    [
+        pytest.param("shared-key", GATEWAY_BASE["model"], True, id="environment key equal to the explicit key"),
+        pytest.param("other-key", GATEWAY_BASE["model"], False, id="environment key other than the explicit key"),
+        pytest.param("shared-key", "openai/gpt-5.5-mini", False, id="equal keys serving another model"),
+    ],
+)
+def test_hop_strip_matches_an_explicit_key_and_the_environment_key_on_one_api_base(
+    monkeypatch: pytest.MonkeyPatch, environment_key: str, target_model: str, target_can_decrypt: bool
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    monkeypatch.setattr(litellm, "api_key", None)
+    monkeypatch.setattr(litellm, "openai_key", None)
+    monkeypatch.setenv("OPENAI_API_KEY", environment_key)
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", {**GATEWAY_BASE, "api_key": "shared-key"}),
+            _default_endpoint_deployment("target", {**GATEWAY_BASE, "model": target_model}),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    reasoning: Final = _reasoning_input_minted_by("origin")[0]
+    original_reasoning: Final = dict(reasoning)
+    request_input: Final = [reasoning, {"role": "user", "content": "and sunsets?"}]
+
+    EncryptedContentAffinityCheck.strip_reasoning_the_targets_cannot_decrypt(
+        ctx, request_input, None, (_deployment_of(ctx, "target"),), unmarked_origin=None
+    )
+
+    assert request_input[0] == (original_reasoning if target_can_decrypt else SUMMARY_ONLY_REASONING)
+
+
+class _SecretReadCounter(CustomSecretManager):
+    def __init__(self) -> None:
+        super().__init__(secret_manager_name="read-counter")
+        self.reads: int = 0
+
+    async def async_read_secret(
+        self, secret_name: str, optional_params: Mapping[str, object] | None = None, timeout: object = None
+    ) -> str | None:
+        self.reads += 1
+        return None
+
+    def sync_read_secret(
+        self, secret_name: str, optional_params: Mapping[str, object] | None = None, timeout: object = None
+    ) -> str | None:
+        self.reads += 1
+        return None
+
+
+@pytest.mark.parametrize(
+    "deployment_params, reasoning_minted_by",
+    [
+        pytest.param(OPENAI_SHARED_KEY, None, id="no reasoning in the input"),
+        pytest.param(OPENAI_SHARED_KEY, "target", id="reasoning the hop's target minted"),
+        pytest.param(
+            {"model": "groq/llama-4-scout"}, "origin", id="reasoning from a provider with no default boundary"
+        ),
+        pytest.param({**GATEWAY_BASE, "api_key": "shared-key"}, "origin", id="reasoning between explicit pairs"),
+    ],
+)
+def test_hop_strip_reads_no_secrets_when_no_default_boundary_needs_resolving(
+    monkeypatch: pytest.MonkeyPatch, deployment_params: dict[str, object], reasoning_minted_by: str | None
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", deployment_params),
+            _default_endpoint_deployment("target", deployment_params),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    secret_reads: Final = _SecretReadCounter()
+    monkeypatch.setattr(litellm, "secret_manager_client", secret_reads)
+    monkeypatch.setattr(litellm, "_key_management_system", KeyManagementSystem.CUSTOM)
+    monkeypatch.setattr(litellm, "_key_management_settings", KeyManagementSettings(access_mode="read_only"))
+    request_input: Final = (
+        _reasoning_input_minted_by(reasoning_minted_by)
+        if reasoning_minted_by
+        else [{"role": "user", "content": "and sunsets?"}]
+    )
+
+    EncryptedContentAffinityCheck.strip_reasoning_the_targets_cannot_decrypt(
+        ctx, request_input, None, (_deployment_of(ctx, "target"),), unmarked_origin="origin"
+    )
+
+    assert secret_reads.reads == 0
+
+
+@pytest.mark.parametrize(
+    "unreadable_params",
+    [
+        pytest.param(
+            {"model": "openai/gpt-5.5", "litellm_credential_name": "mistyped"},
+            id="named credential with a value of the wrong type",
+        ),
+        pytest.param(
+            {**GATEWAY_BASE, "api_key": "shared-key", "extra_headers": {1: "one"}},
+            id="extra header whose name is not a string",
+        ),
+    ],
+)
+def test_hop_strip_keeps_reasoning_a_target_can_decrypt_beside_a_target_with_unreadable_params(
+    monkeypatch: pytest.MonkeyPatch, unreadable_params: dict[str, object]
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    monkeypatch.setattr(
+        litellm,
+        "credential_list",
+        [
+            CredentialItem(
+                credential_name="mistyped",
+                credential_values={"api_key": "shared-key", "api_version": datetime.date(2024, 10, 21)},
+                credential_info={},
+            )
+        ],
+    )
+    shared_pair: Final = {**GATEWAY_BASE, "api_key": "shared-key"}
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", shared_pair),
+            _default_endpoint_deployment("unreadable", unreadable_params),
+            _default_endpoint_deployment("target", shared_pair),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    reasoning: Final = _reasoning_input_minted_by("origin")[0]
+    original_reasoning: Final = dict(reasoning)
+    request_input: Final = [reasoning, {"role": "user", "content": "and sunsets?"}]
+
+    EncryptedContentAffinityCheck.strip_reasoning_the_targets_cannot_decrypt(
+        ctx,
+        request_input,
+        None,
+        (_deployment_of(ctx, "unreadable"), _deployment_of(ctx, "target")),
+        unmarked_origin=None,
+    )
+
+    assert request_input[0] == original_reasoning
+
+
+def test_boundary_key_puts_pydantic_and_plain_params_on_one_default_endpoint_boundary():
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+    from litellm.types.router import LiteLLM_Params
+
+    pydantic_key: Final = EncryptedContentAffinityCheck._encryption_boundary_key(LiteLLM_Params(**OPENAI_SHARED_KEY))
+    plain_key: Final = EncryptedContentAffinityCheck._encryption_boundary_key(dict(OPENAI_SHARED_KEY))
+
+    assert pydantic_key is not None
+    assert plain_key is not None
+    assert pydantic_key.is_shared_with(plain_key)
+    assert plain_key.is_shared_with(pydantic_key)
+
+
+def test_boundary_key_has_no_default_endpoint_for_a_model_no_provider_claims():
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    unmapped: Final = {"model": "unmapped-model-name", "api_key": "shared-key"}
+
+    assert EncryptedContentAffinityCheck._encryption_boundary_key(unmapped) is None
+
+
+def test_boundary_key_has_no_default_key_for_a_custom_provider(monkeypatch: pytest.MonkeyPatch):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    monkeypatch.setattr(litellm, "provider_list", [*litellm.provider_list, "qa-custom"])
+    monkeypatch.setattr(litellm, "_custom_providers", ["qa-custom"])
+
+    assert EncryptedContentAffinityCheck._encryption_boundary_key({"model": "qa-custom/some-model"}) is None
+
+
+@pytest.mark.asyncio
+async def test_affinity_pins_to_the_same_key_peer_on_the_default_endpoint_when_the_origin_cannot_serve():
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", OPENAI_SHARED_KEY),
+            _default_endpoint_deployment("peer", OPENAI_SHARED_KEY),
+            _default_endpoint_deployment("other-org", {**OPENAI_SHARED_KEY, "api_key": "other-key"}),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    peer: Final = _deployment_of(ctx, "peer")
+    reasoning_input: Final = _reasoning_input_minted_by("origin")
+    original_reasoning: Final = dict(reasoning_input[0])
+
+    result: Final[list[dict[str, object]]] = await EncryptedContentAffinityCheck(ctx=ctx).async_filter_deployments(
+        model="gpt-5.5",
+        healthy_deployments=[peer, _deployment_of(ctx, "other-org")],
+        messages=None,
+        request_kwargs={"litellm_metadata": {}, "input": reasoning_input},
+    )
+
+    assert result == [peer]
+    assert reasoning_input[0] == original_reasoning
+
+
+class _HandAdvancedClock:
+    def __init__(self) -> None:
+        self.now: float = 0.0
+
+    def __call__(self) -> float:
+        return self.now
+
+
+def _count_secret_reads(monkeypatch: pytest.MonkeyPatch) -> _SecretReadCounter:
+    secret_reads: Final = _SecretReadCounter()
+    monkeypatch.setattr(litellm, "secret_manager_client", secret_reads)
+    monkeypatch.setattr(litellm, "_key_management_system", KeyManagementSystem.CUSTOM)
+    monkeypatch.setattr(litellm, "_key_management_settings", KeyManagementSettings(access_mode="read_only"))
+    return secret_reads
+
+
+async def _pin_a_turn_minted_by_the_origin(
+    affinity: object, healthy_deployments: list[dict[str, object]]
+) -> tuple[list[dict[str, object]], Mapping[str, object]]:
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    assert isinstance(affinity, EncryptedContentAffinityCheck)
+    reasoning_input: Final = _reasoning_input_minted_by("origin")
+    result: Final[list[dict[str, object]]] = await affinity.async_filter_deployments(
+        model="gpt-5.5",
+        healthy_deployments=list(healthy_deployments),
+        messages=None,
+        request_kwargs={"litellm_metadata": {}, "input": reasoning_input},
+    )
+    return result, reasoning_input[0]
+
+
+@pytest.mark.asyncio
+async def test_repeated_pins_to_a_default_endpoint_peer_ask_the_secret_manager_once_a_minute(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment("origin", OPENAI_SHARED_KEY),
+            _default_endpoint_deployment("peer", OPENAI_SHARED_KEY),
+            _default_endpoint_deployment("other-org", {**OPENAI_SHARED_KEY, "api_key": "other-key"}),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    peer: Final = _deployment_of(ctx, "peer")
+    healthy_deployments: Final = [peer, _deployment_of(ctx, "other-org")]
+    secret_reads: Final = _count_secret_reads(monkeypatch)
+    EncryptedContentAffinityCheck._encryption_boundary_in_refresh_window.cache_clear()
+    clock: Final = _HandAdvancedClock()
+    affinity: Final = EncryptedContentAffinityCheck(ctx=ctx, clock=clock)
+
+    first_pin, first_reasoning = await _pin_a_turn_minted_by_the_origin(affinity, healthy_deployments)
+    reads_for_the_first_pin: Final = secret_reads.reads
+    clock.now = 59.0
+    second_pin, second_reasoning = await _pin_a_turn_minted_by_the_origin(affinity, healthy_deployments)
+    reads_within_the_minute: Final = secret_reads.reads
+    clock.now = 60.0
+    third_pin, third_reasoning = await _pin_a_turn_minted_by_the_origin(affinity, healthy_deployments)
+
+    assert first_pin == second_pin == third_pin == [peer]
+    assert first_reasoning == second_reasoning == third_reasoning == _reasoning_input_minted_by("origin")[0]
+    assert reads_for_the_first_pin > 0
+    assert reads_within_the_minute == reads_for_the_first_pin
+    assert secret_reads.reads > reads_within_the_minute
+
+
+@pytest.mark.asyncio
+async def test_a_changed_named_credential_moves_the_pin_within_the_secret_manager_refresh_minute(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    from litellm.router_utils.pre_call_checks.encrypted_content_affinity_check import (
+        EncryptedContentAffinityCheck,
+    )
+
+    def origin_credential(api_key: str) -> list[CredentialItem]:
+        return [
+            CredentialItem(credential_name="origin-account", credential_values={"api_key": api_key}, credential_info={})
+        ]
+
+    monkeypatch.setattr(litellm, "credential_list", origin_credential("shared-key"))
+    router: Final = litellm.Router(
+        model_list=[
+            _default_endpoint_deployment(
+                "origin", {"model": "openai/gpt-5.5", "litellm_credential_name": "origin-account"}
+            ),
+            _default_endpoint_deployment("peer", OPENAI_SHARED_KEY),
+            _default_endpoint_deployment("other-org", {**OPENAI_SHARED_KEY, "api_key": "other-key"}),
+        ]
+    )
+    ctx: Final = RoutingContext(router)
+    peer: Final = _deployment_of(ctx, "peer")
+    other_org: Final = _deployment_of(ctx, "other-org")
+    _count_secret_reads(monkeypatch)
+    EncryptedContentAffinityCheck._encryption_boundary_in_refresh_window.cache_clear()
+    affinity: Final = EncryptedContentAffinityCheck(ctx=ctx, clock=_HandAdvancedClock())
+
+    pin_before_the_change, _ = await _pin_a_turn_minted_by_the_origin(affinity, [peer, other_org])
+    monkeypatch.setattr(litellm, "credential_list", origin_credential("other-key"))
+    pin_after_the_change, reasoning_after_the_change = await _pin_a_turn_minted_by_the_origin(
+        affinity, [peer, other_org]
+    )
+
+    assert pin_before_the_change == [peer]
+    assert pin_after_the_change == [other_org]
+    assert reasoning_after_the_change == _reasoning_input_minted_by("origin")[0]
diff --git a/tests/unit/rust_bridge/test_detectors.py b/tests/unit/rust_bridge/test_detectors.py
index 634e69910b9..e4c39bb40f9 100644
--- a/tests/unit/rust_bridge/test_detectors.py
+++ b/tests/unit/rust_bridge/test_detectors.py
@@ -334,6 +334,17 @@ def test_stream_cost_injection_needs_a_stream(monkeypatch: pytest.MonkeyPatch) -
     assert not messages_detectors.stream_cost_injection(call())
 
 
+def test_foundry_beta_row_reads_the_api_base_the_anthropic_handler_reads(monkeypatch: pytest.MonkeyPatch) -> None:
+    for name in ("ANTHROPIC_API_BASE", "ANTHROPIC_BASE_URL"):
+        monkeypatch.delenv(name, raising=False)
+    assert messages_detectors.foundry_beta_row(call(api_base="https://team.services.ai.azure.com/anthropic"))
+    assert messages_detectors.foundry_beta_row(call(base_url="https://team.cognitiveservices.azure.com/anthropic"))
+    assert not messages_detectors.foundry_beta_row(call(api_base="https://api.anthropic.com"))
+    assert not messages_detectors.foundry_beta_row(call())
+    monkeypatch.setenv("ANTHROPIC_BASE_URL", "https://team.services.ai.azure.com/anthropic")
+    assert messages_detectors.foundry_beta_row(call())
+
+
 def test_model_alias_map_applies_only_to_the_requested_model(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(litellm, "model_alias_map", {"fast": "openai/gpt-5-mini"})
     assert chat_detectors.model_alias_map(call(model="fast"))
diff --git a/tests/unit/test_anthropic_beta_headers_filtering.py b/tests/unit/test_anthropic_beta_headers_filtering.py
index c8fef95cf98..a9bc741f800 100644
--- a/tests/unit/test_anthropic_beta_headers_filtering.py
+++ b/tests/unit/test_anthropic_beta_headers_filtering.py
@@ -10,21 +10,32 @@ This test validates:
 
 import json
 import os
-from typing import Dict, Final, List
+from typing import Dict, Final, List, get_args
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
+import respx
+from anthropic.types.anthropic_beta_param import AnthropicBetaParam
 
 import litellm
+from litellm import anthropic_beta_headers_manager
 from litellm.anthropic_beta_headers_manager import (
     GetAnthropicBetaHeadersConfig,
     filter_and_transform_beta_headers,
     get_beta_headers_config,
+    resolve_beta_provider,
     update_headers_with_filtered_beta,
     update_request_with_filtered_beta,
 )
 
 
+def _literal_strings(annotation: object) -> frozenset[str]:
+    args: Final = get_args(annotation)
+    if not args:
+        return frozenset({annotation}) if isinstance(annotation, str) else frozenset()
+    return frozenset[str]().union(*(_literal_strings(arg) for arg in args))
+
+
 class TestAnthropicBetaHeadersFiltering:
     """Test beta header filtering and mapping for all providers."""
 
@@ -50,21 +61,24 @@ class TestAnthropicBetaHeadersFiltering:
         """Get all beta headers from the anthropic provider config."""
         return list(self.config.get("anthropic", {}).keys())
 
+    def get_header_column(self, provider: str) -> Dict[str, str | None]:
+        return {**self.config.get(provider, {}), **self.config.get(f"{provider}_header_only", {})}
+
     def get_supported_headers(self, provider: str) -> List[str]:
         """Get headers with non-null values for a provider."""
-        provider_config = self.config.get(provider, {})
+        provider_config = self.get_header_column(provider)
         return [
             header for header, value in provider_config.items() if value is not None
         ]
 
     def get_unsupported_headers(self, provider: str) -> List[str]:
         """Get headers with null values for a provider."""
-        provider_config = self.config.get(provider, {})
+        provider_config = self.get_header_column(provider)
         return [header for header, value in provider_config.items() if value is None]
 
     def get_mapped_headers(self, provider: str) -> Dict[str, str]:
         """Get mapping of input headers to provider-specific headers."""
-        provider_config = self.config.get(provider, {})
+        provider_config = self.get_header_column(provider)
         return {
             header: value
             for header, value in provider_config.items()
@@ -407,7 +421,15 @@ class TestAnthropicBetaHeadersFiltering:
                 test_case["expected"] in filtered
             ), f"Header '{test_case['input']}' should be mapped to '{test_case['expected']}' for {test_case['provider']}, but got: {filtered}"
 
-    @pytest.mark.parametrize("beta", ["compact-2026-09-04", "inline-tools-2026-09-15"])
+    @pytest.mark.parametrize(
+        "beta",
+        [
+            "compact-2026-09-04",
+            "inline-tools-2026-09-15",
+            "prompt-caching-scope-2026-01-05",
+            "redact-thinking-2026-02-12",
+        ],
+    )
     def test_vertex_ai_header_only_beta_is_forwarded_as_the_header_and_dropped_from_the_body(
         self, beta: str
     ) -> None:
@@ -509,6 +531,44 @@ class TestAnthropicBetaHeadersFiltering:
 
         assert filtered == ["inline-tools-2026-09-15"]
 
+    @pytest.mark.parametrize("provider", ["anthropic", "azure_ai", "vertex_ai"])
+    def test_task_budgets_and_computer_use_betas_reach_every_platform(self, provider: str) -> None:
+        """Live probes on 2026-10-28 found all three platforms accept task-budgets-2026-03-13. On 2026-10-31 Vertex
+        ran the computer tool only with the beta each model takes (computer-use-2025-01-24 on Claude Sonnet 4.5 and
+        Haiku 4.5, computer-use-2025-11-24 on Claude Opus 4.5 and the 4.6 models) and answered 400 to the other, so
+        both reach Vertex and the model decides, the same as calling Vertex directly."""
+        sent: Final = frozenset(("computer-use-2025-01-24", "computer-use-2025-11-24", "task-budgets-2026-03-13"))
+
+        headers: Final = update_headers_with_filtered_beta({"anthropic-beta": ",".join(sorted(sent))}, provider)
+
+        assert frozenset(headers["anthropic-beta"].split(",")) == sent
+
+    @pytest.mark.parametrize("provider", ["anthropic", "azure_ai", "vertex_ai"])
+    def test_claude_code_betas_reach_the_probed_platforms(self, provider: str) -> None:
+        """Claude Code 2.1.299 sends these betas outside the anthropic SDK's list, and live probes on
+        2026-10-28 found Anthropic, Vertex, and Azure AI Foundry accept each of them as the anthropic-beta header."""
+        claude_code_betas: Final = frozenset(
+            ("afk-mode-2026-01-31", "redact-thinking-2026-02-12", "structured-outputs-2025-12-15")
+        )
+
+        headers: Final = update_headers_with_filtered_beta({"anthropic-beta": ",".join(claude_code_betas)}, provider)
+
+        assert frozenset(headers["anthropic-beta"].split(",")) == claude_code_betas
+
+    @pytest.mark.parametrize("provider", ["anthropic", "azure_ai", "vertex_ai"])
+    def test_every_anthropic_sdk_beta_has_a_decision_for_the_probed_platforms(self, provider: str) -> None:
+        sdk_betas: Final = _literal_strings(AnthropicBetaParam)
+        provider_column: Final = GetAnthropicBetaHeadersConfig.load_local_beta_headers_config()[provider]
+
+        assert sdk_betas
+        assert sdk_betas - provider_column.keys() == frozenset()
+
+    @pytest.mark.parametrize("provider", ["azure_ai", "vertex_ai"])
+    def test_every_anthropic_beta_has_a_decision_for_vertex_ai_and_azure_ai(self, provider: str) -> None:
+        config: Final = GetAnthropicBetaHeadersConfig.load_local_beta_headers_config()
+
+        assert config["anthropic"].keys() - config[provider].keys() == set()
+
     def test_null_value_headers_filtered(self):
         """Test that headers with null values are always filtered out."""
         for provider in [
@@ -605,3 +665,113 @@ def test_local_flags_load_bundled_beta_headers_without_fetching(monkeypatch, fla
         config = get_beta_headers_config(url="https://example.test/anthropic_beta_headers_config.json")
     remote_get.assert_not_called()
     assert config == GetAnthropicBetaHeadersConfig.load_local_beta_headers_config()
+
+
+FOUNDRY_API_BASE: Final = "https://my-resource.services.ai.azure.com/anthropic"
+DIRECT_API_BASE: Final = "https://api.anthropic.com"
+DIRECT_ONLY_BETA: Final = "advisor-tool-2026-03-01"
+PRESERVED_THINKING_BETAS: Final = (
+    "thinking-binding-controls-2026-08-01",
+    "mid-conversation-system-clear-at-2026-08-21",
+    "mid-conversation-tool-changes-2026-07-01",
+    "mid-conversation-output-config-2026-07-01",
+    "thinking-display-updates-2026-08-18",
+)
+
+
+@pytest.fixture
+def bundled_config(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS", "True")
+    anthropic_beta_headers_manager._BETA_HEADERS_CONFIG = None
+
+
+def test_requests_without_betas_never_fetch_the_beta_table(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.delenv("LITELLM_LOCAL_ANTHROPIC_BETA_HEADERS", raising=False)
+    monkeypatch.delenv("LITELLM_OFFLINE_MODE", raising=False)
+    anthropic_beta_headers_manager._BETA_HEADERS_CONFIG = None
+    with respx.mock(assert_all_called=False) as router:
+        remote_table: Final = router.get(litellm.anthropic_beta_headers_url).respond(
+            json=GetAnthropicBetaHeadersConfig.load_local_beta_headers_config()
+        )
+        for api_base in (None, DIRECT_API_BASE, FOUNDRY_API_BASE):
+            update_request_with_filtered_beta(
+                headers={"anthropic-version": "2023-06-01"},
+                request_data={"max_tokens": 8},
+                provider="anthropic",
+                api_base=api_base,
+            )
+        for provider, deployment_api_base in (
+            ("anthropic", DIRECT_API_BASE),
+            ("anthropic", FOUNDRY_API_BASE),
+            ("openai", FOUNDRY_API_BASE),
+        ):
+            resolve_beta_provider(provider, deployment_api_base)
+    assert remote_table.call_count == 0
+
+
+def test_foundry_deployment_headers_follow_the_azure_ai_row(bundled_config: None) -> None:
+    headers: Final = {"anthropic-beta": f"{DIRECT_ONLY_BETA},thinking-binding-controls-2026-08-01"}
+    result: Final[dict[str, str]] = update_headers_with_filtered_beta(
+        headers=headers, provider="anthropic", api_base=FOUNDRY_API_BASE
+    )
+    assert result == {"anthropic-beta": "thinking-binding-controls-2026-08-01"}
+
+
+def test_direct_deployment_headers_keep_every_anthropic_row_beta(bundled_config: None) -> None:
+    headers: Final = {"anthropic-beta": f"{DIRECT_ONLY_BETA},thinking-binding-controls-2026-08-01"}
+    result: Final[dict[str, str]] = update_headers_with_filtered_beta(
+        headers=headers, provider="anthropic", api_base=DIRECT_API_BASE
+    )
+    assert result == {"anthropic-beta": f"{DIRECT_ONLY_BETA},thinking-binding-controls-2026-08-01"}
+
+
+# Foundry's /anthropic/v1/messages answered 200 to each of these on claude-sonnet-5-5, 2026-10-31
+FOUNDRY_ACCEPTED_ANTHROPIC_ROW_BETAS: Final = (
+    "compact-2026-01-12",
+    "fast-mode-2026-02-01",
+    "fine-grained-tool-streaming-2025-05-14",
+    "inline-tools-2026-09-15",
+    "oauth-2025-04-20",
+    "output-128k-2025-02-19",
+    "token-efficient-tools-2025-02-19",
+)
+
+
+def test_foundry_deployment_keeps_the_anthropic_row_betas_foundry_accepts(bundled_config: None) -> None:
+    result: Final[dict[str, str]] = update_headers_with_filtered_beta(
+        headers={"anthropic-beta": ",".join((DIRECT_ONLY_BETA, *FOUNDRY_ACCEPTED_ANTHROPIC_ROW_BETAS))},
+        provider="anthropic",
+        api_base=FOUNDRY_API_BASE,
+    )
+    assert sorted(result["anthropic-beta"].split(",")) == sorted(FOUNDRY_ACCEPTED_ANTHROPIC_ROW_BETAS)
+
+
+def test_foundry_deployment_request_filters_header_and_body_betas_together(bundled_config: None) -> None:
+    headers: dict[str, str]
+    data: dict[str, object]
+    headers, data = update_request_with_filtered_beta(
+        headers={"anthropic-beta": DIRECT_ONLY_BETA},
+        request_data={"anthropic_beta": [DIRECT_ONLY_BETA, "thinking-binding-controls-2026-08-01"], "max_tokens": 8},
+        provider="anthropic",
+        api_base=FOUNDRY_API_BASE,
+    )
+    assert headers == {}
+    assert data == {"anthropic_beta": ["thinking-binding-controls-2026-08-01"], "max_tokens": 8}
+
+
+@pytest.mark.parametrize("provider", ["anthropic", "azure_ai", "vertex_ai"])
+def test_live_verified_platforms_forward_every_preserved_thinking_beta(bundled_config: None, provider: str) -> None:
+    result: Final[dict[str, str]] = update_headers_with_filtered_beta(
+        headers={"anthropic-beta": ",".join(PRESERVED_THINKING_BETAS)}, provider=provider
+    )
+    assert sorted(result["anthropic-beta"].split(",")) == sorted(PRESERVED_THINKING_BETAS), result
+
+
+@pytest.mark.parametrize("provider", ["anthropic", "azure_ai", "vertex_ai", "bedrock", "bedrock_converse"])
+def test_each_row_forwards_exactly_its_verified_preserved_thinking_cells(bundled_config: None, provider: str) -> None:
+    row: Final[dict[str, str | None]] = GetAnthropicBetaHeadersConfig.load_local_beta_headers_config()[provider]
+    forwarded: Final = tuple(beta for beta in PRESERVED_THINKING_BETAS if row.get(beta) is not None)
+    result: Final[dict[str, str]] = update_headers_with_filtered_beta(
+        headers={"anthropic-beta": ",".join(PRESERVED_THINKING_BETAS)}, provider=provider
+    )
+    assert sorted(result["anthropic-beta"].split(",")) == sorted(forwarded), (provider, result)
diff --git a/tests/unit/test_cost_calculator.py b/tests/unit/test_cost_calculator.py
index cca138e0bb5..aa759f2c4d9 100644
--- a/tests/unit/test_cost_calculator.py
+++ b/tests/unit/test_cost_calculator.py
@@ -1451,6 +1451,38 @@ def test_transcription_usage_cost_returns_zero_for_unknown_type():
     assert _transcription_usage_cost({}, {}) == 0.0
 
 
+def test_realtime_transcription_prices_each_clip_at_the_transcription_model_set_when_it_ran(monkeypatch):
+    monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
+    monkeypatch.setattr(litellm, "model_cost", litellm.get_model_cost_map(url=""))
+
+    from litellm.cost_calculator import handle_realtime_transcription_cost_calculation
+
+    realtime_model = "gpt-realtime-2.1-mini"
+    first_asr, second_asr = "gpt-4o-transcribe", "gpt-transcribe"
+    first_rate = litellm.model_cost[first_asr]["input_cost_per_second"]
+    second_rate = litellm.model_cost[second_asr]["input_cost_per_second"]
+    assert first_rate != second_rate and first_rate > 0 and second_rate > 0
+
+    def session_frame(frame_type: str, asr_model: str | None) -> dict[str, object]:
+        transcription = None if asr_model is None else {"model": asr_model}
+        return {"type": frame_type, "session": {"model": realtime_model, "audio": {"input": {"transcription": transcription}}}}
+
+    clip = {"type": "conversation.item.input_audio_transcription.completed", "usage": {"type": "duration", "seconds": 5}}
+    results: OpenAIRealtimeStreamList = [
+        session_frame("session.created", None),
+        session_frame("session.updated", first_asr),
+        clip,
+        session_frame("session.updated", second_asr),
+        clip,
+    ]
+
+    cost = handle_realtime_transcription_cost_calculation(
+        results=results, custom_llm_provider="openai", litellm_model_name=realtime_model
+    )
+
+    assert cost == pytest.approx(5 * first_rate + 5 * second_rate, rel=1e-9)
+
+
 def test_get_transcription_model_falls_back_to_session_model(monkeypatch):
     """session.model is used when transcription-specific model fields are absent."""
     monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
diff --git a/tests/unit/test_model_prices_and_context_window.py b/tests/unit/test_model_prices_and_context_window.py
index e4a2beb3a86..4e8ede5c446 100644
--- a/tests/unit/test_model_prices_and_context_window.py
+++ b/tests/unit/test_model_prices_and_context_window.py
@@ -845,6 +845,26 @@ def _search_free_requests_rows(path: Path) -> Mapping[str, dict[str, JsonValue]]
     )
 
 
+def _supports_continuation_rows(path: Path) -> frozenset[str]:
+    prices: Final[dict[str, JsonValue]] = TypeAdapter(dict[str, JsonValue]).validate_json(path.read_bytes())
+    return frozenset(
+        key for key, row in prices.items() if isinstance(row, dict) and row.get("supports_continuation") is True
+    )
+
+
+def test_gemini_4_argon_google_rows_carry_supports_continuation_in_both_cost_map_copies() -> None:
+    main_rows: Final = _supports_continuation_rows(PRICES_PATH)
+    # long decode models: https://ai.google.dev/gemini-api/docs/generate-content/long-decode and
+    # https://docs.cloud.google.com/gemini-enterprise-agent-platform/models/guides/gemini-4-argon (2026-11-02)
+    long_decode_rows: Final = {
+        "gemini/gemini-4-argon",
+        "vertex_ai/gemini-4-argon",
+        "vertex_ai/gemini-4-argon-cyber-permissive",
+    }
+    assert long_decode_rows <= main_rows, sorted(main_rows)
+    assert _supports_continuation_rows(BACKUP_PRICES_PATH) == main_rows
+
+
 @pytest.mark.parametrize("path", (PRICES_PATH, BACKUP_PRICES_PATH), ids=("main", "backup"))
 def test_search_free_requests_rows_are_grounding_rows_with_one_allowance_per_group(path: Path) -> None:
     rows = _search_free_requests_rows(path)
diff --git a/tests/unit/test_responses_id_security.py b/tests/unit/test_responses_id_security.py
index 7e74bfd0f17..8dc50fa33c7 100644
--- a/tests/unit/test_responses_id_security.py
+++ b/tests/unit/test_responses_id_security.py
@@ -4,23 +4,33 @@ Tests for ResponsesIDSecurity hook.
 Tests the security hook that prevents user B from seeing response from user A.
 """
 
+import datetime
+from collections.abc import Callable, Mapping
 from unittest.mock import MagicMock, patch
 
 import pytest
 from fastapi import HTTPException
 
+from litellm.caching.dual_cache import DualCache
+from litellm.integrations.custom_logger import CustomLogger
+from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
+from litellm.proxy._types import UserAPIKeyAuth
 from litellm.proxy.hooks.responses_id_security import (
     ResponsesIDSecurity,
     _streams_response_ids,
 )
+from litellm.proxy.spend_tracking.spend_tracking_utils import get_logging_payload
+from litellm.responses.utils import ResponsesAPIRequestUtils
 from litellm.types.llms.openai import (
     GenericEvent,
+    ResponseAPIUsage,
     ResponseCompletedEvent,
     ResponseCreatedEvent,
     ResponsesAPIResponse,
     ResponsesAPIStreamEvents,
 )
-from litellm.types.utils import SpecialEnums
+from litellm.types.responses.main import DeleteResponseResult
+from litellm.types.utils import CallTypesLiteral, Choices, Message, ModelResponse, SpecialEnums, Usage
 
 
 @pytest.fixture
@@ -55,12 +65,12 @@ class TestIsEncryptedResponseId:
         import litellm.proxy.hooks.responses_id_security as responses_module
 
         with patch.object(responses_module, "decrypt_value_helper") as mock_decrypt:
-            mock_decrypt.return_value = f"{SpecialEnums.LITELM_MANAGED_FILE_ID_PREFIX.value}response_id:resp_123;user_id:user-456"
-
-            result = responses_id_security._is_encrypted_response_id(
-                "resp_encrypted_value"
+            mock_decrypt.return_value = (
+                f"{SpecialEnums.LITELM_MANAGED_FILE_ID_PREFIX.value}response_id:resp_123;user_id:user-456"
             )
 
+            result = responses_id_security._is_encrypted_response_id("resp_encrypted_value")
+
             assert result is True
             mock_decrypt.assert_called_once()
 
@@ -88,9 +98,7 @@ class TestDecryptResponseId:
         with patch.object(responses_module, "decrypt_value_helper") as mock_decrypt:
             mock_decrypt.return_value = f"{SpecialEnums.LITELM_MANAGED_FILE_ID_PREFIX.value}response_id:resp_original_123;user_id:user-456;team_id:team-789"
 
-            original_id, user_id, team_id = responses_id_security._decrypt_response_id(
-                "resp_encrypted_value"
-            )
+            original_id, user_id, team_id = responses_id_security._decrypt_response_id("resp_encrypted_value")
 
             assert original_id == "resp_original_123"
             assert user_id == "user-456"
@@ -104,9 +112,7 @@ class TestDecryptResponseId:
         with patch.object(responses_module, "decrypt_value_helper") as mock_decrypt:
             mock_decrypt.return_value = None
 
-            original_id, user_id, team_id = responses_id_security._decrypt_response_id(
-                "resp_plain_value"
-            )
+            original_id, user_id, team_id = responses_id_security._decrypt_response_id("resp_plain_value")
 
             assert original_id == "resp_plain_value"
             assert user_id is None
@@ -116,9 +122,7 @@ class TestDecryptResponseId:
 class TestCheckUserAccessToResponseId:
     """Test check_user_access_to_response_id function"""
 
-    def test_check_user_access_same_user(
-        self, responses_id_security, mock_user_api_key_dict
-    ):
+    def test_check_user_access_same_user(self, responses_id_security, mock_user_api_key_dict):
         """Test that same user has access to their response ID"""
         result = responses_id_security.check_user_access_to_response_id(
             response_id_user_id="test-user-123",
@@ -128,9 +132,7 @@ class TestCheckUserAccessToResponseId:
 
         assert result is True
 
-    def test_check_user_access_different_user_raises_exception(
-        self, responses_id_security, mock_user_api_key_dict
-    ):
+    def test_check_user_access_different_user_raises_exception(self, responses_id_security, mock_user_api_key_dict):
         """Test that different user is denied access to response ID"""
         with patch("litellm.proxy.proxy_server.general_settings", {}):
             with pytest.raises(HTTPException) as exc_info:
@@ -143,9 +145,7 @@ class TestCheckUserAccessToResponseId:
             assert exc_info.value.status_code == 403
             assert "Forbidden" in exc_info.value.detail
 
-    def test_check_user_access_different_team_raises_exception(
-        self, responses_id_security, mock_user_api_key_dict
-    ):
+    def test_check_user_access_different_team_raises_exception(self, responses_id_security, mock_user_api_key_dict):
         """Test that different team is denied access to response ID"""
         with patch("litellm.proxy.proxy_server.general_settings", {}):
             with pytest.raises(HTTPException) as exc_info:
@@ -158,9 +158,7 @@ class TestCheckUserAccessToResponseId:
             assert exc_info.value.status_code == 403
             assert "Forbidden" in exc_info.value.detail
 
-    def test_check_user_access_team_a_to_team_b_without_user_id(
-        self, responses_id_security
-    ):
+    def test_check_user_access_team_a_to_team_b_without_user_id(self, responses_id_security):
         """Test that key from team A (without user_id) cannot access response from team B (without user_id)"""
         # Create a mock user from team A without user_id
         mock_auth_team_a = MagicMock()
@@ -179,9 +177,7 @@ class TestCheckUserAccessToResponseId:
             assert exc_info.value.status_code == 403
             assert "team" in exc_info.value.detail.lower()
 
-    def test_check_user_access_team_a_to_team_b_with_user_id(
-        self, responses_id_security
-    ):
+    def test_check_user_access_team_a_to_team_b_with_user_id(self, responses_id_security):
         """Test that key from team A (without user_id) cannot access response from team B (with user_id)"""
         # Create a mock user from team A without user_id
         mock_auth_team_a = MagicMock()
@@ -217,9 +213,7 @@ class TestCheckUserAccessToResponseId:
 
         assert result is True
 
-    def test_check_user_access_admin_can_access_any_response(
-        self, responses_id_security
-    ):
+    def test_check_user_access_admin_can_access_any_response(self, responses_id_security):
         """Test that proxy admin can access any response ID"""
         from litellm.proxy._types import LitellmUserRoles
 
@@ -238,9 +232,7 @@ class TestCheckUserAccessToResponseId:
 
         assert result is True
 
-    def test_check_user_access_security_disabled(
-        self, responses_id_security, mock_user_api_key_dict
-    ):
+    def test_check_user_access_security_disabled(self, responses_id_security, mock_user_api_key_dict):
         """Test that when security is disabled, any user can access any response"""
         with patch(
             "litellm.proxy.proxy_server.general_settings",
@@ -266,9 +258,7 @@ class TestAsyncPreCallHook:
         """Test pre-call hook decrypts previous_response_id for aresponses call"""
         data = {"previous_response_id": "resp_encrypted_value"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -284,15 +274,11 @@ class TestAsyncPreCallHook:
                 assert result["previous_response_id"] == "resp_original_123"
 
     @pytest.mark.asyncio
-    async def test_async_pre_call_hook_aget_responses(
-        self, responses_id_security, mock_user_api_key_dict, mock_cache
-    ):
+    async def test_async_pre_call_hook_aget_responses(self, responses_id_security, mock_user_api_key_dict, mock_cache):
         """Test pre-call hook decrypts response_id for aget_responses call"""
         data = {"response_id": "resp_encrypted_456"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -308,9 +294,7 @@ class TestAsyncPreCallHook:
                 assert result["response_id"] == "resp_original_456"
 
     @pytest.mark.asyncio
-    async def test_async_pre_call_hook_team_a_accessing_team_b_response(
-        self, responses_id_security, mock_cache
-    ):
+    async def test_async_pre_call_hook_team_a_accessing_team_b_response(self, responses_id_security, mock_cache):
         """Test pre-call hook prevents team A from accessing team B response"""
         # Create a mock user from team A
         mock_auth_team_a = MagicMock()
@@ -320,9 +304,7 @@ class TestAsyncPreCallHook:
 
         data = {"response_id": "resp_encrypted_team_b"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -341,9 +323,7 @@ class TestAsyncPreCallHook:
                     assert "team" in exc_info.value.detail.lower()
 
     @pytest.mark.asyncio
-    async def test_async_pre_call_hook_team_a_accessing_team_b_with_user(
-        self, responses_id_security, mock_cache
-    ):
+    async def test_async_pre_call_hook_team_a_accessing_team_b_with_user(self, responses_id_security, mock_cache):
         """Test pre-call hook prevents team A (no user) from accessing team B response (with user)"""
         # Create a mock user from team A without user_id
         mock_auth_team_a = MagicMock()
@@ -353,9 +333,7 @@ class TestAsyncPreCallHook:
 
         data = {"response_id": "resp_encrypted_team_b_with_user"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -375,9 +353,7 @@ class TestAsyncPreCallHook:
                     assert "forbidden" in exc_info.value.detail.lower()
 
     @pytest.mark.asyncio
-    async def test_async_pre_call_hook_same_team_access(
-        self, responses_id_security, mock_cache
-    ):
+    async def test_async_pre_call_hook_same_team_access(self, responses_id_security, mock_cache):
         """Test pre-call hook allows team A to access their own team's response"""
         # Create a mock user from team A
         mock_auth_team_a = MagicMock()
@@ -387,9 +363,7 @@ class TestAsyncPreCallHook:
 
         data = {"response_id": "resp_encrypted_team_a"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -405,9 +379,7 @@ class TestAsyncPreCallHook:
                 assert result["response_id"] == "resp_original_team_a"
 
     @pytest.mark.asyncio
-    async def test_async_pre_call_hook_adelete_responses_team_security(
-        self, responses_id_security, mock_cache
-    ):
+    async def test_async_pre_call_hook_adelete_responses_team_security(self, responses_id_security, mock_cache):
         """Test pre-call hook prevents team A from deleting team B's response"""
         # Create a mock user from team A
         mock_auth_team_a = MagicMock()
@@ -417,9 +389,7 @@ class TestAsyncPreCallHook:
 
         data = {"response_id": "resp_encrypted_team_b"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -438,9 +408,7 @@ class TestAsyncPreCallHook:
                     assert "team" in exc_info.value.detail.lower()
 
     @pytest.mark.asyncio
-    async def test_async_pre_call_hook_acancel_responses_team_security(
-        self, responses_id_security, mock_cache
-    ):
+    async def test_async_pre_call_hook_acancel_responses_team_security(self, responses_id_security, mock_cache):
         """Test pre-call hook prevents team A from canceling team B's response"""
         # Create a mock user from team A
         mock_auth_team_a = MagicMock()
@@ -450,9 +418,7 @@ class TestAsyncPreCallHook:
 
         data = {"response_id": "resp_encrypted_team_b"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -470,16 +436,13 @@ class TestAsyncPreCallHook:
                     assert exc_info.value.status_code == 403
                     assert "team" in exc_info.value.detail.lower()
 
-
     @pytest.mark.asyncio
     async def test_async_pre_call_hook_alist_input_items_decrypts_response_id(
         self, responses_id_security, mock_user_api_key_dict, mock_cache
     ):
         data = {"response_id": "resp_encrypted_789"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -496,9 +459,7 @@ class TestAsyncPreCallHook:
                 assert result["response_id"] == "resp_original_789"
 
     @pytest.mark.asyncio
-    async def test_async_pre_call_hook_alist_input_items_team_security(
-        self, responses_id_security, mock_cache
-    ):
+    async def test_async_pre_call_hook_alist_input_items_team_security(self, responses_id_security, mock_cache):
         mock_auth_team_a = MagicMock()
         mock_auth_team_a.user_id = None
         mock_auth_team_a.team_id = "team-a"
@@ -506,9 +467,7 @@ class TestAsyncPreCallHook:
 
         data = {"response_id": "resp_encrypted_team_b"}
 
-        with patch.object(
-            responses_id_security, "_is_encrypted_response_id", return_value=True
-        ):
+        with patch.object(responses_id_security, "_is_encrypted_response_id", return_value=True):
             with patch.object(
                 responses_id_security,
                 "_decrypt_response_id",
@@ -620,9 +579,7 @@ class TestAsyncPostCallStreamingIteratorHook:
             "/openai/v1/responses/resp_rawprovider123",
         ],
     )
-    async def test_streamed_id_encrypted_on_all_responses_routes(
-        self, responses_id_security, route, monkeypatch
-    ):
+    async def test_streamed_id_encrypted_on_all_responses_routes(self, responses_id_security, route, monkeypatch):
         streamed_id = await self._drain_streamed_id(responses_id_security, route, monkeypatch)
 
         assert streamed_id != "resp_rawprovider123"
@@ -634,12 +591,8 @@ class TestAsyncPostCallStreamingIteratorHook:
         )
 
     @pytest.mark.asyncio
-    async def test_streamed_id_untouched_on_non_responses_route(
-        self, responses_id_security, monkeypatch
-    ):
-        streamed_id = await self._drain_streamed_id(
-            responses_id_security, "/chat/completions", monkeypatch
-        )
+    async def test_streamed_id_untouched_on_non_responses_route(self, responses_id_security, monkeypatch):
+        streamed_id = await self._drain_streamed_id(responses_id_security, "/chat/completions", monkeypatch)
 
         assert streamed_id == "resp_rawprovider123"
         assert not responses_id_security._is_encrypted_response_id(streamed_id)
@@ -698,12 +651,8 @@ class TestStreamedGenericEventIdEncryption:
     def _advertised_ids(events):
         nested = (getattr(event, "response", None) for event in events)
         return [
-            payload["id"] if isinstance(payload, dict) else payload.id
-            for payload in nested
-            if payload is not None
-        ] + [
-            event.id for event in events if isinstance(getattr(event, "id", None), str)
-        ]
+            payload["id"] if isinstance(payload, dict) else payload.id for payload in nested if payload is not None
+        ] + [event.id for event in events if isinstance(getattr(event, "id", None), str)]
 
     async def _drain(self, responses_id_security, monkeypatch):
         monkeypatch.setenv("LITELLM_SALT_KEY", "sk-test-salt-key-abcdefghij")
@@ -723,9 +672,7 @@ class TestStreamedGenericEventIdEncryption:
         ]
 
     @pytest.mark.asyncio
-    async def test_every_event_advertises_the_same_encrypted_id(
-        self, responses_id_security, monkeypatch
-    ):
+    async def test_every_event_advertises_the_same_encrypted_id(self, responses_id_security, monkeypatch):
         events = await self._drain(responses_id_security, monkeypatch)
         advertised = self._advertised_ids(events)
 
@@ -742,22 +689,14 @@ class TestStreamedGenericEventIdEncryption:
         )
 
     @pytest.mark.asyncio
-    async def test_raw_provider_id_never_reaches_the_client(
-        self, responses_id_security, monkeypatch
-    ):
+    async def test_raw_provider_id_never_reaches_the_client(self, responses_id_security, monkeypatch):
         events = await self._drain(responses_id_security, monkeypatch)
 
-        assert [self.RAW_ID in event.model_dump_json() for event in events] == [
-            False
-        ] * len(events)
+        assert [self.RAW_ID in event.model_dump_json() for event in events] == [False] * len(events)
 
     @pytest.mark.asyncio
-    async def test_sibling_fields_survive_the_rewrite(
-        self, responses_id_security, monkeypatch
-    ):
-        _, queued, keepalive, later, _ = await self._drain(
-            responses_id_security, monkeypatch
-        )
+    async def test_sibling_fields_survive_the_rewrite(self, responses_id_security, monkeypatch):
+        _, queued, keepalive, later, _ = await self._drain(responses_id_security, monkeypatch)
 
         assert queued.response["status"] == "queued"
         assert later.response["status"] == "in_progress"
@@ -769,27 +708,19 @@ class TestAsyncPostCallSuccessHook:
     """Test async_post_call_success_hook function"""
 
     @pytest.mark.asyncio
-    async def test_async_post_call_success_hook_encrypts_response(
-        self, responses_id_security, mock_user_api_key_dict
-    ):
+    async def test_async_post_call_success_hook_encrypts_response(self, responses_id_security, mock_user_api_key_dict):
         """Test post-call hook encrypts ResponsesAPIResponse"""
-        mock_response = ResponsesAPIResponse(
-            id="resp_789", created_at=1234567890, output=[], status="completed"
-        )
+        mock_response = ResponsesAPIResponse(id="resp_789", created_at=1234567890, output=[], status="completed")
         data = {}
 
-        with patch.object(
-            responses_id_security, "_encrypt_response_id", return_value=mock_response
-        ) as mock_encrypt:
+        with patch.object(responses_id_security, "_encrypt_response_id", return_value=mock_response) as mock_encrypt:
             result = await responses_id_security.async_post_call_success_hook(
                 data=data,
                 user_api_key_dict=mock_user_api_key_dict,
                 response=mock_response,
             )
 
-            mock_encrypt.assert_called_once_with(
-                mock_response, mock_user_api_key_dict, request_cache=None
-            )
+            mock_encrypt.assert_called_once_with(mock_response, mock_user_api_key_dict, request_cache=None)
             assert result == mock_response
 
     @pytest.mark.asyncio
@@ -846,9 +777,7 @@ def _auth(user_id="owner-user", team_id="owner-team", user_role=None):
 def _issue_managed_id(hook, owner, provider_response_id=_FABRICATED_PROVIDER_RESPONSE_ID):
     """Mint an id exactly the way the proxy hands one to a client on create."""
     issued = hook._encrypt_response_id(
-        ResponsesAPIResponse(
-            id=provider_response_id, created_at=1234567890, output=[], status="completed"
-        ),
+        ResponsesAPIResponse(id=provider_response_id, created_at=1234567890, output=[], status="completed"),
         owner,
     )
     return issued.id
@@ -1080,9 +1009,7 @@ class TestClientSuppliedRetainedIdCannotBypassAuthorization:
         assert exc_info.value.status_code == 403
 
     @pytest.mark.asyncio
-    async def test_stranger_forging_their_own_id_never_reaches_someone_elses_response(
-        self, mock_cache, salt_key_env
-    ):
+    async def test_stranger_forging_their_own_id_never_reaches_someone_elses_response(self, mock_cache, salt_key_env):
         hook = _hook()
         stranger = _auth(user_id="stranger-user", team_id="stranger-team")
         stranger_id = _issue_managed_id(hook, stranger, provider_response_id="resp_strangerownprovideridcccccccc")
@@ -1098,3 +1025,436 @@ class TestClientSuppliedRetainedIdCannotBypassAuthorization:
 
         assert result["response_id"] == "resp_strangerownprovideridcccccccc"
         assert result["response_id"] != victim_provider_id
+
+
+def _admin():
+    from litellm.proxy._types import LitellmUserRoles
+
+    return _auth(user_id="admin-user", team_id="admin-team", user_role=LitellmUserRoles.PROXY_ADMIN)
+
+
+def _provider_answer(response_id: str) -> ResponsesAPIResponse:
+    return ResponsesAPIResponse(id=response_id, created_at=1234567890, output=[], status="completed")
+
+
+class TestReadsAnswerWithTheIdTheClientHolds:
+    """A follow-up looks its history up by the id the client holds, so a read must not hand out a new one."""
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("call_type", ["aget_responses", "acancel_responses"])
+    @pytest.mark.parametrize(
+        "issuer, reader",
+        [
+            (_auth(), _auth()),
+            (_auth(team_id=None), _auth(team_id="another-team")),
+            (_auth(user_id=None), _auth(user_id=None)),
+            (_auth(user_id=None), _auth(user_id="teammate-user")),
+            (_auth(), _admin()),
+            (_auth(user_id=None), _auth(user_id=None, team_id="admin-team", user_role=_admin().user_role)),
+        ],
+        ids=[
+            "same-key",
+            "same-user-new-team",
+            "same-team-no-user",
+            "teammate-reading-a-team-key-id",
+            "admin-user",
+            "admin-without-user",
+        ],
+    )
+    async def test_a_caller_with_access_gets_back_the_exact_id_they_sent(
+        self, mock_cache, salt_key_env, call_type, issuer, reader
+    ):
+        hook = _hook()
+        issued_id = _issue_managed_id(hook, issuer)
+        data = await hook.async_pre_call_hook(
+            user_api_key_dict=reader, cache=mock_cache, data={"response_id": issued_id}, call_type=call_type
+        )
+
+        result = await hook.async_post_call_success_hook(
+            data=data, user_api_key_dict=reader, response=_provider_answer(data["response_id"])
+        )
+
+        assert result.id == issued_id
+
+    @pytest.mark.asyncio
+    async def test_a_follow_up_gets_an_id_for_its_own_response_never_the_previous_one(self, mock_cache, salt_key_env):
+        hook = _hook()
+        owner = _auth()
+        previous_id = _issue_managed_id(hook, owner)
+        data = await hook.async_pre_call_hook(
+            user_api_key_dict=owner,
+            cache=mock_cache,
+            data={"model": "gpt-fake", "previous_response_id": previous_id},
+            call_type="aresponses",
+        )
+
+        result = await hook.async_post_call_success_hook(
+            data=data, user_api_key_dict=owner, response=_provider_answer("resp_followupprovideridzzzzzzzzzzzzzzz")
+        )
+
+        assert result.id != previous_id
+        assert hook._decrypt_response_id(result.id) == (
+            "resp_followupprovideridzzzzzzzzzzzzzzz",
+            "owner-user",
+            "owner-team",
+        )
+
+    @pytest.mark.asyncio
+    async def test_an_admin_read_by_a_raw_provider_id_gets_a_managed_id_back(self, mock_cache, salt_key_env):
+        hook = _hook()
+        admin = _admin()
+        data = await hook.async_pre_call_hook(
+            user_api_key_dict=admin,
+            cache=mock_cache,
+            data={"response_id": _FABRICATED_UNMANAGED_ID},
+            call_type="aget_responses",
+        )
+
+        result = await hook.async_post_call_success_hook(
+            data=data, user_api_key_dict=admin, response=_provider_answer(_FABRICATED_UNMANAGED_ID)
+        )
+
+        assert hook._is_encrypted_response_id(result.id)
+        assert hook._decrypt_response_id(result.id) == (_FABRICATED_UNMANAGED_ID, "admin-user", "admin-team")
+
+
+_LOGGED_MANAGED_ID = "resp_managedidlitellmbuiltbeforethehookran"
+
+
+def _streamed_response(response_id):
+    return ResponsesAPIResponse(
+        id=response_id,
+        created_at=0,
+        model="gpt-5.1",
+        object="response",
+        output=[],
+        parallel_tool_calls=False,
+        tool_choice="auto",
+        tools=[],
+        usage=ResponseAPIUsage(input_tokens=3, output_tokens=2, total_tokens=5),
+    )
+
+
+def _upstream_frames():
+    return (
+        ResponseCreatedEvent(
+            type=ResponsesAPIStreamEvents.RESPONSE_CREATED, response=_streamed_response(_LOGGED_MANAGED_ID)
+        ),
+        ResponseCompletedEvent(
+            type=ResponsesAPIStreamEvents.RESPONSE_COMPLETED, response=_streamed_response(_LOGGED_MANAGED_ID)
+        ),
+    )
+
+
+def _native_logged_result():
+    return ResponseCompletedEvent(
+        type=ResponsesAPIStreamEvents.RESPONSE_COMPLETED, response=_streamed_response(_LOGGED_MANAGED_ID)
+    )
+
+
+def _bridged_logged_result():
+    return ModelResponse(
+        id="chatcmpl-bridgedchatcompletionid",
+        model="gpt-5.1",
+        choices=[Choices(message=Message(role="assistant", content="hi"), finish_reason="stop", index=0)],
+        usage=Usage(prompt_tokens=3, completion_tokens=2, total_tokens=5),
+    )
+
+
+class _SpendRowRecorder(CustomLogger):
+    def __init__(self):
+        super().__init__()
+        self.spend_row_ids = []
+        self.standard_logging_ids = []
+        self.callback_response_ids = []
+
+    async def async_log_success_event(self, kwargs, response_obj, start_time, end_time):
+        self.spend_row_ids.append(get_logging_payload(kwargs, response_obj, start_time, end_time)["request_id"])
+        self.callback_response_ids.append(response_obj.id)
+        if "standard_logging_object" in kwargs:
+            self.standard_logging_ids.append(kwargs["standard_logging_object"]["id"])
+
+
+async def _stream_logged_mid_stream(
+    hook: ResponsesIDSecurity,
+    route: str,
+    logged_result: ResponseCompletedEvent | ModelResponse,
+    caller: UserAPIKeyAuth | None = None,
+    request_data: Mapping[str, object] | None = None,
+) -> tuple[str, _SpendRowRecorder]:
+    streaming_caller = caller if caller is not None else _auth()
+    recorder = _SpendRowRecorder()
+    logging_obj = LiteLLMLoggingObj(
+        model="gpt-5.1",
+        messages=[],
+        stream=True,
+        call_type="aresponses",
+        start_time=datetime.datetime.now(),
+        litellm_call_id="streamed-responses-call",
+        function_id="streamed-responses-fn",
+        dynamic_async_success_callbacks=[recorder],
+    )
+    logging_obj.update_environment_variables(
+        model="gpt-5.1", user="", optional_params={}, litellm_params={"api_base": ""}
+    )
+    upstream = _upstream_frames()
+
+    async def frames():
+        for frame in upstream:
+            yield frame
+
+    client_stream = hook.async_post_call_streaming_iterator_hook(
+        user_api_key_dict=streaming_caller.model_copy(update={"request_route": route}),
+        response=frames(),
+        request_data={**(request_data or {}), "litellm_logging_obj": logging_obj},
+    )
+    first_frame = await anext(client_stream)
+    now = datetime.datetime.now()
+    await logging_obj.async_success_handler(result=logged_result, start_time=now, end_time=now, cache_hit=False)
+    client_frames = [first_frame, *[frame async for frame in client_stream]]
+    return client_frames[-1].response.id, recorder
+
+
+class TestStreamedSpendRowCarriesTheIdTheClientSaw:
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("logged_result", [_native_logged_result, _bridged_logged_result], ids=["native", "bridge"])
+    @pytest.mark.parametrize("route", ["/v1/responses", "/responses", "/openai/v1/responses"])
+    async def test_spend_row_and_callbacks_log_the_encrypted_id_of_the_terminal_frame(
+        self, salt_key_env, route, logged_result
+    ):
+        hook = _hook()
+
+        client_id, recorder = await _stream_logged_mid_stream(hook, route, logged_result())
+
+        assert hook._decrypt_response_id(client_id) == (_LOGGED_MANAGED_ID, "owner-user", "owner-team")
+        assert recorder.spend_row_ids == [client_id]
+        assert recorder.standard_logging_ids == [client_id]
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "hook, route",
+        [
+            (_hook(), "/chat/completions"),
+            (_hook(general_settings={"disable_responses_id_security": True}), "/v1/responses"),
+            (_hook(signing_key=None), "/v1/responses"),
+        ],
+        ids=["not-a-create-route", "security-disabled", "no-signing-key"],
+    )
+    async def test_stream_the_hook_leaves_alone_keeps_its_logged_id(self, salt_key_env, hook, route):
+        client_id, recorder = await _stream_logged_mid_stream(hook, route, _native_logged_result())
+
+        assert client_id == _LOGGED_MANAGED_ID
+        assert recorder.spend_row_ids == [_LOGGED_MANAGED_ID]
+        assert recorder.standard_logging_ids == [_LOGGED_MANAGED_ID]
+
+
+class TestStreamedReadAnswersWithTheIdTheClientHolds:
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("route_prefix", ["/v1/responses", "/responses", "/openai/v1/responses"])
+    async def test_the_owner_sees_their_id_while_callbacks_log_one_of_the_reads_own(
+        self, mock_cache, salt_key_env, route_prefix
+    ):
+        hook = _hook()
+        owner = _auth()
+        issued_id = _issue_managed_id(hook, owner, provider_response_id=_LOGGED_MANAGED_ID)
+        data = await hook.async_pre_call_hook(
+            user_api_key_dict=owner, cache=mock_cache, data={"response_id": issued_id}, call_type="aget_responses"
+        )
+
+        client_id, recorder = await _stream_logged_mid_stream(
+            hook, f"{route_prefix}/{issued_id}", _native_logged_result(), caller=owner, request_data=data
+        )
+
+        assert client_id == issued_id
+        assert recorder.spend_row_ids == recorder.standard_logging_ids
+        assert len(recorder.standard_logging_ids) == 1
+        assert recorder.standard_logging_ids[0] != issued_id
+        assert hook._decrypt_response_id(recorder.standard_logging_ids[0]) == (
+            _LOGGED_MANAGED_ID,
+            "owner-user",
+            "owner-team",
+        )
+
+    @pytest.mark.asyncio
+    async def test_an_admin_streamed_read_of_someone_elses_response_sees_the_id_sent_and_logs_one_of_its_own(
+        self, mock_cache, salt_key_env
+    ):
+        hook = _hook()
+        admin = _admin()
+        issued_id = _issue_managed_id(hook, _auth(), provider_response_id=_LOGGED_MANAGED_ID)
+        data = await hook.async_pre_call_hook(
+            user_api_key_dict=admin, cache=mock_cache, data={"response_id": issued_id}, call_type="aget_responses"
+        )
+
+        client_id, recorder = await _stream_logged_mid_stream(
+            hook, f"/v1/responses/{issued_id}", _native_logged_result(), caller=admin, request_data=data
+        )
+
+        assert client_id == issued_id
+        assert recorder.spend_row_ids == recorder.standard_logging_ids
+        assert len(recorder.standard_logging_ids) == 1
+        assert hook._decrypt_response_id(recorder.standard_logging_ids[0]) == (
+            _LOGGED_MANAGED_ID,
+            "admin-user",
+            "admin-team",
+        )
+
+
+    @pytest.mark.asyncio
+    async def test_a_frame_naming_the_held_response_under_another_wrapping_still_gets_the_id_sent(
+        self, mock_cache, salt_key_env
+    ):
+        hook = _hook()
+        owner = _auth()
+        issued_id = _issue_managed_id(hook, owner, provider_response_id=_routed_response_id(_LOGGED_MANAGED_ID))
+        data = await hook.async_pre_call_hook(
+            user_api_key_dict=owner, cache=mock_cache, data={"response_id": issued_id}, call_type="aget_responses"
+        )
+
+        client_id, _ = await _stream_logged_mid_stream(
+            hook, f"/v1/responses/{issued_id}", _native_logged_result(), caller=owner, request_data=data
+        )
+
+        assert client_id == issued_id
+
+
+async def _read_logged_by_callbacks(
+    hook: ResponsesIDSecurity,
+    caller: UserAPIKeyAuth,
+    issued_id: str,
+    call_type: CallTypesLiteral,
+    cache: DualCache,
+    answer: Callable[[str], ResponsesAPIResponse | DeleteResponseResult] = _provider_answer,
+) -> tuple[str, _SpendRowRecorder]:
+    recorder = _SpendRowRecorder()
+    now = datetime.datetime.now()
+    logging_obj = LiteLLMLoggingObj(
+        model="gpt-5.1",
+        messages=[],
+        stream=False,
+        call_type=call_type,
+        start_time=now,
+        litellm_call_id=f"{call_type}-call",
+        function_id=f"{call_type}-fn",
+        dynamic_async_success_callbacks=[recorder],
+    )
+    logging_obj.update_environment_variables(
+        model="gpt-5.1", user="", optional_params={}, litellm_params={"api_base": ""}
+    )
+    data = await hook.async_pre_call_hook(
+        user_api_key_dict=caller, cache=cache, data={"response_id": issued_id}, call_type=call_type
+    )
+    provider_answer = answer(data["response_id"])
+
+    client_response = await hook.async_post_call_success_hook(
+        data=data, user_api_key_dict=caller, response=provider_answer
+    )
+    await logging_obj.async_success_handler(result=provider_answer, start_time=now, end_time=now, cache_hit=False)
+    return client_response.id, recorder
+
+
+class TestEveryReadLogsAnIdOfItsOwn:
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("call_type", ["aget_responses", "acancel_responses"])
+    @pytest.mark.parametrize("reader", [_auth(), _admin()], ids=["owner", "admin"])
+    async def test_callbacks_and_the_spend_row_log_a_new_id_per_read_never_the_one_the_client_holds(
+        self, mock_cache, salt_key_env, call_type, reader
+    ):
+        hook = _hook()
+        issued_id = _issue_managed_id(hook, _auth())
+
+        reads = [await _read_logged_by_callbacks(hook, reader, issued_id, call_type, mock_cache) for _ in range(2)]
+
+        assert [client_id for client_id, _ in reads] == [issued_id, issued_id]
+        logged_ids = [id_ for _, recorder in reads for id_ in recorder.standard_logging_ids]
+        assert [recorder.spend_row_ids for _, recorder in reads] == [[logged_id] for logged_id in logged_ids]
+        assert len(set(logged_ids)) == 2
+        assert issued_id not in logged_ids
+        assert {hook._decrypt_response_id(logged_id) for logged_id in logged_ids} == {
+            (_FABRICATED_PROVIDER_RESPONSE_ID, reader.user_id, reader.team_id)
+        }
+
+
+_RAW_UPSTREAM_RESPONSE_ID = "resp_06de59f3upstreamiddddddddddddddddd"
+
+
+def _routed_response_id(upstream_response_id: str) -> str:
+    return ResponsesAPIRequestUtils.update_responses_api_response_id_with_model_id(
+        _provider_answer(upstream_response_id), "openai", {"model_info": {"id": "deployment-1"}}
+    ).id
+
+
+def _deletion_of(response_id: str) -> DeleteResponseResult:
+    return DeleteResponseResult(
+        id=ResponsesAPIRequestUtils.decode_previous_response_id_to_original_previous_response_id(response_id),
+        object="response.deleted",
+        deleted=True,
+    )
+
+
+class TestDeleteAnswersWithTheIdTheClientHolds:
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("reader", [_auth(), _admin()], ids=["owner", "admin"])
+    @pytest.mark.parametrize(
+        "stored_id",
+        [_routed_response_id(_RAW_UPSTREAM_RESPONSE_ID), _RAW_UPSTREAM_RESPONSE_ID],
+        ids=["routed-deployment", "plain-id"],
+    )
+    async def test_a_caller_with_access_gets_back_the_exact_id_they_sent(
+        self, mock_cache, salt_key_env, reader, stored_id
+    ):
+        hook = _hook()
+        issued_id = _issue_managed_id(hook, _auth(), provider_response_id=stored_id)
+        data = await hook.async_pre_call_hook(
+            user_api_key_dict=reader, cache=mock_cache, data={"response_id": issued_id}, call_type="adelete_responses"
+        )
+
+        result = await hook.async_post_call_success_hook(
+            data=data, user_api_key_dict=reader, response=_deletion_of(data["response_id"])
+        )
+
+        assert (result.id, result.object, result.deleted) == (issued_id, "response.deleted", True)
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("reader", [_auth(), _admin()], ids=["owner", "admin"])
+    async def test_callbacks_and_the_spend_row_log_an_id_of_its_own_never_the_one_the_client_holds(
+        self, mock_cache, salt_key_env, reader
+    ):
+        hook = _hook()
+        issued_id = _issue_managed_id(
+            hook, _auth(), provider_response_id=_routed_response_id(_RAW_UPSTREAM_RESPONSE_ID)
+        )
+
+        client_id, recorder = await _read_logged_by_callbacks(
+            hook, reader, issued_id, "adelete_responses", mock_cache, answer=_deletion_of
+        )
+
+        assert client_id == issued_id
+        assert recorder.spend_row_ids == recorder.callback_response_ids
+        assert len(recorder.callback_response_ids) == 1
+        assert recorder.callback_response_ids[0] != issued_id
+        assert hook._decrypt_response_id(recorder.callback_response_ids[0]) == (
+            _RAW_UPSTREAM_RESPONSE_ID,
+            reader.user_id,
+            reader.team_id,
+        )
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "sent_id",
+        [_routed_response_id(_RAW_UPSTREAM_RESPONSE_ID), _RAW_UPSTREAM_RESPONSE_ID],
+        ids=["routed-deployment", "plain-id"],
+    )
+    async def test_an_admin_delete_by_a_raw_provider_id_gets_the_provider_id_back_and_logs_an_id_of_its_own(
+        self, mock_cache, salt_key_env, sent_id
+    ):
+        hook = _hook()
+
+        client_id, recorder = await _read_logged_by_callbacks(
+            hook, _admin(), sent_id, "adelete_responses", mock_cache, answer=_deletion_of
+        )
+
+        assert client_id == _RAW_UPSTREAM_RESPONSE_ID
+        assert [hook._decrypt_response_id(logged_id) for logged_id in recorder.callback_response_ids] == [
+            (_RAW_UPSTREAM_RESPONSE_ID, "admin-user", "admin-team")
+        ]
diff --git a/tests/unit/test_router/test_router.py b/tests/unit/test_router/test_router.py
index 9996ffcb098..4f35efdfd6e 100644
--- a/tests/unit/test_router/test_router.py
+++ b/tests/unit/test_router/test_router.py
@@ -6776,6 +6776,151 @@ async def test_aresponses_streaming_content_policy_error_event_routes_to_content
     assert fallback_call.await_args.kwargs["model"] == "gemini/gemini-2.5-flash"
 
 
+@pytest.mark.asyncio
+async def test_aresponses_stream_keeps_numbering_after_a_mid_stream_fallback():
+    from litellm.types.llms.openai import OutputTextDeltaEvent, ResponsesAPIStreamEvents
+
+    def delta(sequence_number: int, text: str) -> OutputTextDeltaEvent:
+        return OutputTextDeltaEvent(
+            type=ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA,
+            item_id="msg_1",
+            output_index=0,
+            content_index=0,
+            delta=text,
+            sequence_number=sequence_number,
+        )
+
+    from litellm.exceptions import MidStreamFallbackError
+
+    router: Final = _InjectedFallbackRouter(_AsyncList([delta(0, "c"), delta(1, "d")]))
+    primary: Final = _make_responses_iterator(
+        chunks=[delta(0, "a"), delta(1, "b")],
+        error=MidStreamFallbackError(
+            message="primary died",
+            model="primary",
+            llm_provider="anthropic",
+            is_pre_first_chunk=False,
+            generated_content="ab",
+        ),
+        model="primary",
+    )
+
+    wrapped: Final = await router._aresponses_streaming_iterator(
+        response=primary,
+        initial_kwargs={"model": "primary", "stream": True, "input": "Hi", "original_generic_function": litellm.aresponses},
+    )
+    events: Final = [event async for event in wrapped]
+
+    assert [(event.delta, event.sequence_number) for event in events] == [("a", 0), ("b", 1), ("c", 2), ("d", 3)]
+
+
+
+@pytest.mark.asyncio
+async def test_aresponses_stream_fallback_keeps_higher_numbers_and_passes_unnumbered_events():
+    from litellm.exceptions import MidStreamFallbackError
+    from litellm.types.llms.openai import OutputTextDeltaEvent, ResponsesAPIStreamEvents
+
+    def delta(text: str) -> OutputTextDeltaEvent:
+        return OutputTextDeltaEvent(
+            type=ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA, item_id="msg_1", output_index=0, content_index=0, delta=text
+        )
+
+    def numbered(sequence_number: int, text: str) -> OutputTextDeltaEvent:
+        return delta(text).model_copy(update={"sequence_number": sequence_number})
+
+    router: Final = _InjectedFallbackRouter(_AsyncList([numbered(7, "c"), delta("d"), numbered(8, "e")]))
+    primary: Final = _make_responses_iterator(
+        chunks=[numbered(0, "a"), numbered(1, "b")],
+        error=MidStreamFallbackError(
+            message="primary died",
+            model="primary",
+            llm_provider="anthropic",
+            is_pre_first_chunk=False,
+            generated_content="ab",
+        ),
+        model="primary",
+    )
+
+    wrapped: Final = await router._aresponses_streaming_iterator(
+        response=primary,
+        initial_kwargs={"model": "primary", "stream": True, "input": "Hi", "original_generic_function": litellm.aresponses},
+    )
+    events: Final = [event async for event in wrapped]
+
+    assert [(event.delta, event.get("sequence_number")) for event in events] == [
+        ("a", 0),
+        ("b", 1),
+        ("c", 7),
+        ("d", None),
+        ("e", 8),
+    ]
+
+
+@pytest.mark.asyncio
+async def test_aresponses_stream_without_fallback_passes_upstream_numbers_unchanged():
+    from litellm.types.llms.openai import OutputTextDeltaEvent, ResponsesAPIStreamEvents
+
+    def delta(sequence_number: int, text: str) -> OutputTextDeltaEvent:
+        return OutputTextDeltaEvent(
+            type=ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA,
+            item_id="msg_1",
+            output_index=0,
+            content_index=0,
+            delta=text,
+            sequence_number=sequence_number,
+        )
+
+    router: Final = _InjectedFallbackRouter(_AsyncList([]))
+    primary: Final = _make_responses_iterator(
+        chunks=[delta(0, "a"), delta(1, "b"), delta(1, "c"), delta(0, "d")], model="primary"
+    )
+
+    wrapped: Final = await router._aresponses_streaming_iterator(
+        response=primary,
+        initial_kwargs={"model": "primary", "stream": True, "input": "Hi", "original_generic_function": litellm.aresponses},
+    )
+    events: Final = [event async for event in wrapped]
+
+    assert [(event.delta, event.sequence_number) for event in events] == [("a", 0), ("b", 1), ("c", 1), ("d", 0)]
+
+
+@pytest.mark.asyncio
+async def test_aresponses_stream_fallback_continues_above_the_highest_number_the_primary_sent():
+    from litellm.exceptions import MidStreamFallbackError
+    from litellm.types.llms.openai import OutputTextDeltaEvent, ResponsesAPIStreamEvents
+
+    def delta(sequence_number: int, text: str) -> OutputTextDeltaEvent:
+        return OutputTextDeltaEvent(
+            type=ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA,
+            item_id="msg_1",
+            output_index=0,
+            content_index=0,
+            delta=text,
+            sequence_number=sequence_number,
+        )
+
+    router: Final = _InjectedFallbackRouter(_AsyncList([delta(0, "d")]))
+    primary: Final = _make_responses_iterator(
+        chunks=[delta(0, "a"), delta(3, "b"), delta(1, "c")],
+        error=MidStreamFallbackError(
+            message="primary died",
+            model="primary",
+            llm_provider="anthropic",
+            is_pre_first_chunk=False,
+            generated_content="abc",
+        ),
+        model="primary",
+    )
+
+    wrapped: Final = await router._aresponses_streaming_iterator(
+        response=primary,
+        initial_kwargs={"model": "primary", "stream": True, "input": "Hi", "original_generic_function": litellm.aresponses},
+    )
+    events: Final = [event async for event in wrapped]
+
+    assert [(event.delta, event.sequence_number) for event in events] == [("a", 0), ("b", 3), ("c", 1), ("d", 4)]
+
+
 @pytest.mark.asyncio
 async def test_aresponses_streaming_iterator_unwraps_content_policy_trigger_for_fallback_dispatch():
     """The fallback dispatch matches on the trigger's own type, so the wrapper must hand it the
diff --git a/tests/unit/test_router/test_router_helper_utils.py b/tests/unit/test_router/test_router_helper_utils.py
index 4964dea498f..b46a57ad5f1 100644
--- a/tests/unit/test_router/test_router_helper_utils.py
+++ b/tests/unit/test_router/test_router_helper_utils.py
@@ -1497,6 +1497,51 @@ def test_set_model_group_info(model_list, user_facing_model_group_name):
     assert resp.model_group == user_facing_model_group_name
 
 
+def test_set_model_group_info_reports_supports_continuation_when_any_deployment_has_it():
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "long-decode",
+                "litellm_params": {"model": "openai/gpt-4.1", "api_key": "fake"},
+            },
+            {
+                "model_name": "long-decode",
+                "litellm_params": {"model": "openai/gpt-4.1-mini", "api_key": "fake"},
+                "model_info": {"supports_continuation": True},
+            },
+            {
+                "model_name": "long-decode",
+                "litellm_params": {"model": "openai/gpt-4.1-nano", "api_key": "fake"},
+            },
+            {
+                "model_name": "plain",
+                "litellm_params": {"model": "openai/gpt-4.1", "api_key": "fake"},
+            },
+        ]
+    )
+    long_decode: Final = router._set_model_group_info(
+        model_group="long-decode", user_facing_model_group_name="long-decode"
+    )
+    plain: Final = router._set_model_group_info(model_group="plain", user_facing_model_group_name="plain")
+    assert long_decode is not None and long_decode.supports_continuation is True
+    assert plain is not None and plain.supports_continuation is False
+
+
+@pytest.mark.parametrize("value", ["maybe", "", ["x"], "true", 1])
+def test_set_model_group_info_counts_only_a_boolean_true_supports_continuation(value: object) -> None:
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "long-decode",
+                "litellm_params": {"model": "openai/gpt-4.1", "api_key": "fake"},
+                "model_info": {"supports_continuation": value},
+            },
+        ]
+    )
+    group: Final = router._set_model_group_info(model_group="long-decode", user_facing_model_group_name="long-decode")
+    assert group is not None and group.supports_continuation is False
+
+
 @pytest.mark.asyncio
 async def test_set_response_headers(model_list):
     """Test if the 'set_response_headers' function is working correctly"""
diff --git a/tests/unit/test_router_model_cost_isolation.py b/tests/unit/test_router_model_cost_isolation.py
index 91f0b2339c7..96519a0acbe 100644
--- a/tests/unit/test_router_model_cost_isolation.py
+++ b/tests/unit/test_router_model_cost_isolation.py
@@ -585,7 +585,10 @@ def test_should_not_pollute_shared_key_with_custom_nonzero_pricing():
     )
 
 
-@pytest.mark.parametrize("flag", ["supports_regex_lookaround", "supports_assistant_prefill", "supports_sampling_params"])
+@pytest.mark.parametrize(
+    "flag",
+    ["supports_regex_lookaround", "supports_assistant_prefill", "supports_sampling_params", "supports_continuation"],
+)
 def test_capability_flag_stays_on_the_deployment_that_set_it(flag: str) -> None:
     """A deployment's capability override must not land on the shared
     ``{provider}/{model}`` key, or every sibling deployment of that model would inherit it."""
@@ -672,7 +675,7 @@ def test_pdf_opt_out_on_one_deployment_does_not_block_its_sibling(respx_mock: re
 
 
 def test_token_count_settings_stay_on_the_deployment_that_set_them() -> None:
-    """A deployment's ``token_count_model`` and ``token_count_framing`` must not land on
+    """A deployment's ``token_count_model`` and framing settings must not land on
     the shared ``{provider}/{model}`` key, or a sibling deployment of that model would count with them."""
     from litellm.proxy.common_utils.token_count_settings import cost_map_entry
 
@@ -681,6 +684,9 @@ def test_token_count_settings_stay_on_the_deployment_that_set_them() -> None:
     configured: Final = {
         "token_count_model": {"model": "anthropic.claude-opus-5-5", "region": "us-west-2"},
         "token_count_framing": 7,
+        "token_count_tool_framing": 3,
+        "token_count_responses_framing": 5,
+        "token_count_responses_tool_framing": 2,
     }
     builtin: Final = {field: cost_map_entry(backend_model).get(field) for field in configured}
     assert all(builtin[field] != value for field, value in configured.items()), builtin
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 5cf872f4ea7..a9b56568afb 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -476,6 +476,34 @@ def test_supports_video_input_reads_its_own_cost_map_flag(
     assert litellm.get_model_info(model)["supports_video_input"] is video_input
 
 
+@pytest.mark.parametrize("continuation", [True, False])
+def test_supports_continuation_reads_its_own_cost_map_flag(
+    local_model_cost_map: None, monkeypatch: pytest.MonkeyPatch, continuation: bool
+) -> None:
+    model: Final = "gemini/continuation-flag-model"
+    monkeypatch.setitem(
+        litellm.model_cost,
+        model,
+        {
+            "litellm_provider": "gemini",
+            "mode": "chat",
+            "supports_continuation": continuation,
+            "supports_url_context": not continuation,
+        },
+    )
+    assert litellm.supports_continuation(model) is continuation
+    assert litellm.get_model_info(model).get("supports_continuation") is continuation
+
+
+def test_supports_continuation_is_unset_when_the_cost_map_omits_it(
+    local_model_cost_map: None, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    model: Final = "gemini/no-continuation-flag-model"
+    monkeypatch.setitem(litellm.model_cost, model, {"litellm_provider": "gemini", "mode": "chat"})
+    assert litellm.supports_continuation(model) is False
+    assert litellm.get_model_info(model).get("supports_continuation") is None
+
+
 def test_get_optional_params_image_gen():
     from litellm.llms.azure.image_generation import AzureGPTImageGenerationConfig
 
@@ -1178,6 +1206,9 @@ _COST_MAP_ROW_SCHEMA: Final = {
             "supports_vision": {"type": "boolean"},
             "supports_web_search": {"type": "boolean"},
             "token_count_framing": {"type": "integer"},
+            "token_count_tool_framing": {"type": "integer"},
+            "token_count_responses_framing": {"type": "integer"},
+            "token_count_responses_tool_framing": {"type": "integer"},
             "token_count_model": {
                 "type": "object",
                 "properties": {"model": {"type": "string"}, "region": {"type": "string"}},
@@ -1189,6 +1220,7 @@ _COST_MAP_ROW_SCHEMA: Final = {
             "supports_bedrock_runtime_chat_completions_inline_reasoning": {"type": "boolean"},
             "supports_bedrock_converse_tool_result_images": {"type": "boolean"},
             "supports_url_context": {"type": "boolean"},
+            "supports_continuation": {"type": "boolean"},
             "supports_multimodal": {"type": "boolean"},
             "uses_embed_content": {"type": "boolean"},
             "supports_reasoning": {"type": "boolean"},
diff --git a/tests/unit/text_completions/test_streaming_iterator.py b/tests/unit/text_completions/test_streaming_iterator.py
index e5459a5a0cd..571451164d9 100644
--- a/tests/unit/text_completions/test_streaming_iterator.py
+++ b/tests/unit/text_completions/test_streaming_iterator.py
@@ -1,11 +1,15 @@
-from collections.abc import AsyncIterator, Iterator
+from collections.abc import AsyncIterator, Iterator, Sequence
+from itertools import chain
 from typing import Final
 
 import pytest
+from openai.types.completion import Completion
 
 from litellm.exceptions import APIConnectionError
+from litellm.litellm_core_utils.litellm_logging import Logging
+from litellm.litellm_core_utils.streaming_handler import CustomStreamWrapper
 from litellm.text_completions.streaming_iterator import TextCompletionStreamWrapper
-from litellm.types.utils import Choices, Delta, ModelResponseStream, StreamingChoices, Usage
+from litellm.types.utils import Choices, Delta, ModelResponseStream, StreamingChoices, TextCompletionResponse, Usage
 
 
 def test_reasoning_content_preserved_in_text_completion_wrapper():
@@ -85,6 +89,146 @@ async def test_text_completion_stream_usage_is_opt_in(
     ]
 
 
+def _completion_chunk(text: str, finish_reason: str | None, **choice_extras: object) -> Completion:
+    return Completion.construct(
+        id="cmpl-1",
+        created=1,
+        model="m",
+        object="text_completion",
+        choices=[{"index": 0, "text": text, "finish_reason": finish_reason, "logprobs": None, **choice_extras}],
+    )
+
+
+def _text_completion_stream(upstream: Sequence[Completion]) -> list[TextCompletionResponse]:
+    logging_obj: Final = Logging(
+        model="m",
+        messages=[{"role": "user", "content": "1, 2, 3, 4"}],
+        stream=True,
+        call_type="text_completion",
+        start_time=0.0,
+        litellm_call_id="call-1",
+        function_id="function-1",
+    )
+    chat_stream: Final = CustomStreamWrapper(
+        completion_stream=iter(upstream),
+        model="m",
+        custom_llm_provider="text-completion-openai",
+        logging_obj=logging_obj,
+    )
+    return list(TextCompletionStreamWrapper(completion_stream=chat_stream, model="m"))
+
+
+@pytest.mark.parametrize("final_text", [", 5, 6", ""], ids=["text-then-finish", "finish-only"])
+def test_text_completion_stream_keeps_stop_reason_on_the_finish_chunk(final_text: str) -> None:
+    responses: Final = _text_completion_stream(
+        (_completion_chunk(", 5", None), _completion_chunk(final_text, "stop", stop_reason=", 7"))
+    )
+
+    assert responses[-1].choices[0].model_dump(exclude_none=True) == {
+        "finish_reason": "stop",
+        "index": 0,
+        "stop_reason": ", 7",
+    }
+
+
+def test_text_completion_stream_puts_stop_reason_on_the_final_text_chunk() -> None:
+    responses: Final = _text_completion_stream(
+        (_completion_chunk(", 5", None), _completion_chunk(", 6", "stop", stop_reason=", 7"))
+    )
+
+    assert [(response.choices[0].get("text"), response.choices[0].get("stop_reason")) for response in responses] == [
+        (", 5", None),
+        (", 6", ", 7"),
+        (None, ", 7"),
+    ]
+
+
+@pytest.mark.parametrize("final_text", [", 6", ""], ids=["text-then-finish", "finish-only"])
+def test_text_completion_stream_keeps_held_back_token_ids_and_the_stop_reason(final_text: str) -> None:
+    responses: Final = _text_completion_stream(
+        (
+            _completion_chunk("", None, token_ids=[11]),
+            _completion_chunk("", None, token_ids=[220]),
+            _completion_chunk(", 5", None, token_ids=[20]),
+            _completion_chunk(final_text, "stop", stop_reason=", 7", token_ids=[11, 220, 21]),
+        )
+    )
+    choices: Final = [response.choices[0] for response in responses]
+
+    assert list(chain.from_iterable(choice.get("token_ids") or () for choice in choices)) == [11, 220, 20, 11, 220, 21]
+    assert [choice.get("stop_reason") for choice in choices if choice.finish_reason is not None] == [", 7"]
+
+
+def test_text_completion_stream_sends_empty_text_on_token_id_only_chunks() -> None:
+    responses: Final = _text_completion_stream(
+        (
+            _completion_chunk("", None, token_ids=[11]),
+            _completion_chunk("", None, token_ids=[220]),
+            _completion_chunk(", 5", None, token_ids=[20]),
+        )
+    )
+
+    choices: Final = [response.choices[0] for response in responses]
+
+    assert [(choice.text, choice.get("token_ids")) for choice in choices if choice.get("token_ids")] == [
+        ("", [11]),
+        ("", [220]),
+        (", 5", [20]),
+    ]
+
+
+def test_text_completion_stream_keeps_each_choices_text_and_token_ids_on_its_own_index() -> None:
+    responses: Final = _text_completion_stream(
+        (
+            _completion_chunk(" 5", None, index=0, token_ids=[20]),
+            _completion_chunk(" 7", None, index=1, token_ids=[22]),
+            _completion_chunk(", 6", None, index=0, token_ids=[11, 21]),
+            _completion_chunk("", None, index=1, token_ids=[11]),
+            _completion_chunk("", "stop", index=0, stop_reason=", 9", token_ids=[11, 220]),
+            _completion_chunk(", 8", "length", index=1, token_ids=[220, 23]),
+        )
+    )
+    choices: Final = tuple(chain.from_iterable(response.choices for response in responses))
+
+    assert {
+        index: (
+            "".join(choice.text or "" for choice in choices if choice.index == index),
+            list(chain.from_iterable(choice.get("token_ids") or () for choice in choices if choice.index == index)),
+        )
+        for index in (0, 1)
+    } == {0: (" 5, 6", [20, 11, 21, 11, 220]), 1: (" 7, 8", [22, 11, 220, 23])}
+
+
+@pytest.mark.parametrize(
+    "upstream",
+    [
+        (
+            _completion_chunk(" a", None, index=0),
+            _completion_chunk(" b", None, index=1),
+            _completion_chunk("", "length", index=2),
+            _completion_chunk(" red", "stop", index=1, stop_reason=","),
+            _completion_chunk(" s", "stop", index=0, stop_reason=","),
+        ),
+        (
+            _completion_chunk(" a", None, index=0),
+            _completion_chunk(" b", None, index=1),
+            _completion_chunk(" s", "stop", index=0, stop_reason=","),
+            _completion_chunk("", "length", index=2),
+            _completion_chunk(" red", "stop", index=1, stop_reason=","),
+        ),
+    ],
+    ids=["other-choices-finish-first", "choice-0-finishes-first"],
+)
+def test_text_completion_stream_finishes_each_choice_on_its_own_index(upstream: Sequence[Completion]) -> None:
+    finished: Final = [
+        (choice.index, choice.finish_reason, choice.get("stop_reason"))
+        for choice in chain.from_iterable(response.choices for response in _text_completion_stream(upstream))
+        if choice.finish_reason is not None
+    ]
+
+    assert sorted(finished) == [(0, "stop", ","), (1, "stop", ","), (2, "length", None)]
+
+
 def test_text_completion_conversion_rejects_non_streaming_choices() -> None:
     chunk: Final = Choices()
     wrapper: Final = TextCompletionStreamWrapper(completion_stream=None, model="test-model")
diff --git a/tests/unit/types/llms/test_types_llms_openai.py b/tests/unit/types/llms/test_types_llms_openai.py
index 05801c9feec..8c37e86500b 100644
--- a/tests/unit/types/llms/test_types_llms_openai.py
+++ b/tests/unit/types/llms/test_types_llms_openai.py
@@ -16,8 +16,10 @@ from litellm.types.llms.openai import (
     OpenAIChatCompletionLogprobsContent,
     OpenAIModerationResponse,
     OpenAIVideoObject,
+    OutputTextDeltaEvent,
     ResponseCompletedEvent,
     ResponsesAPIResponse,
+    ResponsesAPIStreamEvents,
 )
 
 
@@ -816,3 +818,32 @@ def test_rebuilding_a_dumped_responses_answer_keeps_the_tool_search_call_keys(ex
     rebuilt: Final = ResponsesAPIResponse(**answer.model_dump())
 
     assert rebuilt.model_dump()["output"] == [search_call]
+
+
+def _text_delta() -> OutputTextDeltaEvent:
+    return OutputTextDeltaEvent(
+        type=ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA, item_id="msg_1", output_index=0, content_index=0, delta="hi"
+    )
+
+
+def test_stream_event_dict_reads_see_a_field_set_after_construction():
+    event: Final = _text_delta().model_copy(update={"sequence_number": 3})
+
+    assert event["sequence_number"] == 3
+    assert event.get("sequence_number") == 3
+    assert "sequence_number" in event
+    assert dict(event.items())["sequence_number"] == 3
+    assert event["delta"] == "hi"
+
+
+def test_stream_event_dict_reads_see_an_undeclared_field_named_keys():
+    assert _text_delta().model_copy(update={"keys": "value"})["keys"] == "value"
+
+
+def test_stream_event_dict_reads_still_miss_absent_keys():
+    event: Final = _text_delta()
+
+    assert event.get("sequence_number", "fallback") == "fallback"
+    assert "sequence_number" not in event
+    with pytest.raises(KeyError):
+        event["sequence_number"]
diff --git a/ui/litellm-dashboard/eslint-suppressions.json b/ui/litellm-dashboard/eslint-suppressions.json
index d4ac60e501b..0cadc13a213 100644
--- a/ui/litellm-dashboard/eslint-suppressions.json
+++ b/ui/litellm-dashboard/eslint-suppressions.json
@@ -215,9 +215,6 @@
     },
     "max-lines": {
       "count": 1
-    },
-    "react/no-unescaped-entities": {
-      "count": 2
     }
   },
   "src/app/(dashboard)/guardrails/_components/content_filter/CompetitorIntentConfiguration.tsx": {
@@ -247,6 +244,9 @@
     }
   },
   "src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeModal.tsx": {
+    "max-lines": {
+      "count": 1
+    },
     "no-nested-ternary": {
       "count": 6
     },
@@ -281,6 +281,9 @@
     "local/no-complex-jsx-arrow": {
       "count": 1
     },
+    "max-lines": {
+      "count": 1
+    },
     "max-params": {
       "count": 1
     },
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsDetailsPage.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsDetailsPage.tsx
index 11d75c0f750..f0529121b21 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsDetailsPage.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsDetailsPage.tsx
@@ -1,4 +1,5 @@
 import { useAccessGroupDetails } from "@/app/(dashboard)/hooks/accessGroups/useAccessGroupDetails";
+import type { TFunction } from "i18next";
 import {
   ArrowLeftIcon,
   BotIcon,
@@ -10,6 +11,7 @@ import {
   UsersIcon,
 } from "lucide-react";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
 import DefaultProxyAdminTag from "@/components/common_components/DefaultProxyAdminTag";
 import { BadgeLink } from "@/components/shared/BadgeLink";
 import CopyButton from "@/components/shared/CopyButton";
@@ -34,11 +36,11 @@ const MAX_PREVIEW = 5;
 
 const shortId = (id: string) => (id.length > 20 ? `${id.slice(0, 10)}...${id.slice(-6)}` : id);
 
-const describeAllowedTools = (tools: readonly string[] | undefined): string => {
+const describeAllowedTools = (tools: readonly string[] | undefined, t: TFunction): string => {
   if (tools === undefined) {
-    return "All tools";
+    return t("accessGroups.detail.toolPermissions.allTools");
   }
-  return tools.length === 0 ? "No tools" : tools.join(", ");
+  return tools.length === 0 ? t("accessGroups.detail.toolPermissions.noTools") : tools.join(", ");
 };
 
 function MCPToolPermissionList({
@@ -48,16 +50,17 @@ function MCPToolPermissionList({
   servers: readonly AccessGroupResource[];
   toolPermissions: Readonly<Record<string, string[]>> | null;
 }) {
+  const { t } = useTranslation();
   if (toolPermissions === null || servers.length === 0) {
     return null;
   }
   return (
-    <section className="mt-6 space-y-2" aria-label="MCP tool permissions">
+    <section className="mt-6 space-y-2" aria-label={t("accessGroups.detail.toolPermissions.label")}>
       {servers.map(({ id, name }) => {
         return (
           <div key={id} className="flex flex-wrap items-baseline gap-2 text-sm">
             <span className="font-medium">{name ?? id}</span>
-            <span className="text-muted-foreground">{describeAllowedTools(toolPermissions[id])}</span>
+            <span className="text-muted-foreground">{describeAllowedTools(toolPermissions[id], t)}</span>
           </div>
         );
       })}
@@ -106,6 +109,7 @@ function ResourceBadge({
 }
 
 export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailProps) {
+  const { t } = useTranslation();
   const { data: accessGroup, isLoading } = useAccessGroupDetails(accessGroupId);
   const [isEditModalVisible, setIsEditModalVisible] = useState(false);
   const [showAllKeys, setShowAllKeys] = useState(false);
@@ -124,10 +128,16 @@ export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailPr
   if (!accessGroup) {
     return (
       <div className="p-6 px-12">
-        <Button variant="ghost" size="icon" aria-label="Back" onClick={onBack} className="mb-4">
+        <Button
+          variant="ghost"
+          size="icon"
+          aria-label={t("accessGroups.detail.back")}
+          onClick={onBack}
+          className="mb-4"
+        >
           <ArrowLeftIcon className="size-4" />
         </Button>
-        <p className="py-8 text-center text-sm text-muted-foreground">Access group not found</p>
+        <p className="py-8 text-center text-sm text-muted-foreground">{t("accessGroups.detail.notFound")}</p>
       </div>
     );
   }
@@ -146,47 +156,50 @@ export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailPr
     <div className="p-6 px-12">
       <div className="mb-6 flex items-center justify-between">
         <div className="flex items-center gap-4">
-          <Button variant="ghost" size="icon" aria-label="Back" onClick={onBack}>
+          <Button variant="ghost" size="icon" aria-label={t("accessGroups.detail.back")} onClick={onBack}>
             <ArrowLeftIcon className="size-4" />
           </Button>
           <div>
             <h1 className="text-xl font-semibold tracking-tight text-foreground">{accessGroup.access_group_name}</h1>
             <div className="flex items-center gap-1 text-sm text-muted-foreground">
-              <span>ID: {accessGroup.access_group_id}</span>
-              <CopyButton value={accessGroup.access_group_id} label="Copy access group ID" />
+              <span>
+                {t("accessGroups.detail.idLabel")}
+                {accessGroup.access_group_id}
+              </span>
+              <CopyButton value={accessGroup.access_group_id} label={t("accessGroups.detail.copyId")} />
             </div>
           </div>
         </div>
         <Button onClick={() => setIsEditModalVisible(true)}>
           <EditIcon className="size-4" />
-          Edit Access Group
+          {t("accessGroups.detail.edit")}
         </Button>
       </div>
 
       <Card className="mb-6">
         <CardHeader>
-          <CardTitle>Group Details</CardTitle>
+          <CardTitle>{t("accessGroups.detail.groupDetails")}</CardTitle>
         </CardHeader>
         <CardContent>
           <dl className="grid grid-cols-[max-content_1fr] gap-x-4 gap-y-2 text-sm">
-            <dt className="text-muted-foreground">Description</dt>
+            <dt className="text-muted-foreground">{t("accessGroups.detail.description")}</dt>
             <dd className="text-foreground">{accessGroup.description || "—"}</dd>
-            <dt className="text-muted-foreground">Created</dt>
+            <dt className="text-muted-foreground">{t("accessGroups.detail.created")}</dt>
             <dd className="flex items-center gap-1 text-foreground">
               {new Date(accessGroup.created_at).toLocaleString()}
               {accessGroup.created_by && (
                 <>
-                  <span>by</span>
+                  <span>{t("accessGroups.detail.by")}</span>
                   <DefaultProxyAdminTag userId={accessGroup.created_by} />
                 </>
               )}
             </dd>
-            <dt className="text-muted-foreground">Last Updated</dt>
+            <dt className="text-muted-foreground">{t("accessGroups.detail.lastUpdated")}</dt>
             <dd className="flex items-center gap-1 text-foreground">
               {new Date(accessGroup.updated_at).toLocaleString()}
               {accessGroup.updated_by && (
                 <>
-                  <span>by</span>
+                  <span>{t("accessGroups.detail.by")}</span>
                   <DefaultProxyAdminTag userId={accessGroup.updated_by} />
                 </>
               )}
@@ -200,13 +213,15 @@ export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailPr
           <CardHeader>
             <CardTitle className="flex items-center gap-2">
               <KeyIcon className="size-4" />
-              Attached Keys
+              {t("accessGroups.detail.attachedKeys")}
               <Badge variant="secondary">{keys.length}</Badge>
             </CardTitle>
             {keys.length > MAX_PREVIEW && (
               <CardAction>
                 <Button variant="link" size="sm" onClick={() => setShowAllKeys(!showAllKeys)}>
-                  {showAllKeys ? "Show Less" : `View All (${keys.length})`}
+                  {showAllKeys
+                    ? t("accessGroups.detail.showLess")
+                    : t("accessGroups.detail.viewAll", { count: keys.length })}
                 </Button>
               </CardAction>
             )}
@@ -219,7 +234,7 @@ export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailPr
                 ))}
               </div>
             ) : (
-              <p className="text-sm text-muted-foreground">No keys attached</p>
+              <p className="text-sm text-muted-foreground">{t("accessGroups.detail.noKeys")}</p>
             )}
           </CardContent>
         </Card>
@@ -228,13 +243,15 @@ export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailPr
           <CardHeader>
             <CardTitle className="flex items-center gap-2">
               <UsersIcon className="size-4" />
-              Attached Teams
+              {t("accessGroups.detail.attachedTeams")}
               <Badge variant="secondary">{teams.length}</Badge>
             </CardTitle>
             {teams.length > MAX_PREVIEW && (
               <CardAction>
                 <Button variant="link" size="sm" onClick={() => setShowAllTeams(!showAllTeams)}>
-                  {showAllTeams ? "Show Less" : `View All (${teams.length})`}
+                  {showAllTeams
+                    ? t("accessGroups.detail.showLess")
+                    : t("accessGroups.detail.viewAll", { count: teams.length })}
                 </Button>
               </CardAction>
             )}
@@ -247,7 +264,7 @@ export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailPr
                 ))}
               </div>
             ) : (
-              <p className="text-sm text-muted-foreground">No teams attached</p>
+              <p className="text-sm text-muted-foreground">{t("accessGroups.detail.noTeams")}</p>
             )}
           </CardContent>
         </Card>
@@ -259,37 +276,37 @@ export function AccessGroupDetail({ accessGroupId, onBack }: AccessGroupDetailPr
             <TabsList variant="line" className="h-auto w-full justify-start rounded-none border-b p-0">
               <TabsTrigger value="models" className="flex-none gap-2 rounded-none px-4 py-2">
                 <LayersIcon className="size-4" />
-                Models
+                {t("accessGroups.detail.tabs.models")}
                 <Badge variant="secondary">{models.length}</Badge>
               </TabsTrigger>
               <TabsTrigger value="mcp" className="flex-none gap-2 rounded-none px-4 py-2">
                 <ServerIcon className="size-4" />
-                MCP Servers
+                {t("accessGroups.detail.tabs.mcpServers")}
                 <Badge variant="secondary">{mcpServers.length}</Badge>
               </TabsTrigger>
               <TabsTrigger value="agents" className="flex-none gap-2 rounded-none px-4 py-2">
                 <BotIcon className="size-4" />
-                Agents
+                {t("accessGroups.detail.tabs.agents")}
                 <Badge variant="secondary">{agents.length}</Badge>
               </TabsTrigger>
               <TabsTrigger value="skills" className="flex-none gap-2 rounded-none px-4 py-2">
                 <SparklesIcon className="size-4" />
-                Skills
+                {t("accessGroups.detail.tabs.skills")}
                 <Badge variant="secondary">{skills.length}</Badge>
               </TabsTrigger>
             </TabsList>
             <TabsContent value="models" className="pt-4">
-              <ResourceList items={models} emptyMessage="No models assigned to this group" />
+              <ResourceList items={models} emptyMessage={t("accessGroups.detail.empty.models")} />
             </TabsContent>
             <TabsContent value="mcp" className="pt-4">
-              <ResourceList items={mcpServers} emptyMessage="No MCP servers assigned to this group" />
+              <ResourceList items={mcpServers} emptyMessage={t("accessGroups.detail.empty.mcpServers")} />
               <MCPToolPermissionList servers={mcpServers} toolPermissions={accessGroup.mcp_tool_permissions ?? null} />
             </TabsContent>
             <TabsContent value="agents" className="pt-4">
-              <ResourceList items={agents} emptyMessage="No agents assigned to this group" />
+              <ResourceList items={agents} emptyMessage={t("accessGroups.detail.empty.agents")} />
             </TabsContent>
             <TabsContent value="skills" className="pt-4">
-              <ResourceList items={skills} emptyMessage="No skills assigned to this group" />
+              <ResourceList items={skills} emptyMessage={t("accessGroups.detail.empty.skills")} />
             </TabsContent>
           </Tabs>
         </CardContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupBaseForm.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupBaseForm.tsx
index 43eaf11b60d..35089234d06 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupBaseForm.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupBaseForm.tsx
@@ -2,6 +2,7 @@
 
 import { BotIcon, InfoIcon, LayersIcon, ServerIcon, SparklesIcon } from "lucide-react";
 import type { UseFormReturn } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 
 import { useAgents } from "@/app/(dashboard)/hooks/agents/useAgents";
@@ -16,9 +17,10 @@ import SkillSelector from "@/components/skills/SkillSelector";
 import { Input } from "@/components/ui/input";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Textarea } from "@/components/ui/textarea";
+import i18n from "@/i18n/i18n";
 
 export const accessGroupFormSchema = z.object({
-  name: z.string().min(1, "Please enter the access group name"),
+  name: z.string().min(1, { error: () => i18n.t("accessGroups.form.name.required") }),
   description: z.string(),
   modelIds: z.array(z.string()),
   mcpServerIds: z.array(z.string()),
@@ -80,6 +82,7 @@ export function AccessGroupBaseForm({
   onTabChange,
   initialServerIds,
 }: AccessGroupBaseFormProps) {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data: agentsData } = useAgents();
   const { data: mcpServersData } = useMCPServers();
@@ -98,56 +101,61 @@ export function AccessGroupBaseForm({
       <TabsList className="w-full">
         <TabsTrigger value={GENERAL_TAB}>
           <InfoIcon size={16} />
-          General Info
+          {t("accessGroups.form.tabs.general")}
         </TabsTrigger>
         <TabsTrigger value={MODELS_TAB}>
           <LayersIcon size={16} />
-          Models
+          {t("accessGroups.form.tabs.models")}
         </TabsTrigger>
         <TabsTrigger value={MCP_SERVERS_TAB}>
           <ServerIcon size={16} />
-          MCP Servers
+          {t("accessGroups.form.tabs.mcpServers")}
         </TabsTrigger>
         <TabsTrigger value={AGENTS_TAB}>
           <BotIcon size={16} />
-          Agents
+          {t("accessGroups.form.tabs.agents")}
         </TabsTrigger>
         <TabsTrigger value={SKILLS_TAB}>
           <SparklesIcon size={16} />
-          Skills
+          {t("accessGroups.form.tabs.skills")}
         </TabsTrigger>
       </TabsList>
 
       <TabsContent value={GENERAL_TAB} className="pt-4">
         <FieldGroup>
-          <FormField control={form.control} name="name" label="Group Name">
+          <FormField control={form.control} name="name" label={t("accessGroups.form.name.label")}>
             {({ ref, ...field }) => (
-              <Input {...field} ref={ref} placeholder="e.g. Engineering Team" disabled={isNameDisabled} />
+              <Input
+                {...field}
+                ref={ref}
+                placeholder={t("accessGroups.form.name.placeholder")}
+                disabled={isNameDisabled}
+              />
             )}
           </FormField>
-          <FormField control={form.control} name="description" label="Description">
+          <FormField control={form.control} name="description" label={t("accessGroups.form.description.label")}>
             {({ ref, ...field }) => (
-              <Textarea {...field} ref={ref} rows={4} placeholder="Describe the purpose of this access group..." />
+              <Textarea {...field} ref={ref} rows={4} placeholder={t("accessGroups.form.description.placeholder")} />
             )}
           </FormField>
         </FieldGroup>
       </TabsContent>
 
       <TabsContent value={MODELS_TAB} className="pt-4">
-        <FormField control={form.control} name="modelIds" label="Allowed Models">
+        <FormField control={form.control} name="modelIds" label={t("accessGroups.form.models.label")}>
           {(field) => <ModelSelect context="global" value={field.value} onChange={field.onChange} />}
         </FormField>
       </TabsContent>
 
       <TabsContent value={MCP_SERVERS_TAB} className="pt-4">
-        <FormField control={form.control} name="mcpServerIds" label="Allowed MCP Servers">
+        <FormField control={form.control} name="mcpServerIds" label={t("accessGroups.form.mcpServers.label")}>
           {({ id, value, onChange }) => (
             <MultiSelect
               id={id}
               value={value}
               onValueChange={onChange}
               options={mcpServerOptions}
-              placeholder="Select MCP servers"
+              placeholder={t("accessGroups.form.mcpServers.placeholder")}
             />
           )}
         </FormField>
@@ -160,14 +168,14 @@ export function AccessGroupBaseForm({
       </TabsContent>
 
       <TabsContent value={AGENTS_TAB} className="pt-4">
-        <FormField control={form.control} name="agentIds" label="Allowed Agents">
+        <FormField control={form.control} name="agentIds" label={t("accessGroups.form.agents.label")}>
           {({ id, value, onChange }) => (
             <MultiSelect
               id={id}
               value={value}
               onValueChange={onChange}
               options={agentOptions}
-              placeholder="Select agents"
+              placeholder={t("accessGroups.form.agents.placeholder")}
             />
           )}
         </FormField>
@@ -177,15 +185,15 @@ export function AccessGroupBaseForm({
         <FormField
           control={form.control}
           name="skillNames"
-          label="Allowed Skills"
-          description="Enabled skills are visible to everyone. Grant disabled (private) Claude Code plugins to the teams and keys in this group here."
+          label={t("accessGroups.form.skills.label")}
+          description={t("accessGroups.form.skills.description")}
         >
           {({ value, onChange }) => (
             <SkillSelector
               onChange={onChange}
               value={value}
               accessToken={accessToken || ""}
-              placeholder="Select skills (optional)"
+              placeholder={t("accessGroups.form.skills.placeholder")}
             />
           )}
         </FormField>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx
index 9ee2583474b..4744c909b4b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx
@@ -2,6 +2,7 @@
 
 import React, { useState } from "react";
 import { useFormState } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 
 import { toast } from "@/lib/toast";
 import { useZodForm } from "@/lib/forms/useZodForm";
@@ -39,6 +40,7 @@ const toFormValues = (accessGroup: AccessGroupResponse): AccessGroupFormValues =
 });
 
 function AccessGroupEditForm({ accessGroup, onCancel, onSuccess }: Omit<AccessGroupEditModalProps, "visible">) {
+  const { t } = useTranslation();
   const form = useZodForm(accessGroupFormSchema, { defaultValues: toFormValues(accessGroup) });
   const { dirtyFields } = useFormState({ control: form.control });
   const editMutation = useEditAccessGroup();
@@ -66,7 +68,7 @@ function AccessGroupEditForm({ accessGroup, onCancel, onSuccess }: Omit<AccessGr
         { accessGroupId: accessGroup.access_group_id, params },
         {
           onSuccess: () => {
-            toast.success("Access group updated successfully");
+            toast.success(t("accessGroups.edit.success"));
             onSuccess?.();
             onCancel();
           },
@@ -87,10 +89,10 @@ function AccessGroupEditForm({ accessGroup, onCancel, onSuccess }: Omit<AccessGr
 
       <div className="mt-6 flex justify-end gap-2">
         <Button type="button" variant="outline" onClick={onCancel} disabled={editMutation.isPending}>
-          Cancel
+          {t("accessGroups.edit.cancel")}
         </Button>
         <Button type="button" onClick={() => void handleOk()} disabled={editMutation.isPending}>
-          Save Changes
+          {t("accessGroups.edit.save")}
         </Button>
       </div>
     </form>
@@ -98,11 +100,12 @@ function AccessGroupEditForm({ accessGroup, onCancel, onSuccess }: Omit<AccessGr
 }
 
 export function AccessGroupEditModal({ visible, accessGroup, onCancel, onSuccess }: AccessGroupEditModalProps) {
+  const { t } = useTranslation();
   return (
     <Dialog open={visible} onOpenChange={(open) => !open && onCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
         <DialogHeader>
-          <DialogTitle>Edit Access Group</DialogTitle>
+          <DialogTitle>{t("accessGroups.edit.title")}</DialogTitle>
         </DialogHeader>
         <AccessGroupEditForm
           key={accessGroup.access_group_id}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx
index 9729ad7b14c..9e83860cf54 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx
@@ -3,6 +3,7 @@ import { AccessGroupResponse, useAccessGroups } from "@/app/(dashboard)/hooks/ac
 import { useDeleteAccessGroup } from "@/app/(dashboard)/hooks/accessGroups/useDeleteAccessGroup";
 import { Boxes, Plus, SearchIcon, X } from "lucide-react";
 import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 import DeleteResourceModal from "@/components/common_components/DeleteResourceModal";
 import { PageHeader, PageHeaderControls, PageHeaderDescription, PageHeaderTitle } from "@/components/shared/PageHeader";
 import { Button } from "@/components/ui/button";
@@ -33,6 +34,7 @@ function mapResponseToAccessGroup(r: AccessGroupResponse): AccessGroup {
 }
 
 export function AccessGroupsPage() {
+  const { t } = useTranslation();
   const { userRole } = useAuthorized();
   // Admin Viewer follows the read-parity rule: see access groups, no writes.
   const canModify = isProxyAdminRole(userRole ?? "");
@@ -65,14 +67,14 @@ export function AccessGroupsPage() {
       <PageHeader>
         <PageHeaderTitle>
           <Boxes />
-          Access Groups
+          {t("accessGroups.page.title")}
         </PageHeaderTitle>
-        <PageHeaderDescription>Manage resource permissions for your organization</PageHeaderDescription>
+        <PageHeaderDescription>{t("accessGroups.page.description")}</PageHeaderDescription>
         {canModify && (
           <PageHeaderControls>
             <Button onClick={() => setIsCreateModalVisible(true)}>
               <Plus className="size-4" />
-              Create Access Group
+              {t("accessGroups.page.create")}
             </Button>
           </PageHeaderControls>
         )}
@@ -85,13 +87,17 @@ export function AccessGroupsPage() {
               <SearchIcon className="size-4 text-muted-foreground" />
             </InputGroupAddon>
             <InputGroupInput
-              placeholder="Search groups by name, ID, or description..."
+              placeholder={t("accessGroups.page.searchPlaceholder")}
               value={searchText}
               onChange={(e) => setSearchText(e.target.value)}
             />
             {searchText && (
               <InputGroupAddon align="inline-end">
-                <InputGroupButton size="icon-xs" aria-label="Clear search" onClick={() => setSearchText("")}>
+                <InputGroupButton
+                  size="icon-xs"
+                  aria-label={t("accessGroups.page.clearSearch")}
+                  onClick={() => setSearchText("")}
+                >
                   <X />
                 </InputGroupButton>
               </InputGroupAddon>
@@ -113,13 +119,13 @@ export function AccessGroupsPage() {
 
       <DeleteResourceModal
         isOpen={!!groupToDelete}
-        title="Delete Access Group"
-        message="Are you sure you want to delete this access group? This action cannot be undone."
-        resourceInformationTitle="Access Group Information"
+        title={t("accessGroups.page.deleteModal.title")}
+        message={t("accessGroups.page.deleteModal.message")}
+        resourceInformationTitle={t("accessGroups.page.deleteModal.informationTitle")}
         resourceInformation={[
-          { label: "ID", value: groupToDelete?.id, code: true },
-          { label: "Name", value: groupToDelete?.name },
-          { label: "Description", value: groupToDelete?.description || "—" },
+          { label: t("accessGroups.page.deleteModal.id"), value: groupToDelete?.id, code: true },
+          { label: t("accessGroups.page.deleteModal.name"), value: groupToDelete?.name },
+          { label: t("accessGroups.page.deleteModal.description"), value: groupToDelete?.description || "—" },
         ]}
         onCancel={() => setGroupToDelete(null)}
         onOk={() => {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTable.tsx
index 10d1735d3e7..354a5f97677 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Layers } from "lucide-react";
 import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 
@@ -21,18 +22,17 @@ interface AccessGroupsTableProps {
 const PAGE_SIZE_OPTIONS = [10, 25, 50];
 
 function EmptyState({ isFiltered }: { isFiltered: boolean }) {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Layers className="size-5 text-muted-foreground" />
       </div>
       <div className="text-sm font-medium text-foreground">
-        {isFiltered ? "No matching access groups" : "No access groups yet"}
+        {isFiltered ? t("accessGroups.table.empty.filteredTitle") : t("accessGroups.table.empty.title")}
       </div>
       <div className="text-sm text-muted-foreground">
-        {isFiltered
-          ? "Try a different search term."
-          : "Create an access group to manage resource permissions for your organization."}
+        {isFiltered ? t("accessGroups.table.empty.filteredDescription") : t("accessGroups.table.empty.description")}
       </div>
     </div>
   );
@@ -46,12 +46,13 @@ export function AccessGroupsTable({
   onGroupClick,
   onDeleteClick,
 }: AccessGroupsTableProps) {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>([]);
 
   const columns = useMemo(() => {
-    const deps = { canModify, onGroupClick, onDeleteClick };
+    const deps = { canModify, onGroupClick, onDeleteClick, t };
     return getAccessGroupsTableColumns(deps);
-  }, [canModify, onGroupClick, onDeleteClick]);
+  }, [canModify, onGroupClick, onDeleteClick, t]);
 
   return (
     <DataTable
@@ -64,7 +65,7 @@ export function AccessGroupsTable({
       paginationMode="client"
       pageSizeOptions={PAGE_SIZE_OPTIONS}
       isLoading={isLoading}
-      loadingMessage="Loading access groups…"
+      loadingMessage={t("accessGroups.table.loading")}
       noDataMessage={<EmptyState isFiltered={isFiltered} />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTableColumns.tsx
index e8ebe4d1b64..a151ff4aa6b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 import { Bot, Layers, MoreHorizontal, Server, Sparkles, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { DateCell, IdentityCell } from "@/components/shared/table_cells";
@@ -37,12 +39,13 @@ const RESOURCE_TONES: Record<"models" | "mcpServers" | "agents" | "skills", Reso
 };
 
 function ResourcesCell({ group }: { group: AccessGroup }) {
+  const { t } = useTranslation();
   const items = [
-    { key: "models" as const, label: "Models", count: group.modelIds.length },
-    { key: "mcpServers" as const, label: "MCP Servers", count: group.mcpServerIds.length },
-    { key: "agents" as const, label: "Agents", count: group.agentIds.length },
-    { key: "skills" as const, label: "Skills", count: group.skillNames.length },
-  ];
+    { key: "models" as const, label: "accessGroups.table.resources.models", count: group.modelIds.length },
+    { key: "mcpServers" as const, label: "accessGroups.table.resources.mcpServers", count: group.mcpServerIds.length },
+    { key: "agents" as const, label: "accessGroups.table.resources.agents", count: group.agentIds.length },
+    { key: "skills" as const, label: "accessGroups.table.resources.skills", count: group.skillNames.length },
+  ] as const;
 
   return (
     <div className="flex items-center gap-1.5">
@@ -52,7 +55,7 @@ function ResourcesCell({ group }: { group: AccessGroup }) {
         return (
           <span
             key={item.key}
-            title={`${item.count} ${item.label}`}
+            title={t(item.label, { count: item.count })}
             className={cn(
               "inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-xs font-medium ring-1 ring-inset [&_svg]:size-3.5",
               tone.className,
@@ -74,10 +77,11 @@ function AccessGroupRowActions({
   group: AccessGroup;
   onDeleteClick: (group: AccessGroup) => void;
 }) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open access group actions"
+        aria-label={t("accessGroups.table.rowActions.open")}
         data-testid={`access-group-actions-${group.id}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -90,7 +94,7 @@ function AccessGroupRowActions({
           onClick={() => onDeleteClick(group)}
         >
           <Trash2 />
-          Delete access group
+          {t("accessGroups.table.rowActions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -101,19 +105,21 @@ interface AccessGroupsTableColumnsDeps {
   canModify: boolean;
   onGroupClick: (id: string) => void;
   onDeleteClick: (group: AccessGroup) => void;
+  t: TFunction;
 }
 
 export const getAccessGroupsTableColumns = ({
   canModify,
   onGroupClick,
   onDeleteClick,
+  t,
 }: AccessGroupsTableColumnsDeps): ColumnDef<AccessGroup>[] => {
   const columns: ColumnDef<AccessGroup>[] = [
     {
       id: "id",
       accessorKey: "id",
-      meta: { title: "ID" },
-      header: "ID",
+      meta: { title: t("accessGroups.table.columns.id") },
+      header: t("accessGroups.table.columns.id"),
       size: 200,
       enableSorting: false,
       cell: ({ row }) => (
@@ -127,8 +133,8 @@ export const getAccessGroupsTableColumns = ({
     {
       id: "name",
       accessorKey: "name",
-      meta: { title: "Name" },
-      header: ({ column }) => <DataTableSortHeader column={column} title="Name" />,
+      meta: { title: t("accessGroups.table.columns.name") },
+      header: ({ column }) => <DataTableSortHeader column={column} title={t("accessGroups.table.columns.name")} />,
       size: 220,
       enableSorting: true,
       cell: ({ row }) => {
@@ -142,8 +148,8 @@ export const getAccessGroupsTableColumns = ({
     },
     {
       id: "resources",
-      meta: { title: "Resources" },
-      header: "Resources",
+      meta: { title: t("accessGroups.table.columns.resources") },
+      header: t("accessGroups.table.columns.resources"),
       size: 220,
       enableSorting: false,
       cell: ({ row }) => <ResourcesCell group={row.original} />,
@@ -151,8 +157,8 @@ export const getAccessGroupsTableColumns = ({
     {
       id: "createdAt",
       accessorKey: "createdAt",
-      meta: { title: "Created" },
-      header: ({ column }) => <DataTableSortHeader column={column} title="Created" />,
+      meta: { title: t("accessGroups.table.columns.created") },
+      header: ({ column }) => <DataTableSortHeader column={column} title={t("accessGroups.table.columns.created")} />,
       size: 150,
       enableSorting: true,
       sortingFn: "datetime",
@@ -161,8 +167,8 @@ export const getAccessGroupsTableColumns = ({
     {
       id: "updatedAt",
       accessorKey: "updatedAt",
-      meta: { title: "Updated" },
-      header: "Updated",
+      meta: { title: t("accessGroups.table.columns.updated") },
+      header: t("accessGroups.table.columns.updated"),
       size: 150,
       enableSorting: false,
       cell: ({ row }) => <DateCell value={row.original.updatedAt} precision="date" />,
@@ -178,7 +184,7 @@ export const getAccessGroupsTableColumns = ({
     {
       id: "actions",
       meta: { className: "text-right", headerClassName: "text-right" },
-      header: () => <span className="sr-only">Actions</span>,
+      header: () => <span className="sr-only">{t("accessGroups.table.columns.actions")}</span>,
       size: 64,
       enableSorting: false,
       enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/access-group-create/AccessGroupCreateDialog.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/access-group-create/AccessGroupCreateDialog.tsx
index f684ba674bf..041f33e5c0b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/access-group-create/AccessGroupCreateDialog.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/access-group-create/AccessGroupCreateDialog.tsx
@@ -3,6 +3,7 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { BotIcon, InfoIcon, LayersIcon, ServerIcon, SparklesIcon } from "lucide-react";
 import * as React from "react";
+import { useTranslation } from "react-i18next";
 
 import { accessGroupKeys } from "@/app/(dashboard)/hooks/accessGroups/useAccessGroups";
 import { useAgents } from "@/app/(dashboard)/hooks/agents/useAgents";
@@ -44,6 +45,7 @@ export const AccessGroupCreateDialog = ({
   onOpenChange,
   createAccessGroup = defaultCreateAccessGroup,
 }: AccessGroupCreateDialogProps) => {
+  const { t } = useTranslation();
   const queryClient = useQueryClient();
   const form = useZodForm(accessGroupCreateSchema, { defaultValues: emptyAccessGroupFormValues });
   const [activeTab, setActiveTab] = React.useState(GENERAL_TAB);
@@ -70,12 +72,12 @@ export const AccessGroupCreateDialog = ({
   const mutation = useMutation({
     mutationFn: (body: AccessGroupCreateBody) => createAccessGroup(body),
     onSuccess: () => {
-      toast.success("Access group created successfully");
+      toast.success(t("accessGroups.create.success"));
       queryClient.invalidateQueries({ queryKey: accessGroupKeys.all });
       closeAndReset();
     },
     onError: (error: unknown) =>
-      toast.fromError(error instanceof Error ? error.message : "Failed to create access group"),
+      toast.fromError(error instanceof Error ? error.message : t("accessGroups.create.failed")),
   });
 
   const handleOpenChange = (nextOpen: boolean) => {
@@ -100,7 +102,7 @@ export const AccessGroupCreateDialog = ({
     <Dialog open={open} onOpenChange={handleOpenChange}>
       <DialogContent className="sm:max-w-2xl max-h-[90vh] overflow-y-auto">
         <DialogHeader>
-          <DialogTitle>Create Access Group</DialogTitle>
+          <DialogTitle>{t("accessGroups.create.title")}</DialogTitle>
         </DialogHeader>
 
         <form onSubmit={onSubmit} noValidate>
@@ -108,38 +110,40 @@ export const AccessGroupCreateDialog = ({
             <TabsList className="w-full">
               <TabsTrigger value={GENERAL_TAB}>
                 <InfoIcon />
-                General Info
+                {t("accessGroups.form.tabs.general")}
               </TabsTrigger>
               <TabsTrigger value="models">
                 <LayersIcon />
-                Models
+                {t("accessGroups.form.tabs.models")}
               </TabsTrigger>
               <TabsTrigger value="mcp-servers">
                 <ServerIcon />
-                MCP Servers
+                {t("accessGroups.form.tabs.mcpServers")}
               </TabsTrigger>
               <TabsTrigger value="agents">
                 <BotIcon />
-                Agents
+                {t("accessGroups.form.tabs.agents")}
               </TabsTrigger>
               <TabsTrigger value="skills">
                 <SparklesIcon />
-                Skills
+                {t("accessGroups.form.tabs.skills")}
               </TabsTrigger>
             </TabsList>
 
             <TabsContent value={GENERAL_TAB} className="pt-4">
               <FieldGroup>
-                <FormField control={form.control} name="name" label="Group Name">
-                  {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. Engineering Team" />}
+                <FormField control={form.control} name="name" label={t("accessGroups.form.name.label")}>
+                  {({ ref, ...field }) => (
+                    <Input {...field} ref={ref} placeholder={t("accessGroups.form.name.placeholder")} />
+                  )}
                 </FormField>
-                <FormField control={form.control} name="description" label="Description">
+                <FormField control={form.control} name="description" label={t("accessGroups.form.description.label")}>
                   {({ ref, ...field }) => (
                     <Textarea
                       {...field}
                       ref={ref}
                       rows={4}
-                      placeholder="Describe the purpose of this access group..."
+                      placeholder={t("accessGroups.form.description.placeholder")}
                     />
                   )}
                 </FormField>
@@ -147,20 +151,20 @@ export const AccessGroupCreateDialog = ({
             </TabsContent>
 
             <TabsContent value="models" className="pt-4">
-              <FormField control={form.control} name="modelIds" label="Allowed Models">
+              <FormField control={form.control} name="modelIds" label={t("accessGroups.form.models.label")}>
                 {(field) => <ModelSelect context="global" value={field.value} onChange={field.onChange} />}
               </FormField>
             </TabsContent>
 
             <TabsContent value="mcp-servers" className="pt-4">
-              <FormField control={form.control} name="mcpServerIds" label="Allowed MCP Servers">
+              <FormField control={form.control} name="mcpServerIds" label={t("accessGroups.form.mcpServers.label")}>
                 {({ id, value, onChange }) => (
                   <MultiSelect
                     id={id}
                     value={value}
                     onValueChange={onChange}
                     options={mcpServerOptions}
-                    placeholder="Select MCP servers"
+                    placeholder={t("accessGroups.form.mcpServers.placeholder")}
                   />
                 )}
               </FormField>
@@ -172,14 +176,14 @@ export const AccessGroupCreateDialog = ({
             </TabsContent>
 
             <TabsContent value="agents" className="pt-4">
-              <FormField control={form.control} name="agentIds" label="Allowed Agents">
+              <FormField control={form.control} name="agentIds" label={t("accessGroups.form.agents.label")}>
                 {({ id, value, onChange }) => (
                   <MultiSelect
                     id={id}
                     value={value}
                     onValueChange={onChange}
                     options={agentOptions}
-                    placeholder="Select agents"
+                    placeholder={t("accessGroups.form.agents.placeholder")}
                   />
                 )}
               </FormField>
@@ -189,15 +193,15 @@ export const AccessGroupCreateDialog = ({
               <FormField
                 control={form.control}
                 name="skillNames"
-                label="Allowed Skills"
-                description="Enabled skills are visible to everyone. Grant disabled (private) Claude Code plugins to the teams and keys in this group here."
+                label={t("accessGroups.form.skills.label")}
+                description={t("accessGroups.form.skills.description")}
               >
                 {({ value, onChange }) => (
                   <SkillSelector
                     onChange={onChange}
                     value={value}
                     accessToken={accessToken || ""}
-                    placeholder="Select skills (optional)"
+                    placeholder={t("accessGroups.form.skills.placeholder")}
                   />
                 )}
               </FormField>
@@ -211,10 +215,10 @@ export const AccessGroupCreateDialog = ({
               onClick={() => handleOpenChange(false)}
               disabled={mutation.isPending}
             >
-              Cancel
+              {t("accessGroups.create.cancel")}
             </Button>
             <Button type="submit" disabled={mutation.isPending}>
-              {mutation.isPending ? "Creating..." : "Create Group"}
+              {mutation.isPending ? t("accessGroups.create.submitting") : t("accessGroups.create.submit")}
             </Button>
           </DialogFooter>
         </form>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx
index 44c62349005..bd688daf2aa 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx
@@ -10,7 +10,9 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Info, TriangleAlert } from "lucide-react";
 import React, { useEffect, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { useBaseUrl } from "@/components/constants";
+import i18n from "@/i18n/i18n";
 import { toast } from "@/lib/toast";
 import { addAllowedIP, deleteAllowedIP, getAllowedIPs, getSSOSettings } from "@/components/networking";
 import SCIMConfig from "@/components/SCIM";
@@ -38,22 +40,23 @@ import { useZodForm } from "@/lib/forms/useZodForm";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const allowedIPSchema = z.object({
-  ip: z.string().min(1, "Please enter an IP address"),
+  ip: z.string().min(1, { error: () => i18n.t("adminPanel.page.addIp.required") }),
 });
 
 type AllowedIPFormValues = z.infer<typeof allowedIPSchema>;
 
 const AddAllowedIPForm = ({ onSubmit }: { onSubmit: (values: AllowedIPFormValues) => Promise<void> }) => {
+  const { t } = useTranslation();
   const form = useZodForm(allowedIPSchema, { defaultValues: { ip: "" } });
 
   return (
     <form onSubmit={form.handleSubmit(onSubmit)}>
       <FieldGroup>
         <FormField control={form.control} name="ip">
-          {({ ref, ...field }) => <Input ref={ref} placeholder="Enter IP address" {...field} />}
+          {({ ref, ...field }) => <Input ref={ref} placeholder={t("adminPanel.page.addIp.placeholder")} {...field} />}
         </FormField>
         <div>
-          <Button type="submit">Add IP Address</Button>
+          <Button type="submit">{t("adminPanel.page.addIp.submit")}</Button>
         </div>
       </FieldGroup>
     </form>
@@ -65,6 +68,7 @@ interface AdminPanelProps {
 }
 
 const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
+  const { t } = useTranslation();
   const { premiumUser, accessToken, userId: userID } = useAuthorized();
   const form = useSSOSettingsForm("admin-panel");
   const [isAddSSOModalVisible, setIsAddSSOModalVisible] = useState(false);
@@ -107,7 +111,7 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
   const handleShowAllowedIPs = async () => {
     try {
       if (premiumUser !== true) {
-        toast.fromError("This feature is only available for premium users. Please upgrade your account.");
+        toast.fromError(t("adminPanel.page.toasts.premiumRequired"));
         return;
       }
       if (accessToken) {
@@ -118,7 +122,7 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
       }
     } catch (error) {
       console.error("Error fetching allowed IPs:", error);
-      toast.fromError(`Failed to fetch allowed IPs ${error}`);
+      toast.fromError(t("adminPanel.page.toasts.fetchIpsFailed", { error: String(error) }));
       setAllowedIPs([all_ip_address_allowed]);
     } finally {
       if (premiumUser === true) {
@@ -134,11 +138,11 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
         // Fetch the updated list of IPs
         const updatedIPs = await getAllowedIPs(accessToken);
         setAllowedIPs(updatedIPs);
-        toast.success("IP address added successfully");
+        toast.success(t("adminPanel.page.toasts.addIpSuccess"));
       }
     } catch (error) {
       console.error("Error adding IP:", error);
-      toast.fromError(`Failed to add IP address ${error}`);
+      toast.fromError(t("adminPanel.page.toasts.addIpFailed", { error: String(error) }));
     } finally {
       setIsAddIPModalVisible(false);
     }
@@ -156,10 +160,10 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
         // Fetch the updated list of IPs
         const updatedIPs = await getAllowedIPs(accessToken);
         setAllowedIPs(updatedIPs.length > 0 ? updatedIPs : [all_ip_address_allowed]);
-        toast.success("IP address deleted successfully");
+        toast.success(t("adminPanel.page.toasts.deleteIpSuccess"));
       } catch (error) {
         console.error("Error deleting IP:", error);
-        toast.fromError(`Failed to delete IP address ${error}`);
+        toast.fromError(t("adminPanel.page.toasts.deleteIpFailed", { error: String(error) }));
       } finally {
         setIsDeleteIPModalVisible(false);
         setIPToDelete(null);
@@ -214,23 +218,20 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
   const tabItems = [
     {
       key: "sso-settings",
-      label: "SSO Settings",
+      label: t("adminPanel.page.tabs.ssoSettings"),
       children: <SSOSettings />,
     },
     {
       key: "security-settings",
-      label: "Security Settings",
+      label: t("adminPanel.page.tabs.securitySettings"),
       children: (
         <>
           <Card className="block p-6">
-            <h3 className="mb-2 text-base font-semibold text-foreground">✨ Security Settings</h3>
+            <h3 className="mb-2 text-base font-semibold text-foreground">{t("adminPanel.page.security.title")}</h3>
             <Alert variant="warning">
               <TriangleAlert />
-              <AlertTitle>SSO Configuration Deprecated</AlertTitle>
-              <AlertDescription>
-                Editing SSO Settings on this page is deprecated and will be removed in a future version. Please use the
-                SSO Settings tab for SSO configuration.
-              </AlertDescription>
+              <AlertTitle>{t("adminPanel.page.security.deprecatedTitle")}</AlertTitle>
+              <AlertDescription>{t("adminPanel.page.security.deprecatedDescription")}</AlertDescription>
             </Alert>
             <div
               style={{
@@ -243,12 +244,12 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
             >
               <div>
                 <Button style={{ width: "150px" }} onClick={() => setIsAddSSOModalVisible(true)}>
-                  {ssoConfigured ? "Edit SSO Settings" : "Add SSO"}
+                  {ssoConfigured ? t("adminPanel.page.security.editSso") : t("adminPanel.page.security.addSso")}
                 </Button>
               </div>
               <div>
                 <Button style={{ width: "150px" }} onClick={handleShowAllowedIPs}>
-                  Allowed IPs
+                  {t("adminPanel.page.security.allowedIps")}
                 </Button>
               </div>
               <div>
@@ -257,10 +258,10 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
                   onClick={() =>
                     premiumUser === true
                       ? setIsUIAccessControlModalVisible(true)
-                      : toast.fromError("Only premium users can configure UI access control")
+                      : toast.fromError(t("adminPanel.page.toasts.uiAccessControlPremiumRequired"))
                   }
                 >
-                  UI Access Control
+                  {t("adminPanel.page.security.uiAccessControl")}
                 </Button>
               </div>
             </div>
@@ -282,23 +283,25 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
             <Dialog open={isAllowedIPModalVisible} onOpenChange={(open) => !open && setIsAllowedIPModalVisible(false)}>
               <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
                 <DialogHeader>
-                  <DialogTitle>Manage Allowed IP Addresses</DialogTitle>
+                  <DialogTitle>{t("adminPanel.page.allowedIps.title")}</DialogTitle>
                 </DialogHeader>
                 <Table>
                   <TableHeader>
                     <TableRow>
-                      <TableHead>IP Address</TableHead>
-                      <TableHead className="text-right">Action</TableHead>
+                      <TableHead>{t("adminPanel.page.allowedIps.columns.ipAddress")}</TableHead>
+                      <TableHead className="text-right">{t("adminPanel.page.allowedIps.columns.action")}</TableHead>
                     </TableRow>
                   </TableHeader>
                   <TableBody>
                     {allowedIPs.map((ip, index) => (
                       <TableRow key={index}>
-                        <TableCell>{ip}</TableCell>
+                        <TableCell>
+                          {ip === all_ip_address_allowed ? t("adminPanel.page.allowedIps.allAllowed") : ip}
+                        </TableCell>
                         <TableCell className="text-right">
                           {ip !== all_ip_address_allowed && (
                             <Button onClick={() => handleDeleteIP(ip)} variant="destructive" size="sm">
-                              Delete
+                              {t("adminPanel.page.allowedIps.delete")}
                             </Button>
                           )}
                         </TableCell>
@@ -308,9 +311,11 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
                 </Table>
                 <DialogFooter>
                   <Button className="mx-1" onClick={() => setIsAddIPModalVisible(true)}>
-                    Add IP Address
+                    {t("adminPanel.page.allowedIps.addIp")}
+                  </Button>
+                  <Button onClick={() => setIsAllowedIPModalVisible(false)}>
+                    {t("adminPanel.page.allowedIps.close")}
                   </Button>
-                  <Button onClick={() => setIsAllowedIPModalVisible(false)}>Close</Button>
                 </DialogFooter>
               </DialogContent>
             </Dialog>
@@ -318,7 +323,7 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
             <Dialog open={isAddIPModalVisible} onOpenChange={(open) => !open && setIsAddIPModalVisible(false)}>
               <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
                 <DialogHeader>
-                  <DialogTitle>Add Allowed IP Address</DialogTitle>
+                  <DialogTitle>{t("adminPanel.page.addIp.title")}</DialogTitle>
                 </DialogHeader>
                 <AddAllowedIPForm onSubmit={handleAddIP} />
               </DialogContent>
@@ -327,16 +332,18 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
             <Dialog open={isDeleteIPModalVisible} onOpenChange={(open) => !open && setIsDeleteIPModalVisible(false)}>
               <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
                 <DialogHeader>
-                  <DialogTitle>Confirm Delete</DialogTitle>
+                  <DialogTitle>{t("adminPanel.page.deleteIp.title")}</DialogTitle>
                 </DialogHeader>
                 <span className="text-sm text-foreground">
-                  Are you sure you want to delete the IP address: {ipToDelete}?
+                  <Trans i18nKey="adminPanel.page.deleteIp.message" components={{ ip: <>{ipToDelete}</> }} />
                 </span>
                 <DialogFooter>
                   <Button className="mx-1" onClick={() => confirmDeleteIP()}>
-                    Yes
+                    {t("adminPanel.page.deleteIp.confirm")}
+                  </Button>
+                  <Button onClick={() => setIsDeleteIPModalVisible(false)}>
+                    {t("adminPanel.page.deleteIp.close")}
                   </Button>
-                  <Button onClick={() => setIsDeleteIPModalVisible(false)}>Close</Button>
                 </DialogFooter>
               </DialogContent>
             </Dialog>
@@ -348,13 +355,13 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
             >
               <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
                 <DialogHeader>
-                  <DialogTitle>UI Access Control Settings</DialogTitle>
+                  <DialogTitle>{t("adminPanel.page.uiAccessControlModal.title")}</DialogTitle>
                 </DialogHeader>
                 <UIAccessControlForm
                   accessToken={accessToken}
                   onSuccess={() => {
                     handleUIAccessControlOk();
-                    toast.success("UI Access Control settings updated successfully");
+                    toast.success(t("adminPanel.page.toasts.uiAccessControlUpdated"));
                   }}
                 />
               </DialogContent>
@@ -362,12 +369,18 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
           </div>
           <Alert variant="info">
             <Info />
-            <AlertTitle>Login without SSO</AlertTitle>
+            <AlertTitle>{t("adminPanel.page.security.loginWithoutSsoTitle")}</AlertTitle>
             <AlertDescription>
-              If you need to login without sso, you can access{" "}
-              <a href={nonSssoUrl} target="_blank" rel="noopener noreferrer">
-                <b>{nonSssoUrl}</b>{" "}
-              </a>
+              <Trans
+                i18nKey="adminPanel.page.security.loginWithoutSso"
+                components={{
+                  url: (
+                    <a href={nonSssoUrl} target="_blank" rel="noopener noreferrer">
+                      <b>{nonSssoUrl}</b>{" "}
+                    </a>
+                  ),
+                }}
+              />
             </AlertDescription>
           </Alert>
         </>
@@ -380,7 +393,7 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
     },
     {
       key: "ui-settings",
-      label: "UI Settings",
+      label: t("adminPanel.page.tabs.uiSettings"),
       children: (
         <div className="flex flex-col gap-4">
           <UISettings />
@@ -391,7 +404,7 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
     },
     {
       key: "logging-settings",
-      label: "Logging Settings",
+      label: t("adminPanel.page.tabs.loggingSettings"),
       children: <LoggingSettings />,
     },
     {
@@ -406,20 +419,20 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
     },
     {
       key: "plugins",
-      label: "Plugins",
+      label: t("adminPanel.page.tabs.plugins"),
       children: <PluginSettings />,
     },
     {
       key: "web-search-interception",
-      label: "Web Search Interception",
+      label: t("adminPanel.page.tabs.webSearchInterception"),
       children: <WebSearchInterceptionSettings />,
     },
   ];
 
   return (
     <div className="w-full m-2 mt-2 p-8">
-      <h2 className="mb-2 text-base font-semibold text-foreground">Admin Access</h2>
-      <p className="mb-4 text-sm text-foreground">Go to &apos;Internal Users&apos; page to add other admins.</p>
+      <h2 className="mb-2 text-base font-semibold text-foreground">{t("adminPanel.page.title")}</h2>
+      <p className="mb-4 text-sm text-foreground">{t("adminPanel.page.subtitle")}</p>
       <Tabs defaultValue={tabItems[0].key}>
         <TabsList variant="line" className="mb-4 h-auto flex-wrap">
           {tabItems.map((item) => (
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentFormKit.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentFormKit.tsx
index 3d863036234..70c7d2fdb92 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentFormKit.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentFormKit.tsx
@@ -27,6 +27,7 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/component
 import { Input } from "@/components/ui/input";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
+import i18n from "@/i18n/i18n";
 import type { KeyValueFormValue, KillSwitchConfig, KillSwitchFormValue } from "./kill_switch_config";
 
 export interface AgentSkillFormValue {
@@ -282,7 +283,7 @@ export const AgentTagsInput = ({
   value,
   onValueChange,
   placeholder,
-  emptyText = "No matching options",
+  emptyText = i18n.t("agents.formKit.noMatchingOptions"),
   ...props
 }: AgentTagsInputProps) => {
   const anchor = useComboboxAnchor();
@@ -396,7 +397,7 @@ export const AgentMultiSelect = ({
   value,
   onValueChange,
   placeholder,
-  emptyText = "No matching options",
+  emptyText = i18n.t("agents.formKit.noMatchingOptions"),
   ...props
 }: AgentMultiSelectProps) => {
   const anchor = useComboboxAnchor();
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityDetails.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityDetails.tsx
index 12465c6e861..e891195d137 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityDetails.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityDetails.tsx
@@ -1,14 +1,17 @@
 import React from "react";
+import type { TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
 import type { components } from "@/lib/http/schema";
 import { useQuery } from "@tanstack/react-query";
 import { apiClient } from "@/components/networking";
 import { Button } from "@/components/ui/button";
 import { readAgentIdentity } from "./agent_identity";
 
-const authenticationMessage = (error: boolean, lastAuthenticated?: string | null): string => {
-  if (error) return "Could not load authentication evidence";
-  if (lastAuthenticated) return `Last authenticated identity match: ${new Date(lastAuthenticated).toLocaleString()}`;
-  return "Configured, awaiting an authenticated request";
+const authenticationMessage = (t: TFunction, error: boolean, lastAuthenticated?: string | null): string => {
+  if (error) return t("agents.identityDetails.evidence.loadFailed");
+  if (lastAuthenticated)
+    return t("agents.identityDetails.evidence.lastMatch", { date: new Date(lastAuthenticated).toLocaleString() });
+  return t("agents.identityDetails.evidence.awaiting");
 };
 
 export const AgentIdentityDetails = ({
@@ -22,6 +25,7 @@ export const AgentIdentityDetails = ({
   accessToken: string | null;
   isAdmin: boolean;
 }) => {
+  const { t } = useTranslation();
   const identity = readAgentIdentity(value);
   const { data, isError, isFetching, refetch } = useQuery({
     queryKey: ["agent-identity", agentId, identity],
@@ -36,31 +40,39 @@ export const AgentIdentityDetails = ({
   });
 
   if (!identity || !isAdmin) return null;
-  const executionLabel = data?.enabled ? "Enabled" : "Disabled";
+  const executionLabel = data?.enabled
+    ? t("agents.identityDetails.execution.enabled")
+    : t("agents.identityDetails.execution.disabled");
   return (
-    <section aria-label="Agent Identity" className="mb-6 space-y-2 rounded-lg border border-border p-4">
-      <h3 className="font-medium">Agent Identity: Microsoft Entra ID</h3>
+    <section
+      aria-label={t("agents.identityDetails.regionLabel")}
+      className="mb-6 space-y-2 rounded-lg border border-border p-4"
+    >
+      <h3 className="font-medium">{t("agents.identityDetails.title")}</h3>
       <p className="text-sm">
-        Tenant: <span className="font-mono">{identity.tenant_id}</span>
+        {t("agents.identityDetails.tenant")} <span className="font-mono">{identity.tenant_id}</span>
       </p>
       <>
         <p className="text-sm">
-          Application (Client) ID: <span className="font-mono">{identity.client_id}</span>
+          {t("agents.identityDetails.clientId")} <span className="font-mono">{identity.client_id}</span>
+        </p>
+        <p className="text-sm">
+          {t("agents.identityDetails.servicePrincipal")}{" "}
+          {identity.service_principal_id || t("agents.identityDetails.notConfigured")}
         </p>
-        <p className="text-sm">Enterprise application Object ID: {identity.service_principal_id || "Not configured"}</p>
       </>
       <p className="text-sm">
-        Execution: {data ? executionLabel : "Loading"} · Mode: {data?.execution_mode ?? "Loading"}
+        {t("agents.identityDetails.executionSummary", {
+          execution: data ? executionLabel : t("agents.identityDetails.loading"),
+          mode: data?.execution_mode ?? t("agents.identityDetails.loading"),
+        })}
       </p>
       <p className="text-sm">
         {data?.identity?.active === false
-          ? "Identity unbound; execution is disabled"
-          : authenticationMessage(isError, data?.last_authenticated_at)}
-      </p>
-      <p className="text-xs text-muted-foreground">
-        Recent evidence comes from a validated Entra token matching this binding. It is persisted across restarts and
-        cleared when the binding changes. Tool and model permissions are checked separately.
+          ? t("agents.identityDetails.evidence.unbound")
+          : authenticationMessage(t, isError, data?.last_authenticated_at)}
       </p>
+      <p className="text-xs text-muted-foreground">{t("agents.identityDetails.evidenceNote")}</p>
       <div className="flex items-center gap-4">
         <Button
           variant="outline"
@@ -70,10 +82,10 @@ export const AgentIdentityDetails = ({
             void refetch();
           }}
         >
-          Refresh authentication evidence
+          {t("agents.identityDetails.refresh")}
         </Button>
         <a className="text-sm underline" href="/ui/logs/">
-          View request logs
+          {t("agents.identityDetails.viewLogs")}
         </a>
       </div>
     </section>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityFields.tsx
index 50c60776ff3..d4af3ff3833 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentIdentityFields.tsx
@@ -1,26 +1,30 @@
 import React, { useEffect, useState } from "react";
 import { useWatch } from "react-hook-form";
+import type { ParseKeys } from "i18next";
+import { Trans, useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 import { apiClient } from "@/components/networking";
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { AgentFormField, type AgentFormValues } from "./AgentFormKit";
 import { entraTenantFromIssuer, IDENTITY_UUID_PATTERN } from "./agent_identity";
 
-const PROVIDER_OPTIONS = [
-  { value: "none", label: "No explicit identity binding" },
-  { value: "microsoft_entra", label: "Microsoft Entra ID" },
+const PROVIDER_OPTIONS: { value: string; labelKey: ParseKeys }[] = [
+  { value: "none", labelKey: "agents.identityFields.providers.none" },
+  { value: "microsoft_entra", labelKey: "agents.identityFields.providers.microsoftEntra" },
 ];
-const EXECUTION_MODE_OPTIONS = [
-  { value: "autonomous", label: "Autonomous" },
-  { value: "delegated", label: "On behalf of a user" },
-  { value: "both", label: "Both" },
+const EXECUTION_MODE_OPTIONS: { value: string; labelKey: ParseKeys }[] = [
+  { value: "autonomous", labelKey: "agents.identityFields.executionModes.autonomous" },
+  { value: "delegated", labelKey: "agents.identityFields.executionModes.delegated" },
+  { value: "both", labelKey: "agents.identityFields.executionModes.both" },
 ];
-const EXECUTION_OPTIONS = [
-  { value: "enabled", label: "Enabled" },
-  { value: "disabled", label: "Disabled" },
+const EXECUTION_OPTIONS: { value: string; labelKey: ParseKeys }[] = [
+  { value: "enabled", labelKey: "agents.identityFields.execution.enabled" },
+  { value: "disabled", labelKey: "agents.identityFields.execution.disabled" },
 ];
 
 export const AgentIdentityFields = ({ accessToken }: { accessToken: string | null }) => {
+  const { t } = useTranslation();
   const provider = useWatch<AgentFormValues>({ name: "identity_provider" });
   const mode = useWatch<AgentFormValues>({ name: "execution_mode" });
   const showScopes = mode !== "autonomous" && mode !== undefined;
@@ -44,7 +48,7 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
         }
       })
       .catch(() => {
-        if (active) setError("Could not load the gateway's trusted identity providers");
+        if (active) setError(i18n.t("agents.identityFields.errors.providersLoadFailed"));
       });
     return () => {
       active = false;
@@ -53,18 +57,18 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
 
   return (
     <>
-      <section aria-label="Agent Identity" className="my-6 space-y-4 rounded-lg border border-border p-4">
+      <section
+        aria-label={t("agents.identityFields.regionLabel")}
+        className="my-6 space-y-4 rounded-lg border border-border p-4"
+      >
         <div>
-          <h3 className="font-medium">Agent Identity</h3>
-          <p className="mt-1 text-sm text-muted-foreground">
-            Connect an existing identity provider application to this agent. Its name and runtime address can change
-            independently.
-          </p>
+          <h3 className="font-medium">{t("agents.identityFields.title")}</h3>
+          <p className="mt-1 text-sm text-muted-foreground">{t("agents.identityFields.description")}</p>
         </div>
-        <AgentFormField name="identity_provider" label="Identity Provider" defaultValue="none">
+        <AgentFormField name="identity_provider" label={t("agents.identityFields.provider")} defaultValue="none">
           {({ value, onChange, id }) => (
             <Select
-              items={PROVIDER_OPTIONS}
+              items={PROVIDER_OPTIONS.map((option) => ({ value: option.value, label: t(option.labelKey) }))}
               value={typeof value === "string" ? value : "none"}
               onValueChange={onChange}
             >
@@ -74,7 +78,7 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
               <SelectContent>
                 {PROVIDER_OPTIONS.map((option) => (
                   <SelectItem key={option.value} value={option.value}>
-                    {option.label}
+                    {t(option.labelKey)}
                   </SelectItem>
                 ))}
               </SelectContent>
@@ -85,13 +89,13 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
           <>
             <AgentFormField
               name="identity_tenant_id"
-              label="Trusted Entra Tenant"
-              rules={{ required: "Select a trusted tenant" }}
+              label={t("agents.identityFields.tenant.label")}
+              rules={{ required: t("agents.identityFields.tenant.required") }}
             >
               {({ value, onChange, id }) => (
                 <Select value={typeof value === "string" ? value : ""} onValueChange={onChange}>
                   <SelectTrigger id={id}>
-                    <SelectValue placeholder="Select the gateway's trusted tenant" />
+                    <SelectValue placeholder={t("agents.identityFields.tenant.placeholder")} />
                   </SelectTrigger>
                   <SelectContent>
                     {tenants.map((tenant) => (
@@ -109,26 +113,24 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
               </p>
             )}
             {!error && tenants.length === 0 && (
-              <p className="text-sm text-muted-foreground">
-                No trusted Entra tenant is available. Configure JWT issuer and audience validation on the gateway first.
-                Dashboard Microsoft SSO is configured separately.
-              </p>
+              <p className="text-sm text-muted-foreground">{t("agents.identityFields.tenant.noneAvailable")}</p>
             )}
             <AgentFormField
               name="identity_client_id"
-              label="Application (Client) ID"
+              label={t("agents.identityFields.clientId.label")}
               rules={{
-                required: "Enter the Entra application client ID",
-                pattern: { value: IDENTITY_UUID_PATTERN, message: "Enter a valid application client UUID" },
+                required: t("agents.identityFields.clientId.required"),
+                pattern: { value: IDENTITY_UUID_PATTERN, message: t("agents.identityFields.clientId.invalid") },
               }}
               description={
-                <>
-                  Find this under{" "}
-                  <a className="underline" href="https://entra.microsoft.com/" target="_blank" rel="noreferrer">
-                    Entra App registrations
-                  </a>
-                  , select your agent application, then Overview. No client secret is required here.
-                </>
+                <Trans
+                  i18nKey="agents.identityFields.clientId.description"
+                  components={{
+                    registrations: (
+                      <a className="underline" href="https://entra.microsoft.com/" target="_blank" rel="noreferrer" />
+                    ),
+                  }}
+                />
               }
             >
               {({ value, onChange, ref, ...control }) => (
@@ -141,10 +143,14 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
                 />
               )}
             </AgentFormField>
-            <AgentFormField name="execution_mode" label="Execution Mode" defaultValue="autonomous">
+            <AgentFormField
+              name="execution_mode"
+              label={t("agents.identityFields.executionMode")}
+              defaultValue="autonomous"
+            >
               {({ value, onChange, id }) => (
                 <Select
-                  items={EXECUTION_MODE_OPTIONS}
+                  items={EXECUTION_MODE_OPTIONS.map((option) => ({ value: option.value, label: t(option.labelKey) }))}
                   value={typeof value === "string" ? value : "autonomous"}
                   onValueChange={onChange}
                 >
@@ -154,7 +160,7 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
                   <SelectContent>
                     {EXECUTION_MODE_OPTIONS.map((option) => (
                       <SelectItem key={option.value} value={option.value}>
-                        {option.label}
+                        {t(option.labelKey)}
                       </SelectItem>
                     ))}
                   </SelectContent>
@@ -163,25 +169,25 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
             </AgentFormField>
             <AgentFormField
               name="identity_service_principal_id"
-              label="Enterprise Application Object ID"
+              label={t("agents.identityFields.servicePrincipal.label")}
               rules={{
-                required: mode !== "delegated" ? "Enter the service principal Object ID" : false,
-                pattern: { value: IDENTITY_UUID_PATTERN, message: "Enter a valid service principal UUID" },
+                required: mode !== "delegated" ? t("agents.identityFields.servicePrincipal.required") : false,
+                pattern: { value: IDENTITY_UUID_PATTERN, message: t("agents.identityFields.servicePrincipal.invalid") },
               }}
               description={
-                <>
-                  Open{" "}
-                  <a
-                    className="underline"
-                    href="https://entra.microsoft.com/#view/Microsoft_AAD_IAM/StartboardApplicationsMenuBlade/~/AppAppsPreview"
-                    target="_blank"
-                    rel="noreferrer"
-                  >
-                    Entra Enterprise applications
-                  </a>
-                  , select this application, and copy its Object ID. The App registrations Object ID is a different
-                  value.
-                </>
+                <Trans
+                  i18nKey="agents.identityFields.servicePrincipal.description"
+                  components={{
+                    enterprise: (
+                      <a
+                        className="underline"
+                        href="https://entra.microsoft.com/#view/Microsoft_AAD_IAM/StartboardApplicationsMenuBlade/~/AppAppsPreview"
+                        target="_blank"
+                        rel="noreferrer"
+                      />
+                    ),
+                  }}
+                />
               }
             >
               {({ value, onChange, ref, ...control }) => (
@@ -191,8 +197,8 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
 
             <AgentFormField
               name="identity_required_roles"
-              label="Required Application Roles"
-              description="Comma-separated role values required on autonomous application tokens"
+              label={t("agents.identityFields.requiredRoles.label")}
+              description={t("agents.identityFields.requiredRoles.description")}
             >
               {({ value, onChange, ref, ...control }) => (
                 <Input
@@ -209,9 +215,9 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
               <>
                 <AgentFormField
                   name="identity_required_scopes"
-                  label="Required Delegated Scopes"
+                  label={t("agents.identityFields.requiredScopes.label")}
                   defaultValue="user_impersonation"
-                  rules={{ required: "Enter a delegated scope" }}
+                  rules={{ required: t("agents.identityFields.requiredScopes.required") }}
                 >
                   {({ value, onChange, ref, ...control }) => (
                     <Input
@@ -222,16 +228,13 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
                     />
                   )}
                 </AgentFormField>
-                <p className="text-sm text-muted-foreground">
-                  Users must first sign in through this gateway&apos;s Microsoft SSO. Subsequent delegated calls must
-                  satisfy both user and agent permissions.
-                </p>
+                <p className="text-sm text-muted-foreground">{t("agents.identityFields.requiredScopes.note")}</p>
               </>
             )}
-            <AgentFormField name="enabled" label="Execution" defaultValue={true}>
+            <AgentFormField name="enabled" label={t("agents.identityFields.executionLabel")} defaultValue={true}>
               {({ value, onChange, id }) => (
                 <Select
-                  items={EXECUTION_OPTIONS}
+                  items={EXECUTION_OPTIONS.map((option) => ({ value: option.value, label: t(option.labelKey) }))}
                   value={value === false ? "disabled" : "enabled"}
                   onValueChange={(next) => onChange(next === "enabled")}
                 >
@@ -241,18 +244,14 @@ export const AgentIdentityFields = ({ accessToken }: { accessToken: string | nul
                   <SelectContent>
                     {EXECUTION_OPTIONS.map((option) => (
                       <SelectItem key={option.value} value={option.value}>
-                        {option.label}
+                        {t(option.labelKey)}
                       </SelectItem>
                     ))}
                   </SelectContent>
                 </Select>
               )}
             </AgentFormField>
-            <p className="text-sm text-muted-foreground">
-              LiteLLM verifies the agent&apos;s Entra token before matching this identity. Saving these fields
-              configures the binding; an authenticated request provides verification. Runtime authentication headers are
-              configured separately.
-            </p>
+            <p className="text-sm text-muted-foreground">{t("agents.identityFields.verificationNote")}</p>
           </>
         )}
       </section>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentKillSwitchDangerZone.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentKillSwitchDangerZone.tsx
index 8d68a8f921b..e733a564576 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentKillSwitchDangerZone.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentKillSwitchDangerZone.tsx
@@ -1,5 +1,6 @@
 import { CircleAlert } from "lucide-react";
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
@@ -24,6 +25,7 @@ const AgentKillSwitchDangerZone: React.FC<AgentKillSwitchDangerZoneProps> = ({
   accessToken,
   isAdmin,
 }) => {
+  const { t } = useTranslation();
   const [isConfirmOpen, setIsConfirmOpen] = useState(false);
   const [confirmationInput, setConfirmationInput] = useState("");
   const [isFiring, setIsFiring] = useState(false);
@@ -44,9 +46,9 @@ const AgentKillSwitchDangerZone: React.FC<AgentKillSwitchDangerZoneProps> = ({
       const result = await triggerAgentKillSwitchCall(accessToken, agentId);
       setLastResult(result);
       setIsConfirmOpen(false);
-      toast.success(`Kill switch fired (HTTP ${result.status_code})`);
+      toast.success(t("agents.dangerZone.toasts.fired", { status: result.status_code }));
     } catch (error) {
-      toast.error(error instanceof Error ? error.message : "Failed to fire kill switch");
+      toast.error(error instanceof Error ? error.message : t("agents.dangerZone.toasts.fireFailed"));
     } finally {
       setIsFiring(false);
     }
@@ -55,38 +57,33 @@ const AgentKillSwitchDangerZone: React.FC<AgentKillSwitchDangerZoneProps> = ({
   return (
     <section aria-labelledby="agent-danger-zone-heading" className="mt-6">
       <h3 id="agent-danger-zone-heading" className="text-lg font-medium text-destructive">
-        Danger Zone
+        {t("agents.dangerZone.title")}
       </h3>
       <div className="mt-4 rounded-lg border border-destructive/40 bg-destructive/5 p-4">
         <div className="flex flex-wrap items-start justify-between gap-4">
           <div className="min-w-0 space-y-1 text-sm">
-            <p className="font-medium text-foreground">Kill switch</p>
+            <p className="font-medium text-foreground">{t("agents.dangerZone.killSwitch")}</p>
             {killSwitch ? (
               <>
-                <p className="text-muted-foreground">
-                  Calls the configured webhook to stop this agent&apos;s upstream runtime. This can cause an outage for
-                  everyone using the agent and cannot be undone from LiteLLM
-                </p>
+                <p className="text-muted-foreground">{t("agents.dangerZone.configuredDescription")}</p>
                 <p className="font-mono break-all text-foreground">
                   {killSwitch.method ?? "POST"} {killSwitch.url}
                 </p>
               </>
             ) : (
-              <p className="text-muted-foreground">
-                Not configured. Add a kill switch webhook under Settings to enable this action
-              </p>
+              <p className="text-muted-foreground">{t("agents.dangerZone.notConfigured")}</p>
             )}
           </div>
           {killSwitch && (
             <Button type="button" variant="destructive" onClick={openConfirm} disabled={isFiring} aria-busy={isFiring}>
               {isFiring && <UiLoadingSpinner className="size-4" />}
-              Fire Kill Switch
+              {t("agents.dangerZone.fire")}
             </Button>
           )}
         </div>
         {lastResult && (
           <p className="mt-3 text-sm text-muted-foreground" role="status">
-            Last result: HTTP {lastResult.status_code}
+            {t("agents.dangerZone.lastResult", { status: lastResult.status_code })}
             {lastResult.response_body ? ` ${lastResult.response_body}` : ""}
           </p>
         )}
@@ -95,27 +92,32 @@ const AgentKillSwitchDangerZone: React.FC<AgentKillSwitchDangerZoneProps> = ({
       <Dialog open={isConfirmOpen} onOpenChange={(open) => !open && !isFiring && setIsConfirmOpen(false)}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
           <DialogHeader>
-            <DialogTitle>Fire kill switch for {agentName}?</DialogTitle>
+            <DialogTitle>{t("agents.dangerZone.confirm.title", { name: agentName })}</DialogTitle>
           </DialogHeader>
           <div className="space-y-4">
             <Alert variant="error">
               <CircleAlert />
-              <AlertTitle>This can cause an outage</AlertTitle>
+              <AlertTitle>{t("agents.dangerZone.confirm.outageTitle")}</AlertTitle>
               <AlertDescription>
-                LiteLLM will call {killSwitch?.method ?? "POST"} {killSwitch?.url} immediately. Whatever that webhook
-                does to the agent is outside LiteLLM&apos;s control and cannot be reverted here
+                {t("agents.dangerZone.confirm.outageDescription", {
+                  method: killSwitch?.method ?? "POST",
+                  url: killSwitch?.url,
+                })}
               </AlertDescription>
             </Alert>
             <div>
               <p className="mb-2 text-base font-medium text-foreground">
-                Type <span className="font-semibold text-destructive">{agentName}</span> to confirm:
+                <Trans
+                  i18nKey="agents.dangerZone.confirm.typeToConfirm"
+                  components={{ name: <span className="font-semibold text-destructive">{agentName}</span> }}
+                />
               </p>
               <InputGroup className="rounded-md">
                 <InputGroupAddon>
                   <CircleAlert className="size-3.5 text-destructive" />
                 </InputGroupAddon>
                 <InputGroupInput
-                  aria-label="Confirm agent name"
+                  aria-label={t("agents.dangerZone.confirm.inputLabel")}
                   value={confirmationInput}
                   onChange={(e) => setConfirmationInput(e.target.value)}
                   placeholder={agentName}
@@ -126,7 +128,7 @@ const AgentKillSwitchDangerZone: React.FC<AgentKillSwitchDangerZoneProps> = ({
           </div>
           <DialogFooter>
             <Button variant="outline" onClick={() => setIsConfirmOpen(false)} disabled={isFiring}>
-              Cancel
+              {t("agents.dangerZone.confirm.cancel")}
             </Button>
             <Button
               variant="destructive"
@@ -135,7 +137,7 @@ const AgentKillSwitchDangerZone: React.FC<AgentKillSwitchDangerZoneProps> = ({
               aria-busy={isFiring}
             >
               {isFiring && <UiLoadingSpinner className="size-4" />}
-              {isFiring ? "Firing..." : "Fire Kill Switch"}
+              {isFiring ? t("agents.dangerZone.confirm.firing") : t("agents.dangerZone.fire")}
             </Button>
           </DialogFooter>
         </DialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsPanel.tsx
index 3f599c38976..308cefec844 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsPanel.tsx
@@ -1,6 +1,7 @@
 import { useTerminology } from "@/contexts/TerminologyContext";
 import React, { useState, useEffect } from "react";
 import { Info, Plus } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { getAgentsList, deleteAgentCall } from "@/components/networking";
 import AddAgentForm from "./add_agent_form";
 import { isAdminRole } from "@/utils/roles";
@@ -33,6 +34,7 @@ interface AgentsResponse {
 
 const AgentsPanel: React.FC<AgentsPanelProps> = ({ accessToken, userRole, teams }) => {
   const term = useTerminology();
+  const { t } = useTranslation();
   const [agentsList, setAgentsList] = useState<Agent[]>([]);
   const [isAddModalVisible, setIsAddModalVisible] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
@@ -122,11 +124,11 @@ const AgentsPanel: React.FC<AgentsPanelProps> = ({ accessToken, userRole, teams
     setIsDeleting(true);
     try {
       await deleteAgentCall(accessToken, agentToDelete.id);
-      toast.success(`Agent "${agentToDelete.name}" deleted successfully`);
+      toast.success(t("agents.panel.toasts.deleted", { name: agentToDelete.name }));
       await refetchAgents(healthCheckEnabled);
     } catch (error) {
       console.error("Error deleting agent:", error);
-      toast.fromError("Failed to delete agent");
+      toast.fromError(t("agents.panel.toasts.deleteFailed"));
     } finally {
       setIsDeleting(false);
       setAgentToDelete(null);
@@ -140,25 +142,18 @@ const AgentsPanel: React.FC<AgentsPanelProps> = ({ accessToken, userRole, teams
   return (
     <div className="w-full mx-auto flex-auto overflow-y-auto m-8 p-2">
       <div className="flex flex-col gap-2 mb-4">
-        <h1 className="text-2xl font-bold">Agents</h1>
-        <p className="text-sm text-muted-foreground">
-          {term(
-            "List of A2A-spec agents that are available to be used in your organization. Go to AI Hub, to make agents public.",
-          )}
-        </p>
+        <h1 className="text-2xl font-bold">{t("agents.panel.title")}</h1>
+        <p className="text-sm text-muted-foreground">{term(t("agents.panel.description"))}</p>
         <Alert className="mb-3">
           <Info />
-          <AlertTitle>How do agents authenticate?</AlertTitle>
-          <AlertDescription>
-            Agents can authenticate with a virtual key or a trusted identity provider using JWT. Configure an identity
-            binding when adding or editing an agent. JWT authentication does not require a virtual key.
-          </AlertDescription>
+          <AlertTitle>{t("agents.panel.authAlert.title")}</AlertTitle>
+          <AlertDescription>{t("agents.panel.authAlert.description")}</AlertDescription>
         </Alert>
         {isAdmin && (
           <div className="mt-2 flex items-center gap-4">
             <Button onClick={handleAddAgent} disabled={!accessToken}>
               <Plus />
-              Add New Agent
+              {t("agents.panel.addAgent")}
             </Button>
           </div>
         )}
@@ -201,15 +196,15 @@ const AgentsPanel: React.FC<AgentsPanelProps> = ({ accessToken, userRole, teams
         >
           <AlertDialogContent>
             <AlertDialogHeader>
-              <AlertDialogTitle>Delete Agent</AlertDialogTitle>
+              <AlertDialogTitle>{t("agents.panel.deleteDialog.title")}</AlertDialogTitle>
               <AlertDialogDescription>
-                Are you sure you want to delete agent: {agentToDelete.name}? This action cannot be undone.
+                {t("agents.panel.deleteDialog.description", { name: agentToDelete.name })}
               </AlertDialogDescription>
             </AlertDialogHeader>
             <AlertDialogFooter>
-              <AlertDialogCancel>Cancel</AlertDialogCancel>
+              <AlertDialogCancel>{t("agents.panel.deleteDialog.cancel")}</AlertDialogCancel>
               <Button variant="destructive" onClick={handleDeleteConfirm} disabled={isDeleting}>
-                Delete
+                {t("agents.panel.deleteDialog.confirm")}
               </Button>
             </AlertDialogFooter>
           </AlertDialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTable.tsx
index d737a9250eb..421207e72d0 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Bot, CircleCheck, Search as SearchIcon, X } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { Agent } from "@/components/agents/types";
 import { DataTable } from "@/components/shared/DataTable";
@@ -27,16 +28,17 @@ interface AgentsTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState({ isFiltered }: { isFiltered: boolean }) {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Bot className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">{isFiltered ? "No matching agents" : "No agents yet"}</div>
+      <div className="text-sm font-medium text-foreground">
+        {isFiltered ? t("agents.table.empty.filteredTitle") : t("agents.table.empty.title")}
+      </div>
       <div className="text-sm text-muted-foreground">
-        {isFiltered
-          ? "Adjust the search to see more agents."
-          : "Add an agent to make it available in your organization."}
+        {isFiltered ? t("agents.table.empty.filteredDescription") : t("agents.table.empty.description")}
       </div>
     </div>
   );
@@ -52,6 +54,7 @@ const AgentsTable: React.FC<AgentsTableProps> = ({
   onAgentClick,
   onDeleteClick,
 }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
   const [searchTerm, setSearchTerm] = useState("");
   const filteredAgents = useMemo(
@@ -79,7 +82,7 @@ const AgentsTable: React.FC<AgentsTableProps> = ({
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading agents…"
+      loadingMessage={t("agents.table.loading")}
       noDataMessage={<EmptyState isFiltered={agents.length > 0} />}
       size="compact"
       toolbar={() => (
@@ -89,13 +92,17 @@ const AgentsTable: React.FC<AgentsTableProps> = ({
               <SearchIcon className="size-4 text-muted-foreground" />
             </InputGroupAddon>
             <InputGroupInput
-              placeholder="Search agents by name, ID, or description..."
+              placeholder={t("agents.table.searchPlaceholder")}
               value={searchTerm}
               onChange={(e) => setSearchTerm(e.target.value)}
             />
             {searchTerm && (
               <InputGroupAddon align="inline-end">
-                <InputGroupButton size="icon-xs" aria-label="Clear search" onClick={() => setSearchTerm("")}>
+                <InputGroupButton
+                  size="icon-xs"
+                  aria-label={t("agents.table.clearSearch")}
+                  onClick={() => setSearchTerm("")}
+                >
                   <X />
                 </InputGroupButton>
               </InputGroupAddon>
@@ -109,7 +116,7 @@ const AgentsTable: React.FC<AgentsTableProps> = ({
                     <CircleCheck
                       className={healthCheckEnabled ? "size-4 text-success" : "size-4 text-muted-foreground"}
                     />
-                    <span className="text-sm text-muted-foreground">Health Check</span>
+                    <span className="text-sm text-muted-foreground">{t("agents.table.healthCheck.label")}</span>
                     <Switch
                       size="sm"
                       checked={healthCheckEnabled}
@@ -119,7 +126,7 @@ const AgentsTable: React.FC<AgentsTableProps> = ({
                   </div>
                 }
               />
-              <TooltipContent>When enabled, only agents with reachable URLs are shown</TooltipContent>
+              <TooltipContent>{t("agents.table.healthCheck.hint")}</TooltipContent>
             </Tooltip>
           </TooltipProvider>
         </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTableColumns.tsx
index 002219f5478..a0e8751e682 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/AgentsTableColumns.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import { useTranslation } from "react-i18next";
 import { MoreHorizontal, Trash2 } from "lucide-react";
 
 import { Agent } from "@/components/agents/types";
@@ -14,6 +15,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import i18n from "@/i18n/i18n";
 import { cn } from "@/lib/cva.config";
 
 interface AgentRowActionsProps {
@@ -22,10 +24,11 @@ interface AgentRowActionsProps {
 }
 
 function AgentRowActions({ agent, onDeleteClick }: AgentRowActionsProps) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open agent actions"
+        aria-label={t("agents.table.actions.open")}
         data-testid={`agent-actions-${agent.agent_id}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -38,7 +41,7 @@ function AgentRowActions({ agent, onDeleteClick }: AgentRowActionsProps) {
           onClick={() => onDeleteClick(agent.agent_id, agent.agent_name)}
         >
           <Trash2 />
-          Delete
+          {t("agents.table.actions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -59,8 +62,8 @@ export const getAgentsTableColumns = ({
   {
     id: "agent_name",
     accessorKey: "agent_name",
-    meta: { title: "Agent Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Agent Name" />,
+    meta: { title: i18n.t("agents.table.columns.name") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={i18n.t("agents.table.columns.name")} />,
     size: 200,
     enableSorting: true,
     cell: ({ row }) => {
@@ -75,8 +78,8 @@ export const getAgentsTableColumns = ({
   {
     id: "agent_id",
     accessorKey: "agent_id",
-    meta: { title: "Agent ID" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Agent ID" />,
+    meta: { title: i18n.t("agents.table.columns.id") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={i18n.t("agents.table.columns.id")} />,
     size: 200,
     enableSorting: true,
     cell: ({ row }) => (
@@ -90,22 +93,22 @@ export const getAgentsTableColumns = ({
   {
     id: "spend",
     accessorKey: "spend",
-    meta: { title: "Spend (USD)", numeric: true },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Spend (USD)" />,
+    meta: { title: i18n.t("agents.table.columns.spend"), numeric: true },
+    header: ({ column }) => <DataTableSortHeader column={column} title={i18n.t("agents.table.columns.spend")} />,
     size: 130,
     enableSorting: true,
     cell: ({ row }) => <MoneyCell value={row.original.spend} decimals={4} />,
   },
   {
     id: "model",
-    meta: { title: "Model" },
-    header: "Model",
+    meta: { title: i18n.t("agents.table.columns.model") },
+    header: i18n.t("agents.table.columns.model"),
     size: 170,
     enableSorting: false,
     cell: ({ row }) => {
       const model = row.original.litellm_params?.model;
       if (!model) {
-        return <span className="text-muted-foreground">N/A</span>;
+        return <span className="text-muted-foreground">{i18n.t("agents.table.noModel")}</span>;
       }
       return (
         <Badge variant="outline" className="max-w-40 font-normal">
@@ -122,25 +125,26 @@ export const getAgentsTableColumns = ({
       const timestamp = agent.created_at ? new Date(agent.created_at).getTime() : 0;
       return Number.isNaN(timestamp) ? 0 : timestamp;
     },
-    meta: { title: "Created" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created" />,
+    meta: { title: i18n.t("agents.table.columns.created") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={i18n.t("agents.table.columns.created")} />,
     size: 150,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} precision="date" />,
   },
   {
     id: "status",
-    meta: { title: "Status" },
-    header: "Status",
+    meta: { title: i18n.t("agents.table.columns.status") },
+    header: i18n.t("agents.table.columns.status"),
     size: 130,
     enableSorting: false,
     cell: ({ row }) => {
       const hasKeys = (row.original.keys?.length ?? 0) > 0;
-      if (row.original.jwt_auth_configured) return <StatusBadge tone="success" label="JWT configured" />;
+      if (row.original.jwt_auth_configured)
+        return <StatusBadge tone="success" label={i18n.t("agents.table.status.jwtConfigured")} />;
       return hasKeys ? (
-        <StatusBadge tone="success" label="Active" />
+        <StatusBadge tone="success" label={i18n.t("agents.table.status.active")} />
       ) : (
-        <StatusBadge tone="warning" label="Needs Setup" />
+        <StatusBadge tone="warning" label={i18n.t("agents.table.status.needsSetup")} />
       );
     },
   },
@@ -149,7 +153,7 @@ export const getAgentsTableColumns = ({
         {
           id: "actions",
           meta: { className: "text-right", headerClassName: "text-right" },
-          header: () => <span className="sr-only">Actions</span>,
+          header: () => <span className="sr-only">{i18n.t("agents.table.columns.actions")}</span>,
           size: 64,
           enableSorting: false,
           enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/KillSwitchFormFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/KillSwitchFormFields.tsx
index 578d80da6ed..2b9a0edb70d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/KillSwitchFormFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/KillSwitchFormFields.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { useFieldArray, useFormContext, useWatch } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { Plus, Trash2 } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -7,6 +8,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
 import { Textarea } from "@/components/ui/textarea";
 import { Field, FieldTitle } from "@/components/ui/field";
 import { PasswordInput } from "@/components/shared/PasswordInput";
+import i18n from "@/i18n/i18n";
 import { AgentFormField, AgentFormValues, labelWithHint } from "./AgentFormKit";
 import { KILL_SWITCH_AUTH_TYPES, KILL_SWITCH_METHODS, validateKillSwitchBody } from "./kill_switch_config";
 
@@ -21,6 +23,7 @@ const KeyValueFieldArray = ({
   keyPlaceholder: string;
   valuePlaceholder: string;
 }) => {
+  const { t } = useTranslation();
   const { control } = useFormContext<AgentFormValues>();
   const { fields, append, remove } = useFieldArray({ control, name });
 
@@ -28,7 +31,10 @@ const KeyValueFieldArray = ({
     <div className="flex flex-col gap-2">
       {fields.map((item, index) => (
         <div key={item.id} className="flex items-start gap-2">
-          <AgentFormField name={`${name}.${index}.key`} rules={{ required: "Name required" }}>
+          <AgentFormField
+            name={`${name}.${index}.key`}
+            rules={{ required: t("agents.killSwitchFields.errors.nameRequired") }}
+          >
             {({ value, onChange, ref, ...control }) => (
               <Input
                 {...control}
@@ -56,7 +62,7 @@ const KeyValueFieldArray = ({
             type="button"
             variant="ghost"
             size="icon"
-            aria-label={`Remove ${addLabel.replace(/^Add /, "").toLowerCase()}`}
+            aria-label={t("agents.killSwitchFields.removeItem", { item: addLabel.replace(/^Add /, "").toLowerCase() })}
             className="text-destructive hover:text-destructive/80"
             onClick={() => remove(index)}
           >
@@ -109,24 +115,50 @@ const TextField = ({
 );
 
 const KillSwitchAuthFields = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<AgentFormValues>();
   const authType = useWatch({ control, name: "kill_switch.auth_type" });
 
   switch (authType) {
     case "bearer":
-      return <TextField name="kill_switch.auth_token" label="Bearer token" required="Token required" secret />;
+      return (
+        <TextField
+          name="kill_switch.auth_token"
+          label={t("agents.killSwitchFields.auth.bearerToken")}
+          required={t("agents.killSwitchFields.errors.tokenRequired")}
+          secret
+        />
+      );
     case "api_key":
       return (
         <>
-          <TextField name="kill_switch.auth_header_name" label="Header name" placeholder="X-API-Key" />
-          <TextField name="kill_switch.auth_api_key" label="API key" required="API key required" secret />
+          <TextField
+            name="kill_switch.auth_header_name"
+            label={t("agents.killSwitchFields.auth.headerName")}
+            placeholder="X-API-Key"
+          />
+          <TextField
+            name="kill_switch.auth_api_key"
+            label={t("agents.killSwitchFields.auth.apiKey")}
+            required={t("agents.killSwitchFields.errors.apiKeyRequired")}
+            secret
+          />
         </>
       );
     case "basic":
       return (
         <>
-          <TextField name="kill_switch.auth_username" label="Username" required="Username required" />
-          <TextField name="kill_switch.auth_password" label="Password" required="Password required" secret />
+          <TextField
+            name="kill_switch.auth_username"
+            label={t("agents.killSwitchFields.auth.username")}
+            required={t("agents.killSwitchFields.errors.usernameRequired")}
+          />
+          <TextField
+            name="kill_switch.auth_password"
+            label={t("agents.killSwitchFields.auth.password")}
+            required={t("agents.killSwitchFields.errors.passwordRequired")}
+            secret
+          />
         </>
       );
     default:
@@ -139,13 +171,13 @@ const KillSwitchFormFields = () => (
     <TextField
       name="kill_switch.url"
       label={labelWithHint(
-        "Webhook URL",
-        "Absolute http(s) URL LiteLLM calls when the kill switch is triggered. Leave empty to remove the kill switch.",
+        i18n.t("agents.killSwitchFields.webhookUrl.label"),
+        i18n.t("agents.killSwitchFields.webhookUrl.hint"),
       )}
       placeholder="https://example.com/hooks/kill-agent"
     />
 
-    <AgentFormField name="kill_switch.method" label="Method">
+    <AgentFormField name="kill_switch.method" label={i18n.t("agents.killSwitchFields.method")}>
       {({ value, onChange, ref: _ref, ...control }) => (
         <Select value={typeof value === "string" ? value : "POST"} onValueChange={onChange}>
           <SelectTrigger {...control} className="w-full">
@@ -163,28 +195,28 @@ const KillSwitchFormFields = () => (
     </AgentFormField>
 
     <Field>
-      <FieldTitle>Headers</FieldTitle>
+      <FieldTitle>{i18n.t("agents.killSwitchFields.headers.title")}</FieldTitle>
       <KeyValueFieldArray
         name="kill_switch.headers"
-        addLabel="Add Header"
-        keyPlaceholder="Header name"
-        valuePlaceholder="Header value"
+        addLabel={i18n.t("agents.killSwitchFields.headers.add")}
+        keyPlaceholder={i18n.t("agents.killSwitchFields.headers.keyPlaceholder")}
+        valuePlaceholder={i18n.t("agents.killSwitchFields.headers.valuePlaceholder")}
       />
     </Field>
 
     <Field>
-      <FieldTitle>Query Parameters</FieldTitle>
+      <FieldTitle>{i18n.t("agents.killSwitchFields.queryParams.title")}</FieldTitle>
       <KeyValueFieldArray
         name="kill_switch.query_params"
-        addLabel="Add Query Parameter"
-        keyPlaceholder="Parameter name"
-        valuePlaceholder="Parameter value"
+        addLabel={i18n.t("agents.killSwitchFields.queryParams.add")}
+        keyPlaceholder={i18n.t("agents.killSwitchFields.queryParams.keyPlaceholder")}
+        valuePlaceholder={i18n.t("agents.killSwitchFields.queryParams.valuePlaceholder")}
       />
     </Field>
 
     <AgentFormField
       name="kill_switch.body"
-      label={labelWithHint("JSON Body", "Optional JSON object sent as the request body")}
+      label={labelWithHint(i18n.t("agents.killSwitchFields.body.label"), i18n.t("agents.killSwitchFields.body.hint"))}
       rules={{ validate: (value) => validateKillSwitchBody(typeof value === "string" ? value : "") }}
     >
       {({ value, onChange, ref, ...control }) => (
@@ -199,7 +231,7 @@ const KillSwitchFormFields = () => (
       )}
     </AgentFormField>
 
-    <AgentFormField name="kill_switch.auth_type" label="Authentication">
+    <AgentFormField name="kill_switch.auth_type" label={i18n.t("agents.killSwitchFields.authentication")}>
       {({ value, onChange, ref: _ref, ...control }) => (
         <Select value={typeof value === "string" ? value : "none"} onValueChange={onChange}>
           <SelectTrigger {...control} className="w-full">
@@ -208,7 +240,7 @@ const KillSwitchFormFields = () => (
           <SelectContent>
             {KILL_SWITCH_AUTH_TYPES.map((option) => (
               <SelectItem key={option.value} value={option.value}>
-                {option.label}
+                {i18n.t(option.labelKey)}
               </SelectItem>
             ))}
           </SelectContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx
index 188d3349beb..715f2516e66 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx
@@ -5,6 +5,7 @@ import { FormProvider, useForm, useWatch } from "react-hook-form";
 import { toast } from "@/lib/toast";
 import { Logo } from "@/components/molecules/logo/Logo";
 import { Bot, Check, CircleCheck, Key, LayoutGrid } from "lucide-react";
+import { Trans, useTranslation } from "react-i18next";
 import CreatedKeyDisplay from "@/components/shared/CreatedKeyDisplay";
 import { Badge } from "@/components/ui/badge";
 import { StatusBadge } from "@/components/shared/table_cells/status_badge";
@@ -55,10 +56,17 @@ import MCPToolPermissions from "@/components/mcp_server_management/MCPToolPermis
 import AccessGroupSelector from "@/components/common_components/AccessGroupSelector";
 import GuardrailSelector from "@/components/guardrails/GuardrailSelector";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import i18n from "@/i18n/i18n";
 
 const CUSTOM_AGENT_TYPE = "custom";
 
-const STEP_TITLES = ["Configure", "Entitlements", "Governance", "Agent Management", "Ready"] as const;
+const STEP_TITLES = [
+  "agents.addForm.steps.configure",
+  "agents.addForm.steps.entitlements",
+  "agents.addForm.steps.governance",
+  "agents.addForm.steps.agentManagement",
+  "agents.addForm.steps.ready",
+] as const;
 
 const stepMarkerClass = (index: number, current: number): string => {
   if (index < current) return "border-primary text-primary";
@@ -73,11 +81,12 @@ const stepTitleClass = (index: number, current: number): string => {
 };
 
 const AgentTypeLabel: React.FC<{ agentType: string; info: AgentCreateInfo | undefined }> = ({ agentType, info }) => {
+  const { t } = useTranslation();
   if (agentType === CUSTOM_AGENT_TYPE) {
     return (
       <span className="flex items-center gap-2">
         <LayoutGrid className="size-4 text-warning" />
-        <span>Custom / Other</span>
+        <span>{t("agents.addForm.agentType.custom")}</span>
       </span>
     );
   }
@@ -91,7 +100,7 @@ const AgentTypeLabel: React.FC<{ agentType: string; info: AgentCreateInfo | unde
 };
 
 const StepProgress: React.FC<{ current: number }> = ({ current }) => (
-  <ol aria-label="Agent creation steps" className="mb-8 flex items-center">
+  <ol aria-label={i18n.t("agents.addForm.steps.ariaLabel")} className="mb-8 flex items-center">
     {STEP_TITLES.map((title, index) => (
       <li
         key={title}
@@ -104,7 +113,7 @@ const StepProgress: React.FC<{ current: number }> = ({ current }) => (
         >
           {index < current ? <Check className="size-3.5" /> : index + 1}
         </span>
-        <span className={`text-xs whitespace-nowrap ${stepTitleClass(index, current)}`}>{title}</span>
+        <span className={`text-xs whitespace-nowrap ${stepTitleClass(index, current)}`}>{i18n.t(title)}</span>
         {index < STEP_TITLES.length - 1 && <span aria-hidden="true" className="mx-2 h-px flex-1 bg-border" />}
       </li>
     ))}
@@ -132,6 +141,7 @@ interface AddAgentFormProps {
 }
 
 const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessToken, onSuccess, teams }) => {
+  const { t } = useTranslation();
   const { userId, userRole } = useAuthorized();
   const form = useForm<AgentFormValues>({ defaultValues: buildInitialValues("a2a") });
   const panels = useCollapsiblePanels([AGENT_FORM_CONFIG.basic.key]);
@@ -339,12 +349,12 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
 
   const handleCreateAgent = async () => {
     if (!accessToken) {
-      toast.error("No access token available");
+      toast.error(t("agents.addForm.toasts.noAccessToken"));
       return;
     }
 
     if (keyAssignOption === "existing_key" && !selectedExistingKey) {
-      toast.error("Please select an existing key to assign");
+      toast.error(t("agents.addForm.toasts.selectExistingKey"));
       return;
     }
 
@@ -358,7 +368,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
       const values = form.getValues();
       const built = buildAgentData(values);
       if (!built) {
-        toast.error("Failed to build agent data");
+        toast.error(t("agents.addForm.toasts.buildFailed"));
         setIsSubmitting(false);
         return;
       }
@@ -434,7 +444,11 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
     } catch (error) {
       console.error("Error creating agent:", error);
       const errorMessage = error instanceof Error ? error.message : String(error);
-      toast.error(errorMessage ? `Failed to create agent: ${errorMessage}` : "Failed to create agent");
+      toast.error(
+        errorMessage
+          ? t("agents.addForm.toasts.createFailedWithError", { error: errorMessage })
+          : t("agents.addForm.toasts.createFailed"),
+      );
     } finally {
       setIsSubmitting(false);
     }
@@ -461,17 +475,14 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
 
   const renderEntitlementsStep = () => (
     <div className="space-y-4">
-      <p className="text-sm text-muted-foreground">
-        Configure which models, agents, and MCP tools this agent is allowed to use. Leave fields empty to allow all
-        (subject to key/team permissions).
-      </p>
+      <p className="text-sm text-muted-foreground">{t("agents.addForm.entitlements.description")}</p>
 
       <FieldGroup>
         <AgentFormField
           name="entitlement_models"
           label={labelWithHint(
-            "Allowed Models",
-            "Restrict which models this agent can call. Leave empty to allow all.",
+            t("agents.addForm.entitlements.models.label"),
+            t("agents.addForm.entitlements.models.hint"),
           )}
         >
           {({ id, value, onChange }) => (
@@ -479,7 +490,11 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
               id={id}
               value={Array.isArray(value) ? (value as string[]) : []}
               onValueChange={onChange}
-              placeholder={loadingModels ? "Loading models..." : "Select models (leave empty for all)"}
+              placeholder={
+                loadingModels
+                  ? t("agents.addForm.entitlements.models.loading")
+                  : t("agents.addForm.entitlements.models.placeholder")
+              }
               options={availableModels.map((m) => ({ label: getModelDisplayName(m), value: m }))}
             />
           )}
@@ -488,8 +503,8 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
         <AgentFormField
           name="entitlement_agents"
           label={labelWithHint(
-            "Allowed Agents (Sub-Agents)",
-            "Restrict which other agents this agent can invoke as sub-agents. Leave empty to allow all.",
+            t("agents.addForm.entitlements.agents.label"),
+            t("agents.addForm.entitlements.agents.hint"),
           )}
         >
           {({ id, value, onChange }) => (
@@ -497,7 +512,11 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
               id={id}
               value={Array.isArray(value) ? (value as string[]) : []}
               onValueChange={onChange}
-              placeholder={loadingAgents ? "Loading agents..." : "Select agents (leave empty for all)"}
+              placeholder={
+                loadingAgents
+                  ? t("agents.addForm.entitlements.agents.loading")
+                  : t("agents.addForm.entitlements.agents.placeholder")
+              }
               options={availableAgents.map((a) => ({ label: a.agent_name, value: a.agent_id }))}
             />
           )}
@@ -506,15 +525,15 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
         <AgentFormField
           name="access_group_ids"
           label={labelWithHint(
-            "Access Groups",
-            "Attach access groups to this agent. Attached groups cap which models, MCP servers, and agents the agent can reach, on top of its key and team permissions. Leave empty to apply no extra cap.",
+            t("agents.addForm.entitlements.accessGroups.label"),
+            t("agents.addForm.entitlements.accessGroups.hint"),
           )}
         >
           {({ value, onChange }) => (
             <AccessGroupSelector
               value={Array.isArray(value) ? (value as string[]) : []}
               onChange={onChange}
-              placeholder="Select access groups (optional)"
+              placeholder={t("agents.addForm.entitlements.accessGroups.placeholder")}
             />
           )}
         </AgentFormField>
@@ -524,8 +543,8 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
         <AgentFormField
           name="allowed_mcp_servers_and_groups"
           label={labelWithHint(
-            "Allowed MCP Servers",
-            "Select which MCP servers or access groups this agent can access",
+            t("agents.addForm.entitlements.mcpServers.label"),
+            t("agents.addForm.entitlements.mcpServers.hint"),
           )}
         >
           {({ value, onChange }) => (
@@ -536,7 +555,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
                 accessGroups: (value as McpServerSelection | undefined)?.accessGroups ?? [],
               }}
               accessToken={accessToken ?? ""}
-              placeholder="Select MCP servers or access groups (optional)"
+              placeholder={t("agents.addForm.entitlements.mcpServers.placeholder")}
             />
           )}
         </AgentFormField>
@@ -574,15 +593,15 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
   const renderObservabilityStep = () => (
     <div className="space-y-6">
       <div>
-        <h4 className="mb-3 text-sm font-medium text-foreground">Tracing</h4>
+        <h4 className="mb-3 text-sm font-medium text-foreground">{t("agents.addForm.governance.tracing.title")}</h4>
         <div className="space-y-4">
           <div className="flex items-center justify-between">
             <div>
               <span className="text-sm font-medium text-foreground">
-                Require x-litellm-trace-id on calls TO this agent
+                {t("agents.addForm.governance.tracing.inbound.label", { header: "x-litellm-trace-id" })}
               </span>
               <p className="mt-1 text-xs text-muted-foreground">
-                Only accept this agent being invoked with a trace-id (e.g. when used as a sub-agent).
+                {t("agents.addForm.governance.tracing.inbound.description")}
               </p>
             </div>
             <Switch checked={requireTraceIdInbound} onCheckedChange={setRequireTraceIdInbound} />
@@ -591,10 +610,10 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
           <div className="flex items-center justify-between">
             <div>
               <span className="text-sm font-medium text-foreground">
-                Require x-litellm-trace-id on calls BY this agent
+                {t("agents.addForm.governance.tracing.outbound.label", { header: "x-litellm-trace-id" })}
               </span>
               <p className="mt-1 text-xs text-muted-foreground">
-                Requires LLM/MCP calls made by this agent to include x-litellm-trace-id for session tracking.
+                {t("agents.addForm.governance.tracing.outbound.description", { header: "x-litellm-trace-id" })}
               </p>
             </div>
             <Switch
@@ -614,24 +633,27 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
       <Separator />
 
       <div>
-        <h4 className="mb-3 text-sm font-medium text-foreground">Budgets &amp; Rate Limits</h4>
+        <h4 className="mb-3 text-sm font-medium text-foreground">{t("agents.addForm.governance.budgets.title")}</h4>
         <div className="space-y-4">
           {!requireTraceIdOutbound && (
             <div className="rounded-lg border border-warning/20 bg-warning/10 p-3 text-sm text-warning">
-              Enable &quot;Require x-litellm-trace-id on calls BY this agent&quot; in Tracing to configure budgets and
-              rate limits.
+              {t("agents.addForm.governance.budgets.requiresOutbound", { header: "x-litellm-trace-id" })}
             </div>
           )}
 
-          <div className="text-sm font-medium text-foreground">Session Budgets</div>
+          <div className="text-sm font-medium text-foreground">
+            {t("agents.addForm.governance.budgets.session.title")}
+          </div>
           <div className="grid grid-cols-2 gap-4">
             <Field className="gap-1">
-              <FieldLabel htmlFor="agent-max-iterations">Max Iterations</FieldLabel>
+              <FieldLabel htmlFor="agent-max-iterations">
+                {t("agents.addForm.governance.budgets.session.maxIterations.label")}
+              </FieldLabel>
               <Input
                 id="agent-max-iterations"
                 type="number"
                 step="any"
-                placeholder="e.g. 25"
+                placeholder={t("agents.addForm.governance.budgets.session.maxIterations.placeholder")}
                 disabled={!requireTraceIdOutbound}
                 value={maxIterations ?? ""}
                 onChange={(event) =>
@@ -639,15 +661,19 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
                 }
                 onBlur={() => setMaxIterations((current) => (current !== null && current < 1 ? 1 : current))}
               />
-              <p className="mt-1 text-xs text-muted-foreground">Hard cap on LLM calls per session</p>
+              <p className="mt-1 text-xs text-muted-foreground">
+                {t("agents.addForm.governance.budgets.session.maxIterations.hint")}
+              </p>
             </Field>
             <Field className="gap-1">
-              <FieldLabel htmlFor="agent-max-budget-per-session">Max Budget Per Session ($)</FieldLabel>
+              <FieldLabel htmlFor="agent-max-budget-per-session">
+                {t("agents.addForm.governance.budgets.session.maxBudget.label")}
+              </FieldLabel>
               <Input
                 id="agent-max-budget-per-session"
                 type="number"
                 step="any"
-                placeholder="e.g. 5.00"
+                placeholder={t("agents.addForm.governance.budgets.session.maxBudget.placeholder")}
                 disabled={!requireTraceIdOutbound}
                 value={maxBudgetPerSession ?? ""}
                 onChange={(event) =>
@@ -657,26 +683,48 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
                   setMaxBudgetPerSession((current) => (current !== null && current < 0.01 ? 0.01 : current))
                 }
               />
-              <p className="mt-1 text-xs text-muted-foreground">Max spend per trace before returning 429</p>
+              <p className="mt-1 text-xs text-muted-foreground">
+                {t("agents.addForm.governance.budgets.session.maxBudget.hint")}
+              </p>
             </Field>
           </div>
 
           <Separator className="my-2" />
 
-          <div className="text-sm font-medium text-foreground">Agent Rate Limits</div>
-          <p className="text-xs text-muted-foreground">Global rate limits applied across all callers of this agent.</p>
+          <div className="text-sm font-medium text-foreground">
+            {t("agents.addForm.governance.rateLimits.agent.title")}
+          </div>
+          <p className="text-xs text-muted-foreground">{t("agents.addForm.governance.rateLimits.agent.description")}</p>
           <div className="grid grid-cols-2 gap-4">
-            {rateLimitField("tpm_limit", "TPM Limit", "e.g. 100000")}
-            {rateLimitField("rpm_limit", "RPM Limit", "e.g. 100")}
+            {rateLimitField(
+              "tpm_limit",
+              t("agents.addForm.governance.rateLimits.agent.tpm.label"),
+              t("agents.addForm.governance.rateLimits.agent.tpm.placeholder"),
+            )}
+            {rateLimitField(
+              "rpm_limit",
+              t("agents.addForm.governance.rateLimits.agent.rpm.label"),
+              t("agents.addForm.governance.rateLimits.agent.rpm.placeholder"),
+            )}
           </div>
 
-          <div className="mt-4 text-sm font-medium text-foreground">Per-Session Rate Limits</div>
+          <div className="mt-4 text-sm font-medium text-foreground">
+            {t("agents.addForm.governance.rateLimits.session.title")}
+          </div>
           <p className="text-xs text-muted-foreground">
-            Rate limits per session (x-litellm-trace-id). Each session gets its own counters.
+            {t("agents.addForm.governance.rateLimits.session.description", { header: "x-litellm-trace-id" })}
           </p>
           <div className="grid grid-cols-2 gap-4">
-            {rateLimitField("session_tpm_limit", "Session TPM Limit", "e.g. 10000")}
-            {rateLimitField("session_rpm_limit", "Session RPM Limit", "e.g. 20")}
+            {rateLimitField(
+              "session_tpm_limit",
+              t("agents.addForm.governance.rateLimits.session.tpm.label"),
+              t("agents.addForm.governance.rateLimits.session.tpm.placeholder"),
+            )}
+            {rateLimitField(
+              "session_rpm_limit",
+              t("agents.addForm.governance.rateLimits.session.rpm.label"),
+              t("agents.addForm.governance.rateLimits.session.rpm.placeholder"),
+            )}
           </div>
         </div>
       </div>
@@ -684,10 +732,8 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
       <Separator />
 
       <div>
-        <h4 className="mb-3 text-sm font-medium text-foreground">Guardrails</h4>
-        <p className="mb-3 text-xs text-muted-foreground">
-          Apply guardrails to this agent. Selected guardrails will run on all calls made by this agent.
-        </p>
+        <h4 className="mb-3 text-sm font-medium text-foreground">{t("agents.addForm.governance.guardrails.title")}</h4>
+        <p className="mb-3 text-xs text-muted-foreground">{t("agents.addForm.governance.guardrails.description")}</p>
         <AgentFormField name="guardrails">
           {({ value, onChange }) => (
             <GuardrailSelector
@@ -763,7 +809,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
     <>
       <Field className="gap-1">
         <FieldLabel htmlFor="agent-type">
-          {labelWithHint("Agent Type", "Select the type of agent you want to create")}
+          {labelWithHint(t("agents.addForm.configure.agentType.label"), t("agents.addForm.configure.agentType.hint"))}
         </FieldLabel>
         <Select value={agentType} onValueChange={(value) => value !== null && handleAgentTypeChange(value)}>
           <SelectTrigger id="agent-type" className="h-10 w-full">
@@ -785,18 +831,22 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
             ))}
             <SelectSeparator />
             <div className="mb-1 px-2 text-xs font-medium tracking-wide text-muted-foreground uppercase">
-              Not listed?
+              {t("agents.addForm.configure.agentType.notListed")}
             </div>
             <SelectItem value={CUSTOM_AGENT_TYPE} className="focus:bg-warning/10">
               <span className="flex items-center gap-3">
                 <LayoutGrid className="size-4.5 shrink-0 text-warning" />
                 <span className="block">
                   <span className="flex items-center gap-2">
-                    <span className="font-medium text-warning">Custom / Other</span>
-                    <StatusBadge tone="warning" label="GENERIC" className="h-4 px-1 text-[10px]" />
+                    <span className="font-medium text-warning">{t("agents.addForm.agentType.custom")}</span>
+                    <StatusBadge
+                      tone="warning"
+                      label={t("agents.addForm.configure.agentType.genericBadge")}
+                      className="h-4 px-1 text-[10px]"
+                    />
                   </span>
                   <span className="block text-xs whitespace-normal text-warning">
-                    For outbound agents using an identity provider or virtual key
+                    {t("agents.addForm.configure.agentType.customDescription")}
                   </span>
                 </span>
               </span>
@@ -810,24 +860,28 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
       <div className="mt-4">
         {agentType === CUSTOM_AGENT_TYPE ? (
           <FieldGroup>
-            <AgentFormField name="agent_name" label="Agent Name" rules={{ required: "Please enter an agent name" }}>
+            <AgentFormField
+              name="agent_name"
+              label={t("agents.addForm.configure.custom.agentName.label")}
+              rules={{ required: t("agents.addForm.configure.custom.agentName.required") }}
+            >
               {({ value, onChange, ref, ...control }) => (
                 <Input
                   {...control}
                   ref={ref}
-                  placeholder="e.g. my-custom-agent"
+                  placeholder={t("agents.addForm.configure.custom.agentName.placeholder")}
                   value={typeof value === "string" ? value : ""}
                   onChange={onChange}
                 />
               )}
             </AgentFormField>
-            <AgentFormField name="description" label="Description">
+            <AgentFormField name="description" label={t("agents.addForm.configure.custom.description.label")}>
               {({ value, onChange, ref, ...control }) => (
                 <Textarea
                   {...control}
                   ref={ref}
                   rows={3}
-                  placeholder="Describe what this agent does…"
+                  placeholder={t("agents.addForm.configure.custom.description.placeholder")}
                   value={typeof value === "string" ? value : ""}
                   onChange={onChange}
                 />
@@ -842,7 +896,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
             {selectedAgentTypeInfo.credential_fields.length > 0 && (
               <div className="mt-4 rounded-lg border border-border p-4">
                 <h4 className="mb-3 text-sm font-medium text-foreground">
-                  {selectedAgentTypeInfo.agent_type_display_name} Settings
+                  {t("agents.addForm.configure.typeSettings", { type: selectedAgentTypeInfo.agent_type_display_name })}
                 </h4>
                 <FieldGroup>
                   {selectedAgentTypeInfo.credential_fields.map((field) => (
@@ -851,7 +905,11 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
                       name={field.key}
                       label={field.tooltip ? labelWithHint(field.label, field.tooltip) : field.label}
                       defaultValue={field.default_value ?? undefined}
-                      rules={field.required ? { required: `Please enter ${field.label}` } : undefined}
+                      rules={
+                        field.required
+                          ? { required: t("agents.addForm.configure.enterField", { field: field.label }) }
+                          : undefined
+                      }
                     >
                       {({ value, onChange, ref, ...control }) =>
                         field.field_type === "password" ? (
@@ -901,7 +959,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
   );
 
   const renderAssignKeyStep = () => {
-    const agentName = form.getValues("agent_name") || "your-agent";
+    const agentName = form.getValues("agent_name") || t("agents.addForm.assignKey.agentNameFallback");
     return (
       <div>
         {/* Agent name chip */}
@@ -914,10 +972,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
 
         <AgentFormField
           name="team_id"
-          label={labelWithHint(
-            "Assign to Team",
-            "Optionally select a team for the virtual key. The agent identity and its permissions are managed separately.",
-          )}
+          label={labelWithHint(t("agents.addForm.assignKey.team.label"), t("agents.addForm.assignKey.team.hint"))}
         >
           {({ value, onChange }) => (
             <TeamDropdown value={typeof value === "string" ? value : undefined} onChange={onChange} />
@@ -927,9 +982,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
         <Separator className="my-4" />
 
         {form.getValues("identity_provider") === "microsoft_entra" && (
-          <p className="mb-4 text-sm text-muted-foreground">
-            This agent will authenticate with Microsoft Entra ID. You can skip virtual key creation.
-          </p>
+          <p className="mb-4 text-sm text-muted-foreground">{t("agents.addForm.assignKey.entraNotice")}</p>
         )}
         <RadioGroup
           value={keyAssignOption}
@@ -947,29 +1000,33 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
           >
             <div className="flex items-start justify-between">
               <div className="flex flex-1 items-start gap-3">
-                <RadioGroupItem value="create_new" aria-label="Create a new key for this agent" />
+                <RadioGroupItem value="create_new" aria-label={t("agents.addForm.assignKey.createNew.title")} />
                 <div className="flex-1">
                   <div className="flex items-center gap-2">
                     <Key className="size-4 text-info" />
-                    <span className="font-medium text-foreground">Create a new key for this agent</span>
+                    <span className="font-medium text-foreground">{t("agents.addForm.assignKey.createNew.title")}</span>
                   </div>
-                  <p className="mt-1 text-sm text-muted-foreground">A dedicated key scoped to this agent.</p>
+                  <p className="mt-1 text-sm text-muted-foreground">
+                    {t("agents.addForm.assignKey.createNew.description")}
+                  </p>
                   {keyAssignOption === "create_new" && (
                     <div className="mt-3 space-y-3" onClick={(e) => e.stopPropagation()}>
                       <Field className="gap-1">
-                        <FieldLabel htmlFor="agent-new-key-name">Key Name</FieldLabel>
+                        <FieldLabel htmlFor="agent-new-key-name">
+                          {t("agents.addForm.assignKey.createNew.keyName.label")}
+                        </FieldLabel>
                         <Input
                           id="agent-new-key-name"
                           value={newKeyName}
                           onChange={(e) => setNewKeyName(e.target.value)}
-                          placeholder="e.g. my-agent-key"
+                          placeholder={t("agents.addForm.assignKey.createNew.keyName.placeholder")}
                         />
                       </Field>
                     </div>
                   )}
                 </div>
               </div>
-              <StatusBadge tone="success" label="Recommended" />
+              <StatusBadge tone="success" label={t("agents.addForm.assignKey.createNew.recommended")} />
             </div>
           </div>
 
@@ -983,18 +1040,24 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
             onClick={() => setKeyAssignOption("existing_key")}
           >
             <div className="flex items-start gap-3">
-              <RadioGroupItem value="existing_key" aria-label="Assign an existing key" />
+              <RadioGroupItem value="existing_key" aria-label={t("agents.addForm.assignKey.existing.title")} />
               <div className="flex-1">
                 <div className="flex items-center gap-2">
                   <Key className="size-4 text-muted-foreground" />
-                  <span className="font-medium text-foreground">Assign an existing key</span>
+                  <span className="font-medium text-foreground">{t("agents.addForm.assignKey.existing.title")}</span>
                 </div>
-                <p className="mt-1 text-sm text-muted-foreground">Re-assign a key you already have to this agent.</p>
+                <p className="mt-1 text-sm text-muted-foreground">
+                  {t("agents.addForm.assignKey.existing.description")}
+                </p>
                 {keyAssignOption === "existing_key" && (
                   <div className="mt-3" onClick={(e) => e.stopPropagation()}>
                     <SearchSelect
                       inputId="agent-existing-key"
-                      placeholder={loadingKeys ? "Loading keys…" : "Search by key name…"}
+                      placeholder={
+                        loadingKeys
+                          ? t("agents.addForm.assignKey.existing.loading")
+                          : t("agents.addForm.assignKey.existing.placeholder")
+                      }
                       value={selectedExistingKey}
                       onValueChange={setSelectedExistingKey}
                       options={existingKeys.map((k) => ({
@@ -1016,8 +1079,8 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
             onClick={() => setKeyAssignOption("skip")}
           >
             {form.getValues("identity_provider") === "microsoft_entra"
-              ? "Use Entra JWT authentication"
-              : "Skip for now, I’ll assign a key later"}
+              ? t("agents.addForm.assignKey.skip.entra")
+              : t("agents.addForm.assignKey.skip.later")}
           </button>
         </div>
       </div>
@@ -1027,7 +1090,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
   const renderReadyStep = () => (
     <div className="py-6 text-center">
       <CircleCheck className="mb-4 size-12 text-success" />
-      <h3 className="mb-2 text-xl font-semibold text-foreground">Agent Created!</h3>
+      <h3 className="mb-2 text-xl font-semibold text-foreground">{t("agents.addForm.ready.title")}</h3>
       <div className="mb-4 flex justify-center">
         <Badge className="h-auto gap-1.5 bg-purple-100 px-3 py-1 text-sm text-purple-700 dark:bg-purple-950 dark:text-purple-300">
           <Bot className="size-3.5" />
@@ -1041,14 +1104,17 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
       )}
       {assignedKeyAlias && (
         <p className="mt-2 text-sm text-muted-foreground">
-          Key <span className="font-medium">{assignedKeyAlias}</span> has been assigned to this agent.
+          <Trans
+            i18nKey="agents.addForm.ready.keyAssigned"
+            components={{ alias: <span className="font-medium">{assignedKeyAlias}</span> }}
+          />
         </p>
       )}
       {!createdKeyValue && !assignedKeyAlias && keyAssignOption === "skip" && (
         <p className="mt-2 text-sm text-muted-foreground">
           {form.getValues("identity_provider") === "microsoft_entra"
-            ? "Microsoft Entra ID is configured. Send an authenticated agent request to verify the connection."
-            : "No key assigned. You can create one from the Virtual Keys page."}
+            ? t("agents.addForm.ready.entraConfigured")
+            : t("agents.addForm.ready.noKey")}
         </p>
       )}
     </div>
@@ -1060,9 +1126,15 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
         <DialogHeader>
           <div className="flex items-center space-x-3 border-b border-border pb-4">
             {selectedLogo && currentStep < 1 && (
-              <Logo src={selectedLogo} label="Agent" className="h-6 w-6 object-contain" />
+              <Logo
+                src={selectedLogo}
+                label={t("agents.addForm.dialog.logoLabel")}
+                className="h-6 w-6 object-contain"
+              />
             )}
-            <DialogTitle className="text-xl font-semibold text-foreground">Add New Agent</DialogTitle>
+            <DialogTitle className="text-xl font-semibold text-foreground">
+              {t("agents.addForm.dialog.title")}
+            </DialogTitle>
           </div>
         </DialogHeader>
         <TooltipProvider>
@@ -1083,24 +1155,24 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
               <div>
                 {currentStep > 0 && currentStep < 4 && (
                   <Button type="button" variant="outline" onClick={handleBack}>
-                    ← Back
+                    {t("agents.addForm.dialog.back")}
                   </Button>
                 )}
               </div>
               <div className="flex gap-3">
                 {currentStep < 4 && (
                   <Button variant="secondary" onClick={handleClose}>
-                    Cancel
+                    {t("agents.addForm.dialog.cancel")}
                   </Button>
                 )}
-                {currentStep < 3 && <Button onClick={handleNext}>Next →</Button>}
+                {currentStep < 3 && <Button onClick={handleNext}>{t("agents.addForm.dialog.next")}</Button>}
                 {currentStep === 3 && (
                   <Button disabled={isSubmitting} aria-busy={isSubmitting} onClick={handleCreateAgent}>
                     {isSubmitting && <UiLoadingSpinner className="size-4" />}
-                    {isSubmitting ? "Creating..." : "Create Agent →"}
+                    {isSubmitting ? t("agents.addForm.dialog.creating") : t("agents.addForm.dialog.create")}
                   </Button>
                 )}
-                {currentStep === 4 && <Button onClick={handleClose}>Done</Button>}
+                {currentStep === 4 && <Button onClick={handleClose}>{t("agents.addForm.dialog.done")}</Button>}
               </div>
             </div>
           </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_card_discovery.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_card_discovery.tsx
index aba16a50508..35df5d2ff3d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_card_discovery.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_card_discovery.tsx
@@ -2,6 +2,8 @@
 
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { ChevronDown, CircleAlert, CircleCheck, Info, Link as LinkIcon, RotateCw, Search, X } from "lucide-react";
+import { Trans, useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 
 import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
 import { DiscoveredAgentCard, discoverAgentCardCall } from "@/components/networking";
@@ -63,6 +65,7 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
   discoveryRequest,
   savedAgentCard,
 }) => {
+  const { t } = useTranslation();
   // When the parent drives discovery, ``manualUrl`` is unused — the URL
   // comes from ``discoveryRequest.url`` directly. When the parent hasn't
   // supplied a plan, the admin types into this field manually.
@@ -117,14 +120,16 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
 
   const handleDiscover = useCallback(async () => {
     if (!accessToken) {
-      setError("No access token available");
+      setError(i18n.t("agents.cardDiscovery.errors.noAccessToken"));
       onApplyRef.current(null);
       return;
     }
     const trimmed = effectiveUrl.trim();
     if (!trimmed) {
       setError(
-        isParentDriven ? "Fill in the agent's connection details above first" : "Enter the agent's base URL first",
+        isParentDriven
+          ? i18n.t("agents.cardDiscovery.errors.fillConnectionDetails")
+          : i18n.t("agents.cardDiscovery.errors.enterBaseUrl"),
       );
       setCard(null);
       onApplyRef.current(null);
@@ -152,7 +157,7 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
       resetSelections(response.agent_card);
     } catch (e: any) {
       if (requestId !== discoverRequestIdRef.current) return;
-      setError(e?.message ? String(e.message) : "Failed to discover agent card");
+      setError(e?.message ? String(e.message) : i18n.t("agents.cardDiscovery.errors.discoverFailed"));
       setCard(null);
       lastSyncedSelectionRef.current = null;
       onApplyRef.current(null);
@@ -247,13 +252,13 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
     if (card) return <RotateCw />;
     return <Search />;
   };
-  const discoverLabel = card ? "Re-discover" : "Discover";
+  const discoverLabel = card ? t("agents.cardDiscovery.rediscover") : t("agents.cardDiscovery.discover");
 
   return (
     <div className="mb-4 rounded-lg border border-border bg-muted/50 p-4">
       <div className="mb-2 flex items-center gap-2">
         <LinkIcon className="size-4 text-primary" />
-        <span className="text-sm font-medium text-foreground">Discover from agent URL</span>
+        <span className="text-sm font-medium text-foreground">{t("agents.cardDiscovery.title")}</span>
         <TooltipProvider delay={300}>
           <Tooltip>
             <TooltipTrigger
@@ -264,20 +269,17 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
               }
             />
             <TooltipContent>
-              LiteLLM will fetch /.well-known/agent-card.json from this URL and let you pick which skills and
-              capabilities to expose through the proxy.
+              {t("agents.cardDiscovery.titleHint", { path: "/.well-known/agent-card.json" })}
             </TooltipContent>
           </Tooltip>
         </TooltipProvider>
       </div>
       {isParentDriven ? (
         <>
-          <p className="mb-2 text-xs text-muted-foreground">
-            Using the connection details you entered above. We&apos;ll fetch:
-          </p>
+          <p className="mb-2 text-xs text-muted-foreground">{t("agents.cardDiscovery.parentDrivenIntro")}</p>
           <div className="mb-3 rounded-sm border border-border bg-background px-3 py-2 font-mono text-xs break-all text-foreground">
             {discoveryRequest!.display_url || effectiveUrl || (
-              <span className="text-muted-foreground italic">Fill in the fields above first</span>
+              <span className="text-muted-foreground italic">{t("agents.cardDiscovery.fillFieldsFirst")}</span>
             )}
           </div>
           <div className="flex justify-end">
@@ -290,8 +292,14 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
       ) : (
         <>
           <p className="mb-3 text-xs text-muted-foreground">
-            Paste the upstream agent&apos;s base URL. We&apos;ll try <code>/.well-known/agent-card.json</code>,{" "}
-            <code>/.well-known/agent.json</code>, and <code>/agent.json</code> in order.
+            <Trans
+              i18nKey="agents.cardDiscovery.manualIntro"
+              components={{
+                cardfile: <code>/.well-known/agent-card.json</code>,
+                agentfile: <code>/.well-known/agent.json</code>,
+                rootfile: <code>/agent.json</code>,
+              }}
+            />
           </p>
 
           <div className="flex w-full items-center gap-2">
@@ -315,10 +323,15 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
       {error && (
         <Alert variant="destructive" className="mt-3">
           <CircleAlert />
-          <AlertTitle>Discovery failed</AlertTitle>
+          <AlertTitle>{t("agents.cardDiscovery.failedTitle")}</AlertTitle>
           <AlertDescription>{error}</AlertDescription>
           <AlertAction>
-            <Button variant="ghost" size="icon-xs" aria-label="Dismiss error" onClick={() => setError(null)}>
+            <Button
+              variant="ghost"
+              size="icon-xs"
+              aria-label={t("agents.cardDiscovery.dismissError")}
+              onClick={() => setError(null)}
+            >
               <X />
             </Button>
           </AlertAction>
@@ -335,7 +348,7 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
         <div className="mt-4 rounded-lg border border-border bg-background p-4">
           <div className="mb-3 flex flex-wrap items-center gap-2">
             <CircleCheck className="size-4 text-success" />
-            <span className="text-sm font-medium text-foreground">Upstream card loaded</span>
+            <span className="text-sm font-medium text-foreground">{t("agents.cardDiscovery.cardLoaded")}</span>
             {card.version && <Badge variant="secondary">v{card.version}</Badge>}
             {card.provider?.organization && <Badge variant="secondary">{card.provider.organization}</Badge>}
           </div>
@@ -343,18 +356,24 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
           <div className="mb-4 grid grid-cols-1 gap-3 md:grid-cols-2">
             <div>
               <label className="mb-1 block text-xs font-medium text-muted-foreground">
-                Name (shown to API clients)
+                {t("agents.cardDiscovery.nameLabel")}
               </label>
-              <Input value={editedName} onChange={(e) => setEditedName(e.target.value)} placeholder="Agent name" />
+              <Input
+                value={editedName}
+                onChange={(e) => setEditedName(e.target.value)}
+                placeholder={t("agents.cardDiscovery.namePlaceholder")}
+              />
             </div>
             <div>
-              <label className="mb-1 block text-xs font-medium text-muted-foreground">Description</label>
+              <label className="mb-1 block text-xs font-medium text-muted-foreground">
+                {t("agents.cardDiscovery.descriptionLabel")}
+              </label>
               <Textarea
                 className="field-sizing-fixed min-h-0"
                 value={editedDescription}
                 onChange={(e) => setEditedDescription(e.target.value)}
                 rows={2}
-                placeholder="What this agent does"
+                placeholder={t("agents.cardDiscovery.descriptionPlaceholder")}
               />
             </div>
           </div>
@@ -366,17 +385,19 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
                   render={
                     <button type="button" className="group flex items-center gap-2">
                       <ChevronDown className="size-4 text-muted-foreground transition-transform group-data-[panel-open]:rotate-180" />
-                      <span className="text-sm font-medium text-foreground">Skills</span>
+                      <span className="text-sm font-medium text-foreground">{t("agents.cardDiscovery.skills")}</span>
                     </button>
                   }
                 />
                 <Badge variant="secondary">
-                  {selectedSkillCount} / {skillCount} selected
+                  {t("agents.cardDiscovery.skillsSelected", { selected: selectedSkillCount, total: skillCount })}
                 </Badge>
               </div>
               <CollapsibleContent className="pt-2">
                 {skillCount === 0 ? (
-                  <div className="py-6 text-center text-sm text-muted-foreground">Upstream card has no skills</div>
+                  <div className="py-6 text-center text-sm text-muted-foreground">
+                    {t("agents.cardDiscovery.noSkills")}
+                  </div>
                 ) : (
                   <div className="space-y-2">
                     {(card.skills ?? []).map((skill, idx) => {
@@ -394,9 +415,9 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
                             <div className="flex flex-wrap items-center gap-2">
                               <span className="text-sm font-medium text-foreground">{skill.name || id}</span>
                               {skill.id && <Badge variant="secondary">{skill.id}</Badge>}
-                              {(skill.tags ?? []).map((t: string) => (
-                                <Badge key={t} variant="outline">
-                                  {t}
+                              {(skill.tags ?? []).map((tag: string) => (
+                                <Badge key={tag} variant="outline">
+                                  {tag}
                                 </Badge>
                               ))}
                             </div>
@@ -418,7 +439,9 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
                   render={
                     <button type="button" className="group flex items-center gap-2">
                       <ChevronDown className="size-4 text-muted-foreground transition-transform group-data-[panel-open]:rotate-180" />
-                      <span className="text-sm font-medium text-foreground">Capabilities</span>
+                      <span className="text-sm font-medium text-foreground">
+                        {t("agents.cardDiscovery.capabilities")}
+                      </span>
                     </button>
                   }
                 />
@@ -431,10 +454,7 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
                         </span>
                       }
                     />
-                    <TooltipContent>
-                      Only capabilities LiteLLM can faithfully proxy today are listed. Others (push notifications,
-                      extensions) are coming soon.
-                    </TooltipContent>
+                    <TooltipContent>{t("agents.cardDiscovery.capabilitiesHint")}</TooltipContent>
                   </Tooltip>
                 </TooltipProvider>
               </div>
@@ -449,7 +469,7 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
                       >
                         <div className="flex items-center gap-2">
                           <span className="text-sm font-medium text-foreground capitalize">{key}</span>
-                          {!upstreamHas && <Badge variant="outline">not advertised upstream</Badge>}
+                          {!upstreamHas && <Badge variant="outline">{t("agents.cardDiscovery.notAdvertised")}</Badge>}
                         </div>
                         <Switch
                           checked={Boolean(selectedCapabilities[key])}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_config.ts b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_config.ts
index 6ec3c3181f7..652b2c0b480 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_config.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_config.ts
@@ -1,3 +1,4 @@
+import type { ParseKeys } from "i18next";
 import { parseIdentityForForm } from "./agent_identity";
 /**
  * Shared configuration for agent form fields
@@ -23,12 +24,12 @@ export interface FieldConfig {
   rows?: number;
   validation?: any[];
   options?: string[];
-  helpText?: string;
+  helpTextKey?: ParseKeys;
 }
 
 export interface SectionConfig {
   key: string;
-  title: string;
+  titleKey: ParseKeys;
   fields: FieldConfig[];
   defaultExpanded?: boolean;
 }
@@ -44,7 +45,7 @@ export const AGENT_FORM_CONFIG: {
 } = {
   basic: {
     key: "basic",
-    title: "Basic Information",
+    titleKey: "agents.formConfig.basic.title",
     defaultExpanded: true,
     fields: [
       {
@@ -85,14 +86,13 @@ export const AGENT_FORM_CONFIG: {
         defaultValue: "1.0",
         tooltip:
           "The A2A protocol version LiteLLM serves to clients for this agent. LiteLLM converts the upstream agent's responses to this version, so clients always see the version you pick here regardless of the original agent's version.",
-        helpText:
-          "LiteLLM serves this version to clients and converts the upstream agent's responses to match it, regardless of the original agent's version.",
+        helpTextKey: "agents.formConfig.basic.protocolVersionHelp",
       },
     ],
   },
   skills: {
     key: "skills",
-    title: "Skills",
+    titleKey: "agents.formConfig.skills.title",
     fields: [
       {
         name: "skills",
@@ -104,7 +104,7 @@ export const AGENT_FORM_CONFIG: {
   },
   capabilities: {
     key: "capabilities",
-    title: "Capabilities",
+    titleKey: "agents.formConfig.capabilities.title",
     fields: [
       {
         name: "streaming",
@@ -126,7 +126,7 @@ export const AGENT_FORM_CONFIG: {
   },
   optional: {
     key: "optional",
-    title: "Optional Settings",
+    titleKey: "agents.formConfig.optional.title",
     fields: [
       {
         name: "iconUrl",
@@ -149,7 +149,7 @@ export const AGENT_FORM_CONFIG: {
   },
   litellm: {
     key: "litellm",
-    title: "LiteLLM Parameters",
+    titleKey: "agents.formConfig.litellm.title",
     fields: [
       {
         name: "model",
@@ -165,7 +165,7 @@ export const AGENT_FORM_CONFIG: {
   },
   cost: {
     key: "cost",
-    title: "Cost Configuration",
+    titleKey: "agents.formConfig.cost.title",
     fields: [
       {
         name: "cost_per_query",
@@ -192,7 +192,7 @@ export const AGENT_FORM_CONFIG: {
   },
   tracing: {
     key: "tracing",
-    title: "Tracing",
+    titleKey: "agents.formConfig.tracing.title",
     fields: [
       {
         name: "enable_tracing",
@@ -208,33 +208,33 @@ export const AGENT_FORM_CONFIG: {
 export const SKILL_FIELD_CONFIG = {
   id: {
     name: "id",
-    label: "Skill ID",
+    labelKey: "agents.formConfig.skillFields.id" as ParseKeys,
     required: true,
-    placeholder: "e.g., hello_world",
+    placeholderKey: "agents.formConfig.skillFields.idPlaceholder" as ParseKeys,
   },
   name: {
     name: "name",
-    label: "Skill Name",
+    labelKey: "agents.formConfig.skillFields.name" as ParseKeys,
     required: true,
-    placeholder: "e.g., Returns hello world",
+    placeholderKey: "agents.formConfig.skillFields.namePlaceholder" as ParseKeys,
   },
   description: {
     name: "description",
-    label: "Description",
+    labelKey: "agents.formConfig.skillFields.description" as ParseKeys,
     required: true,
-    placeholder: "What this skill does",
+    placeholderKey: "agents.formConfig.skillFields.descriptionPlaceholder" as ParseKeys,
     rows: 2,
   },
   tags: {
     name: "tags",
-    label: "Tags",
+    labelKey: "agents.formConfig.skillFields.tags" as ParseKeys,
     required: true,
-    placeholder: "Type a tag and press Enter",
+    placeholderKey: "agents.formConfig.skillFields.tagsPlaceholder" as ParseKeys,
   },
   examples: {
     name: "examples",
-    label: "Examples",
-    placeholder: "Type an example and press Enter",
+    labelKey: "agents.formConfig.skillFields.examples" as ParseKeys,
+    placeholderKey: "agents.formConfig.skillFields.examplesPlaceholder" as ParseKeys,
   },
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_cost_view.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_cost_view.tsx
index df1d72a4405..813f1e12f39 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_cost_view.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_cost_view.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Agent } from "@/components/agents/types";
 
 interface AgentCostViewProps {
@@ -6,6 +7,7 @@ interface AgentCostViewProps {
 }
 
 const AgentCostView: React.FC<AgentCostViewProps> = ({ agent }) => {
+  const { t } = useTranslation();
   const params = agent.litellm_params;
 
   if (params?.cost_per_query == null && params?.input_cost_per_token == null && params?.output_cost_per_token == null) {
@@ -14,15 +16,15 @@ const AgentCostView: React.FC<AgentCostViewProps> = ({ agent }) => {
 
   const rows = (
     [
-      ["Cost Per Query", params.cost_per_query],
-      ["Input Cost Per Token", params.input_cost_per_token],
-      ["Output Cost Per Token", params.output_cost_per_token],
+      [t("agents.costView.costPerQuery"), params.cost_per_query],
+      [t("agents.costView.inputCostPerToken"), params.input_cost_per_token],
+      [t("agents.costView.outputCostPerToken"), params.output_cost_per_token],
     ] as const
   ).filter(([, value]) => value != null);
 
   return (
     <div className="mt-6">
-      <h3 className="text-lg font-semibold text-foreground">Cost Configuration</h3>
+      <h3 className="text-lg font-semibold text-foreground">{t("agents.costView.title")}</h3>
       <dl className="mt-4 divide-y divide-border overflow-hidden rounded-lg border border-border">
         {rows.map(([label, value]) => (
           <div key={label} className="grid grid-cols-1 sm:grid-cols-3">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_form_fields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_form_fields.tsx
index bf32af30fb6..41e25d14054 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_form_fields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_form_fields.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { useFieldArray, useFormContext } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { Plus, Trash2 } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -47,6 +48,7 @@ interface AgentFormFieldsProps {
 }
 
 const SkillsFieldArray = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<AgentFormValues>();
   const { fields, append, remove } = useFieldArray({ control, name: "skills" });
 
@@ -57,14 +59,14 @@ const SkillsFieldArray = () => {
           <FieldGroup>
             <AgentFormField
               name={`skills.${index}.id`}
-              label={SKILL_FIELD_CONFIG.id.label}
-              rules={SKILL_FIELD_CONFIG.id.required ? { required: "Required" } : undefined}
+              label={t(SKILL_FIELD_CONFIG.id.labelKey)}
+              rules={SKILL_FIELD_CONFIG.id.required ? { required: t("agents.formFields.errors.required") } : undefined}
             >
               {({ value, onChange, ref, ...control }) => (
                 <Input
                   {...control}
                   ref={ref}
-                  placeholder={SKILL_FIELD_CONFIG.id.placeholder}
+                  placeholder={t(SKILL_FIELD_CONFIG.id.placeholderKey)}
                   value={typeof value === "string" ? value : ""}
                   onChange={onChange}
                 />
@@ -73,14 +75,16 @@ const SkillsFieldArray = () => {
 
             <AgentFormField
               name={`skills.${index}.name`}
-              label={SKILL_FIELD_CONFIG.name.label}
-              rules={SKILL_FIELD_CONFIG.name.required ? { required: "Required" } : undefined}
+              label={t(SKILL_FIELD_CONFIG.name.labelKey)}
+              rules={
+                SKILL_FIELD_CONFIG.name.required ? { required: t("agents.formFields.errors.required") } : undefined
+              }
             >
               {({ value, onChange, ref, ...control }) => (
                 <Input
                   {...control}
                   ref={ref}
-                  placeholder={SKILL_FIELD_CONFIG.name.placeholder}
+                  placeholder={t(SKILL_FIELD_CONFIG.name.placeholderKey)}
                   value={typeof value === "string" ? value : ""}
                   onChange={onChange}
                 />
@@ -89,15 +93,19 @@ const SkillsFieldArray = () => {
 
             <AgentFormField
               name={`skills.${index}.description`}
-              label={SKILL_FIELD_CONFIG.description.label}
-              rules={SKILL_FIELD_CONFIG.description.required ? { required: "Required" } : undefined}
+              label={t(SKILL_FIELD_CONFIG.description.labelKey)}
+              rules={
+                SKILL_FIELD_CONFIG.description.required
+                  ? { required: t("agents.formFields.errors.required") }
+                  : undefined
+              }
             >
               {({ value, onChange, ref, ...control }) => (
                 <Textarea
                   {...control}
                   ref={ref}
                   rows={SKILL_FIELD_CONFIG.description.rows}
-                  placeholder={SKILL_FIELD_CONFIG.description.placeholder}
+                  placeholder={t(SKILL_FIELD_CONFIG.description.placeholderKey)}
                   value={typeof value === "string" ? value : ""}
                   onChange={onChange}
                 />
@@ -106,26 +114,28 @@ const SkillsFieldArray = () => {
 
             <AgentFormField
               name={`skills.${index}.tags`}
-              label={SKILL_FIELD_CONFIG.tags.label}
-              rules={SKILL_FIELD_CONFIG.tags.required ? { required: "Required" } : undefined}
+              label={t(SKILL_FIELD_CONFIG.tags.labelKey)}
+              rules={
+                SKILL_FIELD_CONFIG.tags.required ? { required: t("agents.formFields.errors.required") } : undefined
+              }
             >
               {({ id, value, onChange }) => (
                 <AgentTagsInput
                   id={id}
                   value={Array.isArray(value) ? (value as string[]) : []}
                   onValueChange={onChange}
-                  placeholder={SKILL_FIELD_CONFIG.tags.placeholder}
+                  placeholder={t(SKILL_FIELD_CONFIG.tags.placeholderKey)}
                 />
               )}
             </AgentFormField>
 
-            <AgentFormField name={`skills.${index}.examples`} label={SKILL_FIELD_CONFIG.examples.label}>
+            <AgentFormField name={`skills.${index}.examples`} label={t(SKILL_FIELD_CONFIG.examples.labelKey)}>
               {({ id, value, onChange }) => (
                 <AgentTagsInput
                   id={id}
                   value={Array.isArray(value) ? (value as string[]) : []}
                   onValueChange={onChange}
-                  placeholder={SKILL_FIELD_CONFIG.examples.placeholder}
+                  placeholder={t(SKILL_FIELD_CONFIG.examples.placeholderKey)}
                 />
               )}
             </AgentFormField>
@@ -138,19 +148,20 @@ const SkillsFieldArray = () => {
             onClick={() => remove(index)}
           >
             <Trash2 />
-            Remove Skill
+            {t("agents.formFields.skills.remove")}
           </Button>
         </div>
       ))}
       <Button type="button" variant="outline" className="w-full border-dashed" onClick={() => append({})}>
         <Plus />
-        Add Skill
+        {t("agents.formFields.skills.add")}
       </Button>
     </>
   );
 };
 
 const StaticHeadersFieldArray = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<AgentFormValues>();
   const { fields, append, remove } = useFieldArray({ control, name: "static_headers" });
 
@@ -158,25 +169,31 @@ const StaticHeadersFieldArray = () => {
     <>
       {fields.map((item, index) => (
         <div key={item.id} className="flex items-start gap-2">
-          <AgentFormField name={`static_headers.${index}.header`} rules={{ required: "Header name required" }}>
+          <AgentFormField
+            name={`static_headers.${index}.header`}
+            rules={{ required: t("agents.formFields.staticHeaders.errors.nameRequired") }}
+          >
             {({ value, onChange, ref, ...control }) => (
               <Input
                 {...control}
                 ref={ref}
                 className="w-55"
-                placeholder="Header name (e.g. Authorization)"
+                placeholder={t("agents.formFields.staticHeaders.namePlaceholder")}
                 value={typeof value === "string" ? value : ""}
                 onChange={onChange}
               />
             )}
           </AgentFormField>
-          <AgentFormField name={`static_headers.${index}.value`} rules={{ required: "Value required" }}>
+          <AgentFormField
+            name={`static_headers.${index}.value`}
+            rules={{ required: t("agents.formFields.staticHeaders.errors.valueRequired") }}
+          >
             {({ value, onChange, ref, ...control }) => (
               <Input
                 {...control}
                 ref={ref}
                 className="w-65"
-                placeholder="Value (e.g. Bearer token123)"
+                placeholder={t("agents.formFields.staticHeaders.valuePlaceholder")}
                 value={typeof value === "string" ? value : ""}
                 onChange={onChange}
               />
@@ -186,7 +203,7 @@ const StaticHeadersFieldArray = () => {
             type="button"
             variant="ghost"
             size="icon"
-            aria-label="Remove static header"
+            aria-label={t("agents.formFields.staticHeaders.remove")}
             className="text-destructive hover:text-destructive/80"
             onClick={() => remove(index)}
           >
@@ -196,13 +213,14 @@ const StaticHeadersFieldArray = () => {
       ))}
       <Button type="button" variant="outline" className="w-full border-dashed" onClick={() => append({})}>
         <Plus />
-        Add Static Header
+        {t("agents.formFields.staticHeaders.add")}
       </Button>
     </>
   );
 };
 
 const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName = true, visiblePanels }) => {
+  const { t } = useTranslation();
   const shouldShow = (key: string) => !visiblePanels || visiblePanels.includes(key);
 
   return (
@@ -211,14 +229,14 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         <FieldGroup className="mb-4">
           <AgentFormField
             name="agent_name"
-            label={labelWithHint("Agent Name", "Unique identifier for the agent")}
-            rules={{ required: "Please enter a unique agent name" }}
+            label={labelWithHint(t("agents.formFields.agentName.label"), t("agents.formFields.agentName.hint"))}
+            rules={{ required: t("agents.formFields.agentName.required") }}
           >
             {({ value, onChange, ref, ...control }) => (
               <Input
                 {...control}
                 ref={ref}
-                placeholder="e.g., customer-support-agent"
+                placeholder={t("agents.formFields.agentName.placeholder")}
                 value={typeof value === "string" ? value : ""}
                 onChange={onChange}
               />
@@ -231,7 +249,7 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         {shouldShow(AGENT_FORM_CONFIG.basic.key) && (
           <AgentFormPanel
             panelKey={AGENT_FORM_CONFIG.basic.key}
-            title={`${AGENT_FORM_CONFIG.basic.title} (Required)`}
+            title={t("agents.formFields.requiredSection", { section: t(AGENT_FORM_CONFIG.basic.titleKey) })}
             panels={panels}
           >
             {AGENT_FORM_CONFIG.basic.fields.map((field) => (
@@ -239,8 +257,12 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
                 key={field.name}
                 name={field.name}
                 label={field.tooltip ? labelWithHint(field.label, field.tooltip) : field.label}
-                description={field.helpText}
-                rules={field.required ? { required: `Please enter ${field.label.toLowerCase()}` } : undefined}
+                description={field.helpTextKey ? t(field.helpTextKey) : undefined}
+                rules={
+                  field.required
+                    ? { required: t("agents.formFields.errors.enterField", { field: field.label.toLowerCase() }) }
+                    : undefined
+                }
               >
                 {({ value, onChange, ref, ...control }) => {
                   const text = typeof value === "string" ? value : "";
@@ -284,7 +306,7 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         {shouldShow(AGENT_FORM_CONFIG.skills.key) && (
           <AgentFormPanel
             panelKey={AGENT_FORM_CONFIG.skills.key}
-            title={AGENT_FORM_CONFIG.skills.title}
+            title={t(AGENT_FORM_CONFIG.skills.titleKey)}
             panels={panels}
           >
             <SkillsFieldArray />
@@ -294,7 +316,7 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         {shouldShow(AGENT_FORM_CONFIG.capabilities.key) && (
           <AgentFormPanel
             panelKey={AGENT_FORM_CONFIG.capabilities.key}
-            title={AGENT_FORM_CONFIG.capabilities.title}
+            title={t(AGENT_FORM_CONFIG.capabilities.titleKey)}
             panels={panels}
           >
             {AGENT_FORM_CONFIG.capabilities.fields.map((field) => (
@@ -310,7 +332,7 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         {shouldShow(AGENT_FORM_CONFIG.optional.key) && (
           <AgentFormPanel
             panelKey={AGENT_FORM_CONFIG.optional.key}
-            title={AGENT_FORM_CONFIG.optional.title}
+            title={t(AGENT_FORM_CONFIG.optional.titleKey)}
             panels={panels}
           >
             {AGENT_FORM_CONFIG.optional.fields.map((field) => (
@@ -334,7 +356,11 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         )}
 
         {shouldShow(AGENT_FORM_CONFIG.cost.key) && (
-          <AgentFormPanel panelKey={AGENT_FORM_CONFIG.cost.key} title={AGENT_FORM_CONFIG.cost.title} panels={panels}>
+          <AgentFormPanel
+            panelKey={AGENT_FORM_CONFIG.cost.key}
+            title={t(AGENT_FORM_CONFIG.cost.titleKey)}
+            panels={panels}
+          >
             <CostConfigFields />
           </AgentFormPanel>
         )}
@@ -342,7 +368,7 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         {shouldShow(AGENT_FORM_CONFIG.litellm.key) && (
           <AgentFormPanel
             panelKey={AGENT_FORM_CONFIG.litellm.key}
-            title={AGENT_FORM_CONFIG.litellm.title}
+            title={t(AGENT_FORM_CONFIG.litellm.titleKey)}
             panels={panels}
           >
             {AGENT_FORM_CONFIG.litellm.fields.map((field) => (
@@ -366,12 +392,16 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         )}
 
         {shouldShow(AUTH_HEADERS_PANEL_KEY) && (
-          <AgentFormPanel panelKey={AUTH_HEADERS_PANEL_KEY} title="Authentication Headers" panels={panels}>
+          <AgentFormPanel
+            panelKey={AUTH_HEADERS_PANEL_KEY}
+            title={t("agents.formFields.authHeaders.title")}
+            panels={panels}
+          >
             <Field>
               <FieldTitle>
                 {labelWithHint(
-                  "Static Headers",
-                  "Headers always sent to the backend agent, regardless of the client request. Admin-configured, static wins on conflict.",
+                  t("agents.formFields.authHeaders.staticHeaders"),
+                  t("agents.formFields.authHeaders.staticHeadersHint"),
                 )}
               </FieldTitle>
               <div className="flex flex-col gap-2">
@@ -382,8 +412,8 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
             <AgentFormField
               name="extra_headers"
               label={labelWithHint(
-                "Forward Client Headers",
-                "Header names to extract from the client's request and forward to the agent. Type a name and press Enter.",
+                t("agents.formFields.authHeaders.forwardHeaders"),
+                t("agents.formFields.authHeaders.forwardHeadersHint"),
               )}
             >
               {({ id, value, onChange }) => (
@@ -391,7 +421,7 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
                   id={id}
                   value={Array.isArray(value) ? (value as string[]) : []}
                   onValueChange={onChange}
-                  placeholder="e.g. x-api-key, Authorization"
+                  placeholder={t("agents.formFields.authHeaders.forwardHeadersPlaceholder")}
                 />
               )}
             </AgentFormField>
@@ -399,7 +429,7 @@ const AgentFormFields: React.FC<AgentFormFieldsProps> = ({ panels, showAgentName
         )}
 
         {shouldShow(KILL_SWITCH_PANEL_KEY) && (
-          <AgentFormPanel panelKey={KILL_SWITCH_PANEL_KEY} title="Kill Switch" panels={panels}>
+          <AgentFormPanel panelKey={KILL_SWITCH_PANEL_KEY} title={t("agents.formFields.killSwitch")} panels={panels}>
             <KillSwitchFormFields />
           </AgentFormPanel>
         )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx
index 68c0a6a702d..554116716ea 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx
@@ -14,6 +14,7 @@ import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { Field, FieldGroup, FieldLabel } from "@/components/ui/field";
 import { toast } from "@/lib/toast";
 import { ArrowLeft } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { getAgentInfo, patchAgentCall, getAgentCreateMetadata, AgentCreateInfo } from "@/components/networking";
 import { Agent } from "@/components/agents/types";
 import { KeyResponse } from "@/components/key_team_helpers/key_list";
@@ -79,6 +80,7 @@ const DetailItem: React.FC<{ label: React.ReactNode; children: React.ReactNode }
 );
 
 const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessToken, isAdmin }) => {
+  const { t } = useTranslation();
   const [agent, setAgent] = useState<Agent | null>(null);
   const [selectedKey, setSelectedKey] = useState<KeyResponse | null>(null);
   const { data: keysData, isLoading: keysLoading, refetch: refetchAgentKeys } = useKeys(1, 100, { agentID: agentId });
@@ -127,7 +129,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
       if (agentType === "a2a") {
         form.reset(parseAgentForForm(data));
       } else {
-        const typeInfo = agentTypeMetadata.find((t) => t.agent_type === agentType);
+        const typeInfo = agentTypeMetadata.find((info) => info.agent_type === agentType);
         if (typeInfo) {
           form.reset({
             ...parseDynamicAgentForForm(data, typeInfo),
@@ -140,7 +142,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
       }
     } catch (error) {
       console.error("Error fetching agent info:", error);
-      toast.error("Failed to load agent information");
+      toast.error(t("agents.info.toasts.loadFailed"));
     } finally {
       setIsLoading(false);
     }
@@ -151,7 +153,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
     if (agent && agentTypeMetadata.length > 0) {
       const agentType = detectAgentType(agent);
       if (agentType !== "a2a") {
-        const typeInfo = agentTypeMetadata.find((t) => t.agent_type === agentType);
+        const typeInfo = agentTypeMetadata.find((info) => info.agent_type === agentType);
         if (typeInfo) {
           form.reset({
             ...parseDynamicAgentForForm(agent, typeInfo),
@@ -163,7 +165,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
     }
   }, [agentTypeMetadata, agent]);
 
-  const selectedAgentTypeInfo = agentTypeMetadata.find((t) => t.agent_type === detectedAgentType);
+  const selectedAgentTypeInfo = agentTypeMetadata.find((info) => info.agent_type === detectedAgentType);
   const watchedFormValues = useWatch({ control: form.control });
   const mcpSelection = useWatch({ control: form.control, name: "allowed_mcp_servers_and_groups" });
   const mcpToolPermissions = useWatch({ control: form.control, name: "mcp_tool_permissions" });
@@ -249,12 +251,12 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
         object_permission: buildMcpObjectPermission(values),
         access_group_ids: values.access_group_ids ?? [],
       });
-      toast.success("Agent updated successfully");
+      toast.success(t("agents.info.toasts.updated"));
       setIsEditing(false);
       fetchAgentInfo();
     } catch (error) {
       console.error("Error updating agent:", error);
-      toast.error("Failed to update agent");
+      toast.error(t("agents.info.toasts.updateFailed"));
     } finally {
       setIsSaving(false);
     }
@@ -273,9 +275,9 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
   if (!agent) {
     return (
       <div className="p-4">
-        <div className="text-center">Agent not found</div>
+        <div className="text-center">{t("agents.info.notFound")}</div>
         <Button onClick={onClose} className="mt-4">
-          Back to Agents List
+          {t("agents.info.backToList")}
         </Button>
       </div>
     );
@@ -297,7 +299,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
           onChange={onChange}
           inputRef={ref}
           min={0}
-          placeholder="Unlimited"
+          placeholder={t("agents.info.unlimited")}
         />
       )}
     </AgentFormField>
@@ -314,7 +316,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
           refetchAgentKeys();
         }}
         teams={null}
-        backButtonText="Back to Agent"
+        backButtonText={t("agents.info.backToAgent")}
       />
     );
   }
@@ -324,20 +326,20 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
       <div>
         <Button variant="ghost" onClick={onClose} className="mb-4">
           <ArrowLeft className="size-4" />
-          Back to Agents
+          {t("agents.info.backToAgents")}
         </Button>
-        <h1 className="text-2xl font-semibold">{agent.agent_name || "Unnamed Agent"}</h1>
+        <h1 className="text-2xl font-semibold">{agent.agent_name || t("agents.info.unnamed")}</h1>
         <p className="text-sm text-muted-foreground font-mono">{agent.agent_id}</p>
       </div>
 
       <Tabs value={activeTab} onValueChange={setActiveTab}>
         <TabsList variant="line" className="mb-4 h-auto w-full justify-start rounded-none border-b p-0">
           <TabsTrigger value="overview" className="flex-none rounded-none px-4 py-2">
-            Overview
+            {t("agents.info.tabs.overview")}
           </TabsTrigger>
           {isAdmin && (
             <TabsTrigger value="settings" className="flex-none rounded-none px-4 py-2">
-              Settings
+              {t("agents.info.tabs.settings")}
             </TabsTrigger>
           )}
         </TabsList>
@@ -352,38 +354,62 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
               isAdmin={isAdmin}
             />
             <DetailList>
-              <DetailItem label="Agent ID">{agent.agent_id}</DetailItem>
-              <DetailItem label="Agent Name">{agent.agent_name}</DetailItem>
-              <DetailItem label="Display Name">{agent.agent_card_params?.name || "-"}</DetailItem>
-              <DetailItem label="Description">{agent.agent_card_params?.description || "-"}</DetailItem>
-              <DetailItem label="URL">{agent.agent_card_params?.url || "-"}</DetailItem>
-              <DetailItem label="Version">{agent.agent_card_params?.version || "-"}</DetailItem>
-              <DetailItem label="Protocol Version">{agent.agent_card_params?.protocolVersion || "-"}</DetailItem>
-              <DetailItem label="Streaming">
-                {agent.agent_card_params?.capabilities?.streaming ? "Yes" : "No"}
+              <DetailItem label={t("agents.info.details.agentId")}>{agent.agent_id}</DetailItem>
+              <DetailItem label={t("agents.info.details.agentName")}>{agent.agent_name}</DetailItem>
+              <DetailItem label={t("agents.info.details.displayName")}>
+                {agent.agent_card_params?.name || "-"}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.description")}>
+                {agent.agent_card_params?.description || "-"}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.url")}>{agent.agent_card_params?.url || "-"}</DetailItem>
+              <DetailItem label={t("agents.info.details.version")}>
+                {agent.agent_card_params?.version || "-"}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.protocolVersion")}>
+                {agent.agent_card_params?.protocolVersion || "-"}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.streaming")}>
+                {agent.agent_card_params?.capabilities?.streaming ? t("agents.info.yes") : t("agents.info.no")}
               </DetailItem>
               {agent.agent_card_params?.capabilities?.pushNotifications && (
-                <DetailItem label="Push Notifications">Yes</DetailItem>
+                <DetailItem label={t("agents.info.details.pushNotifications")}>{t("agents.info.yes")}</DetailItem>
               )}
               {agent.agent_card_params?.capabilities?.stateTransitionHistory && (
-                <DetailItem label="State Transition History">Yes</DetailItem>
+                <DetailItem label={t("agents.info.details.stateTransitionHistory")}>{t("agents.info.yes")}</DetailItem>
+              )}
+              <DetailItem label={t("agents.info.details.skills")}>
+                {t("agents.info.skillsConfigured", { count: agent.agent_card_params?.skills?.length || 0 })}
+              </DetailItem>
+              {agent.litellm_params?.model && (
+                <DetailItem label={t("agents.info.details.model")}>{agent.litellm_params.model}</DetailItem>
               )}
-              <DetailItem label="Skills">{agent.agent_card_params?.skills?.length || 0} configured</DetailItem>
-              {agent.litellm_params?.model && <DetailItem label="Model">{agent.litellm_params.model}</DetailItem>}
               {agent.litellm_params?.make_public !== undefined && (
-                <DetailItem label="Make Public">{agent.litellm_params.make_public ? "Yes" : "No"}</DetailItem>
+                <DetailItem label={t("agents.info.details.makePublic")}>
+                  {agent.litellm_params.make_public ? t("agents.info.yes") : t("agents.info.no")}
+                </DetailItem>
               )}
               {agent.agent_card_params?.iconUrl && (
-                <DetailItem label="Icon URL">{agent.agent_card_params.iconUrl}</DetailItem>
+                <DetailItem label={t("agents.info.details.iconUrl")}>{agent.agent_card_params.iconUrl}</DetailItem>
               )}
               {agent.agent_card_params?.documentationUrl && (
-                <DetailItem label="Documentation URL">{agent.agent_card_params.documentationUrl}</DetailItem>
+                <DetailItem label={t("agents.info.details.documentationUrl")}>
+                  {agent.agent_card_params.documentationUrl}
+                </DetailItem>
               )}
-              <DetailItem label="TPM Limit">{agent.tpm_limit ?? "Unlimited"}</DetailItem>
-              <DetailItem label="RPM Limit">{agent.rpm_limit ?? "Unlimited"}</DetailItem>
-              <DetailItem label="Session TPM Limit">{agent.session_tpm_limit ?? "Unlimited"}</DetailItem>
-              <DetailItem label="Session RPM Limit">{agent.session_rpm_limit ?? "Unlimited"}</DetailItem>
-              <DetailItem label="Access Groups">
+              <DetailItem label={t("agents.info.details.tpmLimit")}>
+                {agent.tpm_limit ?? t("agents.info.unlimited")}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.rpmLimit")}>
+                {agent.rpm_limit ?? t("agents.info.unlimited")}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.sessionTpmLimit")}>
+                {agent.session_tpm_limit ?? t("agents.info.unlimited")}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.sessionRpmLimit")}>
+                {agent.session_rpm_limit ?? t("agents.info.unlimited")}
+              </DetailItem>
+              <DetailItem label={t("agents.info.details.accessGroups")}>
                 {agent.access_group_ids?.length ? (
                   <div className="space-y-1">
                     {agent.access_group_ids.map((accessGroupId) => (
@@ -391,11 +417,11 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                     ))}
                   </div>
                 ) : (
-                  "None"
+                  t("agents.info.none")
                 )}
               </DetailItem>
-              <DetailItem label="Created At">{formatDate(agent.created_at)}</DetailItem>
-              <DetailItem label="Updated At">{formatDate(agent.updated_at)}</DetailItem>
+              <DetailItem label={t("agents.info.details.createdAt")}>{formatDate(agent.created_at)}</DetailItem>
+              <DetailItem label={t("agents.info.details.updatedAt")}>{formatDate(agent.updated_at)}</DetailItem>
             </DetailList>
 
             <AgentVirtualKeys keys={agentKeys} isLoading={keysLoading} onKeyClick={setSelectedKey} />
@@ -407,10 +433,10 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                 (agent.object_permission.mcp_tool_permissions &&
                   Object.keys(agent.object_permission.mcp_tool_permissions).length > 0)) && (
                 <div style={{ marginTop: 24 }}>
-                  <h3 className="text-lg font-medium">MCP Tool Permissions</h3>
+                  <h3 className="text-lg font-medium">{t("agents.info.mcpPermissions.title")}</h3>
                   <DetailList className="mt-4">
                     {agent.object_permission.mcp_servers && agent.object_permission.mcp_servers.length > 0 && (
-                      <DetailItem label="MCP Servers">
+                      <DetailItem label={t("agents.info.mcpPermissions.servers")}>
                         <div className="space-y-1">
                           {agent.object_permission.mcp_servers.map((serverId) => (
                             <div key={serverId}>{mcpServerLabel(serverId)}</div>
@@ -420,16 +446,18 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                     )}
                     {agent.object_permission.mcp_access_groups &&
                       agent.object_permission.mcp_access_groups.length > 0 && (
-                        <DetailItem label="MCP Access Groups">
+                        <DetailItem label={t("agents.info.mcpPermissions.accessGroups")}>
                           {agent.object_permission.mcp_access_groups.join(", ")}
                         </DetailItem>
                       )}
                     {agent.object_permission.mcp_toolsets && agent.object_permission.mcp_toolsets.length > 0 && (
-                      <DetailItem label="MCP Toolsets">{agent.object_permission.mcp_toolsets.join(", ")}</DetailItem>
+                      <DetailItem label={t("agents.info.mcpPermissions.toolsets")}>
+                        {agent.object_permission.mcp_toolsets.join(", ")}
+                      </DetailItem>
                     )}
                     {agent.object_permission.mcp_tool_permissions &&
                       Object.keys(agent.object_permission.mcp_tool_permissions).length > 0 && (
-                        <DetailItem label="Tool permissions per server">
+                        <DetailItem label={t("agents.info.mcpPermissions.toolsPerServer")}>
                           <div className="space-y-1">
                             {Object.entries(agent.object_permission.mcp_tool_permissions).map(([serverId, tools]) => (
                               <div key={serverId}>
@@ -448,23 +476,27 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
 
             {agent.agent_card_params?.skills && agent.agent_card_params.skills.length > 0 && (
               <div style={{ marginTop: 24 }}>
-                <h3 className="text-lg font-medium">Skills</h3>
+                <h3 className="text-lg font-medium">{t("agents.info.skillsSection.title")}</h3>
                 <DetailList className="mt-4">
                   {agent.agent_card_params.skills.map((skill, index) => (
-                    <DetailItem label={skill.name || `Skill ${index + 1}`} key={index}>
+                    <DetailItem
+                      label={skill.name || t("agents.info.skillsSection.fallbackName", { number: index + 1 })}
+                      key={index}
+                    >
                       <div>
                         <div>
-                          <strong>ID:</strong> {skill.id}
+                          <strong>{t("agents.info.skillsSection.id")}</strong> {skill.id}
                         </div>
                         <div>
-                          <strong>Description:</strong> {skill.description}
+                          <strong>{t("agents.info.skillsSection.description")}</strong> {skill.description}
                         </div>
                         <div>
-                          <strong>Tags:</strong> {Array.isArray(skill.tags) ? skill.tags.join(", ") : skill.tags}
+                          <strong>{t("agents.info.skillsSection.tags")}</strong>{" "}
+                          {Array.isArray(skill.tags) ? skill.tags.join(", ") : skill.tags}
                         </div>
                         {skill.examples && skill.examples.length > 0 && (
                           <div>
-                            <strong>Examples:</strong>{" "}
+                            <strong>{t("agents.info.skillsSection.examples")}</strong>{" "}
                             {Array.isArray(skill.examples) ? skill.examples.join(", ") : skill.examples}
                           </div>
                         )}
@@ -489,7 +521,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
             <TabsContent value="settings" keepMounted>
               <Card className="block p-6">
                 <div className="flex justify-between items-center mb-4">
-                  <h3 className="text-lg font-medium">Agent Settings</h3>
+                  <h3 className="text-lg font-medium">{t("agents.info.settings.title")}</h3>
                   {!isEditing && (
                     <Button
                       onClick={() => {
@@ -497,7 +529,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                         setIsEditing(true);
                       }}
                     >
-                      Edit Settings
+                      {t("agents.info.settings.edit")}
                     </Button>
                   )}
                 </div>
@@ -508,7 +540,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                       <form onSubmit={form.handleSubmit(handleUpdate)}>
                         <FieldGroup className="mb-4">
                           <Field>
-                            <FieldLabel htmlFor="agent-id">Agent ID</FieldLabel>
+                            <FieldLabel htmlFor="agent-id">{t("agents.info.settings.agentId")}</FieldLabel>
                             <Input id="agent-id" value={agent.agent_id} disabled readOnly />
                           </Field>
                         </FieldGroup>
@@ -533,44 +565,44 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                         )}
 
                         <Separator className="my-6" />
-                        <h3 className="text-lg font-medium mb-4">Rate Limits</h3>
+                        <h3 className="text-lg font-medium mb-4">{t("agents.info.settings.rateLimits")}</h3>
                         <div className="grid grid-cols-2 gap-4">
-                          {rateLimitField("tpm_limit", "TPM Limit")}
-                          {rateLimitField("rpm_limit", "RPM Limit")}
+                          {rateLimitField("tpm_limit", t("agents.info.settings.tpmLimit"))}
+                          {rateLimitField("rpm_limit", t("agents.info.settings.rpmLimit"))}
                         </div>
                         <div className="mt-4 grid grid-cols-2 gap-4">
-                          {rateLimitField("session_tpm_limit", "Session TPM Limit")}
-                          {rateLimitField("session_rpm_limit", "Session RPM Limit")}
+                          {rateLimitField("session_tpm_limit", t("agents.info.settings.sessionTpmLimit"))}
+                          {rateLimitField("session_rpm_limit", t("agents.info.settings.sessionRpmLimit"))}
                         </div>
 
                         <Separator className="my-6" />
-                        <h3 className="text-lg font-medium mb-4">Access Groups</h3>
+                        <h3 className="text-lg font-medium mb-4">{t("agents.info.settings.accessGroups.title")}</h3>
                         <FieldGroup>
                           <AgentFormField
                             name="access_group_ids"
                             label={labelWithHint(
-                              "Access Groups",
-                              "Attached groups cap which models, MCP servers, and agents this agent can reach, on top of its key and team permissions. Leave empty to apply no extra cap.",
+                              t("agents.info.settings.accessGroups.label"),
+                              t("agents.info.settings.accessGroups.hint"),
                             )}
                           >
                             {({ value, onChange }) => (
                               <AccessGroupSelector
                                 value={Array.isArray(value) ? (value as string[]) : []}
                                 onChange={onChange}
-                                placeholder="Select access groups (optional)"
+                                placeholder={t("agents.info.settings.accessGroups.placeholder")}
                               />
                             )}
                           </AgentFormField>
                         </FieldGroup>
 
                         <Separator className="my-6" />
-                        <h3 className="text-lg font-medium mb-4">MCP Servers</h3>
+                        <h3 className="text-lg font-medium mb-4">{t("agents.info.settings.mcpServers.title")}</h3>
                         <FieldGroup>
                           <AgentFormField
                             name="allowed_mcp_servers_and_groups"
                             label={labelWithHint(
-                              "Allowed MCP Servers",
-                              "Select which MCP servers or access groups this agent can access. Keys bound to this agent can only reach servers granted here.",
+                              t("agents.info.settings.mcpServers.label"),
+                              t("agents.info.settings.mcpServers.hint"),
                             )}
                           >
                             {({ value, onChange }) => (
@@ -582,7 +614,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                                   toolsets: (value as McpServerSelection | undefined)?.toolsets ?? [],
                                 }}
                                 accessToken={accessToken ?? ""}
-                                placeholder="Select MCP servers or access groups (optional)"
+                                placeholder={t("agents.info.settings.mcpServers.placeholder")}
                               />
                             )}
                           </AgentFormField>
@@ -608,18 +640,18 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                               fetchAgentInfo();
                             }}
                           >
-                            Cancel
+                            {t("agents.info.settings.cancel")}
                           </Button>
                           <Button type="submit" disabled={isSaving} aria-busy={isSaving}>
                             {isSaving && <UiLoadingSpinner className="size-4" />}
-                            Save Changes
+                            {t("agents.info.settings.save")}
                           </Button>
                         </div>
                       </form>
                     </FormProvider>
                   </TooltipProvider>
                 ) : (
-                  <p>Click &quot;Edit Settings&quot; to modify agent configuration.</p>
+                  <p>{t("agents.info.settings.editHint")}</p>
                 )}
               </Card>
             </TabsContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_virtual_keys.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_virtual_keys.tsx
index f9485c2b1a7..c6846b9a071 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_virtual_keys.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_virtual_keys.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { KeyRound } from "lucide-react";
 import { KeyResponse } from "@/components/key_team_helpers/key_list";
 import { Button } from "@/components/ui/button";
@@ -11,19 +12,22 @@ interface AgentVirtualKeysProps {
 }
 
 const AgentVirtualKeys: React.FC<AgentVirtualKeysProps> = ({ keys, isLoading, onKeyClick }) => {
+  const { t } = useTranslation();
   return (
     <div className="mt-6">
-      <h4 className="text-base font-semibold text-foreground">Virtual Keys</h4>
+      <h4 className="text-base font-semibold text-foreground">{t("agents.virtualKeys.title")}</h4>
       {isLoading ? (
-        <p className="mt-2 text-sm text-muted-foreground">Loading keys...</p>
+        <p className="mt-2 text-sm text-muted-foreground">{t("agents.virtualKeys.loading")}</p>
       ) : keys.length === 0 ? (
-        <p className="mt-2 text-sm text-muted-foreground">No virtual key assigned to this agent.</p>
+        <p className="mt-2 text-sm text-muted-foreground">{t("agents.virtualKeys.empty")}</p>
       ) : (
         <div className="mt-3 flex flex-col gap-2">
           {keys.map((key) => (
             <div key={key.token} className="flex items-center gap-3 rounded-sm border border-border px-3 py-2">
               <KeyRound className="size-4 text-muted-foreground" />
-              <span className="text-sm font-medium text-foreground">{key.key_alias || "Unnamed key"}</span>
+              <span className="text-sm font-medium text-foreground">
+                {key.key_alias || t("agents.virtualKeys.unnamed")}
+              </span>
               {key.key_name && <span className="font-mono text-xs text-muted-foreground">{key.key_name}</span>}
               <TooltipProvider delay={300}>
                 <Tooltip>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/dynamic_agent_form_fields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/dynamic_agent_form_fields.tsx
index 85ffbffeab1..4ec37821989 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/dynamic_agent_form_fields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/dynamic_agent_form_fields.tsx
@@ -1,10 +1,13 @@
 import React from "react";
+import type { TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
 import { FieldGroup } from "@/components/ui/field";
 import { AgentCreateInfo, AgentCredentialFieldMetadata } from "@/components/networking";
 import { PasswordInput } from "@/components/shared/PasswordInput";
+import i18n from "@/i18n/i18n";
 import { AGENT_FORM_CONFIG, applyKillSwitchToPayload } from "./agent_config";
 import CostConfigFields, { COST_FIELD_NAMES } from "./cost_config_fields";
 import KillSwitchFormFields from "./KillSwitchFormFields";
@@ -32,12 +35,13 @@ export const unmountedDynamicFieldNames = (mountedPanels: readonly string[]): re
 // validation rather than throwing during render and taking the whole form down with it.
 const buildValidationPatternRule = (
   field: AgentCredentialFieldMetadata,
+  t: TFunction,
 ): { value: RegExp; message: string } | undefined => {
   if (!field.validation_pattern) return undefined;
   try {
     return {
       value: new RegExp(field.validation_pattern),
-      message: field.validation_message || `${field.label} looks incomplete or malformed`,
+      message: field.validation_message || t("agents.dynamicFields.errors.malformed", { field: field.label }),
     };
   } catch {
     return undefined;
@@ -45,14 +49,15 @@ const buildValidationPatternRule = (
 };
 
 const CredentialField = ({ field }: { field: AgentCredentialFieldMetadata }) => {
-  const patternRule = buildValidationPatternRule(field);
+  const { t } = useTranslation();
+  const patternRule = buildValidationPatternRule(field, t);
   return (
     <AgentFormField
       name={field.key}
       label={field.tooltip ? labelWithHint(field.label, field.tooltip) : field.label}
       defaultValue={field.default_value ?? undefined}
       rules={{
-        ...(field.required ? { required: `Please enter ${field.label}` } : {}),
+        ...(field.required ? { required: t("agents.dynamicFields.errors.enterField", { field: field.label }) } : {}),
         ...(patternRule ? { pattern: patternRule } : {}),
       }}
     >
@@ -108,14 +113,17 @@ const DynamicAgentFormFields: React.FC<DynamicAgentFormFieldsProps> = ({ agentTy
     <FieldGroup className="mb-4">
       <AgentFormField
         name="agent_name"
-        label={labelWithHint("Agent Name", "Unique identifier for the agent")}
-        rules={{ required: "Please enter a unique agent name" }}
+        label={labelWithHint(
+          i18n.t("agents.dynamicFields.agentName.label"),
+          i18n.t("agents.dynamicFields.agentName.hint"),
+        )}
+        rules={{ required: i18n.t("agents.dynamicFields.agentName.required") }}
       >
         {({ value, onChange, ref, ...control }) => (
           <Input
             {...control}
             ref={ref}
-            placeholder="e.g., my-langgraph-agent"
+            placeholder={i18n.t("agents.dynamicFields.agentName.placeholder")}
             value={typeof value === "string" ? value : ""}
             onChange={onChange}
           />
@@ -124,14 +132,17 @@ const DynamicAgentFormFields: React.FC<DynamicAgentFormFieldsProps> = ({ agentTy
 
       <AgentFormField
         name="description"
-        label={labelWithHint("Description", "Brief description of what this agent does")}
+        label={labelWithHint(
+          i18n.t("agents.dynamicFields.description.label"),
+          i18n.t("agents.dynamicFields.description.hint"),
+        )}
       >
         {({ value, onChange, ref, ...control }) => (
           <Textarea
             {...control}
             ref={ref}
             rows={2}
-            placeholder="Describe what this agent does..."
+            placeholder={i18n.t("agents.dynamicFields.description.placeholder")}
             value={typeof value === "string" ? value : ""}
             onChange={onChange}
           />
@@ -144,10 +155,18 @@ const DynamicAgentFormFields: React.FC<DynamicAgentFormFieldsProps> = ({ agentTy
     </FieldGroup>
 
     <div className="mb-4 rounded-md border border-border px-4">
-      <AgentFormPanel panelKey={AGENT_FORM_CONFIG.cost.key} title={AGENT_FORM_CONFIG.cost.title} panels={panels}>
+      <AgentFormPanel
+        panelKey={AGENT_FORM_CONFIG.cost.key}
+        title={i18n.t(AGENT_FORM_CONFIG.cost.titleKey)}
+        panels={panels}
+      >
         <CostConfigFields />
       </AgentFormPanel>
-      <AgentFormPanel panelKey={KILL_SWITCH_PANEL_KEY} title="Kill Switch" panels={panels}>
+      <AgentFormPanel
+        panelKey={KILL_SWITCH_PANEL_KEY}
+        title={i18n.t("agents.dynamicFields.killSwitch")}
+        panels={panels}
+      >
         <KillSwitchFormFields />
       </AgentFormPanel>
     </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/kill_switch_config.ts b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/kill_switch_config.ts
index d59808bc1b3..c14b2b68d2b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/kill_switch_config.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/kill_switch_config.ts
@@ -1,3 +1,5 @@
+import type { ParseKeys, TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
 import type { components } from "@/lib/http/schema";
 
 export type KillSwitchConfig = components["schemas"]["AgentKillSwitchConfig"];
@@ -6,11 +8,11 @@ export type KillSwitchMethod = NonNullable<KillSwitchConfig["method"]>;
 export type KillSwitchAuthType = KillSwitchAuth["type"] | "none";
 
 export const KILL_SWITCH_METHODS: readonly KillSwitchMethod[] = ["POST", "PUT", "PATCH", "DELETE", "GET"];
-export const KILL_SWITCH_AUTH_TYPES: readonly { value: KillSwitchAuthType; label: string }[] = [
-  { value: "none", label: "None" },
-  { value: "bearer", label: "Bearer token" },
-  { value: "api_key", label: "API key header" },
-  { value: "basic", label: "Basic auth" },
+export const KILL_SWITCH_AUTH_TYPES: readonly { value: KillSwitchAuthType; labelKey: ParseKeys }[] = [
+  { value: "none", labelKey: "agents.killSwitchConfig.authTypes.none" },
+  { value: "bearer", labelKey: "agents.killSwitchConfig.authTypes.bearer" },
+  { value: "api_key", labelKey: "agents.killSwitchConfig.authTypes.apiKey" },
+  { value: "basic", labelKey: "agents.killSwitchConfig.authTypes.basic" },
 ];
 
 export interface KeyValueFormValue {
@@ -61,12 +63,12 @@ export const parseKillSwitchBody = (text: string | undefined): Record<string, un
   return parsed as Record<string, unknown>;
 };
 
-export const validateKillSwitchBody = (text: string | undefined): true | string => {
+export const validateKillSwitchBody = (text: string | undefined, t: TFunction = i18n.t.bind(i18n)): true | string => {
   try {
     parseKillSwitchBody(text);
     return true;
   } catch (error) {
-    return error instanceof Error ? error.message : "Body must be valid JSON";
+    return error instanceof Error ? error.message : t("agents.killSwitchConfig.errors.invalidJson");
   }
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/ErrorDrilldown.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/ErrorDrilldown.tsx
index 0bf670abc08..ba117360f81 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/ErrorDrilldown.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/ErrorDrilldown.tsx
@@ -2,6 +2,7 @@
 
 import React from "react";
 import { X } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { BarChart } from "@/components/shared/charts";
 import type { ChartTooltipProps } from "@/components/shared/charts/chart_tooltip";
 import { Button } from "@/components/ui/button";
@@ -40,6 +41,7 @@ export const groupErrorBuckets = (buckets: readonly CacheActivityErrorBucket[],
 };
 
 export const ErrorCodeTooltip = ({ active, payload, label }: ChartTooltipProps) => {
+  const { t } = useTranslation();
   if (!active || !payload || payload.length === 0) return null;
   const datum = payload[0]?.payload as ErrorCodeDatum | undefined;
   if (!datum) return null;
@@ -47,7 +49,10 @@ export const ErrorCodeTooltip = ({ active, payload, label }: ChartTooltipProps)
   return (
     <div className="min-w-40 rounded-lg border border-border/50 bg-background px-2.5 py-1.5 text-xs shadow-xl">
       <p className="mb-1.5 font-medium text-foreground">
-        Error code {String(label)}: {datum[FAILED_REQUESTS_SERIES].toLocaleString()} failed
+        {t("caching.errorDrilldown.tooltipTitle", {
+          code: String(label),
+          total: datum[FAILED_REQUESTS_SERIES].toLocaleString(),
+        })}
       </p>
       <div className="grid gap-1.5">
         {datum.classes.map((errorClass) => (
@@ -70,27 +75,33 @@ interface ErrorDrilldownCardProps {
   onClose: () => void;
 }
 
-export const ErrorDrilldownCard = ({ callType, buckets, valueFormatter, onClose }: ErrorDrilldownCardProps) => (
-  <Card className="mt-4">
-    <CardHeader className="flex flex-row items-center justify-between">
-      <CardTitle className="text-base font-semibold">Failed requests by error code: {callType}</CardTitle>
-      <Button variant="outline" size="icon-sm" onClick={onClose} aria-label="Close error breakdown">
-        <X />
-      </Button>
-    </CardHeader>
-    <CardContent>
-      <p className="text-sm text-muted-foreground">Hover a bar to see the error classes behind that code.</p>
-      <BarChart
-        data={groupErrorBuckets(buckets, callType)}
-        index="error_code"
-        categories={[FAILED_REQUESTS_SERIES]}
-        colors={["red"]}
-        valueFormatter={valueFormatter}
-        showLegend={false}
-        customTooltip={ErrorCodeTooltip}
-        yAxisWidth={48}
-        className="mt-2"
-      />
-    </CardContent>
-  </Card>
-);
+export const ErrorDrilldownCard = ({ callType, buckets, valueFormatter, onClose }: ErrorDrilldownCardProps) => {
+  const { t } = useTranslation();
+  return (
+    <Card className="mt-4">
+      <CardHeader className="flex flex-row items-center justify-between">
+        <CardTitle className="text-base font-semibold">
+          {t("caching.errorDrilldown.title")}
+          {callType}
+        </CardTitle>
+        <Button variant="outline" size="icon-sm" onClick={onClose} aria-label={t("caching.errorDrilldown.close")}>
+          <X />
+        </Button>
+      </CardHeader>
+      <CardContent>
+        <p className="text-sm text-muted-foreground">{t("caching.errorDrilldown.hint")}</p>
+        <BarChart
+          data={groupErrorBuckets(buckets, callType)}
+          index="error_code"
+          categories={[FAILED_REQUESTS_SERIES]}
+          colors={["red"]}
+          valueFormatter={valueFormatter}
+          showLegend={false}
+          customTooltip={ErrorCodeTooltip}
+          yAxisWidth={48}
+          className="mt-2"
+        />
+      </CardContent>
+    </Card>
+  );
+};
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_dashboard.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_dashboard.tsx
index 9e730be4df3..311258dfc71 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_dashboard.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_dashboard.tsx
@@ -1,5 +1,7 @@
 import type { DateRangePickerValue } from "@/components/shared/date_picker_types";
+import type { TFunction } from "i18next";
 import React, { useEffect, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import AdvancedDatePicker from "@/components/shared/advanced_date_picker";
 import { BarChart } from "@/components/shared/charts";
@@ -32,23 +34,22 @@ import CoordinationRedisSettings from "./coordination_redis_settings";
 import { ErrorDrilldownCard } from "./ErrorDrilldown";
 
 const REQUEST_SERIES = {
-  apiRequests: "LLM API requests",
-  cacheHits: "Cache hit",
-  failed: "Failed requests",
+  apiRequests: "caching.dashboard.series.apiRequests",
+  cacheHits: "caching.dashboard.series.cacheHits",
+  failed: "caching.dashboard.series.failed",
 } as const;
 
 const UNKNOWN_CALL_TYPE = "Unknown";
 
-const UNKNOWN_CALL_TYPE_NOTE =
-  "Unknown groups spend logs that recorded no endpoint. Older proxy versions wrote those for requests rejected before routing, so they are not necessarily LLM API requests.";
+const UNKNOWN_CALL_TYPE_NOTE = "caching.dashboard.requestsChart.unknownCallTypeNote";
 
-const toChartDatum = (group: CacheActivityGroup) => ({
+const toChartDatum = (group: CacheActivityGroup, t: TFunction) => ({
   name: group.call_type,
-  [REQUEST_SERIES.apiRequests]: group.api_requests,
-  [REQUEST_SERIES.cacheHits]: group.cache_hits,
-  [REQUEST_SERIES.failed]: group.failed_requests,
-  "Cached Completion Tokens": group.cached_completion_tokens,
-  "Generated Completion Tokens": group.generated_completion_tokens,
+  [t(REQUEST_SERIES.apiRequests)]: group.api_requests,
+  [t(REQUEST_SERIES.cacheHits)]: group.cache_hits,
+  [t(REQUEST_SERIES.failed)]: group.failed_requests,
+  [t("caching.dashboard.series.cachedCompletionTokens")]: group.cached_completion_tokens,
+  [t("caching.dashboard.series.generatedCompletionTokens")]: group.generated_completion_tokens,
 });
 
 const formatDateWithoutTZ = (date: Date | undefined) => {
@@ -82,6 +83,7 @@ interface CachePageProps {
 // Helper function to deep-parse a JSON string if possible
 
 const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole, userID, premiumUser }) => {
+  const { t } = useTranslation();
   const anchor1 = useComboboxAnchor();
   const anchor2 = useComboboxAnchor();
   const [selectedApiKeys, setSelectedApiKeys] = useState<string[]>([]);
@@ -114,7 +116,7 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
 
   const uniqueApiKeys = activity?.filter_options.key_aliases ?? [];
   const uniqueModels = activity?.filter_options.models ?? [];
-  const chartData = (activity?.groups ?? []).map(toChartDatum);
+  const chartData = (activity?.groups ?? []).map((group) => toChartDatum(group, t));
   const hasUnknownGroup = (activity?.groups ?? []).some((group) => group.call_type === UNKNOWN_CALL_TYPE);
   const activeDrilldownCallType = resolveDrilldownCallType(errorDrilldownCallType, activity?.groups ?? []);
 
@@ -125,7 +127,7 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
 
   const runCachingHealthCheck = async () => {
     try {
-      toast.info("Running cache health check...");
+      toast.info(t("caching.dashboard.healthCheck.running"));
       setHealthCheckResponse("");
       const response = await cachingHealthCheckCall(accessToken !== null ? accessToken : "");
       setHealthCheckResponse(response);
@@ -145,7 +147,7 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
           errorData = { message: error.message };
         }
       } else {
-        errorData = { message: "Unknown error occurred" };
+        errorData = { message: t("caching.dashboard.healthCheck.unknownError") };
       }
       setHealthCheckResponse({ error: errorData });
     }
@@ -154,9 +156,15 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
   const totals = activity?.totals;
   const hasRequests = totals != null && totals.api_requests + totals.cache_hits + totals.failed_requests > 0;
   const statCards = [
-    { label: "Cache Hit Ratio", value: `${hasRequests ? totals.cache_hit_ratio.toFixed(2) : "0"}%` },
-    { label: "Cache Hits", value: valueFormatterNumbers(totals?.cache_hits ?? 0) },
-    { label: "Cached Completion Tokens", value: valueFormatterNumbers(totals?.cached_completion_tokens ?? 0) },
+    {
+      label: t("caching.dashboard.stats.cacheHitRatio"),
+      value: `${hasRequests ? totals.cache_hit_ratio.toFixed(2) : "0"}%`,
+    },
+    { label: t("caching.dashboard.stats.cacheHits"), value: valueFormatterNumbers(totals?.cache_hits ?? 0) },
+    {
+      label: t("caching.dashboard.stats.cachedCompletionTokens"),
+      value: valueFormatterNumbers(totals?.cached_completion_tokens ?? 0),
+    },
   ];
 
   return (
@@ -164,22 +172,32 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
       <div className="mt-2 flex w-full items-center justify-between border-b">
         <TabsList variant="line" className="h-auto rounded-none p-0">
           <TabsTrigger value="analytics" className="flex-none rounded-none px-4 py-2">
-            Cache Analytics
+            {t("caching.dashboard.tabs.analytics")}
           </TabsTrigger>
           <TabsTrigger value="health" className="flex-none rounded-none px-4 py-2">
-            Cache Health
+            {t("caching.dashboard.tabs.health")}
           </TabsTrigger>
           <TabsTrigger value="settings" className="flex-none rounded-none px-4 py-2">
-            Cache Settings
+            {t("caching.dashboard.tabs.settings")}
           </TabsTrigger>
           <TabsTrigger value="coordination" className="flex-none rounded-none px-4 py-2">
-            Coordination Redis
+            {t("caching.dashboard.tabs.coordination")}
           </TabsTrigger>
         </TabsList>
 
         <div className="flex items-center space-x-2">
-          {lastRefreshed && <p className="text-sm text-muted-foreground">Last Refreshed: {lastRefreshed}</p>}
-          <Button variant="outline" size="icon-sm" onClick={handleRefreshClick} aria-label="Refresh">
+          {lastRefreshed && (
+            <p className="text-sm text-muted-foreground">
+              {t("caching.dashboard.lastRefreshed")}
+              {lastRefreshed}
+            </p>
+          )}
+          <Button
+            variant="outline"
+            size="icon-sm"
+            onClick={handleRefreshClick}
+            aria-label={t("caching.dashboard.refresh")}
+          >
             <RefreshCw />
           </Button>
         </div>
@@ -189,26 +207,27 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
         <Card>
           <CardContent>
             <p className="text-sm text-muted-foreground">
-              Analytics for LiteLLM&apos;s{" "}
-              <a
-                href="https://docs.litellm.ai/docs/proxy/caching"
-                target="_blank"
-                rel="noreferrer"
-                className="underline"
-              >
-                response cache
-              </a>{" "}
-              (e.g. Redis / in-memory): requests answered from cache without calling the LLM provider. Provider-side{" "}
-              <a
-                href="https://docs.litellm.ai/docs/completion/prompt_caching"
-                target="_blank"
-                rel="noreferrer"
-                className="underline"
-              >
-                prompt caching
-              </a>{" "}
-              (cached input tokens from Anthropic, OpenAI, etc.) is not shown here; see &quot;Prompt Caching
-              Metrics&quot; on the Usage page or individual requests in the Logs page.
+              <Trans
+                i18nKey="caching.dashboard.description"
+                components={{
+                  cacheDocs: (
+                    <a
+                      href="https://docs.litellm.ai/docs/proxy/caching"
+                      target="_blank"
+                      rel="noreferrer"
+                      className="underline"
+                    />
+                  ),
+                  promptDocs: (
+                    <a
+                      href="https://docs.litellm.ai/docs/completion/prompt_caching"
+                      target="_blank"
+                      rel="noreferrer"
+                      className="underline"
+                    />
+                  ),
+                }}
+              />
             </p>
 
             <div className="mt-4 grid grid-cols-1 items-center gap-4 md:grid-cols-[1fr_1fr_auto]">
@@ -228,10 +247,10 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
                       ))
                     }
                   </ComboboxValue>
-                  <ComboboxChipsInput placeholder="Select Virtual Keys" />
+                  <ComboboxChipsInput placeholder={t("caching.dashboard.filters.virtualKeysPlaceholder")} />
                 </ComboboxChips>
                 <ComboboxContent anchor={anchor1}>
-                  <ComboboxEmpty>No virtual keys found</ComboboxEmpty>
+                  <ComboboxEmpty>{t("caching.dashboard.filters.noVirtualKeys")}</ComboboxEmpty>
                   <ComboboxList>
                     {(key: string) => (
                       <ComboboxItem key={key} value={key}>
@@ -258,10 +277,10 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
                       ))
                     }
                   </ComboboxValue>
-                  <ComboboxChipsInput placeholder="Select Models" />
+                  <ComboboxChipsInput placeholder={t("caching.dashboard.filters.modelsPlaceholder")} />
                 </ComboboxChips>
                 <ComboboxContent anchor={anchor2}>
-                  <ComboboxEmpty>No models found</ComboboxEmpty>
+                  <ComboboxEmpty>{t("caching.dashboard.filters.noModels")}</ComboboxEmpty>
                   <ComboboxList>
                     {(model: string) => (
                       <ComboboxItem key={model} value={model}>
@@ -295,16 +314,14 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
 
             <Card className="mt-4">
               <CardHeader>
-                <CardTitle className="text-base font-semibold">Cache Hits vs API Requests</CardTitle>
+                <CardTitle className="text-base font-semibold">{t("caching.dashboard.requestsChart.title")}</CardTitle>
               </CardHeader>
               <CardContent>
-                <p className="text-sm text-muted-foreground">
-                  Click a red failed-requests segment to see which error codes caused those failures.
-                </p>
-                {hasUnknownGroup && <p className="mt-1 text-sm text-muted-foreground">{UNKNOWN_CALL_TYPE_NOTE}</p>}
+                <p className="text-sm text-muted-foreground">{t("caching.dashboard.requestsChart.hint")}</p>
+                {hasUnknownGroup && <p className="mt-1 text-sm text-muted-foreground">{t(UNKNOWN_CALL_TYPE_NOTE)}</p>}
                 {activityFailed ? (
                   <ErrorState
-                    title="Failed to load cache activity"
+                    title={t("caching.dashboard.requestsChart.loadFailed")}
                     message={deriveErrorMessage(activityError)}
                     onRetry={() => void refetch()}
                   />
@@ -314,12 +331,12 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
                     stack={true}
                     index="name"
                     valueFormatter={valueFormatterNumbers}
-                    categories={[REQUEST_SERIES.apiRequests, REQUEST_SERIES.cacheHits, REQUEST_SERIES.failed]}
+                    categories={[t(REQUEST_SERIES.apiRequests), t(REQUEST_SERIES.cacheHits), t(REQUEST_SERIES.failed)]}
                     colors={["sky", "teal", "red"]}
                     yAxisWidth={48}
                     className="mt-2"
                     onValueChange={(item) => {
-                      if (item.categoryClicked === REQUEST_SERIES.failed) setErrorDrilldownCallType(item.name);
+                      if (item.categoryClicked === t(REQUEST_SERIES.failed)) setErrorDrilldownCallType(item.name);
                     }}
                   />
                 )}
@@ -337,9 +354,7 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
 
             <Card className="mt-6">
               <CardHeader>
-                <CardTitle className="text-base font-semibold">
-                  Cached Completion Tokens vs Generated Completion Tokens
-                </CardTitle>
+                <CardTitle className="text-base font-semibold">{t("caching.dashboard.tokensChart.title")}</CardTitle>
               </CardHeader>
               <CardContent>
                 <BarChart
@@ -347,7 +362,10 @@ const CacheDashboard: React.FC<CachePageProps> = ({ accessToken, token, userRole
                   stack={true}
                   index="name"
                   valueFormatter={valueFormatterNumbers}
-                  categories={["Generated Completion Tokens", "Cached Completion Tokens"]}
+                  categories={[
+                    t("caching.dashboard.series.generatedCompletionTokens"),
+                    t("caching.dashboard.series.cachedCompletionTokens"),
+                  ]}
                   colors={["sky", "teal"]}
                   yAxisWidth={48}
                 />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_health.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_health.tsx
index d6457db3e43..382438d9efe 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_health.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_health.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { CheckCircle2, XCircle, ClipboardCopy } from "lucide-react";
@@ -19,8 +20,9 @@ const deepParse = (input: any) => {
 
 // TableClickableErrorField component with copy-to-clipboard functionality
 const TableClickableErrorField: React.FC<{ label: string; value: string | null | undefined }> = ({ label, value }) => {
+  const { t } = useTranslation();
   const [isExpanded, setIsExpanded] = React.useState(false);
-  const safeValue = value?.toString() || "N/A";
+  const safeValue = value?.toString() || t("caching.health.notAvailable");
   const truncated = safeValue.length > 50 ? safeValue.substring(0, 50) + "..." : safeValue;
 
   const handleCopy = () => {
@@ -74,6 +76,7 @@ interface ErrorDetails {
 
 // Update HealthCheckDetails component to handle errors
 const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
+  const { t } = useTranslation();
   // Initialize with safe default values
   let errorDetails: ErrorDetails | null = null;
   let parsedLitellmParams: any = {};
@@ -86,8 +89,8 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
           typeof response.error.message === "string" ? JSON.parse(response.error.message) : response.error.message;
 
         errorDetails = {
-          message: errorMessage?.message || "Unknown error",
-          traceback: errorMessage?.traceback || "No traceback available",
+          message: errorMessage?.message || t("caching.health.unknownError"),
+          traceback: errorMessage?.traceback || t("caching.health.noTraceback"),
           litellm_params: errorMessage?.litellm_cache_params || {},
           health_check_cache_params: errorMessage?.health_check_cache_params || {},
         };
@@ -97,8 +100,8 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
       } catch (e) {
         console.warn("Error parsing error details:", e);
         errorDetails = {
-          message: String(response.error.message || "Unknown error"),
-          traceback: "Error parsing details",
+          message: String(response.error.message || t("caching.health.unknownError")),
+          traceback: t("caching.health.parseFailed"),
           litellm_params: {},
           health_check_cache_params: {},
         };
@@ -121,16 +124,16 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
       parsedRedisParams?.redis_async_client?.connection_pool?.connection_kwargs?.host ||
       parsedRedisParams?.connection_kwargs?.host ||
       parsedRedisParams?.host ||
-      "N/A",
+      t("caching.health.notAvailable"),
 
     redis_port:
       parsedRedisParams?.redis_client?.connection_pool?.connection_kwargs?.port ||
       parsedRedisParams?.redis_async_client?.connection_pool?.connection_kwargs?.port ||
       parsedRedisParams?.connection_kwargs?.port ||
       parsedRedisParams?.port ||
-      "N/A",
+      t("caching.health.notAvailable"),
 
-    redis_version: parsedRedisParams?.redis_version || "N/A",
+    redis_version: parsedRedisParams?.redis_version || t("caching.health.notAvailable"),
 
     startup_nodes: (() => {
       try {
@@ -143,13 +146,13 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
         const port =
           parsedRedisParams?.redis_client?.connection_pool?.connection_kwargs?.port ||
           parsedRedisParams?.redis_async_client?.connection_pool?.connection_kwargs?.port;
-        return host && port ? JSON.stringify([{ host, port }]) : "N/A";
+        return host && port ? JSON.stringify([{ host, port }]) : t("caching.health.notAvailable");
       } catch (e) {
-        return "N/A";
+        return t("caching.health.notAvailable");
       }
     })(),
 
-    namespace: parsedRedisParams?.namespace || "N/A",
+    namespace: parsedRedisParams?.namespace || t("caching.health.notAvailable"),
   };
 
   return (
@@ -157,10 +160,10 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
       <Tabs defaultValue="summary">
         <TabsList className="border-b border-border px-4">
           <TabsTrigger value="summary" className="flex-none">
-            Summary
+            {t("caching.health.tabs.summary")}
           </TabsTrigger>
           <TabsTrigger value="raw" className="flex-none">
-            Raw Response
+            {t("caching.health.tabs.raw")}
           </TabsTrigger>
         </TabsList>
 
@@ -175,7 +178,8 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
               <p
                 className={`text-sm font-medium ${response?.status === "healthy" ? "text-success" : "text-destructive"}`}
               >
-                Cache Status: {response?.status || "unhealthy"}
+                {t("caching.health.cacheStatus")}
+                {response?.status || "unhealthy"}
               </p>
             </div>
 
@@ -186,23 +190,32 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
                   <>
                     <tr>
                       <td colSpan={2} className="pt-4 pb-2 font-semibold text-destructive">
-                        Error Details
+                        {t("caching.health.errorDetails")}
                       </td>
                     </tr>
-                    <TableClickableErrorField label="Error Message" value={errorDetails.message} />
-                    <TableClickableErrorField label="Traceback" value={errorDetails.traceback} />
+                    <TableClickableErrorField label={t("caching.health.errorMessage")} value={errorDetails.message} />
+                    <TableClickableErrorField label={t("caching.health.traceback")} value={errorDetails.traceback} />
                   </>
                 )}
 
                 {/* Always show cache details, regardless of error state */}
                 <tr>
                   <td colSpan={2} className="pt-4 pb-2 font-semibold">
-                    Cache Details
+                    {t("caching.health.cacheDetails")}
                   </td>
                 </tr>
-                <TableClickableErrorField label="Cache Configuration" value={String(parsedLitellmParams?.type)} />
-                <TableClickableErrorField label="Ping Response" value={String(response.ping_response)} />
-                <TableClickableErrorField label="Set Cache Response" value={response.set_cache_response || "N/A"} />
+                <TableClickableErrorField
+                  label={t("caching.health.cacheConfiguration")}
+                  value={String(parsedLitellmParams?.type)}
+                />
+                <TableClickableErrorField
+                  label={t("caching.health.pingResponse")}
+                  value={String(response.ping_response)}
+                />
+                <TableClickableErrorField
+                  label={t("caching.health.setCacheResponse")}
+                  value={response.set_cache_response || t("caching.health.notAvailable")}
+                />
                 <TableClickableErrorField
                   label="litellm_settings.cache_params"
                   value={JSON.stringify(parsedLitellmParams, null, 2)}
@@ -213,14 +226,29 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
                   <>
                     <tr>
                       <td colSpan={2} className="pt-4 pb-2 font-semibold">
-                        Redis Details
+                        {t("caching.health.redisDetails")}
                       </td>
                     </tr>
-                    <TableClickableErrorField label="Redis Host" value={redisDetails.redis_host || "N/A"} />
-                    <TableClickableErrorField label="Redis Port" value={redisDetails.redis_port || "N/A"} />
-                    <TableClickableErrorField label="Redis Version" value={redisDetails.redis_version || "N/A"} />
-                    <TableClickableErrorField label="Startup Nodes" value={redisDetails.startup_nodes || "N/A"} />
-                    <TableClickableErrorField label="Namespace" value={redisDetails.namespace || "N/A"} />
+                    <TableClickableErrorField
+                      label={t("caching.health.redisHost")}
+                      value={redisDetails.redis_host || t("caching.health.notAvailable")}
+                    />
+                    <TableClickableErrorField
+                      label={t("caching.health.redisPort")}
+                      value={redisDetails.redis_port || t("caching.health.notAvailable")}
+                    />
+                    <TableClickableErrorField
+                      label={t("caching.health.redisVersion")}
+                      value={redisDetails.redis_version || t("caching.health.notAvailable")}
+                    />
+                    <TableClickableErrorField
+                      label={t("caching.health.startupNodes")}
+                      value={redisDetails.startup_nodes || t("caching.health.notAvailable")}
+                    />
+                    <TableClickableErrorField
+                      label={t("caching.health.namespace")}
+                      value={redisDetails.namespace || t("caching.health.notAvailable")}
+                    />
                   </>
                 )}
               </tbody>
@@ -254,7 +282,7 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
                   // Then stringify with proper formatting
                   return JSON.stringify(prettyData, null, 2);
                 } catch (e) {
-                  return "Error formatting JSON: " + (e as Error).message;
+                  return t("caching.health.formatFailed", { message: (e as Error).message });
                 }
               })()}
             </pre>
@@ -271,6 +299,7 @@ export const CacheHealthTab: React.FC<{
   runCachingHealthCheck: () => void;
   responseTimeMs?: number | null;
 }> = ({ accessToken, healthCheckResponse, runCachingHealthCheck, responseTimeMs }) => {
+  const { t } = useTranslation();
   const [localResponseTimeMs, setLocalResponseTimeMs] = React.useState<number | null>(null);
   const [isLoading, setIsLoading] = React.useState<boolean>(false);
 
@@ -287,7 +316,7 @@ export const CacheHealthTab: React.FC<{
     <div className="space-y-4">
       <div className="flex items-center justify-between">
         <Button onClick={handleHealthCheck} disabled={isLoading}>
-          {isLoading ? "Running Health Check..." : "Run Health Check"}
+          {isLoading ? t("caching.health.running") : t("caching.health.runButton")}
         </Button>
         <ResponseTimeIndicator responseTimeMs={localResponseTimeMs} />
       </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/CacheFormField.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/CacheFormField.tsx
index 1753dab4d22..ae72f22b596 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/CacheFormField.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/CacheFormField.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { useFormContext } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { FormField } from "@/components/shared/form/FormField";
 import { PasswordInput } from "@/components/shared/PasswordInput";
 import {
@@ -23,7 +24,7 @@ export interface EmbeddingModelOption {
   label: string;
 }
 
-export const SECRET_ALREADY_SET_PLACEHOLDER = "Already set. Enter a new value to replace it.";
+export const SECRET_ALREADY_SET_PLACEHOLDER = "caching.settings.field.secretAlreadySet";
 
 interface CacheFormFieldProps {
   field: CacheField;
@@ -32,11 +33,12 @@ interface CacheFormFieldProps {
 }
 
 const CacheFormField: React.FC<CacheFormFieldProps> = ({ field, embeddingModels, isSecretConfigured = false }) => {
+  const { t } = useTranslation();
   const form = useFormContext<CacheFormValues>();
-  const placeholder = isSecretConfigured ? SECRET_ALREADY_SET_PLACEHOLDER : field.helpText;
+  const placeholder = isSecretConfigured ? t(SECRET_ALREADY_SET_PLACEHOLDER) : t(field.helpText);
 
   return (
-    <FormField control={form.control} name={field.name} label={field.label} description={field.helpText}>
+    <FormField control={form.control} name={field.name} label={t(field.label)} description={t(field.helpText)}>
       {({ ref, value, onChange, ...rest }) => {
         if (field.type === "boolean") {
           return <Switch {...rest} checked={value === true} onCheckedChange={(checked) => onChange(checked)} />;
@@ -70,7 +72,7 @@ const CacheFormField: React.FC<CacheFormFieldProps> = ({ field, embeddingModels,
           const { id, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy, name, onBlur, disabled } = rest;
           return (
             <Select
-              items={options.map((option) => ({ label: option.label, value: option.value }))}
+              items={options.map((option) => ({ label: t(option.label), value: option.value }))}
               name={name}
               disabled={disabled}
               value={typeof value === "string" && value !== "" ? value : null}
@@ -83,12 +85,12 @@ const CacheFormField: React.FC<CacheFormFieldProps> = ({ field, embeddingModels,
                 onBlur={onBlur}
                 className="w-full"
               >
-                <SelectValue placeholder="Select an option" />
+                <SelectValue placeholder={t("caching.settings.field.selectPlaceholder")} />
               </SelectTrigger>
               <SelectContent>
                 {options.map((option) => (
                   <SelectItem key={option.value} value={option.value}>
-                    {option.label}
+                    {t(option.label)}
                   </SelectItem>
                 ))}
               </SelectContent>
@@ -107,11 +109,15 @@ const CacheFormField: React.FC<CacheFormFieldProps> = ({ field, embeddingModels,
                 model.value === other.value
               }
             >
-              <ComboboxInput {...rest} placeholder="Search and select a model..." className="w-full">
+              <ComboboxInput
+                {...rest}
+                placeholder={t("caching.settings.field.modelSearchPlaceholder")}
+                className="w-full"
+              >
                 <ComboboxClear />
               </ComboboxInput>
               <ComboboxContent>
-                <ComboboxEmpty>No models found</ComboboxEmpty>
+                <ComboboxEmpty>{t("caching.settings.field.noModels")}</ComboboxEmpty>
                 <ComboboxList>
                   {(model: EmbeddingModelOption) => (
                     <ComboboxItem key={model.value} value={model} title={model.label}>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/RedisTypeSelector.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/RedisTypeSelector.tsx
index 40f553e6fde..d88d9390bf5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/RedisTypeSelector.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/RedisTypeSelector.tsx
@@ -1,37 +1,45 @@
+import type { ParseKeys } from "i18next";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 
 interface RedisTypeSelectorProps {
   redisType: string;
-  redisTypeDescriptions: Readonly<Record<string, string>>;
+  redisTypeDescriptions: Readonly<Record<string, ParseKeys>>;
   onTypeChange: (type: string) => void;
 }
 
-const REDIS_TYPE_LABELS: Readonly<Record<string, string>> = {
-  node: "Node (Single Instance)",
-  cluster: "Cluster",
-  sentinel: "Sentinel",
-  semantic: "Semantic",
+const REDIS_TYPE_LABELS: Readonly<Record<string, ParseKeys>> = {
+  node: "caching.settings.redisType.options.node",
+  cluster: "caching.settings.redisType.options.cluster",
+  sentinel: "caching.settings.redisType.options.sentinel",
+  semantic: "caching.settings.redisType.options.semantic",
 };
 
 const RedisTypeSelector: React.FC<RedisTypeSelectorProps> = ({ redisType, redisTypeDescriptions, onTypeChange }) => {
+  const { t } = useTranslation();
   return (
     <div className="space-y-2">
-      <label className="text-sm font-medium">Redis Type</label>
+      <label className="text-sm font-medium">{t("caching.settings.redisType.label")}</label>
       <Select value={redisType} onValueChange={(value) => value !== null && onTypeChange(value)}>
         <SelectTrigger className="w-full">
-          <SelectValue>{REDIS_TYPE_LABELS[redisType] ?? redisType}</SelectValue>
+          <SelectValue>
+            {Object.hasOwn(REDIS_TYPE_LABELS, redisType) ? t(REDIS_TYPE_LABELS[redisType]) : redisType}
+          </SelectValue>
         </SelectTrigger>
         <SelectContent>
           {Object.entries(REDIS_TYPE_LABELS).map(([value, label]) => (
             <SelectItem key={value} value={value}>
-              {label}
+              {t(label)}
             </SelectItem>
           ))}
         </SelectContent>
       </Select>
       <p className="text-xs text-muted-foreground">
-        {redisTypeDescriptions[redisType] || "Select the type of Redis deployment you're using"}
+        {t(
+          (Object.hasOwn(redisTypeDescriptions, redisType) && redisTypeDescriptions[redisType]) ||
+            "caching.settings.redisType.fallbackDescription",
+        )}
       </p>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/cacheSettingsFields.ts b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/cacheSettingsFields.ts
index 9ebb9c191ed..27a39e18545 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/cacheSettingsFields.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/cacheSettingsFields.ts
@@ -1,3 +1,5 @@
+import type { ParseKeys } from "i18next";
+
 export type CacheFieldType =
   | "string"
   | "password"
@@ -10,14 +12,14 @@ export type CacheFieldType =
 
 export interface CacheFieldOption {
   readonly value: string;
-  readonly label: string;
+  readonly label: ParseKeys;
 }
 
 export type RedisType = "node" | "cluster" | "sentinel" | "semantic";
 
 export type CacheSection = "connection" | "cluster" | "sentinel" | "semantic" | "ssl" | "cacheManagement" | "gcp";
 
-export type CacheFieldRule = (value: unknown) => string | null;
+export type CacheFieldRule = (value: unknown) => ParseKeys | null;
 
 // Marker the backend returns for a configured credential and maps back to the
 // stored secret on save, so the plaintext never round-trips through the form.
@@ -25,10 +27,10 @@ export const REDACTED_VALUE = "***REDACTED***";
 
 export interface CacheField {
   readonly name: string;
-  readonly label: string;
+  readonly label: ParseKeys;
   readonly type: CacheFieldType;
   readonly section: CacheSection;
-  readonly helpText: string;
+  readonly helpText: ParseKeys;
   readonly redisType: RedisType | null;
   readonly defaultValue?: string | number | boolean;
   readonly options?: readonly CacheFieldOption[];
@@ -40,11 +42,11 @@ export interface CacheField {
 
 export const REDIS_TYPES: readonly RedisType[] = ["node", "cluster", "sentinel", "semantic"];
 
-export const REDIS_TYPE_DESCRIPTIONS: Readonly<Record<RedisType, string>> = {
-  node: "Standard Redis node/single instance",
-  cluster: "Redis Cluster mode for high availability and horizontal scaling",
-  sentinel: "Redis Sentinel mode for high availability with automatic failover",
-  semantic: "Semantic caching that reuses responses for similar prompts",
+export const REDIS_TYPE_DESCRIPTIONS: Readonly<Record<RedisType, ParseKeys>> = {
+  node: "caching.settings.redisType.descriptions.node",
+  cluster: "caching.settings.redisType.descriptions.cluster",
+  sentinel: "caching.settings.redisType.descriptions.sentinel",
+  semantic: "caching.settings.redisType.descriptions.semantic",
 };
 
 const isBlank = (value: unknown): boolean => value === undefined || value === null || String(value).trim() === "";
@@ -54,7 +56,7 @@ const portRule: CacheFieldRule = (value) => {
     return null;
   }
   const port = Number(value);
-  return Number.isInteger(port) && port >= 1 && port <= 65535 ? null : "Port must be an integer between 1 and 65535";
+  return Number.isInteger(port) && port >= 1 && port <= 65535 ? null : "caching.settings.validation.port";
 };
 
 const jsonListRule: CacheFieldRule = (value) => {
@@ -65,9 +67,9 @@ const jsonListRule: CacheFieldRule = (value) => {
   try {
     parsed = JSON.parse(String(value));
   } catch {
-    return "Must be a valid JSON array (use double quotes)";
+    return "caching.settings.validation.jsonArrayInvalid";
   }
-  return Array.isArray(parsed) ? null : "Must be a JSON array";
+  return Array.isArray(parsed) ? null : "caching.settings.validation.jsonArrayRequired";
 };
 
 const nonNegativeIntegerRule: CacheFieldRule = (value) => {
@@ -75,205 +77,202 @@ const nonNegativeIntegerRule: CacheFieldRule = (value) => {
     return null;
   }
   const parsed = Number(value);
-  return Number.isInteger(parsed) && parsed >= 0 ? null : "Must be a non-negative integer";
+  return Number.isInteger(parsed) && parsed >= 0 ? null : "caching.settings.validation.nonNegativeInteger";
 };
 
 const numberRule: CacheFieldRule = (value) => {
   if (isBlank(value)) {
     return null;
   }
-  return Number.isNaN(Number(value)) ? "Must be a number" : null;
+  return Number.isNaN(Number(value)) ? "caching.settings.validation.number" : null;
 };
 
 export const CACHE_FIELDS: readonly CacheField[] = [
   {
     name: "url",
-    label: "Redis URL",
+    label: "caching.settings.fields.url.label",
     type: "string",
     section: "connection",
-    helpText:
-      "Full Redis/Valkey connection URL (e.g. redis://:password@host:6379/1). When set, it takes precedence over Host, Port, Password, and Database Index.",
+    helpText: "caching.settings.fields.url.helpText",
     redisType: null,
     secret: true,
   },
   {
     name: "host",
-    label: "Host",
+    label: "caching.settings.fields.host.label",
     type: "string",
     section: "connection",
-    helpText: "Redis server hostname or IP address",
+    helpText: "caching.settings.fields.host.helpText",
     redisType: null,
   },
   {
     name: "port",
-    label: "Port",
+    label: "caching.settings.fields.port.label",
     type: "string",
     section: "connection",
-    helpText: "Redis server port number",
+    helpText: "caching.settings.fields.port.helpText",
     redisType: null,
     defaultValue: "6379",
     rules: [portRule],
   },
   {
     name: "db",
-    label: "Database Index",
+    label: "caching.settings.fields.db.label",
     type: "integer",
     section: "connection",
-    helpText: "Logical database index to isolate the cache (e.g. 1 for redis://host:6379/1)",
+    helpText: "caching.settings.fields.db.helpText",
     redisType: null,
     rules: [nonNegativeIntegerRule],
   },
   {
     name: "password",
-    label: "Password",
+    label: "caching.settings.fields.password.label",
     type: "password",
     section: "connection",
-    helpText: "Redis server password",
+    helpText: "caching.settings.fields.password.helpText",
     redisType: null,
     secret: true,
   },
   {
     name: "username",
-    label: "Username",
+    label: "caching.settings.fields.username.label",
     type: "string",
     section: "connection",
-    helpText: "Redis server username (if required)",
+    helpText: "caching.settings.fields.username.helpText",
     redisType: null,
   },
   {
     name: "redis_startup_nodes",
-    label: "Startup Nodes",
+    label: "caching.settings.fields.redisStartupNodes.label",
     type: "list",
     section: "cluster",
-    helpText: 'List of startup nodes for Redis Cluster (e.g., [{"host": "127.0.0.1", "port": "7001"}])',
+    helpText: "caching.settings.fields.redisStartupNodes.helpText",
     redisType: "cluster",
     rules: [jsonListRule],
   },
   {
     name: "sentinel_nodes",
-    label: "Sentinel Nodes",
+    label: "caching.settings.fields.sentinelNodes.label",
     type: "list",
     section: "sentinel",
-    helpText: 'List of Sentinel nodes (e.g., [["localhost", 26379]])',
+    helpText: "caching.settings.fields.sentinelNodes.helpText",
     redisType: "sentinel",
     rules: [jsonListRule],
   },
   {
     name: "service_name",
-    label: "Service Name",
+    label: "caching.settings.fields.serviceName.label",
     type: "string",
     section: "sentinel",
-    helpText: "Master service name for Redis Sentinel",
+    helpText: "caching.settings.fields.serviceName.helpText",
     redisType: "sentinel",
   },
   {
     name: "sentinel_password",
-    label: "Sentinel Password",
+    label: "caching.settings.fields.sentinelPassword.label",
     type: "password",
     section: "sentinel",
-    helpText: "Password for Redis Sentinel authentication",
+    helpText: "caching.settings.fields.sentinelPassword.helpText",
     redisType: "sentinel",
     secret: true,
   },
   {
     name: "similarity_threshold",
-    label: "Similarity Threshold",
+    label: "caching.settings.fields.similarityThreshold.label",
     type: "float",
     section: "semantic",
-    helpText: "Similarity threshold for semantic cache",
+    helpText: "caching.settings.fields.similarityThreshold.helpText",
     redisType: "semantic",
     defaultValue: 0.8,
     rules: [numberRule],
   },
   {
     name: "redis_semantic_cache_embedding_model",
-    label: "Embedding Model",
+    label: "caching.settings.fields.embeddingModel.label",
     type: "model-select",
     section: "semantic",
-    helpText: "Embedding model for semantic cache",
+    helpText: "caching.settings.fields.embeddingModel.helpText",
     redisType: "semantic",
   },
   {
     name: "semantic_cache_scope",
-    label: "Semantic Cache Scope",
+    label: "caching.settings.fields.semanticCacheScope.label",
     type: "select",
     section: "semantic",
-    helpText:
-      "Who can share a semantic cache hit. Key shares hits between all end users of a key/team/org. End user also isolates per end user; requests without an end user fall back to the key scope.",
+    helpText: "caching.settings.fields.semanticCacheScope.helpText",
     redisType: "semantic",
     defaultValue: "key",
     options: [
-      { value: "key", label: "Key (shared by all end users of the key/team/org)" },
-      { value: "end_user", label: "End user (isolated per end user)" },
+      { value: "key", label: "caching.settings.scopeOptions.key" },
+      { value: "end_user", label: "caching.settings.scopeOptions.endUser" },
     ],
   },
   {
     name: "ssl",
-    label: "SSL",
+    label: "caching.settings.fields.ssl.label",
     type: "boolean",
     section: "ssl",
-    helpText: "Enable SSL/TLS connection",
+    helpText: "caching.settings.fields.ssl.helpText",
     redisType: null,
     defaultValue: false,
   },
   {
     name: "ssl_cert_reqs",
-    label: "SSL Cert Reqs",
+    label: "caching.settings.fields.sslCertReqs.label",
     type: "string",
     section: "ssl",
-    helpText: "SSL certificate requirements (None, CERT_REQUIRED, CERT_OPTIONAL)",
+    helpText: "caching.settings.fields.sslCertReqs.helpText",
     redisType: null,
   },
   {
     name: "ssl_check_hostname",
-    label: "SSL Check Hostname",
+    label: "caching.settings.fields.sslCheckHostname.label",
     type: "boolean",
     section: "ssl",
-    helpText: "Enable SSL hostname verification",
+    helpText: "caching.settings.fields.sslCheckHostname.helpText",
     redisType: null,
     defaultValue: false,
   },
   {
     name: "namespace",
-    label: "Namespace",
+    label: "caching.settings.fields.namespace.label",
     type: "string",
     section: "cacheManagement",
-    helpText: "Namespace prefix for cache keys",
+    helpText: "caching.settings.fields.namespace.helpText",
     redisType: null,
   },
   {
     name: "ttl",
-    label: "TTL (seconds)",
+    label: "caching.settings.fields.ttl.label",
     type: "float",
     section: "cacheManagement",
-    helpText: "Time-to-live for cached items in seconds",
+    helpText: "caching.settings.fields.ttl.helpText",
     redisType: null,
     rules: [numberRule],
   },
   {
     name: "max_connections",
-    label: "Max Connections",
+    label: "caching.settings.fields.maxConnections.label",
     type: "integer",
     section: "cacheManagement",
-    helpText: "Maximum number of connections in the connection pool",
+    helpText: "caching.settings.fields.maxConnections.helpText",
     redisType: null,
     rules: [nonNegativeIntegerRule],
   },
   {
     name: "gcp_service_account",
-    label: "GCP Service Account",
+    label: "caching.settings.fields.gcpServiceAccount.label",
     type: "string",
     section: "gcp",
-    helpText:
-      "GCP service account for IAM authentication (e.g., projects/-/serviceAccounts/your-sa@project.iam.gserviceaccount.com)",
+    helpText: "caching.settings.fields.gcpServiceAccount.helpText",
     redisType: null,
   },
   {
     name: "gcp_ssl_ca_certs",
-    label: "GCP SSL CA Certs",
+    label: "caching.settings.fields.gcpSslCaCerts.label",
     type: "string",
     section: "gcp",
-    helpText: "Path to SSL CA certificate file for GCP Memorystore Redis",
+    helpText: "caching.settings.fields.gcpSslCaCerts.helpText",
     redisType: null,
   },
 ];
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/index.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/index.tsx
index d26cc1b40f8..76aaf4c035f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/index.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/cache_settings/index.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useCallback } from "react";
 import { ChevronRight } from "lucide-react";
 import { FormProvider, useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import { getCacheSettingsCall, testCacheConnectionCall, updateCacheSettingsCall } from "@/components/networking";
@@ -30,6 +31,7 @@ const toRedisType = (value: unknown): RedisType =>
   REDIS_TYPES.includes(value as RedisType) ? (value as RedisType) : "node";
 
 const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
+  const { t } = useTranslation();
   const form = useForm<CacheFormValues>({ defaultValues: buildInitialValues({}) });
   const [redisType, setRedisType] = useState<RedisType>("node");
   const [advancedOpen, setAdvancedOpen] = useState(false);
@@ -50,9 +52,9 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
       setRedisType(toRedisType(currentValues.redis_type));
     } catch (error) {
       console.error("Failed to load cache settings:", error);
-      toast.fromError("Failed to load cache settings");
+      toast.fromError(t("caching.settings.toasts.loadFailed"));
     }
-  }, [accessToken, form]);
+  }, [accessToken, form, t]);
 
   useEffect(() => {
     loadCacheSettings();
@@ -85,7 +87,7 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
     });
 
     form.clearErrors();
-    failures.forEach(([name, message]) => form.setError(name, { message }));
+    failures.forEach(([name, message]) => form.setError(name, { message: t(message) }));
     return failures.length > 0 ? null : values;
   };
 
@@ -105,13 +107,17 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
         buildCachePayload(redisType, values, { forTesting: true }),
       );
       if (result.status === "success") {
-        toast.success("Cache connection test successful!");
+        toast.success(t("caching.settings.toasts.testSucceeded"));
       } else {
-        toast.fromError(`Connection test failed: ${result.message || result.error}`);
+        toast.fromError(t("caching.settings.toasts.testFailed", { error: String(result.message || result.error) }));
       }
     } catch (error) {
       console.error("Test connection error:", error);
-      toast.fromError(`Connection test failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+      toast.fromError(
+        t("caching.settings.toasts.testFailed", {
+          error: error instanceof Error ? error.message : t("caching.settings.toasts.unknownError"),
+        }),
+      );
     } finally {
       setIsTesting(false);
     }
@@ -129,11 +135,11 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
     setIsSaving(true);
     try {
       await updateCacheSettingsCall(accessToken, buildCachePayload(redisType, values, { forTesting: false }));
-      toast.success("Cache settings updated successfully");
+      toast.success(t("caching.settings.toasts.saved"));
       await loadCacheSettings();
     } catch (error) {
       console.error("Failed to save cache settings:", error);
-      toast.fromError("Failed to update cache settings");
+      toast.fromError(t("caching.settings.toasts.saveFailed"));
     } finally {
       setIsSaving(false);
     }
@@ -148,8 +154,8 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
       <FormProvider {...form}>
         <form onSubmit={(event) => event.preventDefault()} className="space-y-6">
           <div className="max-w-3xl">
-            <h3 className="text-sm font-medium text-foreground">Cache Settings</h3>
-            <p className="text-xs text-muted-foreground mt-1">Configure Redis cache for LiteLLM</p>
+            <h3 className="text-sm font-medium text-foreground">{t("caching.settings.title")}</h3>
+            <p className="text-xs text-muted-foreground mt-1">{t("caching.settings.subtitle")}</p>
           </div>
 
           <RedisTypeSelector
@@ -160,7 +166,7 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
 
           <div className="pt-4 border-t border-border">
             <CacheFieldSection
-              title="Connection Settings"
+              title={t("caching.settings.sections.connection")}
               section="connection"
               redisType={redisType}
               embeddingModels={embeddingModels}
@@ -171,7 +177,7 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
           {redisType === "cluster" && (
             <div className="pt-4 border-t border-border">
               <CacheFieldSection
-                title="Cluster Configuration"
+                title={t("caching.settings.sections.cluster")}
                 section="cluster"
                 redisType={redisType}
                 embeddingModels={embeddingModels}
@@ -183,7 +189,7 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
           {redisType === "sentinel" && (
             <div className="pt-4 border-t border-border">
               <CacheFieldSection
-                title="Sentinel Configuration"
+                title={t("caching.settings.sections.sentinel")}
                 section="sentinel"
                 redisType={redisType}
                 embeddingModels={embeddingModels}
@@ -195,7 +201,7 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
           {redisType === "semantic" && (
             <div className="pt-4 border-t border-border">
               <CacheFieldSection
-                title="Semantic Configuration"
+                title={t("caching.settings.sections.semantic")}
                 section="semantic"
                 redisType={redisType}
                 embeddingModels={embeddingModels}
@@ -205,27 +211,27 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
 
           <Collapsible open={advancedOpen} onOpenChange={setAdvancedOpen} className="mt-4">
             <CollapsibleTrigger className="group flex w-full items-center justify-between py-2 text-left">
-              <span className="text-sm font-medium text-foreground">Advanced Settings</span>
+              <span className="text-sm font-medium text-foreground">{t("caching.settings.advanced")}</span>
               <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
             </CollapsibleTrigger>
             <CollapsibleContent>
               <div className="space-y-6">
                 <CacheFieldSection
-                  title="SSL Settings"
+                  title={t("caching.settings.sections.ssl")}
                   section="ssl"
                   redisType={redisType}
                   embeddingModels={embeddingModels}
                   headingLevel="h5"
                 />
                 <CacheFieldSection
-                  title="Cache Management"
+                  title={t("caching.settings.sections.cacheManagement")}
                   section="cacheManagement"
                   redisType={redisType}
                   embeddingModels={embeddingModels}
                   headingLevel="h5"
                 />
                 <CacheFieldSection
-                  title="GCP Authentication"
+                  title={t("caching.settings.sections.gcp")}
                   section="gcp"
                   redisType={redisType}
                   embeddingModels={embeddingModels}
@@ -239,10 +245,10 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
 
       <div className="border-t border-border pt-6 flex justify-end gap-3">
         <Button variant="secondary" size="sm" onClick={handleTestConnection} disabled={isTesting} className="text-sm">
-          {isTesting ? "Testing..." : "Test Connection"}
+          {isTesting ? t("caching.settings.testing") : t("caching.settings.testConnection")}
         </Button>
         <Button size="sm" onClick={handleSaveChanges} disabled={isSaving} className="text-sm font-medium">
-          {isSaving ? "Saving..." : "Save Changes"}
+          {isSaving ? t("caching.settings.saving") : t("caching.settings.saveChanges")}
         </Button>
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisFormField.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisFormField.tsx
index dc4fae83200..3a54e664836 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisFormField.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisFormField.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { useFormContext } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { FormField } from "@/components/shared/form/FormField";
 import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Input } from "@/components/ui/input";
@@ -8,7 +9,7 @@ import { Textarea } from "@/components/ui/textarea";
 import { CoordinationField } from "./coordinationRedisFields";
 import type { CoordinationFormValues } from "./coordinationRedisUtils";
 
-export const SECRET_ALREADY_SET_PLACEHOLDER = "Already set. Enter a new value to replace it.";
+export const SECRET_ALREADY_SET_PLACEHOLDER = "caching.coordinationRedis.field.secretAlreadySet";
 
 interface CoordinationRedisFormFieldProps {
   field: CoordinationField;
@@ -16,11 +17,12 @@ interface CoordinationRedisFormFieldProps {
 }
 
 const CoordinationRedisFormField: React.FC<CoordinationRedisFormFieldProps> = ({ field, isSecretConfigured }) => {
+  const { t } = useTranslation();
   const form = useFormContext<CoordinationFormValues>();
-  const placeholder = isSecretConfigured ? SECRET_ALREADY_SET_PLACEHOLDER : field.helpText;
+  const placeholder = isSecretConfigured ? t(SECRET_ALREADY_SET_PLACEHOLDER) : t(field.helpText);
 
   return (
-    <FormField control={form.control} name={field.name} label={field.label} description={field.helpText}>
+    <FormField control={form.control} name={field.name} label={t(field.label)} description={t(field.helpText)}>
       {({ ref, value, onChange, ...rest }) => {
         if (field.type === "boolean") {
           return <Switch {...rest} checked={value === true} onCheckedChange={(checked) => onChange(checked)} />;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisTypeSelector.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisTypeSelector.tsx
index e6385e83649..9dd2c6b24d7 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisTypeSelector.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/CoordinationRedisTypeSelector.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import {
   COORDINATION_REDIS_TYPES,
@@ -12,25 +13,32 @@ interface CoordinationRedisTypeSelectorProps {
   onTypeChange: (type: CoordinationRedisType) => void;
 }
 
-const CoordinationRedisTypeSelector: React.FC<CoordinationRedisTypeSelectorProps> = ({ redisType, onTypeChange }) => (
-  <div className="space-y-2">
-    <label htmlFor="coordination-redis-type" className="text-sm font-medium">
-      Redis Type
-    </label>
-    <Select value={redisType} onValueChange={(value) => value !== null && onTypeChange(value)}>
-      <SelectTrigger id="coordination-redis-type" className="w-full">
-        <SelectValue>{COORDINATION_REDIS_TYPE_LABELS[redisType]}</SelectValue>
-      </SelectTrigger>
-      <SelectContent>
-        {COORDINATION_REDIS_TYPES.map((type) => (
-          <SelectItem key={type} value={type}>
-            {COORDINATION_REDIS_TYPE_LABELS[type]}
-          </SelectItem>
-        ))}
-      </SelectContent>
-    </Select>
-    <p className="text-xs text-muted-foreground">{COORDINATION_REDIS_TYPE_DESCRIPTIONS[redisType]}</p>
-  </div>
-);
+const CoordinationRedisTypeSelector: React.FC<CoordinationRedisTypeSelectorProps> = ({ redisType, onTypeChange }) => {
+  const { t } = useTranslation();
+  return (
+    <div className="space-y-2">
+      <label htmlFor="coordination-redis-type" className="text-sm font-medium">
+        {t("caching.coordinationRedis.redisType.label")}
+      </label>
+      <Select value={redisType} onValueChange={(value) => value !== null && onTypeChange(value)}>
+        <SelectTrigger id="coordination-redis-type" className="w-full">
+          <SelectValue>
+            {Object.hasOwn(COORDINATION_REDIS_TYPE_LABELS, redisType)
+              ? t(COORDINATION_REDIS_TYPE_LABELS[redisType])
+              : ""}
+          </SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+          {COORDINATION_REDIS_TYPES.map((type) => (
+            <SelectItem key={type} value={type}>
+              {t(COORDINATION_REDIS_TYPE_LABELS[type])}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+      <p className="text-xs text-muted-foreground">{COORDINATION_REDIS_TYPE_DESCRIPTIONS[redisType]}</p>
+    </div>
+  );
+};
 
 export default CoordinationRedisTypeSelector;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisFields.ts b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisFields.ts
index 9e885be2601..54d87b183f8 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisFields.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisFields.ts
@@ -1,17 +1,21 @@
+import type { ParseKeys } from "i18next";
+
+import i18n from "@/i18n/i18n";
+
 export type CoordinationFieldType = "string" | "password" | "integer" | "boolean" | "list";
 
 export type CoordinationRedisType = "node" | "cluster" | "sentinel";
 
 export type CoordinationSection = "connection" | "cluster" | "sentinel" | "ssl";
 
-export type CoordinationFieldRule = (value: unknown) => string | null;
+export type CoordinationFieldRule = (value: unknown) => ParseKeys | null;
 
 export interface CoordinationField {
   readonly name: string;
-  readonly label: string;
+  readonly label: ParseKeys;
   readonly type: CoordinationFieldType;
   readonly section: CoordinationSection;
-  readonly helpText: string;
+  readonly helpText: ParseKeys;
   readonly redisType: CoordinationRedisType | null;
   readonly secret: boolean;
   readonly defaultValue?: string | number | boolean;
@@ -21,15 +25,21 @@ export interface CoordinationField {
 export const COORDINATION_REDIS_TYPES: readonly CoordinationRedisType[] = ["node", "cluster", "sentinel"];
 
 export const COORDINATION_REDIS_TYPE_DESCRIPTIONS: Readonly<Record<CoordinationRedisType, string>> = {
-  node: "Standard Redis node/single instance",
-  cluster: "Redis Cluster mode for high availability and horizontal scaling",
-  sentinel: "Redis Sentinel mode for high availability with automatic failover",
+  get node() {
+    return i18n.t("caching.coordinationRedis.redisType.descriptions.node");
+  },
+  get cluster() {
+    return i18n.t("caching.coordinationRedis.redisType.descriptions.cluster");
+  },
+  get sentinel() {
+    return i18n.t("caching.coordinationRedis.redisType.descriptions.sentinel");
+  },
 };
 
-export const COORDINATION_REDIS_TYPE_LABELS: Readonly<Record<CoordinationRedisType, string>> = {
-  node: "Node (Single Instance)",
-  cluster: "Cluster",
-  sentinel: "Sentinel",
+export const COORDINATION_REDIS_TYPE_LABELS: Readonly<Record<CoordinationRedisType, ParseKeys>> = {
+  node: "caching.coordinationRedis.redisType.options.node",
+  cluster: "caching.coordinationRedis.redisType.options.cluster",
+  sentinel: "caching.coordinationRedis.redisType.options.sentinel",
 };
 
 const isBlank = (value: unknown): boolean => value === undefined || value === null || String(value).trim() === "";
@@ -39,7 +49,7 @@ const portRule: CoordinationFieldRule = (value) => {
     return null;
   }
   const port = Number(value);
-  return Number.isInteger(port) && port >= 1 && port <= 65535 ? null : "Port must be an integer between 1 and 65535";
+  return Number.isInteger(port) && port >= 1 && port <= 65535 ? null : "caching.coordinationRedis.validation.port";
 };
 
 const jsonListRule: CoordinationFieldRule = (value) => {
@@ -50,37 +60,36 @@ const jsonListRule: CoordinationFieldRule = (value) => {
   try {
     parsed = JSON.parse(String(value));
   } catch {
-    return "Must be a valid JSON array (use double quotes)";
+    return "caching.coordinationRedis.validation.jsonArrayInvalid";
   }
-  return Array.isArray(parsed) ? null : "Must be a JSON array";
+  return Array.isArray(parsed) ? null : "caching.coordinationRedis.validation.jsonArrayRequired";
 };
 
 export const COORDINATION_FIELDS: readonly CoordinationField[] = [
   {
     name: "url",
-    label: "Redis URL",
+    label: "caching.coordinationRedis.fields.url.label",
     type: "password",
     section: "connection",
-    helpText:
-      "Full Redis/Valkey connection URL (e.g. redis://:password@host:6379/1). When set, it takes precedence over Host, Port, Username, and Password.",
+    helpText: "caching.coordinationRedis.fields.url.helpText",
     redisType: null,
     secret: true,
   },
   {
     name: "host",
-    label: "Host",
+    label: "caching.coordinationRedis.fields.host.label",
     type: "string",
     section: "connection",
-    helpText: "Redis server hostname or IP address",
+    helpText: "caching.coordinationRedis.fields.host.helpText",
     redisType: null,
     secret: false,
   },
   {
     name: "port",
-    label: "Port",
+    label: "caching.coordinationRedis.fields.port.label",
     type: "integer",
     section: "connection",
-    helpText: "Redis server port number",
+    helpText: "caching.coordinationRedis.fields.port.helpText",
     redisType: null,
     secret: false,
     defaultValue: "6379",
@@ -88,66 +97,66 @@ export const COORDINATION_FIELDS: readonly CoordinationField[] = [
   },
   {
     name: "username",
-    label: "Username",
+    label: "caching.coordinationRedis.fields.username.label",
     type: "string",
     section: "connection",
-    helpText: "Redis server username (if required)",
+    helpText: "caching.coordinationRedis.fields.username.helpText",
     redisType: null,
     secret: false,
   },
   {
     name: "password",
-    label: "Password",
+    label: "caching.coordinationRedis.fields.password.label",
     type: "password",
     section: "connection",
-    helpText: "Redis server password",
+    helpText: "caching.coordinationRedis.fields.password.helpText",
     redisType: null,
     secret: true,
   },
   {
     name: "startup_nodes",
-    label: "Startup Nodes",
+    label: "caching.coordinationRedis.fields.startupNodes.label",
     type: "list",
     section: "cluster",
-    helpText: 'List of startup nodes for Redis Cluster (e.g., [{"host": "127.0.0.1", "port": 7001}])',
+    helpText: "caching.coordinationRedis.fields.startupNodes.helpText",
     redisType: "cluster",
     secret: false,
     rules: [jsonListRule],
   },
   {
     name: "sentinel_nodes",
-    label: "Sentinel Nodes",
+    label: "caching.coordinationRedis.fields.sentinelNodes.label",
     type: "list",
     section: "sentinel",
-    helpText: 'List of Sentinel nodes (e.g., [["localhost", 26379]])',
+    helpText: "caching.coordinationRedis.fields.sentinelNodes.helpText",
     redisType: "sentinel",
     secret: false,
     rules: [jsonListRule],
   },
   {
     name: "service_name",
-    label: "Service Name",
+    label: "caching.coordinationRedis.fields.serviceName.label",
     type: "string",
     section: "sentinel",
-    helpText: "Master service name for Redis Sentinel",
+    helpText: "caching.coordinationRedis.fields.serviceName.helpText",
     redisType: "sentinel",
     secret: false,
   },
   {
     name: "sentinel_password",
-    label: "Sentinel Password",
+    label: "caching.coordinationRedis.fields.sentinelPassword.label",
     type: "password",
     section: "sentinel",
-    helpText: "Password for Redis Sentinel authentication",
+    helpText: "caching.coordinationRedis.fields.sentinelPassword.helpText",
     redisType: "sentinel",
     secret: true,
   },
   {
     name: "ssl",
-    label: "SSL",
+    label: "caching.coordinationRedis.fields.ssl.label",
     type: "boolean",
     section: "ssl",
-    helpText: "Enable SSL/TLS connection",
+    helpText: "caching.coordinationRedis.fields.ssl.helpText",
     redisType: null,
     secret: false,
     defaultValue: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisUtils.ts b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisUtils.ts
index bd1a0e405ed..008f9ba9ffa 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisUtils.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/coordinationRedisUtils.ts
@@ -1,4 +1,7 @@
+import type { ParseKeys, TFunction } from "i18next";
+
 import type { StatusTone } from "@/components/shared/table_cells/status_badge";
+import i18n from "@/i18n/i18n";
 import {
   COORDINATION_FIELDS,
   CoordinationField,
@@ -118,31 +121,41 @@ export interface SourceBadgeDescriptor {
   readonly tooltip: string;
 }
 
-const SOURCE_BADGES: Readonly<Record<CoordinationRedisSource, SourceBadgeDescriptor>> = {
+interface SourceBadgeKeys {
+  readonly tone: StatusTone;
+  readonly label: ParseKeys;
+  readonly tooltip: ParseKeys;
+}
+
+const SOURCE_BADGES: Readonly<Record<CoordinationRedisSource, SourceBadgeKeys>> = {
   coordination_redis: {
     tone: "success",
-    label: "Configured here",
-    tooltip: "general_settings.coordination_redis is set, so coordination uses its own Redis connection.",
+    label: "caching.coordinationRedis.source.coordinationRedis.label",
+    tooltip: "caching.coordinationRedis.source.coordinationRedis.tooltip",
   },
   cache_backend: {
     tone: "info",
-    label: "Borrowed from response cache",
-    tooltip: "No coordination Redis is configured; the proxy reuses the response cache's Redis connection.",
+    label: "caching.coordinationRedis.source.cacheBackend.label",
+    tooltip: "caching.coordinationRedis.source.cacheBackend.tooltip",
   },
   environment: {
     tone: "info",
-    label: "From REDIS_* environment",
-    tooltip: "No coordination Redis is configured; the proxy falls back to the REDIS_* environment variables.",
+    label: "caching.coordinationRedis.source.environment.label",
+    tooltip: "caching.coordinationRedis.source.environment.tooltip",
   },
 };
 
-const NOT_CONFIGURED_BADGE: SourceBadgeDescriptor = {
+const NOT_CONFIGURED_BADGE: SourceBadgeKeys = {
   tone: "neutral",
-  label: "Not configured",
-  tooltip: "Cross-pod rate limits, spend tracking, and the pod lock manager have no Redis to coordinate through.",
+  label: "caching.coordinationRedis.source.notConfigured.label",
+  tooltip: "caching.coordinationRedis.source.notConfigured.tooltip",
 };
 
-export const sourceBadge = (source: string | null | undefined): SourceBadgeDescriptor => {
-  const known: Readonly<Record<string, SourceBadgeDescriptor>> = SOURCE_BADGES;
-  return (source && known[source]) || NOT_CONFIGURED_BADGE;
+export const sourceBadge = (
+  source: string | null | undefined,
+  t: TFunction = i18n.t.bind(i18n),
+): SourceBadgeDescriptor => {
+  const known: Readonly<Record<string, SourceBadgeKeys>> = SOURCE_BADGES;
+  const badge = source && Object.hasOwn(known, source) ? known[source] : NOT_CONFIGURED_BADGE;
+  return { tone: badge.tone, label: t(badge.label), tooltip: t(badge.tooltip) };
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/index.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/index.tsx
index 6690ec4878c..706debd2fff 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/index.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/coordination_redis_settings/index.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { FormProvider, useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { toast } from "@/lib/toast";
@@ -23,6 +24,7 @@ import {
 } from "./coordinationRedisUtils";
 
 const CoordinationRedisSettings: React.FC = () => {
+  const { t } = useTranslation();
   const form = useForm<CoordinationFormValues>({ defaultValues: buildInitialValues({}) });
   const [selectedRedisType, setSelectedRedisType] = useState<CoordinationRedisType | null>(null);
 
@@ -40,9 +42,9 @@ const CoordinationRedisSettings: React.FC = () => {
 
   useEffect(() => {
     if (isError) {
-      toast.fromError("Failed to load coordination Redis settings");
+      toast.fromError(t("caching.coordinationRedis.toasts.loadFailed"));
     }
-  }, [isError]);
+  }, [isError, t]);
 
   const validate = (): CoordinationFormValues | null => {
     const values = form.getValues();
@@ -52,7 +54,7 @@ const CoordinationRedisSettings: React.FC = () => {
     });
 
     form.clearErrors();
-    failures.forEach(([name, message]) => form.setError(name, { message }));
+    failures.forEach(([name, message]) => form.setError(name, { message: t(message) }));
     return failures.length > 0 ? null : values;
   };
 
@@ -65,12 +67,20 @@ const CoordinationRedisSettings: React.FC = () => {
     try {
       const result = await testConnection.mutateAsync(buildCoordinationPayload(redisType, values));
       if (result.status === "healthy") {
-        toast.success("Coordination Redis connection test successful!");
+        toast.success(t("caching.coordinationRedis.toasts.testSucceeded"));
       } else {
-        toast.fromError(`Connection test failed: ${result.error ?? "Unknown error"}`);
+        toast.fromError(
+          t("caching.coordinationRedis.toasts.testFailed", {
+            error: result.error ?? t("caching.coordinationRedis.toasts.unknownError"),
+          }),
+        );
       }
     } catch (error) {
-      toast.fromError(`Connection test failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+      toast.fromError(
+        t("caching.coordinationRedis.toasts.testFailed", {
+          error: error instanceof Error ? error.message : t("caching.coordinationRedis.toasts.unknownError"),
+        }),
+      );
     }
   };
 
@@ -82,13 +92,13 @@ const CoordinationRedisSettings: React.FC = () => {
 
     try {
       await updateSettings.mutateAsync(buildCoordinationPayload(redisType, values));
-      toast.success("Coordination Redis settings saved. Restart the proxy to apply them.");
+      toast.success(t("caching.coordinationRedis.toasts.saved"));
     } catch {
-      toast.fromError("Failed to update coordination Redis settings");
+      toast.fromError(t("caching.coordinationRedis.toasts.saveFailed"));
     }
   };
 
-  const badge = sourceBadge(data?.source);
+  const badge = sourceBadge(data?.source, t);
   const configuredSecrets = useMemo(() => configuredSecretFields(data?.values ?? {}), [data]);
 
   return (
@@ -97,24 +107,21 @@ const CoordinationRedisSettings: React.FC = () => {
         <form onSubmit={(event) => event.preventDefault()} className="space-y-6">
           <div className="max-w-3xl space-y-2">
             <div className="flex items-center gap-3">
-              <h3 className="text-sm font-medium text-foreground">Coordination Redis</h3>
+              <h3 className="text-sm font-medium text-foreground">{t("caching.coordinationRedis.title")}</h3>
               {!isLoading && (
                 <StatusBadge tone={badge.tone} label={badge.label} dataTestId="coordination-redis-source" />
               )}
             </div>
-            <p className="text-xs text-muted-foreground">
-              Redis used to coordinate work across proxy pods: cross-pod rate limits, spend tracking, and the pod lock
-              manager. It is configured independently of the response cache.
-            </p>
+            <p className="text-xs text-muted-foreground">{t("caching.coordinationRedis.description")}</p>
             <p className="text-xs text-muted-foreground">{badge.tooltip}</p>
-            <p className="text-xs text-warning">Saved changes take effect on proxy restart.</p>
+            <p className="text-xs text-warning">{t("caching.coordinationRedis.restartNote")}</p>
           </div>
 
           <CoordinationRedisTypeSelector redisType={redisType} onTypeChange={setSelectedRedisType} />
 
           <div className="pt-4 border-t border-border">
             <CoordinationRedisFieldSection
-              title="Connection Settings"
+              title={t("caching.coordinationRedis.sections.connection")}
               section="connection"
               redisType={redisType}
               configuredSecrets={configuredSecrets}
@@ -124,7 +131,7 @@ const CoordinationRedisSettings: React.FC = () => {
           {redisType === "cluster" && (
             <div className="pt-4 border-t border-border">
               <CoordinationRedisFieldSection
-                title="Cluster Configuration"
+                title={t("caching.coordinationRedis.sections.cluster")}
                 section="cluster"
                 redisType={redisType}
                 configuredSecrets={configuredSecrets}
@@ -136,7 +143,7 @@ const CoordinationRedisSettings: React.FC = () => {
           {redisType === "sentinel" && (
             <div className="pt-4 border-t border-border">
               <CoordinationRedisFieldSection
-                title="Sentinel Configuration"
+                title={t("caching.coordinationRedis.sections.sentinel")}
                 section="sentinel"
                 redisType={redisType}
                 configuredSecrets={configuredSecrets}
@@ -146,7 +153,7 @@ const CoordinationRedisSettings: React.FC = () => {
 
           <div className="pt-4 border-t border-border">
             <CoordinationRedisFieldSection
-              title="SSL Settings"
+              title={t("caching.coordinationRedis.sections.ssl")}
               section="ssl"
               redisType={redisType}
               configuredSecrets={configuredSecrets}
@@ -158,11 +165,15 @@ const CoordinationRedisSettings: React.FC = () => {
       <div className="border-t border-border pt-6 flex justify-end gap-3">
         <Button variant="outline" onClick={handleTestConnection} disabled={testConnection.isPending}>
           {testConnection.isPending && <UiLoadingSpinner className="size-4" />}
-          {testConnection.isPending ? "Testing..." : "Test Connection"}
+          {testConnection.isPending
+            ? t("caching.coordinationRedis.testing")
+            : t("caching.coordinationRedis.testConnection")}
         </Button>
         <Button onClick={handleSaveChanges} disabled={updateSettings.isPending}>
           {updateSettings.isPending && <UiLoadingSpinner className="size-4" />}
-          {updateSettings.isPending ? "Saving..." : "Save Changes"}
+          {updateSettings.isPending
+            ? t("caching.coordinationRedis.saving")
+            : t("caching.coordinationRedis.saveChanges")}
         </Button>
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/response_time_indicator.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/response_time_indicator.tsx
index 1600b9a8678..4f5e77a8ec3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/response_time_indicator.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/_components/response_time_indicator.tsx
@@ -1,10 +1,12 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 
 interface ResponseTimeIndicatorProps {
   responseTimeMs: number | null;
 }
 
 export const ResponseTimeIndicator: React.FC<ResponseTimeIndicatorProps> = ({ responseTimeMs }) => {
+  const { t } = useTranslation();
   if (responseTimeMs === null || responseTimeMs === undefined) return null;
 
   return (
@@ -18,7 +20,7 @@ export const ResponseTimeIndicator: React.FC<ResponseTimeIndicatorProps> = ({ re
           strokeLinejoin="round"
         />
       </svg>
-      <span>{responseTimeMs.toFixed(0)}ms</span>
+      <span>{t("caching.responseTime", { value: responseTimeMs.toFixed(0) })}</span>
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailDeleteModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailDeleteModal.tsx
index a3ed15b630f..8dfe9442d7c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailDeleteModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailDeleteModal.tsx
@@ -1,12 +1,10 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import DeleteResourceModal from "@/components/common_components/DeleteResourceModal";
 import { deleteGuardrailCall } from "@/components/networking";
 import { toast } from "@/lib/toast";
 import { formatGuardrailMode, getGuardrailLogoAndName } from "./guardrail_info_helpers";
 
-const DANGLING_REFERENCE_WARNING =
-  "Keys, teams, and policies that list this guardrail will silently stop running it. Policy pipeline steps that use it will block every request with a 400 error, unless the step's on_error is next or allow (or its on_fail, when on_error is not set).";
-
 export interface DeletableGuardrail {
   guardrail_id: string;
   guardrail_name?: string | null;
@@ -25,6 +23,7 @@ interface GuardrailDeleteModalProps {
 }
 
 export function GuardrailDeleteModal({ guardrail, accessToken, onClose, onDeleted }: GuardrailDeleteModalProps) {
+  const { t } = useTranslation();
   const [isDeleting, setIsDeleting] = useState(false);
   const guardrailName = guardrail ? guardrail.guardrail_name || guardrail.guardrail_id : "";
   const providerDisplayName = getGuardrailLogoAndName(guardrail?.litellm_params?.guardrail || "").displayName;
@@ -34,11 +33,11 @@ export function GuardrailDeleteModal({ guardrail, accessToken, onClose, onDelete
     setIsDeleting(true);
     try {
       await deleteGuardrailCall(accessToken, guardrail.guardrail_id);
-      toast.success(`Guardrail "${guardrailName}" deleted successfully`);
+      toast.success(t("guardrails.deleteModal.toast.deleted", { name: guardrailName }));
       onClose();
       onDeleted();
     } catch {
-      toast.fromError("Failed to delete guardrail");
+      toast.fromError(t("guardrails.deleteModal.toast.deleteFailed"));
       onClose();
     } finally {
       setIsDeleting(false);
@@ -48,16 +47,21 @@ export function GuardrailDeleteModal({ guardrail, accessToken, onClose, onDelete
   return (
     <DeleteResourceModal
       isOpen={guardrail !== null}
-      title="Delete Guardrail"
-      alertMessage={DANGLING_REFERENCE_WARNING}
-      message={`Are you sure you want to delete guardrail: ${guardrailName}? This action cannot be undone.`}
-      resourceInformationTitle="Guardrail Information"
+      title={t("guardrails.deleteModal.title")}
+      alertMessage={t("guardrails.deleteModal.danglingReferenceWarning")}
+      message={t("guardrails.deleteModal.message", { name: guardrailName })}
+      resourceInformationTitle={t("guardrails.deleteModal.infoTitle")}
       resourceInformation={[
-        { label: "Name", value: guardrail?.guardrail_name },
-        { label: "ID", value: guardrail?.guardrail_id, code: true },
-        { label: "Provider", value: providerDisplayName },
-        { label: "Mode", value: formatGuardrailMode(guardrail?.litellm_params?.mode) },
-        { label: "Default On", value: guardrail?.litellm_params?.default_on ? "Yes" : "No" },
+        { label: t("guardrails.deleteModal.info.name"), value: guardrail?.guardrail_name },
+        { label: t("guardrails.deleteModal.info.id"), value: guardrail?.guardrail_id, code: true },
+        { label: t("guardrails.deleteModal.info.provider"), value: providerDisplayName },
+        { label: t("guardrails.deleteModal.info.mode"), value: formatGuardrailMode(guardrail?.litellm_params?.mode) },
+        {
+          label: t("guardrails.deleteModal.info.defaultOn"),
+          value: guardrail?.litellm_params?.default_on
+            ? t("guardrails.deleteModal.info.yes")
+            : t("guardrails.deleteModal.info.no"),
+        },
       ]}
       onCancel={onClose}
       onOk={handleDelete}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx
index 071d8010ea0..74878fc8e62 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx
@@ -1,7 +1,9 @@
 "use client";
 
+import type { ParseKeys } from "i18next";
 import { CircleHelp } from "lucide-react";
 import React, { useEffect, useId } from "react";
+import { useTranslation } from "react-i18next";
 import {
   useController,
   useWatch,
@@ -121,22 +123,24 @@ export const GuardrailField: React.FC<GuardrailFieldProps> = ({
   );
 };
 
-const SKIP_MESSAGE_ITEMS = [
-  { label: "Use global default", value: "inherit" },
-  { label: "Yes — exclude from guardrail scan", value: "yes" },
-  { label: "No — always include in scan", value: "no" },
+const SKIP_MESSAGE_ITEMS: { labelKey: ParseKeys; value: string }[] = [
+  { labelKey: "guardrails.formField.skipMessage.options.inherit", value: "inherit" },
+  { labelKey: "guardrails.formField.skipMessage.options.yes", value: "yes" },
+  { labelKey: "guardrails.formField.skipMessage.options.no", value: "no" },
 ];
 
 export const SkipMessageSelect: React.FC<{ control: GuardrailFieldControlProps }> = ({ control }) => {
+  const { t } = useTranslation();
   const { id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy } = control;
+  const items = SKIP_MESSAGE_ITEMS.map(({ labelKey, value: itemValue }) => ({ label: t(labelKey), value: itemValue }));
 
   return (
-    <Select items={SKIP_MESSAGE_ITEMS} value={asText(value) || null} onValueChange={onChange}>
+    <Select items={items} value={asText(value) || null} onValueChange={onChange}>
       <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy} className="w-full">
-        <SelectValue placeholder="Select an option" />
+        <SelectValue placeholder={t("guardrails.formField.skipMessage.placeholder")} />
       </SelectTrigger>
       <SelectContent>
-        {SKIP_MESSAGE_ITEMS.map((item) => (
+        {items.map((item) => (
           <SelectItem key={item.value} value={item.value}>
             {item.label}
           </SelectItem>
@@ -150,8 +154,9 @@ export const LoggingOnlyScopeSelect: React.FC<{
   control: GuardrailFieldControlProps;
   directionalScopeSupported: boolean;
 }> = ({ control, directionalScopeSupported }) => {
+  const { t } = useTranslation();
   const { id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy } = control;
-  const items = getLoggingOnlyScopeOptions(directionalScopeSupported);
+  const items = getLoggingOnlyScopeOptions(directionalScopeSupported, t);
 
   useEffect(() => {
     const currentChoice = isLoggingOnlyScopeChoice(value) ? value : "default";
@@ -162,7 +167,7 @@ export const LoggingOnlyScopeSelect: React.FC<{
   return (
     <Select items={items} value={asText(value) || "default"} onValueChange={onChange}>
       <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy} className="w-full">
-        <SelectValue placeholder="Select an option" />
+        <SelectValue placeholder={t("guardrails.formField.loggingOnlyScope.placeholder")} />
       </SelectTrigger>
       <SelectContent>
         {items.map((item) => (
@@ -180,6 +185,7 @@ export const LoggingOnlyScopeField: React.FC<{
   mode: unknown;
   directionalScopeSupported: boolean;
 }> = ({ control, mode, directionalScopeSupported }) => {
+  const { t } = useTranslation();
   const scopeChoice = useWatch({ control, name: "logging_only_scope_choice" });
   const continueDisabled = scopeChoice === "input" || scopeChoice === "output";
   if (!modeIncludesLoggingOnly(mode)) return null;
@@ -190,8 +196,8 @@ export const LoggingOnlyScopeField: React.FC<{
         control={control}
         name="logging_only_scope_choice"
         label={labelWithHint(
-          "Logging only scope",
-          "Which direction a logging_only scan observes. Observe-only scans never block; pre_call and post_call on this guardrail still block.",
+          t("guardrails.formField.loggingOnlyScope.label"),
+          t("guardrails.formField.loggingOnlyScope.hint"),
         )}
       >
         {(fieldControl) => (
@@ -202,8 +208,8 @@ export const LoggingOnlyScopeField: React.FC<{
         control={control}
         name="logging_only_continue_on_input_failure"
         label={labelWithHint(
-          "Continue observing the response after a flagged request",
-          "When on, a flagged or failing request scan is logged and the response is still scanned, so both verdicts land.",
+          t("guardrails.formField.continueOnInputFailure.label"),
+          t("guardrails.formField.continueOnInputFailure.hint"),
         )}
       >
         {(fieldControl) => (
@@ -214,7 +220,7 @@ export const LoggingOnlyScopeField: React.FC<{
             onCheckedChange={fieldControl.onChange}
             aria-invalid={fieldControl["aria-invalid"]}
             aria-describedby={fieldControl["aria-describedby"]}
-            aria-label="Continue observing the response after a flagged request"
+            aria-label={t("guardrails.formField.continueOnInputFailure.label")}
           />
         )}
       </GuardrailField>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailModeDisplay.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailModeDisplay.tsx
index 2121a83f9fd..733560830ac 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailModeDisplay.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailModeDisplay.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Badge } from "@/components/ui/badge";
 import { Card } from "@/components/ui/card";
 import {
@@ -15,39 +16,53 @@ type GuardrailModeParams = {
   logging_only_continue_on_input_failure?: boolean | null;
 };
 
-export const GuardrailModeCard: React.FC<{ litellmParams: GuardrailModeParams }> = ({ litellmParams }) => (
-  <Card className="block p-6">
-    <p>Mode</p>
-    <div className="mt-2">
-      <h3 className="text-lg font-medium">{formatGuardrailMode(litellmParams.mode) || "-"}</h3>
-      <Badge variant={litellmParams.default_on ? "secondary" : "outline"}>
-        {litellmParams.default_on ? "Default On" : "Default Off"}
-      </Badge>
-    </div>
-    {modeIncludesLoggingOnly(litellmParams.mode) && (
-      <div className="mt-4">
-        <p>Logging only scope</p>
-        <h3 className="text-lg font-medium">{formatLoggingOnlyScope(litellmParams.logging_only_scope)}</h3>
-        <p className="mt-2">Continue after a flagged request</p>
-        <h3 className="text-lg font-medium">{loggingOnlyContinueFromParams(litellmParams) ? "On" : "Off"}</h3>
+export const GuardrailModeCard: React.FC<{ litellmParams: GuardrailModeParams }> = ({ litellmParams }) => {
+  const { t } = useTranslation();
+  return (
+    <Card className="block p-6">
+      <p>{t("guardrails.modeDisplay.mode")}</p>
+      <div className="mt-2">
+        <h3 className="text-lg font-medium">{formatGuardrailMode(litellmParams.mode) || "-"}</h3>
+        <Badge variant={litellmParams.default_on ? "secondary" : "outline"}>
+          {litellmParams.default_on ? t("guardrails.modeDisplay.defaultOn") : t("guardrails.modeDisplay.defaultOff")}
+        </Badge>
       </div>
-    )}
-  </Card>
-);
+      {modeIncludesLoggingOnly(litellmParams.mode) && (
+        <div className="mt-4">
+          <p>{t("guardrails.modeDisplay.loggingOnlyScope")}</p>
+          <h3 className="text-lg font-medium">{formatLoggingOnlyScope(litellmParams.logging_only_scope, t)}</h3>
+          <p className="mt-2">{t("guardrails.modeDisplay.continueAfterFlagged")}</p>
+          <h3 className="text-lg font-medium">
+            {loggingOnlyContinueFromParams(litellmParams)
+              ? t("guardrails.modeDisplay.on")
+              : t("guardrails.modeDisplay.off")}
+          </h3>
+        </div>
+      )}
+    </Card>
+  );
+};
 
-export const GuardrailModeRows: React.FC<{ litellmParams: GuardrailModeParams }> = ({ litellmParams }) => (
-  <>
-    <div>
-      <p className="font-medium">Mode</p>
-      <div>{formatGuardrailMode(litellmParams.mode) || "-"}</div>
-    </div>
-    {modeIncludesLoggingOnly(litellmParams.mode) && (
+export const GuardrailModeRows: React.FC<{ litellmParams: GuardrailModeParams }> = ({ litellmParams }) => {
+  const { t } = useTranslation();
+  return (
+    <>
       <div>
-        <p className="font-medium">Logging only scope</p>
-        <div>{formatLoggingOnlyScope(litellmParams.logging_only_scope)}</div>
-        <p className="font-medium">Continue after a flagged request</p>
-        <div>{loggingOnlyContinueFromParams(litellmParams) ? "On" : "Off"}</div>
+        <p className="font-medium">{t("guardrails.modeDisplay.mode")}</p>
+        <div>{formatGuardrailMode(litellmParams.mode) || "-"}</div>
       </div>
-    )}
-  </>
-);
+      {modeIncludesLoggingOnly(litellmParams.mode) && (
+        <div>
+          <p className="font-medium">{t("guardrails.modeDisplay.loggingOnlyScope")}</p>
+          <div>{formatLoggingOnlyScope(litellmParams.logging_only_scope, t)}</div>
+          <p className="font-medium">{t("guardrails.modeDisplay.continueAfterFlagged")}</p>
+          <div>
+            {loggingOnlyContinueFromParams(litellmParams)
+              ? t("guardrails.modeDisplay.on")
+              : t("guardrails.modeDisplay.off")}
+          </div>
+        </div>
+      )}
+    </>
+  );
+};
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailReadOnlyDetails.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailReadOnlyDetails.tsx
index 43434ee0dca..93ab6299e1a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailReadOnlyDetails.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailReadOnlyDetails.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "react-i18next";
 import { Badge } from "@/components/ui/badge";
 import { DEFAULT_DECISION_THRESHOLD } from "./decision_model/decisionModelQuestion";
 import { GuardrailModeRows } from "./GuardrailModeDisplay";
@@ -17,29 +18,32 @@ const DecisionModelSection = ({
 }: {
   decisionModel: string;
   checks: DecisionModelCheckView[];
-}) => (
-  <div>
-    <p className="font-medium">Decision Model</p>
-    <div className="font-mono">{decisionModel}</div>
-    <p className="mt-2 font-medium">Checks</p>
-    <div className="mt-2 overflow-hidden rounded-lg border border-border">
-      <div className="flex border-b border-border bg-muted/40 px-4 py-2 text-xs font-semibold">
-        <span className="flex-1">Check</span>
-        <span className="w-24 text-right">Action</span>
-        <span className="w-24 text-right">Threshold</span>
-      </div>
-      {checks.map((check) => (
-        <div key={check.name} className="flex items-center border-b border-border px-4 py-2 text-sm last:border-b-0">
-          <span className="flex-1">{check.name.replace(/_/g, " ")}</span>
-          <span className="w-24 text-right">
-            <Badge variant="secondary">{check.action ?? "block"}</Badge>
-          </span>
-          <span className="w-24 text-right">{check.threshold ?? DEFAULT_DECISION_THRESHOLD}</span>
+}) => {
+  const { t } = useTranslation();
+  return (
+    <div>
+      <p className="font-medium">{t("guardrails.readOnlyDetails.decisionModel.heading")}</p>
+      <div className="font-mono">{decisionModel}</div>
+      <p className="mt-2 font-medium">{t("guardrails.readOnlyDetails.decisionModel.checks")}</p>
+      <div className="mt-2 overflow-hidden rounded-lg border border-border">
+        <div className="flex border-b border-border bg-muted/40 px-4 py-2 text-xs font-semibold">
+          <span className="flex-1">{t("guardrails.readOnlyDetails.decisionModel.columns.check")}</span>
+          <span className="w-24 text-right">{t("guardrails.readOnlyDetails.decisionModel.columns.action")}</span>
+          <span className="w-24 text-right">{t("guardrails.readOnlyDetails.decisionModel.columns.threshold")}</span>
         </div>
-      ))}
+        {checks.map((check) => (
+          <div key={check.name} className="flex items-center border-b border-border px-4 py-2 text-sm last:border-b-0">
+            <span className="flex-1">{check.name.replace(/_/g, " ")}</span>
+            <span className="w-24 text-right">
+              <Badge variant="secondary">{check.action ?? "block"}</Badge>
+            </span>
+            <span className="w-24 text-right">{check.threshold ?? DEFAULT_DECISION_THRESHOLD}</span>
+          </div>
+        ))}
+      </div>
     </div>
-  </div>
-);
+  );
+};
 
 export const GuardrailReadOnlyDetails = ({
   guardrailId,
@@ -72,45 +76,52 @@ export const GuardrailReadOnlyDetails = ({
   updatedAt: string;
   showToolPermission: boolean;
   toolPermissionConfig: ToolPermissionConfig;
-}) => (
-  <div className="space-y-4">
-    <div>
-      <p className="font-medium">Guardrail ID</p>
-      <div className="font-mono">{guardrailId}</div>
-    </div>
-    <div>
-      <p className="font-medium">Guardrail Name</p>
-      <div>{guardrailName || "Unnamed Guardrail"}</div>
-    </div>
-    <div>
-      <p className="font-medium">Provider</p>
-      <div>{displayName}</div>
-    </div>
-    <GuardrailModeRows litellmParams={litellmParams} />
-    <GuardrailStreamScopeDetail raw={streamScope} />
-    <div>
-      <p className="font-medium">Default On</p>
-      <Badge variant={defaultOn ? "secondary" : "outline"}>{defaultOn ? "Yes" : "No"}</Badge>
-    </div>
-    {litellmParams.guardrail === "decision_model" && litellmParams.decision_model && (
-      <DecisionModelSection decisionModel={litellmParams.decision_model} checks={litellmParams.checks ?? []} />
-    )}
-    {piiEntityCount > 0 && (
+}) => {
+  const { t } = useTranslation();
+  return (
+    <div className="space-y-4">
       <div>
-        <p className="font-medium">PII Protection</p>
-        <div className="mt-2">
-          <Badge variant="secondary">{piiEntityCount} PII entities configured</Badge>
-        </div>
+        <p className="font-medium">{t("guardrails.readOnlyDetails.guardrailId")}</p>
+        <div className="font-mono">{guardrailId}</div>
       </div>
-    )}
-    <div>
-      <p className="font-medium">Created At</p>
-      <div>{createdAt}</div>
+      <div>
+        <p className="font-medium">{t("guardrails.readOnlyDetails.guardrailName")}</p>
+        <div>{guardrailName || t("guardrails.readOnlyDetails.unnamed")}</div>
+      </div>
+      <div>
+        <p className="font-medium">{t("guardrails.readOnlyDetails.provider")}</p>
+        <div>{displayName}</div>
+      </div>
+      <GuardrailModeRows litellmParams={litellmParams} />
+      <GuardrailStreamScopeDetail raw={streamScope} />
+      <div>
+        <p className="font-medium">{t("guardrails.readOnlyDetails.defaultOn")}</p>
+        <Badge variant={defaultOn ? "secondary" : "outline"}>
+          {defaultOn ? t("guardrails.readOnlyDetails.yes") : t("guardrails.readOnlyDetails.no")}
+        </Badge>
+      </div>
+      {litellmParams.guardrail === "decision_model" && litellmParams.decision_model && (
+        <DecisionModelSection decisionModel={litellmParams.decision_model} checks={litellmParams.checks ?? []} />
+      )}
+      {piiEntityCount > 0 && (
+        <div>
+          <p className="font-medium">{t("guardrails.readOnlyDetails.piiProtection")}</p>
+          <div className="mt-2">
+            <Badge variant="secondary">
+              {piiEntityCount} {t("guardrails.readOnlyDetails.piiEntitiesConfigured", { count: piiEntityCount })}
+            </Badge>
+          </div>
+        </div>
+      )}
+      <div>
+        <p className="font-medium">{t("guardrails.readOnlyDetails.createdAt")}</p>
+        <div>{createdAt}</div>
+      </div>
+      <div>
+        <p className="font-medium">{t("guardrails.readOnlyDetails.lastUpdated")}</p>
+        <div>{updatedAt}</div>
+      </div>
+      {showToolPermission && <ToolPermissionRulesEditor value={toolPermissionConfig} disabled />}
     </div>
-    <div>
-      <p className="font-medium">Last Updated</p>
-      <div>{updatedAt}</div>
-    </div>
-    {showToolPermission && <ToolPermissionRulesEditor value={toolPermissionConfig} disabled />}
-  </div>
-);
+  );
+};
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailSettingsActions.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailSettingsActions.tsx
index 46bc09e7383..5ad7b0f42fc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailSettingsActions.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailSettingsActions.tsx
@@ -1,5 +1,6 @@
 import { Code, Trash2 } from "lucide-react";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { DeletableGuardrail, GuardrailDeleteModal } from "./GuardrailDeleteModal";
 
@@ -20,6 +21,7 @@ export function GuardrailSettingsActions({
   accessToken,
   onDeleted,
 }: GuardrailSettingsActionsProps) {
+  const { t } = useTranslation();
   const [isModalOpen, setIsModalOpen] = useState(false);
 
   if (isEditing || guardrail.guardrail_definition_location === "config") return null;
@@ -29,16 +31,16 @@ export function GuardrailSettingsActions({
       {guardrail.litellm_params?.guardrail === "custom_code" ? (
         <Button variant="outline" onClick={onEditCode}>
           <Code />
-          Edit Code
+          {t("guardrails.settingsActions.editCode")}
         </Button>
       ) : (
         <Button variant="outline" onClick={onEdit}>
-          Edit Settings
+          {t("guardrails.settingsActions.editSettings")}
         </Button>
       )}
       <Button variant="destructive" onClick={() => setIsModalOpen(true)}>
         <Trash2 />
-        Delete
+        {t("guardrails.settingsActions.delete")}
       </Button>
       <GuardrailDeleteModal
         guardrail={isModalOpen ? guardrail : null}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPanel.tsx
index 183d68da261..8cc25913b63 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPanel.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Copy, Info } from "lucide-react";
 import { toast } from "@/lib/toast";
 import { Button } from "@/components/ui/button";
@@ -25,6 +26,7 @@ export function GuardrailTestPanel({
   errors,
   onClose,
 }: GuardrailTestPanelProps) {
+  const { t } = useTranslation();
   const [inputText, setInputText] = useState("");
   const [metadataText, setMetadataText] = useState("");
   const [metadataError, setMetadataError] = useState<string | null>(null);
@@ -36,24 +38,24 @@ export function GuardrailTestPanel({
     try {
       const parsed = JSON.parse(raw);
       if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
-        return { metadata: null, error: "Metadata must be a JSON object" };
+        return { metadata: null, error: t("guardrails.testPanel.errors.metadataNotObject") };
       }
       return { metadata: parsed, error: null };
     } catch {
-      return { metadata: null, error: "Invalid JSON" };
+      return { metadata: null, error: t("guardrails.testPanel.errors.invalidJson") };
     }
   };
 
   const handleSubmit = () => {
     if (!inputText.trim()) {
-      toast.fromError("Please enter text to test");
+      toast.fromError(t("guardrails.testPanel.toast.emptyText"));
       return;
     }
 
     const { metadata, error } = parseMetadata(metadataText);
     if (error) {
       setMetadataError(error);
-      toast.fromError(`Metadata: ${error}`);
+      toast.fromError(t("guardrails.testPanel.toast.metadataError", { error }));
       return;
     }
     setMetadataError(null);
@@ -99,9 +101,9 @@ export function GuardrailTestPanel({
   const handleCopyInput = async () => {
     const success = await copyToClipboard(inputText);
     if (success) {
-      toast.success("Input copied to clipboard");
+      toast.success(t("guardrails.testPanel.toast.copied"));
     } else {
-      toast.fromError("Failed to copy input");
+      toast.fromError(t("guardrails.testPanel.toast.copyFailed"));
     }
   };
 
@@ -112,7 +114,7 @@ export function GuardrailTestPanel({
         <div className="flex items-center space-x-3">
           <div className="flex-1 min-w-0">
             <div className="mb-1 flex items-center space-x-2">
-              <h2 className="text-lg font-semibold">Test Guardrails:</h2>
+              <h2 className="text-lg font-semibold">{t("guardrails.testPanel.title")}</h2>
               <div className="flex flex-wrap gap-2">
                 {guardrailNames.map((name) => (
                   <div
@@ -125,7 +127,11 @@ export function GuardrailTestPanel({
               </div>
             </div>
             <p className="text-sm text-muted-foreground">
-              Test {guardrailNames.length > 1 ? "guardrails" : "guardrail"} and compare results
+              <Trans
+                i18nKey="guardrails.testPanel.subtitle"
+                count={guardrailNames.length}
+                components={{ noun: <></> }}
+              />
             </p>
           </div>
         </div>
@@ -137,7 +143,7 @@ export function GuardrailTestPanel({
           <div>
             <div className="mb-2 flex items-center justify-between">
               <div className="flex items-center gap-2">
-                <label className="text-sm font-medium">Input Text</label>
+                <label className="text-sm font-medium">{t("guardrails.testPanel.inputLabel")}</label>
                 <Tooltip>
                   <TooltipTrigger
                     render={
@@ -146,13 +152,13 @@ export function GuardrailTestPanel({
                       </span>
                     }
                   />
-                  <TooltipContent>Press Enter to submit. Use Shift+Enter for new line.</TooltipContent>
+                  <TooltipContent>{t("guardrails.testPanel.inputTooltip")}</TooltipContent>
                 </Tooltip>
               </div>
               {inputText && (
                 <Button size="sm" variant="secondary" onClick={handleCopyInput}>
                   <Copy />
-                  Copy Input
+                  {t("guardrails.testPanel.copyInput")}
                 </Button>
               )}
             </div>
@@ -160,21 +166,26 @@ export function GuardrailTestPanel({
               value={inputText}
               onChange={(e) => setInputText(e.target.value)}
               onKeyDown={handleKeyDown}
-              placeholder="Enter text to test with guardrails..."
+              placeholder={t("guardrails.testPanel.inputPlaceholder")}
               rows={8}
               className="font-mono text-sm field-sizing-fixed"
             />
             <div className="mt-1 flex items-center justify-between">
               <span className="text-xs text-muted-foreground">
-                Press <Kbd>Enter</Kbd> to submit • <Kbd>Shift+Enter</Kbd> for new line
+                <Trans i18nKey="guardrails.testPanel.keyboardHint" components={{ kbd: <Kbd /> }} />
+              </span>
+              <span className="text-xs text-muted-foreground">
+                <Trans
+                  i18nKey="guardrails.testPanel.characters"
+                  components={{ length: <>{String(inputText.length)}</> }}
+                />
               </span>
-              <span className="text-xs text-muted-foreground">Characters: {inputText.length}</span>
             </div>
           </div>
 
           <div>
             <div className="mb-2 flex items-center gap-2">
-              <label className="text-sm font-medium">Metadata (optional)</label>
+              <label className="text-sm font-medium">{t("guardrails.testPanel.metadataLabel")}</label>
               <Tooltip>
                 <TooltipTrigger
                   render={
@@ -183,10 +194,7 @@ export function GuardrailTestPanel({
                     </span>
                   }
                 />
-                <TooltipContent>
-                  JSON object forwarded to the guardrail as request_data[&apos;metadata&apos;]. Custom guardrails can
-                  read per-request configuration from it.
-                </TooltipContent>
+                <TooltipContent>{t("guardrails.testPanel.metadataTooltip")}</TooltipContent>
               </Tooltip>
             </div>
             <Textarea
@@ -214,8 +222,8 @@ export function GuardrailTestPanel({
             >
               {isLoading && <UiLoadingSpinner className="size-4" />}
               {isLoading
-                ? `Testing ${guardrailNames.length} guardrail${guardrailNames.length > 1 ? "s" : ""}...`
-                : `Test ${guardrailNames.length} guardrail${guardrailNames.length > 1 ? "s" : ""}`}
+                ? t("guardrails.testPanel.submit.running", { count: guardrailNames.length })
+                : t("guardrails.testPanel.submit.idle", { count: guardrailNames.length })}
             </Button>
           </div>
         </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPlayground.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPlayground.tsx
index c64b5d7cb5c..2b1b11cfba4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPlayground.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestPlayground.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { FlaskConical, Search } from "lucide-react";
 import GuardrailTestPanel from "./GuardrailTestPanel";
 import { applyGuardrail } from "@/components/networking";
@@ -47,6 +48,7 @@ const GuardrailTestPlayground: React.FC<GuardrailTestPlaygroundProps> = ({
   accessToken,
   onClose,
 }) => {
+  const { t } = useTranslation();
   const [selectedGuardrails, setSelectedGuardrails] = useState<Set<string>>(new Set());
   const [searchQuery, setSearchQuery] = useState("");
   const [testResults, setTestResults] = useState<TestResult[]>([]);
@@ -107,10 +109,10 @@ const GuardrailTestPlayground: React.FC<GuardrailTestPlaygroundProps> = ({
     setIsTesting(false);
 
     if (results.length > 0) {
-      toast.success(`${results.length} guardrail${results.length > 1 ? "s" : ""} applied successfully`);
+      toast.success(t("guardrails.testPlayground.toast.applied", { count: results.length }));
     }
     if (errors.length > 0) {
-      toast.fromError(`${errors.length} guardrail${errors.length > 1 ? "s" : ""} failed`);
+      toast.fromError(t("guardrails.testPlayground.toast.failed", { count: errors.length }));
     }
   };
 
@@ -123,13 +125,13 @@ const GuardrailTestPlayground: React.FC<GuardrailTestPlaygroundProps> = ({
             <div className="flex w-1/4 flex-col overflow-hidden border-r border-border">
               <div className="border-b border-border p-4">
                 <div className="mb-3">
-                  <h3 className="mb-3 text-lg font-semibold">Guardrails</h3>
+                  <h3 className="mb-3 text-lg font-semibold">{t("guardrails.testPlayground.sidebarTitle")}</h3>
                   <InputGroup>
                     <InputGroupAddon>
                       <Search className="size-4 text-muted-foreground" />
                     </InputGroupAddon>
                     <InputGroupInput
-                      placeholder="Search guardrails..."
+                      placeholder={t("guardrails.testPlayground.searchPlaceholder")}
                       value={searchQuery}
                       onChange={(e) => setSearchQuery(e.target.value)}
                     />
@@ -144,7 +146,9 @@ const GuardrailTestPlayground: React.FC<GuardrailTestPlaygroundProps> = ({
                   </div>
                 ) : filteredGuardrails.length === 0 ? (
                   <div className="p-4 text-center text-muted-foreground">
-                    {searchQuery ? "No guardrails match your search" : "No guardrails available"}
+                    {searchQuery
+                      ? t("guardrails.testPlayground.noMatches")
+                      : t("guardrails.testPlayground.noGuardrails")}
                   </div>
                 ) : (
                   <ul className="m-0 list-none p-0">
@@ -168,11 +172,11 @@ const GuardrailTestPlayground: React.FC<GuardrailTestPlaygroundProps> = ({
                         </div>
                         <div className="mt-1 space-y-1 text-xs">
                           <div>
-                            <span className="font-medium">Type: </span>
+                            <span className="font-medium">{t("guardrails.testPlayground.typeLabel")}</span>
                             <span className="text-muted-foreground">{guardrail.litellm_params.guardrail}</span>
                           </div>
                           <div>
-                            <span className="font-medium">Mode: </span>
+                            <span className="font-medium">{t("guardrails.testPlayground.modeLabel")}</span>
                             <span className="text-muted-foreground">
                               {formatGuardrailMode(guardrail.litellm_params.mode)}
                             </span>
@@ -186,7 +190,13 @@ const GuardrailTestPlayground: React.FC<GuardrailTestPlaygroundProps> = ({
 
               <div className="border-t border-border bg-muted/40 p-3">
                 <span className="text-xs text-muted-foreground">
-                  {selectedGuardrails.size} of {filteredGuardrails.length} selected
+                  <Trans
+                    i18nKey="guardrails.testPlayground.selectedCount"
+                    components={{
+                      selected: <>{String(selectedGuardrails.size)}</>,
+                      total: <>{String(filteredGuardrails.length)}</>,
+                    }}
+                  />
                 </span>
               </div>
             </div>
@@ -194,17 +204,15 @@ const GuardrailTestPlayground: React.FC<GuardrailTestPlaygroundProps> = ({
             {/* Right Panel - Test Area */}
             <div className="flex w-3/4 flex-col">
               <div className="flex items-center justify-between border-b border-border p-4">
-                <h2 className="mb-0 text-xl font-semibold">Guardrail Testing Playground</h2>
+                <h2 className="mb-0 text-xl font-semibold">{t("guardrails.testPlayground.title")}</h2>
               </div>
 
               <div className="flex-1 overflow-auto p-4">
                 {selectedGuardrails.size === 0 ? (
                   <div className="flex h-full flex-col items-center justify-center text-muted-foreground">
                     <FlaskConical className="mb-4 size-12" />
-                    <p className="mb-2 text-lg font-medium">Select Guardrails to Test</p>
-                    <p className="max-w-md text-center">
-                      Choose one or more guardrails from the left sidebar to start testing and comparing results.
-                    </p>
+                    <p className="mb-2 text-lg font-medium">{t("guardrails.testPlayground.emptyState.title")}</p>
+                    <p className="max-w-md text-center">{t("guardrails.testPlayground.emptyState.description")}</p>
                   </div>
                 ) : (
                   <div className="h-full">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestResults.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestResults.tsx
index 766aaefc141..470c4b09f9f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestResults.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailTestResults.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Check, ChevronDown, ChevronRight, Clock, Copy } from "lucide-react";
 import { toast } from "@/lib/toast";
 import { Button } from "@/components/ui/button";
@@ -22,6 +23,7 @@ interface GuardrailTestResultsProps {
 }
 
 export function GuardrailTestResults({ results, errors }: GuardrailTestResultsProps) {
+  const { t } = useTranslation();
   const [collapsedResults, setCollapsedResults] = useState<Set<string>>(new Set());
 
   const toggleResultCollapse = (guardrailName: string) => {
@@ -68,7 +70,7 @@ export function GuardrailTestResults({ results, errors }: GuardrailTestResultsPr
 
   return (
     <div className="space-y-3 border-t border-border pt-4">
-      <h3 className="text-sm font-semibold">Results</h3>
+      <h3 className="text-sm font-semibold">{t("guardrails.testResults.title")}</h3>
 
       {/* Success Results */}
       {results &&
@@ -93,7 +95,12 @@ export function GuardrailTestResults({ results, errors }: GuardrailTestResultsPr
                   <div className="flex items-center gap-3">
                     <div className="flex items-center space-x-1 text-xs text-muted-foreground">
                       <Clock className="size-3" />
-                      <span className="font-medium">{result.latency}ms</span>
+                      <span className="font-medium">
+                        <Trans
+                          i18nKey="guardrails.testResults.latency"
+                          components={{ value: <>{String(result.latency)}</> }}
+                        />
+                      </span>
                     </div>
                     {!isCollapsed && (
                       <Button
@@ -102,14 +109,14 @@ export function GuardrailTestResults({ results, errors }: GuardrailTestResultsPr
                         onClick={async () => {
                           const success = await copyToClipboard(result.response_text);
                           if (success) {
-                            toast.success("Result copied to clipboard");
+                            toast.success(t("guardrails.testResults.toast.copied"));
                           } else {
-                            toast.fromError("Failed to copy result");
+                            toast.fromError(t("guardrails.testResults.toast.copyFailed"));
                           }
                         }}
                       >
                         <Copy />
-                        Copy
+                        {t("guardrails.testResults.copy")}
                       </Button>
                     )}
                   </div>
@@ -117,13 +124,16 @@ export function GuardrailTestResults({ results, errors }: GuardrailTestResultsPr
                 {!isCollapsed && (
                   <>
                     <div className="rounded-sm border border-success/20 bg-background p-3">
-                      <label className="mb-2 block text-xs font-medium text-muted-foreground">Output Text</label>
+                      <label className="mb-2 block text-xs font-medium text-muted-foreground">
+                        {t("guardrails.testResults.outputLabel")}
+                      </label>
                       <div className="font-mono text-sm whitespace-pre-wrap wrap-break-word">
                         {result.response_text}
                       </div>
                     </div>
                     <div className="text-xs text-muted-foreground">
-                      <span className="font-medium">Characters:</span> {result.response_text.length}
+                      <span className="font-medium">{t("guardrails.testResults.charactersLabel")}</span>{" "}
+                      {result.response_text.length}
                     </div>
                   </>
                 )}
@@ -162,11 +172,19 @@ export function GuardrailTestResults({ results, errors }: GuardrailTestResultsPr
                         className="cursor-pointer text-sm font-medium text-destructive"
                         onClick={() => toggleResultCollapse(errorItem.guardrailName)}
                       >
-                        {errorItem.guardrailName} - Error
+                        <Trans
+                          i18nKey="guardrails.testResults.errorTitle"
+                          components={{ name: <>{errorItem.guardrailName}</> }}
+                        />
                       </p>
                       <div className="flex items-center space-x-1 text-xs text-muted-foreground">
                         <Clock className="size-3" />
-                        <span className="font-medium">{errorItem.latency}ms</span>
+                        <span className="font-medium">
+                          <Trans
+                            i18nKey="guardrails.testResults.latency"
+                            components={{ value: <>{String(errorItem.latency)}</> }}
+                          />
+                        </span>
                       </div>
                     </div>
                     {!isCollapsed && <p className="mt-1 text-sm text-destructive">{errorItem.error.message}</p>}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailsPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailsPanel.tsx
index b53d016e950..dfdd76136f8 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailsPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailsPanel.tsx
@@ -1,5 +1,6 @@
 import { parseAsString, useQueryState } from "nuqs";
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { ChevronDown, Code, Plus } from "lucide-react";
 import { getGuardrailsList } from "@/components/networking";
@@ -32,6 +33,7 @@ interface GuardrailsResponse {
 }
 
 const GuardrailsPanel: React.FC<GuardrailsPanelProps> = ({ accessToken, userRole }) => {
+  const { t } = useTranslation();
   const [guardrailsList, setGuardrailsList] = useState<Guardrail[]>([]);
   const [isAddModalVisible, setIsAddModalVisible] = useState(false);
   const [isCustomCodeModalVisible, setIsCustomCodeModalVisible] = useState(false);
@@ -104,18 +106,18 @@ const GuardrailsPanel: React.FC<GuardrailsPanelProps> = ({ accessToken, userRole
           {isAdmin && (
             <>
               <TabsTrigger value="garden" className="flex-none">
-                Guardrail Garden
+                {t("guardrails.panel.tabs.garden")}
               </TabsTrigger>
               <TabsTrigger value="guardrails" className="flex-none">
-                Guardrails
+                {t("guardrails.panel.tabs.guardrails")}
               </TabsTrigger>
               <TabsTrigger value="playground" className="flex-none" disabled={!accessToken}>
-                Test Playground
+                {t("guardrails.panel.tabs.playground")}
               </TabsTrigger>
             </>
           )}
           <TabsTrigger value="submitted" className="flex-none">
-            Submitted Guardrails
+            {t("guardrails.panel.tabs.submitted")}
           </TabsTrigger>
         </TabsList>
 
@@ -130,17 +132,17 @@ const GuardrailsPanel: React.FC<GuardrailsPanelProps> = ({ accessToken, userRole
                 <DropdownMenu>
                   <DropdownMenuTrigger disabled={!accessToken} className={cn(buttonVariants({ variant: "default" }))}>
                     <Plus />
-                    Add New Guardrail
+                    {t("guardrails.panel.addMenu.trigger")}
                     <ChevronDown />
                   </DropdownMenuTrigger>
                   <DropdownMenuContent align="start" className="w-56">
                     <DropdownMenuItem onClick={handleAddGuardrail}>
                       <Plus />
-                      Add Provider Guardrail
+                      {t("guardrails.panel.addMenu.provider")}
                     </DropdownMenuItem>
                     <DropdownMenuItem onClick={handleAddCustomCodeGuardrail}>
                       <Code />
-                      Create Custom Code Guardrail
+                      {t("guardrails.panel.addMenu.customCode")}
                     </DropdownMenuItem>
                   </DropdownMenuContent>
                 </DropdownMenu>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/StreamScopeFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/StreamScopeFields.tsx
index 1a8f55ce477..b914c297cee 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/StreamScopeFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/StreamScopeFields.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "react-i18next";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { GuardrailField, labelWithHint, type GuardrailFormControl } from "./GuardrailFormField";
 import {
@@ -7,14 +8,6 @@ import {
   isGuardrailStreamScope,
 } from "./guardrail_info_helpers";
 
-const STREAM_SCOPE_ITEMS = STREAM_SCOPE_OPTIONS.map((option) => ({
-  label: option.label,
-  value: option.value,
-}));
-
-const REQUEST_SHAPE_HINT =
-  "Run this guardrail on streaming requests, non-streaming requests, or both, for each selected mode.";
-
 export const StreamScopeFields = ({
   modes,
   value,
@@ -24,8 +17,14 @@ export const StreamScopeFields = ({
   value: Record<string, GuardrailStreamScope>;
   onChange: (next: Record<string, GuardrailStreamScope>) => void;
 }) => {
+  const { t } = useTranslation();
   if (modes.length === 0) return null;
 
+  const streamScopeItems = STREAM_SCOPE_OPTIONS.map((option) => ({
+    label: t(option.labelKey),
+    value: option.value,
+  }));
+
   return (
     <div className="space-y-3">
       {modes.map((mode) => {
@@ -33,10 +32,10 @@ export const StreamScopeFields = ({
         return (
           <div key={mode} className="space-y-1">
             <label htmlFor={`stream-scope-${mode}`} className="block text-sm font-medium text-foreground">
-              {mode} applies to
+              {t("guardrails.streamScope.appliesTo", { mode })}
             </label>
             <Select
-              items={STREAM_SCOPE_ITEMS}
+              items={streamScopeItems}
               value={selected}
               onValueChange={(next: GuardrailStreamScope | null) => {
                 if (!isGuardrailStreamScope(next)) return;
@@ -44,10 +43,10 @@ export const StreamScopeFields = ({
               }}
             >
               <SelectTrigger id={`stream-scope-${mode}`} className="w-full">
-                <SelectValue placeholder="Streaming and non-streaming" />
+                <SelectValue placeholder={t("guardrails.streamScope.placeholder")} />
               </SelectTrigger>
               <SelectContent>
-                {STREAM_SCOPE_OPTIONS.map((option) => (
+                {streamScopeItems.map((option) => (
                   <SelectItem key={option.value} value={option.value}>
                     {option.label}
                   </SelectItem>
@@ -61,34 +60,39 @@ export const StreamScopeFields = ({
   );
 };
 
-export const StreamScopeFormField = ({ control, modes }: { control: GuardrailFormControl; modes: string[] }) => (
-  <GuardrailField
-    control={control}
-    name="stream_scope_by_mode"
-    label={labelWithHint("Request shape", REQUEST_SHAPE_HINT)}
-  >
-    {({ value, onChange }) => (
-      <StreamScopeFields
-        modes={modes}
-        value={(value as Record<string, GuardrailStreamScope> | undefined) ?? {}}
-        onChange={onChange}
-      />
-    )}
-  </GuardrailField>
-);
+export const StreamScopeFormField = ({ control, modes }: { control: GuardrailFormControl; modes: string[] }) => {
+  const { t } = useTranslation();
+  return (
+    <GuardrailField
+      control={control}
+      name="stream_scope_by_mode"
+      label={labelWithHint(t("guardrails.streamScope.requestShape"), t("guardrails.streamScope.requestShapeHint"))}
+    >
+      {({ value, onChange }) => (
+        <StreamScopeFields
+          modes={modes}
+          value={(value as Record<string, GuardrailStreamScope> | undefined) ?? {}}
+          onChange={onChange}
+        />
+      )}
+    </GuardrailField>
+  );
+};
 
 export const GuardrailStreamScopeCaption = ({ raw }: { raw: unknown }) => {
-  const label = formatGuardrailStreamScope(raw);
+  const { t } = useTranslation();
+  const label = formatGuardrailStreamScope(raw, t);
   if (!label) return null;
   return <p className="mt-1 text-sm text-muted-foreground">{label}</p>;
 };
 
 export const GuardrailStreamScopeDetail = ({ raw }: { raw: unknown }) => {
-  const label = formatGuardrailStreamScope(raw);
+  const { t } = useTranslation();
+  const label = formatGuardrailStreamScope(raw, t);
   if (!label) return null;
   return (
     <div>
-      <p className="font-medium">Request shape</p>
+      <p className="font-medium">{t("guardrails.streamScope.requestShape")}</p>
       <div>{label}</div>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx
index b29ad63171c..ea4219958c5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx
@@ -1,6 +1,8 @@
 "use client";
 
-import React, { useState, useEffect, useCallback } from "react";
+import React, { useState, useEffect, useCallback, useMemo } from "react";
+import type { ParseKeys, TFunction } from "i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { useDebouncedValue } from "@tanstack/react-pacer/debouncer";
 import { DEBOUNCE_WAIT_MS } from "@/utils/debounceConstants";
 import {
@@ -41,42 +43,50 @@ import { useZodForm } from "@/lib/forms/useZodForm";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Button } from "@/components/ui/button";
 
-const GUARDRAIL_MODES = [
-  { value: "pre_call", label: "Pre Call" },
-  { value: "post_call", label: "Post Call" },
-  { value: "during_call", label: "During Call" },
-] as const;
+const GUARDRAIL_MODES: { value: string; labelKey: ParseKeys }[] = [
+  { value: "pre_call", labelKey: "guardrails.teamTab.modes.preCall" },
+  { value: "post_call", labelKey: "guardrails.teamTab.modes.postCall" },
+  { value: "during_call", labelKey: "guardrails.teamTab.modes.duringCall" },
+];
 
-const submitGuardrailSchema = z.object({
-  team_id: z
-    .string()
-    .nullable()
-    .pipe(z.string({ error: "Select a team" }).min(1, "Select a team")),
-  guardrail_name: z.string().min(1, "Enter a guardrail name"),
-  mode: z.string().min(1, "Select a mode"),
-  api_base: z.string().min(1, "Enter the API base URL").refine(isValidUrl, "Must be a valid URL"),
-  extra_litellm_params: z.string().superRefine((value, ctx) => {
-    if (!value) return;
-    try {
-      const parsed: unknown = JSON.parse(value);
-      if (typeof parsed !== "object" || Array.isArray(parsed)) {
-        ctx.addIssue({ code: "custom", message: "Must be a JSON object" });
+const buildSubmitGuardrailSchema = (t: TFunction) =>
+  z.object({
+    team_id: z
+      .string()
+      .nullable()
+      .pipe(
+        z
+          .string({ error: t("guardrails.teamTab.validation.teamRequired") })
+          .min(1, t("guardrails.teamTab.validation.teamRequired")),
+      ),
+    guardrail_name: z.string().min(1, t("guardrails.teamTab.validation.nameRequired")),
+    mode: z.string().min(1, t("guardrails.teamTab.validation.modeRequired")),
+    api_base: z
+      .string()
+      .min(1, t("guardrails.teamTab.validation.apiBaseRequired"))
+      .refine(isValidUrl, t("guardrails.teamTab.validation.apiBaseInvalid")),
+    extra_litellm_params: z.string().superRefine((value, ctx) => {
+      if (!value) return;
+      try {
+        const parsed: unknown = JSON.parse(value);
+        if (typeof parsed !== "object" || Array.isArray(parsed)) {
+          ctx.addIssue({ code: "custom", message: t("guardrails.teamTab.validation.notJsonObject") });
+        }
+      } catch {
+        ctx.addIssue({ code: "custom", message: t("guardrails.teamTab.validation.invalidJson") });
       }
-    } catch {
-      ctx.addIssue({ code: "custom", message: "Invalid JSON" });
-    }
-  }),
-  guardrail_info: z.string().superRefine((value, ctx) => {
-    if (!value) return;
-    try {
-      JSON.parse(value);
-    } catch {
-      ctx.addIssue({ code: "custom", message: "Invalid JSON" });
-    }
-  }),
-});
+    }),
+    guardrail_info: z.string().superRefine((value, ctx) => {
+      if (!value) return;
+      try {
+        JSON.parse(value);
+      } catch {
+        ctx.addIssue({ code: "custom", message: t("guardrails.teamTab.validation.invalidJson") });
+      }
+    }),
+  });
 
-type SubmitGuardrailValues = z.output<typeof submitGuardrailSchema>;
+type SubmitGuardrailValues = z.output<ReturnType<typeof buildSubmitGuardrailSchema>>;
 
 const EMPTY_SUBMIT_VALUES: SubmitGuardrailValues = {
   team_id: "",
@@ -180,21 +190,21 @@ function submissionToTeamGuardrail(item: GuardrailSubmissionItem): TeamGuardrail
   };
 }
 
-const STATUS_CONFIG: Record<GuardrailStatus, { label: string; bg: string; text: string; dot: string }> = {
+const STATUS_CONFIG: Record<GuardrailStatus, { labelKey: ParseKeys; bg: string; text: string; dot: string }> = {
   active: {
-    label: "Active",
+    labelKey: "guardrails.teamTab.status.active",
     bg: "bg-success/10",
     text: "text-success",
     dot: "bg-success",
   },
   pending: {
-    label: "Pending Review",
+    labelKey: "guardrails.teamTab.status.pending",
     bg: "bg-warning/10",
     text: "text-warning",
     dot: "bg-warning",
   },
   rejected: {
-    label: "Rejected",
+    labelKey: "guardrails.teamTab.status.rejected",
     bg: "bg-destructive/10",
     text: "text-destructive",
     dot: "bg-destructive",
@@ -309,6 +319,7 @@ function GuardrailCard({
   onApprove,
   onReject,
 }: GuardrailCardProps) {
+  const { t } = useTranslation();
   const status = STATUS_CONFIG[g.status];
   const teamColor = TEAM_COLORS[g.team] ?? "bg-muted text-foreground";
   return (
@@ -320,12 +331,14 @@ function GuardrailCard({
       <div className="flex items-start justify-between gap-4">
         <div className="flex-1 min-w-0">
           <div className="flex items-center gap-2 mb-1.5 flex-wrap">
-            <span className={`text-xs font-medium px-2 py-0.5 rounded-full ${teamColor}`}>Team: {g.team}</span>
+            <span className={`text-xs font-medium px-2 py-0.5 rounded-full ${teamColor}`}>
+              <Trans i18nKey="guardrails.teamTab.card.team" components={{ team: <>{g.team}</> }} />
+            </span>
             <span
               className={`inline-flex items-center gap-1.5 text-xs font-medium px-2 py-0.5 rounded-full ${status.bg} ${status.text}`}
             >
               <span className={`w-1.5 h-1.5 rounded-full ${status.dot}`} />
-              {status.label}
+              {t(status.labelKey)}
             </span>
           </div>
           <h3 className="text-sm font-semibold text-foreground mb-1">{g.name}</h3>
@@ -336,16 +349,24 @@ function GuardrailCard({
           </div>
           <div className="flex items-center gap-4 text-xs text-muted-foreground">
             <span>
-              Model: <span className="font-medium text-foreground">{g.model}</span>
+              <Trans
+                i18nKey="guardrails.teamTab.card.model"
+                components={{ value: <span className="font-medium text-foreground">{g.model}</span> }}
+              />
             </span>
             <span>
-              Submitted: <span className="font-medium text-foreground">{g.submittedAt}</span>
+              <Trans
+                i18nKey="guardrails.teamTab.card.submitted"
+                components={{ value: <span className="font-medium text-foreground">{g.submittedAt}</span> }}
+              />
             </span>
           </div>
         </div>
         <div className="flex flex-col items-end gap-2 shrink-0">
           <div className="flex items-center gap-2">
-            <span className="text-xs text-muted-foreground whitespace-nowrap">Forward API Key</span>
+            <span className="text-xs text-muted-foreground whitespace-nowrap">
+              {t("guardrails.teamTab.card.forwardApiKey")}
+            </span>
             <Toggle enabled={g.forwardKey} onToggle={onToggleForwardKey} disabled={!isAdmin} />
           </div>
           <div className="flex items-center gap-2 mt-1">
@@ -354,7 +375,7 @@ function GuardrailCard({
               onClick={onSelect}
               className="text-xs border border-border text-muted-foreground hover:bg-muted px-3 py-1.5 rounded-md transition-colors font-medium"
             >
-              {isSelected ? "Close" : "Review"}
+              {isSelected ? t("guardrails.teamTab.card.close") : t("guardrails.teamTab.card.review")}
             </button>
             {isAdmin && g.status === "pending" && (
               <>
@@ -363,14 +384,14 @@ function GuardrailCard({
                   onClick={onApprove}
                   className="text-xs bg-success hover:bg-success/80 text-success-foreground px-3 py-1.5 rounded-md transition-colors font-medium"
                 >
-                  Approve
+                  {t("guardrails.teamTab.card.approve")}
                 </button>
                 <button
                   type="button"
                   onClick={onReject}
                   className="text-xs border border-destructive/30 text-destructive hover:bg-destructive/10 px-3 py-1.5 rounded-md transition-colors font-medium"
                 >
-                  Reject
+                  {t("guardrails.teamTab.card.reject")}
                 </button>
               </>
             )}
@@ -384,7 +405,7 @@ function GuardrailCard({
           className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors"
         >
           {isHeadersExpanded ? <ChevronUpIcon className="h-3.5 w-3.5" /> : <ChevronDownIcon className="h-3.5 w-3.5" />}
-          Static headers
+          {t("guardrails.teamTab.card.staticHeaders")}
           {g.customHeaders.length > 0 && (
             <span className="ml-1 bg-muted text-muted-foreground rounded-full px-1.5 py-0.5 text-xs">
               {g.customHeaders.length}
@@ -394,7 +415,7 @@ function GuardrailCard({
         {isHeadersExpanded && (
           <div className="mt-2">
             {g.customHeaders.length === 0 ? (
-              <p className="text-xs text-muted-foreground italic">No static headers configured.</p>
+              <p className="text-xs text-muted-foreground italic">{t("guardrails.teamTab.card.noStaticHeaders")}</p>
             ) : (
               <div className="space-y-1">
                 {g.customHeaders.map((h, i) => (
@@ -447,6 +468,7 @@ function DetailPanel({
   onUpdateCustomHeaders,
   onUpdateExtraHeaders,
 }: DetailPanelProps) {
+  const { t } = useTranslation();
   const [configExpanded, setConfigExpanded] = useState(false);
   const [newExtraHeader, setNewExtraHeader] = useState("");
   const [newStaticHeaderKey, setNewStaticHeaderKey] = useState("");
@@ -459,31 +481,36 @@ function DetailPanel({
         <div className="flex items-start justify-between mb-4">
           <div>
             <div className="flex items-center gap-2 mb-1">
-              <span className={`text-xs font-medium px-2 py-0.5 rounded-full ${teamColor}`}>Team: {g.team}</span>
+              <span className={`text-xs font-medium px-2 py-0.5 rounded-full ${teamColor}`}>
+                <Trans i18nKey="guardrails.teamTab.detail.team" components={{ team: <>{g.team}</> }} />
+              </span>
               <span
                 className={`inline-flex items-center gap-1.5 text-xs font-medium px-2 py-0.5 rounded-full ${status.bg} ${status.text}`}
               >
                 <span className={`w-1.5 h-1.5 rounded-full ${status.dot}`} />
-                {status.label}
+                {t(status.labelKey)}
               </span>
             </div>
             <h2 className="text-base font-semibold text-foreground">{g.name}</h2>
             <p className="text-xs text-muted-foreground mt-0.5">
-              Submitted by {g.submittedBy} on {g.submittedAt}
+              <Trans
+                i18nKey="guardrails.teamTab.detail.submittedBy"
+                components={{ by: <>{g.submittedBy}</>, at: <>{g.submittedAt}</> }}
+              />
             </p>
           </div>
           <button
             type="button"
             onClick={onClose}
             className="text-muted-foreground hover:text-foreground transition-colors"
-            aria-label="Close detail panel"
+            aria-label={t("guardrails.teamTab.detail.closeLabel")}
           >
             <XIcon className="h-4 w-4" />
           </button>
         </div>
         <p className="text-sm text-muted-foreground mb-5">{g.description}</p>
         <div className="space-y-4">
-          <ConfigRow label="Endpoint">
+          <ConfigRow label={t("guardrails.teamTab.detail.endpoint")}>
             <div className="flex items-center gap-1.5">
               <code className="text-xs font-mono text-foreground break-all">{g.endpoint}</code>
               <a
@@ -496,7 +523,7 @@ function DetailPanel({
               </a>
             </div>
           </ConfigRow>
-          <ConfigRow label="Method">
+          <ConfigRow label={t("guardrails.teamTab.detail.method")}>
             <span className="text-xs font-mono font-medium text-foreground bg-muted px-2 py-0.5 rounded-sm">
               {g.method}
             </span>
@@ -505,29 +532,35 @@ function DetailPanel({
             <div className="flex items-center justify-between mb-2">
               <div className="flex items-center gap-1.5">
                 <KeyIcon className="h-3.5 w-3.5 text-info" />
-                <span className="text-xs font-semibold text-info">Forward LiteLLM API Key</span>
+                <span className="text-xs font-semibold text-info">
+                  {t("guardrails.teamTab.detail.forwardKeyTitle")}
+                </span>
               </div>
               <Toggle enabled={g.forwardKey} onToggle={onToggleForwardKey} disabled={!isAdmin} />
             </div>
             <p className="text-xs text-info leading-relaxed">
-              When enabled, the caller&apos;s LiteLLM API key is forwarded as an{" "}
-              <code className="font-mono bg-info/15 px-1 rounded-sm">Authorization</code> header to your guardrail
-              endpoint. This allows your guardrail to authenticate model calls using the original caller&apos;s
-              credentials.
+              <Trans
+                i18nKey="guardrails.teamTab.detail.forwardKeyDescription"
+                components={{ code: <code className="font-mono bg-info/15 px-1 rounded-sm" /> }}
+              />
             </p>
           </div>
           <div>
             <div className="flex items-center gap-1.5 mb-2">
-              <span className="text-xs font-semibold text-foreground">Static headers</span>
+              <span className="text-xs font-semibold text-foreground">
+                {t("guardrails.teamTab.detail.staticHeaders")}
+              </span>
               {g.customHeaders.length > 0 && (
                 <span className="bg-muted text-muted-foreground rounded-full px-1.5 py-0.5 text-xs">
                   {g.customHeaders.length}
                 </span>
               )}
             </div>
-            <p className="text-xs text-muted-foreground mb-2">Sent with every request to the guardrail.</p>
+            <p className="text-xs text-muted-foreground mb-2">{t("guardrails.teamTab.detail.staticHeadersHint")}</p>
             {g.customHeaders.length === 0 ? (
-              <p className="text-xs text-muted-foreground italic mb-2">No static headers configured.</p>
+              <p className="text-xs text-muted-foreground italic mb-2">
+                {t("guardrails.teamTab.detail.noStaticHeaders")}
+              </p>
             ) : (
               <ul className="list-none space-y-1 mb-2">
                 {g.customHeaders.map((h, i) => (
@@ -543,7 +576,7 @@ function DetailPanel({
                         type="button"
                         onClick={() => onUpdateCustomHeaders(g.customHeaders.filter((_, idx) => idx !== i))}
                         className="text-muted-foreground hover:text-destructive shrink-0"
-                        aria-label={`Remove ${h.key}`}
+                        aria-label={t("guardrails.teamTab.detail.removeHeader", { name: h.key })}
                       >
                         <XIcon className="h-3.5 w-3.5" />
                       </button>
@@ -558,7 +591,7 @@ function DetailPanel({
                   type="text"
                   value={newStaticHeaderKey}
                   onChange={(e) => setNewStaticHeaderKey(e.target.value)}
-                  placeholder="Header name (e.g. X-API-Key)"
+                  placeholder={t("guardrails.teamTab.detail.headerNamePlaceholder")}
                   className="flex-1 min-w-0 text-xs font-mono border border-border rounded-sm px-2 py-1.5 text-foreground placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring"
                   onKeyDown={(e) => {
                     if (e.key === "Enter") {
@@ -577,7 +610,7 @@ function DetailPanel({
                   type="text"
                   value={newStaticHeaderValue}
                   onChange={(e) => setNewStaticHeaderValue(e.target.value)}
-                  placeholder="Value"
+                  placeholder={t("guardrails.teamTab.detail.headerValuePlaceholder")}
                   className="flex-1 min-w-0 text-xs font-mono border border-border rounded-sm px-2 py-1.5 text-foreground placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring"
                   onKeyDown={(e) => {
                     if (e.key === "Enter") {
@@ -605,14 +638,16 @@ function DetailPanel({
                   }}
                   className="text-xs font-medium text-info border border-info/20 bg-info/10 hover:bg-info/15 px-2 py-1.5 rounded-sm transition-colors shrink-0"
                 >
-                  Add
+                  {t("guardrails.teamTab.detail.addStaticHeader")}
                 </button>
               </div>
             )}
           </div>
           <div>
             <div className="flex items-center gap-1.5 mb-2">
-              <span className="text-xs font-semibold text-foreground">Forward client headers</span>
+              <span className="text-xs font-semibold text-foreground">
+                {t("guardrails.teamTab.detail.forwardClientHeaders")}
+              </span>
               {g.extraHeaders.length > 0 && (
                 <span className="bg-muted text-muted-foreground rounded-full px-1.5 py-0.5 text-xs">
                   {g.extraHeaders.length}
@@ -620,10 +655,12 @@ function DetailPanel({
               )}
             </div>
             <p className="text-xs text-muted-foreground mb-2">
-              Allowed header names to forward from the client request to the guardrail (e.g. x-request-id).
+              {t("guardrails.teamTab.detail.forwardClientHeadersHint")}
             </p>
             {g.extraHeaders.length === 0 ? (
-              <p className="text-xs text-muted-foreground italic mb-2">No forward client headers configured.</p>
+              <p className="text-xs text-muted-foreground italic mb-2">
+                {t("guardrails.teamTab.detail.noForwardClientHeaders")}
+              </p>
             ) : (
               <ul className="list-none space-y-1 mb-2">
                 {g.extraHeaders.map((name, i) => (
@@ -637,7 +674,7 @@ function DetailPanel({
                         type="button"
                         onClick={() => onUpdateExtraHeaders(g.extraHeaders.filter((_, idx) => idx !== i))}
                         className="text-muted-foreground hover:text-destructive shrink-0"
-                        aria-label={`Remove ${name}`}
+                        aria-label={t("guardrails.teamTab.detail.removeHeader", { name })}
                       >
                         <XIcon className="h-3.5 w-3.5" />
                       </button>
@@ -652,7 +689,7 @@ function DetailPanel({
                   type="text"
                   value={newExtraHeader}
                   onChange={(e) => setNewExtraHeader(e.target.value)}
-                  placeholder="e.g. x-request-id"
+                  placeholder={t("guardrails.teamTab.detail.forwardHeaderPlaceholder")}
                   className="flex-1 min-w-0 text-xs font-mono border border-border rounded-sm px-2 py-1.5 text-foreground placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring"
                   onKeyDown={(e) => {
                     if (e.key === "Enter") {
@@ -676,7 +713,7 @@ function DetailPanel({
                   }}
                   className="text-xs font-medium text-info border border-info/20 bg-info/10 hover:bg-info/15 px-2 py-1.5 rounded-sm transition-colors"
                 >
-                  Add
+                  {t("guardrails.teamTab.detail.addForwardHeader")}
                 </button>
               </div>
             )}
@@ -687,7 +724,7 @@ function DetailPanel({
               onClick={() => setConfigExpanded(!configExpanded)}
               className="w-full flex items-center justify-between px-3 py-2 text-left text-xs font-semibold text-foreground bg-muted hover:bg-border transition-colors"
             >
-              <span>Equivalent config</span>
+              <span>{t("guardrails.teamTab.detail.equivalentConfig")}</span>
               {configExpanded ? (
                 <ChevronUpIcon className="h-3.5 w-3.5 text-muted-foreground" />
               ) : (
@@ -703,17 +740,19 @@ function DetailPanel({
           <div className="flex items-start gap-2 bg-muted border border-border rounded-lg p-3">
             <InfoIcon className="h-3.5 w-3.5 text-muted-foreground shrink-0 mt-0.5" />
             <p className="text-xs text-muted-foreground leading-relaxed">
-              This guardrail runs on a separate instance. It receives the user request and forwards the result to the
-              next step in the pipeline. See{" "}
-              <a
-                href="https://docs.litellm.ai/docs/adding_provider/generic_guardrail_api"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-info hover:underline"
-              >
-                LiteLLM Generic Guardrail API docs
-              </a>{" "}
-              for configuration details.
+              <Trans
+                i18nKey="guardrails.teamTab.detail.separateInstanceNote"
+                components={{
+                  docs: (
+                    <a
+                      href="https://docs.litellm.ai/docs/adding_provider/generic_guardrail_api"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-info hover:underline"
+                    />
+                  ),
+                }}
+              />
             </p>
           </div>
         </div>
@@ -723,7 +762,7 @@ function DetailPanel({
             className="w-full flex items-center justify-center gap-2 border border-border text-foreground hover:bg-muted text-sm font-medium py-2 rounded-md transition-colors"
           >
             <ExternalLinkIcon className="h-4 w-4" />
-            Test Endpoint
+            {t("guardrails.teamTab.detail.testEndpoint")}
           </button>
           {isAdmin && g.status === "pending" && (
             <div className="flex gap-2">
@@ -733,7 +772,7 @@ function DetailPanel({
                 className="flex-1 flex items-center justify-center gap-1.5 bg-success hover:bg-success/80 text-success-foreground text-sm font-medium py-2 rounded-md transition-colors"
               >
                 <CheckIcon className="h-4 w-4" />
-                Approve
+                {t("guardrails.teamTab.detail.approve")}
               </button>
               <button
                 type="button"
@@ -741,7 +780,7 @@ function DetailPanel({
                 className="flex-1 flex items-center justify-center gap-1.5 border border-destructive/30 text-destructive hover:bg-destructive/10 text-sm font-medium py-2 rounded-md transition-colors"
               >
                 <XIcon className="h-4 w-4" />
-                Reject
+                {t("guardrails.teamTab.detail.reject")}
               </button>
             </div>
           )}
@@ -759,6 +798,7 @@ type ConfirmDialogProps = {
 };
 
 function ConfirmDialog({ action, guardrailName, onConfirm, onCancel }: ConfirmDialogProps) {
+  const { t } = useTranslation();
   const isApprove = action === "approve";
   return (
     <div className="fixed inset-0 bg-black/30 flex items-center justify-center z-overlay">
@@ -775,14 +815,15 @@ function ConfirmDialog({ action, guardrailName, onConfirm, onCancel }: ConfirmDi
           )}
         </div>
         <h3 className="text-base font-semibold text-foreground mb-1">
-          {isApprove ? "Approve Guardrail" : "Reject Guardrail"}
+          {isApprove ? t("guardrails.teamTab.confirm.approveTitle") : t("guardrails.teamTab.confirm.rejectTitle")}
         </h3>
         <p className="text-sm text-muted-foreground mb-5">
-          Are you sure you want to {action}{" "}
-          <span className="font-medium text-foreground">&quot;{guardrailName}&quot;</span>?{" "}
-          {isApprove
-            ? "This will make it active and available for use."
-            : "This will mark it as rejected and notify the team."}
+          <Trans
+            i18nKey={
+              isApprove ? "guardrails.teamTab.confirm.approveMessage" : "guardrails.teamTab.confirm.rejectMessage"
+            }
+            components={{ name: <span className="font-medium text-foreground">&quot;{guardrailName}&quot;</span> }}
+          />
         </p>
         <div className="flex gap-3">
           <button
@@ -790,7 +831,7 @@ function ConfirmDialog({ action, guardrailName, onConfirm, onCancel }: ConfirmDi
             onClick={onCancel}
             className="flex-1 border border-border text-foreground hover:bg-muted text-sm font-medium py-2 rounded-md transition-colors"
           >
-            Cancel
+            {t("guardrails.teamTab.confirm.cancel")}
           </button>
           <button
             type="button"
@@ -801,7 +842,7 @@ function ConfirmDialog({ action, guardrailName, onConfirm, onCancel }: ConfirmDi
                 : "bg-destructive text-destructive-foreground hover:bg-destructive/80"
             }`}
           >
-            {isApprove ? "Approve" : "Reject"}
+            {isApprove ? t("guardrails.teamTab.confirm.approve") : t("guardrails.teamTab.confirm.reject")}
           </button>
         </div>
       </div>
@@ -814,6 +855,7 @@ interface TeamGuardrailsTabProps {
 }
 
 export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
+  const { t } = useTranslation();
   const { userRole } = useAuthorized();
   const isAdmin = userRole ? isProxyAdminRole(userRole) : false;
   const [guardrails, setGuardrails] = useState<TeamGuardrail[]>([]);
@@ -835,7 +877,12 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [isSubmitModalOpen, setIsSubmitModalOpen] = useState(false);
+  const submitGuardrailSchema = useMemo(() => buildSubmitGuardrailSchema(t), [t]);
   const submitForm = useZodForm(submitGuardrailSchema, { defaultValues: EMPTY_SUBMIT_VALUES });
+  const guardrailModeItems = useMemo(
+    () => GUARDRAIL_MODES.map(({ value, labelKey }) => ({ value, label: t(labelKey) })),
+    [t],
+  );
   const registerGuardrail = useRegisterGuardrail();
 
   const fetchSubmissions = useCallback(async () => {
@@ -855,12 +902,12 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
       setGuardrails(res.submissions.map(submissionToTeamGuardrail));
       setSummary(res.summary);
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to load submissions");
+      setError(err instanceof Error ? err.message : t("guardrails.teamTab.list.loadFailed"));
       setGuardrails([]);
     } finally {
       setIsLoading(false);
     }
-  }, [accessToken, statusFilter, searchDebounced]);
+  }, [accessToken, statusFilter, searchDebounced, t]);
 
   useEffect(() => {
     fetchSubmissions();
@@ -880,7 +927,7 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
         litellm_params,
         guardrail_info: values.guardrail_info ? JSON.parse(values.guardrail_info) : undefined,
       });
-      toast.success("Guardrail submitted for review");
+      toast.success(t("guardrails.teamTab.toast.submitted"));
       setIsSubmitModalOpen(false);
       submitForm.reset();
       fetchSubmissions();
@@ -906,9 +953,11 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
         litellm_params: { forward_api_key: newValue },
       });
       setGuardrails((prev) => prev.map((x) => (x.id === id ? { ...x, forwardKey: newValue } : x)));
-      toast.success(newValue ? "Forward API key enabled" : "Forward API key disabled");
+      toast.success(
+        newValue ? t("guardrails.teamTab.toast.forwardKeyEnabled") : t("guardrails.teamTab.toast.forwardKeyDisabled"),
+      );
     } catch {
-      toast.fromError("Failed to update forward API key");
+      toast.fromError(t("guardrails.teamTab.toast.forwardKeyFailed"));
     }
   }
 
@@ -932,9 +981,9 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
             : x,
         ),
       );
-      toast.success("Static headers updated");
+      toast.success(t("guardrails.teamTab.toast.staticHeadersUpdated"));
     } catch {
-      toast.fromError("Failed to update static headers");
+      toast.fromError(t("guardrails.teamTab.toast.staticHeadersFailed"));
     }
   }
 
@@ -945,9 +994,9 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
         litellm_params: { extra_headers: extraHeaders },
       });
       setGuardrails((prev) => prev.map((x) => (x.id === id ? { ...x, extraHeaders } : x)));
-      toast.success("Forward client headers updated");
+      toast.success(t("guardrails.teamTab.toast.forwardHeadersUpdated"));
     } catch {
-      toast.fromError("Failed to update forward client headers");
+      toast.fromError(t("guardrails.teamTab.toast.forwardHeadersFailed"));
     }
   }
 
@@ -958,9 +1007,9 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
       setConfirmAction(null);
       if (selectedId === id) setSelectedId(null);
       await fetchSubmissions();
-      toast.success("Guardrail approved");
+      toast.success(t("guardrails.teamTab.toast.approved"));
     } catch {
-      toast.fromError("Failed to approve guardrail");
+      toast.fromError(t("guardrails.teamTab.toast.approveFailed"));
     }
   }
 
@@ -971,9 +1020,9 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
       setConfirmAction(null);
       if (selectedId === id) setSelectedId(null);
       await fetchSubmissions();
-      toast.success("Guardrail rejected");
+      toast.success(t("guardrails.teamTab.toast.rejected"));
     } catch {
-      toast.fromError("Failed to reject guardrail");
+      toast.fromError(t("guardrails.teamTab.toast.rejectFailed"));
     }
   }
 
@@ -990,32 +1039,32 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
     <div className="flex h-full">
       <div className={`flex-1 min-w-0 p-6 overflow-auto ${selected ? "border-r border-border" : ""}`}>
         <div className="grid grid-cols-4 gap-4 mb-6">
-          <StatCard label="Total Submitted" value={totalCount} color="text-foreground" />
-          <StatCard label="Pending Review" value={pendingCount} color="text-warning" />
-          <StatCard label="Active" value={activeCount} color="text-success" />
-          <StatCard label="Rejected" value={rejectedCount} color="text-destructive" />
+          <StatCard label={t("guardrails.teamTab.stats.total")} value={totalCount} color="text-foreground" />
+          <StatCard label={t("guardrails.teamTab.stats.pending")} value={pendingCount} color="text-warning" />
+          <StatCard label={t("guardrails.teamTab.stats.active")} value={activeCount} color="text-success" />
+          <StatCard label={t("guardrails.teamTab.stats.rejected")} value={rejectedCount} color="text-destructive" />
         </div>
         <div className="flex items-center gap-3 mb-5">
           <div className="relative flex-1 max-w-xs">
             <SearchIcon className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
             <input
               type="text"
-              placeholder="Search guardrails..."
+              placeholder={t("guardrails.teamTab.toolbar.searchPlaceholder")}
               value={search}
               onChange={(e) => setSearch(e.target.value)}
               className="w-full pl-9 pr-4 py-2 border border-border rounded-md text-sm text-foreground placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-info"
             />
           </div>
           <select
-            aria-label="Filter by status"
+            aria-label={t("guardrails.teamTab.toolbar.statusFilterLabel")}
             value={statusFilter}
             onChange={(e) => setStatusFilter(e.target.value as typeof statusFilter)}
             className="border border-border rounded-md px-3 py-2 text-sm text-foreground focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-info bg-background"
           >
-            <option value="all">All Status</option>
-            <option value="pending">Pending Review</option>
-            <option value="active">Active</option>
-            <option value="rejected">Rejected</option>
+            <option value="all">{t("guardrails.teamTab.toolbar.statusFilter.all")}</option>
+            <option value="pending">{t("guardrails.teamTab.toolbar.statusFilter.pending")}</option>
+            <option value="active">{t("guardrails.teamTab.toolbar.statusFilter.active")}</option>
+            <option value="rejected">{t("guardrails.teamTab.toolbar.statusFilter.rejected")}</option>
           </select>
           <button
             type="button"
@@ -1023,14 +1072,18 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
             className="ml-auto flex items-center gap-2 bg-info hover:bg-info/80 text-info-foreground text-sm font-medium px-4 py-2 rounded-md transition-colors"
           >
             <PlusIcon className="h-4 w-4" />
-            Add Guardrail
+            {t("guardrails.teamTab.toolbar.addGuardrail")}
           </button>
         </div>
         <div className="space-y-3">
-          {isLoading && <div className="text-center py-12 text-muted-foreground text-sm">Loading submissions…</div>}
+          {isLoading && (
+            <div className="text-center py-12 text-muted-foreground text-sm">
+              {t("guardrails.teamTab.list.loading")}
+            </div>
+          )}
           {error && <div className="text-center py-12 text-destructive text-sm">{error}</div>}
           {!isLoading && !error && filtered.length === 0 && (
-            <div className="text-center py-12 text-muted-foreground text-sm">No guardrails match your filters.</div>
+            <div className="text-center py-12 text-muted-foreground text-sm">{t("guardrails.teamTab.list.empty")}</div>
           )}
           {!isLoading &&
             !error &&
@@ -1084,23 +1137,33 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
       >
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
           <DialogHeader>
-            <DialogTitle>Submit Guardrail for Review</DialogTitle>
+            <DialogTitle>{t("guardrails.teamTab.submitModal.title")}</DialogTitle>
           </DialogHeader>
           <div className="rounded-md bg-info/10 border border-info/20 px-4 py-3 text-sm text-info mb-4">
-            Your guardrail will be sent for admin review before it becomes active.
+            {t("guardrails.teamTab.submitModal.notice")}
           </div>
           <TooltipProvider>
             <form onSubmit={handleSubmitGuardrail}>
               <FieldGroup>
-                <FormField control={submitForm.control} name="team_id" label="Team">
+                <FormField control={submitForm.control} name="team_id" label={t("guardrails.teamTab.submitModal.team")}>
                   {({ id, value, onChange }) => <TeamDropdown id={id} value={value} onChange={onChange} />}
                 </FormField>
-                <FormField control={submitForm.control} name="guardrail_name" label="Guardrail Name">
-                  {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. pii-detection" />}
+                <FormField
+                  control={submitForm.control}
+                  name="guardrail_name"
+                  label={t("guardrails.teamTab.submitModal.guardrailName")}
+                >
+                  {({ ref, ...field }) => (
+                    <Input
+                      {...field}
+                      ref={ref}
+                      placeholder={t("guardrails.teamTab.submitModal.guardrailNamePlaceholder")}
+                    />
+                  )}
                 </FormField>
-                <FormField control={submitForm.control} name="mode" label="Mode">
+                <FormField control={submitForm.control} name="mode" label={t("guardrails.teamTab.submitModal.mode")}>
                   {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                    <Select items={GUARDRAIL_MODES} value={value} onValueChange={onChange}>
+                    <Select items={guardrailModeItems} value={value} onValueChange={onChange}>
                       <SelectTrigger
                         id={id}
                         aria-invalid={ariaInvalid}
@@ -1110,7 +1173,7 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
                         <SelectValue />
                       </SelectTrigger>
                       <SelectContent>
-                        {GUARDRAIL_MODES.map((mode) => (
+                        {guardrailModeItems.map((mode) => (
                           <SelectItem key={mode.value} value={mode.value} title={mode.label}>
                             {mode.label}
                           </SelectItem>
@@ -1119,7 +1182,11 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
                     </Select>
                   )}
                 </FormField>
-                <FormField control={submitForm.control} name="api_base" label="API Base URL">
+                <FormField
+                  control={submitForm.control}
+                  name="api_base"
+                  label={t("guardrails.teamTab.submitModal.apiBase")}
+                >
                   {({ ref, ...field }) => (
                     <Input
                       {...field}
@@ -1133,8 +1200,8 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
                   control={submitForm.control}
                   name="extra_litellm_params"
                   label={labelWithHint(
-                    "Additional litellm_params (optional)",
-                    "JSON object merged into litellm_params. e.g. forward_api_key, headers, model, unreachable_fallback",
+                    t("guardrails.teamTab.submitModal.extraParams"),
+                    t("guardrails.teamTab.submitModal.extraParamsHint"),
                   )}
                 >
                   {({ ref, ...field }) => (
@@ -1147,7 +1214,11 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
                     />
                   )}
                 </FormField>
-                <FormField control={submitForm.control} name="guardrail_info" label="Guardrail Info (optional)">
+                <FormField
+                  control={submitForm.control}
+                  name="guardrail_info"
+                  label={t("guardrails.teamTab.submitModal.guardrailInfo")}
+                >
                   {({ ref, ...field }) => (
                     <Textarea
                       {...field}
@@ -1169,9 +1240,9 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
                 submitForm.reset();
               }}
             >
-              Cancel
+              {t("guardrails.teamTab.submitModal.cancel")}
             </Button>
-            <Button onClick={handleSubmitGuardrail}>Submit for Review</Button>
+            <Button onClick={handleSubmitGuardrail}>{t("guardrails.teamTab.submitModal.submit")}</Button>
           </DialogFooter>
         </DialogContent>
       </Dialog>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
index 9c5ca575193..226629d5cb6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
@@ -1,5 +1,7 @@
+import type { ParseKeys } from "i18next";
 import React, { useEffect, useMemo, useState } from "react";
 import { useForm, useWatch, type UseFormReturn } from "react-hook-form";
+import { Trans, useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import {
   createGuardrailCall,
@@ -84,14 +86,14 @@ import ToolPermissionRulesEditor, { ToolPermissionConfig } from "./tool_permissi
 import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
 
 // Define human-friendly descriptions for each mode
-const modeDescriptions = {
-  pre_call: "Before LLM Call - Runs before the LLM call and checks the input (Recommended)",
-  during_call: "During LLM Call - Runs in parallel with the LLM call, with response held until check completes",
-  post_call: "After LLM Call - Runs after the LLM call and checks only the output",
-  logging_only: "Logging Only - Only runs on logging callbacks without affecting the LLM call",
-  pre_mcp_call: "Before MCP Tool Call - Runs before MCP tool execution and validates tool calls",
-  during_mcp_call: "During MCP Tool Call - Runs in parallel with MCP tool execution for monitoring",
-  post_mcp_call: "After MCP Tool Call - Runs after MCP tool execution and checks the tool result",
+const MODE_DESCRIPTION_KEYS: Record<string, ParseKeys> = {
+  pre_call: "guardrails.addForm.modeDescriptions.preCall",
+  during_call: "guardrails.addForm.modeDescriptions.duringCall",
+  post_call: "guardrails.addForm.modeDescriptions.postCall",
+  logging_only: "guardrails.addForm.modeDescriptions.loggingOnly",
+  pre_mcp_call: "guardrails.addForm.modeDescriptions.preMcpCall",
+  during_mcp_call: "guardrails.addForm.modeDescriptions.duringMcpCall",
+  post_mcp_call: "guardrails.addForm.modeDescriptions.postMcpCall",
 };
 
 interface GuardrailPreset {
@@ -197,9 +199,9 @@ const INITIAL_VALUES: GuardrailFormValues = {
   stream_scope_by_mode: {},
 };
 
-const ALWAYS_ON_ITEMS = [
-  { label: "Yes", value: true },
-  { label: "No", value: false },
+const ALWAYS_ON_ITEMS: { labelKey: ParseKeys; value: boolean }[] = [
+  { labelKey: "guardrails.addForm.fields.alwaysOn.yes", value: true },
+  { labelKey: "guardrails.addForm.fields.alwaysOn.no", value: false },
 ];
 
 const DEFAULT_MODES = ["pre_call", "during_call", "post_call", "logging_only"];
@@ -231,6 +233,7 @@ interface ProviderParamsResponse {
 }
 
 const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, accessToken, onSuccess, preset }) => {
+  const { t } = useTranslation();
   const form = useForm<GuardrailFormValues>({ defaultValues: INITIAL_VALUES });
   const watchedMode = useWatch({ control: form.control, name: "mode" });
   const [loading, setLoading] = useState(false);
@@ -313,12 +316,12 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
         setDecisionModelGroups(parseDecisionModelGroups(modelGroupsResp?.data));
       } catch (error) {
         console.error("Error fetching guardrail data:", error);
-        toast.fromError("Failed to load guardrail configuration");
+        toast.fromError(t("guardrails.addForm.toasts.loadFailed"));
       }
     };
 
     fetchData();
-  }, [accessToken]);
+  }, [accessToken, t]);
 
   // Apply preset when settings are loaded and form becomes visible
   useEffect(() => {
@@ -449,14 +452,14 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
     // Validate configuration steps
     if (currentStep === 1) {
       if (shouldRenderPIIConfigSettings(selectedProvider) && selectedEntities.length === 0) {
-        toast.fromError("Please select at least one PII entity to continue");
+        toast.fromError(t("guardrails.addForm.toasts.piiEntityRequired"));
         return;
       }
       if (isDecisionModelProvider) {
         if (!(await form.trigger(["decision_model"]))) {
           return;
         }
-        const questionsProblem = decisionChecksProblem(decisionChecks);
+        const questionsProblem = decisionChecksProblem(decisionChecks, t);
         if (questionsProblem) {
           toast.fromError(questionsProblem);
           return;
@@ -500,7 +503,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
       setLoading(true);
       // First validate currently visible fields
       if (!(await form.trigger())) {
-        toast.fromError("Failed to create guardrail: please fix the highlighted fields");
+        toast.fromError(t("guardrails.addForm.toasts.fixHighlightedFields"));
         return;
       }
 
@@ -589,9 +592,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
         const hasContentFilterSelections =
           selectedPatterns.length > 0 || blockedWords.length > 0 || selectedContentCategories.length > 0;
         if (!hasContentFilterSelections && !hasCompetitorIntent) {
-          toast.fromError(
-            "Please configure at least one content filter setting (category, pattern, keyword, or competitor intent)",
-          );
+          toast.fromError(t("guardrails.addForm.toasts.contentFilterRequired"));
           setLoading(false);
           return;
         }
@@ -645,7 +646,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
           // For some guardrails, the config values need to be in litellm_params
           guardrailData.guardrail_info = configObj;
         } catch (error) {
-          toast.fromError("Invalid JSON in configuration");
+          toast.fromError(t("guardrails.addForm.toasts.invalidJson"));
           setLoading(false);
           return;
         }
@@ -654,13 +655,13 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
       if (guardrailProvider === "llm_as_a_judge") {
         const criteria: GuardrailCriterion[] = values.criteria ?? [];
         if (criteria.length === 0) {
-          toast.fromError("Add at least one evaluation criterion");
+          toast.fromError(t("guardrails.addForm.toasts.criterionRequired"));
           setLoading(false);
           return;
         }
         const weightTotal = criteria.reduce((sum, c) => sum + (Number(c?.weight) || 0), 0);
         if (weightTotal !== 100) {
-          toast.fromError(`Criterion weights must sum to 100% (currently ${weightTotal}%)`);
+          toast.fromError(t("guardrails.addForm.toasts.criterionWeights", { total: weightTotal }));
           setLoading(false);
           return;
         }
@@ -675,7 +676,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
       }
 
       if (guardrailProvider === "decision_model") {
-        const questionsProblem = decisionChecksProblem(decisionChecks);
+        const questionsProblem = decisionChecksProblem(decisionChecks, t);
         if (questionsProblem) {
           toast.fromError(questionsProblem);
           setLoading(false);
@@ -688,7 +689,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
 
       if (guardrailProvider === "tool_permission") {
         if (toolPermissionConfig.rules.length === 0) {
-          toast.fromError("Add at least one tool permission rule");
+          toast.fromError(t("guardrails.addForm.toasts.toolRuleRequired"));
           setLoading(false);
           return;
         }
@@ -765,7 +766,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
 
       await createGuardrailCall(accessToken, guardrailData);
 
-      toast.success("Guardrail created successfully");
+      toast.success(t("guardrails.addForm.toasts.created"));
 
       // Reset form and close modal
       resetForm();
@@ -773,7 +774,11 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
       onClose();
     } catch (error) {
       console.error("Failed to create guardrail:", error);
-      toast.fromError("Failed to create guardrail: " + (error instanceof Error ? error.message : String(error)));
+      toast.fromError(
+        t("guardrails.addForm.toasts.createFailed", {
+          message: error instanceof Error ? error.message : String(error),
+        }),
+      );
     } finally {
       setLoading(false);
     }
@@ -794,24 +799,30 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
         (term) => providerFilter.contains(term, query),
       );
     const supportedModes = getSupportedModesForProvider(guardrailSettings, selectedProvider) ?? DEFAULT_MODES;
+    const alwaysOnItems = ALWAYS_ON_ITEMS.map(({ labelKey, value }) => ({ label: t(labelKey), value }));
     return (
       <FieldGroup>
         <GuardrailField
           control={form.control}
           name="guardrail_name"
-          label="Guardrail Name"
-          rules={requiredRule("Please enter a guardrail name")}
+          label={t("guardrails.addForm.fields.name.label")}
+          rules={requiredRule(t("guardrails.addForm.fields.name.required"))}
         >
           {({ ref, value, ...field }) => (
-            <Input {...field} ref={ref} value={asText(value)} placeholder="Enter a name for this guardrail" />
+            <Input
+              {...field}
+              ref={ref}
+              value={asText(value)}
+              placeholder={t("guardrails.addForm.fields.name.placeholder")}
+            />
           )}
         </GuardrailField>
 
         <GuardrailField
           control={form.control}
           name="provider"
-          label="Guardrail Provider"
-          rules={requiredRule("Please select a provider")}
+          label={t("guardrails.addForm.fields.provider.label")}
+          rules={requiredRule(t("guardrails.addForm.fields.provider.required"))}
         >
           {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
             <Combobox
@@ -830,11 +841,11 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                 id={id}
                 aria-invalid={ariaInvalid}
                 aria-describedby={ariaDescribedBy}
-                placeholder="Select a guardrail provider"
+                placeholder={t("guardrails.addForm.fields.provider.placeholder")}
                 className="w-full"
               />
               <ComboboxContent>
-                <ComboboxEmpty>No matching providers</ComboboxEmpty>
+                <ComboboxEmpty>{t("guardrails.addForm.fields.provider.empty")}</ComboboxEmpty>
                 <ComboboxList>
                   {(key: string) => (
                     <ComboboxItem key={key} value={key}>
@@ -857,8 +868,8 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
         <GuardrailField
           control={form.control}
           name="mode"
-          label={labelWithHint("Mode", "How the guardrail should be applied")}
-          rules={requiredRule("Please select a mode")}
+          label={labelWithHint(t("guardrails.addForm.fields.mode.label"), t("guardrails.addForm.fields.mode.hint"))}
+          rules={requiredRule(t("guardrails.addForm.fields.mode.required"))}
         >
           {({ id, value, onChange }) => (
             <MultiSelect
@@ -866,7 +877,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
               options={supportedModes.map((mode) => ({
                 label: mode,
                 value: mode,
-                description: modeDescriptions[mode as keyof typeof modeDescriptions],
+                description: MODE_DESCRIPTION_KEYS[mode] ? t(MODE_DESCRIPTION_KEYS[mode]) : undefined,
               }))}
               value={asStringArray(value)}
               onValueChange={onChange}
@@ -880,20 +891,23 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
         <GuardrailField
           control={form.control}
           name="default_on"
-          label={labelWithHint("Always On", "If enabled, this guardrail will be applied to all requests by default.")}
+          label={labelWithHint(
+            t("guardrails.addForm.fields.alwaysOn.label"),
+            t("guardrails.addForm.fields.alwaysOn.hint"),
+          )}
         >
           {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
             <Select
-              items={ALWAYS_ON_ITEMS}
+              items={alwaysOnItems}
               value={typeof value === "boolean" ? value : null}
               onValueChange={(next: boolean | null) => onChange(next)}
             >
               <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy} className="w-full">
-                <SelectValue placeholder="Select an option" />
+                <SelectValue placeholder={t("guardrails.addForm.fields.alwaysOn.placeholder")} />
               </SelectTrigger>
               <SelectContent>
-                <SelectItem value={true}>Yes</SelectItem>
-                <SelectItem value={false}>No</SelectItem>
+                <SelectItem value={true}>{t("guardrails.addForm.fields.alwaysOn.yes")}</SelectItem>
+                <SelectItem value={false}>{t("guardrails.addForm.fields.alwaysOn.no")}</SelectItem>
               </SelectContent>
             </Select>
           )}
@@ -903,8 +917,8 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
           control={form.control}
           name="skip_system_message_choice"
           label={labelWithHint(
-            "Skip system messages in guardrail",
-            "Unified guardrails only: omit role: system from guardrail evaluation input (OpenAI chat + Anthropic messages). The model still receives full messages. Use global default follows litellm_settings.skip_system_message_in_guardrail.",
+            t("guardrails.addForm.fields.skipSystemMessages.label"),
+            t("guardrails.addForm.fields.skipSystemMessages.hint"),
           )}
         >
           {(fieldControl) => <SkipMessageSelect control={fieldControl} />}
@@ -914,8 +928,8 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
           control={form.control}
           name="skip_tool_message_choice"
           label={labelWithHint(
-            "Skip tool messages in guardrail",
-            "Unified guardrails only: omit role: tool from guardrail evaluation input (OpenAI chat + Anthropic messages). The model still receives full messages. Use global default follows litellm_settings.skip_tool_message_in_guardrail.",
+            t("guardrails.addForm.fields.skipToolMessages.label"),
+            t("guardrails.addForm.fields.skipToolMessages.hint"),
           )}
         >
           {(fieldControl) => <SkipMessageSelect control={fieldControl} />}
@@ -1078,14 +1092,13 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
       <div className="space-y-6">
         <div>
           <p className="text-sm text-muted-foreground">
-            Configure settings for a specific call type. Most guardrails don't need this — skip it unless you're using a
-            specific endpoint like <code>/v1/realtime</code>.
+            <Trans i18nKey="guardrails.addForm.endpoint.intro" components={{ code: <code /> }} />
           </p>
         </div>
 
         <div>
           <label htmlFor="guardrail-call-type" className="mb-1 block text-sm font-medium text-foreground">
-            Call type
+            {t("guardrails.addForm.endpoint.callType.label")}
           </label>
           <Select
             items={CALL_TYPE_ITEMS}
@@ -1096,7 +1109,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
             }}
           >
             <SelectTrigger id="guardrail-call-type" className="w-65">
-              <SelectValue placeholder="Select a call type" />
+              <SelectValue placeholder={t("guardrails.addForm.endpoint.callType.placeholder")} />
             </SelectTrigger>
             <SelectContent>
               {CALL_TYPE_ITEMS.map((item) => (
@@ -1106,7 +1119,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
               ))}
             </SelectContent>
           </Select>
-          <p className="mt-1 text-xs text-muted-foreground">More call types coming soon.</p>
+          <p className="mt-1 text-xs text-muted-foreground">{t("guardrails.addForm.endpoint.callType.comingSoon")}</p>
         </div>
 
         {selectedEndpointType === "realtime" && (
@@ -1116,7 +1129,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
               onClick={() => setEndpointSettingsOpen((o) => !o)}
               className="flex w-full items-center justify-between bg-muted px-4 py-3 text-sm font-medium text-foreground hover:bg-muted/70"
             >
-              <span>/v1/realtime settings</span>
+              <span>{t("guardrails.addForm.endpoint.realtime.title")}</span>
               <svg
                 className={`w-4 h-4 text-muted-foreground transition-transform ${endpointSettingsOpen ? "rotate-180" : ""}`}
                 fill="none"
@@ -1135,17 +1148,16 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                     htmlFor="guardrail-end-session-after"
                     className="mb-1 block text-sm font-medium text-foreground"
                   >
-                    End session after X violations
+                    {t("guardrails.addForm.endpoint.realtime.endSessionAfter.label")}
                   </label>
                   <p className="mb-2 text-xs text-muted-foreground">
-                    Automatically close the session after this many guardrail violations. Leave empty to never
-                    auto-close.
+                    {t("guardrails.addForm.endpoint.realtime.endSessionAfter.description")}
                   </p>
                   <Input
                     id="guardrail-end-session-after"
                     type="number"
                     min={1}
-                    placeholder="e.g. 3"
+                    placeholder={t("guardrails.addForm.endpoint.realtime.endSessionAfter.placeholder")}
                     value={endSessionAfterNFails ?? ""}
                     onChange={(e) =>
                       setEndSessionAfterNFails(e.target.value ? parseInt(e.target.value, 10) : undefined)
@@ -1155,7 +1167,9 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                 </div>
 
                 <div>
-                  <label className="mb-2 block text-sm font-medium text-foreground">On violation</label>
+                  <label className="mb-2 block text-sm font-medium text-foreground">
+                    {t("guardrails.addForm.endpoint.realtime.onViolation.label")}
+                  </label>
                   <div className="space-y-2">
                     {(["warn", "end_session"] as const).map((opt) => (
                       <label key={opt} className="flex items-start gap-2 cursor-pointer">
@@ -1169,12 +1183,14 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                         />
                         <div>
                           <span className="text-sm font-medium text-foreground">
-                            {opt === "warn" ? "Warn" : "End session"}
+                            {opt === "warn"
+                              ? t("guardrails.addForm.endpoint.realtime.onViolation.warn.label")
+                              : t("guardrails.addForm.endpoint.realtime.onViolation.endSession.label")}
                           </span>
                           <p className="m-0 text-xs text-muted-foreground">
                             {opt === "warn"
-                              ? "Bot speaks the message, session continues"
-                              : "Bot speaks the message, connection closes immediately"}
+                              ? t("guardrails.addForm.endpoint.realtime.onViolation.warn.description")
+                              : t("guardrails.addForm.endpoint.realtime.onViolation.endSession.description")}
                           </p>
                         </div>
                       </label>
@@ -1187,16 +1203,15 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                     htmlFor="guardrail-realtime-message"
                     className="mb-1 block text-sm font-medium text-foreground"
                   >
-                    Message the user hears
+                    {t("guardrails.addForm.endpoint.realtime.message.label")}
                   </label>
                   <p className="mb-2 text-xs text-muted-foreground">
-                    What the bot says aloud when this guardrail fires. Falls back to the default violation message if
-                    empty.
+                    {t("guardrails.addForm.endpoint.realtime.message.description")}
                   </p>
                   <Textarea
                     id="guardrail-realtime-message"
                     rows={3}
-                    placeholder="e.g. I'm not able to continue this conversation. Please contact us at 1-800-774-2678."
+                    placeholder={t("guardrails.addForm.endpoint.realtime.message.placeholder")}
                     value={realtimeViolationMessage}
                     onChange={(e) => setRealtimeViolationMessage(e.target.value)}
                     className="w-full resize-none"
@@ -1213,28 +1228,28 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
   const getStepConfigs = () => {
     if (shouldRenderContentFilterConfigSettings(selectedProvider)) {
       return [
-        { title: "Basic Info", optional: false },
-        { title: "Topics", optional: false },
-        { title: "Patterns", optional: false },
-        { title: "Keywords", optional: false },
-        { title: "Endpoint Settings (Optional)", optional: true },
+        { title: t("guardrails.addForm.steps.basicInfo"), optional: false },
+        { title: t("guardrails.addForm.steps.topics"), optional: false },
+        { title: t("guardrails.addForm.steps.patterns"), optional: false },
+        { title: t("guardrails.addForm.steps.keywords"), optional: false },
+        { title: t("guardrails.addForm.steps.endpointSettings"), optional: true },
       ];
     }
     if (shouldRenderPIIConfigSettings(selectedProvider)) {
       return [
-        { title: "Basic Info", optional: false },
-        { title: "PII Configuration", optional: false },
+        { title: t("guardrails.addForm.steps.basicInfo"), optional: false },
+        { title: t("guardrails.addForm.steps.piiConfiguration"), optional: false },
       ];
     }
     if (isDecisionModelProvider) {
       return [
-        { title: "Basic Info", optional: false },
-        { title: "Decision Model Configuration", optional: false },
+        { title: t("guardrails.addForm.steps.basicInfo"), optional: false },
+        { title: t("guardrails.addForm.steps.decisionModelConfiguration"), optional: false },
       ];
     }
     return [
-      { title: "Basic Info", optional: false },
-      { title: "Provider Configuration", optional: false },
+      { title: t("guardrails.addForm.steps.basicInfo"), optional: false },
+      { title: t("guardrails.addForm.steps.providerConfiguration"), optional: false },
     ];
   };
 
@@ -1250,7 +1265,9 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
           <div className="flex min-w-0 flex-col">
             {/* Header */}
             <div className="flex items-center justify-between border-b border-border px-6 py-4">
-              <DialogTitle className="m-0 text-base font-semibold text-foreground">Create guardrail</DialogTitle>
+              <DialogTitle className="m-0 text-base font-semibold text-foreground">
+                {t("guardrails.addForm.title")}
+              </DialogTitle>
               <button
                 type="button"
                 onClick={handleClose}
@@ -1290,9 +1307,15 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                         >
                           <span className={`text-sm ${getStepTitleClass(isDone, isCurrent)}`}>{step.title}</span>
                           {step.optional && !isCurrent && (
-                            <span className="text-[11px] text-muted-foreground">optional</span>
+                            <span className="text-[11px] text-muted-foreground">
+                              {t("guardrails.addForm.steps.optional")}
+                            </span>
+                          )}
+                          {isDone && (
+                            <span className="text-[11px] text-info hover:underline">
+                              {t("guardrails.addForm.steps.edit")}
+                            </span>
                           )}
-                          {isDone && <span className="text-[11px] text-info hover:underline">Edit</span>}
                         </div>
 
                         {/* Expanded form content for current step */}
@@ -1307,21 +1330,21 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
             {/* Bottom bar */}
             <div className="flex items-center justify-end space-x-3 border-t border-border px-6 py-3">
               <Button type="button" variant="outline" onClick={handleClose}>
-                Cancel
+                {t("guardrails.addForm.actions.cancel")}
               </Button>
               {currentStep > 0 && (
                 <Button type="button" variant="outline" onClick={prevStep}>
-                  Previous
+                  {t("guardrails.addForm.actions.previous")}
                 </Button>
               )}
               {currentStep < stepConfigs.length - 1 ? (
                 <Button type="button" onClick={nextStep}>
-                  Next
+                  {t("guardrails.addForm.actions.next")}
                 </Button>
               ) : (
                 <Button type="button" onClick={handleSubmit} disabled={loading}>
                   {loading && <UiLoadingSpinner className="size-4" />}
-                  Create Guardrail
+                  {t("guardrails.addForm.actions.create")}
                 </Button>
               )}
             </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CategoryTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CategoryTable.tsx
index f012923d32f..532b67a3332 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CategoryTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CategoryTable.tsx
@@ -1,11 +1,12 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Trash2 } from "lucide-react";
 import type { ColumnDef } from "@tanstack/react-table";
 import { DataTable } from "@/components/shared/DataTable";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { ACTION_ITEMS, SEVERITY_ITEMS } from "./action_options";
+import { ACTION_ITEMS, SEVERITY_ITEMS, translateOptions } from "./action_options";
 
 interface ContentCategory {
   id: string;
@@ -30,9 +31,12 @@ const CategoryTable: React.FC<CategoryTableProps> = ({
   onRemove,
   readOnly = false,
 }) => {
+  const { t } = useTranslation();
+  const actionItems = translateOptions(ACTION_ITEMS, t);
+  const severityItems = translateOptions(SEVERITY_ITEMS, t);
   const columns: ColumnDef<ContentCategory>[] = [
     {
-      header: "Category",
+      header: t("guardrails.contentFilter.categoryTable.columns.category"),
       accessorKey: "display_name",
       cell: ({ row }) => {
         const { category, display_name: displayName } = row.original;
@@ -45,7 +49,7 @@ const CategoryTable: React.FC<CategoryTableProps> = ({
       },
     },
     {
-      header: "Severity Threshold",
+      header: t("guardrails.contentFilter.categoryTable.columns.severityThreshold"),
       accessorKey: "severity_threshold",
       size: 180,
       cell: ({ row }) => {
@@ -55,17 +59,21 @@ const CategoryTable: React.FC<CategoryTableProps> = ({
         }
         return (
           <Select
-            items={SEVERITY_ITEMS}
+            items={severityItems}
             value={severity}
             onValueChange={(value: string | null) =>
               value && onSeverityChange?.(id, value as "high" | "medium" | "low")
             }
           >
-            <SelectTrigger size="sm" className="w-[150px]" aria-label="Severity Threshold">
+            <SelectTrigger
+              size="sm"
+              className="w-[150px]"
+              aria-label={t("guardrails.contentFilter.categoryTable.columns.severityThreshold")}
+            >
               <SelectValue />
             </SelectTrigger>
             <SelectContent>
-              {SEVERITY_ITEMS.map((item) => (
+              {severityItems.map((item) => (
                 <SelectItem key={item.value} value={item.value}>
                   {item.label}
                 </SelectItem>
@@ -76,7 +84,7 @@ const CategoryTable: React.FC<CategoryTableProps> = ({
       },
     },
     {
-      header: "Action",
+      header: t("guardrails.contentFilter.categoryTable.columns.action"),
       accessorKey: "action",
       size: 150,
       cell: ({ row }) => {
@@ -86,15 +94,19 @@ const CategoryTable: React.FC<CategoryTableProps> = ({
         }
         return (
           <Select
-            items={ACTION_ITEMS}
+            items={actionItems}
             value={action}
             onValueChange={(value: string | null) => value && onActionChange?.(id, value as "BLOCK" | "MASK")}
           >
-            <SelectTrigger size="sm" className="w-[120px]" aria-label="Action">
+            <SelectTrigger
+              size="sm"
+              className="w-[120px]"
+              aria-label={t("guardrails.contentFilter.categoryTable.columns.action")}
+            >
               <SelectValue />
             </SelectTrigger>
             <SelectContent>
-              {ACTION_ITEMS.map((item) => (
+              {actionItems.map((item) => (
                 <SelectItem key={item.value} value={item.value}>
                   {item.label}
                 </SelectItem>
@@ -114,14 +126,16 @@ const CategoryTable: React.FC<CategoryTableProps> = ({
       cell: ({ row }) => (
         <Button variant="ghost" size="sm" onClick={() => onRemove?.(row.original.id)}>
           <Trash2 />
-          Delete
+          {t("guardrails.contentFilter.categoryTable.delete")}
         </Button>
       ),
     });
   }
 
   if (categories.length === 0) {
-    return <div className="py-10 text-center text-muted-foreground">No categories configured.</div>;
+    return (
+      <div className="py-10 text-center text-muted-foreground">{t("guardrails.contentFilter.categoryTable.empty")}</div>
+    );
   }
 
   return <DataTable data={categories} columns={columns} getRowId={(row) => row.id} size="compact" />;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CompetitorIntentConfiguration.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CompetitorIntentConfiguration.tsx
index 0632ec87f34..97d899b783f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CompetitorIntentConfiguration.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CompetitorIntentConfiguration.tsx
@@ -1,4 +1,6 @@
+import type { ParseKeys } from "i18next";
 import React, { useEffect, useId, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 
 import { getMajorAirlines } from "@/components/networking";
 import { Field, FieldDescription, FieldGroup, FieldLabel } from "@/components/ui/field";
@@ -49,26 +51,43 @@ const DEFAULT_CONFIG: CompetitorIntentConfig = {
   threshold_low: 0.3,
 };
 
-const INTENT_TYPES = [
-  { value: "airline", label: "Airline (auto-load competitors from IATA)" },
-  { value: "generic", label: "Generic (specify competitors manually)" },
-] as const;
+const INTENT_TYPES: readonly { value: CompetitorIntentConfig["competitor_intent_type"]; labelKey: ParseKeys }[] = [
+  { value: "airline", labelKey: "guardrails.contentFilter.competitorIntent.intentTypes.airline" },
+  { value: "generic", labelKey: "guardrails.contentFilter.competitorIntent.intentTypes.generic" },
+];
 
-const COMPETITOR_COMPARISON_POLICIES = [
-  { value: "refuse", label: "Refuse (block request)" },
-  { value: "reframe", label: "Reframe (suggest alternative)" },
-] as const;
+type PolicyChoice = "refuse" | "reframe";
 
-const POSSIBLE_COMPETITOR_COMPARISON_POLICIES = [
-  { value: "refuse", label: "Refuse (block request)" },
-  { value: "reframe", label: "Reframe (suggest alternative to backend LLM)" },
-] as const;
+const COMPETITOR_COMPARISON_POLICIES: readonly { value: PolicyChoice; labelKey: ParseKeys }[] = [
+  { value: "refuse", labelKey: "guardrails.contentFilter.competitorIntent.policies.refuse" },
+  { value: "reframe", labelKey: "guardrails.contentFilter.competitorIntent.policies.reframe" },
+];
+
+const POSSIBLE_COMPETITOR_COMPARISON_POLICIES: readonly { value: PolicyChoice; labelKey: ParseKeys }[] = [
+  { value: "refuse", labelKey: "guardrails.contentFilter.competitorIntent.policies.refuse" },
+  { value: "reframe", labelKey: "guardrails.contentFilter.competitorIntent.policies.reframeToBackend" },
+];
 
 const THRESHOLDS = [
-  { field: "threshold_high", label: "High", hint: "e.g. 0.7", fallback: 0.7 },
-  { field: "threshold_medium", label: "Medium", hint: "e.g. 0.45", fallback: 0.45 },
-  { field: "threshold_low", label: "Low", hint: "e.g. 0.3", fallback: 0.3 },
-] as const;
+  {
+    field: "threshold_high",
+    labelKey: "guardrails.contentFilter.competitorIntent.thresholds.high",
+    hint: 0.7,
+    fallback: 0.7,
+  },
+  {
+    field: "threshold_medium",
+    labelKey: "guardrails.contentFilter.competitorIntent.thresholds.medium",
+    hint: 0.45,
+    fallback: 0.45,
+  },
+  {
+    field: "threshold_low",
+    labelKey: "guardrails.contentFilter.competitorIntent.thresholds.low",
+    hint: 0.3,
+    fallback: 0.3,
+  },
+] as const satisfies readonly { field: string; labelKey: ParseKeys; hint: number; fallback: number }[];
 
 const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps> = ({
   enabled,
@@ -76,6 +95,7 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
   onChange,
   accessToken,
 }) => {
+  const { t } = useTranslation();
   const effectiveConfig = config ?? DEFAULT_CONFIG;
   const [airlineOptions, setAirlineOptions] = useState<MajorAirline[]>([]);
   const [loadingAirlines, setLoadingAirlines] = useState(false);
@@ -139,7 +159,7 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
 
   const header = (
     <CardHeader className="gap-0">
-      <CardTitle className="text-base">Competitor Intent Filter</CardTitle>
+      <CardTitle className="text-base">{t("guardrails.contentFilter.competitorIntent.title")}</CardTitle>
       <CardAction>
         <Switch checked={enabled} onCheckedChange={handleEnabledChange} />
       </CardAction>
@@ -152,8 +172,7 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
         {header}
         <CardContent>
           <p className="text-sm text-muted-foreground">
-            Block or reframe competitor comparison questions. When enabled, airline type auto-loads competitors from
-            IATA; generic type requires manual competitor list.
+            {t("guardrails.contentFilter.competitorIntent.disabledDescription")}
           </p>
         </CardContent>
       </Card>
@@ -175,19 +194,30 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
         })
       : [];
 
+  const intentTypes = INTENT_TYPES.map(({ value, labelKey }) => ({ value, label: t(labelKey) }));
+  const competitorComparisonPolicies = COMPETITOR_COMPARISON_POLICIES.map(({ value, labelKey }) => ({
+    value,
+    label: t(labelKey),
+  }));
+  const possibleCompetitorComparisonPolicies = POSSIBLE_COMPETITOR_COMPARISON_POLICIES.map(({ value, labelKey }) => ({
+    value,
+    label: t(labelKey),
+  }));
+
   return (
     <Card>
       {header}
       <CardContent>
         <p className="mb-4 text-sm text-muted-foreground">
-          Block or reframe competitor comparison questions. Airline type uses major airlines (excluding your brand);
-          generic requires manual competitor list.
+          {t("guardrails.contentFilter.competitorIntent.enabledDescription")}
         </p>
         <FieldGroup>
           <Field>
-            <FieldLabel htmlFor={`${fieldId}-type`}>Type</FieldLabel>
+            <FieldLabel htmlFor={`${fieldId}-type`}>
+              {t("guardrails.contentFilter.competitorIntent.typeLabel")}
+            </FieldLabel>
             <Select
-              items={INTENT_TYPES}
+              items={intentTypes}
               value={effectiveConfig.competitor_intent_type}
               onValueChange={(v: string | null) => v !== null && handleConfigChange("competitor_intent_type", v)}
             >
@@ -195,7 +225,7 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {INTENT_TYPES.map((type) => (
+                {intentTypes.map((type) => (
                   <SelectItem key={type.value} value={type.value} title={type.label}>
                     {type.label}
                   </SelectItem>
@@ -205,7 +235,9 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
           </Field>
 
           <Field>
-            <FieldLabel htmlFor={`${fieldId}-brand-self`}>Your Brand (brand_self)</FieldLabel>
+            <FieldLabel htmlFor={`${fieldId}-brand-self`}>
+              {t("guardrails.contentFilter.competitorIntent.brandSelfLabel", { field: "brand_self" })}
+            </FieldLabel>
             <TagsInput
               id={`${fieldId}-brand-self`}
               value={effectiveConfig.brand_self}
@@ -219,49 +251,57 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
               loading={loadingAirlines}
               placeholder={
                 effectiveConfig.competitor_intent_type === "airline"
-                  ? "Search or select airline, or type to add custom"
-                  : "Type and press Enter to add"
+                  ? t("guardrails.contentFilter.competitorIntent.airlinePlaceholder")
+                  : t("guardrails.contentFilter.competitorIntent.typeToAddPlaceholder")
               }
             />
             <FieldDescription>
               {effectiveConfig.competitor_intent_type === "airline"
-                ? "Select your airline from the list (excluded from competitors) or type to add a custom term"
-                : "Names/codes users use for your brand"}
+                ? t("guardrails.contentFilter.competitorIntent.airlineBrandDescription")
+                : t("guardrails.contentFilter.competitorIntent.genericBrandDescription")}
             </FieldDescription>
           </Field>
 
           {effectiveConfig.competitor_intent_type === "airline" && (
             <Field>
-              <FieldLabel htmlFor={`${fieldId}-locations`}>Locations (optional)</FieldLabel>
+              <FieldLabel htmlFor={`${fieldId}-locations`}>
+                {t("guardrails.contentFilter.competitorIntent.locationsLabel")}
+              </FieldLabel>
               <TagsInput
                 id={`${fieldId}-locations`}
                 value={effectiveConfig.locations ?? []}
                 onValueChange={(v) => handleNestedArrayChange("locations", v)}
                 tokenSeparators={[","]}
-                placeholder="Type and press Enter to add"
+                placeholder={t("guardrails.contentFilter.competitorIntent.typeToAddPlaceholder")}
               />
-              <FieldDescription>Countries, cities, airports for disambiguation (e.g. qatar, doha)</FieldDescription>
+              <FieldDescription>{t("guardrails.contentFilter.competitorIntent.locationsDescription")}</FieldDescription>
             </Field>
           )}
 
           {effectiveConfig.competitor_intent_type === "generic" && (
             <Field>
-              <FieldLabel htmlFor={`${fieldId}-competitors`}>Competitors</FieldLabel>
+              <FieldLabel htmlFor={`${fieldId}-competitors`}>
+                {t("guardrails.contentFilter.competitorIntent.competitorsLabel")}
+              </FieldLabel>
               <TagsInput
                 id={`${fieldId}-competitors`}
                 value={effectiveConfig.competitors ?? []}
                 onValueChange={(v) => handleNestedArrayChange("competitors", v)}
                 tokenSeparators={[","]}
-                placeholder="Type and press Enter to add"
+                placeholder={t("guardrails.contentFilter.competitorIntent.typeToAddPlaceholder")}
               />
-              <FieldDescription>Competitor names to detect (required for generic type)</FieldDescription>
+              <FieldDescription>
+                {t("guardrails.contentFilter.competitorIntent.competitorsDescription")}
+              </FieldDescription>
             </Field>
           )}
 
           <Field>
-            <FieldLabel htmlFor={`${fieldId}-competitor-comparison`}>Policy: Competitor comparison</FieldLabel>
+            <FieldLabel htmlFor={`${fieldId}-competitor-comparison`}>
+              {t("guardrails.contentFilter.competitorIntent.competitorComparisonLabel")}
+            </FieldLabel>
             <Select
-              items={COMPETITOR_COMPARISON_POLICIES}
+              items={competitorComparisonPolicies}
               value={effectiveConfig.policy?.competitor_comparison ?? "refuse"}
               onValueChange={(v: string | null) => v !== null && handlePolicyChange("competitor_comparison", v)}
             >
@@ -269,7 +309,7 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {COMPETITOR_COMPARISON_POLICIES.map((policy) => (
+                {competitorComparisonPolicies.map((policy) => (
                   <SelectItem key={policy.value} value={policy.value} title={policy.label}>
                     {policy.label}
                   </SelectItem>
@@ -280,10 +320,10 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
 
           <Field>
             <FieldLabel htmlFor={`${fieldId}-possible-competitor-comparison`}>
-              Policy: Possible competitor comparison
+              {t("guardrails.contentFilter.competitorIntent.possibleCompetitorComparisonLabel")}
             </FieldLabel>
             <Select
-              items={POSSIBLE_COMPETITOR_COMPARISON_POLICIES}
+              items={possibleCompetitorComparisonPolicies}
               value={effectiveConfig.policy?.possible_competitor_comparison ?? "reframe"}
               onValueChange={(v: string | null) =>
                 v !== null && handlePolicyChange("possible_competitor_comparison", v)
@@ -293,7 +333,7 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {POSSIBLE_COMPETITOR_COMPARISON_POLICIES.map((policy) => (
+                {possibleCompetitorComparisonPolicies.map((policy) => (
                   <SelectItem key={policy.value} value={policy.value} title={policy.label}>
                     {policy.label}
                   </SelectItem>
@@ -303,11 +343,11 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
           </Field>
 
           <Field>
-            <FieldLabel>Confidence thresholds</FieldLabel>
+            <FieldLabel>{t("guardrails.contentFilter.competitorIntent.thresholdsLabel")}</FieldLabel>
             <div className="flex flex-wrap gap-4">
               {THRESHOLDS.map((threshold) => (
                 <Field key={threshold.field} className="w-20">
-                  <FieldLabel htmlFor={`${fieldId}-${threshold.field}`}>{threshold.label}</FieldLabel>
+                  <FieldLabel htmlFor={`${fieldId}-${threshold.field}`}>{t(threshold.labelKey)}</FieldLabel>
                   <ThresholdInput
                     id={`${fieldId}-${threshold.field}`}
                     value={effectiveConfig[threshold.field] ?? threshold.fallback}
@@ -316,26 +356,35 @@ const CompetitorIntentConfiguration: React.FC<CompetitorIntentConfigurationProps
                     max={1}
                     step={0.05}
                   />
-                  <FieldDescription>{threshold.hint}</FieldDescription>
+                  <FieldDescription>
+                    {t("guardrails.contentFilter.competitorIntent.thresholds.example", { value: threshold.hint })}
+                  </FieldDescription>
                 </Field>
               ))}
             </div>
             <FieldDescription>
-              Classify competitor intent by confidence (0–1). Higher confidence -&gt; stronger intent.
+              {t("guardrails.contentFilter.competitorIntent.thresholdsHelp.intro")}
               <ul className="mt-1 mb-0 list-disc pl-5">
                 <li>
-                  <strong>High (≥)</strong>: Treat as full competitor comparison -&gt; uses &quot;Competitor
-                  comparison&quot; policy
+                  <Trans
+                    i18nKey="guardrails.contentFilter.competitorIntent.thresholdsHelp.high"
+                    components={{ strong: <strong /> }}
+                  />
                 </li>
                 <li>
-                  <strong>Medium (≥)</strong>: Treat as possible comparison -&gt; uses &quot;Possible competitor
-                  comparison&quot; policy
+                  <Trans
+                    i18nKey="guardrails.contentFilter.competitorIntent.thresholdsHelp.medium"
+                    components={{ strong: <strong /> }}
+                  />
                 </li>
                 <li>
-                  <strong>Low (≥)</strong>: Log only; allow request. Below Low -&gt; allow with no action
+                  <Trans
+                    i18nKey="guardrails.contentFilter.competitorIntent.thresholdsHelp.low"
+                    components={{ strong: <strong /> }}
+                  />
                 </li>
               </ul>
-              Raise thresholds to be more permissive; lower them to be stricter.
+              {t("guardrails.contentFilter.competitorIntent.thresholdsHelp.outro")}
             </FieldDescription>
           </Field>
         </FieldGroup>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentCategoryConfiguration.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentCategoryConfiguration.tsx
index f2226a3bc6e..1172a7c38f1 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentCategoryConfiguration.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentCategoryConfiguration.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { ChevronRight, FileText, Plus, Trash2 } from "lucide-react";
 import type { ColumnDef } from "@tanstack/react-table";
 import { getCategoryYaml } from "@/components/networking";
@@ -16,7 +17,7 @@ import {
   ComboboxList,
 } from "@/components/ui/combobox";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { ACTION_ITEMS, SEVERITY_ITEMS } from "./action_options";
+import { ACTION_ITEMS, SEVERITY_ITEMS, translateOptions } from "./action_options";
 
 interface ContentCategory {
   name: string;
@@ -54,6 +55,9 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
   pendingSelection,
   onPendingSelectionChange,
 }) => {
+  const { t } = useTranslation();
+  const actionItems = translateOptions(ACTION_ITEMS, t);
+  const severityItems = translateOptions(SEVERITY_ITEMS, t);
   // Use controlled state if parent provides it, otherwise use local state
   const [localSelectedCategoryName, setLocalSelectedCategoryName] = React.useState<string>("");
   const selectedCategoryName = pendingSelection !== undefined ? pendingSelection : localSelectedCategoryName;
@@ -174,7 +178,7 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
 
   const columns: ColumnDef<SelectedCategory>[] = [
     {
-      header: "Category",
+      header: t("guardrails.contentFilter.categoryConfiguration.columns.category"),
       accessorKey: "display_name",
       cell: ({ row }) => {
         const category = availableCategories.find((c) => c.name === row.original.category);
@@ -187,20 +191,24 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
       },
     },
     {
-      header: "Action",
+      header: t("guardrails.contentFilter.categoryConfiguration.columns.action"),
       accessorKey: "action",
       size: 150,
       cell: ({ row }) => (
         <Select
-          items={ACTION_ITEMS}
+          items={actionItems}
           value={row.original.action}
           onValueChange={(value: string | null) => value && onCategoryUpdate(row.original.id, "action", value)}
         >
-          <SelectTrigger size="sm" className="w-full" aria-label="Action">
+          <SelectTrigger
+            size="sm"
+            className="w-full"
+            aria-label={t("guardrails.contentFilter.categoryConfiguration.columns.action")}
+          >
             <SelectValue />
           </SelectTrigger>
           <SelectContent>
-            {ACTION_ITEMS.map((item) => (
+            {actionItems.map((item) => (
               <SelectItem key={item.value} value={item.value}>
                 <Badge variant={item.value === "BLOCK" ? "destructive" : "secondary"}>{item.value}</Badge>
               </SelectItem>
@@ -210,22 +218,26 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
       ),
     },
     {
-      header: "Severity Threshold",
+      header: t("guardrails.contentFilter.categoryConfiguration.columns.severityThreshold"),
       accessorKey: "severity_threshold",
       size: 180,
       cell: ({ row }) => (
         <Select
-          items={SEVERITY_ITEMS}
+          items={severityItems}
           value={row.original.severity_threshold}
           onValueChange={(value: string | null) =>
             value && onCategoryUpdate(row.original.id, "severity_threshold", value)
           }
         >
-          <SelectTrigger size="sm" className="w-full" aria-label="Severity Threshold">
+          <SelectTrigger
+            size="sm"
+            className="w-full"
+            aria-label={t("guardrails.contentFilter.categoryConfiguration.columns.severityThreshold")}
+          >
             <SelectValue />
           </SelectTrigger>
           <SelectContent>
-            {SEVERITY_ITEMS.map((item) => (
+            {severityItems.map((item) => (
               <SelectItem key={item.value} value={item.value}>
                 {item.label}
               </SelectItem>
@@ -241,7 +253,7 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
       cell: ({ row }) => (
         <Button variant="outline" size="sm" onClick={() => onCategoryRemove(row.original.id)}>
           <Trash2 />
-          Remove
+          {t("guardrails.contentFilter.categoryConfiguration.remove")}
         </Button>
       ),
     },
@@ -256,9 +268,9 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
     <Card>
       <CardHeader>
         <div className="flex flex-wrap items-center justify-between gap-2">
-          <CardTitle>Blocked topics</CardTitle>
+          <CardTitle>{t("guardrails.contentFilter.categoryConfiguration.title")}</CardTitle>
           <p className="text-xs font-normal text-muted-foreground">
-            Select topics to block using keyword and semantic analysis
+            {t("guardrails.contentFilter.categoryConfiguration.subtitle")}
           </p>
         </div>
       </CardHeader>
@@ -270,9 +282,12 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
             onValueChange={(category: ContentCategory | null) => setSelectedCategoryName(category?.name ?? "")}
             itemToStringLabel={(category: ContentCategory) => category.display_name}
           >
-            <ComboboxInput className="w-full" placeholder="Select a content category" />
+            <ComboboxInput
+              className="w-full"
+              placeholder={t("guardrails.contentFilter.categoryConfiguration.placeholder")}
+            />
             <ComboboxContent>
-              <ComboboxEmpty>No matching categories</ComboboxEmpty>
+              <ComboboxEmpty>{t("guardrails.contentFilter.categoryConfiguration.noMatches")}</ComboboxEmpty>
               <ComboboxList>
                 {(cat: ContentCategory) => (
                   <ComboboxItem key={cat.name} value={cat}>
@@ -287,7 +302,7 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
           </Combobox>
           <Button onClick={handleAddCategory} disabled={!selectedCategoryName}>
             <Plus />
-            Add
+            {t("guardrails.contentFilter.categoryConfiguration.add")}
           </Button>
         </div>
 
@@ -295,7 +310,8 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
         {selectedCategoryName && (
           <div className="mb-4 rounded-md border border-border bg-muted/40 p-3">
             <div className="mb-2 text-sm font-medium">
-              Preview: {availableCategories.find((c) => c.name === selectedCategoryName)?.display_name}
+              {t("guardrails.contentFilter.categoryConfiguration.preview")}{" "}
+              {availableCategories.find((c) => c.name === selectedCategoryName)?.display_name}
               {categoryFileTypes[selectedCategoryName] && (
                 <span className="ml-2 text-xs font-normal text-muted-foreground">
                   ({categoryFileTypes[selectedCategoryName]?.toUpperCase()})
@@ -303,13 +319,17 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
               )}
             </div>
             {loadingPreviewYaml ? (
-              <div className="p-4 text-center text-muted-foreground">Loading content...</div>
+              <div className="p-4 text-center text-muted-foreground">
+                {t("guardrails.contentFilter.categoryConfiguration.loadingContent")}
+              </div>
             ) : previewYaml ? (
               <pre className="m-0 max-h-[300px] max-w-full overflow-auto rounded-md border border-border bg-background p-3 text-xs leading-relaxed break-words whitespace-pre-wrap">
                 <code>{previewYaml}</code>
               </pre>
             ) : (
-              <div className="p-2 text-center text-xs text-muted-foreground">Unable to load category content</div>
+              <div className="p-2 text-center text-xs text-muted-foreground">
+                {t("guardrails.contentFilter.categoryConfiguration.previewUnavailable")}
+              </div>
             )}
           </div>
         )}
@@ -339,18 +359,25 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
                       <ChevronRight className={`size-4 transition-transform ${isExpanded ? "rotate-90" : ""}`} />
                       <FileText className="size-4" />
                       <span>
-                        View {fileType.toUpperCase()} for {category.display_name}
+                        {t("guardrails.contentFilter.categoryConfiguration.viewContent", {
+                          fileType: fileType.toUpperCase(),
+                          name: category.display_name,
+                        })}
                       </span>
                     </CollapsibleTrigger>
                     <CollapsibleContent>
                       {loadingYaml[category.category] ? (
-                        <div className="p-4 text-center text-muted-foreground">Loading content...</div>
+                        <div className="p-4 text-center text-muted-foreground">
+                          {t("guardrails.contentFilter.categoryConfiguration.loadingContent")}
+                        </div>
                       ) : categoryYaml[category.category] ? (
                         <pre className="m-0 max-h-[400px] overflow-auto rounded-md bg-muted p-4 text-xs leading-relaxed">
                           <code>{categoryYaml[category.category]}</code>
                         </pre>
                       ) : (
-                        <div className="p-4 text-center text-muted-foreground">Content will load when expanded</div>
+                        <div className="p-4 text-center text-muted-foreground">
+                          {t("guardrails.contentFilter.categoryConfiguration.contentLoadsOnExpand")}
+                        </div>
                       )}
                     </CollapsibleContent>
                   </Collapsible>
@@ -360,7 +387,7 @@ const ContentCategoryConfiguration: React.FC<ContentCategoryConfigurationProps>
           </>
         ) : (
           <div className="rounded-md border border-dashed border-border p-6 text-center text-muted-foreground">
-            No blocked topics selected. Add topics to detect and block harmful content.
+            {t("guardrails.contentFilter.categoryConfiguration.empty")}
           </div>
         )}
       </CardContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterConfiguration.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterConfiguration.tsx
index 7a9c381fd09..c4eeaa7b4e1 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterConfiguration.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterConfiguration.tsx
@@ -1,4 +1,5 @@
 import React, { useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Plus, Upload } from "lucide-react";
 import { validateBlockedWordsFile } from "@/components/networking";
 import { toast } from "@/lib/toast";
@@ -102,6 +103,7 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
   competitorIntentConfig = null,
   onCompetitorIntentChange,
 }) => {
+  const { t } = useTranslation();
   const [patternModalVisible, setPatternModalVisible] = useState(false);
   const [keywordModalVisible, setKeywordModalVisible] = useState(false);
   const [customPatternModalVisible, setCustomPatternModalVisible] = useState(false);
@@ -119,7 +121,7 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
 
   const handleAddPrebuiltPattern = () => {
     if (!selectedPatternName) {
-      toast.error("Please select a pattern");
+      toast.error(t("guardrails.contentFilter.configuration.toasts.selectPattern"));
       return;
     }
 
@@ -140,7 +142,7 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
 
   const handleAddCustomPattern = () => {
     if (!customPatternName || !customPatternRegex) {
-      toast.error("Please provide pattern name and regex");
+      toast.error(t("guardrails.contentFilter.configuration.toasts.patternNameAndRegexRequired"));
       return;
     }
 
@@ -160,7 +162,7 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
 
   const handleAddKeyword = () => {
     if (!newKeyword) {
-      toast.error("Please enter a keyword");
+      toast.error(t("guardrails.contentFilter.configuration.toasts.keywordRequired"));
       return;
     }
 
@@ -188,14 +190,17 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
           if (onFileUpload) {
             onFileUpload(content);
           }
-          toast.success(result.message || "File uploaded successfully");
+          toast.success(result.message || t("guardrails.contentFilter.configuration.toasts.uploadSucceeded"));
         } else {
-          const errorMessage = result.error || (result.errors && result.errors.join(", ")) || "Invalid file";
-          toast.error(`Validation failed: ${errorMessage}`);
+          const errorMessage =
+            result.error ||
+            (result.errors && result.errors.join(", ")) ||
+            t("guardrails.contentFilter.configuration.toasts.invalidFile");
+          toast.error(t("guardrails.contentFilter.configuration.toasts.validationFailed", { error: errorMessage }));
         }
       }
     } catch (error) {
-      toast.error(`Failed to upload file: ${error}`);
+      toast.error(t("guardrails.contentFilter.configuration.toasts.uploadFailed", { error: String(error) }));
     } finally {
       setUploadValidating(false);
     }
@@ -219,10 +224,7 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
     <div className="space-y-6">
       {!showStep && (
         <div>
-          <p className="text-muted-foreground">
-            Configure patterns, keywords, and content categories to detect and filter sensitive information in requests
-            and responses.
-          </p>
+          <p className="text-muted-foreground">{t("guardrails.contentFilter.configuration.intro")}</p>
         </div>
       )}
 
@@ -230,9 +232,9 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
         <Card>
           <CardHeader>
             <div className="flex flex-wrap items-center justify-between gap-2">
-              <CardTitle>Pattern Detection</CardTitle>
+              <CardTitle>{t("guardrails.contentFilter.configuration.patterns.title")}</CardTitle>
               <p className="text-sm font-normal text-muted-foreground">
-                Detect sensitive information using regex patterns (SSN, credit cards, API keys, etc.)
+                {t("guardrails.contentFilter.configuration.patterns.description")}
               </p>
             </div>
           </CardHeader>
@@ -240,11 +242,11 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
             <div className="mb-4 flex flex-wrap gap-2">
               <Button onClick={() => setPatternModalVisible(true)}>
                 <Plus />
-                Add prebuilt pattern
+                {t("guardrails.contentFilter.configuration.patterns.addPrebuilt")}
               </Button>
               <Button variant="outline" onClick={() => setCustomPatternModalVisible(true)}>
                 <Plus />
-                Add custom regex
+                {t("guardrails.contentFilter.configuration.patterns.addCustom")}
               </Button>
             </div>
             <PatternTable
@@ -260,9 +262,9 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
         <Card>
           <CardHeader>
             <div className="flex flex-wrap items-center justify-between gap-2">
-              <CardTitle>Blocked Keywords</CardTitle>
+              <CardTitle>{t("guardrails.contentFilter.configuration.keywords.title")}</CardTitle>
               <p className="text-sm font-normal text-muted-foreground">
-                Block or mask specific sensitive terms and phrases
+                {t("guardrails.contentFilter.configuration.keywords.description")}
               </p>
             </div>
           </CardHeader>
@@ -270,7 +272,7 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
             <div className="mb-4 flex flex-wrap gap-2">
               <Button onClick={() => setKeywordModalVisible(true)}>
                 <Plus />
-                Add keyword
+                {t("guardrails.contentFilter.configuration.keywords.addKeyword")}
               </Button>
               <input
                 ref={fileInputRef}
@@ -286,7 +288,7 @@ const ContentFilterConfiguration: React.FC<ContentFilterConfigurationProps> = ({
                 onClick={() => fileInputRef.current?.click()}
               >
                 {uploadValidating ? <UiLoadingSpinner className="size-4" /> : <Upload />}
-                Upload YAML file
+                {t("guardrails.contentFilter.configuration.keywords.uploadYaml")}
               </Button>
             </div>
             <KeywordTable keywords={blockedWords} onActionChange={onBlockedWordUpdate} onRemove={onBlockedWordRemove} />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterDisplay.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterDisplay.tsx
index d34f2920bb3..a35473c9d4e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterDisplay.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterDisplay.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Badge } from "@/components/ui/badge";
 import { Card, CardContent } from "@/components/ui/card";
 import PatternTable from "./PatternTable";
@@ -56,6 +57,8 @@ const ContentFilterDisplay: React.FC<ContentFilterDisplayProps> = ({
   onCategorySeverityChange,
   onCategoryRemove,
 }) => {
+  const { t } = useTranslation();
+
   if (patterns.length === 0 && blockedWords.length === 0 && categories.length === 0) {
     return null;
   }
@@ -69,8 +72,11 @@ const ContentFilterDisplay: React.FC<ContentFilterDisplayProps> = ({
         <Card className="mt-6">
           <CardContent>
             <div className="mb-4 flex items-center justify-between">
-              <p className="text-lg font-semibold">Content Categories</p>
-              <Badge variant="secondary">{categories.length} categories configured</Badge>
+              <p className="text-lg font-semibold">{t("guardrails.contentFilter.display.categoriesTitle")}</p>
+              <Badge variant="secondary">
+                {categories.length}{" "}
+                {t("guardrails.contentFilter.display.categoriesConfigured", { count: categories.length })}
+              </Badge>
             </div>
             <CategoryTable
               categories={categories}
@@ -87,8 +93,10 @@ const ContentFilterDisplay: React.FC<ContentFilterDisplayProps> = ({
         <Card className="mt-6">
           <CardContent>
             <div className="mb-4 flex items-center justify-between">
-              <p className="text-lg font-semibold">Pattern Detection</p>
-              <Badge variant="secondary">{patterns.length} patterns configured</Badge>
+              <p className="text-lg font-semibold">{t("guardrails.contentFilter.display.patternsTitle")}</p>
+              <Badge variant="secondary">
+                {patterns.length} {t("guardrails.contentFilter.display.patternsConfigured", { count: patterns.length })}
+              </Badge>
             </div>
             <PatternTable
               patterns={patterns}
@@ -103,8 +111,11 @@ const ContentFilterDisplay: React.FC<ContentFilterDisplayProps> = ({
         <Card className="mt-6">
           <CardContent>
             <div className="mb-4 flex items-center justify-between">
-              <p className="text-lg font-semibold">Blocked Keywords</p>
-              <Badge variant="secondary">{blockedWords.length} keywords configured</Badge>
+              <p className="text-lg font-semibold">{t("guardrails.contentFilter.display.keywordsTitle")}</p>
+              <Badge variant="secondary">
+                {blockedWords.length}{" "}
+                {t("guardrails.contentFilter.display.keywordsConfigured", { count: blockedWords.length })}
+              </Badge>
             </div>
             <KeywordTable
               keywords={blockedWords}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterManager.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterManager.tsx
index b6d4f4b1970..4acbc3ff4fa 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterManager.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/ContentFilterManager.tsx
@@ -1,5 +1,6 @@
 import { TriangleAlert } from "lucide-react";
 import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Alert, AlertDescription } from "@/components/shared/Alert";
 import { Separator } from "@/components/ui/separator";
 import ContentFilterConfiguration from "./ContentFilterConfiguration";
@@ -74,6 +75,7 @@ const ContentFilterManager: React.FC<ContentFilterManagerProps> = ({
   onDataChange,
   onUnsavedChanges,
 }) => {
+  const { t } = useTranslation();
   const [selectedPatterns, setSelectedPatterns] = useState<Pattern[]>([]);
   const [blockedWords, setBlockedWords] = useState<BlockedWord[]>([]);
   const [selectedContentCategories, setSelectedContentCategories] = useState<SelectedContentCategory[]>([]);
@@ -234,15 +236,13 @@ const ContentFilterManager: React.FC<ContentFilterManagerProps> = ({
   return (
     <>
       <div className="my-6 flex items-center gap-4">
-        <span className="shrink-0 font-medium">Content Filter Configuration</span>
+        <span className="shrink-0 font-medium">{t("guardrails.contentFilter.manager.heading")}</span>
         <Separator className="flex-1" />
       </div>
       {hasUnsavedChanges && (
         <Alert variant="warning" className="mb-4">
           <TriangleAlert />
-          <AlertDescription>
-            You have unsaved changes to patterns or keywords. Remember to click &quot;Save Changes&quot; at the bottom.
-          </AlertDescription>
+          <AlertDescription>{t("guardrails.contentFilter.manager.unsavedChanges")}</AlertDescription>
         </Alert>
       )}
       <div className="mb-6">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CustomPatternModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CustomPatternModal.tsx
index 68eb7e138ab..c2a95b1fffd 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CustomPatternModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/CustomPatternModal.tsx
@@ -1,9 +1,10 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { ACTION_ITEMS } from "./action_options";
+import { ACTION_ITEMS, translateOptions } from "./action_options";
 
 interface CustomPatternModalProps {
   visible: boolean;
@@ -28,50 +29,61 @@ const CustomPatternModal: React.FC<CustomPatternModalProps> = ({
   onAdd,
   onCancel,
 }) => {
+  const { t } = useTranslation();
+  const actionItems = translateOptions(ACTION_ITEMS, t);
   return (
     <Dialog open={visible} onOpenChange={(open) => !open && onCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
         <DialogHeader>
-          <DialogTitle>Add custom regex pattern</DialogTitle>
+          <DialogTitle>{t("guardrails.contentFilter.customPatternModal.title")}</DialogTitle>
         </DialogHeader>
 
         <div className="space-y-6">
           <div>
-            <p className="font-semibold">Pattern name</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.customPatternModal.nameLabel")}</p>
             <Input
               className="mt-2"
-              placeholder="e.g., internal_id, employee_code"
+              placeholder={t("guardrails.contentFilter.customPatternModal.namePlaceholder", {
+                example: "internal_id, employee_code",
+              })}
               value={patternName}
               onChange={(e) => onNameChange(e.target.value)}
             />
           </div>
 
           <div>
-            <p className="font-semibold">Regex pattern</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.customPatternModal.regexLabel")}</p>
             <Input
               className="mt-2"
-              placeholder="e.g., ID-[0-9]{6}"
+              placeholder={t("guardrails.contentFilter.customPatternModal.regexPlaceholder", {
+                example: "ID-[0-9]{6}",
+              })}
               value={patternRegex}
               onChange={(e) => onRegexChange(e.target.value)}
             />
-            <p className="text-xs text-muted-foreground">Enter a valid regular expression to match sensitive data</p>
+            <p className="text-xs text-muted-foreground">
+              {t("guardrails.contentFilter.customPatternModal.regexHelp")}
+            </p>
           </div>
 
           <div>
-            <p className="font-semibold">Action</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.customPatternModal.actionLabel")}</p>
             <p className="mt-1 mb-2 text-muted-foreground">
-              Choose what action the guardrail should take when this pattern is detected
+              {t("guardrails.contentFilter.customPatternModal.actionDescription")}
             </p>
             <Select
-              items={ACTION_ITEMS}
+              items={actionItems}
               value={patternAction}
               onValueChange={(value: string | null) => value && onActionChange(value as "BLOCK" | "MASK")}
             >
-              <SelectTrigger className="w-full" aria-label="Action">
+              <SelectTrigger
+                className="w-full"
+                aria-label={t("guardrails.contentFilter.customPatternModal.actionLabel")}
+              >
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {ACTION_ITEMS.map((item) => (
+                {actionItems.map((item) => (
                   <SelectItem key={item.value} value={item.value}>
                     {item.label}
                   </SelectItem>
@@ -83,9 +95,9 @@ const CustomPatternModal: React.FC<CustomPatternModalProps> = ({
 
         <DialogFooter>
           <Button variant="outline" onClick={onCancel}>
-            Cancel
+            {t("guardrails.contentFilter.customPatternModal.cancel")}
           </Button>
-          <Button onClick={onAdd}>Add</Button>
+          <Button onClick={onAdd}>{t("guardrails.contentFilter.customPatternModal.add")}</Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordModal.tsx
index bf1b49dabd0..64a60e63efc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordModal.tsx
@@ -1,10 +1,11 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
-import { ACTION_ITEMS } from "./action_options";
+import { ACTION_ITEMS, translateOptions } from "./action_options";
 
 interface KeywordModalProps {
   visible: boolean;
@@ -29,39 +30,41 @@ const KeywordModal: React.FC<KeywordModalProps> = ({
   onAdd,
   onCancel,
 }) => {
+  const { t } = useTranslation();
+  const actionItems = translateOptions(ACTION_ITEMS, t);
   return (
     <Dialog open={visible} onOpenChange={(open) => !open && onCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
         <DialogHeader>
-          <DialogTitle>Add blocked keyword</DialogTitle>
+          <DialogTitle>{t("guardrails.contentFilter.keywordModal.title")}</DialogTitle>
         </DialogHeader>
 
         <div className="space-y-6">
           <div>
-            <p className="font-semibold">Keyword</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.keywordModal.keywordLabel")}</p>
             <Input
               className="mt-2"
-              placeholder="Enter sensitive keyword or phrase"
+              placeholder={t("guardrails.contentFilter.keywordModal.keywordPlaceholder")}
               value={keyword}
               onChange={(e) => onKeywordChange(e.target.value)}
             />
           </div>
 
           <div>
-            <p className="font-semibold">Action</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.keywordModal.actionLabel")}</p>
             <p className="mt-1 mb-2 text-muted-foreground">
-              Choose what action the guardrail should take when this keyword is detected
+              {t("guardrails.contentFilter.keywordModal.actionDescription")}
             </p>
             <Select
-              items={ACTION_ITEMS}
+              items={actionItems}
               value={action}
               onValueChange={(value: string | null) => value && onActionChange(value as "BLOCK" | "MASK")}
             >
-              <SelectTrigger className="w-full" aria-label="Action">
+              <SelectTrigger className="w-full" aria-label={t("guardrails.contentFilter.keywordModal.actionLabel")}>
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {ACTION_ITEMS.map((item) => (
+                {actionItems.map((item) => (
                   <SelectItem key={item.value} value={item.value}>
                     {item.label}
                   </SelectItem>
@@ -71,10 +74,10 @@ const KeywordModal: React.FC<KeywordModalProps> = ({
           </div>
 
           <div>
-            <p className="font-semibold">Description (optional)</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.keywordModal.descriptionLabel")}</p>
             <Textarea
               className="mt-2 field-sizing-fixed"
-              placeholder="Explain why this keyword is sensitive"
+              placeholder={t("guardrails.contentFilter.keywordModal.descriptionPlaceholder")}
               value={description}
               onChange={(e) => onDescriptionChange(e.target.value)}
               rows={3}
@@ -84,9 +87,9 @@ const KeywordModal: React.FC<KeywordModalProps> = ({
 
         <DialogFooter>
           <Button variant="outline" onClick={onCancel}>
-            Cancel
+            {t("guardrails.contentFilter.keywordModal.cancel")}
           </Button>
-          <Button onClick={onAdd}>Add</Button>
+          <Button onClick={onAdd}>{t("guardrails.contentFilter.keywordModal.add")}</Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordTable.tsx
index 5b69b04955f..fad3480cc1a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/KeywordTable.tsx
@@ -1,10 +1,11 @@
 import { Trash2 } from "lucide-react";
 import type { ColumnDef } from "@tanstack/react-table";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { DataTable } from "@/components/shared/DataTable";
 import { Button } from "@/components/ui/button";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { ACTION_ITEMS } from "./action_options";
+import { ACTION_ITEMS, translateOptions } from "./action_options";
 
 interface BlockedWord {
   id: string;
@@ -20,26 +21,32 @@ interface KeywordTableProps {
 }
 
 const KeywordTable: React.FC<KeywordTableProps> = ({ keywords, onActionChange, onRemove }) => {
+  const { t } = useTranslation();
+  const actionItems = translateOptions(ACTION_ITEMS, t);
   const columns: ColumnDef<BlockedWord>[] = [
     {
-      header: "Keyword",
+      header: t("guardrails.contentFilter.keywordTable.columns.keyword"),
       accessorKey: "keyword",
     },
     {
-      header: "Action",
+      header: t("guardrails.contentFilter.keywordTable.columns.action"),
       accessorKey: "action",
       size: 150,
       cell: ({ row }) => (
         <Select
-          items={ACTION_ITEMS}
+          items={actionItems}
           value={row.original.action}
           onValueChange={(value: string | null) => value && onActionChange(row.original.id, "action", value)}
         >
-          <SelectTrigger size="sm" className="w-[120px]" aria-label="Action">
+          <SelectTrigger
+            size="sm"
+            className="w-[120px]"
+            aria-label={t("guardrails.contentFilter.keywordTable.columns.action")}
+          >
             <SelectValue />
           </SelectTrigger>
           <SelectContent>
-            {ACTION_ITEMS.map((item) => (
+            {actionItems.map((item) => (
               <SelectItem key={item.value} value={item.value}>
                 {item.label}
               </SelectItem>
@@ -49,7 +56,7 @@ const KeywordTable: React.FC<KeywordTableProps> = ({ keywords, onActionChange, o
       ),
     },
     {
-      header: "Description",
+      header: t("guardrails.contentFilter.keywordTable.columns.description"),
       accessorKey: "description",
       cell: ({ row }) => row.original.description || "-",
     },
@@ -60,14 +67,16 @@ const KeywordTable: React.FC<KeywordTableProps> = ({ keywords, onActionChange, o
       cell: ({ row }) => (
         <Button variant="ghost" size="sm" onClick={() => onRemove(row.original.id)}>
           <Trash2 />
-          Delete
+          {t("guardrails.contentFilter.keywordTable.delete")}
         </Button>
       ),
     },
   ];
 
   if (keywords.length === 0) {
-    return <div className="py-10 text-center text-muted-foreground">No keywords added.</div>;
+    return (
+      <div className="py-10 text-center text-muted-foreground">{t("guardrails.contentFilter.keywordTable.empty")}</div>
+    );
   }
 
   return <DataTable data={keywords} columns={columns} getRowId={(row) => row.id} size="compact" />;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternModal.tsx
index aeeadedfbf1..d4d4b3acd60 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternModal.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import {
   Combobox,
@@ -13,7 +14,7 @@ import {
 } from "@/components/ui/combobox";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { ACTION_ITEMS } from "./action_options";
+import { ACTION_ITEMS, translateOptions } from "./action_options";
 
 interface PrebuiltPattern {
   name: string;
@@ -55,6 +56,8 @@ const PatternModal: React.FC<PatternModalProps> = ({
   onAdd,
   onCancel,
 }) => {
+  const { t } = useTranslation();
+  const actionItems = translateOptions(ACTION_ITEMS, t);
   const selectedPattern = prebuiltPatterns.find((pattern) => pattern.name === selectedPatternName) ?? null;
   const patternGroups = categories
     .map((category) => ({
@@ -67,12 +70,12 @@ const PatternModal: React.FC<PatternModalProps> = ({
     <Dialog open={visible} onOpenChange={(open) => !open && onCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
         <DialogHeader>
-          <DialogTitle>Add prebuilt pattern</DialogTitle>
+          <DialogTitle>{t("guardrails.contentFilter.patternModal.title")}</DialogTitle>
         </DialogHeader>
 
         <div className="space-y-6">
           <div>
-            <p className="font-semibold">Pattern type</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.patternModal.patternTypeLabel")}</p>
             <Combobox
               items={patternGroups}
               value={selectedPattern}
@@ -80,9 +83,12 @@ const PatternModal: React.FC<PatternModalProps> = ({
               itemToStringLabel={(pattern: PrebuiltPattern) => pattern.display_name}
               filter={matchesPatternQuery}
             >
-              <ComboboxInput className="mt-2 w-full" placeholder="Choose pattern type" />
+              <ComboboxInput
+                className="mt-2 w-full"
+                placeholder={t("guardrails.contentFilter.patternModal.patternTypePlaceholder")}
+              />
               <ComboboxContent>
-                <ComboboxEmpty>No matching patterns</ComboboxEmpty>
+                <ComboboxEmpty>{t("guardrails.contentFilter.patternModal.noMatches")}</ComboboxEmpty>
                 <ComboboxList>
                   {(group: PatternGroup) => (
                     <ComboboxGroup key={group.category} items={group.items}>
@@ -102,20 +108,20 @@ const PatternModal: React.FC<PatternModalProps> = ({
           </div>
 
           <div>
-            <p className="font-semibold">Action</p>
+            <p className="font-semibold">{t("guardrails.contentFilter.patternModal.actionLabel")}</p>
             <p className="mt-1 mb-2 text-muted-foreground">
-              Choose what action the guardrail should take when this pattern is detected
+              {t("guardrails.contentFilter.patternModal.actionDescription")}
             </p>
             <Select
-              items={ACTION_ITEMS}
+              items={actionItems}
               value={patternAction}
               onValueChange={(value: string | null) => value && onActionChange(value as "BLOCK" | "MASK")}
             >
-              <SelectTrigger className="w-full" aria-label="Action">
+              <SelectTrigger className="w-full" aria-label={t("guardrails.contentFilter.patternModal.actionLabel")}>
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {ACTION_ITEMS.map((item) => (
+                {actionItems.map((item) => (
                   <SelectItem key={item.value} value={item.value}>
                     {item.label}
                   </SelectItem>
@@ -127,9 +133,9 @@ const PatternModal: React.FC<PatternModalProps> = ({
 
         <DialogFooter>
           <Button variant="outline" onClick={onCancel}>
-            Cancel
+            {t("guardrails.contentFilter.patternModal.cancel")}
           </Button>
-          <Button onClick={onAdd}>Add</Button>
+          <Button onClick={onAdd}>{t("guardrails.contentFilter.patternModal.add")}</Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternTable.tsx
index f4e87119d7b..b242fec997b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/PatternTable.tsx
@@ -1,11 +1,12 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Trash2 } from "lucide-react";
 import type { ColumnDef } from "@tanstack/react-table";
 import { DataTable } from "@/components/shared/DataTable";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { ACTION_ITEMS } from "./action_options";
+import { ACTION_ITEMS, translateOptions } from "./action_options";
 
 interface Pattern {
   id: string;
@@ -23,20 +24,28 @@ interface PatternTableProps {
 }
 
 const PatternTable: React.FC<PatternTableProps> = ({ patterns, onActionChange, onRemove }) => {
+  const { t } = useTranslation();
+  const actionItems = translateOptions(ACTION_ITEMS, t);
   const columns: ColumnDef<Pattern>[] = [
     {
-      header: "Type",
+      header: t("guardrails.contentFilter.patternTable.columns.type"),
       accessorKey: "type",
       size: 100,
-      cell: ({ row }) => <Badge variant="secondary">{row.original.type === "prebuilt" ? "Prebuilt" : "Custom"}</Badge>,
+      cell: ({ row }) => (
+        <Badge variant="secondary">
+          {row.original.type === "prebuilt"
+            ? t("guardrails.contentFilter.patternTable.types.prebuilt")
+            : t("guardrails.contentFilter.patternTable.types.custom")}
+        </Badge>
+      ),
     },
     {
-      header: "Pattern name",
+      header: t("guardrails.contentFilter.patternTable.columns.name"),
       accessorKey: "name",
       cell: ({ row }) => row.original.display_name || row.original.name,
     },
     {
-      header: "Regex pattern",
+      header: t("guardrails.contentFilter.patternTable.columns.regex"),
       accessorKey: "pattern",
       cell: ({ row }) =>
         row.original.pattern ? (
@@ -46,20 +55,24 @@ const PatternTable: React.FC<PatternTableProps> = ({ patterns, onActionChange, o
         ),
     },
     {
-      header: "Action",
+      header: t("guardrails.contentFilter.patternTable.columns.action"),
       accessorKey: "action",
       size: 150,
       cell: ({ row }) => (
         <Select
-          items={ACTION_ITEMS}
+          items={actionItems}
           value={row.original.action}
           onValueChange={(value: string | null) => value && onActionChange(row.original.id, value as "BLOCK" | "MASK")}
         >
-          <SelectTrigger size="sm" className="w-[120px]" aria-label="Action">
+          <SelectTrigger
+            size="sm"
+            className="w-[120px]"
+            aria-label={t("guardrails.contentFilter.patternTable.columns.action")}
+          >
             <SelectValue />
           </SelectTrigger>
           <SelectContent>
-            {ACTION_ITEMS.map((item) => (
+            {actionItems.map((item) => (
               <SelectItem key={item.value} value={item.value}>
                 {item.label}
               </SelectItem>
@@ -75,14 +88,16 @@ const PatternTable: React.FC<PatternTableProps> = ({ patterns, onActionChange, o
       cell: ({ row }) => (
         <Button variant="ghost" size="sm" onClick={() => onRemove(row.original.id)}>
           <Trash2 />
-          Delete
+          {t("guardrails.contentFilter.patternTable.delete")}
         </Button>
       ),
     },
   ];
 
   if (patterns.length === 0) {
-    return <div className="py-10 text-center text-muted-foreground">No patterns added.</div>;
+    return (
+      <div className="py-10 text-center text-muted-foreground">{t("guardrails.contentFilter.patternTable.empty")}</div>
+    );
   }
 
   return <DataTable data={patterns} columns={columns} getRowId={(row) => row.id} size="compact" />;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/action_options.ts b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/action_options.ts
index d959da32756..d9c32c816cc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/action_options.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/content_filter/action_options.ts
@@ -1,10 +1,20 @@
-export const ACTION_ITEMS = [
-  { value: "BLOCK", label: "Block" },
-  { value: "MASK", label: "Mask" },
-] as const;
+import type { ParseKeys, TFunction } from "i18next";
 
-export const SEVERITY_ITEMS = [
-  { value: "high", label: "High" },
-  { value: "medium", label: "Medium" },
-  { value: "low", label: "Low" },
-] as const;
+interface OptionItem<V extends string> {
+  value: V;
+  labelKey: ParseKeys;
+}
+
+export const ACTION_ITEMS: readonly OptionItem<"BLOCK" | "MASK">[] = [
+  { value: "BLOCK", labelKey: "guardrails.contentFilter.options.action.block" },
+  { value: "MASK", labelKey: "guardrails.contentFilter.options.action.mask" },
+];
+
+export const SEVERITY_ITEMS: readonly OptionItem<"high" | "medium" | "low">[] = [
+  { value: "high", labelKey: "guardrails.contentFilter.options.severity.high" },
+  { value: "medium", labelKey: "guardrails.contentFilter.options.severity.medium" },
+  { value: "low", labelKey: "guardrails.contentFilter.options.severity.low" },
+];
+
+export const translateOptions = <V extends string>(items: readonly OptionItem<V>[], t: TFunction) =>
+  items.map(({ value, labelKey }) => ({ value, label: t(labelKey) }));
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeLoggingOnlyScope.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeLoggingOnlyScope.tsx
index c2b0a472f1f..0b7448526f3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeLoggingOnlyScope.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeLoggingOnlyScope.tsx
@@ -1,4 +1,5 @@
-import React from "react";
+import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import {
   choiceToLoggingOnlyScope,
   effectiveLoggingOnlyContinue,
@@ -9,8 +10,9 @@ import {
 } from "../guardrail_info_helpers";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 
-const LOGGING_ONLY_SCOPE_ITEMS = getLoggingOnlyScopeOptions(true);
-const LOGGING_ONLY_SCOPE_CHOICES: ReadonlySet<string> = new Set(LOGGING_ONLY_SCOPE_ITEMS.map(({ value }) => value));
+const LOGGING_ONLY_SCOPE_CHOICES: ReadonlySet<string> = new Set(
+  getLoggingOnlyScopeOptions(true).map(({ value }) => value),
+);
 
 const isLoggingOnlyScopeChoice = (value: unknown): value is LoggingOnlyScopeChoice =>
   typeof value === "string" && LOGGING_ONLY_SCOPE_CHOICES.has(value);
@@ -18,29 +20,35 @@ const isLoggingOnlyScopeChoice = (value: unknown): value is LoggingOnlyScopeChoi
 export const CustomCodeLoggingOnlyScopeSelect: React.FC<{
   value: LoggingOnlyScopeChoice;
   onChange: (choice: LoggingOnlyScopeChoice) => void;
-}> = ({ value, onChange }) => (
-  <div className="w-[240px]">
-    <label className="mb-1 block text-xs font-medium text-muted-foreground">Logging only scope</label>
-    <Select
-      items={LOGGING_ONLY_SCOPE_ITEMS}
-      value={value}
-      onValueChange={(nextValue) => {
-        if (isLoggingOnlyScopeChoice(nextValue)) onChange(nextValue);
-      }}
-    >
-      <SelectTrigger className="w-full" aria-label="Logging only scope">
-        <SelectValue />
-      </SelectTrigger>
-      <SelectContent>
-        {LOGGING_ONLY_SCOPE_ITEMS.map((option) => (
-          <SelectItem key={option.value} value={option.value}>
-            {option.label}
-          </SelectItem>
-        ))}
-      </SelectContent>
-    </Select>
-  </div>
-);
+}> = ({ value, onChange }) => {
+  const { t } = useTranslation();
+  const items = useMemo(() => getLoggingOnlyScopeOptions(true, t), [t]);
+  return (
+    <div className="w-[240px]">
+      <label className="mb-1 block text-xs font-medium text-muted-foreground">
+        {t("guardrails.customCode.loggingOnlyScope.label")}
+      </label>
+      <Select
+        items={items}
+        value={value}
+        onValueChange={(nextValue) => {
+          if (isLoggingOnlyScopeChoice(nextValue)) onChange(nextValue);
+        }}
+      >
+        <SelectTrigger className="w-full" aria-label={t("guardrails.customCode.loggingOnlyScope.label")}>
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          {items.map((option) => (
+            <SelectItem key={option.value} value={option.value}>
+              {option.label}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    </div>
+  );
+};
 
 export const getCustomCodeLoggingOnlyScopeCreate = (
   mode: string[],
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeModal.tsx
index aed9b531299..e0a8d554bb4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/CustomCodeModal.tsx
@@ -1,4 +1,5 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { CheckCircle2, ChevronRight, Code, ExternalLink, PlayCircle, Save, Users, XCircle } from "lucide-react";
 import { createGuardrailCall, updateGuardrailCall, testCustomCodeGuardrail } from "@/components/networking";
 import { toast } from "@/lib/toast";
@@ -47,9 +48,9 @@ import {
 } from "../guardrail_info_helpers";
 import {
   CODE_TEMPLATES,
-  MODE_OPTION_BY_VALUE,
+  DEFAULT_OPEN_PRIMITIVE_CATEGORY,
   MODE_OPTIONS,
-  PRIMITIVES,
+  PRIMITIVE_CATEGORIES,
   TEMPLATE_ITEMS,
   type ModeOption,
 } from "./custom_code_catalog";
@@ -78,6 +79,7 @@ interface CustomCodeModalProps {
 }
 
 const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onSuccess, accessToken, editData }) => {
+  const { t } = useTranslation();
   const anchor = useComboboxAnchor();
   const isEditMode = !!editData;
   const [guardrailName, setGuardrailName] = useState("");
@@ -268,15 +270,15 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
   // Save guardrail (create or update)
   const handleSave = async () => {
     if (!guardrailName.trim()) {
-      toast.fromError("Please enter a guardrail name");
+      toast.fromError(t("guardrails.customCode.toast.nameRequired"));
       return;
     }
     if (!code.trim()) {
-      toast.fromError("Please enter custom code");
+      toast.fromError(t("guardrails.customCode.toast.codeRequired"));
       return;
     }
     if (!accessToken) {
-      toast.fromError("No access token available");
+      toast.fromError(t("guardrails.customCode.toast.noAccessToken"));
       return;
     }
 
@@ -319,7 +321,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
         }
 
         await updateGuardrailCall(accessToken, editData.guardrail_id, updateData);
-        toast.success("Custom code guardrail updated successfully");
+        toast.success(t("guardrails.customCode.toast.updated"));
       } else {
         // Create new guardrail
         const streamScope = streamScopePayload(mode, streamScopeByMode);
@@ -337,15 +339,16 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
         };
 
         await createGuardrailCall(accessToken, guardrailData);
-        toast.success("Custom code guardrail created successfully");
+        toast.success(t("guardrails.customCode.toast.created"));
       }
       onSuccess();
       onClose();
     } catch (error) {
       console.error("Failed to save guardrail:", error);
       toast.fromError(
-        `Failed to ${isEditMode ? "update" : "create"} guardrail: ` +
-          (error instanceof Error ? error.message : String(error)),
+        t(isEditMode ? "guardrails.customCode.toast.updateFailed" : "guardrails.customCode.toast.createFailed", {
+          error: error instanceof Error ? error.message : String(error),
+        }),
       );
     } finally {
       setIsSaving(false);
@@ -355,7 +358,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
   // Test guardrail using backend endpoint
   const handleTest = async () => {
     if (!accessToken) {
-      setTestResult({ error: "No access token available" });
+      setTestResult({ error: t("guardrails.customCode.test.errors.noAccessToken") });
       return;
     }
 
@@ -368,7 +371,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
       try {
         parsedInput = JSON.parse(testInput);
       } catch (e) {
-        setTestResult({ error: "Invalid test input JSON" });
+        setTestResult({ error: t("guardrails.customCode.test.errors.invalidInput") });
         setIsTesting(false);
         return;
       }
@@ -405,12 +408,12 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
           error_type: response.error_type,
         });
       } else {
-        setTestResult({ error: "Unknown error occurred" });
+        setTestResult({ error: t("guardrails.customCode.test.errors.unknown") });
       }
     } catch (error) {
       console.error("Failed to test custom code:", error);
       setTestResult({
-        error: error instanceof Error ? error.message : "Failed to test custom code",
+        error: error instanceof Error ? error.message : t("guardrails.customCode.test.errors.failed"),
       });
     } finally {
       setIsTesting(false);
@@ -418,7 +421,19 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
   };
 
   const lineCount = code.split("\n").length;
-  const selectedModeOptions = mode.map((value) => MODE_OPTION_BY_VALUE[value]).filter(Boolean);
+  const modeOptions: ModeOption[] = useMemo(
+    () => MODE_OPTIONS.map(({ value, labelKey }) => ({ value, label: t(labelKey) })),
+    [t],
+  );
+  const modeOptionByValue: Record<string, ModeOption> = useMemo(
+    () => Object.fromEntries(modeOptions.map((option) => [option.value, option])),
+    [modeOptions],
+  );
+  const templateItems = useMemo(
+    () => TEMPLATE_ITEMS.map(({ value, labelKey }) => ({ value, label: t(labelKey) })),
+    [t],
+  );
+  const selectedModeOptions = mode.map((value) => modeOptionByValue[value]).filter(Boolean);
   const rawEditMode = editData?.litellm_params?.mode;
   const tagScopedModeLabel =
     rawEditMode !== null && typeof rawEditMode === "object" && !Array.isArray(rawEditMode)
@@ -430,30 +445,38 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[1400px]">
         <DialogHeader>
           <DialogTitle className="text-xl font-semibold">
-            {isEditMode ? "Edit Custom Guardrail" : "Create Custom Guardrail"}
+            {isEditMode ? t("guardrails.customCode.title.edit") : t("guardrails.customCode.title.create")}
           </DialogTitle>
-          <DialogDescription>Define custom logic using Python-like syntax</DialogDescription>
+          <DialogDescription>{t("guardrails.customCode.description")}</DialogDescription>
         </DialogHeader>
 
         {/* Top Controls */}
         <div className="flex flex-wrap items-center gap-4 border-b border-border py-4">
           <div className="min-w-[160px] max-w-[200px] flex-1">
-            <label className="mb-1 block text-xs font-medium text-muted-foreground">Guardrail Name</label>
+            <label className="mb-1 block text-xs font-medium text-muted-foreground">
+              {t("guardrails.customCode.nameLabel")}
+            </label>
             <Input
               value={guardrailName}
               onChange={(e) => setGuardrailName(e.target.value)}
-              placeholder="e.g., block-pii-custom"
+              placeholder={t("guardrails.customCode.namePlaceholder")}
             />
           </div>
           <div className="w-[280px]">
             <label className="mb-1 block text-xs font-medium text-muted-foreground">
-              {tagScopedModeLabel ? "Mode (tag-scoped, read-only)" : "Mode (can select multiple)"}
+              {tagScopedModeLabel
+                ? t("guardrails.customCode.modeLabel.tagScoped")
+                : t("guardrails.customCode.modeLabel.multiple")}
             </label>
             {tagScopedModeLabel ? (
-              <Input value={tagScopedModeLabel} disabled aria-label="Mode (tag-scoped)" />
+              <Input
+                value={tagScopedModeLabel}
+                disabled
+                aria-label={t("guardrails.customCode.tagScopedModeAriaLabel")}
+              />
             ) : (
               <Combobox
-                items={MODE_OPTIONS}
+                items={modeOptions}
                 value={selectedModeOptions}
                 onValueChange={(options: ModeOption[]) => setMode(options.map((option) => option.value))}
                 multiple
@@ -464,10 +487,12 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                       {option.label}
                     </ComboboxChip>
                   ))}
-                  <ComboboxChipsInput placeholder={mode.length === 0 ? "Select modes" : undefined} />
+                  <ComboboxChipsInput
+                    placeholder={mode.length === 0 ? t("guardrails.customCode.modePlaceholder") : undefined}
+                  />
                 </ComboboxChips>
                 <ComboboxContent anchor={anchor}>
-                  <ComboboxEmpty>No matching modes</ComboboxEmpty>
+                  <ComboboxEmpty>{t("guardrails.customCode.noMatchingModes")}</ComboboxEmpty>
                   <ComboboxList>
                     {(option: ModeOption) => (
                       <ComboboxItem key={option.value} value={option}>
@@ -484,31 +509,31 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
           )}
           {mode.includes("logging_only") && (
             <div className="flex shrink-0 items-center gap-2 pt-5">
-              <span className="text-sm text-muted-foreground">
-                Continue observing the response after a flagged request
-              </span>
+              <span className="text-sm text-muted-foreground">{t("guardrails.customCode.continueObserving")}</span>
               <Switch
                 checked={loggingOnlyScopeChoice === "default" && loggingOnlyContinue}
                 disabled={loggingOnlyScopeChoice !== "default"}
                 onCheckedChange={setLoggingOnlyContinue}
-                aria-label="Continue observing the response after a flagged request"
+                aria-label={t("guardrails.customCode.continueObserving")}
               />
             </div>
           )}
           <div className="w-[180px]">
-            <label className="mb-1 block text-xs font-medium text-muted-foreground">Template</label>
+            <label className="mb-1 block text-xs font-medium text-muted-foreground">
+              {t("guardrails.customCode.templateLabel")}
+            </label>
             <Select
-              items={TEMPLATE_ITEMS}
+              items={templateItems}
               value={selectedTemplate}
               onValueChange={(value: string | null) => value && handleTemplateChange(value)}
             >
-              <SelectTrigger className="w-full" aria-label="Template">
+              <SelectTrigger className="w-full" aria-label={t("guardrails.customCode.templateLabel")}>
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
                 <SelectGroup>
-                  <SelectLabel>STANDARD</SelectLabel>
-                  {TEMPLATE_ITEMS.map((template) => (
+                  <SelectLabel>{t("guardrails.customCode.standardTemplates")}</SelectLabel>
+                  {templateItems.map((template) => (
                     <SelectItem key={template.value} value={template.value}>
                       {template.label}
                     </SelectItem>
@@ -521,15 +546,19 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                   className="flex w-full items-center gap-1 rounded-sm px-2 py-1.5 text-xs text-primary hover:bg-accent"
                 >
                   <Users className="size-3.5" />
-                  <span>Browse Community templates</span>
+                  <span>{t("guardrails.customCode.browseCommunity")}</span>
                   <ExternalLink className="size-2.5" />
                 </button>
               </SelectContent>
             </Select>
           </div>
           <div className="flex items-center gap-2 pt-5">
-            <span className="text-sm text-muted-foreground">Default On</span>
-            <Switch checked={defaultOn} onCheckedChange={setDefaultOn} aria-label="Default On" />
+            <span className="text-sm text-muted-foreground">{t("guardrails.customCode.defaultOn")}</span>
+            <Switch
+              checked={defaultOn}
+              onCheckedChange={setDefaultOn}
+              aria-label={t("guardrails.customCode.defaultOn")}
+            />
           </div>
         </div>
         {mode.length > 0 && (
@@ -543,8 +572,10 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
           {/* Code Editor */}
           <div className="flex min-w-0 flex-1 flex-col">
             <div className="mb-2 flex shrink-0 items-center justify-between">
-              <span className="text-xs font-semibold tracking-wide text-muted-foreground uppercase">Python Logic</span>
-              <span className="text-xs text-muted-foreground">Restricted environment (no imports)</span>
+              <span className="text-xs font-semibold tracking-wide text-muted-foreground uppercase">
+                {t("guardrails.customCode.pythonLogic")}
+              </span>
+              <span className="text-xs text-muted-foreground">{t("guardrails.customCode.restrictedEnvironment")}</span>
             </div>
             <div
               className="relative rounded-lg overflow-hidden border border-gray-700 bg-[#1e1e1e] shrink-0"
@@ -591,59 +622,87 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
               <CollapsibleTrigger className="flex w-full items-center gap-2 p-3 text-sm font-medium">
                 <ChevronRight className={`size-4 transition-transform ${testExpanded ? "rotate-90" : ""}`} />
                 <PlayCircle className="size-4 text-muted-foreground" />
-                Test Your Guardrail
+                {t("guardrails.customCode.test.title")}
               </CollapsibleTrigger>
               <CollapsibleContent className="p-3 pt-0">
                 <div className="space-y-3">
                   <div>
                     <div className="flex items-center justify-between mb-2">
-                      <label className="block text-xs font-medium text-muted-foreground">Test Input (JSON)</label>
+                      <label className="block text-xs font-medium text-muted-foreground">
+                        {t("guardrails.customCode.test.inputLabel")}
+                      </label>
                       <div className="flex items-center gap-2">
-                        <span className="text-xs text-muted-foreground">Load example:</span>
+                        <span className="text-xs text-muted-foreground">
+                          {t("guardrails.customCode.test.loadExample")}
+                        </span>
                         <button
                           type="button"
                           onClick={() => setTestInput(JSON.stringify(TEST_INPUT_EXAMPLES.pre_call.data, null, 2))}
                           className="px-2 py-1 text-xs rounded-sm border border-warning/20 bg-warning/10 text-warning hover:bg-warning/15 transition-colors"
                         >
-                          Pre-call
+                          {t("guardrails.customCode.test.examples.preCall")}
                         </button>
                         <button
                           type="button"
                           onClick={() => setTestInput(JSON.stringify(TEST_INPUT_EXAMPLES.pre_mcp_call.data, null, 2))}
                           className="px-2 py-1 text-xs rounded-sm border border-purple-200 bg-purple-50 text-purple-700 hover:bg-purple-100 transition-colors dark:border-purple-800 dark:bg-purple-950 dark:text-purple-300 dark:hover:bg-purple-900"
                         >
-                          Pre MCP
+                          {t("guardrails.customCode.test.examples.preMcp")}
                         </button>
                         <button
                           type="button"
                           onClick={() => setTestInput(JSON.stringify(TEST_INPUT_EXAMPLES.post_call.data, null, 2))}
                           className="px-2 py-1 text-xs rounded-sm border border-success/20 bg-success/10 text-success hover:bg-success/15 transition-colors"
                         >
-                          Post-call
+                          {t("guardrails.customCode.test.examples.postCall")}
                         </button>
                       </div>
                     </div>
                     <div className="mb-2 rounded-sm border border-border bg-muted/40 p-2 text-xs text-muted-foreground">
                       <div className="grid grid-cols-2 gap-x-4 gap-y-1">
                         <div>
-                          <strong>texts</strong>: Message content (always)
+                          <Trans
+                            i18nKey="guardrails.customCode.test.fields.texts"
+                            components={{ field: <strong>texts</strong> }}
+                          />
                         </div>
                         <div>
-                          <strong>images</strong>: Base64 images (vision)
+                          <Trans
+                            i18nKey="guardrails.customCode.test.fields.images"
+                            components={{ field: <strong>images</strong> }}
+                          />
                         </div>
                         <div>
-                          <strong>tools</strong>: Tool definitions <span className="text-warning">(pre_call)</span>, MCP
-                          as OpenAI tool <span className="text-purple-600">(pre_mcp_call)</span>
+                          <Trans
+                            i18nKey="guardrails.customCode.test.fields.tools"
+                            components={{
+                              field: <strong>tools</strong>,
+                              preCall: <span className="text-warning">(pre_call)</span>,
+                              preMcpCall: <span className="text-purple-600">(pre_mcp_call)</span>,
+                            }}
+                          />
                         </div>
                         <div>
-                          <strong>tool_calls</strong>: LLM tool calls <span className="text-success">(post_call)</span>
+                          <Trans
+                            i18nKey="guardrails.customCode.test.fields.toolCalls"
+                            components={{
+                              field: <strong>tool_calls</strong>,
+                              postCall: <span className="text-success">(post_call)</span>,
+                            }}
+                          />
                         </div>
                         <div>
-                          <strong>structured_messages</strong>: Full messages{" "}
+                          <Trans
+                            i18nKey="guardrails.customCode.test.fields.structuredMessages"
+                            components={{ field: <strong>structured_messages</strong> }}
+                          />{" "}
                           <span className="text-warning">(pre_call)</span>
                         </div>
                         <div>
-                          <strong>model</strong>: Model name (always)
+                          <Trans
+                            i18nKey="guardrails.customCode.test.fields.model"
+                            components={{ field: <strong>model</strong> }}
+                          />
                         </div>
                       </div>
                     </div>
@@ -658,7 +717,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                   <div className="flex items-center gap-3">
                     <Button size="sm" onClick={handleTest} disabled={isTesting} aria-busy={isTesting}>
                       {isTesting ? <UiLoadingSpinner className="size-4" /> : <PlayCircle />}
-                      {isTesting ? "Running..." : "Run Test"}
+                      {isTesting ? t("guardrails.customCode.test.running") : t("guardrails.customCode.test.run")}
                     </Button>
                     {testResult && (
                       <div
@@ -682,15 +741,19 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                           </>
                         ) : testResult.action === "allow" ? (
                           <>
-                            <CheckCircle2 className="size-4" /> Allowed
+                            <CheckCircle2 className="size-4" />
+                            {` ${t("guardrails.customCode.test.result.allowed")}`}
                           </>
                         ) : testResult.action === "block" ? (
                           <>
-                            <XCircle className="size-4" /> Blocked: {testResult.reason}
+                            <XCircle className="size-4" />
+                            {` ${t("guardrails.customCode.test.result.blocked")} `}
+                            {testResult.reason}
                           </>
                         ) : testResult.action === "modify" ? (
                           <>
-                            <CheckCircle2 className="size-4" /> Modified
+                            <CheckCircle2 className="size-4" />
+                            {` ${t("guardrails.customCode.test.result.modified")}`}
                             {testResult.texts && testResult.texts.length > 0 && (
                               <span className="ml-1 text-xs text-muted-foreground">
                                 -&gt; {testResult.texts[0].substring(0, 50)}
@@ -700,7 +763,8 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                           </>
                         ) : (
                           <>
-                            <CheckCircle2 className="size-4" /> {testResult.action || "Unknown"}
+                            <CheckCircle2 className="size-4" />{" "}
+                            {testResult.action || t("guardrails.customCode.test.result.unknownAction")}
                           </>
                         )}
                       </div>
@@ -716,15 +780,15 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                   <Users className="size-5 text-info" />
                 </div>
                 <div>
-                  <div className="text-sm font-medium">Built a useful guardrail?</div>
+                  <div className="text-sm font-medium">{t("guardrails.customCode.contribute.title")}</div>
                   <div className="text-xs text-muted-foreground">
-                    Share it with the community and help others build faster
+                    {t("guardrails.customCode.contribute.description")}
                   </div>
                 </div>
               </div>
               <Button size="sm" onClick={() => window.open("https://github.com/BerriAI/litellm-guardrails", "_blank")}>
                 <ExternalLink />
-                Contribute Template
+                {t("guardrails.customCode.contribute.button")}
               </Button>
             </div>
           </div>
@@ -733,19 +797,19 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
           <div className="w-[300px] shrink-0 overflow-auto border-l border-border pl-6">
             <div className="mb-3 flex items-center gap-2">
               <Code className="size-4 text-muted-foreground" />
-              <span className="font-semibold">Available Primitives</span>
+              <span className="font-semibold">{t("guardrails.customCode.primitives.title")}</span>
             </div>
-            <p className="mb-3 text-xs text-muted-foreground">Click to copy functions to clipboard</p>
+            <p className="mb-3 text-xs text-muted-foreground">{t("guardrails.customCode.primitives.hint")}</p>
 
             <div className="space-y-2">
-              {Object.entries(PRIMITIVES).map(([category, primitives]) => (
+              {PRIMITIVE_CATEGORIES.map(({ id, labelKey, primitives }) => (
                 <Collapsible
-                  key={category}
-                  defaultOpen={category === "Return Values"}
+                  key={id}
+                  defaultOpen={id === DEFAULT_OPEN_PRIMITIVE_CATEGORY}
                   className="rounded-lg border border-border"
                 >
                   <CollapsibleTrigger className="group flex w-full items-center justify-between px-3 py-2 text-sm font-medium">
-                    {category}
+                    {t(labelKey)}
                     <ChevronRight className="size-4 transition-transform group-data-panel-open:rotate-90" />
                   </CollapsibleTrigger>
                   <CollapsibleContent className="px-3 pb-3">
@@ -760,12 +824,13 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                         >
                           {copiedPrimitive === p.name ? (
                             <span className="flex items-center gap-1 font-mono text-xs">
-                              <CheckCircle2 className="size-3.5" /> Copied!
+                              <CheckCircle2 className="size-3.5" />
+                              {` ${t("guardrails.customCode.primitives.copied")}`}
                             </span>
                           ) : (
                             <>
                               <div className="font-mono text-xs">{p.name}</div>
-                              <div className="mt-0.5 text-[10px] text-muted-foreground">{p.desc}</div>
+                              <div className="mt-0.5 text-[10px] text-muted-foreground">{t(p.descKey)}</div>
                             </>
                           )}
                         </button>
@@ -780,14 +845,14 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
 
         {/* Footer */}
         <div className="mt-4 flex items-center justify-between border-t border-border pt-4">
-          <span className="text-xs text-muted-foreground">Changes are auto-saved to local draft</span>
+          <span className="text-xs text-muted-foreground">{t("guardrails.customCode.footer.autosaveNote")}</span>
           <div className="flex items-center gap-3">
             <Button variant="secondary" onClick={onClose}>
-              Cancel
+              {t("guardrails.customCode.footer.cancel")}
             </Button>
             <Button onClick={handleSave} disabled={isSaving || !guardrailName.trim()} aria-busy={isSaving}>
               {isSaving ? <UiLoadingSpinner className="size-4" /> : <Save />}
-              {isEditMode ? "Update Guardrail" : "Save Guardrail"}
+              {isEditMode ? t("guardrails.customCode.footer.update") : t("guardrails.customCode.footer.save")}
             </Button>
           </div>
         </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/custom_code_catalog.ts b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/custom_code_catalog.ts
index aad3df181a7..c8bbab80c2e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/custom_code_catalog.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/custom_code/custom_code_catalog.ts
@@ -1,6 +1,8 @@
+import type { ParseKeys } from "i18next";
+
 export const CODE_TEMPLATES = {
   empty: {
-    name: "Empty Template",
+    nameKey: "guardrails.customCode.templates.empty",
     code: `async def apply_guardrail(inputs, request_data, input_type):
     # inputs: {texts, images, tools, tool_calls, structured_messages, model}
     # request_data: {model, user_id, team_id, end_user_id, metadata}
@@ -8,7 +10,7 @@ export const CODE_TEMPLATES = {
     return allow()`,
   },
   blockSSN: {
-    name: "Block SSN",
+    nameKey: "guardrails.customCode.templates.blockSsn",
     code: `def apply_guardrail(inputs, request_data, input_type):
     for text in inputs["texts"]:
         if regex_match(text, r"\\d{3}-\\d{2}-\\d{4}"):
@@ -16,7 +18,7 @@ export const CODE_TEMPLATES = {
     return allow()`,
   },
   redactEmail: {
-    name: "Redact Emails",
+    nameKey: "guardrails.customCode.templates.redactEmail",
     code: `def apply_guardrail(inputs, request_data, input_type):
     pattern = r"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}"
     modified = []
@@ -25,7 +27,7 @@ export const CODE_TEMPLATES = {
     return modify(texts=modified)`,
   },
   blockSQL: {
-    name: "Block SQL Injection",
+    nameKey: "guardrails.customCode.templates.blockSql",
     code: `def apply_guardrail(inputs, request_data, input_type):
     if input_type != "request":
         return allow()
@@ -35,7 +37,7 @@ export const CODE_TEMPLATES = {
     return allow()`,
   },
   validateJSON: {
-    name: "Validate JSON",
+    nameKey: "guardrails.customCode.templates.validateJson",
     code: `def apply_guardrail(inputs, request_data, input_type):
     if input_type != "response":
         return allow()
@@ -51,7 +53,7 @@ export const CODE_TEMPLATES = {
     return allow()`,
   },
   externalAPI: {
-    name: "External API Check (async)",
+    nameKey: "guardrails.customCode.templates.externalApi",
     code: `async def apply_guardrail(inputs, request_data, input_type):
     # Call an external moderation API (async for non-blocking)
     for text in inputs["texts"]:
@@ -71,66 +73,129 @@ export const CODE_TEMPLATES = {
     
     return allow()`,
   },
-};
+} satisfies Record<string, { nameKey: ParseKeys; code: string }>;
 
-export const PRIMITIVES = {
-  "Return Values": [
-    { name: "allow()", desc: "Let request/response through" },
-    { name: "block(reason)", desc: "Reject with message" },
-    { name: "flag(reason, metadata={})", desc: "Let through, record a non-blocking violation" },
-    { name: "modify(texts=[], images=[], tool_calls=[])", desc: "Transform content" },
-  ],
-  "HTTP Requests (async)": [
-    { name: "await http_request(url, method, headers, body)", desc: "Make async HTTP request" },
-    { name: "await http_get(url, headers)", desc: "Async GET request" },
-    { name: "await http_post(url, body, headers)", desc: "Async POST request" },
-  ],
-  "Regex Functions": [
-    { name: "regex_match(text, pattern)", desc: "Returns True if pattern found" },
-    { name: "regex_replace(text, pattern, replacement)", desc: "Replace all matches" },
-    { name: "regex_find_all(text, pattern)", desc: "Return list of matches" },
-  ],
-  "JSON Functions": [
-    { name: "json_parse(text)", desc: "Parse JSON string, returns None on error" },
-    { name: "json_stringify(obj)", desc: "Convert to JSON string" },
-    { name: "json_schema_valid(obj, schema)", desc: "Validate against JSON schema" },
-  ],
-  "URL Functions": [
-    { name: "extract_urls(text)", desc: "Extract all URLs from text" },
-    { name: "is_valid_url(url)", desc: "Check if URL is valid" },
-    { name: "all_urls_valid(text)", desc: "Check all URLs in text are valid" },
-  ],
-  "Code Detection": [
-    { name: "detect_code(text)", desc: "Returns True if code detected" },
-    { name: "detect_code_languages(text)", desc: "Returns list of detected languages" },
-    { name: 'contains_code_language(text, ["sql"])', desc: "Check for specific languages" },
-  ],
-  "Text Utilities": [
-    { name: "contains(text, substring)", desc: "Check if substring exists" },
-    { name: "contains_any(text, [substr1, substr2])", desc: "Check if any substring exists" },
-    { name: "word_count(text)", desc: "Count words" },
-    { name: "char_count(text)", desc: "Count characters" },
-    { name: "lower(text) / upper(text) / trim(text)", desc: "String transforms" },
-  ],
-};
+interface Primitive {
+  name: string;
+  descKey: ParseKeys;
+}
 
-export const MODE_OPTIONS = [
-  { value: "pre_call", label: "pre_call (Request)" },
-  { value: "post_call", label: "post_call (Response)" },
-  { value: "during_call", label: "during_call (Parallel)" },
-  { value: "logging_only", label: "logging_only" },
-  { value: "pre_mcp_call", label: "pre_mcp_call (Before MCP Tool Call)" },
-  { value: "post_mcp_call", label: "post_mcp_call (After MCP Tool Call)" },
-  { value: "during_mcp_call", label: "during_mcp_call (During MCP Tool Call)" },
+interface PrimitiveCategory {
+  id: string;
+  labelKey: ParseKeys;
+  primitives: Primitive[];
+}
+
+export const DEFAULT_OPEN_PRIMITIVE_CATEGORY = "returnValues";
+
+export const PRIMITIVE_CATEGORIES: PrimitiveCategory[] = [
+  {
+    id: "returnValues",
+    labelKey: "guardrails.customCode.primitives.categories.returnValues",
+    primitives: [
+      { name: "allow()", descKey: "guardrails.customCode.primitives.descriptions.allow" },
+      { name: "block(reason)", descKey: "guardrails.customCode.primitives.descriptions.block" },
+      { name: "flag(reason, metadata={})", descKey: "guardrails.customCode.primitives.descriptions.flag" },
+      {
+        name: "modify(texts=[], images=[], tool_calls=[])",
+        descKey: "guardrails.customCode.primitives.descriptions.modify",
+      },
+    ],
+  },
+  {
+    id: "httpRequests",
+    labelKey: "guardrails.customCode.primitives.categories.httpRequests",
+    primitives: [
+      {
+        name: "await http_request(url, method, headers, body)",
+        descKey: "guardrails.customCode.primitives.descriptions.httpRequest",
+      },
+      { name: "await http_get(url, headers)", descKey: "guardrails.customCode.primitives.descriptions.httpGet" },
+      {
+        name: "await http_post(url, body, headers)",
+        descKey: "guardrails.customCode.primitives.descriptions.httpPost",
+      },
+    ],
+  },
+  {
+    id: "regex",
+    labelKey: "guardrails.customCode.primitives.categories.regex",
+    primitives: [
+      { name: "regex_match(text, pattern)", descKey: "guardrails.customCode.primitives.descriptions.regexMatch" },
+      {
+        name: "regex_replace(text, pattern, replacement)",
+        descKey: "guardrails.customCode.primitives.descriptions.regexReplace",
+      },
+      { name: "regex_find_all(text, pattern)", descKey: "guardrails.customCode.primitives.descriptions.regexFindAll" },
+    ],
+  },
+  {
+    id: "json",
+    labelKey: "guardrails.customCode.primitives.categories.json",
+    primitives: [
+      { name: "json_parse(text)", descKey: "guardrails.customCode.primitives.descriptions.jsonParse" },
+      { name: "json_stringify(obj)", descKey: "guardrails.customCode.primitives.descriptions.jsonStringify" },
+      {
+        name: "json_schema_valid(obj, schema)",
+        descKey: "guardrails.customCode.primitives.descriptions.jsonSchemaValid",
+      },
+    ],
+  },
+  {
+    id: "url",
+    labelKey: "guardrails.customCode.primitives.categories.url",
+    primitives: [
+      { name: "extract_urls(text)", descKey: "guardrails.customCode.primitives.descriptions.extractUrls" },
+      { name: "is_valid_url(url)", descKey: "guardrails.customCode.primitives.descriptions.isValidUrl" },
+      { name: "all_urls_valid(text)", descKey: "guardrails.customCode.primitives.descriptions.allUrlsValid" },
+    ],
+  },
+  {
+    id: "codeDetection",
+    labelKey: "guardrails.customCode.primitives.categories.codeDetection",
+    primitives: [
+      { name: "detect_code(text)", descKey: "guardrails.customCode.primitives.descriptions.detectCode" },
+      {
+        name: "detect_code_languages(text)",
+        descKey: "guardrails.customCode.primitives.descriptions.detectCodeLanguages",
+      },
+      {
+        name: 'contains_code_language(text, ["sql"])',
+        descKey: "guardrails.customCode.primitives.descriptions.containsCodeLanguage",
+      },
+    ],
+  },
+  {
+    id: "textUtilities",
+    labelKey: "guardrails.customCode.primitives.categories.textUtilities",
+    primitives: [
+      { name: "contains(text, substring)", descKey: "guardrails.customCode.primitives.descriptions.contains" },
+      {
+        name: "contains_any(text, [substr1, substr2])",
+        descKey: "guardrails.customCode.primitives.descriptions.containsAny",
+      },
+      { name: "word_count(text)", descKey: "guardrails.customCode.primitives.descriptions.wordCount" },
+      { name: "char_count(text)", descKey: "guardrails.customCode.primitives.descriptions.charCount" },
+      {
+        name: "lower(text) / upper(text) / trim(text)",
+        descKey: "guardrails.customCode.primitives.descriptions.stringTransforms",
+      },
+    ],
+  },
 ];
 
-export const TEMPLATE_ITEMS = Object.entries(CODE_TEMPLATES).map(([key, template]) => ({
-  value: key,
-  label: template.name,
-}));
+export const MODE_OPTIONS: { value: string; labelKey: ParseKeys }[] = [
+  { value: "pre_call", labelKey: "guardrails.customCode.modes.preCall" },
+  { value: "post_call", labelKey: "guardrails.customCode.modes.postCall" },
+  { value: "during_call", labelKey: "guardrails.customCode.modes.duringCall" },
+  { value: "logging_only", labelKey: "guardrails.customCode.modes.loggingOnly" },
+  { value: "pre_mcp_call", labelKey: "guardrails.customCode.modes.preMcpCall" },
+  { value: "post_mcp_call", labelKey: "guardrails.customCode.modes.postMcpCall" },
+  { value: "during_mcp_call", labelKey: "guardrails.customCode.modes.duringMcpCall" },
+];
 
-export type ModeOption = (typeof MODE_OPTIONS)[number];
-
-export const MODE_OPTION_BY_VALUE: Record<string, ModeOption> = Object.fromEntries(
-  MODE_OPTIONS.map((option) => [option.value, option]),
+export const TEMPLATE_ITEMS: { value: string; labelKey: ParseKeys }[] = Object.entries(CODE_TEMPLATES).map(
+  ([key, template]) => ({ value: key, labelKey: template.nameKey }),
 );
+
+export type ModeOption = { value: string; label: string };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionModelFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionModelFields.tsx
index 379995ad37c..d37276cbf3a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionModelFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionModelFields.tsx
@@ -1,8 +1,10 @@
 "use client";
 
+import type { ParseKeys } from "i18next";
 import { Info, Plus, X } from "lucide-react";
 import React from "react";
 import { useWatch } from "react-hook-form";
+import { Trans, useTranslation } from "react-i18next";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
 import {
@@ -36,9 +38,9 @@ export interface DecisionModelFieldsProps {
   control: GuardrailFormControl;
 }
 
-const ACTION_ITEMS = [
-  { label: "Block", value: "block" },
-  { label: "Log only", value: "log" },
+const ACTION_ITEMS: { labelKey: ParseKeys; value: "block" | "log" }[] = [
+  { labelKey: "guardrails.decisionModel.actionOptions.block", value: "block" },
+  { labelKey: "guardrails.decisionModel.actionOptions.log", value: "log" },
 ];
 
 const ProviderLogo: React.FC<{ provider: string }> = ({ provider }) => (
@@ -46,16 +48,21 @@ const ProviderLogo: React.FC<{ provider: string }> = ({ provider }) => (
 );
 
 const NoDecisionModels: React.FC<{ providerFilter: string | null }> = ({ providerFilter }) => {
-  const source = providerFilter ? ` from the ${getProviderLogoAndName(providerFilter).displayName} provider` : "";
+  const { t } = useTranslation();
+  const description = providerFilter
+    ? t("guardrails.decisionModel.noModels.descriptionForProvider", {
+        provider: getProviderLogoAndName(providerFilter).displayName,
+      })
+    : t("guardrails.decisionModel.noModels.description");
   return (
-    <Alert variant="info" role="note" aria-label="No decision models">
+    <Alert variant="info" role="note" aria-label={t("guardrails.decisionModel.noModels.ariaLabel")}>
       <Info />
-      <AlertTitle>No decision models yet</AlertTitle>
+      <AlertTitle>{t("guardrails.decisionModel.noModels.title")}</AlertTitle>
       <AlertDescription>
         <p>
-          Add a decision model{source} to use this guardrail. A model shows up here once its mode is decisions.{" "}
+          {description}{" "}
           <a href={uiHref("models-and-endpoints")} target="_blank" rel="noopener noreferrer">
-            Add a model
+            {t("guardrails.decisionModel.noModels.addModel")}
           </a>
         </p>
       </AlertDescription>
@@ -93,9 +100,11 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
   onChecksChange,
   control,
 }) => {
+  const { t } = useTranslation();
   const selectedModel = asText(useWatch({ control, name: "decision_model" }));
   const duplicateNames = duplicateDecisionCheckNames(checks);
   const providerByModel = new Map(decisionModels.map((option) => [option.model, option.provider]));
+  const actionItems = ACTION_ITEMS.map(({ labelKey, value }) => ({ label: t(labelKey), value }));
 
   const updateCheck = (id: string, patch: Partial<DecisionModelCheckDraft>) =>
     onChecksChange(checks.map((check) => (check.id === id ? { ...check, ...patch } : check)));
@@ -107,19 +116,14 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
   return (
     <div className="space-y-5">
       <div className="rounded-md border border-success/20 bg-success/10 px-3.5 py-2.5 text-[13px] text-success">
-        The <strong>Decision Model</strong> answers yes/no questions about each request (pre_call, during_call) or
-        response (post_call). A question whose probability reaches its threshold blocks the call, or is recorded when
-        set to Log only.
+        <Trans i18nKey="guardrails.decisionModel.intro" components={{ strong: <strong /> }} />
       </div>
 
       <GuardrailField
         control={control}
         name="decision_model"
-        label={labelWithHint(
-          "Decision Model",
-          "A decisions-API model on this proxy, such as typesafe/jev-latest. It scores every question below.",
-        )}
-        rules={requiredRule("Select a decision model")}
+        label={labelWithHint(t("guardrails.decisionModel.model.label"), t("guardrails.decisionModel.model.hint"))}
+        rules={requiredRule(t("guardrails.decisionModel.model.required"))}
       >
         {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
           <Combobox
@@ -134,11 +138,15 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
               id={id}
               aria-invalid={ariaInvalid}
               aria-describedby={ariaDescribedBy}
-              placeholder={decisionModels.length > 0 ? "Select a decision model" : "No decision models yet"}
+              placeholder={
+                decisionModels.length > 0
+                  ? t("guardrails.decisionModel.model.placeholder")
+                  : t("guardrails.decisionModel.model.placeholderEmpty")
+              }
               className="w-full"
             />
             <ComboboxContent>
-              <ComboboxEmpty>No matching models</ComboboxEmpty>
+              <ComboboxEmpty>{t("guardrails.decisionModel.model.empty")}</ComboboxEmpty>
               <ComboboxList>
                 {(model: string) => {
                   const provider = providerByModel.get(model);
@@ -160,11 +168,8 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
       {decisionModels.length === 0 && <NoDecisionModels providerFilter={providerFilter} />}
 
       <Field>
-        <FieldLabel>Questions</FieldLabel>
-        <p className="m-0 text-xs text-muted-foreground">
-          Yes/no questions the decision model answers about the text. Block stops the call once a score reaches the
-          threshold, and Log only records it.
-        </p>
+        <FieldLabel>{t("guardrails.decisionModel.questions.label")}</FieldLabel>
+        <p className="m-0 text-xs text-muted-foreground">{t("guardrails.decisionModel.questions.description")}</p>
         {checks.map((check, index) => {
           const position = index + 1;
           return (
@@ -172,30 +177,36 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
               <button
                 type="button"
                 onClick={() => removeCheck(check.id)}
-                aria-label={`Remove question ${position}`}
+                aria-label={t("guardrails.decisionModel.question.remove", { position })}
                 className="absolute top-2 right-2 p-1 text-muted-foreground transition-colors hover:text-destructive"
               >
                 <X className="size-4" />
               </button>
               <div>
-                <span className="mb-1 block text-xs font-medium text-muted-foreground">Name</span>
+                <span className="mb-1 block text-xs font-medium text-muted-foreground">
+                  {t("guardrails.decisionModel.question.nameLabel")}
+                </span>
                 <Input
-                  aria-label={`Question ${position} name`}
-                  placeholder="Name (e.g. invoice_policy)"
+                  aria-label={t("guardrails.decisionModel.question.nameAriaLabel", { position })}
+                  placeholder={t("guardrails.decisionModel.question.namePlaceholder")}
                   className="bg-background"
                   value={check.name}
                   onChange={(event) => updateCheck(check.id, { name: event.target.value })}
                 />
                 {duplicateNames.has(check.name.trim()) && (
-                  <p className="m-0 mt-1 text-xs text-destructive">Another question already uses this name</p>
+                  <p className="m-0 mt-1 text-xs text-destructive">
+                    {t("guardrails.decisionModel.question.duplicateName")}
+                  </p>
                 )}
               </div>
               <div>
-                <span className="mb-1 block text-xs font-medium text-muted-foreground">Question</span>
+                <span className="mb-1 block text-xs font-medium text-muted-foreground">
+                  {t("guardrails.decisionModel.question.questionLabel")}
+                </span>
                 <Textarea
-                  aria-label={`Question ${position}`}
+                  aria-label={t("guardrails.decisionModel.question.questionAriaLabel", { position })}
                   rows={2}
-                  placeholder="The question the decision model answers, e.g. Does the text ask about invoices?"
+                  placeholder={t("guardrails.decisionModel.question.questionPlaceholder")}
                   className="w-full resize-none bg-background"
                   value={check.instructions}
                   onChange={(event) => updateCheck(check.id, { instructions: event.target.value })}
@@ -203,19 +214,24 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
               </div>
               <div className="flex items-end gap-6">
                 <div className="w-32">
-                  <span className="mb-1 block text-xs font-medium text-muted-foreground">Action</span>
+                  <span className="mb-1 block text-xs font-medium text-muted-foreground">
+                    {t("guardrails.decisionModel.question.actionLabel")}
+                  </span>
                   <Select
-                    items={ACTION_ITEMS}
+                    items={actionItems}
                     value={check.action}
                     onValueChange={(next: string | null) =>
                       next && updateCheck(check.id, { action: next as "block" | "log" })
                     }
                   >
-                    <SelectTrigger className="w-full bg-background" aria-label={`Question ${position} action`}>
+                    <SelectTrigger
+                      className="w-full bg-background"
+                      aria-label={t("guardrails.decisionModel.question.actionAriaLabel", { position })}
+                    >
                       <SelectValue />
                     </SelectTrigger>
                     <SelectContent>
-                      {ACTION_ITEMS.map((item) => (
+                      {actionItems.map((item) => (
                         <SelectItem key={item.value} value={item.value}>
                           {item.label}
                         </SelectItem>
@@ -224,10 +240,12 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
                   </Select>
                 </div>
                 <div className="w-56">
-                  <span className="mb-1 block text-xs font-medium text-muted-foreground">Threshold</span>
+                  <span className="mb-1 block text-xs font-medium text-muted-foreground">
+                    {t("guardrails.decisionModel.question.thresholdLabel")}
+                  </span>
                   <div className="flex h-9 items-center">
                     <ThresholdSlider
-                      aria-label={`Question ${position} threshold`}
+                      aria-label={t("guardrails.decisionModel.question.thresholdAriaLabel", { position })}
                       value={check.threshold}
                       onChange={(next) => updateCheck(check.id, { threshold: next })}
                     />
@@ -240,7 +258,7 @@ const DecisionModelFields: React.FC<DecisionModelFieldsProps> = ({
         <div>
           <Button variant="outline" size="sm" onClick={addCheck}>
             <Plus className="size-3" />
-            Add question
+            {t("guardrails.decisionModel.questions.add")}
           </Button>
         </div>
       </Field>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionTestSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionTestSection.tsx
index c54fd8d1576..c2b572f9afe 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionTestSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/DecisionTestSection.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import React, { useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { StatusBadge } from "@/components/shared/table_cells";
 import { Button } from "@/components/ui/button";
 import { FieldLabel } from "@/components/ui/field";
@@ -27,6 +28,7 @@ export interface DecisionTestSectionProps {
 }
 
 const DecisionTestSection: React.FC<DecisionTestSectionProps> = ({ accessToken, model, checks }) => {
+  const { t } = useTranslation();
   const [input, setInput] = useState("");
   const [runs, setRuns] = useState<DecisionTestRun[]>([]);
   const [running, setRunning] = useState(false);
@@ -35,9 +37,9 @@ const DecisionTestSection: React.FC<DecisionTestSectionProps> = ({ accessToken,
 
   const runnableQuestions = runnableDecisionQuestions(checks);
   let disabledReason: string | null = null;
-  if (!model) disabledReason = "Select a decision model to run a test";
-  else if (!input.trim()) disabledReason = "Type an input to run a test";
-  else if (runnableQuestions.length === 0) disabledReason = "Add a question to run a test";
+  if (!model) disabledReason = t("guardrails.decisionModel.test.disabled.noModel");
+  else if (!input.trim()) disabledReason = t("guardrails.decisionModel.test.disabled.noInput");
+  else if (runnableQuestions.length === 0) disabledReason = t("guardrails.decisionModel.test.disabled.noQuestions");
   const canRun = !disabledReason && !running;
 
   const runTest = async () => {
@@ -79,16 +81,13 @@ const DecisionTestSection: React.FC<DecisionTestSectionProps> = ({ accessToken,
   return (
     <div className="space-y-3 border-t border-border pt-4">
       <div className="space-y-1">
-        <FieldLabel>Test</FieldLabel>
-        <p className="m-0 text-xs text-muted-foreground">
-          Try your questions on a sample input before you save. Uses the thresholds above. Each run is a real decision
-          model call, so it is billed and shows up in Logs.
-        </p>
+        <FieldLabel>{t("guardrails.decisionModel.test.label")}</FieldLabel>
+        <p className="m-0 text-xs text-muted-foreground">{t("guardrails.decisionModel.test.description")}</p>
       </div>
       <Textarea
-        aria-label="Test input"
+        aria-label={t("guardrails.decisionModel.test.inputAriaLabel")}
         rows={3}
-        placeholder="Paste a sample input to score against your questions"
+        placeholder={t("guardrails.decisionModel.test.inputPlaceholder")}
         className="w-full resize-none"
         value={input}
         onChange={(event) => setInput(event.target.value)}
@@ -101,16 +100,14 @@ const DecisionTestSection: React.FC<DecisionTestSectionProps> = ({ accessToken,
       />
       <div className="flex items-center gap-2">
         <Button type="button" onClick={runTest} disabled={!canRun}>
-          {running ? "Running…" : "Run test"}
+          {running ? t("guardrails.decisionModel.test.running") : t("guardrails.decisionModel.test.run")}
         </Button>
         {!running && disabledReason && <p className="m-0 text-xs text-muted-foreground">{disabledReason}</p>}
         {!running && !disabledReason && <p className="m-0 text-xs text-muted-foreground">{runTestShortcutLabel()}</p>}
       </div>
       {runs.length > 0 && (
         <>
-          <p className="m-0 text-xs text-muted-foreground">
-            Latest first. Each run keeps its input so you can compare.
-          </p>
+          <p className="m-0 text-xs text-muted-foreground">{t("guardrails.decisionModel.test.historyHint")}</p>
           <div className="space-y-2" data-slot="decision-test-history">
             {runs.map((run) => {
               const visible = "error" in run ? [] : visibleTestResults(run, checks, model);
@@ -123,25 +120,32 @@ const DecisionTestSection: React.FC<DecisionTestSectionProps> = ({ accessToken,
                     {visible.length > 0 && (
                       <StatusBadge
                         tone={DECISION_TEST_CHIP_TONE[decisionTestOverall(visible)]}
-                        label={decisionTestOverall(visible) === "block" ? "Block" : "Pass"}
+                        label={
+                          decisionTestOverall(visible) === "block"
+                            ? t("guardrails.decisionModel.test.overall.block")
+                            : t("guardrails.decisionModel.test.overall.pass")
+                        }
                       />
                     )}
                   </div>
                   {"error" in run && <p className="m-0 mt-1.5 text-xs text-destructive">{run.error}</p>}
                   {!("error" in run) && visible.length === 0 && (
                     <p className="m-0 mt-1.5 text-xs text-muted-foreground">
-                      The model or questions changed since this run. Run it again to score them.
+                      {t("guardrails.decisionModel.test.stale")}
                     </p>
                   )}
                   {visible.length > 0 && (
                     <div className="mt-1.5 flex flex-wrap gap-1.5">
                       {visible.map(({ check, result }) => {
                         const chip = decisionTestChip(result, check);
-                        const score = result.kind === "probability" ? result.probability.toFixed(2) : "No answer";
+                        const score =
+                          result.kind === "probability"
+                            ? result.probability.toFixed(2)
+                            : t("guardrails.decisionModel.test.chip.noAnswer");
                         let label = "";
-                        if (chip === "block") label = "Block";
-                        else if (chip === "logged") label = "Pass · logged";
-                        else if (chip === "pass") label = "Pass";
+                        if (chip === "block") label = t("guardrails.decisionModel.test.chip.block");
+                        else if (chip === "logged") label = t("guardrails.decisionModel.test.chip.logged");
+                        else if (chip === "pass") label = t("guardrails.decisionModel.test.chip.pass");
                         return (
                           <StatusBadge
                             key={check.name}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/buildDecisionModelParams.ts b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/buildDecisionModelParams.ts
index 7356cb181fe..a60b65d1b2f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/buildDecisionModelParams.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/decision_model/buildDecisionModelParams.ts
@@ -1,3 +1,6 @@
+import type { TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
+
 export interface DecisionModelCheckDraft {
   id: string;
   name: string;
@@ -27,13 +30,16 @@ export function duplicateDecisionCheckNames(checks: readonly DecisionModelCheckD
   return new Set(names.filter((name, index) => names.indexOf(name) !== index));
 }
 
-export function decisionChecksProblem(checks: readonly DecisionModelCheckDraft[]): string | null {
+export function decisionChecksProblem(
+  checks: readonly DecisionModelCheckDraft[],
+  t: TFunction = i18n.t.bind(i18n),
+): string | null {
   const trimmed = trimDecisionChecks(checks);
-  if (trimmed.length === 0) return "Add at least one question";
+  if (trimmed.length === 0) return t("guardrails.decisionModel.problems.noQuestions");
   if (trimmed.some((check) => !check.name || !check.instructions)) {
-    return "Give every question a name and a question, or remove it";
+    return t("guardrails.decisionModel.problems.incompleteQuestion");
   }
-  if (duplicateDecisionCheckNames(checks).size > 0) return "Each question needs a different name";
+  if (duplicateDecisionCheckNames(checks).size > 0) return t("guardrails.decisionModel.problems.duplicateNames");
   return null;
 }
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrailTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrailTableColumns.tsx
index 53f1b1a03d3..5d97e8220bc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrailTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrailTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { ParseKeys, TFunction } from "i18next";
 import { MoreHorizontal, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { DateCell, IdentityCell, StatusBadge } from "@/components/shared/table_cells";
@@ -18,7 +20,7 @@ import { cn } from "@/lib/cva.config";
 import { formatGuardrailMode, getGuardrailLogoAndName } from "./guardrail_info_helpers";
 import { Logo } from "@/components/molecules/logo/Logo";
 
-const CONFIG_DELETE_HINT = "Config guardrails are defined in the config file and cannot be deleted from the dashboard.";
+const CONFIG_DELETE_HINT_KEY: ParseKeys = "guardrails.table.configDeleteHint";
 
 function GuardrailProviderCell({ provider }: { provider: string }) {
   const { logo, displayName } = getGuardrailLogoAndName(provider);
@@ -36,12 +38,13 @@ interface GuardrailRowActionsProps {
 }
 
 function GuardrailRowActions({ guardrail, onDeleteClick }: GuardrailRowActionsProps) {
+  const { t } = useTranslation();
   const isConfigGuardrail = guardrail.guardrail_definition_location === GuardrailDefinitionLocation.CONFIG;
 
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open guardrail actions"
+        aria-label={t("guardrails.table.actions.open")}
         data-testid={`guardrail-actions-${guardrail.guardrail_id}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -52,11 +55,13 @@ function GuardrailRowActions({ guardrail, onDeleteClick }: GuardrailRowActionsPr
           variant="destructive"
           disabled={isConfigGuardrail}
           data-testid="guardrail-action-delete"
-          title={isConfigGuardrail ? CONFIG_DELETE_HINT : undefined}
-          onClick={() => onDeleteClick(guardrail.guardrail_id, guardrail.guardrail_name || "Unnamed Guardrail")}
+          title={isConfigGuardrail ? t(CONFIG_DELETE_HINT_KEY) : undefined}
+          onClick={() =>
+            onDeleteClick(guardrail.guardrail_id, guardrail.guardrail_name || t("guardrails.table.unnamed"))
+          }
         >
           <Trash2 />
-          Delete
+          {t("guardrails.table.actions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -66,17 +71,19 @@ function GuardrailRowActions({ guardrail, onDeleteClick }: GuardrailRowActionsPr
 interface GuardrailTableColumnsDeps {
   onGuardrailClick: (guardrailId: string) => void;
   onDeleteClick: (guardrailId: string, guardrailName: string) => void;
+  t: TFunction;
 }
 
 export const getGuardrailTableColumns = ({
   onGuardrailClick,
   onDeleteClick,
+  t,
 }: GuardrailTableColumnsDeps): ColumnDef<Guardrail>[] => [
   {
     id: "guardrail_id",
     accessorKey: "guardrail_id",
-    meta: { title: "Guardrail ID" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Guardrail ID" />,
+    meta: { title: t("guardrails.table.columns.guardrailId") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("guardrails.table.columns.guardrailId")} />,
     size: 200,
     enableSorting: true,
     cell: ({ row }) => (
@@ -90,8 +97,8 @@ export const getGuardrailTableColumns = ({
   {
     id: "guardrail_name",
     accessorKey: "guardrail_name",
-    meta: { title: "Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Name" />,
+    meta: { title: t("guardrails.table.columns.name") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("guardrails.table.columns.name")} />,
     size: 200,
     enableSorting: true,
     cell: ({ row }) => {
@@ -105,16 +112,16 @@ export const getGuardrailTableColumns = ({
   },
   {
     id: "provider",
-    meta: { title: "Provider" },
-    header: "Provider",
+    meta: { title: t("guardrails.table.columns.provider") },
+    header: t("guardrails.table.columns.provider"),
     size: 180,
     enableSorting: false,
     cell: ({ row }) => <GuardrailProviderCell provider={row.original.litellm_params.guardrail} />,
   },
   {
     id: "mode",
-    meta: { title: "Mode" },
-    header: "Mode",
+    meta: { title: t("guardrails.table.columns.mode") },
+    header: t("guardrails.table.columns.mode"),
     size: 130,
     enableSorting: false,
     cell: ({ row }) => {
@@ -128,22 +135,25 @@ export const getGuardrailTableColumns = ({
   },
   {
     id: "default_on",
-    meta: { title: "Default On" },
-    header: "Default On",
+    meta: { title: t("guardrails.table.columns.defaultOn") },
+    header: t("guardrails.table.columns.defaultOn"),
     size: 120,
     enableSorting: false,
     cell: ({ row }) => {
       const isDefaultOn = !!row.original.litellm_params?.default_on;
       return (
-        <StatusBadge tone={isDefaultOn ? "success" : "neutral"} label={isDefaultOn ? "Default On" : "Default Off"} />
+        <StatusBadge
+          tone={isDefaultOn ? "success" : "neutral"}
+          label={isDefaultOn ? t("guardrails.table.defaultOnStatus.on") : t("guardrails.table.defaultOnStatus.off")}
+        />
       );
     },
   },
   {
     id: "created_at",
     accessorKey: "created_at",
-    meta: { title: "Created At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created At" />,
+    meta: { title: t("guardrails.table.columns.createdAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("guardrails.table.columns.createdAt")} />,
     size: 150,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} />,
@@ -151,8 +161,8 @@ export const getGuardrailTableColumns = ({
   {
     id: "updated_at",
     accessorKey: "updated_at",
-    meta: { title: "Updated At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Updated At" />,
+    meta: { title: t("guardrails.table.columns.updatedAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("guardrails.table.columns.updatedAt")} />,
     size: 150,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.updated_at} />,
@@ -160,7 +170,7 @@ export const getGuardrailTableColumns = ({
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("guardrails.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden.tsx
index d430a5a9f19..2346c32599e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden.tsx
@@ -1,8 +1,15 @@
 import { useTerminology } from "@/contexts/TerminologyContext";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { ArrowRight, Search } from "lucide-react";
 import { InputGroup, InputGroupAddon, InputGroupInput } from "@/components/ui/input-group";
-import { GuardrailCardInfo, ALL_CARDS } from "./guardrail_garden_data";
+import {
+  GuardrailCardInfo,
+  ALL_CARDS,
+  gardenCardDescription,
+  gardenCardName,
+  gardenTagLabel,
+} from "./guardrail_garden_data";
 import GuardrailCard from "./guardrail_garden_card";
 import GuardrailDetailView from "./guardrail_garden_detail";
 
@@ -12,6 +19,7 @@ interface GuardrailGardenProps {
 }
 
 const GuardrailGarden: React.FC<GuardrailGardenProps> = ({ accessToken, onGuardrailCreated }) => {
+  const { t } = useTranslation();
   const term = useTerminology();
   const [searchQuery, setSearchQuery] = useState("");
   const [selectedCard, setSelectedCard] = useState<GuardrailCardInfo | null>(null);
@@ -23,9 +31,9 @@ const GuardrailGarden: React.FC<GuardrailGardenProps> = ({ accessToken, onGuardr
     if (!searchQuery) return true;
     const q = searchQuery.toLowerCase();
     return (
-      card.name.toLowerCase().includes(q) ||
-      term(card.description).toLowerCase().includes(q) ||
-      card.tags.some((t) => t.toLowerCase().includes(q))
+      gardenCardName(card, t).toLowerCase().includes(q) ||
+      term(gardenCardDescription(card, t)).toLowerCase().includes(q) ||
+      card.tags.some((tag) => gardenTagLabel(tag, t).toLowerCase().includes(q))
     );
   });
 
@@ -52,7 +60,7 @@ const GuardrailGarden: React.FC<GuardrailGardenProps> = ({ accessToken, onGuardr
             <Search className="size-4 text-muted-foreground" />
           </InputGroupAddon>
           <InputGroupInput
-            placeholder="Search guardrails"
+            placeholder={t("guardrails.garden.searchPlaceholder")}
             value={searchQuery}
             onChange={(e) => setSearchQuery(e.target.value)}
           />
@@ -62,25 +70,23 @@ const GuardrailGarden: React.FC<GuardrailGardenProps> = ({ accessToken, onGuardr
       <section className="mb-10" aria-labelledby="guardrail-garden-litellm">
         <div className="mb-1 flex items-center justify-between">
           <h2 id="guardrail-garden-litellm" className="m-0 text-xl font-semibold text-foreground">
-            LiteLLM Content Filter
+            {t("guardrails.garden.litellmHeading")}
           </h2>
           <span
             className="inline-flex cursor-pointer items-center gap-1.5 text-sm text-primary"
             onClick={() => setShowAllLitellm(!showAllLitellm)}
           >
             {showAllLitellm ? (
-              <>Show less</>
+              <>{t("guardrails.garden.showLess")}</>
             ) : (
               <>
                 <ArrowRight className="size-3" />
-                {`Show all (${litellmCards.length})`}
+                {t("guardrails.garden.showAll", { total: litellmCards.length })}
               </>
             )}
           </span>
         </div>
-        <p className="mt-1 mb-5 text-[13px] text-muted-foreground">
-          Built-in guardrails powered by LiteLLM. Zero latency, no external dependencies, no additional cost.
-        </p>
+        <p className="mt-1 mb-5 text-[13px] text-muted-foreground">{t("guardrails.garden.litellmDescription")}</p>
         <div className="grid grid-cols-[repeat(auto-fill,minmax(220px,1fr))] gap-4">
           {(showAllLitellm ? litellmCards : litellmCards.slice(0, CARDS_PER_ROW * VISIBLE_ROWS)).map((card) => (
             <GuardrailCard key={card.id} card={card} onClick={() => setSelectedCard(card)} />
@@ -90,12 +96,9 @@ const GuardrailGarden: React.FC<GuardrailGardenProps> = ({ accessToken, onGuardr
 
       <section className="mb-10" aria-labelledby="guardrail-garden-decision-model">
         <h2 id="guardrail-garden-decision-model" className="mt-0 mb-1 text-xl font-semibold text-foreground">
-          Decision Model
+          {t("guardrails.garden.decisionModelHeading")}
         </h2>
-        <p className="mt-1 mb-5 text-[13px] text-muted-foreground">
-          Ask a decision model yes/no questions about each request or response, and block or log when a score reaches
-          its threshold.
-        </p>
+        <p className="mt-1 mb-5 text-[13px] text-muted-foreground">{t("guardrails.garden.decisionModelDescription")}</p>
         <div className="grid grid-cols-[repeat(auto-fill,minmax(220px,1fr))] gap-4">
           {decisionModelCards.map((card) => (
             <GuardrailCard key={card.id} card={card} onClick={() => setSelectedCard(card)} />
@@ -105,11 +108,9 @@ const GuardrailGarden: React.FC<GuardrailGardenProps> = ({ accessToken, onGuardr
 
       <section className="mb-10" aria-labelledby="guardrail-garden-partner">
         <h2 id="guardrail-garden-partner" className="mt-0 mb-1 text-xl font-semibold text-foreground">
-          Partner Guardrails
+          {t("guardrails.garden.partnerHeading")}
         </h2>
-        <p className="mt-1 mb-5 text-[13px] text-muted-foreground">
-          {term("Third-party guardrail integrations from leading AI security providers.")}
-        </p>
+        <p className="mt-1 mb-5 text-[13px] text-muted-foreground">{term(t("guardrails.garden.partnerDescription"))}</p>
         <div className="grid grid-cols-[repeat(auto-fill,minmax(220px,1fr))] gap-4">
           {partnerCards.map((card) => (
             <GuardrailCard key={card.id} card={card} onClick={() => setSelectedCard(card)} />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.tsx
index 8a6375d0d68..c6abd9225d7 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.tsx
@@ -1,28 +1,33 @@
 import { useTerminology } from "@/contexts/TerminologyContext";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { CircleCheck } from "lucide-react";
-import { GuardrailCardInfo } from "./guardrail_garden_data";
+import { GuardrailCardInfo, gardenCardDescription, gardenCardName } from "./guardrail_garden_data";
 import { Logo } from "@/components/molecules/logo/Logo";
 
 const GuardrailCard: React.FC<{ card: GuardrailCardInfo; onClick: () => void }> = ({ card, onClick }) => {
+  const { t } = useTranslation();
   const term = useTerminology();
+  const name = gardenCardName(card, t);
   return (
     <div
       onClick={onClick}
       className="flex min-h-[170px] cursor-pointer flex-col rounded-xl border border-border bg-card px-5 pt-5 pb-4 transition-[border-color,box-shadow] hover:border-primary/40 hover:shadow-sm"
     >
       <div className="mb-2.5 flex items-center gap-2.5">
-        <Logo src={card.logo} label={card.name} className="w-7 h-7 rounded-md object-contain shrink-0" />
-        <span className="text-sm leading-tight font-semibold text-foreground">{card.name}</span>
+        <Logo src={card.logo} label={name} className="w-7 h-7 rounded-md object-contain shrink-0" />
+        <span className="text-sm leading-tight font-semibold text-foreground">{name}</span>
       </div>
 
-      <p className="line-clamp-3 m-0 flex-1 text-xs leading-relaxed text-muted-foreground">{term(card.description)}</p>
+      <p className="line-clamp-3 m-0 flex-1 text-xs leading-relaxed text-muted-foreground">
+        {term(gardenCardDescription(card, t))}
+      </p>
 
       {card.eval && (
         <div className="mt-2.5 flex items-center gap-1 text-success">
           <CircleCheck className="size-3" />
           <span className="text-[11px] font-medium">
-            F1: {card.eval.f1}% &middot; {card.eval.testCases} test cases
+            F1: {card.eval.f1}% &middot; {card.eval.testCases} {t("guardrails.gardenCard.testCases")}
           </span>
         </div>
       )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_data.ts b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_data.ts
index 7ef4f159717..dc6acffa13c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_data.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_data.ts
@@ -1,12 +1,15 @@
+import type { ParseKeys, TFunction } from "i18next";
 import { Providers, providerLogoMap } from "@/components/provider_info_helpers";
 import { guardrailLogoMap } from "./guardrail_info_helpers";
 
 export interface GuardrailCardInfo {
   id: string;
   name: string;
+  nameKey?: ParseKeys;
   description: string;
+  descriptionKey?: ParseKeys;
   category: "litellm" | "decision_model" | "partner";
-  subcategory?: string;
+  subcategoryKey?: ParseKeys;
   logo: string;
   tags: string[];
   eval?: {
@@ -19,16 +22,71 @@ export interface GuardrailCardInfo {
   providerKey?: string;
 }
 
+export const GARDEN_TAG_LABEL_KEYS: Readonly<Partial<Record<string, ParseKeys>>> = {
+  "Content Category": "guardrails.gardenCatalog.tags.contentCategory",
+  "Topic Blocker": "guardrails.gardenCatalog.tags.topicBlocker",
+  Safety: "guardrails.gardenCatalog.tags.safety",
+  Bias: "guardrails.gardenCatalog.tags.bias",
+  "Prompt Injection": "guardrails.gardenCatalog.tags.promptInjection",
+  Toxicity: "guardrails.gardenCatalog.tags.toxicity",
+  PII: "guardrails.gardenCatalog.tags.pii",
+  Regex: "guardrails.gardenCatalog.tags.regex",
+  "Data Protection": "guardrails.gardenCatalog.tags.dataProtection",
+  Keywords: "guardrails.gardenCatalog.tags.keywords",
+  Blocklist: "guardrails.gardenCatalog.tags.blocklist",
+  Code: "guardrails.gardenCatalog.tags.code",
+  Competitor: "guardrails.gardenCatalog.tags.competitor",
+  "Decision Model": "guardrails.gardenCatalog.tags.decisionModel",
+  "Content Safety": "guardrails.gardenCatalog.tags.contentSafety",
+  Security: "guardrails.gardenCatalog.tags.security",
+  "Content Moderation": "guardrails.gardenCatalog.tags.contentModeration",
+  "Open Source": "guardrails.gardenCatalog.tags.openSource",
+  Validation: "guardrails.gardenCatalog.tags.validation",
+  Enterprise: "guardrails.gardenCatalog.tags.enterprise",
+  "Threat Detection": "guardrails.gardenCatalog.tags.threatDetection",
+  Hallucination: "guardrails.gardenCatalog.tags.hallucination",
+  Policy: "guardrails.gardenCatalog.tags.policy",
+  Compliance: "guardrails.gardenCatalog.tags.compliance",
+  Governance: "guardrails.gardenCatalog.tags.governance",
+  Gateway: "guardrails.gardenCatalog.tags.gateway",
+  Monitoring: "guardrails.gardenCatalog.tags.monitoring",
+  Grounding: "guardrails.gardenCatalog.tags.grounding",
+  RAG: "guardrails.gardenCatalog.tags.rag",
+  Firewall: "guardrails.gardenCatalog.tags.firewall",
+  Agentic: "guardrails.gardenCatalog.tags.agentic",
+  "Tool Misuse": "guardrails.gardenCatalog.tags.toolMisuse",
+  Skills: "guardrails.gardenCatalog.tags.skills",
+  Observability: "guardrails.gardenCatalog.tags.observability",
+  "Data Privacy": "guardrails.gardenCatalog.tags.dataPrivacy",
+  Streaming: "guardrails.gardenCatalog.tags.streaming",
+  Runtime: "guardrails.gardenCatalog.tags.runtime",
+  Secrets: "guardrails.gardenCatalog.tags.secrets",
+  Redaction: "guardrails.gardenCatalog.tags.redaction",
+};
+
+export const gardenCardName = (card: GuardrailCardInfo, t: TFunction): string =>
+  card.nameKey ? t(card.nameKey) : card.name;
+
+export const gardenCardDescription = (card: GuardrailCardInfo, t: TFunction): string =>
+  card.descriptionKey ? t(card.descriptionKey) : card.description;
+
+export const gardenTagLabel = (tag: string, t: TFunction): string => {
+  const key = GARDEN_TAG_LABEL_KEYS[tag];
+  return key ? t(key) : tag;
+};
+
 const litellmContentFilterLogo = guardrailLogoMap["LiteLLM Content Filter"];
 
 export const LITELLM_CONTENT_FILTER_CARDS: GuardrailCardInfo[] = [
   {
     id: "cf_denied_financial",
     name: "Denied Financial Advice",
+    nameKey: "guardrails.gardenCatalog.contentFilter.deniedFinancial.name",
     description:
       "Detects requests for personalized financial advice, investment recommendations, or financial planning.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.deniedFinancial.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Topic Blocker"],
     eval: {
@@ -42,9 +100,11 @@ export const LITELLM_CONTENT_FILTER_CARDS: GuardrailCardInfo[] = [
   {
     id: "cf_denied_insults",
     name: "Insults & Personal Attacks",
+    nameKey: "guardrails.gardenCatalog.contentFilter.deniedInsults.name",
     description: "Detects insults, name-calling, and personal attacks directed at the chatbot, staff, or other people.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.deniedInsults.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Topic Blocker"],
     eval: {
@@ -58,184 +118,224 @@ export const LITELLM_CONTENT_FILTER_CARDS: GuardrailCardInfo[] = [
   {
     id: "cf_denied_legal",
     name: "Denied Legal Advice",
+    nameKey: "guardrails.gardenCatalog.contentFilter.deniedLegal.name",
     description: "Detects requests for unauthorized legal advice, case analysis, or legal recommendations.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.deniedLegal.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Topic Blocker"],
   },
   {
     id: "cf_denied_medical",
     name: "Denied Medical Advice",
+    nameKey: "guardrails.gardenCatalog.contentFilter.deniedMedical.name",
     description: "Detects requests for medical diagnosis, treatment recommendations, or health advice.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.deniedMedical.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Topic Blocker"],
   },
   {
     id: "cf_harmful_violence",
     name: "Harmful Violence",
+    nameKey: "guardrails.gardenCatalog.contentFilter.harmfulViolence.name",
     description: "Detects content related to violence, criminal planning, attacks, and violent threats.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.harmfulViolence.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Safety"],
   },
   {
     id: "cf_harmful_self_harm",
     name: "Harmful Self-Harm",
+    nameKey: "guardrails.gardenCatalog.contentFilter.harmfulSelfHarm.name",
     description: "Detects content related to self-harm, suicide, and dangerous self-destructive behavior.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.harmfulSelfHarm.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Safety"],
   },
   {
     id: "cf_harmful_child_safety",
     name: "Harmful Child Safety",
+    nameKey: "guardrails.gardenCatalog.contentFilter.harmfulChildSafety.name",
     description: "Detects content that could endanger child safety or exploit minors.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.harmfulChildSafety.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Safety"],
   },
   {
     id: "cf_harmful_illegal_weapons",
     name: "Harmful Illegal Weapons",
+    nameKey: "guardrails.gardenCatalog.contentFilter.harmfulIllegalWeapons.name",
     description: "Detects content related to illegal weapons manufacturing, distribution, or acquisition.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.harmfulIllegalWeapons.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Safety"],
   },
   {
     id: "cf_bias_gender",
     name: "Bias: Gender",
+    nameKey: "guardrails.gardenCatalog.contentFilter.biasGender.name",
     description: "Detects gender-based discrimination, stereotypes, and biased language.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.biasGender.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Bias"],
   },
   {
     id: "cf_bias_racial",
     name: "Bias: Racial",
+    nameKey: "guardrails.gardenCatalog.contentFilter.biasRacial.name",
     description: "Detects racial discrimination, stereotypes, and racially biased content.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.biasRacial.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Bias"],
   },
   {
     id: "cf_bias_religious",
     name: "Bias: Religious",
+    nameKey: "guardrails.gardenCatalog.contentFilter.biasReligious.name",
     description: "Detects religious discrimination, intolerance, and religiously biased content.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.biasReligious.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Bias"],
   },
   {
     id: "cf_bias_sexual_orientation",
     name: "Bias: Sexual Orientation",
+    nameKey: "guardrails.gardenCatalog.contentFilter.biasSexualOrientation.name",
     description: "Detects discrimination based on sexual orientation and related biased content.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.biasSexualOrientation.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Bias"],
   },
   {
     id: "cf_prompt_injection_jailbreak",
     name: "Prompt Injection: Jailbreak",
+    nameKey: "guardrails.gardenCatalog.contentFilter.promptInjectionJailbreak.name",
     description: "Detects jailbreak attempts designed to bypass AI safety guidelines and restrictions.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.promptInjectionJailbreak.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Prompt Injection"],
   },
   {
     id: "cf_prompt_injection_data_exfil",
     name: "Prompt Injection: Data Exfiltration",
+    nameKey: "guardrails.gardenCatalog.contentFilter.promptInjectionDataExfil.name",
     description: "Detects attempts to extract sensitive data through prompt manipulation.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.promptInjectionDataExfil.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Prompt Injection"],
   },
   {
     id: "cf_prompt_injection_sql",
     name: "Prompt Injection: SQL",
+    nameKey: "guardrails.gardenCatalog.contentFilter.promptInjectionSql.name",
     description: "Detects SQL injection attempts embedded in prompts.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.promptInjectionSql.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Prompt Injection"],
   },
   {
     id: "cf_prompt_injection_malicious_code",
     name: "Prompt Injection: Malicious Code",
+    nameKey: "guardrails.gardenCatalog.contentFilter.promptInjectionMaliciousCode.name",
     description: "Detects attempts to inject malicious code through prompts.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.promptInjectionMaliciousCode.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Prompt Injection"],
   },
   {
     id: "cf_prompt_injection_system_prompt",
     name: "Prompt Injection: System Prompt",
+    nameKey: "guardrails.gardenCatalog.contentFilter.promptInjectionSystemPrompt.name",
     description: "Detects attempts to extract or override system prompts.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.promptInjectionSystemPrompt.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Prompt Injection"],
   },
   {
     id: "cf_toxic_abuse",
     name: "Toxic & Abusive Language",
+    nameKey: "guardrails.gardenCatalog.contentFilter.toxicAbuse.name",
     description: "Detects toxic, abusive, and hateful language across multiple languages (EN, AU, DE, ES, FR).",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.toxicAbuse.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Toxicity"],
   },
   {
     id: "cf_patterns",
     name: "Pattern Matching",
+    nameKey: "guardrails.gardenCatalog.contentFilter.patterns.name",
     description:
       "Detect and block sensitive data patterns like SSNs, credit card numbers, API keys, and custom regex patterns.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.patterns.description",
     category: "litellm",
-    subcategory: "Patterns",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.patterns",
     logo: litellmContentFilterLogo,
     tags: ["PII", "Regex", "Data Protection"],
   },
   {
     id: "cf_keywords",
     name: "Keyword Blocking",
+    nameKey: "guardrails.gardenCatalog.contentFilter.keywords.name",
     description:
       "Block or mask content containing specific keywords or phrases. Upload custom word lists or add individual terms.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.keywords.description",
     category: "litellm",
-    subcategory: "Keywords",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.keywords",
     logo: litellmContentFilterLogo,
     tags: ["Keywords", "Blocklist"],
   },
   {
     id: "block_code_execution",
     name: "Block Code Execution",
+    nameKey: "guardrails.gardenCatalog.contentFilter.blockCodeExecution.name",
     description:
       "Detects markdown fenced code blocks in requests and responses. Block or mask executable code (e.g. Python, JavaScript, Bash) by language with configurable confidence.",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.blockCodeExecution.description",
     category: "litellm",
-    subcategory: "Code Safety",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.codeSafety",
     logo: litellmContentFilterLogo,
     tags: ["Code", "Safety", "Prompt Injection"],
   },
   {
     id: "cf_competitor_intent",
     name: "Competitor Name Blocking",
+    nameKey: "guardrails.gardenCatalog.contentFilter.competitorIntent.name",
     description:
       "Block or reframe competitor comparison and ranking intent. Detect when users ask to compare or recommend competitors (airline or generic competitor lists).",
+    descriptionKey: "guardrails.gardenCatalog.contentFilter.competitorIntent.description",
     category: "litellm",
-    subcategory: "Content Category",
+    subcategoryKey: "guardrails.gardenCatalog.subcategories.contentCategory",
     logo: litellmContentFilterLogo,
     tags: ["Content Category", "Competitor", "Topic Blocker"],
   },
@@ -247,6 +347,7 @@ export const DECISION_MODEL_CARDS: GuardrailCardInfo[] = [
     name: "TypeSafe Jev",
     description:
       "TypeSafe's Jev decision model answers your yes/no questions about each request, such as prompt injection or policy checks.",
+    descriptionKey: "guardrails.gardenCatalog.decisionModel.typesafeJev.description",
     category: "decision_model",
     logo: providerLogoMap[Providers.TypeSafe] ?? "",
     tags: ["Decision Model", "TypeSafe", "Prompt Injection"],
@@ -255,7 +356,9 @@ export const DECISION_MODEL_CARDS: GuardrailCardInfo[] = [
   {
     id: "dm_perplexity",
     name: "Perplexity Decision",
+    nameKey: "guardrails.gardenCatalog.decisionModel.perplexity.name",
     description: "Perplexity's pplx-decider model answers your yes/no questions about each request or response.",
+    descriptionKey: "guardrails.gardenCatalog.decisionModel.perplexity.description",
     category: "decision_model",
     logo: providerLogoMap[Providers.Perplexity] ?? "",
     tags: ["Decision Model", "Perplexity"],
@@ -264,8 +367,10 @@ export const DECISION_MODEL_CARDS: GuardrailCardInfo[] = [
   {
     id: "dm_microsoft",
     name: "Microsoft Decision Model",
+    nameKey: "guardrails.gardenCatalog.decisionModel.microsoft.name",
     description:
       "Microsoft Foundry decision models, such as Microsoft-Decision-1, answer your yes/no questions about each request or response.",
+    descriptionKey: "guardrails.gardenCatalog.decisionModel.microsoft.description",
     category: "decision_model",
     logo: providerLogoMap[Providers.Azure_AI_Studio] ?? "",
     tags: ["Decision Model", "Microsoft"],
@@ -274,8 +379,10 @@ export const DECISION_MODEL_CARDS: GuardrailCardInfo[] = [
   {
     id: "dm_openai",
     name: "OpenAI Decision Model",
+    nameKey: "guardrails.gardenCatalog.decisionModel.openai.name",
     description:
       "OpenAI decision models, such as gpt-6-luna, answer your yes/no questions about each request or response.",
+    descriptionKey: "guardrails.gardenCatalog.decisionModel.openai.description",
     category: "decision_model",
     logo: providerLogoMap[Providers.OpenAI] ?? "",
     tags: ["Decision Model", "OpenAI"],
@@ -284,8 +391,10 @@ export const DECISION_MODEL_CARDS: GuardrailCardInfo[] = [
   {
     id: "dm_databricks",
     name: "Databricks Decision Model",
+    nameKey: "guardrails.gardenCatalog.decisionModel.databricks.name",
     description:
       "Decision models served on Databricks, such as OpenJev, answer your yes/no questions about each request or response.",
+    descriptionKey: "guardrails.gardenCatalog.decisionModel.databricks.description",
     category: "decision_model",
     logo: providerLogoMap[Providers.Databricks] ?? "",
     tags: ["Decision Model", "Databricks"],
@@ -299,6 +408,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Presidio PII",
     description:
       "Microsoft Presidio for PII detection and anonymization. Supports 30+ entity types with configurable actions.",
+    descriptionKey: "guardrails.gardenCatalog.partner.presidio.description",
     category: "partner",
     logo: guardrailLogoMap["Presidio PII"],
     tags: ["PII", "Microsoft"],
@@ -308,6 +418,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "bedrock",
     name: "Bedrock Guardrail",
     description: "AWS Bedrock Guardrails for content filtering, topic avoidance, and sensitive information detection.",
+    descriptionKey: "guardrails.gardenCatalog.partner.bedrock.description",
     category: "partner",
     logo: guardrailLogoMap["Bedrock Guardrail"],
     tags: ["AWS", "Content Safety"],
@@ -317,6 +428,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "lakera",
     name: "Lakera",
     description: "AI security platform protecting against prompt injections, data leakage, and harmful content.",
+    descriptionKey: "guardrails.gardenCatalog.partner.lakera.description",
     category: "partner",
     logo: guardrailLogoMap["Lakera"],
     tags: ["Security", "Prompt Injection"],
@@ -326,6 +438,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "openai_moderation",
     name: "OpenAI Moderation",
     description: "OpenAI's content moderation API for detecting harmful content across multiple categories.",
+    descriptionKey: "guardrails.gardenCatalog.partner.openaiModeration.description",
     category: "partner",
     logo: guardrailLogoMap["OpenAI Moderation"],
     tags: ["Content Moderation", "OpenAI"],
@@ -334,6 +447,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "google_model_armor",
     name: "Google Cloud Model Armor",
     description: "Google Cloud's model protection service for safe and responsible AI deployments.",
+    descriptionKey: "guardrails.gardenCatalog.partner.googleModelArmor.description",
     category: "partner",
     logo: guardrailLogoMap["Google Cloud Model Armor"],
     tags: ["Google Cloud", "Safety"],
@@ -342,6 +456,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "guardrails_ai",
     name: "Guardrails AI",
     description: "Open-source framework for adding structural, type, and quality guarantees to LLM outputs.",
+    descriptionKey: "guardrails.gardenCatalog.partner.guardrailsAi.description",
     category: "partner",
     logo: guardrailLogoMap["Guardrails AI"],
     tags: ["Open Source", "Validation"],
@@ -350,6 +465,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "zscaler",
     name: "Zscaler AI Guard",
     description: "Enterprise AI security from Zscaler for monitoring and protecting AI/ML workloads.",
+    descriptionKey: "guardrails.gardenCatalog.partner.zscaler.description",
     category: "partner",
     logo: guardrailLogoMap["Zscaler AI Guard"],
     tags: ["Enterprise", "Security"],
@@ -358,6 +474,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "panw",
     name: "PANW Prisma AIRS",
     description: "Palo Alto Networks Prisma AI Runtime Security for securing AI applications in production.",
+    descriptionKey: "guardrails.gardenCatalog.partner.panw.description",
     category: "partner",
     logo: guardrailLogoMap["PANW Prisma AIRS"],
     tags: ["Enterprise", "Security"],
@@ -367,6 +484,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Cisco AI Defense",
     description:
       "Cisco AI Defense Inspection API for runtime protection: prompt injection, PII/PCI/PHI, harassment, hate speech, profanity, violence, and code detection.",
+    descriptionKey: "guardrails.gardenCatalog.partner.ciscoAiDefense.description",
     category: "partner",
     logo: guardrailLogoMap["Cisco AI Defense"],
     tags: ["Enterprise", "Security", "Prompt Injection", "PII"],
@@ -376,6 +494,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "noma",
     name: "Noma Security",
     description: "AI security platform for detecting and preventing AI-specific threats and vulnerabilities.",
+    descriptionKey: "guardrails.gardenCatalog.partner.noma.description",
     category: "partner",
     logo: guardrailLogoMap["Noma Security"],
     tags: ["Security", "Threat Detection"],
@@ -384,6 +503,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "aporia",
     name: "Aporia AI",
     description: "Real-time AI guardrails for hallucination detection, topic control, and policy enforcement.",
+    descriptionKey: "guardrails.gardenCatalog.partner.aporia.description",
     category: "partner",
     logo: guardrailLogoMap["Aporia AI"],
     tags: ["Hallucination", "Policy"],
@@ -392,6 +512,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "aim",
     name: "AIM Guardrail",
     description: "AIM Security guardrails for comprehensive AI threat detection and mitigation.",
+    descriptionKey: "guardrails.gardenCatalog.partner.aim.description",
     category: "partner",
     logo: guardrailLogoMap["AIM Guardrail"],
     tags: ["Security", "Threat Detection"],
@@ -400,6 +521,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "cato_networks",
     name: "Cato Networks Guardrail",
     description: "Cato Networks guardrails for comprehensive AI threat detection and mitigation.",
+    descriptionKey: "guardrails.gardenCatalog.partner.catoNetworks.description",
     category: "partner",
     logo: guardrailLogoMap["Cato Networks Guardrail"],
     tags: ["Security", "Threat Detection"],
@@ -408,6 +530,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "prompt_security",
     name: "Prompt Security",
     description: "Protect against prompt injection attacks, data leakage, and other LLM security threats.",
+    descriptionKey: "guardrails.gardenCatalog.partner.promptSecurity.description",
     category: "partner",
     logo: guardrailLogoMap["Prompt Security"],
     tags: ["Prompt Injection", "Security"],
@@ -416,6 +539,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "lasso",
     name: "Lasso Guardrail",
     description: "Content moderation and safety guardrails for responsible AI deployments.",
+    descriptionKey: "guardrails.gardenCatalog.partner.lasso.description",
     category: "partner",
     logo: guardrailLogoMap["Lasso Guardrail"],
     tags: ["Content Moderation"],
@@ -424,6 +548,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "pangea",
     name: "Pangea Guardrail",
     description: "Pangea's AI guardrails for secure, compliant, and trustworthy AI applications.",
+    descriptionKey: "guardrails.gardenCatalog.partner.pangea.description",
     category: "partner",
     logo: guardrailLogoMap["Pangea Guardrail"],
     tags: ["Compliance", "Security"],
@@ -432,6 +557,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "enkryptai",
     name: "EnkryptAI",
     description: "AI security and governance platform for enterprise AI safety and compliance.",
+    descriptionKey: "guardrails.gardenCatalog.partner.enkryptai.description",
     category: "partner",
     logo: guardrailLogoMap["EnkryptAI"],
     tags: ["Enterprise", "Governance"],
@@ -440,6 +566,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "javelin",
     name: "Javelin Guardrails",
     description: "AI gateway with built-in guardrails for secure and compliant AI operations.",
+    descriptionKey: "guardrails.gardenCatalog.partner.javelin.description",
     category: "partner",
     logo: guardrailLogoMap["Javelin Guardrails"],
     tags: ["Gateway", "Security"],
@@ -448,6 +575,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "pillar",
     name: "Pillar Guardrail",
     description: "AI safety platform for monitoring, testing, and securing AI systems.",
+    descriptionKey: "guardrails.gardenCatalog.partner.pillar.description",
     category: "partner",
     logo: guardrailLogoMap["Pillar Guardrail"],
     tags: ["Monitoring", "Safety"],
@@ -456,6 +584,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     id: "akto",
     name: "Akto Guardrail",
     description: "AI security platform from Akto.io with automatic monitoring and guardrails for AI/ML applications.",
+    descriptionKey: "guardrails.gardenCatalog.partner.akto.description",
     category: "partner",
     logo: guardrailLogoMap["Akto"],
     tags: ["Security", "Safety", "Monitoring"],
@@ -465,6 +594,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "PromptGuard",
     description:
       "AI security gateway with prompt injection detection, PII redaction, topic filtering, entity blocklists, and hallucination detection. Self-hostable with drop-in proxy integration.",
+    descriptionKey: "guardrails.gardenCatalog.partner.promptguard.description",
     category: "partner",
     logo: guardrailLogoMap["PromptGuard"],
     tags: ["Security", "Prompt Injection", "PII"],
@@ -482,6 +612,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "XecGuard",
     description:
       "CyCraft XecGuard AI security gateway. Multi-policy scanning (prompt injection, harmful content, PII, system-prompt enforcement) plus RAG context grounding.",
+    descriptionKey: "guardrails.gardenCatalog.partner.xecguard.description",
     category: "partner",
     logo: guardrailLogoMap["XecGuard"],
     tags: ["Security", "Policy", "Grounding", "RAG"],
@@ -492,6 +623,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "DeepKeep AI Firewall",
     description:
       "DeepKeep AI Firewall for comprehensive LLM security — prompt injection detection, PII protection, content moderation, and policy enforcement with configurable guardrail pipelines.",
+    descriptionKey: "guardrails.gardenCatalog.partner.deepkeep.description",
     category: "partner",
     logo: guardrailLogoMap["DeepKeep AI Firewall"],
     tags: ["Security", "Prompt Injection", "PII", "Firewall"],
@@ -502,6 +634,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "RepelloAI Argus",
     description:
       "RepelloAI Argus scans prompts and responses against policies configured per asset in the Repello dashboard.",
+    descriptionKey: "guardrails.gardenCatalog.partner.repelloai.description",
     category: "partner",
     logo: guardrailLogoMap["RepelloAI Argus"],
     tags: ["Security", "Policy", "Prompt Injection"],
@@ -512,6 +645,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Straiker",
     description:
       "Defend AI Agentic Guardrails: Indirect/Direct Prompt Injection, Tool Misuse, Malicious MCP and Skills",
+    descriptionKey: "guardrails.gardenCatalog.partner.straiker.description",
     category: "partner",
     logo: guardrailLogoMap["Straiker"],
     tags: ["Agentic", "Prompt Injection", "Tool Misuse", "MCP", "Skills"],
@@ -522,6 +656,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Alice",
     description:
       "Policy-based guardrails for prompts and model responses, evaluated per application so one proxy can enforce a different policy set per team or product.",
+    descriptionKey: "guardrails.gardenCatalog.partner.alice.description",
     category: "partner",
     logo: guardrailLogoMap["Alice"],
     tags: ["Content Moderation", "Prompt Injection", "PII", "Policy"],
@@ -532,6 +667,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Microsoft Agent 365",
     description:
       "Microsoft Agent 365 tool-call governance: Defender threat evaluation and observability for MCP tool calls, acting on behalf of the signed-in user",
+    descriptionKey: "guardrails.gardenCatalog.partner.agent365.description",
     category: "partner",
     logo: guardrailLogoMap["Microsoft Agent 365"],
     tags: ["Agentic", "MCP", "Tool Misuse", "Observability"],
@@ -542,6 +678,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "LLM Shield Proxy",
     description:
       "Self-hosted PII redaction that puts the original values back into the model's response, so the provider never receives personal data while the end user still sees it.",
+    descriptionKey: "guardrails.gardenCatalog.partner.llmShieldProxy.description",
     category: "partner",
     logo: guardrailLogoMap["LLM Shield Proxy"],
     tags: ["PII", "Data Privacy", "Compliance", "Streaming"],
@@ -552,6 +689,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Conduct Guard",
     description:
       "Conduct Guard evaluates prompts against workspace rules before the model call: prompt injection, PII, and custom policies, with block, warning, and approval verdicts.",
+    descriptionKey: "guardrails.gardenCatalog.partner.conduct.description",
     category: "partner",
     logo: guardrailLogoMap["Conduct Guard"],
     tags: ["Security", "Prompt Injection", "PII", "Policy"],
@@ -562,6 +700,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Wingback",
     description:
       "Wingback runtime security for LiteLLM — PII detection, prompt injection, toxic content, and policy enforcement via the Wingback connectors service.",
+    descriptionKey: "guardrails.gardenCatalog.partner.wingback.description",
     category: "partner",
     logo: guardrailLogoMap["Wingback"],
     tags: ["Security", "PII", "Prompt Injection", "Runtime"],
@@ -572,6 +711,7 @@ export const PARTNER_GUARDRAIL_CARDS: GuardrailCardInfo[] = [
     name: "Airia Guardrail",
     description:
       "Airia AI security and governance platform. Runtime guardrails for prompt injection, data leakage prevention, and responsible AI, enforced on every prompt and response.",
+    descriptionKey: "guardrails.gardenCatalog.partner.airia.description",
     category: "partner",
     logo: guardrailLogoMap["Airia Guardrail"],
     tags: ["Security", "Prompt Injection", "PII", "Secrets", "Redaction"],
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_detail.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_detail.tsx
index e549ebca50a..6cf76adc0ea 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_detail.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_detail.tsx
@@ -1,17 +1,28 @@
 import { useTerminology } from "@/contexts/TerminologyContext";
 import React, { useState } from "react";
+import type { ParseKeys } from "i18next";
+import { useTranslation } from "react-i18next";
 import { ArrowLeft } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/cva.config";
 import AddGuardrailForm from "./add_guardrail_form";
 import { Logo } from "@/components/molecules/logo/Logo";
 import { GUARDRAIL_PRESETS } from "./guardrail_garden_configs";
-import { GuardrailCardInfo } from "./guardrail_garden_data";
+import { GuardrailCardInfo, gardenCardDescription, gardenCardName, gardenTagLabel } from "./guardrail_garden_data";
 
-const CATEGORY_LABELS: Record<GuardrailCardInfo["category"], { provider: string; type: string }> = {
-  litellm: { provider: "LiteLLM Content Filter", type: "Content Filter" },
-  decision_model: { provider: "Decision Model", type: "Decision Model" },
-  partner: { provider: "Partner Guardrail", type: "Partner" },
+const CATEGORY_LABEL_KEYS: Record<GuardrailCardInfo["category"], { provider: ParseKeys; type: ParseKeys }> = {
+  litellm: {
+    provider: "guardrails.gardenDetail.categories.litellm.provider",
+    type: "guardrails.gardenDetail.categories.litellm.type",
+  },
+  decision_model: {
+    provider: "guardrails.gardenDetail.categories.decisionModel.provider",
+    type: "guardrails.gardenDetail.categories.decisionModel.type",
+  },
+  partner: {
+    provider: "guardrails.gardenDetail.categories.partner.provider",
+    type: "guardrails.gardenDetail.categories.partner.type",
+  },
 };
 
 interface GuardrailDetailViewProps {
@@ -22,34 +33,66 @@ interface GuardrailDetailViewProps {
 }
 
 const GuardrailDetailView: React.FC<GuardrailDetailViewProps> = ({ card, onBack, accessToken, onGuardrailCreated }) => {
+  const { t } = useTranslation();
   const term = useTerminology();
+  const name = gardenCardName(card, t);
+  const description = term(gardenCardDescription(card, t));
   const [isAddFormVisible, setIsAddFormVisible] = useState(false);
   const [activeTab, setActiveTab] = useState("overview");
 
   const detailRows = [
-    { property: "Provider", value: CATEGORY_LABELS[card.category].provider },
-    ...(card.subcategory ? [{ property: "Subcategory", value: card.subcategory }] : []),
-    ...(card.category === "decision_model"
-      ? [{ property: "Cost", value: "Billed per call by the decision model provider" }]
+    {
+      property: t("guardrails.gardenDetail.detailRows.provider"),
+      value: t(CATEGORY_LABEL_KEYS[card.category].provider),
+    },
+    ...(card.subcategoryKey
+      ? [{ property: t("guardrails.gardenDetail.detailRows.subcategory"), value: t(card.subcategoryKey) }]
+      : []),
+    ...(card.category === "decision_model"
+      ? [
+          {
+            property: t("guardrails.gardenDetail.detailRows.cost"),
+            value: t("guardrails.gardenDetail.detailValues.decisionModelCost"),
+          },
+        ]
+      : []),
+    ...(card.category === "litellm"
+      ? [
+          {
+            property: t("guardrails.gardenDetail.detailRows.cost"),
+            value: t("guardrails.gardenDetail.detailValues.litellmCost"),
+          },
+        ]
+      : []),
+    ...(card.category === "litellm"
+      ? [
+          {
+            property: t("guardrails.gardenDetail.detailRows.externalDependencies"),
+            value: t("guardrails.gardenDetail.detailValues.noExternalDependencies"),
+          },
+        ]
+      : []),
+    ...(card.category === "litellm"
+      ? [{ property: t("guardrails.gardenDetail.detailRows.latency"), value: card.eval?.latency || "<1ms" }]
       : []),
-    ...(card.category === "litellm" ? [{ property: "Cost", value: "$0 / request" }] : []),
-    ...(card.category === "litellm" ? [{ property: "External Dependencies", value: "None" }] : []),
-    ...(card.category === "litellm" ? [{ property: "Latency", value: card.eval?.latency || "<1ms" }] : []),
   ];
 
   const evalRows = card.eval
     ? [
-        { metric: "Precision", value: `${card.eval.precision}%` },
-        { metric: "Recall", value: `${card.eval.recall}%` },
-        { metric: "F1 Score", value: `${card.eval.f1}%` },
-        { metric: "Test Cases", value: String(card.eval.testCases) },
-        { metric: "False Positives", value: "0" },
-        { metric: "False Negatives", value: "0" },
-        { metric: "Latency (p50)", value: card.eval.latency },
+        { metric: t("guardrails.gardenDetail.evalMetrics.precision"), value: `${card.eval.precision}%` },
+        { metric: t("guardrails.gardenDetail.evalMetrics.recall"), value: `${card.eval.recall}%` },
+        { metric: t("guardrails.gardenDetail.evalMetrics.f1Score"), value: `${card.eval.f1}%` },
+        { metric: t("guardrails.gardenDetail.evalMetrics.testCases"), value: String(card.eval.testCases) },
+        { metric: t("guardrails.gardenDetail.evalMetrics.falsePositives"), value: "0" },
+        { metric: t("guardrails.gardenDetail.evalMetrics.falseNegatives"), value: "0" },
+        { metric: t("guardrails.gardenDetail.evalMetrics.latencyP50"), value: card.eval.latency },
       ]
     : [];
 
-  const tabs = [{ key: "overview", label: "Overview" }, ...(card.eval ? [{ key: "eval", label: "Eval Results" }] : [])];
+  const tabs = [
+    { key: "overview", label: t("guardrails.gardenDetail.tabs.overview") },
+    ...(card.eval ? [{ key: "eval", label: t("guardrails.gardenDetail.tabs.evalResults") }] : []),
+  ];
 
   return (
     <div className="mx-auto max-w-[960px]">
@@ -59,21 +102,21 @@ const GuardrailDetailView: React.FC<GuardrailDetailViewProps> = ({ card, onBack,
         className="mb-6 inline-flex cursor-pointer items-center gap-1.5 text-sm text-muted-foreground"
       >
         <ArrowLeft className="size-3" />
-        <span>{card.name}</span>
+        <span>{name}</span>
       </div>
 
       {/* ── Header block (Vertex-style) ── */}
       <div className="mb-2 flex items-center gap-4">
-        <Logo src={card.logo} label={card.name} className="w-10 h-10 rounded-lg object-contain shrink-0" />
-        <h1 className="m-0 text-[28px] font-normal leading-tight text-foreground">{card.name}</h1>
+        <Logo src={card.logo} label={name} className="w-10 h-10 rounded-lg object-contain shrink-0" />
+        <h1 className="m-0 text-[28px] font-normal leading-tight text-foreground">{name}</h1>
       </div>
 
-      <p className="m-0 mb-5 text-sm leading-relaxed text-muted-foreground">{term(card.description)}</p>
+      <p className="m-0 mb-5 text-sm leading-relaxed text-muted-foreground">{description}</p>
 
       {/* Action buttons — outlined style like Vertex */}
       <div className="mb-8 flex gap-2.5">
         <Button variant="outline" className="rounded-full" onClick={() => setIsAddFormVisible(true)}>
-          Create Guardrail
+          {t("guardrails.gardenDetail.createGuardrail")}
         </Button>
       </div>
 
@@ -102,17 +145,23 @@ const GuardrailDetailView: React.FC<GuardrailDetailViewProps> = ({ card, onBack,
         <div className="flex gap-16">
           {/* Left column — overview + details table */}
           <div className="min-w-0 flex-1">
-            <h2 className="m-0 mb-3 text-lg font-normal text-foreground">Overview</h2>
-            <p className="m-0 mb-8 text-sm leading-[1.7] text-foreground">{term(card.description)}</p>
+            <h2 className="m-0 mb-3 text-lg font-normal text-foreground">
+              {t("guardrails.gardenDetail.overviewHeading")}
+            </h2>
+            <p className="m-0 mb-8 text-sm leading-[1.7] text-foreground">{description}</p>
 
-            <h2 className="m-0 mb-1 text-lg font-normal text-foreground">Guardrail Details</h2>
-            <p className="m-0 mb-4 text-[13px] text-muted-foreground">Details are as follows</p>
+            <h2 className="m-0 mb-1 text-lg font-normal text-foreground">
+              {t("guardrails.gardenDetail.detailsHeading")}
+            </h2>
+            <p className="m-0 mb-4 text-[13px] text-muted-foreground">{t("guardrails.gardenDetail.detailsSubtitle")}</p>
 
             <table className="w-full border-collapse text-sm">
               <thead>
                 <tr className="border-b border-border">
-                  <th className="w-50 py-3 text-left font-medium text-muted-foreground">Property</th>
-                  <th className="py-3 text-left font-medium text-muted-foreground">{card.name}</th>
+                  <th className="w-50 py-3 text-left font-medium text-muted-foreground">
+                    {t("guardrails.gardenDetail.propertyColumn")}
+                  </th>
+                  <th className="py-3 text-left font-medium text-muted-foreground">{name}</th>
                 </tr>
               </thead>
               <tbody>
@@ -130,27 +179,27 @@ const GuardrailDetailView: React.FC<GuardrailDetailViewProps> = ({ card, onBack,
           <div className="w-60 shrink-0">
             {/* Guardrail ID */}
             <div className="mb-7">
-              <div className="mb-1 text-xs text-muted-foreground">Guardrail ID</div>
+              <div className="mb-1 text-xs text-muted-foreground">{t("guardrails.gardenDetail.guardrailIdLabel")}</div>
               <div className="break-all text-[13px] text-foreground">litellm/{card.id}</div>
             </div>
 
             {/* Type */}
             <div className="mb-7">
-              <div className="mb-1 text-xs text-muted-foreground">Type</div>
-              <div className="text-[13px] text-foreground">{CATEGORY_LABELS[card.category].type}</div>
+              <div className="mb-1 text-xs text-muted-foreground">{t("guardrails.gardenDetail.typeLabel")}</div>
+              <div className="text-[13px] text-foreground">{t(CATEGORY_LABEL_KEYS[card.category].type)}</div>
             </div>
 
             {/* Tags — pill style like Vertex */}
             {card.tags.length > 0 && (
               <div className="mb-7">
-                <div className="mb-2 text-xs text-muted-foreground">Tags</div>
+                <div className="mb-2 text-xs text-muted-foreground">{t("guardrails.gardenDetail.tagsLabel")}</div>
                 <div className="flex flex-wrap gap-1.5">
                   {card.tags.map((tag) => (
                     <span
                       key={tag}
                       className="rounded-2xl border border-border bg-card px-3 py-1 text-xs text-foreground"
                     >
-                      {tag}
+                      {gardenTagLabel(tag, t)}
                     </span>
                   ))}
                 </div>
@@ -162,12 +211,18 @@ const GuardrailDetailView: React.FC<GuardrailDetailViewProps> = ({ card, onBack,
 
       {activeTab === "eval" && (
         <div>
-          <h2 className="m-0 mb-4 text-lg font-normal text-foreground">Eval Results</h2>
+          <h2 className="m-0 mb-4 text-lg font-normal text-foreground">
+            {t("guardrails.gardenDetail.evalResultsHeading")}
+          </h2>
           <table className="w-full max-w-[560px] border-collapse text-sm">
             <thead>
               <tr className="border-b border-border bg-muted">
-                <th className="px-4 py-3 text-left font-medium text-muted-foreground">Metric</th>
-                <th className="px-4 py-3 text-left font-medium text-muted-foreground">Value</th>
+                <th className="px-4 py-3 text-left font-medium text-muted-foreground">
+                  {t("guardrails.gardenDetail.metricColumn")}
+                </th>
+                <th className="px-4 py-3 text-left font-medium text-muted-foreground">
+                  {t("guardrails.gardenDetail.valueColumn")}
+                </th>
               </tr>
             </thead>
             <tbody>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
index eacacf5e30e..881085d77ef 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
@@ -10,8 +10,10 @@ import { ArrowLeft, Ban, CheckIcon, Code, CopyIcon, EyeOff, Info } from "lucide-
 import { Badge } from "@/components/ui/badge";
 import { Card } from "@/components/ui/card";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import type { ParseKeys } from "i18next";
 import React, { useCallback, useEffect, useLayoutEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import { Logo } from "@/components/molecules/logo/Logo";
 import { FieldGroup } from "@/components/ui/field";
@@ -58,9 +60,9 @@ import GuardrailProviderFields from "./guardrail_provider_fields";
 import PiiConfiguration from "./pii_configuration";
 import ToolPermissionRulesEditor, { ToolPermissionConfig } from "./tool_permission/ToolPermissionRulesEditor";
 
-const DEFAULT_ON_ITEMS = [
-  { label: "Yes", value: true },
-  { label: "No", value: false },
+const DEFAULT_ON_ITEMS: readonly { labelKey: ParseKeys; value: boolean }[] = [
+  { labelKey: "guardrails.info.settings.defaultOnOptions.yes", value: true },
+  { labelKey: "guardrails.info.settings.defaultOnOptions.no", value: false },
 ];
 
 const SectionHeading: React.FC<{ children: React.ReactNode }> = ({ children }) => (
@@ -79,6 +81,7 @@ export interface GuardrailInfoProps {
 }
 
 const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose, onDeleted, accessToken, isAdmin }) => {
+  const { t } = useTranslation();
   const [guardrailData, setGuardrailData] = useState<any>(null);
   const [guardrailProviderSpecificParams, setGuardrailProviderSpecificParams] = useState<any>(null);
   const [loading, setLoading] = useState(true);
@@ -193,7 +196,7 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
         setSelectedPiiActions({});
       }
     } catch (error) {
-      toast.fromError("Failed to load guardrail information");
+      toast.fromError(t("guardrails.info.toasts.loadFailed"));
       console.error("Error fetching guardrail info:", error);
     } finally {
       setLoading(false);
@@ -486,19 +489,19 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
 
       // Only proceed with update if there are actual changes
       if (Object.keys(updateData).length === 0) {
-        toast.info("No changes detected");
+        toast.info(t("guardrails.info.toasts.noChanges"));
         setIsEditing(false);
         return;
       }
 
       await updateGuardrailCall(accessToken, guardrailId, updateData);
-      toast.success("Guardrail updated successfully");
+      toast.success(t("guardrails.info.toasts.updated"));
       setHasUnsavedContentFilterChanges(false);
       fetchGuardrailInfo();
       setIsEditing(false);
     } catch (error) {
       console.error("Error updating guardrail:", error);
-      toast.fromError("Failed to update guardrail");
+      toast.fromError(t("guardrails.info.toasts.updateFailed"));
     }
   };
 
@@ -511,18 +514,23 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
   const submitLatest = useCallback((values: GuardrailFormValues) => submitRef.current(values), []);
 
   if (loading) {
-    return <div className="p-4">Loading...</div>;
+    return <div className="p-4">{t("guardrails.info.loading")}</div>;
   }
 
   const backButton = (
     <Button variant="ghost" onClick={onClose} className="mb-4">
       <ArrowLeft className="w-4 h-4" />
-      Back to Guardrails
+      {t("guardrails.info.back")}
     </Button>
   );
 
   if (!guardrailData) {
-    return <div className="p-4">{backButton}Guardrail not found</div>;
+    return (
+      <div className="p-4">
+        {backButton}
+        {t("guardrails.info.notFound")}
+      </div>
+    );
   }
 
   const formatDate = (dateString?: string) => (dateString ? new Date(dateString).toLocaleString() : "-");
@@ -546,7 +554,7 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
     <div className="p-4">
       <div>
         {backButton}
-        <h1 className="text-2xl font-semibold">{guardrailData.guardrail_name || "Unnamed Guardrail"}</h1>
+        <h1 className="text-2xl font-semibold">{guardrailData.guardrail_name || t("guardrails.info.unnamed")}</h1>
         <div className="flex items-center cursor-pointer">
           <p className="text-muted-foreground font-mono">{guardrailData.guardrail_id}</p>
 
@@ -568,11 +576,11 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
       <Tabs defaultValue="overview">
         <TabsList variant="line" className="mb-4 h-auto w-full justify-start rounded-none border-b p-0">
           <TabsTrigger value="overview" className="flex-none rounded-none px-4 py-2">
-            Overview
+            {t("guardrails.info.tabs.overview")}
           </TabsTrigger>
           {isAdmin && (
             <TabsTrigger value="settings" className="flex-none rounded-none px-4 py-2">
-              Settings
+              {t("guardrails.info.tabs.settings")}
             </TabsTrigger>
           )}
         </TabsList>
@@ -582,7 +590,7 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
           <TabsContent value="overview" keepMounted>
             <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
               <Card className="block p-6">
-                <p>Provider</p>
+                <p>{t("guardrails.info.overview.provider")}</p>
                 <div className="mt-2 flex items-center space-x-2">
                   <Logo src={logo} label={displayName} className="w-6 h-6" />
                   <h3 className="text-lg font-medium">{displayName}</h3>
@@ -593,10 +601,12 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
               <GuardrailStreamScopeCaption raw={guardrailData.litellm_params?.stream_scope} />
 
               <Card className="block p-6">
-                <p>Created At</p>
+                <p>{t("guardrails.info.overview.createdAt")}</p>
                 <div className="mt-2">
                   <h3 className="text-lg font-medium">{formatDate(guardrailData.created_at)}</h3>
-                  <p>Last Updated: {formatDate(guardrailData.updated_at)}</p>
+                  <p>
+                    {t("guardrails.info.overview.lastUpdated")} {formatDate(guardrailData.updated_at)}
+                  </p>
                 </div>
               </Card>
             </div>
@@ -605,9 +615,12 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
               Object.keys(guardrailData.litellm_params.pii_entities_config).length > 0 && (
                 <Card className="block mt-6 p-6">
                   <div className="flex justify-between items-center">
-                    <p className="font-medium">PII Protection</p>
+                    <p className="font-medium">{t("guardrails.info.overview.piiProtection")}</p>
                     <Badge variant="secondary">
-                      {Object.keys(guardrailData.litellm_params.pii_entities_config).length} PII entities configured
+                      {Object.keys(guardrailData.litellm_params.pii_entities_config).length}{" "}
+                      {t("guardrails.info.overview.piiEntitiesConfigured", {
+                        count: Object.keys(guardrailData.litellm_params.pii_entities_config).length,
+                      })}
                     </Badge>
                   </div>
                 </Card>
@@ -616,11 +629,13 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
             {guardrailData.litellm_params?.pii_entities_config &&
               Object.keys(guardrailData.litellm_params.pii_entities_config).length > 0 && (
                 <Card className="block mt-6 p-6">
-                  <p className="mb-4 text-lg font-semibold">PII Entity Configuration</p>
+                  <p className="mb-4 text-lg font-semibold">{t("guardrails.info.overview.piiEntityConfiguration")}</p>
                   <div className="border rounded-lg overflow-hidden shadow-xs">
                     <div className="bg-muted px-5 py-3 border-b flex">
-                      <p className="flex-1 font-semibold text-foreground">Entity Type</p>
-                      <p className="flex-1 font-semibold text-foreground">Configuration</p>
+                      <p className="flex-1 font-semibold text-foreground">{t("guardrails.info.overview.entityType")}</p>
+                      <p className="flex-1 font-semibold text-foreground">
+                        {t("guardrails.info.overview.configuration")}
+                      </p>
                     </div>
                     <div className="max-h-[400px] overflow-y-auto">
                       {Object.entries(guardrailData.litellm_params?.pii_entities_config).map(([key, value]) => (
@@ -655,12 +670,12 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                 <div className="flex justify-between items-center mb-4">
                   <div className="flex items-center gap-2">
                     <Code className="text-info" />
-                    <p className="font-medium text-lg">Custom Code</p>
+                    <p className="font-medium text-lg">{t("guardrails.info.overview.customCode")}</p>
                   </div>
                   {isAdmin && !isConfigGuardrail && (
                     <Button variant="outline" size="sm" onClick={() => setCustomCodeModalVisible(true)}>
                       <Code />
-                      Edit Code
+                      {t("guardrails.info.overview.editCode")}
                     </Button>
                   )}
                 </div>
@@ -689,10 +704,14 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
             <TabsContent value="settings" keepMounted>
               <Card className="block p-6">
                 <div className="flex items-center gap-2 mb-4">
-                  <h3 className="mr-auto text-lg font-medium">Guardrail Settings</h3>
+                  <h3 className="mr-auto text-lg font-medium">{t("guardrails.info.settings.heading")}</h3>
                   {isConfigGuardrail && (
-                    <SimpleTooltip content="Guardrail is defined in the config file and cannot be edited.">
-                      <Info role="img" aria-label="Config guardrail details" className="size-4 text-muted-foreground" />
+                    <SimpleTooltip content={t("guardrails.info.settings.configTooltip")}>
+                      <Info
+                        role="img"
+                        aria-label={t("guardrails.info.settings.configDetailsLabel")}
+                        className="size-4 text-muted-foreground"
+                      />
                     </SimpleTooltip>
                   )}
                   <GuardrailSettingsActions
@@ -713,18 +732,27 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                         <GuardrailField
                           control={form.control}
                           name="guardrail_name"
-                          label="Guardrail Name"
-                          rules={requiredRule("Please input a guardrail name")}
+                          label={t("guardrails.info.settings.nameLabel")}
+                          rules={requiredRule(t("guardrails.info.settings.nameRequired"))}
                         >
                           {({ ref, value, ...field }) => (
-                            <Input {...field} ref={ref} value={asText(value)} placeholder="Enter guardrail name" />
+                            <Input
+                              {...field}
+                              ref={ref}
+                              value={asText(value)}
+                              placeholder={t("guardrails.info.settings.namePlaceholder")}
+                            />
                           )}
                         </GuardrailField>
 
-                        <GuardrailField control={form.control} name="default_on" label="Default On">
+                        <GuardrailField
+                          control={form.control}
+                          name="default_on"
+                          label={t("guardrails.info.settings.defaultOnLabel")}
+                        >
                           {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": describedBy }) => (
                             <Select
-                              items={DEFAULT_ON_ITEMS}
+                              items={DEFAULT_ON_ITEMS.map(({ labelKey, value }) => ({ label: t(labelKey), value }))}
                               value={typeof value === "boolean" ? value : null}
                               onValueChange={(next: boolean | null) => onChange(next)}
                             >
@@ -734,11 +762,15 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                                 aria-describedby={describedBy}
                                 className="w-full"
                               >
-                                <SelectValue placeholder="Select an option" />
+                                <SelectValue placeholder={t("guardrails.info.settings.defaultOnPlaceholder")} />
                               </SelectTrigger>
                               <SelectContent>
-                                <SelectItem value={true}>Yes</SelectItem>
-                                <SelectItem value={false}>No</SelectItem>
+                                <SelectItem value={true}>
+                                  {t("guardrails.info.settings.defaultOnOptions.yes")}
+                                </SelectItem>
+                                <SelectItem value={false}>
+                                  {t("guardrails.info.settings.defaultOnOptions.no")}
+                                </SelectItem>
                               </SelectContent>
                             </Select>
                           )}
@@ -753,8 +785,8 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                           control={form.control}
                           name="skip_system_message_choice"
                           label={labelWithHint(
-                            "Skip system messages in guardrail",
-                            "Unified guardrails: omit role: system from guardrail input (LLM still gets full messages). Use global default follows litellm_settings.skip_system_message_in_guardrail.",
+                            t("guardrails.info.settings.skipSystemMessagesLabel"),
+                            t("guardrails.info.settings.skipSystemMessagesHint"),
                           )}
                         >
                           {(fieldControl) => <SkipMessageSelect control={fieldControl} />}
@@ -764,8 +796,8 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                           control={form.control}
                           name="skip_tool_message_choice"
                           label={labelWithHint(
-                            "Skip tool messages in guardrail",
-                            "Unified guardrails: omit role: tool from guardrail input (LLM still gets full messages). Use global default follows litellm_settings.skip_tool_message_in_guardrail.",
+                            t("guardrails.info.settings.skipToolMessagesLabel"),
+                            t("guardrails.info.settings.skipToolMessagesHint"),
                           )}
                         >
                           {(fieldControl) => <SkipMessageSelect control={fieldControl} />}
@@ -777,7 +809,7 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                         />
                         {guardrailData.litellm_params?.guardrail === "presidio" && (
                           <>
-                            <SectionHeading>PII Protection</SectionHeading>
+                            <SectionHeading>{t("guardrails.info.settings.sections.piiProtection")}</SectionHeading>
                             <div className="mb-6">
                               {guardrailSettings && (
                                 <PiiConfiguration
@@ -804,7 +836,9 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                         />
 
                         {(guardrailData.litellm_params?.guardrail === "tool_permission" ||
-                          guardrailProviderSpecificParams) && <SectionHeading>Provider Settings</SectionHeading>}
+                          guardrailProviderSpecificParams) && (
+                          <SectionHeading>{t("guardrails.info.settings.sections.providerSettings")}</SectionHeading>
+                        )}
 
                         {guardrailData.litellm_params?.guardrail === "tool_permission" ? (
                           <ToolPermissionRulesEditor value={toolPermissionConfig} onChange={setToolPermissionConfig} />
@@ -848,8 +882,12 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                           </>
                         )}
 
-                        <SectionHeading>Advanced Settings</SectionHeading>
-                        <GuardrailField control={form.control} name="guardrail_info" label="Guardrail Information">
+                        <SectionHeading>{t("guardrails.info.settings.sections.advancedSettings")}</SectionHeading>
+                        <GuardrailField
+                          control={form.control}
+                          name="guardrail_info"
+                          label={t("guardrails.info.settings.guardrailInfoLabel")}
+                        >
                           {({ ref, value, ...field }) => (
                             <Textarea {...field} ref={ref} value={asText(value)} rows={5} />
                           )}
@@ -865,9 +903,9 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                               resetToolPermissionEditor();
                             }}
                           >
-                            Cancel
+                            {t("guardrails.info.settings.cancel")}
                           </Button>
-                          <Button type="submit">Save Changes</Button>
+                          <Button type="submit">{t("guardrails.info.settings.save")}</Button>
                         </div>
                       </FieldGroup>
                     </form>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info_helpers.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info_helpers.tsx
index 6c4bb8c4313..c22e1e5a90d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info_helpers.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info_helpers.tsx
@@ -1,3 +1,5 @@
+import type { ParseKeys, TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
 import airiaLogo from "../../../../../public/assets/logos/airia.svg";
 import aimSecurityLogo from "../../../../../public/assets/logos/aim_security.jpeg";
 import aktoLogo from "../../../../../public/assets/logos/akto.svg";
@@ -133,10 +135,10 @@ export const normalizeLoggingOnlyScopeChoice = (
   directionalScopeSupported: boolean,
 ): LoggingOnlyScopeChoice => (directionalScopeSupported || choice === "default" ? choice : "default");
 
-const LOGGING_ONLY_SCOPE_OPTIONS: LoggingOnlyScopeOption[] = [
-  { label: "Default (request and response)", value: "default" },
-  { label: "Input only (request)", value: "input" },
-  { label: "Output only (response)", value: "output" },
+const LOGGING_ONLY_SCOPE_OPTIONS: { labelKey: ParseKeys; value: LoggingOnlyScopeChoice }[] = [
+  { labelKey: "guardrails.modeOptions.loggingOnlyScope.default", value: "default" },
+  { labelKey: "guardrails.modeOptions.loggingOnlyScope.input", value: "input" },
+  { labelKey: "guardrails.modeOptions.loggingOnlyScope.output", value: "output" },
 ];
 
 export const loggingOnlyScopeToChoice = (v: string | null | undefined): LoggingOnlyScopeChoice =>
@@ -185,10 +187,10 @@ export const getLoggingOnlyScopeUpdate = (
   };
 };
 
-export const formatLoggingOnlyScope = (v: string | null | undefined): string => {
-  if (v === "input") return "Input only (request)";
-  if (v === "output") return "Output only (response)";
-  return "Default (request and response)";
+export const formatLoggingOnlyScope = (v: string | null | undefined, t: TFunction = i18n.t.bind(i18n)): string => {
+  if (v === "input") return t("guardrails.modeOptions.loggingOnlyScope.input");
+  if (v === "output") return t("guardrails.modeOptions.loggingOnlyScope.output");
+  return t("guardrails.modeOptions.loggingOnlyScope.default");
 };
 
 export const modeIncludesLoggingOnly = (raw: unknown): boolean => {
@@ -203,10 +205,13 @@ export const modeIncludesLoggingOnly = (raw: unknown): boolean => {
   return toModeArray(fallback).includes("logging_only") || taggedModes;
 };
 
-export const getLoggingOnlyScopeOptions = (directionalScopeSupported: boolean): LoggingOnlyScopeOption[] =>
-  directionalScopeSupported
-    ? LOGGING_ONLY_SCOPE_OPTIONS
-    : LOGGING_ONLY_SCOPE_OPTIONS.filter((option) => option.value === "default");
+export const getLoggingOnlyScopeOptions = (
+  directionalScopeSupported: boolean,
+  t: TFunction = i18n.t.bind(i18n),
+): LoggingOnlyScopeOption[] =>
+  LOGGING_ONLY_SCOPE_OPTIONS.filter((option) => directionalScopeSupported || option.value === "default").map(
+    ({ labelKey, value }) => ({ label: t(labelKey), value }),
+  );
 
 export const supportsDirectionalLoggingOnlyScope = (
   settings: { providers_without_directional_logging_only_scope?: string[] } | null,
@@ -392,10 +397,10 @@ export function choiceToSkipToolForCreate(choice: SkipToolMessageChoice | undefi
 export const GUARDRAIL_STREAM_SCOPES = ["both", "streaming", "non_streaming"] as const;
 export type GuardrailStreamScope = (typeof GUARDRAIL_STREAM_SCOPES)[number];
 
-export const STREAM_SCOPE_OPTIONS: { value: GuardrailStreamScope; label: string }[] = [
-  { value: "both", label: "Streaming and non-streaming" },
-  { value: "streaming", label: "Streaming only" },
-  { value: "non_streaming", label: "Non-streaming only" },
+export const STREAM_SCOPE_OPTIONS: { value: GuardrailStreamScope; labelKey: ParseKeys }[] = [
+  { value: "both", labelKey: "guardrails.modeOptions.streamScope.both" },
+  { value: "streaming", labelKey: "guardrails.modeOptions.streamScope.streaming" },
+  { value: "non_streaming", labelKey: "guardrails.modeOptions.streamScope.nonStreaming" },
 ];
 
 export const isGuardrailStreamScope = (value: unknown): value is GuardrailStreamScope =>
@@ -427,16 +432,17 @@ export const streamScopePayload = (
   return Object.fromEntries(Object.entries(perMode).filter((entry) => entry[1] !== "both"));
 };
 
-export const formatGuardrailStreamScope = (raw: unknown): string => {
+export const formatGuardrailStreamScope = (raw: unknown, t: TFunction = i18n.t.bind(i18n)): string => {
   if (isGuardrailStreamScope(raw)) {
-    return STREAM_SCOPE_OPTIONS.find((option) => option.value === raw)?.label ?? raw;
+    const option = STREAM_SCOPE_OPTIONS.find((candidate) => candidate.value === raw);
+    return option ? t(option.labelKey) : raw;
   }
   if (raw !== null && typeof raw === "object" && !Array.isArray(raw)) {
     const entries = Object.entries(raw as Record<string, unknown>).filter(
       (entry): entry is [string, GuardrailStreamScope] => isGuardrailStreamScope(entry[1]),
     );
     if (entries.length === 0) return "";
-    return entries.map(([mode, scope]) => `${mode}: ${formatGuardrailStreamScope(scope)}`).join(", ");
+    return entries.map(([mode, scope]) => `${mode}: ${formatGuardrailStreamScope(scope, t)}`).join(", ");
   }
   return "";
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_optional_params.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_optional_params.tsx
index 78077b0e768..de49132376e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_optional_params.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_optional_params.tsx
@@ -1,4 +1,6 @@
+import type { ParseKeys } from "i18next";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { MultiSelect } from "@/components/shared/MultiSelect";
 import { PasswordInput } from "@/components/shared/PasswordInput";
 import NumericalInput from "@/components/shared/numerical_input";
@@ -41,9 +43,9 @@ interface DictFieldProps {
   value: unknown;
 }
 
-const BOOLEAN_ITEMS = [
-  { label: "True", value: true },
-  { label: "False", value: false },
+const BOOLEAN_ITEMS: { labelKey: ParseKeys; value: boolean }[] = [
+  { labelKey: "guardrails.optionalParams.boolean.true", value: true },
+  { labelKey: "guardrails.optionalParams.boolean.false", value: false },
 ];
 
 const isSecretKey = (fieldKey: string): boolean =>
@@ -59,11 +61,13 @@ const BooleanSelect: React.FC<{ control: GuardrailFieldControlProps; placeholder
   control,
   placeholder,
 }) => {
+  const { t } = useTranslation();
   const { id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy } = control;
+  const items = BOOLEAN_ITEMS.map(({ labelKey, value: itemValue }) => ({ label: t(labelKey), value: itemValue }));
 
   return (
     <Select
-      items={BOOLEAN_ITEMS}
+      items={items}
       value={typeof value === "boolean" ? value : null}
       onValueChange={(next: boolean | null) => onChange(next)}
     >
@@ -71,14 +75,15 @@ const BooleanSelect: React.FC<{ control: GuardrailFieldControlProps; placeholder
         <SelectValue placeholder={placeholder} />
       </SelectTrigger>
       <SelectContent>
-        <SelectItem value={true}>True</SelectItem>
-        <SelectItem value={false}>False</SelectItem>
+        <SelectItem value={true}>{t("guardrails.optionalParams.boolean.true")}</SelectItem>
+        <SelectItem value={false}>{t("guardrails.optionalParams.boolean.false")}</SelectItem>
       </SelectContent>
     </Select>
   );
 };
 
 const DictField: React.FC<DictFieldProps> = ({ field, fullFieldKey, control, value }) => {
+  const { t } = useTranslation();
   const [selectedEntries, setSelectedEntries] = React.useState<Array<{ key: string; id: string }>>([]);
   const [availableKeys, setAvailableKeys] = React.useState<string[]>(field.dict_key_options || []);
 
@@ -133,7 +138,7 @@ const DictField: React.FC<DictFieldProps> = ({ field, fullFieldKey, control, val
                     id={fieldControl.id}
                     name={fieldControl.name}
                     step={1}
-                    placeholder={`Enter ${entry.key} value`}
+                    placeholder={t("guardrails.optionalParams.dict.enterValue", { name: entry.key })}
                     value={asText(fieldControl.value)}
                     onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
                       fieldControl.onChange(toNumberValue(event.target.value))
@@ -146,7 +151,12 @@ const DictField: React.FC<DictFieldProps> = ({ field, fullFieldKey, control, val
               }
 
               if (field.dict_value_type === "boolean") {
-                return <BooleanSelect control={fieldControl} placeholder={`Select ${entry.key} value`} />;
+                return (
+                  <BooleanSelect
+                    control={fieldControl}
+                    placeholder={t("guardrails.optionalParams.dict.selectValue", { name: entry.key })}
+                  />
+                );
               }
 
               return (
@@ -154,7 +164,7 @@ const DictField: React.FC<DictFieldProps> = ({ field, fullFieldKey, control, val
                   id={fieldControl.id}
                   name={fieldControl.name}
                   ref={fieldControl.ref}
-                  placeholder={`Enter ${entry.key} value`}
+                  placeholder={t("guardrails.optionalParams.dict.enterValue", { name: entry.key })}
                   value={asText(fieldControl.value)}
                   onChange={fieldControl.onChange}
                   onBlur={fieldControl.onBlur}
@@ -170,7 +180,7 @@ const DictField: React.FC<DictFieldProps> = ({ field, fullFieldKey, control, val
             className="text-destructive hover:text-destructive/80"
             onClick={() => removeEntry(entry.id, entry.key)}
           >
-            Remove
+            {t("guardrails.optionalParams.dict.remove")}
           </Button>
         </div>
       ))}
@@ -184,7 +194,7 @@ const DictField: React.FC<DictFieldProps> = ({ field, fullFieldKey, control, val
             onValueChange={(next: string | null) => next && addEntry(next)}
           >
             <SelectTrigger className="w-50">
-              <SelectValue placeholder="Select category to configure" />
+              <SelectValue placeholder={t("guardrails.optionalParams.dict.keyPlaceholder")} />
             </SelectTrigger>
             <SelectContent>
               {availableKeys.map((key) => (
@@ -194,7 +204,7 @@ const DictField: React.FC<DictFieldProps> = ({ field, fullFieldKey, control, val
               ))}
             </SelectContent>
           </Select>
-          <span className="text-sm text-muted-foreground">Select a category to add threshold configuration</span>
+          <span className="text-sm text-muted-foreground">{t("guardrails.optionalParams.dict.addHint")}</span>
         </div>
       )}
     </div>
@@ -297,6 +307,7 @@ const GuardrailOptionalParams: React.FC<GuardrailOptionalParamsProps> = ({
   control,
   values,
 }) => {
+  const { t } = useTranslation();
   const renderField = (fieldKey: string, field: ProviderParam) => {
     const fullFieldKey = `${parentFieldKey}.${fieldKey}`;
     const value = values?.[fieldKey];
@@ -318,7 +329,11 @@ const GuardrailOptionalParams: React.FC<GuardrailOptionalParamsProps> = ({
           name={fullFieldKey}
           label={<span className="text-base">{fieldKey}</span>}
           description={field.description}
-          rules={field.required ? requiredRule(`${fieldKey} is required`) : undefined}
+          rules={
+            field.required
+              ? requiredRule(t("guardrails.optionalParams.errors.required", { field: fieldKey }))
+              : undefined
+          }
           defaultValue={value !== undefined ? value : field.default_value}
         >
           {(fieldControl) => <OptionalParamInput descriptor={field} fieldKey={fieldKey} control={fieldControl} />}
@@ -334,9 +349,9 @@ const GuardrailOptionalParams: React.FC<GuardrailOptionalParamsProps> = ({
   return (
     <div className="guardrail-optional-params">
       <div className="mb-8 border-b border-border pb-4">
-        <h3 className="mb-2 text-lg font-semibold text-foreground">Optional Parameters</h3>
+        <h3 className="mb-2 text-lg font-semibold text-foreground">{t("guardrails.optionalParams.title")}</h3>
         <p className="text-sm text-muted-foreground">
-          {optionalParams.description || "Configure additional settings for this guardrail provider"}
+          {optionalParams.description || t("guardrails.optionalParams.defaultDescription")}
         </p>
       </div>
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_provider_fields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_provider_fields.tsx
index 7d48da89ebf..312fb36ac11 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_provider_fields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_provider_fields.tsx
@@ -1,4 +1,6 @@
+import type { ParseKeys, TFunction } from "i18next";
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import {
   guardrail_provider_map,
   populateGuardrailProviders,
@@ -55,9 +57,9 @@ interface ProviderParamsResponse {
   [provider: string]: { [key: string]: ProviderParam };
 }
 
-const BOOLEAN_ITEMS = [
-  { label: "True", value: true },
-  { label: "False", value: false },
+const BOOLEAN_ITEMS: { labelKey: ParseKeys; value: boolean }[] = [
+  { labelKey: "guardrails.providerFields.boolean.true", value: true },
+  { labelKey: "guardrails.providerFields.boolean.false", value: false },
 ];
 
 const isSecretKey = (fieldKey: string): boolean =>
@@ -68,14 +70,16 @@ const isPlainObject = (value: unknown): value is Record<string, unknown> =>
 
 // Object fields hold the raw text while the user types, so submission must be
 // blocked until the value parses to a plain JSON object (or is cleared).
-const jsonObjectRule = (fieldKey: string): GuardrailFieldRules => ({
+const jsonObjectRule = (fieldKey: string, t: TFunction): GuardrailFieldRules => ({
   validate: (value: unknown) =>
-    value === undefined || isPlainObject(value) ? true : `${fieldKey} must be a valid JSON object`,
+    value === undefined || isPlainObject(value)
+      ? true
+      : t("guardrails.providerFields.errors.invalidJsonObject", { field: fieldKey }),
 });
 
 // Commits a parsed object (or undefined for a cleared field) to the form on
 // blur; anything else stays as raw text so jsonObjectRule blocks submission.
-const commitObjectField = (raw: string, onChange: (value: unknown) => void): void => {
+const commitObjectField = (raw: string, onChange: (value: unknown) => void, t: TFunction): void => {
   const next = raw.trim();
   if (next === "") {
     onChange(undefined);
@@ -90,15 +94,15 @@ const commitObjectField = (raw: string, onChange: (value: unknown) => void): voi
   if (isPlainObject(parsed)) {
     onChange(parsed);
   } else {
-    toast.error("Enter a valid JSON object for this configuration");
+    toast.error(t("guardrails.providerFields.toasts.invalidJsonObject"));
   }
 };
 
-const fieldRules = (field: ProviderParam, fieldKey: string): GuardrailFieldRules | undefined => {
+const fieldRules = (field: ProviderParam, fieldKey: string, t: TFunction): GuardrailFieldRules | undefined => {
   if (field.type === "object") {
-    return jsonObjectRule(fieldKey);
+    return jsonObjectRule(fieldKey, t);
   }
-  return field.required ? requiredRule(`${fieldKey} is required`) : undefined;
+  return field.required ? requiredRule(t("guardrails.providerFields.errors.required", { field: fieldKey })) : undefined;
 };
 
 interface ProviderFieldInputProps {
@@ -108,6 +112,7 @@ interface ProviderFieldInputProps {
 }
 
 const ProviderFieldInput: React.FC<ProviderFieldInputProps> = ({ descriptor, fieldKey, control }) => {
+  const { t } = useTranslation();
   const { id, value, onChange, onBlur, ref, name, ...aria } = control;
 
   if (descriptor.type === "select" && descriptor.options) {
@@ -146,7 +151,7 @@ const ProviderFieldInput: React.FC<ProviderFieldInputProps> = ({ descriptor, fie
   if (descriptor.type === "bool" || descriptor.type === "boolean") {
     return (
       <Select
-        items={BOOLEAN_ITEMS}
+        items={BOOLEAN_ITEMS.map(({ labelKey, value: itemValue }) => ({ label: t(labelKey), value: itemValue }))}
         value={typeof value === "boolean" ? value : null}
         onValueChange={(next: boolean | null) => onChange(next)}
       >
@@ -154,8 +159,8 @@ const ProviderFieldInput: React.FC<ProviderFieldInputProps> = ({ descriptor, fie
           <SelectValue placeholder={descriptor.description} />
         </SelectTrigger>
         <SelectContent>
-          <SelectItem value={true}>True</SelectItem>
-          <SelectItem value={false}>False</SelectItem>
+          <SelectItem value={true}>{t("guardrails.providerFields.boolean.true")}</SelectItem>
+          <SelectItem value={false}>{t("guardrails.providerFields.boolean.false")}</SelectItem>
         </SelectContent>
       </Select>
     );
@@ -193,7 +198,7 @@ const ProviderFieldInput: React.FC<ProviderFieldInputProps> = ({ descriptor, fie
         value={objectValue}
         onChange={(event) => onChange(event.target.value)}
         onBlur={(event) => {
-          commitObjectField(event.target.value, onChange);
+          commitObjectField(event.target.value, onChange, t);
           onBlur();
         }}
         {...aria}
@@ -252,9 +257,10 @@ const GuardrailProviderFields: React.FC<GuardrailProviderFieldsProps> = ({
   providerParams: providerParamsProp = null,
   value = null,
 }) => {
+  const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [providerParams, setProviderParams] = useState<ProviderParamsResponse | null>(providerParamsProp);
-  const [error, setError] = useState<string | null>(null);
+  const [loadFailed, setLoadFailed] = useState(false);
 
   // Fetch provider-specific parameters when component mounts
   useEffect(() => {
@@ -268,7 +274,7 @@ const GuardrailProviderFields: React.FC<GuardrailProviderFieldsProps> = ({
       if (!accessToken) return;
 
       setLoading(true);
-      setError(null);
+      setLoadFailed(false);
 
       try {
         const data = await getGuardrailProviderSpecificParams(accessToken);
@@ -279,7 +285,7 @@ const GuardrailProviderFields: React.FC<GuardrailProviderFieldsProps> = ({
         populateGuardrailProviderMap(data);
       } catch (error) {
         console.error("Error fetching provider params:", error);
-        setError("Failed to load provider parameters");
+        setLoadFailed(true);
       } finally {
         setLoading(false);
       }
@@ -301,14 +307,14 @@ const GuardrailProviderFields: React.FC<GuardrailProviderFieldsProps> = ({
     return (
       <div className="flex items-center gap-2 text-sm text-muted-foreground">
         <UiLoadingSpinner className="size-4" />
-        Loading provider parameters...
+        {t("guardrails.providerFields.loading")}
       </div>
     );
   }
 
   // Show error state
-  if (error) {
-    return <div className="text-destructive">{error}</div>;
+  if (loadFailed) {
+    return <div className="text-destructive">{t("guardrails.providerFields.loadFailed")}</div>;
   }
 
   // Get the provider key matching the selected provider in the guardrail_provider_map
@@ -318,7 +324,7 @@ const GuardrailProviderFields: React.FC<GuardrailProviderFieldsProps> = ({
   const providerFields = providerParams && providerParams[providerKey];
 
   if (!providerFields || Object.keys(providerFields).length === 0) {
-    return <div>No configuration fields available for this provider.</div>;
+    return <div>{t("guardrails.providerFields.noFields")}</div>;
   }
 
   // Fields to skip for content filter provider (handled in dedicated steps)
@@ -376,7 +382,7 @@ const GuardrailProviderFields: React.FC<GuardrailProviderFieldsProps> = ({
           control={control}
           name={fullFieldKey}
           label={labelWithHint(fieldKey, field.description)}
-          rules={fieldRules(field, fieldKey)}
+          rules={fieldRules(field, fieldKey, t)}
           defaultValue={resolvedInitialValue}
         >
           {(fieldControl) => <ProviderFieldInput descriptor={field} fieldKey={fieldKey} control={fieldControl} />}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_table.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_table.tsx
index bbab01e346d..b557e5e95ee 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_table.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_table.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Inbox } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 import { Guardrail } from "@/components/guardrails/types";
@@ -19,13 +20,14 @@ interface GuardrailTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No guardrails yet</div>
-      <div className="text-sm text-muted-foreground">Add a guardrail to start filtering requests and responses.</div>
+      <div className="text-sm font-medium text-foreground">{t("guardrails.table.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("guardrails.table.empty.description")}</div>
     </div>
   );
 }
@@ -36,11 +38,12 @@ const GuardrailTable: React.FC<GuardrailTableProps> = ({
   onDeleteClick,
   onGuardrailClick,
 }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
 
   const columns = useMemo(
-    () => getGuardrailTableColumns({ onGuardrailClick, onDeleteClick }),
-    [onGuardrailClick, onDeleteClick],
+    () => getGuardrailTableColumns({ onGuardrailClick, onDeleteClick, t }),
+    [onGuardrailClick, onDeleteClick, t],
   );
 
   return (
@@ -53,7 +56,7 @@ const GuardrailTable: React.FC<GuardrailTableProps> = ({
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading guardrails…"
+      loadingMessage={t("guardrails.table.loading")}
       noDataMessage={<EmptyState />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/llm_judge/LLMJudgeFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/llm_judge/LLMJudgeFields.tsx
index 7d1df1497db..6d24ef25aa7 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/llm_judge/LLMJudgeFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/llm_judge/LLMJudgeFields.tsx
@@ -1,8 +1,10 @@
 "use client";
 
+import type { ParseKeys } from "i18next";
 import { Plus, X } from "lucide-react";
 import React from "react";
 import { useController } from "react-hook-form";
+import { Trans, useTranslation } from "react-i18next";
 import { Field, FieldGroup, FieldLabel } from "@/components/ui/field";
 import { Button } from "@/components/ui/button";
 import {
@@ -33,9 +35,9 @@ interface LLMJudgeFieldsProps {
 
 const DEFAULT_CRITERIA: GuardrailCriterion[] = [{ name: "", weight: 100, description: "" }];
 
-const ON_FAILURE_ITEMS = [
-  { label: "Block (return 422)", value: "block" },
-  { label: "Log only", value: "log" },
+const ON_FAILURE_ITEMS: { labelKey: ParseKeys; value: string }[] = [
+  { labelKey: "guardrails.llmJudge.onFailure.options.block", value: "block" },
+  { labelKey: "guardrails.llmJudge.onFailure.options.log", value: "log" },
 ];
 
 const clampToRange = (value: unknown, min: number, max: number): number | null => {
@@ -77,28 +79,26 @@ const BoundedNumberInput: React.FC<BoundedNumberInputProps> = ({ control, min, m
 };
 
 const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, control }) => {
+  const { t } = useTranslation();
   const { field } = useController({ control, name: "criteria", defaultValue: DEFAULT_CRITERIA });
   const criteria: GuardrailCriterion[] = Array.isArray(field.value) ? field.value : [];
   const setCriteria = field.onChange;
 
   const weightTotal = criteria.reduce((sum, entry) => sum + (Number(entry?.weight) || 0), 0);
   const weightOk = weightTotal === 100;
+  const onFailureItems = ON_FAILURE_ITEMS.map(({ labelKey, value }) => ({ label: t(labelKey), value }));
 
   return (
     <FieldGroup>
       <div className="rounded-md border border-success/20 bg-success/10 px-3.5 py-2.5 text-[13px] text-success">
-        The <strong>Judge Model</strong> scores the user request (pre_call, during_call) or the LLM response (post_call)
-        0–100 against your criteria. If the weighted average falls below the threshold, it is blocked (or logged).
+        <Trans i18nKey="guardrails.llmJudge.intro" components={{ strong: <strong /> }} />
       </div>
 
       <GuardrailField
         control={control}
         name="judge_model"
-        label={labelWithHint(
-          "Judge Model",
-          "The LLM that reads each response and grades it. Pick a capable model — it never sees end-user data beyond what the LLM returned.",
-        )}
-        rules={requiredRule("Select a judge model")}
+        label={labelWithHint(t("guardrails.llmJudge.judgeModel.label"), t("guardrails.llmJudge.judgeModel.hint"))}
+        rules={requiredRule(t("guardrails.llmJudge.judgeModel.required"))}
       >
         {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
           <Combobox items={availableModels} value={asText(value) || null} onValueChange={onChange}>
@@ -106,11 +106,11 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
               id={id}
               aria-invalid={ariaInvalid}
               aria-describedby={ariaDescribedBy}
-              placeholder="Select a model"
+              placeholder={t("guardrails.llmJudge.judgeModel.placeholder")}
               className="w-full"
             />
             <ComboboxContent>
-              <ComboboxEmpty>No matching models</ComboboxEmpty>
+              <ComboboxEmpty>{t("guardrails.llmJudge.judgeModel.empty")}</ComboboxEmpty>
               <ComboboxList>
                 {(model: string) => (
                   <ComboboxItem key={model} value={model} title={model}>
@@ -126,10 +126,7 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
       <GuardrailField
         control={control}
         name="overall_threshold"
-        label={labelWithHint(
-          "Minimum Score to Pass",
-          "0–100. If the weighted average of criterion scores falls below this, the guardrail triggers. 80 is a good default.",
-        )}
+        label={labelWithHint(t("guardrails.llmJudge.threshold.label"), t("guardrails.llmJudge.threshold.hint"))}
         defaultValue={80}
       >
         {(fieldControl) => <BoundedNumberInput control={fieldControl} min={0} max={100} suffix="/ 100" />}
@@ -138,19 +135,16 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
       <GuardrailField
         control={control}
         name="on_failure"
-        label={labelWithHint(
-          "On Failure",
-          "Block: return HTTP 422 when the score is too low. Log: record the result but let the response through.",
-        )}
+        label={labelWithHint(t("guardrails.llmJudge.onFailure.label"), t("guardrails.llmJudge.onFailure.hint"))}
         defaultValue="block"
       >
         {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-          <Select items={ON_FAILURE_ITEMS} value={asText(value) || null} onValueChange={onChange}>
+          <Select items={onFailureItems} value={asText(value) || null} onValueChange={onChange}>
             <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy} className="w-full">
-              <SelectValue placeholder="Select an action" />
+              <SelectValue placeholder={t("guardrails.llmJudge.onFailure.placeholder")} />
             </SelectTrigger>
             <SelectContent>
-              {ON_FAILURE_ITEMS.map((item) => (
+              {onFailureItems.map((item) => (
                 <SelectItem key={item.value} value={item.value}>
                   {item.label}
                 </SelectItem>
@@ -162,10 +156,7 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
 
       <Field>
         <FieldLabel>
-          {labelWithHint(
-            "Evaluation Criteria",
-            "Each criterion is something the judge checks. Weights must add up to 100%.",
-          )}
+          {labelWithHint(t("guardrails.llmJudge.criteria.label"), t("guardrails.llmJudge.criteria.hint"))}
         </FieldLabel>
 
         {criteria.map((_, index) => (
@@ -174,7 +165,7 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
               <GuardrailField
                 control={control}
                 name={`criteria.${index}.name`}
-                rules={requiredRule("Enter criterion name")}
+                rules={requiredRule(t("guardrails.llmJudge.criteria.nameRequired"))}
                 className="flex-2"
               >
                 {({ ref, value, ...field }) => (
@@ -182,7 +173,7 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
                     {...field}
                     ref={ref}
                     value={asText(value)}
-                    placeholder="Criterion name (e.g. Policy accuracy)"
+                    placeholder={t("guardrails.llmJudge.criteria.namePlaceholder")}
                   />
                 )}
               </GuardrailField>
@@ -190,20 +181,28 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
                 control={control}
                 name={`criteria.${index}.weight`}
                 label={labelWithHint(
-                  <span className="text-xs text-muted-foreground">Weight</span>,
-                  "How much this criterion counts toward the final score. All weights must add up to 100%.",
+                  <span className="text-xs text-muted-foreground">
+                    {t("guardrails.llmJudge.criteria.weightLabel")}
+                  </span>,
+                  t("guardrails.llmJudge.criteria.weightHint"),
                 )}
-                rules={requiredRule("Enter weight")}
+                rules={requiredRule(t("guardrails.llmJudge.criteria.weightRequired"))}
                 className="flex-1"
               >
                 {(fieldControl) => (
-                  <BoundedNumberInput control={fieldControl} min={0} max={100} suffix="%" placeholder="e.g. 50" />
+                  <BoundedNumberInput
+                    control={fieldControl}
+                    min={0}
+                    max={100}
+                    suffix="%"
+                    placeholder={t("guardrails.llmJudge.criteria.weightPlaceholder")}
+                  />
                 )}
               </GuardrailField>
               <Button
                 variant="ghost"
                 size="sm"
-                aria-label="Remove criterion"
+                aria-label={t("guardrails.llmJudge.criteria.remove")}
                 className="mb-1 text-destructive hover:text-destructive/80"
                 onClick={() => setCriteria(criteria.filter((_, position) => position !== index))}
               >
@@ -213,7 +212,7 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
             <GuardrailField
               control={control}
               name={`criteria.${index}.description`}
-              rules={requiredRule("Describe what to check")}
+              rules={requiredRule(t("guardrails.llmJudge.criteria.descriptionRequired"))}
               className="mt-2"
             >
               {({ ref, value, ...field }) => (
@@ -221,7 +220,7 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
                   {...field}
                   ref={ref}
                   value={asText(value)}
-                  placeholder="What should the judge check for this criterion?"
+                  placeholder={t("guardrails.llmJudge.criteria.descriptionPlaceholder")}
                 />
               )}
             </GuardrailField>
@@ -234,12 +233,14 @@ const LLMJudgeFields: React.FC<LLMJudgeFieldsProps> = ({ availableModels, contro
           onClick={() => setCriteria([...criteria, { name: "", weight: 0, description: "" }])}
         >
           <Plus className="size-4" />
-          Add Criterion
+          {t("guardrails.llmJudge.criteria.add")}
         </Button>
 
         {criteria.length > 0 && (
           <div className={`mt-1.5 text-xs ${weightOk ? "text-success" : "text-warning"}`}>
-            Weights total: {weightTotal}%{weightOk ? " ✓" : " — must add up to 100%"}
+            {weightOk
+              ? t("guardrails.llmJudge.criteria.weightsTotalOk", { total: weightTotal })
+              : t("guardrails.llmJudge.criteria.weightsTotalOff", { total: weightTotal })}
           </div>
         )}
       </Field>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_components.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_components.tsx
index 0de7eb1c9ce..780f5ea48a2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_components.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_components.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { EyeOff, Filter, Info, Ban, X } from "lucide-react";
 import { PiiEntityCategory } from "@/components/guardrails/types";
 import { Badge } from "@/components/ui/badge";
@@ -42,6 +43,7 @@ export interface CategoryFilterProps {
 }
 
 export const CategoryFilter: React.FC<CategoryFilterProps> = ({ categories, selectedCategories, onChange }) => {
+  const { t } = useTranslation();
   const anchor = useComboboxAnchor();
   const categoryNames = categories.map((cat) => cat.category);
 
@@ -49,7 +51,7 @@ export const CategoryFilter: React.FC<CategoryFilterProps> = ({ categories, sele
     <div>
       <div className="mb-2 flex items-center">
         <Filter className="mr-1 size-4 text-muted-foreground" />
-        <span className="font-medium text-muted-foreground">Filter by category</span>
+        <span className="font-medium text-muted-foreground">{t("guardrails.pii.categoryFilter.title")}</span>
       </div>
       <Combobox items={categoryNames} value={selectedCategories} onValueChange={onChange} multiple>
         <ComboboxChips render={<div ref={anchor} />} className="mb-4 w-full">
@@ -59,11 +61,11 @@ export const CategoryFilter: React.FC<CategoryFilterProps> = ({ categories, sele
             </ComboboxChip>
           ))}
           <ComboboxChipsInput
-            placeholder={selectedCategories.length === 0 ? "Select categories to filter by" : undefined}
+            placeholder={selectedCategories.length === 0 ? t("guardrails.pii.categoryFilter.placeholder") : undefined}
           />
         </ComboboxChips>
         <ComboboxContent anchor={anchor}>
-          <ComboboxEmpty>No matching categories</ComboboxEmpty>
+          <ComboboxEmpty>{t("guardrails.pii.categoryFilter.empty")}</ComboboxEmpty>
           <ComboboxList>
             {(category: string) => (
               <ComboboxItem key={category} value={category}>
@@ -85,11 +87,12 @@ export interface QuickActionsProps {
 }
 
 export const QuickActions: React.FC<QuickActionsProps> = ({ onSelectAll, onUnselectAll, hasSelectedEntities }) => {
+  const { t } = useTranslation();
   return (
     <div className="mb-6 rounded-lg border border-border bg-muted/40 p-5 shadow-xs">
       <div className="mb-4 flex items-center justify-between">
         <div className="flex items-center">
-          <span className="text-base font-semibold">Quick Actions</span>
+          <span className="text-base font-semibold">{t("guardrails.pii.quickActions.title")}</span>
           <Tooltip>
             <TooltipTrigger
               render={
@@ -98,22 +101,22 @@ export const QuickActions: React.FC<QuickActionsProps> = ({ onSelectAll, onUnsel
                 </span>
               }
             />
-            <TooltipContent>Apply action to all PII types at once</TooltipContent>
+            <TooltipContent>{t("guardrails.pii.quickActions.hint")}</TooltipContent>
           </Tooltip>
         </div>
         <Button variant="outline" onClick={onUnselectAll} disabled={!hasSelectedEntities}>
           <X />
-          Unselect All
+          {t("guardrails.pii.quickActions.unselectAll")}
         </Button>
       </div>
       <div className="grid grid-cols-2 gap-4">
         <Button variant="outline" className="h-10 w-full" onClick={() => onSelectAll("MASK")}>
           <EyeOff />
-          Select All &amp; Mask
+          {t("guardrails.pii.quickActions.selectAllMask")}
         </Button>
         <Button variant="outline" className="h-10 w-full" onClick={() => onSelectAll("BLOCK")}>
           <Ban />
-          Select All &amp; Block
+          {t("guardrails.pii.quickActions.selectAllBlock")}
         </Button>
       </div>
     </div>
@@ -140,15 +143,16 @@ export const PiiEntityList: React.FC<PiiEntityListProps> = ({
   onActionSelect,
   entityToCategoryMap,
 }) => {
+  const { t } = useTranslation();
   return (
     <div className="overflow-hidden rounded-lg border border-border shadow-xs">
       <div className="flex border-b border-border bg-muted/40 px-5 py-3">
-        <span className="flex-1 font-semibold">PII Type</span>
-        <span className="w-32 text-right font-semibold">Action</span>
+        <span className="flex-1 font-semibold">{t("guardrails.pii.entityList.typeColumn")}</span>
+        <span className="w-32 text-right font-semibold">{t("guardrails.pii.entityList.actionColumn")}</span>
       </div>
       <div className="max-h-[400px] overflow-y-auto">
         {entities.length === 0 ? (
-          <div className="py-10 text-center text-muted-foreground">No PII types match your filter criteria</div>
+          <div className="py-10 text-center text-muted-foreground">{t("guardrails.pii.entityList.empty")}</div>
         ) : (
           entities.map((entity) => {
             const isSelected = selectedEntities.includes(entity);
@@ -176,7 +180,10 @@ export const PiiEntityList: React.FC<PiiEntityListProps> = ({
                     onValueChange={(value: string | null) => value && onActionSelect(entity, value)}
                     disabled={!isSelected}
                   >
-                    <SelectTrigger className={`w-[120px] ${isSelected ? "" : "opacity-50"}`} aria-label="Action">
+                    <SelectTrigger
+                      className={`w-[120px] ${isSelected ? "" : "opacity-50"}`}
+                      aria-label={t("guardrails.pii.entityList.actionSelect")}
+                    >
                       <SelectValue />
                     </SelectTrigger>
                     <SelectContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_configuration.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_configuration.tsx
index cba29ed615d..f84893ca555 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_configuration.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/pii_configuration.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { CategoryFilter, PiiEntityList, QuickActions } from "./pii_components";
 import { PiiConfigurationProps } from "@/components/guardrails/types";
 
@@ -15,6 +16,7 @@ const PiiConfiguration: React.FC<PiiConfigurationProps> = ({
   onActionSelect,
   entityCategories = [],
 }) => {
+  const { t } = useTranslation();
   const [selectedCategories, setSelectedCategories] = useState<string[]>([]);
 
   // Create a lookup map to quickly find an entity's category
@@ -54,9 +56,11 @@ const PiiConfiguration: React.FC<PiiConfigurationProps> = ({
     <div className="pii-configuration">
       <div className="flex justify-between items-center mb-5">
         <div className="flex items-center">
-          <h4 className="m-0 text-lg font-semibold text-foreground">Configure PII Protection</h4>
+          <h4 className="m-0 text-lg font-semibold text-foreground">{t("guardrails.pii.configuration.title")}</h4>
         </div>
-        <span className="text-muted-foreground">{selectedEntities.length} items selected</span>
+        <span className="text-muted-foreground">
+          {t("guardrails.pii.configuration.selectedCount", { count: selectedEntities.length })}
+        </span>
       </div>
 
       <div className="mb-6">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/tool_permission/ToolPermissionRulesEditor.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/tool_permission/ToolPermissionRulesEditor.tsx
index c154d102314..188c5896daa 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/tool_permission/ToolPermissionRulesEditor.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/tool_permission/ToolPermissionRulesEditor.tsx
@@ -1,4 +1,6 @@
+import type { ParseKeys } from "i18next";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Info, Plus, Trash2 } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
@@ -33,15 +35,17 @@ interface ToolPermissionRulesEditorProps {
   disabled?: boolean;
 }
 
-const DECISION_ITEMS = [
-  { value: "allow", label: "Allow" },
-  { value: "deny", label: "Deny" },
-] as const;
+const DECISION_ITEMS: readonly { value: ToolPermissionDecision; labelKey: ParseKeys }[] = [
+  { value: "allow", labelKey: "guardrails.toolPermission.decisionOptions.allow" },
+  { value: "deny", labelKey: "guardrails.toolPermission.decisionOptions.deny" },
+];
 
-const ON_DISALLOWED_ITEMS = [
-  { value: "block", label: "Block" },
-  { value: "rewrite", label: "Rewrite" },
-] as const;
+const ON_DISALLOWED_ITEMS: readonly { value: ToolPermissionOnDisallowedAction; labelKey: ParseKeys }[] = [
+  { value: "block", labelKey: "guardrails.toolPermission.onDisallowedOptions.block" },
+  { value: "rewrite", labelKey: "guardrails.toolPermission.onDisallowedOptions.rewrite" },
+];
+
+const TOOL_NAME_EXAMPLE = "^mcp__github_.*$";
 
 const DEFAULT_CONFIG: ToolPermissionConfig = {
   rules: [],
@@ -57,7 +61,10 @@ const ensureConfig = (config?: ToolPermissionConfig): ToolPermissionConfig => ({
 });
 
 const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ value, onChange, disabled = false }) => {
+  const { t } = useTranslation();
   const config = ensureConfig(value);
+  const decisionItems = DECISION_ITEMS.map((item) => ({ value: item.value, label: t(item.labelKey) }));
+  const onDisallowedItems = ON_DISALLOWED_ITEMS.map((item) => ({ value: item.value, label: t(item.labelKey) }));
 
   const updateConfig = (partial: Partial<ToolPermissionConfig>) => {
     const nextConfig: ToolPermissionConfig = {
@@ -135,14 +142,14 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
           size="sm"
           onClick={() => updateRule(index, { allowed_param_patterns: { "": "" } })}
         >
-          + Restrict tool arguments (optional)
+          {t("guardrails.toolPermission.constraints.restrict")}
         </Button>
       );
     }
 
     return (
       <div className="space-y-2">
-        <p className="text-sm text-muted-foreground">Argument constraints (dot or array paths)</p>
+        <p className="text-sm text-muted-foreground">{t("guardrails.toolPermission.constraints.title")}</p>
         {entries.map(([path, pattern], patternIndex) => (
           <div key={`${rule.id || index}-${patternIndex}`} className="flex items-start gap-2">
             <Input
@@ -160,7 +167,7 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
             <Button
               variant="outline"
               size="icon"
-              aria-label="Remove constraint"
+              aria-label={t("guardrails.toolPermission.constraints.remove")}
               disabled={disabled}
               onClick={() =>
                 updateAllowedParamEntries(index, (entries) => {
@@ -185,7 +192,7 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
             })
           }
         >
-          + Add another constraint
+          {t("guardrails.toolPermission.constraints.addAnother")}
         </Button>
       </div>
     );
@@ -196,16 +203,15 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
       <CardContent>
         <div className="flex items-center justify-between">
           <div>
-            <p className="text-lg font-semibold">LiteLLM Tool Permission Guardrail</p>
+            <p className="text-lg font-semibold">{t("guardrails.toolPermission.title")}</p>
             <p className="text-sm text-muted-foreground">
-              Provide regex patterns (e.g., ^mcp__github_.*$) for tool names or types and optionally constrain payload
-              fields.
+              {t("guardrails.toolPermission.description", { example: TOOL_NAME_EXAMPLE })}
             </p>
           </div>
           {!disabled && (
             <Button onClick={addRule}>
               <Plus />
-              Add Rule
+              {t("guardrails.toolPermission.addRule")}
             </Button>
           )}
         </div>
@@ -213,22 +219,22 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
         <Separator className="my-4" />
 
         {config.rules.length === 0 ? (
-          <div className="py-10 text-center text-muted-foreground">No tool rules added yet</div>
+          <div className="py-10 text-center text-muted-foreground">{t("guardrails.toolPermission.empty")}</div>
         ) : (
           <div className="space-y-4">
             {config.rules.map((rule, index) => (
               <Card key={rule.id || index} className="bg-muted/40">
                 <CardContent>
                   <div className="mb-3 flex items-center justify-between">
-                    <p className="font-semibold">Rule {index + 1}</p>
+                    <p className="font-semibold">{t("guardrails.toolPermission.rule.title", { number: index + 1 })}</p>
                     <Button variant="ghost" disabled={disabled} onClick={() => removeRule(index)}>
                       <Trash2 />
-                      Remove
+                      {t("guardrails.toolPermission.rule.remove")}
                     </Button>
                   </div>
                   <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
                     <div>
-                      <p className="text-sm font-medium">Rule ID</p>
+                      <p className="text-sm font-medium">{t("guardrails.toolPermission.rule.id")}</p>
                       <Input
                         disabled={disabled}
                         placeholder="unique_rule_id"
@@ -237,10 +243,10 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
                       />
                     </div>
                     <div>
-                      <p className="text-sm font-medium">Tool Name (optional)</p>
+                      <p className="text-sm font-medium">{t("guardrails.toolPermission.rule.toolName")}</p>
                       <Input
                         disabled={disabled}
-                        placeholder="^mcp__github_.*$"
+                        placeholder={TOOL_NAME_EXAMPLE}
                         value={rule.tool_name ?? ""}
                         onChange={(e) =>
                           updateRule(index, {
@@ -253,7 +259,7 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
 
                   <div className="mt-4 grid grid-cols-1 gap-4 md:grid-cols-2">
                     <div>
-                      <p className="text-sm font-medium">Tool Type (optional)</p>
+                      <p className="text-sm font-medium">{t("guardrails.toolPermission.rule.toolType")}</p>
                       <Input
                         disabled={disabled}
                         placeholder="^function$"
@@ -268,20 +274,20 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
                   </div>
 
                   <div className="mt-4 flex flex-col gap-2">
-                    <p className="text-sm font-medium">Decision</p>
+                    <p className="text-sm font-medium">{t("guardrails.toolPermission.rule.decision")}</p>
                     <Select
-                      items={DECISION_ITEMS}
+                      items={decisionItems}
                       disabled={disabled}
                       value={rule.decision}
                       onValueChange={(value: string | null) =>
                         value && updateRule(index, { decision: value as ToolPermissionDecision })
                       }
                     >
-                      <SelectTrigger className="w-[200px]" aria-label="Decision">
+                      <SelectTrigger className="w-[200px]" aria-label={t("guardrails.toolPermission.rule.decision")}>
                         <SelectValue />
                       </SelectTrigger>
                       <SelectContent>
-                        {DECISION_ITEMS.map((item) => (
+                        {decisionItems.map((item) => (
                           <SelectItem key={item.value} value={item.value}>
                             {item.label}
                           </SelectItem>
@@ -301,20 +307,20 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
 
         <div className="grid gap-4 md:grid-cols-2">
           <div>
-            <p className="text-sm font-medium">Default action</p>
+            <p className="text-sm font-medium">{t("guardrails.toolPermission.defaultAction")}</p>
             <Select
-              items={DECISION_ITEMS}
+              items={decisionItems}
               disabled={disabled}
               value={config.default_action}
               onValueChange={(value: string | null) =>
                 value && updateConfig({ default_action: value as ToolPermissionDefaultAction })
               }
             >
-              <SelectTrigger className="w-full" aria-label="Default action">
+              <SelectTrigger className="w-full" aria-label={t("guardrails.toolPermission.defaultAction")}>
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {DECISION_ITEMS.map((item) => (
+                {decisionItems.map((item) => (
                   <SelectItem key={item.value} value={item.value}>
                     {item.label}
                   </SelectItem>
@@ -324,7 +330,7 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
           </div>
           <div>
             <p className="flex items-center gap-1 text-sm font-medium">
-              On disallowed action
+              {t("guardrails.toolPermission.onDisallowed.label")}
               <Tooltip>
                 <TooltipTrigger
                   render={
@@ -333,25 +339,22 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
                     </span>
                   }
                 />
-                <TooltipContent>
-                  Block returns an error when a forbidden tool is invoked. Rewrite strips the tool call but lets the
-                  rest of the response continue.
-                </TooltipContent>
+                <TooltipContent>{t("guardrails.toolPermission.onDisallowed.hint")}</TooltipContent>
               </Tooltip>
             </p>
             <Select
-              items={ON_DISALLOWED_ITEMS}
+              items={onDisallowedItems}
               disabled={disabled}
               value={config.on_disallowed_action}
               onValueChange={(value: string | null) =>
                 value && updateConfig({ on_disallowed_action: value as ToolPermissionOnDisallowedAction })
               }
             >
-              <SelectTrigger className="w-full" aria-label="On disallowed action">
+              <SelectTrigger className="w-full" aria-label={t("guardrails.toolPermission.onDisallowed.label")}>
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {ON_DISALLOWED_ITEMS.map((item) => (
+                {onDisallowedItems.map((item) => (
                   <SelectItem key={item.value} value={item.value}>
                     {item.label}
                   </SelectItem>
@@ -362,12 +365,12 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
         </div>
 
         <div className="mt-4">
-          <p className="text-sm font-medium">Violation message (optional)</p>
+          <p className="text-sm font-medium">{t("guardrails.toolPermission.violationMessage.label")}</p>
           <Textarea
             className="field-sizing-fixed"
             disabled={disabled}
             rows={3}
-            placeholder="This violates our org policy..."
+            placeholder={t("guardrails.toolPermission.violationMessage.placeholder")}
             value={config.violation_message_template}
             onChange={(e) => updateConfig({ violation_message_template: e.target.value })}
           />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx
index 5f64d003c11..b153d0a6456 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx
@@ -1,5 +1,6 @@
 import { Info } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
@@ -22,134 +23,150 @@ const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, toolt
 const ACCESS_KEY_PATH = ["credentials", "aws_access_key_id"] as const;
 const SECRET_KEY_PATH = ["credentials", "aws_secret_access_key"] as const;
 
-const AwsSigV4Fields: React.FC = () => (
-  <>
-    <p className="text-sm text-muted-foreground mb-2">
-      For MCP servers hosted on AWS Bedrock AgentCore.{" "}
-      <a
-        href="https://docs.litellm.ai/docs/mcp_aws_sigv4"
-        target="_blank"
-        rel="noopener noreferrer"
-        className="text-info hover:text-info/80"
+const AwsSigV4Fields: React.FC = () => {
+  const { t } = useTranslation();
+  return (
+    <>
+      <p className="text-sm text-muted-foreground mb-2">
+        {t("mcpServers.awsSigV4Fields.intro")}{" "}
+        <a
+          href="https://docs.litellm.ai/docs/mcp_aws_sigv4"
+          target="_blank"
+          rel="noopener noreferrer"
+          className="text-info hover:text-info/80"
+        >
+          {t("mcpServers.awsSigV4Fields.viewDocs")}
+        </a>
+      </p>
+      <MountedFormField
+        label={
+          <FieldLabel
+            label={t("mcpServers.awsSigV4Fields.region.label")}
+            tooltip={t("mcpServers.awsSigV4Fields.region.tooltip")}
+          />
+        }
+        name={["credentials", "aws_region_name"]}
+        required
+        rules={{ validate: { required: requiredRule(t("mcpServers.awsSigV4Fields.region.required")) } }}
       >
-        View docs &rarr;
-      </a>
-    </p>
-    <MountedFormField
-      label={<FieldLabel label="AWS Region" tooltip="AWS region for SigV4 signing (e.g., us-east-1)" />}
-      name={["credentials", "aws_region_name"]}
-      required
-      rules={{ validate: { required: requiredRule("AWS region is required for SigV4 auth") } }}
-    >
-      {(control) => <Input {...textControl(control)} placeholder="us-east-1" className={fieldClassName} />}
-    </MountedFormField>
-    <MountedFormField
-      label={
-        <FieldLabel
-          label="AWS Service Name"
-          tooltip="AWS service name for SigV4 signing. Defaults to 'bedrock-agentcore'."
-        />
-      }
-      name={["credentials", "aws_service_name"]}
-    >
-      {(control) => <Input {...textControl(control)} placeholder="bedrock-agentcore" className={fieldClassName} />}
-    </MountedFormField>
-    <MountedFormField
-      label={
-        <FieldLabel
-          label="AWS Access Key ID"
-          tooltip="Optional. If not provided, falls back to the boto3 credential chain (IAM role, env vars, etc.)."
-        />
-      }
-      name={ACCESS_KEY_PATH}
-      rules={{
-        deps: ["credentials.aws_secret_access_key"],
-        validate: {
-          pairedWithSecret: requiredWhenSiblingSet(
-            SECRET_KEY_PATH,
-            "Access Key ID is required when Secret Access Key is provided",
-          ),
-        },
-      }}
-    >
-      {(control) => (
-        <PasswordInput
-          {...textControl(control)}
-          placeholder="AKIA... (optional — uses IAM role if blank)"
-          groupClassName={fieldClassName}
-        />
-      )}
-    </MountedFormField>
-    <MountedFormField
-      label={
-        <FieldLabel label="AWS Secret Access Key" tooltip="Optional. Required if AWS Access Key ID is provided." />
-      }
-      name={SECRET_KEY_PATH}
-      rules={{
-        deps: ["credentials.aws_access_key_id"],
-        validate: {
-          pairedWithAccessKey: requiredWhenSiblingSet(
-            ACCESS_KEY_PATH,
-            "Secret Access Key is required when Access Key ID is provided",
-          ),
-        },
-      }}
-    >
-      {(control) => (
-        <PasswordInput
-          {...textControl(control)}
-          placeholder="Enter secret key (optional — uses IAM role if blank)"
-          groupClassName={fieldClassName}
-        />
-      )}
-    </MountedFormField>
-    <MountedFormField
-      label={<FieldLabel label="AWS Session Token" tooltip="Optional. Only needed for temporary STS credentials." />}
-      name={["credentials", "aws_session_token"]}
-    >
-      {(control) => (
-        <PasswordInput
-          {...textControl(control)}
-          placeholder="Enter session token (optional)"
-          groupClassName={fieldClassName}
-        />
-      )}
-    </MountedFormField>
-    <MountedFormField
-      label={
-        <FieldLabel
-          label="AWS Role ARN"
-          tooltip="Optional. IAM role ARN to assume via STS before signing. If set, LiteLLM calls sts:AssumeRole to get temporary credentials. Uses ambient credentials (IAM role, env vars) as the source identity unless explicit keys are also provided."
-        />
-      }
-      name={["credentials", "aws_role_name"]}
-    >
-      {(control) => (
-        <Input
-          {...textControl(control)}
-          placeholder="arn:aws:iam::123456789012:role/MyRole (optional)"
-          className={fieldClassName}
-        />
-      )}
-    </MountedFormField>
-    <MountedFormField
-      label={
-        <FieldLabel
-          label="AWS Session Name"
-          tooltip="Optional. Session name for the AssumeRole call — appears in CloudTrail logs. Auto-generated if omitted."
-        />
-      }
-      name={["credentials", "aws_session_name"]}
-    >
-      {(control) => (
-        <Input
-          {...textControl(control)}
-          placeholder="litellm-prod (optional, auto-generated if blank)"
-          className={fieldClassName}
-        />
-      )}
-    </MountedFormField>
-  </>
-);
+        {(control) => <Input {...textControl(control)} placeholder="us-east-1" className={fieldClassName} />}
+      </MountedFormField>
+      <MountedFormField
+        label={
+          <FieldLabel
+            label={t("mcpServers.awsSigV4Fields.serviceName.label")}
+            tooltip={t("mcpServers.awsSigV4Fields.serviceName.tooltip")}
+          />
+        }
+        name={["credentials", "aws_service_name"]}
+      >
+        {(control) => <Input {...textControl(control)} placeholder="bedrock-agentcore" className={fieldClassName} />}
+      </MountedFormField>
+      <MountedFormField
+        label={
+          <FieldLabel
+            label={t("mcpServers.awsSigV4Fields.accessKeyId.label")}
+            tooltip={t("mcpServers.awsSigV4Fields.accessKeyId.tooltip")}
+          />
+        }
+        name={ACCESS_KEY_PATH}
+        rules={{
+          deps: ["credentials.aws_secret_access_key"],
+          validate: {
+            pairedWithSecret: requiredWhenSiblingSet(
+              SECRET_KEY_PATH,
+              t("mcpServers.awsSigV4Fields.accessKeyId.requiredWithSecret"),
+            ),
+          },
+        }}
+      >
+        {(control) => (
+          <PasswordInput
+            {...textControl(control)}
+            placeholder={t("mcpServers.awsSigV4Fields.accessKeyId.placeholder")}
+            groupClassName={fieldClassName}
+          />
+        )}
+      </MountedFormField>
+      <MountedFormField
+        label={
+          <FieldLabel
+            label={t("mcpServers.awsSigV4Fields.secretAccessKey.label")}
+            tooltip={t("mcpServers.awsSigV4Fields.secretAccessKey.tooltip")}
+          />
+        }
+        name={SECRET_KEY_PATH}
+        rules={{
+          deps: ["credentials.aws_access_key_id"],
+          validate: {
+            pairedWithAccessKey: requiredWhenSiblingSet(
+              ACCESS_KEY_PATH,
+              t("mcpServers.awsSigV4Fields.secretAccessKey.requiredWithAccessKey"),
+            ),
+          },
+        }}
+      >
+        {(control) => (
+          <PasswordInput
+            {...textControl(control)}
+            placeholder={t("mcpServers.awsSigV4Fields.secretAccessKey.placeholder")}
+            groupClassName={fieldClassName}
+          />
+        )}
+      </MountedFormField>
+      <MountedFormField
+        label={
+          <FieldLabel
+            label={t("mcpServers.awsSigV4Fields.sessionToken.label")}
+            tooltip={t("mcpServers.awsSigV4Fields.sessionToken.tooltip")}
+          />
+        }
+        name={["credentials", "aws_session_token"]}
+      >
+        {(control) => (
+          <PasswordInput
+            {...textControl(control)}
+            placeholder={t("mcpServers.awsSigV4Fields.sessionToken.placeholder")}
+            groupClassName={fieldClassName}
+          />
+        )}
+      </MountedFormField>
+      <MountedFormField
+        label={
+          <FieldLabel
+            label={t("mcpServers.awsSigV4Fields.roleArn.label")}
+            tooltip={t("mcpServers.awsSigV4Fields.roleArn.tooltip")}
+          />
+        }
+        name={["credentials", "aws_role_name"]}
+      >
+        {(control) => (
+          <Input
+            {...textControl(control)}
+            placeholder={t("mcpServers.awsSigV4Fields.roleArn.placeholder")}
+            className={fieldClassName}
+          />
+        )}
+      </MountedFormField>
+      <MountedFormField
+        label={
+          <FieldLabel
+            label={t("mcpServers.awsSigV4Fields.sessionName.label")}
+            tooltip={t("mcpServers.awsSigV4Fields.sessionName.tooltip")}
+          />
+        }
+        name={["credentials", "aws_session_name"]}
+      >
+        {(control) => (
+          <Input
+            {...textControl(control)}
+            placeholder={t("mcpServers.awsSigV4Fields.sessionName.placeholder")}
+            className={fieldClassName}
+          />
+        )}
+      </MountedFormField>
+    </>
+  );
+};
 
 export default AwsSigV4Fields;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx
index 07618abb9a4..14a6e3d941f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx
@@ -1,5 +1,7 @@
+import type { TFunction } from "i18next";
 import React, { useState } from "react";
 import { FormProvider, useForm, useWatch } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { ChevronDown, Info } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
@@ -35,7 +37,7 @@ import {
   buildCreateServerPayload,
   reduceStaticHeaders,
 } from "./createServerPayload";
-import { DUPLICATE_IDENTIFIER_MESSAGE, findDuplicateMcpServer, mcpSubmitErrorReason } from "./duplicateServerCheck";
+import { DUPLICATE_IDENTIFIER_MESSAGE_KEY, findDuplicateMcpServer, mcpSubmitErrorReason } from "./duplicateServerCheck";
 import { readCreateUiSnapshot, writeCreateUiSnapshot } from "./createOAuthUiState";
 import AwsSigV4Fields from "./AwsSigV4Fields";
 import OpenApiByokFields from "./OpenApiByokFields";
@@ -86,14 +88,14 @@ interface CreateMCPServerProps {
   stdioEnabled?: boolean;
 }
 
-const payloadErrorMessage = (result: Exclude<BuildCreatePayloadResult, { kind: "ok" }>): string => {
+const payloadErrorMessage = (result: Exclude<BuildCreatePayloadResult, { kind: "ok" }>, t: TFunction): string => {
   switch (result.kind) {
     case "invalid_tool_display_name":
-      return `Tool display name "${result.displayName}" is invalid. Only letters, digits, underscores, and hyphens are allowed (no spaces).`;
+      return t("mcpServers.createMcpServer.payloadErrors.invalidToolDisplayName", { displayName: result.displayName });
     case "invalid_stdio_json":
-      return "Invalid JSON in stdio configuration";
+      return t("mcpServers.createMcpServer.payloadErrors.invalidStdioJson");
     case "invalid_token_validation_json":
-      return "Invalid JSON in Token Validation Rules";
+      return t("mcpServers.createMcpServer.payloadErrors.invalidTokenValidationJson");
   }
 };
 
@@ -117,6 +119,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
   onBackToDiscovery,
   stdioEnabled = true,
 }) => {
+  const { t } = useTranslation();
   const form = useForm<MountedFormValues>({ mode: "onChange", defaultValues: CREATE_DEFAULTS });
   const registry = useMountRegistry();
   const [isLoading, setIsLoading] = useState(false);
@@ -255,9 +258,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
         // which would persist it as server-level credentials on the created server row. Mirrors the
         // edit form's onTokenReceived early return.
         setAuthorizedIdentity(getOAuthAuthorizationIdentity(allFieldsValue(form)));
-        toast.success(
-          "Token held for this browser session. Tools can now be previewed and configured; the token is not saved to LiteLLM.",
-        );
+        toast.success(t("mcpServers.createMcpServer.toasts.browserTokenHeld"));
         return;
       }
 
@@ -283,7 +284,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
       // its own credential write.
       setAuthorizedIdentity(getOAuthAuthorizationIdentity(allFieldsValue(form)));
 
-      toast.success("OAuth authorization successful! Please click 'Create MCP Server' to save the configuration.");
+      toast.success(t("mcpServers.createMcpServer.toasts.oauthAuthorized"));
     },
     onBeforeRedirect: persistCreateUiState,
     flowSource: "create",
@@ -425,8 +426,8 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
       typeof values.alias === "string" ? values.alias : undefined,
     );
     if (duplicate) {
-      form.setError(duplicate.field, { type: "duplicate", message: DUPLICATE_IDENTIFIER_MESSAGE });
-      toast.fromError(DUPLICATE_IDENTIFIER_MESSAGE);
+      form.setError(duplicate.field, { type: "duplicate", message: t(DUPLICATE_IDENTIFIER_MESSAGE_KEY) });
+      toast.fromError(t(DUPLICATE_IDENTIFIER_MESSAGE_KEY));
       return;
     }
     const built = buildCreateServerPayload(values, {
@@ -440,7 +441,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
       dcrClient: dcrClientRef.current,
     });
     if (built.kind !== "ok") {
-      toast.fromError(payloadErrorMessage(built));
+      toast.fromError(payloadErrorMessage(built, t));
       return;
     }
     const payload = built.payload;
@@ -482,10 +483,10 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
         }
 
         if (isAdmin) {
-          toast.success("MCP Server created successfully");
+          toast.success(t("mcpServers.createMcpServer.toasts.created"));
         } else {
-          toast.success("MCP Server submitted for admin review", {
-            description: "Once an admin approves it, the server will appear in your MCP Servers list.",
+          toast.success(t("mcpServers.createMcpServer.toasts.submittedForReview"), {
+            description: t("mcpServers.createMcpServer.toasts.submittedForReviewDescription"),
           });
         }
         form.reset(CREATE_DEFAULTS);
@@ -500,7 +501,11 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
       }
     } catch (error) {
       const reason = mcpSubmitErrorReason(error);
-      toast.fromError(isAdmin ? `Error creating MCP Server: ${reason}` : `Error submitting MCP Server: ${reason}`);
+      toast.fromError(
+        isAdmin
+          ? t("mcpServers.createMcpServer.toasts.createFailed", { reason })
+          : t("mcpServers.createMcpServer.toasts.submitFailed", { reason }),
+      );
     } finally {
       setIsLoading(false);
     }
@@ -640,9 +645,11 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                 &#8592;
               </Button>
             )}
-            <img src={mcpLogoImg} alt="MCP Logo" className="size-5 object-contain" />
+            <img src={mcpLogoImg} alt={t("mcpServers.createMcpServer.logoAlt")} className="size-5 object-contain" />
             <DialogTitle className="text-xl font-semibold">
-              {isAdmin ? "Add New MCP Server" : "Submit MCP Server for Review"}
+              {isAdmin
+                ? t("mcpServers.createMcpServer.title.admin")
+                : t("mcpServers.createMcpServer.title.submitForReview")}
             </DialogTitle>
           </div>
         </DialogHeader>
@@ -653,27 +660,26 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
               <form onSubmit={handleSubmit} className="space-y-6">
                 {!isAdmin && (
                   <div className="rounded-md bg-info/10 border border-info/20 px-4 py-3 text-sm text-info">
-                    Your submission will be sent for admin review. Once approved, the server will appear in your MCP
-                    Servers list. The request must be made with a team-scoped API key.
+                    {t("mcpServers.createMcpServer.reviewNotice")}
                   </div>
                 )}
                 <div className="grid grid-cols-1 gap-6">
                   <MountedFormField
                     label={
                       <span className="text-sm font-medium text-foreground flex items-center">
-                        MCP Server Name
-                        <SimpleTooltip content="Best practice: Use a descriptive name that indicates the server's purpose (e.g., 'GitHub_MCP', 'Email_Service'). Cannot contain spaces or hyphens; use underscores instead. Names must comply with SEP-986 and will be rejected if invalid (https://modelcontextprotocol.io/specification/2025-11-25/server/tools#tool-names).">
+                        {t("mcpServers.createMcpServer.serverName.label")}
+                        <SimpleTooltip content={t("mcpServers.createMcpServer.serverName.tooltip")}>
                           <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                         </SimpleTooltip>
                       </span>
                     }
                     name="server_name"
-                    rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value) }) }}
+                    rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value, t) }) }}
                   >
                     {(control) => (
                       <Input
                         {...textControl(control)}
-                        placeholder="e.g., GitHub_MCP, Zapier_MCP, etc."
+                        placeholder={t("mcpServers.createMcpServer.serverName.placeholder")}
                         className="rounded-lg border-border focus:border-info focus:ring-ring"
                       />
                     )}
@@ -682,19 +688,19 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   <MountedFormField
                     label={
                       <span className="text-sm font-medium text-foreground flex items-center">
-                        Alias
-                        <SimpleTooltip content="A short, unique identifier for this server. Defaults to the server name if not provided. Cannot contain spaces or hyphens; use underscores instead.">
+                        {t("mcpServers.createMcpServer.alias.label")}
+                        <SimpleTooltip content={t("mcpServers.createMcpServer.alias.tooltip")}>
                           <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                         </SimpleTooltip>
                       </span>
                     }
                     name="alias"
-                    rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value) }) }}
+                    rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value, t) }) }}
                   >
                     {(control) => (
                       <Input
                         {...textControl(control)}
-                        placeholder="e.g., GitHub_MCP, Zapier_MCP, etc."
+                        placeholder={t("mcpServers.createMcpServer.alias.placeholder")}
                         className="rounded-lg border-border focus:border-info focus:ring-ring"
                         onChange={(event) => {
                           control.onChange(event);
@@ -705,13 +711,17 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   </MountedFormField>
 
                   <MountedFormField
-                    label={<span className="text-sm font-medium text-foreground">Description</span>}
+                    label={
+                      <span className="text-sm font-medium text-foreground">
+                        {t("mcpServers.createMcpServer.description.label")}
+                      </span>
+                    }
                     name="description"
                   >
                     {(control) => (
                       <Input
                         {...textControl(control)}
-                        placeholder="Brief description of what this server does"
+                        placeholder={t("mcpServers.createMcpServer.description.placeholder")}
                         className="rounded-lg border-border focus:border-info focus:ring-ring"
                       />
                     )}
@@ -720,7 +730,11 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   <MCPLogoSelector value={logoUrl} onChange={setLogoUrl} />
 
                   <MountedFormField
-                    label={<span className="text-sm font-medium text-foreground">GitHub / Source URL</span>}
+                    label={
+                      <span className="text-sm font-medium text-foreground">
+                        {t("mcpServers.createMcpServer.sourceUrl.label")}
+                      </span>
+                    }
                     name="source_url"
                   >
                     {(control) => (
@@ -733,10 +747,14 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   </MountedFormField>
 
                   <MountedFormField
-                    label={<span className="text-sm font-medium text-foreground">Transport Type</span>}
+                    label={
+                      <span className="text-sm font-medium text-foreground">
+                        {t("mcpServers.createMcpServer.transport.label")}
+                      </span>
+                    }
                     name="transport"
                     required
-                    rules={{ validate: { required: requiredRule("Please select a transport type") } }}
+                    rules={{ validate: { required: requiredRule(t("mcpServers.createMcpServer.transport.required")) } }}
                   >
                     {(control) => (
                       <Select
@@ -745,7 +763,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                         onValueChange={handleTransportSelected(control.onChange)}
                       >
                         <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
-                          <SelectValue placeholder="Select transport" />
+                          <SelectValue placeholder={t("mcpServers.createMcpServer.transport.placeholder")} />
                         </SelectTrigger>
                         <SelectContent>
                           <TransportSelectItems stdioEnabled={stdioEnabled} />
@@ -757,13 +775,17 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   {/* URL field - only show for HTTP and SSE */}
                   {(transportType === "http" || transportType === "sse") && (
                     <MountedFormField
-                      label={<span className="text-sm font-medium text-foreground">MCP Server URL</span>}
+                      label={
+                        <span className="text-sm font-medium text-foreground">
+                          {t("mcpServers.createMcpServer.url.label")}
+                        </span>
+                      }
                       name="url"
                       required
                       rules={{
                         validate: {
-                          required: requiredRule("Please enter a server URL"),
-                          ...validatorRules({ validator: (_, value) => validateMCPServerUrl(value) }),
+                          required: requiredRule(t("mcpServers.createMcpServer.url.required")),
+                          ...validatorRules({ validator: (_, value) => validateMCPServerUrl(value, t) }),
                         },
                       }}
                     >
@@ -797,8 +819,8 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   <MountedFormField
                     label={
                       <span className="text-sm font-medium text-foreground flex items-center">
-                        Max Concurrent Requests (optional)
-                        <SimpleTooltip content="Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.">
+                        {t("mcpServers.createMcpServer.maxConcurrentRequests.label")}
+                        <SimpleTooltip content={t("mcpServers.createMcpServer.maxConcurrentRequests.tooltip")}>
                           <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                         </SimpleTooltip>
                       </span>
@@ -810,7 +832,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                         {...numberControl(control, 0)}
                         min={1}
                         step={1}
-                        placeholder="e.g. 10"
+                        placeholder={t("mcpServers.createMcpServer.maxConcurrentRequests.placeholder")}
                         className="w-full rounded-lg"
                       />
                     )}
@@ -819,8 +841,8 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   <MountedFormField
                     label={
                       <span className="text-sm font-medium text-foreground flex items-center">
-                        RPM limit (all callers)
-                        <SimpleTooltip content="Max requests per minute to this server across all keys and teams. Leave empty for no limit">
+                        {t("mcpServers.createMcpServer.rpm.label")}
+                        <SimpleTooltip content={t("mcpServers.createMcpServer.rpm.tooltip")}>
                           <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                         </SimpleTooltip>
                       </span>
@@ -832,7 +854,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                         {...numberControl(control, 0)}
                         min={0}
                         step={1}
-                        placeholder="e.g. 60"
+                        placeholder={t("mcpServers.createMcpServer.rpm.placeholder")}
                         className="w-full rounded-lg"
                       />
                     )}
@@ -842,20 +864,24 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                   {transportType !== "stdio" && transportType !== "" && (
                     <Collapsible defaultOpen className="mb-4">
                       <CollapsibleTrigger className="group flex w-full items-center justify-between gap-4 py-2 text-left">
-                        <span className="text-sm font-semibold text-foreground">Authentication settings</span>
+                        <span className="text-sm font-semibold text-foreground">
+                          {t("mcpServers.createMcpServer.auth.sectionTitle")}
+                        </span>
                         <ChevronDown className="size-4 text-muted-foreground transition-transform group-data-[panel-open]:rotate-180" />
                       </CollapsibleTrigger>
                       <CollapsibleContent keepMounted className="space-y-6 pt-2">
                         <MountedFormField
-                          label="Authentication"
+                          label={t("mcpServers.createMcpServer.auth.typeLabel")}
                           name="auth_type"
                           required
-                          rules={{ validate: { required: requiredRule("Please select an auth type") } }}
+                          rules={{
+                            validate: { required: requiredRule(t("mcpServers.createMcpServer.auth.typeRequired")) },
+                          }}
                         >
                           {(control) => (
                             <Select {...selectControl<string>(control)} items={AUTH_TYPE_ITEMS}>
                               <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
-                                <SelectValue placeholder="Select auth type" />
+                                <SelectValue placeholder={t("mcpServers.createMcpServer.auth.typePlaceholder")} />
                               </SelectTrigger>
                               <SelectContent>
                                 {AUTH_TYPE_ITEMS.map((item) => (
@@ -886,8 +912,8 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                           <MountedFormField
                             label={
                               <span className="text-sm font-medium text-foreground flex items-center">
-                                Authentication Value
-                                <SimpleTooltip content="Token, password, or header value to send with each request for the selected auth type.">
+                                {t("mcpServers.createMcpServer.auth.valueLabel")}
+                                <SimpleTooltip content={t("mcpServers.createMcpServer.auth.valueTooltip")}>
                                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                                 </SimpleTooltip>
                               </span>
@@ -895,14 +921,14 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                             name={["credentials", "auth_value"]}
                             rules={{
                               validate: {
-                                notWhitespace: notOnlyWhitespace("Authentication value cannot be empty whitespace"),
+                                notWhitespace: notOnlyWhitespace(t("mcpServers.createMcpServer.auth.valueWhitespace")),
                               },
                             }}
                           >
                             {(control) => (
                               <PasswordInput
                                 {...textControl(control)}
-                                placeholder="Enter token or secret"
+                                placeholder={t("mcpServers.createMcpServer.auth.valuePlaceholder")}
                                 groupClassName="rounded-lg border-border focus:border-info focus:ring-ring"
                               />
                             )}
@@ -1000,11 +1026,13 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
 
                 <div className="flex items-center justify-end space-x-3 pt-6 border-t border-border">
                   <Button variant="secondary" onClick={handleCancel}>
-                    Cancel
+                    {t("mcpServers.createMcpServer.actions.cancel")}
                   </Button>
                   <Button type="submit" disabled={isLoading} aria-busy={isLoading}>
                     {isLoading && <UiLoadingSpinner className="size-4" />}
-                    {isLoading ? "Creating..." : "Add MCP Server"}
+                    {isLoading
+                      ? t("mcpServers.createMcpServer.actions.creating")
+                      : t("mcpServers.createMcpServer.actions.submit")}
                   </Button>
                 </div>
               </form>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx
index 893981fa9c6..48a8f4d7a64 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx
@@ -1,5 +1,6 @@
 import { Info } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { Switch } from "@/components/ui/switch";
@@ -23,13 +24,14 @@ export default function DcrBridgeToggle({
   authType?: string | null;
   initialChecked?: boolean;
 }) {
+  const { t } = useTranslation();
   if (!isClientForwardedTokenMode(authType)) return null;
   return (
     <MountedFormField
       label={
         <span className="text-sm font-medium text-foreground flex items-center">
-          Gateway-hosted sign-in (DCR bridge)
-          <SimpleTooltip content="Lets OAuth-only clients like Claude Desktop register and sign in through the gateway. Turn off to relay the upstream server's own OAuth metadata instead (for clients pre-registered with the upstream IdP).">
+          {t("mcpServers.dcrBridgeToggle.label")}
+          <SimpleTooltip content={t("mcpServers.dcrBridgeToggle.tooltip")}>
             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
           </SimpleTooltip>
         </span>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx
index 378410e4790..a804d4697c4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx
@@ -1,5 +1,7 @@
+import type { ParseKeys } from "i18next";
 import { CircleMinus, Info, Plus } from "lucide-react";
 import React from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { Button } from "@/components/ui/button";
@@ -16,11 +18,13 @@ import { requiredRule } from "@/components/common_components/formRules";
 import { matchesPattern, selectControl, selectTriggerControl, textControl } from "./mcpFieldRules";
 import { listControl } from "./mcpFormStore";
 
-const SCOPE_OPTIONS = [
-  { value: "global", label: "Instance" },
-  { value: "user", label: "Per-user" },
+const SCOPE_OPTIONS: ReadonlyArray<{ value: string; labelKey: ParseKeys }> = [
+  { value: "global", labelKey: "mcpServers.envVarsSection.scopes.instance" },
+  { value: "user", labelKey: "mcpServers.envVarsSection.scopes.perUser" },
 ];
 
+const VARIABLE_SYNTAX = "${VAR_NAME}";
+
 const VARIABLE_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 
 /**
@@ -34,31 +38,34 @@ const VARIABLE_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
  * The parent form reads the ``env_vars`` field from the form values.
  */
 const EnvVarsSection: React.FC = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<MountedFormValues>();
   const { fields, append, remove } = useFieldArray({ control: listControl(control), name: "env_vars" });
   useMountedName("env_vars");
+  const scopeOptions = SCOPE_OPTIONS.map((option) => ({ value: option.value, label: t(option.labelKey) }));
 
   return (
     <div className="rounded-lg border border-border bg-muted p-4">
       <div className="flex items-center gap-2 mb-1">
-        <strong className="text-sm font-semibold">Variables</strong>
+        <strong className="text-sm font-semibold">{t("mcpServers.envVarsSection.title")}</strong>
         <SimpleTooltip
           content={
-            <>
-              Define variables you can interpolate in Static Headers or Authentication using{" "}
-              <code>{"${VAR_NAME}"}</code>. <br />
-              <b>Instance</b>: admin-defined value used for every user.
-              <br />
-              <b>Per-user</b>: each user supplies their own value (e.g. personal credentials) via the MCP Gateway
-              dashboard.
-            </>
+            <Trans
+              i18nKey="mcpServers.envVarsSection.tooltip"
+              values={{ variableSyntax: VARIABLE_SYNTAX }}
+              components={{ code: <code />, b: <b /> }}
+            />
           }
         >
           <Info className="size-4 text-info hover:text-info/80 cursor-help" />
         </SimpleTooltip>
       </div>
       <span className="mb-3 block text-xs text-muted-foreground">
-        Reference these in Static Headers or Authentication as <code>{"${VAR_NAME}"}</code>. For example:{" "}
+        <Trans
+          i18nKey="mcpServers.envVarsSection.reference"
+          values={{ variableSyntax: VARIABLE_SYNTAX }}
+          components={{ code: <code /> }}
+        />{" "}
         <code className="bg-card px-1 rounded-sm border border-border">
           {"${DB_PROTOCOL}://${CORP_USERNAME}:${CORP_PASSWORD}@${DB_HOSTNAME}"}
         </code>
@@ -67,9 +74,9 @@ const EnvVarsSection: React.FC = () => {
       <div className="space-y-2">
         {fields.length > 0 && (
           <div className="flex gap-3 px-1 text-xs font-medium text-muted-foreground uppercase tracking-wide">
-            <div style={{ flex: 1 }}>Variable Name</div>
-            <div style={{ flex: 1 }}>Value / Description</div>
-            <div style={{ width: 160 }}>Scope</div>
+            <div style={{ flex: 1 }}>{t("mcpServers.envVarsSection.columns.name")}</div>
+            <div style={{ flex: 1 }}>{t("mcpServers.envVarsSection.columns.value")}</div>
+            <div style={{ width: 160 }}>{t("mcpServers.envVarsSection.columns.scope")}</div>
             <div style={{ width: 24 }} />
           </div>
         )}
@@ -80,16 +87,17 @@ const EnvVarsSection: React.FC = () => {
               className="mb-0 flex-1"
               rules={{
                 validate: {
-                  required: requiredRule("Variable name is required"),
-                  pattern: matchesPattern(
-                    VARIABLE_NAME_PATTERN,
-                    "Use letters, digits, underscores; cannot start with a digit.",
-                  ),
+                  required: requiredRule(t("mcpServers.envVarsSection.name.required")),
+                  pattern: matchesPattern(VARIABLE_NAME_PATTERN, t("mcpServers.envVarsSection.name.invalid")),
                 },
               }}
             >
               {(control) => (
-                <Input {...textControl(control)} placeholder="e.g. DB_PROTOCOL" className="rounded-md font-mono" />
+                <Input
+                  {...textControl(control)}
+                  placeholder={t("mcpServers.envVarsSection.name.placeholder")}
+                  className="rounded-md font-mono"
+                />
               )}
             </MountedFormField>
             <div style={{ flex: 1 }}>
@@ -97,12 +105,12 @@ const EnvVarsSection: React.FC = () => {
             </div>
             <MountedFormField name={["env_vars", String(index), "scope"]} className="mb-0 w-40" defaultValue="global">
               {(control) => (
-                <Select {...selectControl<string>(control)} items={SCOPE_OPTIONS}>
+                <Select {...selectControl<string>(control)} items={scopeOptions}>
                   <SelectTrigger {...selectTriggerControl(control)} className="w-full">
                     <SelectValue />
                   </SelectTrigger>
                   <SelectContent>
-                    {SCOPE_OPTIONS.map((option) => (
+                    {scopeOptions.map((option) => (
                       <SelectItem key={option.value} value={option.value}>
                         {option.label}
                       </SelectItem>
@@ -121,7 +129,7 @@ const EnvVarsSection: React.FC = () => {
         ))}
         <Button variant="outline" className="w-full border-dashed" onClick={() => append({ scope: "global" })}>
           <Plus />
-          Add Variable
+          {t("mcpServers.envVarsSection.addVariable")}
         </Button>
       </div>
     </div>
@@ -132,6 +140,7 @@ const EnvVarsSection: React.FC = () => {
 // vars the value comes from each user later, so the column instead captures an
 // optional description that the per-user fill-in modal shows as a hint.
 const ScopedValueOrDescription: React.FC<{ index: number }> = ({ index }) => {
+  const { t } = useTranslation();
   const isPerUser = useWatch({ name: `env_vars.${index}.scope` }) === "user";
   if (isPerUser) {
     return (
@@ -139,16 +148,16 @@ const ScopedValueOrDescription: React.FC<{ index: number }> = ({ index }) => {
         {(control) => (
           <InputGroup>
             <InputGroupAddon>
-              <SimpleTooltip content="Per-user variables have no shared value. This text is only a hint shown to each user when they fill in their own value.">
+              <SimpleTooltip content={t("mcpServers.envVarsSection.hint.tooltip")}>
                 <span className="text-xs text-muted-foreground cursor-help whitespace-nowrap">
                   <Info className="mr-1 inline size-3 align-text-bottom" />
-                  Hint
+                  {t("mcpServers.envVarsSection.hint.label")}
                 </span>
               </SimpleTooltip>
             </InputGroupAddon>
             <InputGroupInput
               {...textControl(control)}
-              placeholder="e.g. Your DB username"
+              placeholder={t("mcpServers.envVarsSection.hint.placeholder")}
               className="text-muted-foreground"
             />
           </InputGroup>
@@ -158,7 +167,13 @@ const ScopedValueOrDescription: React.FC<{ index: number }> = ({ index }) => {
   }
   return (
     <MountedFormField name={["env_vars", String(index), "value"]} className="mb-0">
-      {(control) => <Input {...textControl(control)} placeholder="e.g. postgresql" className="rounded-md font-mono" />}
+      {(control) => (
+        <Input
+          {...textControl(control)}
+          placeholder={t("mcpServers.envVarsSection.value.placeholder")}
+          className="rounded-md font-mono"
+        />
+      )}
     </MountedFormField>
   );
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx
index 70d1bc40c18..98bb3254ba5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx
@@ -1,5 +1,6 @@
 import { Info } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
@@ -27,9 +28,10 @@ const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, toolt
 );
 
 const PRIVATE_KEY_PATH = ["credentials", "client_private_key"] as const;
+const PEM_HEADER = "-----BEGIN PRIVATE KEY-----";
 
 const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false }) => {
-  const placeholderSuffix = isEditing ? " (leave blank to keep existing)" : "";
+  const { t } = useTranslation();
   const requiredWhenCreating = (message: string) =>
     isEditing ? undefined : { validate: { required: requiredRule(message) } };
 
@@ -38,13 +40,13 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Org Token Endpoint (leg 1)"
-            tooltip="Your IdP org authorization server's token endpoint. LiteLLM exchanges the user's identity assertion here for an ID-JAG assertion (RFC 8693 with requested_token_type=urn:ietf:params:oauth:token-type:id-jag)."
+            label={t("mcpServers.idJagFormFields.orgTokenEndpoint.label")}
+            tooltip={t("mcpServers.idJagFormFields.orgTokenEndpoint.tooltip")}
           />
         }
         name="token_exchange_endpoint"
         required={!isEditing}
-        rules={requiredWhenCreating("The org token endpoint is required for ID-JAG")}
+        rules={requiredWhenCreating(t("mcpServers.idJagFormFields.orgTokenEndpoint.required"))}
       >
         {(control) => (
           <Input
@@ -57,13 +59,13 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Resource Token Endpoint (leg 2)"
-            tooltip="The upstream resource authorization server's token endpoint. LiteLLM posts the ID-JAG assertion here as an RFC 7523 jwt-bearer grant to get the access token the MCP server accepts."
+            label={t("mcpServers.idJagFormFields.resourceTokenEndpoint.label")}
+            tooltip={t("mcpServers.idJagFormFields.resourceTokenEndpoint.tooltip")}
           />
         }
         name={["credentials", "id_jag_resource_token_endpoint"]}
         required={!isEditing}
-        rules={requiredWhenCreating("The resource token endpoint is required for ID-JAG")}
+        rules={requiredWhenCreating(t("mcpServers.idJagFormFields.resourceTokenEndpoint.required"))}
       >
         {(control) => (
           <Input
@@ -74,15 +76,24 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
         )}
       </MountedFormField>
       <MountedFormField
-        label={<FieldLabel label="Client ID" tooltip="OAuth2 client ID LiteLLM authenticates as on both legs." />}
+        label={
+          <FieldLabel
+            label={t("mcpServers.idJagFormFields.clientId.label")}
+            tooltip={t("mcpServers.idJagFormFields.clientId.tooltip")}
+          />
+        }
         name={["credentials", "client_id"]}
         required={!isEditing}
-        rules={requiredWhenCreating("Client ID is required for ID-JAG")}
+        rules={requiredWhenCreating(t("mcpServers.idJagFormFields.clientId.required"))}
       >
         {(control) => (
           <PasswordInput
             {...textControl(control)}
-            placeholder={`Enter OAuth client ID${placeholderSuffix}`}
+            placeholder={
+              isEditing
+                ? t("mcpServers.idJagFormFields.clientId.placeholderEditing")
+                : t("mcpServers.idJagFormFields.clientId.placeholder")
+            }
             groupClassName={fieldClassName}
           />
         )}
@@ -90,8 +101,8 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Client Secret"
-            tooltip="Authenticates LiteLLM as the OAuth client via client_secret_post. Leave blank when using a private key instead; a private key takes precedence over this secret."
+            label={t("mcpServers.idJagFormFields.clientSecret.label")}
+            tooltip={t("mcpServers.idJagFormFields.clientSecret.tooltip")}
           />
         }
         name={["credentials", "client_secret"]}
@@ -103,7 +114,7 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
                 validate: {
                   secretOrPrivateKey: requiredUnlessSiblingSet(
                     PRIVATE_KEY_PATH,
-                    "Provide either a client secret or a client private key",
+                    t("mcpServers.idJagFormFields.clientSecret.secretOrPrivateKey"),
                   ),
                 },
               }
@@ -112,7 +123,11 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
         {(control) => (
           <PasswordInput
             {...textControl(control)}
-            placeholder={`Enter OAuth client secret${placeholderSuffix}`}
+            placeholder={
+              isEditing
+                ? t("mcpServers.idJagFormFields.clientSecret.placeholderEditing")
+                : t("mcpServers.idJagFormFields.clientSecret.placeholder")
+            }
             groupClassName={fieldClassName}
           />
         )}
@@ -120,8 +135,8 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Client Private Key (PEM)"
-            tooltip="PEM private key signing the RFC 7523 private_key_jwt client assertion. Okta Cross App Access normally requires this. When set it takes precedence over the client secret."
+            label={t("mcpServers.idJagFormFields.privateKey.label")}
+            tooltip={t("mcpServers.idJagFormFields.privateKey.tooltip")}
           />
         }
         name={PRIVATE_KEY_PATH}
@@ -130,7 +145,11 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
           <Textarea
             {...textControl(control)}
             rows={3}
-            placeholder={`-----BEGIN PRIVATE KEY-----${placeholderSuffix}`}
+            placeholder={
+              isEditing
+                ? t("mcpServers.idJagFormFields.privateKey.placeholderEditing", { pemHeader: PEM_HEADER })
+                : PEM_HEADER
+            }
             className={fieldClassName}
           />
         )}
@@ -138,8 +157,8 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Private Key ID (optional)"
-            tooltip="The kid advertised in the client assertion JWT header, so the IdP can select the right registered key."
+            label={t("mcpServers.idJagFormFields.privateKeyId.label")}
+            tooltip={t("mcpServers.idJagFormFields.privateKeyId.tooltip")}
           />
         }
         name={["credentials", "client_private_key_id"]}
@@ -149,8 +168,8 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Client Assertion Signing Algorithm (optional)"
-            tooltip="Algorithm signing the client assertion JWT. Defaults to RS256."
+            label={t("mcpServers.idJagFormFields.signingAlg.label")}
+            tooltip={t("mcpServers.idJagFormFields.signingAlg.tooltip")}
           />
         }
         name={["credentials", "client_assertion_signing_alg"]}
@@ -160,8 +179,8 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Audience (optional)"
-            tooltip="RFC 8693 audience sent on leg 1, identifying the upstream the ID-JAG assertion is minted for."
+            label={t("mcpServers.idJagFormFields.audience.label")}
+            tooltip={t("mcpServers.idJagFormFields.audience.tooltip")}
           />
         }
         name="audience"
@@ -173,8 +192,8 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Resource Indicator (optional)"
-            tooltip="RFC 8707 resource indicator sent on leg 1. Separate from Audience, which is the RFC 8693 parameter."
+            label={t("mcpServers.idJagFormFields.resource.label")}
+            tooltip={t("mcpServers.idJagFormFields.resource.tooltip")}
           />
         }
         name={["credentials", "id_jag_resource"]}
@@ -186,8 +205,8 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
       <MountedFormField
         label={
           <FieldLabel
-            label="Subject Token Type (optional)"
-            tooltip="Type of the identity assertion exchanged on leg 1. Defaults to urn:ietf:params:oauth:token-type:id_token."
+            label={t("mcpServers.idJagFormFields.subjectTokenType.label")}
+            tooltip={t("mcpServers.idJagFormFields.subjectTokenType.tooltip")}
           />
         }
         name="subject_token_type"
@@ -201,10 +220,21 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
         )}
       </MountedFormField>
       <MountedFormField
-        label={<FieldLabel label="Scopes (optional)" tooltip="Scopes requested on leg 1 of the exchange." />}
+        label={
+          <FieldLabel
+            label={t("mcpServers.idJagFormFields.scopes.label")}
+            tooltip={t("mcpServers.idJagFormFields.scopes.tooltip")}
+          />
+        }
         name={["credentials", "scopes"]}
       >
-        {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
+        {(control) => (
+          <MultiSelect
+            {...tagsControl(control, t)}
+            placeholder={t("mcpServers.idJagFormFields.scopes.placeholder")}
+            className="rounded-lg"
+          />
+        )}
       </MountedFormField>
       <UpstreamTokenHeaderField />
     </>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ImportMCPServers.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ImportMCPServers.tsx
index d04160bca3e..159710bd305 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ImportMCPServers.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ImportMCPServers.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Textarea } from "@/components/ui/textarea";
@@ -24,6 +25,7 @@ const PLACEHOLDER = `{
 }`;
 
 const ImportMCPServers: React.FC<ImportMCPServersProps> = ({ accessToken, open, onClose, onImported }) => {
+  const { t } = useTranslation();
   const [configText, setConfigText] = useState("");
   const [parseError, setParseError] = useState<string | null>(null);
   const [isImporting, setIsImporting] = useState(false);
@@ -37,7 +39,7 @@ const ImportMCPServers: React.FC<ImportMCPServersProps> = ({ accessToken, open,
   };
 
   const handleImport = async () => {
-    const parsed = parseConnectorConfig(configText);
+    const parsed = parseConnectorConfig(configText, t);
     if (!parsed.ok) {
       setParseError(parsed.error);
       return;
@@ -48,12 +50,12 @@ const ImportMCPServers: React.FC<ImportMCPServersProps> = ({ accessToken, open,
       const response = (await importMCPServers(accessToken, parsed.payload)) as MCPConnectorImportResponse;
       setResult(response);
       if (response.imported.length > 0) {
-        toast.success(`Imported ${response.imported.length} MCP server${response.imported.length === 1 ? "" : "s"}`);
+        toast.success(t("mcpServers.importMcpServers.toasts.imported", { count: response.imported.length }));
         onImported();
       }
     } catch (error) {
       console.error("Failed to import MCP servers:", error);
-      setParseError("Import request failed. Check the proxy logs for details.");
+      setParseError(t("mcpServers.importMcpServers.errors.requestFailed"));
     } finally {
       setIsImporting(false);
     }
@@ -63,15 +65,14 @@ const ImportMCPServers: React.FC<ImportMCPServersProps> = ({ accessToken, open,
     <Dialog open={open} onOpenChange={(isOpen) => !isOpen && handleClose()}>
       <DialogContent className="max-w-2xl">
         <DialogHeader>
-          <DialogTitle>Import MCP Connectors</DialogTitle>
+          <DialogTitle>{t("mcpServers.importMcpServers.title")}</DialogTitle>
         </DialogHeader>
         <div className="space-y-4">
           <p className="text-sm text-muted-foreground">
-            Paste an Anthropic connector configuration: the <code>mcpServers</code> mapping from a Claude Desktop /
-            Claude Code config file, or the <code>mcp_servers</code> array from the Anthropic Messages API.
+            <Trans i18nKey="mcpServers.importMcpServers.description" components={{ code: <code /> }} />
           </p>
           <Textarea
-            aria-label="Connector JSON"
+            aria-label={t("mcpServers.importMcpServers.connectorJsonLabel")}
             value={configText}
             onChange={(e) => setConfigText(e.target.value)}
             placeholder={PLACEHOLDER}
@@ -87,13 +88,13 @@ const ImportMCPServers: React.FC<ImportMCPServersProps> = ({ accessToken, open,
             <div className="space-y-2 text-sm">
               {result.imported.length > 0 && (
                 <div>
-                  <span className="font-semibold">Imported:</span>{" "}
+                  <span className="font-semibold">{t("mcpServers.importMcpServers.result.imported")}</span>{" "}
                   {result.imported.map((entry) => entry.alias || entry.name).join(", ")}
                 </div>
               )}
               {result.skipped.length > 0 && (
                 <div>
-                  <span className="font-semibold">Skipped:</span>
+                  <span className="font-semibold">{t("mcpServers.importMcpServers.result.skipped")}</span>
                   <ul className="ml-4 list-disc">
                     {result.skipped.map((entry) => (
                       <li key={entry.name}>
@@ -105,7 +106,7 @@ const ImportMCPServers: React.FC<ImportMCPServersProps> = ({ accessToken, open,
               )}
               {result.errors.length > 0 && (
                 <div>
-                  <span className="font-semibold">Failed:</span>
+                  <span className="font-semibold">{t("mcpServers.importMcpServers.result.failed")}</span>
                   <ul className="ml-4 list-disc">
                     {result.errors.map((entry) => (
                       <li key={entry.name}>
@@ -119,10 +120,10 @@ const ImportMCPServers: React.FC<ImportMCPServersProps> = ({ accessToken, open,
           )}
           <div className="flex justify-end gap-2">
             <Button variant="outline" onClick={handleClose} disabled={isImporting}>
-              Close
+              {t("mcpServers.importMcpServers.close")}
             </Button>
             <Button onClick={handleImport} disabled={isImporting}>
-              {isImporting ? "Importing..." : "Import"}
+              {isImporting ? t("mcpServers.importMcpServers.importing") : t("mcpServers.importMcpServers.import")}
             </Button>
           </div>
         </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPGatewaySessionsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPGatewaySessionsTab.tsx
index 46c1d2c6848..8ec003b042c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPGatewaySessionsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPGatewaySessionsTab.tsx
@@ -2,6 +2,9 @@
 
 import { useTerminology } from "@/contexts/TerminologyContext";
 import React, { useState } from "react";
+import type { TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { RefreshCw, Unplug } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
@@ -27,29 +30,36 @@ import { createQueryKeys } from "@/app/(dashboard)/hooks/common/queryKeysFactory
 
 const mcpGatewaySessionKeys = createQueryKeys("mcpGatewaySessions");
 const REFETCH_INTERVAL_MS = 15000;
-const UNKNOWN_LABEL = "(unknown)";
 
-export function formatIdleSeconds(idleSeconds: number): string {
+export function formatIdleSeconds(idleSeconds: number, t: TFunction = i18n.t.bind(i18n)): string {
   const total = Math.max(0, Math.floor(idleSeconds));
-  if (total < 60) return `${total}s`;
+  if (total < 60) return t("mcpServers.gatewaySessionsTab.idle.seconds", { seconds: total });
   const minutes = Math.floor(total / 60);
   const seconds = total % 60;
-  return seconds === 0 ? `${minutes}m` : `${minutes}m ${seconds}s`;
+  return seconds === 0
+    ? t("mcpServers.gatewaySessionsTab.idle.minutes", { minutes })
+    : t("mcpServers.gatewaySessionsTab.idle.minutesSeconds", { minutes, seconds });
 }
 
-function groupLabel(label: string | null): string {
-  if (label === null) return UNKNOWN_LABEL;
+function groupLabel(label: string | null, t: TFunction): string {
+  if (label === null) return t("mcpServers.gatewaySessionsTab.unknown");
   return label === "" ? '""' : label;
 }
 
-export function describeSelector(selector: MCPGatewaySessionSelector): string {
-  if (selector.user_id !== undefined) return `every live session opened by user ${groupLabel(selector.user_id)}`;
-  return `session ${selector.session_id_prefix}`;
+export function describeSelector(selector: MCPGatewaySessionSelector, t: TFunction): string {
+  if (selector.user_id !== undefined)
+    return t("mcpServers.gatewaySessionsTab.selector.user", { user: groupLabel(selector.user_id, t) });
+  return t("mcpServers.gatewaySessionsTab.selector.session", { sessionId: selector.session_id_prefix });
 }
 
-export function describeTerminateResult(result: MCPGatewaySessionsTerminateResponse): string {
-  const noun = result.terminated_sessions === 1 ? "session" : "sessions";
-  return `Disconnected ${result.terminated_sessions} ${noun} on worker pid ${result.worker_pid}.`;
+export function describeTerminateResult(
+  result: MCPGatewaySessionsTerminateResponse,
+  t: TFunction = i18n.t.bind(i18n),
+): string {
+  return t("mcpServers.gatewaySessionsTab.terminateResult", {
+    count: result.terminated_sessions,
+    pid: result.worker_pid,
+  });
 }
 
 function StatCard({ label, value }: { label: string; value: number }) {
@@ -68,16 +78,17 @@ function DisconnectUserButton({
   userId: string | null;
   onDisconnectUser: (userId: string) => void;
 }) {
+  const { t } = useTranslation();
   if (userId === null || userId === "") return null;
   return (
     <Button
       variant="outline"
       size="sm"
       onClick={() => onDisconnectUser(userId)}
-      aria-label={`Disconnect all sessions for user ${groupLabel(userId)}`}
+      aria-label={t("mcpServers.gatewaySessionsTab.disconnectUser.ariaLabel", { user: groupLabel(userId, t) })}
     >
       <Unplug className="size-4" />
-      Disconnect all
+      {t("mcpServers.gatewaySessionsTab.disconnectUser.label")}
     </Button>
   );
 }
@@ -93,6 +104,7 @@ function GroupCountTable({
   labelHeader: string;
   onDisconnectUser?: (userId: string) => void;
 }) {
+  const { t } = useTranslation();
   return (
     <section aria-label={title} className="rounded-lg border border-border bg-card">
       <h3 className="border-b border-border px-4 py-2 text-sm font-semibold text-foreground">{title}</h3>
@@ -100,14 +112,16 @@ function GroupCountTable({
         <TableHeader>
           <TableRow>
             <TableHead>{labelHeader}</TableHead>
-            <TableHead className="text-right">Sessions</TableHead>
-            {onDisconnectUser ? <TableHead className="text-right">Actions</TableHead> : null}
+            <TableHead className="text-right">{t("mcpServers.gatewaySessionsTab.columns.sessions")}</TableHead>
+            {onDisconnectUser ? (
+              <TableHead className="text-right">{t("mcpServers.gatewaySessionsTab.columns.actions")}</TableHead>
+            ) : null}
           </TableRow>
         </TableHeader>
         <TableBody>
           {groups.map((group) => (
             <TableRow key={group.label ?? "__unknown__"}>
-              <TableCell className="font-mono text-xs">{groupLabel(group.label)}</TableCell>
+              <TableCell className="font-mono text-xs">{groupLabel(group.label, t)}</TableCell>
               <TableCell className="text-right">{group.count}</TableCell>
               {onDisconnectUser ? (
                 <TableCell className="text-right">
@@ -134,6 +148,7 @@ function SessionsBody({
   onDisconnect: ((selector: MCPGatewaySessionSelector) => void) | null;
 }) {
   const term = useTerminology();
+  const { t } = useTranslation();
   if (isLoading) {
     return (
       <div
@@ -141,14 +156,14 @@ function SessionsBody({
         className="flex items-center justify-center gap-3 rounded-lg border border-dashed border-border bg-card p-12"
       >
         <UiLoadingSpinner className="size-6 text-muted-foreground" />
-        <p className="text-sm text-muted-foreground">Loading live connections...</p>
+        <p className="text-sm text-muted-foreground">{t("mcpServers.gatewaySessionsTab.loading")}</p>
       </div>
     );
   }
   if (error) {
     return (
       <Alert variant="destructive">
-        <AlertTitle>Could not load live connections</AlertTitle>
+        <AlertTitle>{t("mcpServers.gatewaySessionsTab.loadError.title")}</AlertTitle>
         <AlertDescription>{error.message}</AlertDescription>
       </Alert>
     );
@@ -158,8 +173,8 @@ function SessionsBody({
     return (
       <div className="rounded-lg border border-dashed border-border bg-card p-12 text-center">
         <p className="text-sm text-muted-foreground">
-          No live MCP connections on this worker (pid {data.worker_pid}).{" "}
-          {term("Connect an AI client to the gateway to see it here.")}
+          {t("mcpServers.gatewaySessionsTab.empty.noConnections", { pid: data.worker_pid })}{" "}
+          {term(t("mcpServers.gatewaySessionsTab.empty.connectHint"))}
         </p>
       </div>
     );
@@ -167,35 +182,44 @@ function SessionsBody({
   return (
     <>
       <div className="grid grid-cols-1 gap-3 sm:grid-cols-3">
-        <StatCard label="Live sessions" value={data.total_sessions} />
-        <StatCard label={term("AI clients")} value={data.by_client.length} />
-        <StatCard label="Users" value={data.by_user.length} />
+        <StatCard label={t("mcpServers.gatewaySessionsTab.stats.liveSessions")} value={data.total_sessions} />
+        <StatCard label={term(t("mcpServers.gatewaySessionsTab.stats.aiClients"))} value={data.by_client.length} />
+        <StatCard label={t("mcpServers.gatewaySessionsTab.stats.users")} value={data.by_user.length} />
       </div>
       <div className="grid grid-cols-1 gap-4 lg:grid-cols-2">
-        <GroupCountTable title={term("Sessions by AI client")} labelHeader="Client" groups={data.by_client} />
         <GroupCountTable
-          title="Sessions by user"
-          labelHeader="User"
+          title={term(t("mcpServers.gatewaySessionsTab.groups.byClient"))}
+          labelHeader={t("mcpServers.gatewaySessionsTab.columns.client")}
+          groups={data.by_client}
+        />
+        <GroupCountTable
+          title={t("mcpServers.gatewaySessionsTab.groups.byUser")}
+          labelHeader={t("mcpServers.gatewaySessionsTab.columns.user")}
           groups={data.by_user}
           onDisconnectUser={onDisconnect ? (userId) => onDisconnect({ user_id: userId }) : undefined}
         />
       </div>
-      <section aria-label="Live sessions" className="rounded-lg border border-border bg-card">
+      <section
+        aria-label={t("mcpServers.gatewaySessionsTab.liveSessions.regionLabel")}
+        className="rounded-lg border border-border bg-card"
+      >
         <h3 className="border-b border-border px-4 py-2 text-sm font-semibold text-foreground">
-          Live sessions (worker pid {data.worker_pid})
+          {t("mcpServers.gatewaySessionsTab.liveSessions.heading", { pid: data.worker_pid })}
         </h3>
         <Table>
           <TableHeader>
             <TableRow>
-              <TableHead>Session</TableHead>
-              <TableHead>Client</TableHead>
-              <TableHead>User</TableHead>
-              <TableHead>Key alias</TableHead>
-              <TableHead>Team</TableHead>
-              <TableHead>Client IP</TableHead>
-              <TableHead className="text-right">Idle</TableHead>
-              <TableHead className="text-right">In flight</TableHead>
-              {onDisconnect ? <TableHead className="text-right">Actions</TableHead> : null}
+              <TableHead>{t("mcpServers.gatewaySessionsTab.columns.session")}</TableHead>
+              <TableHead>{t("mcpServers.gatewaySessionsTab.columns.client")}</TableHead>
+              <TableHead>{t("mcpServers.gatewaySessionsTab.columns.user")}</TableHead>
+              <TableHead>{t("mcpServers.gatewaySessionsTab.columns.keyAlias")}</TableHead>
+              <TableHead>{t("mcpServers.gatewaySessionsTab.columns.team")}</TableHead>
+              <TableHead>{t("mcpServers.gatewaySessionsTab.columns.clientIp")}</TableHead>
+              <TableHead className="text-right">{t("mcpServers.gatewaySessionsTab.columns.idle")}</TableHead>
+              <TableHead className="text-right">{t("mcpServers.gatewaySessionsTab.columns.inFlight")}</TableHead>
+              {onDisconnect ? (
+                <TableHead className="text-right">{t("mcpServers.gatewaySessionsTab.columns.actions")}</TableHead>
+              ) : null}
             </TableRow>
           </TableHeader>
           <TableBody>
@@ -204,10 +228,10 @@ function SessionsBody({
                 <TableCell className="font-mono text-xs">{session.session_id_prefix}</TableCell>
                 <TableCell>
                   {session.client_name === null ? (
-                    <span className="text-muted-foreground">{UNKNOWN_LABEL}</span>
+                    <span className="text-muted-foreground">{t("mcpServers.gatewaySessionsTab.unknown")}</span>
                   ) : (
                     <>
-                      <span className="font-mono text-xs">{groupLabel(session.client_name)}</span>
+                      <span className="font-mono text-xs">{groupLabel(session.client_name, t)}</span>
                       {session.client_version ? (
                         <span className="ml-1 text-xs text-muted-foreground">v{session.client_version}</span>
                       ) : null}
@@ -216,7 +240,7 @@ function SessionsBody({
                 </TableCell>
                 <TableCell>
                   {session.user_id === null ? (
-                    <span className="text-muted-foreground">{UNKNOWN_LABEL}</span>
+                    <span className="text-muted-foreground">{t("mcpServers.gatewaySessionsTab.unknown")}</span>
                   ) : (
                     <>
                       <span className="font-mono text-xs">{session.user_id}</span>
@@ -229,7 +253,7 @@ function SessionsBody({
                 <TableCell className="text-xs">{session.key_alias ?? "-"}</TableCell>
                 <TableCell className="text-xs">{session.team_alias ?? session.team_id ?? "-"}</TableCell>
                 <TableCell className="font-mono text-xs">{session.client_ip || "-"}</TableCell>
-                <TableCell className="text-right text-xs">{formatIdleSeconds(session.idle_seconds)}</TableCell>
+                <TableCell className="text-right text-xs">{formatIdleSeconds(session.idle_seconds, t)}</TableCell>
                 <TableCell className="text-right text-xs">{session.in_flight_requests}</TableCell>
                 {onDisconnect ? (
                   <TableCell className="text-right">
@@ -237,10 +261,12 @@ function SessionsBody({
                       variant="outline"
                       size="sm"
                       onClick={() => onDisconnect({ session_id_prefix: session.session_id_prefix })}
-                      aria-label={`Disconnect session ${session.session_id_prefix}`}
+                      aria-label={t("mcpServers.gatewaySessionsTab.disconnectSession.ariaLabel", {
+                        sessionId: session.session_id_prefix,
+                      })}
                     >
                       <Unplug className="size-4" />
-                      Disconnect
+                      {t("mcpServers.gatewaySessionsTab.disconnectSession.label")}
                     </Button>
                   </TableCell>
                 ) : null}
@@ -260,6 +286,7 @@ interface MCPGatewaySessionsTabProps {
 
 export function MCPGatewaySessionsTab({ accessToken, canTerminate }: MCPGatewaySessionsTabProps) {
   const term = useTerminology();
+  const { t } = useTranslation();
   const queryClient = useQueryClient();
   const [pendingSelector, setPendingSelector] = useState<MCPGatewaySessionSelector | null>(null);
   const queryOptions = {
@@ -283,37 +310,32 @@ export function MCPGatewaySessionsTab({ accessToken, canTerminate }: MCPGatewayS
     <div className="mt-4 space-y-4" data-testid="mcp-gateway-sessions-tab">
       <div className="flex flex-wrap items-start justify-between gap-3">
         <div>
-          <h2 className="text-base font-semibold text-foreground">Live Connections</h2>
-          <p className="text-sm text-muted-foreground">
-            {term(
-              "Stateful Streamable HTTP sessions currently open on this proxy worker, grouped by the AI client that sent the MCP initialize request and by the authenticated LiteLLM user. Stateless requests and SSE connections are not counted.",
-            )}
-          </p>
+          <h2 className="text-base font-semibold text-foreground">{t("mcpServers.gatewaySessionsTab.header.title")}</h2>
+          <p className="text-sm text-muted-foreground">{term(t("mcpServers.gatewaySessionsTab.header.description"))}</p>
         </div>
         <Button
           variant="outline"
           size="sm"
           onClick={() => refetch()}
           disabled={isFetching}
-          aria-label="Refresh live connections"
+          aria-label={t("mcpServers.gatewaySessionsTab.refresh.ariaLabel")}
         >
           <RefreshCw className={`size-4 ${isFetching ? "animate-spin" : ""}`} />
-          Refresh
+          {t("mcpServers.gatewaySessionsTab.refresh.label")}
         </Button>
       </div>
 
       {terminate.isError ? (
         <Alert variant="destructive">
-          <AlertTitle>Could not disconnect</AlertTitle>
+          <AlertTitle>{t("mcpServers.gatewaySessionsTab.terminateError.title")}</AlertTitle>
           <AlertDescription>{terminate.error.message}</AlertDescription>
         </Alert>
       ) : null}
       {terminate.isSuccess ? (
         <Alert>
-          <AlertTitle>Disconnected</AlertTitle>
+          <AlertTitle>{t("mcpServers.gatewaySessionsTab.terminateSuccess.title")}</AlertTitle>
           <AlertDescription>
-            {describeTerminateResult(terminate.data)} Clients holding those sessions must send a new initialize request,
-            which re-runs authentication. Sessions on other proxy workers are not affected.
+            {describeTerminateResult(terminate.data, t)} {t("mcpServers.gatewaySessionsTab.terminateSuccess.followUp")}
           </AlertDescription>
         </Alert>
       ) : null}
@@ -328,18 +350,20 @@ export function MCPGatewaySessionsTab({ accessToken, canTerminate }: MCPGatewayS
       <AlertDialog open={pendingSelector !== null} onOpenChange={(open) => !open && setPendingSelector(null)}>
         <AlertDialogContent>
           <AlertDialogHeader>
-            <AlertDialogTitle>Disconnect MCP session</AlertDialogTitle>
+            <AlertDialogTitle>{t("mcpServers.gatewaySessionsTab.confirm.title")}</AlertDialogTitle>
             <AlertDialogDescription>
-              {pendingSelector ? `This force-closes ${describeSelector(pendingSelector)} on this proxy worker. ` : ""}
-              In-flight requests fail and the client must initialize again before it can call tools.
+              {pendingSelector
+                ? `${t("mcpServers.gatewaySessionsTab.confirm.target", { target: describeSelector(pendingSelector, t) })} `
+                : ""}
+              {t("mcpServers.gatewaySessionsTab.confirm.consequence")}
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
             <Button variant="outline" onClick={() => setPendingSelector(null)}>
-              Cancel
+              {t("mcpServers.gatewaySessionsTab.confirm.cancel")}
             </Button>
             <Button variant="destructive" onClick={confirmDisconnect} disabled={terminate.isPending}>
-              Disconnect
+              {t("mcpServers.gatewaySessionsTab.confirm.confirm")}
             </Button>
           </AlertDialogFooter>
         </AlertDialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPLogoSelector.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPLogoSelector.tsx
index 1cb8ed6f5b5..419ab9c7bcf 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPLogoSelector.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPLogoSelector.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Info, Link as LinkIcon } from "lucide-react";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { InputGroup, InputGroupAddon, InputGroupInput } from "@/components/ui/input-group";
@@ -56,6 +57,7 @@ interface MCPLogoSelectorProps {
 }
 
 const MCPLogoSelector: React.FC<MCPLogoSelectorProps> = ({ value, onChange }) => {
+  const { t } = useTranslation();
   const selectedWellKnown = WELL_KNOWN_LOGOS.find((l) => l.url === value);
 
   const handleSelect = (url: string) => {
@@ -66,14 +68,17 @@ const MCPLogoSelector: React.FC<MCPLogoSelectorProps> = ({ value, onChange }) =>
     <TooltipProvider>
       <div>
         <div className="mb-2 flex items-center gap-2">
-          <span className="text-sm font-medium">Logo</span>
+          <span className="text-sm font-medium">{t("mcpServers.logoSelector.label")}</span>
           <Tooltip>
             <TooltipTrigger
-              render={<Info className="size-4 cursor-help text-muted-foreground" aria-label="About the logo" />}
+              render={
+                <Info
+                  className="size-4 cursor-help text-muted-foreground"
+                  aria-label={t("mcpServers.logoSelector.tooltipLabel")}
+                />
+              }
             />
-            <TooltipContent>
-              Select a well-known logo or paste a URL to any image. The logo is shown on the admin and chat pages.
-            </TooltipContent>
+            <TooltipContent>{t("mcpServers.logoSelector.tooltip")}</TooltipContent>
           </Tooltip>
         </div>
 
@@ -82,7 +87,7 @@ const MCPLogoSelector: React.FC<MCPLogoSelectorProps> = ({ value, onChange }) =>
           <div className="mb-3 flex items-center gap-3 rounded-lg border border-border bg-muted p-3">
             <Logo
               src={selectedWellKnown?.src ?? value}
-              label="Selected"
+              label={t("mcpServers.logoSelector.selectedLabel")}
               className="h-10 w-10 rounded-sm object-contain"
             />
             <div className="min-w-0 flex-1">
@@ -130,7 +135,7 @@ const MCPLogoSelector: React.FC<MCPLogoSelectorProps> = ({ value, onChange }) =>
             <LinkIcon className="size-4 text-muted-foreground" />
           </InputGroupAddon>
           <InputGroupInput
-            placeholder="Or paste a custom logo URL..."
+            placeholder={t("mcpServers.logoSelector.customUrlPlaceholder")}
             value={value && !selectedWellKnown ? value : ""}
             onChange={(e) => {
               const v = e.target.value.trim();
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPNetworkSettings.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPNetworkSettings.tsx
index 45180203a58..6990983325d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPNetworkSettings.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPNetworkSettings.tsx
@@ -1,4 +1,6 @@
 import React, { useState, useEffect, useId } from "react";
+import type { ParseKeys } from "i18next";
+import { useTranslation } from "react-i18next";
 import { Save, Plus, X } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -108,6 +110,7 @@ interface AllowedClientDialogProps {
 }
 
 const AllowedClientDialog: React.FC<AllowedClientDialogProps> = ({ draft, onChange, onCommit, onRemove, onClose }) => {
+  const { t } = useTranslation();
   const aliasId = useId();
   const valueId = useId();
   if (draft === null) return null;
@@ -115,28 +118,29 @@ const AllowedClientDialog: React.FC<AllowedClientDialogProps> = ({ draft, onChan
     <Dialog open onOpenChange={(open) => !open && onClose()}>
       <DialogContent>
         <DialogHeader>
-          <DialogTitle>{draft.key === null ? "Add client" : "Edit client"}</DialogTitle>
-          <DialogDescription>
-            The alias is the name shown in the dashboard and gateway logs. The value is the exact JWT claim or header
-            value that identifies the client, such as the OAuth client ID your identity provider issues.
-          </DialogDescription>
+          <DialogTitle>
+            {draft.key === null
+              ? t("mcpServers.networkSettings.clientDialog.addTitle")
+              : t("mcpServers.networkSettings.clientDialog.editTitle")}
+          </DialogTitle>
+          <DialogDescription>{t("mcpServers.networkSettings.clientDialog.description")}</DialogDescription>
         </DialogHeader>
         <div className="grid gap-4">
           <div className="grid gap-2">
-            <Label htmlFor={aliasId}>Alias</Label>
+            <Label htmlFor={aliasId}>{t("mcpServers.networkSettings.clientDialog.aliasLabel")}</Label>
             <Input
               id={aliasId}
               value={draft.alias}
-              placeholder="e.g. Coding CLI"
+              placeholder={t("mcpServers.networkSettings.clientDialog.aliasPlaceholder")}
               onChange={(e) => onChange({ ...draft, alias: e.target.value })}
             />
           </div>
           <div className="grid gap-2">
-            <Label htmlFor={valueId}>Value</Label>
+            <Label htmlFor={valueId}>{t("mcpServers.networkSettings.clientDialog.valueLabel")}</Label>
             <Input
               id={valueId}
               value={draft.value}
-              placeholder="e.g. 0oa1b2c3d4e5f6g7h8i9"
+              placeholder={t("mcpServers.networkSettings.clientDialog.valuePlaceholder")}
               className="font-mono"
               onChange={(e) => onChange({ ...draft, value: e.target.value })}
             />
@@ -145,14 +149,16 @@ const AllowedClientDialog: React.FC<AllowedClientDialogProps> = ({ draft, onChan
         <DialogFooter>
           {draft.key !== null && (
             <Button type="button" variant="destructive" className="sm:mr-auto" onClick={onRemove}>
-              Remove client
+              {t("mcpServers.networkSettings.clientDialog.remove")}
             </Button>
           )}
           <Button type="button" variant="outline" onClick={onClose}>
-            Cancel
+            {t("mcpServers.networkSettings.clientDialog.cancel")}
           </Button>
           <Button type="button" disabled={isIncomplete(trimClient(draft))} onClick={onCommit}>
-            {draft.key === null ? "Add" : "Done"}
+            {draft.key === null
+              ? t("mcpServers.networkSettings.clientDialog.add")
+              : t("mcpServers.networkSettings.clientDialog.done")}
           </Button>
         </DialogFooter>
       </DialogContent>
@@ -162,12 +168,16 @@ const AllowedClientDialog: React.FC<AllowedClientDialogProps> = ({ draft, onChan
 
 type DisableableCapability = "prompts" | "resources";
 
-const CAPABILITY_TOGGLES: { capability: DisableableCapability; label: string; description: string }[] = [
-  { capability: "prompts", label: "Prompts", description: "Advertise prompts and answer prompts/list and prompts/get" },
+const CAPABILITY_TOGGLES: { capability: DisableableCapability; labelKey: ParseKeys; descriptionKey: ParseKeys }[] = [
+  {
+    capability: "prompts",
+    labelKey: "mcpServers.networkSettings.capabilities.prompts.label",
+    descriptionKey: "mcpServers.networkSettings.capabilities.prompts.description",
+  },
   {
     capability: "resources",
-    label: "Resources",
-    description: "Advertise resources and answer resources/list, resources/templates/list and resources/read",
+    labelKey: "mcpServers.networkSettings.capabilities.resources.label",
+    descriptionKey: "mcpServers.networkSettings.capabilities.resources.description",
   },
 ];
 
@@ -177,6 +187,7 @@ const parseDisabledCapabilities = (value: unknown): DisableableCapability[] =>
     : [];
 
 const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken }) => {
+  const { t } = useTranslation();
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState(false);
   const [privateRanges, setPrivateRanges] = useState<string[]>([]);
@@ -303,7 +314,7 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
       (result): result is PromiseRejectedResult => result.status === "rejected",
     );
     if (failures.length === 0) {
-      toast.success("MCP network settings saved");
+      toast.success(t("mcpServers.networkSettings.saved"));
       return;
     }
     failures.forEach((failure) => toast.fromError(failure.reason));
@@ -362,10 +373,9 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
   return (
     <div className="space-y-6 p-4">
       <div>
-        <p className="text-lg font-semibold">Private IP Ranges</p>
+        <p className="text-lg font-semibold">{t("mcpServers.networkSettings.privateRanges.title")}</p>
         <p className="mt-1 text-sm text-muted-foreground">
-          Define which IP ranges are part of your private network. Callers from these IPs can see all MCP servers.
-          Callers from any other IP can only see servers marked &quot;Available on Public Internet&quot;.
+          {t("mcpServers.networkSettings.privateRanges.description")}
         </p>
       </div>
 
@@ -373,11 +383,12 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
         {currentIp && (
           <div className="mb-4 rounded-lg bg-muted p-3">
             <p className="text-sm">
-              Your current IP: <span className="font-mono font-medium">{currentIp}</span>
+              {t("mcpServers.networkSettings.privateRanges.currentIp")}{" "}
+              <span className="font-mono font-medium">{currentIp}</span>
             </p>
             {suggestedRange && !privateRanges.includes(suggestedRange) && (
               <div className="mt-1 flex items-center gap-2">
-                <p className="text-sm">Suggested range: </p>
+                <p className="text-sm">{t("mcpServers.networkSettings.privateRanges.suggestedRange")} </p>
                 <Button
                   variant="outline"
                   size="sm"
@@ -393,7 +404,7 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
         )}
 
         <div className="mb-2 flex items-center">
-          <p className="text-sm font-medium">Your Private Network Ranges</p>
+          <p className="text-sm font-medium">{t("mcpServers.networkSettings.privateRanges.listTitle")}</p>
         </div>
         {privateRanges.length > 0 && (
           <div className="mb-2 flex flex-wrap gap-1.5">
@@ -402,7 +413,7 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
                 {range}
                 <button
                   type="button"
-                  aria-label={`Remove ${range}`}
+                  aria-label={t("mcpServers.networkSettings.privateRanges.removeAriaLabel", { range })}
                   onClick={() => setPrivateRanges(privateRanges.filter((r) => r !== range))}
                   className="ml-1 cursor-pointer"
                 >
@@ -414,7 +425,7 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
         )}
         <Input
           value={rangeDraft}
-          placeholder="Leave empty to use defaults: 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8"
+          placeholder={t("mcpServers.networkSettings.privateRanges.placeholder")}
           onChange={(e) => setRangeDraft(e.target.value)}
           onBlur={commitDraft}
           onKeyDown={(e) => {
@@ -424,33 +435,24 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
             }
           }}
         />
-        <p className="mt-2 text-xs text-muted-foreground">
-          Enter CIDR ranges (e.g., 10.0.0.0/8). When empty, standard private IP ranges are used.
-        </p>
+        <p className="mt-2 text-xs text-muted-foreground">{t("mcpServers.networkSettings.privateRanges.hint")}</p>
       </Card>
 
       <div>
-        <p className="text-lg font-semibold">Allowed Clients</p>
+        <p className="text-lg font-semibold">{t("mcpServers.networkSettings.allowedClients.title")}</p>
         <p className="mt-1 text-sm text-muted-foreground">
-          Only the MCP client applications listed here can use the gateway. Leave empty to allow every client. A client
-          that authenticates with a JWT is identified by the claim named in litellm_jwtauth.mcp_client_id_jwt_field in
-          your proxy config (for example azp or client_id), which your identity provider asserts and the client cannot
-          change. Any other client is identified by the request header configured below, if you enable one.
+          {t("mcpServers.networkSettings.allowedClients.description")}
         </p>
       </div>
 
       <Card className="p-6">
         {storedAllowlistIsMalformed && (
           <p className="mb-2 text-sm text-destructive">
-            The stored allowlist is not a list of alias and value pairs, so every client is denied. Add the clients you
-            want and save to replace it, or save with the list empty to remove it and allow every client again.
+            {t("mcpServers.networkSettings.allowedClients.malformedWarning")}
           </p>
         )}
         {storedAllowlistIsEmpty && (
-          <p className="mb-2 text-sm text-destructive">
-            An empty allowlist is currently stored, so every client is denied. Save with the list empty to remove it and
-            allow every client again.
-          </p>
+          <p className="mb-2 text-sm text-destructive">{t("mcpServers.networkSettings.allowedClients.emptyWarning")}</p>
         )}
         {allowedClients.length > 0 && (
           <div className="mb-3 grid gap-2 sm:grid-cols-2 lg:grid-cols-3">
@@ -474,46 +476,35 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
           onClick={() => setClientDraft({ key: null, alias: "", value: "" })}
         >
           <Plus />
-          Add client
+          {t("mcpServers.networkSettings.allowedClients.add")}
         </Button>
-        <p className="mt-2 text-xs text-muted-foreground">
-          Click a client to edit or remove it. Leave the list empty to allow every client. Every MCP request from an
-          unlisted client, or from one with no resolvable identity, gets a 403.
-        </p>
+        <p className="mt-2 text-xs text-muted-foreground">{t("mcpServers.networkSettings.allowedClients.hint")}</p>
 
         <div className="mt-6 mb-2 flex items-center">
-          <p className="text-sm font-medium">Client Identity Header (less secure)</p>
+          <p className="text-sm font-medium">{t("mcpServers.networkSettings.clientIdHeader.title")}</p>
         </div>
         <Input
-          aria-label="Client identity header"
+          aria-label={t("mcpServers.networkSettings.clientIdHeader.ariaLabel")}
           value={clientIdHeader}
-          placeholder="Leave empty to identify clients by JWT only, e.g. x-mcp-client"
+          placeholder={t("mcpServers.networkSettings.clientIdHeader.placeholder")}
           onChange={(e) => setClientIdHeader(e.target.value)}
         />
-        <p className="mt-2 text-xs text-muted-foreground">
-          Optional header whose value names the client for callers without a JWT identity. Clients pick this value
-          themselves, so it is a policy control rather than a security boundary. Without it, callers that do not carry
-          the JWT claim are rejected while the allowlist is set.
-        </p>
+        <p className="mt-2 text-xs text-muted-foreground">{t("mcpServers.networkSettings.clientIdHeader.hint")}</p>
       </Card>
 
       <div>
-        <p className="text-lg font-semibold">Served Capabilities</p>
-        <p className="mt-1 text-sm text-muted-foreground">
-          Turn off prompts or resources when none of your MCP servers offer them. A capability that is turned off is
-          left out of the initialize response, its list calls return an empty list without contacting any upstream
-          server, and its get or read calls are rejected.
-        </p>
+        <p className="text-lg font-semibold">{t("mcpServers.networkSettings.capabilities.title")}</p>
+        <p className="mt-1 text-sm text-muted-foreground">{t("mcpServers.networkSettings.capabilities.description")}</p>
       </div>
 
       <Card className="space-y-4 p-6">
-        {CAPABILITY_TOGGLES.map(({ capability, label, description }) => (
+        {CAPABILITY_TOGGLES.map(({ capability, labelKey, descriptionKey }) => (
           <div key={capability} className="flex items-center justify-between gap-4">
             <div>
               <Label htmlFor={`${capabilityToggleId}-${capability}`} className="text-sm font-medium">
-                {label}
+                {t(labelKey)}
               </Label>
-              <p className="text-xs text-muted-foreground">{description}</p>
+              <p className="text-xs text-muted-foreground">{t(descriptionKey)}</p>
             </div>
             <Switch
               id={`${capabilityToggleId}-${capability}`}
@@ -528,7 +519,7 @@ const MCPNetworkSettings: React.FC<MCPNetworkSettingsProps> = ({ accessToken })
       <div className="flex justify-end">
         <Button onClick={handleSave} disabled={saving}>
           <Save />
-          Save
+          {t("mcpServers.networkSettings.save")}
         </Button>
       </div>
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx
index a48c991bc7a..aed2cdbd2c2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { MultiSelect } from "@/components/shared/MultiSelect";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { ChevronRight, CircleMinus, Info, Plus, TriangleAlert, X } from "lucide-react";
@@ -53,6 +54,7 @@ const ClearableInput: React.FC<{
 };
 
 const StaticHeadersFieldArray: React.FC = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<MountedFormValues>();
   const { fields, append, remove } = useFieldArray({ control: listControl(control), name: "static_headers" });
   useMountedName("static_headers");
@@ -64,23 +66,35 @@ const StaticHeadersFieldArray: React.FC = () => {
           <MountedFormField
             name={["static_headers", String(index), "header"]}
             className="flex-1"
-            rules={{ validate: { required: requiredRule("Header name is required") } }}
+            rules={{
+              validate: {
+                required: requiredRule(t("mcpServers.permissionManagement.staticHeaders.headerNameRequired")),
+              },
+            }}
           >
             {(headerControl) => (
               <ClearableInput
                 control={headerControl}
-                placeholder="Header name (e.g., X-API-Key)"
-                clearLabel="Clear header name"
+                placeholder={t("mcpServers.permissionManagement.staticHeaders.headerNamePlaceholder")}
+                clearLabel={t("mcpServers.permissionManagement.staticHeaders.clearHeaderName")}
               />
             )}
           </MountedFormField>
           <MountedFormField
             name={["static_headers", String(index), "value"]}
             className="flex-1"
-            rules={{ validate: { required: requiredRule("Header value is required") } }}
+            rules={{
+              validate: {
+                required: requiredRule(t("mcpServers.permissionManagement.staticHeaders.headerValueRequired")),
+              },
+            }}
           >
             {(valueControl) => (
-              <ClearableInput control={valueControl} placeholder="Header value" clearLabel="Clear header value" />
+              <ClearableInput
+                control={valueControl}
+                placeholder={t("mcpServers.permissionManagement.staticHeaders.headerValuePlaceholder")}
+                clearLabel={t("mcpServers.permissionManagement.staticHeaders.clearHeaderValue")}
+              />
             )}
           </MountedFormField>
           <CircleMinus
@@ -91,7 +105,7 @@ const StaticHeadersFieldArray: React.FC = () => {
       ))}
       <Button variant="outline" className="w-full border-dashed" onClick={() => append({})}>
         <Plus />
-        Add Static Header
+        {t("mcpServers.permissionManagement.staticHeaders.add")}
       </Button>
     </div>
   );
@@ -102,6 +116,7 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
   mcpServer,
   mountedAuthType,
 }) => {
+  const { t } = useTranslation();
   const { setValue } = useFormContext<MountedFormValues>();
   const isOAuth2 = mountedAuthType === AUTH_TYPE.OAUTH2;
   const isNoneAuth = mountedAuthType === AUTH_TYPE.NONE || mountedAuthType == null;
@@ -186,11 +201,9 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
         <span className="flex items-center">
           <span className="flex items-center space-x-2">
             <span className="w-2 h-2 bg-info rounded-full"></span>
-            <span className="text-lg font-semibold text-foreground">Permission Management / Access Control</span>
-          </span>
-          <span className="text-sm text-muted-foreground ml-4">
-            Configure access permissions and security settings (Optional)
+            <span className="text-lg font-semibold text-foreground">{t("mcpServers.permissionManagement.title")}</span>
           </span>
+          <span className="text-sm text-muted-foreground ml-4">{t("mcpServers.permissionManagement.subtitle")}</span>
         </span>
         <ChevronRight className="size-4 shrink-0 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
       </CollapsibleTrigger>
@@ -199,34 +212,44 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
           <div className="flex items-start justify-between gap-4">
             <div>
               <span className="text-sm font-medium text-foreground flex items-center">
-                Allow All LiteLLM Keys
-                <SimpleTooltip content="When enabled, every API key can access this MCP server.">
+                {t("mcpServers.permissionManagement.allowAllKeys.label")}
+                <SimpleTooltip content={t("mcpServers.permissionManagement.allowAllKeys.tooltip")}>
                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                 </SimpleTooltip>
               </span>
               <p className="text-sm text-muted-foreground mt-1">
-                Enable if this server should be &quot;public&quot; to all keys.
+                {t("mcpServers.permissionManagement.allowAllKeys.description")}
               </p>
             </div>
             <MountedFormField name="allow_all_keys" defaultValue={mcpServer?.allow_all_keys ?? false} className="mb-0">
-              {(control) => <Switch aria-label="Allow All LiteLLM Keys" {...switchControl(control)} />}
+              {(control) => (
+                <Switch
+                  aria-label={t("mcpServers.permissionManagement.allowAllKeys.label")}
+                  {...switchControl(control)}
+                />
+              )}
             </MountedFormField>
           </div>
 
           <div className="flex items-start justify-between gap-4">
             <div>
               <span className="text-sm font-medium text-foreground flex items-center">
-                Internal network only
-                <SimpleTooltip content="When on, requests must come from your internal network unless the server ID is explicitly published in public_mcp_servers. Turn off to allow public IPs. Authentication and access permissions still apply.">
+                {t("mcpServers.permissionManagement.internalNetworkOnly.label")}
+                <SimpleTooltip content={t("mcpServers.permissionManagement.internalNetworkOnly.tooltip")}>
                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                 </SimpleTooltip>
               </span>
               <p className="text-sm text-muted-foreground mt-1">
-                Turn on to restrict public IPs. Explicitly published server IDs remain accessible from public IPs.
+                {t("mcpServers.permissionManagement.internalNetworkOnly.description")}
               </p>
             </div>
             <MountedFormField name="available_on_public_internet" defaultValue={true} className="mb-0">
-              {(control) => <Switch aria-label="Internal network only" {...invertedSwitchControl(control)} />}
+              {(control) => (
+                <Switch
+                  aria-label={t("mcpServers.permissionManagement.internalNetworkOnly.label")}
+                  {...invertedSwitchControl(control)}
+                />
+              )}
             </MountedFormField>
           </div>
 
@@ -234,13 +257,13 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
             <div className="flex items-start justify-between gap-4">
               <div>
                 <span className="text-sm font-medium text-foreground flex items-center">
-                  Delegate auth to upstream (PKCE passthrough)
-                  <SimpleTooltip content="When on, LiteLLM skips its own API key/SSO check for this server and lets the client complete PKCE directly with the upstream MCP server. Only honored when Auth Type is oauth2. No spend tracking or per-key rate limiting will run on this route.">
+                  {t("mcpServers.permissionManagement.delegateAuth.label")}
+                  <SimpleTooltip content={t("mcpServers.permissionManagement.delegateAuth.tooltip")}>
                     <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                   </SimpleTooltip>
                 </span>
                 <p className="text-sm text-muted-foreground mt-1">
-                  Bypass LiteLLM auth so clients authenticate directly with the upstream OAuth MCP server.
+                  {t("mcpServers.permissionManagement.delegateAuth.description")}
                 </p>
               </div>
               <MountedFormField
@@ -249,7 +272,10 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
                 className="mb-0"
               >
                 {(control) => (
-                  <Switch aria-label="Delegate auth to upstream (PKCE passthrough)" {...switchControl(control)} />
+                  <Switch
+                    aria-label={t("mcpServers.permissionManagement.delegateAuth.label")}
+                    {...switchControl(control)}
+                  />
                 )}
               </MountedFormField>
             </div>
@@ -259,14 +285,13 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
             <div className="flex items-start justify-between gap-4">
               <div>
                 <span className="text-sm font-medium text-foreground flex items-center">
-                  OAuth pass-through
-                  <SimpleTooltip content="When on, this server is treated as an OAuth pass-through: the gateway proxies the upstream /.well-known/oauth-protected-resource metadata, emits spec-compliant 401 challenges when no bearer is supplied, and propagates upstream 401/403 responses. Only honored when Auth Type is None and 'Authorization' is in Extra Headers.">
+                  {t("mcpServers.permissionManagement.oauthPassthrough.label")}
+                  <SimpleTooltip content={t("mcpServers.permissionManagement.oauthPassthrough.tooltip")}>
                     <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                   </SimpleTooltip>
                 </span>
                 <p className="text-sm text-muted-foreground mt-1">
-                  Forward upstream OAuth discovery and 401 challenges so clients negotiate OAuth directly with the
-                  upstream MCP server.
+                  {t("mcpServers.permissionManagement.oauthPassthrough.description")}
                 </p>
               </div>
               <MountedFormField
@@ -274,7 +299,12 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
                 defaultValue={mcpServer?.oauth_passthrough ?? false}
                 className="mb-0"
               >
-                {(control) => <Switch aria-label="OAuth pass-through" {...switchControl(control)} />}
+                {(control) => (
+                  <Switch
+                    aria-label={t("mcpServers.permissionManagement.oauthPassthrough.label")}
+                    {...switchControl(control)}
+                  />
+                )}
               </MountedFormField>
             </div>
           )}
@@ -282,11 +312,9 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
           {showInternalDelegatePkceWarning && (
             <Alert variant="warning" className="mb-2">
               <TriangleAlert />
-              <AlertTitle>Internal server with upstream OAuth delegation</AlertTitle>
+              <AlertTitle>{t("mcpServers.permissionManagement.internalDelegateWarning.title")}</AlertTitle>
               <AlertDescription>
-                This MCP server is configured as internal-only but delegates auth to upstream. Anonymous users will be
-                able to reach the upstream OAuth2 /authorize flow without a LiteLLM session. Ensure your upstream
-                provider and network enforce access controls.
+                {t("mcpServers.permissionManagement.internalDelegateWarning.description")}
               </AlertDescription>
             </Alert>
           )}
@@ -294,8 +322,8 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
           <MountedFormField
             label={
               <span className="text-sm font-medium text-foreground flex items-center">
-                MCP Access Groups
-                <SimpleTooltip content="Specify access groups for this MCP server. Users must be in at least one of these groups to access the server.">
+                {t("mcpServers.permissionManagement.accessGroups.label")}
+                <SimpleTooltip content={t("mcpServers.permissionManagement.accessGroups.tooltip")}>
                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                 </SimpleTooltip>
               </span>
@@ -305,9 +333,9 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
           >
             {(control) => (
               <MultiSelect
-                {...tagsControl(control)}
+                {...tagsControl(control, t)}
                 options={availableAccessGroups.map((group) => ({ label: group, value: group }))}
-                placeholder="Select existing groups or type to create new ones"
+                placeholder={t("mcpServers.permissionManagement.accessGroups.placeholder")}
                 className="rounded-lg"
               />
             )}
@@ -316,13 +344,15 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
           <MountedFormField
             label={
               <span className="text-sm font-medium text-foreground flex items-center">
-                Extra Headers
-                <SimpleTooltip content="Forward custom headers from incoming requests to this MCP server (e.g., Authorization, X-Custom-Header, User-Agent)">
+                {t("mcpServers.permissionManagement.extraHeaders.label")}
+                <SimpleTooltip content={t("mcpServers.permissionManagement.extraHeaders.tooltip")}>
                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                 </SimpleTooltip>
                 {mcpServer?.extra_headers && mcpServer.extra_headers.length > 0 && (
                   <span className="ml-2 text-xs bg-info/15 text-info px-2 py-1 rounded-full">
-                    {mcpServer.extra_headers.length} configured
+                    {t("mcpServers.permissionManagement.extraHeaders.configuredCount", {
+                      count: mcpServer.extra_headers.length,
+                    })}
                   </span>
                 )}
               </span>
@@ -331,11 +361,13 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
           >
             {(control) => (
               <MultiSelect
-                {...tagsControl(control)}
+                {...tagsControl(control, t)}
                 placeholder={
                   mcpServer?.extra_headers && mcpServer.extra_headers.length > 0
-                    ? `Currently: ${mcpServer.extra_headers.join(", ")}`
-                    : "Enter header names (e.g., Authorization, X-Custom-Header)"
+                    ? t("mcpServers.permissionManagement.extraHeaders.currentlyPlaceholder", {
+                        headers: mcpServer.extra_headers.join(", "),
+                      })
+                    : t("mcpServers.permissionManagement.extraHeaders.placeholder")
                 }
                 className="rounded-lg"
               />
@@ -345,8 +377,8 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
           <Field>
             <FieldLabel>
               <span className="text-sm font-medium text-foreground flex items-center">
-                Static Headers
-                <SimpleTooltip content="Send these key-value headers with every request to this MCP server.">
+                {t("mcpServers.permissionManagement.staticHeaders.label")}
+                <SimpleTooltip content={t("mcpServers.permissionManagement.staticHeaders.tooltip")}>
                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                 </SimpleTooltip>
               </span>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerCard.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerCard.tsx
index a9bb2334372..6524985b74a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerCard.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerCard.tsx
@@ -1,4 +1,5 @@
 import { type FC, type KeyboardEvent, type MouseEvent } from "react";
+import { useTranslation } from "react-i18next";
 import { Check, CircleAlert, Ellipsis, Trash2, Zap } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -14,7 +15,7 @@ import { cn } from "@/lib/cva.config";
 import { AUTH_TYPE, MCP_REACHABLE_DESCRIPTION, type MCPServer } from "@/components/mcp_tools/types";
 import { Logo } from "@/components/molecules/logo/Logo";
 import { getMaskedAndFullUrl, getMCPNetworkAccess } from "./utils";
-import { STDIO_DISABLED_MESSAGE } from "./StdioAvailability";
+import { STDIO_DISABLED_MESSAGE_KEY } from "./StdioAvailability";
 
 interface MCPServerCardProps {
   server: MCPServer;
@@ -56,6 +57,7 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
   onDelete,
   stdioEnabled = true,
 }) => {
+  const { t } = useTranslation();
   const alias = server.alias || server.server_name || "";
   const name = server.server_name || alias || server.server_id;
   // Logo is sourced exclusively from the admin-set `mcp_info.logo_url`.
@@ -73,7 +75,7 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
     server.auth_type === AUTH_TYPE.OAUTH2 && !server.oauth2_flow && !server.delegate_auth_to_upstream;
   const status = server.status || "unknown";
   const healthTone = HEALTH_TONE[status] ?? HEALTH_TONE.unknown;
-  const networkAccess = getMCPNetworkAccess(server);
+  const networkAccess = getMCPNetworkAccess(server, t);
   const accessGroups = (server.mcp_access_groups ?? []).filter((g): g is string => typeof g === "string");
 
   const missing = missingUserFields ?? [];
@@ -162,7 +164,7 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                     type="button"
                     onClick={stop}
                     onKeyDown={stop}
-                    aria-label="Server actions"
+                    aria-label={t("mcpServers.serverCard.actionsMenu.label")}
                     className="-mr-1 -mt-1 inline-flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground"
                   >
                     <Ellipsis className="size-5" />
@@ -179,7 +181,7 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                     }}
                   >
                     <Zap />
-                    Test Connection
+                    {t("mcpServers.serverCard.actionsMenu.testConnection")}
                   </DropdownMenuItem>
                 )}
                 {onRecheckHealth && onDelete && <DropdownMenuSeparator />}
@@ -192,7 +194,7 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                     }}
                   >
                     <Trash2 />
-                    Delete
+                    {t("mcpServers.serverCard.actionsMenu.delete")}
                   </DropdownMenuItem>
                 )}
               </DropdownMenuContent>
@@ -229,11 +231,11 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                 render={
                   <Badge variant="outline">
                     <CircleAlert />
-                    stdio disabled
+                    {t("mcpServers.serverCard.stdioDisabled")}
                   </Badge>
                 }
               />
-              <TooltipContent>{STDIO_DISABLED_MESSAGE}</TooltipContent>
+              <TooltipContent>{t(STDIO_DISABLED_MESSAGE_KEY)}</TooltipContent>
             </Tooltip>
           )}
           {oauthFlowUnset && (
@@ -242,14 +244,11 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                 render={
                   <Badge variant="outline">
                     <CircleAlert />
-                    OAuth flow not set
+                    {t("mcpServers.serverCard.oauthFlowUnset.badge")}
                   </Badge>
                 }
               />
-              <TooltipContent>
-                This OAuth server has no flow set (Machine-to-Machine vs Interactive). Open it and choose an OAuth Flow
-                Type so LiteLLM authenticates it as you intend.
-              </TooltipContent>
+              <TooltipContent>{t("mcpServers.serverCard.oauthFlowUnset.tooltip")}</TooltipContent>
             </Tooltip>
           )}
           <Tooltip>
@@ -294,13 +293,12 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                     render={
                       <span className="inline-flex items-center gap-1 font-semibold text-destructive">
                         <CircleAlert className="size-3.5" />
-                        {missing.length} user field
-                        {missing.length === 1 ? "" : "s"} missing
+                        {t("mcpServers.serverCard.missingFields.summary", { count: missing.length })}
                       </span>
                     }
                   />
                   <TooltipContent>
-                    <div className="mb-1 font-semibold">Missing user fields:</div>
+                    <div className="mb-1 font-semibold">{t("mcpServers.serverCard.missingFields.tooltipTitle")}</div>
                     <ul className="ml-3">
                       {missing.map((m) => (
                         <li key={m}>• {m}</li>
@@ -317,7 +315,7 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                       onOpenFillFields();
                     }}
                   >
-                    Set
+                    {t("mcpServers.serverCard.missingFields.set")}
                   </Button>
                 )}
               </div>
@@ -348,11 +346,12 @@ const HealthChip: FC<HealthChipProps> = ({
   error,
   dotClass,
 }) => {
+  const { t } = useTranslation();
   if (isLoadingHealth || isRechecking) {
     return (
       <Badge variant="outline" className="text-muted-foreground">
         <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-muted-foreground" />
-        Checking
+        {t("mcpServers.serverCard.healthChip.checking")}
       </Badge>
     );
   }
@@ -379,44 +378,51 @@ const HealthChip: FC<HealthChipProps> = ({
         }
       />
       <TooltipContent side="top" className="max-w-xs">
-        <div className="mb-1 font-semibold">Health: {status}</div>
+        <div className="mb-1 font-semibold">{t("mcpServers.serverCard.healthChip.health", { status })}</div>
         {status === "reachable" && <div className="mb-1 text-xs">{MCP_REACHABLE_DESCRIPTION}</div>}
-        {lastCheck && <div className="mb-1 text-xs">Last check: {new Date(lastCheck).toLocaleString()}</div>}
+        {lastCheck && (
+          <div className="mb-1 text-xs">
+            {t("mcpServers.serverCard.healthChip.lastCheck", { time: new Date(lastCheck).toLocaleString() })}
+          </div>
+        )}
         {error && (
           <div className="text-xs">
-            <div className="mb-1 font-medium">Error</div>
+            <div className="mb-1 font-medium">{t("mcpServers.serverCard.healthChip.error")}</div>
             <div className="wrap-break-word">{error}</div>
           </div>
         )}
-        {!hasHealthData && <div className="text-xs">No health data</div>}
-        {onRecheck && <div className="mt-1 text-xs">Click to recheck</div>}
+        {!hasHealthData && <div className="text-xs">{t("mcpServers.serverCard.healthChip.noData")}</div>}
+        {onRecheck && <div className="mt-1 text-xs">{t("mcpServers.serverCard.healthChip.clickToRecheck")}</div>}
       </TooltipContent>
     </Tooltip>
   );
 };
 
-const UserFieldsRow: FC<{ onUpdate?: () => void }> = ({ onUpdate }) => (
-  <div className="flex items-center justify-between gap-2 text-xs">
-    <span className="text-muted-foreground">Per-user credentials</span>
-    <div className="flex items-center gap-2">
-      <Badge variant="outline">
-        <Check /> Set
-      </Badge>
-      {onUpdate && (
-        <Button
-          variant="link"
-          size="sm"
-          onClick={(e) => {
-            stop(e);
-            onUpdate();
-          }}
-        >
-          Update
-        </Button>
-      )}
+const UserFieldsRow: FC<{ onUpdate?: () => void }> = ({ onUpdate }) => {
+  const { t } = useTranslation();
+  return (
+    <div className="flex items-center justify-between gap-2 text-xs">
+      <span className="text-muted-foreground">{t("mcpServers.serverCard.userFieldsRow.label")}</span>
+      <div className="flex items-center gap-2">
+        <Badge variant="outline">
+          <Check /> {t("mcpServers.serverCard.userFieldsRow.set")}
+        </Badge>
+        {onUpdate && (
+          <Button
+            variant="link"
+            size="sm"
+            onClick={(e) => {
+              stop(e);
+              onUpdate();
+            }}
+          >
+            {t("mcpServers.serverCard.userFieldsRow.update")}
+          </Button>
+        )}
+      </div>
     </div>
-  </div>
-);
+  );
+};
 
 interface ByokRowProps {
   connected: boolean;
@@ -424,13 +430,14 @@ interface ByokRowProps {
 }
 
 const ByokRow: FC<ByokRowProps> = ({ connected, onConnect }) => {
+  const { t } = useTranslation();
   if (connected) {
     return (
       <div className="flex items-center justify-between gap-2 text-xs">
-        <span className="text-muted-foreground">BYOK credential</span>
+        <span className="text-muted-foreground">{t("mcpServers.serverCard.byokRow.label")}</span>
         <div className="flex items-center gap-2">
           <Badge variant="outline">
-            <Check /> Connected
+            <Check /> {t("mcpServers.serverCard.byokRow.connected")}
           </Badge>
           {onConnect && (
             <Button
@@ -441,7 +448,7 @@ const ByokRow: FC<ByokRowProps> = ({ connected, onConnect }) => {
                 onConnect();
               }}
             >
-              Update
+              {t("mcpServers.serverCard.byokRow.update")}
             </Button>
           )}
         </div>
@@ -450,7 +457,7 @@ const ByokRow: FC<ByokRowProps> = ({ connected, onConnect }) => {
   }
   return (
     <div className="flex items-center justify-between gap-2 text-xs">
-      <span className="text-muted-foreground">BYOK credential</span>
+      <span className="text-muted-foreground">{t("mcpServers.serverCard.byokRow.label")}</span>
       {onConnect ? (
         <Button
           size="sm"
@@ -459,7 +466,7 @@ const ByokRow: FC<ByokRowProps> = ({ connected, onConnect }) => {
             onConnect();
           }}
         >
-          Connect
+          {t("mcpServers.serverCard.byokRow.connect")}
         </Button>
       ) : (
         <span className="text-muted-foreground">—</span>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerUserCredentialsPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerUserCredentialsPanel.tsx
index 20b679450c3..23a41cc9427 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerUserCredentialsPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPServerUserCredentialsPanel.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import React, { useState } from "react";
+import type { TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { RefreshCw, ShieldOff } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
@@ -22,8 +24,11 @@ import { createQueryKeys } from "@/app/(dashboard)/hooks/common/queryKeysFactory
 
 const mcpServerUserCredentialKeys = createQueryKeys("mcpServerUserCredentials");
 
-export function credentialTypeLabel(credentialType: MCPServerUserCredentialListItem["credential_type"]): string {
-  return credentialType === "oauth2" ? "OAuth2" : "BYOK API key";
+export function credentialTypeLabel(
+  credentialType: MCPServerUserCredentialListItem["credential_type"],
+  t: TFunction,
+): string {
+  return credentialType === "oauth2" ? "OAuth2" : t("mcpServers.serverUserCredentialsPanel.credentialTypes.byokApiKey");
 }
 
 export function formatTimestamp(value: string | null): string {
@@ -43,6 +48,7 @@ function CredentialsBody({
   isLoading: boolean;
   onRevoke: ((item: MCPServerUserCredentialListItem) => void) | null;
 }) {
+  const { t } = useTranslation();
   if (isLoading) {
     return (
       <div
@@ -50,14 +56,14 @@ function CredentialsBody({
         className="flex items-center justify-center gap-3 rounded-lg border border-dashed border-border bg-card p-12"
       >
         <UiLoadingSpinner className="size-6 text-muted-foreground" />
-        <p className="text-sm text-muted-foreground">Loading user credentials...</p>
+        <p className="text-sm text-muted-foreground">{t("mcpServers.serverUserCredentialsPanel.loading")}</p>
       </div>
     );
   }
   if (error) {
     return (
       <Alert variant="destructive">
-        <AlertTitle>Could not load user credentials</AlertTitle>
+        <AlertTitle>{t("mcpServers.serverUserCredentialsPanel.loadError")}</AlertTitle>
         <AlertDescription>{error.message}</AlertDescription>
       </Alert>
     );
@@ -66,21 +72,26 @@ function CredentialsBody({
   if (items.length === 0) {
     return (
       <div className="rounded-lg border border-dashed border-border bg-card p-12 text-center">
-        <p className="text-sm text-muted-foreground">No user has a stored credential for this server.</p>
+        <p className="text-sm text-muted-foreground">{t("mcpServers.serverUserCredentialsPanel.empty")}</p>
       </div>
     );
   }
   return (
-    <section aria-label="Stored user credentials" className="rounded-lg border border-border bg-card">
+    <section
+      aria-label={t("mcpServers.serverUserCredentialsPanel.tableLabel")}
+      className="rounded-lg border border-border bg-card"
+    >
       <Table>
         <TableHeader>
           <TableRow>
-            <TableHead>User</TableHead>
-            <TableHead>Type</TableHead>
-            <TableHead>Connected</TableHead>
-            <TableHead>Expires</TableHead>
-            <TableHead>Updated</TableHead>
-            {onRevoke ? <TableHead className="text-right">Actions</TableHead> : null}
+            <TableHead>{t("mcpServers.serverUserCredentialsPanel.columns.user")}</TableHead>
+            <TableHead>{t("mcpServers.serverUserCredentialsPanel.columns.type")}</TableHead>
+            <TableHead>{t("mcpServers.serverUserCredentialsPanel.columns.connected")}</TableHead>
+            <TableHead>{t("mcpServers.serverUserCredentialsPanel.columns.expires")}</TableHead>
+            <TableHead>{t("mcpServers.serverUserCredentialsPanel.columns.updated")}</TableHead>
+            {onRevoke ? (
+              <TableHead className="text-right">{t("mcpServers.serverUserCredentialsPanel.columns.actions")}</TableHead>
+            ) : null}
           </TableRow>
         </TableHeader>
         <TableBody>
@@ -88,7 +99,7 @@ function CredentialsBody({
             <TableRow key={item.user_id}>
               <TableCell className="font-mono text-xs">{item.user_id}</TableCell>
               <TableCell>
-                <Badge variant="secondary">{credentialTypeLabel(item.credential_type)}</Badge>
+                <Badge variant="secondary">{credentialTypeLabel(item.credential_type, t)}</Badge>
               </TableCell>
               <TableCell className="text-xs">{formatTimestamp(item.connected_at)}</TableCell>
               <TableCell className="text-xs">{formatTimestamp(item.expires_at)}</TableCell>
@@ -99,10 +110,10 @@ function CredentialsBody({
                     variant="outline"
                     size="sm"
                     onClick={() => onRevoke(item)}
-                    aria-label={`Revoke credential for user ${item.user_id}`}
+                    aria-label={t("mcpServers.serverUserCredentialsPanel.revokeAriaLabel", { user: item.user_id })}
                   >
                     <ShieldOff className="size-4" />
-                    Revoke
+                    {t("mcpServers.serverUserCredentialsPanel.revoke")}
                   </Button>
                 </TableCell>
               ) : null}
@@ -125,6 +136,7 @@ export function MCPServerUserCredentialsPanel({
   accessToken,
   canRevoke,
 }: MCPServerUserCredentialsPanelProps) {
+  const { t } = useTranslation();
   const queryClient = useQueryClient();
   const [pendingItem, setPendingItem] = useState<MCPServerUserCredentialListItem | null>(null);
   const queryKey = mcpServerUserCredentialKeys.detail(serverId);
@@ -147,37 +159,35 @@ export function MCPServerUserCredentialsPanel({
     <div className="space-y-4" data-testid="mcp-server-user-credentials-panel">
       <div className="flex flex-wrap items-start justify-between gap-3">
         <div>
-          <h2 className="text-lg font-medium">User Credentials</h2>
-          <p className="text-sm text-muted-foreground">
-            Per-user OAuth2 tokens and BYOK API keys stored for this server. Revoking one deletes it from the database
-            and clears the cached copy, so the user must connect again before the gateway will call this server for
-            them.
-          </p>
+          <h2 className="text-lg font-medium">{t("mcpServers.serverUserCredentialsPanel.title")}</h2>
+          <p className="text-sm text-muted-foreground">{t("mcpServers.serverUserCredentialsPanel.description")}</p>
         </div>
         <Button
           variant="outline"
           size="sm"
           onClick={() => refetch()}
           disabled={isFetching}
-          aria-label="Refresh user credentials"
+          aria-label={t("mcpServers.serverUserCredentialsPanel.refreshAriaLabel")}
         >
           <RefreshCw className={`size-4 ${isFetching ? "animate-spin" : ""}`} />
-          Refresh
+          {t("mcpServers.serverUserCredentialsPanel.refresh")}
         </Button>
       </div>
 
       {revoke.isError ? (
         <Alert variant="destructive">
-          <AlertTitle>Could not revoke credential</AlertTitle>
+          <AlertTitle>{t("mcpServers.serverUserCredentialsPanel.revokeError")}</AlertTitle>
           <AlertDescription>{revoke.error.message}</AlertDescription>
         </Alert>
       ) : null}
       {revoke.isSuccess ? (
         <Alert>
-          <AlertTitle>Credential revoked</AlertTitle>
+          <AlertTitle>{t("mcpServers.serverUserCredentialsPanel.revokeSuccess.title")}</AlertTitle>
           <AlertDescription>
-            The stored {credentialTypeLabel(revoke.variables.credential_type)} credential for user{" "}
-            {revoke.variables.user_id} was deleted.
+            {t("mcpServers.serverUserCredentialsPanel.revokeSuccess.description", {
+              type: credentialTypeLabel(revoke.variables.credential_type, t),
+              user: revoke.variables.user_id,
+            })}
           </AlertDescription>
         </Alert>
       ) : null}
@@ -187,20 +197,23 @@ export function MCPServerUserCredentialsPanel({
       <AlertDialog open={pendingItem !== null} onOpenChange={(open) => !open && setPendingItem(null)}>
         <AlertDialogContent>
           <AlertDialogHeader>
-            <AlertDialogTitle>Revoke stored credential</AlertDialogTitle>
+            <AlertDialogTitle>{t("mcpServers.serverUserCredentialsPanel.revokeDialog.title")}</AlertDialogTitle>
             <AlertDialogDescription>
               {pendingItem
-                ? `This deletes the ${credentialTypeLabel(pendingItem.credential_type)} credential stored for user ${pendingItem.user_id}. `
+                ? `${t("mcpServers.serverUserCredentialsPanel.revokeDialog.target", {
+                    type: credentialTypeLabel(pendingItem.credential_type, t),
+                    user: pendingItem.user_id,
+                  })} `
                 : ""}
-              Their next MCP request to this server fails until they connect again.
+              {t("mcpServers.serverUserCredentialsPanel.revokeDialog.consequence")}
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
             <Button variant="outline" onClick={() => setPendingItem(null)}>
-              Cancel
+              {t("mcpServers.serverUserCredentialsPanel.revokeDialog.cancel")}
             </Button>
             <Button variant="destructive" onClick={confirmRevoke} disabled={revoke.isPending}>
-              Revoke
+              {t("mcpServers.serverUserCredentialsPanel.revokeDialog.confirm")}
             </Button>
           </AlertDialogFooter>
         </AlertDialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPStandardsSettings.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPStandardsSettings.tsx
index 13a9b7c171e..95e3e95a451 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPStandardsSettings.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPStandardsSettings.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { MCPServer } from "@/components/mcp_tools/types";
+import i18n from "@/i18n/i18n";
 
 export interface RequiredFieldDef {
   key: string;
@@ -16,51 +17,79 @@ export interface FieldGroup {
 
 export const FIELD_GROUPS: FieldGroup[] = [
   {
-    label: "Documentation",
+    get label() {
+      return i18n.t("mcpServers.standardsSettings.groups.documentation");
+    },
     fields: [
       {
         key: "description",
-        label: "Description",
-        description: "Must have a non-empty description",
+        get label() {
+          return i18n.t("mcpServers.standardsSettings.fields.description.label");
+        },
+        get description() {
+          return i18n.t("mcpServers.standardsSettings.fields.description.description");
+        },
         check: (s) => !!s.description?.trim(),
       },
       {
         key: "alias",
-        label: "Alias",
-        description: "Must have a display alias",
+        get label() {
+          return i18n.t("mcpServers.standardsSettings.fields.alias.label");
+        },
+        get description() {
+          return i18n.t("mcpServers.standardsSettings.fields.alias.description");
+        },
         check: (s) => !!s.alias?.trim(),
       },
     ],
   },
   {
-    label: "Source",
+    get label() {
+      return i18n.t("mcpServers.standardsSettings.groups.source");
+    },
     fields: [
       {
         key: "source_url",
-        label: "GitHub / Source URL",
-        description: "Must link to a source repository",
+        get label() {
+          return i18n.t("mcpServers.standardsSettings.fields.sourceUrl.label");
+        },
+        get description() {
+          return i18n.t("mcpServers.standardsSettings.fields.sourceUrl.description");
+        },
         check: (s) => !!s.source_url?.trim(),
       },
     ],
   },
   {
-    label: "Connection",
+    get label() {
+      return i18n.t("mcpServers.standardsSettings.groups.connection");
+    },
     fields: [
       {
         key: "url",
-        label: "Server URL",
-        description: "Must have a URL configured",
+        get label() {
+          return i18n.t("mcpServers.standardsSettings.fields.url.label");
+        },
+        get description() {
+          return i18n.t("mcpServers.standardsSettings.fields.url.description");
+        },
         check: (s) => !!s.url?.trim(),
       },
     ],
   },
   {
-    label: "Security",
+    get label() {
+      return i18n.t("mcpServers.standardsSettings.groups.security");
+    },
     fields: [
       {
         key: "auth_type",
-        label: "Auth configured",
-        description: "Must use authentication (not 'none')",
+        get label() {
+          return i18n.t("mcpServers.standardsSettings.fields.authType.label");
+        },
+        get description() {
+          return i18n.t("mcpServers.standardsSettings.fields.authType.description");
+        },
         check: (s) => !!s.auth_type && s.auth_type !== "none",
       },
     ],
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPSubmissionsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPSubmissionsTab.tsx
index 4c4c73e6818..d0617042aef 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPSubmissionsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPSubmissionsTab.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import React, { useState, useEffect, useCallback } from "react";
+import type { ParseKeys } from "i18next";
+import { Trans, useTranslation } from "react-i18next";
 import {
   SearchIcon,
   CheckIcon,
@@ -25,21 +27,21 @@ import { toast } from "@/lib/toast";
 
 type MCPStatus = "active" | "pending_review" | "rejected";
 
-const STATUS_CONFIG: Record<MCPStatus, { label: string; bg: string; text: string; dot: string }> = {
+const STATUS_CONFIG: Record<MCPStatus, { labelKey: ParseKeys; bg: string; text: string; dot: string }> = {
   active: {
-    label: "Active",
+    labelKey: "mcpServers.submissionsTab.status.active",
     bg: "bg-success/10",
     text: "text-success",
     dot: "bg-success",
   },
   pending_review: {
-    label: "Pending Review",
+    labelKey: "mcpServers.submissionsTab.status.pendingReview",
     bg: "bg-warning/10",
     text: "text-warning",
     dot: "bg-warning",
   },
   rejected: {
-    label: "Rejected",
+    labelKey: "mcpServers.submissionsTab.status.rejected",
     bg: "bg-destructive/10",
     text: "text-destructive",
     dot: "bg-destructive",
@@ -82,11 +84,12 @@ type ConfirmDialogProps = {
 };
 
 function ConfirmDialog({ action, serverName, isCurrentlyActive, onConfirm, onCancel }: ConfirmDialogProps) {
+  const { t } = useTranslation();
   const [reviewNotes, setReviewNotes] = useState("");
   const isApprove = action === "approve";
   const rejectBody = isCurrentlyActive
-    ? "This server is currently live. Rejecting it will immediately remove it from the proxy runtime."
-    : "This will mark the submission as rejected.";
+    ? t("mcpServers.submissionsTab.confirmDialog.rejectBodyLive")
+    : t("mcpServers.submissionsTab.confirmDialog.rejectBody");
   return (
     <div className="fixed inset-0 bg-black/30 flex items-center justify-center z-overlay">
       <div className="bg-card rounded-xl shadow-xl p-6 max-w-sm w-full mx-4">
@@ -102,18 +105,24 @@ function ConfirmDialog({ action, serverName, isCurrentlyActive, onConfirm, onCan
           )}
         </div>
         <h3 className="text-base font-semibold text-foreground mb-1">
-          {isApprove ? "Approve MCP Server" : "Reject MCP Server"}
+          {isApprove
+            ? t("mcpServers.submissionsTab.confirmDialog.approveTitle")
+            : t("mcpServers.submissionsTab.confirmDialog.rejectTitle")}
         </h3>
         <p className="text-sm text-muted-foreground mb-4">
-          Are you sure you want to {action}{" "}
-          <span className="font-medium text-foreground">&quot;{serverName}&quot;</span>?{" "}
-          {isApprove
-            ? "This will activate the server. The submitting user will see it in their MCP Servers list once approved."
-            : rejectBody}
+          <Trans
+            i18nKey={
+              isApprove
+                ? "mcpServers.submissionsTab.confirmDialog.approvePrompt"
+                : "mcpServers.submissionsTab.confirmDialog.rejectPrompt"
+            }
+            components={{ name: <span className="font-medium text-foreground" />, server: <>{serverName}</> }}
+          />{" "}
+          {isApprove ? t("mcpServers.submissionsTab.confirmDialog.approveBody") : rejectBody}
         </p>
         {!isApprove && (
           <textarea
-            placeholder="Reason for rejection (optional)"
+            placeholder={t("mcpServers.submissionsTab.confirmDialog.reasonPlaceholder")}
             value={reviewNotes}
             onChange={(e) => setReviewNotes(e.target.value)}
             className="w-full border border-border rounded-md px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring mb-4 resize-none"
@@ -126,7 +135,7 @@ function ConfirmDialog({ action, serverName, isCurrentlyActive, onConfirm, onCan
             onClick={onCancel}
             className="flex-1 border border-border text-foreground hover:bg-accent text-sm font-medium py-2 rounded-md transition-colors"
           >
-            Cancel
+            {t("mcpServers.submissionsTab.confirmDialog.cancel")}
           </button>
           <button
             type="button"
@@ -137,7 +146,9 @@ function ConfirmDialog({ action, serverName, isCurrentlyActive, onConfirm, onCan
                 : "bg-destructive text-destructive-foreground hover:bg-destructive/80"
             }`}
           >
-            {isApprove ? "Approve" : "Reject"}
+            {isApprove
+              ? t("mcpServers.submissionsTab.confirmDialog.approve")
+              : t("mcpServers.submissionsTab.confirmDialog.reject")}
           </button>
         </div>
       </div>
@@ -154,6 +165,7 @@ type SubmissionRulesPanelProps = {
 };
 
 function SubmissionRulesPanel({ requiredFields, onChange, onSave, isSaving, disabled }: SubmissionRulesPanelProps) {
+  const { t } = useTranslation();
   const [expanded, setExpanded] = useState(false);
   const activeLabels = MCP_REQUIRED_FIELD_DEFS.filter((f) => requiredFields.includes(f.key));
 
@@ -169,13 +181,17 @@ function SubmissionRulesPanel({ requiredFields, onChange, onSave, isSaving, disa
       >
         <div className="flex items-center gap-2">
           <SettingsIcon className="h-4 w-4 text-muted-foreground" />
-          <span className="text-sm font-semibold text-foreground">Submission Rules</span>
+          <span className="text-sm font-semibold text-foreground">
+            {t("mcpServers.submissionsTab.rulesPanel.title")}
+          </span>
           {activeLabels.length > 0 ? (
             <span className="text-xs text-muted-foreground">
-              ({activeLabels.length} required field{activeLabels.length !== 1 ? "s" : ""})
+              {t("mcpServers.submissionsTab.rulesPanel.requiredFieldCount", { count: activeLabels.length })}
             </span>
           ) : (
-            <span className="text-xs text-muted-foreground italic">no rules set</span>
+            <span className="text-xs text-muted-foreground italic">
+              {t("mcpServers.submissionsTab.rulesPanel.noRules")}
+            </span>
           )}
         </div>
         <div className="flex items-center gap-3">
@@ -202,10 +218,7 @@ function SubmissionRulesPanel({ requiredFields, onChange, onSave, isSaving, disa
 
       {expanded && (
         <div className="border-t border-border px-4 pt-4 pb-4">
-          <p className="text-xs text-muted-foreground mb-4">
-            Select which fields must be filled in before a submission is considered compliant. LiteLLM will show ✓ / ✗
-            for each rule on every submission card below.
-          </p>
+          <p className="text-xs text-muted-foreground mb-4">{t("mcpServers.submissionsTab.rulesPanel.help")}</p>
           <div className="grid grid-cols-2 gap-x-8 gap-y-5">
             {FIELD_GROUPS.map((group) => (
               <div key={group.label}>
@@ -247,14 +260,16 @@ function SubmissionRulesPanel({ requiredFields, onChange, onSave, isSaving, disa
               }}
               className="px-4 py-1.5 text-sm font-medium text-info-foreground bg-info hover:bg-info/80 disabled:opacity-50 rounded-md transition-colors"
             >
-              {isSaving ? "Saving…" : "Save Rules"}
+              {isSaving
+                ? t("mcpServers.submissionsTab.rulesPanel.saving")
+                : t("mcpServers.submissionsTab.rulesPanel.save")}
             </button>
             <button
               type="button"
               onClick={() => setExpanded(false)}
               className="px-4 py-1.5 text-sm font-medium text-muted-foreground hover:text-foreground border border-border rounded-md hover:bg-accent transition-colors"
             >
-              Cancel
+              {t("mcpServers.submissionsTab.rulesPanel.cancel")}
             </button>
           </div>
         </div>
@@ -284,6 +299,7 @@ type CardReviewActionsProps = {
 };
 
 function CardReviewActions({ approvalStatus, onApprove, onReject }: CardReviewActionsProps) {
+  const { t } = useTranslation();
   return (
     <>
       {approvalStatus !== "rejected" && (
@@ -294,7 +310,7 @@ function CardReviewActions({ approvalStatus, onApprove, onReject }: CardReviewAc
               onClick={onApprove}
               className="text-xs bg-success hover:bg-success/80 text-success-foreground px-3 py-1.5 rounded-md transition-colors font-medium"
             >
-              Approve
+              {t("mcpServers.submissionsTab.reviewActions.approve")}
             </button>
           )}
           <button
@@ -302,7 +318,7 @@ function CardReviewActions({ approvalStatus, onApprove, onReject }: CardReviewAc
             onClick={onReject}
             className="text-xs border border-destructive/30 text-destructive hover:bg-destructive/10 px-3 py-1.5 rounded-md transition-colors font-medium"
           >
-            Reject
+            {t("mcpServers.submissionsTab.reviewActions.reject")}
           </button>
         </div>
       )}
@@ -313,7 +329,7 @@ function CardReviewActions({ approvalStatus, onApprove, onReject }: CardReviewAc
             onClick={onApprove}
             className="text-xs bg-success hover:bg-success/80 text-success-foreground px-3 py-1.5 rounded-md transition-colors font-medium"
           >
-            Re-approve
+            {t("mcpServers.submissionsTab.reviewActions.reapprove")}
           </button>
         </div>
       )}
@@ -329,6 +345,7 @@ type ComplianceChecksPanelProps = {
 };
 
 function ComplianceChecksPanel({ checks, approvalStatus, onApprove, onReject }: ComplianceChecksPanelProps) {
+  const { t } = useTranslation();
   const passCount = checks.filter((c) => c.passed).length;
   const failCount = checks.length - passCount;
   const allPassed = checks.length > 0 && failCount === 0;
@@ -353,10 +370,12 @@ function ComplianceChecksPanel({ checks, approvalStatus, onApprove, onReject }:
         </div>
         <div className="flex-1 min-w-0">
           <div className={`text-sm font-semibold leading-tight ${allPassed ? "text-success" : "text-destructive"}`}>
-            {allPassed ? "All checks passed" : `${failCount} check${failCount !== 1 ? "s" : ""} failed`}
+            {allPassed
+              ? t("mcpServers.submissionsTab.compliance.allPassed")
+              : t("mcpServers.submissionsTab.compliance.failedCount", { count: failCount })}
           </div>
           <div className="text-xs text-muted-foreground mt-0.5">
-            {passCount} passing, {failCount} failing
+            {t("mcpServers.submissionsTab.compliance.summary", { passCount, failCount })}
           </div>
         </div>
         <div className="flex items-center gap-2 shrink-0">
@@ -366,7 +385,7 @@ function ComplianceChecksPanel({ checks, approvalStatus, onApprove, onReject }:
               onClick={onApprove}
               className="text-xs bg-success hover:bg-success/80 text-success-foreground px-3 py-1.5 rounded-md transition-colors font-medium"
             >
-              Approve
+              {t("mcpServers.submissionsTab.reviewActions.approve")}
             </button>
           )}
           {approvalStatus === "rejected" && (
@@ -375,7 +394,7 @@ function ComplianceChecksPanel({ checks, approvalStatus, onApprove, onReject }:
               onClick={onApprove}
               className="text-xs bg-success hover:bg-success/80 text-success-foreground px-3 py-1.5 rounded-md transition-colors font-medium"
             >
-              Re-approve
+              {t("mcpServers.submissionsTab.reviewActions.reapprove")}
             </button>
           )}
           {approvalStatus !== "rejected" && (
@@ -384,7 +403,7 @@ function ComplianceChecksPanel({ checks, approvalStatus, onApprove, onReject }:
               onClick={onReject}
               className="text-xs border border-destructive/30 text-destructive hover:bg-destructive/10 bg-card px-3 py-1.5 rounded-md transition-colors font-medium"
             >
-              Reject
+              {t("mcpServers.submissionsTab.reviewActions.reject")}
             </button>
           )}
         </div>
@@ -406,7 +425,9 @@ function ComplianceChecksPanel({ checks, approvalStatus, onApprove, onReject }:
             </div>
             <span className={`text-sm flex-1 ${c.passed ? "text-foreground" : "text-foreground"}`}>{c.label}</span>
             <span className={`text-xs ${c.passed ? "text-success" : "text-destructive"}`}>
-              {c.passed ? "Passes" : "Missing"}
+              {c.passed
+                ? t("mcpServers.submissionsTab.compliance.passes")
+                : t("mcpServers.submissionsTab.compliance.missing")}
             </span>
           </div>
         ))}
@@ -416,6 +437,7 @@ function ComplianceChecksPanel({ checks, approvalStatus, onApprove, onReject }:
 }
 
 function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServerCardProps) {
+  const { t } = useTranslation();
   const approvalStatus = (server.approval_status ?? "active") as MCPStatus;
   const statusCfg = STATUS_CONFIG[approvalStatus] ?? STATUS_CONFIG["active"];
 
@@ -436,7 +458,7 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
                 className={`inline-flex items-center gap-1.5 text-xs font-medium px-2 py-0.5 rounded-full ${statusCfg.bg} ${statusCfg.text}`}
               >
                 <span className={`w-1.5 h-1.5 rounded-full ${statusCfg.dot}`} />
-                {statusCfg.label}
+                {t(statusCfg.labelKey)}
               </span>
             </div>
             <h3 className="text-sm font-semibold text-foreground">
@@ -453,17 +475,21 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
             )}
             <div className="flex items-center gap-3 mt-1.5 text-xs text-muted-foreground">
               <span>
-                Transport: <span className="text-muted-foreground">{server.transport ?? "sse"}</span>
+                {t("mcpServers.submissionsTab.card.transport")}{" "}
+                <span className="text-muted-foreground">{server.transport ?? "sse"}</span>
               </span>
               <span>·</span>
               <span>
-                Submitted by: <span className="text-muted-foreground">{server.submitted_by ?? "—"}</span>
+                {t("mcpServers.submissionsTab.card.submittedBy")}{" "}
+                <span className="text-muted-foreground">{server.submitted_by ?? "—"}</span>
               </span>
               <span>·</span>
               <span>{formatDate(server.submitted_at)}</span>
             </div>
             {approvalStatus === "rejected" && server.review_notes && (
-              <p className="text-xs text-destructive mt-1.5">Rejection reason: {server.review_notes}</p>
+              <p className="text-xs text-destructive mt-1.5">
+                {t("mcpServers.submissionsTab.card.rejectionReason", { reason: server.review_notes })}
+              </p>
             )}
           </div>
           {checks.length === 0 && (
@@ -489,6 +515,7 @@ interface MCPSubmissionsTabProps {
 }
 
 export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
+  const { t } = useTranslation();
   const [summary, setSummary] = useState<MCPSubmissionsSummary>(EMPTY_SUMMARY);
   const [search, setSearch] = useState("");
   const [statusFilter, setStatusFilter] = useState<"all" | MCPStatus>("all");
@@ -526,11 +553,11 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
         }
       }
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to load submissions");
+      setError(err instanceof Error ? err.message : t("mcpServers.submissionsTab.errors.loadFailed"));
     } finally {
       setIsLoading(false);
     }
-  }, [accessToken]);
+  }, [accessToken, t]);
 
   useEffect(() => {
     fetchData();
@@ -541,9 +568,9 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
     setIsSavingRules(true);
     try {
       await updateConfigFieldSetting(accessToken, SETTINGS_KEY, requiredFields);
-      toast.success("Submission rules saved");
+      toast.success(t("mcpServers.submissionsTab.toasts.rulesSaved"));
     } catch {
-      toast.fromError("Failed to save submission rules");
+      toast.fromError(t("mcpServers.submissionsTab.toasts.rulesSaveFailed"));
     } finally {
       setIsSavingRules(false);
     }
@@ -567,9 +594,9 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
     try {
       await approveMCPServer(accessToken, serverId);
       await fetchData();
-      toast.success(`MCP server "${serverName}" approved`);
+      toast.success(t("mcpServers.submissionsTab.toasts.approved", { serverName }));
     } catch {
-      toast.fromError("Failed to approve MCP server");
+      toast.fromError(t("mcpServers.submissionsTab.toasts.approveFailed"));
     } finally {
       setConfirmAction(null);
     }
@@ -580,9 +607,9 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
     try {
       await rejectMCPServer(accessToken, serverId, reviewNotes);
       await fetchData();
-      toast.success(`MCP server "${serverName}" rejected`);
+      toast.success(t("mcpServers.submissionsTab.toasts.rejected", { serverName }));
     } catch {
-      toast.fromError("Failed to reject MCP server");
+      toast.fromError(t("mcpServers.submissionsTab.toasts.rejectFailed"));
     } finally {
       setConfirmAction(null);
     }
@@ -599,10 +626,18 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
       />
 
       <div className="grid grid-cols-4 gap-4 mb-6">
-        <StatCard label="Total Submitted" value={summary.total} color="text-foreground" />
-        <StatCard label="Pending Review" value={summary.pending_review} color="text-warning" />
-        <StatCard label="Active" value={summary.active} color="text-success" />
-        <StatCard label="Rejected" value={summary.rejected} color="text-destructive" />
+        <StatCard label={t("mcpServers.submissionsTab.stats.total")} value={summary.total} color="text-foreground" />
+        <StatCard
+          label={t("mcpServers.submissionsTab.status.pendingReview")}
+          value={summary.pending_review}
+          color="text-warning"
+        />
+        <StatCard label={t("mcpServers.submissionsTab.status.active")} value={summary.active} color="text-success" />
+        <StatCard
+          label={t("mcpServers.submissionsTab.status.rejected")}
+          value={summary.rejected}
+          color="text-destructive"
+        />
       </div>
 
       <div className="flex items-center gap-3 mb-5">
@@ -610,7 +645,7 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
           <SearchIcon className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
           <input
             type="text"
-            placeholder="Search MCP servers..."
+            placeholder={t("mcpServers.submissionsTab.filters.searchPlaceholder")}
             value={search}
             onChange={(e) => setSearch(e.target.value)}
             className="w-full pl-9 pr-4 py-2 border border-border rounded-md text-sm text-foreground placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-info"
@@ -621,20 +656,22 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
           onChange={(e) => setStatusFilter(e.target.value as typeof statusFilter)}
           className="border border-border rounded-md px-3 py-2 text-sm text-foreground focus:outline-hidden focus:ring-1 focus:ring-ring focus:border-info bg-card"
         >
-          <option value="all">All Status</option>
-          <option value="pending_review">Pending Review</option>
-          <option value="active">Active</option>
-          <option value="rejected">Rejected</option>
+          <option value="all">{t("mcpServers.submissionsTab.filters.allStatuses")}</option>
+          <option value="pending_review">{t("mcpServers.submissionsTab.status.pendingReview")}</option>
+          <option value="active">{t("mcpServers.submissionsTab.status.active")}</option>
+          <option value="rejected">{t("mcpServers.submissionsTab.status.rejected")}</option>
         </select>
       </div>
 
       <div className="space-y-3">
-        {isLoading && <div className="text-center py-12 text-muted-foreground text-sm">Loading submissions…</div>}
+        {isLoading && (
+          <div className="text-center py-12 text-muted-foreground text-sm">
+            {t("mcpServers.submissionsTab.loading")}
+          </div>
+        )}
         {error && <div className="text-center py-12 text-destructive text-sm">{error}</div>}
         {showEmptyState && (
-          <div className="text-center py-12 text-muted-foreground text-sm">
-            No MCP server submissions match your filters.
-          </div>
+          <div className="text-center py-12 text-muted-foreground text-sm">{t("mcpServers.submissionsTab.empty")}</div>
         )}
         {!isLoading &&
           !error &&
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetTableColumns.tsx
index d1bf4112cb9..fcb4f4c8290 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 import { Copy, Link2, MoreHorizontal, Pencil, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { DateCell, IdCell, IdentityCell } from "@/components/shared/table_cells";
@@ -17,6 +19,7 @@ import { cn } from "@/lib/cva.config";
 import { getGatewayBaseUrl } from "@/components/networking";
 import { MCPToolset } from "@/components/mcp_tools/types";
 import { copyToClipboard } from "@/utils/dataUtils";
+import i18n from "@/i18n/i18n";
 
 // Display-only. Toolsets persist {server_id, bare tool_name}; the gateway serves
 // each tool prefixed as "{server-prefix}-{tool}". Render that qualified form so
@@ -41,10 +44,11 @@ interface ToolsetRowActionsProps {
 }
 
 function ToolsetRowActions({ toolset, isAdmin, onEditClick, onDeleteClick }: ToolsetRowActionsProps) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open toolset actions"
+        aria-label={t("mcpServers.toolsetTableColumns.actions.open")}
         data-testid={`toolset-actions-${toolset.toolset_id}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -53,24 +57,29 @@ function ToolsetRowActions({ toolset, isAdmin, onEditClick, onDeleteClick }: Too
       <DropdownMenuContent align="end" className="w-52">
         <DropdownMenuItem
           data-testid="toolset-action-copy-url"
-          onClick={() => void copyToClipboard(toolsetEndpointUrl(toolset.toolset_name), "Endpoint URL copied")}
+          onClick={() =>
+            void copyToClipboard(
+              toolsetEndpointUrl(toolset.toolset_name),
+              t("mcpServers.toolsetTableColumns.actions.urlCopied"),
+            )
+          }
         >
           <Link2 />
-          Copy endpoint URL
+          {t("mcpServers.toolsetTableColumns.actions.copyUrl")}
         </DropdownMenuItem>
         <DropdownMenuItem
           data-testid="toolset-action-copy-id"
-          onClick={() => void copyToClipboard(toolset.toolset_id, "Toolset ID copied")}
+          onClick={() => void copyToClipboard(toolset.toolset_id, t("mcpServers.toolsetTableColumns.actions.idCopied"))}
         >
           <Copy />
-          Copy toolset ID
+          {t("mcpServers.toolsetTableColumns.actions.copyId")}
         </DropdownMenuItem>
         {isAdmin && (
           <>
             <DropdownMenuSeparator />
             <DropdownMenuItem data-testid="toolset-action-edit" onClick={() => onEditClick(toolset)}>
               <Pencil />
-              Edit
+              {t("mcpServers.toolsetTableColumns.actions.edit")}
             </DropdownMenuItem>
             <DropdownMenuItem
               variant="destructive"
@@ -78,7 +87,7 @@ function ToolsetRowActions({ toolset, isAdmin, onEditClick, onDeleteClick }: Too
               onClick={() => onDeleteClick(toolset.toolset_id)}
             >
               <Trash2 />
-              Delete
+              {t("mcpServers.toolsetTableColumns.actions.delete")}
             </DropdownMenuItem>
           </>
         )}
@@ -92,6 +101,7 @@ interface MCPToolsetTableColumnsDeps {
   serverPrefixById: Map<string, string>;
   onEditClick: (toolset: MCPToolset) => void;
   onDeleteClick: (toolsetId: string) => void;
+  t?: TFunction;
 }
 
 export const getMCPToolsetTableColumns = ({
@@ -99,12 +109,13 @@ export const getMCPToolsetTableColumns = ({
   serverPrefixById,
   onEditClick,
   onDeleteClick,
+  t = i18n.t.bind(i18n),
 }: MCPToolsetTableColumnsDeps): ColumnDef<MCPToolset>[] => [
   {
     id: "toolset_id",
     accessorKey: "toolset_id",
-    meta: { title: "Toolset ID" },
-    header: "Toolset ID",
+    meta: { title: t("mcpServers.toolsetTableColumns.columns.toolsetId") },
+    header: t("mcpServers.toolsetTableColumns.columns.toolsetId"),
     size: 140,
     enableSorting: false,
     cell: ({ row }) => <IdCell value={row.original.toolset_id} />,
@@ -112,8 +123,10 @@ export const getMCPToolsetTableColumns = ({
   {
     id: "toolset_name",
     accessorKey: "toolset_name",
-    meta: { title: "Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Name" />,
+    meta: { title: t("mcpServers.toolsetTableColumns.columns.name") },
+    header: ({ column }) => (
+      <DataTableSortHeader column={column} title={t("mcpServers.toolsetTableColumns.columns.name")} />
+    ),
     size: 260,
     enableSorting: true,
     sortingFn: "alphanumeric",
@@ -129,8 +142,8 @@ export const getMCPToolsetTableColumns = ({
   {
     id: "description",
     accessorKey: "description",
-    meta: { title: "Description" },
-    header: "Description",
+    meta: { title: t("mcpServers.toolsetTableColumns.columns.description") },
+    header: t("mcpServers.toolsetTableColumns.columns.description"),
     size: 200,
     enableSorting: false,
     cell: ({ row }) => (
@@ -141,8 +154,8 @@ export const getMCPToolsetTableColumns = ({
   },
   {
     id: "tools",
-    meta: { title: "Tools", skeleton: "chips" },
-    header: "Tools",
+    meta: { title: t("mcpServers.toolsetTableColumns.columns.tools"), skeleton: "chips" },
+    header: t("mcpServers.toolsetTableColumns.columns.tools"),
     size: 260,
     enableSorting: false,
     cell: ({ row }) => {
@@ -158,7 +171,9 @@ export const getMCPToolsetTableColumns = ({
             </span>
           ))}
           {tools.length > 4 && (
-            <span className="self-center text-xs text-muted-foreground">+{tools.length - 4} more</span>
+            <span className="self-center text-xs text-muted-foreground">
+              {t("mcpServers.toolsetTableColumns.moreTools", { count: tools.length - 4 })}
+            </span>
           )}
         </div>
       );
@@ -167,8 +182,10 @@ export const getMCPToolsetTableColumns = ({
   {
     id: "created_at",
     accessorKey: "created_at",
-    meta: { title: "Created" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created" />,
+    meta: { title: t("mcpServers.toolsetTableColumns.columns.created") },
+    header: ({ column }) => (
+      <DataTableSortHeader column={column} title={t("mcpServers.toolsetTableColumns.columns.created")} />
+    ),
     size: 120,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} precision="date" />,
@@ -176,7 +193,7 @@ export const getMCPToolsetTableColumns = ({
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("mcpServers.toolsetTableColumns.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx
index dc1477b79d3..dac46dfe450 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx
@@ -1,4 +1,6 @@
 import React, { useState } from "react";
+import type { TFunction } from "i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { z } from "zod";
 import { SortingState } from "@tanstack/react-table";
 import { Inbox, Plus, X } from "lucide-react";
@@ -41,12 +43,13 @@ interface MCPToolsetsTabProps {
   userRole: string | null;
 }
 
-const toolsetSchema = z.object({
-  toolset_name: z.string().min(1, "Please enter a toolset name"),
-  description: z.string(),
-});
+const buildToolsetSchema = (t: TFunction) =>
+  z.object({
+    toolset_name: z.string().min(1, t("mcpServers.toolsetsTab.form.errors.nameRequired")),
+    description: z.string(),
+  });
 
-type ToolsetFormValues = z.infer<typeof toolsetSchema>;
+type ToolsetFormValues = z.infer<ReturnType<typeof buildToolsetSchema>>;
 
 const SEARCH_DEBOUNCE_WAIT_MS = 300;
 
@@ -117,11 +120,13 @@ const selectedToolIssue = (
   tool: MCPToolsetTool,
   serverNameById: ReadonlyMap<string, string>,
   toolsByServer: ReadonlyMap<string, MCPServerToolsState>,
+  t: TFunction,
 ): string | undefined => {
-  if (!serverNameById.has(tool.server_id)) return "server not found";
+  if (!serverNameById.has(tool.server_id)) return t("mcpServers.toolsetsTab.toolIssues.serverNotFound");
   const state = toolsByServer.get(tool.server_id);
-  if (state?.status === "error") return "server unreachable";
-  if (state?.status === "success" && !state.tools.some((t) => t.name === tool.tool_name)) return "tool not found";
+  if (state?.status === "error") return t("mcpServers.toolsetsTab.toolIssues.serverUnreachable");
+  if (state?.status === "success" && !state.tools.some((entry) => entry.name === tool.tool_name))
+    return t("mcpServers.toolsetsTab.toolIssues.toolNotFound");
   return undefined;
 };
 
@@ -150,7 +155,8 @@ function ServerToolGroup({
   onToggleTool,
   onSetToolsSelected,
 }: ServerToolGroupProps) {
-  const selectedCount = selectedTools.filter((t) => t.server_id === serverId).length;
+  const { t } = useTranslation();
+  const selectedCount = selectedTools.filter((tool) => tool.server_id === serverId).length;
   const visibleRefs = visibleTools.map((tool) => ({ server_id: serverId, tool_name: tool.name }));
   const groupState = selectionState(selectedTools, visibleRefs);
 
@@ -163,12 +169,14 @@ function ServerToolGroup({
       );
     }
     if (state.status === "error") {
-      return <p className="text-xs text-destructive px-2 py-2">Couldn&apos;t load tools for this server.</p>;
+      return <p className="text-xs text-destructive px-2 py-2">{t("mcpServers.toolsetsTab.serverGroup.loadError")}</p>;
     }
     if (visibleTools.length === 0) {
       return (
         <p className="text-xs text-muted-foreground px-2 py-2">
-          {searchActive ? "No matching tools on this server." : "No tools found for this server."}
+          {searchActive
+            ? t("mcpServers.toolsetsTab.serverGroup.noMatchingTools")
+            : t("mcpServers.toolsetsTab.serverGroup.noTools")}
         </p>
       );
     }
@@ -212,7 +220,11 @@ function ServerToolGroup({
           disabled={visibleRefs.length === 0}
           // Base UI renders a span, which the global button cursor rule does not cover.
           className="cursor-pointer data-disabled:cursor-not-allowed"
-          aria-label={`${searchActive ? "Select matching tools" : "Select all tools"} on ${serverName}`}
+          aria-label={
+            searchActive
+              ? t("mcpServers.toolsetsTab.serverGroup.selectMatching", { serverName })
+              : t("mcpServers.toolsetsTab.serverGroup.selectAll", { serverName })
+          }
           onCheckedChange={(checked) => onSetToolsSelected(visibleRefs, checked)}
         />
         <button
@@ -225,7 +237,7 @@ function ServerToolGroup({
             {serverName}
             {selectedCount > 0 && (
               <span className="ml-1 text-xs text-purple-600 font-semibold dark:text-purple-400">
-                {selectedCount} selected
+                {t("mcpServers.toolsetsTab.serverGroup.selectedCount", { count: selectedCount })}
               </span>
             )}
           </span>
@@ -250,6 +262,8 @@ const toolsetFormDefaults = (toolset?: MCPToolset): ToolsetFormValues => ({
 });
 
 function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToolsetModalProps) {
+  const { t } = useTranslation();
+  const toolsetSchema = React.useMemo(() => buildToolsetSchema(t), [t]);
   const form = useZodForm(toolsetSchema, { defaultValues: toolsetFormDefaults(initialToolset) });
   const [selectedTools, setSelectedTools] = useState<MCPToolsetTool[]>(initialToolset?.tools || []);
   const [saving, setSaving] = useState(false);
@@ -321,15 +335,29 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
     <Dialog open={open} onOpenChange={(open) => !open && handleClose()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[960px]">
         <DialogHeader>
-          <DialogTitle>{initialToolset ? "Edit Toolset" : "New Toolset"}</DialogTitle>
+          <DialogTitle>
+            {initialToolset
+              ? t("mcpServers.toolsetsTab.modal.editTitle")
+              : t("mcpServers.toolsetsTab.modal.createTitle")}
+          </DialogTitle>
         </DialogHeader>
         <form onSubmit={(event) => event.preventDefault()} className="mt-2">
           <FieldGroup className="mb-4 flex-row gap-4">
-            <FormField control={form.control} name="toolset_name" label="Toolset Name" className="flex-1">
-              {(field) => <Input {...field} placeholder="e.g. github-linear-tools" />}
+            <FormField
+              control={form.control}
+              name="toolset_name"
+              label={t("mcpServers.toolsetsTab.modal.nameLabel")}
+              className="flex-1"
+            >
+              {(field) => <Input {...field} placeholder={t("mcpServers.toolsetsTab.modal.namePlaceholder")} />}
             </FormField>
-            <FormField control={form.control} name="description" label="Description" className="flex-1">
-              {(field) => <Input {...field} placeholder="Optional description" />}
+            <FormField
+              control={form.control}
+              name="description"
+              label={t("mcpServers.toolsetsTab.modal.descriptionLabel")}
+              className="flex-1"
+            >
+              {(field) => <Input {...field} placeholder={t("mcpServers.toolsetsTab.modal.descriptionPlaceholder")} />}
             </FormField>
           </FieldGroup>
         </form>
@@ -338,18 +366,24 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
           {/* Left panel: Available Tools */}
           <div className="flex-1 min-w-0">
             <div className="flex items-center justify-between mb-2">
-              <p className="text-sm font-semibold text-foreground">Available Tools</p>
+              <p className="text-sm font-semibold text-foreground">
+                {t("mcpServers.toolsetsTab.modal.availableTools")}
+              </p>
             </div>
             <InputGroup className="mb-2">
               <InputGroupInput
-                placeholder="Search tools or servers..."
-                aria-label="Search tools or servers"
+                placeholder={t("mcpServers.toolsetsTab.modal.searchPlaceholder")}
+                aria-label={t("mcpServers.toolsetsTab.modal.searchLabel")}
                 value={search}
                 onChange={(e) => setSearch(e.target.value)}
               />
               {search && (
                 <InputGroupAddon align="inline-end">
-                  <InputGroupButton size="icon-xs" aria-label="Clear search" onClick={() => setSearch("")}>
+                  <InputGroupButton
+                    size="icon-xs"
+                    aria-label={t("mcpServers.toolsetsTab.modal.clearSearch")}
+                    onClick={() => setSearch("")}
+                  >
                     <X />
                   </InputGroupButton>
                 </InputGroupAddon>
@@ -358,9 +392,9 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
             {searchActive && (
               <div className="mb-2 flex items-center justify-between gap-2">
                 <p className="text-xs text-muted-foreground" aria-live="polite">
-                  {matchingTools.length} matching {matchingTools.length === 1 ? "tool" : "tools"}
+                  {t("mcpServers.toolsetsTab.modal.matchingTools", { count: matchingTools.length })}
                   {pendingServerCount > 0 &&
-                    ` · loading ${pendingServerCount} ${pendingServerCount === 1 ? "server" : "servers"}…`}
+                    ` · ${t("mcpServers.toolsetsTab.modal.loadingServers", { count: pendingServerCount })}`}
                 </p>
                 <div className="flex gap-1 shrink-0">
                   <Button
@@ -369,7 +403,7 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
                     disabled={matchingTools.length === 0 || matchingState === "all"}
                     onClick={() => handleSetToolsSelected(matchingTools, true)}
                   >
-                    Select all matching
+                    {t("mcpServers.toolsetsTab.modal.selectAllMatching")}
                   </Button>
                   <Button
                     size="xs"
@@ -377,7 +411,7 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
                     disabled={matchingState === "none"}
                     onClick={() => handleSetToolsSelected(matchingTools, false)}
                   >
-                    Deselect all matching
+                    {t("mcpServers.toolsetsTab.modal.deselectAllMatching")}
                   </Button>
                 </div>
               </div>
@@ -385,7 +419,9 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
             <div className="space-y-2 overflow-y-auto" style={{ maxHeight: 300 }}>
               {serverViews.length === 0 ? (
                 <p className="text-muted-foreground text-sm">
-                  {mcpServers.length === 0 ? "No MCP servers configured" : "No tools or servers match your search"}
+                  {mcpServers.length === 0
+                    ? t("mcpServers.toolsetsTab.modal.noServers")
+                    : t("mcpServers.toolsetsTab.modal.noSearchMatches")}
                 </p>
               ) : (
                 serverViews.map(({ server, serverName, state, visibleTools }) => (
@@ -414,8 +450,10 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
           <div className="w-72 shrink-0">
             <div className="flex items-center justify-between mb-2">
               <p className="text-sm font-semibold text-foreground">
-                Your Toolset{" "}
-                <span className="text-xs font-normal text-muted-foreground">({selectedTools.length} tools)</span>
+                {t("mcpServers.toolsetsTab.modal.yourToolset")}{" "}
+                <span className="text-xs font-normal text-muted-foreground">
+                  {t("mcpServers.toolsetsTab.modal.toolCount", { count: selectedTools.length })}
+                </span>
               </p>
               <Button
                 size="xs"
@@ -423,21 +461,21 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
                 disabled={selectedTools.length === 0}
                 onClick={() => setSelectedTools([])}
               >
-                Clear all
+                {t("mcpServers.toolsetsTab.modal.clearAll")}
               </Button>
             </div>
             <div className="space-y-1 overflow-y-auto" style={{ maxHeight: 340 }}>
               {selectedTools.length === 0 ? (
-                <p className="text-muted-foreground text-sm">No tools added yet</p>
+                <p className="text-muted-foreground text-sm">{t("mcpServers.toolsetsTab.modal.noToolsAdded")}</p>
               ) : (
                 selectedTools.map((tool) => {
                   const toolName = displayToolName(serverPrefixById.get(tool.server_id), tool.tool_name);
-                  const issue = serversLoaded ? selectedToolIssue(tool, serverPrefixById, toolsByServer) : undefined;
+                  const issue = serversLoaded ? selectedToolIssue(tool, serverPrefixById, toolsByServer, t) : undefined;
                   return (
                     <button
                       key={`${tool.server_id}:${tool.tool_name}`}
                       type="button"
-                      aria-label={`Remove ${toolName}`}
+                      aria-label={t("mcpServers.toolsetsTab.modal.removeTool", { toolName })}
                       onClick={() => handleToggleTool(tool)}
                       className="w-full flex items-center justify-between px-3 py-1.5 rounded-lg border border-purple-200 bg-purple-50 hover:bg-destructive/10 hover:border-destructive/20 group transition-colors dark:border-purple-800 dark:bg-purple-950"
                     >
@@ -466,11 +504,11 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
 
         <div className="flex justify-end gap-2 mt-4 pt-4 border-t border-border">
           <Button variant="outline" onClick={handleClose}>
-            Cancel
+            {t("mcpServers.toolsetsTab.modal.cancel")}
           </Button>
           <Button onClick={() => void form.handleSubmit(handleSubmit)()} disabled={saving} aria-busy={saving}>
             {saving && <UiLoadingSpinner className="size-4" />}
-            {initialToolset ? "Save Changes" : "Create Toolset"}
+            {initialToolset ? t("mcpServers.toolsetsTab.modal.saveChanges") : t("mcpServers.toolsetsTab.modal.create")}
           </Button>
         </div>
       </DialogContent>
@@ -479,20 +517,20 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
 }
 
 function ToolsetsEmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No toolsets yet</div>
-      <div className="text-sm text-muted-foreground">
-        Create a toolset to give keys and teams a curated set of MCP tools.
-      </div>
+      <div className="text-sm font-medium text-foreground">{t("mcpServers.toolsetsTab.emptyState.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("mcpServers.toolsetsTab.emptyState.body")}</div>
     </div>
   );
 }
 
 function ToolsetUsageGuide() {
+  const { t } = useTranslation();
   const [copied, setCopied] = useState(false);
   const gatewayBaseUrl = getGatewayBaseUrl();
 
@@ -517,13 +555,14 @@ function ToolsetUsageGuide() {
 
   return (
     <div className="mb-6 rounded-lg border border-border bg-muted px-5 py-4">
-      <p className="text-sm font-medium text-foreground mb-1">How toolsets work</p>
+      <p className="text-sm font-medium text-foreground mb-1">{t("mcpServers.toolsetsTab.usageGuide.title")}</p>
       <p className="text-sm text-muted-foreground mb-3">
-        Create a toolset, assign it to a key via{" "}
-        <span className="font-medium text-foreground">API Keys → Edit Key → MCP Servers</span>, then point your MCP
-        client at the toolset URL. The client only sees the tools you picked.
+        <Trans
+          i18nKey="mcpServers.toolsetsTab.usageGuide.body"
+          components={{ menu: <span className="font-medium text-foreground" /> }}
+        />
       </p>
-      <div className="text-xs text-muted-foreground mb-1">Claude Code / Cursor config</div>
+      <div className="text-xs text-muted-foreground mb-1">{t("mcpServers.toolsetsTab.usageGuide.configLabel")}</div>
       <div className="relative">
         <pre className="bg-card border border-border rounded-sm px-4 py-3 text-xs font-mono text-foreground overflow-x-auto leading-relaxed pr-14">
           {snippet}
@@ -533,7 +572,7 @@ function ToolsetUsageGuide() {
           onClick={copy}
           className="absolute top-2 right-2 px-2 py-1 text-xs rounded-sm border bg-card hover:bg-muted text-muted-foreground hover:text-foreground border-border transition-colors"
         >
-          {copied ? "✓" : "copy"}
+          {copied ? "✓" : t("mcpServers.toolsetsTab.usageGuide.copy")}
         </button>
       </div>
     </div>
@@ -541,6 +580,7 @@ function ToolsetUsageGuide() {
 }
 
 export function MCPToolsetsTab({ accessToken, userRole }: MCPToolsetsTabProps) {
+  const { t } = useTranslation();
   const queryClient = useQueryClient();
   const { data: toolsets = [], isLoading } = useMCPToolsets();
   const { data: mcpServers = [] } = useMCPServers();
@@ -554,14 +594,14 @@ export function MCPToolsetsTab({ accessToken, userRole }: MCPToolsetsTabProps) {
   const handleCreate = async (name: string, description: string | undefined, tools: MCPToolsetTool[]) => {
     if (!accessToken) return;
     await createMCPToolset(accessToken, { toolset_name: name, description, tools });
-    toast.success("Toolset created");
+    toast.success(t("mcpServers.toolsetsTab.toasts.created"));
     queryClient.invalidateQueries({ queryKey: ["mcpToolsets"] });
   };
 
   const handleUpdate = async (name: string, description: string | undefined, tools: MCPToolsetTool[]) => {
     if (!accessToken || !editToolset) return;
     await updateMCPToolset(accessToken, { toolset_id: editToolset.toolset_id, toolset_name: name, description, tools });
-    toast.success("Toolset updated");
+    toast.success(t("mcpServers.toolsetsTab.toasts.updated"));
     queryClient.invalidateQueries({ queryKey: ["mcpToolsets"] });
     setEditToolset(null);
   };
@@ -571,7 +611,7 @@ export function MCPToolsetsTab({ accessToken, userRole }: MCPToolsetsTabProps) {
     setDeleting(true);
     try {
       await deleteMCPToolset(accessToken, deleteId);
-      toast.success("Toolset deleted");
+      toast.success(t("mcpServers.toolsetsTab.toasts.deleted"));
       queryClient.invalidateQueries({ queryKey: ["mcpToolsets"] });
       setDeleteId(null);
     } finally {
@@ -590,24 +630,22 @@ export function MCPToolsetsTab({ accessToken, userRole }: MCPToolsetsTabProps) {
       serverPrefixById,
       onEditClick: setEditToolset,
       onDeleteClick: setDeleteId,
+      t,
     };
     return getMCPToolsetTableColumns(deps);
-  }, [isAdmin, serverPrefixById]);
+  }, [isAdmin, serverPrefixById, t]);
 
   return (
     <div className="mt-4">
       <div className="flex items-center justify-between mb-4">
         <div>
-          <h3 className="text-lg font-medium text-foreground">MCP Toolsets</h3>
-          <p className="text-muted-foreground text-sm">
-            Curated collections of tools from one or more MCP servers. Assign toolsets to keys and teams via the MCP
-            permissions dropdown.
-          </p>
+          <h3 className="text-lg font-medium text-foreground">{t("mcpServers.toolsetsTab.header.title")}</h3>
+          <p className="text-muted-foreground text-sm">{t("mcpServers.toolsetsTab.header.description")}</p>
         </div>
         {isAdmin && (
           <Button onClick={() => setCreateOpen(true)}>
             <Plus />
-            New Toolset
+            {t("mcpServers.toolsetsTab.header.newToolset")}
           </Button>
         )}
       </div>
@@ -623,7 +661,7 @@ export function MCPToolsetsTab({ accessToken, userRole }: MCPToolsetsTabProps) {
         sorting={sorting}
         onSortingChange={setSorting}
         isLoading={isLoading}
-        loadingMessage="Loading toolsets…"
+        loadingMessage={t("mcpServers.toolsetsTab.loading")}
         noDataMessage={<ToolsetsEmptyState />}
         size="compact"
       />
@@ -642,17 +680,15 @@ export function MCPToolsetsTab({ accessToken, userRole }: MCPToolsetsTabProps) {
       <Dialog open={!!deleteId} onOpenChange={(open) => !open && setDeleteId(null)}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
           <DialogHeader>
-            <DialogTitle>Delete Toolset</DialogTitle>
+            <DialogTitle>{t("mcpServers.toolsetsTab.deleteDialog.title")}</DialogTitle>
           </DialogHeader>
-          <p>
-            Are you sure you want to delete this toolset? Keys and teams using it will lose access to the scoped tools.
-          </p>
+          <p>{t("mcpServers.toolsetsTab.deleteDialog.body")}</p>
           <DialogFooter>
             <Button variant="outline" onClick={() => setDeleteId(null)}>
-              Cancel
+              {t("mcpServers.toolsetsTab.deleteDialog.cancel")}
             </Button>
             <Button onClick={handleDelete} variant="destructive" disabled={deleting} aria-busy={deleting}>
-              Delete
+              {t("mcpServers.toolsetsTab.deleteDialog.delete")}
             </Button>
           </DialogFooter>
         </DialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx
index 41817f8c916..d6206e13506 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx
@@ -1,5 +1,7 @@
+import type { ParseKeys } from "i18next";
 import { Info } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { MultiSelect } from "@/components/shared/MultiSelect";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { SimpleTooltip } from "@/components/ui/tooltip";
@@ -39,18 +41,11 @@ interface OAuthFormFieldsProps {
 
 const fieldClassName = "rounded-lg border-border focus:border-info focus:ring-ring";
 
-const OAUTH_FLOW_ITEMS = [
-  { value: OAUTH_FLOW.M2M, label: "Machine-to-Machine (M2M)" },
-  { value: OAUTH_FLOW.INTERACTIVE, label: "Interactive (PKCE)" },
+const OAUTH_FLOW_ITEMS: ReadonlyArray<{ value: string; labelKey: ParseKeys }> = [
+  { value: OAUTH_FLOW.M2M, labelKey: "mcpServers.oauthFormFields.flowType.m2m.label" },
+  { value: OAUTH_FLOW.INTERACTIVE, labelKey: "mcpServers.oauthFormFields.flowType.interactive.label" },
 ];
 
-const UPSTREAM_RESOURCE_TOOLTIP =
-  "RFC 8707 resource indicator sent to the authorization server so it mints a token audienced for this MCP server. " +
-  "Leave blank to send nothing, which is the default and what most providers expect. Use 'auto' to send this server's " +
-  "own URL. Set an exact identifier when the authorization server expects a specific one. Some providers reject this " +
-  "parameter and take the audience from scopes instead; if you see AADSTS901002, leave it blank. If you see " +
-  "invalid_target, the authorization server needs it set.";
-
 const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, tooltip }) => (
   <span className="text-sm font-medium text-foreground flex items-center">
     {label}
@@ -60,16 +55,28 @@ const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, toolt
   </span>
 );
 
-const UpstreamResourceField: React.FC = () => (
-  <MountedFormField
-    label={<FieldLabel label="Resource Indicator (optional)" tooltip={UPSTREAM_RESOURCE_TOOLTIP} />}
-    name={["credentials", "upstream_resource"]}
-  >
-    {(control) => (
-      <Input {...textControl(control)} placeholder="auto, or https://mcp.example.com/mcp" className={fieldClassName} />
-    )}
-  </MountedFormField>
-);
+const UpstreamResourceField: React.FC = () => {
+  const { t } = useTranslation();
+  return (
+    <MountedFormField
+      label={
+        <FieldLabel
+          label={t("mcpServers.oauthFormFields.upstreamResource.label")}
+          tooltip={t("mcpServers.oauthFormFields.upstreamResource.tooltip")}
+        />
+      }
+      name={["credentials", "upstream_resource"]}
+    >
+      {(control) => (
+        <Input
+          {...textControl(control)}
+          placeholder={t("mcpServers.oauthFormFields.upstreamResource.placeholder")}
+          className={fieldClassName}
+        />
+      )}
+    </MountedFormField>
+  );
+};
 
 const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
   isM2M,
@@ -78,7 +85,8 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
   initialFlowType,
   docsUrl,
 }) => {
-  const placeholderSuffix = isEditing ? " (leave blank to keep existing)" : "";
+  const { t } = useTranslation();
+  const oauthFlowItems = OAUTH_FLOW_ITEMS.map((item) => ({ value: item.value, label: t(item.labelKey) }));
   const requiredWhenCreating = (message: string) =>
     isEditing ? undefined : { validate: { required: requiredRule(message) } };
 
@@ -87,29 +95,33 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
       <MountedFormField
         label={
           <FieldLabel
-            label="OAuth Flow Type"
-            tooltip="Choose how the proxy authenticates with this MCP server. M2M is for server-to-server communication using client credentials. Interactive (PKCE) is for user-facing flows that require browser-based authorization."
+            label={t("mcpServers.oauthFormFields.flowType.label")}
+            tooltip={t("mcpServers.oauthFormFields.flowType.tooltip")}
           />
         }
         name="oauth_flow_type"
         {...(initialFlowType ? { defaultValue: initialFlowType } : {})}
       >
         {(control) => (
-          <Select {...selectControl<string>(control)} items={OAUTH_FLOW_ITEMS}>
+          <Select {...selectControl<string>(control)} items={oauthFlowItems}>
             <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
-              <SelectValue placeholder="Select OAuth flow" />
+              <SelectValue placeholder={t("mcpServers.oauthFormFields.flowType.placeholder")} />
             </SelectTrigger>
             <SelectContent>
               <SelectItem value={OAUTH_FLOW.M2M}>
                 <div>
-                  <span className="font-medium">Machine-to-Machine (M2M)</span>
-                  <span className="ml-2 text-xs text-muted-foreground">server-to-server, no user interaction</span>
+                  <span className="font-medium">{t("mcpServers.oauthFormFields.flowType.m2m.label")}</span>
+                  <span className="ml-2 text-xs text-muted-foreground">
+                    {t("mcpServers.oauthFormFields.flowType.m2m.description")}
+                  </span>
                 </div>
               </SelectItem>
               <SelectItem value={OAUTH_FLOW.INTERACTIVE}>
                 <div>
-                  <span className="font-medium">Interactive (PKCE)</span>
-                  <span className="ml-2 text-xs text-muted-foreground">browser-based user authorization</span>
+                  <span className="font-medium">{t("mcpServers.oauthFormFields.flowType.interactive.label")}</span>
+                  <span className="ml-2 text-xs text-muted-foreground">
+                    {t("mcpServers.oauthFormFields.flowType.interactive.description")}
+                  </span>
                 </div>
               </SelectItem>
             </SelectContent>
@@ -120,40 +132,61 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
       {isM2M ? (
         <>
           <MountedFormField
-            label={<FieldLabel label="Client ID" tooltip="OAuth2 client ID for the client_credentials grant." />}
+            label={
+              <FieldLabel
+                label={t("mcpServers.oauthFormFields.m2m.clientId.label")}
+                tooltip={t("mcpServers.oauthFormFields.m2m.clientId.tooltip")}
+              />
+            }
             name={["credentials", "client_id"]}
             required={!isEditing}
-            rules={requiredWhenCreating("Client ID is required for M2M OAuth")}
+            rules={requiredWhenCreating(t("mcpServers.oauthFormFields.m2m.clientId.required"))}
           >
             {(control) => (
               <PasswordInput
                 {...textControl(control)}
-                placeholder={`Enter OAuth client ID${placeholderSuffix}`}
+                placeholder={
+                  isEditing
+                    ? t("mcpServers.oauthFormFields.m2m.clientId.placeholderEditing")
+                    : t("mcpServers.oauthFormFields.m2m.clientId.placeholder")
+                }
                 groupClassName={fieldClassName}
               />
             )}
           </MountedFormField>
           <MountedFormField
             label={
-              <FieldLabel label="Client Secret" tooltip="OAuth2 client secret for the client_credentials grant." />
+              <FieldLabel
+                label={t("mcpServers.oauthFormFields.m2m.clientSecret.label")}
+                tooltip={t("mcpServers.oauthFormFields.m2m.clientSecret.tooltip")}
+              />
             }
             name={["credentials", "client_secret"]}
             required={!isEditing}
-            rules={requiredWhenCreating("Client Secret is required for M2M OAuth")}
+            rules={requiredWhenCreating(t("mcpServers.oauthFormFields.m2m.clientSecret.required"))}
           >
             {(control) => (
               <PasswordInput
                 {...textControl(control)}
-                placeholder={`Enter OAuth client secret${placeholderSuffix}`}
+                placeholder={
+                  isEditing
+                    ? t("mcpServers.oauthFormFields.m2m.clientSecret.placeholderEditing")
+                    : t("mcpServers.oauthFormFields.m2m.clientSecret.placeholder")
+                }
                 groupClassName={fieldClassName}
               />
             )}
           </MountedFormField>
           <MountedFormField
-            label={<FieldLabel label="Token URL" tooltip="Token endpoint URL for the client_credentials grant." />}
+            label={
+              <FieldLabel
+                label={t("mcpServers.oauthFormFields.m2m.tokenUrl.label")}
+                tooltip={t("mcpServers.oauthFormFields.m2m.tokenUrl.tooltip")}
+              />
+            }
             name="token_url"
             required={!isEditing}
-            rules={requiredWhenCreating("Token URL is required for M2M OAuth")}
+            rules={requiredWhenCreating(t("mcpServers.oauthFormFields.m2m.tokenUrl.required"))}
           >
             {(control) => (
               <Input
@@ -167,13 +200,19 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
           <MountedFormField
             label={
               <FieldLabel
-                label="Scopes (optional)"
-                tooltip="Optional scopes to request with the client_credentials grant."
+                label={t("mcpServers.oauthFormFields.m2m.scopes.label")}
+                tooltip={t("mcpServers.oauthFormFields.m2m.scopes.tooltip")}
               />
             }
             name={["credentials", "scopes"]}
           >
-            {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
+            {(control) => (
+              <MultiSelect
+                {...tagsControl(control, t)}
+                placeholder={t("mcpServers.oauthFormFields.m2m.scopes.placeholder")}
+                className="rounded-lg"
+              />
+            )}
           </MountedFormField>
           <UpstreamResourceField />
           <UpstreamTokenHeaderField />
@@ -184,8 +223,8 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             label={
               <span className="flex items-center justify-between w-full">
                 <FieldLabel
-                  label="Client ID (optional)"
-                  tooltip="Provide only if your MCP server cannot handle dynamic client registration."
+                  label={t("mcpServers.oauthFormFields.interactive.clientId.label")}
+                  tooltip={t("mcpServers.oauthFormFields.interactive.clientId.tooltip")}
                 />
                 {docsUrl && (
                   <a
@@ -195,7 +234,7 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
                     className="text-xs text-info hover:text-info/80 ml-2 font-normal"
                     onClick={(e) => e.stopPropagation()}
                   >
-                    Create OAuth App →
+                    {t("mcpServers.oauthFormFields.interactive.clientId.createOAuthApp")}
                   </a>
                 )}
               </span>
@@ -205,7 +244,11 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             {(control) => (
               <PasswordInput
                 {...textControl(control)}
-                placeholder={`Enter client ID${placeholderSuffix}`}
+                placeholder={
+                  isEditing
+                    ? t("mcpServers.oauthFormFields.interactive.clientId.placeholderEditing")
+                    : t("mcpServers.oauthFormFields.interactive.clientId.placeholder")
+                }
                 groupClassName={fieldClassName}
               />
             )}
@@ -213,8 +256,8 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
           <MountedFormField
             label={
               <FieldLabel
-                label="Client Secret (optional)"
-                tooltip="Provide only if your MCP server cannot handle dynamic client registration."
+                label={t("mcpServers.oauthFormFields.interactive.clientSecret.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.clientSecret.tooltip")}
               />
             }
             name={["credentials", "client_secret"]}
@@ -222,7 +265,11 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             {(control) => (
               <PasswordInput
                 {...textControl(control)}
-                placeholder={`Enter client secret${placeholderSuffix}`}
+                placeholder={
+                  isEditing
+                    ? t("mcpServers.oauthFormFields.interactive.clientSecret.placeholderEditing")
+                    : t("mcpServers.oauthFormFields.interactive.clientSecret.placeholder")
+                }
                 groupClassName={fieldClassName}
               />
             )}
@@ -230,21 +277,27 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
           <MountedFormField
             label={
               <FieldLabel
-                label="Scopes (optional)"
-                tooltip="Optional scopes requested during token exchange. Separate multiple scopes with enter or commas."
+                label={t("mcpServers.oauthFormFields.interactive.scopes.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.scopes.tooltip")}
               />
             }
             name={["credentials", "scopes"]}
           >
-            {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
+            {(control) => (
+              <MultiSelect
+                {...tagsControl(control, t)}
+                placeholder={t("mcpServers.oauthFormFields.interactive.scopes.placeholder")}
+                className="rounded-lg"
+              />
+            )}
           </MountedFormField>
           <UpstreamResourceField />
           <UpstreamTokenHeaderField />
           <MountedFormField
             label={
               <FieldLabel
-                label="Issuer (optional)"
-                tooltip="OAuth 2.0 authorization server issuer (RFC 8414). Leave empty to discover endpoints from the upstream resource; set it to pin the trust anchor, which makes this issuer's document the only endpoint source (RFC 8414 §3.3), overriding the Authorization/Token/Registration URLs above and failing closed if its metadata cannot be fetched."
+                label={t("mcpServers.oauthFormFields.interactive.issuer.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.issuer.tooltip")}
               />
             }
             name="issuer"
@@ -256,8 +309,8 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
           <MountedFormField
             label={
               <FieldLabel
-                label="Authorization URL (optional)"
-                tooltip="Optional override for the authorization endpoint."
+                label={t("mcpServers.oauthFormFields.interactive.authorizationUrl.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.authorizationUrl.tooltip")}
               />
             }
             name="authorization_url"
@@ -271,7 +324,12 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             )}
           </MountedFormField>
           <MountedFormField
-            label={<FieldLabel label="Token URL (optional)" tooltip="Optional override for the token endpoint." />}
+            label={
+              <FieldLabel
+                label={t("mcpServers.oauthFormFields.interactive.tokenUrl.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.tokenUrl.tooltip")}
+              />
+            }
             name="token_url"
           >
             {(control) => (
@@ -286,8 +344,8 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
           <MountedFormField
             label={
               <FieldLabel
-                label="Registration URL (optional)"
-                tooltip="Optional override for the dynamic client registration endpoint."
+                label={t("mcpServers.oauthFormFields.interactive.registrationUrl.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.registrationUrl.tooltip")}
               />
             }
             name="registration_url"
@@ -303,12 +361,14 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
           <MountedFormField
             label={
               <FieldLabel
-                label="Token Validation Rules (optional)"
-                tooltip='JSON object of key-value rules checked against the OAuth token response before storing. Supports dot-notation for nested fields (e.g. {"organization": "my-org", "team.id": "123"}). Tokens that fail validation are rejected with HTTP 403.'
+                label={t("mcpServers.oauthFormFields.interactive.tokenValidation.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.tokenValidation.tooltip")}
               />
             }
             name="token_validation_json"
-            rules={{ validate: { json: parsesAsJson("Must be valid JSON") } }}
+            rules={{
+              validate: { json: parsesAsJson(t("mcpServers.oauthFormFields.interactive.tokenValidation.invalidJson")) },
+            }}
           >
             {(control) => (
               <Textarea
@@ -322,21 +382,25 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
           <MountedFormField
             label={
               <FieldLabel
-                label="Token Storage TTL (seconds, optional)"
-                tooltip="How long to cache each user's OAuth access token in Redis before evicting it (never longer than the token's own expires_in). Leave blank to derive the TTL from the token's expires_in, or fall back to the 12-hour default."
+                label={t("mcpServers.oauthFormFields.interactive.tokenStorageTtl.label")}
+                tooltip={t("mcpServers.oauthFormFields.interactive.tokenStorageTtl.tooltip")}
               />
             }
             name="token_storage_ttl_seconds"
           >
             {(control) => (
-              <Input {...numberControl(control)} min={1} placeholder="e.g. 3600" className="w-full rounded-lg" />
+              <Input
+                {...numberControl(control)}
+                min={1}
+                placeholder={t("mcpServers.oauthFormFields.interactive.tokenStorageTtl.placeholder")}
+                className="w-full rounded-lg"
+              />
             )}
           </MountedFormField>
           {oauthFlow && (
             <div className="rounded-lg border border-dashed border-border p-4 space-y-2">
               <p className="text-sm text-muted-foreground">
-                Use OAuth to fetch a fresh access token and temporarily save it in the session as the authentication
-                value.
+                {t("mcpServers.oauthFormFields.interactive.authorize.description")}
               </p>
               <Button
                 variant="secondary"
@@ -344,15 +408,17 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
                 disabled={oauthFlow.status === "authorizing" || oauthFlow.status === "exchanging"}
               >
                 {oauthFlow.status === "authorizing"
-                  ? "Waiting for authorization..."
+                  ? t("mcpServers.oauthFormFields.interactive.authorize.authorizing")
                   : oauthFlow.status === "exchanging"
-                    ? "Exchanging authorization code..."
-                    : "Authorize & Fetch Token"}
+                    ? t("mcpServers.oauthFormFields.interactive.authorize.exchanging")
+                    : t("mcpServers.oauthFormFields.interactive.authorize.start")}
               </Button>
               {oauthFlow.error && <p className="text-sm text-destructive">{oauthFlow.error}</p>}
               {oauthFlow.status === "success" && oauthFlow.tokenResponse?.access_token && (
                 <p className="text-sm text-success">
-                  Token fetched. Expires in {oauthFlow.tokenResponse.expires_in ?? "?"} seconds.
+                  {t("mcpServers.oauthFormFields.interactive.authorize.success", {
+                    expiresIn: oauthFlow.tokenResponse.expires_in ?? "?",
+                  })}
                 </p>
               )}
             </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx
index 248776802cf..6af7065828e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx
@@ -1,5 +1,6 @@
 import { Info } from "lucide-react";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { Input } from "@/components/ui/input";
 import { AUTH_TYPE, OAUTH_FLOW } from "@/components/mcp_tools/types";
@@ -35,6 +36,7 @@ const OpenAPIFormSection: React.FC<OpenAPIFormSectionProps> = ({
   onLogoUrlChange,
   onOAuthDocsUrlChange,
 }) => {
+  const { t } = useTranslation();
   const [selectedPreset, setSelectedPreset] = useState<string | null>(null);
 
   const handlePresetSelect = (entry: OpenAPIRegistryEntry) => {
@@ -68,15 +70,15 @@ const OpenAPIFormSection: React.FC<OpenAPIFormSectionProps> = ({
       <MountedFormField
         label={
           <span className="text-sm font-medium text-foreground flex items-center">
-            OpenAPI Spec URL
-            <SimpleTooltip content="URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.">
+            {t("mcpServers.openApiFormSection.specUrl.label")}
+            <SimpleTooltip content={t("mcpServers.openApiFormSection.specUrl.tooltip")}>
               <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
             </SimpleTooltip>
           </span>
         }
         name="spec_path"
         required
-        rules={{ validate: { required: requiredRule("Please enter an OpenAPI spec URL") } }}
+        rules={{ validate: { required: requiredRule(t("mcpServers.openApiFormSection.specUrl.required")) } }}
       >
         {(control) => (
           <Input
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIQuickPicker.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIQuickPicker.tsx
index d8e153a9699..a6e6d28b3dc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIQuickPicker.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIQuickPicker.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { cn } from "@/lib/cva.config";
 import { fetchOpenAPIRegistry } from "@/components/networking";
@@ -30,6 +31,7 @@ interface OpenAPIQuickPickerProps {
 }
 
 const OpenAPIQuickPicker: React.FC<OpenAPIQuickPickerProps> = ({ accessToken, selectedName, onSelect }) => {
+  const { t } = useTranslation();
   const [apis, setApis] = useState<OpenAPIRegistryEntry[]>([]);
   const [loading, setLoading] = useState(false);
   const [imgErrors, setImgErrors] = useState<Set<string>>(new Set());
@@ -50,7 +52,7 @@ const OpenAPIQuickPicker: React.FC<OpenAPIQuickPickerProps> = ({ accessToken, se
   if (loading) {
     return (
       <div className="mb-4">
-        <span className="text-sm font-medium">Popular APIs</span>
+        <span className="text-sm font-medium">{t("mcpServers.openApiQuickPicker.title")}</span>
         <div className="flex justify-center py-6">
           <UiLoadingSpinner className="size-5 text-muted-foreground" />
         </div>
@@ -62,7 +64,7 @@ const OpenAPIQuickPicker: React.FC<OpenAPIQuickPickerProps> = ({ accessToken, se
 
   return (
     <div className="mb-4">
-      <span className="mb-2 block text-sm font-medium">Popular APIs</span>
+      <span className="mb-2 block text-sm font-medium">{t("mcpServers.openApiQuickPicker.title")}</span>
 
       <div className="grid grid-cols-5 gap-2">
         {apis.map((api) => {
@@ -97,9 +99,7 @@ const OpenAPIQuickPicker: React.FC<OpenAPIQuickPickerProps> = ({ accessToken, se
         })}
       </div>
 
-      <p className="mt-2 text-xs text-muted-foreground">
-        Select an API to pre-fill the spec URL and OAuth 2.0 settings, or enter your own spec URL below.
-      </p>
+      <p className="mt-2 text-xs text-muted-foreground">{t("mcpServers.openApiQuickPicker.hint")}</p>
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx
index a63821cd04c..526825c90a4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx
@@ -3,6 +3,7 @@ import React from "react";
 import { MultiSelect } from "@/components/shared/MultiSelect";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { useWatch } from "react-hook-form";
+import { Trans, useTranslation } from "react-i18next";
 
 import { Input } from "@/components/ui/input";
 import { Switch } from "@/components/ui/switch";
@@ -18,6 +19,7 @@ const AUTH_HEADER_FORMATS: Readonly<Record<string, string>> = {
 };
 
 const OpenApiByokFields: React.FC = () => {
+  const { t } = useTranslation();
   const isByok = Boolean(useWatch({ name: "is_byok" }));
   const authType = useWatch({ name: "auth_type" }) as string | undefined;
   const hasAuthType = Boolean(authType) && authType !== "none";
@@ -27,8 +29,8 @@ const OpenApiByokFields: React.FC = () => {
       <MountedFormField
         label={
           <span className="text-sm font-medium text-foreground flex items-center gap-2">
-            BYOK (Bring Your Own Key)
-            <SimpleTooltip content="When enabled, each user provides their own API key for this service. Keys are stored per-user and never shared.">
+            {t("mcpServers.openApiByokFields.byok.label")}
+            <SimpleTooltip content={t("mcpServers.openApiByokFields.byok.tooltip")}>
               <Info className="size-4 text-info hover:text-info/80 cursor-help" />
             </SimpleTooltip>
           </span>
@@ -44,7 +46,7 @@ const OpenApiByokFields: React.FC = () => {
             <div className="mb-4 p-3 bg-info/10 rounded-lg text-sm text-info flex items-start gap-2">
               <Info className="mt-0.5 size-4 shrink-0" />
               <span>
-                User keys will be sent as:{" "}
+                {t("mcpServers.openApiByokFields.headerFormat")}{" "}
                 <code className="font-mono bg-info/15 px-1 rounded-sm">
                   {authType === undefined ? "" : AUTH_HEADER_FORMATS[authType]}
                 </code>
@@ -55,16 +57,15 @@ const OpenApiByokFields: React.FC = () => {
             <div className="mb-4 p-3 bg-warning/10 rounded-lg text-sm text-warning flex items-start gap-2">
               <Info className="mt-0.5 size-4 shrink-0" />
               <span>
-                Set the <strong>Authentication Type</strong> below to specify how user keys are sent (e.g., Bearer
-                Token, API Key header).
+                <Trans i18nKey="mcpServers.openApiByokFields.authTypeMissing" components={{ strong: <strong /> }} />
               </span>
             </div>
           )}
           <MountedFormField
             label={
               <span className="text-sm font-medium text-foreground">
-                Access Description
-                <SimpleTooltip content="List of permissions shown to users in the connection modal (e.g. 'Create and manage Jira issues')">
+                {t("mcpServers.openApiByokFields.accessDescription.label")}
+                <SimpleTooltip content={t("mcpServers.openApiByokFields.accessDescription.tooltip")}>
                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                 </SimpleTooltip>
               </span>
@@ -73,8 +74,8 @@ const OpenApiByokFields: React.FC = () => {
           >
             {(control) => (
               <MultiSelect
-                {...tagsControl(control)}
-                placeholder="Add access description items (press Enter after each)"
+                {...tagsControl(control, t)}
+                placeholder={t("mcpServers.openApiByokFields.accessDescription.placeholder")}
                 className="w-full"
               />
             )}
@@ -83,8 +84,8 @@ const OpenApiByokFields: React.FC = () => {
           <MountedFormField
             label={
               <span className="text-sm font-medium text-foreground">
-                API Key Help URL
-                <SimpleTooltip content="Optional link shown to users to help them find their API key">
+                {t("mcpServers.openApiByokFields.apiKeyHelpUrl.label")}
+                <SimpleTooltip content={t("mcpServers.openApiByokFields.apiKeyHelpUrl.tooltip")}>
                   <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                 </SimpleTooltip>
               </span>
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 e6cd9eb54a5..b05a2ccf389 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
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
@@ -56,41 +57,39 @@ export default function PassthroughAuthorizeSection({
   onRemoveStoredAppChange?: (remove: boolean) => void;
   appMayNotMatchUpstream?: boolean;
 }) {
+  const { t } = useTranslation();
   if (!isClientForwardedTokenMode(authType)) return null;
   const authorizeButtonLabels: Record<string, string> = {
-    authorizing: "Waiting for authorization...",
-    exchanging: "Exchanging authorization code...",
+    authorizing: t("mcpServers.passthroughAuthorizeSection.authorize.authorizing"),
+    exchanging: t("mcpServers.passthroughAuthorizeSection.authorize.exchanging"),
   };
-  const authorizeButtonLabel = authorizeButtonLabels[oauthFlow.status] ?? "Authorize & Fetch Tools (browser-only)";
+  const authorizeButtonLabel =
+    authorizeButtonLabels[oauthFlow.status] ?? t("mcpServers.passthroughAuthorizeSection.authorize.start");
   // On edit, "keep existing" only holds when the stored credential class is unchanged; a cross-class
   // switch (e.g. oauth2 -> true_passthrough) replaces credentials, so blanks then mean "no app".
   const classUnchanged = isEditing && credentialAuthClass(savedAuthType) === credentialAuthClass(authType);
   const clientIdPlaceholder = classUnchanged
-    ? "Leave blank to keep the currently saved app (if any)"
-    : "Leave blank to use dynamic client registration";
+    ? t("mcpServers.passthroughAuthorizeSection.clientId.placeholderKeepSaved")
+    : t("mcpServers.passthroughAuthorizeSection.clientId.placeholderDcr");
   const clientSecretPlaceholder = classUnchanged
-    ? "Leave blank to keep the currently saved secret (if any)"
-    : "Leave blank for public clients / PKCE";
+    ? t("mcpServers.passthroughAuthorizeSection.clientSecret.placeholderKeepSaved")
+    : t("mcpServers.passthroughAuthorizeSection.clientSecret.placeholderPublicClient");
   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.";
+    ? t("mcpServers.passthroughAuthorizeSection.clientId.helpKeepSaved")
+    : t("mcpServers.passthroughAuthorizeSection.clientId.helpClassChanged");
   return (
     <div className="rounded-lg border border-dashed border-border p-4 space-y-2 mb-4">
-      <p className="text-sm text-muted-foreground">
-        Callers bring their own upstream token for this auth type, so LiteLLM never stores tokens. To preview tools and
-        configure the tool allowlist, authorize against the upstream here: the token stays in this browser session only
-        and is never saved to LiteLLM. An OAuth app configured below IS saved with the server, so internal users who
-        authorize from the Tools page go through it.
-      </p>
+      <p className="text-sm text-muted-foreground">{t("mcpServers.passthroughAuthorizeSection.description")}</p>
       {appMayNotMatchUpstream && (
-        <p className="text-sm text-warning">
-          You changed the upstream URL or endpoints; the OAuth app entered here was registered for the previous upstream
-          and may not be valid. Update the client ID, or clear it to use dynamic client registration.
-        </p>
+        <p className="text-sm text-warning">{t("mcpServers.passthroughAuthorizeSection.appMayNotMatchUpstream")}</p>
       )}
       <MountedFormField
-        label={<span className="text-sm font-medium text-foreground">OAuth Client ID (optional)</span>}
+        label={
+          <span className="text-sm font-medium text-foreground">
+            {t("mcpServers.passthroughAuthorizeSection.clientId.label")}
+          </span>
+        }
         name={["credentials", "client_id"]}
         help={clientIdExtra}
       >
@@ -104,7 +103,11 @@ export default function PassthroughAuthorizeSection({
         )}
       </MountedFormField>
       <MountedFormField
-        label={<span className="text-sm font-medium text-foreground">OAuth Client Secret (optional)</span>}
+        label={
+          <span className="text-sm font-medium text-foreground">
+            {t("mcpServers.passthroughAuthorizeSection.clientSecret.label")}
+          </span>
+        }
         name={["credentials", "client_secret"]}
       >
         {(control) => (
@@ -117,9 +120,13 @@ export default function PassthroughAuthorizeSection({
         )}
       </MountedFormField>
       <MountedFormField
-        label={<span className="text-sm font-medium text-foreground">Authorization URL (optional)</span>}
+        label={
+          <span className="text-sm font-medium text-foreground">
+            {t("mcpServers.passthroughAuthorizeSection.authorizationUrl.label")}
+          </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."
+        help={t("mcpServers.passthroughAuthorizeSection.authorizationUrl.help")}
       >
         {(control) => (
           <Input
@@ -130,9 +137,13 @@ export default function PassthroughAuthorizeSection({
         )}
       </MountedFormField>
       <MountedFormField
-        label={<span className="text-sm font-medium text-foreground">Token URL (optional)</span>}
+        label={
+          <span className="text-sm font-medium text-foreground">
+            {t("mcpServers.passthroughAuthorizeSection.tokenUrl.label")}
+          </span>
+        }
         name="token_url"
-        help="Token endpoint of the same authorization server. Leave blank to discover it from the upstream."
+        help={t("mcpServers.passthroughAuthorizeSection.tokenUrl.help")}
       >
         {(control) => (
           <Input
@@ -143,17 +154,27 @@ export default function PassthroughAuthorizeSection({
         )}
       </MountedFormField>
       <MountedFormField
-        label={<span className="text-sm font-medium text-foreground">Scopes (optional)</span>}
+        label={
+          <span className="text-sm font-medium text-foreground">
+            {t("mcpServers.passthroughAuthorizeSection.scopes.label")}
+          </span>
+        }
         name={["credentials", "scopes"]}
-        help="Scopes requested from the upstream when a user authorizes. Press enter or comma between scopes."
+        help={t("mcpServers.passthroughAuthorizeSection.scopes.help")}
       >
-        {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
+        {(control) => (
+          <MultiSelect
+            {...tagsControl(control, t)}
+            placeholder={t("mcpServers.passthroughAuthorizeSection.scopes.placeholder")}
+            className="rounded-lg"
+          />
+        )}
       </MountedFormField>
       <DcrBridgeToggle authType={authType} initialChecked={dcrBridgeInitialChecked} />
       {isEditing && onRemoveStoredAppChange && (
         <Label className="items-start leading-normal font-normal text-foreground">
           <Checkbox className="mt-0.5" checked={removeStoredApp} onCheckedChange={onRemoveStoredAppChange} />
-          Remove the saved OAuth app on save (the server goes back to dynamic client registration)
+          {t("mcpServers.passthroughAuthorizeSection.removeStoredApp")}
         </Label>
       )}
       <Button
@@ -165,10 +186,7 @@ export default function PassthroughAuthorizeSection({
       </Button>
       {oauthFlow.error && <p className="text-sm text-destructive">{oauthFlow.error}</p>}
       {oauthFlow.status === "success" && oauthFlow.tokenResponse?.access_token && (
-        <p className="text-sm text-success">
-          Token held for this browser session. Tools can now be previewed and configured; the token was not saved to
-          LiteLLM.
-        </p>
+        <p className="text-sm text-success">{t("mcpServers.passthroughAuthorizeSection.authorize.success")}</p>
       )}
     </div>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioAvailability.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioAvailability.tsx
index 960f0dbbe5d..4c2ef63c63f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioAvailability.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioAvailability.tsx
@@ -1,37 +1,47 @@
+import type { ParseKeys } from "i18next";
 import { type FC } from "react";
+import { useTranslation } from "react-i18next";
 import { TriangleAlert } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { SelectItem } from "@/components/ui/select";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { TRANSPORT, TRANSPORT_ITEMS } from "@/components/mcp_tools/types";
 import { $api } from "@/lib/http/api";
+import en from "@/i18n/locales/en.json";
 
-export const STDIO_DISABLED_MESSAGE =
-  "stdio MCP servers are disabled on this proxy. Set LITELLM_ENABLE_MCP_STDIO=true on the proxy and restart to enable them";
+export const STDIO_DISABLED_MESSAGE_KEY: ParseKeys = "mcpServers.stdioAvailability.disabledMessage";
+
+export const STDIO_DISABLED_MESSAGE = en.mcpServers.stdioAvailability.disabledMessage;
 
 export const useMcpStdioEnabled = (): boolean =>
   $api.useQuery("get", "/.well-known/litellm-ui-config").data?.mcp_stdio_enabled !== false;
 
-export const TransportSelectItems: FC<{ stdioEnabled: boolean }> = ({ stdioEnabled }) => (
-  <>
-    {TRANSPORT_ITEMS.map((item) => {
-      const disabled = item.value === TRANSPORT.STDIO && !stdioEnabled;
-      return (
-        <SelectItem key={item.value} value={item.value} disabled={disabled}>
-          {item.label}
-          {disabled && <SimpleTooltip content={STDIO_DISABLED_MESSAGE} className="pointer-events-auto" />}
-        </SelectItem>
-      );
-    })}
-  </>
-);
+export const TransportSelectItems: FC<{ stdioEnabled: boolean }> = ({ stdioEnabled }) => {
+  const { t } = useTranslation();
+  return (
+    <>
+      {TRANSPORT_ITEMS.map((item) => {
+        const disabled = item.value === TRANSPORT.STDIO && !stdioEnabled;
+        return (
+          <SelectItem key={item.value} value={item.value} disabled={disabled}>
+            {item.label}
+            {disabled && <SimpleTooltip content={t(STDIO_DISABLED_MESSAGE_KEY)} className="pointer-events-auto" />}
+          </SelectItem>
+        );
+      })}
+    </>
+  );
+};
 
-export const StdioDisabledBanner: FC = () => (
-  <Alert variant="warning" className="mb-4 rounded-lg">
-    <TriangleAlert />
-    <AlertTitle>stdio is disabled on this proxy</AlertTitle>
-    <AlertDescription>
-      {STDIO_DISABLED_MESSAGE}. Until then this server cannot start or be saved as stdio.
-    </AlertDescription>
-  </Alert>
-);
+export const StdioDisabledBanner: FC = () => {
+  const { t } = useTranslation();
+  return (
+    <Alert variant="warning" className="mb-4 rounded-lg">
+      <TriangleAlert />
+      <AlertTitle>{t("mcpServers.stdioAvailability.banner.title")}</AlertTitle>
+      <AlertDescription>
+        {t("mcpServers.stdioAvailability.banner.description", { disabledMessage: t(STDIO_DISABLED_MESSAGE_KEY) })}
+      </AlertDescription>
+    </Alert>
+  );
+};
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx
index 854e67940a1..e0d5a9e6009 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx
@@ -1,5 +1,6 @@
 import { Info } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
@@ -30,14 +31,15 @@ const PLACEHOLDER = `{
 }`;
 
 const StdioConfiguration: React.FC<StdioConfigurationProps> = ({ isVisible, required = true }) => {
+  const { t } = useTranslation();
   if (!isVisible) return null;
 
   return (
     <MountedFormField
       label={
         <span className="text-sm font-medium text-foreground flex items-center">
-          Stdio Configuration (JSON)
-          <SimpleTooltip content="Paste your stdio MCP server configuration in JSON format. You can use the full mcpServers structure from config.yaml or just the inner server configuration.">
+          {t("mcpServers.stdioConfiguration.label")}
+          <SimpleTooltip content={t("mcpServers.stdioConfiguration.tooltip")}>
             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
           </SimpleTooltip>
         </span>
@@ -46,8 +48,8 @@ const StdioConfiguration: React.FC<StdioConfigurationProps> = ({ isVisible, requ
       required={required}
       rules={{
         validate: {
-          ...(required ? { required: requiredRule("Please enter stdio configuration") } : {}),
-          json: parsesAsJson("Please enter valid JSON"),
+          ...(required ? { required: requiredRule(t("mcpServers.stdioConfiguration.errors.required")) } : {}),
+          json: parsesAsJson(t("mcpServers.stdioConfiguration.errors.invalidJson")),
         },
       }}
     >
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx
index 3dc2d62539d..721ea4ee590 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx
@@ -1,53 +1,62 @@
+import type { ParseKeys } from "i18next";
 import { Info } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { selectControl, selectTriggerControl } from "./mcpFieldRules";
 
-const TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS = [
-  { value: "client_secret_basic", label: "Client Secret Basic" },
-  { value: "client_secret_post", label: "Client Secret Post" },
+const TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS: ReadonlyArray<{ value: string; labelKey: ParseKeys }> = [
+  { value: "client_secret_basic", labelKey: "mcpServers.tokenEndpointAuthMethodField.methods.clientSecretBasic" },
+  { value: "client_secret_post", labelKey: "mcpServers.tokenEndpointAuthMethodField.methods.clientSecretPost" },
 ];
 
 interface TokenEndpointAuthMethodFieldProps {
   isEditing?: boolean;
 }
 
-const TokenEndpointAuthMethodField: React.FC<TokenEndpointAuthMethodFieldProps> = ({ isEditing = false }) => (
-  <MountedFormField
-    label={
-      <span className="text-sm font-medium text-foreground flex items-center">
-        Token Endpoint Auth Method (optional)
-        <SimpleTooltip content="How the proxy authenticates to the upstream OAuth token endpoint. Client Secret Basic sends the client credentials in an HTTP Basic Authorization header; leave blank to use the default, Client Secret Post, which sends them in the request body.">
-          <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
-        </SimpleTooltip>
-      </span>
-    }
-    name={["credentials", "token_endpoint_auth_method"]}
-  >
-    {(control) => {
-      const placeholder = isEditing
-        ? "Leave blank to keep existing (default Client Secret Post)"
-        : "Default (Client Secret Post)";
-      return (
-        <Select {...selectControl<string>(control)} items={TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS}>
-          <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
-            <SelectValue placeholder={placeholder} />
-          </SelectTrigger>
-          <SelectContent>
-            <SelectItem value={null}>{placeholder}</SelectItem>
-            {TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS.map((option) => (
-              <SelectItem key={option.value} value={option.value}>
-                {option.label}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      );
-    }}
-  </MountedFormField>
-);
+const TokenEndpointAuthMethodField: React.FC<TokenEndpointAuthMethodFieldProps> = ({ isEditing = false }) => {
+  const { t } = useTranslation();
+  const authMethodOptions = TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS.map((option) => ({
+    value: option.value,
+    label: t(option.labelKey),
+  }));
+  return (
+    <MountedFormField
+      label={
+        <span className="text-sm font-medium text-foreground flex items-center">
+          {t("mcpServers.tokenEndpointAuthMethodField.label")}
+          <SimpleTooltip content={t("mcpServers.tokenEndpointAuthMethodField.tooltip")}>
+            <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
+          </SimpleTooltip>
+        </span>
+      }
+      name={["credentials", "token_endpoint_auth_method"]}
+    >
+      {(control) => {
+        const placeholder = isEditing
+          ? t("mcpServers.tokenEndpointAuthMethodField.placeholderEditing")
+          : t("mcpServers.tokenEndpointAuthMethodField.placeholder");
+        return (
+          <Select {...selectControl<string>(control)} items={authMethodOptions}>
+            <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
+              <SelectValue placeholder={placeholder} />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value={null}>{placeholder}</SelectItem>
+              {authMethodOptions.map((option) => (
+                <SelectItem key={option.value} value={option.value}>
+                  {option.label}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        );
+      }}
+    </MountedFormField>
+  );
+};
 
 export default TokenEndpointAuthMethodField;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx
index 5a43166b7c9..ce01ec59d22 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx
@@ -4,6 +4,7 @@ import { MultiSelect } from "@/components/shared/MultiSelect";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { useWatch } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import UpstreamTokenHeaderField from "./UpstreamTokenHeaderField";
@@ -18,11 +19,6 @@ interface TokenExchangeFormFieldsProps {
 
 const fieldClassName = "rounded-lg border-border focus:border-info focus:ring-ring";
 
-const TOKEN_EXCHANGE_PROFILE_ITEMS = [
-  { value: "rfc8693", label: "RFC 8693 (standard)" },
-  { value: "entra_obo", label: "Microsoft Entra OBO" },
-];
-
 const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, tooltip }) => (
   <span className="text-sm font-medium text-foreground flex items-center">
     {label}
@@ -33,7 +29,11 @@ const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, toolt
 );
 
 const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEditing = false }) => {
-  const placeholderSuffix = isEditing ? " (leave blank to keep existing)" : "";
+  const { t } = useTranslation();
+  const tokenExchangeProfileItems = [
+    { value: "rfc8693", label: t("mcpServers.tokenExchangeFormFields.profile.rfc8693") },
+    { value: "entra_obo", label: "Microsoft Entra OBO" },
+  ];
   const isEntraObo = useWatch({ name: "token_exchange_profile" }) === "entra_obo";
   const requiredWhenCreating = (message: string) =>
     isEditing ? undefined : { validate: { required: requiredRule(message) } };
@@ -43,20 +43,20 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
       <MountedFormField
         label={
           <FieldLabel
-            label="Profile"
-            tooltip="Token-exchange wire dialect. RFC 8693 is the standard token-exchange grant. Microsoft Entra OBO uses Entra's On-Behalf-Of dialect (the RFC 7523 jwt-bearer grant with requested_token_use=on_behalf_of) and carries the target resource in a scope like api://<app-id>/.default."
+            label={t("mcpServers.tokenExchangeFormFields.profile.label")}
+            tooltip={t("mcpServers.tokenExchangeFormFields.profile.tooltip")}
           />
         }
         name="token_exchange_profile"
         {...(isEditing ? {} : { defaultValue: "rfc8693" })}
       >
         {(control) => (
-          <Select {...selectControl<string>(control)} items={TOKEN_EXCHANGE_PROFILE_ITEMS}>
+          <Select {...selectControl<string>(control)} items={tokenExchangeProfileItems}>
             <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
               <SelectValue />
             </SelectTrigger>
             <SelectContent>
-              {TOKEN_EXCHANGE_PROFILE_ITEMS.map((item) => (
+              {tokenExchangeProfileItems.map((item) => (
                 <SelectItem key={item.value} value={item.value}>
                   <span className="font-medium">{item.label}</span>
                 </SelectItem>
@@ -68,8 +68,8 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
       <MountedFormField
         label={
           <FieldLabel
-            label="Token Exchange Endpoint (optional)"
-            tooltip="RFC 8693 token endpoint. The proxy exchanges the user's incoming token here for a scoped token used to call the upstream MCP server. Leave blank to auto-discover it from the upstream's protected-resource metadata (RFC 9728 then RFC 8414)."
+            label={t("mcpServers.tokenExchangeFormFields.endpoint.label")}
+            tooltip={t("mcpServers.tokenExchangeFormFields.endpoint.tooltip")}
           />
         }
         name="token_exchange_endpoint"
@@ -85,18 +85,22 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
       <MountedFormField
         label={
           <FieldLabel
-            label="Client ID"
-            tooltip="OAuth2 client ID used to authenticate to the token exchange endpoint."
+            label={t("mcpServers.tokenExchangeFormFields.clientId.label")}
+            tooltip={t("mcpServers.tokenExchangeFormFields.clientId.tooltip")}
           />
         }
         name={["credentials", "client_id"]}
         required={!isEditing}
-        rules={requiredWhenCreating("Client ID is required for token exchange")}
+        rules={requiredWhenCreating(t("mcpServers.tokenExchangeFormFields.clientId.required"))}
       >
         {(control) => (
           <PasswordInput
             {...textControl(control)}
-            placeholder={`Enter OAuth client ID${placeholderSuffix}`}
+            placeholder={
+              isEditing
+                ? t("mcpServers.tokenExchangeFormFields.clientId.placeholderEditing")
+                : t("mcpServers.tokenExchangeFormFields.clientId.placeholder")
+            }
             groupClassName={fieldClassName}
           />
         )}
@@ -104,18 +108,22 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
       <MountedFormField
         label={
           <FieldLabel
-            label="Client Secret"
-            tooltip="OAuth2 client secret used to authenticate to the token exchange endpoint."
+            label={t("mcpServers.tokenExchangeFormFields.clientSecret.label")}
+            tooltip={t("mcpServers.tokenExchangeFormFields.clientSecret.tooltip")}
           />
         }
         name={["credentials", "client_secret"]}
         required={!isEditing}
-        rules={requiredWhenCreating("Client Secret is required for token exchange")}
+        rules={requiredWhenCreating(t("mcpServers.tokenExchangeFormFields.clientSecret.required"))}
       >
         {(control) => (
           <PasswordInput
             {...textControl(control)}
-            placeholder={`Enter OAuth client secret${placeholderSuffix}`}
+            placeholder={
+              isEditing
+                ? t("mcpServers.tokenExchangeFormFields.clientSecret.placeholderEditing")
+                : t("mcpServers.tokenExchangeFormFields.clientSecret.placeholder")
+            }
             groupClassName={fieldClassName}
           />
         )}
@@ -125,8 +133,8 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
           <MountedFormField
             label={
               <FieldLabel
-                label="Audience (optional)"
-                tooltip="Target audience for the exchanged token (RFC 8693 audience). Identifies the upstream MCP server the token is for."
+                label={t("mcpServers.tokenExchangeFormFields.audience.label")}
+                tooltip={t("mcpServers.tokenExchangeFormFields.audience.tooltip")}
               />
             }
             name="audience"
@@ -138,8 +146,8 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
           <MountedFormField
             label={
               <FieldLabel
-                label="Subject Token Type (optional)"
-                tooltip="Type of the user's incoming token (RFC 8693 subject_token_type). Defaults to urn:ietf:params:oauth:token-type:access_token."
+                label={t("mcpServers.tokenExchangeFormFields.subjectTokenType.label")}
+                tooltip={t("mcpServers.tokenExchangeFormFields.subjectTokenType.tooltip")}
               />
             }
             name="subject_token_type"
@@ -157,11 +165,15 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
       <MountedFormField
         label={
           <FieldLabel
-            label={isEntraObo ? "Scopes" : "Scopes (optional)"}
+            label={
+              isEntraObo
+                ? t("mcpServers.tokenExchangeFormFields.scopes.labelEntraObo")
+                : t("mcpServers.tokenExchangeFormFields.scopes.label")
+            }
             tooltip={
               isEntraObo
-                ? "Microsoft Entra OBO carries the target resource in the scope, so at least one is required (e.g. api://<app-id>/.default)."
-                : "Optional scopes to request during the token exchange."
+                ? t("mcpServers.tokenExchangeFormFields.scopes.tooltipEntraObo")
+                : t("mcpServers.tokenExchangeFormFields.scopes.tooltip")
             }
           />
         }
@@ -171,7 +183,7 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
           isEntraObo
             ? {
                 validate: {
-                  required: requiredRule("Microsoft Entra OBO requires a scope, e.g. api://<app-id>/.default"),
+                  required: requiredRule(t("mcpServers.tokenExchangeFormFields.scopes.requiredEntraObo")),
                 },
               }
             : undefined
@@ -179,8 +191,10 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
       >
         {(control) => (
           <MultiSelect
-            {...tagsControl(control)}
-            placeholder={isEntraObo ? "api://<app-id>/.default" : "Add scopes"}
+            {...tagsControl(control, t)}
+            placeholder={
+              isEntraObo ? "api://<app-id>/.default" : t("mcpServers.tokenExchangeFormFields.scopes.placeholder")
+            }
             className="rounded-lg"
           />
         )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx
index 48bac2a4dd9..a181ae15647 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx
@@ -1,5 +1,7 @@
 import React from "react";
 import { useForm, type Control } from "react-hook-form";
+import type { ParseKeys, TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
 import { CircleHelp } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
@@ -33,14 +35,14 @@ const argumentLabel = (field: ToolArgumentField): React.ReactNode => (
   </span>
 );
 
-const BOOLEAN_ITEMS = [
-  { value: true, label: "True" },
-  { value: false, label: "False" },
+const BOOLEAN_ITEMS: readonly { readonly value: boolean; readonly labelKey: ParseKeys }[] = [
+  { value: true, labelKey: "mcpServers.toolArgumentsForm.boolean.true" },
+  { value: false, labelKey: "mcpServers.toolArgumentsForm.boolean.false" },
 ];
 
-const booleanTitle = (value: unknown): string | undefined => {
-  if (value === true) return "True";
-  if (value === false) return "False";
+const booleanTitle = (value: unknown, t: TFunction): string | undefined => {
+  if (value === true) return t("mcpServers.toolArgumentsForm.boolean.true");
+  if (value === false) return t("mcpServers.toolArgumentsForm.boolean.false");
   return undefined;
 };
 
@@ -49,8 +51,11 @@ const JsonArgumentControl: React.FC<{
   prop: InputSchemaProperty;
   control: FormFieldControlProps<ToolArgumentsFormValues, `args.${number}`>;
 }> = ({ field, prop, control }) => {
+  const { t } = useTranslation();
   const isObject = prop.type === "object";
-  const fallbackPlaceholder = isObject ? `Enter JSON object for ${field.key}` : `Enter JSON array for ${field.key}`;
+  const fallbackPlaceholder = isObject
+    ? t("mcpServers.toolArgumentsForm.jsonObjectPlaceholder", { field: field.key })
+    : t("mcpServers.toolArgumentsForm.jsonArrayPlaceholder", { field: field.key });
   return (
     <div className="space-y-2">
       <Textarea
@@ -63,7 +68,7 @@ const JsonArgumentControl: React.FC<{
         className="rounded-lg font-mono"
       />
       <p className="text-xs text-muted-foreground">
-        {isObject ? "Provide a valid JSON object." : "Provide a valid JSON array."}
+        {isObject ? t("mcpServers.toolArgumentsForm.jsonObjectHint") : t("mcpServers.toolArgumentsForm.jsonArrayHint")}
       </p>
     </div>
   );
@@ -73,6 +78,7 @@ const ToolArgumentControl: React.FC<{
   field: ToolArgumentField;
   control: FormFieldControlProps<ToolArgumentsFormValues, `args.${number}`>;
 }> = ({ field, control }) => {
+  const { t } = useTranslation();
   const prop = resolveSchemaProperty(field.prop);
 
   if (prop.type === "string" && prop.enum) {
@@ -84,11 +90,11 @@ const ToolArgumentControl: React.FC<{
         className="w-full rounded-lg border border-input bg-transparent px-3 py-2 text-sm shadow-xs transition-colors focus:border-ring focus:ring-3 focus:ring-ring/50 focus:outline-hidden"
       >
         <option value={-1} disabled={field.required}>
-          Select {field.key}
+          {t("mcpServers.toolArgumentsForm.selectPlaceholder", { field: field.key })}
         </option>
         {prop.enum.map((option, index) => (
           <option key={option} value={index}>
-            {option === "" ? "Empty string" : option}
+            {option === "" ? t("mcpServers.toolArgumentsForm.emptyString") : option}
           </option>
         ))}
       </select>
@@ -102,31 +108,33 @@ const ToolArgumentControl: React.FC<{
         type="number"
         step={prop.type === "integer" ? 1 : "any"}
         value={(control.value as number | string) ?? ""}
-        placeholder={prop.description || `Enter ${field.key}`}
+        placeholder={prop.description || t("mcpServers.toolArgumentsForm.enterPlaceholder", { field: field.key })}
         className="rounded-lg"
       />
     );
   }
 
   if (prop.type === "boolean") {
+    const booleanItems = BOOLEAN_ITEMS.map(({ value, labelKey }) => ({ value, label: t(labelKey) }));
+    const selectPlaceholder = t("mcpServers.toolArgumentsForm.selectPlaceholder", { field: field.key });
     return (
       <Select
-        items={field.required ? BOOLEAN_ITEMS : [{ value: null, label: `Select ${field.key}` }, ...BOOLEAN_ITEMS]}
+        items={field.required ? booleanItems : [{ value: null, label: selectPlaceholder }, ...booleanItems]}
         value={control.value ?? null}
         onValueChange={control.onChange}
       >
         <SelectTrigger
           id={control.id}
           aria-invalid={control["aria-invalid"]}
-          title={booleanTitle(control.value)}
+          title={booleanTitle(control.value, t)}
           className="w-full"
         >
-          <SelectValue placeholder={`Select ${field.key}`} />
+          <SelectValue placeholder={selectPlaceholder} />
         </SelectTrigger>
         <SelectContent>
-          {!field.required && <SelectItem value={null}>Select {field.key}</SelectItem>}
-          <SelectItem value={true}>True</SelectItem>
-          <SelectItem value={false}>False</SelectItem>
+          {!field.required && <SelectItem value={null}>{selectPlaceholder}</SelectItem>}
+          <SelectItem value={true}>{t("mcpServers.toolArgumentsForm.boolean.true")}</SelectItem>
+          <SelectItem value={false}>{t("mcpServers.toolArgumentsForm.boolean.false")}</SelectItem>
         </SelectContent>
       </Select>
     );
@@ -140,7 +148,7 @@ const ToolArgumentControl: React.FC<{
     <Input
       {...control}
       value={(control.value as string) ?? ""}
-      placeholder={prop.description || `Enter ${field.key}`}
+      placeholder={prop.description || t("mcpServers.toolArgumentsForm.enterPlaceholder", { field: field.key })}
       className="rounded-lg"
     />
   );
@@ -151,6 +159,7 @@ const ToolArgumentFields: React.FC<{
   control: Control<ToolArgumentsFormValues>;
   singleInputFallback: boolean;
 }> = ({ fields, control, singleInputFallback }) => {
+  const { t } = useTranslation();
   if (singleInputFallback) {
     return (
       <FieldGroup>
@@ -159,7 +168,7 @@ const ToolArgumentFields: React.FC<{
           name="args.0"
           label={
             <span>
-              Input <span className="text-destructive">*</span>
+              {t("mcpServers.toolArgumentsForm.singleInput.label")} <span className="text-destructive">*</span>
             </span>
           }
         >
@@ -167,7 +176,7 @@ const ToolArgumentFields: React.FC<{
             <Input
               {...field}
               value={(field.value as string) ?? ""}
-              placeholder="Enter input for this tool"
+              placeholder={t("mcpServers.toolArgumentsForm.singleInput.placeholder")}
               className="rounded-lg"
             />
           )}
@@ -180,8 +189,10 @@ const ToolArgumentFields: React.FC<{
     return (
       <div className="rounded-lg border border-border bg-muted py-6 text-center">
         <div className="mx-auto max-w-sm">
-          <h4 className="mb-1 text-sm font-medium text-foreground">No Parameters Required</h4>
-          <p className="text-xs text-muted-foreground">This tool can be called without any input parameters.</p>
+          <h4 className="mb-1 text-sm font-medium text-foreground">
+            {t("mcpServers.toolArgumentsForm.noParameters.title")}
+          </h4>
+          <p className="text-xs text-muted-foreground">{t("mcpServers.toolArgumentsForm.noParameters.description")}</p>
         </div>
       </div>
     );
@@ -203,9 +214,11 @@ const ToolArgumentFields: React.FC<{
   );
 };
 
-const callButtonLabel = (isLoading: boolean, hasRun: boolean): string => {
-  if (isLoading) return "Calling Tool...";
-  return hasRun ? "Call Again" : "Call Tool";
+const callButtonLabel = (isLoading: boolean, hasRun: boolean, t: TFunction): string => {
+  if (isLoading) return t("mcpServers.toolArgumentsForm.callButton.calling");
+  return hasRun
+    ? t("mcpServers.toolArgumentsForm.callButton.callAgain")
+    : t("mcpServers.toolArgumentsForm.callButton.call");
 };
 
 export const ToolArgumentsForm: React.FC<{
@@ -215,9 +228,10 @@ export const ToolArgumentsForm: React.FC<{
   hasRun: boolean;
   onRun: (args: Record<string, unknown>) => void;
 }> = ({ fields, singleInputFallback, isLoading, hasRun, onRun }) => {
+  const { t } = useTranslation();
   const form = useForm<ToolArgumentsFormValues>({
     defaultValues: { args: initialArgumentValues(fields) },
-    resolver: toolArgumentsResolver(fields),
+    resolver: toolArgumentsResolver(fields, t),
   });
 
   const submit = form.handleSubmit((values) => onRun(buildToolCallArguments(fields, values.args)));
@@ -236,7 +250,7 @@ export const ToolArgumentsForm: React.FC<{
             className="w-full"
           >
             {isLoading && <UiLoadingSpinner className="size-4" />}
-            {callButtonLabel(isLoading, hasRun)}
+            {callButtonLabel(isLoading, hasRun, t)}
           </Button>
         </div>
       </form>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.tsx
index d51fc5da5de..5d51404027a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { CircleHelp, X } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
@@ -24,6 +25,7 @@ export function ToolTestPanel({
   error: Error | null;
   onClose: () => void;
 }) {
+  const { t } = useTranslation();
   const [viewMode, setViewMode] = React.useState<"formatted" | "json">("formatted");
   const [startTime, setStartTime] = React.useState<number | null>(null);
   const [duration, setDuration] = React.useState<number | null>(null);
@@ -37,14 +39,14 @@ export function ToolTestPanel({
         properties: {
           input: {
             type: "string",
-            description: "Input for this tool",
+            description: t("mcpServers.toolTestPanel.defaultInputDescription"),
           },
         },
         required: ["input"],
       };
     }
     return tool.inputSchema as InputSchema;
-  }, [tool.inputSchema]);
+  }, [tool.inputSchema, t]);
 
   // Check if this is a nested params structure and extract the actual parameters
   const actualSchema: InputSchema = React.useMemo(() => {
@@ -118,18 +120,18 @@ export function ToolTestPanel({
   const handleCopyResult = async () => {
     const success = await copyToClipboard(JSON.stringify(result, null, 2));
     if (success) {
-      toast.success("Result copied to clipboard");
+      toast.success(t("mcpServers.toolTestPanel.toasts.resultCopied"));
     } else {
-      toast.fromError("Failed to copy result");
+      toast.fromError(t("mcpServers.toolTestPanel.toasts.resultCopyFailed"));
     }
   };
 
   const handleCopyToolName = async () => {
     const success = await copyToClipboard(tool.name);
     if (success) {
-      toast.success("Tool name copied to clipboard");
+      toast.success(t("mcpServers.toolTestPanel.toasts.toolNameCopied"));
     } else {
-      toast.fromError("Failed to copy tool name");
+      toast.fromError(t("mcpServers.toolTestPanel.toasts.toolNameCopyFailed"));
     }
   };
 
@@ -142,17 +144,17 @@ export function ToolTestPanel({
             // eslint-disable-next-line @next/next/no-img-element
             <img
               src={resolveLogoSrc(tool.mcp_info.logo_url)}
-              alt={`${tool.mcp_info.server_name} logo`}
+              alt={t("mcpServers.toolTestPanel.logoAlt", { serverName: tool.mcp_info.server_name })}
               className="w-6 h-6 object-contain"
             />
           )}
           <div className="flex-1 min-w-0">
             <div className="flex items-center space-x-2 mb-1">
-              <h2 className="text-lg font-semibold text-foreground">Test Tool:</h2>
+              <h2 className="text-lg font-semibold text-foreground">{t("mcpServers.toolTestPanel.title")}</h2>
               <div
                 className="group inline-flex items-center space-x-1 bg-muted hover:bg-accent px-3 py-1 rounded-md cursor-pointer transition-colors border border-border"
                 onClick={handleCopyToolName}
-                title="Click to copy tool name"
+                title={t("mcpServers.toolTestPanel.copyToolNameTitle")}
               >
                 <span className="font-mono text-foreground font-medium text-sm">{tool.name}</span>
                 <svg
@@ -171,14 +173,16 @@ export function ToolTestPanel({
               </div>
             </div>
             <p className="text-xs text-muted-foreground">{tool.description}</p>
-            <p className="text-xs text-muted-foreground">Provider: {tool.mcp_info.server_name}</p>
+            <p className="text-xs text-muted-foreground">
+              {t("mcpServers.toolTestPanel.provider", { serverName: tool.mcp_info.server_name })}
+            </p>
           </div>
         </div>
         <Button
           onClick={onClose}
           variant="ghost"
           size="icon-sm"
-          aria-label="Close"
+          aria-label={t("mcpServers.toolTestPanel.close")}
           className="text-muted-foreground hover:text-foreground"
         >
           <X className="size-4" />
@@ -191,13 +195,13 @@ export function ToolTestPanel({
         <div className="bg-card border border-border rounded-lg">
           <div className="border-b border-border px-4 py-2">
             <div className="flex items-center justify-between">
-              <h3 className="text-sm font-semibold text-foreground">Input Parameters</h3>
+              <h3 className="text-sm font-semibold text-foreground">{t("mcpServers.toolTestPanel.inputParameters")}</h3>
               <TooltipProvider>
                 <Tooltip>
                   <TooltipTrigger
                     render={<CircleHelp className="size-4 cursor-help text-muted-foreground hover:text-foreground" />}
                   />
-                  <TooltipContent>Configure the input parameters for this tool call</TooltipContent>
+                  <TooltipContent>{t("mcpServers.toolTestPanel.inputParametersTooltip")}</TooltipContent>
                 </Tooltip>
               </TooltipProvider>
             </div>
@@ -218,7 +222,7 @@ export function ToolTestPanel({
         {/* Right Column - Tool Result */}
         <div className="bg-card border border-border rounded-lg">
           <div className="border-b border-border px-4 py-2">
-            <h3 className="text-sm font-semibold text-foreground">Tool Result</h3>
+            <h3 className="text-sm font-semibold text-foreground">{t("mcpServers.toolTestPanel.toolResult")}</h3>
           </div>
 
           <div className="p-4">
@@ -241,9 +245,11 @@ export function ToolTestPanel({
                       />
                     </svg>
                   </div>
-                  <h4 className="text-sm font-medium text-foreground mb-1">Ready to Call Tool</h4>
+                  <h4 className="text-sm font-medium text-foreground mb-1">
+                    {t("mcpServers.toolTestPanel.empty.title")}
+                  </h4>
                   <p className="text-xs text-muted-foreground leading-relaxed">
-                    Configure the input parameters and click &quot;Call Tool&quot; to see the results here.
+                    {t("mcpServers.toolTestPanel.empty.description")}
                   </p>
                 </div>
               </div>
@@ -262,9 +268,11 @@ export function ToolTestPanel({
                             d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
                           />
                         </svg>
-                        <h4 className="text-xs font-medium text-success">Tool executed successfully</h4>
+                        <h4 className="text-xs font-medium text-success">{t("mcpServers.toolTestPanel.success")}</h4>
                         {duration !== null && (
-                          <span className="text-xs text-success ml-1">• {(duration / 1000).toFixed(2)}s</span>
+                          <span className="text-xs text-success ml-1">
+                            {t("mcpServers.toolTestPanel.duration", { seconds: (duration / 1000).toFixed(2) })}
+                          </span>
                         )}
                       </div>
 
@@ -278,7 +286,7 @@ export function ToolTestPanel({
                                 : "text-success hover:text-success/80"
                             }`}
                           >
-                            Formatted
+                            {t("mcpServers.toolTestPanel.formatted")}
                           </button>
                           <button
                             onClick={() => setViewMode("json")}
@@ -293,7 +301,7 @@ export function ToolTestPanel({
                         <button
                           onClick={handleCopyResult}
                           className="p-1 hover:bg-success/15 rounded-sm text-success"
-                          title="Copy response"
+                          title={t("mcpServers.toolTestPanel.copyResponse")}
                         >
                           <svg
                             xmlns="http://www.w3.org/2000/svg"
@@ -322,8 +330,10 @@ export function ToolTestPanel({
                         <div className="animate-spin rounded-full h-8 w-8 border-2 border-border"></div>
                         <div className="animate-spin rounded-full h-8 w-8 border-2 border-info border-t-transparent absolute top-0"></div>
                       </div>
-                      <p className="text-sm font-medium mt-3">Calling tool...</p>
-                      <p className="text-xs text-muted-foreground mt-1">Please wait while we process your request</p>
+                      <p className="text-sm font-medium mt-3">{t("mcpServers.toolTestPanel.calling.title")}</p>
+                      <p className="text-xs text-muted-foreground mt-1">
+                        {t("mcpServers.toolTestPanel.calling.description")}
+                      </p>
                     </div>
                   )}
 
@@ -347,9 +357,13 @@ export function ToolTestPanel({
                         </div>
                         <div className="flex-1">
                           <div className="flex items-center space-x-2 mb-1">
-                            <h4 className="text-xs font-medium text-destructive">Tool Call Failed</h4>
+                            <h4 className="text-xs font-medium text-destructive">
+                              {t("mcpServers.toolTestPanel.failed")}
+                            </h4>
                             {duration !== null && (
-                              <span className="text-xs text-destructive">• {(duration / 1000).toFixed(2)}s</span>
+                              <span className="text-xs text-destructive">
+                                {t("mcpServers.toolTestPanel.duration", { seconds: (duration / 1000).toFixed(2) })}
+                              </span>
                             )}
                           </div>
                           <div className="bg-card border border-destructive/20 rounded-sm p-2 max-h-48 overflow-y-auto">
@@ -374,7 +388,7 @@ export function ToolTestPanel({
                               <div>
                                 <div className="bg-muted px-3 py-1 border-b border-border">
                                   <span className="text-xs font-medium text-foreground uppercase tracking-wide">
-                                    Text Response
+                                    {t("mcpServers.toolTestPanel.textResponse")}
                                   </span>
                                 </div>
                                 <div className="p-3">
@@ -463,7 +477,7 @@ export function ToolTestPanel({
                               <div>
                                 <div className="bg-muted px-3 py-1 border-b border-border">
                                   <span className="text-xs font-medium text-foreground uppercase tracking-wide">
-                                    Image Response
+                                    {t("mcpServers.toolTestPanel.imageResponse")}
                                   </span>
                                 </div>
                                 <div className="p-3">
@@ -471,7 +485,7 @@ export function ToolTestPanel({
                                     {/* eslint-disable-next-line @next/next/no-img-element */}
                                     <img
                                       src={content.url}
-                                      alt="Tool result"
+                                      alt={t("mcpServers.toolTestPanel.imageAlt")}
                                       className="max-w-full h-auto rounded-sm shadow-xs"
                                     />
                                   </div>
@@ -483,7 +497,7 @@ export function ToolTestPanel({
                               <div>
                                 <div className="bg-muted px-3 py-1 border-b border-border">
                                   <span className="text-xs font-medium text-foreground uppercase tracking-wide">
-                                    Embedded Resource
+                                    {t("mcpServers.toolTestPanel.embeddedResource")}
                                   </span>
                                 </div>
                                 <div className="p-3">
@@ -505,7 +519,9 @@ export function ToolTestPanel({
                                     </div>
                                     <div className="flex-1">
                                       <p className="text-xs font-medium text-info">
-                                        Resource Type: {content.resource_type}
+                                        {t("mcpServers.toolTestPanel.resourceType", {
+                                          resourceType: content.resource_type,
+                                        })}
                                       </p>
                                       {content.url && (
                                         <a
@@ -514,7 +530,7 @@ export function ToolTestPanel({
                                           rel="noopener noreferrer"
                                           className="inline-flex items-center text-xs text-info hover:underline mt-1"
                                         >
-                                          View Resource
+                                          {t("mcpServers.toolTestPanel.viewResource")}
                                           <svg className="ml-1 h-3 w-3" fill="currentColor" viewBox="0 0 20 20">
                                             <path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z" />
                                             <path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z" />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TruePassthroughWarning.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TruePassthroughWarning.tsx
index b017fc4f1b4..d56da991bb0 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TruePassthroughWarning.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TruePassthroughWarning.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { TriangleAlert } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { AUTH_TYPE } from "@/components/mcp_tools/types";
@@ -9,17 +10,13 @@ import { AUTH_TYPE } from "@/components/mcp_tools/types";
  * that server, so callers reach the upstream without a LiteLLM identity.
  */
 export default function TruePassthroughWarning({ authType }: { authType?: string | null }) {
+  const { t } = useTranslation();
   if (authType !== AUTH_TYPE.TRUE_PASSTHROUGH) return null;
   return (
     <Alert className="mb-4">
       <TriangleAlert />
-      <AlertTitle>True Passthrough disables LiteLLM authentication for this server</AlertTitle>
-      <AlertDescription>
-        Anyone who can reach the gateway can call this server without a LiteLLM key. The caller&apos;s Authorization
-        header is forwarded to the upstream verbatim, per-key and per-team rate limits and spend tracking do not apply,
-        and the upstream is fully responsible for authenticating callers. Choose OAuth Delegate instead if callers
-        should still authenticate to LiteLLM.
-      </AlertDescription>
+      <AlertTitle>{t("mcpServers.truePassthroughWarning.title")}</AlertTitle>
+      <AlertDescription>{t("mcpServers.truePassthroughWarning.description")}</AlertDescription>
     </Alert>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UpstreamTokenHeaderField.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UpstreamTokenHeaderField.tsx
index 154d55c8cb4..d55ceeae0b3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UpstreamTokenHeaderField.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UpstreamTokenHeaderField.tsx
@@ -1,31 +1,35 @@
 import { Info } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { Input } from "@/components/ui/input";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { textControl } from "./mcpFieldRules";
 
-const UpstreamTokenHeaderField: React.FC = () => (
-  <MountedFormField
-    label={
-      <span className="text-sm font-medium text-foreground flex items-center">
-        Token Header (optional)
-        <SimpleTooltip content="Which upstream header carries the token LiteLLM resolves for this server. Leave blank to send it as 'Authorization: Bearer <token>', which is the default and what most servers expect. Set a header name when the upstream expects it elsewhere, for example an API gateway that terminates its own credential on 'esb-oauth' while a separate Authorization from Static Headers passes through to the server behind it.">
-          <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
-        </SimpleTooltip>
-      </span>
-    }
-    name={["credentials", "upstream_token_header"]}
-  >
-    {(control) => (
-      <Input
-        {...textControl(control)}
-        placeholder="Authorization"
-        className="rounded-lg border-border focus:border-info focus:ring-ring"
-      />
-    )}
-  </MountedFormField>
-);
+const UpstreamTokenHeaderField: React.FC = () => {
+  const { t } = useTranslation();
+  return (
+    <MountedFormField
+      label={
+        <span className="text-sm font-medium text-foreground flex items-center">
+          {t("mcpServers.upstreamTokenHeaderField.label")}
+          <SimpleTooltip content={t("mcpServers.upstreamTokenHeaderField.tooltip")}>
+            <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
+          </SimpleTooltip>
+        </span>
+      }
+      name={["credentials", "upstream_token_header"]}
+    >
+      {(control) => (
+        <Input
+          {...textControl(control)}
+          placeholder="Authorization"
+          className="rounded-lg border-border focus:border-info focus:ring-ring"
+        />
+      )}
+    </MountedFormField>
+  );
+};
 
 export default UpstreamTokenHeaderField;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx
index 1984ca92a52..2e57d9639bd 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx
@@ -2,6 +2,8 @@ import React from "react";
 import { CircleAlert, Info } from "lucide-react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { z } from "zod";
+import type { TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
 import { MCPServer, MCPUserEnvVarsStatus, MCPUserEnvVarSpec } from "@/components/mcp_tools/types";
 import { clearMCPUserEnvVars, getMCPUserEnvVars, storeMCPUserEnvVars } from "@/components/networking";
 import { toast } from "@/lib/toast";
@@ -40,10 +42,15 @@ interface UserEnvVarsFormProps {
   onSubmit: (values: Record<string, string>) => void;
 }
 
-const buildSchema = (required: readonly MCPUserEnvVarSpec[]) =>
+const buildSchema = (required: readonly MCPUserEnvVarSpec[], t: TFunction) =>
   z.object(
     Object.fromEntries(
-      required.map((spec) => [spec.name, spec.is_set ? z.string() : z.string().min(1, `${spec.name} is required`)]),
+      required.map((spec) => [
+        spec.name,
+        spec.is_set
+          ? z.string()
+          : z.string().min(1, t("mcpServers.userEnvVarsModal.form.required", { name: spec.name })),
+      ]),
     ),
   );
 
@@ -51,7 +58,8 @@ const emptyValues = (required: readonly MCPUserEnvVarSpec[]): Record<string, str
   Object.fromEntries(required.map((spec) => [spec.name, ""]));
 
 const UserEnvVarsForm: React.FC<UserEnvVarsFormProps> = ({ required, isSaving, onCancel, onClear, onSubmit }) => {
-  const form = useZodForm(buildSchema(required), { defaultValues: emptyValues(required) });
+  const { t } = useTranslation();
+  const form = useZodForm(buildSchema(required, t), { defaultValues: emptyValues(required) });
 
   return (
     <form onSubmit={form.handleSubmit(onSubmit)}>
@@ -65,7 +73,7 @@ const UserEnvVarsForm: React.FC<UserEnvVarsFormProps> = ({ required, isSaving, o
             label={
               <span className="flex items-center gap-2">
                 <span className="font-mono text-sm font-semibold">{spec.name}</span>
-                {spec.is_set && <Badge variant="secondary">Set</Badge>}
+                {spec.is_set && <Badge variant="secondary">{t("mcpServers.userEnvVarsModal.form.setBadge")}</Badge>}
               </span>
             }
           >
@@ -74,7 +82,9 @@ const UserEnvVarsForm: React.FC<UserEnvVarsFormProps> = ({ required, isSaving, o
                 {...field}
                 disabled={isSaving}
                 placeholder={
-                  spec.is_set ? "Enter a new value to overwrite" : spec.description || `Enter your ${spec.name}`
+                  spec.is_set
+                    ? t("mcpServers.userEnvVarsModal.form.overwritePlaceholder")
+                    : spec.description || t("mcpServers.userEnvVarsModal.form.placeholder", { name: spec.name })
                 }
               />
             )}
@@ -84,15 +94,15 @@ const UserEnvVarsForm: React.FC<UserEnvVarsFormProps> = ({ required, isSaving, o
       <div className="mt-6 flex items-center justify-end gap-2 border-t border-border pt-2">
         {onClear && (
           <Button type="button" variant="destructive" className="mr-auto" onClick={onClear} disabled={isSaving}>
-            Clear
+            {t("mcpServers.userEnvVarsModal.form.clear")}
           </Button>
         )}
         <Button type="button" variant="outline" onClick={onCancel} disabled={isSaving}>
-          Cancel
+          {t("mcpServers.userEnvVarsModal.form.cancel")}
         </Button>
         <Button type="submit" disabled={isSaving}>
           {isSaving && <UiLoadingSpinner className="mr-2 size-4" />}
-          Save Credentials
+          {t("mcpServers.userEnvVarsModal.form.save")}
         </Button>
       </div>
     </form>
@@ -107,6 +117,7 @@ const UserEnvVarsForm: React.FC<UserEnvVarsFormProps> = ({ required, isSaving, o
  * description as the placeholder.
  */
 const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, accessToken, onClose, onSaved }) => {
+  const { t } = useTranslation();
   const queryClient = useQueryClient();
   const [confirmingClear, setConfirmingClear] = React.useState(false);
   const close = () => {
@@ -128,12 +139,14 @@ const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, acces
     mutationFn: (values: Record<string, string>) => storeMCPUserEnvVars(accessToken!, server!.server_id, values),
     onSuccess: (saved) => {
       queryClient.setQueryData(queryKey, saved);
-      toast.success("Credentials saved");
+      toast.success(t("mcpServers.userEnvVarsModal.toasts.saved"));
       onSaved?.(saved);
       close();
     },
     onError: (err) => {
-      toast.fromError(`Failed to save env vars: ${err instanceof Error ? err.message : String(err)}`);
+      toast.fromError(
+        t("mcpServers.userEnvVarsModal.toasts.saveFailed", { error: err instanceof Error ? err.message : String(err) }),
+      );
     },
   });
 
@@ -141,12 +154,16 @@ const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, acces
     mutationFn: () => clearMCPUserEnvVars(accessToken!, server!.server_id),
     onSuccess: (cleared) => {
       queryClient.setQueryData(queryKey, cleared);
-      toast.success("Credentials cleared");
+      toast.success(t("mcpServers.userEnvVarsModal.toasts.cleared"));
       onSaved?.(cleared);
       close();
     },
     onError: (err) => {
-      toast.fromError(`Failed to clear env vars: ${err instanceof Error ? err.message : String(err)}`);
+      toast.fromError(
+        t("mcpServers.userEnvVarsModal.toasts.clearFailed", {
+          error: err instanceof Error ? err.message : String(err),
+        }),
+      );
     },
   });
 
@@ -159,7 +176,8 @@ const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, acces
     saveMutation.mutate(trimmed);
   };
 
-  const displayName = server?.server_name || server?.alias || server?.server_id || "MCP Server";
+  const displayName =
+    server?.server_name || server?.alias || server?.server_id || t("mcpServers.userEnvVarsModal.fallbackServerName");
   const required = status?.required ?? [];
   const isSaving = saveMutation.isPending || clearMutation.isPending;
   const canClear = !!server && !!accessToken && required.some((spec) => spec.is_set);
@@ -173,8 +191,8 @@ const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, acces
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[520px]">
         <DialogHeader>
           <div className="flex items-center gap-2">
-            <DialogTitle className="text-base font-semibold">Set your credentials</DialogTitle>
-            <StatusBadge tone="info" label="Per-user" />
+            <DialogTitle className="text-base font-semibold">{t("mcpServers.userEnvVarsModal.title")}</DialogTitle>
+            <StatusBadge tone="info" label={t("mcpServers.userEnvVarsModal.perUserBadge")} />
           </div>
           <span className="text-xs text-muted-foreground">{displayName}</span>
         </DialogHeader>
@@ -187,20 +205,16 @@ const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, acces
           ) : isError ? (
             <Alert variant="error">
               <CircleAlert />
-              <AlertTitle>Failed to load env vars</AlertTitle>
+              <AlertTitle>{t("mcpServers.userEnvVarsModal.loadFailed")}</AlertTitle>
             </Alert>
           ) : required.length === 0 ? (
             <Alert variant="info">
               <Info />
-              <AlertTitle>No per-user fields configured for this server.</AlertTitle>
+              <AlertTitle>{t("mcpServers.userEnvVarsModal.noFields")}</AlertTitle>
             </Alert>
           ) : (
             <>
-              <span className="block text-sm text-muted-foreground">
-                These values are private to you. Your admin configured this MCP server to require these per-user
-                credentials. Saved values are never shown back; leave an already-set field blank to keep it, or enter a
-                value to set or change it.
-              </span>
+              <span className="block text-sm text-muted-foreground">{t("mcpServers.userEnvVarsModal.intro")}</span>
               <UserEnvVarsForm
                 required={required}
                 isSaving={isSaving}
@@ -214,18 +228,17 @@ const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, acces
         <AlertDialog open={confirmingClear} onOpenChange={(opened) => !opened && setConfirmingClear(false)}>
           <AlertDialogContent>
             <AlertDialogHeader>
-              <AlertDialogTitle>Clear saved credentials</AlertDialogTitle>
+              <AlertDialogTitle>{t("mcpServers.userEnvVarsModal.clearDialog.title")}</AlertDialogTitle>
               <AlertDialogDescription>
-                This deletes every per-user value you saved for {displayName}. Your next MCP request to this server
-                fails until you set them again.
+                {t("mcpServers.userEnvVarsModal.clearDialog.description", { server: displayName })}
               </AlertDialogDescription>
             </AlertDialogHeader>
             <AlertDialogFooter>
               <Button variant="outline" onClick={() => setConfirmingClear(false)}>
-                Cancel
+                {t("mcpServers.userEnvVarsModal.clearDialog.cancel")}
               </Button>
               <Button variant="destructive" onClick={confirmClear}>
-                Clear credentials
+                {t("mcpServers.userEnvVarsModal.clearDialog.confirm")}
               </Button>
             </AlertDialogFooter>
           </AlertDialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/duplicateServerCheck.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/duplicateServerCheck.ts
index 0e24e13e7f1..aea2eae003f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/duplicateServerCheck.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/duplicateServerCheck.ts
@@ -1,3 +1,4 @@
+import type { ParseKeys } from "i18next";
 import { MCPServer } from "@/components/mcp_tools/types";
 import { ApiError, deriveErrorMessage, unwrapProxyErrorMessage } from "@/lib/http/client";
 
@@ -38,7 +39,7 @@ export function findDuplicateMcpServer(
   return null;
 }
 
-export const DUPLICATE_IDENTIFIER_MESSAGE = "An MCP server with this name/alias already exists.";
+export const DUPLICATE_IDENTIFIER_MESSAGE_KEY: ParseKeys = "mcpServers.duplicateServerCheck.duplicateIdentifier";
 
 export const mcpSubmitErrorReason = (error: unknown): string => {
   if (error instanceof ApiError) {
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 081063854c0..068cf85a6e1 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
@@ -1,3 +1,4 @@
+import type { TFunction } from "i18next";
 import type { McpDcrCredentials } from "@/hooks/useMcpOAuthFlow";
 import {
   ADMIN_CONFIG_CREDENTIAL_KEYS,
@@ -114,20 +115,23 @@ const assertNever = (value: never): never => {
   throw new Error(`unhandled edit payload result: ${JSON.stringify(value)}`);
 };
 
-export const editPayloadErrorMessage = (result: Exclude<BuildEditPayloadResult, { kind: "ok" }>): string => {
+export const editPayloadErrorMessage = (
+  result: Exclude<BuildEditPayloadResult, { kind: "ok" }>,
+  t: TFunction,
+): string => {
   switch (result.kind) {
     case "invalid_tool_display_name":
-      return `Tool display name "${result.displayName}" is invalid. Only letters, digits, underscores, and hyphens are allowed (no spaces).`;
+      return t("mcpServers.editServerPayload.errors.invalidToolDisplayName", { displayName: result.displayName });
     case "stdio_config_missing_command":
-      return "Stdio configuration must include a command";
+      return t("mcpServers.editServerPayload.errors.stdioConfigMissingCommand");
     case "invalid_stdio_json":
-      return "Invalid JSON in stdio configuration";
+      return t("mcpServers.editServerPayload.errors.invalidStdioJson");
     case "invalid_stdio_env_json":
-      return "Invalid JSON in stdio env configuration";
+      return t("mcpServers.editServerPayload.errors.invalidStdioEnvJson");
     case "stdio_command_required":
-      return "Stdio transport requires a command";
+      return t("mcpServers.editServerPayload.errors.stdioCommandRequired");
     case "invalid_token_validation_json":
-      return "Invalid JSON in Token Validation Rules";
+      return t("mcpServers.editServerPayload.errors.invalidTokenValidationJson");
     default:
       return assertNever(result);
   }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editToolPreview.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editToolPreview.ts
index 6dea7d7d18e..4ffc7dc600b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editToolPreview.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editToolPreview.ts
@@ -1,3 +1,5 @@
+import type { TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
 import { AUTH_TYPE, TRANSPORT } from "@/components/mcp_tools/types";
 import { AUTH_TYPES_REQUIRING_AUTH_VALUE, reduceStaticHeaders } from "./createServerPayload";
 
@@ -27,6 +29,7 @@ type EditToolPreview =
 export const getEditToolPreview = (
   values: Readonly<Record<string, unknown>>,
   initialValues: Readonly<Record<string, unknown>>,
+  t: TFunction = i18n.t.bind(i18n),
 ): EditToolPreview => {
   const staticAuth =
     values.auth_type === AUTH_TYPE.NONE ||
@@ -59,8 +62,7 @@ export const getEditToolPreview = (
   if (changedOrigin && (needsSavedCredential || reusesHeader)) {
     return {
       kind: "incomplete",
-      message:
-        "The server origin changed. Enter credentials and replace or remove saved static headers to preview tools.",
+      message: t("mcpServers.editToolPreview.originChanged"),
     };
   }
   return { kind: "preview", config };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/importConnectorConfig.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/importConnectorConfig.ts
index 16dfc0542fd..b7c02dd6f9f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/importConnectorConfig.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/importConnectorConfig.ts
@@ -1,3 +1,6 @@
+import type { TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
+
 export interface MCPConnectorImportResult {
   name: string;
   server_id: string;
@@ -24,41 +27,41 @@ export type ParsedConnectorConfig =
   | { ok: true; payload: Record<string, unknown>; connectorCount: number }
   | { ok: false; error: string };
 
-export const parseConnectorConfig = (text: string): ParsedConnectorConfig => {
+export const parseConnectorConfig = (text: string, t: TFunction = i18n.t.bind(i18n)): ParsedConnectorConfig => {
   const trimmed = text.trim();
   if (!trimmed) {
-    return { ok: false, error: "Paste your connector JSON before importing." };
+    return { ok: false, error: t("mcpServers.importConnectorConfig.errors.emptyInput") };
   }
   let parsed: unknown;
   try {
     parsed = JSON.parse(trimmed);
   } catch {
-    return { ok: false, error: "Invalid JSON. Check for missing quotes, commas, or brackets." };
+    return { ok: false, error: t("mcpServers.importConnectorConfig.errors.invalidJson") };
   }
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    return { ok: false, error: "Expected a JSON object with an mcpServers or mcp_servers key." };
+    return { ok: false, error: t("mcpServers.importConnectorConfig.errors.unrecognizedShape") };
   }
   const record = parsed as Record<string, unknown>;
   const mapping = record.mcpServers;
   if (mapping !== undefined) {
     if (typeof mapping !== "object" || mapping === null || Array.isArray(mapping)) {
-      return { ok: false, error: "mcpServers must be an object mapping connector names to definitions." };
+      return { ok: false, error: t("mcpServers.importConnectorConfig.errors.mappingNotObject") };
     }
     const connectorCount = Object.keys(mapping).length;
     if (connectorCount === 0) {
-      return { ok: false, error: "mcpServers contains no connectors." };
+      return { ok: false, error: t("mcpServers.importConnectorConfig.errors.mappingEmpty") };
     }
     return { ok: true, payload: { mcpServers: mapping }, connectorCount };
   }
   const list = record.mcp_servers;
   if (list !== undefined) {
     if (!Array.isArray(list)) {
-      return { ok: false, error: "mcp_servers must be an array of connector definitions." };
+      return { ok: false, error: t("mcpServers.importConnectorConfig.errors.listNotArray") };
     }
     if (list.length === 0) {
-      return { ok: false, error: "mcp_servers contains no connectors." };
+      return { ok: false, error: t("mcpServers.importConnectorConfig.errors.listEmpty") };
     }
     return { ok: true, payload: { mcp_servers: list }, connectorCount: list.length };
   }
-  return { ok: false, error: "Expected a JSON object with an mcpServers or mcp_servers key." };
+  return { ok: false, error: t("mcpServers.importConnectorConfig.errors.unrecognizedShape") };
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts
index 9046cb6d039..dee5470abbc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts
@@ -1,6 +1,9 @@
+import type { TFunction } from "i18next";
 import type React from "react";
 import type { Validate } from "react-hook-form";
 
+import i18n from "@/i18n/i18n";
+
 import type { MountedFieldControlProps, MountedFormValues } from "@/components/common_components/MountedFormField";
 
 type McpValidate = Validate<unknown, MountedFormValues>;
@@ -35,14 +38,14 @@ const toTags = (value: unknown): string[] =>
     (entry): entry is string => typeof entry === "string" && entry !== "",
   );
 
-export const tagsControl = (control: MountedFieldControlProps) => {
+export const tagsControl = (control: MountedFieldControlProps, t: TFunction = i18n.t.bind(i18n)) => {
   const value = toTags(control.value);
   return {
     id: control.id,
     options: [...new Set(value)].map((tag) => ({ label: tag, value: tag })),
     value,
     onValueChange: control.onChange,
-    emptyText: "Type to add",
+    emptyText: t("mcpServers.fieldRules.tagsControl.emptyText"),
     allowCustomValues: true,
   };
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx
index d609c9f2527..729cd4e4110 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx
@@ -1,7 +1,7 @@
-/* eslint-disable react/no-unescaped-entities */
-
 import { useTerminology } from "@/contexts/TerminologyContext";
+import type { ParseKeys } from "i18next";
 import React, { useId, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
@@ -33,7 +33,7 @@ interface CodeBlockProps {
 
 interface FeatureCardProps {
   icon: React.ReactNode;
-  title: string;
+  titleKey: ParseKeys;
   description: string;
   children: React.ReactNode;
   serverName?: string;
@@ -42,12 +42,13 @@ interface FeatureCardProps {
 
 const FeatureCard: React.FC<FeatureCardProps> = ({
   icon,
-  title,
+  titleKey,
   description,
   children,
   serverName,
   accessGroups = ["dev-group"],
 }) => {
+  const { t } = useTranslation();
   const [useServerHeader, setUseServerHeader] = useState(false);
   const serverHeaderToggleId = useId();
 
@@ -70,44 +71,61 @@ const FeatureCard: React.FC<FeatureCardProps> = ({
         <div className="flex items-center gap-3 mb-3">
           <span className="p-2 rounded-lg bg-muted">{icon}</span>
           <div>
-            <h5 className="mb-0 text-base font-semibold text-foreground">{title}</h5>
+            <h5 className="mb-0 text-base font-semibold text-foreground">{t(titleKey)}</h5>
             <span className="text-muted-foreground">{description}</span>
           </div>
         </div>
-        {serverName && (title === "Implementation Example" || title === "Configuration") && (
-          <div className="mb-4">
-            <div className="flex items-center gap-2 mb-2">
-              <Switch
-                id={serverHeaderToggleId}
-                size="sm"
-                checked={useServerHeader}
-                onCheckedChange={setUseServerHeader}
-              />
-              <Label htmlFor={serverHeaderToggleId} className="font-normal leading-normal">
-                Limit tools to specific MCP servers or MCP groups by passing the <code>x-mcp-servers</code> header
-              </Label>
+        {serverName &&
+          (titleKey === "mcpServers.connect.implementationExampleCard.title" ||
+            titleKey === "mcpServers.connect.cursorTab.configurationCard.title") && (
+            <div className="mb-4">
+              <div className="flex items-center gap-2 mb-2">
+                <Switch
+                  id={serverHeaderToggleId}
+                  size="sm"
+                  checked={useServerHeader}
+                  onCheckedChange={setUseServerHeader}
+                />
+                <Label htmlFor={serverHeaderToggleId} className="font-normal leading-normal">
+                  <Trans i18nKey="mcpServers.connect.featureCard.serverHeaderToggle" components={{ code: <code /> }} />
+                </Label>
+              </div>
+              {useServerHeader && (
+                <Alert className="mt-2" variant="info">
+                  <Info />
+                  <AlertTitle>{t("mcpServers.connect.featureCard.optionsTitle")}</AlertTitle>
+                  <AlertDescription>
+                    <div>
+                      <p>
+                        <Trans
+                          i18nKey="mcpServers.connect.featureCard.optionServer"
+                          components={{
+                            strong: <strong />,
+                            code: <code />,
+                            server: <>{serverName.replace(/\s+/g, "_")}</>,
+                          }}
+                        />
+                      </p>
+                      <p>
+                        <Trans
+                          i18nKey="mcpServers.connect.featureCard.optionGroup"
+                          values={{ group: "dev-group" }}
+                          components={{ strong: <strong />, code: <code /> }}
+                        />
+                      </p>
+                      <p className="mt-2 text-sm text-muted-foreground">
+                        <Trans
+                          i18nKey="mcpServers.connect.featureCard.optionMix"
+                          values={{ example: "Server1,dev-group" }}
+                          components={{ code: <code /> }}
+                        />
+                      </p>
+                    </div>
+                  </AlertDescription>
+                </Alert>
+              )}
             </div>
-            {useServerHeader && (
-              <Alert className="mt-2" variant="info">
-                <Info />
-                <AlertTitle>Two Options</AlertTitle>
-                <AlertDescription>
-                  <div>
-                    <p>
-                      <strong>Option 1:</strong> Get a specific server: <code>"{serverName.replace(/\s+/g, "_")}"</code>
-                    </p>
-                    <p>
-                      <strong>Option 2:</strong> Get a group of MCPs: <code>"dev-group"</code>
-                    </p>
-                    <p className="mt-2 text-sm text-muted-foreground">
-                      You can also mix both: <code>"Server1,dev-group"</code>
-                    </p>
-                  </div>
-                </AlertDescription>
-              </Alert>
-            )}
-          </div>
-        )}
+          )}
         {React.Children.map(children, (child) => {
           if (
             React.isValidElement<CodeBlockProps>(child) &&
@@ -134,6 +152,7 @@ interface MCPConnectProps {
 
 const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = [] }) => {
   const term = useTerminology();
+  const { t } = useTranslation();
   const proxyBaseUrl = getProxyBaseUrl();
   const gatewayBaseUrl = getGatewayBaseUrl();
   const [copiedStates, setCopiedStates] = useState<Record<string, boolean>>({});
@@ -205,39 +224,45 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
       <div className="bg-linear-to-r from-success/15 to-success/5 p-6 rounded-lg border border-success/15">
         <div className="flex items-center gap-3 mb-3">
           <Zap className="text-success" size={24} />
-          <h4 className="mb-0 text-xl font-semibold text-success">LiteLLM Proxy API Integration</h4>
+          <h4 className="mb-0 text-xl font-semibold text-success">{t("mcpServers.connect.litellmTab.title")}</h4>
         </div>
-        <span className="text-success">
-          Connect to LiteLLM Proxy Responses API for seamless tool integration with multiple model providers
-        </span>
+        <span className="text-success">{t("mcpServers.connect.litellmTab.description")}</span>
       </div>
 
       <div className="flex w-full flex-col gap-6">
         <FeatureCard
           icon={<KeyIcon className="text-success" size={16} />}
-          title="Virtual Key Setup"
-          description="Configure your LiteLLM Proxy Virtual Key for authentication"
+          titleKey="mcpServers.connect.litellmTab.virtualKeyCard.title"
+          description={t("mcpServers.connect.litellmTab.virtualKeyCard.description")}
         >
           <div className="flex w-full flex-col gap-4">
             <div>
-              <span>Get your Virtual Key from your LiteLLM Proxy dashboard or contact your administrator</span>
+              <span>{t("mcpServers.connect.litellmTab.virtualKeyCard.instructions")}</span>
             </div>
-            <CodeBlock title="Environment Variable" code='export LITELLM_API_KEY="sk-..."' copyKey="litellm-env" />
+            <CodeBlock
+              title={t("mcpServers.connect.codeBlocks.environmentVariable")}
+              code='export LITELLM_API_KEY="sk-..."'
+              copyKey="litellm-env"
+            />
           </div>
         </FeatureCard>
 
         <FeatureCard
           icon={<ServerIcon className="text-success" size={16} />}
-          title="MCP Server Information"
-          description="Connection details for your LiteLLM MCP server"
+          titleKey="mcpServers.connect.serverInfoCard.title"
+          description={t("mcpServers.connect.serverInfoCard.description")}
         >
-          <CodeBlock title="Server URL" code={`${proxyBaseUrl}/mcp`} copyKey="litellm-server-url" />
+          <CodeBlock
+            title={t("mcpServers.connect.codeBlocks.serverUrl")}
+            code={`${proxyBaseUrl}/mcp`}
+            copyKey="litellm-server-url"
+          />
         </FeatureCard>
 
         <FeatureCard
           icon={<Code className="text-success" size={16} />}
-          title="Implementation Example"
-          description="Complete cURL example for using the LiteLLM Proxy Responses API"
+          titleKey="mcpServers.connect.implementationExampleCard.title"
+          description={t("mcpServers.connect.litellmTab.exampleDescription")}
           serverName={currentServer}
           accessGroups={["dev-group"]}
         >
@@ -275,49 +300,60 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
       <div className="bg-linear-to-r from-info/15 to-info/5 p-6 rounded-lg border border-info/15">
         <div className="flex items-center gap-3 mb-3">
           <Code className="text-info" size={24} />
-          <h4 className="mb-0 text-xl font-semibold text-info">OpenAI Responses API Integration</h4>
+          <h4 className="mb-0 text-xl font-semibold text-info">{t("mcpServers.connect.openaiTab.title")}</h4>
         </div>
-        <span className="text-info">
-          Connect OpenAI Responses API to your LiteLLM MCP server for seamless tool integration
-        </span>
+        <span className="text-info">{t("mcpServers.connect.openaiTab.description")}</span>
       </div>
 
       <div className="flex w-full flex-col gap-6">
         <FeatureCard
           icon={<KeyIcon className="text-info" size={16} />}
-          title="API Key Setup"
-          description="Configure your OpenAI API key for authentication"
+          titleKey="mcpServers.connect.openaiTab.apiKeyCard.title"
+          description={t("mcpServers.connect.openaiTab.apiKeyCard.description")}
         >
           <div className="flex w-full flex-col gap-4">
             <div>
               <span>
-                Get your API key from the{" "}
-                <a
-                  href="https://platform.openai.com/api-keys"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="text-info hover:text-info/80 inline-flex items-center gap-1"
-                >
-                  OpenAI platform <ExternalLinkIcon size={12} />
-                </a>
+                <Trans
+                  i18nKey="mcpServers.connect.openaiTab.apiKeyCard.instructions"
+                  components={{
+                    docs: (
+                      <a
+                        href="https://platform.openai.com/api-keys"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-info hover:text-info/80 inline-flex items-center gap-1"
+                      />
+                    ),
+                    icon: <ExternalLinkIcon size={12} />,
+                  }}
+                />
               </span>
             </div>
-            <CodeBlock title="Environment Variable" code='export OPENAI_API_KEY="sk-..."' copyKey="openai-env" />
+            <CodeBlock
+              title={t("mcpServers.connect.codeBlocks.environmentVariable")}
+              code='export OPENAI_API_KEY="sk-..."'
+              copyKey="openai-env"
+            />
           </div>
         </FeatureCard>
 
         <FeatureCard
           icon={<ServerIcon className="text-info" size={16} />}
-          title="MCP Server Information"
-          description="Connection details for your LiteLLM MCP server"
+          titleKey="mcpServers.connect.serverInfoCard.title"
+          description={t("mcpServers.connect.serverInfoCard.description")}
         >
-          <CodeBlock title="Server URL" code={`${proxyBaseUrl}/mcp`} copyKey="openai-server-url" />
+          <CodeBlock
+            title={t("mcpServers.connect.codeBlocks.serverUrl")}
+            code={`${proxyBaseUrl}/mcp`}
+            copyKey="openai-server-url"
+          />
         </FeatureCard>
 
         <FeatureCard
           icon={<Code className="text-info" size={16} />}
-          title="Implementation Example"
-          description="Complete cURL example for using the Responses API"
+          titleKey="mcpServers.connect.implementationExampleCard.title"
+          description={t("mcpServers.connect.openaiTab.exampleDescription")}
           serverName="Zapier Gmail"
           accessGroups={["dev-group"]}
         >
@@ -355,38 +391,42 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
       <div className="bg-linear-to-r from-purple-50 to-blue-50 p-6 rounded-lg border border-purple-100 dark:from-purple-950 dark:to-blue-950 dark:border-purple-900">
         <div className="flex items-center gap-3 mb-3">
           <Terminal className="text-purple-600 dark:text-purple-400" size={24} />
-          <h4 className="mb-0 text-xl font-semibold text-purple-900 dark:text-purple-100">Cursor IDE Integration</h4>
+          <h4 className="mb-0 text-xl font-semibold text-purple-900 dark:text-purple-100">
+            {t("mcpServers.connect.cursorTab.title")}
+          </h4>
         </div>
         <span className="text-purple-700 dark:text-purple-300">
-          {term(
-            "Use tools directly from Cursor IDE with LiteLLM MCP. Enable your AI assistant to perform real-world tasks without leaving your coding environment.",
-          )}
+          {term(t("mcpServers.connect.cursorTab.description"))}
         </span>
       </div>
 
       <Card>
         <CardContent>
-          <h5 className="mb-4 text-base font-semibold text-foreground">Setup Instructions</h5>
+          <h5 className="mb-4 text-base font-semibold text-foreground">
+            {t("mcpServers.connect.cursorTab.setupTitle")}
+          </h5>
           <div className="flex w-full flex-col gap-6">
-            <StepCard step={1} title="Open Cursor Settings">
+            <StepCard step={1} title={t("mcpServers.connect.cursorTab.steps.openSettings.title")}>
               <span className="text-muted-foreground">
-                Use the keyboard shortcut <Kbd>⇧+⌘+J</Kbd> (Mac) or <Kbd>Ctrl+Shift+J</Kbd> (Windows/Linux)
+                <Trans i18nKey="mcpServers.connect.cursorTab.steps.openSettings.body" components={{ kbd: <Kbd /> }} />
               </span>
             </StepCard>
 
-            <StepCard step={2} title="Navigate to MCP Tools">
-              <span className="text-muted-foreground">Go to the "MCP Tools" tab and click "New MCP Server"</span>
+            <StepCard step={2} title={t("mcpServers.connect.cursorTab.steps.navigate.title")}>
+              <span className="text-muted-foreground">{t("mcpServers.connect.cursorTab.steps.navigate.body")}</span>
             </StepCard>
 
-            <StepCard step={3} title="Add Configuration">
+            <StepCard step={3} title={t("mcpServers.connect.cursorTab.steps.addConfiguration.title")}>
               <span className="mb-3 text-muted-foreground">
-                Copy the JSON configuration below and paste it into Cursor, then save with <Kbd>Cmd+S</Kbd> or{" "}
-                <Kbd>Ctrl+S</Kbd>
+                <Trans
+                  i18nKey="mcpServers.connect.cursorTab.steps.addConfiguration.body"
+                  components={{ kbd: <Kbd /> }}
+                />
               </span>
               <FeatureCard
                 icon={<Code className="text-purple-600 dark:text-purple-400" size={16} />}
-                title="Configuration"
-                description="Cursor MCP configuration"
+                titleKey="mcpServers.connect.cursorTab.configurationCard.title"
+                description={t("mcpServers.connect.cursorTab.configurationCard.description")}
                 serverName="Zapier Gmail"
                 accessGroups={["dev-group"]}
               >
@@ -418,28 +458,27 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
       <div className="bg-linear-to-r from-success/15 to-success/5 p-6 rounded-lg border border-success/15">
         <div className="flex items-center gap-3 mb-3">
           <Globe className="text-success" size={24} />
-          <h4 className="mb-0 text-xl font-semibold text-success">Streamable HTTP Transport</h4>
+          <h4 className="mb-0 text-xl font-semibold text-success">{t("mcpServers.connect.httpTab.title")}</h4>
         </div>
-        <span className="text-success">
-          Connect to LiteLLM MCP using HTTP transport. Compatible with any MCP client that supports HTTP streaming.
-        </span>
+        <span className="text-success">{t("mcpServers.connect.httpTab.description")}</span>
       </div>
 
       <FeatureCard
         icon={<Globe className="text-success" size={16} />}
-        title="Universal MCP Connection"
-        description="Use this URL with any MCP client that supports HTTP transport"
+        titleKey="mcpServers.connect.httpTab.connectionCard.title"
+        description={t("mcpServers.connect.httpTab.connectionCard.description")}
       >
         <div className="flex w-full flex-col gap-4">
           <div>
-            <span>
-              Each MCP client supports different transports. Refer to your client documentation to determine the
-              appropriate transport method.
-            </span>
+            <span>{t("mcpServers.connect.httpTab.connectionCard.instructions")}</span>
           </div>
-          <CodeBlock title="Server URL" code={`${proxyBaseUrl}/mcp`} copyKey="http-server-url" />
           <CodeBlock
-            title="Headers Configuration"
+            title={t("mcpServers.connect.codeBlocks.serverUrl")}
+            code={`${proxyBaseUrl}/mcp`}
+            copyKey="http-server-url"
+          />
+          <CodeBlock
+            title={t("mcpServers.connect.codeBlocks.headersConfiguration")}
             code={JSON.stringify(
               {
                 "x-litellm-api-key": "Bearer YOUR_LITELLM_API_KEY",
@@ -463,7 +502,7 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
               }
             >
               <ExternalLinkIcon size={14} />
-              Learn more about MCP transports
+              {t("mcpServers.connect.httpTab.learnMore")}
             </Button>
           </div>
         </div>
@@ -475,12 +514,8 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
     <div>
       <div className="flex w-full flex-col gap-6">
         <div>
-          <h2 className="text-3xl font-bold text-foreground mb-3">Connect to your MCP client</h2>
-          <p className="text-lg text-muted-foreground">
-            {term(
-              "Use tools directly from any MCP client with LiteLLM MCP. Enable your AI assistant to perform real-world tasks through a simple, secure connection.",
-            )}
-          </p>
+          <h2 className="text-3xl font-bold text-foreground mb-3">{t("mcpServers.connect.title")}</h2>
+          <p className="text-lg text-muted-foreground">{term(t("mcpServers.connect.description"))}</p>
         </div>
 
         <Tabs defaultValue="openai" className="w-full">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connection_status.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connection_status.tsx
index cb02fedab66..f55c36c5c1f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connection_status.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connection_status.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { CircleCheck, CircleAlert, RefreshCw, Wrench, Info } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
@@ -27,6 +28,7 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
   canFetchTools,
   fetchTools,
 }) => {
+  const { t } = useTranslation();
   const isPreviewForbidden = toolsErrorStatus === 403;
   // Don't show anything if required fields aren't filled
   if (!canFetchTools && !formValues.url && !formValues.spec_path) {
@@ -38,14 +40,14 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
       <div className="space-y-4">
         <div className="flex items-center gap-2">
           <CircleCheck className="size-4 text-muted-foreground" />
-          <h3 className="text-lg font-medium">Connection Status</h3>
+          <h3 className="text-lg font-medium">{t("mcpServers.connectionStatus.title")}</h3>
         </div>
 
         {!canFetchTools && (formValues.url || formValues.spec_path) && (
           <div className="rounded-lg border border-dashed py-6 text-center text-muted-foreground">
             <Wrench className="mx-auto mb-2 size-6" />
-            <p className="text-sm">Complete required fields to test connection</p>
-            <p className="text-sm">Fill in URL, Transport, and Authentication to test MCP server connection</p>
+            <p className="text-sm">{t("mcpServers.connectionStatus.incomplete.title")}</p>
+            <p className="text-sm">{t("mcpServers.connectionStatus.incomplete.description")}</p>
           </div>
         )}
 
@@ -55,36 +57,38 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
               <div>
                 <p className="text-sm font-medium">
                   {isLoadingTools
-                    ? "Testing connection to MCP server..."
+                    ? t("mcpServers.connectionStatus.state.testing")
                     : tools.length > 0
-                      ? "Connection successful"
+                      ? t("mcpServers.connectionStatus.state.successful")
                       : toolsError
                         ? isPreviewForbidden
-                          ? "Ready to submit"
-                          : "Connection failed"
-                        : "Ready to test connection"}
+                          ? t("mcpServers.connectionStatus.state.readyToSubmit")
+                          : t("mcpServers.connectionStatus.state.failed")
+                        : t("mcpServers.connectionStatus.state.readyToTest")}
+                </p>
+                <p className="text-sm text-muted-foreground">
+                  {t("mcpServers.connectionStatus.server", { server: formValues.url || formValues.spec_path })}
                 </p>
-                <p className="text-sm text-muted-foreground">Server: {formValues.url || formValues.spec_path}</p>
               </div>
 
               {isLoadingTools && (
                 <div className="flex items-center gap-2 text-muted-foreground">
                   <UiLoadingSpinner className="size-4" />
-                  <p className="text-sm">Connecting...</p>
+                  <p className="text-sm">{t("mcpServers.connectionStatus.badge.connecting")}</p>
                 </div>
               )}
 
               {!isLoadingTools && !toolsError && tools.length > 0 && (
                 <div className="flex items-center gap-1">
                   <CircleCheck className="size-4" />
-                  <p className="text-sm font-medium">Connected</p>
+                  <p className="text-sm font-medium">{t("mcpServers.connectionStatus.badge.connected")}</p>
                 </div>
               )}
 
               {toolsError && !isPreviewForbidden && (
                 <div className="flex items-center gap-1 text-destructive">
                   <CircleAlert className="size-4" />
-                  <p className="text-sm font-medium">Failed</p>
+                  <p className="text-sm font-medium">{t("mcpServers.connectionStatus.badge.failed")}</p>
                 </div>
               )}
             </div>
@@ -92,14 +96,14 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
             {isLoadingTools && (
               <div className="flex items-center justify-center gap-3 py-6">
                 <UiLoadingSpinner className="size-6 text-muted-foreground" />
-                <p className="text-sm">Testing connection and loading tools...</p>
+                <p className="text-sm">{t("mcpServers.connectionStatus.loadingTools")}</p>
               </div>
             )}
 
             {toolsError && isPreviewForbidden && (
               <Alert>
                 <Info />
-                <AlertTitle>Tool preview unavailable</AlertTitle>
+                <AlertTitle>{t("mcpServers.connectionStatus.previewUnavailable")}</AlertTitle>
                 <AlertDescription>{toolsError}</AlertDescription>
               </Alert>
             )}
@@ -107,7 +111,7 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
             {toolsError && !isPreviewForbidden && (
               <Alert variant="destructive">
                 <CircleAlert />
-                <AlertTitle>Connection Failed</AlertTitle>
+                <AlertTitle>{t("mcpServers.connectionStatus.error.title")}</AlertTitle>
                 <AlertDescription>
                   <div>{toolsError}</div>
                   {toolsErrorStackTrace && (
@@ -115,7 +119,7 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
                       <CollapsibleTrigger
                         render={
                           <Button variant="link" size="sm" className="h-auto p-0">
-                            Stack Trace
+                            {t("mcpServers.connectionStatus.error.stackTrace")}
                           </Button>
                         }
                       />
@@ -130,7 +134,7 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
                 <div className="mt-3">
                   <Button variant="outline" size="sm" onClick={fetchTools}>
                     <RefreshCw />
-                    Retry
+                    {t("mcpServers.connectionStatus.error.retry")}
                   </Button>
                 </div>
               </Alert>
@@ -139,8 +143,8 @@ const MCPConnectionStatus: React.FC<MCPConnectionStatusProps> = ({
             {!isLoadingTools && tools.length === 0 && !toolsError && (
               <div className="rounded-lg border border-dashed py-6 text-center">
                 <CircleCheck className="mx-auto mb-2 size-6" />
-                <p className="text-sm font-medium">Connection successful!</p>
-                <p className="text-sm text-muted-foreground">No tools found for this MCP server</p>
+                <p className="text-sm font-medium">{t("mcpServers.connectionStatus.noTools.title")}</p>
+                <p className="text-sm text-muted-foreground">{t("mcpServers.connectionStatus.noTools.description")}</p>
               </div>
             )}
           </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_discovery.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_discovery.tsx
index a80f88b4480..95f208c1a51 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_discovery.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_discovery.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useMemo, useEffect } from "react";
 import { Search } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { InputGroup, InputGroupAddon, InputGroupInput } from "@/components/ui/input-group";
@@ -42,6 +43,7 @@ const MCPDiscovery: React.FC<MCPDiscoveryProps> = ({
   onCustomServer,
   accessToken,
 }) => {
+  const { t } = useTranslation();
   const [servers, setServers] = useState<DiscoverableMCPServer[]>([]);
   const [categories, setCategories] = useState<string[]>([]);
   const [loading, setLoading] = useState(false);
@@ -59,13 +61,13 @@ const MCPDiscovery: React.FC<MCPDiscoveryProps> = ({
           setCategories(data.categories || []);
         })
         .catch((err: Error) => {
-          setError(err.message || "Failed to load MCP servers");
+          setError(err.message || t("mcpServers.discovery.errors.loadFailed"));
         })
         .finally(() => {
           setLoading(false);
         });
     }
-  }, [isVisible, accessToken]);
+  }, [isVisible, accessToken, t]);
 
   useEffect(() => {
     if (isVisible) {
@@ -107,11 +109,15 @@ const MCPDiscovery: React.FC<MCPDiscoveryProps> = ({
         <DialogHeader>
           <div className="flex items-center justify-between border-b border-border pb-4">
             <div className="flex items-center space-x-3">
-              <img src={resolveLogoSrc(mcpLogoImg)} alt="MCP Logo" className="mr-2 size-5 object-contain" />
-              <DialogTitle className="text-xl font-semibold">Add MCP Server</DialogTitle>
+              <img
+                src={resolveLogoSrc(mcpLogoImg)}
+                alt={t("mcpServers.discovery.logoAlt")}
+                className="mr-2 size-5 object-contain"
+              />
+              <DialogTitle className="text-xl font-semibold">{t("mcpServers.discovery.title")}</DialogTitle>
             </div>
             <Button variant="link" size="sm" className="mr-8" onClick={onCustomServer}>
-              + Custom Server
+              {t("mcpServers.discovery.customServer")}
             </Button>
           </div>
         </DialogHeader>
@@ -128,7 +134,7 @@ const MCPDiscovery: React.FC<MCPDiscoveryProps> = ({
                   variant={isSelected ? "default" : "outline"}
                   onClick={() => setSelectedCategory(cat)}
                 >
-                  {cat}
+                  {cat === "All" ? t("mcpServers.discovery.allCategories") : cat}
                 </Button>
               );
             })}
@@ -140,7 +146,7 @@ const MCPDiscovery: React.FC<MCPDiscoveryProps> = ({
               <Search className="size-4 text-muted-foreground" />
             </InputGroupAddon>
             <InputGroupInput
-              placeholder="Search servers..."
+              placeholder={t("mcpServers.discovery.searchPlaceholder")}
               value={searchQuery}
               onChange={(e) => setSearchQuery(e.target.value)}
             />
@@ -157,16 +163,16 @@ const MCPDiscovery: React.FC<MCPDiscoveryProps> = ({
 
           {error && (
             <div className="py-8 text-center text-muted-foreground">
-              <p className="text-sm">Failed to load servers: {error}</p>
+              <p className="text-sm">{t("mcpServers.discovery.loadError", { error })}</p>
             </div>
           )}
 
           {!loading && !error && filteredServers.length === 0 && (
             <div className="py-8 text-center text-muted-foreground">
               <p className="text-sm">
-                No servers found.{" "}
+                {t("mcpServers.discovery.noServers")}{" "}
                 <Button variant="link" size="sm" onClick={onCustomServer}>
-                  Add a custom server
+                  {t("mcpServers.discovery.addCustomServer")}
                 </Button>
               </p>
             </div>
@@ -178,7 +184,7 @@ const MCPDiscovery: React.FC<MCPDiscoveryProps> = ({
             Object.entries(groupedServers).map(([category, categoryServers]) => (
               <div key={category} className="mb-4">
                 <div className="mb-1 border-b border-border py-1.5 text-[11px] font-medium tracking-wider text-muted-foreground uppercase">
-                  {category}
+                  {category === "Other" ? t("mcpServers.discovery.otherCategory") : category}
                 </div>
                 <div className="grid grid-cols-2 gap-x-4">
                   {categoryServers.map((server) => {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_config.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_config.tsx
index e0d44718ec5..83d999ccd9c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_config.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_config.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Info, DollarSign, Wrench } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Card } from "@/components/ui/card";
@@ -61,6 +62,7 @@ const MCPServerCostConfig: React.FC<MCPServerCostConfigProps> = ({
   tools = [],
   disabled = false,
 }) => {
+  const { t } = useTranslation();
   const handleDefaultCostChange = (defaultCost: number | null) => {
     const updated = {
       ...value,
@@ -86,28 +88,34 @@ const MCPServerCostConfig: React.FC<MCPServerCostConfigProps> = ({
         <div className="space-y-6">
           <div className="mb-4 flex items-center gap-2">
             <DollarSign className="size-4 text-muted-foreground" />
-            <h3 className="text-lg font-medium">Cost Configuration</h3>
+            <h3 className="text-lg font-medium">{t("mcpServers.serverCostConfig.title")}</h3>
             <Tooltip>
               <TooltipTrigger
-                render={<Info className="size-4 text-muted-foreground" aria-label="About cost configuration" />}
+                render={
+                  <Info
+                    className="size-4 text-muted-foreground"
+                    aria-label={t("mcpServers.serverCostConfig.titleTooltipLabel")}
+                  />
+                }
               />
-              <TooltipContent>
-                Configure costs for this MCP server&apos;s tool calls. Set a default rate and per-tool overrides.
-              </TooltipContent>
+              <TooltipContent>{t("mcpServers.serverCostConfig.titleTooltip")}</TooltipContent>
             </Tooltip>
           </div>
 
           <div className="space-y-4">
             <div>
               <label className="mb-2 block text-sm font-medium">
-                Default Cost per Query ($)
+                {t("mcpServers.serverCostConfig.defaultCost.label")}
                 <Tooltip>
                   <TooltipTrigger
                     render={
-                      <Info className="ml-1 inline size-4 text-muted-foreground" aria-label="About the default cost" />
+                      <Info
+                        className="ml-1 inline size-4 text-muted-foreground"
+                        aria-label={t("mcpServers.serverCostConfig.defaultCost.tooltipLabel")}
+                      />
                     }
                   />
-                  <TooltipContent>Default cost charged for each tool call to this server.</TooltipContent>
+                  <TooltipContent>{t("mcpServers.serverCostConfig.defaultCost.tooltip")}</TooltipContent>
                 </Tooltip>
               </label>
               <CostInput
@@ -118,23 +126,24 @@ const MCPServerCostConfig: React.FC<MCPServerCostConfigProps> = ({
                 onChange={handleDefaultCostChange}
               />
               <p className="mt-1 block text-sm text-muted-foreground">
-                Set a default cost for all tool calls to this server
+                {t("mcpServers.serverCostConfig.defaultCost.help")}
               </p>
             </div>
 
             {tools.length > 0 && (
               <div className="space-y-4">
                 <label className="block text-sm font-medium">
-                  Tool-Specific Costs ($)
+                  {t("mcpServers.serverCostConfig.toolCosts.label")}
                   <Tooltip>
                     <TooltipTrigger
                       render={
-                        <Info className="ml-1 inline size-4 text-muted-foreground" aria-label="About per-tool costs" />
+                        <Info
+                          className="ml-1 inline size-4 text-muted-foreground"
+                          aria-label={t("mcpServers.serverCostConfig.toolCosts.tooltipLabel")}
+                        />
                       }
                     />
-                    <TooltipContent>
-                      Override the default cost for specific tools. Leave blank to use the default rate.
-                    </TooltipContent>
+                    <TooltipContent>{t("mcpServers.serverCostConfig.toolCosts.tooltip")}</TooltipContent>
                   </Tooltip>
                 </label>
                 <Collapsible className="rounded-lg border border-border">
@@ -142,7 +151,7 @@ const MCPServerCostConfig: React.FC<MCPServerCostConfigProps> = ({
                     render={
                       <button type="button" className="flex w-full items-center gap-2 p-3 text-left">
                         <Wrench className="size-4 text-muted-foreground" />
-                        <span className="font-medium">Available Tools</span>
+                        <span className="font-medium">{t("mcpServers.serverCostConfig.toolCosts.availableTools")}</span>
                         <Badge variant="secondary">{tools.length}</Badge>
                       </button>
                     }
@@ -160,7 +169,7 @@ const MCPServerCostConfig: React.FC<MCPServerCostConfigProps> = ({
                           <div className="ml-4">
                             <CostInput
                               value={value.tool_name_to_cost_per_query?.[tool.name]}
-                              placeholder="Use default"
+                              placeholder={t("mcpServers.serverCostConfig.toolCosts.useDefaultPlaceholder")}
                               disabled={disabled}
                               className="w-40"
                               onChange={(cost) => handleToolCostChange(tool.name, cost)}
@@ -178,11 +187,13 @@ const MCPServerCostConfig: React.FC<MCPServerCostConfigProps> = ({
           {(value.default_cost_per_query ||
             (value.tool_name_to_cost_per_query && Object.keys(value.tool_name_to_cost_per_query).length > 0)) && (
             <div className="mt-6 rounded-lg border border-border bg-muted p-4">
-              <p className="text-sm font-medium">Cost Summary:</p>
+              <p className="text-sm font-medium">{t("mcpServers.serverCostConfig.summary.title")}</p>
               <div className="mt-2 space-y-1">
                 {value.default_cost_per_query && (
                   <p className="text-sm text-muted-foreground">
-                    • Default cost: ${value.default_cost_per_query.toFixed(4)} per query
+                    {t("mcpServers.serverCostConfig.summary.defaultCost", {
+                      cost: value.default_cost_per_query.toFixed(4),
+                    })}
                   </p>
                 )}
                 {value.tool_name_to_cost_per_query &&
@@ -191,7 +202,7 @@ const MCPServerCostConfig: React.FC<MCPServerCostConfigProps> = ({
                       cost !== null &&
                       cost !== undefined && (
                         <p key={toolName} className="text-sm text-muted-foreground">
-                          • {toolName}: ${cost.toFixed(4)} per query
+                          {t("mcpServers.serverCostConfig.summary.toolCost", { toolName, cost: cost.toFixed(4) })}
                         </p>
                       ),
                   )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_display.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_display.tsx
index 30fd269447e..d557e145f52 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_display.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_cost_display.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { MCPServerCostInfo } from "@/components/mcp_tools/types";
 
 interface MCPServerCostDisplayProps {
@@ -6,6 +7,7 @@ interface MCPServerCostDisplayProps {
 }
 
 const MCPServerCostDisplay: React.FC<MCPServerCostDisplayProps> = ({ costConfig }) => {
+  const { t } = useTranslation();
   const hasDefaultCost =
     costConfig?.default_cost_per_query !== undefined && costConfig?.default_cost_per_query !== null;
   const hasToolCosts =
@@ -17,9 +19,7 @@ const MCPServerCostDisplay: React.FC<MCPServerCostDisplayProps> = ({ costConfig
       <div className="mt-6 border-t border-border pt-6">
         <div className="space-y-4">
           <div className="rounded-lg border border-border bg-muted p-4">
-            <p className="text-sm text-muted-foreground">
-              No cost configuration set for this server. Tool calls will be charged at $0.00 per tool call.
-            </p>
+            <p className="text-sm text-muted-foreground">{t("mcpServers.serverCostDisplay.noConfig")}</p>
           </div>
         </div>
       </div>
@@ -33,14 +33,14 @@ const MCPServerCostDisplay: React.FC<MCPServerCostDisplayProps> = ({ costConfig
           costConfig?.default_cost_per_query !== undefined &&
           costConfig?.default_cost_per_query !== null && (
             <div>
-              <p className="text-sm font-medium">Default Cost per Query</p>
+              <p className="text-sm font-medium">{t("mcpServers.serverCostDisplay.defaultCostTitle")}</p>
               <div className="font-mono text-sm">${costConfig.default_cost_per_query.toFixed(4)}</div>
             </div>
           )}
 
         {hasToolCosts && costConfig?.tool_name_to_cost_per_query && (
           <div>
-            <p className="text-sm font-medium">Tool-Specific Costs</p>
+            <p className="text-sm font-medium">{t("mcpServers.serverCostDisplay.toolCostsTitle")}</p>
             <div className="mt-2 space-y-2">
               {Object.entries(costConfig.tool_name_to_cost_per_query).map(
                 ([toolName, cost]) =>
@@ -48,7 +48,9 @@ const MCPServerCostDisplay: React.FC<MCPServerCostDisplayProps> = ({ costConfig
                   cost !== undefined && (
                     <div key={toolName} className="flex items-center justify-between rounded-lg bg-muted p-3">
                       <p className="text-sm font-medium">{toolName}</p>
-                      <p className="font-mono text-sm">${cost.toFixed(4)} per query</p>
+                      <p className="font-mono text-sm">
+                        {t("mcpServers.serverCostDisplay.costPerQuery", { cost: cost.toFixed(4) })}
+                      </p>
                     </div>
                   ),
               )}
@@ -57,18 +59,22 @@ const MCPServerCostDisplay: React.FC<MCPServerCostDisplayProps> = ({ costConfig
         )}
 
         <div className="mt-4 rounded-lg border border-border bg-muted p-4">
-          <p className="text-sm font-medium">Cost Summary:</p>
+          <p className="text-sm font-medium">{t("mcpServers.serverCostDisplay.summaryTitle")}</p>
           <div className="mt-2 space-y-1">
             {hasDefaultCost &&
               costConfig?.default_cost_per_query !== undefined &&
               costConfig?.default_cost_per_query !== null && (
                 <p className="text-sm text-muted-foreground">
-                  • Default cost: ${costConfig.default_cost_per_query.toFixed(4)} per query
+                  {t("mcpServers.serverCostDisplay.summaryDefaultCost", {
+                    cost: costConfig.default_cost_per_query.toFixed(4),
+                  })}
                 </p>
               )}
             {hasToolCosts && costConfig?.tool_name_to_cost_per_query && (
               <p className="text-sm text-muted-foreground">
-                • {Object.keys(costConfig.tool_name_to_cost_per_query).length} tool(s) with custom pricing
+                {t("mcpServers.serverCostDisplay.summaryToolCount", {
+                  toolCount: Object.keys(costConfig.tool_name_to_cost_per_query).length,
+                })}
               </p>
             )}
           </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx
index 57985fd8cbb..ee27d23bf8e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { MultiSelect } from "@/components/shared/MultiSelect";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { SimpleTooltip } from "@/components/ui/tooltip";
@@ -53,7 +54,7 @@ import EnvVarsSection from "./EnvVarsSection";
 import { validateMCPServerUrl, validateMCPServerName, normalizeToolOverrideMap } from "./utils";
 import { AUTH_TYPES_REQUIRING_AUTH_VALUE } from "./createServerPayload";
 import { EditServerFormValues, buildEditServerPayload, editPayloadErrorMessage } from "./editServerPayload";
-import { DUPLICATE_IDENTIFIER_MESSAGE, findDuplicateMcpServer, mcpSubmitErrorReason } from "./duplicateServerCheck";
+import { DUPLICATE_IDENTIFIER_MESSAGE_KEY, findDuplicateMcpServer, mcpSubmitErrorReason } from "./duplicateServerCheck";
 import { toast } from "@/lib/toast";
 import { getEditToolPreview } from "./editToolPreview";
 import { useMcpOAuthFlow, type McpDcrCredentials } from "@/hooks/useMcpOAuthFlow";
@@ -107,6 +108,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
   existingServers,
   stdioEnabled = true,
 }) => {
+  const { t } = useTranslation();
   const initialStaticHeaders = React.useMemo(() => {
     if (!mcpServer.static_headers) {
       return [];
@@ -314,9 +316,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
           token_type: token.token_type,
         };
         setToken(mcpServer.server_id, browserHeldToken, userID);
-        toast.success(
-          "Token held for this browser session. Tools can now be loaded and configured; the token is not saved to LiteLLM.",
-        );
+        toast.success(t("mcpServers.serverEdit.toasts.browserTokenHeld"));
         return;
       }
 
@@ -336,7 +336,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
       // Re-capture after writing credentials so the token is not invalidated by its own credential write.
       authorizedIdentityRef.current = getOAuthAuthorizationIdentity(allFieldsValue(form));
 
-      toast.success("OAuth authorization successful! Please click 'Update MCP Server' to save the credentials.");
+      toast.success(t("mcpServers.serverEdit.toasts.oauthAuthorized"));
     },
     onBeforeRedirect: persistEditUiState,
     flowSource: "edit",
@@ -460,7 +460,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
     }
   }, [mcpServer]);
 
-  const toolPreview = getEditToolPreview(allFieldsValue(form), initialValues);
+  const toolPreview = getEditToolPreview(allFieldsValue(form), initialValues, t);
   const toolPreviewKey = JSON.stringify(toolPreview);
 
   useEffect(() => {
@@ -470,7 +470,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
     setIsLoadingTools(false);
     if (!accessToken || !mcpServer.server_id) return;
     if (toolPreview.kind === "incomplete") {
-      setToolsError(toolPreview.message ?? "Complete the URL, authentication, and header settings to load tools.");
+      setToolsError(toolPreview.message ?? t("mcpServers.serverEdit.tools.incompleteSettings"));
       return;
     }
     setIsLoadingTools(true);
@@ -584,12 +584,12 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
         setTools(toolsResponse.tools);
       } else {
         setTools([]);
-        setToolsError(toolsResponse.message || "Failed to load tools");
+        setToolsError(toolsResponse.message || t("mcpServers.serverEdit.tools.loadFailed"));
       }
     } catch (error) {
       if (!isCurrent()) return true;
       setTools([]);
-      setToolsError(error instanceof Error ? error.message : "Failed to load tools");
+      setToolsError(error instanceof Error ? error.message : t("mcpServers.serverEdit.tools.loadFailed"));
     } finally {
       if (isCurrent()) setIsLoadingTools(false);
     }
@@ -628,8 +628,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
         setTools([]);
         setToolsError(
           isBrowserHeldTokenMode
-            ? "Authorize with the upstream (browser-only, in the Authentication section) to load and configure this server's tools."
-            : "Authenticate with this server in the Tools tab to load and configure its tools.",
+            ? t("mcpServers.serverEdit.tools.authorizeUpstream")
+            : t("mcpServers.serverEdit.tools.authenticateInToolsTab"),
         );
         return;
       }
@@ -656,12 +656,12 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
         setTools(toolsResponse.tools);
       } else {
         setTools([]);
-        setToolsError(toolsResponse.message || "Failed to load tools");
+        setToolsError(toolsResponse.message || t("mcpServers.serverEdit.tools.loadFailed"));
       }
     } catch (error) {
       if (!isCurrent()) return;
       setTools([]);
-      setToolsError(error instanceof Error ? error.message : "Failed to load tools");
+      setToolsError(error instanceof Error ? error.message : t("mcpServers.serverEdit.tools.loadFailed"));
     } finally {
       if (isCurrent()) setIsLoadingTools(false);
     }
@@ -751,8 +751,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
       mcpServer.server_id,
     );
     if (duplicate) {
-      form.setError(duplicate.field, { type: "duplicate", message: DUPLICATE_IDENTIFIER_MESSAGE });
-      toast.fromError(DUPLICATE_IDENTIFIER_MESSAGE);
+      form.setError(duplicate.field, { type: "duplicate", message: t(DUPLICATE_IDENTIFIER_MESSAGE_KEY) });
+      toast.fromError(t(DUPLICATE_IDENTIFIER_MESSAGE_KEY));
       return;
     }
     try {
@@ -770,7 +770,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
       };
       const built = buildEditServerPayload(values, uiState);
       if (built.kind !== "ok") {
-        toast.fromError(editPayloadErrorMessage(built));
+        toast.fromError(editPayloadErrorMessage(built, t));
         return;
       }
       const payload = built.payload;
@@ -807,17 +807,25 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
           }
         } catch (error: unknown) {
           const message = error instanceof Error ? error.message : "";
-          toast.fromError("MCP Server updated, but failed to persist OAuth token" + (message ? `: ${message}` : ""));
+          toast.fromError(
+            message
+              ? t("mcpServers.serverEdit.toasts.persistTokenFailedWithReason", { reason: message })
+              : t("mcpServers.serverEdit.toasts.persistTokenFailed"),
+          );
           return;
         }
       }
 
-      toast.success("MCP Server updated successfully");
+      toast.success(t("mcpServers.serverEdit.toasts.updated"));
       setAppMayNotMatchUpstream(false);
       onSuccess(updated);
     } catch (error: any) {
       const reason = mcpSubmitErrorReason(error);
-      toast.fromError("Failed to update MCP Server" + (reason ? `: ${reason}` : ""));
+      toast.fromError(
+        reason
+          ? t("mcpServers.serverEdit.toasts.updateFailedWithReason", { reason })
+          : t("mcpServers.serverEdit.toasts.updateFailed"),
+      );
     }
   };
 
@@ -825,10 +833,10 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
     <Tabs defaultValue="server">
       <TabsList variant="line" className="grid h-auto w-full grid-cols-2 rounded-none border-b p-0">
         <TabsTrigger value="server" className="rounded-none py-2">
-          Server Configuration
+          {t("mcpServers.serverEdit.tabs.server")}
         </TabsTrigger>
         <TabsTrigger value="cost" className="rounded-none py-2">
-          Cost Configuration
+          {t("mcpServers.serverEdit.tabs.cost")}
         </TabsTrigger>
       </TabsList>
       <div className="mt-6">
@@ -836,7 +844,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
           <FormProvider {...form}>
             <MountedFormProvider value={{ control: form.control, registry }}>
               <form
-                aria-label="Edit MCP server"
+                aria-label={t("mcpServers.serverEdit.formLabel")}
                 onSubmit={(event) => {
                   event.preventDefault();
                   void submitForm();
@@ -844,9 +852,9 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
               >
                 {isStdioTransport && !stdioEnabled && <StdioDisabledBanner />}
                 <MountedFormField
-                  label="MCP Server Name"
+                  label={t("mcpServers.serverEdit.fields.serverName")}
                   name="server_name"
-                  rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value) }) }}
+                  rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value, t) }) }}
                 >
                   {(control) => (
                     <Input
@@ -856,9 +864,9 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                   )}
                 </MountedFormField>
                 <MountedFormField
-                  label="Alias"
+                  label={t("mcpServers.serverEdit.fields.alias")}
                   name="alias"
-                  rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value) }) }}
+                  rules={{ validate: validatorRules({ validator: (_, value) => validateMCPServerName(value, t) }) }}
                 >
                   {(control) => (
                     <Input
@@ -871,7 +879,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     />
                   )}
                 </MountedFormField>
-                <MountedFormField label="Description" name="description">
+                <MountedFormField label={t("mcpServers.serverEdit.fields.description")} name="description">
                   {(control) => (
                     <Input
                       {...textControl(control)}
@@ -881,10 +889,10 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 </MountedFormField>
                 <MCPLogoSelector value={logoUrl} onChange={setLogoUrl} />
                 <MountedFormField
-                  label="Transport Type"
+                  label={t("mcpServers.serverEdit.fields.transport")}
                   name="transport"
                   required
-                  rules={{ validate: { required: requiredRule("Transport Type is required") } }}
+                  rules={{ validate: { required: requiredRule(t("mcpServers.serverEdit.fields.transportRequired")) } }}
                 >
                   {(control) => (
                     <Select
@@ -905,13 +913,13 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 {/* URL field - only for HTTP/SSE */}
                 {isMCPTransport && (
                   <MountedFormField
-                    label="MCP Server URL"
+                    label={t("mcpServers.serverEdit.fields.url")}
                     name="url"
                     required
                     rules={{
                       validate: {
-                        required: requiredRule("Please enter a server URL"),
-                        ...validatorRules({ validator: (_, value) => validateMCPServerUrl(value) }),
+                        required: requiredRule(t("mcpServers.serverEdit.fields.urlRequired")),
+                        ...validatorRules({ validator: (_, value) => validateMCPServerUrl(value, t) }),
                       },
                     }}
                   >
@@ -930,15 +938,15 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                   <MountedFormField
                     label={
                       <span className="text-sm font-medium text-foreground flex items-center">
-                        OpenAPI Spec URL
-                        <SimpleTooltip content="URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.">
+                        {t("mcpServers.serverEdit.fields.specUrl")}
+                        <SimpleTooltip content={t("mcpServers.serverEdit.fields.specUrlTooltip")}>
                           <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                         </SimpleTooltip>
                       </span>
                     }
                     name="spec_path"
                     required
-                    rules={{ validate: { required: requiredRule("Please enter an OpenAPI spec URL") } }}
+                    rules={{ validate: { required: requiredRule(t("mcpServers.serverEdit.fields.specUrlRequired")) } }}
                   >
                     {(control) => (
                       <Input
@@ -953,8 +961,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 <MountedFormField
                   label={
                     <span className="text-sm font-medium text-foreground flex items-center">
-                      Max Concurrent Requests (optional)
-                      <SimpleTooltip content="Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.">
+                      {t("mcpServers.serverEdit.fields.maxConcurrentRequests")}
+                      <SimpleTooltip content={t("mcpServers.serverEdit.fields.maxConcurrentRequestsTooltip")}>
                         <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                       </SimpleTooltip>
                     </span>
@@ -966,7 +974,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {...numberControl(control, 0)}
                       min={1}
                       step={1}
-                      placeholder="e.g. 10"
+                      placeholder={t("mcpServers.serverEdit.fields.maxConcurrentRequestsPlaceholder")}
                       className="w-full rounded-lg"
                     />
                   )}
@@ -975,8 +983,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 <MountedFormField
                   label={
                     <span className="text-sm font-medium text-foreground flex items-center">
-                      RPM limit (all callers)
-                      <SimpleTooltip content="Max requests per minute to this server across all keys and teams. Leave empty for no limit">
+                      {t("mcpServers.serverEdit.fields.rpm")}
+                      <SimpleTooltip content={t("mcpServers.serverEdit.fields.rpmTooltip")}>
                         <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                       </SimpleTooltip>
                     </span>
@@ -988,7 +996,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {...numberControl(control, 0)}
                       min={0}
                       step={1}
-                      placeholder="e.g. 60"
+                      placeholder={t("mcpServers.serverEdit.fields.rpmPlaceholder")}
                       className="w-full rounded-lg"
                     />
                   )}
@@ -998,10 +1006,12 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 {!isStdioTransport && (
                   <>
                     <MountedFormField
-                      label="Authentication"
+                      label={t("mcpServers.serverEdit.fields.authType")}
                       name="auth_type"
                       required
-                      rules={{ validate: { required: requiredRule("Authentication is required") } }}
+                      rules={{
+                        validate: { required: requiredRule(t("mcpServers.serverEdit.fields.authTypeRequired")) },
+                      }}
                     >
                       {(control) => (
                         <Select {...selectControl<string>(control)} items={AUTH_TYPE_ITEMS}>
@@ -1038,42 +1048,42 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
 
                 {isStdioTransport && (
                   <div className="rounded-lg border border-border p-4 space-y-4">
-                    <p className="text-sm text-muted-foreground">
-                      Configure the stdio transport used to launch the MCP server process. You can either fill in the
-                      fields below or paste a JSON configuration.
-                    </p>
+                    <p className="text-sm text-muted-foreground">{t("mcpServers.serverEdit.stdio.description")}</p>
 
                     <MountedFormField
-                      label="Command"
+                      label={t("mcpServers.serverEdit.stdio.command")}
                       name="command"
                       required
-                      rules={{ validate: { required: requiredRule("Please enter a command for stdio transport") } }}
+                      rules={{ validate: { required: requiredRule(t("mcpServers.serverEdit.stdio.commandRequired")) } }}
                     >
                       {(control) => (
                         <Input
                           {...textControl(control)}
-                          placeholder="e.g., npx"
+                          placeholder={t("mcpServers.serverEdit.stdio.commandPlaceholder")}
                           className="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
                     </MountedFormField>
 
-                    <MountedFormField label="Args" name="args">
+                    <MountedFormField label={t("mcpServers.serverEdit.stdio.args")} name="args">
                       {(control) => (
                         <MultiSelect
-                          {...tagsControl(control)}
-                          placeholder="Add args (press enter or comma)"
+                          {...tagsControl(control, t)}
+                          placeholder={t("mcpServers.serverEdit.stdio.argsPlaceholder")}
                           className="rounded-lg"
                         />
                       )}
                     </MountedFormField>
 
                     <MountedFormField
-                      label="Environment (JSON object)"
+                      label={t("mcpServers.serverEdit.stdio.env")}
                       name="env_json"
                       rules={{
                         validate: {
-                          jsonObject: parsesAsJsonObject("Please enter valid JSON", "Env must be a JSON object"),
+                          jsonObject: parsesAsJsonObject(
+                            t("mcpServers.serverEdit.stdio.envInvalidJson"),
+                            t("mcpServers.serverEdit.stdio.envNotObject"),
+                          ),
                         },
                       }}
                     >
@@ -1096,19 +1106,23 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                   <MountedFormField
                     label={
                       <span className="text-sm font-medium text-foreground flex items-center">
-                        Authentication Value
-                        <SimpleTooltip content="Token, password, or header value to send with each request for the selected auth type.">
+                        {t("mcpServers.serverEdit.fields.authValue")}
+                        <SimpleTooltip content={t("mcpServers.serverEdit.fields.authValueTooltip")}>
                           <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                         </SimpleTooltip>
                       </span>
                     }
                     name={["credentials", "auth_value"]}
-                    rules={{ validate: { notWhitespace: notOnlyWhitespace("Authentication value cannot be empty") } }}
+                    rules={{
+                      validate: {
+                        notWhitespace: notOnlyWhitespace(t("mcpServers.serverEdit.fields.authValueWhitespace")),
+                      },
+                    }}
                   >
                     {(control) => (
                       <PasswordInput
                         {...textControl(control)}
-                        placeholder="Enter token or secret (leave blank to keep existing)"
+                        placeholder={t("mcpServers.serverEdit.fields.authValuePlaceholder")}
                         groupClassName="rounded-lg border-border focus:border-info focus:ring-ring"
                       />
                     )}
@@ -1120,12 +1134,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     {!oauthFlowTypeValue && !isDelegateAuth && (
                       <Alert variant="warning" className="mb-4 rounded-lg">
                         <TriangleAlert />
-                        <AlertTitle>This server has no OAuth flow set</AlertTitle>
-                        <AlertDescription>
-                          Choose Machine-to-Machine (M2M) or Interactive (PKCE) so LiteLLM authenticates it the way you
-                          intend, then save. Until it is set, LiteLLM falls back to interactive per-user auth and treats
-                          a machine-to-machine credential shape conservatively.
-                        </AlertDescription>
+                        <AlertTitle>{t("mcpServers.serverEdit.missingOAuthFlow.title")}</AlertTitle>
+                        <AlertDescription>{t("mcpServers.serverEdit.missingOAuthFlow.description")}</AlertDescription>
                       </Alert>
                     )}
                     <OAuthFormFields
@@ -1148,21 +1158,21 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 {!isStdioTransport && isAwsSigV4AuthType && (
                   <>
                     <p className="text-sm text-muted-foreground mb-2">
-                      For MCP servers hosted on AWS Bedrock AgentCore.{" "}
+                      {t("mcpServers.serverEdit.aws.intro")}{" "}
                       <a
                         href="https://docs.litellm.ai/docs/mcp_aws_sigv4"
                         target="_blank"
                         rel="noopener noreferrer"
                         className="text-info hover:text-info/80"
                       >
-                        View docs &rarr;
+                        {t("mcpServers.serverEdit.aws.viewDocs")}
                       </a>
                     </p>
                     <MountedFormField
                       label={
                         <span className="text-sm font-medium text-foreground flex items-center">
-                          AWS Region
-                          <SimpleTooltip content="AWS region for SigV4 signing (e.g., us-east-1)">
+                          {t("mcpServers.serverEdit.aws.region.label")}
+                          <SimpleTooltip content={t("mcpServers.serverEdit.aws.region.tooltip")}>
                             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                           </SimpleTooltip>
                         </span>
@@ -1172,7 +1182,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {(control) => (
                         <Input
                           {...textControl(control)}
-                          placeholder="us-east-1 (leave blank to keep existing)"
+                          placeholder={t("mcpServers.serverEdit.aws.region.placeholder")}
                           className="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
@@ -1180,8 +1190,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     <MountedFormField
                       label={
                         <span className="text-sm font-medium text-foreground flex items-center">
-                          AWS Service Name
-                          <SimpleTooltip content="AWS service name for SigV4 signing. Defaults to 'bedrock-agentcore'.">
+                          {t("mcpServers.serverEdit.aws.serviceName.label")}
+                          <SimpleTooltip content={t("mcpServers.serverEdit.aws.serviceName.tooltip")}>
                             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                           </SimpleTooltip>
                         </span>
@@ -1191,7 +1201,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {(control) => (
                         <Input
                           {...textControl(control)}
-                          placeholder="bedrock-agentcore (leave blank to keep existing)"
+                          placeholder={t("mcpServers.serverEdit.aws.serviceName.placeholder")}
                           className="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
@@ -1199,8 +1209,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     <MountedFormField
                       label={
                         <span className="text-sm font-medium text-foreground flex items-center">
-                          AWS Access Key ID
-                          <SimpleTooltip content="Optional. If not provided, falls back to the boto3 credential chain (IAM role, env vars, etc.).">
+                          {t("mcpServers.serverEdit.aws.accessKeyId.label")}
+                          <SimpleTooltip content={t("mcpServers.serverEdit.aws.accessKeyId.tooltip")}>
                             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                           </SimpleTooltip>
                         </span>
@@ -1210,7 +1220,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {(control) => (
                         <PasswordInput
                           {...textControl(control)}
-                          placeholder="Leave blank to keep existing"
+                          placeholder={t("mcpServers.serverEdit.aws.keepExistingPlaceholder")}
                           groupClassName="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
@@ -1218,8 +1228,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     <MountedFormField
                       label={
                         <span className="text-sm font-medium text-foreground flex items-center">
-                          AWS Secret Access Key
-                          <SimpleTooltip content="Optional. Required if AWS Access Key ID is provided.">
+                          {t("mcpServers.serverEdit.aws.secretAccessKey.label")}
+                          <SimpleTooltip content={t("mcpServers.serverEdit.aws.secretAccessKey.tooltip")}>
                             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                           </SimpleTooltip>
                         </span>
@@ -1229,7 +1239,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {(control) => (
                         <PasswordInput
                           {...textControl(control)}
-                          placeholder="Leave blank to keep existing"
+                          placeholder={t("mcpServers.serverEdit.aws.keepExistingPlaceholder")}
                           groupClassName="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
@@ -1237,8 +1247,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     <MountedFormField
                       label={
                         <span className="text-sm font-medium text-foreground flex items-center">
-                          AWS Session Token
-                          <SimpleTooltip content="Optional. Only needed for temporary STS credentials.">
+                          {t("mcpServers.serverEdit.aws.sessionToken.label")}
+                          <SimpleTooltip content={t("mcpServers.serverEdit.aws.sessionToken.tooltip")}>
                             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                           </SimpleTooltip>
                         </span>
@@ -1248,7 +1258,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {(control) => (
                         <PasswordInput
                           {...textControl(control)}
-                          placeholder="Leave blank to keep existing"
+                          placeholder={t("mcpServers.serverEdit.aws.keepExistingPlaceholder")}
                           groupClassName="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
@@ -1256,8 +1266,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     <MountedFormField
                       label={
                         <span className="text-sm font-medium text-foreground flex items-center">
-                          AWS Role ARN
-                          <SimpleTooltip content="Optional. IAM role ARN to assume via STS before signing. If set, LiteLLM calls sts:AssumeRole to get temporary credentials.">
+                          {t("mcpServers.serverEdit.aws.roleArn.label")}
+                          <SimpleTooltip content={t("mcpServers.serverEdit.aws.roleArn.tooltip")}>
                             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                           </SimpleTooltip>
                         </span>
@@ -1267,7 +1277,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {(control) => (
                         <Input
                           {...textControl(control)}
-                          placeholder="Leave blank to keep existing"
+                          placeholder={t("mcpServers.serverEdit.aws.keepExistingPlaceholder")}
                           className="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
@@ -1275,8 +1285,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     <MountedFormField
                       label={
                         <span className="text-sm font-medium text-foreground flex items-center">
-                          AWS Session Name
-                          <SimpleTooltip content="Optional. Session name for the AssumeRole call — appears in CloudTrail logs. Auto-generated if omitted.">
+                          {t("mcpServers.serverEdit.aws.sessionName.label")}
+                          <SimpleTooltip content={t("mcpServers.serverEdit.aws.sessionName.tooltip")}>
                             <Info className="ml-2 size-4 text-info hover:text-info/80 cursor-help" />
                           </SimpleTooltip>
                         </span>
@@ -1286,7 +1296,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       {(control) => (
                         <Input
                           {...textControl(control)}
-                          placeholder="Leave blank to keep existing"
+                          placeholder={t("mcpServers.serverEdit.aws.keepExistingPlaceholder")}
                           className="rounded-lg border-border focus:border-info focus:ring-ring"
                         />
                       )}
@@ -1348,10 +1358,10 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
 
                 <div className="flex justify-end gap-2">
                   <Button variant="outline" onClick={handleCancel}>
-                    Cancel
+                    {t("mcpServers.serverEdit.actions.cancel")}
                   </Button>
                   <Button type="submit" disabled={isOAuthPending}>
-                    Save Changes
+                    {t("mcpServers.serverEdit.actions.save")}
                   </Button>
                 </div>
               </form>
@@ -1365,10 +1375,10 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
 
             <div className="flex justify-end gap-2">
               <Button variant="outline" onClick={handleCancel}>
-                Cancel
+                {t("mcpServers.serverEdit.actions.cancel")}
               </Button>
               <Button onClick={() => void submitForm()} disabled={isOAuthPending}>
-                Save Changes
+                {t("mcpServers.serverEdit.actions.save")}
               </Button>
             </div>
           </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_view.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_view.tsx
index 02d961a818d..29e4ae8edb3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_view.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_view.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { useQueryClient } from "@tanstack/react-query";
 import { mcpServersKeys } from "@/app/(dashboard)/hooks/mcpServers/useMCPServers";
 import { ArrowLeft, Eye, EyeOff } from "lucide-react";
@@ -69,12 +70,13 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
 }) => {
   // Open the editing Settings tab on first render when returning from the edit OAuth
   // redirect, so the "token fetched" feedback shows where the user left off (Settings=2).
+  const { t } = useTranslation();
   const queryClient = useQueryClient();
   const canEdit = isProxyAdmin && !isViewOnly && !mcpServer.is_config;
   const returningFromEditOAuth = isReturningFromEditOAuth(canEdit, mcpServer.server_id);
   const [editing, setEditing] = useState(isEditing || returningFromEditOAuth);
   const [showFullUrl, setShowFullUrl] = useState(false);
-  const networkAccess = getMCPNetworkAccess(mcpServer);
+  const networkAccess = getMCPNetworkAccess(mcpServer, t);
   const [copiedStates, setCopiedStates] = useState<Record<string, boolean>>({});
   const [selectedTabIndex, setSelectedTabIndex] = useState(returningFromEditOAuth ? 2 : initialTabIndex);
   const editFormShowsStdioBanner = selectedTabIndex === 2 && editing && canEdit;
@@ -117,14 +119,16 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
       <div className="mb-6">
         <Button variant="ghost" className="mb-4" onClick={onBack}>
           <ArrowLeft />
-          Back to All Servers
+          {t("mcpServers.serverView.backToServers")}
         </Button>
         <div className="flex items-center gap-2">
-          <h1 className="text-2xl font-semibold">{mcpServer.server_name || mcpServer.alias || "Unnamed Server"}</h1>
+          <h1 className="text-2xl font-semibold">
+            {mcpServer.server_name || mcpServer.alias || t("mcpServers.serverView.unnamedServer")}
+          </h1>
           <Button
             variant="ghost"
             size="icon-sm"
-            aria-label="Copy server name"
+            aria-label={t("mcpServers.serverView.copyServerName")}
             onClick={() => copyToClipboard(mcpServer.server_name || mcpServer.alias, "mcp-server_name")}
           >
             {copiedStates["mcp-server_name"] ? <CheckIcon size={12} /> : <CopyIcon size={12} />}
@@ -140,7 +144,7 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
           <Button
             variant="ghost"
             size="icon-sm"
-            aria-label="Copy server id"
+            aria-label={t("mcpServers.serverView.copyServerId")}
             onClick={() => copyToClipboard(mcpServer.server_id, "mcp-server-id")}
           >
             {copiedStates["mcp-server-id"] ? <CheckIcon size={10} /> : <CopyIcon size={10} />}
@@ -154,19 +158,19 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
       <Tabs value={String(selectedTabIndex)} onValueChange={(v: unknown) => setSelectedTabIndex(Number(v))}>
         <TabsList variant="line" className="mb-4 h-auto w-full justify-start rounded-none border-b p-0">
           <TabsTrigger value="0" className="flex-none rounded-none px-4 py-2">
-            Overview
+            {t("mcpServers.serverView.tabs.overview")}
           </TabsTrigger>
           <TabsTrigger value="1" className="flex-none rounded-none px-4 py-2">
-            MCP Tools
+            {t("mcpServers.serverView.tabs.tools")}
           </TabsTrigger>
           {isProxyAdmin && (
             <TabsTrigger value="2" className="flex-none rounded-none px-4 py-2">
-              Settings
+              {t("mcpServers.serverView.tabs.settings")}
             </TabsTrigger>
           )}
           {canViewUserCredentials && (
             <TabsTrigger value="3" className="flex-none rounded-none px-4 py-2">
-              User Credentials
+              {t("mcpServers.serverView.tabs.userCredentials")}
             </TabsTrigger>
           )}
         </TabsList>
@@ -175,19 +179,25 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
         <TabsContent value="0" keepMounted>
           <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
             <Card className="p-4">
-              <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">Transport</p>
+              <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
+                {t("mcpServers.serverView.overview.transport")}
+              </p>
               <div className="mt-3">
                 {getTransportBadge(handleTransport(mcpServer.transport ?? undefined, mcpServer.spec_path ?? undefined))}
               </div>
             </Card>
 
             <Card className="p-4">
-              <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">Authentication</p>
+              <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
+                {t("mcpServers.serverView.overview.authentication")}
+              </p>
               <div className="mt-3">{getAuthBadge(handleAuth(mcpServer.auth_type ?? undefined))}</div>
             </Card>
 
             <Card className="p-4">
-              <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">Host URL</p>
+              <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
+                {t("mcpServers.serverView.overview.hostUrl")}
+              </p>
               <div className="mt-3 flex items-center gap-2">
                 <p className="overflow-wrap-anywhere font-mono text-sm break-all">
                   {renderUrlWithToggle(mcpServer.url, showFullUrl)}
@@ -201,7 +211,9 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                   <Button
                     variant="ghost"
                     size="icon-sm"
-                    aria-label={showFullUrl ? "Hide full URL" : "Show full URL"}
+                    aria-label={
+                      showFullUrl ? t("mcpServers.serverView.hideFullUrl") : t("mcpServers.serverView.showFullUrl")
+                    }
                     onClick={() => setShowFullUrl(!showFullUrl)}
                   >
                     {showFullUrl ? <EyeOff /> : <Eye />}
@@ -211,7 +223,9 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
             </Card>
           </div>
           <Card className="mt-4 p-4">
-            <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">Cost Configuration</p>
+            <p className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
+              {t("mcpServers.serverView.overview.costConfiguration")}
+            </p>
             <div className="mt-3">
               <MCPServerCostDisplay costConfig={mcpServer.mcp_info?.mcp_server_cost_info} />
             </div>
@@ -239,16 +253,16 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
         <TabsContent value="2" keepMounted>
           <Card className="p-6">
             <div className="mb-4 flex items-center justify-between">
-              <h2 className="text-lg font-medium">MCP Server Settings</h2>
+              <h2 className="text-lg font-medium">{t("mcpServers.serverView.settings.title")}</h2>
               {editing && canEdit ? null : (
                 <Button variant="outline" disabled={!canEdit} onClick={() => setEditing(true)}>
-                  Edit Settings
+                  {t("mcpServers.serverView.settings.edit")}
                 </Button>
               )}
             </div>
             {mcpServer.is_config && (
               <p className="mb-4 text-sm text-muted-foreground">
-                Defined in config. Edit your YAML configuration to make changes
+                {t("mcpServers.serverView.settings.definedInConfig")}
               </p>
             )}
             {editing && canEdit ? (
@@ -265,32 +279,42 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
             ) : (
               <div className="divide-y divide-border">
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Server Name</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.serverName")}
+                  </p>
                   <div className="col-span-2 text-sm">
                     {mcpServer.server_name || <span className="text-muted-foreground">—</span>}
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Alias</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.alias")}
+                  </p>
                   <div className="col-span-2 font-mono text-sm">
                     {mcpServer.alias || <span className="text-muted-foreground">—</span>}
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Description</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.description")}
+                  </p>
                   <div className="col-span-2 text-sm">
                     {mcpServer.description || <span className="text-muted-foreground">—</span>}
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">URL</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.url")}
+                  </p>
                   <div className="col-span-2 flex items-center gap-2 font-mono text-sm break-all">
                     {renderUrlWithToggle(mcpServer.url, showFullUrl)}
                     {hasToken && (
                       <Button
                         variant="ghost"
                         size="icon-sm"
-                        aria-label={showFullUrl ? "Hide full URL" : "Show full URL"}
+                        aria-label={
+                          showFullUrl ? t("mcpServers.serverView.hideFullUrl") : t("mcpServers.serverView.showFullUrl")
+                        }
                         onClick={() => setShowFullUrl(!showFullUrl)}
                       >
                         {showFullUrl ? <EyeOff /> : <Eye />}
@@ -299,17 +323,23 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Transport</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.transport")}
+                  </p>
                   <div className="col-span-2">
                     {getTransportBadge(handleTransport(mcpServer.transport, mcpServer.spec_path))}
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Authentication</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.authentication")}
+                  </p>
                   <div className="col-span-2">{getAuthBadge(handleAuth(mcpServer.auth_type))}</div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Extra Headers</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.extraHeaders")}
+                  </p>
                   <div className="col-span-2 text-sm">
                     {mcpServer.extra_headers && mcpServer.extra_headers.length > 0 ? (
                       mcpServer.extra_headers.join(", ")
@@ -319,20 +349,24 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Allow All Keys</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.allowAllKeys")}
+                  </p>
                   <div className="col-span-2">
                     {mcpServer.allow_all_keys ? (
                       <Badge variant="outline">
                         <span className="h-1.5 w-1.5 rounded-full bg-success" />
-                        Enabled
+                        {t("mcpServers.serverView.settings.status.enabled")}
                       </Badge>
                     ) : (
-                      <Badge variant="outline">Disabled</Badge>
+                      <Badge variant="outline">{t("mcpServers.serverView.settings.status.disabled")}</Badge>
                     )}
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Network access</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.networkAccess")}
+                  </p>
                   <div className="col-span-2">
                     <Badge variant="outline">
                       <span className={`h-1.5 w-1.5 rounded-full ${networkAccess.dotClassName}`} />
@@ -343,15 +377,17 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                 </div>
                 {handleAuth(mcpServer.auth_type) === "oauth2" && (
                   <div className="grid grid-cols-3 gap-4 py-3">
-                    <p className="text-sm font-medium text-muted-foreground">Delegate Auth to Upstream</p>
+                    <p className="text-sm font-medium text-muted-foreground">
+                      {t("mcpServers.serverView.settings.fields.delegateAuth")}
+                    </p>
                     <div className="col-span-2">
                       {mcpServer.delegate_auth_to_upstream ? (
                         <Badge variant="outline">
                           <span className="h-1.5 w-1.5 rounded-full bg-success" />
-                          Enabled (PKCE passthrough)
+                          {t("mcpServers.serverView.settings.status.enabledPkcePassthrough")}
                         </Badge>
                       ) : (
-                        <Badge variant="outline">Disabled</Badge>
+                        <Badge variant="outline">{t("mcpServers.serverView.settings.status.disabled")}</Badge>
                       )}
                     </div>
                   </div>
@@ -360,21 +396,25 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                   Array.isArray(mcpServer.extra_headers) &&
                   mcpServer.extra_headers.some((h) => typeof h === "string" && h.toLowerCase() === "authorization") && (
                     <div className="grid grid-cols-3 gap-4 py-3">
-                      <p className="text-sm font-medium text-muted-foreground">OAuth Pass-through</p>
+                      <p className="text-sm font-medium text-muted-foreground">
+                        {t("mcpServers.serverView.settings.fields.oauthPassthrough")}
+                      </p>
                       <div className="col-span-2">
                         {mcpServer.oauth_passthrough ? (
                           <Badge variant="outline">
                             <span className="h-1.5 w-1.5 rounded-full bg-success" />
-                            Enabled
+                            {t("mcpServers.serverView.settings.status.enabled")}
                           </Badge>
                         ) : (
-                          <Badge variant="outline">Disabled</Badge>
+                          <Badge variant="outline">{t("mcpServers.serverView.settings.status.disabled")}</Badge>
                         )}
                       </div>
                     </div>
                   )}
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Access Groups</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.accessGroups")}
+                  </p>
                   <div className="col-span-2">
                     {mcpServer.mcp_access_groups && mcpServer.mcp_access_groups.length > 0 ? (
                       <div className="flex flex-wrap gap-1.5">
@@ -390,7 +430,9 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Allowed Tools</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.allowedTools")}
+                  </p>
                   <div className="col-span-2">
                     {mcpServer.allowed_tools && mcpServer.allowed_tools.length > 0 ? (
                       <div className="flex flex-wrap gap-1.5">
@@ -401,12 +443,14 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                         ))}
                       </div>
                     ) : (
-                      <Badge variant="outline">All tools enabled</Badge>
+                      <Badge variant="outline">{t("mcpServers.serverView.settings.status.allToolsEnabled")}</Badge>
                     )}
                   </div>
                 </div>
                 <div className="grid grid-cols-3 gap-4 py-3">
-                  <p className="text-sm font-medium text-muted-foreground">Cost</p>
+                  <p className="text-sm font-medium text-muted-foreground">
+                    {t("mcpServers.serverView.settings.fields.cost")}
+                  </p>
                   <div className="col-span-2">
                     <MCPServerCostDisplay costConfig={mcpServer.mcp_info?.mcp_server_cost_info} />
                   </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_servers.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_servers.tsx
index 682cd5ad3cb..f559b7444be 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_servers.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_servers.tsx
@@ -1,4 +1,5 @@
 import { isAdminRole, isProxyAdminRole, isProxyAdminTierRole } from "@/utils/roles";
+import type { ParseKeys } from "i18next";
 import { CircleHelp, Plug, Search } from "lucide-react";
 import Link from "next/link";
 import { Badge } from "@/components/ui/badge";
@@ -19,6 +20,7 @@ import {
 import React, { useEffect, useState, useMemo, useCallback } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { useQueryState } from "nuqs";
+import { useTranslation } from "react-i18next";
 import { useMCPServers } from "@/app/(dashboard)/hooks/mcpServers/useMCPServers";
 import { useMCPServerHealth } from "@/app/(dashboard)/hooks/mcpServers/useMCPServerHealth";
 import { toast } from "@/lib/toast";
@@ -53,11 +55,11 @@ import { listMCPUserEnvVarStatus } from "@/components/networking";
 
 export type SortKey = "created_desc" | "updated_desc" | "name_asc" | "health";
 
-const SORT_OPTIONS: { value: SortKey; label: string }[] = [
-  { value: "created_desc", label: "Recently created" },
-  { value: "updated_desc", label: "Recently updated" },
-  { value: "name_asc", label: "Name (A→Z)" },
-  { value: "health", label: "Health (unhealthy first)" },
+const SORT_OPTIONS: { value: SortKey; labelKey: ParseKeys }[] = [
+  { value: "created_desc", labelKey: "mcpServers.servers.sort.options.createdDesc" },
+  { value: "updated_desc", labelKey: "mcpServers.servers.sort.options.updatedDesc" },
+  { value: "name_asc", labelKey: "mcpServers.servers.sort.options.nameAsc" },
+  { value: "health", labelKey: "mcpServers.servers.sort.options.health" },
 ];
 
 const HEALTH_RANK: Record<string, number> = {
@@ -129,32 +131,31 @@ function DeleteServerDialog({
   isDeleting: boolean;
   onConfirm: () => Promise<void>;
 }) {
+  const { t } = useTranslation();
   return (
     <AlertDialog open={open} onOpenChange={onOpenChange}>
       <AlertDialogContent>
         <AlertDialogHeader>
-          <AlertDialogTitle>Delete MCP Server?</AlertDialogTitle>
+          <AlertDialogTitle>{t("mcpServers.servers.deleteDialog.title")}</AlertDialogTitle>
         </AlertDialogHeader>
         <div className="space-y-4">
-          <p className="text-sm text-muted-foreground">
-            This action is permanent and cannot be undone. All associated configurations will be removed.
-          </p>
+          <p className="text-sm text-muted-foreground">{t("mcpServers.servers.deleteDialog.body")}</p>
 
           {server && (
             <dl className="mt-3 space-y-1 rounded-lg border border-border bg-muted p-4">
               {server.server_name && (
                 <div className="flex gap-2">
-                  <dt className="text-sm text-muted-foreground">Name</dt>
+                  <dt className="text-sm text-muted-foreground">{t("mcpServers.servers.deleteDialog.fields.name")}</dt>
                   <dd className="text-sm font-semibold">{server.server_name}</dd>
                 </div>
               )}
               <div className="flex gap-2">
-                <dt className="text-sm text-muted-foreground">ID</dt>
+                <dt className="text-sm text-muted-foreground">{t("mcpServers.servers.deleteDialog.fields.id")}</dt>
                 <dd className="font-mono text-xs">{server.server_id}</dd>
               </div>
               {server.url && (
                 <div className="flex gap-2">
-                  <dt className="text-sm text-muted-foreground">URL</dt>
+                  <dt className="text-sm text-muted-foreground">{t("mcpServers.servers.deleteDialog.fields.url")}</dt>
                   <dd className="font-mono text-xs break-all">{server.url}</dd>
                 </div>
               )}
@@ -162,9 +163,9 @@ function DeleteServerDialog({
           )}
         </div>
         <AlertDialogFooter>
-          <AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
+          <AlertDialogCancel disabled={isDeleting}>{t("mcpServers.servers.deleteDialog.cancel")}</AlertDialogCancel>
           <Button variant="destructive" disabled={isDeleting} onClick={onConfirm}>
-            {isDeleting ? "Deleting..." : "Delete"}
+            {isDeleting ? t("mcpServers.servers.deleteDialog.deleting") : t("mcpServers.servers.deleteDialog.delete")}
           </Button>
         </AlertDialogFooter>
       </AlertDialogContent>
@@ -173,6 +174,7 @@ function DeleteServerDialog({
 }
 
 const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, isViewOnly = false }) => {
+  const { t } = useTranslation();
   const { data: mcpServers, isLoading: isLoadingServers, refetch } = useMCPServers();
 
   // Fetch health status for all servers
@@ -315,11 +317,13 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
   // Get unique MCP access groups from all servers
   const teamSelectItems = React.useMemo(
     () => ({
-      all: isInternalUser ? "All Available Servers" : "All Servers",
-      personal: "Personal",
+      all: isInternalUser
+        ? t("mcpServers.servers.filters.team.allAvailableServers")
+        : t("mcpServers.servers.filters.team.allServers"),
+      personal: t("mcpServers.servers.filters.team.personal"),
       ...Object.fromEntries(uniqueTeams.map((team) => [team.team_id, team.team_alias || team.team_id])),
     }),
-    [isInternalUser, uniqueTeams],
+    [isInternalUser, uniqueTeams, t],
   );
 
   const uniqueMcpAccessGroups = React.useMemo(() => {
@@ -335,12 +339,14 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
 
   const accessGroupSelectItems = React.useMemo(
     () => ({
-      all: "All Access Groups",
+      all: t("mcpServers.servers.filters.accessGroup.all"),
       ...Object.fromEntries(uniqueMcpAccessGroups.map((group) => [group, group])),
     }),
-    [uniqueMcpAccessGroups],
+    [uniqueMcpAccessGroups, t],
   );
 
+  const sortOptions = useMemo(() => SORT_OPTIONS.map(({ value, labelKey }) => ({ value, label: t(labelKey) })), [t]);
+
   // Filtering logic for both team and access group
   const filterServers = useCallback(
     (teamId: string, group: string) => {
@@ -409,7 +415,7 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
     try {
       setIsDeletingServer(true);
       await deleteMCPServer(accessToken, serverIdToDelete);
-      toast.success("Deleted MCP Server successfully");
+      toast.success(t("mcpServers.servers.toasts.deleted"));
       // If the user is currently viewing the detail page of the server they
       // just deleted, return them to the All Servers list. Otherwise the
       // detail view would stay mounted, fall back to an empty stub server,
@@ -470,7 +476,7 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
   }, [refetch]);
 
   if (!accessToken || !userRole || !userID) {
-    return <div className="p-6 text-center text-muted-foreground">Missing required authentication parameters.</div>;
+    return <div className="p-6 text-center text-muted-foreground">{t("mcpServers.servers.missingAuth")}</div>;
   }
 
   return (
@@ -503,23 +509,23 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
         <div className="flex items-center justify-between">
           <div>
             <div className="flex items-center gap-3">
-              <h1 className="text-xl font-semibold">MCP Servers</h1>
+              <h1 className="text-xl font-semibold">{t("mcpServers.servers.header.title")}</h1>
               {filteredServers.length > 0 && <Badge variant="secondary">{filteredServers.length}</Badge>}
             </div>
-            <p className="mt-1 text-sm text-muted-foreground">Configure and manage your MCP servers</p>
+            <p className="mt-1 text-sm text-muted-foreground">{t("mcpServers.servers.header.subtitle")}</p>
           </div>
           <div className="flex flex-wrap items-center justify-end gap-2">
             <Link href={uiHref("connect")} className={cn(buttonVariants({ variant: "outline" }), "shrink-0")}>
               <Plug />
-              My Connections
+              {t("mcpServers.servers.header.myConnections")}
             </Link>
             {isAdminRole(userRole) ? (
               <>
                 <Button className="shrink-0" variant="secondary" onClick={() => setImportVisible(true)}>
-                  Import from JSON
+                  {t("mcpServers.servers.header.importFromJson")}
                 </Button>
                 <Button className="shrink-0" onClick={() => setDiscoveryVisible(true)}>
-                  + Add New MCP Server
+                  {t("mcpServers.servers.header.addServer")}
                 </Button>
               </>
             ) : (
@@ -531,7 +537,7 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
                 }}
                 variant="secondary"
               >
-                + Submit MCP Server
+                {t("mcpServers.servers.header.submitServer")}
               </Button>
             )}
           </div>
@@ -560,36 +566,36 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
         <Tabs defaultValue="servers" className="mt-2 w-full">
           <TabsList variant="line" className="h-auto w-full justify-start rounded-none border-b p-0">
             <TabsTrigger value="servers" className="flex-none rounded-none px-4 py-2">
-              All Servers
+              {t("mcpServers.servers.tabs.allServers")}
             </TabsTrigger>
             <TabsTrigger value="toolsets" className="flex-none rounded-none px-4 py-2">
-              Toolsets
+              {t("mcpServers.servers.tabs.toolsets")}
             </TabsTrigger>
             <TabsTrigger value="connect" className="flex-none rounded-none px-4 py-2">
-              Connect
+              {t("mcpServers.servers.tabs.connect")}
             </TabsTrigger>
             {isAdminRole(userRole) && (
               <>
                 <TabsTrigger value="semantic-filter" className="flex-none rounded-none px-4 py-2">
-                  Semantic Filter
+                  {t("mcpServers.servers.tabs.semanticFilter")}
                 </TabsTrigger>
 
                 <TabsTrigger value="tool-search" className="flex-none rounded-none px-4 py-2">
-                  Tool Search
+                  {t("mcpServers.servers.tabs.toolSearch")}
                 </TabsTrigger>
 
                 <TabsTrigger value="network-settings" className="flex-none rounded-none px-4 py-2">
-                  Network Settings
+                  {t("mcpServers.servers.tabs.networkSettings")}
                 </TabsTrigger>
 
                 <TabsTrigger value="submitted" className="flex-none rounded-none px-4 py-2">
-                  Submitted MCPs
+                  {t("mcpServers.servers.tabs.submitted")}
                 </TabsTrigger>
               </>
             )}
             {isProxyAdminTierRole(userRole) && (
               <TabsTrigger value="connections" className="flex-none rounded-none px-4 py-2">
-                Live Connections
+                {t("mcpServers.servers.tabs.liveConnections")}
               </TabsTrigger>
             )}
           </TabsList>
@@ -616,18 +622,20 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
                   <div className="flex flex-col space-y-4">
                     <div className="flex items-center gap-6 rounded-lg border border-border bg-card px-4 py-3">
                       <div className="flex items-center gap-2">
-                        <p className="text-sm font-medium whitespace-nowrap text-muted-foreground">Team</p>
+                        <p className="text-sm font-medium whitespace-nowrap text-muted-foreground">
+                          {t("mcpServers.servers.filters.team.label")}
+                        </p>
                         <Select
                           items={teamSelectItems}
                           value={selectedTeam}
                           onValueChange={(v: string | null) => handleTeamChange(v ?? "all")}
                         >
-                          <SelectTrigger className="w-55" aria-label="Team">
+                          <SelectTrigger className="w-55" aria-label={t("mcpServers.servers.filters.team.label")}>
                             <SelectValue />
                           </SelectTrigger>
                           <SelectContent>
                             <SelectItem value="all">{teamSelectItems.all}</SelectItem>
-                            <SelectItem value="personal">Personal</SelectItem>
+                            <SelectItem value="personal">{t("mcpServers.servers.filters.team.personal")}</SelectItem>
                             {uniqueTeams.map((team) => (
                               <SelectItem key={team.team_id} value={team.team_id}>
                                 {team.team_alias || team.team_id}
@@ -639,20 +647,17 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
                       <div className="h-6 w-px bg-border" />
                       <div className="flex items-center gap-2">
                         <p className="flex items-center text-sm font-medium whitespace-nowrap text-muted-foreground">
-                          Access Group
+                          {t("mcpServers.servers.filters.accessGroup.label")}
                           <Tooltip>
                             <TooltipTrigger
                               render={
                                 <CircleHelp
                                   className="ml-1 size-3.5 text-muted-foreground"
-                                  aria-label="About access groups"
+                                  aria-label={t("mcpServers.servers.filters.accessGroup.helpLabel")}
                                 />
                               }
                             />
-                            <TooltipContent>
-                              An MCP Access Group is a set of users or teams that have permission to access specific MCP
-                              servers. Use access groups to control and organize who can connect to which servers.
-                            </TooltipContent>
+                            <TooltipContent>{t("mcpServers.servers.filters.accessGroup.help")}</TooltipContent>
                           </Tooltip>
                         </p>
                         <Select
@@ -660,11 +665,14 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
                           value={selectedMcpAccessGroup}
                           onValueChange={(v: string | null) => handleMcpAccessGroupChange(v ?? "all")}
                         >
-                          <SelectTrigger className="w-55" aria-label="Access Group">
+                          <SelectTrigger
+                            className="w-55"
+                            aria-label={t("mcpServers.servers.filters.accessGroup.label")}
+                          >
                             <SelectValue />
                           </SelectTrigger>
                           <SelectContent>
-                            <SelectItem value="all">All Access Groups</SelectItem>
+                            <SelectItem value="all">{t("mcpServers.servers.filters.accessGroup.all")}</SelectItem>
                             {uniqueMcpAccessGroups.map((group) => (
                               <SelectItem key={group} value={group}>
                                 {group}
@@ -682,15 +690,17 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
                       <Search className="size-4 text-muted-foreground" />
                     </InputGroupAddon>
                     <InputGroupInput
-                      placeholder="Search by name, alias, URL, or ID"
+                      placeholder={t("mcpServers.servers.searchPlaceholder")}
                       value={searchQuery}
                       onChange={(e) => setSearchQuery(e.target.value)}
                     />
                   </InputGroup>
                   <div className="flex items-center gap-2">
-                    <p className="text-sm font-medium whitespace-nowrap text-muted-foreground">Sort</p>
+                    <p className="text-sm font-medium whitespace-nowrap text-muted-foreground">
+                      {t("mcpServers.servers.sort.label")}
+                    </p>
                     <Select
-                      items={SORT_OPTIONS}
+                      items={sortOptions}
                       value={sortKey}
                       onValueChange={(v: string | null) => setSortKey((v ?? "created_desc") as SortKey)}
                     >
@@ -698,7 +708,7 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
                         <SelectValue />
                       </SelectTrigger>
                       <SelectContent>
-                        {SORT_OPTIONS.map((opt) => (
+                        {sortOptions.map((opt) => (
                           <SelectItem key={opt.value} value={opt.value}>
                             {opt.label}
                           </SelectItem>
@@ -707,21 +717,24 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID, i
                     </Select>
                   </div>
                   <div className="ml-auto text-xs text-muted-foreground">
-                    {displayedServers.length} of {filteredServers.length} servers
+                    {t("mcpServers.servers.resultCount", {
+                      shown: displayedServers.length,
+                      total: filteredServers.length,
+                    })}
                   </div>
                 </div>
                 <div className="mt-4 w-full">
                   {isLoadingServers ? (
                     <div className="flex items-center justify-center gap-3 rounded-lg border border-dashed border-border bg-card p-12">
                       <UiLoadingSpinner className="size-6 text-muted-foreground" />
-                      <p className="text-sm text-muted-foreground">Loading MCP servers...</p>
+                      <p className="text-sm text-muted-foreground">{t("mcpServers.servers.loading")}</p>
                     </div>
                   ) : displayedServers.length === 0 ? (
                     <div className="rounded-lg border border-dashed border-border bg-card p-12 text-center">
                       <p className="text-sm text-muted-foreground">
                         {filteredServers.length === 0
-                          ? "No MCP servers configured. Click '+ Add New MCP Server' to get started."
-                          : "No servers match the current filters or search."}
+                          ? t("mcpServers.servers.empty.noServers")
+                          : t("mcpServers.servers.empty.noMatches")}
                       </p>
                     </div>
                   ) : (
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tool_configuration.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tool_configuration.tsx
index a3d62de9941..4cdcacaa417 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tool_configuration.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tool_configuration.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Wrench, CircleCheck, Search, Pencil } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -69,6 +70,7 @@ const ToolRow: React.FC<ToolRowProps> = ({
   onDisplayNameChange,
   onDescriptionChange,
 }) => {
+  const { t } = useTranslation();
   const displayNameValue = toolNameToDisplayName[tool.name] || "";
   const isDisplayNameInvalid = displayNameValue !== "" && !TOOL_DISPLAY_NAME_PATTERN.test(displayNameValue);
 
@@ -85,8 +87,14 @@ const ToolRow: React.FC<ToolRowProps> = ({
           <div className="flex-1">
             <div className="flex items-center gap-2">
               <p className="text-sm font-medium">{toolNameToDisplayName[tool.name] || tool.name}</p>
-              <Badge variant={isEnabled ? "secondary" : "outline"}>{isEnabled ? "Enabled" : "Disabled"}</Badge>
-              {toolNameToDisplayName[tool.name] && <Badge variant="secondary">Custom name</Badge>}
+              <Badge variant={isEnabled ? "secondary" : "outline"}>
+                {isEnabled
+                  ? t("mcpServers.toolConfiguration.toolRow.enabled")
+                  : t("mcpServers.toolConfiguration.toolRow.disabled")}
+              </Badge>
+              {toolNameToDisplayName[tool.name] && (
+                <Badge variant="secondary">{t("mcpServers.toolConfiguration.toolRow.customName")}</Badge>
+              )}
             </div>
             {(toolNameToDescription[tool.name] || tool.description) && (
               <p className="mt-1 block text-sm text-muted-foreground">
@@ -94,14 +102,16 @@ const ToolRow: React.FC<ToolRowProps> = ({
               </p>
             )}
             <p className="mt-1 block text-xs text-muted-foreground">
-              {isEnabled ? "✓ Users can call this tool" : "✗ Users cannot call this tool"}
+              {isEnabled
+                ? t("mcpServers.toolConfiguration.toolRow.callable")
+                : t("mcpServers.toolConfiguration.toolRow.notCallable")}
             </p>
           </div>
           <Button
             variant="ghost"
             size="icon-sm"
             onClick={(e) => onToggleExpand(tool.name, e)}
-            title="Edit display name and description"
+            title={t("mcpServers.toolConfiguration.toolRow.editTitle")}
           >
             <Pencil />
           </Button>
@@ -113,7 +123,9 @@ const ToolRow: React.FC<ToolRowProps> = ({
           onClick={(e) => e.stopPropagation()}
         >
           <div>
-            <p className="mb-1 block text-xs font-medium">Display Name</p>
+            <p className="mb-1 block text-xs font-medium">
+              {t("mcpServers.toolConfiguration.toolRow.displayNameLabel")}
+            </p>
             <Input
               placeholder={tool.name}
               value={toolNameToDisplayName[tool.name] || ""}
@@ -122,25 +134,27 @@ const ToolRow: React.FC<ToolRowProps> = ({
             />
             {isDisplayNameInvalid ? (
               <p className="mt-1 block text-xs text-destructive">
-                Only letters, digits, underscores, and hyphens are allowed (no spaces).
+                {t("mcpServers.toolConfiguration.toolRow.displayNameInvalid")}
               </p>
             ) : (
               <p className="mt-1 block text-xs text-muted-foreground">
-                Override how this tool&apos;s name appears to users. Leave blank to use original.
+                {t("mcpServers.toolConfiguration.toolRow.displayNameHelp")}
               </p>
             )}
           </div>
           <div>
-            <p className="mb-1 block text-xs font-medium">Description</p>
+            <p className="mb-1 block text-xs font-medium">
+              {t("mcpServers.toolConfiguration.toolRow.descriptionLabel")}
+            </p>
             <Textarea
               className="field-sizing-fixed"
-              placeholder={tool.description || "No description"}
+              placeholder={tool.description || t("mcpServers.toolConfiguration.toolRow.noDescription")}
               value={toolNameToDescription[tool.name] || ""}
               onChange={(e) => onDescriptionChange(tool.name, e.target.value)}
               rows={2}
             />
             <p className="mt-1 block text-xs text-muted-foreground">
-              Override the tool description shown to users. Leave blank to use original.
+              {t("mcpServers.toolConfiguration.toolRow.descriptionHelp")}
             </p>
           </div>
         </div>
@@ -169,6 +183,7 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
   externalCanFetch,
   isEditMode = false,
 }) => {
+  const { t } = useTranslation();
   const previousToolsRef = useRef<ToolEntry[]>([]);
   const [toolSearchTerm, setToolSearchTerm] = useState("");
   const [viewMode, setViewMode] = useState<"crud" | "flat">("crud");
@@ -398,7 +413,7 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
         <div className="flex items-center justify-between">
           <div className="flex items-center gap-2">
             <Wrench className="size-4 text-muted-foreground" />
-            <h3 className="text-lg font-medium">Tool Configuration</h3>
+            <h3 className="text-lg font-medium">{t("mcpServers.toolConfiguration.title")}</h3>
             {tools.length > 0 && <Badge variant="secondary">{tools.length}</Badge>}
           </div>
           {tools.length > 0 && (
@@ -408,14 +423,14 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
                 variant={viewMode === "crud" ? "default" : "outline"}
                 onClick={() => setViewMode("crud")}
               >
-                Risk Groups
+                {t("mcpServers.toolConfiguration.viewModes.riskGroups")}
               </Button>
               <Button
                 size="sm"
                 variant={viewMode === "flat" ? "default" : "outline"}
                 onClick={() => setViewMode("flat")}
               >
-                Flat List
+                {t("mcpServers.toolConfiguration.viewModes.flatList")}
               </Button>
             </div>
           )}
@@ -424,8 +439,7 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
         {/* Description */}
         <div className="rounded-lg border border-border bg-muted p-3">
           <p className="text-sm">
-            <strong>Select which tools users can call:</strong> Only checked tools will be available for users to
-            invoke. Unchecked tools will be blocked from execution.
+            <Trans i18nKey="mcpServers.toolConfiguration.intro" components={{ strong: <strong /> }} />
           </p>
         </div>
 
@@ -433,7 +447,7 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
         {isLoadingTools && (
           <div className="flex items-center justify-center gap-3 py-6">
             <UiLoadingSpinner className="size-6 text-muted-foreground" />
-            <p className="text-sm">Loading tools...</p>
+            <p className="text-sm">{t("mcpServers.toolConfiguration.loading")}</p>
           </div>
         )}
 
@@ -447,7 +461,7 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
         {toolsError && !isLoadingTools && !isPreviewForbidden && (
           <div className="rounded-lg border border-dashed border-destructive/40 bg-destructive/5 py-6 text-center">
             <Wrench className="mx-auto mb-2 size-6 text-destructive" />
-            <p className="text-sm font-medium text-destructive">Unable to load tools</p>
+            <p className="text-sm font-medium text-destructive">{t("mcpServers.toolConfiguration.loadError")}</p>
             <p className="text-sm text-destructive">{toolsError}</p>
           </div>
         )}
@@ -460,14 +474,18 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
           (keyTools && keyTools.length > 0 ? (
             <div className="rounded-lg border border-dashed py-4 text-center text-muted-foreground">
               <Wrench className="mx-auto mb-2 size-6" />
-              <p className="text-sm">No tools loaded from spec</p>
-              <p className="mt-1 block text-sm">Expected tools: {keyTools.map((t) => t.name).join(", ")}</p>
+              <p className="text-sm">{t("mcpServers.toolConfiguration.noToolsFromSpec")}</p>
+              <p className="mt-1 block text-sm">
+                {t("mcpServers.toolConfiguration.expectedTools", {
+                  tools: keyTools.map((keyTool) => keyTool.name).join(", "),
+                })}
+              </p>
             </div>
           ) : (
             <div className="rounded-lg border border-dashed py-6 text-center text-muted-foreground">
               <Wrench className="mx-auto mb-2 size-6" />
-              <p className="text-sm">No tools available for configuration</p>
-              <p className="text-sm">Connect to an MCP server with tools to configure them</p>
+              <p className="text-sm">{t("mcpServers.toolConfiguration.noTools.title")}</p>
+              <p className="text-sm">{t("mcpServers.toolConfiguration.noTools.hint")}</p>
             </div>
           ))}
 
@@ -475,8 +493,8 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
         {!canFetchTools && (formValues.url || formValues.spec_path) && (
           <div className="rounded-lg border border-dashed py-6 text-center text-muted-foreground">
             <Wrench className="mx-auto mb-2 size-6" />
-            <p className="text-sm">Complete required fields to configure tools</p>
-            <p className="text-sm">Fill in URL, Transport, and Authentication to load available tools</p>
+            <p className="text-sm">{t("mcpServers.toolConfiguration.incomplete.title")}</p>
+            <p className="text-sm">{t("mcpServers.toolConfiguration.incomplete.hint")}</p>
           </div>
         )}
 
@@ -486,8 +504,10 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
             <div className="flex items-center gap-2 rounded-lg border border-border bg-muted p-3">
               <CircleCheck className="size-4" />
               <p className="text-sm font-medium">
-                {effectiveAllowedTools.length} of {tools.length} {tools.length === 1 ? "tool" : "tools"} enabled for
-                user access
+                {t("mcpServers.toolConfiguration.enabledSummary", {
+                  enabled: effectiveAllowedTools.length,
+                  count: tools.length,
+                })}
               </p>
             </div>
 
@@ -497,7 +517,7 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
                 <Search className="size-4 text-muted-foreground" />
               </InputGroupAddon>
               <InputGroupInput
-                placeholder="Search tools by name or description..."
+                placeholder={t("mcpServers.toolConfiguration.searchPlaceholder")}
                 value={toolSearchTerm}
                 onChange={(e) => setToolSearchTerm(e.target.value)}
               />
@@ -519,7 +539,9 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
                 {filteredTools.length === 0 ? (
                   <div className="rounded-lg border border-dashed py-6 text-center text-muted-foreground">
                     <Search className="mx-auto mb-2 size-6" />
-                    <p className="text-sm">No tools found matching &quot;{toolSearchTerm}&quot;</p>
+                    <p className="text-sm">
+                      {t("mcpServers.toolConfiguration.noMatches", { searchTerm: toolSearchTerm })}
+                    </p>
                   </div>
                 ) : (
                   <div className="space-y-2">
@@ -527,14 +549,14 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
                       <>
                         <div className="flex items-center justify-between px-1">
                           <p className="text-xs font-semibold tracking-wide text-muted-foreground uppercase">
-                            Suggested tools
+                            {t("mcpServers.toolConfiguration.suggestedTools")}
                           </p>
                           <div className="flex gap-2">
                             <Button variant="link" size="sm" onClick={handleEnableSuggested}>
-                              Enable all
+                              {t("mcpServers.toolConfiguration.enableAll")}
                             </Button>
                             <Button variant="link" size="sm" onClick={handleDisableSuggested}>
-                              Disable all
+                              {t("mcpServers.toolConfiguration.disableAll")}
                             </Button>
                           </div>
                         </div>
@@ -558,14 +580,16 @@ const MCPToolConfiguration: React.FC<MCPToolConfigurationProps> = ({
                       <>
                         <div className="flex items-center justify-between px-1 pt-2">
                           <p className="text-xs font-semibold tracking-wide text-muted-foreground uppercase">
-                            {pinnedFiltered.length > 0 ? "All tools" : "Tools"}
+                            {pinnedFiltered.length > 0
+                              ? t("mcpServers.toolConfiguration.allTools")
+                              : t("mcpServers.toolConfiguration.tools")}
                           </p>
                           <div className="flex gap-2">
                             <Button variant="link" size="sm" onClick={handleEnableRest}>
-                              Enable all
+                              {t("mcpServers.toolConfiguration.enableAll")}
                             </Button>
                             <Button variant="link" size="sm" onClick={handleDisableRest}>
-                              Disable all
+                              {t("mcpServers.toolConfiguration.disableAll")}
                             </Button>
                           </div>
                         </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tools.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tools.tsx
index a7af5c978f9..dfe3a6a7d35 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tools.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_tools.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { useQuery, useMutation } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
 import { ToolTestPanel } from "./ToolTestPanel";
 import { resolveLogoSrc } from "@/lib/assetPaths";
 import {
@@ -39,6 +40,7 @@ const MCPToolsViewer = ({
   serverAlias,
   extraHeaders,
 }: MCPToolsViewerProps) => {
+  const { t } = useTranslation();
   const [selectedTool, setSelectedTool] = useState<MCPTool | null>(null);
   const [toolResult, setToolResult] = useState<MCPContent[] | null>(null);
   const [toolError, setToolError] = useState<Error | null>(null);
@@ -294,7 +296,7 @@ const MCPToolsViewer = ({
         <div className="grid h-auto w-full grid-cols-4 gap-4">
           {/* Left Sidebar with Controls */}
           <div className="col-span-1 flex flex-col bg-muted p-4">
-            <h2 className="mt-2 mb-6 text-xl font-semibold">MCP Tools</h2>
+            <h2 className="mt-2 mb-6 text-xl font-semibold">{t("mcpServers.tools.title")}</h2>
 
             <div className="flex flex-col flex-1">
               {/* Extra Headers Input Section */}
@@ -303,17 +305,15 @@ const MCPToolsViewer = ({
                   <div className="mb-2 flex items-center justify-between">
                     <div className="flex items-center">
                       <Key className="mr-2 size-4 text-muted-foreground" />
-                      <p className="text-sm font-medium">Additional Headers</p>
+                      <p className="text-sm font-medium">{t("mcpServers.tools.additionalHeaders")}</p>
                     </div>
                     <Button variant="link" size="sm" onClick={() => setShowHeaderInput(!showHeaderInput)}>
-                      {showHeaderInput ? "Hide" : "Configure"}
+                      {showHeaderInput ? t("mcpServers.tools.hide") : t("mcpServers.tools.configure")}
                     </Button>
                   </div>
 
                   {!showHeaderInput && Object.keys(passthroughHeaders).length === 0 && (
-                    <p className="text-xs text-muted-foreground">
-                      This server requires additional headers. Click &quot;Configure&quot; to provide values.
-                    </p>
+                    <p className="text-xs text-muted-foreground">{t("mcpServers.tools.headersRequired")}</p>
                   )}
 
                   {showHeaderInput && (
@@ -326,7 +326,7 @@ const MCPToolsViewer = ({
                               <Key className="size-4 text-muted-foreground" />
                             </InputGroupAddon>
                             <InputGroupInput
-                              placeholder={`Enter ${headerName}`}
+                              placeholder={t("mcpServers.tools.headerPlaceholder", { headerName })}
                               value={passthroughHeaders[headerName] || ""}
                               onChange={(e) => {
                                 setPassthroughHeaders({
@@ -347,7 +347,7 @@ const MCPToolsViewer = ({
                         disabled={Object.values(passthroughHeaders).every((v) => !v || !v.trim())}
                         className="mt-2 w-full"
                       >
-                        Load Tools
+                        {t("mcpServers.tools.loadTools")}
                       </Button>
                     </div>
                   )}
@@ -356,7 +356,9 @@ const MCPToolsViewer = ({
                     <div className="mt-2">
                       <p className="flex items-center text-xs text-muted-foreground">
                         <span className="mr-2 inline-block size-2 rounded-full bg-success" />
-                        {Object.keys(passthroughHeaders).length} header(s) configured
+                        {t("mcpServers.tools.headersConfigured", {
+                          headerCount: Object.keys(passthroughHeaders).length,
+                        })}
                       </p>
                     </div>
                   )}
@@ -366,7 +368,7 @@ const MCPToolsViewer = ({
               {/* Tool Selection - Show tools first */}
               <div className="flex flex-col flex-1 min-h-0">
                 <p className="mb-3 flex items-center text-sm font-medium">
-                  <Wrench className="mr-2 size-4" /> Available Tools
+                  <Wrench className="mr-2 size-4" /> {t("mcpServers.tools.availableTools")}
                   {toolsData.length > 0 && (
                     <Badge variant="secondary" className="ml-2">
                       {toolsData.length}
@@ -378,14 +380,14 @@ const MCPToolsViewer = ({
                 {usesBrowserHeldToken && !oauthToken && (
                   <div className="rounded-lg border border-border bg-card p-4 text-center">
                     <Lock className="mx-auto mb-2 size-6 text-muted-foreground" />
-                    <p className="mb-1 text-xs font-medium">Authentication required</p>
-                    <p className="mb-3 text-xs text-muted-foreground">Authenticate to view available tools</p>
+                    <p className="mb-1 text-xs font-medium">{t("mcpServers.tools.authRequired")}</p>
+                    <p className="mb-3 text-xs text-muted-foreground">{t("mcpServers.tools.authenticateToView")}</p>
                     <Button
                       size="sm"
                       onClick={startOAuthFlow}
                       disabled={!accessToken || oauthStatus === "authorizing" || oauthStatus === "exchanging"}
                     >
-                      Authorize
+                      {t("mcpServers.tools.authorize")}
                     </Button>
                     {oauthError && <p className="mt-2 text-xs text-destructive">{oauthError}</p>}
                   </div>
@@ -399,16 +401,14 @@ const MCPToolsViewer = ({
                 {(authorizationCodeNeedsAuth || authorizationCodeTokenRejected) && (
                   <div className="rounded-lg border border-border bg-card p-4 text-center">
                     <Lock className="mx-auto mb-2 size-6 text-muted-foreground" />
-                    <p className="mb-1 text-xs font-medium">Authentication required</p>
-                    <p className="mb-3 text-xs text-muted-foreground">
-                      Authenticate with the upstream provider to view available tools
-                    </p>
+                    <p className="mb-1 text-xs font-medium">{t("mcpServers.tools.authRequired")}</p>
+                    <p className="mb-3 text-xs text-muted-foreground">{t("mcpServers.tools.authenticateUpstream")}</p>
                     <Button
                       size="sm"
                       onClick={startAuthorizationCodeAuthorize}
                       disabled={!accessToken || dbOAuthStatus === "authorizing" || dbOAuthStatus === "exchanging"}
                     >
-                      Authorize
+                      {t("mcpServers.tools.authorize")}
                     </Button>
                     {dbOAuthError && <p className="mt-2 text-xs text-destructive">{dbOAuthError}</p>}
                   </div>
@@ -424,7 +424,7 @@ const MCPToolsViewer = ({
                             <Search className="size-4 text-muted-foreground" />
                           </InputGroupAddon>
                           <InputGroupInput
-                            placeholder="Search tools..."
+                            placeholder={t("mcpServers.tools.searchPlaceholder")}
                             value={toolSearchTerm}
                             onChange={(e) => setToolSearchTerm(e.target.value)}
                           />
@@ -436,7 +436,7 @@ const MCPToolsViewer = ({
                     {toolsAreaLoading && (
                       <div className="flex flex-col items-center justify-center rounded-lg border border-border bg-card py-8">
                         <UiLoadingSpinner className="mb-3 size-6 text-muted-foreground" />
-                        <p className="text-xs font-medium">Loading tools...</p>
+                        <p className="text-xs font-medium">{t("mcpServers.tools.loading")}</p>
                       </div>
                     )}
 
@@ -444,7 +444,9 @@ const MCPToolsViewer = ({
                     {(mcpToolsResponse?.error || mcpToolsError) && !toolsAreaLoading && !toolsData.length && (
                       <div className="rounded-lg border border-destructive/40 bg-destructive/5 p-3 text-xs text-destructive">
                         <p className="font-medium">
-                          Error: {mcpToolsResponse?.message || (mcpToolsError as Error)?.message}
+                          {t("mcpServers.tools.error", {
+                            message: mcpToolsResponse?.message || (mcpToolsError as Error)?.message,
+                          })}
                         </p>
                       </div>
                     )}
@@ -470,8 +472,8 @@ const MCPToolsViewer = ({
                               />
                             </svg>
                           </div>
-                          <p className="mb-1 text-xs font-medium">No tools available</p>
-                          <p className="text-xs text-muted-foreground">No tools found for this server</p>
+                          <p className="mb-1 text-xs font-medium">{t("mcpServers.tools.noTools.title")}</p>
+                          <p className="text-xs text-muted-foreground">{t("mcpServers.tools.noTools.description")}</p>
                         </div>
                       )}
 
@@ -481,8 +483,10 @@ const MCPToolsViewer = ({
                         {filteredTools.length === 0 ? (
                           <div className="rounded-lg border border-border bg-card p-4 text-center">
                             <Search className="mx-auto mb-2 size-6 text-muted-foreground" />
-                            <p className="mb-1 text-xs font-medium">No tools found</p>
-                            <p className="text-xs text-muted-foreground">No tools match &quot;{toolSearchTerm}&quot;</p>
+                            <p className="mb-1 text-xs font-medium">{t("mcpServers.tools.noMatches.title")}</p>
+                            <p className="text-xs text-muted-foreground">
+                              {t("mcpServers.tools.noMatches.description", { searchTerm: toolSearchTerm })}
+                            </p>
                           </div>
                         ) : (
                           <div className="mcp-tools-scrollable max-h-100 min-h-0 flex-1 space-y-2 overflow-y-auto">
@@ -505,7 +509,7 @@ const MCPToolsViewer = ({
                                   {tool.mcp_info.logo_url && (
                                     <img
                                       src={resolveLogoSrc(tool.mcp_info.logo_url)}
-                                      alt={`${tool.mcp_info.server_name} logo`}
+                                      alt={t("mcpServers.tools.logoAlt", { serverName: tool.mcp_info.server_name })}
                                       className="w-4 h-4 object-contain shrink-0 mt-0.5"
                                     />
                                   )}
@@ -529,7 +533,7 @@ const MCPToolsViewer = ({
                                           clipRule="evenodd"
                                         />
                                       </svg>
-                                      Selected
+                                      {t("mcpServers.tools.selected")}
                                     </div>
                                   </div>
                                 )}
@@ -548,7 +552,7 @@ const MCPToolsViewer = ({
           {/* Main Testing Area */}
           <div className="col-span-3 flex flex-col">
             <div className="flex items-center justify-between border-b border-border p-4">
-              <h2 className="mb-0 text-xl font-semibold">Tool Testing Playground</h2>
+              <h2 className="mb-0 text-xl font-semibold">{t("mcpServers.tools.playground.title")}</h2>
             </div>
 
             <div className="flex-1 overflow-auto p-4">
@@ -556,10 +560,8 @@ const MCPToolsViewer = ({
                 /* Empty State */
                 <div className="flex h-full flex-col items-center justify-center text-muted-foreground">
                   <Bot className="mb-4 size-12" />
-                  <p className="mb-2 text-lg font-medium">Select a Tool to Test</p>
-                  <p className="max-w-md text-center text-sm">
-                    Choose a tool from the left sidebar to start testing its functionality with custom inputs.
-                  </p>
+                  <p className="mb-2 text-lg font-medium">{t("mcpServers.tools.playground.emptyTitle")}</p>
+                  <p className="max-w-md text-center text-sm">{t("mcpServers.tools.playground.emptyDescription")}</p>
                 </div>
               ) : (
                 /* Tool Test Panel */
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts
index 28579514f72..ab043927d6f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts
@@ -1,5 +1,7 @@
+import type { TFunction } from "i18next";
 import type { Resolver, ResolverResult } from "react-hook-form";
 
+import i18n from "@/i18n/i18n";
 import { InputSchema, InputSchemaProperty } from "@/components/mcp_tools/types";
 
 export interface ToolArgumentField {
@@ -51,27 +53,31 @@ const isBlank = (value: unknown): boolean => value === undefined || value === nu
 const isUnsetArgument = (prop: InputSchemaProperty, value: unknown): boolean =>
   prop.type === "string" && prop.enum ? value == null : isBlank(typeof value === "string" ? value.trim() : value);
 
-export const validateToolArgument = (field: ToolArgumentField, value: unknown): string | undefined => {
+export const validateToolArgument = (
+  field: ToolArgumentField,
+  value: unknown,
+  t: TFunction = i18n.t.bind(i18n),
+): string | undefined => {
   const prop = resolveSchemaProperty(field.prop);
   if (field.required && isUnsetArgument(prop, value)) {
-    return `Please enter ${field.key}`;
+    return t("mcpServers.toolCallArguments.validation.required", { field: field.key });
   }
   if (prop.type === "string" && prop.enum) {
     if (!isUnsetArgument(prop, value) && !prop.enum.includes(String(value)))
-      return `Please select a valid ${field.key}`;
+      return t("mcpServers.toolCallArguments.validation.invalidOption", { field: field.key });
   }
   if (!isJsonField(prop) || (isBlank(value) && !field.required)) {
     return undefined;
   }
   const parsed = parseJson(value);
   if (parsed.kind === "invalid") {
-    return "Invalid JSON";
+    return t("mcpServers.toolCallArguments.validation.invalidJson");
   }
   if (prop.type === "object" && !isPlainObject(parsed.value)) {
-    return "Please enter a JSON object";
+    return t("mcpServers.toolCallArguments.validation.expectedObject");
   }
   if (prop.type === "array" && !Array.isArray(parsed.value)) {
-    return "Please enter a JSON array";
+    return t("mcpServers.toolCallArguments.validation.expectedArray");
   }
   return undefined;
 };
@@ -115,10 +121,10 @@ export const buildToolCallArguments = (
   );
 
 export const toolArgumentsResolver =
-  (fields: readonly ToolArgumentField[]): Resolver<ToolArgumentsFormValues> =>
+  (fields: readonly ToolArgumentField[], t: TFunction = i18n.t.bind(i18n)): Resolver<ToolArgumentsFormValues> =>
   (values): ResolverResult<ToolArgumentsFormValues> => {
     const issues = fields
-      .map((field, index) => ({ index, message: validateToolArgument(field, values.args[index]) }))
+      .map((field, index) => ({ index, message: validateToolArgument(field, values.args[index], t) }))
       .filter((issue): issue is { index: number; message: string } => issue.message !== undefined);
 
     if (issues.length === 0) {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/utils.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/utils.tsx
index bb72831d92e..430da3f6a80 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/utils.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/utils.tsx
@@ -1,35 +1,37 @@
+import type { TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
 import { MCPEnvVar, MCPEnvVarScope, type MCPServer } from "@/components/mcp_tools/types";
 
 export const getMCPNetworkAccess = (
   server: Pick<MCPServer, "available_on_public_internet" | "mcp_info">,
+  t: TFunction = i18n.t.bind(i18n),
 ): {
-  readonly label: "All Networks" | "Internal Only" | "Unknown";
+  readonly label: string;
   readonly dotClassName: string;
   readonly description: string;
 } => {
   const explicitlyPublished = server.mcp_info?.is_public_explicit;
   if (server.available_on_public_internet === true || explicitlyPublished === true) {
     return {
-      label: "All Networks",
+      label: t("mcpServers.utils.networkAccess.allNetworks.label"),
       dotClassName: "bg-success",
       description:
         server.available_on_public_internet === true
-          ? "Allows requests from public and internal IPs. Authentication and access permissions still apply"
-          : "Allows requests from public and internal IPs because this server is published in MCP Hub. Authentication and access permissions still apply",
+          ? t("mcpServers.utils.networkAccess.allNetworks.publicDescription")
+          : t("mcpServers.utils.networkAccess.allNetworks.hubDescription"),
     };
   }
   if (server.available_on_public_internet === false && explicitlyPublished === false) {
     return {
-      label: "Internal Only",
+      label: t("mcpServers.utils.networkAccess.internalOnly.label"),
       dotClassName: "bg-warning",
-      description:
-        "Allows requests only from internal/private IP ranges. Authentication and access permissions still apply",
+      description: t("mcpServers.utils.networkAccess.internalOnly.description"),
     };
   }
   return {
-    label: "Unknown",
+    label: t("mcpServers.utils.networkAccess.unknown.label"),
     dotClassName: "bg-border",
-    description: "The proxy did not report enough network and publication settings to determine allowed client IPs",
+    description: t("mcpServers.utils.networkAccess.unknown.description"),
   };
 };
 
@@ -72,26 +74,24 @@ export const getMaskedAndFullUrl = (url: string): { maskedUrl: string; hasToken:
 };
 
 // Validation utilities for MCP server forms
-export const validateMCPServerUrl = (value: string) => {
+export const validateMCPServerUrl = (value: string, t: TFunction = i18n.t.bind(i18n)) => {
   if (!value) return Promise.resolve();
   // More flexible URL validation that allows Kubernetes service names and various URL formats
   const urlPattern = /^https?:\/\/[^\s/$.?#].[^\s]*$/i;
-  return urlPattern.test(value)
-    ? Promise.resolve()
-    : Promise.reject("Please enter a valid URL (e.g., http://service-name.domain:1234/path or https://example.com)");
+  return urlPattern.test(value) ? Promise.resolve() : Promise.reject(t("mcpServers.utils.validation.invalidUrl"));
 };
 
-export const validateMCPServerName = (value: string) => {
+export const validateMCPServerName = (value: string, t: TFunction = i18n.t.bind(i18n)) => {
   return value && (value.includes("-") || value.includes(" "))
-    ? Promise.reject("Cannot contain '-' (hyphen) or spaces. Please use '_' (underscore) instead.")
+    ? Promise.reject(t("mcpServers.utils.validation.invalidServerName"))
     : Promise.resolve();
 };
 
 export const TOOL_DISPLAY_NAME_PATTERN = /^[a-zA-Z0-9_-]+$/;
 
-export const validateToolDisplayName = (value: string) => {
+export const validateToolDisplayName = (value: string, t: TFunction = i18n.t.bind(i18n)) => {
   return value && !TOOL_DISPLAY_NAME_PATTERN.test(value)
-    ? Promise.reject("Only letters, digits, underscores, and hyphens are allowed (no spaces).")
+    ? Promise.reject(t("mcpServers.utils.validation.invalidToolDisplayName"))
     : Promise.resolve();
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryDetailDrawer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryDetailDrawer.tsx
index 5c2fac2d5a9..ae88b42c906 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryDetailDrawer.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryDetailDrawer.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import React from "react";
+import { useTranslation } from "react-i18next";
 
 import { MemoryRow } from "@/components/networking";
 import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@/components/ui/sheet";
@@ -25,6 +26,7 @@ function formatTimestamp(ts?: string): string {
 }
 
 export function MemoryDetailDrawer({ row, onClose }: MemoryDetailDrawerProps) {
+  const { t } = useTranslation();
   return (
     <Sheet
       open={!!row}
@@ -34,47 +36,49 @@ export function MemoryDetailDrawer({ row, onClose }: MemoryDetailDrawerProps) {
     >
       <SheetContent className="overflow-y-auto data-[side=right]:w-full data-[side=right]:max-w-full data-[side=right]:sm:w-[720px] data-[side=right]:sm:max-w-full">
         <SheetHeader className="border-b">
-          <SheetTitle>{row ? <code className={CODE_CLASS}>{row.key}</code> : "Memory"}</SheetTitle>
+          <SheetTitle>
+            {row ? <code className={CODE_CLASS}>{row.key}</code> : t("memory.detailDrawer.title")}
+          </SheetTitle>
         </SheetHeader>
         {row && (
           <div className="flex flex-col gap-4 px-4 pb-4">
             <div className="flex flex-wrap gap-x-8 gap-y-3">
               <div>
-                <span className={`block ${LABEL_CLASS}`}>Memory ID</span>
+                <span className={`block ${LABEL_CLASS}`}>{t("memory.detailDrawer.memoryId")}</span>
                 <code className={CODE_CLASS}>{row.memory_id}</code>
               </div>
               <div>
-                <span className={`block ${LABEL_CLASS}`}>User ID</span>
+                <span className={`block ${LABEL_CLASS}`}>{t("memory.detailDrawer.userId")}</span>
                 <span className={row.user_id ? "text-sm text-foreground" : "text-sm text-muted-foreground"}>
                   {row.user_id ?? "-"}
                 </span>
               </div>
               <div>
-                <span className={`block ${LABEL_CLASS}`}>Team ID</span>
+                <span className={`block ${LABEL_CLASS}`}>{t("memory.detailDrawer.teamId")}</span>
                 <span className={row.team_id ? "text-sm text-foreground" : "text-sm text-muted-foreground"}>
                   {row.team_id ?? "-"}
                 </span>
               </div>
             </div>
             <div>
-              <span className={LABEL_CLASS}>Value</span>
+              <span className={LABEL_CLASS}>{t("memory.detailDrawer.value")}</span>
               <p className={`${BLOCK_CLASS} text-[13px]`}>{row.value}</p>
             </div>
             {row.metadata !== undefined && row.metadata !== null && (
               <div>
-                <span className={LABEL_CLASS}>Metadata</span>
+                <span className={LABEL_CLASS}>{t("memory.detailDrawer.metadata")}</span>
                 <p className={`${BLOCK_CLASS} text-xs`}>{JSON.stringify(row.metadata, null, 2)}</p>
               </div>
             )}
             <div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
               <span>
-                Created {formatTimestamp(row.created_at)}
-                {row.created_by ? ` by ${row.created_by}` : ""}
+                {t("memory.detailDrawer.created", { time: formatTimestamp(row.created_at) })}
+                {row.created_by ? t("memory.detailDrawer.by", { name: row.created_by }) : ""}
               </span>
               <span aria-hidden="true">·</span>
               <span>
-                Updated {formatTimestamp(row.updated_at)}
-                {row.updated_by ? ` by ${row.updated_by}` : ""}
+                {t("memory.detailDrawer.updated", { time: formatTimestamp(row.updated_at) })}
+                {row.updated_by ? t("memory.detailDrawer.by", { name: row.updated_by }) : ""}
               </span>
             </div>
           </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx
index dac209057f1..39d2f3b559d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx
@@ -2,6 +2,8 @@
 
 import { CircleHelp } from "lucide-react";
 import React, { useEffect, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 import { z } from "zod";
 
 import type { MemoryRow } from "@/components/networking";
@@ -15,8 +17,8 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "
 import { Button } from "@/components/ui/button";
 
 const memorySchema = z.object({
-  key: z.string().min(1, "Key is required"),
-  value: z.string().min(1, "Value is required"),
+  key: z.string().min(1, { error: () => i18n.t("memory.editModal.errors.keyRequired") }),
+  value: z.string().min(1, { error: () => i18n.t("memory.editModal.errors.valueRequired") }),
   metadata: z.string(),
 });
 
@@ -43,6 +45,7 @@ interface MemoryEditModalProps {
 }
 
 export const MemoryEditModal: React.FC<MemoryEditModalProps> = ({ open, mode, initialRow, onClose, onSave }) => {
+  const { t } = useTranslation();
   const form = useZodForm(memorySchema, { defaultValues: EMPTY_MEMORY, mode: "onChange" });
   const [submitting, setSubmitting] = useState(false);
 
@@ -80,7 +83,11 @@ export const MemoryEditModal: React.FC<MemoryEditModalProps> = ({ open, mode, in
     >
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[640px]">
         <DialogHeader>
-          <DialogTitle>{mode === "create" ? "Create memory" : `Edit ${initialRow?.key ?? ""}`}</DialogTitle>
+          <DialogTitle>
+            {mode === "create"
+              ? t("memory.editModal.createTitle")
+              : t("memory.editModal.editTitle", { name: initialRow?.key ?? "" })}
+          </DialogTitle>
         </DialogHeader>
         <form onSubmit={(event) => event.preventDefault()} noValidate>
           <TooltipProvider>
@@ -88,23 +95,25 @@ export const MemoryEditModal: React.FC<MemoryEditModalProps> = ({ open, mode, in
               <FormField
                 control={form.control}
                 name="key"
-                label={labelWithHint(
-                  "Key",
-                  "Globally unique — two memories cannot share a key. Namespace your own keys if you need per-user isolation (e.g. user:123:notes).",
-                )}
+                label={labelWithHint(t("memory.editModal.labels.key"), t("memory.editModal.hints.key"))}
               >
                 {({ ref, ...field }) => (
-                  <Input {...field} ref={ref} placeholder="e.g. user_role" disabled={mode === "edit"} />
+                  <Input
+                    {...field}
+                    ref={ref}
+                    placeholder={t("memory.editModal.placeholders.key")}
+                    disabled={mode === "edit"}
+                  />
                 )}
               </FormField>
 
               <FormField
                 control={form.control}
                 name="value"
-                label={labelWithHint("Value", "Markdown/text injected into LLM context. Plain strings are fine.")}
+                label={labelWithHint(t("memory.editModal.labels.value"), t("memory.editModal.hints.value"))}
               >
                 {({ ref, ...field }) => (
-                  <Textarea {...field} ref={ref} rows={8} placeholder="What the agent should remember…" />
+                  <Textarea {...field} ref={ref} rows={8} placeholder={t("memory.editModal.placeholders.value")} />
                 )}
               </FormField>
 
@@ -113,9 +122,12 @@ export const MemoryEditModal: React.FC<MemoryEditModalProps> = ({ open, mode, in
                 name="metadata"
                 label={labelWithHint(
                   <span>
-                    Metadata <span className="text-muted-foreground">(optional JSON)</span>
+                    <Trans
+                      i18nKey="memory.editModal.labels.metadata"
+                      components={{ muted: <span className="text-muted-foreground" /> }}
+                    />
                   </span>,
-                  "Optional structured metadata — must be valid JSON if provided.",
+                  t("memory.editModal.hints.metadata"),
                 )}
               >
                 {({ ref, ...field }) => (
@@ -133,10 +145,10 @@ export const MemoryEditModal: React.FC<MemoryEditModalProps> = ({ open, mode, in
               onClose();
             }}
           >
-            Cancel
+            {t("memory.editModal.cancel")}
           </Button>
           <Button onClick={handleOk} disabled={submitting} aria-busy={submitting}>
-            {mode === "create" ? "Create" : "Save"}
+            {mode === "create" ? t("memory.editModal.create") : t("memory.editModal.save")}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTable.tsx
index 3e37faafe15..6feb9795601 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTable.tsx
@@ -3,6 +3,7 @@
 import { OnChangeFn, PaginationState } from "@tanstack/react-table";
 import { Database } from "lucide-react";
 import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 
 import { MemoryRow } from "@/components/networking";
 import { DataTable, DataTableToolbar } from "@/components/shared/DataTable";
@@ -26,18 +27,17 @@ interface MemoryTableProps {
 }
 
 function MemoryEmptyState({ hasActiveSearch }: { hasActiveSearch: boolean }) {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Database className="size-5 text-muted-foreground" />
       </div>
       <div className="text-sm font-medium text-foreground">
-        {hasActiveSearch ? "No matching memories" : "No memories stored yet"}
+        {hasActiveSearch ? t("memory.table.empty.titleSearch") : t("memory.table.empty.title")}
       </div>
       <div className="text-sm text-muted-foreground">
-        {hasActiveSearch
-          ? "No memories match your search."
-          : "Memories your agents store under /v1/memory will appear here."}
+        {hasActiveSearch ? t("memory.table.empty.descriptionSearch") : t("memory.table.empty.description")}
       </div>
     </div>
   );
@@ -58,10 +58,11 @@ export function MemoryTable({
   onEditClick,
   onDeleteClick,
 }: MemoryTableProps) {
+  const { t } = useTranslation();
   const columns = useMemo(() => {
-    const columnDeps = { onViewClick, onEditClick, onDeleteClick };
+    const columnDeps = { onViewClick, onEditClick, onDeleteClick, t };
     return getMemoryTableColumns(columnDeps);
-  }, [onViewClick, onEditClick, onDeleteClick]);
+  }, [onViewClick, onEditClick, onDeleteClick, t]);
 
   return (
     <DataTable
@@ -73,7 +74,7 @@ export function MemoryTable({
       onPaginationChange={onPaginationChange}
       rowCount={rowCount}
       isLoading={isLoading}
-      loadingMessage="Loading memories…"
+      loadingMessage={t("memory.table.loading")}
       noDataMessage={<MemoryEmptyState hasActiveSearch={hasActiveSearch} />}
       size="compact"
       toolbar={(table) => (
@@ -81,7 +82,7 @@ export function MemoryTable({
           table={table}
           searchValue={searchValue}
           onSearchChange={onSearchChange}
-          searchPlaceholder="Search by key prefix or memory ID…"
+          searchPlaceholder={t("memory.table.searchPlaceholder")}
           onRefresh={onRefresh}
           isRefreshing={isRefreshing}
           showViewOptions={false}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTableColumns.tsx
index 62b8ec624fa..4b43582abb2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 import { Eye, MoreHorizontal, Pencil, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { MemoryRow } from "@/components/networking";
 import { DateCell, IdCell, IdentityCell } from "@/components/shared/table_cells";
@@ -24,10 +26,11 @@ interface MemoryRowActionsProps {
 }
 
 function MemoryRowActions({ row, onViewClick, onEditClick, onDeleteClick }: MemoryRowActionsProps) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open memory actions"
+        aria-label={t("memory.table.actions.open")}
         data-testid={`memory-actions-${row.memory_id}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -36,16 +39,16 @@ function MemoryRowActions({ row, onViewClick, onEditClick, onDeleteClick }: Memo
       <DropdownMenuContent align="end" className="w-40">
         <DropdownMenuItem data-testid="memory-action-view" onClick={() => onViewClick(row)}>
           <Eye />
-          View
+          {t("memory.table.actions.view")}
         </DropdownMenuItem>
         <DropdownMenuItem data-testid="memory-action-edit" onClick={() => onEditClick(row)}>
           <Pencil />
-          Edit
+          {t("memory.table.actions.edit")}
         </DropdownMenuItem>
         <DropdownMenuSeparator />
         <DropdownMenuItem variant="destructive" data-testid="memory-action-delete" onClick={() => onDeleteClick(row)}>
           <Trash2 />
-          Delete
+          {t("memory.table.actions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -56,18 +59,20 @@ export interface MemoryTableColumnsDeps {
   onViewClick: (row: MemoryRow) => void;
   onEditClick: (row: MemoryRow) => void;
   onDeleteClick: (row: MemoryRow) => void;
+  t: TFunction;
 }
 
 export const getMemoryTableColumns = ({
   onViewClick,
   onEditClick,
   onDeleteClick,
+  t,
 }: MemoryTableColumnsDeps): ColumnDef<MemoryRow>[] => [
   {
     id: "memory_id",
     accessorKey: "memory_id",
-    meta: { title: "ID" },
-    header: "ID",
+    meta: { title: t("memory.table.columns.id") },
+    header: t("memory.table.columns.id"),
     size: 180,
     enableSorting: false,
     cell: ({ row }) => (
@@ -81,8 +86,8 @@ export const getMemoryTableColumns = ({
   {
     id: "key",
     accessorKey: "key",
-    meta: { title: "Name" },
-    header: "Name",
+    meta: { title: t("memory.table.columns.name") },
+    header: t("memory.table.columns.name"),
     size: 200,
     enableSorting: false,
     cell: ({ row }) => (
@@ -94,8 +99,8 @@ export const getMemoryTableColumns = ({
   {
     id: "value",
     accessorKey: "value",
-    meta: { title: "Preview" },
-    header: "Preview",
+    meta: { title: t("memory.table.columns.preview") },
+    header: t("memory.table.columns.preview"),
     enableSorting: false,
     cell: ({ row }) => (
       <span className="block max-w-72 truncate text-sm text-muted-foreground" title={row.original.value}>
@@ -106,8 +111,8 @@ export const getMemoryTableColumns = ({
   {
     id: "user_id",
     accessorKey: "user_id",
-    meta: { title: "User ID" },
-    header: "User ID",
+    meta: { title: t("memory.table.columns.userId") },
+    header: t("memory.table.columns.userId"),
     size: 160,
     enableSorting: false,
     cell: ({ row }) => {
@@ -118,8 +123,8 @@ export const getMemoryTableColumns = ({
   {
     id: "team_id",
     accessorKey: "team_id",
-    meta: { title: "Team ID" },
-    header: "Team ID",
+    meta: { title: t("memory.table.columns.teamId") },
+    header: t("memory.table.columns.teamId"),
     size: 160,
     enableSorting: false,
     cell: ({ row }) => {
@@ -130,8 +135,8 @@ export const getMemoryTableColumns = ({
   {
     id: "updated_at",
     accessorKey: "updated_at",
-    meta: { title: "Updated" },
-    header: "Updated",
+    meta: { title: t("memory.table.columns.updated") },
+    header: t("memory.table.columns.updated"),
     size: 170,
     enableSorting: false,
     cell: ({ row }) => <DateCell value={row.original.updated_at} />,
@@ -139,7 +144,7 @@ export const getMemoryTableColumns = ({
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("memory.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryView.tsx b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryView.tsx
index 58d4e42aa96..cf5191da864 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryView.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryView.tsx
@@ -5,6 +5,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { PaginationState } from "@tanstack/react-table";
 import { Plus } from "lucide-react";
 import React, { useCallback, useMemo, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 
 import { MemoryRow, createMemory, deleteMemory, fetchMemoryList, updateMemory } from "@/components/networking";
 import DeleteResourceModal from "@/components/common_components/DeleteResourceModal";
@@ -25,6 +26,7 @@ interface MemoryViewProps {
 const DEFAULT_PAGE_SIZE = 50;
 
 export const MemoryView: React.FC<MemoryViewProps> = ({ accessToken }) => {
+  const { t } = useTranslation();
   const [searchInput, setSearchInput] = useState("");
   const [debouncedSearch] = useDebouncedValue(searchInput, { wait: DEBOUNCE_WAIT_MS });
   const [pagination, setPagination] = useState<PaginationState>({ pageIndex: 0, pageSize: DEFAULT_PAGE_SIZE });
@@ -72,11 +74,11 @@ export const MemoryView: React.FC<MemoryViewProps> = ({ accessToken }) => {
       return createMemory(accessToken, args);
     },
     onSuccess: (row) => {
-      toast.success(`Created ${row.key}`);
+      toast.success(t("memory.view.toasts.created", { name: row.key }));
       invalidateList();
     },
     onError: (err: Error) => {
-      toast.error(`Save failed: ${err.message}`);
+      toast.error(t("memory.view.toasts.saveFailed", { error: err.message }));
     },
   });
 
@@ -87,11 +89,11 @@ export const MemoryView: React.FC<MemoryViewProps> = ({ accessToken }) => {
       return updateMemory(accessToken, key, payload);
     },
     onSuccess: (row) => {
-      toast.success(`Updated ${row.key}`);
+      toast.success(t("memory.view.toasts.updated", { name: row.key }));
       invalidateList();
     },
     onError: (err: Error) => {
-      toast.error(`Save failed: ${err.message}`);
+      toast.error(t("memory.view.toasts.saveFailed", { error: err.message }));
     },
   });
 
@@ -101,11 +103,11 @@ export const MemoryView: React.FC<MemoryViewProps> = ({ accessToken }) => {
       return deleteMemory(accessToken, key).then(() => key);
     },
     onSuccess: (key) => {
-      toast.success(`Deleted ${key}`);
+      toast.success(t("memory.view.toasts.deleted", { name: key }));
       invalidateList();
     },
     onError: (err: Error) => {
-      toast.error(`Delete failed: ${err.message}`);
+      toast.error(t("memory.view.toasts.deleteFailed", { error: err.message }));
     },
   });
 
@@ -147,7 +149,7 @@ export const MemoryView: React.FC<MemoryViewProps> = ({ accessToken }) => {
       try {
         metadataPayload = JSON.parse(metadataText);
       } catch {
-        toast.error("Metadata must be valid JSON (or leave empty).");
+        toast.error(t("memory.view.toasts.invalidMetadata"));
         return false;
       }
     }
@@ -178,18 +180,23 @@ export const MemoryView: React.FC<MemoryViewProps> = ({ accessToken }) => {
       <div className="flex flex-col gap-6">
         <div className="flex items-start justify-between gap-4">
           <div>
-            <h1 className="text-2xl font-semibold text-foreground">Memory</h1>
+            <h1 className="text-2xl font-semibold text-foreground">{t("memory.view.title")}</h1>
             <p className="mt-1 text-sm text-muted-foreground">
-              Inspect what your agents have stored under{" "}
-              <code className="rounded-sm border border-border bg-muted px-1 py-0.5 font-mono text-xs text-foreground">
-                /v1/memory
-              </code>
-              . Scoped to memories visible to your user / team (admins see all).
+              <Trans
+                i18nKey="memory.view.intro"
+                components={{
+                  endpoint: (
+                    <code className="rounded-sm border border-border bg-muted px-1 py-0.5 font-mono text-xs text-foreground">
+                      /v1/memory
+                    </code>
+                  ),
+                }}
+              />
             </p>
           </div>
           <Button onClick={() => setIsCreateOpen(true)}>
             <Plus />
-            New memory
+            {t("memory.view.newMemory")}
           </Button>
         </div>
 
@@ -228,16 +235,16 @@ export const MemoryView: React.FC<MemoryViewProps> = ({ accessToken }) => {
       {/* Delete confirmation modal */}
       <DeleteResourceModal
         isOpen={!!deleteRow}
-        title="Delete memory"
-        message="This action cannot be undone."
-        resourceInformationTitle="Memory"
+        title={t("memory.view.deleteModal.title")}
+        message={t("memory.view.deleteModal.message")}
+        resourceInformationTitle={t("memory.view.deleteModal.infoTitle")}
         resourceInformation={
           deleteRow
             ? [
-                { label: "Key", value: deleteRow.key, code: true },
-                { label: "Memory ID", value: deleteRow.memory_id, code: true },
-                { label: "User ID", value: deleteRow.user_id ?? "-", code: true },
-                { label: "Team ID", value: deleteRow.team_id ?? "-", code: true },
+                { label: t("memory.view.deleteModal.fields.key"), value: deleteRow.key, code: true },
+                { label: t("memory.view.deleteModal.fields.memoryId"), value: deleteRow.memory_id, code: true },
+                { label: t("memory.view.deleteModal.fields.userId"), value: deleteRow.user_id ?? "-", code: true },
+                { label: t("memory.view.deleteModal.fields.teamId"), value: deleteRow.team_id ?? "-", code: true },
               ]
             : []
         }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/memory/page.tsx b/ui/litellm-dashboard/src/app/(dashboard)/memory/page.tsx
index 1ba2ece9f84..777a138100c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/memory/page.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/memory/page.tsx
@@ -4,13 +4,15 @@ import { MemoryView } from "./_components/MemoryView";
 import { AdminOnlyNotice } from "@/components/shared/AdminOnlyNotice";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import useCan from "@/app/(dashboard)/hooks/useCan";
+import { useTranslation } from "react-i18next";
 
 export default function Memory() {
+  const { t } = useTranslation();
   const { accessToken, userRole, userId } = useAuthorized();
   const canViewMemory = useCan("viewMemory");
 
   if (!canViewMemory) {
-    return <AdminOnlyNotice pageTitle="Memory" />;
+    return <AdminOnlyNotice pageTitle={t("memory.page.title")} />;
   }
 
   return <MemoryView accessToken={accessToken} userID={userId} userRole={userRole} />;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTable.tsx
index e810c3622d1..9beb52f7b40 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Inbox } from "lucide-react";
 import React, { useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 import { modelHubCall, PromptSpec } from "@/components/networking";
@@ -22,13 +23,14 @@ interface PromptTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No prompts yet</div>
-      <div className="text-sm text-muted-foreground">Add a prompt to start managing reusable templates.</div>
+      <div className="text-sm font-medium text-foreground">{t("prompts.table.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("prompts.table.empty.description")}</div>
     </div>
   );
 }
@@ -41,6 +43,7 @@ const PromptTable: React.FC<PromptTableProps> = ({
   accessToken,
   isAdmin,
 }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
   const [modelHubData, setModelHubData] = useState<Map<string, ModelGroupInfo>>(new Map());
 
@@ -66,8 +69,8 @@ const PromptTable: React.FC<PromptTableProps> = ({
   }, [accessToken]);
 
   const columns = useMemo(
-    () => getPromptTableColumns({ modelHubData, isAdmin, onPromptClick, onDeleteClick }),
-    [modelHubData, isAdmin, onPromptClick, onDeleteClick],
+    () => getPromptTableColumns({ modelHubData, isAdmin, onPromptClick, onDeleteClick, t }),
+    [modelHubData, isAdmin, onPromptClick, onDeleteClick, t],
   );
 
   return (
@@ -82,7 +85,7 @@ const PromptTable: React.FC<PromptTableProps> = ({
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading prompts…"
+      loadingMessage={t("prompts.table.loading")}
       noDataMessage={<EmptyState />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTableColumns.tsx
index db0392bbd6e..a7e1cfcaccb 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/PromptTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 import { Copy, MoreHorizontal, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { CellTooltip, DateCell, IdentityCell, StatusBadge, StatusTone } from "@/components/shared/table_cells";
@@ -69,10 +71,11 @@ interface PromptRowActionsProps {
 }
 
 function PromptRowActions({ prompt, isAdmin, onDeleteClick }: PromptRowActionsProps) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open prompt actions"
+        aria-label={t("prompts.table.rowActions.open")}
         data-testid={`prompt-actions-${prompt.prompt_id}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -81,10 +84,10 @@ function PromptRowActions({ prompt, isAdmin, onDeleteClick }: PromptRowActionsPr
       <DropdownMenuContent align="end" className="w-52">
         <DropdownMenuItem
           data-testid="prompt-action-copy"
-          onClick={() => void copyToClipboard(prompt.prompt_id, "Prompt ID copied")}
+          onClick={() => void copyToClipboard(prompt.prompt_id, t("prompts.table.rowActions.idCopied"))}
         >
           <Copy />
-          Copy prompt ID
+          {t("prompts.table.rowActions.copyId")}
         </DropdownMenuItem>
         {isAdmin && (
           <>
@@ -95,13 +98,13 @@ function PromptRowActions({ prompt, isAdmin, onDeleteClick }: PromptRowActionsPr
               onClick={() =>
                 onDeleteClick?.(
                   prompt.prompt_id,
-                  prompt.prompt_id || "Unknown Prompt",
+                  prompt.prompt_id || t("prompts.table.rowActions.unknownPrompt"),
                   prompt.environment || "development",
                 )
               }
             >
               <Trash2 />
-              Delete
+              {t("prompts.table.rowActions.delete")}
             </DropdownMenuItem>
           </>
         )}
@@ -115,6 +118,7 @@ interface PromptTableColumnsDeps {
   isAdmin: boolean;
   onPromptClick?: (id: string, environment: string) => void;
   onDeleteClick?: (id: string, name: string, environment: string) => void;
+  t: TFunction;
 }
 
 export const getPromptTableColumns = ({
@@ -122,12 +126,13 @@ export const getPromptTableColumns = ({
   isAdmin,
   onPromptClick,
   onDeleteClick,
+  t,
 }: PromptTableColumnsDeps): ColumnDef<PromptSpec>[] => [
   {
     id: "prompt_id",
     accessorKey: "prompt_id",
-    meta: { title: "Prompt ID" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Prompt ID" />,
+    meta: { title: t("prompts.table.columns.promptId") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("prompts.table.columns.promptId")} />,
     size: 220,
     enableSorting: true,
     cell: ({ row }) => (
@@ -145,8 +150,8 @@ export const getPromptTableColumns = ({
   },
   {
     id: "model",
-    meta: { title: "Model" },
-    header: "Model",
+    meta: { title: t("prompts.table.columns.model") },
+    header: t("prompts.table.columns.model"),
     size: 200,
     enableSorting: false,
     cell: ({ row }) => <PromptModelCell prompt={row.original} modelHubData={modelHubData} />,
@@ -155,8 +160,8 @@ export const getPromptTableColumns = ({
     id: "created_at",
     accessorKey: "created_at",
     sortingFn: "datetime",
-    meta: { title: "Created At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created At" />,
+    meta: { title: t("prompts.table.columns.createdAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("prompts.table.columns.createdAt")} />,
     size: 160,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} />,
@@ -165,8 +170,8 @@ export const getPromptTableColumns = ({
     id: "updated_at",
     accessorKey: "updated_at",
     sortingFn: "datetime",
-    meta: { title: "Updated At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Updated At" />,
+    meta: { title: t("prompts.table.columns.updatedAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("prompts.table.columns.updatedAt")} />,
     size: 160,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.updated_at} />,
@@ -174,8 +179,8 @@ export const getPromptTableColumns = ({
   {
     id: "environment",
     accessorKey: "environment",
-    meta: { title: "Environment", skeleton: "badge" },
-    header: "Environment",
+    meta: { title: t("prompts.table.columns.environment"), skeleton: "badge" },
+    header: t("prompts.table.columns.environment"),
     size: 130,
     enableSorting: false,
     cell: ({ row }) => {
@@ -186,8 +191,8 @@ export const getPromptTableColumns = ({
   {
     id: "created_by",
     accessorKey: "created_by",
-    meta: { title: "Created By" },
-    header: "Created By",
+    meta: { title: t("prompts.table.columns.createdBy") },
+    header: t("prompts.table.columns.createdBy"),
     size: 160,
     enableSorting: false,
     cell: ({ row }) => {
@@ -209,8 +214,8 @@ export const getPromptTableColumns = ({
   {
     id: "prompt_type",
     accessorKey: "prompt_info.prompt_type",
-    meta: { title: "Type" },
-    header: "Type",
+    meta: { title: t("prompts.table.columns.type") },
+    header: t("prompts.table.columns.type"),
     size: 140,
     enableSorting: false,
     cell: ({ row }) => {
@@ -225,7 +230,7 @@ export const getPromptTableColumns = ({
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("prompts.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx
index b12f5fdef4d..954d897de9c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx
@@ -1,8 +1,10 @@
 import React, { useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Upload as UploadIcon, X } from "lucide-react";
 import { z } from "zod";
 import { convertPromptFileToJson, createPromptCall } from "@/components/networking";
 import { toast } from "@/lib/toast";
+import i18n from "@/i18n/i18n";
 import { Field, FieldDescription, FieldGroup, FieldSeparator, FieldTitle } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Button } from "@/components/ui/button";
@@ -36,8 +38,8 @@ const PROMPT_INTEGRATION_OPTIONS = [{ label: "dotprompt", value: "dotprompt" }];
 const addPromptSchema = z.object({
   prompt_id: z
     .string()
-    .min(1, "Please enter a prompt ID")
-    .regex(/^[a-zA-Z0-9_-]+$/, "Prompt ID can only contain letters, numbers, underscores, and hyphens"),
+    .min(1, { error: () => i18n.t("prompts.addForm.errors.idRequired") })
+    .regex(/^[a-zA-Z0-9_-]+$/, { error: () => i18n.t("prompts.addForm.errors.idInvalid") }),
   prompt_integration: z.string(),
 });
 
@@ -46,6 +48,7 @@ type AddPromptFormValues = z.infer<typeof addPromptSchema>;
 const EMPTY_VALUES: AddPromptFormValues = { prompt_id: "", prompt_integration: "dotprompt" };
 
 const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessToken, onSuccess }) => {
+  const { t } = useTranslation();
   const form = useZodForm(addPromptSchema, { defaultValues: EMPTY_VALUES });
   const [loading, setLoading] = useState(false);
   const [selectedFile, setSelectedFile] = useState<File | null>(null);
@@ -70,7 +73,7 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
     const picked = event.target.files?.[0];
     if (!picked) return;
     if (!picked.name.endsWith(".prompt")) {
-      toast.fromError("Please upload a .prompt file");
+      toast.fromError(t("prompts.addForm.toasts.fileRequired"));
       clearSelectedFile();
       return;
     }
@@ -104,21 +107,21 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
       };
     } catch (conversionError) {
       console.error("Error converting prompt file:", conversionError);
-      toast.fromError("Failed to convert prompt file to JSON");
+      toast.fromError(t("prompts.addForm.toasts.convertFailed"));
       return null;
     }
   };
 
   const handleSubmit = async (values: AddPromptFormValues) => {
     if (!accessToken) {
-      toast.fromError("Access token is required");
+      toast.fromError(t("prompts.addForm.toasts.tokenRequired"));
       return;
     }
 
     const isDotprompt = promptIntegration === "dotprompt";
 
     if (isDotprompt && !selectedFile) {
-      toast.fromError("Please upload a .prompt file");
+      toast.fromError(t("prompts.addForm.toasts.fileRequired"));
       return;
     }
 
@@ -134,12 +137,12 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
 
     try {
       await createPromptCall(accessToken, promptData);
-      toast.success("Prompt created successfully!");
+      toast.success(t("prompts.addForm.toasts.created"));
       handleCancel();
       onSuccess();
     } catch (createError) {
       console.error("Error creating prompt:", createError);
-      toast.fromError("Failed to create prompt");
+      toast.fromError(t("prompts.addForm.toasts.createFailed"));
     } finally {
       setLoading(false);
     }
@@ -149,17 +152,17 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
     <Dialog open={visible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
         <DialogHeader>
-          <DialogTitle>Add New Prompt</DialogTitle>
+          <DialogTitle>{t("prompts.addForm.title")}</DialogTitle>
         </DialogHeader>
         <form onSubmit={(event) => event.preventDefault()} noValidate>
           <FieldGroup>
-            <FormField control={form.control} name="prompt_id" label="Prompt ID">
+            <FormField control={form.control} name="prompt_id" label={t("prompts.addForm.fields.promptId")}>
               {({ ref, ...field }) => (
-                <Input {...field} ref={ref} placeholder="Enter unique prompt ID (e.g., my_prompt_id)" />
+                <Input {...field} ref={ref} placeholder={t("prompts.addForm.fields.promptIdPlaceholder")} />
               )}
             </FormField>
 
-            <FormField control={form.control} name="prompt_integration" label="Prompt Integration">
+            <FormField control={form.control} name="prompt_integration" label={t("prompts.addForm.fields.integration")}>
               {({ id, value, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
                 <Select items={PROMPT_INTEGRATION_OPTIONS} value={value} onValueChange={handleIntegrationChange}>
                   <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
@@ -180,25 +183,25 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
               <>
                 <FieldSeparator />
                 <Field>
-                  <FieldTitle>Prompt File</FieldTitle>
+                  <FieldTitle>{t("prompts.addForm.fields.file")}</FieldTitle>
                   <input
                     ref={fileInputRef}
                     type="file"
                     accept=".prompt"
-                    aria-label="Prompt file"
+                    aria-label={t("prompts.addForm.fields.fileInput")}
                     className="sr-only"
                     onChange={handleFileChange}
                   />
                   <Button type="button" variant="outline" onClick={() => fileInputRef.current?.click()}>
                     <UploadIcon />
-                    Select .prompt File
+                    {t("prompts.addForm.fields.selectFile")}
                   </Button>
                   {selectedFile && (
                     <div className="mt-2 flex items-center gap-2 text-sm text-muted-foreground">
-                      <span>Selected: {selectedFile.name}</span>
+                      <span>{t("prompts.addForm.fields.selected", { name: selectedFile.name })}</span>
                       <button
                         type="button"
-                        aria-label={`Remove ${selectedFile.name}`}
+                        aria-label={t("prompts.addForm.fields.removeFile", { name: selectedFile.name })}
                         onClick={clearSelectedFile}
                         className="text-muted-foreground hover:text-destructive"
                       >
@@ -206,7 +209,7 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
                       </button>
                     </div>
                   )}
-                  <FieldDescription>Upload a .prompt file that follows the Dotprompt specification</FieldDescription>
+                  <FieldDescription>{t("prompts.addForm.fields.fileDescription")}</FieldDescription>
                 </Field>
               </>
             )}
@@ -214,11 +217,11 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
         </form>
         <DialogFooter>
           <Button type="button" variant="outline" onClick={handleCancel}>
-            Cancel
+            {t("prompts.addForm.cancel")}
           </Button>
           <Button type="button" disabled={loading} onClick={() => void form.handleSubmit(handleSubmit)()}>
             {loading && <UiLoadingSpinner className="size-4" />}
-            Create Prompt
+            {t("prompts.addForm.submit")}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/index.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/index.tsx
index 2d8d905c480..b6e795f7a47 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/index.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/index.tsx
@@ -1,4 +1,6 @@
 import React, { useState, useEffect } from "react";
+import type { ParseKeys } from "i18next";
+import { useTranslation } from "react-i18next";
 
 import { Plus, Upload } from "lucide-react";
 import { getPromptsList, PromptSpec, ListPromptsResponse, deletePromptCall } from "@/components/networking";
@@ -20,16 +22,16 @@ import {
 } from "@/components/ui/alert-dialog";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 
-const ALL_ENVIRONMENTS_LABEL = "All Environments";
+const ALL_ENVIRONMENTS_LABEL_KEY: ParseKeys = "prompts.panel.environments.all";
 
-const ENVIRONMENT_OPTIONS = [
-  { label: "Development", value: "development" },
-  { label: "Staging", value: "staging" },
-  { label: "Production", value: "production" },
+const ENVIRONMENT_OPTIONS: { labelKey: ParseKeys; value: string }[] = [
+  { labelKey: "prompts.panel.environments.development", value: "development" },
+  { labelKey: "prompts.panel.environments.staging", value: "staging" },
+  { labelKey: "prompts.panel.environments.production", value: "production" },
 ];
 
 // SelectValue falls back to the raw value unless the root can map it to a label.
-const ENVIRONMENT_ITEMS = [{ label: ALL_ENVIRONMENTS_LABEL, value: null }, ...ENVIRONMENT_OPTIONS];
+const ENVIRONMENT_ITEMS = [{ labelKey: ALL_ENVIRONMENTS_LABEL_KEY, value: null }, ...ENVIRONMENT_OPTIONS];
 
 interface PromptsProps {
   accessToken: string | null;
@@ -37,6 +39,7 @@ interface PromptsProps {
 }
 
 const PromptsPanel: React.FC<PromptsProps> = ({ accessToken, userRole }) => {
+  const { t } = useTranslation();
   const [promptsList, setPromptsList] = useState<PromptSpec[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [selectedEnvironment, setSelectedEnvironment] = useState<string | undefined>(undefined);
@@ -123,11 +126,13 @@ const PromptsPanel: React.FC<PromptsProps> = ({ accessToken, userRole }) => {
     setIsDeleting(true);
     try {
       await deletePromptCall(accessToken, promptToDelete.id, promptToDelete.environment);
-      toast.success(`Prompt "${promptToDelete.name}" deleted successfully from ${promptToDelete.environment}`);
+      toast.success(
+        t("prompts.panel.toasts.deleted", { name: promptToDelete.name, environment: promptToDelete.environment }),
+      );
       fetchPrompts(); // Refresh the list
     } catch (error) {
       console.error("Error deleting prompt:", error);
-      toast.fromError("Failed to delete prompt");
+      toast.fromError(t("prompts.panel.toasts.deleteFailed"));
     } finally {
       setIsDeleting(false);
       setPromptToDelete(null);
@@ -165,28 +170,28 @@ const PromptsPanel: React.FC<PromptsProps> = ({ accessToken, userRole }) => {
                 <>
                   <Button onClick={handleAddPrompt} disabled={!accessToken}>
                     <Plus />
-                    Add New Prompt
+                    {t("prompts.panel.addNew")}
                   </Button>
                   <Button onClick={handleAddPromptFromFile} disabled={!accessToken} variant="secondary">
                     <Upload />
-                    Upload .prompt File
+                    {t("prompts.panel.uploadFile")}
                   </Button>
                 </>
               )}
             </div>
             <Select
-              items={ENVIRONMENT_ITEMS}
+              items={ENVIRONMENT_ITEMS.map((item) => ({ label: t(item.labelKey), value: item.value }))}
               value={selectedEnvironment ?? null}
               onValueChange={(value) => setSelectedEnvironment((value as string | null) ?? undefined)}
             >
               <SelectTrigger className="w-[180px]">
-                <SelectValue placeholder={ALL_ENVIRONMENTS_LABEL} />
+                <SelectValue placeholder={t(ALL_ENVIRONMENTS_LABEL_KEY)} />
               </SelectTrigger>
               <SelectContent>
-                <SelectItem value={null}>{ALL_ENVIRONMENTS_LABEL}</SelectItem>
+                <SelectItem value={null}>{t(ALL_ENVIRONMENTS_LABEL_KEY)}</SelectItem>
                 {ENVIRONMENT_OPTIONS.map((option) => (
                   <SelectItem key={option.value} value={option.value}>
-                    {option.label}
+                    {t(option.labelKey)}
                   </SelectItem>
                 ))}
               </SelectContent>
@@ -220,16 +225,18 @@ const PromptsPanel: React.FC<PromptsProps> = ({ accessToken, userRole }) => {
         >
           <AlertDialogContent>
             <AlertDialogHeader>
-              <AlertDialogTitle>Delete Prompt</AlertDialogTitle>
+              <AlertDialogTitle>{t("prompts.panel.deleteDialog.title")}</AlertDialogTitle>
               <AlertDialogDescription>
-                Are you sure you want to delete the {promptToDelete.environment} copy of prompt: {promptToDelete.name}?
-                This action cannot be undone.
+                {t("prompts.panel.deleteDialog.description", {
+                  environment: promptToDelete.environment,
+                  name: promptToDelete.name,
+                })}
               </AlertDialogDescription>
             </AlertDialogHeader>
             <AlertDialogFooter>
-              <AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
+              <AlertDialogCancel disabled={isDeleting}>{t("prompts.panel.deleteDialog.cancel")}</AlertDialogCancel>
               <Button variant="destructive" onClick={handleDeleteConfirm} disabled={isDeleting}>
-                Delete
+                {t("prompts.panel.deleteDialog.confirm")}
               </Button>
             </AlertDialogFooter>
           </AlertDialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DeveloperMessageCard.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DeveloperMessageCard.tsx
index 27c8907012c..ce417d00c62 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DeveloperMessageCard.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DeveloperMessageCard.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "@/components/ui/card";
 import VariableTextArea from "../variable_textarea";
 
@@ -8,16 +9,17 @@ interface DeveloperMessageCardProps {
 }
 
 const DeveloperMessageCard: React.FC<DeveloperMessageCardProps> = ({ value, onChange }) => {
+  const { t } = useTranslation();
   return (
     <Card>
       <CardContent className="p-3">
-        <p className="mb-2 text-sm font-medium text-foreground">Developer message</p>
-        <p className="mb-2 text-xs text-muted-foreground">Optional system instructions for the model</p>
+        <p className="mb-2 text-sm font-medium text-foreground">{t("prompts.developerMessage.title")}</p>
+        <p className="mb-2 text-xs text-muted-foreground">{t("prompts.developerMessage.description")}</p>
         <VariableTextArea
           value={value}
           onChange={onChange}
           rows={3}
-          placeholder="e.g., You are a helpful assistant..."
+          placeholder={t("prompts.developerMessage.placeholder")}
         />
       </CardContent>
     </Card>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DotpromptViewTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DotpromptViewTab.tsx
index 1be456c9b09..b1e1f78bbd3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DotpromptViewTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/DotpromptViewTab.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { PromptType } from "./types";
 import { convertToDotPrompt } from "./utils";
 
@@ -7,13 +8,14 @@ interface DotpromptViewTabProps {
 }
 
 const DotpromptViewTab: React.FC<DotpromptViewTabProps> = ({ prompt }) => {
+  const { t } = useTranslation();
   const dotpromptContent = convertToDotPrompt(prompt);
 
   return (
     <div className="p-6">
       <div className="mb-4">
-        <h3 className="text-sm font-medium text-foreground mb-2">Generated .prompt file</h3>
-        <p className="text-xs text-muted-foreground">This is the dotprompt format that will be saved to the database</p>
+        <h3 className="text-sm font-medium text-foreground mb-2">{t("prompts.dotpromptView.title")}</h3>
+        <p className="text-xs text-muted-foreground">{t("prompts.dotpromptView.description")}</p>
       </div>
       <div className="bg-muted border border-border rounded-lg p-4 overflow-auto">
         <pre className="text-sm text-foreground font-mono whitespace-pre-wrap">{dotpromptContent}</pre>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ModelConfigCard.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ModelConfigCard.tsx
index e9b526c9703..83264e86d1a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ModelConfigCard.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ModelConfigCard.tsx
@@ -3,6 +3,7 @@ import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { SettingsIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import ModelSelector from "@/components/common_components/ModelSelector";
 
 interface ModelConfigCardProps {
@@ -24,6 +25,7 @@ const ModelConfigCard: React.FC<ModelConfigCardProps> = ({
   onTemperatureChange,
   onMaxTokensChange,
 }) => {
+  const { t } = useTranslation();
   const [showConfig, setShowConfig] = useState(false);
 
   return (
@@ -34,19 +36,19 @@ const ModelConfigCard: React.FC<ModelConfigCardProps> = ({
 
       <Button type="button" variant="outline" onClick={() => setShowConfig(!showConfig)} className="gap-2">
         <SettingsIcon size={16} />
-        <span>Parameters</span>
+        <span>{t("prompts.modelConfig.parameters")}</span>
       </Button>
 
       <Dialog open={showConfig} onOpenChange={setShowConfig}>
         <DialogContent>
           <DialogHeader>
-            <DialogTitle>Model Parameters</DialogTitle>
+            <DialogTitle>{t("prompts.modelConfig.title")}</DialogTitle>
           </DialogHeader>
           <div className="space-y-4">
             <div>
               <div className="flex items-center justify-between mb-2">
                 <label htmlFor="prompt-temperature" className="text-sm text-foreground">
-                  Temperature
+                  {t("prompts.modelConfig.temperature")}
                 </label>
                 <Input
                   id="prompt-temperature"
@@ -63,7 +65,7 @@ const ModelConfigCard: React.FC<ModelConfigCardProps> = ({
             <div>
               <div className="flex items-center justify-between mb-2">
                 <label htmlFor="prompt-max-tokens" className="text-sm text-foreground">
-                  Max Tokens
+                  {t("prompts.modelConfig.maxTokens")}
                 </label>
                 <Input
                   id="prompt-max-tokens"
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptCodeSnippets.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptCodeSnippets.tsx
index b4f3d33c195..fd7e78f5cb4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptCodeSnippets.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptCodeSnippets.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import { CodeIcon, CopyIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
 import { coy } from "react-syntax-highlighter/dist/esm/styles/prism";
 
@@ -38,6 +39,7 @@ const PromptCodeSnippets: React.FC<PromptCodeSnippetsProps> = ({
   environment,
   proxySettings,
 }) => {
+  const { t } = useTranslation();
   const syntaxTheme = useSyntaxTheme(coy);
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [selectedLanguage, setSelectedLanguage] = useState<"curl" | "python" | "javascript">("curl");
@@ -252,18 +254,18 @@ main();`;
     <>
       <Button variant="outline" onClick={showModal}>
         <CodeIcon />
-        Get Code
+        {t("prompts.codeSnippets.trigger")}
       </Button>
 
       <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-3xl">
           <DialogHeader>
-            <DialogTitle>Generated Code</DialogTitle>
+            <DialogTitle>{t("prompts.codeSnippets.title")}</DialogTitle>
           </DialogHeader>
           <div className="flex justify-between items-center mb-4">
             <div>
               <label htmlFor="prompt-code-language" className="font-medium block mb-1 text-foreground">
-                Language
+                {t("prompts.codeSnippets.language")}
               </label>
               <Select
                 items={LANGUAGE_ITEMS}
@@ -286,19 +288,19 @@ main();`;
               variant="outline"
               onClick={() => {
                 navigator.clipboard.writeText(generatedCode);
-                toast.success("Copied to clipboard!");
+                toast.success(t("prompts.codeSnippets.copied"));
               }}
             >
               <CopyIcon />
-              Copy to Clipboard
+              {t("prompts.codeSnippets.copy")}
             </Button>
           </div>
 
           <Tabs value={selectedTab} onValueChange={(value) => setSelectedTab(String(value))}>
-            <TabsList aria-label="Generated code type">
-              <TabsTrigger value="basic">Basic</TabsTrigger>
-              <TabsTrigger value="messages">With Messages</TabsTrigger>
-              <TabsTrigger value="version">With Version</TabsTrigger>
+            <TabsList aria-label={t("prompts.codeSnippets.typeLabel")}>
+              <TabsTrigger value="basic">{t("prompts.codeSnippets.tabs.basic")}</TabsTrigger>
+              <TabsTrigger value="messages">{t("prompts.codeSnippets.tabs.messages")}</TabsTrigger>
+              <TabsTrigger value="version">{t("prompts.codeSnippets.tabs.version")}</TabsTrigger>
             </TabsList>
           </Tabs>
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptEditorHeader.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptEditorHeader.tsx
index 0f001979c28..c0e28631ade 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptEditorHeader.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptEditorHeader.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { ArrowLeftIcon, SaveIcon, ClockIcon, LoaderCircleIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import PromptCodeSnippets from "./PromptCodeSnippets";
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
@@ -7,9 +8,9 @@ import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 
 const ENVIRONMENT_ITEMS = [
-  { value: "development", label: "Development" },
-  { value: "staging", label: "Staging" },
-  { value: "production", label: "Production" },
+  { value: "development", labelKey: "prompts.editorHeader.environments.development" },
+  { value: "staging", labelKey: "prompts.editorHeader.environments.staging" },
+  { value: "production", labelKey: "prompts.editorHeader.environments.production" },
 ] as const;
 
 interface PromptEditorHeaderProps {
@@ -48,15 +49,16 @@ const PromptEditorHeader: React.FC<PromptEditorHeaderProps> = ({
   environment,
   onEnvironmentChange,
 }) => {
+  const { t } = useTranslation();
   return (
     <div className="bg-background border-b border-border px-6 py-3 flex items-center justify-between">
       <div className="flex items-center space-x-3">
         <Button variant="ghost" onClick={onBack} size="sm">
           <ArrowLeftIcon />
-          Back
+          {t("prompts.editorHeader.back")}
         </Button>
         <Input
-          aria-label="Prompt name"
+          aria-label={t("prompts.editorHeader.nameLabel")}
           value={promptName}
           onChange={(e) => onNameChange(e.target.value)}
           className="text-base font-medium border-none shadow-none"
@@ -64,23 +66,23 @@ const PromptEditorHeader: React.FC<PromptEditorHeaderProps> = ({
         />
         {version && <Badge>{version}</Badge>}
         <Select
-          items={ENVIRONMENT_ITEMS}
+          items={ENVIRONMENT_ITEMS.map((item) => ({ value: item.value, label: t(item.labelKey) }))}
           value={environment}
           onValueChange={(value) => onEnvironmentChange(String(value))}
         >
-          <SelectTrigger size="sm" className="w-[140px]" aria-label="Environment">
+          <SelectTrigger size="sm" className="w-[140px]" aria-label={t("prompts.editorHeader.environmentLabel")}>
             <SelectValue />
           </SelectTrigger>
           <SelectContent>
             {ENVIRONMENT_ITEMS.map((item) => (
               <SelectItem key={item.value} value={item.value}>
-                {item.label}
+                {t(item.labelKey)}
               </SelectItem>
             ))}
           </SelectContent>
         </Select>
-        <Badge variant="secondary">Draft</Badge>
-        <span className="text-xs text-muted-foreground">Unsaved changes</span>
+        <Badge variant="secondary">{t("prompts.editorHeader.draft")}</Badge>
+        <span className="text-xs text-muted-foreground">{t("prompts.editorHeader.unsaved")}</span>
       </div>
       <div className="flex items-center space-x-2">
         <PromptCodeSnippets
@@ -95,12 +97,12 @@ const PromptEditorHeader: React.FC<PromptEditorHeaderProps> = ({
         {editMode && onShowHistory && (
           <Button variant="outline" onClick={onShowHistory}>
             <ClockIcon />
-            History
+            {t("prompts.editorHeader.history")}
           </Button>
         )}
         <Button onClick={onSave} disabled={isSaving}>
           {isSaving ? <LoaderCircleIcon className="animate-spin" /> : <SaveIcon />}
-          {editMode ? "Update" : "Save"}
+          {editMode ? t("prompts.editorHeader.update") : t("prompts.editorHeader.save")}
         </Button>
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptMessagesCard.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptMessagesCard.tsx
index e69cae030c0..04722d372f4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptMessagesCard.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PromptMessagesCard.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { PlusIcon, TrashIcon, GripVerticalIcon } from "lucide-react";
 import VariableTextArea from "../variable_textarea";
 import { Message } from "./types";
@@ -7,9 +8,9 @@ import { Card } from "@/components/ui/card";
 import { Select as ShadcnSelect, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 
 const ROLE_ITEMS = [
-  { value: "user", label: "User" },
-  { value: "assistant", label: "Assistant" },
-  { value: "system", label: "System" },
+  { value: "user", labelKey: "prompts.messagesCard.roles.user" },
+  { value: "assistant", labelKey: "prompts.messagesCard.roles.assistant" },
+  { value: "system", labelKey: "prompts.messagesCard.roles.system" },
 ] as const;
 
 interface PromptMessagesCardProps {
@@ -27,6 +28,7 @@ const PromptMessagesCard: React.FC<PromptMessagesCardProps> = ({
   onRemoveMessage,
   onMoveMessage,
 }) => {
+  const { t } = useTranslation();
   const [draggedIndex, setDraggedIndex] = useState<number | null>(null);
   const [dragOverIndex, setDragOverIndex] = useState<number | null>(null);
 
@@ -56,9 +58,15 @@ const PromptMessagesCard: React.FC<PromptMessagesCardProps> = ({
   return (
     <Card className="p-3">
       <div className="mb-2">
-        <p className="text-sm font-medium">Prompt messages</p>
+        <p className="text-sm font-medium">{t("prompts.messagesCard.title")}</p>
         <p className="text-muted-foreground text-xs mt-1">
-          Use <code className="bg-muted px-1 rounded-sm text-xs">{"{{variable}}"}</code> syntax for template variables
+          <Trans
+            i18nKey="prompts.messagesCard.syntaxHint"
+            components={{
+              code: <code className="bg-muted px-1 rounded-sm text-xs" />,
+              variable: <>{"{{variable}}"}</>,
+            }}
+          />
         </p>
       </div>
       <div className="space-y-2">
@@ -76,21 +84,21 @@ const PromptMessagesCard: React.FC<PromptMessagesCardProps> = ({
           >
             <div className="bg-muted px-2 py-1.5 border-b border-border flex items-center justify-between">
               <ShadcnSelect
-                items={ROLE_ITEMS}
+                items={ROLE_ITEMS.map((item) => ({ value: item.value, label: t(item.labelKey) }))}
                 value={message.role}
                 onValueChange={(value) => onUpdateMessage(index, "role", String(value))}
               >
                 <SelectTrigger
                   size="sm"
                   className="w-[110px] border-0 shadow-none"
-                  aria-label={`Message ${index + 1} role`}
+                  aria-label={t("prompts.messagesCard.roleLabel", { number: index + 1 })}
                 >
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
                   {ROLE_ITEMS.map((item) => (
                     <SelectItem key={item.value} value={item.value}>
-                      {item.label}
+                      {t(item.labelKey)}
                     </SelectItem>
                   ))}
                 </SelectContent>
@@ -100,7 +108,7 @@ const PromptMessagesCard: React.FC<PromptMessagesCardProps> = ({
                   <Button
                     variant="ghost"
                     size="icon-sm"
-                    aria-label={`Remove message ${index + 1}`}
+                    aria-label={t("prompts.messagesCard.remove", { number: index + 1 })}
                     onClick={() => onRemoveMessage(index)}
                   >
                     <TrashIcon size={14} />
@@ -116,7 +124,7 @@ const PromptMessagesCard: React.FC<PromptMessagesCardProps> = ({
                 value={message.content}
                 onChange={(value) => onUpdateMessage(index, "content", value)}
                 rows={3}
-                placeholder="Enter prompt content..."
+                placeholder={t("prompts.messagesCard.contentPlaceholder")}
               />
             </div>
           </div>
@@ -124,7 +132,7 @@ const PromptMessagesCard: React.FC<PromptMessagesCardProps> = ({
       </div>
       <Button variant="ghost" size="sm" onClick={onAddMessage} className="mt-2">
         <PlusIcon size={14} className="mr-1" />
-        Add message
+        {t("prompts.messagesCard.add")}
       </Button>
     </Card>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PublishModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PublishModal.tsx
index e37efd3464a..8aeb52efab1 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PublishModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/PublishModal.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { LoaderCircleIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -28,36 +29,35 @@ const PublishModal: React.FC<PublishModalProps> = ({
   onPublish,
   onCancel,
 }) => {
+  const { t } = useTranslation();
   return (
     <Dialog open={visible} onOpenChange={(open) => !open && onCancel()}>
       <DialogContent>
         <DialogHeader>
-          <DialogTitle>Publish Prompt</DialogTitle>
-          <DialogDescription>Published prompts are versioned and can be used in API calls.</DialogDescription>
+          <DialogTitle>{t("prompts.publishModal.title")}</DialogTitle>
+          <DialogDescription>{t("prompts.publishModal.description")}</DialogDescription>
         </DialogHeader>
         <div className="py-4">
           <label htmlFor="publish-prompt-name" className="mb-2 block">
-            Name
+            {t("prompts.publishModal.nameLabel")}
           </label>
           <Input
             id="publish-prompt-name"
             value={promptName}
             onChange={(e) => onNameChange(e.target.value)}
-            placeholder="Enter prompt name"
+            placeholder={t("prompts.publishModal.namePlaceholder")}
             onKeyDown={(event) => event.key === "Enter" && onPublish()}
             autoFocus
           />
-          <p className="text-muted-foreground text-xs mt-2">
-            Published prompts can be used in API calls and are versioned for easy tracking.
-          </p>
+          <p className="text-muted-foreground text-xs mt-2">{t("prompts.publishModal.hint")}</p>
         </div>
         <DialogFooter>
           <Button variant="outline" onClick={onCancel}>
-            Cancel
+            {t("prompts.publishModal.cancel")}
           </Button>
           <Button onClick={onPublish} disabled={isSaving}>
             {isSaving && <LoaderCircleIcon className="animate-spin" />}
-            Publish
+            {t("prompts.publishModal.publish")}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ToolsCard.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ToolsCard.tsx
index c8c8f3e68fa..17f22abfe13 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ToolsCard.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/ToolsCard.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { PlusIcon, TrashIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Tool } from "./types";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
@@ -12,17 +13,18 @@ interface ToolsCardProps {
 }
 
 const ToolsCard: React.FC<ToolsCardProps> = ({ tools, onAddTool, onEditTool, onRemoveTool }) => {
+  const { t } = useTranslation();
   return (
     <Card className="p-3">
       <div className="flex items-center justify-between mb-2">
-        <p className="text-sm font-medium">Tools</p>
+        <p className="text-sm font-medium">{t("prompts.toolsCard.title")}</p>
         <Button variant="ghost" size="sm" onClick={onAddTool}>
           <PlusIcon size={14} className="mr-1" />
-          Add
+          {t("prompts.toolsCard.add")}
         </Button>
       </div>
       {tools.length === 0 ? (
-        <p className="text-muted-foreground text-xs">No tools added</p>
+        <p className="text-muted-foreground text-xs">{t("prompts.toolsCard.empty")}</p>
       ) : (
         <div className="space-y-2">
           {tools.map((tool, index) => (
@@ -33,12 +35,12 @@ const ToolsCard: React.FC<ToolsCardProps> = ({ tools, onAddTool, onEditTool, onR
               </div>
               <div className="flex items-center space-x-1 ml-2">
                 <Button variant="ghost" size="sm" onClick={() => onEditTool(index)}>
-                  Edit
+                  {t("prompts.toolsCard.edit")}
                 </Button>
                 <Button
                   variant="ghost"
                   size="icon-sm"
-                  aria-label={`Remove ${tool.name}`}
+                  aria-label={t("prompts.toolsCard.remove", { name: tool.name })}
                   onClick={() => onRemoveTool(index)}
                 >
                   <TrashIcon size={14} aria-hidden="true" />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/VersionHistorySidePanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/VersionHistorySidePanel.tsx
index 64bc7755694..9449317d5bf 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/VersionHistorySidePanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/VersionHistorySidePanel.tsx
@@ -4,6 +4,7 @@ import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { XIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 interface VersionHistorySidePanelProps {
   isOpen: boolean;
@@ -22,6 +23,7 @@ const VersionHistorySidePanel: React.FC<VersionHistorySidePanelProps> = ({
   activeVersionId,
   onSelectVersion,
 }) => {
+  const { t } = useTranslation();
   const [versions, setVersions] = useState<PromptSpec[]>([]);
   const [loading, setLoading] = useState(false);
 
@@ -90,23 +92,23 @@ const VersionHistorySidePanel: React.FC<VersionHistorySidePanelProps> = ({
     >
       <Button type="button" variant="ghost" size="icon-sm" className="absolute top-4 right-4" onClick={onClose}>
         <XIcon />
-        <span className="sr-only">Close</span>
+        <span className="sr-only">{t("prompts.versionHistory.close")}</span>
       </Button>
       <header className="flex flex-col gap-1.5 p-4">
         <h2 id="version-history-title" className="font-medium text-foreground">
-          Version History
+          {t("prompts.versionHistory.title")}
         </h2>
       </header>
       <div className="overflow-y-auto px-4 pb-4">
         {loading ? (
-          <div className="space-y-3" role="status" aria-label="Loading version history">
+          <div className="space-y-3" role="status" aria-label={t("prompts.versionHistory.loading")}>
             <Skeleton className="h-24 w-full" />
             <Skeleton className="h-24 w-full" />
             <Skeleton className="h-24 w-full" />
             <Skeleton className="h-24 w-full" />
           </div>
         ) : versions.length === 0 ? (
-          <div className="text-center py-8 text-muted-foreground">No version history available.</div>
+          <div className="text-center py-8 text-muted-foreground">{t("prompts.versionHistory.empty")}</div>
         ) : (
           <div className="space-y-4">
             {versions.map((item, index) => {
@@ -138,15 +140,17 @@ const VersionHistorySidePanel: React.FC<VersionHistorySidePanelProps> = ({
                   <div className="flex justify-between items-start mb-2">
                     <div className="flex items-center gap-2">
                       <Badge variant="secondary">{getVersionNumber(item)}</Badge>
-                      {index === 0 && <Badge>Latest</Badge>}
+                      {index === 0 && <Badge>{t("prompts.versionHistory.latest")}</Badge>}
                     </div>
-                    {isSelected && <Badge variant="secondary">Active</Badge>}
+                    {isSelected && <Badge variant="secondary">{t("prompts.versionHistory.active")}</Badge>}
                   </div>
 
                   <div className="flex flex-col gap-1">
                     <span className="text-sm text-muted-foreground font-medium">{formatDate(item.created_at)}</span>
                     <span className="text-xs text-muted-foreground">
-                      {item.prompt_info?.prompt_type === "db" ? "Saved to Database" : "Config Prompt"}
+                      {item.prompt_info?.prompt_type === "db"
+                        ? t("prompts.versionHistory.savedToDatabase")
+                        : t("prompts.versionHistory.configPrompt")}
                     </span>
                   </div>
                 </button>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/EmptyState.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/EmptyState.tsx
index 5b381427988..962a946f483 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/EmptyState.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/EmptyState.tsx
@@ -1,18 +1,20 @@
 import React from "react";
 import { Bot } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 interface EmptyStateProps {
   hasVariables: boolean;
 }
 
 const EmptyState: React.FC<EmptyStateProps> = ({ hasVariables }) => {
+  const { t } = useTranslation();
   return (
     <div className="h-full flex flex-col items-center justify-center text-muted-foreground">
       <Bot className="mb-4 size-12" aria-hidden="true" />
       <span className="text-base">
         {hasVariables
-          ? "Fill in the variables above, then type a message to start testing"
-          : "Type a message below to start testing your prompt"}
+          ? t("prompts.conversation.emptyState.withVariables")
+          : t("prompts.conversation.emptyState.withoutVariables")}
       </span>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageInput.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageInput.tsx
index d2c47a2dd4d..35943d6283e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageInput.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageInput.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { ArrowUp } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Textarea } from "@/components/ui/textarea";
 
@@ -22,6 +23,7 @@ const MessageInput: React.FC<MessageInputProps> = ({
   onKeyDown,
   onCancel,
 }) => {
+  const { t } = useTranslation();
   return (
     <div className="flex items-center gap-2">
       <div className="flex items-center flex-1 bg-background border border-border rounded-xl px-3 py-1 min-h-[44px]">
@@ -29,7 +31,7 @@ const MessageInput: React.FC<MessageInputProps> = ({
           value={inputMessage}
           onChange={(e) => onInputChange(e.target.value)}
           onKeyDown={onKeyDown}
-          placeholder="Type your message... (Shift+Enter for new line)"
+          placeholder={t("prompts.conversation.input.placeholder")}
           disabled={isLoading}
           rows={1}
           className="field-sizing-content max-h-24 min-h-8 flex-1 resize-none overflow-y-auto border-0 bg-transparent px-0 py-1 text-sm shadow-none focus-visible:ring-0"
@@ -41,7 +43,7 @@ const MessageInput: React.FC<MessageInputProps> = ({
           onClick={onSend}
           disabled={isDisabled}
           className="ml-2 shrink-0 rounded-full"
-          aria-label="Send message"
+          aria-label={t("prompts.conversation.input.send")}
         >
           <ArrowUp aria-hidden="true" />
         </Button>
@@ -49,7 +51,7 @@ const MessageInput: React.FC<MessageInputProps> = ({
 
       {isLoading && (
         <Button type="button" variant="destructive" onClick={onCancel}>
-          Cancel
+          {t("prompts.conversation.input.cancel")}
         </Button>
       )}
     </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx
index 48d6697a052..c5e4498a722 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { Loader2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import EmptyState from "./EmptyState";
 import MessageBubble from "./MessageBubble";
 import { Message } from "./types";
@@ -12,6 +13,7 @@ interface MessageListProps {
 }
 
 const MessageList: React.FC<MessageListProps> = ({ messages, isLoading, hasVariables, messagesEndRef }) => {
+  const { t } = useTranslation();
   return (
     <div className="flex-1 overflow-y-auto p-4 pb-0">
       {messages.length === 0 && <EmptyState hasVariables={hasVariables} />}
@@ -22,7 +24,10 @@ const MessageList: React.FC<MessageListProps> = ({ messages, isLoading, hasVaria
 
       {isLoading && (
         <div className="flex justify-center items-center my-4">
-          <Loader2 className="size-6 animate-spin text-muted-foreground" aria-label="Loading response" />
+          <Loader2
+            className="size-6 animate-spin text-muted-foreground"
+            aria-label={t("prompts.conversation.list.loadingResponse")}
+          />
         </div>
       )}
       <div ref={messagesEndRef} style={{ height: "1px" }} />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableInput.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableInput.tsx
index 96397ef4afa..64a8b790ade 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableInput.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableInput.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Input } from "@/components/ui/input";
 
 interface VariableInputProps {
@@ -8,13 +9,14 @@ interface VariableInputProps {
 }
 
 const VariableInput: React.FC<VariableInputProps> = ({ extractedVariables, variables, onVariableChange }) => {
+  const { t } = useTranslation();
   if (extractedVariables.length === 0) {
     return null;
   }
 
   return (
     <div className="p-4 border-b border-border bg-accent">
-      <h3 className="text-sm font-semibold text-foreground mb-3">Fill in template variables to start testing</h3>
+      <h3 className="text-sm font-semibold text-foreground mb-3">{t("prompts.conversation.variables.title")}</h3>
       <div className="space-y-2">
         {extractedVariables.map((varName) => (
           <div key={varName}>
@@ -26,7 +28,7 @@ const VariableInput: React.FC<VariableInputProps> = ({ extractedVariables, varia
             <Input
               value={variables[varName] || ""}
               onChange={(e) => onVariableChange(varName, e.target.value)}
-              placeholder={`Enter value for ${varName}`}
+              placeholder={t("prompts.conversation.variables.placeholder", { name: varName })}
             />
           </div>
         ))}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableWarning.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableWarning.tsx
index b4b710e37a0..4443ca07baa 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableWarning.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/VariableWarning.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 
 interface VariableWarningProps {
   extractedVariables: string[];
@@ -6,6 +7,7 @@ interface VariableWarningProps {
 }
 
 const VariableWarning: React.FC<VariableWarningProps> = ({ extractedVariables, variables }) => {
+  const { t } = useTranslation();
   const missingVariables = extractedVariables.filter(
     (varName) => !variables[varName] || variables[varName].trim() === "",
   );
@@ -19,9 +21,11 @@ const VariableWarning: React.FC<VariableWarningProps> = ({ extractedVariables, v
       <div className="flex items-start gap-2">
         <span className="text-warning text-sm">⚠️</span>
         <div className="flex-1">
-          <p className="text-sm text-warning font-medium mb-1">Please fill in all template variables above</p>
+          <p className="text-sm text-warning font-medium mb-1">{t("prompts.conversation.warning.title")}</p>
           <p className="text-xs text-warning">
-            Missing: {missingVariables.map((varName) => `{{${varName}}}`).join(", ")}
+            {t("prompts.conversation.warning.missing", {
+              variables: missingVariables.map((varName) => `{{${varName}}}`).join(", "),
+            })}
           </p>
         </div>
       </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/index.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/index.tsx
index e3cc15bf48b..4f53f4189cf 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/index.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/index.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { ConversationPanelProps } from "./types";
 import { useConversation } from "./useConversation";
@@ -9,6 +10,7 @@ import VariableWarning from "./VariableWarning";
 import MessageInput from "./MessageInput";
 
 const ConversationPanel: React.FC<ConversationPanelProps> = ({ prompt, accessToken }) => {
+  const { t } = useTranslation();
   const {
     isLoading,
     messages,
@@ -40,7 +42,7 @@ const ConversationPanel: React.FC<ConversationPanelProps> = ({ prompt, accessTok
         <div className="p-3 border-b border-border bg-background flex justify-end">
           <Button type="button" variant="outline" size="sm" onClick={handleClearConversation}>
             <Trash2 aria-hidden="true" />
-            Clear Chat
+            {t("prompts.conversation.panel.clearChat")}
           </Button>
         </div>
       )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/useConversation.ts b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/useConversation.ts
index 199c2cb3970..6fd351a3162 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/useConversation.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/useConversation.ts
@@ -1,4 +1,5 @@
 import { useState, useRef, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import { TokenUsage } from "@/components/chat_ui/ResponseMetrics";
 import { Message } from "./types";
@@ -7,6 +8,7 @@ import { getProxyBaseUrl, getGlobalLitellmHeaderName } from "@/components/networ
 import { streamErrorMessage } from "@/utils/streamErrorMessage";
 
 export const useConversation = (prompt: any, accessToken: string | null) => {
+  const { t } = useTranslation();
   const [isLoading, setIsLoading] = useState(false);
   const [messages, setMessages] = useState<Message[]>([]);
   const [inputMessage, setInputMessage] = useState("");
@@ -38,12 +40,12 @@ export const useConversation = (prompt: any, accessToken: string | null) => {
 
   const handleSendMessage = async () => {
     if (!accessToken) {
-      toast.fromError("Access token is required");
+      toast.fromError(t("prompts.conversation.toasts.tokenRequired"));
       return;
     }
 
     if (extractedVariables.length > 0 && !allVariablesFilled) {
-      toast.fromError("Please fill in all template variables");
+      toast.fromError(t("prompts.conversation.toasts.variablesRequired"));
       return;
     }
 
@@ -208,14 +210,14 @@ export const useConversation = (prompt: any, accessToken: string | null) => {
       abortController.abort();
       setAbortController(null);
       setIsLoading(false);
-      toast.info("Request cancelled");
+      toast.info(t("prompts.conversation.toasts.cancelled"));
     }
   };
 
   const handleClearConversation = () => {
     setMessages([]);
     setVariablesFilled(false);
-    toast.success("Chat history cleared.");
+    toast.success(t("prompts.conversation.toasts.cleared"));
   };
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/index.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/index.tsx
index 2c2908a50f5..f7efb8175cc 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/index.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/index.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import ToolModal from "../tool_modal";
 import { toast } from "@/lib/toast";
 import { createPromptCall, updatePromptCall, getPromptInfo } from "@/components/networking";
@@ -15,13 +16,14 @@ import DotpromptViewTab from "./DotpromptViewTab";
 import VersionHistorySidePanel from "./VersionHistorySidePanel";
 
 const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess, accessToken, initialPromptData }) => {
+  const { t } = useTranslation();
   const getInitialPrompt = (): PromptType => {
     if (initialPromptData) {
       try {
         return parseExistingPrompt(initialPromptData);
       } catch (error) {
         console.error("Error parsing existing prompt:", error);
-        toast.fromError("Failed to parse prompt data");
+        toast.fromError(t("prompts.editor.toasts.parseFailed"));
       }
     }
     return {
@@ -120,7 +122,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
     try {
       const parsed = JSON.parse(json);
       const tool: Tool = {
-        name: parsed.function?.name || "Unnamed Tool",
+        name: parsed.function?.name || t("prompts.editor.unnamedTool"),
         description: parsed.function?.description || "",
         json: json,
       };
@@ -142,7 +144,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
       setShowToolModal(false);
       setEditingToolIndex(null);
     } catch (error) {
-      toast.fromError("Invalid JSON format");
+      toast.fromError(t("prompts.editor.toasts.invalidJson"));
     }
   };
 
@@ -171,7 +173,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
       setActiveVersionId(`${versionData.prompt_id}.v${versionNum}`);
     } catch (error) {
       console.error("Error loading version:", error);
-      toast.fromError("Failed to load prompt version");
+      toast.fromError(t("prompts.editor.toasts.loadVersionFailed"));
     }
   };
 
@@ -185,12 +187,12 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
 
   const handleSave = async () => {
     if (!accessToken) {
-      toast.fromError("Access token is required");
+      toast.fromError(t("prompts.editor.toasts.tokenRequired"));
       return;
     }
 
     if (!prompt.name || prompt.name.trim() === "") {
-      toast.fromError("Please enter a valid prompt name");
+      toast.fromError(t("prompts.editor.toasts.nameRequired"));
       return;
     }
 
@@ -214,16 +216,16 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
 
       if (editMode && initialPromptData?.prompt_spec?.prompt_id) {
         await updatePromptCall(accessToken, initialPromptData.prompt_spec.prompt_id, promptData);
-        toast.success("Prompt updated successfully!");
+        toast.success(t("prompts.editor.toasts.updated"));
       } else {
         await createPromptCall(accessToken, promptData);
-        toast.success("Prompt created successfully!");
+        toast.success(t("prompts.editor.toasts.created"));
       }
       onSuccess();
       onClose();
     } catch (error) {
       console.error("Error saving prompt:", error);
-      toast.fromError(editMode ? "Failed to update prompt" : "Failed to save prompt");
+      toast.fromError(editMode ? t("prompts.editor.toasts.updateFailed") : t("prompts.editor.toasts.saveFailed"));
     } finally {
       setIsSaving(false);
       setShowNameModal(false);
@@ -320,7 +322,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
                   }`}
                   onClick={() => setViewMode("pretty")}
                 >
-                  PRETTY
+                  {t("prompts.editor.viewModes.pretty")}
                 </button>
                 <button
                   className={`px-3 py-1 text-xs font-medium rounded-full transition-colors ${
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/utils.ts b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/utils.ts
index 3d768e930a9..ade4b39aa63 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/utils.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/utils.ts
@@ -1,3 +1,4 @@
+import i18n from "@/i18n/i18n";
 import { PromptType, Message, Tool } from "./types";
 
 export const extractVariables = (prompt: PromptType): string[] => {
@@ -117,7 +118,7 @@ const parseToolsFromFrontmatter = (lines: string[]): Tool[] => {
     try {
       const toolObj = JSON.parse(rawJson);
       tools.push({
-        name: toolObj?.function?.name || "Unnamed Tool",
+        name: toolObj?.function?.name || i18n.t("prompts.editor.unnamedTool"),
         description: toolObj?.function?.description || "",
         json: JSON.stringify(toolObj, null, 2),
       });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_info.tsx
index 062e1d84a0a..9a37f026c12 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_info.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect, useRef } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
@@ -37,6 +38,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
   onDelete,
   onEdit,
 }) => {
+  const { t } = useTranslation();
   const [promptData, setPromptData] = useState<PromptSpec | null>(null);
   const [promptTemplate, setPromptTemplate] = useState<PromptTemplateBase | null>(null);
   const [rawApiResponse, setRawApiResponse] = useState<any>(null);
@@ -71,7 +73,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
       }
       setSelectedVersion(response.prompt_spec.version || null);
     } catch (error) {
-      toast.fromError("Failed to load prompt information");
+      toast.fromError(t("prompts.info.toasts.loadFailed"));
       console.error("Error fetching prompt info:", error);
     } finally {
       setLoading(false);
@@ -118,11 +120,11 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
   }, [selectedEnv]);
 
   if (loading && !promptData) {
-    return <div className="p-4">Loading...</div>;
+    return <div className="p-4">{t("prompts.info.loading")}</div>;
   }
 
   if (!promptData) {
-    return <div className="p-4">Prompt not found</div>;
+    return <div className="p-4">{t("prompts.info.notFound")}</div>;
   }
 
   const formatDate = (dateString?: string) => {
@@ -150,12 +152,12 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
     setIsDeleting(true);
     try {
       await deletePromptCall(accessToken, basePromptId);
-      toast.success(`Prompt "${basePromptId}" deleted successfully`);
+      toast.success(t("prompts.info.toasts.deleted", { name: basePromptId }));
       onDelete?.();
       onClose();
     } catch (error) {
       console.error("Error deleting prompt:", error);
-      toast.fromError("Failed to delete prompt");
+      toast.fromError(t("prompts.info.toasts.deleteFailed"));
     } finally {
       setIsDeleting(false);
       setShowDeleteConfirm(false);
@@ -178,7 +180,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
       setPromptTemplate(response.raw_prompt_template);
       setRawApiResponse(response);
     } catch {
-      toast.fromError(`Failed to load version v${versionNum}`);
+      toast.fromError(t("prompts.info.toasts.loadVersionFailed", { version: versionNum }));
     }
   };
 
@@ -193,11 +195,11 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
       <div>
         <Button variant="ghost" onClick={onClose} className="mb-4">
           <ArrowLeft className="size-4" />
-          Back to Prompts
+          {t("prompts.info.back")}
         </Button>
         <div className="flex justify-between items-start mb-4">
           <div>
-            <h1 className="text-2xl font-semibold">Prompt Details</h1>
+            <h1 className="text-2xl font-semibold">{t("prompts.info.title")}</h1>
             <div className="flex items-center cursor-pointer">
               <p className="text-sm text-muted-foreground font-mono">{basePromptId}</p>
               <Button
@@ -225,12 +227,12 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
             />
             <Button onClick={() => onEdit?.(rawApiResponse)} className="flex items-center">
               <Pencil />
-              Prompt Studio
+              {t("prompts.info.openStudio")}
             </Button>
             {isAdmin && (
               <Button variant="secondary" onClick={handleDeleteClick} className="flex items-center">
                 <Trash2 />
-                Delete Prompt
+                {t("prompts.info.deletePrompt")}
               </Button>
             )}
           </div>
@@ -264,7 +266,9 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
               >
                 {env}
                 {versionHistory.length > 0 && selectedEnv === env && (
-                  <span className="ml-1 text-xs opacity-75">(v{latestVersion})</span>
+                  <span className="ml-1 text-xs opacity-75">
+                    {t("prompts.info.environmentVersion", { version: latestVersion })}
+                  </span>
                 )}
               </button>
             ))}
@@ -275,7 +279,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
       {isViewingOldVersion && (
         <div className="mb-4 p-3 bg-warning/10 border border-warning/20 rounded-lg flex items-center justify-between">
           <p className="text-sm text-warning">
-            Viewing v{selectedVersion} — not the latest version (v{latestVersion})
+            {t("prompts.info.oldVersionBanner", { selected: selectedVersion, latest: latestVersion })}
           </p>
           <Button
             variant="ghost"
@@ -285,7 +289,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
               if (latest) handleVersionClick(latest);
             }}
           >
-            Go to latest
+            {t("prompts.info.goToLatest")}
           </Button>
         </div>
       )}
@@ -293,15 +297,15 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
       <Tabs defaultValue="overview">
         <TabsList variant="line" className="mb-4 h-auto w-full justify-start rounded-none border-b p-0">
           <TabsTrigger value="overview" className="flex-none rounded-none px-4 py-2">
-            Overview
+            {t("prompts.info.tabs.overview")}
           </TabsTrigger>
           {promptTemplate && (
             <TabsTrigger value="prompt-template" className="flex-none rounded-none px-4 py-2">
-              Prompt Template
+              {t("prompts.info.tabs.template")}
             </TabsTrigger>
           )}
           <TabsTrigger value="raw-json" className="flex-none rounded-none px-4 py-2">
-            Raw JSON
+            {t("prompts.info.tabs.rawJson")}
           </TabsTrigger>
         </TabsList>
 
@@ -310,51 +314,55 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
           <TabsContent value="overview" keepMounted>
             <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
               <Card className="block p-6">
-                <p>Version</p>
+                <p>{t("prompts.info.overview.version")}</p>
                 <div className="mt-2">
                   <h3 className="text-lg font-medium">{currentVersion}</h3>
                   <Badge variant="secondary" className="mt-1">
-                    v{currentVersion}
+                    {t("prompts.info.versionLabel", { version: currentVersion })}
                   </Badge>
                 </div>
               </Card>
 
               <Card className="block p-6">
-                <p>Prompt Type</p>
+                <p>{t("prompts.info.overview.promptType")}</p>
                 <div className="mt-2">
                   <h3 className="text-lg font-medium">{promptData.prompt_info?.prompt_type || "-"}</h3>
                 </div>
               </Card>
 
               <Card className="block p-6">
-                <p>Created By</p>
+                <p>{t("prompts.info.overview.createdBy")}</p>
                 <div className="mt-2">
                   <h3 className="text-sm font-medium">{promptData.created_by || "-"}</h3>
                 </div>
               </Card>
 
               <Card className="block p-6">
-                <p>Created At</p>
+                <p>{t("prompts.info.overview.createdAt")}</p>
                 <div className="mt-2">
                   <h3 className="text-sm font-medium">{formatDate(promptData.created_at)}</h3>
-                  <p className="text-xs">Updated: {formatDate(promptData.updated_at)}</p>
+                  <p className="text-xs">
+                    {t("prompts.info.overview.updated", { date: formatDate(promptData.updated_at) })}
+                  </p>
                 </div>
               </Card>
             </div>
 
             {/* Version History Table */}
             <Card className="block mt-6 p-6">
-              <h3 className="text-lg font-medium mb-3">Version History — {selectedEnv}</h3>
+              <h3 className="text-lg font-medium mb-3">
+                {t("prompts.info.history.title", { environment: selectedEnv })}
+              </h3>
               {loadingVersions ? (
-                <p>Loading versions...</p>
+                <p>{t("prompts.info.history.loading")}</p>
               ) : versionHistory.length > 0 ? (
                 <Table>
                   <TableHeader>
                     <TableRow>
-                      <TableHead>Version</TableHead>
-                      <TableHead>Created By</TableHead>
-                      <TableHead>Date</TableHead>
-                      <TableHead>Actions</TableHead>
+                      <TableHead>{t("prompts.info.history.columns.version")}</TableHead>
+                      <TableHead>{t("prompts.info.history.columns.createdBy")}</TableHead>
+                      <TableHead>{t("prompts.info.history.columns.date")}</TableHead>
+                      <TableHead>{t("prompts.info.history.columns.actions")}</TableHead>
                     </TableRow>
                   </TableHeader>
                   <TableBody>
@@ -371,10 +379,12 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
                           onClick={() => handleVersionClick(v)}
                         >
                           <TableCell>
-                            <span className={isSelected ? "font-bold" : ""}>v{vNum}</span>
+                            <span className={isSelected ? "font-bold" : ""}>
+                              {t("prompts.info.versionLabel", { version: vNum })}
+                            </span>
                             {isLatest && (
                               <Badge variant="secondary" className="ml-2">
-                                latest
+                                {t("prompts.info.history.latest")}
                               </Badge>
                             )}
                           </TableCell>
@@ -403,7 +413,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
                               }}
                             >
                               <Pencil />
-                              Edit
+                              {t("prompts.info.history.edit")}
                             </Button>
                           </TableCell>
                         </TableRow>
@@ -412,7 +422,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
                   </TableBody>
                 </Table>
               ) : (
-                <p className="text-muted-foreground">No versions found in {selectedEnv}</p>
+                <p className="text-muted-foreground">{t("prompts.info.history.empty", { environment: selectedEnv })}</p>
               )}
             </Card>
           </TabsContent>
@@ -422,7 +432,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
             <TabsContent value="prompt-template" keepMounted>
               <Card className="block p-6">
                 <div className="flex justify-between items-center mb-4">
-                  <h3 className="text-lg font-medium">Prompt Template</h3>
+                  <h3 className="text-lg font-medium">{t("prompts.info.template.title")}</h3>
                   <Button
                     variant="ghost"
                     size="sm"
@@ -434,18 +444,18 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
                     }`}
                   >
                     {copiedStates["prompt-content"] ? <CheckIcon size={16} /> : <CopyIcon size={16} />}
-                    {copiedStates["prompt-content"] ? "Copied!" : "Copy Content"}
+                    {copiedStates["prompt-content"] ? t("prompts.info.copied") : t("prompts.info.template.copy")}
                   </Button>
                 </div>
 
                 <div className="space-y-4">
                   <div>
-                    <p className="font-medium">Template ID</p>
+                    <p className="font-medium">{t("prompts.info.template.id")}</p>
                     <div className="font-mono text-sm bg-muted p-2 rounded-sm">{promptTemplate.litellm_prompt_id}</div>
                   </div>
 
                   <div>
-                    <p className="font-medium">Content</p>
+                    <p className="font-medium">{t("prompts.info.template.content")}</p>
                     <div className="mt-2 p-4 bg-muted rounded-md border overflow-auto max-h-96">
                       <pre className="text-sm text-foreground whitespace-pre-wrap">{promptTemplate.content}</pre>
                     </div>
@@ -453,7 +463,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
 
                   {promptTemplate.metadata && Object.keys(promptTemplate.metadata).length > 0 && (
                     <div>
-                      <p className="font-medium">Template Metadata</p>
+                      <p className="font-medium">{t("prompts.info.template.metadata")}</p>
                       <div className="mt-2 p-3 bg-muted rounded-md border">
                         <pre className="text-xs text-foreground whitespace-pre-wrap overflow-auto max-h-64">
                           {JSON.stringify(promptTemplate.metadata, null, 2)}
@@ -470,7 +480,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
           <TabsContent value="raw-json" keepMounted>
             <Card className="block p-6">
               <div className="flex justify-between items-center mb-4">
-                <h3 className="text-lg font-medium">Raw API Response</h3>
+                <h3 className="text-lg font-medium">{t("prompts.info.rawJson.title")}</h3>
                 <Button
                   variant="ghost"
                   size="sm"
@@ -482,7 +492,7 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
                   }`}
                 >
                   {copiedStates["raw-json"] ? <CheckIcon size={16} /> : <CopyIcon size={16} />}
-                  {copiedStates["raw-json"] ? "Copied!" : "Copy JSON"}
+                  {copiedStates["raw-json"] ? t("prompts.info.copied") : t("prompts.info.rawJson.copy")}
                 </Button>
               </div>
 
@@ -500,18 +510,21 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({
       <Dialog open={showDeleteConfirm} onOpenChange={(open) => !open && handleDeleteCancel()}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
           <DialogHeader>
-            <DialogTitle>Delete Prompt</DialogTitle>
+            <DialogTitle>{t("prompts.info.deleteDialog.title")}</DialogTitle>
           </DialogHeader>
           <p>
-            Are you sure you want to delete prompt: <strong>{basePromptId}</strong> from every environment?
+            <Trans
+              i18nKey="prompts.info.deleteDialog.description"
+              components={{ strong: <strong />, name: <>{basePromptId}</> }}
+            />
           </p>
-          <p>This action cannot be undone.</p>
+          <p>{t("prompts.info.deleteDialog.warning")}</p>
           <DialogFooter>
             <Button variant="outline" onClick={handleDeleteCancel}>
-              Cancel
+              {t("prompts.info.deleteDialog.cancel")}
             </Button>
             <Button onClick={handleDeleteConfirm} variant="destructive" disabled={isDeleting} aria-busy={isDeleting}>
-              Delete
+              {t("prompts.info.deleteDialog.confirm")}
             </Button>
           </DialogFooter>
         </DialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/tool_modal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/tool_modal.tsx
index 0ebcdfcb28a..7b190ec3031 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/tool_modal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/tool_modal.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
@@ -32,6 +33,7 @@ const defaultToolJson = `{
 }`;
 
 const ToolModal: React.FC<ToolModalProps> = ({ visible, initialJson, onSave, onClose }) => {
+  const { t } = useTranslation();
   const [json, setJson] = useState(initialJson || defaultToolJson);
   const [error, setError] = useState<string | null>(null);
 
@@ -41,7 +43,7 @@ const ToolModal: React.FC<ToolModalProps> = ({ visible, initialJson, onSave, onC
       setError(null);
       onSave(json);
     } catch (e) {
-      setError("Invalid JSON format. Please check your syntax.");
+      setError(t("prompts.toolModal.invalidJson"));
     }
   };
 
@@ -54,7 +56,7 @@ const ToolModal: React.FC<ToolModalProps> = ({ visible, initialJson, onSave, onC
     <Dialog open={visible} onOpenChange={(open) => !open && handleClose()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-3xl">
         <DialogHeader>
-          <DialogTitle>Add Tool</DialogTitle>
+          <DialogTitle>{t("prompts.toolModal.title")}</DialogTitle>
         </DialogHeader>
         <div className="space-y-3">
           {error && (
@@ -66,18 +68,18 @@ const ToolModal: React.FC<ToolModalProps> = ({ visible, initialJson, onSave, onC
             </div>
           )}
           <textarea
-            aria-label="Tool JSON"
+            aria-label={t("prompts.toolModal.jsonLabel")}
             value={json}
             onChange={(e) => setJson(e.target.value)}
             className="w-full min-h-[400px] px-4 py-3 border border-input rounded-lg text-sm font-mono focus:outline-hidden focus:ring-2 focus:ring-ring resize-none"
-            placeholder="Paste your tool JSON here..."
+            placeholder={t("prompts.toolModal.jsonPlaceholder")}
           />
         </div>
         <DialogFooter>
           <Button variant="outline" onClick={handleClose}>
-            Cancel
+            {t("prompts.toolModal.cancel")}
           </Button>
-          <Button onClick={handleSave}>Add</Button>
+          <Button onClick={handleSave}>{t("prompts.toolModal.add")}</Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/variable_textarea.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/variable_textarea.tsx
index 72f34cef0f9..7535c5f5f2a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/variable_textarea.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/variable_textarea.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import { PencilIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -15,6 +16,7 @@ interface VariableTextAreaProps {
 }
 
 const VariableTextArea: React.FC<VariableTextAreaProps> = ({ value, onChange, placeholder, rows = 4, className }) => {
+  const { t } = useTranslation();
   const [editingVariable, setEditingVariable] = useState<{
     oldName: string;
     start: number;
@@ -75,7 +77,7 @@ const VariableTextArea: React.FC<VariableTextAreaProps> = ({ value, onChange, pl
       {/* Variable Management - Clear and Functional */}
       {variables.length > 0 && (
         <div className="mt-2 flex flex-wrap gap-2 items-center">
-          <span className="text-xs text-muted-foreground mr-1">Detected variables:</span>
+          <span className="text-xs text-muted-foreground mr-1">{t("prompts.variableTextarea.detected")}</span>
           {variables.map((variable, index) => (
             <Popover
               key={`${variable.start}-${index}`}
@@ -111,17 +113,17 @@ const VariableTextArea: React.FC<VariableTextAreaProps> = ({ value, onChange, pl
               </PopoverTrigger>
               <PopoverContent className="w-[216px]">
                 <div className="p-2">
-                  <div className="text-xs text-muted-foreground mb-2">Edit variable name</div>
+                  <div className="text-xs text-muted-foreground mb-2">{t("prompts.variableTextarea.editTitle")}</div>
                   <Input
                     value={newVariableName}
                     onChange={(e) => setNewVariableName(e.target.value)}
                     onKeyDown={(event) => event.key === "Enter" && handleVariableEdit()}
-                    placeholder="Variable name"
+                    placeholder={t("prompts.variableTextarea.namePlaceholder")}
                     autoFocus
                   />
                   <div className="flex gap-2 mt-2">
                     <Button size="sm" onClick={handleVariableEdit}>
-                      Save
+                      {t("prompts.variableTextarea.save")}
                     </Button>
                     <Button
                       variant="outline"
@@ -131,7 +133,7 @@ const VariableTextArea: React.FC<VariableTextAreaProps> = ({ value, onChange, pl
                         setNewVariableName("");
                       }}
                     >
-                      Cancel
+                      {t("prompts.variableTextarea.cancel")}
                     </Button>
                   </div>
                 </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/RequestTagMappings.tsx b/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/RequestTagMappings.tsx
index d1101eaaf27..4e9d3d30bff 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/RequestTagMappings.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/RequestTagMappings.tsx
@@ -2,7 +2,9 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
+import type { ParseKeys } from "i18next";
 import { Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 export interface RequestTagMapping {
   header: "baggage";
@@ -25,56 +27,55 @@ const isMapping = (value: unknown): value is RequestTagMapping => {
   return "key" in value && typeof value.key === "string";
 };
 
-const MODES = [
-  { value: "exact", label: "Exact value" },
-  { value: "any", label: "Any value" },
+const MODES: { value: string; label: ParseKeys }[] = [
+  { value: "exact", label: "routerSettings.requestTagMappings.modes.exact" },
+  { value: "any", label: "routerSettings.requestTagMappings.modes.any" },
 ];
 
 const BAGGAGE_KEY_PATTERN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
 
 const isExact = (rule: RequestTagMapping) => rule.value !== undefined && rule.value !== null;
 
-const mappingProblem = (rule: RequestTagMapping): string | null => {
-  if (!rule.key) return "Enter a baggage key";
-  if (!BAGGAGE_KEY_PATTERN.test(rule.key)) return "Use only letters, digits, and !#$%&'*+-.^_`|~ in the baggage key";
+const mappingProblem = (rule: RequestTagMapping): ParseKeys | null => {
+  if (!rule.key) return "routerSettings.requestTagMappings.problems.keyRequired";
+  if (!BAGGAGE_KEY_PATTERN.test(rule.key)) return "routerSettings.requestTagMappings.problems.keyInvalid";
   if (isExact(rule)) {
-    if (!rule.value) return "Enter a match value";
-    return rule.tag ? null : "Enter a tag";
+    if (!rule.value) return "routerSettings.requestTagMappings.problems.valueRequired";
+    return rule.tag ? null : "routerSettings.requestTagMappings.problems.tagRequired";
   }
-  return rule.tag_prefix ? null : "Enter a tag prefix";
+  return rule.tag_prefix ? null : "routerSettings.requestTagMappings.problems.tagPrefixRequired";
 };
 
 const matchIdentity = (rule: RequestTagMapping) => JSON.stringify([rule.key, isExact(rule) ? rule.value : null]);
 
-const problemAt = (rules: RequestTagMapping[], index: number): string | null => {
+const problemAt = (rules: RequestTagMapping[], index: number): ParseKeys | null => {
   const identity = matchIdentity(rules[index]);
   const duplicated = rules.slice(0, index).some((earlier) => matchIdentity(earlier) === identity);
-  return mappingProblem(rules[index]) ?? (duplicated ? "Another mapping already matches this key and value" : null);
+  return mappingProblem(rules[index]) ?? (duplicated ? "routerSettings.requestTagMappings.problems.duplicate" : null);
 };
 
 export const requestTagMappingsAreValid = (value: unknown) =>
   Array.isArray(value) && value.every(isMapping) && value.every((_, index) => problemAt(value, index) === null);
 
 export function RequestTagMappingsEditor({ value, onChange, disabled = false }: Props) {
+  const { t } = useTranslation();
   const rules = Array.isArray(value) ? value.filter(isMapping) : [];
   const update = (index: number, patch: Partial<RequestTagMapping>) =>
     onChange(rules.map((rule, position) => (position === index ? { ...rule, ...patch } : rule)));
 
   return (
     <div className="min-w-80 space-y-4 whitespace-normal">
-      <p className="text-xs text-muted-foreground">
-        Exact value mappings take priority over any-value rules for the same key.
-      </p>
+      <p className="text-xs text-muted-foreground">{t("routerSettings.requestTagMappings.priorityHint")}</p>
       {rules.map((rule, index) => {
         const exact = isExact(rule);
         const problem = problemAt(rules, index);
-        const label = `Mapping ${index + 1}`;
+        const label = t("routerSettings.requestTagMappings.mappingLabel", { number: index + 1 });
         return (
           <fieldset key={index} disabled={disabled} className="space-y-3 rounded-lg border p-3 disabled:opacity-60">
             <legend className="px-1 text-xs font-medium">{label}</legend>
             <div className="flex items-center gap-2">
               <Select
-                items={MODES}
+                items={MODES.map((mode) => ({ ...mode, label: t(mode.label) }))}
                 value={exact ? "exact" : "any"}
                 onValueChange={(mode) =>
                   update(
@@ -85,13 +86,13 @@ export function RequestTagMappingsEditor({ value, onChange, disabled = false }:
                   )
                 }
               >
-                <SelectTrigger aria-label={`${label} mode`}>
+                <SelectTrigger aria-label={t("routerSettings.requestTagMappings.modeAriaLabel", { number: index + 1 })}>
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
                   {MODES.map((mode) => (
                     <SelectItem key={mode.value} value={mode.value}>
-                      {mode.label}
+                      {t(mode.label)}
                     </SelectItem>
                   ))}
                 </SelectContent>
@@ -100,16 +101,16 @@ export function RequestTagMappingsEditor({ value, onChange, disabled = false }:
                 type="button"
                 variant="ghost"
                 size="icon"
-                aria-label={`Delete ${label.toLowerCase()}`}
+                aria-label={t("routerSettings.requestTagMappings.deleteAriaLabel", { number: index + 1 })}
                 onClick={() => onChange(rules.filter((_, position) => position !== index))}
               >
                 <Trash2 className="h-4 w-4" />
               </Button>
             </div>
             <label className="flex flex-col gap-1 text-xs">
-              Baggage key
+              {t("routerSettings.requestTagMappings.baggageKey")}
               <Input
-                aria-label={`${label} baggage key`}
+                aria-label={t("routerSettings.requestTagMappings.baggageKeyAriaLabel", { number: index + 1 })}
                 placeholder="entrypoint"
                 value={rule.key}
                 onChange={(event) => update(index, { key: event.target.value })}
@@ -118,31 +119,32 @@ export function RequestTagMappingsEditor({ value, onChange, disabled = false }:
             {exact ? (
               <>
                 <label className="flex flex-col gap-1 text-xs">
-                  Match value
+                  {t("routerSettings.requestTagMappings.matchValue")}
                   <Input
-                    aria-label={`${label} match value`}
+                    aria-label={t("routerSettings.requestTagMappings.matchValueAriaLabel", { number: index + 1 })}
                     value={rule.value ?? ""}
                     onChange={(event) => update(index, { value: event.target.value })}
                   />
                 </label>
                 <label className="flex flex-col gap-1 text-xs">
-                  Tag
+                  {t("routerSettings.requestTagMappings.tag")}
                   <Input
-                    aria-label={`${label} tag`}
+                    aria-label={t("routerSettings.requestTagMappings.tagAriaLabel", { number: index + 1 })}
                     value={rule.tag ?? ""}
                     onChange={(event) => update(index, { tag: event.target.value })}
                   />
                 </label>
                 <p className="text-xs text-muted-foreground">
-                  {rule.key}={rule.value || "value"} → {rule.tag || "tag"}
+                  {rule.key}={rule.value || t("routerSettings.requestTagMappings.previewValue")} →{" "}
+                  {rule.tag || t("routerSettings.requestTagMappings.previewTag")}
                 </p>
               </>
             ) : (
               <>
                 <label className="flex flex-col gap-1 text-xs">
-                  Tag prefix
+                  {t("routerSettings.requestTagMappings.tagPrefix")}
                   <Input
-                    aria-label={`${label} tag prefix`}
+                    aria-label={t("routerSettings.requestTagMappings.tagPrefixAriaLabel", { number: index + 1 })}
                     placeholder="usecase:"
                     value={rule.tag_prefix ?? ""}
                     onChange={(event) => update(index, { tag_prefix: event.target.value })}
@@ -153,19 +155,19 @@ export function RequestTagMappingsEditor({ value, onChange, disabled = false }:
                 </p>
               </>
             )}
-            {problem ? <p className="text-xs text-destructive">{problem}</p> : null}
+            {problem ? <p className="text-xs text-destructive">{t(problem)}</p> : null}
             <label className="flex items-center justify-between gap-3 text-xs">
-              Require a mapped value
+              {t("routerSettings.requestTagMappings.required")}
               <Switch
-                aria-label={`${label} required`}
+                aria-label={t("routerSettings.requestTagMappings.requiredAriaLabel", { number: index + 1 })}
                 checked={rule.required ?? false}
                 onCheckedChange={(checked) => update(index, { required: checked })}
               />
             </label>
             <label className="flex items-center justify-between gap-3 text-xs">
-              Require an existing tag budget
+              {t("routerSettings.requestTagMappings.requireBudget")}
               <Switch
-                aria-label={`${label} require budget`}
+                aria-label={t("routerSettings.requestTagMappings.requireBudgetAriaLabel", { number: index + 1 })}
                 checked={rule.require_budgeted_tag ?? false}
                 onCheckedChange={(checked) => update(index, { require_budgeted_tag: checked })}
               />
@@ -174,7 +176,7 @@ export function RequestTagMappingsEditor({ value, onChange, disabled = false }:
         );
       })}
       {disabled ? (
-        <p className="text-xs text-muted-foreground">Managed in config.yaml. Edit the YAML to change these rules.</p>
+        <p className="text-xs text-muted-foreground">{t("routerSettings.requestTagMappings.configManaged")}</p>
       ) : null}
       <Button
         disabled={disabled}
@@ -182,7 +184,7 @@ export function RequestTagMappingsEditor({ value, onChange, disabled = false }:
         variant="outline"
         onClick={() => onChange([...rules, { header: "baggage", key: "", value: "", tag: "" }])}
       >
-        Add mapping
+        {t("routerSettings.requestTagMappings.addMapping")}
       </Button>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/general_settings.tsx b/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/general_settings.tsx
index 67712d78a13..268c2aae446 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/general_settings.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/router-settings/_components/general_settings.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardTitle } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
@@ -59,6 +60,7 @@ const SettingValueEditor: React.FC<{
   setting: generalSettingsItem;
   onChange: (fieldName: string, newValue: any) => void;
 }> = ({ setting, onChange }) => {
+  const { t } = useTranslation();
   if (setting.field_name === "request_tag_mappings") {
     return (
       <RequestTagMappingsEditor
@@ -128,7 +130,7 @@ const SettingValueEditor: React.FC<{
       <Input
         key={String(setting.stored_in_db)}
         aria-label={setting.field_name}
-        placeholder="Comma-separated values"
+        placeholder={t("routerSettings.generalSettings.listPlaceholder")}
         defaultValue={fromListValue(setting.field_value)}
         onChange={(event) => onChange(setting.field_name, toListValue(event.target.value))}
       />
@@ -138,10 +140,10 @@ const SettingValueEditor: React.FC<{
     return (
       <Select value={setting.field_value ?? null} onValueChange={(newValue) => onChange(setting.field_name, newValue)}>
         <SelectTrigger className="min-w-32">
-          <SelectValue placeholder="Default" />
+          <SelectValue placeholder={t("routerSettings.generalSettings.selectDefault")} />
         </SelectTrigger>
         <SelectContent>
-          <SelectItem value={null}>Default</SelectItem>
+          <SelectItem value={null}>{t("routerSettings.generalSettings.selectDefault")}</SelectItem>
           {(setting.field_options ?? []).map((option) => (
             <SelectItem key={option} value={option}>
               {option}
@@ -159,6 +161,7 @@ export const PromptCachingPanel: React.FC<{
   settings: generalSettingsItem[];
   onChange: (fieldName: string, newValue: any) => void;
 }> = ({ accessToken, settings, onChange }) => {
+  const { t } = useTranslation();
   const enableSetting = settings.find((s) => s.field_name === ENABLE_ANTHROPIC_PROMPT_CACHING);
   const ttlSetting = settings.find((s) => s.field_name === ANTHROPIC_PROMPT_CACHING_TTL);
   const systemFirstSetting = settings.find((s) => s.field_name === OPENAI_SYSTEM_MESSAGES_FIRST);
@@ -185,11 +188,11 @@ export const PromptCachingPanel: React.FC<{
   return (
     <Card>
       <CardContent>
-        <CardTitle>Prompt Caching</CardTitle>
+        <CardTitle>{t("routerSettings.promptCaching.title")}</CardTitle>
 
         <div className="mt-6 flex items-start justify-between gap-8">
           <div className="min-w-0 max-w-2xl">
-            <p className="font-medium">Automatic Anthropic prompt caching</p>
+            <p className="font-medium">{t("routerSettings.promptCaching.anthropicCaching")}</p>
             <p className="mt-1 break-words text-xs text-muted-foreground">{enableSetting.field_description}</p>
           </div>
           <Switch checked={enabled} onCheckedChange={(checked) => persist(ENABLE_ANTHROPIC_PROMPT_CACHING, checked)} />
@@ -198,7 +201,9 @@ export const PromptCachingPanel: React.FC<{
         {ttlSetting && (
           <div className="mt-6 flex items-start justify-between gap-8">
             <div className="min-w-0 max-w-2xl">
-              <p className={`font-medium ${enabled ? "" : "text-muted-foreground"}`}>Cache lifetime (TTL)</p>
+              <p className={`font-medium ${enabled ? "" : "text-muted-foreground"}`}>
+                {t("routerSettings.promptCaching.cacheLifetime")}
+              </p>
               <p className="mt-1 break-words text-xs text-muted-foreground">{ttlSetting.field_description}</p>
             </div>
             <Select
@@ -207,10 +212,10 @@ export const PromptCachingPanel: React.FC<{
               onValueChange={(newValue) => persist(ANTHROPIC_PROMPT_CACHING_TTL, newValue)}
             >
               <SelectTrigger className="min-w-40">
-                <SelectValue placeholder="5m (default)" />
+                <SelectValue placeholder={t("routerSettings.promptCaching.ttlDefault")} />
               </SelectTrigger>
               <SelectContent>
-                <SelectItem value={null}>5m (default)</SelectItem>
+                <SelectItem value={null}>{t("routerSettings.promptCaching.ttlDefault")}</SelectItem>
                 {(ttlSetting.field_options ?? []).map((option) => (
                   <SelectItem key={option} value={option}>
                     {option}
@@ -224,11 +229,11 @@ export const PromptCachingPanel: React.FC<{
         {systemFirstSetting && (
           <div className="mt-6 flex items-start justify-between gap-8">
             <div className="min-w-0 max-w-2xl">
-              <p className="font-medium">System messages first for OpenAI</p>
+              <p className="font-medium">{t("routerSettings.promptCaching.systemMessagesFirst")}</p>
               <p className="mt-1 break-words text-xs text-muted-foreground">{systemFirstSetting.field_description}</p>
             </div>
             <Switch
-              aria-label="System messages first for OpenAI"
+              aria-label={t("routerSettings.promptCaching.systemMessagesFirst")}
               checked={isOn(systemFirstSetting.field_value)}
               onCheckedChange={(checked) => persist(OPENAI_SYSTEM_MESSAGES_FIRST, checked)}
             />
@@ -240,6 +245,7 @@ export const PromptCachingPanel: React.FC<{
 };
 
 const GeneralSettings: React.FC<GeneralSettingsPageProps> = ({ accessToken, userRole, userID }) => {
+  const { t } = useTranslation();
   const [generalSettings, setGeneralSettings] = useState<generalSettingsItem[]>([]);
 
   useEffect(() => {
@@ -313,11 +319,11 @@ const GeneralSettings: React.FC<GeneralSettingsPageProps> = ({ accessToken, user
     <div className="w-full">
       <Tabs defaultValue="loadbalancing" className="h-[75vh] w-full">
         <TabsList variant="line" className="mx-8 mt-4">
-          <TabsTrigger value="loadbalancing">Loadbalancing</TabsTrigger>
-          <TabsTrigger value="routing-groups">Routing Groups</TabsTrigger>
-          <TabsTrigger value="fallbacks">Fallbacks</TabsTrigger>
-          <TabsTrigger value="prompt-caching">Prompt Caching</TabsTrigger>
-          <TabsTrigger value="general">General</TabsTrigger>
+          <TabsTrigger value="loadbalancing">{t("routerSettings.generalSettings.tabs.loadbalancing")}</TabsTrigger>
+          <TabsTrigger value="routing-groups">{t("routerSettings.generalSettings.tabs.routingGroups")}</TabsTrigger>
+          <TabsTrigger value="fallbacks">{t("routerSettings.generalSettings.tabs.fallbacks")}</TabsTrigger>
+          <TabsTrigger value="prompt-caching">{t("routerSettings.generalSettings.tabs.promptCaching")}</TabsTrigger>
+          <TabsTrigger value="general">{t("routerSettings.generalSettings.tabs.general")}</TabsTrigger>
         </TabsList>
         <TabsContent value="loadbalancing" className="px-8 py-6" keepMounted>
           <RouterSettings accessToken={accessToken} userRole={userRole} userID={userID} />
@@ -337,10 +343,10 @@ const GeneralSettings: React.FC<GeneralSettingsPageProps> = ({ accessToken, user
               <Table>
                 <TableHeader>
                   <TableRow>
-                    <TableHead>Setting</TableHead>
-                    <TableHead>Value</TableHead>
-                    <TableHead>Status</TableHead>
-                    <TableHead>Action</TableHead>
+                    <TableHead>{t("routerSettings.generalSettings.columns.setting")}</TableHead>
+                    <TableHead>{t("routerSettings.generalSettings.columns.value")}</TableHead>
+                    <TableHead>{t("routerSettings.generalSettings.columns.status")}</TableHead>
+                    <TableHead>{t("routerSettings.generalSettings.columns.action")}</TableHead>
                   </TableRow>
                 </TableHeader>
                 <TableBody>
@@ -366,11 +372,11 @@ const GeneralSettings: React.FC<GeneralSettingsPageProps> = ({ accessToken, user
                         </TableCell>
                         <TableCell>
                           {value.stored_in_db == true ? (
-                            <StatusBadge tone="success" label="In DB" />
+                            <StatusBadge tone="success" label={t("routerSettings.generalSettings.status.inDb")} />
                           ) : value.stored_in_db == false ? (
-                            <StatusBadge tone="neutral" label="In Config" />
+                            <StatusBadge tone="neutral" label={t("routerSettings.generalSettings.status.inConfig")} />
                           ) : (
-                            <StatusBadge tone="neutral" label="Not Set" />
+                            <StatusBadge tone="neutral" label={t("routerSettings.generalSettings.status.notSet")} />
                           )}
                         </TableCell>
                         <TableCell>
@@ -381,7 +387,7 @@ const GeneralSettings: React.FC<GeneralSettingsPageProps> = ({ accessToken, user
                             }
                             onClick={() => handleUpdateField(value.field_name)}
                           >
-                            Update
+                            {t("routerSettings.generalSettings.update")}
                           </Button>
                           {value.field_name === "request_tag_mappings" && value.editable === false ? null : (
                             <span
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx
index b42484dbe71..e0f440b03c7 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx
@@ -3,6 +3,8 @@ import { useQuery } from "@tanstack/react-query";
 import { CircleHelp } from "lucide-react";
 import React, { useCallback, useMemo, useState } from "react";
 import { useWatch } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 import { z } from "zod";
 import { Logo } from "@/components/molecules/logo/Logo";
 import { toast } from "@/lib/toast";
@@ -63,15 +65,22 @@ export const SearchProviderLabel: React.FC<SearchProviderLabelProps> = ({ provid
 const createSearchToolShape = {
   search_tool_name: z
     .string()
-    .min(1, "Please enter a search tool name")
-    .regex(/^[a-zA-Z0-9_-]+$/, "Name can only contain letters, numbers, hyphens, and underscores"),
+    .min(1, { error: () => i18n.t("searchTools.createForm.errors.nameRequired") })
+    .regex(/^[a-zA-Z0-9_-]+$/, { error: () => i18n.t("searchTools.createForm.errors.nameInvalid") }),
   search_provider: z
     .string()
     .nullable()
-    .pipe(z.string({ error: "Please select a search provider" }).min(1, "Please select a search provider")),
+    .pipe(
+      z
+        .string({ error: () => i18n.t("searchTools.createForm.errors.providerRequired") })
+        .min(1, { error: () => i18n.t("searchTools.createForm.errors.providerRequired") }),
+    ),
   api_key: z.string().optional(),
   description: z.string().optional(),
-  input_cost_per_query: z.number().nonnegative("Cost per query cannot be negative").optional(),
+  input_cost_per_query: z
+    .number()
+    .nonnegative({ error: () => i18n.t("searchTools.createForm.errors.costNegative") })
+    .optional(),
 };
 
 const createSearchToolSchema = z.object(createSearchToolShape);
@@ -105,6 +114,7 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
   isModalVisible,
   setModalVisible,
 }) => {
+  const { t } = useTranslation();
   const form = useZodForm(createSearchToolSchema, { defaultValues: EMPTY_VALUES });
   const [isLoading, setIsLoading] = useState(false);
   const [isTestModalVisible, setIsTestModalVisible] = useState(false);
@@ -144,13 +154,13 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
       if (accessToken != null) {
         const response = await createSearchTool(accessToken, payload);
 
-        toast.success("Search tool created successfully");
+        toast.success(t("searchTools.createForm.toasts.created"));
         form.reset(EMPTY_VALUES);
         setModalVisible(false);
         onCreateSuccess(response);
       }
     } catch (error) {
-      toast.error("Error creating search tool: " + error);
+      toast.error(t("searchTools.createForm.toasts.createFailed", { error: String(error) }));
     } finally {
       setIsLoading(false);
     }
@@ -164,7 +174,7 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
   const handleTestConnection = async () => {
     const isValid = await form.trigger(["search_provider", "api_key"]);
     if (!isValid) {
-      toast.error("Please fill in Search Provider and API Key before testing");
+      toast.error(t("searchTools.createForm.toasts.testMissingFields"));
       return;
     }
 
@@ -183,7 +193,9 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
         <DialogHeader>
           <div className="flex items-center space-x-3 pb-4 border-b border-border">
             <span className="text-2xl">🔍</span>
-            <DialogTitle className="text-xl font-semibold text-foreground">Add New Search Tool</DialogTitle>
+            <DialogTitle className="text-xl font-semibold text-foreground">
+              {t("searchTools.createForm.title")}
+            </DialogTitle>
           </div>
         </DialogHeader>
         <div className="mt-6">
@@ -193,16 +205,13 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                 <FormField
                   control={form.control}
                   name="search_tool_name"
-                  label={labelWithHint(
-                    "Search Tool Name",
-                    "A unique name to identify this search tool configuration (e.g., 'perplexity-search', 'tavily-news-search').",
-                  )}
+                  label={labelWithHint(t("searchTools.createForm.labels.name"), t("searchTools.createForm.hints.name"))}
                 >
                   {({ ref, ...field }) => (
                     <Input
                       {...field}
                       ref={ref}
-                      placeholder="e.g., perplexity-search, my-tavily-tool"
+                      placeholder={t("searchTools.createForm.placeholders.name")}
                       className="rounded-lg"
                     />
                   )}
@@ -212,8 +221,8 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                   control={form.control}
                   name="search_provider"
                   label={labelWithHint(
-                    "Search Provider",
-                    "Select the search provider you want to use. Each provider has different capabilities and pricing.",
+                    t("searchTools.createForm.labels.provider"),
+                    t("searchTools.createForm.hints.provider"),
                   )}
                 >
                   {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
@@ -227,13 +236,13 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                         id={id}
                         aria-invalid={ariaInvalid}
                         aria-describedby={ariaDescribedBy}
-                        placeholder="Select a search provider"
+                        placeholder={t("searchTools.createForm.placeholders.provider")}
                         className="h-10 w-full rounded-lg"
                         disabled={isLoadingProviders}
                         showClear={value != null && value !== ""}
                       />
                       <ComboboxContent>
-                        <ComboboxEmpty>No matching search providers</ComboboxEmpty>
+                        <ComboboxEmpty>{t("searchTools.createForm.noProviders")}</ComboboxEmpty>
                         <ComboboxList>
                           {(providerName: string) => (
                             <ComboboxItem key={providerName} value={providerName}>
@@ -253,8 +262,8 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                   control={form.control}
                   name="api_key"
                   label={labelWithHint(
-                    "API Key",
-                    "The API key for authenticating with the search provider. This will be securely stored.",
+                    t("searchTools.createForm.labels.apiKey"),
+                    t("searchTools.createForm.hints.apiKey"),
                   )}
                 >
                   {({ ref, value, ...field }) => (
@@ -262,7 +271,7 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                       {...field}
                       ref={ref}
                       value={value ?? ""}
-                      placeholder="Enter your API key"
+                      placeholder={t("searchTools.createForm.placeholders.apiKey")}
                       groupClassName="h-10 rounded-lg"
                     />
                   )}
@@ -271,10 +280,7 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                 <FormField
                   control={form.control}
                   name="input_cost_per_query"
-                  label={labelWithHint(
-                    "Cost per Query (USD, Optional)",
-                    "Your negotiated price per search query. It overrides the LiteLLM cost map price for this tool in the response cost header and spend logs. Leave blank to use the provider's default price.",
-                  )}
+                  label={labelWithHint(t("searchTools.createForm.labels.cost"), t("searchTools.createForm.hints.cost"))}
                 >
                   {({ ref, value, onChange, ...field }) => (
                     <Input
@@ -284,20 +290,24 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                       step="any"
                       value={value ?? ""}
                       onChange={(event) => onChange(event.target.value === "" ? undefined : event.target.valueAsNumber)}
-                      placeholder="e.g., 0.007"
+                      placeholder={t("searchTools.createForm.placeholders.cost")}
                       className="rounded-lg"
                     />
                   )}
                 </FormField>
 
-                <FormField control={form.control} name="description" label="Description (Optional)">
+                <FormField
+                  control={form.control}
+                  name="description"
+                  label={t("searchTools.createForm.labels.description")}
+                >
                   {({ ref, value, ...field }) => (
                     <Textarea
                       {...field}
                       ref={ref}
                       value={value ?? ""}
                       rows={3}
-                      placeholder="Brief description of this search tool's purpose"
+                      placeholder={t("searchTools.createForm.placeholders.description")}
                       className="rounded-lg"
                     />
                   )}
@@ -314,20 +324,20 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                         target="_blank"
                         rel="noopener noreferrer"
                       >
-                        Need Help?
+                        {t("searchTools.createForm.help")}
                       </a>
                     }
                   />
-                  <TooltipContent>Get help on our github</TooltipContent>
+                  <TooltipContent>{t("searchTools.createForm.helpTooltip")}</TooltipContent>
                 </Tooltip>
                 <div className="flex gap-2">
                   <Button type="submit" variant="outline" onClick={handleTestConnection} disabled={isTestingConnection}>
                     {isTestingConnection && <UiLoadingSpinner className="size-4" />}
-                    Test Connection
+                    {t("searchTools.createForm.testConnection")}
                   </Button>
                   <Button type="submit" variant="outline" disabled={isLoading}>
                     {isLoading && <UiLoadingSpinner className="size-4" />}
-                    Add Search Tool
+                    {t("searchTools.createForm.submit")}
                   </Button>
                 </div>
               </div>
@@ -346,7 +356,7 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
         >
           <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
             <DialogHeader>
-              <DialogTitle>Connection Test Results</DialogTitle>
+              <DialogTitle>{t("searchTools.createForm.testResultsTitle")}</DialogTitle>
             </DialogHeader>
             {isTestModalVisible && accessToken && (
               <SearchConnectionTest
@@ -369,7 +379,7 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
                   setIsTestingConnection(false);
                 }}
               >
-                Close
+                {t("searchTools.createForm.close")}
               </Button>
             </DialogFooter>
           </DialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchConnectionTest.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchConnectionTest.tsx
index 12a19a41964..47cfaf16723 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchConnectionTest.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchConnectionTest.tsx
@@ -1,5 +1,7 @@
 import { AlertTriangle, CheckCircle2, Info } from "lucide-react";
 import React, { useEffect, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 import { toast } from "@/lib/toast";
 import { testSearchToolConnection } from "@/components/networking";
 import { Button } from "@/components/ui/button";
@@ -13,6 +15,7 @@ interface SearchConnectionTestProps {
 }
 
 const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmParams, accessToken, onTestComplete }) => {
+  const { t } = useTranslation();
   const [isLoading, setIsLoading] = useState(true);
   const [testResult, setTestResult] = useState<{
     status: "success" | "error";
@@ -30,12 +33,12 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
         const result = await testSearchToolConnection(accessToken, litellmParams);
         setTestResult(result);
         if (result.status === "success") {
-          toast.success("Connection test successful!");
+          toast.success(i18n.t("searchTools.connectionTest.toastSuccess"));
         }
       } catch (error) {
         setTestResult({
           status: "error",
-          message: error instanceof Error ? error.message : "Unknown error occurred",
+          message: error instanceof Error ? error.message : i18n.t("searchTools.connectionTest.unknownErrorOccurred"),
           error_type: "NetworkError",
         });
       } finally {
@@ -50,7 +53,7 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
   }, [accessToken, litellmParams, onTestComplete]);
 
   const getCleanErrorMessage = (errorMsg: string) => {
-    if (!errorMsg) return "Unknown error";
+    if (!errorMsg) return t("searchTools.connectionTest.unknownError");
 
     const mainError = errorMsg.split("stack trace:")[0].trim();
 
@@ -64,9 +67,9 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
         return titleMatch[1];
       }
       if (finalError.includes("401") || finalError.includes("Authorization Required")) {
-        return "Authentication failed: Invalid API key or credentials";
+        return t("searchTools.connectionTest.authFailed");
       }
-      return "Authentication error - please check your API key";
+      return t("searchTools.connectionTest.authError");
     }
 
     if (finalError.length > 200) {
@@ -76,7 +79,9 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
     return finalError;
   };
 
-  const errorMessage = testResult?.message ? getCleanErrorMessage(testResult.message) : "Unknown error";
+  const errorMessage = testResult?.message
+    ? getCleanErrorMessage(testResult.message)
+    : t("searchTools.connectionTest.unknownError");
 
   if (isLoading) {
     return (
@@ -84,7 +89,9 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
         <div className="flex flex-col items-center justify-center px-5 py-8">
           <UiLoadingSpinner className="mb-4 size-8 text-primary" />
           <p className="text-base text-foreground">
-            Testing connection to {litellmParams.search_provider || "search provider"}...
+            {t("searchTools.connectionTest.testing", {
+              provider: litellmParams.search_provider || t("searchTools.connectionTest.fallbackProvider"),
+            })}
           </p>
         </div>
       </div>
@@ -102,15 +109,22 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
           <CheckCircle2 className="size-6 text-success" />
           <div className="ml-3">
             <p className="text-lg font-medium text-success">
-              Connection to {litellmParams.search_provider} successful!
+              {t("searchTools.connectionTest.success", { provider: litellmParams.search_provider })}
             </p>
             {testResult.test_query && (
               <p className="mt-2 text-sm text-muted-foreground">
-                Test query: <code className="rounded bg-muted px-1.5 py-0.5">{testResult.test_query}</code>
+                <Trans
+                  i18nKey="searchTools.connectionTest.testQuery"
+                  components={{
+                    query: <code className="rounded bg-muted px-1.5 py-0.5">{testResult.test_query}</code>,
+                  }}
+                />
               </p>
             )}
             {testResult.results_count !== undefined && (
-              <p className="text-sm text-muted-foreground">Results retrieved: {testResult.results_count}</p>
+              <p className="text-sm text-muted-foreground">
+                {t("searchTools.connectionTest.resultsRetrieved", { results: testResult.results_count })}
+              </p>
             )}
           </div>
         </div>
@@ -119,18 +133,20 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
           <div className="mb-5 flex items-center">
             <AlertTriangle className="mr-3 size-6 text-destructive" />
             <p className="text-lg font-medium text-destructive">
-              Connection to {litellmParams.search_provider || "search provider"} failed
+              {t("searchTools.connectionTest.failed", {
+                provider: litellmParams.search_provider || t("searchTools.connectionTest.fallbackProvider"),
+              })}
             </p>
           </div>
 
           <div className="mb-5 rounded-lg border border-destructive/30 bg-destructive/10 p-4">
-            <p className="mb-2 font-semibold text-foreground">Error: </p>
+            <p className="mb-2 font-semibold text-foreground">{t("searchTools.connectionTest.errorLabel")}</p>
             <p className="text-sm leading-relaxed text-destructive">{errorMessage}</p>
 
             {testResult.error_type && (
               <div className="mt-2">
                 <p className="text-[13px] text-muted-foreground">
-                  Error type:{" "}
+                  {t("searchTools.connectionTest.errorType")}{" "}
                   <code className="rounded bg-destructive/10 px-1.5 py-0.5 text-destructive">
                     {testResult.error_type}
                   </code>
@@ -141,7 +157,9 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
             {testResult.message && (
               <div className="mt-3">
                 <Button variant="link" size="sm" className="h-auto p-0" onClick={() => setShowDetails(!showDetails)}>
-                  {showDetails ? "Hide Details" : "Show Details"}
+                  {showDetails
+                    ? t("searchTools.connectionTest.hideDetails")
+                    : t("searchTools.connectionTest.showDetails")}
                 </Button>
               </div>
             )}
@@ -149,7 +167,9 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
 
           {showDetails && (
             <div className="mb-5">
-              <p className="mb-2 text-[15px] font-semibold text-foreground">Full Error Details</p>
+              <p className="mb-2 text-[15px] font-semibold text-foreground">
+                {t("searchTools.connectionTest.fullDetails")}
+              </p>
               <pre className="max-h-52 overflow-auto rounded-lg border border-border bg-muted p-4 text-[13px] leading-relaxed break-words whitespace-pre-wrap">
                 {testResult.message}
               </pre>
@@ -157,12 +177,12 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
           )}
 
           <div className="rounded-lg border border-warning/20 border-l-4 border-l-amber-500 bg-warning/10 p-4">
-            <p className="mb-2 font-semibold text-warning">Troubleshooting tips:</p>
+            <p className="mb-2 font-semibold text-warning">{t("searchTools.connectionTest.troubleshooting.title")}</p>
             <ul className="my-2 list-disc pl-5 text-warning">
-              <li className="mb-1.5">Verify your API key is correct and active</li>
-              <li className="mb-1.5">Check if the search provider service is operational</li>
-              <li className="mb-1.5">Ensure you have sufficient credits/quota with the provider</li>
-              <li className="mb-1.5">Review the provider&apos;s documentation for any additional requirements</li>
+              <li className="mb-1.5">{t("searchTools.connectionTest.troubleshooting.apiKey")}</li>
+              <li className="mb-1.5">{t("searchTools.connectionTest.troubleshooting.serviceStatus")}</li>
+              <li className="mb-1.5">{t("searchTools.connectionTest.troubleshooting.quota")}</li>
+              <li className="mb-1.5">{t("searchTools.connectionTest.troubleshooting.docs")}</li>
             </ul>
           </div>
         </div>
@@ -176,7 +196,7 @@ const SearchConnectionTest: React.FC<SearchConnectionTestProps> = ({ litellmPara
           className="inline-flex items-center gap-1.5 text-sm font-medium text-primary hover:underline"
         >
           <Info className="size-4" />
-          View Search Documentation
+          {t("searchTools.connectionTest.docsLink")}
         </a>
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTable.tsx
index f60f4f3d1da..17863f3ea86 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Inbox } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 
@@ -21,13 +22,14 @@ interface SearchToolTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No search tools configured</div>
-      <div className="text-sm text-muted-foreground">Add a search tool to enable web search for your models.</div>
+      <div className="text-sm font-medium text-foreground">{t("searchTools.table.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("searchTools.table.empty.description")}</div>
     </div>
   );
 }
@@ -40,12 +42,13 @@ const SearchToolTable: React.FC<SearchToolTableProps> = ({
   onEdit,
   onDelete,
 }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
 
   const columns = useMemo(() => {
-    const deps = { availableProviders, onView, onEdit, onDelete };
+    const deps = { availableProviders, onView, onEdit, onDelete, t };
     return getSearchToolTableColumns(deps);
-  }, [availableProviders, onView, onEdit, onDelete]);
+  }, [availableProviders, onView, onEdit, onDelete, t]);
 
   return (
     <DataTable
@@ -57,7 +60,7 @@ const SearchToolTable: React.FC<SearchToolTableProps> = ({
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading search tools…"
+      loadingMessage={t("searchTools.table.loading")}
       noDataMessage={<EmptyState />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTableColumns.tsx
index 550bf3dc7bd..8242b448253 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { ParseKeys, TFunction } from "i18next";
 import { MoreHorizontal, Pencil, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { DateCell, IdentityCell, StatusBadge } from "@/components/shared/table_cells";
@@ -17,8 +19,8 @@ import { cn } from "@/lib/cva.config";
 
 import { AvailableSearchProvider, SearchTool } from "./types";
 
-const CONFIG_EDIT_HINT = "Config search tools cannot be edited on the dashboard. Please edit the config file.";
-const CONFIG_DELETE_HINT = "Config search tools cannot be deleted on the dashboard. Please edit the config file.";
+const CONFIG_EDIT_HINT_KEY: ParseKeys = "searchTools.table.configEditHint";
+const CONFIG_DELETE_HINT_KEY: ParseKeys = "searchTools.table.configDeleteHint";
 
 export const searchToolKey = (tool: SearchTool): string => tool.search_tool_id || tool.search_tool_name;
 
@@ -29,13 +31,14 @@ interface SearchToolRowActionsProps {
 }
 
 function SearchToolRowActions({ tool, onEdit, onDelete }: SearchToolRowActionsProps) {
+  const { t } = useTranslation();
   const isFromConfig = tool.is_from_config ?? false;
   const toolId = tool.search_tool_id;
 
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open search tool actions"
+        aria-label={t("searchTools.table.actions.open")}
         data-testid={`search-tool-actions-${searchToolKey(tool)}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -45,22 +48,22 @@ function SearchToolRowActions({ tool, onEdit, onDelete }: SearchToolRowActionsPr
         <DropdownMenuItem
           disabled={isFromConfig || !toolId}
           data-testid="search-tool-action-edit"
-          title={isFromConfig ? CONFIG_EDIT_HINT : undefined}
+          title={isFromConfig ? t(CONFIG_EDIT_HINT_KEY) : undefined}
           onClick={() => toolId && onEdit(toolId)}
         >
           <Pencil />
-          Edit search tool
+          {t("searchTools.table.actions.edit")}
         </DropdownMenuItem>
         <DropdownMenuSeparator />
         <DropdownMenuItem
           variant="destructive"
           disabled={isFromConfig || !toolId}
           data-testid="search-tool-action-delete"
-          title={isFromConfig ? CONFIG_DELETE_HINT : undefined}
+          title={isFromConfig ? t(CONFIG_DELETE_HINT_KEY) : undefined}
           onClick={() => toolId && onDelete(toolId)}
         >
           <Trash2 />
-          Delete search tool
+          {t("searchTools.table.actions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -72,6 +75,7 @@ interface SearchToolTableColumnsDeps {
   onView: (searchToolId: string) => void;
   onEdit: (searchToolId: string) => void;
   onDelete: (searchToolId: string) => void;
+  t: TFunction;
 }
 
 export const getSearchToolTableColumns = ({
@@ -79,12 +83,13 @@ export const getSearchToolTableColumns = ({
   onView,
   onEdit,
   onDelete,
+  t,
 }: SearchToolTableColumnsDeps): ColumnDef<SearchTool>[] => [
   {
     id: "search_tool_id",
     accessorKey: "search_tool_id",
-    meta: { title: "Search Tool ID" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Search Tool ID" />,
+    meta: { title: t("searchTools.table.columns.id") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("searchTools.table.columns.id")} />,
     size: 200,
     enableSorting: true,
     cell: ({ row }) => {
@@ -101,8 +106,8 @@ export const getSearchToolTableColumns = ({
   {
     id: "search_tool_name",
     accessorKey: "search_tool_name",
-    meta: { title: "Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Name" />,
+    meta: { title: t("searchTools.table.columns.name") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("searchTools.table.columns.name")} />,
     size: 200,
     enableSorting: true,
     cell: ({ row }) => (
@@ -113,8 +118,8 @@ export const getSearchToolTableColumns = ({
   },
   {
     id: "provider",
-    meta: { title: "Provider" },
-    header: "Provider",
+    meta: { title: t("searchTools.table.columns.provider") },
+    header: t("searchTools.table.columns.provider"),
     size: 160,
     enableSorting: false,
     cell: ({ row }) => {
@@ -126,8 +131,8 @@ export const getSearchToolTableColumns = ({
   {
     id: "created_at",
     accessorKey: "created_at",
-    meta: { title: "Created At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created At" />,
+    meta: { title: t("searchTools.table.columns.createdAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("searchTools.table.columns.createdAt")} />,
     size: 130,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} precision="date" />,
@@ -135,27 +140,32 @@ export const getSearchToolTableColumns = ({
   {
     id: "updated_at",
     accessorKey: "updated_at",
-    meta: { title: "Updated At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Updated At" />,
+    meta: { title: t("searchTools.table.columns.updatedAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("searchTools.table.columns.updatedAt")} />,
     size: 130,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.updated_at} precision="date" />,
   },
   {
     id: "source",
-    meta: { title: "Source", skeleton: "badge" },
-    header: "Source",
+    meta: { title: t("searchTools.table.columns.source"), skeleton: "badge" },
+    header: t("searchTools.table.columns.source"),
     size: 100,
     enableSorting: false,
     cell: ({ row }) => {
       const isFromConfig = row.original.is_from_config ?? false;
-      return <StatusBadge tone={isFromConfig ? "neutral" : "info"} label={isFromConfig ? "Config" : "DB"} />;
+      return (
+        <StatusBadge
+          tone={isFromConfig ? "neutral" : "info"}
+          label={isFromConfig ? t("searchTools.table.source.config") : t("searchTools.table.source.db")}
+        />
+      );
     },
   },
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("searchTools.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTester.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTester.tsx
index 646120443c7..962b88e0fad 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTester.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolTester.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import { ExternalLink, Search } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import { searchToolQueryCall } from "@/components/networking";
 import { Button } from "@/components/ui/button";
@@ -24,6 +25,7 @@ interface SearchToolTesterProps {
 }
 
 export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolName, accessToken, className = "" }) => {
+  const { t } = useTranslation();
   const [query, setQuery] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   const [searchHistory, setSearchHistory] = useState<
@@ -38,7 +40,7 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
 
   const handleSearch = async () => {
     if (!query.trim()) {
-      toast.warning("Please enter a search query");
+      toast.warning(t("searchTools.tester.toasts.emptyQuery"));
       return;
     }
 
@@ -73,7 +75,7 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
   const clearHistory = () => {
     setSearchHistory([]);
     setExpandedResults({});
-    toast.success("Search history cleared");
+    toast.success(t("searchTools.tester.toasts.cleared"));
   };
 
   const toggleResultExpansion = (historyIndex: number, resultIndex: number) => {
@@ -89,7 +91,7 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
   return (
     <Card className={`mt-6 ${className}`}>
       <div className="px-6">
-        <h2 className="text-lg font-semibold text-foreground">Test Search Tool</h2>
+        <h2 className="text-lg font-semibold text-foreground">{t("searchTools.tester.title")}</h2>
       </div>
 
       <div className="flex min-h-[600px] flex-col px-6">
@@ -106,14 +108,14 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                     handleSearch();
                   }
                 }}
-                placeholder="Enter your search query..."
+                placeholder={t("searchTools.tester.placeholder")}
                 disabled={isLoading}
                 className="h-12 pl-11 text-[15px]"
               />
             </div>
             <Button onClick={handleSearch} disabled={isLoading || !query.trim()} className="h-12 px-6 text-[15px]">
               {isLoading ? <UiLoadingSpinner className="size-4" /> : <Search className="size-4" />}
-              Search
+              {t("searchTools.tester.search")}
             </Button>
           </div>
         </div>
@@ -124,15 +126,15 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
               <div className="mb-6 flex size-24 items-center justify-center rounded-full bg-muted">
                 <Search className="size-12 text-muted-foreground" />
               </div>
-              <p className="text-lg font-medium text-foreground">Test your search tool</p>
-              <p className="mt-2 text-sm text-muted-foreground">Enter a query above to see search results</p>
+              <p className="text-lg font-medium text-foreground">{t("searchTools.tester.emptyTitle")}</p>
+              <p className="mt-2 text-sm text-muted-foreground">{t("searchTools.tester.emptyDescription")}</p>
             </div>
           ) : (
             <div>
               {isLoading && (
                 <div className="flex flex-col items-center justify-center py-16">
                   <UiLoadingSpinner className="size-8 text-primary" />
-                  <p className="mt-4 font-medium text-muted-foreground">Searching...</p>
+                  <p className="mt-4 font-medium text-muted-foreground">{t("searchTools.tester.searching")}</p>
                 </div>
               )}
 
@@ -142,7 +144,7 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                     <div className="flex items-center justify-between">
                       <div className="flex-1">
                         <p className="text-xs font-semibold tracking-wide text-muted-foreground uppercase">
-                          Search Query
+                          {t("searchTools.tester.queryLabel")}
                         </p>
                         <div className="mt-1.5 text-base font-semibold text-foreground">{latestResults.query}</div>
                       </div>
@@ -150,13 +152,16 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                         <p className="text-xs text-muted-foreground">{formatTimestamp(latestResults.timestamp)}</p>
                         <div className="mt-1 flex items-center gap-3">
                           <div className="text-sm font-semibold text-primary">
-                            {latestResults.response?.results?.length || 0}{" "}
-                            {latestResults.response?.results?.length === 1 ? "result" : "results"}
+                            {t("searchTools.tester.resultCount", {
+                              count: latestResults.response?.results?.length || 0,
+                            })}
                           </div>
                           {latestResults.latency !== undefined && (
                             <>
                               <span className="text-muted-foreground">•</span>
-                              <div className="text-sm font-semibold text-success">{latestResults.latency}ms</div>
+                              <div className="text-sm font-semibold text-success">
+                                {t("searchTools.tester.latency", { latency: latestResults.latency })}
+                              </div>
                             </>
                           )}
                         </div>
@@ -189,7 +194,7 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                                 <Button
                                   variant="ghost"
                                   size="icon-sm"
-                                  aria-label="Open result in new tab"
+                                  aria-label={t("searchTools.tester.openResult")}
                                   className="shrink-0 text-muted-foreground"
                                   onClick={() => window.open(result.url, "_blank")}
                                 >
@@ -212,7 +217,9 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                                   className="mt-3 h-auto p-0"
                                   onClick={() => toggleResultExpansion(0, resultIndex)}
                                 >
-                                  {isResultExpanded ? "Show less" : "Show more"}
+                                  {isResultExpanded
+                                    ? t("searchTools.tester.showLess")
+                                    : t("searchTools.tester.showMore")}
                                 </Button>
                               )}
                             </div>
@@ -225,8 +232,8 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                       <div className="mx-auto mb-4 flex size-16 items-center justify-center rounded-full bg-muted">
                         <Search className="size-6 text-muted-foreground" />
                       </div>
-                      <p className="font-medium text-foreground">No results found</p>
-                      <p className="mt-1 text-sm text-muted-foreground">Try a different search query</p>
+                      <p className="font-medium text-foreground">{t("searchTools.tester.noResults")}</p>
+                      <p className="mt-1 text-sm text-muted-foreground">{t("searchTools.tester.noResultsHint")}</p>
                     </div>
                   )}
                 </>
@@ -235,9 +242,9 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
               {searchHistory.length > 1 && (
                 <div className="mt-8 border-t border-border pt-6">
                   <div className="mb-4 flex items-center justify-between">
-                    <p className="text-sm font-semibold text-foreground">Previous Searches</p>
+                    <p className="text-sm font-semibold text-foreground">{t("searchTools.tester.previous")}</p>
                     <Button variant="link" size="sm" className="h-auto p-0" onClick={clearHistory}>
-                      Clear All
+                      {t("searchTools.tester.clearAll")}
                     </Button>
                   </div>
                   <div className="space-y-2">
@@ -252,13 +259,14 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                         <div className="truncate text-sm font-medium text-foreground">{entry.query}</div>
                         <div className="mt-1.5 flex items-center gap-2 text-xs text-muted-foreground">
                           <span className="font-medium text-primary">
-                            {entry.response?.results?.length || 0}{" "}
-                            {entry.response?.results?.length === 1 ? "result" : "results"}
+                            {t("searchTools.tester.resultCount", { count: entry.response?.results?.length || 0 })}
                           </span>
                           {entry.latency !== undefined && (
                             <>
                               <span>•</span>
-                              <span className="font-medium text-success">{entry.latency}ms</span>
+                              <span className="font-medium text-success">
+                                {t("searchTools.tester.latency", { latency: entry.latency })}
+                              </span>
                             </>
                           )}
                           <span>•</span>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolView.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolView.tsx
index 6ad0028a4c3..3c589ad0a4a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolView.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchToolView.tsx
@@ -1,6 +1,7 @@
 import { copyToClipboard as utilCopyToClipboard } from "@/utils/dataUtils";
 import { ArrowLeft, Check, Copy } from "lucide-react";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import { SearchToolTester } from "./SearchToolTester";
@@ -21,6 +22,7 @@ export const SearchToolView: React.FC<SearchToolViewProps> = ({
   accessToken,
   availableProviders,
 }) => {
+  const { t } = useTranslation();
   const [copiedStates, setCopiedStates] = useState<Record<string, boolean>>({});
 
   const copyToClipboard = async (text: string | null | undefined, key: string) => {
@@ -44,14 +46,14 @@ export const SearchToolView: React.FC<SearchToolViewProps> = ({
         <div>
           <Button variant="ghost" size="sm" className="mb-4 -ml-2 text-muted-foreground" onClick={onBack}>
             <ArrowLeft className="mr-2 size-4" />
-            Back to All Search Tools
+            {t("searchTools.view.back")}
           </Button>
           <div className="flex items-center gap-1">
             <h1 className="text-2xl font-semibold text-foreground">{searchTool.search_tool_name}</h1>
             <Button
               variant="ghost"
               size="icon-xs"
-              aria-label="Copy search tool name"
+              aria-label={t("searchTools.view.copyName")}
               className="text-muted-foreground"
               onClick={() => copyToClipboard(searchTool.search_tool_name, "search-tool-name")}
             >
@@ -63,7 +65,7 @@ export const SearchToolView: React.FC<SearchToolViewProps> = ({
             <Button
               variant="ghost"
               size="icon-xs"
-              aria-label="Copy search tool ID"
+              aria-label={t("searchTools.view.copyId")}
               className="text-muted-foreground"
               onClick={() => copyToClipboard(searchTool.search_tool_id, "search-tool-id")}
             >
@@ -76,7 +78,7 @@ export const SearchToolView: React.FC<SearchToolViewProps> = ({
       <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
         <Card>
           <CardContent>
-            <p className="text-sm text-muted-foreground">Provider</p>
+            <p className="text-sm text-muted-foreground">{t("searchTools.view.provider")}</p>
             <p className="mt-2 text-lg font-semibold text-foreground">
               {getProviderDisplayName(searchTool.litellm_params.search_provider)}
             </p>
@@ -85,27 +87,31 @@ export const SearchToolView: React.FC<SearchToolViewProps> = ({
 
         <Card>
           <CardContent>
-            <p className="text-sm text-muted-foreground">API Key</p>
-            <p className="mt-2 text-foreground">{searchTool.litellm_params.api_key ? "****" : "Not set"}</p>
-          </CardContent>
-        </Card>
-
-        <Card>
-          <CardContent>
-            <p className="text-sm text-muted-foreground">Cost per Query</p>
+            <p className="text-sm text-muted-foreground">{t("searchTools.view.apiKey")}</p>
             <p className="mt-2 text-foreground">
-              {typeof searchTool.litellm_params.input_cost_per_query === "number"
-                ? `$${searchTool.litellm_params.input_cost_per_query}`
-                : "Provider default"}
+              {searchTool.litellm_params.api_key ? "****" : t("searchTools.view.apiKeyNotSet")}
             </p>
           </CardContent>
         </Card>
 
         <Card>
           <CardContent>
-            <p className="text-sm text-muted-foreground">Created At</p>
+            <p className="text-sm text-muted-foreground">{t("searchTools.view.cost")}</p>
             <p className="mt-2 text-foreground">
-              {searchTool.created_at ? new Date(searchTool.created_at).toLocaleString() : "Unknown"}
+              {typeof searchTool.litellm_params.input_cost_per_query === "number"
+                ? `$${searchTool.litellm_params.input_cost_per_query}`
+                : t("searchTools.view.costDefault")}
+            </p>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardContent>
+            <p className="text-sm text-muted-foreground">{t("searchTools.view.createdAt")}</p>
+            <p className="mt-2 text-foreground">
+              {searchTool.created_at
+                ? new Date(searchTool.created_at).toLocaleString()
+                : t("searchTools.view.createdUnknown")}
             </p>
           </CardContent>
         </Card>
@@ -114,7 +120,7 @@ export const SearchToolView: React.FC<SearchToolViewProps> = ({
       {searchTool.search_tool_info?.description && (
         <Card className="mt-6">
           <CardContent>
-            <p className="text-sm text-muted-foreground">Description</p>
+            <p className="text-sm text-muted-foreground">{t("searchTools.view.description")}</p>
             <p className="mt-2 text-foreground">{searchTool.search_tool_info.description}</p>
           </CardContent>
         </Card>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx
index f3f7659f4b0..7a7835c39a3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx
@@ -1,6 +1,8 @@
 import { isAdminRole } from "@/utils/roles";
 import { useQuery } from "@tanstack/react-query";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 import { z } from "zod";
 import DeleteResourceModal from "@/components/common_components/DeleteResourceModal";
 import { toast } from "@/lib/toast";
@@ -33,11 +35,14 @@ interface SearchToolsProps {
 }
 
 const editSearchToolShape = {
-  search_tool_name: z.string().min(1, "Please enter a search tool name"),
-  search_provider: z.string().min(1, "Please select a search provider"),
+  search_tool_name: z.string().min(1, { error: () => i18n.t("searchTools.page.editForm.errors.nameRequired") }),
+  search_provider: z.string().min(1, { error: () => i18n.t("searchTools.page.editForm.errors.providerRequired") }),
   api_key: z.string().nullish(),
   description: z.string().nullish(),
-  input_cost_per_query: z.number().nonnegative("Cost per query cannot be negative").nullish(),
+  input_cost_per_query: z
+    .number()
+    .nonnegative({ error: () => i18n.t("searchTools.page.editForm.errors.costNegative") })
+    .nullish(),
 };
 
 const editSearchToolSchema = z.object(editSearchToolShape);
@@ -47,6 +52,7 @@ type EditSearchToolFormValues = z.infer<typeof editSearchToolSchema>;
 const EMPTY_EDIT_VALUES: EditSearchToolFormValues = { search_tool_name: "", search_provider: "" };
 
 const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID }) => {
+  const { t } = useTranslation();
   const {
     data: searchTools,
     isLoading: isLoadingTools,
@@ -86,7 +92,7 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
   };
 
   const handleEditOpen = (toolId: string) => {
-    const tool = searchTools?.find((t) => t.search_tool_id === toolId);
+    const tool = searchTools?.find((candidate) => candidate.search_tool_id === toolId);
     if (!tool) {
       return;
     }
@@ -114,13 +120,13 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
     setIsDeleting(true);
     try {
       await deleteSearchTool(accessToken, toolIdToDelete);
-      toast.success("Deleted search tool successfully");
+      toast.success(t("searchTools.page.toasts.deleted"));
       setIsDeleteModalOpen(false);
       setToolToDelete(null);
       refetch();
     } catch (error) {
       console.error("Error deleting the search tool:", error);
-      toast.error("Failed to delete search tool");
+      toast.error(t("searchTools.page.toasts.deleteFailed"));
     } finally {
       setIsDeleting(false);
     }
@@ -131,7 +137,7 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
     setToolToDelete(null);
   };
 
-  const toolToDelete = searchTools?.find((t) => t.search_tool_id === toolIdToDelete);
+  const toolToDelete = searchTools?.find((candidate) => candidate.search_tool_id === toolIdToDelete);
   const providerInfo = toolToDelete
     ? availableProviders.find((p) => p.provider_name === toolToDelete.litellm_params.search_provider)
     : null;
@@ -147,19 +153,19 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
 
       try {
         await updateSearchTool(accessToken, selectedToolId, buildSearchToolPayload(values));
-        toast.success("Search tool updated successfully");
+        toast.success(t("searchTools.page.toasts.updated"));
         setEditModalVisible(false);
         form.reset(EMPTY_EDIT_VALUES);
         setSelectedToolId(null);
         refetch();
       } catch (error) {
         console.error("Failed to update search tool:", error);
-        toast.error("Failed to update search tool");
+        toast.error(t("searchTools.page.toasts.updateFailed"));
       }
     },
     (errors) => {
       console.error("Failed to update search tool:", errors);
-      toast.error("Failed to update search tool");
+      toast.error(t("searchTools.page.toasts.updateFailed"));
     },
   );
 
@@ -171,11 +177,13 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
   const renderEditForm = () => (
     <form onSubmit={(event) => event.preventDefault()}>
       <FieldGroup>
-        <FormField control={form.control} name="search_tool_name" label="Search Tool Name">
-          {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g., my-perplexity-search" />}
+        <FormField control={form.control} name="search_tool_name" label={t("searchTools.page.editForm.labels.name")}>
+          {({ ref, ...field }) => (
+            <Input {...field} ref={ref} placeholder={t("searchTools.page.editForm.placeholders.name")} />
+          )}
         </FormField>
 
-        <FormField control={form.control} name="search_provider" label="Search Provider">
+        <FormField control={form.control} name="search_provider" label={t("searchTools.page.editForm.labels.provider")}>
           {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
             <Select
               items={availableProviders.map((provider) => ({
@@ -186,7 +194,7 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
               onValueChange={(provider: string | null) => onChange(provider ?? "")}
             >
               <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy} className="w-full">
-                <SelectValue placeholder="Select a search provider" />
+                <SelectValue placeholder={t("searchTools.page.editForm.placeholders.provider")} />
                 {isLoadingProviders && <UiLoadingSpinner className="size-4" />}
               </SelectTrigger>
               <SelectContent>
@@ -200,17 +208,27 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
           )}
         </FormField>
 
-        <FormField control={form.control} name="api_key" label="API Key" description="API key for the search provider">
+        <FormField
+          control={form.control}
+          name="api_key"
+          label={t("searchTools.page.editForm.labels.apiKey")}
+          description={t("searchTools.page.editForm.descriptions.apiKey")}
+        >
           {({ ref, value, ...field }) => (
-            <PasswordInput {...field} ref={ref} value={value ?? ""} placeholder="Enter API key" />
+            <PasswordInput
+              {...field}
+              ref={ref}
+              value={value ?? ""}
+              placeholder={t("searchTools.page.editForm.placeholders.apiKey")}
+            />
           )}
         </FormField>
 
         <FormField
           control={form.control}
           name="input_cost_per_query"
-          label="Cost per Query (USD)"
-          description="Overrides the cost map price for this tool. Leave blank to use the provider's default price"
+          label={t("searchTools.page.editForm.labels.cost")}
+          description={t("searchTools.page.editForm.descriptions.cost")}
         >
           {({ ref, value, onChange, ...field }) => (
             <Input
@@ -220,14 +238,20 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
               step="any"
               value={value ?? ""}
               onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-              placeholder="e.g., 0.007"
+              placeholder={t("searchTools.page.editForm.placeholders.cost")}
             />
           )}
         </FormField>
 
-        <FormField control={form.control} name="description" label="Description">
+        <FormField control={form.control} name="description" label={t("searchTools.page.editForm.labels.description")}>
           {({ ref, value, ...field }) => (
-            <Textarea {...field} ref={ref} value={value ?? ""} rows={3} placeholder="Description of this search tool" />
+            <Textarea
+              {...field}
+              ref={ref}
+              value={value ?? ""}
+              rows={3}
+              placeholder={t("searchTools.page.editForm.placeholders.description")}
+            />
           )}
         </FormField>
       </FieldGroup>
@@ -235,7 +259,7 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
   );
 
   if (!accessToken || !userRole || !userID) {
-    return <div className="p-6 text-center text-muted-foreground">Missing required authentication parameters.</div>;
+    return <div className="p-6 text-center text-muted-foreground">{t("searchTools.page.missingAuth")}</div>;
   }
 
   const ToolsTab = () =>
@@ -276,19 +300,22 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
     <div className="w-full h-full p-6">
       <DeleteResourceModal
         isOpen={isDeleteModalOpen}
-        title="Delete Search Tool"
-        message="Are you sure you want to delete this search tool? This action cannot be undone."
-        resourceInformationTitle="Search Tool Information"
+        title={t("searchTools.page.deleteModal.title")}
+        message={t("searchTools.page.deleteModal.message")}
+        resourceInformationTitle={t("searchTools.page.deleteModal.infoTitle")}
         resourceInformation={
           toolToDelete
             ? [
-                { label: "Name", value: toolToDelete.search_tool_name },
-                { label: "ID", value: toolToDelete.search_tool_id, code: true },
+                { label: t("searchTools.page.deleteModal.fields.name"), value: toolToDelete.search_tool_name },
+                { label: t("searchTools.page.deleteModal.fields.id"), value: toolToDelete.search_tool_id, code: true },
                 {
-                  label: "Provider",
+                  label: t("searchTools.page.deleteModal.fields.provider"),
                   value: providerInfo?.ui_friendly_name || toolToDelete.litellm_params.search_provider,
                 },
-                { label: "Description", value: toolToDelete.search_tool_info?.description || "-" },
+                {
+                  label: t("searchTools.page.deleteModal.fields.description"),
+                  value: toolToDelete.search_tool_info?.description || "-",
+                },
               ]
             : []
         }
@@ -317,7 +344,7 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
       >
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
           <DialogHeader>
-            <DialogTitle>Edit Search Tool</DialogTitle>
+            <DialogTitle>{t("searchTools.page.editModal.title")}</DialogTitle>
           </DialogHeader>
           {renderEditForm()}
           <DialogFooter>
@@ -329,18 +356,18 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
                 setSelectedToolId(null);
               }}
             >
-              Cancel
+              {t("searchTools.page.editModal.cancel")}
             </Button>
-            <Button onClick={handleEditSubmit}>OK</Button>
+            <Button onClick={handleEditSubmit}>{t("searchTools.page.editModal.ok")}</Button>
           </DialogFooter>
         </DialogContent>
       </Dialog>
 
-      <h1 className="text-lg font-semibold text-foreground">Search Tools</h1>
-      <p className="mt-2 text-sm text-muted-foreground">Configure and manage your search providers</p>
+      <h1 className="text-lg font-semibold text-foreground">{t("searchTools.page.title")}</h1>
+      <p className="mt-2 text-sm text-muted-foreground">{t("searchTools.page.subtitle")}</p>
       {isAdminRole(userRole) && (
         <Button className="mt-4 mb-4" variant="outline" onClick={() => setCreateModalVisible(true)}>
-          + Add New Search Tool
+          {t("searchTools.page.addButton")}
         </Button>
       )}
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/ClaudeCodePluginsPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/ClaudeCodePluginsPanel.tsx
index f79b9a405cc..45023541f78 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/ClaudeCodePluginsPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/ClaudeCodePluginsPanel.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import {
   AlertDialog,
@@ -23,6 +24,7 @@ interface ClaudeCodePluginsPanelProps {
 }
 
 const ClaudeCodePluginsPanel: React.FC<ClaudeCodePluginsPanelProps> = ({ accessToken, userRole }) => {
+  const { t } = useTranslation();
   const [pluginsList, setPluginsList] = useState<Plugin[]>([]);
   const [isAddModalVisible, setIsAddModalVisible] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
@@ -66,11 +68,11 @@ const ClaudeCodePluginsPanel: React.FC<ClaudeCodePluginsPanelProps> = ({ accessT
     setIsDeleting(true);
     try {
       await deleteClaudeCodePlugin(accessToken, pluginToDelete.name);
-      toast.success(`Skill "${pluginToDelete.displayName}" deleted successfully`);
+      toast.success(t("skills.panel.toasts.deleted", { name: pluginToDelete.displayName }));
       fetchPlugins();
     } catch (error) {
       console.error("Error deleting skill:", error);
-      toast.error("Failed to delete skill");
+      toast.error(t("skills.panel.toasts.deleteFailed"));
     } finally {
       setIsDeleting(false);
       setPluginToDelete(null);
@@ -90,14 +92,18 @@ const ClaudeCodePluginsPanel: React.FC<ClaudeCodePluginsPanelProps> = ({ accessT
       ) : (
         <>
           <div className="flex flex-col gap-2 mb-4">
-            <h1 className="text-2xl font-bold">Skills</h1>
+            <h1 className="text-2xl font-bold">{t("skills.panel.title")}</h1>
             <p className="text-sm text-muted-foreground">
-              Register Claude Code skills. Published skills appear in the Skill Hub for all users and are served via{" "}
-              <code className="bg-muted px-1 rounded-sm">/claude-code/marketplace.json</code>.
+              <Trans
+                i18nKey="skills.panel.intro"
+                components={{
+                  endpoint: <code className="bg-muted px-1 rounded-sm">/claude-code/marketplace.json</code>,
+                }}
+              />
             </p>
             <div className="mt-2 flex gap-2">
               <Button onClick={() => setIsAddModalVisible(true)} disabled={!accessToken || !isAdmin}>
-                + Add Skill
+                {t("skills.panel.addButton")}
               </Button>
             </div>
           </div>
@@ -131,16 +137,19 @@ const ClaudeCodePluginsPanel: React.FC<ClaudeCodePluginsPanelProps> = ({ accessT
         >
           <AlertDialogContent>
             <AlertDialogHeader>
-              <AlertDialogTitle>Delete Skill</AlertDialogTitle>
+              <AlertDialogTitle>{t("skills.panel.deleteDialog.title")}</AlertDialogTitle>
               <AlertDialogDescription>
-                Are you sure you want to delete skill: <strong>{pluginToDelete.displayName}</strong>?
+                <Trans
+                  i18nKey="skills.panel.deleteDialog.confirm"
+                  components={{ name: <strong>{pluginToDelete.displayName}</strong> }}
+                />
               </AlertDialogDescription>
-              <p className="text-sm text-muted-foreground">This action cannot be undone.</p>
+              <p className="text-sm text-muted-foreground">{t("skills.panel.deleteDialog.irreversible")}</p>
             </AlertDialogHeader>
             <AlertDialogFooter>
-              <AlertDialogCancel>Cancel</AlertDialogCancel>
+              <AlertDialogCancel>{t("skills.panel.deleteDialog.cancel")}</AlertDialogCancel>
               <Button variant="destructive" onClick={handleDeleteConfirm} disabled={isDeleting}>
-                Delete
+                {t("skills.panel.deleteDialog.delete")}
               </Button>
             </AlertDialogFooter>
           </AlertDialogContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTable.tsx
index 1b1ccb0932a..6666f67ff4c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Inbox } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 import { Plugin } from "@/components/claude_code_plugins/types";
@@ -20,18 +21,20 @@ interface PluginTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No skills found</div>
-      <div className="text-sm text-muted-foreground">Add one to get started.</div>
+      <div className="text-sm font-medium text-foreground">{t("skills.table.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("skills.table.empty.description")}</div>
     </div>
   );
 }
 
 const PluginTable: React.FC<PluginTableProps> = ({ pluginsList, isLoading, onDeleteClick, isAdmin, onPluginClick }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
 
   const columns = useMemo(
@@ -49,7 +52,7 @@ const PluginTable: React.FC<PluginTableProps> = ({ pluginsList, isLoading, onDel
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading skills…"
+      loadingMessage={t("skills.table.loading")}
       noDataMessage={<EmptyState />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTableColumns.tsx
index 649944d1e6e..954d7531c8a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/PluginTableColumns.tsx
@@ -2,10 +2,12 @@
 
 import { ColumnDef } from "@tanstack/react-table";
 import { Copy, MoreHorizontal, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { DateCell, IdentityCell, StatusBadge } from "@/components/shared/table_cells";
 import { getCategoryBadgeColor } from "@/components/claude_code_plugins/helpers";
+import i18n from "@/i18n/i18n";
 import { Plugin } from "@/components/claude_code_plugins/types";
 import { Badge } from "@/components/ui/badge";
 import { buttonVariants } from "@/components/ui/button";
@@ -31,12 +33,13 @@ const CATEGORY_BADGE_CLASS: Record<ReturnType<typeof getCategoryBadgeColor>, str
 };
 
 function PluginCategoryBadge({ category }: { category?: string }) {
+  const { t } = useTranslation();
   return (
     <Badge
       variant="outline"
       className={cn("whitespace-nowrap font-normal", CATEGORY_BADGE_CLASS[getCategoryBadgeColor(category)])}
     >
-      {category || "Uncategorized"}
+      {category || t("skills.table.uncategorized")}
     </Badge>
   );
 }
@@ -48,10 +51,11 @@ interface PluginRowActionsProps {
 }
 
 function PluginRowActions({ plugin, isAdmin, onDeleteClick }: PluginRowActionsProps) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open skill actions"
+        aria-label={t("skills.table.actions.open")}
         data-testid={`plugin-actions-${plugin.name}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -60,10 +64,10 @@ function PluginRowActions({ plugin, isAdmin, onDeleteClick }: PluginRowActionsPr
       <DropdownMenuContent align="end" className="w-52">
         <DropdownMenuItem
           data-testid="plugin-action-copy"
-          onClick={() => void copyToClipboard(plugin.id, "Skill ID copied")}
+          onClick={() => void copyToClipboard(plugin.id, t("skills.table.actions.idCopied"))}
         >
           <Copy />
-          Copy skill ID
+          {t("skills.table.actions.copyId")}
         </DropdownMenuItem>
         {isAdmin && (
           <>
@@ -74,7 +78,7 @@ function PluginRowActions({ plugin, isAdmin, onDeleteClick }: PluginRowActionsPr
               onClick={() => onDeleteClick(plugin.name, plugin.name)}
             >
               <Trash2 />
-              Delete
+              {t("skills.table.actions.delete")}
             </DropdownMenuItem>
           </>
         )}
@@ -97,8 +101,8 @@ export const getPluginTableColumns = ({
   {
     id: "name",
     accessorKey: "name",
-    meta: { title: "Skill Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Skill Name" />,
+    meta: { title: i18n.t("skills.table.columns.name") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={i18n.t("skills.table.columns.name")} />,
     size: 220,
     enableSorting: true,
     cell: ({ row }) => (
@@ -113,24 +117,28 @@ export const getPluginTableColumns = ({
   {
     id: "version",
     accessorKey: "version",
-    meta: { title: "Version" },
-    header: "Version",
+    meta: { title: i18n.t("skills.table.columns.version") },
+    header: i18n.t("skills.table.columns.version"),
     size: 100,
     enableSorting: false,
-    cell: ({ row }) => <span className="text-sm text-muted-foreground">{row.original.version || "N/A"}</span>,
+    cell: ({ row }) => (
+      <span className="text-sm text-muted-foreground">
+        {row.original.version || i18n.t("skills.table.versionMissing")}
+      </span>
+    ),
   },
   {
     id: "description",
     accessorKey: "description",
-    meta: { title: "Description" },
-    header: "Description",
+    meta: { title: i18n.t("skills.table.columns.description") },
+    header: i18n.t("skills.table.columns.description"),
     size: 300,
     enableSorting: false,
     cell: ({ row }) => {
       const description = row.original.description;
       return (
         <span className="block max-w-72 truncate text-sm text-muted-foreground" title={description ?? undefined}>
-          {description || "No description"}
+          {description || i18n.t("skills.table.noDescription")}
         </span>
       );
     },
@@ -138,8 +146,8 @@ export const getPluginTableColumns = ({
   {
     id: "category",
     accessorKey: "category",
-    meta: { title: "Category", skeleton: "badge" },
-    header: "Category",
+    meta: { title: i18n.t("skills.table.columns.category"), skeleton: "badge" },
+    header: i18n.t("skills.table.columns.category"),
     size: 150,
     enableSorting: false,
     cell: ({ row }) => <PluginCategoryBadge category={row.original.category ?? undefined} />,
@@ -147,20 +155,23 @@ export const getPluginTableColumns = ({
   {
     id: "enabled",
     accessorKey: "enabled",
-    meta: { title: "Public", skeleton: "badge" },
-    header: "Public",
+    meta: { title: i18n.t("skills.table.columns.public"), skeleton: "badge" },
+    header: i18n.t("skills.table.columns.public"),
     size: 100,
     enableSorting: false,
     cell: ({ row }) => (
-      <StatusBadge tone={row.original.enabled ? "success" : "neutral"} label={row.original.enabled ? "Yes" : "No"} />
+      <StatusBadge
+        tone={row.original.enabled ? "success" : "neutral"}
+        label={row.original.enabled ? i18n.t("skills.table.publicYes") : i18n.t("skills.table.publicNo")}
+      />
     ),
   },
   {
     id: "created_at",
     accessorKey: "created_at",
     sortingFn: "datetime",
-    meta: { title: "Created At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created At" />,
+    meta: { title: i18n.t("skills.table.columns.createdAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={i18n.t("skills.table.columns.createdAt")} />,
     size: 160,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} />,
@@ -168,7 +179,7 @@ export const getPluginTableColumns = ({
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{i18n.t("skills.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx
index 63b8b1be7de..a2288123f91 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx
@@ -1,5 +1,8 @@
 import React, { useState } from "react";
+import type { ParseKeys } from "i18next";
 import { CircleHelp } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 import { z } from "zod";
 import { toast } from "@/lib/toast";
 import { registerClaudeCodePlugin } from "@/components/networking";
@@ -40,18 +43,15 @@ interface AddPluginFormProps {
 }
 
 const addPluginShape = {
-  skillUrl: z.string().min(1, "Please enter a repository or zip archive URL"),
-  subPath: z
-    .string()
-    .refine(
-      (value) => !value || isValidSubPath(value),
-      "Subfolder must be a relative path like plugins/my-skill (letters, numbers, dots, hyphens, underscores)",
-    ),
-  sha256: z.string().refine(isValidSha256, "SHA-256 must be a 64-character hex digest"),
+  skillUrl: z.string().min(1, { error: () => i18n.t("skills.addForm.errors.urlRequired") }),
+  subPath: z.string().refine((value) => !value || isValidSubPath(value), {
+    error: () => i18n.t("skills.addForm.errors.subPathInvalid"),
+  }),
+  sha256: z.string().refine(isValidSha256, { error: () => i18n.t("skills.addForm.errors.sha256Invalid") }),
   name: z
     .string()
-    .min(1, "Please enter skill name")
-    .regex(/^[a-z0-9-]+$/, "Name must be kebab-case (lowercase, numbers, hyphens only)"),
+    .min(1, { error: () => i18n.t("skills.addForm.errors.nameRequired") })
+    .regex(/^[a-z0-9-]+$/, { error: () => i18n.t("skills.addForm.errors.nameInvalid") }),
   domain: z.string(),
   namespace: z.string(),
   description: z.string(),
@@ -59,9 +59,9 @@ const addPluginShape = {
   keywords: z.string(),
   version: z.string(),
   authorName: z.string(),
-  authorEmail: z
-    .string()
-    .refine((value) => value === "" || z.email().safeParse(value).success, "Please enter a valid email"),
+  authorEmail: z.string().refine((value) => value === "" || z.email().safeParse(value).success, {
+    error: () => i18n.t("skills.addForm.errors.emailInvalid"),
+  }),
 };
 
 const addPluginSchema = z.object(addPluginShape);
@@ -126,12 +126,12 @@ const PREDEFINED_CATEGORIES = [
   "Documentation",
 ];
 
-const SUB_PATH_LOCK_REASON = {
-  "git-subdir": "The URL already points to a subfolder, so this field is disabled",
-  archive: "A zip archive is installed as a whole, so this field is disabled",
-} as const;
+const SUB_PATH_LOCK_REASON_KEY = {
+  "git-subdir": "skills.addForm.subPathLock.gitSubdir",
+  archive: "skills.addForm.subPathLock.archive",
+} as const satisfies Record<string, ParseKeys>;
 
-type SubPathLock = keyof typeof SUB_PATH_LOCK_REASON;
+type SubPathLock = keyof typeof SUB_PATH_LOCK_REASON_KEY;
 
 const subPathLockFor = (source: PluginSource["source"] | undefined): SubPathLock | null =>
   source === "git-subdir" || source === "archive" ? source : null;
@@ -147,6 +147,7 @@ const labelWithHint = (label: string, hint: string): React.ReactNode => (
 );
 
 const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessToken, onSuccess }) => {
+  const { t } = useTranslation();
   const form = useZodForm(addPluginSchema, { defaultValues: EMPTY_VALUES });
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [urlPreview, setUrlPreview] = useState<SkillSourcePreview | null>(null);
@@ -170,34 +171,34 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
 
   const handleSubmit = async (values: AddPluginFormValues) => {
     if (!accessToken) {
-      toast.error("No access token available");
+      toast.error(t("skills.addForm.toasts.noToken"));
       return;
     }
 
     if (!urlPreview) {
-      toast.error("Please enter a valid repository or zip archive URL");
+      toast.error(t("skills.addForm.toasts.invalidUrl"));
       return;
     }
 
     if (!validatePluginName(values.name)) {
-      toast.error("Skill name must be kebab-case (lowercase letters, numbers, and hyphens only)");
+      toast.error(t("skills.addForm.toasts.invalidName"));
       return;
     }
 
     if (values.version && !isValidSemanticVersion(values.version)) {
-      toast.error("Version must be in semantic versioning format (e.g., 1.0.0)");
+      toast.error(t("skills.addForm.toasts.invalidVersion"));
       return;
     }
 
     if (values.authorEmail && !isValidEmail(values.authorEmail)) {
-      toast.error("Invalid email format");
+      toast.error(t("skills.addForm.toasts.invalidEmail"));
       return;
     }
 
     setIsSubmitting(true);
     try {
       await registerClaudeCodePlugin(accessToken, buildRegisterRequest(values, urlPreview.parsed));
-      toast.success("Skill registered successfully");
+      toast.success(t("skills.addForm.toasts.registered"));
       form.reset(EMPTY_VALUES);
       setUrlPreview(null);
       setSubPathLock(null);
@@ -205,7 +206,7 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
       onClose();
     } catch (error) {
       console.error("Error registering skill:", error);
-      toast.error(error instanceof Error && error.message ? error.message : "Failed to register skill");
+      toast.error(error instanceof Error && error.message ? error.message : t("skills.addForm.toasts.registerFailed"));
     } finally {
       setIsSubmitting(false);
     }
@@ -222,7 +223,7 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
     <Dialog open={visible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[700px]">
         <DialogHeader>
-          <DialogTitle>Add New Skill</DialogTitle>
+          <DialogTitle>{t("skills.addForm.title")}</DialogTitle>
         </DialogHeader>
         <TooltipProvider>
           <form onSubmit={form.handleSubmit(handleSubmit)} noValidate className="mt-4">
@@ -230,16 +231,13 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
               <FormField
                 control={form.control}
                 name="skillUrl"
-                label={labelWithHint(
-                  "Source URL",
-                  "Paste an HTTPS git repository URL from GitHub, GitLab, Bitbucket, or a self-hosted host (e.g. github.com/org/repo or github.com/org/repo/tree/main/my-skill), or an HTTPS link to a .zip archive of the skill hosted on S3 or any static file server. For a private repository use its SSH clone URL (git@ghe.example.com:org/repo.git) so Claude Code clones it with your own SSH key.",
-                )}
+                label={labelWithHint(t("skills.addForm.labels.sourceUrl"), t("skills.addForm.hints.sourceUrl"))}
               >
                 {({ ref, onChange, ...field }) => (
                   <Input
                     {...field}
                     ref={ref}
-                    placeholder="https://github.com/org/repo or https://bucket.s3.amazonaws.com/my-skill.zip"
+                    placeholder={t("skills.addForm.placeholders.sourceUrl")}
                     className="rounded-lg"
                     onChange={(event) => {
                       onChange(event);
@@ -252,11 +250,8 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
               <FormField
                 control={form.control}
                 name="subPath"
-                label={labelWithHint(
-                  "Subfolder path (Optional)",
-                  "Path within the repository where the skill lives (e.g., plugins/my-skill). Leave empty if the skill is at the repo root.",
-                )}
-                description={subPathLock ? SUB_PATH_LOCK_REASON[subPathLock] : undefined}
+                label={labelWithHint(t("skills.addForm.labels.subPath"), t("skills.addForm.hints.subPath"))}
+                description={subPathLock ? t(SUB_PATH_LOCK_REASON_KEY[subPathLock]) : undefined}
               >
                 {({ ref, onChange, ...field }) => (
                   <Input
@@ -277,27 +272,29 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
                 <FormField
                   control={form.control}
                   name="sha256"
-                  label={labelWithHint(
-                    "Archive SHA-256 (Optional)",
-                    "Hex digest of the zip file. Claude Code refuses to install the archive if its checksum does not match.",
-                  )}
+                  label={labelWithHint(t("skills.addForm.labels.sha256"), t("skills.addForm.hints.sha256"))}
                 >
                   {({ ref, ...field }) => (
-                    <Input {...field} ref={ref} placeholder="64 hex characters" className="rounded-lg font-mono" />
+                    <Input
+                      {...field}
+                      ref={ref}
+                      placeholder={t("skills.addForm.placeholders.sha256")}
+                      className="rounded-lg font-mono"
+                    />
                   )}
                 </FormField>
               )}
 
               {urlPreview && (
                 <div className="rounded-lg border border-info/20 bg-info/10 px-3 py-2 text-sm text-info">
-                  Detected: {urlPreview.label}
+                  {t("skills.addForm.detected", { source: urlPreview.label })}
                 </div>
               )}
 
               <FormField
                 control={form.control}
                 name="name"
-                label={labelWithHint("Skill Name", "Unique identifier in kebab-case format (e.g., my-skill)")}
+                label={labelWithHint(t("skills.addForm.labels.name"), t("skills.addForm.hints.name"))}
               >
                 {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="my-skill" className="rounded-lg" />}
               </FormField>
@@ -306,17 +303,22 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
                 <FormField
                   control={form.control}
                   name="domain"
-                  label={labelWithHint("Domain (Optional)", "Top-level grouping in the Skill Hub (e.g., Productivity)")}
+                  label={labelWithHint(t("skills.addForm.labels.domain"), t("skills.addForm.hints.domain"))}
                   className="flex-1"
                 >
                   {({ ref, ...field }) => (
-                    <Input {...field} ref={ref} placeholder="Productivity" className="rounded-lg" />
+                    <Input
+                      {...field}
+                      ref={ref}
+                      placeholder={t("skills.addForm.placeholders.domain")}
+                      className="rounded-lg"
+                    />
                   )}
                 </FormField>
                 <FormField
                   control={form.control}
                   name="namespace"
-                  label={labelWithHint("Namespace (Optional)", "Sub-grouping within domain (e.g., workflows)")}
+                  label={labelWithHint(t("skills.addForm.labels.namespace"), t("skills.addForm.hints.namespace"))}
                   className="flex-1"
                 >
                   {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="workflows" className="rounded-lg" />}
@@ -326,14 +328,14 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
               <FormField
                 control={form.control}
                 name="description"
-                label={labelWithHint("Description (Optional)", "Brief description of what the skill does")}
+                label={labelWithHint(t("skills.addForm.labels.description"), t("skills.addForm.hints.description"))}
               >
                 {({ ref, ...field }) => (
                   <Textarea
                     {...field}
                     ref={ref}
                     rows={3}
-                    placeholder="A skill that helps with..."
+                    placeholder={t("skills.addForm.placeholders.description")}
                     maxLength={500}
                     className="rounded-lg"
                   />
@@ -343,7 +345,7 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
               <FormField
                 control={form.control}
                 name="category"
-                label={labelWithHint("Category (Optional)", "Select a category or enter a custom one")}
+                label={labelWithHint(t("skills.addForm.labels.category"), t("skills.addForm.hints.category"))}
               >
                 {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
                   <Combobox items={PREDEFINED_CATEGORIES} value={value} onValueChange={onChange}>
@@ -351,12 +353,12 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
                       id={id}
                       aria-invalid={ariaInvalid}
                       aria-describedby={ariaDescribedBy}
-                      placeholder="Select or type a category"
+                      placeholder={t("skills.addForm.placeholders.category")}
                       className="w-full rounded-lg"
                       showClear={value != null && value !== ""}
                     />
                     <ComboboxContent>
-                      <ComboboxEmpty>No matching categories</ComboboxEmpty>
+                      <ComboboxEmpty>{t("skills.addForm.noCategories")}</ComboboxEmpty>
                       <ComboboxList>
                         {(category: string) => (
                           <ComboboxItem key={category} value={category}>
@@ -372,17 +374,22 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
               <FormField
                 control={form.control}
                 name="keywords"
-                label={labelWithHint("Keywords (Optional)", "Comma-separated list of keywords for search")}
+                label={labelWithHint(t("skills.addForm.labels.keywords"), t("skills.addForm.hints.keywords"))}
               >
                 {({ ref, ...field }) => (
-                  <Input {...field} ref={ref} placeholder="search, web, api" className="rounded-lg" />
+                  <Input
+                    {...field}
+                    ref={ref}
+                    placeholder={t("skills.addForm.placeholders.keywords")}
+                    className="rounded-lg"
+                  />
                 )}
               </FormField>
 
               <FormField
                 control={form.control}
                 name="version"
-                label={labelWithHint("Version (Optional)", "Semantic version (e.g., 1.0.0)")}
+                label={labelWithHint(t("skills.addForm.labels.version"), t("skills.addForm.hints.version"))}
               >
                 {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="1.0.0" className="rounded-lg" />}
               </FormField>
@@ -390,17 +397,22 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
               <FormField
                 control={form.control}
                 name="authorName"
-                label={labelWithHint("Author Name (Optional)", "Name of the skill author or organization")}
+                label={labelWithHint(t("skills.addForm.labels.authorName"), t("skills.addForm.hints.authorName"))}
               >
                 {({ ref, ...field }) => (
-                  <Input {...field} ref={ref} placeholder="Your Name or Organization" className="rounded-lg" />
+                  <Input
+                    {...field}
+                    ref={ref}
+                    placeholder={t("skills.addForm.placeholders.authorName")}
+                    className="rounded-lg"
+                  />
                 )}
               </FormField>
 
               <FormField
                 control={form.control}
                 name="authorEmail"
-                label={labelWithHint("Author Email (Optional)", "Contact email for the skill author")}
+                label={labelWithHint(t("skills.addForm.labels.authorEmail"), t("skills.addForm.hints.authorEmail"))}
               >
                 {({ ref, ...field }) => (
                   <Input {...field} ref={ref} type="email" placeholder="author@example.com" className="rounded-lg" />
@@ -410,11 +422,11 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
 
             <div className="mt-6 flex justify-end gap-2">
               <Button type="button" variant="outline" onClick={handleCancel} disabled={isSubmitting}>
-                Cancel
+                {t("skills.addForm.cancel")}
               </Button>
               <Button type="submit" disabled={isSubmitting} aria-busy={isSubmitting}>
                 {isSubmitting && <UiLoadingSpinner className="size-4" />}
-                {isSubmitting ? "Adding..." : "Add Skill"}
+                {isSubmitting ? t("skills.addForm.adding") : t("skills.addForm.submit")}
               </Button>
             </div>
           </form>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/TagTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/TagTable.tsx
index d56695a9056..8b6fe5b387d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/TagTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/TagTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState, Table } from "@tanstack/react-table";
 import { Inbox, SearchX } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 import { Tag } from "@/components/tag_management/types";
@@ -21,42 +22,45 @@ interface TagTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No tags yet</div>
-      <div className="text-sm text-muted-foreground">Create a tag to start routing and restricting model usage.</div>
+      <div className="text-sm font-medium text-foreground">{t("tagManagement.table.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("tagManagement.table.empty.description")}</div>
     </div>
   );
 }
 
 function NoMatchingTags() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <SearchX className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No matching tags</div>
-      <div className="text-sm text-muted-foreground">Try a different tag name or description.</div>
+      <div className="text-sm font-medium text-foreground">{t("tagManagement.table.noMatch.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("tagManagement.table.noMatch.description")}</div>
     </div>
   );
 }
 
 function TagFilters({ table }: { table: Table<Tag> }) {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-wrap items-center gap-2">
       <Input
-        aria-label="Filter by tag name"
-        placeholder="Filter by tag name…"
+        aria-label={t("tagManagement.table.filters.name")}
+        placeholder={t("tagManagement.table.filters.namePlaceholder")}
         className="h-8 w-56"
         value={(table.getColumn("name")?.getFilterValue() as string | undefined) ?? ""}
         onChange={(event) => table.getColumn("name")?.setFilterValue(event.target.value)}
       />
       <Input
-        aria-label="Filter by description"
-        placeholder="Filter by description…"
+        aria-label={t("tagManagement.table.filters.description")}
+        placeholder={t("tagManagement.table.filters.descriptionPlaceholder")}
         className="h-8 w-56"
         value={(table.getColumn("description")?.getFilterValue() as string | undefined) ?? ""}
         onChange={(event) => table.getColumn("description")?.setFilterValue(event.target.value)}
@@ -66,9 +70,13 @@ function TagFilters({ table }: { table: Table<Tag> }) {
 }
 
 const TagTable: React.FC<TagTableProps> = ({ data, onEdit, onDelete, onSelectTag, isLoading = false }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
 
-  const columns = useMemo(() => getTagTableColumns({ onSelectTag, onEdit, onDelete }), [onSelectTag, onEdit, onDelete]);
+  const columns = useMemo(
+    () => getTagTableColumns({ onSelectTag, onEdit, onDelete }, t),
+    [onSelectTag, onEdit, onDelete, t],
+  );
 
   return (
     <DataTable
@@ -81,7 +89,7 @@ const TagTable: React.FC<TagTableProps> = ({ data, onEdit, onDelete, onSelectTag
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading tags…"
+      loadingMessage={t("tagManagement.table.loading")}
       filterMode="client"
       toolbar={(table) => <TagFilters table={table} />}
       noDataMessage={data.length === 0 ? <EmptyState /> : <NoMatchingTags />}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx
index 5a51b3f21b3..520cd0e7a3a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx
@@ -2,6 +2,7 @@
 
 import { ChevronRight, CircleHelp } from "lucide-react";
 import React from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { z } from "zod";
 import BudgetDurationDropdown from "@/components/common_components/budget_duration_dropdown";
 import { FieldGroup } from "@/components/ui/field";
@@ -13,6 +14,7 @@ import { Button } from "@/components/ui/button";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
+import i18n from "@/i18n/i18n";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
@@ -37,7 +39,7 @@ interface ModelInfo {
 }
 
 const createTagShape = {
-  tag_name: z.string().min(1, "Please input a tag name"),
+  tag_name: z.string().min(1, { error: () => i18n.t("tagManagement.createModal.validation.nameRequired") }),
   description: z.string().optional(),
   allowed_llms: z.array(z.string()).optional(),
   max_budget: z.string().optional(),
@@ -56,6 +58,7 @@ interface CreateTagModalProps {
 }
 
 const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSubmit, availableModels }) => {
+  const { t } = useTranslation();
   const [budgetSectionOpen, setBudgetSectionOpen] = React.useState(false);
   const form = useZodForm(createTagSchema, { defaultValues: { tag_name: "" } });
 
@@ -80,16 +83,20 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
     <Dialog open={visible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
         <DialogHeader>
-          <DialogTitle>Create New Tag</DialogTitle>
+          <DialogTitle>{t("tagManagement.createModal.title")}</DialogTitle>
         </DialogHeader>
         <form onSubmit={form.handleSubmit(handleFinish)} noValidate>
           <TooltipProvider>
             <FieldGroup>
-              <FormField control={form.control} name="tag_name" label="Tag Name">
+              <FormField control={form.control} name="tag_name" label={t("tagManagement.createModal.fields.name")}>
                 {({ ref, ...field }) => <Input {...field} ref={ref} />}
               </FormField>
 
-              <FormField control={form.control} name="description" label="Description">
+              <FormField
+                control={form.control}
+                name="description"
+                label={t("tagManagement.createModal.fields.description")}
+              >
                 {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
               </FormField>
 
@@ -97,8 +104,8 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
                 control={form.control}
                 name="allowed_llms"
                 label={labelWithHint(
-                  "Allowed Models",
-                  "Select which models are allowed to process requests from this tag",
+                  t("tagManagement.createModal.fields.models"),
+                  t("tagManagement.createModal.fields.modelsHint"),
                 )}
               >
                 {({ value, onChange }) => (
@@ -106,7 +113,7 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
                     options={modelOptions}
                     value={value}
                     onValueChange={onChange}
-                    placeholder="Select Models"
+                    placeholder={t("tagManagement.createModal.fields.modelsPlaceholder")}
                   />
                 )}
               </FormField>
@@ -118,7 +125,7 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
               className="mt-4 mb-4 rounded-md border border-border"
             >
               <CollapsibleTrigger className="group flex w-full items-center justify-between px-4 py-3 text-base font-medium text-foreground">
-                Budget & Rate Limits (Optional)
+                {t("tagManagement.createModal.budgetSection")}
                 <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
               </CollapsibleTrigger>
               <CollapsibleContent className="px-4 pb-4">
@@ -127,8 +134,8 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
                     control={form.control}
                     name="max_budget"
                     label={labelWithHint(
-                      "Max Budget (USD)",
-                      "Maximum amount in USD this tag can spend. When reached, requests with this tag will be blocked",
+                      t("tagManagement.createModal.fields.maxBudget"),
+                      t("tagManagement.createModal.fields.maxBudgetHint"),
                     )}
                   >
                     {({ ref, value, ...field }) => <NumericalInput {...field} value={value ?? ""} step={0.01} />}
@@ -138,8 +145,8 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
                     control={form.control}
                     name="budget_duration"
                     label={labelWithHint(
-                      "Reset Budget",
-                      "How often the budget should reset. For example, setting 'daily' will reset the budget every 24 hours",
+                      t("tagManagement.createModal.fields.resetBudget"),
+                      t("tagManagement.createModal.fields.resetBudgetHint"),
                     )}
                   >
                     {({ id, value, onChange }) => (
@@ -154,23 +161,26 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
 
                 <div className="mt-4 rounded-md border border-border bg-muted p-3">
                   <p className="text-sm text-muted-foreground">
-                    TPM/RPM limits for tags are not currently supported. If you need this feature, please{" "}
-                    <a
-                      href="https://github.com/BerriAI/litellm/issues/new"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="text-info underline hover:text-info/80"
-                    >
-                      create a GitHub issue
-                    </a>
-                    .
+                    <Trans
+                      i18nKey="tagManagement.createModal.rateLimitsNotice"
+                      components={{
+                        issue: (
+                          <a
+                            href="https://github.com/BerriAI/litellm/issues/new"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="text-info underline hover:text-info/80"
+                          />
+                        ),
+                      }}
+                    />
                   </p>
                 </div>
               </CollapsibleContent>
             </Collapsible>
 
             <div className="mt-2.5 text-right">
-              <Button type="submit">Create Tag</Button>
+              <Button type="submit">{t("tagManagement.createModal.submit")}</Button>
             </div>
           </TooltipProvider>
         </form>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/index.tsx b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/index.tsx
index 583492bf837..b0fa159bab1 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/index.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/index.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { RefreshCw } from "lucide-react";
+import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import TagInfoView from "./tag_info";
 import { modelInfoCall } from "@/components/networking";
@@ -27,6 +28,7 @@ interface TagProps {
 }
 
 const TagManagement: React.FC<TagProps> = ({ accessToken, userID, userRole }) => {
+  const { t } = useTranslation();
   const [tags, setTags] = useState<Tag[]>([]);
   const [isLoadingTags, setIsLoadingTags] = useState(true);
   const [isCreateModalVisible, setIsCreateModalVisible] = useState(false);
@@ -48,7 +50,7 @@ const TagManagement: React.FC<TagProps> = ({ accessToken, userID, userRole }) =>
       setTags(Object.values(response));
     } catch (error) {
       console.error("Error fetching tags:", error);
-      toast.fromError("Error fetching tags: " + error);
+      toast.fromError(t("tagManagement.page.toasts.fetchTagsFailed", { error: String(error) }));
     } finally {
       setIsLoadingTags(false);
     }
@@ -73,12 +75,12 @@ const TagManagement: React.FC<TagProps> = ({ accessToken, userID, userRole }) =>
         rpm_limit: formValues.rpm_limit,
         budget_duration: formValues.budget_duration,
       });
-      toast.success("Tag created successfully");
+      toast.success(t("tagManagement.page.toasts.created"));
       setIsCreateModalVisible(false);
       fetchTags();
     } catch (error) {
       console.error("Error creating tag:", error);
-      toast.fromError("Error creating tag: " + error);
+      toast.fromError(t("tagManagement.page.toasts.createFailed", { error: String(error) }));
     }
   };
 
@@ -92,11 +94,11 @@ const TagManagement: React.FC<TagProps> = ({ accessToken, userID, userRole }) =>
     setIsDeleting(true);
     try {
       await tagDeleteCall(accessToken, tagToDelete);
-      toast.success("Tag deleted successfully");
+      toast.success(t("tagManagement.page.toasts.deleted"));
       fetchTags();
     } catch (error) {
       console.error("Error deleting tag:", error);
-      toast.fromError("Error deleting tag: " + error);
+      toast.fromError(t("tagManagement.page.toasts.deleteFailed", { error: String(error) }));
     } finally {
       setIsDeleting(false);
       setIsDeleteModalOpen(false);
@@ -114,12 +116,12 @@ const TagManagement: React.FC<TagProps> = ({ accessToken, userID, userRole }) =>
           }
         } catch (error) {
           console.error("Error fetching models:", error);
-          toast.fromError("Error fetching models: " + error);
+          toast.fromError(t("tagManagement.page.toasts.fetchModelsFailed", { error: String(error) }));
         }
       };
       fetchModels();
     }
-  }, [accessToken, userID, userRole]);
+  }, [accessToken, userID, userRole, t]);
 
   useEffect(() => {
     fetchTags();
@@ -141,29 +143,45 @@ const TagManagement: React.FC<TagProps> = ({ accessToken, userID, userRole }) =>
       ) : (
         <div className="flex h-full w-full flex-col p-8 pt-10">
           <div className="mt-2 mb-4 flex w-full items-center justify-between">
-            <h1>Tag Management</h1>
+            <h1>{t("tagManagement.page.title")}</h1>
             <div className="flex items-center space-x-2">
-              {lastRefreshed && <p className="text-sm">Last Refreshed: {lastRefreshed}</p>}
-              <Button variant="outline" size="icon-sm" aria-label="Refresh tags" onClick={handleRefreshClick}>
+              {lastRefreshed && (
+                <p className="text-sm">
+                  {t("tagManagement.page.lastRefreshedPrefix")}
+                  {lastRefreshed}
+                </p>
+              )}
+              <Button
+                variant="outline"
+                size="icon-sm"
+                aria-label={t("tagManagement.page.refresh")}
+                onClick={handleRefreshClick}
+              >
                 <RefreshCw />
               </Button>
             </div>
           </div>
 
           <div className="mb-4 text-sm">
-            Click on a tag name to view and edit its details.
+            {t("tagManagement.page.intro")}
             <p>
-              You can use tags to restrict the usage of certain LLMs based on tags passed in the request. Read more
-              about tag routing{" "}
-              <a href="https://docs.litellm.ai/docs/proxy/tag_routing" target="_blank" rel="noopener noreferrer">
-                here
-              </a>
-              .
+              <Trans
+                i18nKey="tagManagement.page.routingHelp"
+                components={{
+                  docs: (
+                    <a
+                      href="https://docs.litellm.ai/docs/proxy/tag_routing"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    />
+                  ),
+                }}
+              />
             </p>
           </div>
 
           <Button className="mb-4 self-start" onClick={() => setIsCreateModalVisible(true)}>
-            + Create New Tag
+            {t("tagManagement.page.create")}
           </Button>
 
           <div className="mt-2 flex min-h-0 flex-1 flex-col">
@@ -190,10 +208,12 @@ const TagManagement: React.FC<TagProps> = ({ accessToken, userID, userRole }) =>
           {/* Delete Confirmation Modal */}
           <DeleteResourceModal
             isOpen={isDeleteModalOpen}
-            title="Delete Tag"
-            message="Are you sure you want to delete this tag? This action cannot be undone."
-            resourceInformationTitle="Tag Information"
-            resourceInformation={[{ label: "Tag Name", value: tagToDelete, code: true }]}
+            title={t("tagManagement.page.deleteDialog.title")}
+            message={t("tagManagement.page.deleteDialog.message")}
+            resourceInformationTitle={t("tagManagement.page.deleteDialog.infoTitle")}
+            resourceInformation={[
+              { label: t("tagManagement.page.deleteDialog.tagName"), value: tagToDelete, code: true },
+            ]}
             onCancel={() => {
               setIsDeleteModalOpen(false);
               setTagToDelete(null);
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tagTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tagTableColumns.tsx
index 1cb56e90038..c6d9e5d4f62 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tagTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tagTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 import { MoreHorizontal, Pencil, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { CellTooltip, DateCell, IdentityCell } from "@/components/shared/table_cells";
@@ -22,10 +24,11 @@ export const DYNAMIC_SPEND_TAG_DESCRIPTION =
 const isDynamicSpendTag = (tag: Tag) => tag.description === DYNAMIC_SPEND_TAG_DESCRIPTION;
 
 function TagNameCell({ tag, onSelectTag }: { tag: Tag; onSelectTag: (tagName: string) => void }) {
+  const { t } = useTranslation();
   if (isDynamicSpendTag(tag)) {
     return (
       <CellTooltip
-        content="You cannot view the information of a dynamically generated spend tag"
+        content={t("tagManagement.table.dynamicTagHint")}
         trigger={<span className="block max-w-60 truncate font-mono text-xs text-muted-foreground">{tag.name}</span>}
       />
     );
@@ -41,16 +44,17 @@ function TagNameCell({ tag, onSelectTag }: { tag: Tag; onSelectTag: (tagName: st
 }
 
 function TagModelsCell({ tag }: { tag: Tag }) {
+  const { t } = useTranslation();
   const models = tag.models ?? [];
   if (models.length === 0) {
-    return <Badge variant="secondary">All Models</Badge>;
+    return <Badge variant="secondary">{t("tagManagement.table.allModels")}</Badge>;
   }
   return (
     <div className="flex flex-wrap items-center gap-1">
       {models.map((modelId) => (
         <CellTooltip
           key={modelId}
-          content={`ID: ${modelId}`}
+          content={t("tagManagement.table.modelId", { id: modelId })}
           trigger={
             <Badge variant="outline" className="cursor-default">
               {tag.model_info?.[modelId] || modelId}
@@ -69,12 +73,13 @@ interface TagRowActionsProps {
 }
 
 function TagRowActions({ tag, onEdit, onDelete }: TagRowActionsProps) {
+  const { t } = useTranslation();
   const isDynamic = isDynamicSpendTag(tag);
 
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open tag actions"
+        aria-label={t("tagManagement.table.actions.open")}
         data-testid={`tag-actions-${tag.name}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -84,21 +89,21 @@ function TagRowActions({ tag, onEdit, onDelete }: TagRowActionsProps) {
         <DropdownMenuItem
           disabled={isDynamic}
           data-testid="tag-action-edit"
-          title={isDynamic ? "Dynamically generated spend tags cannot be edited" : undefined}
+          title={isDynamic ? t("tagManagement.table.actions.editDisabled") : undefined}
           onClick={() => onEdit(tag)}
         >
           <Pencil />
-          Edit
+          {t("tagManagement.table.actions.edit")}
         </DropdownMenuItem>
         <DropdownMenuItem
           variant="destructive"
           disabled={isDynamic}
           data-testid="tag-action-delete"
-          title={isDynamic ? "Dynamically generated spend tags cannot be deleted" : undefined}
+          title={isDynamic ? t("tagManagement.table.actions.deleteDisabled") : undefined}
           onClick={() => onDelete(tag.name)}
         >
           <Trash2 />
-          Delete
+          {t("tagManagement.table.actions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -111,12 +116,15 @@ interface TagTableColumnsDeps {
   onDelete: (tagName: string) => void;
 }
 
-export const getTagTableColumns = ({ onSelectTag, onEdit, onDelete }: TagTableColumnsDeps): ColumnDef<Tag>[] => [
+export const getTagTableColumns = (
+  { onSelectTag, onEdit, onDelete }: TagTableColumnsDeps,
+  t: TFunction,
+): ColumnDef<Tag>[] => [
   {
     id: "name",
     accessorKey: "name",
-    meta: { title: "Tag Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Tag Name" />,
+    meta: { title: t("tagManagement.table.columns.name") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("tagManagement.table.columns.name")} />,
     size: 260,
     enableSorting: true,
     filterFn: "includesString",
@@ -125,8 +133,8 @@ export const getTagTableColumns = ({ onSelectTag, onEdit, onDelete }: TagTableCo
   {
     id: "description",
     accessorKey: "description",
-    meta: { title: "Description" },
-    header: "Description",
+    meta: { title: t("tagManagement.table.columns.description") },
+    header: t("tagManagement.table.columns.description"),
     size: 300,
     enableSorting: false,
     filterFn: "includesString",
@@ -141,8 +149,8 @@ export const getTagTableColumns = ({ onSelectTag, onEdit, onDelete }: TagTableCo
   },
   {
     id: "models",
-    meta: { title: "Allowed Models", skeleton: "chips" },
-    header: "Allowed Models",
+    meta: { title: t("tagManagement.table.columns.models"), skeleton: "chips" },
+    header: t("tagManagement.table.columns.models"),
     size: 240,
     enableSorting: false,
     cell: ({ row }) => <TagModelsCell tag={row.original} />,
@@ -151,8 +159,8 @@ export const getTagTableColumns = ({ onSelectTag, onEdit, onDelete }: TagTableCo
     id: "created_at",
     accessorKey: "created_at",
     sortingFn: "datetime",
-    meta: { title: "Created" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created" />,
+    meta: { title: t("tagManagement.table.columns.created") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("tagManagement.table.columns.created")} />,
     size: 150,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} precision="date" />,
@@ -160,7 +168,7 @@ export const getTagTableColumns = ({ onSelectTag, onEdit, onDelete }: TagTableCo
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("tagManagement.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tag_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tag_info.tsx
index 4c9e1c1d082..6d01c6c6768 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tag_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/tag_info.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import React, { useState, useEffect } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { z } from "zod";
 import { fetchUserModels } from "@/components/organisms/create_key_button";
@@ -19,20 +20,20 @@ import { Card, CardContent, CardTitle } from "@/components/ui/card";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
+import i18n from "@/i18n/i18n";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { copyToClipboard as utilCopyToClipboard } from "@/utils/dataUtils";
 import { CheckIcon, ChevronRight, CopyIcon } from "lucide-react";
 
 const tagEditShape = {
-  name: z.string().min(1, "Please input a tag name"),
+  name: z.string().min(1, { error: () => i18n.t("tagManagement.editForm.validation.nameRequired") }),
   description: z.string().optional(),
   models: z.array(z.string()).optional(),
   max_budget: z
     .union([z.string(), z.number()])
-    .refine(
-      (value) => value === "" || (Number.isFinite(Number(value)) && Number(value) >= 0),
-      "Enter a nonnegative budget",
-    )
+    .refine((value) => value === "" || (Number.isFinite(Number(value)) && Number(value) >= 0), {
+      error: () => i18n.t("tagManagement.editForm.validation.budgetNonnegative"),
+    })
     .optional(),
   budget_duration: z.string().nullish(),
 };
@@ -56,6 +57,7 @@ interface TagEditFormProps {
 }
 
 const TagEditForm: React.FC<TagEditFormProps> = ({ tag, seedBudgetFields, userModels, onCancel, onSave }) => {
+  const { t } = useTranslation();
   const [budgetSectionOpen, setBudgetSectionOpen] = useState(false);
   const form = useZodForm(tagEditSchema, {
     defaultValues: {
@@ -75,22 +77,27 @@ const TagEditForm: React.FC<TagEditFormProps> = ({ tag, seedBudgetFields, userMo
   return (
     <form onSubmit={form.handleSubmit(submitVisibleValues)} noValidate>
       <FieldGroup>
-        <FormField control={form.control} name="name" label="Tag Name">
+        <FormField control={form.control} name="name" label={t("tagManagement.editForm.fields.name")}>
           {({ ref, ...field }) => <Input {...field} ref={ref} />}
         </FormField>
 
-        <FormField control={form.control} name="description" label="Description">
+        <FormField control={form.control} name="description" label={t("tagManagement.editForm.fields.description")}>
           {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
         </FormField>
 
         <FormField
           control={form.control}
           name="models"
-          label="Allowed Models"
-          description="Select which models are allowed to process this type of data"
+          label={t("tagManagement.editForm.fields.models")}
+          description={t("tagManagement.editForm.fields.modelsDescription")}
         >
           {({ value, onChange }) => (
-            <MultiSelect options={modelOptions} value={value} onValueChange={onChange} placeholder="Select Models" />
+            <MultiSelect
+              options={modelOptions}
+              value={value}
+              onValueChange={onChange}
+              placeholder={t("tagManagement.editForm.fields.modelsPlaceholder")}
+            />
           )}
         </FormField>
       </FieldGroup>
@@ -101,7 +108,7 @@ const TagEditForm: React.FC<TagEditFormProps> = ({ tag, seedBudgetFields, userMo
         className="mt-4 mb-4 rounded-md border border-border"
       >
         <CollapsibleTrigger className="group flex w-full items-center justify-between px-4 py-3 text-base font-medium text-foreground">
-          Budget & Rate Limits
+          {t("tagManagement.editForm.budgetSection")}
           <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
         </CollapsibleTrigger>
         <CollapsibleContent className="px-4 pb-4">
@@ -109,8 +116,8 @@ const TagEditForm: React.FC<TagEditFormProps> = ({ tag, seedBudgetFields, userMo
             <FormField
               control={form.control}
               name="max_budget"
-              label="Max Budget (USD)"
-              description="Maximum amount in USD this tag can spend"
+              label={t("tagManagement.editForm.fields.maxBudget")}
+              description={t("tagManagement.editForm.fields.maxBudgetDescription")}
             >
               {({ ref, value, ...field }) => <NumericalInput {...field} value={value ?? ""} step={0.01} />}
             </FormField>
@@ -118,8 +125,8 @@ const TagEditForm: React.FC<TagEditFormProps> = ({ tag, seedBudgetFields, userMo
             <FormField
               control={form.control}
               name="budget_duration"
-              label="Reset Budget"
-              description="How often the budget should reset"
+              label={t("tagManagement.editForm.fields.resetBudget")}
+              description={t("tagManagement.editForm.fields.resetBudgetDescription")}
             >
               {({ id, value, onChange }) => (
                 <BudgetDurationDropdown id={id} value={value ?? null} onChange={onChange} />
@@ -129,16 +136,19 @@ const TagEditForm: React.FC<TagEditFormProps> = ({ tag, seedBudgetFields, userMo
 
           <div className="mt-4 rounded-md border border-border bg-muted p-3">
             <p className="text-sm text-muted-foreground">
-              TPM/RPM limits for tags are not currently supported. If you need this feature, please{" "}
-              <a
-                href="https://github.com/BerriAI/litellm/issues/new"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-info underline hover:text-info/80"
-              >
-                create a GitHub issue
-              </a>
-              .
+              <Trans
+                i18nKey="tagManagement.editForm.rateLimitsNotice"
+                components={{
+                  issue: (
+                    <a
+                      href="https://github.com/BerriAI/litellm/issues/new"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-info underline hover:text-info/80"
+                    />
+                  ),
+                }}
+              />
             </p>
           </div>
         </CollapsibleContent>
@@ -146,9 +156,9 @@ const TagEditForm: React.FC<TagEditFormProps> = ({ tag, seedBudgetFields, userMo
 
       <div className="flex justify-end space-x-2">
         <Button type="button" variant="outline" onClick={onCancel}>
-          Cancel
+          {t("tagManagement.editForm.cancel")}
         </Button>
-        <Button type="submit">Save Changes</Button>
+        <Button type="submit">{t("tagManagement.editForm.save")}</Button>
       </div>
     </form>
   );
@@ -163,6 +173,7 @@ interface TagInfoViewProps {
 }
 
 const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken, is_admin, editTag }) => {
+  const { t } = useTranslation();
   const [tagDetails, setTagDetails] = useState<Tag | null>(null);
   const [isEditing, setIsEditing] = useState<boolean>(editTag);
   const [userModels, setUserModels] = useState<string[]>([]);
@@ -188,7 +199,7 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
       }
     } catch (error) {
       console.error("Error fetching tag details:", error);
-      toast.fromError("Error fetching tag details: " + error);
+      toast.fromError(t("tagManagement.info.toasts.fetchFailed", { error: String(error) }));
     }
   };
 
@@ -216,17 +227,17 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
         rpm_limit: undefined,
         budget_duration: values.budget_duration,
       });
-      toast.success("Tag updated successfully");
+      toast.success(t("tagManagement.info.toasts.updated"));
       setIsEditing(false);
       fetchTagDetails();
     } catch (error) {
       console.error("Error updating tag:", error);
-      toast.fromError("Error updating tag: " + error);
+      toast.fromError(t("tagManagement.info.toasts.updateFailed", { error: String(error) }));
     }
   };
 
   if (!tagDetails) {
-    return <div>Loading...</div>;
+    return <div>{t("tagManagement.info.loading")}</div>;
   }
 
   return (
@@ -234,10 +245,10 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
       <div className="flex justify-between items-center mb-6">
         <div>
           <Button onClick={onClose} className="mb-4">
-            ← Back to Tags
+            {t("tagManagement.info.back")}
           </Button>
           <div className="flex items-center gap-2">
-            <span className="text-sm font-medium">Tag Name:</span>
+            <span className="text-sm font-medium">{t("tagManagement.info.tagNameLabel")}</span>
             <span className="font-mono px-2 py-1 bg-muted rounded-sm text-sm border border-border">
               {tagDetails.name}
             </span>
@@ -254,9 +265,13 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
               {copiedStates["tag-name"] ? <CheckIcon size={12} /> : <CopyIcon size={12} />}
             </Button>
           </div>
-          <p className="text-sm text-muted-foreground">{tagDetails.description || "No description"}</p>
+          <p className="text-sm text-muted-foreground">
+            {tagDetails.description || t("tagManagement.info.noDescription")}
+          </p>
         </div>
-        {is_admin && !isEditing && <Button onClick={() => setIsEditing(true)}>Edit Tag</Button>}
+        {is_admin && !isEditing && (
+          <Button onClick={() => setIsEditing(true)}>{t("tagManagement.info.editTag")}</Button>
+        )}
       </div>
 
       {isEditing ? (
@@ -275,25 +290,25 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
         <div className="space-y-6">
           <Card>
             <CardContent>
-              <CardTitle>Tag Details</CardTitle>
+              <CardTitle>{t("tagManagement.info.details.title")}</CardTitle>
               <div className="space-y-4 mt-4">
                 <div>
-                  <p className="font-medium">Name</p>
+                  <p className="font-medium">{t("tagManagement.info.details.name")}</p>
                   <p>{tagDetails.name}</p>
                 </div>
                 <div>
-                  <p className="font-medium">Description</p>
+                  <p className="font-medium">{t("tagManagement.info.details.description")}</p>
                   <p>{tagDetails.description || "-"}</p>
                 </div>
                 <div>
-                  <p className="font-medium">Allowed Models</p>
+                  <p className="font-medium">{t("tagManagement.info.details.models")}</p>
                   <div className="flex flex-wrap gap-2 mt-2">
                     {!tagDetails.models || tagDetails.models.length === 0 ? (
-                      <Badge variant="secondary">All Models</Badge>
+                      <Badge variant="secondary">{t("tagManagement.info.details.allModels")}</Badge>
                     ) : (
                       tagDetails.models.map((modelId) => (
                         <Badge key={modelId} variant="secondary">
-                          <SimpleTooltip content={`ID: ${modelId}`}>
+                          <SimpleTooltip content={t("tagManagement.info.details.modelId", { id: modelId })}>
                             {tagDetails.model_info?.[modelId] || modelId}
                           </SimpleTooltip>
                         </Badge>
@@ -302,11 +317,11 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
                   </div>
                 </div>
                 <div>
-                  <p className="font-medium">Created</p>
+                  <p className="font-medium">{t("tagManagement.info.details.created")}</p>
                   <p>{tagDetails.created_at ? new Date(tagDetails.created_at).toLocaleString() : "-"}</p>
                 </div>
                 <div>
-                  <p className="font-medium">Last Updated</p>
+                  <p className="font-medium">{t("tagManagement.info.details.lastUpdated")}</p>
                   <p>{tagDetails.updated_at ? new Date(tagDetails.updated_at).toLocaleString() : "-"}</p>
                 </div>
               </div>
@@ -316,32 +331,32 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
           {tagDetails.litellm_budget_table && (
             <Card>
               <CardContent>
-                <CardTitle>Budget & Rate Limits</CardTitle>
+                <CardTitle>{t("tagManagement.info.budget.title")}</CardTitle>
                 <div className="space-y-4 mt-4">
                   {tagDetails.litellm_budget_table.max_budget !== undefined &&
                     tagDetails.litellm_budget_table.max_budget !== null && (
                       <div>
-                        <p className="font-medium">Max Budget</p>
+                        <p className="font-medium">{t("tagManagement.info.budget.maxBudget")}</p>
                         <p>${tagDetails.litellm_budget_table.max_budget}</p>
                       </div>
                     )}
                   {tagDetails.litellm_budget_table.budget_duration && (
                     <div>
-                      <p className="font-medium">Budget Duration</p>
+                      <p className="font-medium">{t("tagManagement.info.budget.duration")}</p>
                       <p>{tagDetails.litellm_budget_table.budget_duration}</p>
                     </div>
                   )}
                   {tagDetails.litellm_budget_table.tpm_limit !== undefined &&
                     tagDetails.litellm_budget_table.tpm_limit !== null && (
                       <div>
-                        <p className="font-medium">TPM Limit</p>
+                        <p className="font-medium">{t("tagManagement.info.budget.tpmLimit")}</p>
                         <p>{tagDetails.litellm_budget_table.tpm_limit.toLocaleString()}</p>
                       </div>
                     )}
                   {tagDetails.litellm_budget_table.rpm_limit !== undefined &&
                     tagDetails.litellm_budget_table.rpm_limit !== null && (
                       <div>
-                        <p className="font-medium">RPM Limit</p>
+                        <p className="font-medium">{t("tagManagement.info.budget.rpmLimit")}</p>
                         <p>{tagDetails.litellm_budget_table.rpm_limit.toLocaleString()}</p>
                       </div>
                     )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx
index 2d7375431cd..e529dc85956 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx
@@ -1,4 +1,5 @@
 import React, { useId, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import { CircleCheck, CircleHelp, Inbox, X } from "lucide-react";
 import { v4 as uuidv4 } from "uuid";
@@ -48,6 +49,7 @@ const providerItems = Object.entries(VectorStoreProviders)
 const asText = (value: unknown): string => (typeof value === "string" ? value : "");
 
 const IngestSuccessAlert: React.FC<{ ingestResults: RAGIngestResponse[] }> = ({ ingestResults }) => {
+  const { t } = useTranslation();
   const [dismissed, setDismissed] = useState(false);
 
   if (dismissed) {
@@ -57,19 +59,24 @@ const IngestSuccessAlert: React.FC<{ ingestResults: RAGIngestResponse[] }> = ({
   return (
     <Alert variant="success">
       <CircleCheck />
-      <AlertTitle>Vector Store Created Successfully</AlertTitle>
+      <AlertTitle>{t("vectorStores.create.success.title")}</AlertTitle>
       <AlertDescription>
         <div>
           <p>
-            <strong>Vector Store ID:</strong> {ingestResults[0]?.vector_store_id}
+            <strong>{t("vectorStores.create.success.vectorStoreId")}</strong> {ingestResults[0]?.vector_store_id}
           </p>
           <p>
-            <strong>Documents Ingested:</strong> {ingestResults.length}
+            <strong>{t("vectorStores.create.success.documentsIngested")}</strong> {ingestResults.length}
           </p>
         </div>
       </AlertDescription>
       <AlertAction>
-        <Button variant="ghost" size="icon-sm" aria-label="Close" onClick={() => setDismissed(true)}>
+        <Button
+          variant="ghost"
+          size="icon-sm"
+          aria-label={t("vectorStores.create.success.close")}
+          onClick={() => setDismissed(true)}
+        >
           <X className="size-4" />
         </Button>
       </AlertAction>
@@ -93,6 +100,7 @@ interface CreateVectorStoreProps {
 }
 
 const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSuccess }) => {
+  const { t } = useTranslation();
   const [documents, setDocuments] = useState<DocumentUpload[]>([]);
   const [isCreating, setIsCreating] = useState(false);
   const [selectedProvider, setSelectedProvider] = useState<string>("bedrock");
@@ -104,11 +112,11 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
 
   const isSupportedDocument = (file: File): boolean => {
     if (!ACCEPTED_DOCUMENT_TYPES.includes(file.type)) {
-      toast.error(`${file.name} is not a supported file type. Please upload PDF, TXT, DOCX, or MD files.`);
+      toast.error(t("vectorStores.create.toasts.unsupportedType", { name: file.name }));
       return false;
     }
     if (file.size >= MAX_DOCUMENT_BYTES) {
-      toast.error(`${file.name} must be smaller than 50MB!`);
+      toast.error(t("vectorStores.create.toasts.tooLarge", { name: file.name }));
       return false;
     }
     return true;
@@ -135,12 +143,12 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
 
   const handleCreateVectorStore = async () => {
     if (documents.length === 0) {
-      toast.warning("Please upload at least one document");
+      toast.warning(t("vectorStores.create.toasts.noDocuments"));
       return;
     }
 
     if (!selectedProvider) {
-      toast.warning("Please select a provider");
+      toast.warning(t("vectorStores.create.toasts.noProvider"));
       return;
     }
 
@@ -148,7 +156,7 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
     const requiredFields = getProviderSpecificFields(selectedProvider).filter((field) => field.required);
     for (const field of requiredFields) {
       if (!providerParams[field.name]) {
-        toast.warning(`Please provide ${field.label}`);
+        toast.warning(t("vectorStores.create.toasts.fieldRequired", { field: t(field.label) }));
         return;
       }
     }
@@ -158,17 +166,17 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
       const bucketName = asText(providerParams.vector_bucket_name);
       const indexName = asText(providerParams.index_name);
       if (bucketName && bucketName.length < 3) {
-        toast.warning("Vector bucket name must be at least 3 characters");
+        toast.warning(t("vectorStores.create.toasts.bucketTooShort"));
         return;
       }
       if (indexName && indexName.length > 0 && indexName.length < 3) {
-        toast.warning("Index name must be at least 3 characters if provided");
+        toast.warning(t("vectorStores.create.toasts.indexTooShort"));
         return;
       }
     }
 
     if (!accessToken) {
-      toast.error("No access token available");
+      toast.error(t("vectorStores.create.toasts.noAccessToken"));
       return;
     }
 
@@ -221,13 +229,15 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
       setIngestResults(results);
       if (failure) {
         toast.warning(
-          `Vector store ${vectorStoreId} was created with ${results.length} document(s), but ${failure.name} failed to ingest`,
+          t("vectorStores.create.toasts.partialFailure", {
+            id: String(vectorStoreId),
+            count: results.length,
+            name: failure.name,
+          }),
           { description: failure.error instanceof Error ? failure.error.message : String(failure.error) },
         );
       } else {
-        toast.success(
-          `Successfully created vector store with ${results.length} document(s). Vector Store ID: ${vectorStoreId}`,
-        );
+        toast.success(t("vectorStores.create.toasts.created", { count: results.length, id: String(vectorStoreId) }));
       }
 
       if (onSuccess && vectorStoreId) {
@@ -245,7 +255,7 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
       }, 3000);
     } catch (error) {
       console.error("Error creating vector store:", error);
-      toast.fromError(`Failed to create vector store: ${error}`);
+      toast.fromError(t("vectorStores.create.toasts.createFailed", { error: String(error) }));
     } finally {
       setIsCreating(false);
     }
@@ -255,20 +265,16 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
     <TooltipProvider>
       <div className="space-y-6">
         <div>
-          <h3 className="text-lg font-medium">Create Vector Store</h3>
-          <p className="text-sm text-muted-foreground">
-            Upload documents and select a provider to create a new vector store with embedded content.
-          </p>
+          <h3 className="text-lg font-medium">{t("vectorStores.create.title")}</h3>
+          <p className="text-sm text-muted-foreground">{t("vectorStores.create.description")}</p>
         </div>
 
         {/* Upload Area */}
         <Card>
           <CardContent>
             <div className="mb-4">
-              <p className="font-medium">Step 1: Upload Documents</p>
-              <p className="text-sm text-muted-foreground block mt-1">
-                Upload one or more documents (PDF, TXT, DOCX, MD). Maximum file size: 50MB per file.
-              </p>
+              <p className="font-medium">{t("vectorStores.create.upload.title")}</p>
+              <p className="text-sm text-muted-foreground block mt-1">{t("vectorStores.create.upload.description")}</p>
             </div>
             <label
               htmlFor={documentsInputId}
@@ -280,10 +286,8 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
               }}
             >
               <Inbox className="size-12 text-primary" />
-              <span className="text-base">Click or drag files to this area to upload</span>
-              <span className="text-sm text-muted-foreground">
-                Support for single or bulk upload. Supported formats: PDF, TXT, DOCX, MD
-              </span>
+              <span className="text-base">{t("vectorStores.create.upload.dropzone")}</span>
+              <span className="text-sm text-muted-foreground">{t("vectorStores.create.upload.formats")}</span>
               <input
                 id={documentsInputId}
                 type="file"
@@ -304,7 +308,7 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
           <Card>
             <CardContent>
               <div className="mb-4">
-                <p className="font-medium">Uploaded Documents ({documents.length})</p>
+                <p className="font-medium">{t("vectorStores.create.uploadedDocuments", { count: documents.length })}</p>
               </div>
               <DocumentsTable documents={documents} onRemove={handleRemoveDocument} />
             </CardContent>
@@ -315,41 +319,47 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
         <Card>
           <CardContent className="space-y-4">
             <div>
-              <p className="font-medium">Step 2: Configure Vector Store</p>
+              <p className="font-medium">{t("vectorStores.create.configure.title")}</p>
               <p className="text-sm text-muted-foreground block mt-1">
-                Choose the provider and optionally provide a name and description for your vector store.
+                {t("vectorStores.create.configure.description")}
               </p>
             </div>
 
             <FieldGroup>
               <Field>
                 <FieldLabel htmlFor="vector-store-name">
-                  {labelWithHint("Vector Store Name", "Optional: Give your vector store a meaningful name")}
+                  {labelWithHint(t("vectorStores.create.fields.name"), t("vectorStores.create.fields.nameHint"))}
                 </FieldLabel>
                 <Input
                   id="vector-store-name"
                   value={vectorStoreName}
                   onChange={(e) => setVectorStoreName(e.target.value)}
-                  placeholder="e.g., Product Documentation, Customer Support KB"
+                  placeholder={t("vectorStores.create.fields.namePlaceholder")}
                 />
               </Field>
 
               <Field>
                 <FieldLabel htmlFor="vector-store-description">
-                  {labelWithHint("Description", "Optional: Describe what this vector store contains")}
+                  {labelWithHint(
+                    t("vectorStores.create.fields.description"),
+                    t("vectorStores.create.fields.descriptionHint"),
+                  )}
                 </FieldLabel>
                 <Textarea
                   id="vector-store-description"
                   value={vectorStoreDescription}
                   onChange={(e) => setVectorStoreDescription(e.target.value)}
-                  placeholder="e.g., Contains all product documentation and user guides"
+                  placeholder={t("vectorStores.create.fields.descriptionPlaceholder")}
                   rows={2}
                 />
               </Field>
 
               <Field>
                 <FieldLabel htmlFor="vector-store-provider">
-                  {labelWithHint("Provider", "Select the provider for embedding and vector store operations")}
+                  {labelWithHint(
+                    t("vectorStores.create.fields.provider"),
+                    t("vectorStores.create.fields.providerHint"),
+                  )}
                 </FieldLabel>
                 <Select
                   items={providerItems}
@@ -357,7 +367,7 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
                   onValueChange={(value: string | null) => value !== null && setSelectedProvider(value)}
                 >
                   <SelectTrigger id="vector-store-provider" className="w-full">
-                    <SelectValue placeholder="Select a provider" />
+                    <SelectValue placeholder={t("vectorStores.create.fields.providerPlaceholder")} />
                   </SelectTrigger>
                   <SelectContent>
                     {providerItems.map((item) => (
@@ -384,7 +394,7 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
                 getProviderSpecificFields(selectedProvider).map((field: VectorStoreFieldConfig) => (
                   <Field key={field.name}>
                     <FieldLabel htmlFor={`vector-store-${field.name}`}>
-                      {labelWithHint(field.label, field.tooltip)}
+                      {labelWithHint(t(field.label), t(field.tooltip))}
                     </FieldLabel>
                     <Input
                       id={`vector-store-${field.name}`}
@@ -404,7 +414,7 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
                 disabled={isCreating || documents.length === 0 || !selectedProvider}
               >
                 {isCreating && <UiLoadingSpinner className="size-4" />}
-                {isCreating ? "Creating Vector Store..." : "Create Vector Store"}
+                {isCreating ? t("vectorStores.create.buttons.creating") : t("vectorStores.create.buttons.create")}
               </Button>
             </div>
           </CardContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTable.tsx
index 416fcb37a10..f3003239331 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTable.tsx
@@ -2,6 +2,7 @@
 
 import { Inbox } from "lucide-react";
 import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 import { DocumentUpload } from "@/components/vector_store_management/types";
@@ -14,19 +15,21 @@ interface DocumentsTableProps {
 }
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No documents uploaded yet</div>
-      <div className="text-sm text-muted-foreground">Upload documents above to get started.</div>
+      <div className="text-sm font-medium text-foreground">{t("vectorStores.documents.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("vectorStores.documents.empty.description")}</div>
     </div>
   );
 }
 
 const DocumentsTable: React.FC<DocumentsTableProps> = ({ documents, onRemove }) => {
-  const columns = useMemo(() => getDocumentsTableColumns({ onRemove }), [onRemove]);
+  const { t } = useTranslation();
+  const columns = useMemo(() => getDocumentsTableColumns({ onRemove }, t), [onRemove, t]);
 
   return (
     <DataTable
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTableColumns.tsx
index 9be9f806bf9..5448a739766 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/DocumentsTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 import { Copy, MoreHorizontal, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { StatusBadge, type StatusTone } from "@/components/shared/table_cells";
 import { buttonVariants } from "@/components/ui/button";
@@ -30,10 +32,11 @@ function formatFileSize(bytes?: number): string {
 }
 
 function DocumentRowActions({ document, onRemove }: { document: DocumentUpload; onRemove: (uid: string) => void }) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open document actions"
+        aria-label={t("vectorStores.documents.actions.open")}
         data-testid={`document-actions-${document.uid}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -42,10 +45,10 @@ function DocumentRowActions({ document, onRemove }: { document: DocumentUpload;
       <DropdownMenuContent align="end" className="w-52">
         <DropdownMenuItem
           data-testid="document-action-copy"
-          onClick={() => void copyToClipboard(document.uid, "Document ID copied to clipboard")}
+          onClick={() => void copyToClipboard(document.uid, t("vectorStores.documents.actions.idCopied"))}
         >
           <Copy />
-          Copy document ID
+          {t("vectorStores.documents.actions.copyId")}
         </DropdownMenuItem>
         <DropdownMenuItem
           variant="destructive"
@@ -53,7 +56,7 @@ function DocumentRowActions({ document, onRemove }: { document: DocumentUpload;
           onClick={() => onRemove(document.uid)}
         >
           <Trash2 />
-          Remove
+          {t("vectorStores.documents.actions.remove")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -64,12 +67,15 @@ interface DocumentsTableColumnsDeps {
   onRemove: (uid: string) => void;
 }
 
-export const getDocumentsTableColumns = ({ onRemove }: DocumentsTableColumnsDeps): ColumnDef<DocumentUpload>[] => [
+export const getDocumentsTableColumns = (
+  { onRemove }: DocumentsTableColumnsDeps,
+  t: TFunction,
+): ColumnDef<DocumentUpload>[] => [
   {
     id: "name",
     accessorKey: "name",
-    meta: { title: "Name" },
-    header: "Name",
+    meta: { title: t("vectorStores.documents.columns.name") },
+    header: t("vectorStores.documents.columns.name"),
     enableSorting: false,
     cell: ({ row }) => (
       <div className="flex items-center gap-2">
@@ -85,8 +91,8 @@ export const getDocumentsTableColumns = ({ onRemove }: DocumentsTableColumnsDeps
   {
     id: "status",
     accessorKey: "status",
-    meta: { title: "Status", skeleton: "badge" },
-    header: "Status",
+    meta: { title: t("vectorStores.documents.columns.status"), skeleton: "badge" },
+    header: t("vectorStores.documents.columns.status"),
     size: 150,
     enableSorting: false,
     cell: ({ row }) => {
@@ -97,7 +103,7 @@ export const getDocumentsTableColumns = ({ onRemove }: DocumentsTableColumnsDeps
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("vectorStores.documents.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTab.tsx
index a1e23a698b9..84183cfcaf2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTab.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
+import i18n from "@/i18n/i18n";
 
 import { toast } from "@/lib/toast";
 import { indexesListCall } from "@/components/networking";
@@ -29,6 +31,7 @@ interface IndexesTabProps {
 }
 
 const IndexesTab: React.FC<IndexesTabProps> = ({ accessToken, vectorStores, onViewVectorStore }) => {
+  const { t } = useTranslation();
   const [indexes, setIndexes] = useState<VectorStoreIndex[]>([]);
   const [isLoading, setIsLoading] = useState(true);
 
@@ -55,7 +58,7 @@ const IndexesTab: React.FC<IndexesTabProps> = ({ accessToken, vectorStores, onVi
         setIndexes(response.data || []);
       } catch (error) {
         console.error("Error fetching indexes:", error);
-        toast.fromError("Error fetching indexes: " + error);
+        toast.fromError(i18n.t("vectorStores.indexes.toasts.fetchFailed", { error: String(error) }));
       } finally {
         setIsLoading(false);
       }
@@ -66,26 +69,28 @@ const IndexesTab: React.FC<IndexesTabProps> = ({ accessToken, vectorStores, onVi
   return (
     <div className="w-full">
       <p className="mb-4 text-sm text-muted-foreground">
-        Vector store indexes registered on this proxy via the <code>/v1/indexes</code> API. See the{" "}
-        <a
-          href="https://docs.litellm.ai/docs/providers/azure_ai/azure_ai_vector_stores_passthrough"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="text-info hover:underline"
-        >
-          vector store index docs
-        </a>{" "}
-        for how this works. Index passthrough is supported for Azure AI Search and Milvus today; support for more
-        providers can be added, so please{" "}
-        <a
-          href="https://github.com/BerriAI/litellm/issues"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="text-info hover:underline"
-        >
-          file a GitHub issue
-        </a>{" "}
-        if you want your provider supported.
+        <Trans
+          i18nKey="vectorStores.indexes.intro"
+          components={{
+            endpoint: <code>/v1/indexes</code>,
+            docs: (
+              <a
+                href="https://docs.litellm.ai/docs/providers/azure_ai/azure_ai_vector_stores_passthrough"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-info hover:underline"
+              />
+            ),
+            issues: (
+              <a
+                href="https://github.com/BerriAI/litellm/issues"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-info hover:underline"
+              />
+            ),
+          }}
+        />
       </p>
       <div className="grid grid-cols-1 gap-2 pt-2 pb-2 w-full">
         <IndexesTable
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTable.tsx
index a0b0c02f99d..d11ed64a053 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Inbox } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 
@@ -19,13 +20,14 @@ interface IndexesTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No indexes registered yet</div>
-      <div className="text-sm text-muted-foreground">Indexes registered on this proxy will appear here.</div>
+      <div className="text-sm font-medium text-foreground">{t("vectorStores.indexes.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("vectorStores.indexes.empty.description")}</div>
     </div>
   );
 }
@@ -36,11 +38,12 @@ const IndexesTable: React.FC<IndexesTableProps> = ({
   onViewVectorStore,
   isLoading = false,
 }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
 
   const columns = useMemo(
-    () => getIndexesTableColumns({ resolveVectorStoreId, onViewVectorStore }),
-    [resolveVectorStoreId, onViewVectorStore],
+    () => getIndexesTableColumns({ resolveVectorStoreId, onViewVectorStore }, t),
+    [resolveVectorStoreId, onViewVectorStore, t],
   );
 
   return (
@@ -53,7 +56,7 @@ const IndexesTable: React.FC<IndexesTableProps> = ({
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading indexes…"
+      loadingMessage={t("vectorStores.indexes.loading")}
       noDataMessage={<EmptyState />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTableColumns.tsx
index c21665f87cd..83ce5795767 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/IndexesTableColumns.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { DateCell, IdentityCell } from "@/components/shared/table_cells";
@@ -13,15 +14,15 @@ interface IndexesTableColumnsDeps {
   onViewVectorStore: (vectorStoreId: string) => void;
 }
 
-export const getIndexesTableColumns = ({
-  resolveVectorStoreId,
-  onViewVectorStore,
-}: IndexesTableColumnsDeps): ColumnDef<VectorStoreIndex>[] => [
+export const getIndexesTableColumns = (
+  { resolveVectorStoreId, onViewVectorStore }: IndexesTableColumnsDeps,
+  t: TFunction,
+): ColumnDef<VectorStoreIndex>[] => [
   {
     id: "index_name",
     accessorKey: "index_name",
-    meta: { title: "Index Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Index Name" />,
+    meta: { title: t("vectorStores.indexes.columns.indexName") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("vectorStores.indexes.columns.indexName")} />,
     size: 220,
     enableSorting: true,
     cell: ({ row }) => (
@@ -33,8 +34,10 @@ export const getIndexesTableColumns = ({
   {
     id: "vector_store_name",
     accessorFn: (row) => row.litellm_params.vector_store_name,
-    meta: { title: "Vector Store" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Vector Store" />,
+    meta: { title: t("vectorStores.indexes.columns.vectorStore") },
+    header: ({ column }) => (
+      <DataTableSortHeader column={column} title={t("vectorStores.indexes.columns.vectorStore")} />
+    ),
     size: 200,
     enableSorting: true,
     cell: ({ row }) => {
@@ -60,8 +63,8 @@ export const getIndexesTableColumns = ({
   {
     id: "vector_store_index",
     accessorFn: (row) => row.litellm_params.vector_store_index,
-    meta: { title: "Provider Index" },
-    header: "Provider Index",
+    meta: { title: t("vectorStores.indexes.columns.providerIndex") },
+    header: t("vectorStores.indexes.columns.providerIndex"),
     size: 220,
     enableSorting: false,
     cell: ({ row }) => (
@@ -76,8 +79,8 @@ export const getIndexesTableColumns = ({
   {
     id: "created_by",
     accessorKey: "created_by",
-    meta: { title: "Created By" },
-    header: "Created By",
+    meta: { title: t("vectorStores.indexes.columns.createdBy") },
+    header: t("vectorStores.indexes.columns.createdBy"),
     size: 160,
     enableSorting: false,
     cell: ({ row }) => {
@@ -99,8 +102,8 @@ export const getIndexesTableColumns = ({
     id: "created_at",
     accessorKey: "created_at",
     sortingFn: "datetime",
-    meta: { title: "Created At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created At" />,
+    meta: { title: t("vectorStores.indexes.columns.createdAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("vectorStores.indexes.columns.createdAt")} />,
     size: 150,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} precision="date" />,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx
index db549601212..0eff5debb6d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { CircleHelp, Info } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
@@ -33,6 +34,7 @@ const labelWithHint = (label: string, hint: string): React.ReactNode => (
 const asText = (value: unknown): string => (typeof value === "string" ? value : "");
 
 const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, providerParams, onParamsChange }) => {
+  const { t } = useTranslation();
   const [embeddingModels, setEmbeddingModels] = useState<ModelGroup[]>([]);
   const [isLoadingModels, setIsLoadingModels] = useState(false);
 
@@ -64,33 +66,38 @@ const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, provider
 
   const bucketName = asText(providerParams.vector_bucket_name);
   const indexName = asText(providerParams.index_name);
-  const bucketNameError = bucketName && bucketName.length < 3 ? "Bucket name must be at least 3 characters" : undefined;
+  const bucketNameError =
+    bucketName && bucketName.length < 3 ? t("vectorStores.s3Config.errors.bucketTooShort") : undefined;
   const indexNameError =
     indexName && indexName.length > 0 && indexName.length < 3
-      ? "Index name must be at least 3 characters if provided"
+      ? t("vectorStores.s3Config.errors.indexTooShort")
       : undefined;
 
   return (
     <TooltipProvider>
       <Alert variant="info" className="mb-4">
         <Info />
-        <AlertTitle>AWS S3 Vectors Setup</AlertTitle>
+        <AlertTitle>{t("vectorStores.s3Config.setup.title")}</AlertTitle>
         <AlertDescription>
           <div>
-            <p>AWS S3 Vectors allows you to store and query vector embeddings directly in S3:</p>
+            <p>{t("vectorStores.s3Config.setup.intro")}</p>
             <ul style={{ marginLeft: "16px", marginTop: "8px" }}>
-              <li>Vector buckets and indexes will be automatically created if they don&apos;t exist</li>
-              <li>Vector dimensions are auto-detected from your selected embedding model</li>
-              <li>Ensure your AWS credentials have permissions for S3 Vectors operations</li>
+              <li>{t("vectorStores.s3Config.setup.autoCreate")}</li>
+              <li>{t("vectorStores.s3Config.setup.dimensions")}</li>
+              <li>{t("vectorStores.s3Config.setup.permissions")}</li>
               <li>
-                Learn more:{" "}
-                <a
-                  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-vector-buckets.html"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  AWS S3 Vectors Documentation
-                </a>
+                <Trans
+                  i18nKey="vectorStores.s3Config.setup.learnMore"
+                  components={{
+                    docs: (
+                      <a
+                        href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-vector-buckets.html"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      />
+                    ),
+                  }}
+                />
               </li>
             </ul>
           </div>
@@ -100,15 +107,15 @@ const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, provider
       <Field data-invalid={bucketNameError !== undefined || undefined}>
         <FieldLabel htmlFor="s3-vector-bucket-name">
           {labelWithHint(
-            "Vector Bucket Name",
-            "S3 bucket name for vector storage (must be at least 3 characters, lowercase letters, numbers, hyphens, and periods only)",
+            t("vectorStores.s3Config.fields.bucketName"),
+            t("vectorStores.s3Config.fields.bucketNameHint"),
           )}
         </FieldLabel>
         <Input
           id="s3-vector-bucket-name"
           value={bucketName}
           onChange={(e) => handleFieldChange("vector_bucket_name", e.target.value)}
-          placeholder="my-vector-bucket (min 3 chars)"
+          placeholder={t("vectorStores.s3Config.fields.bucketNamePlaceholder")}
           aria-invalid={bucketNameError !== undefined || undefined}
         />
         <FieldError>{bucketNameError}</FieldError>
@@ -116,16 +123,13 @@ const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, provider
 
       <Field data-invalid={indexNameError !== undefined || undefined}>
         <FieldLabel htmlFor="s3-index-name">
-          {labelWithHint(
-            "Index Name",
-            "Name for the vector index (optional, will be auto-generated if not provided). If provided, must be at least 3 characters.",
-          )}
+          {labelWithHint(t("vectorStores.s3Config.fields.indexName"), t("vectorStores.s3Config.fields.indexNameHint"))}
         </FieldLabel>
         <Input
           id="s3-index-name"
           value={indexName}
           onChange={(e) => handleFieldChange("index_name", e.target.value)}
-          placeholder="my-vector-index (optional, min 3 chars)"
+          placeholder={t("vectorStores.s3Config.fields.indexNamePlaceholder")}
           aria-invalid={indexNameError !== undefined || undefined}
         />
         <FieldError>{indexNameError}</FieldError>
@@ -133,7 +137,7 @@ const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, provider
 
       <Field>
         <FieldLabel htmlFor="s3-aws-region-name">
-          {labelWithHint("AWS Region", "AWS region where the S3 bucket is located (e.g., us-west-2)")}
+          {labelWithHint(t("vectorStores.s3Config.fields.region"), t("vectorStores.s3Config.fields.regionHint"))}
         </FieldLabel>
         <Input
           id="s3-aws-region-name"
@@ -145,16 +149,26 @@ const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, provider
 
       <Field>
         <FieldLabel htmlFor="s3-embedding-model">
-          {labelWithHint("Embedding Model", "Select the embedding model to use for vector generation")}
+          {labelWithHint(
+            t("vectorStores.s3Config.fields.embeddingModel"),
+            t("vectorStores.s3Config.fields.embeddingModelHint"),
+          )}
         </FieldLabel>
         <Combobox
           value={asText(providerParams.embedding_model) || null}
           onValueChange={(value: string | null) => value !== null && handleFieldChange("embedding_model", value)}
           items={embeddingModels.map((model) => model.model_group)}
         >
-          <ComboboxInput id="s3-embedding-model" placeholder="Select an embedding model" />
+          <ComboboxInput
+            id="s3-embedding-model"
+            placeholder={t("vectorStores.s3Config.fields.embeddingModelPlaceholder")}
+          />
           <ComboboxContent>
-            <ComboboxEmpty>{isLoadingModels ? "Loading models..." : "No embedding models found."}</ComboboxEmpty>
+            <ComboboxEmpty>
+              {isLoadingModels
+                ? t("vectorStores.s3Config.fields.loadingModels")
+                : t("vectorStores.s3Config.fields.noModels")}
+            </ComboboxEmpty>
             <ComboboxList>
               {(model: string) => (
                 <ComboboxItem key={model} value={model}>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/TestVectorStoreTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/TestVectorStoreTab.tsx
index fec2dc62e9c..056da6bf2f8 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/TestVectorStoreTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/TestVectorStoreTab.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Card, CardContent } from "@/components/ui/card";
 import {
   Combobox,
@@ -19,13 +20,14 @@ interface TestVectorStoreTabProps {
 const storeLabel = (store: VectorStore) => store.vector_store_name || store.vector_store_id;
 
 const TestVectorStoreTab: React.FC<TestVectorStoreTabProps> = ({ accessToken, vectorStores }) => {
+  const { t } = useTranslation();
   const [selectedVectorStore, setSelectedVectorStore] = useState<VectorStore | null>(vectorStores[0] ?? null);
 
   if (!accessToken) {
     return (
       <Card>
         <CardContent>
-          <p className="text-sm text-muted-foreground">Access token is required to test vector stores.</p>
+          <p className="text-sm text-muted-foreground">{t("vectorStores.testTab.noToken")}</p>
         </CardContent>
       </Card>
     );
@@ -36,7 +38,7 @@ const TestVectorStoreTab: React.FC<TestVectorStoreTabProps> = ({ accessToken, ve
       <Card>
         <CardContent>
           <div className="py-8 text-center">
-            <p className="text-sm text-muted-foreground">No vector stores available. Create one first to test it.</p>
+            <p className="text-sm text-muted-foreground">{t("vectorStores.testTab.noStores")}</p>
           </div>
         </CardContent>
       </Card>
@@ -48,8 +50,8 @@ const TestVectorStoreTab: React.FC<TestVectorStoreTabProps> = ({ accessToken, ve
       <Card>
         <CardContent className="space-y-4">
           <div>
-            <h5 className="text-base font-medium text-foreground">Select Vector Store</h5>
-            <p className="text-sm text-muted-foreground">Choose a vector store to test search queries against</p>
+            <h5 className="text-base font-medium text-foreground">{t("vectorStores.testTab.selectTitle")}</h5>
+            <p className="text-sm text-muted-foreground">{t("vectorStores.testTab.selectDescription")}</p>
           </div>
 
           <Combobox
@@ -58,9 +60,9 @@ const TestVectorStoreTab: React.FC<TestVectorStoreTabProps> = ({ accessToken, ve
             onValueChange={setSelectedVectorStore}
             itemToStringLabel={storeLabel}
           >
-            <ComboboxInput className="w-full" placeholder="Select a vector store" />
+            <ComboboxInput className="w-full" placeholder={t("vectorStores.testTab.selectPlaceholder")} />
             <ComboboxContent>
-              <ComboboxEmpty>No matching vector stores</ComboboxEmpty>
+              <ComboboxEmpty>{t("vectorStores.testTab.noMatch")}</ComboboxEmpty>
               <ComboboxList>
                 {(store: VectorStore) => (
                   <ComboboxItem key={store.vector_store_id} value={store}>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx
index bf5b925eb16..f7d63de5d7e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx
@@ -1,4 +1,6 @@
 import React, { useState, useEffect } from "react";
+import type { ParseKeys } from "i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { CircleHelp, Eye, EyeOff, Info } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { useWatch } from "react-hook-form";
@@ -15,6 +17,7 @@ import {
 import { Logo } from "@/components/molecules/logo/Logo";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
 import { toast } from "@/lib/toast";
+import i18n from "@/i18n/i18n";
 import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Button } from "@/components/ui/button";
@@ -96,8 +99,8 @@ const isProviderFieldName = (name: string): name is ProviderFieldName =>
 const optionalText = z.string().optional();
 
 const vectorStoreShape = {
-  custom_llm_provider: z.string().min(1, "Please select a provider"),
-  vector_store_id: z.string().min(1, "Please input the vector store ID from your api provider"),
+  custom_llm_provider: z.string().min(1, { error: () => i18n.t("vectorStores.form.errors.providerRequired") }),
+  vector_store_id: z.string().min(1, { error: () => i18n.t("vectorStores.form.errors.vectorStoreIdRequired") }),
   vector_store_name: optionalText,
   vector_store_description: optionalText,
   litellm_credential_name: z.string().nullable().optional(),
@@ -136,25 +139,26 @@ const vectorStoreSchema = z.object(vectorStoreShape).superRefine((values, ctx) =
         path: [field.name],
         message:
           field.type === "select"
-            ? `Please select the ${field.label.toLowerCase()}`
-            : `Please input the ${field.label.toLowerCase()}`,
+            ? i18n.t("vectorStores.form.errors.selectField", { field: i18n.t(field.label).toLowerCase() })
+            : i18n.t("vectorStores.form.errors.inputField", { field: i18n.t(field.label).toLowerCase() }),
       }),
     );
 });
 
 type VectorStoreFormValues = z.output<typeof vectorStoreSchema>;
 
-const VECTOR_STORE_ID_PLACEHOLDERS: Record<string, string> = {
-  vertex_rag_engine: '6917529027641081856 (corpus ID from Vertex AI / "RAG Engine" console)',
-  "vertex_ai/search_api": 'my-datastore_1234567890 (data store ID from Vertex AI / "Agent Search" console)',
-  valkey: "my-search-index (FT index name in Valkey)",
-  mongodb: "my-vector-index (MongoDB Vector Search index name)",
-  opensearch: "my-knn-index (OpenSearch index name)",
+const VECTOR_STORE_ID_PLACEHOLDERS: Record<string, ParseKeys> = {
+  vertex_rag_engine: "vectorStores.form.idPlaceholders.vertexRagEngine",
+  "vertex_ai/search_api": "vectorStores.form.idPlaceholders.vertexAiSearch",
+  valkey: "vectorStores.form.idPlaceholders.valkey",
+  mongodb: "vectorStores.form.idPlaceholders.mongodb",
+  opensearch: "vectorStores.form.idPlaceholders.opensearch",
 };
 
-const VERTEX_SEARCH_API_WITH_ENGINE_PLACEHOLDER = "Any identifier you'll use to reference this in LiteLLM";
+const VERTEX_SEARCH_API_WITH_ENGINE_PLACEHOLDER: ParseKeys =
+  "vectorStores.form.idPlaceholders.vertexAiSearchWithEngine";
 
-const DEFAULT_VECTOR_STORE_ID_PLACEHOLDER = "Enter vector store ID from your provider";
+const DEFAULT_VECTOR_STORE_ID_PLACEHOLDER: ParseKeys = "vectorStores.form.idPlaceholders.default";
 
 const EMPTY_VALUES: VectorStoreFormValues = {
   custom_llm_provider: "bedrock",
@@ -182,6 +186,7 @@ const labelWithHint = (label: string, hint: string): React.ReactNode => (
 
 const PasswordInput = React.forwardRef<HTMLInputElement, React.ComponentPropsWithoutRef<typeof InputGroupInput>>(
   (props, ref) => {
+    const { t } = useTranslation();
     const [revealed, setRevealed] = useState(false);
     return (
       <InputGroup>
@@ -189,7 +194,7 @@ const PasswordInput = React.forwardRef<HTMLInputElement, React.ComponentPropsWit
         <InputGroupAddon align="inline-end">
           <InputGroupButton
             size="icon-xs"
-            aria-label={revealed ? "Hide Password" : "Show Password"}
+            aria-label={revealed ? t("vectorStores.form.password.hide") : t("vectorStores.form.password.show")}
             onClick={() => setRevealed(!revealed)}
           >
             {revealed ? <EyeOff /> : <Eye />}
@@ -208,6 +213,7 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
   accessToken,
   credentials,
 }) => {
+  const { t } = useTranslation();
   const form = useZodForm(vectorStoreSchema, { defaultValues: EMPTY_VALUES });
   const [metadataJson, setMetadataJson] = useState("{}");
   const [selectedProvider, setSelectedProvider] = useState("bedrock");
@@ -244,7 +250,7 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
       try {
         metadata = metadataJson.trim() ? JSON.parse(metadataJson) : {};
       } catch (e) {
-        toast.fromError("Invalid JSON in metadata field");
+        toast.fromError(t("vectorStores.form.toasts.invalidMetadata"));
         return;
       }
 
@@ -257,13 +263,13 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
         litellm_credential_name: formValues.litellm_credential_name,
         litellm_params: buildVectorStoreLitellmParams(formValues.custom_llm_provider, formValues),
       });
-      toast.success("Vector store created successfully");
+      toast.success(t("vectorStores.form.toasts.created"));
       form.reset(EMPTY_VALUES);
       setMetadataJson("{}");
       onSuccess();
     } catch (error) {
       console.error("Error creating vector store:", error);
-      toast.fromError("Error creating vector store: " + error);
+      toast.fromError(t("vectorStores.form.toasts.createFailed", { error: String(error) }));
     }
   };
 
@@ -283,7 +289,7 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
     <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[1000px]">
         <DialogHeader>
-          <DialogTitle>Add New Vector Store</DialogTitle>
+          <DialogTitle>{t("vectorStores.form.title")}</DialogTitle>
         </DialogHeader>
         <TooltipProvider>
           <form onSubmit={form.handleSubmit(handleCreate)}>
@@ -291,7 +297,10 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               <FormField
                 control={form.control}
                 name="custom_llm_provider"
-                label={labelWithHint("Provider", "Select the provider for this vector store")}
+                label={labelWithHint(
+                  t("vectorStores.form.fields.provider"),
+                  t("vectorStores.form.fields.providerHint"),
+                )}
               >
                 {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
                   <Select value={value} onValueChange={makeProviderChangeHandler(onChange)}>
@@ -332,19 +341,19 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               {selectedProvider === "pg_vector" && (
                 <Alert variant="info">
                   <Info />
-                  <AlertTitle>PG Vector Setup Required</AlertTitle>
+                  <AlertTitle>{t("vectorStores.form.pgVector.title")}</AlertTitle>
                   <AlertDescription>
-                    <p>LiteLLM provides a server to connect to PG Vector. To use this provider:</p>
+                    <p>{t("vectorStores.form.pgVector.intro")}</p>
                     <ol style={{ marginLeft: "16px", marginTop: "8px", listStyleType: "decimal" }}>
                       <li>
-                        Deploy the litellm-pgvector server from:{" "}
+                        {t("vectorStores.form.pgVector.steps.deploy")}{" "}
                         <a href="https://github.com/BerriAI/litellm-pgvector" target="_blank" rel="noopener noreferrer">
                           https://github.com/BerriAI/litellm-pgvector
                         </a>
                       </li>
-                      <li>Configure your PostgreSQL database with pgvector extension</li>
-                      <li>Start the server and note the API base URL and API key</li>
-                      <li>Enter those details in the fields below</li>
+                      <li>{t("vectorStores.form.pgVector.steps.configure")}</li>
+                      <li>{t("vectorStores.form.pgVector.steps.start")}</li>
+                      <li>{t("vectorStores.form.pgVector.steps.enter")}</li>
                     </ol>
                   </AlertDescription>
                 </Alert>
@@ -353,34 +362,16 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               {selectedProvider === "valkey" && (
                 <Alert variant="info">
                   <Info />
-                  <AlertTitle>Valkey Setup Required</AlertTitle>
+                  <AlertTitle>{t("vectorStores.form.valkey.title")}</AlertTitle>
                   <AlertDescription>
-                    <p>
-                      LiteLLM searches documents you have already stored in Valkey. It does not create the index or
-                      upload documents for you. Before creating this vector store, make sure:
-                    </p>
+                    <p>{t("vectorStores.form.valkey.intro")}</p>
                     <ol style={{ marginLeft: "16px", marginTop: "8px", listStyleType: "decimal" }}>
-                      <li>
-                        Your Valkey server has vector search enabled (the valkey-search module, included in the
-                        valkey-bundle image and in AWS ElastiCache / MemoryDB for Valkey)
-                      </li>
-                      <li>
-                        You have already created a search index and loaded your documents and their embeddings into it.
-                        Enter that index name as the Vector Store ID
-                      </li>
-                      <li>
-                        You know which embedding model created those stored embeddings. That model must be added to this
-                        proxy under Models so you can pick it below. Using a different model returns wrong results
-                      </li>
-                      <li>
-                        You know the field names your documents use for their text and their embedding. If they are not
-                        &quot;text&quot; and &quot;embedding&quot;, set them below
-                      </li>
+                      <li>{t("vectorStores.form.valkey.steps.searchEnabled")}</li>
+                      <li>{t("vectorStores.form.valkey.steps.indexLoaded")}</li>
+                      <li>{t("vectorStores.form.valkey.steps.embeddingModel")}</li>
+                      <li>{t("vectorStores.form.valkey.steps.fieldNames")}</li>
                     </ol>
-                    <p style={{ marginTop: "8px" }}>
-                      When a query comes in, LiteLLM converts it to an embedding with the model below and returns the
-                      closest matching documents from your index.
-                    </p>
+                    <p style={{ marginTop: "8px" }}>{t("vectorStores.form.valkey.howItWorks")}</p>
                   </AlertDescription>
                 </Alert>
               )}
@@ -388,27 +379,13 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               {selectedProvider === "opensearch" && (
                 <Alert variant="info">
                   <Info />
-                  <AlertTitle>OpenSearch Setup Required</AlertTitle>
+                  <AlertTitle>{t("vectorStores.form.opensearch.title")}</AlertTitle>
                   <AlertDescription>
-                    <p>
-                      LiteLLM searches a k-NN index you already have in an OpenSearch Serverless collection or an
-                      OpenSearch Service domain. It does not create the index or upload documents. Before creating this
-                      vector store, make sure:
-                    </p>
+                    <p>{t("vectorStores.form.opensearch.intro")}</p>
                     <ol style={{ marginLeft: "16px", marginTop: "8px", listStyleType: "decimal" }}>
-                      <li>
-                        The index has a knn_vector field holding each document&apos;s embedding. Enter the index name as
-                        the Vector Store ID, or under Index Name when another endpoint already uses that ID
-                      </li>
-                      <li>
-                        You know which embedding model created those embeddings. That model must be added to this proxy
-                        under Models so you can pick it below. Using a different model returns wrong results
-                      </li>
-                      <li>
-                        The proxy has AWS credentials that can read the index, either its own (environment variables or
-                        an IAM role) or a saved credential picked under Existing Credentials. A Serverless collection
-                        needs a data access policy for them, and a domain needs its access policy to allow them
-                      </li>
+                      <li>{t("vectorStores.form.opensearch.steps.knnField")}</li>
+                      <li>{t("vectorStores.form.opensearch.steps.embeddingModel")}</li>
+                      <li>{t("vectorStores.form.opensearch.steps.credentials")}</li>
                     </ol>
                   </AlertDescription>
                 </Alert>
@@ -417,30 +394,30 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               {selectedProvider === "vertex_rag_engine" && (
                 <Alert variant="info">
                   <Info />
-                  <AlertTitle>Vertex AI RAG Engine Setup</AlertTitle>
+                  <AlertTitle>{t("vectorStores.form.vertexRagEngine.title")}</AlertTitle>
                   <AlertDescription>
-                    <p>To use Vertex AI RAG Engine:</p>
+                    <p>{t("vectorStores.form.vertexRagEngine.intro")}</p>
                     <p style={{ marginTop: "4px", fontStyle: "italic" }}>
-                      Note: Google Cloud has renamed this to &quot;RAG Engine&quot; in its console — the steps below
-                      still apply.
+                      {t("vectorStores.form.vertexRagEngine.renameNote")}
                     </p>
                     <ol style={{ marginLeft: "16px", marginTop: "8px", listStyleType: "decimal" }}>
                       <li>
-                        Set up your Vertex AI RAG Engine corpus following the guide:{" "}
-                        <a
-                          href="https://cloud.google.com/vertex-ai/generative-ai/docs/rag-engine/rag-overview"
-                          target="_blank"
-                          rel="noopener noreferrer"
-                        >
-                          Vertex AI RAG Engine Overview
-                        </a>
+                        <Trans
+                          i18nKey="vectorStores.form.vertexRagEngine.steps.guide"
+                          components={{
+                            guide: (
+                              <a
+                                href="https://cloud.google.com/vertex-ai/generative-ai/docs/rag-engine/rag-overview"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                              />
+                            ),
+                          }}
+                        />
                       </li>
-                      <li>Create a corpus in your Google Cloud project</li>
-                      <li>
-                        Note the corpus ID from the Vertex AI console (now labeled &quot;RAG Engine&quot; in Google
-                        Cloud)
-                      </li>
-                      <li>Enter the corpus ID in the Vector Store ID field below</li>
+                      <li>{t("vectorStores.form.vertexRagEngine.steps.createCorpus")}</li>
+                      <li>{t("vectorStores.form.vertexRagEngine.steps.noteCorpusId")}</li>
+                      <li>{t("vectorStores.form.vertexRagEngine.steps.enterCorpusId")}</li>
                     </ol>
                   </AlertDescription>
                 </Alert>
@@ -449,36 +426,35 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               {selectedProvider === "vertex_ai/search_api" && (
                 <Alert variant="info">
                   <Info />
-                  <AlertTitle>Vertex AI Search Setup</AlertTitle>
+                  <AlertTitle>{t("vectorStores.form.vertexAiSearch.title")}</AlertTitle>
                   <AlertDescription>
-                    <p>To use Vertex AI Search (Discovery Engine):</p>
+                    <p>{t("vectorStores.form.vertexAiSearch.intro")}</p>
                     <p style={{ marginTop: "4px", fontStyle: "italic" }}>
-                      Note: Google Cloud has renamed this to &quot;Agent Search&quot; in its console — the steps below
-                      still apply.
+                      {t("vectorStores.form.vertexAiSearch.renameNote")}
                     </p>
                     <ol style={{ marginLeft: "16px", marginTop: "8px", listStyleType: "decimal" }}>
                       <li>
-                        Enable the Discovery Engine API on your Google Cloud project and create a data store following
-                        the guide:{" "}
-                        <a
-                          href="https://cloud.google.com/generative-ai-app-builder/docs/create-data-store-es"
-                          target="_blank"
-                          rel="noopener noreferrer"
-                          style={{ textDecoration: "underline" }}
-                        >
-                          Create a Vertex AI Search data store
-                        </a>
+                        <Trans
+                          i18nKey="vectorStores.form.vertexAiSearch.steps.guide"
+                          components={{
+                            guide: (
+                              <a
+                                href="https://cloud.google.com/generative-ai-app-builder/docs/create-data-store-es"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                style={{ textDecoration: "underline" }}
+                              />
+                            ),
+                          }}
+                        />
                       </li>
-                      <li>Pick a supported location: global, us, or eu</li>
+                      <li>{t("vectorStores.form.vertexAiSearch.steps.location")}</li>
+                      <li>{t("vectorStores.form.vertexAiSearch.steps.dataStoreId")}</li>
                       <li>
-                        For most data store types (Cloud Storage, BigQuery, Media): copy the data store ID and enter it
-                        in the Vector Store ID field below.
-                      </li>
-                      <li>
-                        For website, healthcare, and connector-based sources (Drive, Gmail, Slack, Jira, etc.): create a
-                        search app on top of the data store, then copy the <strong>Engine ID</strong> and enter it in
-                        the Engine ID field. The Vector Store ID is still required as the LiteLLM-side name for this
-                        record, but it isn&apos;t used in the GCP URL when Engine ID is set.
+                        <Trans
+                          i18nKey="vectorStores.form.vertexAiSearch.steps.engineId"
+                          components={{ strong: <strong /> }}
+                        />
                       </li>
                     </ol>
                   </AlertDescription>
@@ -488,9 +464,12 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               <FormField
                 control={form.control}
                 name="vector_store_id"
-                label={labelWithHint("Vector Store ID", "Enter the vector store ID from your api provider")}
+                label={labelWithHint(
+                  t("vectorStores.form.fields.vectorStoreId"),
+                  t("vectorStores.form.fields.vectorStoreIdHint"),
+                )}
               >
-                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder={vectorStoreIdPlaceholder} />}
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder={t(vectorStoreIdPlaceholder)} />}
               </FormField>
 
               {getProviderSpecificFields(selectedProvider)
@@ -502,15 +481,16 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
               <FormField
                 control={form.control}
                 name="vector_store_name"
-                label={labelWithHint(
-                  "Vector Store Name",
-                  "Custom name you want to give to the vector store, this name will be rendered on the LiteLLM UI",
-                )}
+                label={labelWithHint(t("vectorStores.form.fields.name"), t("vectorStores.form.fields.nameHint"))}
               >
                 {({ ref, value, ...field }) => <Input {...field} ref={ref} value={value ?? ""} />}
               </FormField>
 
-              <FormField control={form.control} name="vector_store_description" label="Description">
+              <FormField
+                control={form.control}
+                name="vector_store_description"
+                label={t("vectorStores.form.fields.description")}
+              >
                 {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
               </FormField>
 
@@ -518,14 +498,14 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
                 control={form.control}
                 name="litellm_credential_name"
                 label={labelWithHint(
-                  "Existing Credentials",
-                  "Optionally select API provider credentials for this vector store eg. Bedrock API KEY",
+                  t("vectorStores.form.fields.credentials"),
+                  t("vectorStores.form.fields.credentialsHint"),
                 )}
               >
                 {({ id, value, onChange }) => (
                   <SearchSelect
                     inputId={id}
-                    placeholder="Select or search for existing credentials"
+                    placeholder={t("vectorStores.form.fields.credentialsPlaceholder")}
                     options={credentialOptions(credentials)}
                     value={value ?? ""}
                     onValueChange={(selected) => onChange(selected === "" || selected === null ? undefined : selected)}
@@ -535,7 +515,7 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
 
               <div role="group" className="flex w-full flex-col gap-3">
                 <span className="flex w-fit gap-2 text-sm leading-snug font-medium">
-                  {labelWithHint("Metadata", "JSON metadata for the vector store (optional)")}
+                  {labelWithHint(t("vectorStores.form.fields.metadata"), t("vectorStores.form.fields.metadataHint"))}
                 </span>
                 <Textarea
                   rows={4}
@@ -548,9 +528,9 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
 
             <div className="mt-6 flex justify-end space-x-3">
               <Button type="button" variant="outline" onClick={handleCancel}>
-                Cancel
+                {t("vectorStores.form.buttons.cancel")}
               </Button>
-              <Button type="submit">Create</Button>
+              <Button type="submit">{t("vectorStores.form.buttons.create")}</Button>
             </div>
           </form>
         </TooltipProvider>
@@ -571,7 +551,8 @@ interface ProviderFieldProps {
 }
 
 const ProviderField: React.FC<ProviderFieldProps> = ({ field, control, modelInfo }) => {
-  const label = labelWithHint(field.label, field.tooltip);
+  const { t } = useTranslation();
+  const label = labelWithHint(t(field.label), t(field.tooltip));
 
   if (field.type === "select") {
     const selectOptions =
@@ -604,7 +585,7 @@ const ProviderField: React.FC<ProviderFieldProps> = ({ field, control, modelInfo
               className="w-full"
             />
             <ComboboxContent>
-              <ComboboxEmpty>No matching options</ComboboxEmpty>
+              <ComboboxEmpty>{t("vectorStores.form.noMatchingOptions")}</ComboboxEmpty>
               <ComboboxList>
                 {(option: { value: string; label: string }) => (
                   <ComboboxItem key={option.value} value={option}>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.tsx
index 32e7bc2324d..717feae5eb7 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTable.tsx
@@ -3,6 +3,7 @@
 import { SortingState } from "@tanstack/react-table";
 import { Inbox } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 import { VectorStore } from "@/components/vector_store_management/types";
@@ -20,23 +21,26 @@ interface VectorStoreTableProps {
 const DEFAULT_SORTING: SortingState = [{ id: "created_at", desc: true }];
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No vector stores</div>
-      <div className="text-sm text-muted-foreground">
-        Connect a vector store to enable retrieval-augmented generation.
-      </div>
+      <div className="text-sm font-medium text-foreground">{t("vectorStores.table.empty.title")}</div>
+      <div className="text-sm text-muted-foreground">{t("vectorStores.table.empty.description")}</div>
     </div>
   );
 }
 
 const VectorStoreTable: React.FC<VectorStoreTableProps> = ({ data, onView, onEdit, onDelete, isLoading = false }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>(DEFAULT_SORTING);
 
-  const columns = useMemo(() => getVectorStoreTableColumns({ onView, onEdit, onDelete }), [onView, onEdit, onDelete]);
+  const columns = useMemo(
+    () => getVectorStoreTableColumns({ onView, onEdit, onDelete }, t),
+    [onView, onEdit, onDelete, t],
+  );
 
   return (
     <DataTable
@@ -48,7 +52,7 @@ const VectorStoreTable: React.FC<VectorStoreTableProps> = ({ data, onView, onEdi
       sorting={sorting}
       onSortingChange={setSorting}
       isLoading={isLoading}
-      loadingMessage="Loading vector stores…"
+      loadingMessage={t("vectorStores.table.loading")}
       noDataMessage={<EmptyState />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx
index d0ed333d3d7..ce61c22956e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { ParseKeys, TFunction } from "i18next";
 import { Copy, MoreHorizontal, Pencil, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { CellTooltip, DateCell, IdentityCell, StatusBadge } from "@/components/shared/table_cells";
@@ -18,8 +20,7 @@ import { VectorStore } from "@/components/vector_store_management/types";
 import { cn } from "@/lib/cva.config";
 import { copyToClipboard } from "@/utils/dataUtils";
 
-const CONFIG_STORE_HINT =
-  "Read only: this vector store is defined in the config file and cannot be edited or deleted on the dashboard.";
+const CONFIG_STORE_HINT: ParseKeys = "vectorStores.table.actions.configHint";
 
 function VectorStoreProviderCell({ provider }: { provider: string }) {
   const { displayName, logo } = getVectorStoreProviderLogoAndName(provider);
@@ -41,16 +42,19 @@ function VectorStoreProviderCell({ provider }: { provider: string }) {
 }
 
 function VectorStoreFilesCell({ vectorStore }: { vectorStore: VectorStore }) {
+  const { t } = useTranslation();
   const ingestedFiles = vectorStore.vector_store_metadata?.ingested_files || [];
   if (ingestedFiles.length === 0) {
     return <span className="text-sm text-muted-foreground">-</span>;
   }
 
-  const filenames = ingestedFiles.map((file) => file.filename || file.file_url || "Unknown").join(", ");
+  const filenames = ingestedFiles
+    .map((file) => file.filename || file.file_url || t("vectorStores.table.files.unknown"))
+    .join(", ");
   const displayText =
     ingestedFiles.length === 1
-      ? ingestedFiles[0].filename || ingestedFiles[0].file_url || "1 file"
-      : `${ingestedFiles.length} files`;
+      ? ingestedFiles[0].filename || ingestedFiles[0].file_url || t("vectorStores.table.files.count", { count: 1 })
+      : t("vectorStores.table.files.count", { count: ingestedFiles.length });
 
   return (
     <CellTooltip
@@ -67,11 +71,12 @@ interface VectorStoreRowActionsProps {
 }
 
 function VectorStoreRowActions({ vectorStore, onEdit, onDelete }: VectorStoreRowActionsProps) {
+  const { t } = useTranslation();
   const isFromConfig = vectorStore.is_config ?? false;
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open vector store actions"
+        aria-label={t("vectorStores.table.actions.open")}
         data-testid={`vector-store-actions-${vectorStore.vector_store_id}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -84,14 +89,14 @@ function VectorStoreRowActions({ vectorStore, onEdit, onDelete }: VectorStoreRow
           onClick={() => onEdit(vectorStore.vector_store_id)}
         >
           <Pencil />
-          Edit
+          {t("vectorStores.table.actions.edit")}
         </DropdownMenuItem>
         <DropdownMenuItem
           data-testid="vector-store-action-copy"
-          onClick={() => void copyToClipboard(vectorStore.vector_store_id, "Vector store ID copied")}
+          onClick={() => void copyToClipboard(vectorStore.vector_store_id, t("vectorStores.table.actions.idCopied"))}
         >
           <Copy />
-          Copy vector store ID
+          {t("vectorStores.table.actions.copyId")}
         </DropdownMenuItem>
         <DropdownMenuSeparator />
         <DropdownMenuItem
@@ -101,11 +106,11 @@ function VectorStoreRowActions({ vectorStore, onEdit, onDelete }: VectorStoreRow
           onClick={() => onDelete(vectorStore.vector_store_id)}
         >
           <Trash2 />
-          Delete
+          {t("vectorStores.table.actions.delete")}
         </DropdownMenuItem>
         {isFromConfig && (
           <div data-testid="vector-store-config-hint" className="px-2 py-1.5 text-xs text-muted-foreground">
-            {CONFIG_STORE_HINT}
+            {t(CONFIG_STORE_HINT)}
           </div>
         )}
       </DropdownMenuContent>
@@ -119,16 +124,17 @@ interface VectorStoreTableColumnsDeps {
   onDelete: (vectorStoreId: string) => void;
 }
 
-export const getVectorStoreTableColumns = ({
-  onView,
-  onEdit,
-  onDelete,
-}: VectorStoreTableColumnsDeps): ColumnDef<VectorStore>[] => [
+export const getVectorStoreTableColumns = (
+  { onView, onEdit, onDelete }: VectorStoreTableColumnsDeps,
+  t: TFunction,
+): ColumnDef<VectorStore>[] => [
   {
     id: "vector_store_id",
     accessorKey: "vector_store_id",
-    meta: { title: "Vector Store ID" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Vector Store ID" />,
+    meta: { title: t("vectorStores.table.columns.vectorStoreId") },
+    header: ({ column }) => (
+      <DataTableSortHeader column={column} title={t("vectorStores.table.columns.vectorStoreId")} />
+    ),
     size: 220,
     enableSorting: true,
     cell: ({ row }) => (
@@ -143,8 +149,8 @@ export const getVectorStoreTableColumns = ({
   {
     id: "vector_store_name",
     accessorKey: "vector_store_name",
-    meta: { title: "Name" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Name" />,
+    meta: { title: t("vectorStores.table.columns.name") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("vectorStores.table.columns.name")} />,
     size: 200,
     enableSorting: true,
     cell: ({ row }) => {
@@ -159,8 +165,8 @@ export const getVectorStoreTableColumns = ({
   {
     id: "vector_store_description",
     accessorKey: "vector_store_description",
-    meta: { title: "Description" },
-    header: "Description",
+    meta: { title: t("vectorStores.table.columns.description") },
+    header: t("vectorStores.table.columns.description"),
     size: 280,
     enableSorting: false,
     cell: ({ row }) => {
@@ -175,19 +181,24 @@ export const getVectorStoreTableColumns = ({
   {
     id: "source",
     accessorFn: (row) => row.is_config ?? false,
-    meta: { title: "Source", skeleton: "badge" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Source" />,
+    meta: { title: t("vectorStores.table.columns.source"), skeleton: "badge" },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("vectorStores.table.columns.source")} />,
     size: 110,
     enableSorting: true,
     cell: ({ row }) => {
       const isFromConfig = row.original.is_config ?? false;
-      return <StatusBadge tone={isFromConfig ? "neutral" : "info"} label={isFromConfig ? "Config" : "DB"} />;
+      return (
+        <StatusBadge
+          tone={isFromConfig ? "neutral" : "info"}
+          label={isFromConfig ? t("vectorStores.table.source.config") : t("vectorStores.table.source.db")}
+        />
+      );
     },
   },
   {
     id: "files",
-    meta: { title: "Files" },
-    header: "Files",
+    meta: { title: t("vectorStores.table.columns.files") },
+    header: t("vectorStores.table.columns.files"),
     size: 160,
     enableSorting: false,
     cell: ({ row }) => <VectorStoreFilesCell vectorStore={row.original} />,
@@ -195,8 +206,8 @@ export const getVectorStoreTableColumns = ({
   {
     id: "provider",
     accessorKey: "custom_llm_provider",
-    meta: { title: "Provider" },
-    header: "Provider",
+    meta: { title: t("vectorStores.table.columns.provider") },
+    header: t("vectorStores.table.columns.provider"),
     size: 160,
     enableSorting: false,
     cell: ({ row }) => <VectorStoreProviderCell provider={row.original.custom_llm_provider} />,
@@ -205,8 +216,8 @@ export const getVectorStoreTableColumns = ({
     id: "created_at",
     accessorKey: "created_at",
     sortingFn: "datetime",
-    meta: { title: "Created At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Created At" />,
+    meta: { title: t("vectorStores.table.columns.createdAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("vectorStores.table.columns.createdAt")} />,
     size: 150,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.created_at} precision="date" />,
@@ -215,8 +226,8 @@ export const getVectorStoreTableColumns = ({
     id: "updated_at",
     accessorKey: "updated_at",
     sortingFn: "datetime",
-    meta: { title: "Updated At" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Updated At" />,
+    meta: { title: t("vectorStores.table.columns.updatedAt") },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("vectorStores.table.columns.updatedAt")} />,
     size: 150,
     enableSorting: true,
     cell: ({ row }) => <DateCell value={row.original.updated_at} precision="date" />,
@@ -224,7 +235,7 @@ export const getVectorStoreTableColumns = ({
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("vectorStores.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTester.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTester.tsx
index a9c4e0d1061..fd77834cf30 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTester.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreTester.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import { ChevronDown, ChevronRight, Database, Send } from "lucide-react";
 import { vectorStoreSearchCall } from "@/components/networking";
@@ -34,6 +35,7 @@ interface VectorStoreTesterProps {
 }
 
 export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStoreId, accessToken, className = "" }) => {
+  const { t } = useTranslation();
   const [query, setQuery] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   const [searchHistory, setSearchHistory] = useState<
@@ -48,7 +50,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
 
   const handleSearch = async () => {
     if (!query.trim()) {
-      toast.warning("Please enter a search query");
+      toast.warning(t("vectorStores.tester.toasts.emptyQuery"));
       return;
     }
 
@@ -90,7 +92,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
   const clearHistory = () => {
     setSearchHistory([]);
     setExpandedResults({});
-    toast.success("Search history cleared");
+    toast.success(t("vectorStores.tester.toasts.historyCleared"));
   };
 
   const toggleResultExpansion = (historyIndex: number, resultIndex: number) => {
@@ -108,11 +110,11 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
         <div className="flex items-center justify-between border-b p-4">
           <div className="flex items-center">
             <Database className="mr-2 size-4 text-primary" />
-            <h4 className="text-base font-medium text-foreground">Test Vector Store</h4>
+            <h4 className="text-base font-medium text-foreground">{t("vectorStores.tester.title")}</h4>
           </div>
           {searchHistory.length > 0 && (
             <Button variant="outline" size="sm" onClick={clearHistory}>
-              Clear History
+              {t("vectorStores.tester.clearHistory")}
             </Button>
           )}
         </div>
@@ -122,7 +124,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
           {searchHistory.length === 0 ? (
             <div className="flex h-full flex-col items-center justify-center text-muted-foreground">
               <Database className="mb-4 size-12" />
-              <p className="text-sm">Test your vector store by entering a search query below</p>
+              <p className="text-sm">{t("vectorStores.tester.emptyHint")}</p>
             </div>
           ) : (
             <div className="space-y-4">
@@ -132,7 +134,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                   <div className="text-right">
                     <div className="inline-block max-w-[80%] rounded-lg bg-muted p-3 shadow-xs ring-1 ring-foreground/10">
                       <div className="mb-1 flex items-center gap-2">
-                        <strong className="text-sm">Query</strong>
+                        <strong className="text-sm">{t("vectorStores.tester.query")}</strong>
                         <span className="text-xs text-muted-foreground">{formatTimestamp(entry.timestamp)}</span>
                       </div>
                       <div className="text-left">{entry.query}</div>
@@ -144,10 +146,10 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                     <div className="inline-block max-w-[80%] rounded-lg bg-card p-3 shadow-xs ring-1 ring-foreground/10">
                       <div className="mb-2 flex items-center gap-2">
                         <Database className="size-4 text-primary" />
-                        <strong className="text-sm">Vector Store Results</strong>
+                        <strong className="text-sm">{t("vectorStores.tester.results")}</strong>
                         {entry.response && (
                           <span className="rounded-sm bg-muted px-2 py-0.5 text-xs text-muted-foreground">
-                            {entry.response.data?.length || 0} results
+                            {t("vectorStores.tester.resultCount", { count: entry.response.data?.length || 0 })}
                           </span>
                         )}
                       </div>
@@ -170,7 +172,9 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                                     ) : (
                                       <ChevronRight className="mr-2 size-4 text-muted-foreground" />
                                     )}
-                                    <span className="text-sm font-medium">Result {resultIndex + 1}</span>
+                                    <span className="text-sm font-medium">
+                                      {t("vectorStores.tester.result", { number: resultIndex + 1 })}
+                                    </span>
                                     {/* Show preview of content when collapsed */}
                                     {!isExpanded && result.content && result.content[0] && (
                                       <span className="ml-2 max-w-md truncate text-xs text-muted-foreground">
@@ -179,7 +183,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                                     )}
                                   </div>
                                   <span className="rounded-sm bg-muted px-2 py-1 text-xs text-foreground">
-                                    Score: {result.score.toFixed(4)}
+                                    {t("vectorStores.tester.score", { score: result.score.toFixed(4) })}
                                   </span>
                                 </div>
 
@@ -191,7 +195,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                                       result.content.map((content, contentIndex) => (
                                         <div key={contentIndex} className="mb-3">
                                           <div className="mb-1 text-xs text-muted-foreground">
-                                            Content ({content.type})
+                                            {t("vectorStores.tester.content", { type: content.type })}
                                           </div>
                                           <div className="max-h-40 overflow-y-auto rounded-sm border bg-muted/50 p-3 text-sm text-foreground">
                                             {content.text}
@@ -202,21 +206,27 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                                     {/* Metadata */}
                                     {(result.file_id || result.filename || result.attributes) && (
                                       <div className="mt-3 border-t pt-3">
-                                        <div className="mb-2 text-xs font-medium text-muted-foreground">Metadata</div>
+                                        <div className="mb-2 text-xs font-medium text-muted-foreground">
+                                          {t("vectorStores.tester.metadata")}
+                                        </div>
                                         <div className="space-y-2 text-xs">
                                           {result.file_id && (
                                             <div className="rounded-sm bg-muted/50 p-2">
-                                              <span className="font-medium">File ID:</span> {result.file_id}
+                                              <span className="font-medium">{t("vectorStores.tester.fileId")}</span>{" "}
+                                              {result.file_id}
                                             </div>
                                           )}
                                           {result.filename && (
                                             <div className="rounded-sm bg-muted/50 p-2">
-                                              <span className="font-medium">Filename:</span> {result.filename}
+                                              <span className="font-medium">{t("vectorStores.tester.filename")}</span>{" "}
+                                              {result.filename}
                                             </div>
                                           )}
                                           {result.attributes && Object.keys(result.attributes).length > 0 && (
                                             <div className="rounded-sm bg-muted/50 p-2">
-                                              <span className="mb-1 block font-medium">Attributes:</span>
+                                              <span className="mb-1 block font-medium">
+                                                {t("vectorStores.tester.attributes")}
+                                              </span>
                                               <pre className="overflow-x-auto rounded-sm border bg-card p-2 text-xs">
                                                 {JSON.stringify(result.attributes, null, 2)}
                                               </pre>
@@ -237,7 +247,9 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                             entry.error ? "text-sm break-words text-destructive" : "text-sm text-muted-foreground"
                           }
                         >
-                          {entry.error ? `Search failed: ${entry.error}` : "No results found"}
+                          {entry.error
+                            ? t("vectorStores.tester.searchFailed", { error: entry.error })
+                            : t("vectorStores.tester.noResults")}
                         </div>
                       )}
                     </div>
@@ -264,7 +276,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                 value={query}
                 onChange={(e) => setQuery(e.target.value)}
                 onKeyDown={handleKeyDown}
-                placeholder="Enter your search query... (Shift+Enter for new line)"
+                placeholder={t("vectorStores.tester.placeholder")}
                 disabled={isLoading}
                 rows={1}
                 className="field-sizing-fixed max-h-24 min-h-9 resize-none"
@@ -272,7 +284,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
             </div>
             <Button onClick={handleSearch} disabled={isLoading || !query.trim()}>
               {isLoading ? <UiLoadingSpinner className="size-4" /> : <Send className="size-4" />}
-              Search
+              {t("vectorStores.tester.search")}
             </Button>
           </div>
         </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/index.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/index.tsx
index 285a96520bd..dab7f9daba2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/index.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/index.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { RefreshCw } from "lucide-react";
 import {
   vectorStoreListCall,
@@ -28,6 +29,7 @@ interface VectorStoreProps {
 }
 
 const VectorStoreManagement: React.FC<VectorStoreProps> = ({ accessToken, userID, userRole, isViewOnly }) => {
+  const { t } = useTranslation();
   const [vectorStores, setVectorStores] = useState<VectorStore[]>([]);
   const [isLoadingVectorStores, setIsLoadingVectorStores] = useState(true);
   const [isCreateModalVisible, setIsCreateModalVisible] = useState(false);
@@ -52,7 +54,7 @@ const VectorStoreManagement: React.FC<VectorStoreProps> = ({ accessToken, userID
       setVectorStores(response.data || []);
     } catch (error) {
       console.error("Error fetching vector stores:", error);
-      toast.fromError("Error fetching vector stores: " + error);
+      toast.fromError(t("vectorStores.page.toasts.fetchStoresFailed", { error: String(error) }));
     } finally {
       setIsLoadingVectorStores(false);
     }
@@ -65,7 +67,7 @@ const VectorStoreManagement: React.FC<VectorStoreProps> = ({ accessToken, userID
       setCredentials(response.credentials || []);
     } catch (error) {
       console.error("Error fetching credentials:", error);
-      toast.fromError("Error fetching credentials: " + error);
+      toast.fromError(t("vectorStores.page.toasts.fetchCredentialsFailed", { error: String(error) }));
     }
   };
 
@@ -102,11 +104,11 @@ const VectorStoreManagement: React.FC<VectorStoreProps> = ({ accessToken, userID
     setIsDeleting(true);
     try {
       await vectorStoreDeleteCall(accessToken, vectorStoreToDelete);
-      toast.success("Vector store deleted successfully");
+      toast.success(t("vectorStores.page.toasts.deleted"));
       fetchVectorStores();
     } catch (error) {
       console.error("Error deleting vector store:", error);
-      toast.fromError("Error deleting vector store: " + error);
+      toast.fromError(t("vectorStores.page.toasts.deleteFailed", { error: String(error) }));
     } finally {
       setIsDeleting(false);
       setIsDeleteModalOpen(false);
@@ -143,35 +145,42 @@ const VectorStoreManagement: React.FC<VectorStoreProps> = ({ accessToken, userID
     <div className="mx-4">
       <div className="gap-2 p-8 w-full mt-2">
         <div className="flex justify-between mt-2 w-full items-center mb-4">
-          <h1 className="text-xl font-semibold tracking-tight text-foreground">Vector Store Management</h1>
+          <h1 className="text-xl font-semibold tracking-tight text-foreground">{t("vectorStores.page.title")}</h1>
           <div className="flex items-center space-x-2">
-            {lastRefreshed && <p className="text-sm text-muted-foreground">Last Refreshed: {lastRefreshed}</p>}
-            <Button variant="outline" size="icon-sm" aria-label="Refresh" onClick={handleRefreshClick}>
+            {lastRefreshed && (
+              <p className="text-sm text-muted-foreground">
+                {t("vectorStores.page.lastRefreshed", { time: lastRefreshed })}
+              </p>
+            )}
+            <Button
+              variant="outline"
+              size="icon-sm"
+              aria-label={t("vectorStores.page.refresh")}
+              onClick={handleRefreshClick}
+            >
               <RefreshCw className="size-4" />
             </Button>
           </div>
         </div>
 
-        <p className="mb-4 text-sm text-muted-foreground">
-          You can use vector stores to store and retrieve LLM embeddings.
-        </p>
+        <p className="mb-4 text-sm text-muted-foreground">{t("vectorStores.page.description")}</p>
 
         <Tabs defaultValue={defaultTab} onValueChange={onTabChange}>
           <TabsList variant="line" className="mb-6 h-auto w-full justify-start rounded-none p-0">
             {canCreateVectorStores && (
               <TabsTrigger value="create" className="flex-none rounded-none px-4 py-2">
-                Create Vector Store
+                {t("vectorStores.page.tabs.create")}
               </TabsTrigger>
             )}
             <TabsTrigger value="manage" className="flex-none rounded-none px-4 py-2">
-              Manage Vector Stores
+              {t("vectorStores.page.tabs.manage")}
             </TabsTrigger>
             <TabsTrigger value="test" className="flex-none rounded-none px-4 py-2">
-              Test Vector Store
+              {t("vectorStores.page.tabs.test")}
             </TabsTrigger>
             {isProxyAdminRole(userRole || "") && (
               <TabsTrigger value="indexes" className="flex-none rounded-none px-4 py-2">
-                Indexes
+                {t("vectorStores.page.tabs.indexes")}
               </TabsTrigger>
             )}
           </TabsList>
@@ -185,7 +194,7 @@ const VectorStoreManagement: React.FC<VectorStoreProps> = ({ accessToken, userID
           <TabsContent keepMounted={hasVisited("manage")} value="manage">
             {canCreateVectorStores && (
               <Button className="mb-4" onClick={() => setIsCreateModalVisible(true)}>
-                + Add Vector Store
+                {t("vectorStores.page.addVectorStore")}
               </Button>
             )}
 
@@ -223,10 +232,12 @@ const VectorStoreManagement: React.FC<VectorStoreProps> = ({ accessToken, userID
         {/* Delete Confirmation Modal */}
         <DeleteResourceModal
           isOpen={isDeleteModalOpen}
-          title="Delete Vector Store"
-          message="Are you sure you want to delete this vector store? This action cannot be undone."
-          resourceInformationTitle="Vector Store Information"
-          resourceInformation={[{ label: "Vector Store ID", value: vectorStoreToDelete, code: true }]}
+          title={t("vectorStores.page.deleteModal.title")}
+          message={t("vectorStores.page.deleteModal.message")}
+          resourceInformationTitle={t("vectorStores.page.deleteModal.resourceTitle")}
+          resourceInformation={[
+            { label: t("vectorStores.page.deleteModal.vectorStoreId"), value: vectorStoreToDelete, code: true },
+          ]}
           onCancel={() => setIsDeleteModalOpen(false)}
           onOk={confirmDelete}
           confirmLoading={isDeleting}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx
index 71d6a4545f5..1195bd72af8 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/vector_store_info.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { ArrowLeft, CircleHelp, Lock } from "lucide-react";
 import { z } from "zod";
 import {
@@ -13,6 +14,7 @@ import { getVectorStoreProviderLogoAndName } from "@/components/vector_store_pro
 import { Logo } from "@/components/molecules/logo/Logo";
 import VectorStoreTester from "./VectorStoreTester";
 import { toast } from "@/lib/toast";
+import i18n from "@/i18n/i18n";
 import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
@@ -38,10 +40,10 @@ interface VectorStoreInfoViewProps {
 }
 
 const vectorStoreEditShape = {
-  vector_store_id: z.string().min(1, "Please input a vector store ID"),
+  vector_store_id: z.string().min(1, { error: () => i18n.t("vectorStores.info.errors.idRequired") }),
   vector_store_name: z.string().nullish(),
   vector_store_description: z.string().nullish(),
-  custom_llm_provider: z.string().min(1, "Please select a provider"),
+  custom_llm_provider: z.string().min(1, { error: () => i18n.t("vectorStores.info.errors.providerRequired") }),
   litellm_credential_name: z.string().nullable().optional(),
 };
 
@@ -79,6 +81,7 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
   is_admin,
   editVectorStore,
 }) => {
+  const { t } = useTranslation();
   const form = useZodForm(vectorStoreEditSchema, { defaultValues: EMPTY_VALUES });
   const [vectorStoreDetails, setVectorStoreDetails] = useState<VectorStore | null>(null);
   const [loadFailed, setLoadFailed] = useState<boolean>(false);
@@ -108,7 +111,7 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
       form.reset(toFormValues(response.vector_store));
     } catch (error) {
       console.error("Error fetching vector store details:", error);
-      toast.fromError("Error fetching vector store details: " + error);
+      toast.fromError(t("vectorStores.info.toasts.fetchFailed", { error: String(error) }));
       setLoadFailed(true);
     }
   };
@@ -142,7 +145,7 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
       try {
         metadata = metadataString ? JSON.parse(metadataString) : {};
       } catch (e) {
-        toast.fromError("Invalid JSON in metadata field");
+        toast.fromError(t("vectorStores.info.toasts.invalidMetadata"));
         return;
       }
 
@@ -155,12 +158,12 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
       };
 
       await vectorStoreUpdateCall(accessToken, updateData);
-      toast.success("Vector store updated successfully");
+      toast.success(t("vectorStores.info.toasts.updated"));
       setIsEditing(false);
       fetchVectorStoreDetails();
     } catch (error) {
       console.error("Error updating vector store:", error);
-      toast.fromError("Error updating vector store: " + error);
+      toast.fromError(t("vectorStores.info.toasts.updateFailed", { error: String(error) }));
     }
   };
 
@@ -169,18 +172,18 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
       <div className="p-4 max-w-full">
         <Button variant="ghost" className="mb-4" onClick={onClose}>
           <ArrowLeft />
-          Back to Vector Stores
+          {t("vectorStores.info.back")}
         </Button>
-        <h1 className="text-xl font-semibold">Vector store not found</h1>
+        <h1 className="text-xl font-semibold">{t("vectorStores.info.notFound.title")}</h1>
         <p className="text-sm text-muted-foreground">
-          Vector store {vectorStoreId} could not be loaded. It may have been deleted.
+          {t("vectorStores.info.notFound.description", { id: vectorStoreId })}
         </p>
       </div>
     );
   }
 
   if (!vectorStoreDetails) {
-    return <div>Loading...</div>;
+    return <div>{t("vectorStores.info.loading")}</div>;
   }
 
   const canEdit = is_admin && !vectorStoreDetails.is_config;
@@ -192,40 +195,41 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
         <div>
           <Button variant="ghost" className="mb-4" onClick={onClose}>
             <ArrowLeft />
-            Back to Vector Stores
+            {t("vectorStores.info.back")}
           </Button>
           <div className="flex items-center gap-2">
-            <h1 className="text-xl font-semibold">Vector Store ID: {vectorStoreDetails.vector_store_id}</h1>
+            <h1 className="text-xl font-semibold">
+              {t("vectorStores.info.heading", { id: vectorStoreDetails.vector_store_id })}
+            </h1>
             <StatusBadge
               tone={vectorStoreDetails.is_config ? "neutral" : "info"}
-              label={vectorStoreDetails.is_config ? "Config" : "DB"}
+              label={
+                vectorStoreDetails.is_config ? t("vectorStores.info.source.config") : t("vectorStores.info.source.db")
+              }
             />
           </div>
           <p className="text-sm text-muted-foreground">
-            {vectorStoreDetails.vector_store_description || "No description"}
+            {vectorStoreDetails.vector_store_description || t("vectorStores.info.noDescription")}
           </p>
         </div>
-        {canEdit && !isEditing && <Button onClick={startEditing}>Edit Vector Store</Button>}
+        {canEdit && !isEditing && <Button onClick={startEditing}>{t("vectorStores.info.editButton")}</Button>}
       </div>
 
       {vectorStoreDetails.is_config && (
         <Alert variant="info" className="mb-4">
           <Lock className="size-4" aria-hidden />
-          <AlertTitle>Read only: defined in the config file</AlertTitle>
-          <AlertDescription>
-            This vector store comes from the proxy config YAML, so it cannot be edited or deleted on the dashboard.
-            Change or remove it in the config file and restart the proxy.
-          </AlertDescription>
+          <AlertTitle>{t("vectorStores.info.readOnly.title")}</AlertTitle>
+          <AlertDescription>{t("vectorStores.info.readOnly.description")}</AlertDescription>
         </Alert>
       )}
 
       <Tabs defaultValue="details">
         <TabsList variant="line" className="mb-6 h-auto w-full justify-start rounded-none p-0">
           <TabsTrigger value="details" className="flex-none rounded-none px-4 py-2">
-            Details
+            {t("vectorStores.info.tabs.details")}
           </TabsTrigger>
           <TabsTrigger value="test" className="flex-none rounded-none px-4 py-2">
-            Test Vector Store
+            {t("vectorStores.info.tabs.test")}
           </TabsTrigger>
         </TabsList>
 
@@ -233,29 +237,44 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
           {showEditForm ? (
             <div>
               <div className="flex justify-between items-center mb-4">
-                <h3 className="text-lg font-medium">Edit Vector Store</h3>
+                <h3 className="text-lg font-medium">{t("vectorStores.info.edit.title")}</h3>
               </div>
               <Card>
                 <CardContent>
                   <TooltipProvider>
                     <form onSubmit={form.handleSubmit(handleSave)}>
                       <FieldGroup>
-                        <FormField control={form.control} name="vector_store_id" label="Vector Store ID">
+                        <FormField
+                          control={form.control}
+                          name="vector_store_id"
+                          label={t("vectorStores.info.edit.vectorStoreId")}
+                        >
                           {({ ref, ...field }) => <Input {...field} ref={ref} disabled />}
                         </FormField>
 
-                        <FormField control={form.control} name="vector_store_name" label="Vector Store Name">
+                        <FormField
+                          control={form.control}
+                          name="vector_store_name"
+                          label={t("vectorStores.info.edit.name")}
+                        >
                           {({ ref, value, ...field }) => <Input {...field} ref={ref} value={value ?? ""} />}
                         </FormField>
 
-                        <FormField control={form.control} name="vector_store_description" label="Description">
+                        <FormField
+                          control={form.control}
+                          name="vector_store_description"
+                          label={t("vectorStores.info.edit.description")}
+                        >
                           {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
                         </FormField>
 
                         <FormField
                           control={form.control}
                           name="custom_llm_provider"
-                          label={labelWithHint("Provider", "Select the provider for this vector store")}
+                          label={labelWithHint(
+                            t("vectorStores.info.edit.provider"),
+                            t("vectorStores.info.edit.providerHint"),
+                          )}
                         >
                           {({
                             id,
@@ -297,15 +316,17 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
                           )}
                         </FormField>
 
-                        <p className="text-sm text-muted-foreground">
-                          Either select existing credentials OR enter provider credentials below
-                        </p>
+                        <p className="text-sm text-muted-foreground">{t("vectorStores.info.edit.credentialsHint")}</p>
 
-                        <FormField control={form.control} name="litellm_credential_name" label="Existing Credentials">
+                        <FormField
+                          control={form.control}
+                          name="litellm_credential_name"
+                          label={t("vectorStores.info.edit.credentials")}
+                        >
                           {({ id, value, onChange }) => (
                             <SearchSelect
                               inputId={id}
-                              placeholder="Select or search for existing credentials"
+                              placeholder={t("vectorStores.info.edit.credentialsPlaceholder")}
                               options={credentialOptions(credentials)}
                               value={value ?? ""}
                               onValueChange={(selected) =>
@@ -317,13 +338,16 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
 
                         <div className="flex items-center">
                           <div className="grow border-t border-border"></div>
-                          <span className="px-4 text-muted-foreground text-sm">OR</span>
+                          <span className="px-4 text-muted-foreground text-sm">{t("vectorStores.info.edit.or")}</span>
                           <div className="grow border-t border-border"></div>
                         </div>
 
                         <div role="group" className="flex w-full flex-col gap-3">
                           <span className="flex w-fit gap-2 text-sm leading-snug font-medium">
-                            {labelWithHint("Metadata", "JSON metadata for the vector store")}
+                            {labelWithHint(
+                              t("vectorStores.info.edit.metadata"),
+                              t("vectorStores.info.edit.metadataHint"),
+                            )}
                           </span>
                           <Textarea
                             rows={4}
@@ -336,9 +360,9 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
 
                       <div className="mt-6 flex justify-end space-x-2">
                         <Button type="button" variant="outline" onClick={() => setIsEditing(false)}>
-                          Cancel
+                          {t("vectorStores.info.edit.cancel")}
                         </Button>
-                        <Button type="submit">Save Changes</Button>
+                        <Button type="submit">{t("vectorStores.info.edit.save")}</Button>
                       </div>
                     </form>
                   </TooltipProvider>
@@ -348,26 +372,26 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
           ) : (
             <div>
               <div className="flex justify-between items-center mb-4">
-                <h3 className="text-lg font-medium">Vector Store Details</h3>
-                {canEdit && <Button onClick={startEditing}>Edit Vector Store</Button>}
+                <h3 className="text-lg font-medium">{t("vectorStores.info.details.title")}</h3>
+                {canEdit && <Button onClick={startEditing}>{t("vectorStores.info.editButton")}</Button>}
               </div>
               <Card>
                 <CardContent>
                   <div className="space-y-4">
                     <div>
-                      <p className="font-medium">ID</p>
+                      <p className="font-medium">{t("vectorStores.info.details.id")}</p>
                       <p>{vectorStoreDetails.vector_store_id}</p>
                     </div>
                     <div>
-                      <p className="font-medium">Name</p>
+                      <p className="font-medium">{t("vectorStores.info.details.name")}</p>
                       <p>{vectorStoreDetails.vector_store_name || "-"}</p>
                     </div>
                     <div>
-                      <p className="font-medium">Description</p>
+                      <p className="font-medium">{t("vectorStores.info.details.description")}</p>
                       <p>{vectorStoreDetails.vector_store_description || "-"}</p>
                     </div>
                     <div>
-                      <p className="font-medium">Provider</p>
+                      <p className="font-medium">{t("vectorStores.info.details.provider")}</p>
                       <div className="flex items-center space-x-2 mt-1">
                         {(() => {
                           const provider = vectorStoreDetails.custom_llm_provider || "bedrock";
@@ -383,19 +407,19 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
                       </div>
                     </div>
                     <div>
-                      <p className="font-medium">Metadata</p>
+                      <p className="font-medium">{t("vectorStores.info.details.metadata")}</p>
                       <div className="bg-muted p-3 rounded-sm mt-2 font-mono text-xs overflow-auto max-h-48">
                         <pre>{metadataString}</pre>
                       </div>
                     </div>
                     <div>
-                      <p className="font-medium">Created</p>
+                      <p className="font-medium">{t("vectorStores.info.details.created")}</p>
                       <p>
                         {vectorStoreDetails.created_at ? new Date(vectorStoreDetails.created_at).toLocaleString() : "-"}
                       </p>
                     </div>
                     <div>
-                      <p className="font-medium">Last Updated</p>
+                      <p className="font-medium">{t("vectorStores.info.details.lastUpdated")}</p>
                       <p>
                         {vectorStoreDetails.updated_at ? new Date(vectorStoreDetails.updated_at).toLocaleString() : "-"}
                       </p>
diff --git a/ui/litellm-dashboard/src/app/mcp/oauth/callback/page.tsx b/ui/litellm-dashboard/src/app/mcp/oauth/callback/page.tsx
index e62a5db5116..40c3b1edd8a 100644
--- a/ui/litellm-dashboard/src/app/mcp/oauth/callback/page.tsx
+++ b/ui/litellm-dashboard/src/app/mcp/oauth/callback/page.tsx
@@ -2,6 +2,7 @@
 
 import { Suspense, useEffect, useMemo } from "react";
 import { useSearchParams } from "next/navigation";
+import { useTranslation } from "react-i18next";
 import { getSecureItem, setSecureItem } from "@/utils/secureStorage";
 
 // Written to sessionStorage so the admin hook (useMcpOAuthFlow), the user hook
@@ -28,6 +29,7 @@ const resolveDefaultRedirect = () => {
 };
 
 const McpOAuthCallbackContent = () => {
+  const { t } = useTranslation();
   const searchParams = useSearchParams();
 
   const payload = useMemo(() => {
@@ -80,20 +82,19 @@ const McpOAuthCallbackContent = () => {
     <div className="min-h-screen flex items-center justify-center bg-muted p-6">
       <div className="max-w-lg w-full rounded-lg bg-card shadow-md p-8 text-center space-y-4">
         <h1 className="text-xl font-semibold text-foreground">LiteLLM MCP OAuth</h1>
-        <p className="text-sm text-foreground">
-          Authorization complete. You may close this window and return to the LiteLLM dashboard.
-        </p>
-        <p className="text-xs text-muted-foreground">
-          If the window does not close automatically, everything is still saved—you can close it manually.
-        </p>
+        <p className="text-sm text-foreground">{t("mcpOAuthCallback.authorizationComplete")}</p>
+        <p className="text-xs text-muted-foreground">{t("mcpOAuthCallback.manualCloseHint")}</p>
       </div>
     </div>
   );
 };
 
 const McpOAuthCallbackPage = () => {
+  const { t } = useTranslation();
   return (
-    <Suspense fallback={<div className="min-h-screen flex items-center justify-center">Loading...</div>}>
+    <Suspense
+      fallback={<div className="min-h-screen flex items-center justify-center">{t("mcpOAuthCallback.loading")}</div>}
+    >
       <McpOAuthCallbackContent />
     </Suspense>
   );
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCostTracking.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCostTracking.tsx
index 5b504794e9b..554e9b87730 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCostTracking.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCostTracking.tsx
@@ -3,12 +3,14 @@ import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { Card, CardContent } from "@/components/ui/card";
 import CloudZeroEmptyPlaceholder from "./CloudZeroEmptyPlaceholder";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
 import CloudZeroCreationModal from "./CloudZeroCreateModal";
 import { useQueryClient } from "@tanstack/react-query";
 import { createQueryKeys } from "@/app/(dashboard)/hooks/common/queryKeysFactory";
 import { CloudZeroIntegrationSettings } from "./CloudZeroIntegrationSettings";
 
 export default function CloudZeroCostTracking() {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data: settings, isLoading, error } = useCloudZeroSettings(accessToken);
   const queryClient = useQueryClient();
@@ -29,7 +31,7 @@ export default function CloudZeroCostTracking() {
     return (
       <Card>
         <CardContent>
-          <p className="text-sm text-muted-foreground">Loading CloudZero settings...</p>
+          <p className="text-sm text-muted-foreground">{t("loggingAndAlerts.cloudZero.page.loading")}</p>
         </CardContent>
       </Card>
     );
@@ -40,7 +42,8 @@ export default function CloudZeroCostTracking() {
       <Card>
         <CardContent>
           <p className="text-sm text-destructive">
-            Error loading CloudZero settings: {error instanceof Error ? error.message : String(error)}
+            {t("loggingAndAlerts.cloudZero.page.loadErrorPrefix")}
+            {error instanceof Error ? error.message : String(error)}
           </p>
         </CardContent>
       </Card>
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx
index 113169ea0d1..a715b47da48 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 
 import { useCloudZeroCreate } from "@/app/(dashboard)/hooks/cloudzero/useCloudZeroCreate";
@@ -7,6 +8,7 @@ import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Input } from "@/components/ui/input";
 import { TooltipProvider } from "@/components/ui/tooltip";
+import i18n from "@/i18n/i18n";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { toast } from "@/lib/toast";
 
@@ -22,12 +24,13 @@ interface CloudZeroCreationModalProps {
 }
 
 const createSchema = z.object({
-  api_key: z.string().min(1, "Please enter your CloudZero API key"),
-  connection_id: z.string().min(1, "Please enter your CloudZero connection ID"),
+  api_key: z.string().min(1, { error: () => i18n.t("loggingAndAlerts.cloudZero.form.apiKeyRequired") }),
+  connection_id: z.string().min(1, { error: () => i18n.t("loggingAndAlerts.cloudZero.form.connectionIdRequired") }),
   timezone: z.string(),
 });
 
 export default function CloudZeroCreationModal({ open, onOk, onCancel }: CloudZeroCreationModalProps) {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const form = useZodForm(createSchema, { defaultValues: EMPTY_CLOUDZERO_FORM_VALUES });
   const createMutation = useCloudZeroCreate(accessToken || "");
@@ -41,12 +44,12 @@ export default function CloudZeroCreationModal({ open, onOk, onCancel }: CloudZe
   const handleSubmit = (values: CloudZeroFormValues) => {
     createMutation.mutate(buildCloudZeroPayload(values), {
       onSuccess: () => {
-        toast.success("CloudZero integration created successfully");
+        toast.success(t("loggingAndAlerts.cloudZero.createModal.toasts.created"));
         form.reset(EMPTY_CLOUDZERO_FORM_VALUES);
         onOk();
       },
       onError: (error: Error) => {
-        toast.error(error.message || "Failed to create CloudZero integration");
+        toast.error(error.message || t("loggingAndAlerts.cloudZero.createModal.toasts.createFailed"));
       },
     });
   };
@@ -60,23 +63,40 @@ export default function CloudZeroCreationModal({ open, onOk, onCancel }: CloudZe
     <Dialog open={open} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
         <DialogHeader>
-          <DialogTitle>Create CloudZero Integration</DialogTitle>
+          <DialogTitle>{t("loggingAndAlerts.cloudZero.createModal.title")}</DialogTitle>
         </DialogHeader>
         <TooltipProvider>
           <form onSubmit={(event) => event.preventDefault()} noValidate>
             <FieldGroup>
-              <FormField control={form.control} name="api_key" label="CloudZero API Key">
+              <FormField control={form.control} name="api_key" label={t("loggingAndAlerts.cloudZero.form.apiKey")}>
                 {({ ref, ...field }) => (
-                  <CloudZeroApiKeyInput {...field} ref={ref} placeholder="Enter your CloudZero API key" />
+                  <CloudZeroApiKeyInput
+                    {...field}
+                    ref={ref}
+                    placeholder={t("loggingAndAlerts.cloudZero.form.apiKeyPlaceholder")}
+                  />
                 )}
               </FormField>
-              <FormField control={form.control} name="connection_id" label="Connection ID">
-                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Enter your CloudZero connection ID" />}
+              <FormField
+                control={form.control}
+                name="connection_id"
+                label={t("loggingAndAlerts.cloudZero.form.connectionId")}
+              >
+                {({ ref, ...field }) => (
+                  <Input
+                    {...field}
+                    ref={ref}
+                    placeholder={t("loggingAndAlerts.cloudZero.form.connectionIdPlaceholder")}
+                  />
+                )}
               </FormField>
               <FormField
                 control={form.control}
                 name="timezone"
-                label={labelWithHint("Timezone", "Timezone for date handling (defaults to UTC if not provided)")}
+                label={labelWithHint(
+                  t("loggingAndAlerts.cloudZero.form.timezone"),
+                  t("loggingAndAlerts.cloudZero.form.timezoneHint"),
+                )}
               >
                 {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="UTC" />}
               </FormField>
@@ -85,14 +105,16 @@ export default function CloudZeroCreationModal({ open, onOk, onCancel }: CloudZe
         </TooltipProvider>
         <DialogFooter>
           <Button variant="outline" onClick={handleCancel} disabled={createMutation.isPending}>
-            Cancel
+            {t("loggingAndAlerts.cloudZero.createModal.cancel")}
           </Button>
           <Button
             onClick={() => void form.handleSubmit(handleSubmit)()}
             disabled={createMutation.isPending}
             aria-busy={createMutation.isPending}
           >
-            {createMutation.isPending ? "Creating..." : "Create"}
+            {createMutation.isPending
+              ? t("loggingAndAlerts.cloudZero.createModal.submitting")
+              : t("loggingAndAlerts.cloudZero.createModal.submit")}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroEmptyPlaceholder.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroEmptyPlaceholder.tsx
index 869f3c207b2..158101bb27b 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroEmptyPlaceholder.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroEmptyPlaceholder.tsx
@@ -1,21 +1,23 @@
 import { Button } from "@/components/ui/button";
 import { Inbox } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 interface CloudZeroEmptyPlaceholderProps {
   startCreation: () => void;
 }
 
 export default function CloudZeroEmptyPlaceholder({ startCreation }: CloudZeroEmptyPlaceholderProps) {
+  const { t } = useTranslation();
   return (
     <div className="mx-auto mt-8 max-w-2xl rounded-lg border border-dashed border-border bg-card p-12 text-center">
       <div className="flex flex-col items-center gap-2">
         <Inbox className="size-10 text-muted-foreground" aria-hidden />
-        <h4 className="text-base font-semibold">No CloudZero Integration Found</h4>
+        <h4 className="text-base font-semibold">{t("loggingAndAlerts.cloudZero.emptyPlaceholder.title")}</h4>
         <p className="mx-auto max-w-md text-sm text-muted-foreground">
-          Connect your CloudZero account to start tracking and analyzing your cloud costs directly from LiteLLM.
+          {t("loggingAndAlerts.cloudZero.emptyPlaceholder.description")}
         </p>
         <Button size="lg" onClick={startCreation} className="mt-4">
-          Add CloudZero Integration
+          {t("loggingAndAlerts.cloudZero.emptyPlaceholder.add")}
         </Button>
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroFormControls.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroFormControls.tsx
index 7f11f76cfe0..0b780446260 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroFormControls.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroFormControls.tsx
@@ -2,6 +2,7 @@
 
 import { CircleHelp, Eye, EyeOff } from "lucide-react";
 import * as React from "react";
+import { useTranslation } from "react-i18next";
 
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -20,6 +21,7 @@ export const CloudZeroApiKeyInput = React.forwardRef<
   HTMLInputElement,
   Omit<React.ComponentPropsWithoutRef<"input">, "type">
 >(({ className, ...props }, ref) => {
+  const { t } = useTranslation();
   const [revealed, setRevealed] = React.useState(false);
 
   return (
@@ -29,7 +31,9 @@ export const CloudZeroApiKeyInput = React.forwardRef<
         <InputGroupButton
           size="icon-xs"
           variant="ghost"
-          aria-label={revealed ? "Hide API key" : "Show API key"}
+          aria-label={
+            revealed ? t("loggingAndAlerts.cloudZero.form.hideApiKey") : t("loggingAndAlerts.cloudZero.form.showApiKey")
+          }
           onClick={() => setRevealed((current) => !current)}
         >
           {revealed ? <EyeOff /> : <Eye />}
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx
index 2baafa822e3..25dfc688c15 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx
@@ -20,6 +20,7 @@ import { Separator } from "@/components/ui/separator";
 import { toast } from "@/lib/toast";
 import { CheckCircle, Pencil, Play, Trash2, Upload } from "lucide-react";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
 import CloudZeroUpdateModal from "./CloudZeroUpdateModal";
 import { CloudZeroSettings } from "./types";
 
@@ -40,9 +41,13 @@ const DetailRow = ({ label, children }: DetailRowProps) => (
   </div>
 );
 
-const NotConfigured = () => <span className="text-muted-foreground italic">Not configured</span>;
+const NotConfigured = () => {
+  const { t } = useTranslation();
+  return <span className="text-muted-foreground italic">{t("loggingAndAlerts.cloudZero.settings.notConfigured")}</span>;
+};
 
 export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: CloudZeroIntegrationSettingsProps) {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const [isEditModalOpen, setIsEditModalOpen] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
@@ -59,10 +64,10 @@ export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: Cl
       { limit: 10 },
       {
         onSuccess: (data) => {
-          toast.success("Dry run completed successfully");
+          toast.success(t("loggingAndAlerts.cloudZero.settings.toasts.dryRunSucceeded"));
         },
         onError: (error) => {
-          toast.error(error?.message || "Failed to perform dry run");
+          toast.error(error?.message || t("loggingAndAlerts.cloudZero.settings.toasts.dryRunFailed"));
         },
       },
     );
@@ -77,11 +82,11 @@ export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: Cl
       { operation: "replace_hourly" },
       {
         onSuccess: () => {
-          toast.success("Data successfully exported to CloudZero");
+          toast.success(t("loggingAndAlerts.cloudZero.settings.toasts.exported"));
           setIsExportConfirmOpen(false);
         },
         onError: (error) => {
-          toast.error(error?.message || "Failed to export data");
+          toast.error(error?.message || t("loggingAndAlerts.cloudZero.settings.toasts.exportFailed"));
         },
       },
     );
@@ -109,12 +114,12 @@ export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: Cl
 
     deleteMutation.mutate(undefined, {
       onSuccess: () => {
-        toast.success("CloudZero integration deleted successfully");
+        toast.success(t("loggingAndAlerts.cloudZero.settings.toasts.deleted"));
         setIsDeleteModalOpen(false);
         onSettingsUpdated();
       },
       onError: (error) => {
-        toast.error(error?.message || "Failed to delete CloudZero integration");
+        toast.error(error?.message || t("loggingAndAlerts.cloudZero.settings.toasts.deleteFailed"));
       },
     });
   };
@@ -129,59 +134,66 @@ export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: Cl
         <Card>
           <CardHeader>
             <CardTitle className="flex items-center gap-2 text-lg">
-              CloudZero Configuration
+              {t("loggingAndAlerts.cloudZero.settings.title")}
               <Badge variant="secondary" className="capitalize">
-                {settings.status || "Active"}
+                {settings.status || t("loggingAndAlerts.cloudZero.settings.statusFallback")}
               </Badge>
             </CardTitle>
             <CardAction className="flex gap-2">
               <Button variant="outline" onClick={handleEdit}>
                 <Pencil />
-                Edit
+                {t("loggingAndAlerts.cloudZero.settings.edit")}
               </Button>
               <Button variant="destructive" onClick={handleDeleteClick}>
                 <Trash2 />
-                Delete
+                {t("loggingAndAlerts.cloudZero.settings.delete")}
               </Button>
             </CardAction>
           </CardHeader>
 
           <CardContent>
             <dl className="rounded-md border border-border">
-              <DetailRow label="API Key (Redacted)">
+              <DetailRow label={t("loggingAndAlerts.cloudZero.settings.fields.apiKey")}>
                 <span className="font-mono">{settings.api_key_masked || <NotConfigured />}</span>
               </DetailRow>
-              <DetailRow label="Connection ID">
+              <DetailRow label={t("loggingAndAlerts.cloudZero.settings.fields.connectionId")}>
                 <span className="font-mono">{settings.connection_id || <NotConfigured />}</span>
               </DetailRow>
-              <DetailRow label="Timezone">
-                {settings.timezone || <span className="text-muted-foreground italic">Default (UTC)</span>}
+              <DetailRow label={t("loggingAndAlerts.cloudZero.settings.fields.timezone")}>
+                {settings.timezone || (
+                  <span className="text-muted-foreground italic">
+                    {t("loggingAndAlerts.cloudZero.settings.defaultTimezone")}
+                  </span>
+                )}
               </DetailRow>
             </dl>
 
             <div className="mt-6 flex items-center gap-3">
-              <span className="text-sm text-muted-foreground">Actions</span>
+              <span className="text-sm text-muted-foreground">{t("loggingAndAlerts.cloudZero.settings.actions")}</span>
               <Separator className="flex-1" />
             </div>
 
             <div className="mt-4 mb-6 flex flex-wrap gap-4">
               <Button variant="outline" onClick={handleDryRun} disabled={dryRunMutation.isPending}>
                 <Play />
-                Run Dry Run Simulation
+                {t("loggingAndAlerts.cloudZero.settings.dryRun")}
               </Button>
 
               <Button onClick={() => setIsExportConfirmOpen(true)} disabled={exportMutation.isPending}>
                 <Upload />
-                Export Data Now
+                {t("loggingAndAlerts.cloudZero.settings.exportNow")}
               </Button>
             </div>
 
             {dryRunResult && (
               <Alert>
                 <CheckCircle />
-                <AlertTitle>Dry Run Results</AlertTitle>
+                <AlertTitle>{t("loggingAndAlerts.cloudZero.settings.dryRunResults")}</AlertTitle>
                 <AlertDescription>
-                  <p>Simulation output for connection: {settings.connection_id}</p>
+                  <p>
+                    {t("loggingAndAlerts.cloudZero.settings.simulationOutputPrefix")}
+                    {settings.connection_id}
+                  </p>
                   <pre className="overflow-x-auto rounded-md border border-border bg-muted p-4 font-mono text-xs text-foreground">
                     {dryRunResult}
                   </pre>
@@ -195,15 +207,17 @@ export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: Cl
       <AlertDialog open={isExportConfirmOpen} onOpenChange={setIsExportConfirmOpen}>
         <AlertDialogContent>
           <AlertDialogHeader>
-            <AlertDialogTitle>Export Data to CloudZero</AlertDialogTitle>
+            <AlertDialogTitle>{t("loggingAndAlerts.cloudZero.settings.exportDialog.title")}</AlertDialogTitle>
             <AlertDialogDescription>
-              This will push the current accumulated cost data to CloudZero. Continue?
+              {t("loggingAndAlerts.cloudZero.settings.exportDialog.description")}
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
-            <AlertDialogCancel disabled={exportMutation.isPending}>Cancel</AlertDialogCancel>
+            <AlertDialogCancel disabled={exportMutation.isPending}>
+              {t("loggingAndAlerts.cloudZero.settings.exportDialog.cancel")}
+            </AlertDialogCancel>
             <Button onClick={handleExport} disabled={exportMutation.isPending}>
-              Export
+              {t("loggingAndAlerts.cloudZero.settings.exportDialog.confirm")}
             </Button>
           </AlertDialogFooter>
         </AlertDialogContent>
@@ -218,18 +232,18 @@ export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: Cl
 
       <DeleteResourceModal
         isOpen={isDeleteModalOpen}
-        title="Delete CloudZero Integration?"
-        message="Are you sure you want to delete this CloudZero integration? All associated settings and configurations will be permanently removed."
-        resourceInformationTitle="Integration Details"
+        title={t("loggingAndAlerts.cloudZero.settings.deleteDialog.title")}
+        message={t("loggingAndAlerts.cloudZero.settings.deleteDialog.message")}
+        resourceInformationTitle={t("loggingAndAlerts.cloudZero.settings.deleteDialog.infoTitle")}
         resourceInformation={[
           {
-            label: "Connection ID",
+            label: t("loggingAndAlerts.cloudZero.settings.deleteDialog.connectionId"),
             value: settings.connection_id,
             code: true,
           },
           {
-            label: "Timezone",
-            value: settings.timezone || "Default (UTC)",
+            label: t("loggingAndAlerts.cloudZero.settings.deleteDialog.timezone"),
+            value: settings.timezone || t("loggingAndAlerts.cloudZero.settings.defaultTimezone"),
           },
         ]}
         onCancel={handleDeleteCancel}
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx
index 51b9ac7dfeb..3d0e4cd319f 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 
 import { useCloudZeroUpdateSettings } from "@/app/(dashboard)/hooks/cloudzero/useCloudZeroSettings";
@@ -7,6 +8,7 @@ import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Input } from "@/components/ui/input";
 import { TooltipProvider } from "@/components/ui/tooltip";
+import i18n from "@/i18n/i18n";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { toast } from "@/lib/toast";
 
@@ -25,11 +27,12 @@ interface CloudZeroUpdateModalProps {
 
 const updateSchema = z.object({
   api_key: z.string(),
-  connection_id: z.string().min(1, "Please enter your CloudZero connection ID"),
+  connection_id: z.string().min(1, { error: () => i18n.t("loggingAndAlerts.cloudZero.form.connectionIdRequired") }),
   timezone: z.string(),
 });
 
 export default function CloudZeroUpdateModal({ open, onOk, onCancel, settings }: CloudZeroUpdateModalProps) {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const form = useZodForm(updateSchema, { defaultValues: EMPTY_CLOUDZERO_FORM_VALUES });
   const updateMutation = useCloudZeroUpdateSettings(accessToken || "");
@@ -49,12 +52,12 @@ export default function CloudZeroUpdateModal({ open, onOk, onCancel, settings }:
   const handleSubmit = (values: CloudZeroFormValues) => {
     updateMutation.mutate(buildCloudZeroPayload(values), {
       onSuccess: () => {
-        toast.success("CloudZero integration updated successfully");
+        toast.success(t("loggingAndAlerts.cloudZero.updateModal.toasts.updated"));
         form.reset(EMPTY_CLOUDZERO_FORM_VALUES);
         onOk();
       },
       onError: (error: Error) => {
-        toast.error(error.message || "Failed to update CloudZero integration");
+        toast.error(error.message || t("loggingAndAlerts.cloudZero.updateModal.toasts.updateFailed"));
       },
     });
   };
@@ -68,7 +71,7 @@ export default function CloudZeroUpdateModal({ open, onOk, onCancel, settings }:
     <Dialog open={open} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
         <DialogHeader>
-          <DialogTitle>Edit CloudZero Integration</DialogTitle>
+          <DialogTitle>{t("loggingAndAlerts.cloudZero.updateModal.title")}</DialogTitle>
         </DialogHeader>
         <TooltipProvider>
           <form onSubmit={(event) => event.preventDefault()} noValidate>
@@ -76,19 +79,39 @@ export default function CloudZeroUpdateModal({ open, onOk, onCancel, settings }:
               <FormField
                 control={form.control}
                 name="api_key"
-                label={labelWithHint("CloudZero API Key", "Leave empty to keep the existing API key")}
+                label={labelWithHint(
+                  t("loggingAndAlerts.cloudZero.form.apiKey"),
+                  t("loggingAndAlerts.cloudZero.updateModal.apiKeyHint"),
+                )}
               >
                 {({ ref, ...field }) => (
-                  <CloudZeroApiKeyInput {...field} ref={ref} placeholder="Leave empty to keep existing" />
+                  <CloudZeroApiKeyInput
+                    {...field}
+                    ref={ref}
+                    placeholder={t("loggingAndAlerts.cloudZero.updateModal.apiKeyPlaceholder")}
+                  />
                 )}
               </FormField>
-              <FormField control={form.control} name="connection_id" label="Connection ID">
-                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Enter your CloudZero connection ID" />}
+              <FormField
+                control={form.control}
+                name="connection_id"
+                label={t("loggingAndAlerts.cloudZero.form.connectionId")}
+              >
+                {({ ref, ...field }) => (
+                  <Input
+                    {...field}
+                    ref={ref}
+                    placeholder={t("loggingAndAlerts.cloudZero.form.connectionIdPlaceholder")}
+                  />
+                )}
               </FormField>
               <FormField
                 control={form.control}
                 name="timezone"
-                label={labelWithHint("Timezone", "Timezone for date handling (defaults to UTC if not provided)")}
+                label={labelWithHint(
+                  t("loggingAndAlerts.cloudZero.form.timezone"),
+                  t("loggingAndAlerts.cloudZero.form.timezoneHint"),
+                )}
               >
                 {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="UTC" />}
               </FormField>
@@ -97,14 +120,16 @@ export default function CloudZeroUpdateModal({ open, onOk, onCancel, settings }:
         </TooltipProvider>
         <DialogFooter>
           <Button variant="outline" onClick={handleCancel} disabled={updateMutation.isPending}>
-            Cancel
+            {t("loggingAndAlerts.cloudZero.updateModal.cancel")}
           </Button>
           <Button
             onClick={() => void form.handleSubmit(handleSubmit)()}
             disabled={updateMutation.isPending}
             aria-busy={updateMutation.isPending}
           >
-            {updateMutation.isPending ? "Updating..." : "Update"}
+            {updateMutation.isPending
+              ? t("loggingAndAlerts.cloudZero.updateModal.submitting")
+              : t("loggingAndAlerts.cloudZero.updateModal.submit")}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/ui/litellm-dashboard/src/components/MSTeamsSettings.tsx b/ui/litellm-dashboard/src/components/MSTeamsSettings.tsx
index cdbd04de74a..e729573d75f 100644
--- a/ui/litellm-dashboard/src/components/MSTeamsSettings.tsx
+++ b/ui/litellm-dashboard/src/components/MSTeamsSettings.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
@@ -21,8 +22,10 @@ interface MSTeamsSettingsProps {
 const FIELD_HELP: Record<string, React.ReactNode> = {
   MS_TEAMS_WEBHOOK_URL: (
     <>
-      Incoming webhook URL for your Teams channel (Workflows or incoming webhook connector)
-      <span className="text-destructive"> Required * </span>
+      <Trans i18nKey="loggingAndAlerts.msTeams.help.webhookUrl" />
+      <span className="text-destructive">
+        <Trans i18nKey="loggingAndAlerts.msTeams.required" />
+      </span>
     </>
   ),
 };
@@ -30,6 +33,7 @@ const FIELD_HELP: Record<string, React.ReactNode> = {
 const SENSITIVE_FIELD_PATTERN = /(PASSWORD|SECRET|KEY|TOKEN|URL)/i;
 
 const MSTeamsSettings: React.FC<MSTeamsSettingsProps> = ({ accessToken, userID, userRole, alerts }) => {
+  const { t } = useTranslation();
   const [visibleFields, setVisibleFields] = useState<Record<string, boolean>>({});
 
   const toggleFieldVisibility = (key: string) => {
@@ -77,7 +81,7 @@ const MSTeamsSettings: React.FC<MSTeamsSettingsProps> = ({ accessToken, userID,
         environment_variables: updatedVariables,
       };
       await setCallbacksCall(accessToken, payload);
-      toast.success("MS Teams settings updated successfully");
+      toast.success(t("loggingAndAlerts.msTeams.toasts.saved"));
     } catch (error) {
       toast.fromError(error);
     }
@@ -86,17 +90,21 @@ const MSTeamsSettings: React.FC<MSTeamsSettingsProps> = ({ accessToken, userID,
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="text-base">Microsoft Teams Alerting Settings</CardTitle>
+        <CardTitle className="text-base">{t("loggingAndAlerts.msTeams.title")}</CardTitle>
         <p className="text-sm">
-          Send LiteLLM alerts to a Microsoft Teams channel via an incoming webhook. Create one from{" "}
-          <a
-            href="https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook"
-            target="_blank"
-            rel="noreferrer"
-            className="text-primary underline underline-offset-4"
-          >
-            Microsoft Docs: incoming webhooks
-          </a>
+          <Trans
+            i18nKey="loggingAndAlerts.msTeams.intro"
+            components={{
+              docs: (
+                <a
+                  href="https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook"
+                  target="_blank"
+                  rel="noreferrer"
+                  className="text-primary underline underline-offset-4"
+                />
+              ),
+            }}
+          />
         </p>
       </CardHeader>
 
@@ -122,7 +130,11 @@ const MSTeamsSettings: React.FC<MSTeamsSettingsProps> = ({ accessToken, userID,
                           <InputGroupButton
                             size="icon-xs"
                             onClick={() => toggleFieldVisibility(key)}
-                            aria-label={isVisible ? "Hide credential" : "Show credential"}
+                            aria-label={
+                              isVisible
+                                ? t("loggingAndAlerts.msTeams.hideCredential")
+                                : t("loggingAndAlerts.msTeams.showCredential")
+                            }
                           >
                             {isVisible ? <EyeOff /> : <Eye />}
                           </InputGroupButton>
@@ -137,20 +149,20 @@ const MSTeamsSettings: React.FC<MSTeamsSettingsProps> = ({ accessToken, userID,
           ))}
 
         <div className="mt-6 flex gap-2">
-          <Button onClick={() => handleSaveMSTeamsSettings()}>Save Changes</Button>
+          <Button onClick={() => handleSaveMSTeamsSettings()}>{t("loggingAndAlerts.msTeams.saveChanges")}</Button>
           <Button
             variant="secondary"
             onClick={async () => {
               if (!accessToken) return;
               try {
                 await serviceHealthCheck(accessToken, "ms_teams");
-                toast.success("MS Teams test alert triggered. Check your Teams channel.");
+                toast.success(t("loggingAndAlerts.msTeams.toasts.testTriggered"));
               } catch (error) {
                 toast.fromError(error);
               }
             }}
           >
-            Test MS Teams Alerts
+            {t("loggingAndAlerts.msTeams.testAlerts")}
           </Button>
         </div>
       </CardContent>
diff --git a/ui/litellm-dashboard/src/components/SCIM.tsx b/ui/litellm-dashboard/src/components/SCIM.tsx
index efe87454968..283a15e462b 100644
--- a/ui/litellm-dashboard/src/components/SCIM.tsx
+++ b/ui/litellm-dashboard/src/components/SCIM.tsx
@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 import { keyCreateCall } from "./networking";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import { CircleAlert, CirclePlus, Copy, Info, KeyRound, Link } from "lucide-react";
 import { parseErrorMessage } from "./shared/errorUtils";
+import i18n from "@/i18n/i18n";
 import { toast } from "@/lib/toast";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { FieldGroup } from "@/components/ui/field";
@@ -22,12 +24,13 @@ interface SCIMConfigProps {
 }
 
 const scimTokenSchema = z.object({
-  key_alias: z.string().min(1, "Please enter a name for your token"),
+  key_alias: z.string().min(1, { error: () => i18n.t("adminPanel.scim.token.nameRequired") }),
 });
 
 type SCIMTokenFormValues = z.infer<typeof scimTokenSchema>;
 
 const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySettings }) => {
+  const { t } = useTranslation();
   const form = useZodForm(scimTokenSchema, { defaultValues: { key_alias: "" } });
   const [isCreatingToken, setIsCreatingToken] = useState(false);
   const [tokenData, setTokenData] = useState<any>(null);
@@ -50,7 +53,7 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
 
   const handleCreateSCIMToken = async (values: SCIMTokenFormValues) => {
     if (!accessToken || !userID) {
-      toast.fromError("You need to be logged in to create a SCIM token");
+      toast.fromError(t("adminPanel.scim.toasts.notLoggedIn"));
       return;
     }
 
@@ -66,10 +69,10 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
 
       const response = await keyCreateCall(accessToken, userID, formData);
       setTokenData(response);
-      toast.success("SCIM token created successfully");
+      toast.success(t("adminPanel.scim.toasts.created"));
     } catch (error: any) {
       console.error("Error creating SCIM token:", error);
-      toast.fromError("Failed to create SCIM token: " + parseErrorMessage(error));
+      toast.fromError(t("adminPanel.scim.toasts.createFailed", { error: parseErrorMessage(error) }));
     } finally {
       setIsCreatingToken(false);
     }
@@ -80,12 +83,9 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
       <Card>
         <CardContent>
           <div className="flex items-center mb-4">
-            <CardTitle>SCIM Configuration</CardTitle>
+            <CardTitle>{t("adminPanel.scim.title")}</CardTitle>
           </div>
-          <p className="text-muted-foreground">
-            System for Cross-domain Identity Management (SCIM) allows you to automatically provision and manage users
-            and groups in LiteLLM.
-          </p>
+          <p className="text-muted-foreground">{t("adminPanel.scim.description")}</p>
 
           <Separator className="my-6" />
 
@@ -96,18 +96,16 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
                 <div className="flex items-center justify-center w-6 h-6 rounded-full bg-info/15 text-info mr-2">1</div>
                 <h3 className="text-lg font-medium flex items-center">
                   <Link className="h-5 w-5 mr-2" />
-                  SCIM Tenant URL
+                  {t("adminPanel.scim.tenantUrl.title")}
                 </h3>
               </div>
-              <p className="text-muted-foreground mb-3">
-                Use this URL in your identity provider SCIM integration settings.
-              </p>
+              <p className="text-muted-foreground mb-3">{t("adminPanel.scim.tenantUrl.description")}</p>
               <div className="flex items-center">
                 <Input value={scimBaseUrl} disabled={true} readOnly className="grow" />
-                <CopyToClipboard text={scimBaseUrl} onCopy={() => toast.success("URL copied to clipboard")}>
+                <CopyToClipboard text={scimBaseUrl} onCopy={() => toast.success(t("adminPanel.scim.toasts.urlCopied"))}>
                   <Button type="button" className="ml-2 flex items-center">
                     <Copy />
-                    Copy
+                    {t("adminPanel.scim.tenantUrl.copy")}
                   </Button>
                 </CopyToClipboard>
               </div>
@@ -119,25 +117,24 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
                 <div className="flex items-center justify-center w-6 h-6 rounded-full bg-info/15 text-info mr-2">2</div>
                 <h3 className="text-lg font-medium flex items-center">
                   <KeyRound className="h-5 w-5 mr-2" />
-                  Authentication Token
+                  {t("adminPanel.scim.token.title")}
                 </h3>
               </div>
 
               <Alert variant="info" className="mb-4">
                 <Info />
-                <AlertTitle>Using SCIM</AlertTitle>
-                <AlertDescription>
-                  You need a SCIM token to authenticate with the SCIM API. Create one below and use it in your SCIM
-                  provider configuration.
-                </AlertDescription>
+                <AlertTitle>{t("adminPanel.scim.token.alertTitle")}</AlertTitle>
+                <AlertDescription>{t("adminPanel.scim.token.alertDescription")}</AlertDescription>
               </Alert>
 
               {!tokenData ? (
                 <div className="bg-muted p-4 rounded-lg">
                   <form onSubmit={form.handleSubmit(handleCreateSCIMToken)}>
                     <FieldGroup>
-                      <FormField control={form.control} name="key_alias" label="Token Name">
-                        {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="SCIM Access Token" />}
+                      <FormField control={form.control} name="key_alias" label={t("adminPanel.scim.token.nameLabel")}>
+                        {({ ref, ...field }) => (
+                          <Input {...field} ref={ref} placeholder={t("adminPanel.scim.token.namePlaceholder")} />
+                        )}
                       </FormField>
                       <div>
                         <Button
@@ -147,7 +144,7 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
                           className="flex items-center"
                         >
                           {isCreatingToken ? <UiLoadingSpinner className="size-4" /> : <KeyRound />}
-                          Create SCIM Token
+                          {t("adminPanel.scim.token.create")}
                         </Button>
                       </div>
                     </FieldGroup>
@@ -157,17 +154,18 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
                 <Card className="block p-6 border border-warning/30 bg-warning/10">
                   <div className="flex items-center mb-2 text-warning">
                     <CircleAlert className="h-5 w-5 mr-2" />
-                    <h4 className="text-lg font-medium text-warning">Your SCIM Token</h4>
+                    <h4 className="text-lg font-medium text-warning">{t("adminPanel.scim.created.title")}</h4>
                   </div>
-                  <p className="text-warning mb-4 font-medium">
-                    Make sure to copy this token now. You will not be able to see it again.
-                  </p>
+                  <p className="text-warning mb-4 font-medium">{t("adminPanel.scim.created.warning")}</p>
                   <div className="flex items-center">
                     <Input value={tokenData.key} className="grow mr-2" type="password" disabled={true} readOnly />
-                    <CopyToClipboard text={tokenData.key} onCopy={() => toast.success("Token copied to clipboard")}>
+                    <CopyToClipboard
+                      text={tokenData.key}
+                      onCopy={() => toast.success(t("adminPanel.scim.toasts.tokenCopied"))}
+                    >
                       <Button type="button" className="flex items-center">
                         <Copy />
-                        Copy
+                        {t("adminPanel.scim.created.copy")}
                       </Button>
                     </CopyToClipboard>
                   </div>
@@ -178,7 +176,7 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
                     onClick={() => setTokenData(null)}
                   >
                     <CirclePlus />
-                    Create Another Token
+                    {t("adminPanel.scim.created.createAnother")}
                   </Button>
                 </Card>
               )}
diff --git a/ui/litellm-dashboard/src/components/SSOModals.test.tsx b/ui/litellm-dashboard/src/components/SSOModals.test.tsx
index bee5f13c626..d78de8adaef 100644
--- a/ui/litellm-dashboard/src/components/SSOModals.test.tsx
+++ b/ui/litellm-dashboard/src/components/SSOModals.test.tsx
@@ -19,6 +19,7 @@ vi.mock("./shared/errorUtils", () => ({
 
 import { toast } from "@/lib/toast";
 import { getSSOSettings, updateSSOSettings } from "./networking";
+import { CLEARED_SSO_SETTINGS } from "./Settings/AdminSettings/SSOSettings/utils";
 
 describe("SSOModals", () => {
   it("should render the SSOModals component", () => {
@@ -515,27 +516,7 @@ describe("SSOModals", () => {
 
     // Verify the clear API was called with null values
     await waitFor(() => {
-      expect(updateSSOSettings).toHaveBeenCalledWith("test-token", {
-        google_client_id: null,
-        google_client_secret: null,
-        microsoft_client_id: null,
-        microsoft_client_secret: null,
-        microsoft_tenant: null,
-        generic_client_id: null,
-        generic_client_secret: null,
-        generic_authorization_endpoint: null,
-        generic_token_endpoint: null,
-        generic_userinfo_endpoint: null,
-        saml_idp_metadata_url: null,
-        saml_idp_metadata_xml: null,
-        saml_sp_entity_id: null,
-        saml_allow_unsolicited: null,
-        generic_scope: null,
-        proxy_base_url: null,
-        user_email: null,
-        sso_provider: null,
-        role_mappings: null,
-      });
+      expect(updateSSOSettings).toHaveBeenCalledWith("test-token", CLEARED_SSO_SETTINGS);
     });
 
     expect(toast.success).toHaveBeenCalledWith("SSO settings cleared successfully");
diff --git a/ui/litellm-dashboard/src/components/SSOModals.tsx b/ui/litellm-dashboard/src/components/SSOModals.tsx
index 609c0efcd99..4c48164ddb5 100644
--- a/ui/litellm-dashboard/src/components/SSOModals.tsx
+++ b/ui/litellm-dashboard/src/components/SSOModals.tsx
@@ -1,6 +1,8 @@
 import React, { useEffect, useState } from "react";
 import { FormProvider, useWatch, type UseFormReturn } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { getSSOSettings, updateSSOSettings } from "./networking";
+import { CLEARED_SSO_SETTINGS, diffSSOSettingsPayload } from "./Settings/AdminSettings/SSOSettings/utils";
 import { toast } from "@/lib/toast";
 import { parseErrorMessage } from "./shared/errorUtils";
 import { Button } from "@/components/ui/button";
@@ -32,6 +34,60 @@ interface SSOModalsProps {
   ssoConfigured?: boolean; // Add optional prop to indicate if SSO is configured
 }
 
+const buildLegacySSOPayload = (formValues: SSOSettingsFormValues): Record<string, unknown> => {
+  const {
+    proxy_admin_teams,
+    admin_viewer_teams,
+    internal_user_teams,
+    internal_viewer_teams,
+    default_role,
+    group_claim,
+    use_role_mappings,
+    ...rest
+  } = formValues;
+
+  const payload: Record<string, unknown> = {
+    ...rest,
+  };
+
+  if (typeof payload.saml_allow_unsolicited === "boolean") {
+    payload.saml_allow_unsolicited = payload.saml_allow_unsolicited ? "true" : "false";
+  }
+
+  // Add role mappings if use_role_mappings is checked
+  if (use_role_mappings) {
+    // Helper function to split comma-separated string into array
+    const splitTeams = (teams: string | undefined): string[] => {
+      if (!teams || teams.trim() === "") return [];
+      return teams
+        .split(",")
+        .map((team) => team.trim())
+        .filter((team) => team.length > 0);
+    };
+
+    // Map default role display values to backend values
+    const defaultRoleMapping: Record<string, string> = {
+      internal_user_viewer: "internal_user_viewer",
+      internal_user: "internal_user",
+      proxy_admin_viewer: "proxy_admin_viewer",
+      proxy_admin: "proxy_admin",
+    };
+
+    payload.role_mappings = {
+      provider: "generic",
+      group_claim,
+      default_role: (default_role ? defaultRoleMapping[default_role] : undefined) || "internal_user",
+      roles: {
+        proxy_admin: splitTeams(proxy_admin_teams),
+        proxy_admin_viewer: splitTeams(admin_viewer_teams),
+        internal_user: splitTeams(internal_user_teams),
+        internal_user_viewer: splitTeams(internal_viewer_teams),
+      },
+    };
+  }
+  return payload;
+};
+
 const detectSSOProvider = (values: Record<string, unknown>): string | null => {
   if (values.google_client_id) return "google";
   if (values.microsoft_client_id) return "microsoft";
@@ -55,6 +111,7 @@ const SSOModals: React.FC<SSOModalsProps> = ({
   accessToken,
   ssoConfigured = false, // Default to false if not provided
 }) => {
+  const { t } = useTranslation();
   const [isClearConfirmModalVisible, setIsClearConfirmModalVisible] = useState(false);
   const provider = useWatch({ control: form.control, name: "sso_provider" });
   const useRoleMappings = useWatch({ control: form.control, name: "use_role_mappings" });
@@ -129,61 +186,15 @@ const SSOModals: React.FC<SSOModalsProps> = ({
   // Enhanced form submission handler
   const handleFormSubmit = async (formValues: SSOSettingsFormValues) => {
     if (!accessToken) {
-      toast.fromError("No access token available");
+      toast.fromError(t("adminPanel.ssoModals.toasts.noAccessToken"));
       return;
     }
 
     try {
-      const {
-        proxy_admin_teams,
-        admin_viewer_teams,
-        internal_user_teams,
-        internal_viewer_teams,
-        default_role,
-        group_claim,
-        use_role_mappings,
-        ...rest
-      } = formValues;
-
-      const payload: Record<string, unknown> = {
-        ...rest,
-      };
-
-      if (typeof payload.saml_allow_unsolicited === "boolean") {
-        payload.saml_allow_unsolicited = payload.saml_allow_unsolicited ? "true" : "false";
-      }
-
-      // Add role mappings if use_role_mappings is checked
-      if (use_role_mappings) {
-        // Helper function to split comma-separated string into array
-        const splitTeams = (teams: string | undefined): string[] => {
-          if (!teams || teams.trim() === "") return [];
-          return teams
-            .split(",")
-            .map((team) => team.trim())
-            .filter((team) => team.length > 0);
-        };
-
-        // Map default role display values to backend values
-        const defaultRoleMapping: Record<string, string> = {
-          internal_user_viewer: "internal_user_viewer",
-          internal_user: "internal_user",
-          proxy_admin_viewer: "proxy_admin_viewer",
-          proxy_admin: "proxy_admin",
-        };
-
-        payload.role_mappings = {
-          provider: "generic",
-          group_claim,
-          default_role: (default_role ? defaultRoleMapping[default_role] : undefined) || "internal_user",
-          roles: {
-            proxy_admin: splitTeams(proxy_admin_teams),
-            proxy_admin_viewer: splitTeams(admin_viewer_teams),
-            internal_user: splitTeams(internal_user_teams),
-            internal_user_viewer: splitTeams(internal_viewer_teams),
-          },
-        };
-      }
+      const payload = diffSSOSettingsPayload(
+        buildLegacySSOPayload({ ...emptySSOSettingsFormValues, ...form.formState.defaultValues }),
+        buildLegacySSOPayload(formValues),
+      );
 
       // Save SSO settings using the new API
       await updateSSOSettings(accessToken, payload);
@@ -191,42 +202,19 @@ const SSOModals: React.FC<SSOModalsProps> = ({
       // Continue with the original flow (show instructions)
       handleShowInstructions(formValues);
     } catch (error: unknown) {
-      toast.fromError("Failed to save SSO settings: " + parseErrorMessage(error));
+      toast.fromError(t("adminPanel.ssoModals.toasts.saveFailed", { error: parseErrorMessage(error) }));
     }
   };
 
   // Handle clearing SSO settings
   const handleClearSSO = async () => {
     if (!accessToken) {
-      toast.fromError("No access token available");
+      toast.fromError(t("adminPanel.ssoModals.toasts.noAccessToken"));
       return;
     }
 
     try {
-      // Clear all SSO settings
-      const clearSettings = {
-        google_client_id: null,
-        google_client_secret: null,
-        microsoft_client_id: null,
-        microsoft_client_secret: null,
-        microsoft_tenant: null,
-        generic_client_id: null,
-        generic_client_secret: null,
-        generic_authorization_endpoint: null,
-        generic_token_endpoint: null,
-        generic_userinfo_endpoint: null,
-        saml_idp_metadata_url: null,
-        saml_idp_metadata_xml: null,
-        saml_sp_entity_id: null,
-        saml_allow_unsolicited: null,
-        generic_scope: null,
-        proxy_base_url: null,
-        user_email: null,
-        sso_provider: null,
-        role_mappings: null,
-      };
-
-      await updateSSOSettings(accessToken, clearSettings);
+      await updateSSOSettings(accessToken, CLEARED_SSO_SETTINGS);
 
       // Clear the form
       form.reset(emptySSOSettingsFormValues);
@@ -237,10 +225,10 @@ const SSOModals: React.FC<SSOModalsProps> = ({
       // Close the main SSO modal and trigger refresh
       handleAddSSOOk();
 
-      toast.success("SSO settings cleared successfully");
+      toast.success(t("adminPanel.ssoModals.toasts.clearSuccess"));
     } catch (error) {
       console.error("Failed to clear SSO settings:", error);
-      toast.fromError("Failed to clear SSO settings");
+      toast.fromError(t("adminPanel.ssoModals.toasts.clearFailed"));
     }
   };
 
@@ -250,7 +238,9 @@ const SSOModals: React.FC<SSOModalsProps> = ({
       <Dialog open={isAddSSOModalVisible} onOpenChange={(open) => !open && handleAddSSOCancel()}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
           <DialogHeader>
-            <DialogTitle>{ssoConfigured ? "Edit SSO Settings" : "Add SSO"}</DialogTitle>
+            <DialogTitle>
+              {ssoConfigured ? t("adminPanel.ssoModals.titleEdit") : t("adminPanel.ssoModals.titleAdd")}
+            </DialogTitle>
           </DialogHeader>
           <FormProvider {...form}>
             <form
@@ -264,7 +254,9 @@ const SSOModals: React.FC<SSOModalsProps> = ({
                 {provider ? renderProviderFields(provider) : null}
                 <ProxyAdminEmailField />
                 <ProxyBaseUrlField />
-                {showRoleMappingToggle && <MappingToggleField name="use_role_mappings" label="Use Role Mappings" />}
+                {showRoleMappingToggle && (
+                  <MappingToggleField name="use_role_mappings" label={t("adminPanel.ssoModals.useRoleMappings")} />
+                )}
                 {useRoleMappings && (
                   <>
                     <GroupClaimField />
@@ -275,10 +267,10 @@ const SSOModals: React.FC<SSOModalsProps> = ({
               <div className="mt-4 flex items-center justify-end gap-2">
                 {ssoConfigured && (
                   <Button type="button" variant="secondary" onClick={() => setIsClearConfirmModalVisible(true)}>
-                    Clear
+                    {t("adminPanel.ssoModals.clear")}
                   </Button>
                 )}
-                <Button type="submit">Save</Button>
+                <Button type="submit">{t("adminPanel.ssoModals.save")}</Button>
               </div>
             </form>
           </FormProvider>
@@ -289,16 +281,16 @@ const SSOModals: React.FC<SSOModalsProps> = ({
       <Dialog open={isClearConfirmModalVisible} onOpenChange={(open) => !open && setIsClearConfirmModalVisible(false)}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
           <DialogHeader>
-            <DialogTitle>Confirm Clear SSO Settings</DialogTitle>
+            <DialogTitle>{t("adminPanel.ssoModals.clearConfirm.title")}</DialogTitle>
           </DialogHeader>
-          <p>Are you sure you want to clear all SSO settings? This action cannot be undone.</p>
-          <p>Users will no longer be able to login using SSO after this change.</p>
+          <p>{t("adminPanel.ssoModals.clearConfirm.message")}</p>
+          <p>{t("adminPanel.ssoModals.clearConfirm.warning")}</p>
           <DialogFooter>
             <Button variant="outline" onClick={() => setIsClearConfirmModalVisible(false)}>
-              Cancel
+              {t("adminPanel.ssoModals.clearConfirm.cancel")}
             </Button>
             <Button onClick={handleClearSSO} variant="destructive">
-              Yes, Clear
+              {t("adminPanel.ssoModals.clearConfirm.confirm")}
             </Button>
           </DialogFooter>
         </DialogContent>
@@ -307,16 +299,16 @@ const SSOModals: React.FC<SSOModalsProps> = ({
       <Dialog open={isInstructionsModalVisible} onOpenChange={(open) => !open && handleInstructionsCancel()}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
           <DialogHeader>
-            <DialogTitle>SSO Setup Instructions</DialogTitle>
+            <DialogTitle>{t("adminPanel.ssoModals.instructions.title")}</DialogTitle>
           </DialogHeader>
-          <p>Follow these steps to complete the SSO setup:</p>
-          <p className="text-sm mt-2">1. DO NOT Exit this TAB</p>
-          <p className="text-sm mt-2">2. Open a new tab, visit your proxy base url</p>
-          <p className="text-sm mt-2">3. Confirm your SSO is configured correctly and you can login on the new Tab</p>
-          <p className="text-sm mt-2">4. If Step 3 is successful, you can close this tab</p>
+          <p>{t("adminPanel.ssoModals.instructions.intro")}</p>
+          <p className="text-sm mt-2">{t("adminPanel.ssoModals.instructions.step1")}</p>
+          <p className="text-sm mt-2">{t("adminPanel.ssoModals.instructions.step2")}</p>
+          <p className="text-sm mt-2">{t("adminPanel.ssoModals.instructions.step3")}</p>
+          <p className="text-sm mt-2">{t("adminPanel.ssoModals.instructions.step4")}</p>
           <div style={{ textAlign: "right", marginTop: "10px" }}>
             <Button type="button" onClick={handleInstructionsOk}>
-              Done
+              {t("adminPanel.ssoModals.instructions.done")}
             </Button>
           </div>
         </DialogContent>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArk.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArk.tsx
index 30026d0a834..97ab9654e4b 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArk.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArk.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { Edit, ExternalLink, Info, KeyRound, PlugZap, Trash2 } from "lucide-react";
+import type { TFunction } from "i18next";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { testCyberArkConnection } from "@/app/(dashboard)/hooks/configOverrides/cyberArkApi";
 import { useCyberArkConfig } from "@/app/(dashboard)/hooks/configOverrides/useCyberArkConfig";
@@ -19,10 +21,10 @@ import CyberArkEmptyPlaceholder from "./CyberArkEmptyPlaceholder";
 import EditCyberArkModal from "./EditCyberArkModal";
 import { FIELD_LABELS, SENSITIVE_FIELDS } from "./constants";
 
-function detectAuthMethod(values: Record<string, unknown>): string {
-  if (values.cyberark_api_key) return "API Key";
-  if (values.client_cert && values.client_key) return "TLS Certificate";
-  return "None";
+function detectAuthMethod(values: Record<string, unknown>, t: TFunction): string {
+  if (values.cyberark_api_key) return t("adminPanel.cyberArk.authMethods.apiKey");
+  if (values.client_cert && values.client_key) return t("adminPanel.cyberArk.authMethods.tlsCertificate");
+  return t("adminPanel.cyberArk.authMethods.none");
 }
 
 function DetailRow({ children, label }: { children: React.ReactNode; label: string }) {
@@ -35,6 +37,7 @@ function DetailRow({ children, label }: { children: React.ReactNode; label: stri
 }
 
 export default function CyberArk() {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data, isLoading, isError, error } = useCyberArkConfig();
   const { mutate: deleteConfig, isPending: isDeleting } = useDeleteCyberArkConfig(accessToken);
@@ -51,7 +54,7 @@ export default function CyberArk() {
     setIsTesting(true);
     try {
       const result = await testCyberArkConnection(accessToken);
-      toast.success(result.message || "Connection to CyberArk Conjur successful!");
+      toast.success(result.message || t("adminPanel.cyberArk.toasts.connectionSuccess"));
     } catch (err) {
       toast.fromError(err);
     } finally {
@@ -62,7 +65,7 @@ export default function CyberArk() {
   const handleDelete = () => {
     deleteConfig(undefined, {
       onSuccess: () => {
-        toast.success("CyberArk configuration deleted");
+        toast.success(t("adminPanel.cyberArk.toasts.deleted"));
         setIsDeleteModalOpen(false);
       },
       onError: (err) => toast.fromError(err),
@@ -75,7 +78,11 @@ export default function CyberArk() {
       { [clearingField]: "" },
       {
         onSuccess: () => {
-          toast.success(`${FIELD_LABELS[clearingField] ?? clearingField} cleared`);
+          toast.success(
+            t("adminPanel.cyberArk.toasts.fieldCleared", {
+              field: (Object.hasOwn(FIELD_LABELS, clearingField) && t(FIELD_LABELS[clearingField])) || clearingField,
+            }),
+          );
           setClearingField(null);
         },
         onError: (err) => toast.fromError(err),
@@ -85,7 +92,7 @@ export default function CyberArk() {
 
   const renderValue = (key: string) => {
     const value = rawValues[key];
-    if (!value) return <span className="text-muted-foreground italic">Not configured</span>;
+    if (!value) return <span className="text-muted-foreground italic">{t("adminPanel.cyberArk.notConfigured")}</span>;
     if (!SENSITIVE_FIELDS.has(key)) return <span className="font-mono text-muted-foreground">{value}</span>;
 
     return (
@@ -95,7 +102,9 @@ export default function CyberArk() {
           type="button"
           variant="ghost"
           size="icon-sm"
-          aria-label={`Clear ${FIELD_LABELS[key] ?? key}`}
+          aria-label={t("adminPanel.cyberArk.actions.clearField", {
+            field: (Object.hasOwn(FIELD_LABELS, key) && t(FIELD_LABELS[key])) || key,
+          })}
           onClick={() => setClearingField(key)}
         >
           <Trash2 className="size-3.5" />
@@ -109,7 +118,7 @@ export default function CyberArk() {
   const renderCard = () => {
     if (isLoading) {
       return (
-        <Card role="status" aria-label="Loading CyberArk configuration">
+        <Card role="status" aria-label={t("adminPanel.cyberArk.loadingAriaLabel")}>
           <CardContent className="space-y-3">
             <Skeleton className="h-8 w-64" />
             <Skeleton className="h-40 w-full" />
@@ -122,7 +131,7 @@ export default function CyberArk() {
         <Card>
           <CardContent>
             <Alert variant="error">
-              <AlertTitle>Could not load CyberArk configuration</AlertTitle>
+              <AlertTitle>{t("adminPanel.cyberArk.errors.loadFailed")}</AlertTitle>
               {error instanceof Error && <AlertDescription>{error.message}</AlertDescription>}
             </Alert>
           </CardContent>
@@ -138,22 +147,22 @@ export default function CyberArk() {
               <CardTitle>
                 <h3>CyberArk Conjur</h3>
               </CardTitle>
-              <CardDescription>Manage secret manager configuration</CardDescription>
+              <CardDescription>{t("adminPanel.cyberArk.description")}</CardDescription>
             </div>
           </div>
           {isConfigured && (
             <CardAction className="flex flex-wrap gap-2">
               <Button type="button" variant="outline" disabled={isTesting} onClick={handleTestConnection}>
                 <PlugZap />
-                {isTesting ? "Testing..." : "Test Connection"}
+                {isTesting ? t("adminPanel.cyberArk.actions.testing") : t("adminPanel.cyberArk.actions.testConnection")}
               </Button>
               <Button type="button" variant="outline" onClick={() => setIsEditModalVisible(true)}>
                 <Edit />
-                Edit Configuration
+                {t("adminPanel.cyberArk.actions.edit")}
               </Button>
               <Button type="button" variant="destructive" onClick={() => setIsDeleteModalOpen(true)}>
                 <Trash2 />
-                Delete Configuration
+                {t("adminPanel.cyberArk.actions.delete")}
               </Button>
             </CardAction>
           )}
@@ -162,7 +171,7 @@ export default function CyberArk() {
           {isConfigured && (
             <Alert variant="info">
               <Info />
-              <AlertTitle>Configuration changes are hot-reloaded across all proxy instances</AlertTitle>
+              <AlertTitle>{t("adminPanel.cyberArk.hotReloadInfo.title")}</AlertTitle>
               <AlertDescription>
                 <a
                   href="https://docs.litellm.ai/docs/secret_managers/cyberark"
@@ -170,7 +179,7 @@ export default function CyberArk() {
                   rel="noreferrer"
                   className="inline-flex items-center gap-1"
                 >
-                  View documentation
+                  {t("adminPanel.cyberArk.hotReloadInfo.docsLink")}
                   <ExternalLink className="size-3" />
                 </a>
               </AlertDescription>
@@ -180,9 +189,9 @@ export default function CyberArk() {
           {isConfigured ? (
             fieldsToShow.length > 0 && (
               <dl className="divide-y divide-border overflow-hidden rounded-md border border-border">
-                <DetailRow label="Auth Method">{detectAuthMethod(rawValues)}</DetailRow>
+                <DetailRow label={t("adminPanel.cyberArk.authMethodLabel")}>{detectAuthMethod(rawValues, t)}</DetailRow>
                 {fieldsToShow.map(([key]) => (
-                  <DetailRow key={key} label={FIELD_LABELS[key] ?? key}>
+                  <DetailRow key={key} label={(Object.hasOwn(FIELD_LABELS, key) && t(FIELD_LABELS[key])) || key}>
                     {renderValue(key)}
                   </DetailRow>
                 ))}
@@ -207,21 +216,32 @@ export default function CyberArk() {
       />
       <DeleteResourceModal
         isOpen={isDeleteModalOpen}
-        title="Delete CyberArk Configuration?"
-        message="Models using CyberArk secrets will lose access to their API keys until a new configuration is saved."
-        resourceInformationTitle="CyberArk Configuration"
-        resourceInformation={[{ label: "Conjur Server URL", value: rawValues.cyberark_api_base }]}
+        title={t("adminPanel.cyberArk.deleteModal.title")}
+        message={t("adminPanel.cyberArk.deleteModal.message")}
+        resourceInformationTitle={t("adminPanel.cyberArk.deleteModal.resourceTitle")}
+        resourceInformation={[
+          { label: t("adminPanel.cyberArk.deleteModal.serverUrl"), value: rawValues.cyberark_api_base },
+        ]}
         onCancel={() => setIsDeleteModalOpen(false)}
         onOk={handleDelete}
         confirmLoading={isDeleting}
       />
       <DeleteResourceModal
         isOpen={clearingField !== null}
-        title={`Clear ${clearingField ? FIELD_LABELS[clearingField] ?? clearingField : ""}?`}
-        message="This will remove the stored value."
-        resourceInformationTitle="Field"
+        title={t("adminPanel.cyberArk.clearModal.title", {
+          field: clearingField
+            ? (Object.hasOwn(FIELD_LABELS, clearingField) && t(FIELD_LABELS[clearingField])) || clearingField
+            : "",
+        })}
+        message={t("adminPanel.cyberArk.clearModal.message")}
+        resourceInformationTitle={t("adminPanel.cyberArk.clearModal.resourceTitle")}
         resourceInformation={[
-          { label: "Field", value: clearingField ? FIELD_LABELS[clearingField] ?? clearingField : "" },
+          {
+            label: t("adminPanel.cyberArk.clearModal.fieldLabel"),
+            value: clearingField
+              ? (Object.hasOwn(FIELD_LABELS, clearingField) && t(FIELD_LABELS[clearingField])) || clearingField
+              : "",
+          },
         ]}
         onCancel={() => setClearingField(null)}
         onOk={handleClearField}
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArkEmptyPlaceholder.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArkEmptyPlaceholder.tsx
index 513d34d0f65..5f70157ff4b 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArkEmptyPlaceholder.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/CyberArkEmptyPlaceholder.tsx
@@ -1,4 +1,5 @@
 import { KeyRound } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { Button } from "@/components/ui/button";
 
@@ -7,17 +8,18 @@ interface CyberArkEmptyPlaceholderProps {
 }
 
 export default function CyberArkEmptyPlaceholder({ onAdd }: CyberArkEmptyPlaceholderProps) {
+  const { t } = useTranslation();
   return (
     <div className="flex w-full flex-col items-center rounded-lg border border-dashed border-border bg-card p-12 text-center">
       <div className="mb-4 flex size-12 items-center justify-center rounded-full bg-muted">
         <KeyRound className="size-6 text-muted-foreground" />
       </div>
-      <h4 className="text-base font-semibold text-foreground">No CyberArk Configuration Found</h4>
+      <h4 className="text-base font-semibold text-foreground">{t("adminPanel.cyberArk.emptyPlaceholder.title")}</h4>
       <p className="mx-auto mt-2 max-w-md text-sm text-muted-foreground">
-        Configure CyberArk Conjur to securely manage provider API keys and secrets for your LiteLLM deployment.
+        {t("adminPanel.cyberArk.emptyPlaceholder.description")}
       </p>
       <Button size="lg" onClick={onAdd} className="mt-4">
-        Configure CyberArk
+        {t("adminPanel.cyberArk.emptyPlaceholder.configure")}
       </Button>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/EditCyberArkModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/EditCyberArkModal.tsx
index dc88e85b93f..f1c9d1df337 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/EditCyberArkModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/EditCyberArkModal.tsx
@@ -4,7 +4,9 @@ import { useCyberArkConfig } from "@/app/(dashboard)/hooks/configOverrides/useCy
 import { useUpdateCyberArkConfig } from "@/app/(dashboard)/hooks/configOverrides/useUpdateCyberArkConfig";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { toast } from "@/lib/toast";
+import type { ParseKeys } from "i18next";
 import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -14,33 +16,34 @@ import { Input } from "@/components/ui/input";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { Separator } from "@/components/ui/separator";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import i18n from "@/i18n/i18n";
 import { SENSITIVE_FIELDS, FIELD_LABELS } from "./constants";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface CyberArkFieldGroup {
-  title: string;
-  subtitle?: string;
+  title: ParseKeys;
+  subtitle?: ParseKeys;
   fields: string[];
 }
 
 const FIELD_GROUPS: CyberArkFieldGroup[] = [
   {
-    title: "Connection",
+    title: "adminPanel.cyberArk.editModal.groups.connection.title",
     fields: ["cyberark_api_base", "cyberark_account", "cyberark_username"],
   },
   {
-    title: "API Key Authentication",
-    subtitle: "Use a Conjur API key to authenticate. Only one auth method is required.",
+    title: "adminPanel.cyberArk.editModal.groups.apiKey.title",
+    subtitle: "adminPanel.cyberArk.editModal.groups.apiKey.subtitle",
     fields: ["cyberark_api_key"],
   },
   {
-    title: "Certificate Authentication",
-    subtitle: "Use a client TLS certificate and key to authenticate. Only one auth method is required.",
+    title: "adminPanel.cyberArk.editModal.groups.certificate.title",
+    subtitle: "adminPanel.cyberArk.editModal.groups.certificate.subtitle",
     fields: ["client_cert", "client_key"],
   },
   {
-    title: "Advanced",
-    subtitle: "Optional TLS and token caching settings.",
+    title: "adminPanel.cyberArk.editModal.groups.advanced.title",
+    subtitle: "adminPanel.cyberArk.editModal.groups.advanced.subtitle",
     fields: ["ssl_verify", "refresh_interval"],
   },
 ];
@@ -54,7 +57,7 @@ const buildSchema = (fields: readonly string[]): z.ZodType<CyberArkFormValues, C
         name,
         name === "cyberark_api_base"
           ? z.string().refine((value) => value.length === 0 || /^https?:\/\/.+/.test(value), {
-              message: "Must start with http:// or https://",
+              error: () => i18n.t("adminPanel.cyberArk.editModal.errors.invalidUrl"),
             })
           : z.string(),
       ]),
@@ -68,6 +71,7 @@ interface EditCyberArkModalProps {
 }
 
 const EditCyberArkModal: React.FC<EditCyberArkModalProps> = ({ isVisible, onCancel, onSuccess }) => {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data } = useCyberArkConfig();
   const { mutate, isPending } = useUpdateCyberArkConfig(accessToken);
@@ -105,7 +109,7 @@ const EditCyberArkModal: React.FC<EditCyberArkModalProps> = ({ isVisible, onCanc
 
     mutate(config, {
       onSuccess: () => {
-        toast.success("CyberArk configuration updated successfully");
+        toast.success(t("adminPanel.cyberArk.toasts.updated"));
         onSuccess();
       },
       onError: (err) => {
@@ -126,10 +130,17 @@ const EditCyberArkModal: React.FC<EditCyberArkModalProps> = ({ isVisible, onCanc
     const isSensitive = SENSITIVE_FIELDS.has(fieldName);
     const existingValue = rawValues[fieldName];
     const hasExistingValue = isSensitive && existingValue != null && existingValue !== "";
-    const placeholder = hasExistingValue ? `Leave blank to keep existing (${existingValue})` : fieldSchema?.description;
+    const placeholder = hasExistingValue
+      ? t("adminPanel.cyberArk.editModal.keepExistingPlaceholder", { value: existingValue })
+      : fieldSchema?.description;
 
     return (
-      <FormField key={fieldName} control={form.control} name={fieldName} label={FIELD_LABELS[fieldName] ?? fieldName}>
+      <FormField
+        key={fieldName}
+        control={form.control}
+        name={fieldName}
+        label={(Object.hasOwn(FIELD_LABELS, fieldName) && t(FIELD_LABELS[fieldName])) || fieldName}
+      >
         {({ ref, ...field }) =>
           isSensitive ? (
             <PasswordInput ref={ref} placeholder={placeholder} {...field} />
@@ -145,14 +156,14 @@ const EditCyberArkModal: React.FC<EditCyberArkModalProps> = ({ isVisible, onCanc
     <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
         <DialogHeader>
-          <DialogTitle>Edit CyberArk Configuration</DialogTitle>
+          <DialogTitle>{t("adminPanel.cyberArk.editModal.title")}</DialogTitle>
         </DialogHeader>
         <form onSubmit={form.handleSubmit(handleSubmit)}>
           {FIELD_GROUPS.map((group, index) => (
             <div key={group.title}>
               {index > 0 && <Separator className="my-6" />}
-              <h5 className="mb-1 text-base font-semibold text-foreground">{group.title}</h5>
-              {group.subtitle && <p className="mb-4 text-sm text-muted-foreground">{group.subtitle}</p>}
+              <h5 className="mb-1 text-base font-semibold text-foreground">{t(group.title)}</h5>
+              {group.subtitle && <p className="mb-4 text-sm text-muted-foreground">{t(group.subtitle)}</p>}
               <FieldGroup>{group.fields.map(renderField)}</FieldGroup>
             </div>
           ))}
@@ -160,11 +171,11 @@ const EditCyberArkModal: React.FC<EditCyberArkModalProps> = ({ isVisible, onCanc
         <DialogFooter>
           <div className="flex items-center justify-end gap-2">
             <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
-              Cancel
+              {t("adminPanel.cyberArk.editModal.cancel")}
             </Button>
             <Button type="button" disabled={isPending} onClick={() => void form.handleSubmit(handleSubmit)()}>
               {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
-              {isPending ? "Saving..." : "Save"}
+              {isPending ? t("adminPanel.cyberArk.editModal.saving") : t("adminPanel.cyberArk.editModal.save")}
             </Button>
           </div>
         </DialogFooter>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/constants.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/constants.ts
index 5835f93d19a..8490aac0635 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/constants.ts
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/CyberArk/constants.ts
@@ -1,12 +1,14 @@
+import type { ParseKeys } from "i18next";
+
 export const SENSITIVE_FIELDS = new Set(["cyberark_api_key", "client_key"]);
 
-export const FIELD_LABELS: Record<string, string> = {
-  cyberark_api_base: "Conjur Server URL",
-  cyberark_account: "Account",
-  cyberark_username: "Username",
-  cyberark_api_key: "API Key",
-  client_cert: "Client Certificate",
-  client_key: "Client Key",
-  ssl_verify: "SSL Verification",
-  refresh_interval: "Token Refresh Interval (seconds)",
+export const FIELD_LABELS: Record<string, ParseKeys> = {
+  cyberark_api_base: "adminPanel.cyberArk.fields.apiBase",
+  cyberark_account: "adminPanel.cyberArk.fields.account",
+  cyberark_username: "adminPanel.cyberArk.fields.username",
+  cyberark_api_key: "adminPanel.cyberArk.fields.apiKey",
+  client_cert: "adminPanel.cyberArk.fields.clientCert",
+  client_key: "adminPanel.cyberArk.fields.clientKey",
+  ssl_verify: "adminPanel.cyberArk.fields.sslVerify",
+  refresh_interval: "adminPanel.cyberArk.fields.refreshInterval",
 };
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx
index 86fc8ec5e60..77933210957 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx
@@ -4,7 +4,9 @@ import { useHashicorpVaultConfig } from "@/app/(dashboard)/hooks/configOverrides
 import { useUpdateHashicorpVaultConfig } from "@/app/(dashboard)/hooks/configOverrides/useUpdateHashicorpVaultConfig";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { toast } from "@/lib/toast";
+import type { ParseKeys } from "i18next";
 import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -14,18 +16,19 @@ import { Input } from "@/components/ui/input";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { Separator } from "@/components/ui/separator";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import i18n from "@/i18n/i18n";
 import { SENSITIVE_FIELDS, FIELD_LABELS } from "./constants";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface VaultFieldGroup {
-  title: string;
-  subtitle?: string;
+  title: ParseKeys;
+  subtitle?: ParseKeys;
   fields: string[];
 }
 
 const FIELD_GROUPS: VaultFieldGroup[] = [
   {
-    title: "Connection",
+    title: "adminPanel.hashicorpVault.editModal.groups.connection.title",
     fields: [
       "vault_addr",
       "vault_namespace",
@@ -36,18 +39,18 @@ const FIELD_GROUPS: VaultFieldGroup[] = [
     ],
   },
   {
-    title: "Token Authentication",
-    subtitle: "Use a Vault token to authenticate. Only one auth method is required.",
+    title: "adminPanel.hashicorpVault.editModal.groups.token.title",
+    subtitle: "adminPanel.hashicorpVault.editModal.groups.token.subtitle",
     fields: ["vault_token"],
   },
   {
-    title: "AppRole Authentication",
-    subtitle: "Use AppRole credentials to authenticate. Only one auth method is required.",
+    title: "adminPanel.hashicorpVault.editModal.groups.appRole.title",
+    subtitle: "adminPanel.hashicorpVault.editModal.groups.appRole.subtitle",
     fields: ["approle_role_id", "approle_secret_id", "approle_mount_path"],
   },
   {
-    title: "TLS",
-    subtitle: "Optional client certificate for mTLS.",
+    title: "adminPanel.hashicorpVault.editModal.groups.tls.title",
+    subtitle: "adminPanel.hashicorpVault.editModal.groups.tls.subtitle",
     fields: ["client_cert", "client_key", "vault_cert_role"],
   },
 ];
@@ -61,7 +64,7 @@ const buildSchema = (fields: readonly string[]): z.ZodType<VaultFormValues, Vaul
         name,
         name === "vault_addr"
           ? z.string().refine((value) => value.length === 0 || /^https?:\/\/.+/.test(value), {
-              message: "Must start with http:// or https://",
+              error: () => i18n.t("adminPanel.hashicorpVault.editModal.errors.invalidUrl"),
             })
           : z.string(),
       ]),
@@ -75,6 +78,7 @@ interface EditHashicorpVaultModalProps {
 }
 
 const EditHashicorpVaultModal: React.FC<EditHashicorpVaultModalProps> = ({ isVisible, onCancel, onSuccess }) => {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data } = useHashicorpVaultConfig();
   const { mutate, isPending } = useUpdateHashicorpVaultConfig(accessToken);
@@ -112,7 +116,7 @@ const EditHashicorpVaultModal: React.FC<EditHashicorpVaultModalProps> = ({ isVis
 
     mutate(config, {
       onSuccess: () => {
-        toast.success("Hashicorp Vault configuration updated successfully");
+        toast.success(t("adminPanel.hashicorpVault.toasts.updated"));
         onSuccess();
       },
       onError: (err) => {
@@ -133,10 +137,17 @@ const EditHashicorpVaultModal: React.FC<EditHashicorpVaultModalProps> = ({ isVis
     const isSensitive = SENSITIVE_FIELDS.has(fieldName);
     const existingValue = rawValues[fieldName];
     const hasExistingValue = isSensitive && existingValue != null && existingValue !== "";
-    const placeholder = hasExistingValue ? `Leave blank to keep existing (${existingValue})` : fieldSchema?.description;
+    const placeholder = hasExistingValue
+      ? t("adminPanel.hashicorpVault.editModal.keepExistingPlaceholder", { value: existingValue })
+      : fieldSchema?.description;
 
     return (
-      <FormField key={fieldName} control={form.control} name={fieldName} label={FIELD_LABELS[fieldName] ?? fieldName}>
+      <FormField
+        key={fieldName}
+        control={form.control}
+        name={fieldName}
+        label={(Object.hasOwn(FIELD_LABELS, fieldName) && t(FIELD_LABELS[fieldName])) || fieldName}
+      >
         {({ ref, ...field }) =>
           isSensitive ? (
             <PasswordInput ref={ref} placeholder={placeholder} {...field} />
@@ -152,14 +163,14 @@ const EditHashicorpVaultModal: React.FC<EditHashicorpVaultModalProps> = ({ isVis
     <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
         <DialogHeader>
-          <DialogTitle>Edit Hashicorp Vault Configuration</DialogTitle>
+          <DialogTitle>{t("adminPanel.hashicorpVault.editModal.title")}</DialogTitle>
         </DialogHeader>
         <form onSubmit={form.handleSubmit(handleSubmit)}>
           {FIELD_GROUPS.map((group, index) => (
             <div key={group.title}>
               {index > 0 && <Separator className="my-6" />}
-              <h5 className="mb-1 text-base font-semibold text-foreground">{group.title}</h5>
-              {group.subtitle && <p className="mb-4 text-sm text-muted-foreground">{group.subtitle}</p>}
+              <h5 className="mb-1 text-base font-semibold text-foreground">{t(group.title)}</h5>
+              {group.subtitle && <p className="mb-4 text-sm text-muted-foreground">{t(group.subtitle)}</p>}
               <FieldGroup>{group.fields.map(renderField)}</FieldGroup>
             </div>
           ))}
@@ -167,11 +178,13 @@ const EditHashicorpVaultModal: React.FC<EditHashicorpVaultModalProps> = ({ isVis
         <DialogFooter>
           <div className="flex items-center justify-end gap-2">
             <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
-              Cancel
+              {t("adminPanel.hashicorpVault.editModal.cancel")}
             </Button>
             <Button type="button" disabled={isPending} onClick={() => void form.handleSubmit(handleSubmit)()}>
               {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
-              {isPending ? "Saving..." : "Save"}
+              {isPending
+                ? t("adminPanel.hashicorpVault.editModal.saving")
+                : t("adminPanel.hashicorpVault.editModal.save")}
             </Button>
           </div>
         </DialogFooter>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVault.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVault.tsx
index 187ece0213b..5d23be5b967 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVault.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVault.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { Edit, ExternalLink, Info, KeyRound, PlugZap, Trash2 } from "lucide-react";
+import type { TFunction } from "i18next";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { testHashicorpVaultConnection } from "@/app/(dashboard)/hooks/configOverrides/hashicorpVaultApi";
 import { useDeleteHashicorpVaultConfig } from "@/app/(dashboard)/hooks/configOverrides/useDeleteHashicorpVaultConfig";
@@ -19,11 +21,11 @@ import EditHashicorpVaultModal from "./EditHashicorpVaultModal";
 import HashicorpVaultEmptyPlaceholder from "./HashicorpVaultEmptyPlaceholder";
 import { FIELD_LABELS, SENSITIVE_FIELDS } from "./constants";
 
-function detectAuthMethod(values: Record<string, unknown>): string {
+function detectAuthMethod(values: Record<string, unknown>, t: TFunction): string {
   if (values.approle_role_id || values.approle_secret_id) return "AppRole";
-  if (values.client_cert && values.client_key) return "TLS Certificate";
-  if (values.vault_token) return "Token";
-  return "None";
+  if (values.client_cert && values.client_key) return t("adminPanel.hashicorpVault.authMethods.tlsCertificate");
+  if (values.vault_token) return t("adminPanel.hashicorpVault.authMethods.token");
+  return t("adminPanel.hashicorpVault.authMethods.none");
 }
 
 function DetailRow({ children, label }: { children: React.ReactNode; label: string }) {
@@ -36,6 +38,7 @@ function DetailRow({ children, label }: { children: React.ReactNode; label: stri
 }
 
 export default function HashicorpVault() {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data, isLoading, isError, error } = useHashicorpVaultConfig();
   const { mutate: deleteConfig, isPending: isDeleting } = useDeleteHashicorpVaultConfig(accessToken);
@@ -52,7 +55,7 @@ export default function HashicorpVault() {
     setIsTesting(true);
     try {
       const result = await testHashicorpVaultConnection(accessToken);
-      toast.success(result.message || "Connection to Vault successful!");
+      toast.success(result.message || t("adminPanel.hashicorpVault.toasts.connectionSuccess"));
     } catch (err) {
       toast.fromError(err);
     } finally {
@@ -63,7 +66,7 @@ export default function HashicorpVault() {
   const handleDelete = () => {
     deleteConfig(undefined, {
       onSuccess: () => {
-        toast.success("Hashicorp Vault configuration deleted");
+        toast.success(t("adminPanel.hashicorpVault.toasts.deleted"));
         setIsDeleteModalOpen(false);
       },
       onError: (err) => toast.fromError(err),
@@ -76,7 +79,11 @@ export default function HashicorpVault() {
       { [clearingField]: "" },
       {
         onSuccess: () => {
-          toast.success(`${FIELD_LABELS[clearingField] ?? clearingField} cleared`);
+          toast.success(
+            t("adminPanel.hashicorpVault.toasts.fieldCleared", {
+              field: (Object.hasOwn(FIELD_LABELS, clearingField) && t(FIELD_LABELS[clearingField])) || clearingField,
+            }),
+          );
           setClearingField(null);
         },
         onError: (err) => toast.fromError(err),
@@ -86,7 +93,8 @@ export default function HashicorpVault() {
 
   const renderValue = (key: string) => {
     const value = rawValues[key];
-    if (!value) return <span className="text-muted-foreground italic">Not configured</span>;
+    if (!value)
+      return <span className="text-muted-foreground italic">{t("adminPanel.hashicorpVault.notConfigured")}</span>;
     if (!SENSITIVE_FIELDS.has(key)) return <span className="font-mono text-muted-foreground">{value}</span>;
 
     return (
@@ -96,7 +104,9 @@ export default function HashicorpVault() {
           type="button"
           variant="ghost"
           size="icon-sm"
-          aria-label={`Clear ${FIELD_LABELS[key] ?? key}`}
+          aria-label={t("adminPanel.hashicorpVault.actions.clearField", {
+            field: (Object.hasOwn(FIELD_LABELS, key) && t(FIELD_LABELS[key])) || key,
+          })}
           onClick={() => setClearingField(key)}
         >
           <Trash2 className="size-3.5" />
@@ -110,7 +120,7 @@ export default function HashicorpVault() {
   return (
     <>
       {isLoading ? (
-        <Card role="status" aria-label="Loading Hashicorp Vault configuration">
+        <Card role="status" aria-label={t("adminPanel.hashicorpVault.loadingAriaLabel")}>
           <CardContent className="space-y-3">
             <Skeleton className="h-8 w-64" />
             <Skeleton className="h-40 w-full" />
@@ -120,7 +130,7 @@ export default function HashicorpVault() {
         <Card>
           <CardContent>
             <Alert variant="error">
-              <AlertTitle>Could not load Hashicorp Vault configuration</AlertTitle>
+              <AlertTitle>{t("adminPanel.hashicorpVault.errors.loadFailed")}</AlertTitle>
               {error instanceof Error && <AlertDescription>{error.message}</AlertDescription>}
             </Alert>
           </CardContent>
@@ -134,22 +144,24 @@ export default function HashicorpVault() {
                 <CardTitle>
                   <h3>Hashicorp Vault</h3>
                 </CardTitle>
-                <CardDescription>Manage secret manager configuration</CardDescription>
+                <CardDescription>{t("adminPanel.hashicorpVault.description")}</CardDescription>
               </div>
             </div>
             {isConfigured && (
               <CardAction className="flex flex-wrap gap-2">
                 <Button type="button" variant="outline" disabled={isTesting} onClick={handleTestConnection}>
                   <PlugZap />
-                  {isTesting ? "Testing..." : "Test Connection"}
+                  {isTesting
+                    ? t("adminPanel.hashicorpVault.actions.testing")
+                    : t("adminPanel.hashicorpVault.actions.testConnection")}
                 </Button>
                 <Button type="button" variant="outline" onClick={() => setIsEditModalVisible(true)}>
                   <Edit />
-                  Edit Configuration
+                  {t("adminPanel.hashicorpVault.actions.edit")}
                 </Button>
                 <Button type="button" variant="destructive" onClick={() => setIsDeleteModalOpen(true)}>
                   <Trash2 />
-                  Delete Configuration
+                  {t("adminPanel.hashicorpVault.actions.delete")}
                 </Button>
               </CardAction>
             )}
@@ -158,7 +170,7 @@ export default function HashicorpVault() {
             {isConfigured && (
               <Alert variant="info">
                 <Info />
-                <AlertTitle>Secrets must be stored with the field name &quot;key&quot;</AlertTitle>
+                <AlertTitle>{t("adminPanel.hashicorpVault.secretsInfo.title")}</AlertTitle>
                 <AlertDescription>
                   <code className="block font-mono">vault kv put secret/SECRET_NAME key=secret_value</code>
                   <a
@@ -167,7 +179,7 @@ export default function HashicorpVault() {
                     rel="noreferrer"
                     className="inline-flex items-center gap-1"
                   >
-                    View documentation
+                    {t("adminPanel.hashicorpVault.secretsInfo.docsLink")}
                     <ExternalLink className="size-3" />
                   </a>
                 </AlertDescription>
@@ -177,9 +189,11 @@ export default function HashicorpVault() {
             {isConfigured ? (
               fieldsToShow.length > 0 && (
                 <dl className="divide-y divide-border overflow-hidden rounded-md border border-border">
-                  <DetailRow label="Auth Method">{detectAuthMethod(rawValues)}</DetailRow>
+                  <DetailRow label={t("adminPanel.hashicorpVault.authMethodLabel")}>
+                    {detectAuthMethod(rawValues, t)}
+                  </DetailRow>
                   {fieldsToShow.map(([key]) => (
-                    <DetailRow key={key} label={FIELD_LABELS[key] ?? key}>
+                    <DetailRow key={key} label={(Object.hasOwn(FIELD_LABELS, key) && t(FIELD_LABELS[key])) || key}>
                       {renderValue(key)}
                     </DetailRow>
                   ))}
@@ -199,21 +213,32 @@ export default function HashicorpVault() {
       />
       <DeleteResourceModal
         isOpen={isDeleteModalOpen}
-        title="Delete Hashicorp Vault Configuration?"
-        message="Models using Vault secrets will lose access to their API keys until a new configuration is saved."
-        resourceInformationTitle="Vault Configuration"
-        resourceInformation={[{ label: "Vault Address", value: rawValues.vault_addr }]}
+        title={t("adminPanel.hashicorpVault.deleteModal.title")}
+        message={t("adminPanel.hashicorpVault.deleteModal.message")}
+        resourceInformationTitle={t("adminPanel.hashicorpVault.deleteModal.resourceTitle")}
+        resourceInformation={[
+          { label: t("adminPanel.hashicorpVault.deleteModal.vaultAddress"), value: rawValues.vault_addr },
+        ]}
         onCancel={() => setIsDeleteModalOpen(false)}
         onOk={handleDelete}
         confirmLoading={isDeleting}
       />
       <DeleteResourceModal
         isOpen={clearingField !== null}
-        title={`Clear ${clearingField ? FIELD_LABELS[clearingField] ?? clearingField : ""}?`}
-        message="This will remove the stored value."
-        resourceInformationTitle="Field"
+        title={t("adminPanel.hashicorpVault.clearModal.title", {
+          field: clearingField
+            ? (Object.hasOwn(FIELD_LABELS, clearingField) && t(FIELD_LABELS[clearingField])) || clearingField
+            : "",
+        })}
+        message={t("adminPanel.hashicorpVault.clearModal.message")}
+        resourceInformationTitle={t("adminPanel.hashicorpVault.clearModal.resourceTitle")}
         resourceInformation={[
-          { label: "Field", value: clearingField ? FIELD_LABELS[clearingField] ?? clearingField : "" },
+          {
+            label: t("adminPanel.hashicorpVault.clearModal.fieldLabel"),
+            value: clearingField
+              ? (Object.hasOwn(FIELD_LABELS, clearingField) && t(FIELD_LABELS[clearingField])) || clearingField
+              : "",
+          },
         ]}
         onCancel={() => setClearingField(null)}
         onOk={handleClearField}
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVaultEmptyPlaceholder.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVaultEmptyPlaceholder.tsx
index 4842a5fbaf2..0a69364d86d 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVaultEmptyPlaceholder.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/HashicorpVaultEmptyPlaceholder.tsx
@@ -1,4 +1,5 @@
 import { KeyRound } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { Button } from "@/components/ui/button";
 
@@ -7,17 +8,20 @@ interface HashicorpVaultEmptyPlaceholderProps {
 }
 
 export default function HashicorpVaultEmptyPlaceholder({ onAdd }: HashicorpVaultEmptyPlaceholderProps) {
+  const { t } = useTranslation();
   return (
     <div className="flex w-full flex-col items-center rounded-lg border border-dashed border-border bg-card p-12 text-center">
       <div className="mb-4 flex size-12 items-center justify-center rounded-full bg-muted">
         <KeyRound className="size-6 text-muted-foreground" />
       </div>
-      <h4 className="text-base font-semibold text-foreground">No Vault Configuration Found</h4>
+      <h4 className="text-base font-semibold text-foreground">
+        {t("adminPanel.hashicorpVault.emptyPlaceholder.title")}
+      </h4>
       <p className="mx-auto mt-2 max-w-md text-sm text-muted-foreground">
-        Configure Hashicorp Vault to securely manage provider API keys and secrets for your LiteLLM deployment.
+        {t("adminPanel.hashicorpVault.emptyPlaceholder.description")}
       </p>
       <Button size="lg" onClick={onAdd} className="mt-4">
-        Configure Vault
+        {t("adminPanel.hashicorpVault.emptyPlaceholder.configure")}
       </Button>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/constants.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/constants.ts
index 923a942f109..f9766ca33b6 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/constants.ts
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/constants.ts
@@ -1,17 +1,19 @@
+import type { ParseKeys } from "i18next";
+
 export const SENSITIVE_FIELDS = new Set(["vault_token", "approle_secret_id", "client_key"]);
 
-export const FIELD_LABELS: Record<string, string> = {
-  vault_addr: "Vault Address",
-  vault_namespace: "Namespace",
-  vault_login_namespace: "Login Namespace",
-  vault_secret_namespace: "Secret Namespace",
-  vault_mount_name: "KV Mount Name",
-  vault_path_prefix: "Path Prefix",
-  vault_token: "Token",
-  approle_role_id: "Role ID",
-  approle_secret_id: "Secret ID",
-  approle_mount_path: "Mount Path",
-  client_cert: "Client Certificate",
-  client_key: "Client Key",
-  vault_cert_role: "Certificate Role",
+export const FIELD_LABELS: Record<string, ParseKeys> = {
+  vault_addr: "adminPanel.hashicorpVault.fields.vaultAddr",
+  vault_namespace: "adminPanel.hashicorpVault.fields.vaultNamespace",
+  vault_login_namespace: "adminPanel.hashicorpVault.fields.vaultLoginNamespace",
+  vault_secret_namespace: "adminPanel.hashicorpVault.fields.vaultSecretNamespace",
+  vault_mount_name: "adminPanel.hashicorpVault.fields.vaultMountName",
+  vault_path_prefix: "adminPanel.hashicorpVault.fields.vaultPathPrefix",
+  vault_token: "adminPanel.hashicorpVault.fields.vaultToken",
+  approle_role_id: "adminPanel.hashicorpVault.fields.approleRoleId",
+  approle_secret_id: "adminPanel.hashicorpVault.fields.approleSecretId",
+  approle_mount_path: "adminPanel.hashicorpVault.fields.approleMountPath",
+  client_cert: "adminPanel.hashicorpVault.fields.clientCert",
+  client_key: "adminPanel.hashicorpVault.fields.clientKey",
+  vault_cert_role: "adminPanel.hashicorpVault.fields.vaultCertRole",
 };
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx
index 3ec18a537c9..e75303b981e 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx
@@ -23,58 +23,56 @@ import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { CircleHelp, Clock } from "lucide-react";
+import type { ParseKeys } from "i18next";
 import React, { useCallback, useMemo } from "react";
 import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 
 const STORE_PROMPTS_FIELD_NAME = "store_prompts_in_spend_logs";
 
 interface OptionalField {
   readonly name: GeneralSettingsFieldName;
   readonly kind: "duration" | "count";
-  readonly label: string;
-  readonly placeholder: string;
-  readonly fallbackTooltip: string;
+  readonly label: ParseKeys;
+  readonly placeholder: ParseKeys;
+  readonly fallbackTooltip: ParseKeys;
 }
 
 const OPTIONAL_FIELDS: readonly OptionalField[] = [
   {
     name: GeneralSettingsFieldName.MAXIMUM_SPEND_LOGS_RETENTION_PERIOD,
     kind: "duration",
-    label: "Maximum Spend Logs Retention Period (Optional)",
-    placeholder: "e.g., 7d, 30d",
-    fallbackTooltip:
-      "Set the maximum retention period for spend logs (e.g., '7d' for 7 days, '30d' for 30 days). Leave empty for no limit.",
+    label: "adminPanel.loggingSettings.fields.retentionPeriod.label",
+    placeholder: "adminPanel.loggingSettings.fields.retentionPeriod.placeholder",
+    fallbackTooltip: "adminPanel.loggingSettings.fields.retentionPeriod.hint",
   },
   {
     name: GeneralSettingsFieldName.MAXIMUM_SPEND_LOGS_CLEANUP_BATCH_SIZE,
     kind: "count",
-    label: "Spend Logs Cleanup Batch Size (Optional)",
-    placeholder: "e.g., 1000",
-    fallbackTooltip: "Rows deleted per DELETE statement during cleanup. Leave empty to use the default of 1000.",
+    label: "adminPanel.loggingSettings.fields.cleanupBatchSize.label",
+    placeholder: "adminPanel.loggingSettings.fields.cleanupBatchSize.placeholder",
+    fallbackTooltip: "adminPanel.loggingSettings.fields.cleanupBatchSize.hint",
   },
   {
     name: GeneralSettingsFieldName.MAXIMUM_SPEND_LOGS_CLEANUP_MAX_BATCHES,
     kind: "count",
-    label: "Spend Logs Cleanup Max Batches (Optional)",
-    placeholder: "e.g., 500",
-    fallbackTooltip:
-      "Maximum number of DELETE statements run per table per cleanup run. Leave empty to use the default of 500.",
+    label: "adminPanel.loggingSettings.fields.cleanupMaxBatches.label",
+    placeholder: "adminPanel.loggingSettings.fields.cleanupMaxBatches.placeholder",
+    fallbackTooltip: "adminPanel.loggingSettings.fields.cleanupMaxBatches.hint",
   },
   {
     name: GeneralSettingsFieldName.MAXIMUM_SPEND_LOGS_CLEANUP_RUN_BUDGET,
     kind: "duration",
-    label: "Spend Logs Cleanup Run Budget (Optional)",
-    placeholder: "e.g., 5m",
-    fallbackTooltip:
-      "Wall-clock budget for a whole cleanup run, shared across every table it cleans (e.g., '5m'). Leave empty to use the default of 5m.",
+    label: "adminPanel.loggingSettings.fields.cleanupRunBudget.label",
+    placeholder: "adminPanel.loggingSettings.fields.cleanupRunBudget.placeholder",
+    fallbackTooltip: "adminPanel.loggingSettings.fields.cleanupRunBudget.hint",
   },
   {
     name: GeneralSettingsFieldName.MAXIMUM_SPEND_LOGS_CLEANUP_BATCH_TIMEOUT,
     kind: "duration",
-    label: "Spend Logs Cleanup Batch Timeout (Optional)",
-    placeholder: "e.g., 30s",
-    fallbackTooltip:
-      "Postgres statement and lock timeout applied to each cleanup batch, so cleanup never monopolizes a connection (e.g., '30s'). Leave empty to use the default of 30s.",
+    label: "adminPanel.loggingSettings.fields.cleanupBatchTimeout.label",
+    placeholder: "adminPanel.loggingSettings.fields.cleanupBatchTimeout.placeholder",
+    fallbackTooltip: "adminPanel.loggingSettings.fields.cleanupBatchTimeout.hint",
   },
 ];
 
@@ -158,6 +156,7 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
   isSaving,
   onSubmit,
 }) => {
+  const { t } = useTranslation();
   const form = useForm<LoggingSettingsFormValues>({ defaultValues: initialValues });
 
   return (
@@ -168,11 +167,8 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
             control={form.control}
             name={STORE_PROMPTS_FIELD_NAME}
             label={labelWithHint(
-              "Store Prompts in Spend Logs",
-              describeField(
-                STORE_PROMPTS_FIELD_NAME,
-                "When enabled, prompts will be stored in spend logs for tracking and analysis purposes.",
-              ),
+              t("adminPanel.loggingSettings.fields.storePrompts.label"),
+              describeField(STORE_PROMPTS_FIELD_NAME, t("adminPanel.loggingSettings.fields.storePrompts.hint")),
             )}
           >
             {({ id, value, onChange, onBlur }) => (
@@ -185,7 +181,7 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
               key={field.name}
               control={form.control}
               name={field.name}
-              label={labelWithHint(field.label, describeField(field.name, field.fallbackTooltip))}
+              label={labelWithHint(t(field.label), describeField(field.name, t(field.fallbackTooltip)))}
             >
               {({ ref, onChange, onBlur, ...control }) =>
                 field.kind === "duration" ? (
@@ -195,7 +191,7 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
                       ref={ref}
                       onChange={(event) => onChange(event.target.value)}
                       onBlur={onBlur}
-                      placeholder={field.placeholder}
+                      placeholder={t(field.placeholder)}
                     />
                     <InputGroupAddon>
                       <Clock />
@@ -211,7 +207,7 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
                       onChange(countDisplay(event.target.value));
                       onBlur();
                     }}
-                    placeholder={field.placeholder}
+                    placeholder={t(field.placeholder)}
                   />
                 )
               }
@@ -220,8 +216,14 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
         </FieldGroup>
 
         <Button type="submit" className="mt-6" disabled={isSaving}>
-          {isSaving && <UiLoadingSpinner role="img" aria-label="loading" className="size-4" />}
-          {isSaving ? "Saving..." : "Save Settings"}
+          {isSaving && (
+            <UiLoadingSpinner
+              role="img"
+              aria-label={t("adminPanel.loggingSettings.savingAriaLabel")}
+              className="size-4"
+            />
+          )}
+          {isSaving ? t("adminPanel.loggingSettings.saving") : t("adminPanel.loggingSettings.save")}
         </Button>
       </form>
     </TooltipProvider>
@@ -229,6 +231,7 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
 };
 
 const LoggingSettings: React.FC = () => {
+  const { t } = useTranslation();
   const { mutate, isPending } = useStoreRequestInSpendLogs();
   const { mutate: deleteField, isPending: isDeletingField } = useDeleteProxyConfigField();
   const { data: proxyConfigData, isLoading: isLoadingConfig } = useProxyConfig(ConfigType.GENERAL_SETTINGS);
@@ -295,8 +298,9 @@ const LoggingSettings: React.FC = () => {
     const updateParams = buildUpdateParams(formValues);
     const submitUpdate = () =>
       mutate(updateParams, {
-        onSuccess: () => toast.success("Spend logs settings updated successfully"),
-        onError: (error) => toast.fromError("Failed to save spend logs settings: " + parseErrorMessage(error)),
+        onSuccess: () => toast.success(t("adminPanel.loggingSettings.toasts.updated")),
+        onError: (error) =>
+          toast.fromError(t("adminPanel.loggingSettings.toasts.saveFailed", { error: parseErrorMessage(error) })),
       });
 
     const fieldsToClear = omittedFieldNames(updateParams, isStored);
@@ -309,7 +313,7 @@ const LoggingSettings: React.FC = () => {
       if (failed.length > 0) {
         // Reporting an unqualified success here would tell the admin a setting
         // was reset to its default while the old value is still in force.
-        toast.fromError(`Failed to clear saved value for: ${failed.join(", ")}`);
+        toast.fromError(t("adminPanel.loggingSettings.toasts.clearFailed", { fields: failed.join(", ") }));
         return;
       }
       submitUpdate();
@@ -319,13 +323,11 @@ const LoggingSettings: React.FC = () => {
   return (
     <Card>
       <CardHeader className="border-b">
-        <CardTitle>Logging Settings</CardTitle>
+        <CardTitle>{t("adminPanel.loggingSettings.title")}</CardTitle>
       </CardHeader>
       <CardContent>
         <div className="flex w-full flex-col gap-6">
-          <p className="mb-0 text-muted-foreground">
-            Proxy-wide settings that control how request and response data are written to spend logs.
-          </p>
+          <p className="mb-0 text-muted-foreground">{t("adminPanel.loggingSettings.description")}</p>
 
           {isLoadingConfig ? (
             <div className="flex flex-col gap-3">
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx
index f78790dea88..6ac54f427ce 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx
@@ -8,6 +8,7 @@ import { CircleCheck, CircleHelp, Info, Save, X } from "lucide-react";
 import { Alert, AlertAction, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
 import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -81,6 +82,7 @@ const parseTopK = (raw: string, rawAsNumber: number): number | null =>
   raw === "" || Number.isNaN(rawAsNumber) ? null : rawAsNumber;
 
 const SaveSuccessAlert = () => {
+  const { t } = useTranslation();
   const [dismissed, setDismissed] = useState(false);
 
   if (dismissed) {
@@ -90,9 +92,14 @@ const SaveSuccessAlert = () => {
   return (
     <Alert variant="success" className="mb-4">
       <CircleCheck />
-      <AlertTitle>Settings saved successfully</AlertTitle>
+      <AlertTitle>{t("mcpServers.semanticFilterSettings.saveSuccess.title")}</AlertTitle>
       <AlertAction>
-        <Button variant="ghost" size="icon-sm" aria-label="Close" onClick={() => setDismissed(true)}>
+        <Button
+          variant="ghost"
+          size="icon-sm"
+          aria-label={t("mcpServers.semanticFilterSettings.saveSuccess.close")}
+          onClick={() => setDismissed(true)}
+        >
           <X className="size-4" />
         </Button>
       </AlertAction>
@@ -101,6 +108,7 @@ const SaveSuccessAlert = () => {
 };
 
 export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFilterSettingsProps) {
+  const { t } = useTranslation();
   const { data, isLoading, isError, error } = useMCPSemanticFilterSettings();
   const {
     mutate: updateSettings,
@@ -164,7 +172,7 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
         setIsDirty(false);
         setSaveSuccess(true);
         setTimeout(() => setSaveSuccess(false), 3000);
-        toast.success("Settings updated successfully. Changes will be applied across all pods within 10 seconds.");
+        toast.success(t("mcpServers.semanticFilterSettings.toasts.updated"));
       },
       onError: (error) => {
         toast.fromError(error);
@@ -177,19 +185,24 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
       return;
     }
 
-    await runSemanticFilterTest({
-      accessToken,
-      testModel,
-      testQuery,
-      setIsTesting,
-      setTestResult,
-      setTestError,
-    });
+    await runSemanticFilterTest(
+      {
+        accessToken,
+        testModel,
+        testQuery,
+        setIsTesting,
+        setTestResult,
+        setTestError,
+      },
+      t,
+    );
   };
 
   if (!accessToken) {
     return (
-      <div className="p-6 text-center text-muted-foreground">Please log in to configure semantic filter settings.</div>
+      <div className="p-6 text-center text-muted-foreground">
+        {t("mcpServers.semanticFilterSettings.loginRequired")}
+      </div>
     );
   }
 
@@ -204,26 +217,22 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
         </div>
       ) : isError ? (
         <Alert variant="error" className="mb-6">
-          <AlertTitle>Could not load MCP Semantic Filter settings</AlertTitle>
+          <AlertTitle>{t("mcpServers.semanticFilterSettings.loadError.title")}</AlertTitle>
           {error instanceof Error && <AlertDescription>{error.message}</AlertDescription>}
         </Alert>
       ) : (
         <>
           <Alert variant="info" className="mb-6">
             <Info />
-            <AlertTitle>Semantic Tool Filtering</AlertTitle>
-            <AlertDescription>
-              Filter MCP tools semantically based on query relevance. This reduces context window size and improves tool
-              selection accuracy. Click &apos;Save Settings&apos; to apply changes across all pods (takes effect within
-              10 seconds).
-            </AlertDescription>
+            <AlertTitle>{t("mcpServers.semanticFilterSettings.intro.title")}</AlertTitle>
+            <AlertDescription>{t("mcpServers.semanticFilterSettings.intro.description")}</AlertDescription>
           </Alert>
 
           {saveSuccess && <SaveSuccessAlert />}
 
           {updateError && (
             <Alert variant="error" className="mb-4">
-              <AlertTitle>Could not update settings</AlertTitle>
+              <AlertTitle>{t("mcpServers.semanticFilterSettings.updateError.title")}</AlertTitle>
               {updateError instanceof Error && <AlertDescription>{updateError.message}</AlertDescription>}
             </Alert>
           )}
@@ -240,8 +249,8 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                           control={form.control}
                           name="enabled"
                           label={labelWithHint(
-                            "Enable Semantic Filtering",
-                            "When enabled, only the most relevant MCP tools will be included in requests based on semantic similarity",
+                            t("mcpServers.semanticFilterSettings.fields.enabled.label"),
+                            t("mcpServers.semanticFilterSettings.fields.enabled.hint"),
                           )}
                           description={schema?.properties?.enabled?.description}
                         >
@@ -261,7 +270,7 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
 
                   <Card className="mb-4">
                     <CardHeader className="border-b">
-                      <CardTitle>Configuration</CardTitle>
+                      <CardTitle>{t("mcpServers.semanticFilterSettings.configuration.title")}</CardTitle>
                     </CardHeader>
                     <CardContent>
                       <FieldGroup>
@@ -269,8 +278,8 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                           control={form.control}
                           name="embedding_model"
                           label={labelWithHint(
-                            "Embedding Model",
-                            "The model used to generate embeddings for semantic matching",
+                            t("mcpServers.semanticFilterSettings.fields.embeddingModel.label"),
+                            t("mcpServers.semanticFilterSettings.fields.embeddingModel.hint"),
                           )}
                         >
                           {({ value, onChange, id }) => (
@@ -283,8 +292,16 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                               value={value}
                               onValueChange={(selected) => commitChange(onChange, selected)}
                               allowClear={false}
-                              placeholder={loadingModels ? "Loading models..." : "Select embedding model"}
-                              emptyText={loadingModels ? "Loading..." : "No embedding models available"}
+                              placeholder={
+                                loadingModels
+                                  ? t("mcpServers.semanticFilterSettings.fields.embeddingModel.loadingPlaceholder")
+                                  : t("mcpServers.semanticFilterSettings.fields.embeddingModel.placeholder")
+                              }
+                              emptyText={
+                                loadingModels
+                                  ? t("mcpServers.semanticFilterSettings.fields.embeddingModel.loadingEmpty")
+                                  : t("mcpServers.semanticFilterSettings.fields.embeddingModel.empty")
+                              }
                               disabled={isUpdating || loadingModels}
                             />
                           )}
@@ -293,7 +310,10 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                         <FormField
                           control={form.control}
                           name="top_k"
-                          label={labelWithHint("Top K Results", "Maximum number of tools to return after filtering")}
+                          label={labelWithHint(
+                            t("mcpServers.semanticFilterSettings.fields.topK.label"),
+                            t("mcpServers.semanticFilterSettings.fields.topK.hint"),
+                          )}
                         >
                           {({ ref, value, onChange, onBlur, id }) => (
                             <Input
@@ -319,8 +339,8 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                           control={form.control}
                           name="similarity_threshold"
                           label={labelWithHint(
-                            "Similarity Threshold",
-                            "Minimum similarity score (0-1) for a tool to be included",
+                            t("mcpServers.semanticFilterSettings.fields.similarityThreshold.label"),
+                            t("mcpServers.semanticFilterSettings.fields.similarityThreshold.hint"),
                           )}
                         >
                           {({ value, onChange, id }) => (
@@ -359,7 +379,7 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                       disabled={!isDirty || isUpdating}
                     >
                       {isUpdating ? <UiLoadingSpinner className="size-4" /> : <Save />}
-                      Save Settings
+                      {t("mcpServers.semanticFilterSettings.save")}
                     </Button>
                   </div>
                 </form>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterTestPanel.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterTestPanel.tsx
index 82c699d9983..649ca17ad27 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterTestPanel.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterTestPanel.tsx
@@ -1,4 +1,5 @@
 import { Code, CircleAlert, CirclePlay, Info } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
@@ -34,22 +35,23 @@ export default function MCPSemanticFilterTestPanel({
   testError,
   curlCommand,
 }: MCPSemanticFilterTestPanelProps) {
+  const { t } = useTranslation();
   const canRunTest = testQuery && testModel && filterEnabled;
   const testDisabled = isTesting || !canRunTest;
 
   return (
     <Card className="mb-4">
       <CardHeader>
-        <CardTitle>Test Configuration</CardTitle>
+        <CardTitle>{t("mcpServers.semanticFilterTestPanel.title")}</CardTitle>
       </CardHeader>
       <CardContent>
         <Tabs defaultValue="test">
           <TabsList>
             <TabsTrigger value="test" className="flex-none">
-              Test
+              {t("mcpServers.semanticFilterTestPanel.tabs.test")}
             </TabsTrigger>
             <TabsTrigger value="api" className="flex-none">
-              API Usage
+              {t("mcpServers.semanticFilterTestPanel.tabs.api")}
             </TabsTrigger>
           </TabsList>
 
@@ -57,11 +59,11 @@ export default function MCPSemanticFilterTestPanel({
             <div className="flex w-full flex-col gap-6">
               <div>
                 <p className="mb-2 flex items-center gap-1.5 font-medium">
-                  <CirclePlay className="size-4" /> Test Query
+                  <CirclePlay className="size-4" /> {t("mcpServers.semanticFilterTestPanel.testQuery.label")}
                 </p>
                 <Textarea
                   className="field-sizing-fixed"
-                  placeholder="Enter a test query to see which tools would be selected..."
+                  placeholder={t("mcpServers.semanticFilterTestPanel.testQuery.placeholder")}
                   value={testQuery}
                   onChange={(e) => setTestQuery(e.target.value)}
                   rows={4}
@@ -76,45 +78,56 @@ export default function MCPSemanticFilterTestPanel({
                   onChange={setTestModel}
                   disabled={isTesting}
                   showLabel={true}
-                  labelText="Select Model"
+                  labelText={t("mcpServers.semanticFilterTestPanel.modelLabel")}
                 />
               </div>
 
               <Button className="w-full" onClick={onTest} disabled={testDisabled}>
                 <CirclePlay />
-                Test Filter
+                {t("mcpServers.semanticFilterTestPanel.runButton")}
               </Button>
 
               {!filterEnabled && (
                 <Alert>
                   <Info />
-                  <AlertTitle>Semantic filtering is disabled</AlertTitle>
-                  <AlertDescription>Enable semantic filtering and save settings to test the filter.</AlertDescription>
+                  <AlertTitle>{t("mcpServers.semanticFilterTestPanel.disabledAlert.title")}</AlertTitle>
+                  <AlertDescription>
+                    {t("mcpServers.semanticFilterTestPanel.disabledAlert.description")}
+                  </AlertDescription>
                 </Alert>
               )}
 
               {testError && (
                 <Alert variant="destructive" className="mb-4">
                   <CircleAlert />
-                  <AlertTitle>Semantic filtering did not run</AlertTitle>
+                  <AlertTitle>{t("mcpServers.semanticFilterTestPanel.errorAlert.title")}</AlertTitle>
                   <AlertDescription>{testError}</AlertDescription>
                 </Alert>
               )}
 
               {testResult && (
                 <div>
-                  <h5 className="mb-2 text-base font-medium">Results</h5>
+                  <h5 className="mb-2 text-base font-medium">
+                    {t("mcpServers.semanticFilterTestPanel.results.title")}
+                  </h5>
                   <Alert className="mb-4">
                     <Info />
                     <AlertTitle>
-                      {testResult.selectedTools} of {testResult.totalTools} tools selected
+                      {t("mcpServers.semanticFilterTestPanel.results.summary", {
+                        selected: testResult.selectedTools,
+                        total: testResult.totalTools,
+                      })}
                     </AlertTitle>
                     <AlertDescription>
-                      {testResult.totalTools - testResult.selectedTools} tools filtered out
+                      {t("mcpServers.semanticFilterTestPanel.results.filteredOut", {
+                        filtered: testResult.totalTools - testResult.selectedTools,
+                      })}
                     </AlertDescription>
                   </Alert>
                   <div>
-                    <p className="mb-2 block font-medium">Selected Tools:</p>
+                    <p className="mb-2 block font-medium">
+                      {t("mcpServers.semanticFilterTestPanel.results.selectedToolsLabel")}
+                    </p>
                     <ul className="m-0 list-disc pl-5">
                       {testResult.tools.map((tool, index) => (
                         <li key={index} className="mb-1">
@@ -124,7 +137,9 @@ export default function MCPSemanticFilterTestPanel({
                     </ul>
                     {testResult.selectedTools > testResult.tools.length && (
                       <p className="mt-2 block text-sm text-muted-foreground">
-                        +{testResult.selectedTools - testResult.tools.length} more selected tools not shown
+                        {t("mcpServers.semanticFilterTestPanel.results.moreNotShown", {
+                          more: testResult.selectedTools - testResult.tools.length,
+                        })}
                       </p>
                     )}
                   </div>
@@ -137,21 +152,29 @@ export default function MCPSemanticFilterTestPanel({
             <div>
               <div className="mb-2 flex items-center gap-2">
                 <Code className="size-4" />
-                <p className="font-medium">API Usage</p>
+                <p className="font-medium">{t("mcpServers.semanticFilterTestPanel.api.title")}</p>
               </div>
               <p className="mb-2 block text-sm text-muted-foreground">
-                Use this curl command to test the semantic filter with your current configuration.
+                {t("mcpServers.semanticFilterTestPanel.api.description")}
               </p>
-              <p className="mb-2 block font-medium">Response headers to check:</p>
+              <p className="mb-2 block font-medium">{t("mcpServers.semanticFilterTestPanel.api.headersTitle")}</p>
               <ul className="mt-0 mr-0 mb-3 ml-0 list-disc pl-5">
                 <li>
-                  <span>x-litellm-semantic-filter: shows total tools → selected tools</span>
-                  <span className="block text-sm text-muted-foreground">Example: 10→3</span>
+                  <span>
+                    {t("mcpServers.semanticFilterTestPanel.api.filterHeader", { header: "x-litellm-semantic-filter" })}
+                  </span>
+                  <span className="block text-sm text-muted-foreground">
+                    {t("mcpServers.semanticFilterTestPanel.api.filterHeaderExample")}
+                  </span>
                 </li>
                 <li>
-                  <span>x-litellm-semantic-filter-tools: CSV of selected tool names</span>
+                  <span>
+                    {t("mcpServers.semanticFilterTestPanel.api.toolsHeader", {
+                      header: "x-litellm-semantic-filter-tools",
+                    })}
+                  </span>
                   <span className="block text-sm text-muted-foreground">
-                    Example: wikipedia-fetch,github-search,slack-post
+                    {t("mcpServers.semanticFilterTestPanel.api.toolsHeaderExample")}
                   </span>
                 </li>
               </ul>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/semanticFilterTestUtils.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/semanticFilterTestUtils.ts
index 1337cac66eb..ec9d9a37de2 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/semanticFilterTestUtils.ts
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/semanticFilterTestUtils.ts
@@ -1,3 +1,5 @@
+import type { TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
 import { toast } from "@/lib/toast";
 import { testMCPSemanticFilter } from "@/components/networking";
 
@@ -23,23 +25,26 @@ const parseFilterHeaders = (headers: FilterHeaders): TestResult | null => {
   return { totalTools: total, selectedTools: selected, tools };
 };
 
-export const runSemanticFilterTest = async ({
-  accessToken,
-  testModel,
-  testQuery,
-  setIsTesting,
-  setTestResult,
-  setTestError,
-}: {
-  accessToken: string;
-  testModel: string | null;
-  testQuery: string;
-  setIsTesting: (value: boolean) => void;
-  setTestResult: (result: TestResult | null) => void;
-  setTestError: (error: string | null) => void;
-}) => {
+export const runSemanticFilterTest = async (
+  {
+    accessToken,
+    testModel,
+    testQuery,
+    setIsTesting,
+    setTestResult,
+    setTestError,
+  }: {
+    accessToken: string;
+    testModel: string | null;
+    testQuery: string;
+    setIsTesting: (value: boolean) => void;
+    setTestResult: (result: TestResult | null) => void;
+    setTestError: (error: string | null) => void;
+  },
+  t: TFunction = i18n.t.bind(i18n),
+) => {
   if (!testQuery || !testModel || !accessToken) {
-    toast.error("Please enter a query and select a model");
+    toast.error(t("mcpServers.semanticFilterTestUtils.missingInput"));
     return;
   }
 
@@ -52,17 +57,18 @@ export const runSemanticFilterTest = async ({
     const parsedResult = parseFilterHeaders(headers);
 
     if (!parsedResult) {
-      toast.warning("Semantic filter is not enabled or no tools were filtered");
+      toast.warning(t("mcpServers.semanticFilterTestUtils.notFiltered"));
       return;
     }
 
     setTestResult(parsedResult);
-    toast.success("Semantic filter test completed successfully");
+    toast.success(t("mcpServers.semanticFilterTestUtils.completed"));
   } catch (error) {
     console.error("Test failed:", error);
-    const message = error instanceof Error && error.message ? error.message : "Failed to test semantic filter";
+    const message =
+      error instanceof Error && error.message ? error.message : t("mcpServers.semanticFilterTestUtils.failed");
     setTestError(message);
-    toast.error("Failed to test semantic filter");
+    toast.error(t("mcpServers.semanticFilterTestUtils.failed"));
   } finally {
     setIsTesting(false);
   }
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPToolSearchSettings/MCPToolSearchSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPToolSearchSettings/MCPToolSearchSettings.tsx
index 2ad9a56d0f3..ed3fed59a98 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPToolSearchSettings/MCPToolSearchSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPToolSearchSettings/MCPToolSearchSettings.tsx
@@ -10,6 +10,7 @@ import { CircleHelp, Info, Save } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import { Trans, useTranslation } from "react-i18next";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
 import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -48,6 +49,7 @@ const labelWithHint = (label: string, hint: string): React.ReactNode => (
 );
 
 export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSettingsProps) {
+  const { t } = useTranslation();
   const { data, isLoading, isError, error } = useMCPToolSearchSettings();
   const { mutate: updateSettings, isPending: isUpdating } = useUpdateMCPToolSearchSettings();
   const form = useForm<ToolSearchFormValues>({ defaultValues: DEFAULT_FORM_VALUES });
@@ -73,14 +75,16 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
     updateSettings(formToPayload(formValues), {
       onSuccess: () => {
         form.reset(formValues);
-        toast.success("Settings updated successfully. Changes will be applied across all pods within 10 seconds.");
+        toast.success(t("mcpServers.toolSearchSettings.toasts.updated"));
       },
       onError: (saveError) => toast.fromError(saveError),
     });
   };
 
   if (!accessToken) {
-    return <div className="p-6 text-center text-muted-foreground">Please log in to configure tool search.</div>;
+    return (
+      <div className="p-6 text-center text-muted-foreground">{t("mcpServers.toolSearchSettings.loginRequired")}</div>
+    );
   }
 
   if (isLoading) {
@@ -96,7 +100,7 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
   if (isError) {
     return (
       <Alert variant="error" className="mb-6">
-        <AlertTitle>Could not load MCP tool search settings</AlertTitle>
+        <AlertTitle>{t("mcpServers.toolSearchSettings.loadError.title")}</AlertTitle>
         {error instanceof Error && <AlertDescription>{error.message}</AlertDescription>}
       </Alert>
     );
@@ -106,12 +110,9 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
     <div className="w-full">
       <Alert variant="info" className="mb-6">
         <Info />
-        <AlertTitle>Native MCP Tool Search</AlertTitle>
+        <AlertTitle>{t("mcpServers.toolSearchSettings.intro.title")}</AlertTitle>
         <AlertDescription>
-          Controls the <code>mcp_tool_search</code> virtual tool that native MCP clients call to discover tools. With an
-          embedding model set, tools are ranked by the meaning of their name and description, so a query like
-          &quot;FX&quot; finds a &quot;foreign exchange rates&quot; tool. Without one, keyword matching is used. Callers
-          only ever see tools their key, team and server permissions already allow.
+          <Trans i18nKey="mcpServers.toolSearchSettings.intro.description" components={{ code: <code /> }} />
         </AlertDescription>
       </Alert>
 
@@ -119,7 +120,7 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
         <form onSubmit={(event) => event.preventDefault()} noValidate>
           <Card className="mb-4">
             <CardHeader className="border-b">
-              <CardTitle>Ranking</CardTitle>
+              <CardTitle>{t("mcpServers.toolSearchSettings.ranking.title")}</CardTitle>
             </CardHeader>
             <CardContent>
               <FieldGroup>
@@ -127,8 +128,8 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
                   control={form.control}
                   name="embedding_model"
                   label={labelWithHint(
-                    "Embedding Model",
-                    "Embedding model from your model list used to rank tools by meaning. Clear it to fall back to keyword matching.",
+                    t("mcpServers.toolSearchSettings.fields.embeddingModel.label"),
+                    t("mcpServers.toolSearchSettings.fields.embeddingModel.hint"),
                   )}
                 >
                   {({ value, onChange, id }) => (
@@ -138,8 +139,16 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
                       value={value}
                       onValueChange={onChange}
                       allowClear
-                      placeholder={loadingModels ? "Loading models..." : "Keyword matching (no embedding model)"}
-                      emptyText={loadingModels ? "Loading..." : "No embedding models available"}
+                      placeholder={
+                        loadingModels
+                          ? t("mcpServers.toolSearchSettings.fields.embeddingModel.loadingPlaceholder")
+                          : t("mcpServers.toolSearchSettings.fields.embeddingModel.placeholder")
+                      }
+                      emptyText={
+                        loadingModels
+                          ? t("mcpServers.toolSearchSettings.fields.embeddingModel.loadingEmpty")
+                          : t("mcpServers.toolSearchSettings.fields.embeddingModel.empty")
+                      }
                       disabled={isUpdating || loadingModels}
                     />
                   )}
@@ -149,8 +158,8 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
                   control={form.control}
                   name="top_k"
                   label={labelWithHint(
-                    "Top K Results",
-                    "Most ranked tools a search returns. A smaller top_k in the tool call wins. Core tools do not count.",
+                    t("mcpServers.toolSearchSettings.fields.topK.label"),
+                    t("mcpServers.toolSearchSettings.fields.topK.hint"),
                   )}
                 >
                   {({ ref, value, onChange, onBlur, id }) => (
@@ -175,8 +184,8 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
                   control={form.control}
                   name="similarity_threshold"
                   label={labelWithHint(
-                    "Similarity Threshold",
-                    "Lowest cosine similarity a tool needs to appear in semantic results. 0 means no cutoff.",
+                    t("mcpServers.toolSearchSettings.fields.similarityThreshold.label"),
+                    t("mcpServers.toolSearchSettings.fields.similarityThreshold.hint"),
                   )}
                 >
                   {({ value, onChange, id }) => (
@@ -206,7 +215,7 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
 
           <Card className="mb-4">
             <CardHeader className="border-b">
-              <CardTitle>Core Tools</CardTitle>
+              <CardTitle>{t("mcpServers.toolSearchSettings.coreTools.title")}</CardTitle>
             </CardHeader>
             <CardContent>
               <FieldGroup>
@@ -214,8 +223,8 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
                   control={form.control}
                   name="core_tools_text"
                   label={labelWithHint(
-                    "Always Returned First",
-                    "One tool name per line, e.g. my_server-get_rates. Listed before ranked results whenever the caller is allowed to use them.",
+                    t("mcpServers.toolSearchSettings.fields.coreTools.label"),
+                    t("mcpServers.toolSearchSettings.fields.coreTools.hint"),
                   )}
                 >
                   {({ ref, value, onChange, onBlur, id }) => (
@@ -241,7 +250,7 @@ export default function MCPToolSearchSettings({ accessToken }: MCPToolSearchSett
               disabled={!isDirty || isUpdating}
             >
               {isUpdating ? <UiLoadingSpinner className="size-4" /> : <Save />}
-              Save Settings
+              {t("mcpServers.toolSearchSettings.save")}
             </Button>
           </div>
         </form>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx
index e468fc2d91a..fb7452b0c11 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useState, useEffect } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Eye, EyeOff, Pencil, Plus, Trash2 } from "lucide-react";
 import { getConfigFieldSetting, updateConfigFieldSetting } from "@/components/networking";
@@ -28,6 +29,7 @@ interface Plugin {
 const BLANK_PLUGIN: PluginFormValues = { name: "", display_name: "", url: "", plugin_key: undefined };
 
 export default function PluginSettings() {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const [plugins, setPlugins] = useState<Plugin[]>([]);
   const [loading, setLoading] = useState(true);
@@ -102,7 +104,7 @@ export default function PluginSettings() {
       return (
         <TableRow>
           <TableCell colSpan={5} className="py-6 text-center text-sm text-muted-foreground">
-            No data
+            {t("adminPanel.pluginSettings.noData")}
           </TableCell>
         </TableRow>
       );
@@ -128,13 +130,18 @@ export default function PluginSettings() {
         </TableCell>
         <TableCell>
           <div className="flex items-center gap-2">
-            <Button variant="outline" size="icon-sm" aria-label={`Edit ${plugin.name}`} onClick={() => openEdit(idx)}>
+            <Button
+              variant="outline"
+              size="icon-sm"
+              aria-label={t("adminPanel.pluginSettings.editAriaLabel", { name: plugin.name })}
+              onClick={() => openEdit(idx)}
+            >
               <Pencil />
             </Button>
             <Button
               variant="destructive"
               size="icon-sm"
-              aria-label={`Delete ${plugin.name}`}
+              aria-label={t("adminPanel.pluginSettings.deleteAriaLabel", { name: plugin.name })}
               onClick={() => handleDelete(idx)}
             >
               <Trash2 />
@@ -148,30 +155,30 @@ export default function PluginSettings() {
   return (
     <Card>
       <CardHeader>
-        <h4 className="text-base font-semibold text-foreground">Plugins</h4>
-        <p className="text-sm text-foreground">
-          Register external services as plugins. Once added, users can toggle to the plugin from the mode switcher in
-          the top-left of the sidebar.
-        </p>
+        <h4 className="text-base font-semibold text-foreground">{t("adminPanel.pluginSettings.title")}</h4>
+        <p className="text-sm text-foreground">{t("adminPanel.pluginSettings.description")}</p>
         <p className="text-xs text-muted-foreground">
-          Each plugin must expose <code className={INLINE_CODE_CLASS}>GET /api/plugin-manifest</code> returning nav
-          items and capabilities.
+          <Trans
+            i18nKey="adminPanel.pluginSettings.manifestHint"
+            values={{ endpoint: "GET /api/plugin-manifest" }}
+            components={{ code: <code className={INLINE_CODE_CLASS} /> }}
+          />
         </p>
       </CardHeader>
       <CardContent>
         <Button className="mb-4" onClick={openAdd}>
           <Plus />
-          Add Plugin
+          {t("adminPanel.pluginSettings.addPlugin")}
         </Button>
 
         <Table>
           <TableHeader>
             <TableRow>
-              <TableHead>Name</TableHead>
-              <TableHead>Display Name</TableHead>
-              <TableHead>URL</TableHead>
-              <TableHead>Plugin Key</TableHead>
-              <TableHead>Actions</TableHead>
+              <TableHead>{t("adminPanel.pluginSettings.columns.name")}</TableHead>
+              <TableHead>{t("adminPanel.pluginSettings.columns.displayName")}</TableHead>
+              <TableHead>{t("adminPanel.pluginSettings.columns.url")}</TableHead>
+              <TableHead>{t("adminPanel.pluginSettings.columns.pluginKey")}</TableHead>
+              <TableHead>{t("adminPanel.pluginSettings.columns.actions")}</TableHead>
             </TableRow>
           </TableHeader>
           <TableBody>{renderRows()}</TableBody>
@@ -181,29 +188,42 @@ export default function PluginSettings() {
       <Dialog open={modalOpen} onOpenChange={(open) => !open && setModalOpen(false)}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
           <DialogHeader>
-            <DialogTitle>{editingIndex !== null ? "Edit Plugin" : "Add Plugin"}</DialogTitle>
+            <DialogTitle>
+              {editingIndex !== null
+                ? t("adminPanel.pluginSettings.modal.editTitle")
+                : t("adminPanel.pluginSettings.modal.addTitle")}
+            </DialogTitle>
           </DialogHeader>
           <form onSubmit={(event) => event.preventDefault()} noValidate style={{ marginTop: 16 }}>
             <FieldGroup>
               <FormField
                 control={form.control}
                 name="name"
-                label="Name (identifier)"
-                description="Used in URLs and config. No spaces. E.g. litellm-platform-plugin"
+                label={t("adminPanel.pluginSettings.modal.fields.name.label")}
+                description={t("adminPanel.pluginSettings.modal.fields.name.description")}
               >
                 {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="litellm-platform-plugin" />}
               </FormField>
-              <FormField control={form.control} name="display_name" label="Display Name">
+              <FormField
+                control={form.control}
+                name="display_name"
+                label={t("adminPanel.pluginSettings.modal.fields.displayName.label")}
+              >
                 {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Agent Control Plane" />}
               </FormField>
-              <FormField control={form.control} name="url" label="URL" description="Base URL of the plugin service">
+              <FormField
+                control={form.control}
+                name="url"
+                label={t("adminPanel.pluginSettings.modal.fields.url.label")}
+                description={t("adminPanel.pluginSettings.modal.fields.url.description")}
+              >
                 {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="https://your-plugin.example.com" />}
               </FormField>
               <FormField
                 control={form.control}
                 name="plugin_key"
-                label="Plugin Key"
-                description="Optional. The plugin's own credential, injected as Authorization: Bearer <key> only when litellm reverse-proxies API calls to the plugin's backend (/plugin-proxy/<name>/*). Leave blank for plugins that use the forwarded litellm user token (e.g. iframe plugins) — that path uses the user's token, not this key."
+                label={t("adminPanel.pluginSettings.modal.fields.pluginKey.label")}
+                description={t("adminPanel.pluginSettings.modal.fields.pluginKey.description")}
               >
                 {({ ref, ...field }) => (
                   <InputGroup>
@@ -212,13 +232,21 @@ export default function PluginSettings() {
                       ref={ref}
                       type={keyVisible ? "text" : "password"}
                       value={field.value ?? ""}
-                      placeholder={editingIndex !== null ? "Leave blank to keep current key" : "sk-... (optional)"}
+                      placeholder={
+                        editingIndex !== null
+                          ? t("adminPanel.pluginSettings.modal.fields.pluginKey.keepCurrentPlaceholder")
+                          : t("adminPanel.pluginSettings.modal.fields.pluginKey.newPlaceholder")
+                      }
                     />
                     <InputGroupAddon align="inline-end">
                       <InputGroupButton
                         size="icon-xs"
                         onClick={() => setKeyVisible(!keyVisible)}
-                        aria-label={keyVisible ? "Hide plugin key" : "Show plugin key"}
+                        aria-label={
+                          keyVisible
+                            ? t("adminPanel.pluginSettings.modal.fields.pluginKey.hide")
+                            : t("adminPanel.pluginSettings.modal.fields.pluginKey.show")
+                        }
                       >
                         {keyVisible ? <EyeOff /> : <Eye />}
                       </InputGroupButton>
@@ -230,10 +258,10 @@ export default function PluginSettings() {
           </form>
           <DialogFooter>
             <Button variant="outline" onClick={() => setModalOpen(false)}>
-              Cancel
+              {t("adminPanel.pluginSettings.modal.cancel")}
             </Button>
             <Button onClick={form.handleSubmit(handleOk)} disabled={saving} aria-busy={saving}>
-              Save
+              {t("adminPanel.pluginSettings.modal.save")}
             </Button>
           </DialogFooter>
         </DialogContent>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/schema.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/schema.ts
index 85684ba1959..d18deda8a5e 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/schema.ts
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/schema.ts
@@ -1,5 +1,7 @@
 import { z } from "zod";
 
+import i18n from "@/i18n/i18n";
+
 const IPV4 = "(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}";
 const SEG = "[a-fA-F\\d]{1,4}";
 const IPV6 =
@@ -25,12 +27,14 @@ const URL_RULE_PATTERN = new RegExp(
 const isUrl = (value: string): boolean => value.length <= 2048 && URL_RULE_PATTERN.test(value);
 
 const pluginShape = {
-  name: z.string().min(1, "Required"),
-  display_name: z.string().min(1, "Required"),
+  name: z.string().min(1, { error: () => i18n.t("adminPanel.pluginSettings.errors.required") }),
+  display_name: z.string().min(1, { error: () => i18n.t("adminPanel.pluginSettings.errors.required") }),
   url: z
     .string()
-    .min(1, "Required")
-    .refine((value) => value === "" || isUrl(value), "Must be a valid URL"),
+    .min(1, { error: () => i18n.t("adminPanel.pluginSettings.errors.required") })
+    .refine((value) => value === "" || isUrl(value), {
+      error: () => i18n.t("adminPanel.pluginSettings.errors.invalidUrl"),
+    }),
   plugin_key: z.string().optional(),
 };
 
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx
index 7fa16515bf5..889ab625f3a 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx
@@ -3,6 +3,7 @@
 import { toast } from "@/lib/toast";
 import { parseErrorMessage } from "@/components/shared/errorUtils";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import BaseSSOSettingsForm, {
   emptySSOSettingsFormValues,
   submitMountedSSOValues,
@@ -12,7 +13,7 @@ import BaseSSOSettingsForm, {
 import { Button } from "@/components/ui/button";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useEditSSOSettings } from "@/app/(dashboard)/hooks/sso/useEditSSOSettings";
-import { processSSOSettingsPayload } from "../utils";
+import { diffSSOSettingsPayload, processSSOSettingsPayload } from "../utils";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddSSOSettingsModalProps {
@@ -22,19 +23,23 @@ interface AddSSOSettingsModalProps {
 }
 
 const AddSSOSettingsModal: React.FC<AddSSOSettingsModalProps> = ({ isVisible, onCancel, onSuccess }) => {
+  const { t } = useTranslation();
   const form = useSSOSettingsForm("sso-settings");
   const { mutateAsync, isPending } = useEditSSOSettings();
 
   const handleFormSubmit = async (formValues: SSOSettingsFormValues) => {
-    const payload = processSSOSettingsPayload(formValues);
+    const payload = diffSSOSettingsPayload(
+      processSSOSettingsPayload(emptySSOSettingsFormValues),
+      processSSOSettingsPayload(formValues),
+    );
 
     await mutateAsync(payload, {
       onSuccess: () => {
-        toast.success("SSO settings added successfully");
+        toast.success(t("adminPanel.ssoSettings.addModal.toasts.success"));
         onSuccess();
       },
       onError: (error) => {
-        toast.fromError("Failed to save SSO settings: " + parseErrorMessage(error));
+        toast.fromError(t("adminPanel.ssoSettings.addModal.toasts.saveFailed", { error: parseErrorMessage(error) }));
       },
     });
   };
@@ -48,13 +53,13 @@ const AddSSOSettingsModal: React.FC<AddSSOSettingsModalProps> = ({ isVisible, on
     <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
         <DialogHeader>
-          <DialogTitle>Add SSO</DialogTitle>
+          <DialogTitle>{t("adminPanel.ssoSettings.addModal.title")}</DialogTitle>
         </DialogHeader>
         <BaseSSOSettingsForm form={form} onFormSubmit={handleFormSubmit} />
         <DialogFooter>
           <div className="flex items-center justify-end gap-2">
             <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
-              Cancel
+              {t("adminPanel.ssoSettings.addModal.cancel")}
             </Button>
             <Button
               type="button"
@@ -62,7 +67,9 @@ const AddSSOSettingsModal: React.FC<AddSSOSettingsModalProps> = ({ isVisible, on
               onClick={submitMountedSSOValues(form, "sso-settings", handleFormSubmit)}
             >
               {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
-              {isPending ? "Adding..." : "Add SSO"}
+              {isPending
+                ? t("adminPanel.ssoSettings.addModal.submitting")
+                : t("adminPanel.ssoSettings.addModal.submit")}
             </Button>
           </div>
         </DialogFooter>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/BaseSSOSettingsForm.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/BaseSSOSettingsForm.tsx
index e4725294e05..f3f1332a093 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/BaseSSOSettingsForm.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/BaseSSOSettingsForm.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import React from "react";
+import type { ParseKeys, TFunction } from "i18next";
 import { FormProvider, useFormContext, useWatch, type UseFormReturn } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 import { ssoProviderLogoMap, ssoProviderDisplayNames } from "../constants";
 import { Logo } from "@/components/molecules/logo/Logo";
@@ -13,6 +15,7 @@ import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import i18n from "@/i18n/i18n";
 
 export interface SSOSettingsFormValues {
   sso_provider?: string;
@@ -52,9 +55,10 @@ export interface BaseSSOSettingsFormProps {
 export interface SSOProviderConfig {
   envVarMap: Record<string, string>;
   fields: Array<{
-    label: string;
+    label: ParseKeys;
     name: keyof SSOSettingsFormValues;
     placeholder?: string;
+    placeholderKey?: ParseKeys;
     required?: boolean;
     type?: "password" | "textarea" | "checkbox";
   }>;
@@ -67,8 +71,8 @@ export const ssoProviderConfigs: Record<string, SSOProviderConfig> = {
       google_client_secret: "GOOGLE_CLIENT_SECRET",
     },
     fields: [
-      { label: "Google Client ID", name: "google_client_id" },
-      { label: "Google Client Secret", name: "google_client_secret" },
+      { label: "adminPanel.ssoSettings.form.fields.googleClientId", name: "google_client_id" },
+      { label: "adminPanel.ssoSettings.form.fields.googleClientSecret", name: "google_client_secret" },
     ],
   },
   microsoft: {
@@ -78,9 +82,9 @@ export const ssoProviderConfigs: Record<string, SSOProviderConfig> = {
       microsoft_tenant: "MICROSOFT_TENANT",
     },
     fields: [
-      { label: "Microsoft Client ID", name: "microsoft_client_id" },
-      { label: "Microsoft Client Secret", name: "microsoft_client_secret" },
-      { label: "Microsoft Tenant", name: "microsoft_tenant" },
+      { label: "adminPanel.ssoSettings.form.fields.microsoftClientId", name: "microsoft_client_id" },
+      { label: "adminPanel.ssoSettings.form.fields.microsoftClientSecret", name: "microsoft_client_secret" },
+      { label: "adminPanel.ssoSettings.form.fields.microsoftTenant", name: "microsoft_tenant" },
     ],
   },
   okta: {
@@ -93,20 +97,29 @@ export const ssoProviderConfigs: Record<string, SSOProviderConfig> = {
       generic_scope: "GENERIC_SCOPE",
     },
     fields: [
-      { label: "Generic Client ID", name: "generic_client_id" },
-      { label: "Generic Client Secret", name: "generic_client_secret" },
+      { label: "adminPanel.ssoSettings.form.fields.genericClientId", name: "generic_client_id" },
+      { label: "adminPanel.ssoSettings.form.fields.genericClientSecret", name: "generic_client_secret" },
       {
-        label: "Authorization Endpoint",
+        label: "adminPanel.ssoSettings.form.fields.authorizationEndpoint",
         name: "generic_authorization_endpoint",
         placeholder: "https://your-domain/authorize",
       },
-      { label: "Token Endpoint", name: "generic_token_endpoint", placeholder: "https://your-domain/token" },
       {
-        label: "Userinfo Endpoint",
+        label: "adminPanel.ssoSettings.form.fields.tokenEndpoint",
+        name: "generic_token_endpoint",
+        placeholder: "https://your-domain/token",
+      },
+      {
+        label: "adminPanel.ssoSettings.form.fields.userinfoEndpoint",
         name: "generic_userinfo_endpoint",
         placeholder: "https://your-domain/userinfo",
       },
-      { label: "Scopes", name: "generic_scope", placeholder: "openid email profile", required: false },
+      {
+        label: "adminPanel.ssoSettings.form.fields.scopes",
+        name: "generic_scope",
+        placeholder: "openid email profile",
+        required: false,
+      },
     ],
   },
   generic: {
@@ -119,12 +132,17 @@ export const ssoProviderConfigs: Record<string, SSOProviderConfig> = {
       generic_scope: "GENERIC_SCOPE",
     },
     fields: [
-      { label: "Generic Client ID", name: "generic_client_id" },
-      { label: "Generic Client Secret", name: "generic_client_secret" },
-      { label: "Authorization Endpoint", name: "generic_authorization_endpoint" },
-      { label: "Token Endpoint", name: "generic_token_endpoint" },
-      { label: "Userinfo Endpoint", name: "generic_userinfo_endpoint" },
-      { label: "Scopes", name: "generic_scope", placeholder: "openid email profile", required: false },
+      { label: "adminPanel.ssoSettings.form.fields.genericClientId", name: "generic_client_id" },
+      { label: "adminPanel.ssoSettings.form.fields.genericClientSecret", name: "generic_client_secret" },
+      { label: "adminPanel.ssoSettings.form.fields.authorizationEndpoint", name: "generic_authorization_endpoint" },
+      { label: "adminPanel.ssoSettings.form.fields.tokenEndpoint", name: "generic_token_endpoint" },
+      { label: "adminPanel.ssoSettings.form.fields.userinfoEndpoint", name: "generic_userinfo_endpoint" },
+      {
+        label: "adminPanel.ssoSettings.form.fields.scopes",
+        name: "generic_scope",
+        placeholder: "openid email profile",
+        required: false,
+      },
     ],
   },
   saml: {
@@ -136,26 +154,26 @@ export const ssoProviderConfigs: Record<string, SSOProviderConfig> = {
     },
     fields: [
       {
-        label: "IdP Metadata URL",
+        label: "adminPanel.ssoSettings.form.fields.samlIdpMetadataUrl",
         name: "saml_idp_metadata_url",
         required: false,
-        placeholder: "https://idp.example.com/metadata (use this or the metadata XML below)",
+        placeholderKey: "adminPanel.ssoSettings.form.placeholders.samlIdpMetadataUrl",
       },
       {
-        label: "IdP Metadata XML",
+        label: "adminPanel.ssoSettings.form.fields.samlIdpMetadataXml",
         name: "saml_idp_metadata_xml",
         required: false,
         type: "textarea",
-        placeholder: "Paste the IdP metadata XML here if you do not have a metadata URL",
+        placeholderKey: "adminPanel.ssoSettings.form.placeholders.samlIdpMetadataXml",
       },
       {
-        label: "SP Entity ID",
+        label: "adminPanel.ssoSettings.form.fields.samlSpEntityId",
         name: "saml_sp_entity_id",
         required: false,
-        placeholder: "Defaults to <proxy base url>/sso/saml/metadata",
+        placeholderKey: "adminPanel.ssoSettings.form.placeholders.samlSpEntityId",
       },
       {
-        label: "Allow IdP-initiated (unsolicited) responses",
+        label: "adminPanel.ssoSettings.form.fields.samlAllowUnsolicited",
         name: "saml_allow_unsolicited",
         required: false,
         type: "checkbox",
@@ -213,12 +231,12 @@ export const submitMountedSSOValues =
   () =>
     void form.handleSubmit((values) => onFormSubmit(pickMountedSSOValues(values, variant)))();
 
-const REQUIRED_MESSAGES: Record<string, string> = {
-  sso_provider: "Please select an SSO provider",
-  user_email: "Please enter the email of the proxy admin",
-  proxy_base_url: "Please enter the proxy base url",
-  group_claim: "Please enter the group claim",
-  team_ids_jwt_field: "Please enter the team IDs JWT field",
+const REQUIRED_MESSAGES: Record<string, ParseKeys> = {
+  sso_provider: "adminPanel.ssoSettings.form.errors.providerRequired",
+  user_email: "adminPanel.ssoSettings.form.errors.userEmailRequired",
+  proxy_base_url: "adminPanel.ssoSettings.form.errors.proxyBaseUrlRequired",
+  group_claim: "adminPanel.ssoSettings.form.errors.groupClaimRequired",
+  team_ids_jwt_field: "adminPanel.ssoSettings.form.errors.teamIdsJwtFieldRequired",
 };
 
 const isBlank = (value: unknown): boolean => value === undefined || value === null || value === "";
@@ -229,7 +247,7 @@ export const buildSSOSettingsSchema = (variant: SSOFormVariant) =>
 
     const requireField = (name: string) => {
       if (mounted.has(name) && isBlank(values[name as keyof SSOSettingsFormValues])) {
-        ctx.addIssue({ code: "custom", path: [name], message: REQUIRED_MESSAGES[name] });
+        ctx.addIssue({ code: "custom", path: [name], message: i18n.t(REQUIRED_MESSAGES[name]) });
       }
     };
 
@@ -245,20 +263,22 @@ export const buildSSOSettingsSchema = (variant: SSOFormVariant) =>
       ctx.addIssue({
         code: "custom",
         path: [field.name],
-        message: `Please enter the ${field.label.toLowerCase()}`,
+        message: i18n.t("adminPanel.ssoSettings.form.errors.fieldRequired", {
+          field: i18n.t(field.label).toLowerCase(),
+        }),
       });
     });
 
     const proxyBaseUrl = values.proxy_base_url;
     if (isBlank(proxyBaseUrl)) {
-      ctx.addIssue({ code: "custom", path: ["proxy_base_url"], message: REQUIRED_MESSAGES.proxy_base_url });
+      ctx.addIssue({ code: "custom", path: ["proxy_base_url"], message: i18n.t(REQUIRED_MESSAGES.proxy_base_url) });
       return;
     }
     if (!/^https?:\/\/.+/.test(proxyBaseUrl as string)) {
       ctx.addIssue({
         code: "custom",
         path: ["proxy_base_url"],
-        message: "URL must start with http:// or https://",
+        message: i18n.t("adminPanel.ssoSettings.form.errors.urlScheme"),
       });
       return;
     }
@@ -266,7 +286,7 @@ export const buildSSOSettingsSchema = (variant: SSOFormVariant) =>
       ctx.addIssue({
         code: "custom",
         path: ["proxy_base_url"],
-        message: "URL must not end with a trailing slash",
+        message: i18n.t("adminPanel.ssoSettings.form.errors.urlTrailingSlash"),
       });
     }
   });
@@ -299,11 +319,12 @@ export const useSSOSettingsForm = (
   });
 
 const SSOProviderField = ({ field }: { field: SSOProviderConfig["fields"][number] }) => {
+  const { t } = useTranslation();
   const { control } = useFormContext<SSOSettingsFormValues>();
 
   if (field.type === "checkbox") {
     return (
-      <FormField control={control} name={field.name} label={field.label} orientation="horizontal">
+      <FormField control={control} name={field.name} label={t(field.label)} orientation="horizontal">
         {({ value, onChange, onBlur, id, ...rest }) => (
           <Checkbox
             id={id}
@@ -319,9 +340,13 @@ const SSOProviderField = ({ field }: { field: SSOProviderConfig["fields"][number
   }
 
   return (
-    <FormField control={control} name={field.name} label={field.label}>
+    <FormField control={control} name={field.name} label={t(field.label)}>
       {({ ref, value, ...rest }) => {
-        const shared = { placeholder: field.placeholder, value: (value as string) ?? "", ...rest };
+        const shared = {
+          placeholder: field.placeholderKey ? t(field.placeholderKey) : field.placeholder,
+          value: (value as string) ?? "",
+          ...rest,
+        };
         if (field.type === "textarea") return <Textarea ref={ref} rows={4} {...shared} />;
         if (field.type === "password" || field.name.includes("client")) return <PasswordInput ref={ref} {...shared} />;
         return <Input ref={ref} {...shared} />;
@@ -338,10 +363,11 @@ export const renderProviderFields = (provider: string) => {
 };
 
 export const SSOProviderSelectField = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<SSOSettingsFormValues>();
 
   return (
-    <FormField control={control} name="sso_provider" label="SSO Provider">
+    <FormField control={control} name="sso_provider" label={t("adminPanel.ssoSettings.form.fields.ssoProvider")}>
       {({ value, onChange, onBlur, id, ...rest }) => (
         <Select value={(value as string) ?? ""} onValueChange={onChange}>
           <SelectTrigger
@@ -351,7 +377,7 @@ export const SSOProviderSelectField = () => {
             aria-describedby={rest["aria-describedby"]}
             className="w-full"
           >
-            <SelectValue>{(provider: string) => (provider ? providerOptionLabel(provider) : "")}</SelectValue>
+            <SelectValue>{(provider: string) => (provider ? providerOptionLabel(provider, t) : "")}</SelectValue>
           </SelectTrigger>
           <SelectContent>
             {Object.entries(ssoProviderLogoMap).map(([optionValue, logo]) => (
@@ -360,11 +386,15 @@ export const SSOProviderSelectField = () => {
                   {logo && (
                     <Logo
                       src={logo}
-                      label={ssoProviderDisplayNames[optionValue] || optionValue}
+                      label={
+                        Object.hasOwn(ssoProviderDisplayNames, optionValue)
+                          ? t(ssoProviderDisplayNames[optionValue])
+                          : optionValue
+                      }
                       className="h-6 w-6 mr-3 object-contain"
                     />
                   )}
-                  <span>{providerOptionLabel(optionValue)}</span>
+                  <span>{providerOptionLabel(optionValue, t)}</span>
                 </span>
               </SelectItem>
             ))}
@@ -376,20 +406,22 @@ export const SSOProviderSelectField = () => {
 };
 
 export const ProxyAdminEmailField = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<SSOSettingsFormValues>();
 
   return (
-    <FormField control={control} name="user_email" label="Proxy Admin Email">
+    <FormField control={control} name="user_email" label={t("adminPanel.ssoSettings.form.fields.proxyAdminEmail")}>
       {({ ref, value, ...rest }) => <Input ref={ref} value={(value as string) ?? ""} {...rest} />}
     </FormField>
   );
 };
 
 export const ProxyBaseUrlField = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<SSOSettingsFormValues>();
 
   return (
-    <FormField control={control} name="proxy_base_url" label="Proxy Base URL">
+    <FormField control={control} name="proxy_base_url" label={t("adminPanel.ssoSettings.form.fields.proxyBaseUrl")}>
       {({ ref, value, onChange, ...rest }) => (
         <Input
           ref={ref}
@@ -429,31 +461,35 @@ export const MappingToggleField = ({
 };
 
 export const GroupClaimField = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<SSOSettingsFormValues>();
 
   return (
-    <FormField control={control} name="group_claim" label="Group Claim">
+    <FormField control={control} name="group_claim" label={t("adminPanel.ssoSettings.form.fields.groupClaim")}>
       {({ ref, value, ...rest }) => <Input ref={ref} value={(value as string) ?? ""} {...rest} />}
     </FormField>
   );
 };
 
-const DEFAULT_ROLE_OPTIONS: ReadonlyArray<{ value: string; label: string }> = [
-  { value: "internal_user_viewer", label: "Internal Viewer" },
-  { value: "internal_user", label: "Internal User" },
-  { value: "proxy_admin_viewer", label: "Admin Viewer" },
-  { value: "proxy_admin", label: "Proxy Admin" },
+const DEFAULT_ROLE_OPTIONS: ReadonlyArray<{ value: string; label: ParseKeys }> = [
+  { value: "internal_user_viewer", label: "adminPanel.ssoSettings.form.defaultRoles.internalUserViewer" },
+  { value: "internal_user", label: "adminPanel.ssoSettings.form.defaultRoles.internalUser" },
+  { value: "proxy_admin_viewer", label: "adminPanel.ssoSettings.form.defaultRoles.proxyAdminViewer" },
+  { value: "proxy_admin", label: "adminPanel.ssoSettings.form.defaultRoles.proxyAdmin" },
 ];
 
-const providerOptionLabel = (value: string) =>
-  ssoProviderDisplayNames[value] || value.charAt(0).toUpperCase() + value.slice(1) + " SSO";
+const providerOptionLabel = (value: string, t: TFunction) =>
+  Object.hasOwn(ssoProviderDisplayNames, value)
+    ? t(ssoProviderDisplayNames[value])
+    : t("adminPanel.ssoSettings.providers.fallback", { name: value.charAt(0).toUpperCase() + value.slice(1) });
 
 export const RoleMappingTeamFields = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<SSOSettingsFormValues>();
 
   return (
     <>
-      <FormField control={control} name="default_role" label="Default Role">
+      <FormField control={control} name="default_role" label={t("adminPanel.ssoSettings.form.fields.defaultRole")}>
         {({ value, onChange, onBlur, id, ...rest }) => (
           <Select value={(value as string) ?? ""} onValueChange={onChange}>
             <SelectTrigger
@@ -464,13 +500,16 @@ export const RoleMappingTeamFields = () => {
               className="w-full"
             >
               <SelectValue>
-                {(role: string) => DEFAULT_ROLE_OPTIONS.find((option) => option.value === role)?.label ?? role}
+                {(role: string) => {
+                  const label = DEFAULT_ROLE_OPTIONS.find((option) => option.value === role)?.label;
+                  return label ? t(label) : role;
+                }}
               </SelectValue>
             </SelectTrigger>
             <SelectContent>
               {DEFAULT_ROLE_OPTIONS.map((option) => (
                 <SelectItem key={option.value} value={option.value}>
-                  {option.label}
+                  {t(option.label)}
                 </SelectItem>
               ))}
             </SelectContent>
@@ -478,19 +517,35 @@ export const RoleMappingTeamFields = () => {
         )}
       </FormField>
 
-      <FormField control={control} name="proxy_admin_teams" label="Proxy Admin Teams">
+      <FormField
+        control={control}
+        name="proxy_admin_teams"
+        label={t("adminPanel.ssoSettings.form.fields.proxyAdminTeams")}
+      >
         {({ ref, value, ...rest }) => <Input ref={ref} value={(value as string) ?? ""} {...rest} />}
       </FormField>
 
-      <FormField control={control} name="admin_viewer_teams" label="Admin Viewer Teams">
+      <FormField
+        control={control}
+        name="admin_viewer_teams"
+        label={t("adminPanel.ssoSettings.form.fields.adminViewerTeams")}
+      >
         {({ ref, value, ...rest }) => <Input ref={ref} value={(value as string) ?? ""} {...rest} />}
       </FormField>
 
-      <FormField control={control} name="internal_user_teams" label="Internal User Teams">
+      <FormField
+        control={control}
+        name="internal_user_teams"
+        label={t("adminPanel.ssoSettings.form.fields.internalUserTeams")}
+      >
         {({ ref, value, ...rest }) => <Input ref={ref} value={(value as string) ?? ""} {...rest} />}
       </FormField>
 
-      <FormField control={control} name="internal_viewer_teams" label="Internal Viewer Teams">
+      <FormField
+        control={control}
+        name="internal_viewer_teams"
+        label={t("adminPanel.ssoSettings.form.fields.internalViewerTeams")}
+      >
         {({ ref, value, ...rest }) => <Input ref={ref} value={(value as string) ?? ""} {...rest} />}
       </FormField>
     </>
@@ -498,16 +553,22 @@ export const RoleMappingTeamFields = () => {
 };
 
 export const TeamIdsJwtFieldField = () => {
+  const { t } = useTranslation();
   const { control } = useFormContext<SSOSettingsFormValues>();
 
   return (
-    <FormField control={control} name="team_ids_jwt_field" label="Team IDs JWT Field">
+    <FormField
+      control={control}
+      name="team_ids_jwt_field"
+      label={t("adminPanel.ssoSettings.form.fields.teamIdsJwtField")}
+    >
       {({ ref, value, ...rest }) => <Input ref={ref} value={(value as string) ?? ""} {...rest} />}
     </FormField>
   );
 };
 
 const BaseSSOSettingsForm: React.FC<BaseSSOSettingsFormProps> = ({ form, onFormSubmit }) => {
+  const { t } = useTranslation();
   const provider = useWatch({ control: form.control, name: "sso_provider" });
   const useRoleMappings = useWatch({ control: form.control, name: "use_role_mappings" });
   const useTeamMappings = useWatch({ control: form.control, name: "use_team_mappings" });
@@ -527,14 +588,24 @@ const BaseSSOSettingsForm: React.FC<BaseSSOSettingsFormProps> = ({ form, onFormS
             {provider ? renderProviderFields(provider) : null}
             <ProxyAdminEmailField />
             <ProxyBaseUrlField />
-            {showMappingToggles && <MappingToggleField name="use_role_mappings" label="Use Role Mappings" />}
+            {showMappingToggles && (
+              <MappingToggleField
+                name="use_role_mappings"
+                label={t("adminPanel.ssoSettings.form.fields.useRoleMappings")}
+              />
+            )}
             {useRoleMappings && showMappingToggles && (
               <>
                 <GroupClaimField />
                 <RoleMappingTeamFields />
               </>
             )}
-            {showMappingToggles && <MappingToggleField name="use_team_mappings" label="Use Team Mappings" />}
+            {showMappingToggles && (
+              <MappingToggleField
+                name="use_team_mappings"
+                label={t("adminPanel.ssoSettings.form.fields.useTeamMappings")}
+              />
+            )}
             {useTeamMappings && showMappingToggles && <TeamIdsJwtFieldField />}
           </FieldGroup>
         </form>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/DeleteSSOSettingsModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/DeleteSSOSettingsModal.tsx
index 053dac499bd..8566fee7d98 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/DeleteSSOSettingsModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/DeleteSSOSettingsModal.tsx
@@ -1,10 +1,11 @@
 import { useEditSSOSettings } from "@/app/(dashboard)/hooks/sso/useEditSSOSettings";
 import { useSSOSettings } from "@/app/(dashboard)/hooks/sso/useSSOSettings";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import DeleteResourceModal from "../../../../common_components/DeleteResourceModal";
 import { toast } from "@/lib/toast";
 import { parseErrorMessage } from "../../../../shared/errorUtils";
-import { detectSSOProvider } from "../utils";
+import { CLEARED_SSO_SETTINGS, detectSSOProvider } from "../utils";
 
 interface DeleteSSOSettingsModalProps {
   isVisible: boolean;
@@ -13,41 +14,20 @@ interface DeleteSSOSettingsModalProps {
 }
 
 const DeleteSSOSettingsModal: React.FC<DeleteSSOSettingsModalProps> = ({ isVisible, onCancel, onSuccess }) => {
+  const { t } = useTranslation();
   const { data: ssoSettings } = useSSOSettings();
   const { mutateAsync: editSSOSettings, isPending: isEditingSSOSettings } = useEditSSOSettings();
 
   // Handle clearing SSO settings
   const handleClearSSO = async () => {
-    const clearSettings = {
-      google_client_id: null,
-      google_client_secret: null,
-      microsoft_client_id: null,
-      microsoft_client_secret: null,
-      microsoft_tenant: null,
-      generic_client_id: null,
-      generic_client_secret: null,
-      generic_authorization_endpoint: null,
-      generic_token_endpoint: null,
-      generic_userinfo_endpoint: null,
-      saml_idp_metadata_url: null,
-      saml_idp_metadata_xml: null,
-      saml_sp_entity_id: null,
-      saml_allow_unsolicited: null,
-      proxy_base_url: null,
-      user_email: null,
-      sso_provider: null,
-      role_mappings: null,
-      team_mappings: null,
-    };
-
-    await editSSOSettings(clearSettings, {
+    await editSSOSettings(CLEARED_SSO_SETTINGS, {
       onSuccess: () => {
-        toast.success("SSO settings cleared successfully");
+        toast.success(t("adminPanel.ssoSettings.deleteModal.toasts.success"));
         onCancel();
         onSuccess();
       },
       onError: (error) => {
-        toast.fromError("Failed to clear SSO settings: " + parseErrorMessage(error));
+        toast.fromError(t("adminPanel.ssoSettings.deleteModal.toasts.failed", { error: parseErrorMessage(error) }));
       },
     });
   };
@@ -55,12 +35,17 @@ const DeleteSSOSettingsModal: React.FC<DeleteSSOSettingsModalProps> = ({ isVisib
   return (
     <DeleteResourceModal
       isOpen={isVisible}
-      title="Confirm Clear SSO Settings"
-      alertMessage="This action cannot be undone."
-      message="Are you sure you want to clear all SSO settings? Users will no longer be able to login using SSO after this change."
-      resourceInformationTitle="SSO Settings"
+      title={t("adminPanel.ssoSettings.deleteModal.title")}
+      alertMessage={t("adminPanel.ssoSettings.deleteModal.alert")}
+      message={t("adminPanel.ssoSettings.deleteModal.message")}
+      resourceInformationTitle={t("adminPanel.ssoSettings.deleteModal.resourceTitle")}
       resourceInformation={[
-        { label: "Provider", value: (ssoSettings?.values && detectSSOProvider(ssoSettings?.values)) || "Generic" },
+        {
+          label: t("adminPanel.ssoSettings.deleteModal.provider"),
+          value:
+            (ssoSettings?.values && detectSSOProvider(ssoSettings?.values)) ||
+            t("adminPanel.ssoSettings.deleteModal.providerFallback"),
+        },
       ]}
       onCancel={onCancel}
       onOk={handleClearSSO}
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.integration.test.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.integration.test.tsx
index 14bfe5d6ac9..cddcffc6926 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.integration.test.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.integration.test.tsx
@@ -49,7 +49,7 @@ describe("EditSSOSettingsModal (real form tree)", () => {
     expect(mutateAsync).not.toHaveBeenCalled();
   });
 
-  it("sends only the mounted fields when the form is valid", async () => {
+  it("sends only the changed field and leaves the masked secret out", async () => {
     const user = userEvent.setup({ pointerEventsCheck: 0 });
     renderWithProviders(<EditSSOSettingsModal isVisible={true} onCancel={vi.fn()} onSuccess={vi.fn()} />);
 
@@ -58,12 +58,54 @@ describe("EditSSOSettingsModal (real form tree)", () => {
     await user.click(saveButton());
 
     await waitFor(() => expect(mutateAsync).toHaveBeenCalledTimes(1));
-    expect(mutateAsync.mock.calls[0][0]).toEqual({
-      sso_provider: "google",
-      google_client_id: "rotated-client-id",
-      google_client_secret: "stored-client-secret",
+    expect(mutateAsync.mock.calls[0][0]).toEqual({ google_client_id: "rotated-client-id" });
+  });
+
+  it("sends an empty patch when nothing changed", async () => {
+    const user = userEvent.setup({ pointerEventsCheck: 0 });
+    renderWithProviders(<EditSSOSettingsModal isVisible={true} onCancel={vi.fn()} onSuccess={vi.fn()} />);
+
+    await screen.findByLabelText("Google Client ID");
+    await user.click(saveButton());
+
+    await waitFor(() => expect(mutateAsync).toHaveBeenCalledTimes(1));
+    expect(mutateAsync.mock.calls[0][0]).toEqual({});
+  });
+
+  it("sends a new secret when the admin types one", async () => {
+    const user = userEvent.setup({ pointerEventsCheck: 0 });
+    renderWithProviders(<EditSSOSettingsModal isVisible={true} onCancel={vi.fn()} onSuccess={vi.fn()} />);
+
+    fireEvent.change(await screen.findByLabelText("Google Client Secret"), { target: { value: "new-secret" } });
+    await user.click(saveButton());
+
+    await waitFor(() => expect(mutateAsync).toHaveBeenCalledTimes(1));
+    expect(mutateAsync.mock.calls[0][0]).toEqual({ google_client_secret: "new-secret" });
+  });
+
+  it("sends role_mappings null when the admin unchecks role mappings", async () => {
+    seed({
+      generic_client_id: "stored-client-id",
+      generic_client_secret: "kc-s****6e0d",
+      generic_authorization_endpoint: "https://idp.example.com/authorize",
+      generic_token_endpoint: "https://idp.example.com/token",
+      generic_userinfo_endpoint: "https://idp.example.com/userinfo",
       user_email: "admin@example.com",
       proxy_base_url: "https://gateway.example.com",
+      role_mappings: {
+        provider: "generic",
+        group_claim: "groups",
+        default_role: "internal_user",
+        roles: { proxy_admin: ["admins"], proxy_admin_viewer: [], internal_user: [], internal_user_viewer: [] },
+      },
     });
+    const user = userEvent.setup({ pointerEventsCheck: 0 });
+    renderWithProviders(<EditSSOSettingsModal isVisible={true} onCancel={vi.fn()} onSuccess={vi.fn()} />);
+
+    await user.click((await screen.findAllByLabelText("Use Role Mappings"))[0]);
+    await user.click(saveButton());
+
+    await waitFor(() => expect(mutateAsync).toHaveBeenCalledTimes(1));
+    expect(mutateAsync.mock.calls[0][0]).toEqual({ role_mappings: null });
   });
 });
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx
index ef78e3827d8..132800faf9f 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx
@@ -293,6 +293,8 @@ describe("EditSSOSettingsModal", () => {
         useEditSSOSettings: { mutateAsync: mockMutateAsync, isPending: false },
       });
 
+      (processSSOSettingsPayload as any).mockReturnValueOnce({}).mockReturnValueOnce(processedPayload);
+
       renderComponent();
 
       fireEvent.click(screen.getByTestId(TEST_IDS.TRIGGER_FORM_SUBMIT));
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx
index 58c03eda979..e775bb48dff 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 import BaseSSOSettingsForm, {
   emptySSOSettingsFormValues,
   submitMountedSSOValues,
@@ -11,7 +12,7 @@ import { Button } from "@/components/ui/button";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { toast } from "@/lib/toast";
 import { parseErrorMessage } from "@/components/shared/errorUtils";
-import { detectSSOProvider, processSSOSettingsPayload } from "../utils";
+import { detectSSOProvider, diffSSOSettingsPayload, processSSOSettingsPayload } from "../utils";
 import { useSSOSettings, type SSOSettingsValues } from "@/app/(dashboard)/hooks/sso/useSSOSettings";
 import { useEditSSOSettings } from "@/app/(dashboard)/hooks/sso/useEditSSOSettings";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
@@ -74,6 +75,7 @@ export const toSSOFormValues = (values: SSOSettingsValues): SSOSettingsFormValue
 };
 
 const EditSSOSettingsModal: React.FC<EditSSOSettingsModalProps> = ({ isVisible, onCancel, onSuccess }) => {
+  const { t } = useTranslation();
   const ssoSettings = useSSOSettings();
   const { mutateAsync, isPending } = useEditSSOSettings();
 
@@ -86,19 +88,24 @@ const EditSSOSettingsModal: React.FC<EditSSOSettingsModalProps> = ({ isVisible,
 
   const handleFormSubmit = async (formValues: SSOSettingsFormValues) => {
     try {
-      const payload = processSSOSettingsPayload(formValues);
+      const payload = diffSSOSettingsPayload(
+        processSSOSettingsPayload(seededValues),
+        processSSOSettingsPayload(formValues),
+      );
 
       await mutateAsync(payload, {
         onSuccess: () => {
-          toast.success("SSO settings updated successfully");
+          toast.success(t("adminPanel.ssoSettings.editModal.toasts.success"));
           onSuccess();
         },
         onError: (error) => {
-          toast.fromError("Failed to save SSO settings: " + parseErrorMessage(error));
+          toast.fromError(
+            t("adminPanel.ssoSettings.editModal.toasts.saveFailed", { error: String(parseErrorMessage(error)) }),
+          );
         },
       });
     } catch (error) {
-      toast.fromError("Failed to process SSO settings: " + parseErrorMessage(error));
+      toast.fromError(t("adminPanel.ssoSettings.editModal.toasts.processFailed", { error: parseErrorMessage(error) }));
     }
   };
 
@@ -111,13 +118,13 @@ const EditSSOSettingsModal: React.FC<EditSSOSettingsModalProps> = ({ isVisible,
     <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
         <DialogHeader>
-          <DialogTitle>Edit SSO Settings</DialogTitle>
+          <DialogTitle>{t("adminPanel.ssoSettings.editModal.title")}</DialogTitle>
         </DialogHeader>
         <BaseSSOSettingsForm form={form} onFormSubmit={handleFormSubmit} />
         <DialogFooter>
           <div className="flex items-center justify-end gap-2">
             <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
-              Cancel
+              {t("adminPanel.ssoSettings.editModal.cancel")}
             </Button>
             <Button
               type="button"
@@ -125,7 +132,7 @@ const EditSSOSettingsModal: React.FC<EditSSOSettingsModalProps> = ({ isVisible,
               onClick={submitMountedSSOValues(form, "sso-settings", handleFormSubmit)}
             >
               {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
-              {isPending ? "Saving..." : "Save"}
+              {isPending ? t("adminPanel.ssoSettings.editModal.saving") : t("adminPanel.ssoSettings.editModal.save")}
             </Button>
           </div>
         </DialogFooter>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RedactableField.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RedactableField.tsx
index 04ef3309e5a..dcd403ac686 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RedactableField.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RedactableField.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 import { Eye, EyeOff } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { Button } from "@/components/ui/button";
 
@@ -10,6 +11,7 @@ export default function RedactableField({
   defaultHidden?: boolean;
   value: string | null;
 }) {
+  const { t } = useTranslation();
   const [isHidden, setIsHidden] = useState(defaultHidden);
 
   return (
@@ -22,7 +24,9 @@ export default function RedactableField({
             value
           )
         ) : (
-          <span className="text-muted-foreground italic">Not configured</span>
+          <span className="text-muted-foreground italic">
+            {t("adminPanel.ssoSettings.redactableField.notConfigured")}
+          </span>
         )}
       </span>
       {value && (
@@ -30,7 +34,11 @@ export default function RedactableField({
           type="button"
           variant="ghost"
           size="icon-sm"
-          aria-label={isHidden ? "Show value" : "Hide value"}
+          aria-label={
+            isHidden
+              ? t("adminPanel.ssoSettings.redactableField.showValue")
+              : t("adminPanel.ssoSettings.redactableField.hideValue")
+          }
           onClick={() => setIsHidden(!isHidden)}
           className="text-muted-foreground"
         >
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx
index 966a2a9904d..c3cdd81ee69 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx
@@ -5,6 +5,7 @@ import { StatusBadge } from "@/components/shared/table_cells/status_badge";
 import { Card, CardContent } from "@/components/ui/card";
 import { Separator } from "@/components/ui/separator";
 import { Users } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { defaultRoleDisplayNames } from "./constants";
 
 const inlineCodeClass = "rounded-sm border border-border bg-muted px-1 py-0.5 font-mono text-xs";
@@ -15,6 +16,8 @@ interface RoleMappingRow {
 }
 
 export default function RoleMappings({ roleMappings }: { roleMappings: RoleMappingsType | undefined }) {
+  const { t } = useTranslation();
+
   if (!roleMappings) {
     return null;
   }
@@ -23,13 +26,19 @@ export default function RoleMappings({ roleMappings }: { roleMappings: RoleMappi
     {
       id: "role",
       accessorKey: "role",
-      header: "Role",
-      cell: ({ row }) => <strong className="font-semibold">{defaultRoleDisplayNames[row.original.role]}</strong>,
+      header: t("adminPanel.ssoSettings.roleMappings.columns.role"),
+      cell: ({ row }) => (
+        <strong className="font-semibold">
+          {Object.hasOwn(defaultRoleDisplayNames, row.original.role)
+            ? t(defaultRoleDisplayNames[row.original.role])
+            : ""}
+        </strong>
+      ),
     },
     {
       id: "groups",
       accessorKey: "groups",
-      header: "Mapped Groups",
+      header: t("adminPanel.ssoSettings.roleMappings.columns.mappedGroups"),
       cell: ({ row }) =>
         row.original.groups.length > 0 ? (
           <div className="flex flex-wrap gap-1">
@@ -38,7 +47,7 @@ export default function RoleMappings({ roleMappings }: { roleMappings: RoleMappi
             ))}
           </div>
         ) : (
-          <span className="text-muted-foreground italic">No groups mapped</span>
+          <span className="text-muted-foreground italic">{t("adminPanel.ssoSettings.roleMappings.noGroups")}</span>
         ),
     },
   ];
@@ -47,20 +56,30 @@ export default function RoleMappings({ roleMappings }: { roleMappings: RoleMappi
       <CardContent>
         <div className="flex items-center gap-3">
           <Users className="w-6 h-6 text-muted-foreground mb-2" />
-          <h3 className="mb-2 text-2xl font-semibold text-foreground">Role Mappings</h3>
+          <h3 className="mb-2 text-2xl font-semibold text-foreground">
+            {t("adminPanel.ssoSettings.roleMappings.title")}
+          </h3>
         </div>
         <div className="space-y-8">
           <div className="grid grid-cols-2 gap-4">
             <div>
-              <h5 className="mb-2 text-base font-semibold text-foreground">Group Claim</h5>
+              <h5 className="mb-2 text-base font-semibold text-foreground">
+                {t("adminPanel.ssoSettings.roleMappings.groupClaim")}
+              </h5>
               <div>
                 <code className={inlineCodeClass}>{roleMappings.group_claim}</code>
               </div>
             </div>
             <div>
-              <h5 className="mb-2 text-base font-semibold text-foreground">Default Role</h5>
+              <h5 className="mb-2 text-base font-semibold text-foreground">
+                {t("adminPanel.ssoSettings.roleMappings.defaultRole")}
+              </h5>
               <div>
-                <strong className="font-semibold">{defaultRoleDisplayNames[roleMappings.default_role]}</strong>
+                <strong className="font-semibold">
+                  {Object.hasOwn(defaultRoleDisplayNames, roleMappings.default_role)
+                    ? t(defaultRoleDisplayNames[roleMappings.default_role])
+                    : ""}
+                </strong>
               </div>
             </div>
           </div>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettings.tsx
index 90d78c0ce72..f1ad427be8c 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettings.tsx
@@ -2,6 +2,7 @@
 
 import { Copy, Edit, Shield, Trash2 } from "lucide-react";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { useSSOSettings, type SSOSettingsValues } from "@/app/(dashboard)/hooks/sso/useSSOSettings";
 import { Logo } from "@/components/molecules/logo/Logo";
@@ -21,7 +22,8 @@ import { ssoProviderDisplayNames, ssoProviderLogoMap } from "./constants";
 import { detectSSOProvider } from "./utils";
 
 function NotConfigured() {
-  return <span className="text-muted-foreground italic">Not configured</span>;
+  const { t } = useTranslation();
+  return <span className="text-muted-foreground italic">{t("adminPanel.ssoSettings.details.notConfigured")}</span>;
 }
 
 function DetailRow({ children, label }: { children: React.ReactNode; label: string }) {
@@ -34,6 +36,7 @@ function DetailRow({ children, label }: { children: React.ReactNode; label: stri
 }
 
 function EndpointValue({ value }: { value?: string | null }) {
+  const { t } = useTranslation();
   if (!value) return <span className="font-mono text-muted-foreground">-</span>;
 
   return (
@@ -43,8 +46,8 @@ function EndpointValue({ value }: { value?: string | null }) {
         type="button"
         variant="ghost"
         size="icon-sm"
-        aria-label="Copy value"
-        onClick={() => void copyToClipboard(value, "Copied to clipboard")}
+        aria-label={t("adminPanel.ssoSettings.details.copyValue")}
+        onClick={() => void copyToClipboard(value, t("adminPanel.ssoSettings.details.copied"))}
       >
         <Copy className="size-3.5" />
       </Button>
@@ -53,6 +56,7 @@ function EndpointValue({ value }: { value?: string | null }) {
 }
 
 export default function SSOSettings() {
+  const { t } = useTranslation();
   const { data: ssoSettings, refetch, isLoading } = useSSOSettings();
   const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
   const [isAddModalVisible, setIsAddModalVisible] = useState(false);
@@ -78,119 +82,155 @@ export default function SSOSettings() {
 
   const providerConfigs = {
     google: {
-      providerText: ssoProviderDisplayNames.google,
+      providerText: t(ssoProviderDisplayNames.google),
       fields: [
         {
-          label: "Client ID",
+          label: t("adminPanel.ssoSettings.details.clientId"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.google_client_id} />,
         },
         {
-          label: "Client Secret",
+          label: t("adminPanel.ssoSettings.details.clientSecret"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.google_client_secret} />,
         },
-        { label: "Proxy Base URL", render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url) },
+        {
+          label: t("adminPanel.ssoSettings.details.proxyBaseUrl"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url),
+        },
       ],
     },
     microsoft: {
-      providerText: ssoProviderDisplayNames.microsoft,
+      providerText: t(ssoProviderDisplayNames.microsoft),
       fields: [
         {
-          label: "Client ID",
+          label: t("adminPanel.ssoSettings.details.clientId"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.microsoft_client_id} />,
         },
         {
-          label: "Client Secret",
+          label: t("adminPanel.ssoSettings.details.clientSecret"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.microsoft_client_secret} />,
         },
-        { label: "Tenant", render: (values: SSOSettingsValues) => renderSimpleValue(values.microsoft_tenant) },
-        { label: "Proxy Base URL", render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url) },
+        {
+          label: t("adminPanel.ssoSettings.details.tenant"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.microsoft_tenant),
+        },
+        {
+          label: t("adminPanel.ssoSettings.details.proxyBaseUrl"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url),
+        },
       ],
     },
     okta: {
-      providerText: ssoProviderDisplayNames.okta,
+      providerText: t(ssoProviderDisplayNames.okta),
       fields: [
         {
-          label: "Client ID",
+          label: t("adminPanel.ssoSettings.details.clientId"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.generic_client_id} />,
         },
         {
-          label: "Client Secret",
+          label: t("adminPanel.ssoSettings.details.clientSecret"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.generic_client_secret} />,
         },
         {
-          label: "Authorization Endpoint",
+          label: t("adminPanel.ssoSettings.details.authorizationEndpoint"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.generic_authorization_endpoint} />,
         },
         {
-          label: "Token Endpoint",
+          label: t("adminPanel.ssoSettings.details.tokenEndpoint"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.generic_token_endpoint} />,
         },
         {
-          label: "User Info Endpoint",
+          label: t("adminPanel.ssoSettings.details.userInfoEndpoint"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.generic_userinfo_endpoint} />,
         },
-        { label: "Scopes", render: (values: SSOSettingsValues) => renderSimpleValue(values.generic_scope) },
-        { label: "Proxy Base URL", render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url) },
+        {
+          label: t("adminPanel.ssoSettings.details.scopes"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.generic_scope),
+        },
+        {
+          label: t("adminPanel.ssoSettings.details.proxyBaseUrl"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url),
+        },
         isTeamMappingsEnabled
-          ? { label: "Team IDs JWT Field", render: (values: SSOSettingsValues) => renderTeamMappingsField(values) }
+          ? {
+              label: t("adminPanel.ssoSettings.details.teamIdsJwtField"),
+              render: (values: SSOSettingsValues) => renderTeamMappingsField(values),
+            }
           : null,
       ],
     },
     generic: {
-      providerText: ssoProviderDisplayNames.generic,
+      providerText: t(ssoProviderDisplayNames.generic),
       fields: [
         {
-          label: "Client ID",
+          label: t("adminPanel.ssoSettings.details.clientId"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.generic_client_id} />,
         },
         {
-          label: "Client Secret",
+          label: t("adminPanel.ssoSettings.details.clientSecret"),
           render: (values: SSOSettingsValues) => <RedactableField value={values.generic_client_secret} />,
         },
         {
-          label: "Authorization Endpoint",
+          label: t("adminPanel.ssoSettings.details.authorizationEndpoint"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.generic_authorization_endpoint} />,
         },
         {
-          label: "Token Endpoint",
+          label: t("adminPanel.ssoSettings.details.tokenEndpoint"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.generic_token_endpoint} />,
         },
         {
-          label: "User Info Endpoint",
+          label: t("adminPanel.ssoSettings.details.userInfoEndpoint"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.generic_userinfo_endpoint} />,
         },
-        { label: "Scopes", render: (values: SSOSettingsValues) => renderSimpleValue(values.generic_scope) },
-        { label: "Proxy Base URL", render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url) },
+        {
+          label: t("adminPanel.ssoSettings.details.scopes"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.generic_scope),
+        },
+        {
+          label: t("adminPanel.ssoSettings.details.proxyBaseUrl"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url),
+        },
         isTeamMappingsEnabled
-          ? { label: "Team IDs JWT Field", render: (values: SSOSettingsValues) => renderTeamMappingsField(values) }
+          ? {
+              label: t("adminPanel.ssoSettings.details.teamIdsJwtField"),
+              render: (values: SSOSettingsValues) => renderTeamMappingsField(values),
+            }
           : null,
       ],
     },
     saml: {
-      providerText: ssoProviderDisplayNames.saml,
+      providerText: t(ssoProviderDisplayNames.saml),
       fields: [
         {
-          label: "IdP Metadata URL",
+          label: t("adminPanel.ssoSettings.details.samlIdpMetadataUrl"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.saml_idp_metadata_url} />,
         },
         {
-          label: "IdP Metadata XML",
+          label: t("adminPanel.ssoSettings.details.samlIdpMetadataXml"),
           render: (values: SSOSettingsValues) =>
-            values.saml_idp_metadata_xml ? <Badge variant="secondary">Provided</Badge> : <NotConfigured />,
+            values.saml_idp_metadata_xml ? (
+              <Badge variant="secondary">{t("adminPanel.ssoSettings.details.provided")}</Badge>
+            ) : (
+              <NotConfigured />
+            ),
         },
         {
-          label: "SP Entity ID",
+          label: t("adminPanel.ssoSettings.details.samlSpEntityId"),
           render: (values: SSOSettingsValues) => <EndpointValue value={values.saml_sp_entity_id} />,
         },
         {
-          label: "Allow IdP-initiated (unsolicited) responses",
+          label: t("adminPanel.ssoSettings.details.samlAllowUnsolicited"),
           render: (values: SSOSettingsValues) => (
             <Badge variant={values.saml_allow_unsolicited === "true" ? "default" : "secondary"}>
-              {values.saml_allow_unsolicited === "true" ? "Enabled" : "Disabled"}
+              {values.saml_allow_unsolicited === "true"
+                ? t("adminPanel.ssoSettings.details.enabled")
+                : t("adminPanel.ssoSettings.details.disabled")}
             </Badge>
           ),
         },
-        { label: "Proxy Base URL", render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url) },
+        {
+          label: t("adminPanel.ssoSettings.details.proxyBaseUrl"),
+          render: (values: SSOSettingsValues) => renderSimpleValue(values.proxy_base_url),
+        },
       ],
     },
   };
@@ -202,12 +242,16 @@ export default function SSOSettings() {
 
     return (
       <dl className="divide-y divide-border overflow-hidden rounded-md border border-border">
-        <DetailRow label="Provider">
+        <DetailRow label={t("adminPanel.ssoSettings.details.provider")}>
           <div className="flex items-center gap-2">
             {ssoProviderLogoMap[selectedProvider] && (
               <Logo
                 src={ssoProviderLogoMap[selectedProvider]}
-                label={ssoProviderDisplayNames[selectedProvider] || selectedProvider}
+                label={
+                  Object.hasOwn(ssoProviderDisplayNames, selectedProvider)
+                    ? t(ssoProviderDisplayNames[selectedProvider])
+                    : selectedProvider
+                }
                 className="size-6 object-contain"
               />
             )}
@@ -238,20 +282,20 @@ export default function SSOSettings() {
                 <Shield className="size-6 text-muted-foreground" />
                 <div>
                   <CardTitle>
-                    <h3>SSO Configuration</h3>
+                    <h3>{t("adminPanel.ssoSettings.header.title")}</h3>
                   </CardTitle>
-                  <CardDescription>Manage Single Sign-On authentication settings</CardDescription>
+                  <CardDescription>{t("adminPanel.ssoSettings.header.description")}</CardDescription>
                 </div>
               </div>
               {isSSOConfigured && (
                 <CardAction className="flex gap-2">
                   <Button type="button" variant="outline" onClick={() => setIsEditModalVisible(true)}>
                     <Edit />
-                    Edit SSO Settings
+                    {t("adminPanel.ssoSettings.actions.edit")}
                   </Button>
                   <Button type="button" variant="destructive" onClick={() => setIsDeleteModalVisible(true)}>
                     <Trash2 />
-                    Delete SSO Settings
+                    {t("adminPanel.ssoSettings.actions.delete")}
                   </Button>
                 </CardAction>
               )}
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsEmptyPlaceholder.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsEmptyPlaceholder.tsx
index 3afc2014125..8b0b8381e34 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsEmptyPlaceholder.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsEmptyPlaceholder.tsx
@@ -1,4 +1,5 @@
 import { Shield } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { Button } from "@/components/ui/button";
 
@@ -7,18 +8,18 @@ interface SSOSettingsEmptyPlaceholderProps {
 }
 
 export default function SSOSettingsEmptyPlaceholder({ onAdd }: SSOSettingsEmptyPlaceholderProps) {
+  const { t } = useTranslation();
   return (
     <div className="flex w-full flex-col items-center rounded-lg border border-dashed border-border bg-card p-12 text-center">
       <div className="mb-4 flex size-12 items-center justify-center rounded-full bg-muted">
         <Shield className="size-6 text-muted-foreground" />
       </div>
-      <h4 className="text-base font-semibold text-foreground">No SSO Configuration Found</h4>
+      <h4 className="text-base font-semibold text-foreground">{t("adminPanel.ssoSettings.emptyPlaceholder.title")}</h4>
       <p className="mx-auto mt-2 max-w-md text-sm text-muted-foreground">
-        Configure Single Sign-On (SSO) to enable seamless authentication for your team members using your identity
-        provider.
+        {t("adminPanel.ssoSettings.emptyPlaceholder.description")}
       </p>
       <Button size="lg" onClick={onAdd} className="mt-4">
-        Configure SSO
+        {t("adminPanel.ssoSettings.emptyPlaceholder.configure")}
       </Button>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsLoadingSkeleton.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsLoadingSkeleton.tsx
index ad1db99638b..500704b42fd 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsLoadingSkeleton.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/SSOSettingsLoadingSkeleton.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Shield } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
@@ -8,14 +9,15 @@ import { Skeleton } from "@/components/ui/skeleton";
 const CONTENT_WIDTHS = ["w-24", "w-48", "w-60", "w-44", "w-52"];
 
 export default function SSOSettingsLoadingSkeleton() {
+  const { t } = useTranslation();
   return (
-    <Card role="status" aria-label="Loading SSO configuration">
+    <Card role="status" aria-label={t("adminPanel.ssoSettings.header.loading")}>
       <CardHeader className="flex flex-row items-center justify-between">
         <div className="flex items-center gap-3">
           <Shield className="size-6 text-muted-foreground" />
           <div>
-            <h3 className="text-lg font-semibold text-foreground">SSO Configuration</h3>
-            <p className="text-sm text-muted-foreground">Manage Single Sign-On authentication settings</p>
+            <h3 className="text-lg font-semibold text-foreground">{t("adminPanel.ssoSettings.header.title")}</h3>
+            <p className="text-sm text-muted-foreground">{t("adminPanel.ssoSettings.header.description")}</p>
           </div>
         </div>
         <div className="flex items-center gap-3">
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/constants.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/constants.ts
index 19a64a59ca1..e25d45e3da8 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/constants.ts
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/constants.ts
@@ -1,3 +1,4 @@
+import type { ParseKeys } from "i18next";
 import googleLogo from "../../../../../public/assets/logos/google.svg";
 import microsoftAzureLogo from "../../../../../public/assets/logos/microsoft_azure.svg";
 
@@ -11,17 +12,17 @@ export const ssoProviderLogoMap: Record<string, string> = {
 };
 
 // SSO Provider display names (consistent between select dropdown and table)
-export const ssoProviderDisplayNames: Record<string, string> = {
-  google: "Google SSO",
-  microsoft: "Microsoft SSO",
-  okta: "Okta / Auth0 SSO",
-  generic: "Generic SSO",
-  saml: "SAML SSO",
+export const ssoProviderDisplayNames: Record<string, ParseKeys> = {
+  google: "adminPanel.ssoSettings.providers.google",
+  microsoft: "adminPanel.ssoSettings.providers.microsoft",
+  okta: "adminPanel.ssoSettings.providers.okta",
+  generic: "adminPanel.ssoSettings.providers.generic",
+  saml: "adminPanel.ssoSettings.providers.saml",
 };
 
-export const defaultRoleDisplayNames: Record<string, string> = {
-  internal_user_viewer: "Internal Viewer",
-  internal_user: "Internal User",
-  proxy_admin_viewer: "Proxy Admin Viewer",
-  proxy_admin: "Proxy Admin",
+export const defaultRoleDisplayNames: Record<string, ParseKeys> = {
+  internal_user_viewer: "adminPanel.ssoSettings.roles.internalUserViewer",
+  internal_user: "adminPanel.ssoSettings.roles.internalUser",
+  proxy_admin_viewer: "adminPanel.ssoSettings.roles.proxyAdminViewer",
+  proxy_admin: "adminPanel.ssoSettings.roles.proxyAdmin",
 };
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.test-d.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.test-d.ts
new file mode 100644
index 00000000000..c5f50e391ac
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.test-d.ts
@@ -0,0 +1,12 @@
+import { describe, expectTypeOf, test } from "vitest";
+
+import type { components } from "@/lib/http/schema";
+import { CLEARED_SSO_SETTINGS } from "./utils";
+
+describe("SSO settings utils types", () => {
+  test("clearing SSO settings sends null for exactly the fields the backend declares", () => {
+    expectTypeOf(CLEARED_SSO_SETTINGS).toEqualTypeOf<{
+      readonly [K in keyof components["schemas"]["SSOConfig"]]-?: null;
+    }>();
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.test.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.test.ts
index b280f5e92ec..b0d519afcbc 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.test.ts
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.test.ts
@@ -1,4 +1,4 @@
-import { detectSSOProvider, processSSOSettingsPayload } from "./utils";
+import { detectSSOProvider, diffSSOSettingsPayload, processSSOSettingsPayload } from "./utils";
 import { describe, it, expect } from "vitest";
 import type { SSOSettingsValues } from "@/app/(dashboard)/hooks/sso/useSSOSettings";
 
@@ -452,3 +452,58 @@ describe("processSSOSettingsPayload with SAML", () => {
     ).toBe("false");
   });
 });
+
+describe("diffSSOSettingsPayload", () => {
+  const stored = {
+    sso_provider: "generic",
+    generic_client_id: "client-id",
+    generic_client_secret: "kc-s****6e0d",
+    user_email: "admin@example.com",
+    role_mappings: { group_claim: "groups", roles: { proxy_admin: ["admins"] } },
+  };
+
+  it("returns an empty patch when nothing changed", () => {
+    expect(diffSSOSettingsPayload(stored, { ...stored })).toEqual({});
+  });
+
+  it("leaves an untouched masked secret out of the patch", () => {
+    expect(diffSSOSettingsPayload(stored, { ...stored, user_email: "new@example.com" })).toEqual({
+      user_email: "new@example.com",
+    });
+  });
+
+  it("sends null for a field that was emptied", () => {
+    expect(diffSSOSettingsPayload(stored, { ...stored, generic_client_secret: "" })).toEqual({
+      generic_client_secret: null,
+    });
+  });
+
+  it("sends null for fields dropped from the payload, like another provider's or disabled mappings", () => {
+    const { generic_client_id, generic_client_secret, role_mappings, ...rest } = stored;
+    expect(diffSSOSettingsPayload(stored, { ...rest, sso_provider: "google", google_client_id: "g-id" })).toEqual({
+      sso_provider: "google",
+      google_client_id: "g-id",
+      generic_client_id: null,
+      generic_client_secret: null,
+      role_mappings: null,
+    });
+  });
+
+  it("sends the whole mapping object when one part of it changed", () => {
+    const role_mappings = { group_claim: "roles", roles: { proxy_admin: ["admins"] } };
+    expect(diffSSOSettingsPayload(stored, { ...stored, role_mappings })).toEqual({ role_mappings });
+  });
+
+  it("treats empty values on both sides as unchanged", () => {
+    expect(diffSSOSettingsPayload({ generic_scope: undefined, proxy_base_url: "" }, { proxy_base_url: null })).toEqual(
+      {},
+    );
+  });
+
+  it("treats an unchecked saml_allow_unsolicited as unset, but sends false when it was true", () => {
+    expect(diffSSOSettingsPayload({ saml_allow_unsolicited: "false" }, {})).toEqual({});
+    expect(diffSSOSettingsPayload({ saml_allow_unsolicited: "true" }, { saml_allow_unsolicited: "false" })).toEqual({
+      saml_allow_unsolicited: "false",
+    });
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.ts b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.ts
index 768fc7e8e0e..93af987adde 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.ts
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/utils.ts
@@ -71,6 +71,49 @@ export const processSSOSettingsPayload = (formValues: Record<string, any>): Reco
   return payload;
 };
 
+const isEmptySSOValue = (value: unknown): boolean => value === undefined || value === null || value === "";
+
+// An unchecked saml_allow_unsolicited is the same as never having set it
+const comparableSSOValue = (key: string, value: unknown): unknown =>
+  isEmptySSOValue(value) || (key === "saml_allow_unsolicited" && value === "false") ? undefined : value;
+
+// /update/sso_settings is a PATCH: send only the fields that changed, with null for the ones that were emptied
+export const diffSSOSettingsPayload = (
+  before: Record<string, unknown>,
+  after: Record<string, unknown>,
+): Record<string, unknown> =>
+  Object.fromEntries(
+    [...new Set([...Object.keys(before), ...Object.keys(after)])]
+      .filter(
+        (key) =>
+          JSON.stringify(comparableSSOValue(key, before[key])) !== JSON.stringify(comparableSSOValue(key, after[key])),
+      )
+      .map((key) => [key, isEmptySSOValue(after[key]) ? null : after[key]]),
+  );
+
+export const CLEARED_SSO_SETTINGS = {
+  google_client_id: null,
+  google_client_secret: null,
+  microsoft_client_id: null,
+  microsoft_client_secret: null,
+  microsoft_tenant: null,
+  generic_client_id: null,
+  generic_client_secret: null,
+  generic_authorization_endpoint: null,
+  generic_token_endpoint: null,
+  generic_userinfo_endpoint: null,
+  generic_scope: null,
+  saml_idp_metadata_url: null,
+  saml_idp_metadata_xml: null,
+  saml_sp_entity_id: null,
+  saml_allow_unsolicited: null,
+  proxy_base_url: null,
+  user_email: null,
+  ui_access_mode: null,
+  role_mappings: null,
+  team_mappings: null,
+} as const;
+
 // Determine the SSO provider based on the configuration
 export const detectSSOProvider = (values: SSOSettingsValues): string | null => {
   if (values.google_client_id) return "google";
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/BackgroundChatSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/BackgroundChatSettings.tsx
index 428edfff86d..9ca2ee49ce0 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/BackgroundChatSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/BackgroundChatSettings.tsx
@@ -1,3 +1,5 @@
+import { Trans, useTranslation } from "react-i18next";
+
 import { $api } from "@/lib/http/api";
 import { toast } from "@/lib/toast";
 import { Button } from "@/components/ui/button";
@@ -6,11 +8,12 @@ import { Switch } from "@/components/ui/switch";
 import { uiHref } from "@/utils/uiHref";
 
 export default function BackgroundChatSettings() {
+  const { t } = useTranslation();
   const query = $api.useQuery("get", "/get/background_chat_settings");
   const update = $api.useMutation("patch", "/update/background_chat_settings", {
     onSuccess: () => {
       void query.refetch();
-      toast.success("Background chat settings saved.");
+      toast.success(t("adminPanel.backgroundChat.toasts.saved"));
     },
     onError: (error) => toast.fromError(error),
   });
@@ -19,9 +22,9 @@ export default function BackgroundChatSettings() {
   if (query.isError || !query.data)
     return (
       <div role="alert" className="text-sm text-destructive">
-        Could not load background chat settings.
+        {t("adminPanel.backgroundChat.errors.loadFailed")}
         <Button variant="ghost" size="sm" onClick={() => void query.refetch()}>
-          Retry
+          {t("adminPanel.backgroundChat.retry")}
         </Button>
       </div>
     );
@@ -37,36 +40,29 @@ export default function BackgroundChatSettings() {
         checked={settings.enabled}
         disabled={disabled}
         onCheckedChange={(enabled) => update.mutate({ body: { enabled } })}
-        aria-label="Continue chats in the background"
+        aria-label={t("adminPanel.backgroundChat.label")}
         aria-describedby="background-chat-description"
       />
       <div className="space-y-1">
-        <p className="text-sm font-medium text-foreground">Continue chats in the background</p>
+        <p className="text-sm font-medium text-foreground">{t("adminPanel.backgroundChat.label")}</p>
         <p id="background-chat-description" className="text-sm text-muted-foreground">
-          Keep replies and tool runs going after users close the browser. Return to the same browser to see the result.
+          {t("adminPanel.backgroundChat.description")}
         </p>
         {!settings.redis_configured && (
           <p className="text-sm text-muted-foreground">
-            Requires Redis.{" "}
-            <a className="text-primary underline" href={uiHref("/caching")}>
-              Configure it in Caching → Coordination Redis
-            </a>
-            , then restart the proxy.
+            <Trans
+              i18nKey="adminPanel.backgroundChat.requiresRedis"
+              components={{ cachingLink: <a className="text-primary underline" href={uiHref("/caching")} /> }}
+            />
           </p>
         )}
         {settings.managed_by_config && (
-          <p className="text-sm text-muted-foreground">
-            Managed by your config file. Update its background polling setting to change this.
-          </p>
+          <p className="text-sm text-muted-foreground">{t("adminPanel.backgroundChat.managedByConfig")}</p>
         )}
         {!settings.can_save && !settings.managed_by_config && (
-          <p className="text-sm text-muted-foreground">Enable database-backed configuration to save this setting.</p>
-        )}
-        {!readOnly && (
-          <p className="text-sm text-muted-foreground">
-            Changes apply automatically when the proxy refreshes its configuration.
-          </p>
+          <p className="text-sm text-muted-foreground">{t("adminPanel.backgroundChat.dbConfigRequired")}</p>
         )}
+        {!readOnly && <p className="text-sm text-muted-foreground">{t("adminPanel.backgroundChat.autoApply")}</p>}
       </div>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/PageVisibilitySettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/PageVisibilitySettings.tsx
index 723451bf3e5..e017aa3f24c 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/PageVisibilitySettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/PageVisibilitySettings.tsx
@@ -3,6 +3,7 @@
 import { useTerminology } from "@/contexts/TerminologyContext";
 import { ChevronDown } from "lucide-react";
 import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { getAvailablePages } from "@/components/page_utils";
 import { Badge } from "@/components/ui/badge";
@@ -23,6 +24,7 @@ export default function PageVisibilitySettings({
   isUpdating,
   onUpdate,
 }: PageVisibilitySettingsProps) {
+  const { t } = useTranslation();
   const term = useTerminology();
   const isPageVisibilitySet = enabledPagesInternalUsers !== null && enabledPagesInternalUsers !== undefined;
   const availablePages = useMemo(() => getAvailablePages(), []);
@@ -59,28 +61,23 @@ export default function PageVisibilitySettings({
     <div className="space-y-4">
       <div className="space-y-1">
         <div className="flex items-center gap-2">
-          <p className="text-sm font-medium text-foreground">Internal User Page Visibility</p>
+          <p className="text-sm font-medium text-foreground">{t("adminPanel.pageVisibility.title")}</p>
           <Badge variant={isPageVisibilitySet ? "secondary" : "outline"}>
             {isPageVisibilitySet
-              ? `${selectedPages.length} page${selectedPages.length !== 1 ? "s" : ""} selected`
-              : "Not set (all pages visible)"}
+              ? t("adminPanel.pageVisibility.selectedCount", { count: selectedPages.length })
+              : t("adminPanel.pageVisibility.notSet")}
           </Badge>
         </div>
         {enabledPagesPropertyDescription && (
           <p className="text-sm text-muted-foreground">{enabledPagesPropertyDescription}</p>
         )}
-        <p className="text-xs italic text-muted-foreground">
-          By default, all pages are visible to internal users. Select specific pages to restrict visibility.
-        </p>
-        <p className="text-xs text-primary">
-          Note: Only pages accessible to internal user roles are shown here. Admin-only pages are excluded as they
-          cannot be made visible to internal users regardless of this setting.
-        </p>
+        <p className="text-xs italic text-muted-foreground">{t("adminPanel.pageVisibility.defaultHint")}</p>
+        <p className="text-xs text-primary">{t("adminPanel.pageVisibility.adminOnlyNote")}</p>
       </div>
 
       <Collapsible className="rounded-lg border border-border">
         <CollapsibleTrigger className="group flex w-full items-center justify-between rounded-lg px-3 py-2 text-sm font-medium hover:bg-muted">
-          Configure Page Visibility
+          {t("adminPanel.pageVisibility.configure")}
           <ChevronDown className="size-4 transition-transform group-data-[panel-open]:rotate-180" />
         </CollapsibleTrigger>
         <CollapsibleContent className="border-t border-border p-4">
@@ -113,11 +110,11 @@ export default function PageVisibilitySettings({
 
             <div className="flex flex-wrap gap-2">
               <Button type="button" onClick={handleSavePageVisibility} disabled={isUpdating}>
-                Save Page Visibility Settings
+                {t("adminPanel.pageVisibility.save")}
               </Button>
               {isPageVisibilitySet && (
                 <Button type="button" variant="outline" onClick={handleResetToDefault} disabled={isUpdating}>
-                  Reset to Default (All Pages)
+                  {t("adminPanel.pageVisibility.reset")}
                 </Button>
               )}
             </div>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/TeamAdminEditableFieldsSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/TeamAdminEditableFieldsSettings.tsx
index dc713a28b1e..718ae4e37e2 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/TeamAdminEditableFieldsSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/TeamAdminEditableFieldsSettings.tsx
@@ -1,8 +1,10 @@
 "use client";
 
+import type { ParseKeys } from "i18next";
 import { CircleHelp } from "lucide-react";
 import { Fragment, type ReactNode } from "react";
 import { Controller } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 
 import { useUISettings } from "@/app/(dashboard)/hooks/uiSettings/useUISettings";
@@ -32,12 +34,10 @@ type SaveEditableFields = ReturnType<typeof useUpdateUISettings>["mutate"];
 
 const MAX_BUDGET_FIELD: TeamAdminSettingsField = "max_budget";
 
-const RAISE_MAX_BUDGET_HELP_LABEL = "About raising the team's max budget";
-const RAISE_MAX_BUDGET_TOOLTIP =
-  "Lets team admins raise the budget too, capped by the organization's budget when the team has one. Only proxy admins can remove it.";
-const METADATA_HELP_LABEL = "About editing team metadata";
-const METADATA_TOOLTIP =
-  "Lets team admins add, change and remove their own metadata keys. Keys the proxy reads as settings stay with proxy admins, and keys declared in the team metadata schema can be changed but not removed.";
+const RAISE_MAX_BUDGET_HELP_LABEL: ParseKeys = "adminPanel.teamAdminEditableFields.raiseMaxBudgetHelp.ariaLabel";
+const RAISE_MAX_BUDGET_TOOLTIP: ParseKeys = "adminPanel.teamAdminEditableFields.raiseMaxBudgetHelp.tooltip";
+const METADATA_HELP_LABEL: ParseKeys = "adminPanel.teamAdminEditableFields.metadataHelp.ariaLabel";
+const METADATA_TOOLTIP: ParseKeys = "adminPanel.teamAdminEditableFields.metadataHelp.tooltip";
 const TEAM_ADMIN_FIELDS_DOCS_URL =
   "https://docs.litellm.ai/docs/proxy/access_control#choosing-what-team-admins-can-edit";
 
@@ -54,6 +54,7 @@ const toggleEditableField = (
 };
 
 export default function TeamAdminEditableFieldsSettings() {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data, isLoading } = useUISettings();
   const { mutate: saveSettings, isPending } = useUpdateUISettings(accessToken);
@@ -65,16 +66,16 @@ export default function TeamAdminEditableFieldsSettings() {
     <Card>
       <CardHeader>
         <div className="flex items-center gap-2">
-          <CardTitle>Team admin editable fields</CardTitle>
+          <CardTitle>{t("adminPanel.teamAdminEditableFields.title")}</CardTitle>
           <Badge variant={enabledFields.length > 0 ? "secondary" : "outline"}>
             {enabledFields.length > 0
-              ? `${enabledFields.length} field${enabledFields.length !== 1 ? "s" : ""} enabled`
-              : "Team admins cannot edit team settings"}
+              ? t("adminPanel.teamAdminEditableFields.enabledCount", { count: enabledFields.length })
+              : t("adminPanel.teamAdminEditableFields.noneEnabled")}
           </Badge>
         </div>
         <CardDescription>
           {data?.field_schema?.properties?.team_admin_editable_team_fields?.description ??
-            "Team settings fields a team admin may change on the teams they administer."}
+            t("adminPanel.teamAdminEditableFields.defaultDescription")}
         </CardDescription>
       </CardHeader>
       <CardContent>
@@ -107,6 +108,7 @@ function TeamAdminEditableFieldsForm({
   isPending,
   saveSettings,
 }: TeamAdminEditableFieldsFormProps) {
+  const { t } = useTranslation();
   const form = useZodForm(editableFieldsSchema, {
     defaultValues: { team_admin_editable_team_fields: [...enabledFields] },
   });
@@ -114,7 +116,7 @@ function TeamAdminEditableFieldsForm({
     saveSettings(values, {
       onSuccess: () => {
         form.reset(values);
-        toast.success("Team admin editable fields updated successfully");
+        toast.success(t("adminPanel.teamAdminEditableFields.toasts.updated"));
       },
       onError: (error) => {
         toast.fromError(error);
@@ -124,9 +126,7 @@ function TeamAdminEditableFieldsForm({
 
   if (supportedFields.length === 0) {
     return (
-      <p className="text-sm italic text-muted-foreground">
-        This proxy version does not support enabling any team settings fields for team admins yet.
-      </p>
+      <p className="text-sm italic text-muted-foreground">{t("adminPanel.teamAdminEditableFields.unsupported")}</p>
     );
   }
 
@@ -152,7 +152,7 @@ function TeamAdminEditableFieldsForm({
                     onCheckedChange={toggle(name)}
                     help={
                       name === TEAM_ADMIN_METADATA_FIELD ? (
-                        <FieldHelp label={METADATA_HELP_LABEL} text={METADATA_TOOLTIP} />
+                        <FieldHelp label={t(METADATA_HELP_LABEL)} text={t(METADATA_TOOLTIP)} />
                       ) : undefined
                     }
                   />
@@ -163,7 +163,7 @@ function TeamAdminEditableFieldsForm({
                       disabled={isPending || !field.value.includes(MAX_BUDGET_FIELD)}
                       onCheckedChange={toggle(TEAM_ADMIN_RAISE_MAX_BUDGET_PERMISSION)}
                       className="ml-6"
-                      help={<FieldHelp label={RAISE_MAX_BUDGET_HELP_LABEL} text={RAISE_MAX_BUDGET_TOOLTIP} />}
+                      help={<FieldHelp label={t(RAISE_MAX_BUDGET_HELP_LABEL)} text={t(RAISE_MAX_BUDGET_TOOLTIP)} />}
                     />
                   )}
                 </Fragment>
@@ -174,7 +174,7 @@ function TeamAdminEditableFieldsForm({
       />
       <div className="flex justify-end">
         <Button type="submit" disabled={isPending || !form.formState.isDirty}>
-          {isPending ? "Saving..." : "Save"}
+          {isPending ? t("adminPanel.teamAdminEditableFields.saving") : t("adminPanel.teamAdminEditableFields.save")}
         </Button>
       </div>
     </form>
@@ -216,6 +216,7 @@ interface FieldHelpProps {
 }
 
 function FieldHelp({ label, text }: FieldHelpProps) {
+  const { t } = useTranslation();
   return (
     <TooltipProvider>
       <Tooltip>
@@ -230,7 +231,7 @@ function FieldHelp({ label, text }: FieldHelpProps) {
           <span>
             {text}{" "}
             <a href={TEAM_ADMIN_FIELDS_DOCS_URL} target="_blank" rel="noopener noreferrer" className="underline">
-              Learn more
+              {t("adminPanel.teamAdminEditableFields.learnMore")}
             </a>
           </span>
         </TooltipContent>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/UISettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/UISettings.tsx
index 08f345af928..6fe86c0f352 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/UISettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UISettings/UISettings.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useTranslation } from "react-i18next";
 import { useTerminology } from "@/contexts/TerminologyContext";
 import { useUISettings } from "@/app/(dashboard)/hooks/uiSettings/useUISettings";
 import { useUpdateUISettings } from "@/app/(dashboard)/hooks/uiSettings/useUpdateUISettings";
@@ -53,6 +54,7 @@ function SettingRow({
 }
 
 export default function UISettings() {
+  const { t } = useTranslation();
   const term = useTerminology();
   const { accessToken } = useAuthorized();
   const { data, isLoading, isError, error } = useUISettings();
@@ -89,7 +91,7 @@ export default function UISettings() {
       { disable_model_add_for_internal_users: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -103,7 +105,7 @@ export default function UISettings() {
       { disable_team_admin_delete_team_user: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -115,7 +117,7 @@ export default function UISettings() {
   const handleUpdatePageVisibility = (settings: { enabled_ui_pages_internal_users: string[] | null }) => {
     updateSettings(settings, {
       onSuccess: () => {
-        toast.success("Page visibility settings updated successfully");
+        toast.success(t("adminPanel.uiSettings.toasts.pageVisibilityUpdated"));
       },
       onError: (error) => {
         toast.fromError(error);
@@ -128,7 +130,7 @@ export default function UISettings() {
       { forward_client_headers_to_llm_api: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -142,7 +144,7 @@ export default function UISettings() {
       { forward_llm_provider_auth_headers: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -156,7 +158,7 @@ export default function UISettings() {
       { enable_projects_ui: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully. Refreshing page...");
+          toast.success(t("adminPanel.uiSettings.toasts.updatedRefreshing"));
           setTimeout(() => window.location.reload(), 1000);
         },
         onError: (error) => {
@@ -171,7 +173,7 @@ export default function UISettings() {
       { enable_chat_ui: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully. Refreshing page...");
+          toast.success(t("adminPanel.uiSettings.toasts.updatedRefreshing"));
           setTimeout(() => window.location.reload(), 1000);
         },
         onError: (error) => {
@@ -186,7 +188,7 @@ export default function UISettings() {
       { require_auth_for_public_ai_hub: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -200,7 +202,7 @@ export default function UISettings() {
       { disable_agents_for_internal_users: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -214,7 +216,7 @@ export default function UISettings() {
       { allow_agents_for_team_admins: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -228,7 +230,7 @@ export default function UISettings() {
       { disable_vector_stores_for_internal_users: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -242,7 +244,7 @@ export default function UISettings() {
       { allow_vector_stores_for_team_admins: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -256,7 +258,7 @@ export default function UISettings() {
       { scope_user_search_to_org: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -270,7 +272,7 @@ export default function UISettings() {
       { moyai_url: null },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -284,7 +286,7 @@ export default function UISettings() {
       { disable_custom_api_keys: checked },
       {
         onSuccess: () => {
-          toast.success("UI settings updated successfully");
+          toast.success(t("adminPanel.uiSettings.toasts.updated"));
         },
         onError: (error) => {
           toast.fromError(error);
@@ -297,19 +299,19 @@ export default function UISettings() {
     <Card>
       <CardHeader>
         <CardTitle>
-          <h3>UI Settings</h3>
+          <h3>{t("adminPanel.uiSettings.title")}</h3>
         </CardTitle>
       </CardHeader>
       <CardContent>
         {isLoading ? (
-          <div role="status" aria-label="Loading UI settings" className="space-y-3">
+          <div role="status" aria-label={t("adminPanel.uiSettings.loadingAriaLabel")} className="space-y-3">
             <Skeleton className="h-5 w-72" />
             <Skeleton className="h-16 w-full" />
             <Skeleton className="h-16 w-full" />
           </div>
         ) : isError ? (
           <Alert variant="error">
-            <AlertTitle>Could not load UI settings</AlertTitle>
+            <AlertTitle>{t("adminPanel.uiSettings.errors.loadFailed")}</AlertTitle>
             {error instanceof Error && <AlertDescription>{error.message}</AlertDescription>}
           </Alert>
         ) : (
@@ -317,16 +319,15 @@ export default function UISettings() {
             {schema?.description && <p className="text-sm text-foreground">{schema.description}</p>}
             {updateError && (
               <Alert variant="error">
-                <AlertTitle>Could not update UI settings</AlertTitle>
+                <AlertTitle>{t("adminPanel.uiSettings.errors.updateFailed")}</AlertTitle>
                 {updateError instanceof Error && <AlertDescription>{updateError.message}</AlertDescription>}
               </Alert>
             )}
 
             <div className="space-y-2">
-              <Label htmlFor="usage-default-time-range">Default Usage time range</Label>
+              <Label htmlFor="usage-default-time-range">{t("adminPanel.uiSettings.usageRange.label")}</Label>
               <p id="usage-default-time-range-help" className="text-sm text-muted-foreground">
-                The starting range for everyone opening Usage. Shared links and manual date selections take precedence.
-                Calendar ranges use your browser’s timezone.
+                {t("adminPanel.uiSettings.usageRange.help")}
               </p>
               <Select
                 value={usageRange}
@@ -337,7 +338,7 @@ export default function UISettings() {
                   updateSettings(
                     { usage_default_time_range: value },
                     {
-                      onSuccess: () => toast.success("UI settings updated successfully"),
+                      onSuccess: () => toast.success(t("adminPanel.uiSettings.toasts.updated")),
                       onError: (error) => toast.fromError(error),
                     },
                   );
@@ -359,23 +360,26 @@ export default function UISettings() {
                 </SelectContent>
               </Select>
               {usageRangeConfigOwned && (
-                <p className="text-sm text-muted-foreground">Managed by the deployment configuration.</p>
+                <p className="text-sm text-muted-foreground">{t("adminPanel.uiSettings.usageRange.managedByConfig")}</p>
               )}
             </div>
             <SettingRow
               checked={isDisabledForInternalUsers}
               disabled={isUpdating}
               onCheckedChange={handleToggle}
-              ariaLabel={property?.description ?? "Disable model add for internal users"}
-              label="Disable model add for internal users"
+              ariaLabel={property?.description ?? t("adminPanel.uiSettings.settings.disableModelAdd.label")}
+              label={t("adminPanel.uiSettings.settings.disableModelAdd.label")}
               description={property?.description}
             />
             <SettingRow
               checked={isDisabledTeamAdminDeleteTeamUser}
               disabled={isUpdating}
               onCheckedChange={handleToggleTeamAdminDelete}
-              ariaLabel={disableTeamAdminDeleteProperty?.description ?? "Disable team admin delete team user"}
-              label="Disable team admin delete team user"
+              ariaLabel={
+                disableTeamAdminDeleteProperty?.description ??
+                t("adminPanel.uiSettings.settings.disableTeamAdminDelete.label")
+              }
+              label={t("adminPanel.uiSettings.settings.disableTeamAdminDelete.label")}
               description={disableTeamAdminDeleteProperty?.description}
             />
             <SettingRow
@@ -383,9 +387,10 @@ export default function UISettings() {
               disabled={isUpdating}
               onCheckedChange={handleToggleRequireAuthForPublicAIHub}
               ariaLabel={term(
-                requireAuthForPublicAIHubProperty?.description ?? "Require authentication for public AI Hub",
+                requireAuthForPublicAIHubProperty?.description ??
+                  t("adminPanel.uiSettings.settings.requireAuthForPublicAIHub.label"),
               )}
-              label={term("Require authentication for public AI Hub")}
+              label={term(t("adminPanel.uiSettings.settings.requireAuthForPublicAIHub.label"))}
               description={
                 requireAuthForPublicAIHubProperty?.description && term(requireAuthForPublicAIHubProperty.description)
               }
@@ -394,22 +399,28 @@ export default function UISettings() {
               checked={Boolean(values.forward_client_headers_to_llm_api)}
               disabled={isUpdating}
               onCheckedChange={handleToggleForwardClientHeaders}
-              ariaLabel={forwardClientHeadersProperty?.description ?? "Forward client headers to LLM API"}
-              label="Forward client headers to LLM API"
+              ariaLabel={
+                forwardClientHeadersProperty?.description ??
+                t("adminPanel.uiSettings.settings.forwardClientHeaders.label")
+              }
+              label={t("adminPanel.uiSettings.settings.forwardClientHeaders.label")}
               description={
                 forwardClientHeadersProperty?.description ??
-                "Forwards client headers (Authorization, anthropic-beta, and x-* custom headers) to the upstream LLM. Enable for Claude Code with a Max subscription (forwards the OAuth token) or to pass custom/tracing headers through to the provider. Independent of the BYOK toggle — enable only the one(s) you need."
+                t("adminPanel.uiSettings.settings.forwardClientHeaders.description")
               }
             />
             <SettingRow
               checked={Boolean(values.forward_llm_provider_auth_headers)}
               disabled={isUpdating}
               onCheckedChange={handleToggleForwardLLMProviderAuthHeaders}
-              ariaLabel={forwardLLMProviderAuthHeadersProperty?.description ?? "Forward LLM provider auth headers"}
-              label="Forward LLM provider auth headers"
+              ariaLabel={
+                forwardLLMProviderAuthHeadersProperty?.description ??
+                t("adminPanel.uiSettings.settings.forwardLLMProviderAuthHeaders.label")
+              }
+              label={t("adminPanel.uiSettings.settings.forwardLLMProviderAuthHeaders.label")}
               description={
                 forwardLLMProviderAuthHeadersProperty?.description ??
-                "Forwards provider auth headers (x-api-key, x-goog-api-key, api-key, ocp-apim-subscription-key) to the upstream LLM, overriding any deployment-configured key for that request. Enable for Claude Code BYOK (clients bring their own API key). Independent of the client-headers toggle — enable only the one(s) you need."
+                t("adminPanel.uiSettings.settings.forwardLLMProviderAuthHeaders.description")
               }
             />
             {enableProjectsUIProperty && (
@@ -417,11 +428,12 @@ export default function UISettings() {
                 checked={Boolean(values.enable_projects_ui)}
                 disabled={isUpdating}
                 onCheckedChange={handleToggleEnableProjectsUI}
-                ariaLabel={enableProjectsUIProperty.description ?? "Enable Projects UI"}
-                label="[BETA] Enable Projects (page will refresh)"
+                ariaLabel={
+                  enableProjectsUIProperty.description ?? t("adminPanel.uiSettings.settings.enableProjects.ariaLabel")
+                }
+                label={t("adminPanel.uiSettings.settings.enableProjects.label")}
                 description={
-                  enableProjectsUIProperty.description ??
-                  "If enabled, shows the Projects feature in the UI sidebar and the project field in key management."
+                  enableProjectsUIProperty.description ?? t("adminPanel.uiSettings.settings.enableProjects.description")
                 }
               />
             )}
@@ -429,11 +441,10 @@ export default function UISettings() {
               checked={Boolean(values.enable_chat_ui)}
               disabled={isUpdating}
               onCheckedChange={handleToggleEnableChatUI}
-              ariaLabel={enableChatUIProperty?.description ?? "Enable Chat page"}
-              label="Enable Chat page (page will refresh)"
+              ariaLabel={enableChatUIProperty?.description ?? t("adminPanel.uiSettings.settings.enableChat.ariaLabel")}
+              label={t("adminPanel.uiSettings.settings.enableChat.label")}
               description={
-                enableChatUIProperty?.description ??
-                "If enabled, shows the Chat page in the UI sidebar, letting users chat with an LLM and connect their own MCP server credentials via OAuth."
+                enableChatUIProperty?.description ?? t("adminPanel.uiSettings.settings.enableChat.description")
               }
             />
 
@@ -444,16 +455,18 @@ export default function UISettings() {
               <div className="space-y-1">
                 <p className="text-sm font-medium text-foreground">Moyai</p>
                 <p className="text-sm text-muted-foreground">
-                  {moyaiUrl ? `Connected to ${moyaiUrl}` : "Not connected"}
+                  {moyaiUrl
+                    ? t("adminPanel.uiSettings.moyai.connectedTo", { url: moyaiUrl })
+                    : t("adminPanel.uiSettings.moyai.notConnected")}
                 </p>
               </div>
               {moyaiUrl ? (
                 <Button variant="outline" size="sm" disabled={isUpdating} onClick={handleDisconnectMoyai}>
-                  Disconnect
+                  {t("adminPanel.uiSettings.moyai.disconnect")}
                 </Button>
               ) : (
                 <a href={uiHref("moyai")} className="text-sm text-primary underline underline-offset-4">
-                  Connect from the Moyai page
+                  {t("adminPanel.uiSettings.moyai.connectLink")}
                 </a>
               )}
             </div>
@@ -463,16 +476,19 @@ export default function UISettings() {
               checked={isAgentsDisabled}
               disabled={isUpdating}
               onCheckedChange={handleToggleDisableAgents}
-              ariaLabel={disableAgentsProperty?.description ?? "Disable agents for internal users"}
-              label="Disable agents for internal users"
+              ariaLabel={disableAgentsProperty?.description ?? t("adminPanel.uiSettings.settings.disableAgents.label")}
+              label={t("adminPanel.uiSettings.settings.disableAgents.label")}
               description={disableAgentsProperty?.description}
             />
             <SettingRow
               checked={Boolean(values.allow_agents_for_team_admins)}
               disabled={isUpdating || !isAgentsDisabled}
               onCheckedChange={handleToggleAllowAgentsTeamAdmins}
-              ariaLabel={allowAgentsTeamAdminsProperty?.description ?? "Allow agents for team admins"}
-              label="Allow agents for team admins"
+              ariaLabel={
+                allowAgentsTeamAdminsProperty?.description ??
+                t("adminPanel.uiSettings.settings.allowAgentsTeamAdmins.label")
+              }
+              label={t("adminPanel.uiSettings.settings.allowAgentsTeamAdmins.label")}
               description={allowAgentsTeamAdminsProperty?.description}
               indented
               muted={!isAgentsDisabled}
@@ -483,16 +499,22 @@ export default function UISettings() {
               checked={isVectorStoresDisabled}
               disabled={isUpdating}
               onCheckedChange={handleToggleDisableVectorStores}
-              ariaLabel={disableVectorStoresProperty?.description ?? "Disable vector stores for internal users"}
-              label="Disable vector stores for internal users"
+              ariaLabel={
+                disableVectorStoresProperty?.description ??
+                t("adminPanel.uiSettings.settings.disableVectorStores.label")
+              }
+              label={t("adminPanel.uiSettings.settings.disableVectorStores.label")}
               description={disableVectorStoresProperty?.description}
             />
             <SettingRow
               checked={Boolean(values.allow_vector_stores_for_team_admins)}
               disabled={isUpdating || !isVectorStoresDisabled}
               onCheckedChange={handleToggleAllowVectorStoresTeamAdmins}
-              ariaLabel={allowVectorStoresTeamAdminsProperty?.description ?? "Allow vector stores for team admins"}
-              label="Allow vector stores for team admins"
+              ariaLabel={
+                allowVectorStoresTeamAdminsProperty?.description ??
+                t("adminPanel.uiSettings.settings.allowVectorStoresTeamAdmins.label")
+              }
+              label={t("adminPanel.uiSettings.settings.allowVectorStoresTeamAdmins.label")}
               description={allowVectorStoresTeamAdminsProperty?.description}
               indented
               muted={!isVectorStoresDisabled}
@@ -503,11 +525,12 @@ export default function UISettings() {
               checked={Boolean(values.scope_user_search_to_org)}
               disabled={isUpdating}
               onCheckedChange={handleToggleScopeUserSearch}
-              ariaLabel={scopeUserSearchProperty?.description ?? "Scope user search to organization"}
-              label="Scope user search to organization"
+              ariaLabel={
+                scopeUserSearchProperty?.description ?? t("adminPanel.uiSettings.settings.scopeUserSearch.label")
+              }
+              label={t("adminPanel.uiSettings.settings.scopeUserSearch.label")}
               description={
-                scopeUserSearchProperty?.description ??
-                "If enabled, the user search endpoint restricts results by organization. When off, any authenticated user can search all users."
+                scopeUserSearchProperty?.description ?? t("adminPanel.uiSettings.settings.scopeUserSearch.description")
               }
             />
 
@@ -516,11 +539,14 @@ export default function UISettings() {
               checked={Boolean(values.disable_custom_api_keys)}
               disabled={isUpdating}
               onCheckedChange={handleToggleDisableCustomApiKeys}
-              ariaLabel={disableCustomApiKeysProperty?.description ?? "Disable custom Virtual key values"}
-              label="Disable custom Virtual key values"
+              ariaLabel={
+                disableCustomApiKeysProperty?.description ??
+                t("adminPanel.uiSettings.settings.disableCustomApiKeys.label")
+              }
+              label={t("adminPanel.uiSettings.settings.disableCustomApiKeys.label")}
               description={
                 disableCustomApiKeysProperty?.description ??
-                "If true, users cannot specify custom key values. All keys must be auto-generated."
+                t("adminPanel.uiSettings.settings.disableCustomApiKeys.description")
               }
             />
 
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UserBannerSettings/UserBannerSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UserBannerSettings/UserBannerSettings.tsx
index 21e9ab0f7d9..f6971f9d79c 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/UserBannerSettings/UserBannerSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/UserBannerSettings/UserBannerSettings.tsx
@@ -1,6 +1,8 @@
 "use client";
 
+import type { ParseKeys } from "i18next";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { useUpdateUserBanner } from "@/app/(dashboard)/hooks/userBanner/useUpdateUserBanner";
 import { useUserBanner } from "@/app/(dashboard)/hooks/userBanner/useUserBanner";
@@ -16,10 +18,10 @@ import { Textarea } from "@/components/ui/textarea";
 import { SEVERITY_ICONS, UserBannerMarkdown } from "@/components/UserBanner";
 import { Skeleton } from "@/components/ui/skeleton";
 
-const SEVERITY_LABELS: Record<UserBannerSeverity, string> = {
-  info: "Info",
-  warning: "Warning",
-  error: "Error",
+const SEVERITY_LABELS: Record<UserBannerSeverity, ParseKeys> = {
+  info: "adminPanel.userBannerSettings.severity.options.info",
+  warning: "adminPanel.userBannerSettings.severity.options.warning",
+  error: "adminPanel.userBannerSettings.severity.options.error",
 };
 
 const SEVERITY_ITEMS = (Object.keys(SEVERITY_LABELS) as UserBannerSeverity[]).map((severity) => ({
@@ -54,6 +56,7 @@ interface UserBannerSettingsFormProps {
 }
 
 function UserBannerSettingsForm({ persisted, isLoading, isPending, saveBanner }: UserBannerSettingsFormProps) {
+  const { t } = useTranslation();
   const [draft, setDraft] = useState<UserBannerUpdate>({
     enabled: persisted.enabled,
     message: persisted.message,
@@ -65,7 +68,7 @@ function UserBannerSettingsForm({ persisted, isLoading, isPending, saveBanner }:
   const handleSave = () => {
     saveBanner(draft, {
       onSuccess: () => {
-        toast.success("User banner updated successfully");
+        toast.success(t("adminPanel.userBannerSettings.toasts.updated"));
       },
       onError: (error) => {
         toast.fromError(error);
@@ -76,11 +79,8 @@ function UserBannerSettingsForm({ persisted, isLoading, isPending, saveBanner }:
   return (
     <Card>
       <CardHeader>
-        <CardTitle>User Banner</CardTitle>
-        <CardDescription>
-          Publish an announcement to all dashboard users. Markdown is supported; the banner appears below the header on
-          every page until you unpublish it. Users can dismiss it, and it reappears whenever the content changes.
-        </CardDescription>
+        <CardTitle>{t("adminPanel.userBannerSettings.title")}</CardTitle>
+        <CardDescription>{t("adminPanel.userBannerSettings.description")}</CardDescription>
       </CardHeader>
       <CardContent>
         {isLoading ? (
@@ -91,42 +91,44 @@ function UserBannerSettingsForm({ persisted, isLoading, isPending, saveBanner }:
               <Switch
                 checked={draft.enabled}
                 onCheckedChange={(checked: boolean) => setDraft({ ...draft, enabled: checked })}
-                aria-label="Publish user banner"
+                aria-label={t("adminPanel.userBannerSettings.publish")}
               />
-              <Label>Publish user banner</Label>
+              <Label>{t("adminPanel.userBannerSettings.publish")}</Label>
             </div>
 
             <div className="flex flex-col gap-2">
-              <Label htmlFor="user-banner-message">Message</Label>
+              <Label htmlFor="user-banner-message">{t("adminPanel.userBannerSettings.message.label")}</Label>
               <Textarea
                 id="user-banner-message"
                 value={draft.message}
                 maxLength={4000}
                 rows={3}
-                placeholder="**Scheduled maintenance** tonight at 10 PM UTC. See [status page](https://example.com)."
+                placeholder={t("adminPanel.userBannerSettings.message.placeholder")}
                 onChange={(event: React.ChangeEvent<HTMLTextAreaElement>) =>
                   setDraft({ ...draft, message: event.target.value })
                 }
               />
-              {messageMissing && <p className="text-sm text-destructive">Add a message before publishing.</p>}
+              {messageMissing && (
+                <p className="text-sm text-destructive">{t("adminPanel.userBannerSettings.message.missing")}</p>
+              )}
             </div>
 
             <div className="flex flex-col gap-2">
-              <Label>Severity</Label>
+              <Label>{t("adminPanel.userBannerSettings.severity.label")}</Label>
               <Select
-                items={SEVERITY_ITEMS}
+                items={SEVERITY_ITEMS.map((item) => ({ value: item.value, label: t(item.label) }))}
                 value={draft.severity}
                 onValueChange={(value: string | null) =>
                   setDraft({ ...draft, severity: (value ?? "info") as UserBannerSeverity })
                 }
               >
-                <SelectTrigger className="w-48" aria-label="Banner severity">
-                  <SelectValue placeholder="Severity" />
+                <SelectTrigger className="w-48" aria-label={t("adminPanel.userBannerSettings.severity.ariaLabel")}>
+                  <SelectValue placeholder={t("adminPanel.userBannerSettings.severity.placeholder")} />
                 </SelectTrigger>
                 <SelectContent>
                   {SEVERITY_ITEMS.map((item) => (
                     <SelectItem key={item.value} value={item.value}>
-                      {item.label}
+                      {t(item.label)}
                     </SelectItem>
                   ))}
                 </SelectContent>
@@ -135,7 +137,7 @@ function UserBannerSettingsForm({ persisted, isLoading, isPending, saveBanner }:
 
             {draft.message.trim() !== "" && (
               <div className="flex flex-col gap-2">
-                <Label>Preview</Label>
+                <Label>{t("adminPanel.userBannerSettings.preview")}</Label>
                 <Alert variant={draft.severity}>
                   {SEVERITY_ICONS[draft.severity]}
                   <AlertDescription>
@@ -147,7 +149,7 @@ function UserBannerSettingsForm({ persisted, isLoading, isPending, saveBanner }:
 
             <div className="flex justify-end">
               <Button onClick={handleSave} disabled={isPending || messageMissing}>
-                {isPending ? "Saving..." : "Save banner"}
+                {isPending ? t("adminPanel.userBannerSettings.saving") : t("adminPanel.userBannerSettings.save")}
               </Button>
             </div>
           </div>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/WebSearchInterceptionSettings/WebSearchInterceptionSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/WebSearchInterceptionSettings/WebSearchInterceptionSettings.tsx
index 93b9cbffd32..4b910191e4c 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/WebSearchInterceptionSettings/WebSearchInterceptionSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/WebSearchInterceptionSettings/WebSearchInterceptionSettings.tsx
@@ -9,6 +9,7 @@ import { CircleHelp, Info, Save, TriangleAlert } from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { FieldGroup } from "@/components/ui/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { MultiSelect } from "@/components/shared/MultiSelect";
@@ -126,6 +127,7 @@ interface WebSearchInterceptionFormProps {
 }
 
 function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchInterceptionFormProps) {
+  const { t } = useTranslation();
   const {
     mutate: updateSettings,
     isPending: isUpdating,
@@ -139,7 +141,7 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
     updateSettings(formValues, {
       onSuccess: () => {
         form.reset(formValues);
-        toast.success("Settings updated successfully. Changes will be applied across all pods within 10 seconds.");
+        toast.success(t("adminPanel.webSearchInterception.toasts.updated"));
       },
       onError: (saveError) => {
         toast.fromError(saveError);
@@ -151,7 +153,7 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
     <>
       {updateError && (
         <Alert variant="error" className="mb-4">
-          <AlertTitle>Could not update settings</AlertTitle>
+          <AlertTitle>{t("adminPanel.webSearchInterception.errors.updateFailed")}</AlertTitle>
           {updateError instanceof Error && <AlertDescription>{updateError.message}</AlertDescription>}
         </Alert>
       )}
@@ -165,8 +167,8 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
                   control={form.control}
                   name="enabled"
                   label={labelWithHint(
-                    "Enable Web Search Interception",
-                    "When enabled, web search tool calls are executed server-side through the selected search tool",
+                    t("adminPanel.webSearchInterception.fields.enabled.label"),
+                    t("adminPanel.webSearchInterception.fields.enabled.hint"),
                   )}
                   description={schema?.properties?.enabled?.description}
                 >
@@ -179,8 +181,8 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
                   control={form.control}
                   name="enabled_providers"
                   label={labelWithHint(
-                    "Providers",
-                    "Which LLM providers to intercept for. Leave empty to intercept Bedrock only.",
+                    t("adminPanel.webSearchInterception.fields.providers.label"),
+                    t("adminPanel.webSearchInterception.fields.providers.hint"),
                   )}
                   description={schema?.properties?.enabled_providers?.description}
                 >
@@ -190,7 +192,7 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
                       options={PROVIDER_OPTIONS}
                       value={value}
                       onValueChange={onChange}
-                      placeholder="Select providers (defaults to Bedrock)"
+                      placeholder={t("adminPanel.webSearchInterception.fields.providers.placeholder")}
                       allowCustomValues
                       disabled={isUpdating}
                     />
@@ -201,8 +203,8 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
                   control={form.control}
                   name="search_tool_name"
                   label={labelWithHint(
-                    "Search Tool",
-                    "Which configured search tool runs the searches. Leave empty to use the first one available.",
+                    t("adminPanel.webSearchInterception.fields.searchTool.label"),
+                    t("adminPanel.webSearchInterception.fields.searchTool.hint"),
                   )}
                   description={schema?.properties?.search_tool_name?.description}
                 >
@@ -212,7 +214,7 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
                       options={searchTools.map((name) => ({ label: name, value: name }))}
                       value={value}
                       onValueChange={onChange}
-                      placeholder="Select a search tool (defaults to the first available)"
+                      placeholder={t("adminPanel.webSearchInterception.fields.searchTool.placeholder")}
                       disabled={isUpdating || loadingSearchTools}
                     />
                   )}
@@ -222,8 +224,8 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
                   control={form.control}
                   name="max_agentic_loops"
                   label={labelWithHint(
-                    "Max Agentic Loops",
-                    "How many follow-up model calls one intercepted request may chain. Leave empty for the default of 3.",
+                    t("adminPanel.webSearchInterception.fields.maxAgenticLoops.label"),
+                    t("adminPanel.webSearchInterception.fields.maxAgenticLoops.hint"),
                   )}
                   description={schema?.properties?.max_agentic_loops?.description}
                 >
@@ -251,7 +253,7 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
               disabled={!isDirty || isUpdating}
             >
               {isUpdating ? <UiLoadingSpinner className="size-4" /> : <Save />}
-              Save Settings
+              {t("adminPanel.webSearchInterception.save")}
             </Button>
           </div>
         </form>
@@ -261,14 +263,13 @@ function WebSearchInterceptionForm({ accessToken, initial, schema }: WebSearchIn
 }
 
 export default function WebSearchInterceptionSettings() {
+  const { t } = useTranslation();
   const { accessToken } = useAuthorized();
   const { data, isLoading, isError, error } = useWebSearchInterceptionSettings();
 
   if (!accessToken) {
     return (
-      <div className="p-6 text-center text-muted-foreground">
-        Please log in to configure web search interception settings.
-      </div>
+      <div className="p-6 text-center text-muted-foreground">{t("adminPanel.webSearchInterception.notLoggedIn")}</div>
     );
   }
 
@@ -286,7 +287,7 @@ export default function WebSearchInterceptionSettings() {
   if (isError) {
     return (
       <Alert variant="error" className="mb-6">
-        <AlertTitle>Could not load web search interception settings</AlertTitle>
+        <AlertTitle>{t("adminPanel.webSearchInterception.errors.loadFailed")}</AlertTitle>
         {error instanceof Error && <AlertDescription>{error.message}</AlertDescription>}
       </Alert>
     );
@@ -300,23 +301,15 @@ export default function WebSearchInterceptionSettings() {
       {notAppliedHere && (
         <Alert variant="warning" className="mb-6">
           <TriangleAlert />
-          <AlertTitle>Not running on the proxy that answered this page</AlertTitle>
-          <AlertDescription>
-            Interception is switched on for the cluster, but the proxy serving this page has not applied it. That is
-            expected for about 10 seconds after a change or a restart. If it persists, check that proxy&apos;s logs:
-            requests it handles are not being intercepted.
-          </AlertDescription>
+          <AlertTitle>{t("adminPanel.webSearchInterception.notApplied.title")}</AlertTitle>
+          <AlertDescription>{t("adminPanel.webSearchInterception.notApplied.description")}</AlertDescription>
         </Alert>
       )}
 
       <Alert variant="info" className="mb-6">
         <Info />
-        <AlertTitle>Web Search Interception</AlertTitle>
-        <AlertDescription>
-          Serve web search tool calls from a configured search tool instead of passing them upstream, so models without
-          native web search can still answer with fresh results. Click &apos;Save Settings&apos; to apply changes across
-          all pods (takes effect within 10 seconds).
-        </AlertDescription>
+        <AlertTitle>{t("adminPanel.webSearchInterception.info.title")}</AlertTitle>
+        <AlertDescription>{t("adminPanel.webSearchInterception.info.description")}</AlertDescription>
       </Alert>
 
       <WebSearchInterceptionForm
diff --git a/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTable.tsx b/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTable.tsx
index d27b0cfd340..1cd75b5a311 100644
--- a/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTable.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTable.tsx
@@ -2,6 +2,7 @@
 
 import { Inbox, Plus } from "lucide-react";
 import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 import { Button } from "@/components/ui/button";
@@ -25,14 +26,17 @@ type LoggingCallbacksProps = {
 };
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No callbacks configured</div>
+      <div className="text-sm font-medium text-foreground">
+        {t("loggingAndAlerts.loggingCallbacks.table.empty.title")}
+      </div>
       <div className="text-sm text-muted-foreground">
-        Add your first callback to start logging data to external services.
+        {t("loggingAndAlerts.loggingCallbacks.table.empty.description")}
       </div>
     </div>
   );
@@ -47,18 +51,21 @@ export const LoggingCallbacksTable: React.FC<LoggingCallbacksProps> = ({
   onDelete = () => {},
   onAdd = () => {},
 }) => {
+  const { t } = useTranslation();
   const columns = useMemo(() => {
     const deps = { availableCallbacks, onTest, onEdit, onDelete };
-    return getLoggingCallbacksTableColumns(deps);
-  }, [availableCallbacks, onTest, onEdit, onDelete]);
+    return getLoggingCallbacksTableColumns(deps, t);
+  }, [availableCallbacks, onTest, onEdit, onDelete, t]);
 
   return (
     <div className="mt-4 flex w-full flex-col gap-4">
-      <h3 className="text-lg font-semibold tracking-tight text-foreground">Active Logging Callbacks</h3>
+      <h3 className="text-lg font-semibold tracking-tight text-foreground">
+        {t("loggingAndAlerts.loggingCallbacks.table.title")}
+      </h3>
       <div>
         <Button onClick={onAdd}>
           <Plus />
-          Add Callback
+          {t("loggingAndAlerts.loggingCallbacks.table.add")}
         </Button>
       </div>
       <DataTable
@@ -66,7 +73,7 @@ export const LoggingCallbacksTable: React.FC<LoggingCallbacksProps> = ({
         columns={columns}
         getRowId={(callback, index) => `${callback.name || index}-${callbackRowMode(callback)}`}
         isLoading={isLoading}
-        loadingMessage="Loading callbacks…"
+        loadingMessage={t("loggingAndAlerts.loggingCallbacks.table.loading")}
         noDataMessage={<EmptyState />}
         size="compact"
       />
diff --git a/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTableColumns.tsx b/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTableColumns.tsx
index 950ef5de6e4..ca53f9f7b2e 100644
--- a/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTableColumns.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/LoggingAndAlerts/LoggingCallbacks/LoggingCallbacksTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import { ColumnDef } from "@tanstack/react-table";
+import type { ParseKeys, TFunction } from "i18next";
 import { MoreHorizontal, Pencil, Play, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { StatusBadge, type StatusTone } from "@/components/shared/table_cells";
 import { buttonVariants } from "@/components/ui/button";
@@ -30,10 +32,10 @@ export type AvailableCallbacks = Record<string, AvailableCallbackMeta>;
 
 export const callbackRowMode = (record: CallbackRow): string => record.type || record.mode || "success";
 
-const CALLBACK_MODE_LABELS: Record<string, string> = {
-  success: "Success",
-  failure: "Failure",
-  success_and_failure: "Success & Failure",
+const CALLBACK_MODE_LABELS: Record<string, ParseKeys> = {
+  success: "loggingAndAlerts.loggingCallbacks.table.modes.success",
+  failure: "loggingAndAlerts.loggingCallbacks.table.modes.failure",
+  success_and_failure: "loggingAndAlerts.loggingCallbacks.table.modes.successAndFailure",
 };
 
 function callbackModeTone(mode: string): StatusTone {
@@ -50,20 +52,18 @@ interface CallbackRowActionsProps {
 }
 
 function CallbackRowActions({ callback, onTest, onEdit, onDelete }: CallbackRowActionsProps) {
+  const { t } = useTranslation();
   if (callback.read_only) {
     return (
-      <span
-        className="text-xs text-muted-foreground"
-        title="Active callback that was not added through the dashboard. Edit it where it was configured."
-      >
-        Read only
+      <span className="text-xs text-muted-foreground" title={t("loggingAndAlerts.loggingCallbacks.table.readOnlyHint")}>
+        {t("loggingAndAlerts.loggingCallbacks.table.readOnly")}
       </span>
     );
   }
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label="Open callback actions"
+        aria-label={t("loggingAndAlerts.loggingCallbacks.table.actions.open")}
         data-testid={`callback-actions-${callback.name}-${callbackRowMode(callback)}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -72,16 +72,16 @@ function CallbackRowActions({ callback, onTest, onEdit, onDelete }: CallbackRowA
       <DropdownMenuContent align="end" className="w-52">
         <DropdownMenuItem data-testid="callback-action-test" onClick={() => void onTest(callback)}>
           <Play />
-          Test
+          {t("loggingAndAlerts.loggingCallbacks.table.actions.test")}
         </DropdownMenuItem>
         <DropdownMenuItem data-testid="callback-action-edit" onClick={() => onEdit(callback)}>
           <Pencil />
-          Edit
+          {t("loggingAndAlerts.loggingCallbacks.table.actions.edit")}
         </DropdownMenuItem>
         <DropdownMenuSeparator />
         <DropdownMenuItem variant="destructive" data-testid="callback-action-delete" onClick={() => onDelete(callback)}>
           <Trash2 />
-          Delete
+          {t("loggingAndAlerts.loggingCallbacks.table.actions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -95,17 +95,15 @@ interface LoggingCallbacksTableColumnsDeps {
   onDelete: (callback: AlertingObject) => void;
 }
 
-export const getLoggingCallbacksTableColumns = ({
-  availableCallbacks,
-  onTest,
-  onEdit,
-  onDelete,
-}: LoggingCallbacksTableColumnsDeps): ColumnDef<CallbackRow>[] => [
+export const getLoggingCallbacksTableColumns = (
+  { availableCallbacks, onTest, onEdit, onDelete }: LoggingCallbacksTableColumnsDeps,
+  t: TFunction,
+): ColumnDef<CallbackRow>[] => [
   {
     id: "name",
     accessorKey: "name",
-    meta: { title: "Callback Name" },
-    header: "Callback Name",
+    meta: { title: t("loggingAndAlerts.loggingCallbacks.table.columns.name") },
+    header: t("loggingAndAlerts.loggingCallbacks.table.columns.name"),
     enableSorting: false,
     cell: ({ row }) => {
       const id = row.original.name;
@@ -119,19 +117,24 @@ export const getLoggingCallbacksTableColumns = ({
   },
   {
     id: "mode",
-    meta: { title: "Mode", skeleton: "badge" },
-    header: "Mode",
+    meta: { title: t("loggingAndAlerts.loggingCallbacks.table.columns.mode"), skeleton: "badge" },
+    header: t("loggingAndAlerts.loggingCallbacks.table.columns.mode"),
     size: 240,
     enableSorting: false,
     cell: ({ row }) => {
       const mode = callbackRowMode(row.original);
-      return <StatusBadge tone={callbackModeTone(mode)} label={CALLBACK_MODE_LABELS[mode] || mode} />;
+      return (
+        <StatusBadge
+          tone={callbackModeTone(mode)}
+          label={Object.hasOwn(CALLBACK_MODE_LABELS, mode) ? t(CALLBACK_MODE_LABELS[mode]) : mode}
+        />
+      );
     },
   },
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("loggingAndAlerts.loggingCallbacks.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacks.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacks.tsx
index 6ad7624ec60..11956ff3baa 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacks.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacks.tsx
@@ -5,6 +5,7 @@
  */
 
 import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
@@ -25,6 +26,7 @@ interface AddFallbacksProps {
 }
 
 export default function AddFallbacks({ accessToken, value = [], onChange, disabledReason }: AddFallbacksProps) {
+  const { t } = useTranslation();
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [modelInfo, setModelInfo] = useState<ModelGroup[]>([]);
   const [modalKey, setModalKey] = useState(0); // Key to force remount of form when modal opens
@@ -83,7 +85,7 @@ export default function AddFallbacks({ accessToken, value = [], onChange, disabl
     // Validation
     const invalidGroups = groups.filter((g) => !g.primaryModel || g.fallbackModels.length === 0);
     if (invalidGroups.length > 0) {
-      toast.error(`Please complete configuration for all groups. ${invalidGroups.length} group(s) incomplete.`);
+      toast.error(t("routerSettings.addFallbacks.toasts.incomplete", { count: invalidGroups.length }));
       return;
     }
 
@@ -103,7 +105,7 @@ export default function AddFallbacks({ accessToken, value = [], onChange, disabl
       setIsSaving(true);
       try {
         await onChange(updatedFallbacks);
-        toast.success(`${groups.length} fallback configuration(s) added successfully!`);
+        toast.success(t("routerSettings.addFallbacks.toasts.added", { count: groups.length }));
         handleCancel();
       } catch (error) {
         // Error handling is done in handleFallbacksChange, so we don't need to show another notification here
@@ -112,7 +114,7 @@ export default function AddFallbacks({ accessToken, value = [], onChange, disabl
         setIsSaving(false);
       }
     } else {
-      toast.fromError("onChange callback not provided");
+      toast.fromError(t("routerSettings.addFallbacks.toasts.noOnChange"));
     }
   };
 
@@ -123,7 +125,7 @@ export default function AddFallbacks({ accessToken, value = [], onChange, disabl
           <TooltipTrigger render={<span className="inline-flex" tabIndex={0} />}>
             <Button className="mx-auto" disabled aria-disabled="true">
               <span>+</span>
-              Add Fallbacks
+              {t("routerSettings.addFallbacks.addButton")}
             </Button>
           </TooltipTrigger>
           <TooltipContent>{disabledReason}</TooltipContent>
@@ -131,7 +133,7 @@ export default function AddFallbacks({ accessToken, value = [], onChange, disabl
       ) : (
         <Button className="mx-auto" onClick={() => setIsModalVisible(true)}>
           <span>+</span>
-          Add Fallbacks
+          {t("routerSettings.addFallbacks.addButton")}
         </Button>
       )}
       <AddFallbacksModal open={isModalVisible} onCancel={handleCancel}>
@@ -147,11 +149,11 @@ export default function AddFallbacks({ accessToken, value = [], onChange, disabl
         {groups.length > 0 && (
           <div className="flex items-center justify-end space-x-3 pt-6 mt-6 border-t border-border">
             <Button variant="outline" onClick={handleCancel} disabled={isSaving}>
-              Cancel
+              {t("routerSettings.addFallbacks.cancel")}
             </Button>
             <Button variant="outline" onClick={handleSaveAll} disabled={groups.length === 0 || isSaving}>
               {isSaving && <UiLoadingSpinner className="size-4" />}
-              {isSaving ? "Saving Configuration..." : "Save All Configurations"}
+              {isSaving ? t("routerSettings.addFallbacks.saving") : t("routerSettings.addFallbacks.saveAll")}
             </Button>
           </div>
         )}
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx
index d70e80c666c..e353d49b332 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx
@@ -5,6 +5,7 @@
 
 import { ArrowRight } from "lucide-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddFallbacksModalProps {
@@ -14,6 +15,7 @@ interface AddFallbacksModalProps {
 }
 
 export function AddFallbacksModal({ open, onCancel, children }: AddFallbacksModalProps) {
+  const { t } = useTranslation();
   return (
     <Dialog open={open} onOpenChange={(open) => !open && onCancel()} disablePointerDismissal>
       <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[900px]">
@@ -24,9 +26,11 @@ export function AddFallbacksModal({ open, onCancel, children }: AddFallbacksModa
                 <ArrowRight className="w-5 h-5 text-indigo-600 dark:text-indigo-300" />
               </div>
               <div>
-                <DialogTitle className="text-lg font-bold m-0">Configure Model Fallbacks</DialogTitle>
+                <DialogTitle className="text-lg font-bold m-0">
+                  {t("routerSettings.addFallbacksModal.title")}
+                </DialogTitle>
                 <p className="text-sm text-muted-foreground font-normal m-0">
-                  Manage multiple fallback chains for different models (up to 5 groups at a time)
+                  {t("routerSettings.addFallbacksModal.description")}
                 </p>
               </div>
             </div>
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.tsx
index 3893a2f47ad..675ec988b62 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.tsx
@@ -8,6 +8,7 @@ import { Button } from "@/components/ui/button";
 import { useQuery } from "@tanstack/react-query";
 import { LoaderCircle, Pencil } from "lucide-react";
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { fetchAvailableModels } from "@/components/llm_calls/fetch_models";
 import { toast } from "@/lib/toast";
 import { AddFallbacksModal } from "./AddFallbacksModal";
@@ -42,6 +43,7 @@ export default function EditFallbacks({
   onClose,
   maxFallbacks = 10,
 }: EditFallbacksProps) {
+  const { t } = useTranslation();
   const [group, setGroup] = useState<FallbackGroup>(() => toGroup(fallbackEntry));
   const [isSaving, setIsSaving] = useState(false);
 
@@ -69,7 +71,7 @@ export default function EditFallbacks({
     setIsSaving(true);
     try {
       await onChange(updatedFallbacks);
-      toast.success(`Fallbacks for ${primaryModel} updated successfully!`);
+      toast.success(t("routerSettings.editFallbacks.toasts.updated", { model: primaryModel }));
       onClose();
     } catch (error) {
       console.error("Error updating fallbacks:", error);
@@ -89,11 +91,11 @@ export default function EditFallbacks({
       />
       <div className="flex items-center justify-end space-x-3 pt-6 mt-6 border-t border-border">
         <Button variant="outline" onClick={onClose} disabled={isSaving}>
-          Cancel
+          {t("routerSettings.editFallbacks.cancel")}
         </Button>
         <Button onClick={handleSave} disabled={isSaving || group.fallbackModels.length === 0}>
           {isSaving ? <LoaderCircle className="w-4 h-4 animate-spin" /> : <Pencil className="w-4 h-4" />}
-          {isSaving ? "Saving Changes..." : "Save Changes"}
+          {isSaving ? t("routerSettings.editFallbacks.saving") : t("routerSettings.editFallbacks.save")}
         </Button>
       </div>
     </AddFallbacksModal>
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx
index 3897a9d9fa2..aa92dec8561 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx
@@ -7,6 +7,7 @@ import { MultiSelect } from "@/components/shared/MultiSelect";
 import { SearchSelect } from "@/components/shared/SearchSelect";
 import { AlertCircle, ArrowDown, X } from "lucide-react";
 import React, { useId } from "react";
+import { useTranslation } from "react-i18next";
 
 export interface FallbackGroup {
   id: string;
@@ -29,6 +30,7 @@ export function FallbackGroupConfig({
   maxFallbacks,
   disablePrimaryModel = false,
 }: FallbackGroupConfigProps) {
+  const { t } = useTranslation();
   // Filter available options for fallbacks (exclude primary only, allow already selected to be shown for deselection)
   const availableFallbackOptions = availableModels.filter((m) => m !== group.primaryModel);
 
@@ -67,22 +69,22 @@ export function FallbackGroupConfig({
       {/* Primary Model Section */}
       <div className="relative">
         <label htmlFor={primaryModelInputId} className="block text-sm font-semibold text-foreground mb-2">
-          Primary Model <span className="text-destructive">*</span>
+          {t("routerSettings.fallbackGroupConfig.primaryModel")} <span className="text-destructive">*</span>
         </label>
         <SearchSelect
           inputId={primaryModelInputId}
           options={availableModels.map((m) => ({ label: m, value: m }))}
           value={group.primaryModel}
           onValueChange={handlePrimaryChange}
-          placeholder="Select primary model"
-          emptyText="No models found"
+          placeholder={t("routerSettings.fallbackGroupConfig.primaryPlaceholder")}
+          emptyText={t("routerSettings.fallbackGroupConfig.noModelsFound")}
           disabled={disablePrimaryModel}
           className="h-12"
         />
         {!disablePrimaryModel && !group.primaryModel && (
           <div className="mt-2 flex items-center gap-2 text-warning text-xs bg-warning/10 p-2 rounded-sm">
             <AlertCircle className="w-4 h-4" />
-            <span>Select a model to begin configuring fallbacks</span>
+            <span>{t("routerSettings.fallbackGroupConfig.selectPrimaryHint")}</span>
           </div>
         )}
       </div>
@@ -91,7 +93,7 @@ export function FallbackGroupConfig({
       <div className="flex items-center justify-center -my-4 z-raised">
         <div className="bg-indigo-50 text-indigo-500 px-4 py-1 rounded-full text-xs font-bold border border-indigo-100 flex items-center gap-2 shadow-xs dark:bg-indigo-950 dark:text-indigo-300 dark:border-indigo-900">
           <ArrowDown className="w-4 h-4" />
-          IF FAILS, TRY...
+          {t("routerSettings.fallbackGroupConfig.ifFails")}
         </div>
       </div>
 
@@ -100,9 +102,9 @@ export function FallbackGroupConfig({
         className={`transition-opacity duration-300 ${!group.primaryModel ? "opacity-50 pointer-events-none" : "opacity-100"}`}
       >
         <label className="block text-sm font-semibold text-foreground mb-2">
-          Fallback Chain <span className="text-destructive">*</span>
+          {t("routerSettings.fallbackGroupConfig.fallbackChain")} <span className="text-destructive">*</span>
           <span className="text-xs text-muted-foreground font-normal ml-2">
-            (Max {maxFallbacks} fallbacks at a time)
+            {t("routerSettings.fallbackGroupConfig.maxAtATime", { max: maxFallbacks })}
           </span>
         </label>
 
@@ -114,16 +116,21 @@ export function FallbackGroupConfig({
               value={group.fallbackModels}
               onValueChange={handleFallbackSelect}
               placeholder={
-                canAddMoreFallbacks ? "Select fallback models to add..." : `Maximum ${maxFallbacks} fallbacks reached`
+                canAddMoreFallbacks
+                  ? t("routerSettings.fallbackGroupConfig.addPlaceholder")
+                  : t("routerSettings.fallbackGroupConfig.maxReached", { max: maxFallbacks })
               }
-              emptyText="No models found"
+              emptyText={t("routerSettings.fallbackGroupConfig.noModelsFound")}
               disabled={!group.primaryModel}
               className="w-full"
             />
             <p className="text-xs text-muted-foreground mt-1 ml-1">
               {canAddMoreFallbacks
-                ? `Search and select multiple models. Selected models will appear below in order. (${group.fallbackModels.length}/${maxFallbacks} used)`
-                : `Maximum ${maxFallbacks} fallbacks reached. Remove some to add more.`}
+                ? t("routerSettings.fallbackGroupConfig.searchHint", {
+                    used: group.fallbackModels.length,
+                    max: maxFallbacks,
+                  })
+                : t("routerSettings.fallbackGroupConfig.maxReachedHint", { max: maxFallbacks })}
             </p>
           </div>
 
@@ -131,11 +138,11 @@ export function FallbackGroupConfig({
           <div className="space-y-2 min-h-[100px]">
             {group.fallbackModels.length === 0 ? (
               <div className="h-32 border-2 border-dashed border-border rounded-lg flex flex-col items-center justify-center text-muted-foreground">
-                <span className="text-sm">No fallback models selected</span>
-                <span className="text-xs mt-1">Add models from the dropdown above</span>
+                <span className="text-sm">{t("routerSettings.fallbackGroupConfig.noFallbacksSelected")}</span>
+                <span className="text-xs mt-1">{t("routerSettings.fallbackGroupConfig.addFromDropdown")}</span>
               </div>
             ) : (
-              <ol aria-label="Fallback chain" className="space-y-2">
+              <ol aria-label={t("routerSettings.fallbackGroupConfig.chainAriaLabel")} className="space-y-2">
                 {group.fallbackModels.map((modelValue, index) => (
                   <li
                     key={`${modelValue}-${index}`}
@@ -152,7 +159,7 @@ export function FallbackGroupConfig({
 
                     <button
                       type="button"
-                      aria-label={`Remove ${modelValue}`}
+                      aria-label={t("routerSettings.fallbackGroupConfig.removeModel", { model: modelValue })}
                       onClick={() => removeFallback(index)}
                       className="opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground hover:text-destructive p-1"
                     >
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx
index aba9312cb34..0ac11d6e751 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx
@@ -8,6 +8,7 @@ import { Button } from "@/components/ui/button";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Plus, X } from "lucide-react";
 import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import { FallbackGroup, FallbackGroupConfig } from "./FallbackGroupConfig";
 
@@ -26,6 +27,7 @@ export function FallbackSelectionForm({
   maxFallbacks = 10,
   maxGroups = 5,
 }: FallbackSelectionFormProps) {
+  const { t } = useTranslation();
   const [activeKey, setActiveKey] = useState(groups.length > 0 ? groups[0].id : "1");
 
   // Reset activeKey when groups change (e.g., when modal reopens)
@@ -61,7 +63,7 @@ export function FallbackSelectionForm({
 
   const handleRemoveGroup = (targetId: string) => {
     if (groups.length === 1) {
-      toast.warning("At least one group is required");
+      toast.warning(t("routerSettings.fallbackSelectionForm.atLeastOneGroup"));
       return;
     }
     const newGroups = groups.filter((g) => g.id !== targetId);
@@ -77,15 +79,17 @@ export function FallbackSelectionForm({
   };
 
   const groupLabel = (group: FallbackGroup, index: number) =>
-    group.primaryModel ? group.primaryModel : `Group ${index + 1}`;
+    group.primaryModel
+      ? group.primaryModel
+      : t("routerSettings.fallbackSelectionForm.groupLabel", { number: index + 1 });
 
   if (groups.length === 0) {
     return (
       <div className="text-center py-12 bg-muted rounded-lg border border-dashed border-border">
-        <p className="text-muted-foreground mb-4">No fallback groups configured</p>
+        <p className="text-muted-foreground mb-4">{t("routerSettings.fallbackSelectionForm.empty")}</p>
         <Button onClick={handleAddGroup}>
           <Plus className="w-4 h-4" />
-          Create First Group
+          {t("routerSettings.fallbackSelectionForm.createFirstGroup")}
         </Button>
       </div>
     );
@@ -108,7 +112,9 @@ export function FallbackSelectionForm({
                   variant="ghost"
                   size="icon-xs"
                   className="absolute right-1"
-                  aria-label={`Remove ${groupLabel(group, index)}`}
+                  aria-label={t("routerSettings.fallbackSelectionForm.removeGroup", {
+                    group: groupLabel(group, index),
+                  })}
                   onClick={() => handleRemoveGroup(group.id)}
                 >
                   <X />
@@ -118,7 +124,12 @@ export function FallbackSelectionForm({
           ))}
         </TabsList>
         {groups.length < maxGroups && (
-          <Button variant="ghost" size="icon-sm" aria-label="Add fallback group" onClick={handleAddGroup}>
+          <Button
+            variant="ghost"
+            size="icon-sm"
+            aria-label={t("routerSettings.fallbackSelectionForm.addGroup")}
+            onClick={handleAddGroup}
+          >
             <Plus />
           </Button>
         )}
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/Fallbacks.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/Fallbacks.tsx
index 03fd1d43510..68adaa578c0 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/Fallbacks.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/Fallbacks.tsx
@@ -2,8 +2,10 @@ import { useModelCostMap } from "@/app/(dashboard)/hooks/models/useModelCostMap"
 import { ArrowRight, Pencil, Play, Trash2 } from "lucide-react";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
+import type { TFunction } from "i18next";
 import openai from "openai";
 import React, { useEffect, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import DeleteResourceModal from "../../../common_components/DeleteResourceModal";
 import { ProviderLogo } from "../../../molecules/models/ProviderLogo";
 import { toast } from "@/lib/toast";
@@ -81,7 +83,7 @@ interface FallbacksProps {
   userID: string | null;
 }
 
-async function testFallbackModelResponse(selectedModel: string, accessToken: string) {
+async function testFallbackModelResponse(selectedModel: string, accessToken: string, t: TFunction) {
   const isLocal = process.env.NODE_ENV === "development";
   if (isLocal != true) {
     console.log = function () {};
@@ -94,7 +96,7 @@ async function testFallbackModelResponse(selectedModel: string, accessToken: str
   });
 
   try {
-    toast.info("Testing fallback model response...");
+    toast.info(t("routerSettings.fallbacks.toasts.testing"));
 
     const response = await client.chat.completions.create({
       model: selectedModel,
@@ -110,19 +112,24 @@ async function testFallbackModelResponse(selectedModel: string, accessToken: str
 
     toast.success(
       <span>
-        Test model=<strong>{selectedModel}</strong>, received model=
-        <strong>{response.model}</strong>. See{" "}
-        <a
-          href="#"
-          onClick={() => window.open("https://docs.litellm.ai/docs/proxy/reliability", "_blank")}
-          style={{ textDecoration: "underline", color: "blue" }}
-        >
-          curl
-        </a>
+        <Trans
+          i18nKey="routerSettings.fallbacks.toasts.testResult"
+          components={{
+            model: <strong>{selectedModel}</strong>,
+            received: <strong>{response.model}</strong>,
+            docs: (
+              <a
+                href="#"
+                onClick={() => window.open("https://docs.litellm.ai/docs/proxy/reliability", "_blank")}
+                style={{ textDecoration: "underline", color: "blue" }}
+              />
+            ),
+          }}
+        />
       </span>,
     );
   } catch (error) {
-    toast.fromError(`Error occurred while generating model response. Please try again. Error: ${error}`);
+    toast.fromError(t("routerSettings.fallbacks.toasts.testFailed", { error: String(error) }));
   }
 }
 
@@ -133,6 +140,7 @@ function fallbacksWriteHint(source: RouterSettingsSource | null, ownedByConfig:
 }
 
 const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID }) => {
+  const { t } = useTranslation();
   const [routerSettings, setRouterSettings] = useState<{ [key: string]: any }>({});
   const [isDeleting, setIsDeleting] = useState(false);
   const [fallbackToDelete, setFallbackToDelete] = useState<FallbackEntry | null>(null);
@@ -210,9 +218,9 @@ const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID })
     try {
       await setCallbacksCall(accessToken, payload);
       setRouterSettings(updatedSettings);
-      toast.success("Router settings updated successfully");
+      toast.success(t("routerSettings.fallbacks.toasts.updated"));
     } catch (error) {
-      toast.fromError("Failed to update router settings: " + error);
+      toast.fromError(t("routerSettings.fallbacks.toasts.updateFailed", { error: String(error) }));
     } finally {
       setIsDeleting(false);
       setIsDeleteModalOpen(false);
@@ -249,7 +257,7 @@ const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID })
       setRouterSettings(updatedSettings);
     } catch (error) {
       // Revert on error by refetching from server
-      toast.fromError("Failed to update router settings: " + error);
+      toast.fromError(t("routerSettings.fallbacks.toasts.updateFailed", { error: String(error) }));
       if (accessToken && userRole && userID) {
         getCallbacksCall(accessToken, userID, userRole).then((data) => {
           let router_settings = data.router_settings;
@@ -288,17 +296,15 @@ const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID })
       )}
       {!hasFallbacks ? (
         <div className="rounded-lg border border-border bg-muted px-4 py-6 text-center">
-          <span className="text-muted-foreground">
-            No fallbacks configured. Add fallbacks to automatically try another model when the primary fails.
-          </span>
+          <span className="text-muted-foreground">{t("routerSettings.fallbacks.empty")}</span>
         </div>
       ) : (
         <Table>
           <TableHeader>
             <TableRow>
-              <TableHead>Model Name</TableHead>
-              <TableHead>Fallbacks</TableHead>
-              <TableHead>Actions</TableHead>
+              <TableHead>{t("routerSettings.fallbacks.columns.modelName")}</TableHead>
+              <TableHead>{t("routerSettings.fallbacks.columns.fallbacks")}</TableHead>
+              <TableHead>{t("routerSettings.fallbacks.columns.actions")}</TableHead>
             </TableRow>
           </TableHeader>
 
@@ -319,14 +325,14 @@ const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID })
                           <TooltipTrigger
                             render={
                               <span
-                                onClick={() => testFallbackModelResponse(Object.keys(item)[0], accessToken || "")}
+                                onClick={() => testFallbackModelResponse(Object.keys(item)[0], accessToken || "", t)}
                                 className={`${iconWrapperClass} cursor-pointer hover:text-info`}
                               />
                             }
                           >
                             <Play className="h-5 w-5 shrink-0" />
                           </TooltipTrigger>
-                          <TooltipContent>Test fallback</TooltipContent>
+                          <TooltipContent>{t("routerSettings.fallbacks.actions.test")}</TooltipContent>
                         </Tooltip>
                         <Tooltip>
                           <TooltipTrigger
@@ -344,7 +350,7 @@ const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID })
                           >
                             <Pencil className="h-5 w-5 shrink-0" />
                           </TooltipTrigger>
-                          <TooltipContent>{writeHint ?? "Edit fallback"}</TooltipContent>
+                          <TooltipContent>{writeHint ?? t("routerSettings.fallbacks.actions.edit")}</TooltipContent>
                         </Tooltip>
                         <Tooltip>
                           <TooltipTrigger
@@ -362,7 +368,7 @@ const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID })
                           >
                             <Trash2 className="h-5 w-5 shrink-0" />
                           </TooltipTrigger>
-                          <TooltipContent>{writeHint ?? "Delete fallback"}</TooltipContent>
+                          <TooltipContent>{writeHint ?? t("routerSettings.fallbacks.actions.delete")}</TooltipContent>
                         </Tooltip>
                       </>
                     )}
@@ -385,12 +391,12 @@ const Fallbacks: React.FC<FallbacksProps> = ({ accessToken, userRole, userID })
       )}
       <DeleteResourceModal
         isOpen={isDeleteModalOpen}
-        title="Delete Fallback?"
-        message="Are you sure you want to delete this fallback? This action cannot be undone."
-        resourceInformationTitle="Fallback Information"
+        title={t("routerSettings.fallbacks.deleteModal.title")}
+        message={t("routerSettings.fallbacks.deleteModal.message")}
+        resourceInformationTitle={t("routerSettings.fallbacks.deleteModal.informationTitle")}
         resourceInformation={[
           {
-            label: "Model Name",
+            label: t("routerSettings.fallbacks.deleteModal.modelName"),
             value: fallbackToDelete ? Object.keys(fallbackToDelete)[0] : "",
             code: true,
           },
diff --git a/ui/litellm-dashboard/src/components/UIAccessControlForm.tsx b/ui/litellm-dashboard/src/components/UIAccessControlForm.tsx
index fb23ae1a995..e1700938df0 100644
--- a/ui/litellm-dashboard/src/components/UIAccessControlForm.tsx
+++ b/ui/litellm-dashboard/src/components/UIAccessControlForm.tsx
@@ -1,6 +1,7 @@
 import { CircleHelp } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { useWatch } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { z } from "zod";
 
 import { FieldGroup } from "@/components/ui/field";
@@ -12,6 +13,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
 
+import i18n from "@/i18n/i18n";
 import { toast } from "@/lib/toast";
 import { getSSOSettings, updateSSOSettings } from "./networking";
 
@@ -33,15 +35,15 @@ const uiAccessControlSchema = z
     ctx.addIssue({
       code: "custom",
       path: ["restricted_sso_group"],
-      message: "Please enter the restricted SSO group",
+      message: i18n.t("adminPanel.uiAccessControl.errors.restrictedGroupRequired"),
     });
   });
 
 type UIAccessControlFormValues = z.output<typeof uiAccessControlSchema>;
 
 const UI_ACCESS_MODE_OPTIONS = [
-  { value: "all_authenticated_users", label: "All Authenticated Users" },
-  { value: "restricted_sso_group", label: "Restricted SSO Group" },
+  { value: "all_authenticated_users", label: "adminPanel.uiAccessControl.modes.allAuthenticatedUsers" },
+  { value: "restricted_sso_group", label: "adminPanel.uiAccessControl.modes.restrictedSsoGroup" },
 ] as const;
 
 const asRecord = (value: unknown): Record<string, unknown> | null =>
@@ -87,6 +89,7 @@ const labelWithHint = (label: string, hint: string): React.ReactNode => (
 );
 
 const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken, onSuccess }) => {
+  const { t } = useTranslation();
   const form = useZodForm(uiAccessControlSchema, { defaultValues: {} });
   const [loading, setLoading] = useState(false);
   const uiAccessModeType = useWatch({ control: form.control, name: "ui_access_mode_type" });
@@ -112,7 +115,7 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
 
   const handleUIAccessSubmit = async (formValues: UIAccessControlFormValues) => {
     if (!accessToken) {
-      toast.fromError("No access token available");
+      toast.fromError(t("adminPanel.uiAccessControl.toasts.noAccessToken"));
       return;
     }
 
@@ -133,7 +136,7 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
       onSuccess();
     } catch (error) {
       console.error("Failed to save UI access settings:", error);
-      toast.fromError("Failed to save UI access settings");
+      toast.fromError(t("adminPanel.uiAccessControl.toasts.saveFailed"));
     } finally {
       setLoading(false);
     }
@@ -150,9 +153,7 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
     <TooltipProvider>
       <div className="p-4">
         <div className="mb-4">
-          <p className="text-sm text-muted-foreground">
-            Configure who can access the UI interface and how group information is extracted from JWT tokens.
-          </p>
+          <p className="text-sm text-muted-foreground">{t("adminPanel.uiAccessControl.description")}</p>
         </div>
 
         <form onSubmit={form.handleSubmit(submitMountedValues)} noValidate>
@@ -160,11 +161,14 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
             <FormField
               control={form.control}
               name="ui_access_mode_type"
-              label={labelWithHint("UI Access Mode", "Controls who can access the UI interface")}
+              label={labelWithHint(
+                t("adminPanel.uiAccessControl.fields.accessMode"),
+                t("adminPanel.uiAccessControl.fields.accessModeHint"),
+              )}
             >
               {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
                 <Select
-                  items={UI_ACCESS_MODE_OPTIONS}
+                  items={UI_ACCESS_MODE_OPTIONS.map((option) => ({ value: option.value, label: t(option.label) }))}
                   value={value ?? null}
                   onValueChange={(selected) => onChange(selected ?? undefined)}
                 >
@@ -174,12 +178,12 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
                     aria-invalid={ariaInvalid}
                     aria-describedby={ariaDescribedBy}
                   >
-                    <SelectValue placeholder="Select access mode" />
+                    <SelectValue placeholder={t("adminPanel.uiAccessControl.fields.accessModePlaceholder")} />
                   </SelectTrigger>
                   <SelectContent>
                     {UI_ACCESS_MODE_OPTIONS.map((option) => (
                       <SelectItem key={option.value} value={option.value}>
-                        {option.label}
+                        {t(option.label)}
                       </SelectItem>
                     ))}
                   </SelectContent>
@@ -188,7 +192,11 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
             </FormField>
 
             {uiAccessModeType === "restricted_sso_group" && (
-              <FormField control={form.control} name="restricted_sso_group" label="Restricted SSO Group">
+              <FormField
+                control={form.control}
+                name="restricted_sso_group"
+                label={t("adminPanel.uiAccessControl.fields.restrictedGroup")}
+              >
                 {({ ref, value, ...field }) => (
                   <Input {...field} ref={ref} value={value ?? ""} placeholder="ui-access-group" />
                 )}
@@ -199,8 +207,8 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
               control={form.control}
               name="sso_group_jwt_field"
               label={labelWithHint(
-                "SSO Group JWT Field",
-                "JWT field name that contains team/group information. Use dot notation to access nested fields.",
+                t("adminPanel.uiAccessControl.fields.jwtField"),
+                t("adminPanel.uiAccessControl.fields.jwtFieldHint"),
               )}
             >
               {({ ref, value, ...field }) => <Input {...field} ref={ref} value={value ?? ""} placeholder="groups" />}
@@ -210,7 +218,7 @@ const UIAccessControlForm: React.FC<UIAccessControlFormProps> = ({ accessToken,
           <div className="mt-4 text-right">
             <Button type="submit" disabled={loading}>
               {loading && <UiLoadingSpinner className="size-4" />}
-              Update UI Access Control
+              {t("adminPanel.uiAccessControl.submit")}
             </Button>
           </div>
         </form>
diff --git a/ui/litellm-dashboard/src/components/alerting/alerting_settings.tsx b/ui/litellm-dashboard/src/components/alerting/alerting_settings.tsx
index cff33546fbc..72b2d97e546 100644
--- a/ui/litellm-dashboard/src/components/alerting/alerting_settings.tsx
+++ b/ui/litellm-dashboard/src/components/alerting/alerting_settings.tsx
@@ -2,6 +2,7 @@
  * UI for controlling slack alerting settings
  */
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 
 import { alertingSettingsCall, updateConfigFieldSetting } from "../networking";
 import DynamicForm from "./dynamic_form";
@@ -23,6 +24,7 @@ interface AlertingSettingsProps {
 }
 
 const AlertingSettings: React.FC<AlertingSettingsProps> = ({ accessToken, premiumUser }) => {
+  const { t } = useTranslation();
   const [alertingSettings, setAlertingSettings] = useState<alertingSettingsItem[]>([]);
 
   useEffect(() => {
@@ -74,7 +76,7 @@ const AlertingSettings: React.FC<AlertingSettingsProps> = ({ accessToken, premiu
         }
       }
       // update value in state
-      toast.success("Wait 10s for proxy to update.");
+      toast.success(t("loggingAndAlerts.alerting.toasts.saved"));
     } catch (error) {
       toast.error(extractProxyErrorMessage(error));
     }
diff --git a/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx b/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx
index 42aa58ca0ea..01cf049206b 100644
--- a/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx
+++ b/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
 import { CircleCheck, Trash2 } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -33,6 +34,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   handleSubmit,
   premiumUser,
 }) => {
+  const { t } = useTranslation();
   const form = useForm<AlertingFormValues>({ defaultValues: {} });
 
   const onFinish = (formData: AlertingFormValues) => {
@@ -97,7 +99,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
             <TableCell>
               <Button className="flex items-center justify-center">
                 <a href="https://forms.gle/W3U4PZpJGFHWtHyA9" target="_blank">
-                  ✨ Enterprise Feature
+                  {t("loggingAndAlerts.alerting.enterpriseFeature")}
                 </a>
               </Button>
             </TableCell>
@@ -108,12 +110,12 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
             {value.stored_in_db == true ? (
               <Badge variant="secondary">
                 <CircleCheck />
-                In DB
+                {t("loggingAndAlerts.alerting.storage.inDb")}
               </Badge>
             ) : value.stored_in_db == false ? (
-              <Badge variant="outline">In Config</Badge>
+              <Badge variant="outline">{t("loggingAndAlerts.alerting.storage.inConfig")}</Badge>
             ) : (
-              <Badge variant="outline">Not Set</Badge>
+              <Badge variant="outline">{t("loggingAndAlerts.alerting.storage.notSet")}</Badge>
             )}
           </TableCell>
           <TableCell>
@@ -121,7 +123,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
               type="button"
               variant="ghost"
               size="icon-sm"
-              aria-label={`Reset ${value.field_name}`}
+              aria-label={t("loggingAndAlerts.alerting.resetField", { field: value.field_name })}
               onClick={() => handleResetField(value.field_name, index)}
               className="text-destructive"
             >
@@ -131,7 +133,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
         </TableRow>
       ))}
       <div>
-        <Button type="submit">Update Settings</Button>
+        <Button type="submit">{t("loggingAndAlerts.alerting.submit")}</Button>
       </div>
     </form>
   );
diff --git a/ui/litellm-dashboard/src/components/claude_code_plugins/MakeSkillPublicForm.tsx b/ui/litellm-dashboard/src/components/claude_code_plugins/MakeSkillPublicForm.tsx
index 5a3efc188b3..63aa751a610 100644
--- a/ui/litellm-dashboard/src/components/claude_code_plugins/MakeSkillPublicForm.tsx
+++ b/ui/litellm-dashboard/src/components/claude_code_plugins/MakeSkillPublicForm.tsx
@@ -1,5 +1,7 @@
 import React, { useState, useEffect } from "react";
+import type { ParseKeys } from "i18next";
 import { Loader2 } from "lucide-react";
+import { Trans, useTranslation } from "react-i18next";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
@@ -9,7 +11,10 @@ import { enableClaudeCodePlugin, disableClaudeCodePlugin } from "../networking";
 import { toast } from "@/lib/toast";
 import { Plugin } from "./types";
 
-const STEP_TITLES = ["Select Skills", "Confirm"];
+const STEP_TITLE_KEYS: readonly ParseKeys[] = [
+  "claudeCodePlugins.makePublic.steps.select",
+  "claudeCodePlugins.makePublic.steps.confirm",
+];
 
 interface MakeSkillPublicFormProps {
   visible: boolean;
@@ -26,6 +31,7 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
   skillsList,
   onSuccess,
 }) => {
+  const { t } = useTranslation();
   const [currentStep, setCurrentStep] = useState(0);
   const [selectedSkills, setSelectedSkills] = useState<Set<string>>(new Set());
   const [loading, setLoading] = useState(false);
@@ -38,7 +44,7 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
 
   const handleNext = () => {
     if (selectedSkills.size === 0) {
-      toast.fromError("Please select at least one skill");
+      toast.fromError(t("claudeCodePlugins.makePublic.toasts.selectAtLeastOne"));
       return;
     }
     setCurrentStep(1);
@@ -71,7 +77,7 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
 
   const handleSubmit = async () => {
     if (selectedSkills.size === 0) {
-      toast.fromError("Please select at least one skill");
+      toast.fromError(t("claudeCodePlugins.makePublic.toasts.selectAtLeastOne"));
       return;
     }
 
@@ -91,12 +97,12 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
         }),
       );
 
-      toast.success(`Skill Hub updated — ${selectedSkills.size} skill(s) published`);
+      toast.success(t("claudeCodePlugins.makePublic.toasts.published", { count: selectedSkills.size }));
       handleClose();
       onSuccess();
     } catch (error) {
       console.error("Error publishing skills:", error);
-      toast.fromError("Failed to update skills. Please try again.");
+      toast.fromError(t("claudeCodePlugins.makePublic.toasts.publishFailed"));
     } finally {
       setLoading(false);
     }
@@ -108,7 +114,7 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
   const renderStep1 = () => (
     <div className="space-y-4">
       <div className="flex items-center justify-between">
-        <h3 className="text-lg font-semibold">Select Skills to Publish</h3>
+        <h3 className="text-lg font-semibold">{t("claudeCodePlugins.makePublic.step1.title")}</h3>
         <label className="flex items-center gap-2 text-sm">
           <Checkbox
             checked={allSelected}
@@ -116,19 +122,17 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
             onCheckedChange={(checked) => handleSelectAll(checked === true)}
             disabled={skillsList.length === 0}
           />
-          Select All ({skillsList.length})
+          {t("claudeCodePlugins.makePublic.step1.selectAll", { total: skillsList.length })}
         </label>
       </div>
 
-      <p className="text-sm text-muted-foreground">
-        Selected skills will be visible to all users in the Skill Hub. Deselected skills will be unpublished.
-      </p>
+      <p className="text-sm text-muted-foreground">{t("claudeCodePlugins.makePublic.step1.description")}</p>
 
       <div className="max-h-96 overflow-y-auto border rounded-lg p-4">
         <div className="space-y-3">
           {skillsList.length === 0 ? (
             <div className="text-center py-8 text-muted-foreground">
-              <p>No skills registered yet.</p>
+              <p>{t("claudeCodePlugins.makePublic.step1.empty")}</p>
             </div>
           ) : (
             skillsList.map((skill) => (
@@ -141,7 +145,9 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
                 <div className="flex-1 min-w-0">
                   <div className="flex items-center gap-2">
                     <p className="font-medium font-mono text-sm break-words">{skill.name}</p>
-                    {skill.enabled && <Badge variant="secondary">Public</Badge>}
+                    {skill.enabled && (
+                      <Badge variant="secondary">{t("claudeCodePlugins.makePublic.step1.public")}</Badge>
+                    )}
                   </div>
                   {skill.description && (
                     <p className="text-xs text-muted-foreground truncate max-w-sm">{skill.description}</p>
@@ -157,7 +163,11 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
       {selectedSkills.size > 0 && (
         <div className="bg-info/10 border border-info/20 rounded-lg p-3">
           <p className="text-sm text-info">
-            <strong>{selectedSkills.size}</strong> skill{selectedSkills.size !== 1 ? "s" : ""} will be published
+            <Trans
+              i18nKey="claudeCodePlugins.makePublic.step1.selectedCount"
+              count={selectedSkills.size}
+              components={{ strong: <strong /> }}
+            />
           </p>
         </div>
       )}
@@ -166,17 +176,16 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
 
   const renderStep2 = () => (
     <div className="space-y-4">
-      <h3 className="text-lg font-semibold">Confirm Publish to Skill Hub</h3>
+      <h3 className="text-lg font-semibold">{t("claudeCodePlugins.makePublic.step2.title")}</h3>
 
       <div className="bg-warning/10 border border-warning/20 rounded-lg p-4">
         <p className="text-sm text-warning">
-          <strong>Note:</strong> Published skills will be visible to all users in the Skill Hub tab. Skills not in the
-          list below will be unpublished.
+          <Trans i18nKey="claudeCodePlugins.makePublic.step2.note" components={{ strong: <strong /> }} />
         </p>
       </div>
 
       <div className="space-y-3">
-        <p className="font-medium">Skills to be published:</p>
+        <p className="font-medium">{t("claudeCodePlugins.makePublic.step2.listTitle")}</p>
         <div className="max-h-48 overflow-y-auto border rounded-lg p-3">
           <div className="space-y-2">
             {Array.from(selectedSkills).map((name) => {
@@ -194,7 +203,11 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
 
       <div className="bg-info/10 border border-info/20 rounded-lg p-3">
         <p className="text-sm text-info">
-          Total: <strong>{selectedSkills.size}</strong> skill{selectedSkills.size !== 1 ? "s" : ""} will be published
+          <Trans
+            i18nKey="claudeCodePlugins.makePublic.step2.total"
+            count={selectedSkills.size}
+            components={{ strong: <strong /> }}
+          />
         </p>
       </div>
     </div>
@@ -204,12 +217,12 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
     <Dialog open={visible} onOpenChange={(open) => !open && handleClose()} disablePointerDismissal>
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
         <DialogHeader>
-          <DialogTitle>Publish to Skill Hub</DialogTitle>
+          <DialogTitle>{t("claudeCodePlugins.makePublic.title")}</DialogTitle>
         </DialogHeader>
 
         <div>
           <ol className="mb-6 flex items-center gap-6">
-            {STEP_TITLES.map((title, index) => (
+            {STEP_TITLE_KEYS.map((title, index) => (
               <li
                 key={title}
                 className="flex items-center gap-2"
@@ -226,7 +239,7 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
                   {index + 1}
                 </span>
                 <span className={cn("text-sm", currentStep === index ? "font-medium" : "text-muted-foreground")}>
-                  {title}
+                  {t(title)}
                 </span>
               </li>
             ))}
@@ -236,18 +249,20 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
 
           <div className="flex justify-between mt-6">
             <Button variant="outline" onClick={currentStep === 0 ? handleClose : () => setCurrentStep(0)}>
-              {currentStep === 0 ? "Cancel" : "Previous"}
+              {currentStep === 0
+                ? t("claudeCodePlugins.makePublic.buttons.cancel")
+                : t("claudeCodePlugins.makePublic.buttons.previous")}
             </Button>
             <div className="flex space-x-2">
               {currentStep === 0 && (
                 <Button onClick={handleNext} disabled={selectedSkills.size === 0}>
-                  Next
+                  {t("claudeCodePlugins.makePublic.buttons.next")}
                 </Button>
               )}
               {currentStep === 1 && (
                 <Button onClick={handleSubmit} disabled={loading}>
                   {loading && <Loader2 className="size-4 animate-spin" />}
-                  Publish to Hub
+                  {t("claudeCodePlugins.makePublic.buttons.publish")}
                 </Button>
               )}
             </div>
diff --git a/ui/litellm-dashboard/src/components/claude_code_plugins/helpers.ts b/ui/litellm-dashboard/src/components/claude_code_plugins/helpers.ts
index 519d49ca704..b8a32dfd774 100644
--- a/ui/litellm-dashboard/src/components/claude_code_plugins/helpers.ts
+++ b/ui/litellm-dashboard/src/components/claude_code_plugins/helpers.ts
@@ -2,6 +2,7 @@
  * Helper utilities for Claude Code Marketplace
  */
 
+import i18n from "@/i18n/i18n";
 import type { Plugin, PluginSource } from "./types";
 
 export interface SkillSourcePreview {
@@ -103,7 +104,7 @@ const parseGitHubSource = (url: URL, subPath?: string): SkillSourcePreview | nul
   const repoUrl = `https://github.com/${repoFull}`;
   const repoPreview: SkillSourcePreview = {
     parsed: { source: "github", repo: repoFull },
-    label: `GitHub repo — ${repoFull}`,
+    label: i18n.t("claudeCodePlugins.sources.githubRepo", { repo: repoFull }),
     suggestedName: toKebabCase(repoBase),
   };
 
@@ -121,7 +122,7 @@ const parseGitHubSource = (url: URL, subPath?: string): SkillSourcePreview | nul
     }
     return {
       parsed: { source: "git-subdir", url: repoUrl, path },
-      label: `GitHub subdir — ${repoFull} @ ${path}`,
+      label: i18n.t("claudeCodePlugins.sources.githubSubdir", { repo: repoFull, path }),
       suggestedName: toKebabCase(lastSegment(path)),
     };
   }
@@ -137,7 +138,7 @@ const parseGitHubSource = (url: URL, subPath?: string): SkillSourcePreview | nul
     }
     return {
       parsed: { source: "git-subdir", url: repoUrl, path: normalized },
-      label: `GitHub subdir — ${repoFull} @ ${normalized}`,
+      label: i18n.t("claudeCodePlugins.sources.githubSubdir", { repo: repoFull, path: normalized }),
       suggestedName: toKebabCase(lastSegment(normalized)),
     };
   }
@@ -158,14 +159,14 @@ const buildGitSourcePreview = (
     }
     return {
       parsed: { source: "git-subdir", url: repoUrl, path: normalized },
-      label: `${kind} subdir — ${repoUrl} @ ${normalized}`,
+      label: i18n.t("claudeCodePlugins.sources.gitSubdir", { kind, url: repoUrl, path: normalized }),
       suggestedName: toKebabCase(lastSegment(normalized)),
     };
   }
 
   return {
     parsed: { source: "url", url: repoUrl },
-    label: `${kind} repo — ${repoUrl}`,
+    label: i18n.t("claudeCodePlugins.sources.gitRepo", { kind, url: repoUrl }),
     suggestedName: toKebabCase(repoName),
   };
 };
@@ -205,7 +206,7 @@ const parseSshSource = (raw: string, subPath?: string): SkillSourcePreview | nul
 
 const parseArchiveSource = (url: URL): SkillSourcePreview => ({
   parsed: { source: "archive", url: url.href },
-  label: `Zip archive — ${url.host}${url.pathname}`,
+  label: i18n.t("claudeCodePlugins.sources.zipArchive", { location: `${url.host}${url.pathname}` }),
   suggestedName: toKebabCase(lastSegment(url.pathname).replace(ZIP_ARCHIVE_REGEX, "")),
 });
 
@@ -282,7 +283,7 @@ export const validatePluginName = (name: string): boolean => {
  */
 export const getSourceDisplayText = (source: Plugin["source"]): string => {
   if (source.source === "github" && source.repo) {
-    return `GitHub: ${source.repo}`;
+    return i18n.t("claudeCodePlugins.sources.githubDisplay", { repo: source.repo });
   }
   if (source.source === "git-subdir" && source.url && source.path) {
     return `${source.url} @ ${source.path}`;
@@ -290,7 +291,7 @@ export const getSourceDisplayText = (source: Plugin["source"]): string => {
   if ((source.source === "url" || source.source === "archive") && source.url) {
     return source.url;
   }
-  return "Unknown source";
+  return i18n.t("claudeCodePlugins.sources.unknown");
 };
 
 /**
diff --git a/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx b/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx
index 658a0472699..b46d1eaf632 100644
--- a/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx
+++ b/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import { ArrowLeft, Check, Copy, Link2 } from "lucide-react";
+import { Trans, useTranslation } from "react-i18next";
 import { useClaudeCodeMarketplaceRequiresKey } from "@/app/(dashboard)/hooks/claudeCodeMarketplace/useClaudeCodeMarketplaceRequiresKey";
 import { cn } from "@/lib/cva.config";
 import {
@@ -12,12 +13,13 @@ import {
 import { Plugin } from "./types";
 
 const SkillSource: React.FC<{ source: Plugin["source"] }> = ({ source }) => {
+  const { t } = useTranslation();
   const link = getSourceLink(source);
   const href = link && source.source === "git-subdir" && source.path ? `${link}/tree/main/${source.path}` : link;
   if (href) {
     return (
       <div className="mb-6">
-        <div className="mb-1 text-xs text-muted-foreground">Source</div>
+        <div className="mb-1 text-xs text-muted-foreground">{t("claudeCodePlugins.skillDetail.overview.source")}</div>
         <a
           href={href}
           target="_blank"
@@ -35,7 +37,7 @@ const SkillSource: React.FC<{ source: Plugin["source"] }> = ({ source }) => {
   }
   return (
     <div className="mb-6">
-      <div className="mb-1 text-xs text-muted-foreground">Source</div>
+      <div className="mb-1 text-xs text-muted-foreground">{t("claudeCodePlugins.skillDetail.overview.source")}</div>
       <div className="break-all text-[13px] text-foreground">{getSourceDisplayText(source)}</div>
     </div>
   );
@@ -50,6 +52,7 @@ interface SkillDetailProps {
 }
 
 const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
+  const { t } = useTranslation();
   const [activeTab, setActiveTab] = useState("overview");
   const [copiedKey, setCopiedKey] = useState<string | null>(null);
   const marketplaceRequiresKey = useClaudeCodeMarketplaceRequiresKey();
@@ -68,17 +71,32 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
   );
 
   const detailRows = [
-    ...(skill.category ? [{ property: "Category", value: skill.category }] : []),
-    ...(skill.domain ? [{ property: "Domain", value: skill.domain }] : []),
-    ...(skill.namespace ? [{ property: "Namespace", value: skill.namespace }] : []),
-    ...(skill.version ? [{ property: "Version", value: skill.version }] : []),
-    ...(skill.author?.name ? [{ property: "Author", value: skill.author.name }] : []),
-    ...(skill.created_at ? [{ property: "Added", value: new Date(skill.created_at).toLocaleDateString() }] : []),
+    ...(skill.category
+      ? [{ property: t("claudeCodePlugins.skillDetail.properties.category"), value: skill.category }]
+      : []),
+    ...(skill.domain ? [{ property: t("claudeCodePlugins.skillDetail.properties.domain"), value: skill.domain }] : []),
+    ...(skill.namespace
+      ? [{ property: t("claudeCodePlugins.skillDetail.properties.namespace"), value: skill.namespace }]
+      : []),
+    ...(skill.version
+      ? [{ property: t("claudeCodePlugins.skillDetail.properties.version"), value: skill.version }]
+      : []),
+    ...(skill.author?.name
+      ? [{ property: t("claudeCodePlugins.skillDetail.properties.author"), value: skill.author.name }]
+      : []),
+    ...(skill.created_at
+      ? [
+          {
+            property: t("claudeCodePlugins.skillDetail.properties.added"),
+            value: new Date(skill.created_at).toLocaleDateString(),
+          },
+        ]
+      : []),
   ];
 
   const tabs = [
-    { key: "overview", label: "Overview" },
-    { key: "usage", label: "How to Use" },
+    { key: "overview", label: t("claudeCodePlugins.skillDetail.tabs.overview") },
+    { key: "usage", label: t("claudeCodePlugins.skillDetail.tabs.usage") },
   ];
 
   return (
@@ -89,7 +107,7 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
         className="mb-6 inline-flex cursor-pointer items-center gap-1.5 text-sm text-muted-foreground"
       >
         <ArrowLeft className="size-3" />
-        <span>Skills</span>
+        <span>{t("claudeCodePlugins.skillDetail.back")}</span>
       </div>
 
       {/* Header */}
@@ -125,12 +143,18 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
         <div className="flex gap-16">
           {/* Left column */}
           <div className="min-w-0 flex-1">
-            <h2 className="m-0 mb-1 text-lg font-normal text-foreground">Skill Details</h2>
-            <p className="m-0 mb-4 text-[13px] text-muted-foreground">Metadata registered with this skill</p>
+            <h2 className="m-0 mb-1 text-lg font-normal text-foreground">
+              {t("claudeCodePlugins.skillDetail.overview.title")}
+            </h2>
+            <p className="m-0 mb-4 text-[13px] text-muted-foreground">
+              {t("claudeCodePlugins.skillDetail.overview.subtitle")}
+            </p>
             <table className="w-full border-collapse text-sm">
               <thead>
                 <tr className="border-b border-border">
-                  <th className="w-40 py-3 text-left font-medium text-muted-foreground">Property</th>
+                  <th className="w-40 py-3 text-left font-medium text-muted-foreground">
+                    {t("claudeCodePlugins.skillDetail.overview.propertyHeader")}
+                  </th>
                   <th className="py-3 text-left font-medium text-muted-foreground">{skill.name}</th>
                 </tr>
               </thead>
@@ -148,14 +172,18 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
           {/* Right sidebar */}
           <div className="w-60 shrink-0">
             <div className="mb-6">
-              <div className="mb-1 text-xs text-muted-foreground">Status</div>
+              <div className="mb-1 text-xs text-muted-foreground">
+                {t("claudeCodePlugins.skillDetail.overview.status")}
+              </div>
               <span
                 className={cn(
                   "rounded-xl px-2.5 py-[3px] text-xs font-medium",
                   skill.enabled ? "bg-success/10 text-success" : "bg-muted text-muted-foreground",
                 )}
               >
-                {skill.enabled ? "Public" : "Draft"}
+                {skill.enabled
+                  ? t("claudeCodePlugins.skillDetail.overview.public")
+                  : t("claudeCodePlugins.skillDetail.overview.draft")}
               </span>
             </div>
 
@@ -163,7 +191,9 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
 
             {skill.keywords && skill.keywords.length > 0 && (
               <div className="mb-6">
-                <div className="mb-2 text-xs text-muted-foreground">Tags</div>
+                <div className="mb-2 text-xs text-muted-foreground">
+                  {t("claudeCodePlugins.skillDetail.overview.tags")}
+                </div>
                 <div className="flex flex-wrap gap-1.5">
                   {skill.keywords.map((kw) => (
                     <span
@@ -178,7 +208,9 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
             )}
 
             <div>
-              <div className="mb-1 text-xs text-muted-foreground">Skill ID</div>
+              <div className="mb-1 text-xs text-muted-foreground">
+                {t("claudeCodePlugins.skillDetail.overview.skillId")}
+              </div>
               <div className="break-all font-mono text-xs text-foreground">{skill.id}</div>
             </div>
           </div>
@@ -188,15 +220,19 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
       {/* How to Use tab */}
       {activeTab === "usage" && (
         <div className="max-w-[640px]">
-          <h2 className="m-0 mb-2 text-lg font-normal text-foreground">Using this skill</h2>
+          <h2 className="m-0 mb-2 text-lg font-normal text-foreground">
+            {t("claudeCodePlugins.skillDetail.usage.title")}
+          </h2>
           <p className="m-0 mb-6 text-sm leading-relaxed text-muted-foreground">
-            Once your proxy is set as a marketplace, enable this skill in Claude Code with one command:
+            {t("claudeCodePlugins.skillDetail.usage.intro")}
           </p>
 
           {/* Install command */}
           <div className="mb-6 overflow-hidden rounded-lg border border-border">
             <div className="flex items-center justify-between border-b border-border bg-muted px-4 py-2.5">
-              <span className="text-[13px] font-medium text-foreground">Run in Claude Code</span>
+              <span className="text-[13px] font-medium text-foreground">
+                {t("claudeCodePlugins.skillDetail.runInClaudeCode")}
+              </span>
               <button
                 onClick={() => copyToClipboard(installCommand, "install")}
                 className={cn(
@@ -205,7 +241,9 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
                 )}
               >
                 {copiedKey === "install" ? <Check className="size-3" /> : <Copy className="size-3" />}
-                {copiedKey === "install" ? "Copied" : "Copy"}
+                {copiedKey === "install"
+                  ? t("claudeCodePlugins.skillDetail.copied")
+                  : t("claudeCodePlugins.skillDetail.copy")}
               </button>
             </div>
             <pre className="m-0 bg-card px-4 py-3.5 font-mono text-sm text-foreground">{installCommand}</pre>
@@ -214,7 +252,7 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
           {/* Shown when the marketplace catalog is stale and the plugin isn't found yet */}
           <div className="mb-4 rounded-lg border border-warning/30 bg-warning/10 px-4 py-3">
             <p className="m-0 mb-2 text-[13px] leading-relaxed text-muted-foreground">
-              If you see &quot;Plugin {skill.name} not found in marketplace&quot;, update the catalog first:
+              {t("claudeCodePlugins.skillDetail.usage.staleCatalog", { name: skill.name })}
             </p>
             <pre className="m-0 bg-transparent font-mono text-[13px] text-foreground">
               /plugin marketplace update litellm
@@ -222,9 +260,9 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
           </div>
 
           <p className="m-0 text-[13px] leading-relaxed text-muted-foreground">
-            Don&apos;t have the marketplace configured yet?{" "}
+            {t("claudeCodePlugins.skillDetail.usage.notConfigured")}{" "}
             <span onClick={() => setActiveTab("setup")} className="cursor-pointer text-info">
-              See one-time setup →
+              {t("claudeCodePlugins.skillDetail.usage.seeSetup")}
             </span>
           </p>
         </div>
@@ -233,36 +271,45 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
       {/* Setup tab (linked from usage) */}
       {activeTab === "setup" && (
         <div className="max-w-[640px]">
-          <h2 className="m-0 mb-2 text-lg font-normal text-foreground">One-time marketplace setup</h2>
+          <h2 className="m-0 mb-2 text-lg font-normal text-foreground">
+            {t("claudeCodePlugins.skillDetail.setup.title")}
+          </h2>
 
           {marketplaceRequiresKey ? (
             <>
               <div className="mb-4 rounded-lg border border-warning/30 bg-warning/10 px-4 py-3">
                 <p className="m-0 mb-2 text-[13px] leading-relaxed text-muted-foreground">
-                  If you added this marketplace before without a key, remove it first in Claude Code. Removing it also
-                  uninstalls the plugins you installed from it, so install them again from /plugin after you add the
-                  snippet:
+                  {t("claudeCodePlugins.skillDetail.setup.removeFirst")}
                 </p>
                 <pre className="m-0 bg-transparent font-mono text-[13px] text-foreground">
                   /plugin marketplace remove litellm
                 </pre>
               </div>
               <p className="m-0 mb-3 text-sm leading-relaxed text-muted-foreground">
-                This proxy requires a LiteLLM key to read the marketplace. Add this to{" "}
-                <code className="rounded bg-muted px-1.5 py-px text-[13px]">~/.claude/settings.json</code> and replace{" "}
-                <code className="rounded bg-muted px-1.5 py-px text-[13px]">{MARKETPLACE_KEY_PLACEHOLDER}</code> with
-                your key:
+                <Trans
+                  i18nKey="claudeCodePlugins.skillDetail.setup.requiresKey"
+                  components={{
+                    settings: (
+                      <code className="rounded bg-muted px-1.5 py-px text-[13px]">~/.claude/settings.json</code>
+                    ),
+                    placeholder: (
+                      <code className="rounded bg-muted px-1.5 py-px text-[13px]">{MARKETPLACE_KEY_PLACEHOLDER}</code>
+                    ),
+                  }}
+                />
               </p>
             </>
           ) : (
             <>
               {/* Option 1: single command — fastest path for most users */}
               <p className="m-0 mb-3 text-sm leading-relaxed text-muted-foreground">
-                Run this command in Claude Code to register the marketplace:
+                {t("claudeCodePlugins.skillDetail.setup.runCommand")}
               </p>
               <div className="mb-6 overflow-hidden rounded-lg border border-border">
                 <div className="flex items-center justify-between border-b border-border bg-muted px-4 py-2.5">
-                  <span className="text-[13px] font-medium text-foreground">Run in Claude Code</span>
+                  <span className="text-[13px] font-medium text-foreground">
+                    {t("claudeCodePlugins.skillDetail.runInClaudeCode")}
+                  </span>
                   <button
                     onClick={() => {
                       const origin = typeof window !== "undefined" ? window.location.origin : "";
@@ -277,7 +324,9 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
                     )}
                   >
                     {copiedKey === "marketplace-cmd" ? <Check className="size-3" /> : <Copy className="size-3" />}
-                    {copiedKey === "marketplace-cmd" ? "Copied" : "Copy"}
+                    {copiedKey === "marketplace-cmd"
+                      ? t("claudeCodePlugins.skillDetail.copied")
+                      : t("claudeCodePlugins.skillDetail.copy")}
                   </button>
                 </div>
                 <pre className="m-0 bg-card px-4 py-3.5 font-mono text-[13px] text-foreground">
@@ -288,9 +337,14 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
               {/* Option 2: settings.json — for persistent config or managed deployments.
                   extraKnownMarketplaces requires source to be a nested object, not a flat string. */}
               <p className="m-0 mb-3 text-sm leading-relaxed text-muted-foreground">
-                Or add this to{" "}
-                <code className="rounded bg-muted px-1.5 py-px text-[13px]">~/.claude/settings.json</code> for a
-                persistent configuration:
+                <Trans
+                  i18nKey="claudeCodePlugins.skillDetail.setup.orSettings"
+                  components={{
+                    settings: (
+                      <code className="rounded bg-muted px-1.5 py-px text-[13px]">~/.claude/settings.json</code>
+                    ),
+                  }}
+                />
               </p>
             </>
           )}
@@ -305,7 +359,9 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
                 )}
               >
                 {copiedKey === "settings" ? <Check className="size-3" /> : <Copy className="size-3" />}
-                {copiedKey === "settings" ? "Copied" : "Copy"}
+                {copiedKey === "settings"
+                  ? t("claudeCodePlugins.skillDetail.copied")
+                  : t("claudeCodePlugins.skillDetail.copy")}
               </button>
             </div>
             <pre className="m-0 bg-card px-4 py-3.5 font-mono text-[13px] text-foreground">{settingsSnippet}</pre>
diff --git a/ui/litellm-dashboard/src/components/common_components/MetadataKeyValueFields.tsx b/ui/litellm-dashboard/src/components/common_components/MetadataKeyValueFields.tsx
index 22862b5f6eb..8bdc4005be0 100644
--- a/ui/litellm-dashboard/src/components/common_components/MetadataKeyValueFields.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/MetadataKeyValueFields.tsx
@@ -1,5 +1,6 @@
 import { CircleMinus, Plus } from "lucide-react";
 import React, { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import {
   useFieldArray,
   type Control,
@@ -96,11 +97,19 @@ const MetadataRow = <TFieldValues extends FieldValues>({
   schemaLabel,
   onRemove,
 }: MetadataRowProps<TFieldValues>) => {
+  const { t } = useTranslation();
   return (
     <div className="mb-2 flex items-start gap-2">
       {schemaLabel === undefined ? (
         <FormField control={control} name={`${name}.${index}.key` as FieldPath<TFieldValues>}>
-          {({ ref, value, ...rest }) => <Input {...rest} ref={ref} value={(value as string) ?? ""} placeholder="Key" />}
+          {({ ref, value, ...rest }) => (
+            <Input
+              {...rest}
+              ref={ref}
+              value={(value as string) ?? ""}
+              placeholder={t("metadataKeyValueFields.keyPlaceholder")}
+            />
+          )}
         </FormField>
       ) : (
         <Label
@@ -118,7 +127,7 @@ const MetadataRow = <TFieldValues extends FieldValues>({
             id={schemaLabel === undefined ? id : `${rowId}-value`}
             ref={ref}
             value={(value as string) ?? ""}
-            placeholder="Value"
+            placeholder={t("metadataKeyValueFields.valuePlaceholder")}
           />
         )}
       </FormField>
@@ -126,7 +135,7 @@ const MetadataRow = <TFieldValues extends FieldValues>({
         <Button
           variant="ghost"
           size="icon"
-          aria-label="Remove key-value pair"
+          aria-label={t("metadataKeyValueFields.removePair")}
           className="mt-1 text-destructive"
           onClick={onRemove}
         >
@@ -144,6 +153,7 @@ const MetadataKeyValueFields = <TFieldValues extends FieldValues>({
   schemaFields = [],
   schemaLoading = false,
 }: MetadataKeyValueFieldsProps<TFieldValues>) => {
+  const { t } = useTranslation();
   const { fields, append, remove } = useFieldArray({ control, name });
   const seededRef = useRef(false);
   const schemaLabelsByKey = new Map(schemaFields.map((field) => [field.key, field.label || field.key]));
@@ -208,7 +218,7 @@ const MetadataKeyValueFields = <TFieldValues extends FieldValues>({
         onClick={() => append({ key: "", value: "" } as never, { shouldFocus: false })}
       >
         <Plus className="size-4" />
-        Add Key-Value Pair
+        {t("metadataKeyValueFields.addPair")}
       </Button>
     </>
   );
diff --git a/ui/litellm-dashboard/src/components/common_components/ModelSelector.tsx b/ui/litellm-dashboard/src/components/common_components/ModelSelector.tsx
index 15b6b1644b6..aa2063431f7 100644
--- a/ui/litellm-dashboard/src/components/common_components/ModelSelector.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/ModelSelector.tsx
@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from "react";
 import { Bot } from "lucide-react";
 import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
+import { useTranslation } from "react-i18next";
 import { Input } from "@/components/ui/input";
 import { SearchSelect } from "@/components/shared/SearchSelect";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
+import i18n from "@/i18n/i18n";
 
 const MODEL_SELECT_DEBOUNCE_MS = 500;
 
@@ -22,14 +24,15 @@ interface ModelSelectorProps {
 const ModelSelector: React.FC<ModelSelectorProps> = ({
   accessToken,
   value,
-  placeholder = "Select a Model",
+  placeholder = i18n.t("modelSelector.placeholder"),
   onChange,
   disabled = false,
   style,
   className,
   showLabel = true,
-  labelText = "Select Model",
+  labelText = i18n.t("modelSelector.label"),
 }) => {
+  const { t } = useTranslation();
   const [selectedModel, setSelectedModel] = useState<string | null>(value ?? null);
   const [showCustomModelInput, setShowCustomModelInput] = useState<boolean>(false);
   const [modelInfo, setModelInfo] = useState<ModelGroup[]>([]);
@@ -91,7 +94,7 @@ const ModelSelector: React.FC<ModelSelectorProps> = ({
               value: model_group,
               label: model_group,
             })),
-            { value: "custom", label: "Enter custom model" },
+            { value: "custom", label: t("modelSelector.customOption") },
           ]}
           value={selectedModel}
           placeholder={placeholder}
@@ -102,7 +105,7 @@ const ModelSelector: React.FC<ModelSelectorProps> = ({
       {showCustomModelInput && (
         <Input
           className="mt-2"
-          placeholder="Enter custom model name"
+          placeholder={t("modelSelector.customPlaceholder")}
           onChange={(e) => debouncedSelect(e.target.value)}
           disabled={disabled}
         />
diff --git a/ui/litellm-dashboard/src/components/email_events/email_event_settings.tsx b/ui/litellm-dashboard/src/components/email_events/email_event_settings.tsx
index 5d063118b0b..cf4a53f5b92 100644
--- a/ui/litellm-dashboard/src/components/email_events/email_event_settings.tsx
+++ b/ui/litellm-dashboard/src/components/email_events/email_event_settings.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Checkbox } from "@/components/ui/checkbox";
@@ -14,6 +15,7 @@ interface EmailEventSettingsProps {
 }
 
 const EmailEventSettings: React.FC<EmailEventSettingsProps> = ({ accessToken }) => {
+  const { t } = useTranslation();
   const [loading, setLoading] = useState(true);
   const [eventSettings, setEventSettings] = useState<EmailEventSetting[]>([]);
 
@@ -49,7 +51,7 @@ const EmailEventSettings: React.FC<EmailEventSettingsProps> = ({ accessToken })
 
     try {
       await updateEmailEventSettings(accessToken, { settings: eventSettings });
-      toast.success("Email event settings updated successfully");
+      toast.success(t("loggingAndAlerts.emailEvents.toasts.saved"));
     } catch (error) {
       console.error("Failed to update email event settings:", error);
       toast.fromError(error);
@@ -61,7 +63,7 @@ const EmailEventSettings: React.FC<EmailEventSettingsProps> = ({ accessToken })
 
     try {
       await resetEmailEventSettings(accessToken);
-      toast.success("Email event settings reset to defaults");
+      toast.success(t("loggingAndAlerts.emailEvents.toasts.reset"));
       // Refresh settings after reset
       fetchEventSettings();
     } catch (error) {
@@ -74,24 +76,24 @@ const EmailEventSettings: React.FC<EmailEventSettingsProps> = ({ accessToken })
   const getEventDescription = (event: EmailEvent): string => {
     // Convert event name to a sentence with more context
     if (event.includes("Virtual Key Created")) {
-      return "An email will be sent to the user when a new virtual key is created with their user ID";
+      return t("loggingAndAlerts.emailEvents.descriptions.virtualKeyCreated");
     } else if (event.includes("New User Invitation")) {
-      return "An email will be sent to the email address of the user when a new user is created";
+      return t("loggingAndAlerts.emailEvents.descriptions.newUserInvitation");
     } else {
       // Handle any other event type from the API
       const words = event
         .split(/(?=[A-Z])/)
         .join(" ")
         .toLowerCase();
-      return `Receive an email notification when ${words}`;
+      return t("loggingAndAlerts.emailEvents.descriptions.generic", { event: words });
     }
   };
 
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="text-base">Email Notifications</CardTitle>
-        <p className="text-sm text-muted-foreground">Select which events should trigger email notifications.</p>
+        <CardTitle className="text-base">{t("loggingAndAlerts.emailEvents.title")}</CardTitle>
+        <p className="text-sm text-muted-foreground">{t("loggingAndAlerts.emailEvents.description")}</p>
       </CardHeader>
 
       <CardContent>
@@ -122,10 +124,10 @@ const EmailEventSettings: React.FC<EmailEventSettingsProps> = ({ accessToken })
 
         <div className="mt-6 flex gap-4">
           <Button onClick={handleSaveSettings} disabled={loading}>
-            Save Changes
+            {t("loggingAndAlerts.emailEvents.saveChanges")}
           </Button>
           <Button variant="secondary" onClick={handleResetSettings} disabled={loading}>
-            Reset to Defaults
+            {t("loggingAndAlerts.emailEvents.resetToDefaults")}
           </Button>
         </div>
       </CardContent>
diff --git a/ui/litellm-dashboard/src/components/email_settings.tsx b/ui/litellm-dashboard/src/components/email_settings.tsx
index 65fae5a2012..c2065a26bc3 100644
--- a/ui/litellm-dashboard/src/components/email_settings.tsx
+++ b/ui/litellm-dashboard/src/components/email_settings.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
@@ -13,19 +14,46 @@ interface EmailSettingsProps {
   alerts: any[];
 }
 
-const REQUIRED_MARKER = <span className="text-destructive"> Required * </span>;
+const REQUIRED_MARKER = (
+  <span className="text-destructive">
+    <Trans i18nKey="loggingAndAlerts.emailSettings.required" />
+  </span>
+);
 
 const FIELD_HELP: Record<string, React.ReactNode> = {
-  SMTP_HOST: <>Enter the SMTP host address, e.g. `smtp.resend.com`{REQUIRED_MARKER}</>,
-  SMTP_PORT: <>Enter the SMTP port number, e.g. `587`{REQUIRED_MARKER}</>,
-  SMTP_USERNAME: <>Enter the SMTP username, e.g. `username`{REQUIRED_MARKER}</>,
-  SMTP_PASSWORD: REQUIRED_MARKER,
-  SMTP_SENDER_EMAIL: <>Enter the sender email address, e.g. `sender@berri.ai`{REQUIRED_MARKER}</>,
-  TEST_EMAIL_ADDRESS: <>Email Address to send `Test Email Alert` to. example: `info@berri.ai`{REQUIRED_MARKER}</>,
-  EMAIL_LOGO_URL: <>(Optional) Customize the Logo that appears in the email, pass a url to your logo</>,
-  EMAIL_SUPPORT_CONTACT: (
-    <>(Optional) Customize the support email address that appears in the email. Default is support@berri.ai</>
+  SMTP_HOST: (
+    <>
+      <Trans i18nKey="loggingAndAlerts.emailSettings.help.smtpHost" />
+      {REQUIRED_MARKER}
+    </>
   ),
+  SMTP_PORT: (
+    <>
+      <Trans i18nKey="loggingAndAlerts.emailSettings.help.smtpPort" />
+      {REQUIRED_MARKER}
+    </>
+  ),
+  SMTP_USERNAME: (
+    <>
+      <Trans i18nKey="loggingAndAlerts.emailSettings.help.smtpUsername" />
+      {REQUIRED_MARKER}
+    </>
+  ),
+  SMTP_PASSWORD: REQUIRED_MARKER,
+  SMTP_SENDER_EMAIL: (
+    <>
+      <Trans i18nKey="loggingAndAlerts.emailSettings.help.smtpSenderEmail" />
+      {REQUIRED_MARKER}
+    </>
+  ),
+  TEST_EMAIL_ADDRESS: (
+    <>
+      <Trans i18nKey="loggingAndAlerts.emailSettings.help.testEmailAddress" />
+      {REQUIRED_MARKER}
+    </>
+  ),
+  EMAIL_LOGO_URL: <Trans i18nKey="loggingAndAlerts.emailSettings.help.emailLogoUrl" />,
+  EMAIL_SUPPORT_CONTACT: <Trans i18nKey="loggingAndAlerts.emailSettings.help.emailSupportContact" />,
 };
 
 const PREMIUM_ONLY_FIELDS = ["EMAIL_LOGO_URL", "EMAIL_SUPPORT_CONTACT"];
@@ -33,6 +61,7 @@ const PREMIUM_ONLY_FIELDS = ["EMAIL_LOGO_URL", "EMAIL_SUPPORT_CONTACT"];
 const SENSITIVE_FIELD_PATTERN = /(PASSWORD|SECRET|KEY|TOKEN)/i;
 
 const EmailSettings: React.FC<EmailSettingsProps> = ({ accessToken, premiumUser, alerts }) => {
+  const { t } = useTranslation();
   const [visibleFields, setVisibleFields] = useState<Record<string, boolean>>({});
 
   const toggleFieldVisibility = (key: string) => {
@@ -78,7 +107,7 @@ const EmailSettings: React.FC<EmailSettingsProps> = ({ accessToken, premiumUser,
     };
     try {
       await setCallbacksCall(accessToken, payload);
-      toast.success("Email settings updated successfully");
+      toast.success(t("loggingAndAlerts.emailSettings.toasts.saved"));
     } catch (error) {
       toast.fromError(error);
     }
@@ -91,7 +120,7 @@ const EmailSettings: React.FC<EmailSettingsProps> = ({ accessToken, premiumUser,
       </div>
       <Card>
         <CardHeader>
-          <CardTitle className="text-base">Email Server Settings</CardTitle>
+          <CardTitle className="text-base">{t("loggingAndAlerts.emailSettings.title")}</CardTitle>
           <p className="text-sm">
             <a
               href="https://docs.litellm.ai/docs/proxy/email"
@@ -99,7 +128,7 @@ const EmailSettings: React.FC<EmailSettingsProps> = ({ accessToken, premiumUser,
               rel="noreferrer"
               className="text-primary underline underline-offset-4"
             >
-              LiteLLM Docs: email alerts
+              {t("loggingAndAlerts.emailSettings.docsLink")}
             </a>
           </p>
         </CardHeader>
@@ -139,7 +168,11 @@ const EmailSettings: React.FC<EmailSettingsProps> = ({ accessToken, premiumUser,
                             <InputGroupButton
                               size="icon-xs"
                               onClick={() => toggleFieldVisibility(key)}
-                              aria-label={isVisible ? "Hide credential" : "Show credential"}
+                              aria-label={
+                                isVisible
+                                  ? t("loggingAndAlerts.emailSettings.hideCredential")
+                                  : t("loggingAndAlerts.emailSettings.showCredential")
+                              }
                             >
                               {isVisible ? <EyeOff /> : <Eye />}
                             </InputGroupButton>
@@ -154,20 +187,20 @@ const EmailSettings: React.FC<EmailSettingsProps> = ({ accessToken, premiumUser,
             ))}
 
           <div className="mt-6 flex gap-2">
-            <Button onClick={() => handleSaveEmailSettings()}>Save Changes</Button>
+            <Button onClick={() => handleSaveEmailSettings()}>{t("loggingAndAlerts.emailSettings.saveChanges")}</Button>
             <Button
               variant="secondary"
               onClick={async () => {
                 if (!accessToken) return;
                 try {
                   await serviceHealthCheck(accessToken, "email");
-                  toast.success("Email test triggered. Check your configured email inbox/logs.");
+                  toast.success(t("loggingAndAlerts.emailSettings.toasts.testTriggered"));
                 } catch (error) {
                   toast.fromError(error);
                 }
               }}
             >
-              Test Email Alerts
+              {t("loggingAndAlerts.emailSettings.testEmailAlerts")}
             </Button>
           </div>
         </CardContent>
diff --git a/ui/litellm-dashboard/src/components/llm_calls/responses_api.test.tsx b/ui/litellm-dashboard/src/components/llm_calls/responses_api.test.tsx
index f9c5e3b0181..9285a49c93f 100644
--- a/ui/litellm-dashboard/src/components/llm_calls/responses_api.test.tsx
+++ b/ui/litellm-dashboard/src/components/llm_calls/responses_api.test.tsx
@@ -207,6 +207,46 @@ describe("responses_api", () => {
     expect(onTimingData).not.toHaveBeenCalled();
   });
 
+  it.each([
+    [["__all__"], [], [{ server_label: "litellm", server_url: "litellm_proxy/mcp" }]],
+    [
+      ["server-1"],
+      [{ server_id: "server-1", server_name: "my server" }],
+      [{ server_label: "my server", server_url: "litellm_proxy/mcp/my server" }],
+    ],
+  ])(
+    "sends MCP selection %j as gateway references the proxy runs for any model",
+    async (selected, servers, expected) => {
+      await makeOpenAIResponsesRequest(
+        messages,
+        mockUpdateTextUI,
+        "gemini-pro",
+        "test-token",
+        undefined, // tags
+        undefined, // signal
+        undefined, // onReasoningContent
+        undefined, // onTimingData
+        undefined, // onUsageData
+        undefined, // traceId
+        undefined, // vector_store_ids
+        undefined, // guardrails
+        undefined, // policies
+        selected,
+        undefined, // previousResponseId
+        undefined, // onResponseId
+        undefined, // onMCPEvent
+        undefined, // codeInterpreterEnabled
+        undefined, // onCodeInterpreterResult
+        undefined, // customBaseUrl
+        servers as never,
+      );
+
+      expect(mockResponsesCreate.mock.calls[0][0].tools).toEqual(
+        expected.map((tool) => ({ type: "mcp", require_approval: "never", ...tool })),
+      );
+    },
+  );
+
   it("should report total latency in both streaming and non-streaming modes", async () => {
     const onTotalLatency = vi.fn();
     const callWithStreaming = (streamingEnabled: boolean) =>
@@ -475,14 +515,14 @@ describe("responses_api", () => {
       {
         type: "mcp",
         server_label: "Alpha",
-        server_url: "https://backend.example.com/mcp/Alpha",
+        server_url: "litellm_proxy/mcp/Alpha",
         require_approval: "never",
         allowed_tools: ["toolA"],
       },
       {
         type: "mcp",
         server_label: "Beta",
-        server_url: "https://backend.example.com/mcp/Beta",
+        server_url: "litellm_proxy/mcp/Beta",
         require_approval: "never",
         allowed_tools: ["toolB", "toolC"],
       },
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 f25ac939331..ed1aeb25074 100644
--- a/ui/litellm-dashboard/src/components/llm_calls/responses_api.tsx
+++ b/ui/litellm-dashboard/src/components/llm_calls/responses_api.tsx
@@ -7,11 +7,12 @@ import type {
 } from "openai/resources/responses/responses";
 import { MessageType } from "../chat_ui/types";
 import { TokenUsage } from "../chat_ui/ResponseMetrics";
-import { getGatewayBaseUrl, getProxyBaseUrl } from "@/components/networking";
+import { getGatewayBaseUrl } from "@/components/networking";
 import { toast } from "@/lib/toast";
 import { extractPromptCacheTokens } from "@/utils/promptCacheUsage";
 import { parseUsageCost } from "./usage_cost";
 import { buildPlaygroundHeaders, type CustomHeaders } from "./request_headers";
+import { buildMcpToolBlocks, type BuildMcpToolBlocksArgs } from "./mcp_tool_blocks";
 import type { MCPEvent } from "@/components/mcp_tools/types";
 import { MCPServer, MCPToolset } from "@/components/mcp_tools/types";
 import {
@@ -132,7 +133,6 @@ export async function makeOpenAIResponsesRequest(
   }
 
   const proxyBaseUrl = customBaseUrl || getGatewayBaseUrl();
-  const mcpBaseUrl = customBaseUrl || getProxyBaseUrl();
   const headers = buildPlaygroundHeaders(tags, customHeaders);
 
   const client = new openai.OpenAI({
@@ -178,53 +178,13 @@ export async function makeOpenAIResponsesRequest(
     });
 
     // Build tools array
-    const tools: any[] = [];
-
-    // Add MCP servers if selected
-    if (selectedMCPServers && selectedMCPServers.length > 0) {
-      if (selectedMCPServers.includes("__all__")) {
-        // All MCP Servers selected
-        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) => {
-          if (serverId.startsWith("toolset:")) {
-            // Toolset: same /{name}/mcp pattern as individual servers
-            const toolsetId = serverId.slice("toolset:".length);
-            const toolset = mcpToolsets?.find((t) => t.toolset_id === toolsetId);
-            const toolsetName = toolset?.toolset_name || toolsetId;
-            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
-            // unique registered identifier; aliases can collide across servers.
-            const routeName = server?.server_name || serverId;
-            const allowedTools = mcpServerToolRestrictions?.[serverId] || [];
-
-            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);
-          }
-        });
-      }
-    }
+    const mcpSelection: BuildMcpToolBlocksArgs = {
+      selectedMCPServers,
+      mcpServers,
+      mcpToolsets,
+      mcpServerToolRestrictions,
+    };
+    const tools: any[] = buildMcpToolBlocks(mcpSelection);
 
     // Add code_interpreter tool if enabled (OpenAI auto-creates container)
     if (codeInterpreterEnabled) {
diff --git a/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx b/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx
index 2d78d757aab..5a5cbef3610 100644
--- a/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx
@@ -3,6 +3,7 @@ import { useMCPServers } from "@/app/(dashboard)/hooks/mcpServers/useMCPServers"
 import { useMCPToolsets } from "@/app/(dashboard)/hooks/mcpServers/useMCPToolsets";
 import { MultiSelect, type MultiSelectOption } from "@/components/shared/MultiSelect";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { ALL_PROXY_MCP_SERVERS_SENTINEL, NO_MCP_SERVERS_SENTINEL } from "@/components/mcp_tools/constants";
 import type { MCPServer } from "@/components/mcp_tools/types";
 import { accessGroupNamesOf } from "./effectiveMcpServers";
@@ -45,13 +46,14 @@ const MCPServerSelector: React.FC<MCPServerSelectorProps> = ({
   value,
   className,
   accessToken,
-  placeholder = "Select MCP servers",
+  placeholder,
   disabled = false,
   teamId,
   userId,
   allowNoMcpServers = false,
   allowAllProxyMcpServers = false,
 }) => {
+  const { t } = useTranslation();
   const { data: mcpServers = [], isLoading: serversLoading } = useMCPServers(teamId, userId);
   const { data: accessGroups = [], isLoading: groupsLoading } = useMCPAccessGroups();
   const { data: toolsets = [], isLoading: toolsetsLoading } = useMCPToolsets();
@@ -66,17 +68,17 @@ const MCPServerSelector: React.FC<MCPServerSelectorProps> = ({
     ...accessGroups.map((group) => ({
       label: group,
       value: group,
-      description: "Access Group",
+      description: t("mcpServerManagement.serverSelector.optionTypes.accessGroup"),
     })),
     ...visibleServers.map((server) => ({
       label: `${server.server_name || server.server_id} (${server.server_id})`,
       value: server.server_id,
-      description: "MCP Server",
+      description: t("mcpServerManagement.serverSelector.optionTypes.mcpServer"),
     })),
     ...toolsets.map((toolset) => ({
       label: toolset.toolset_name,
       value: `${TOOLSET_PREFIX}${toolset.toolset_id}`,
-      description: "Toolset",
+      description: t("mcpServerManagement.serverSelector.optionTypes.toolset"),
     })),
   ];
 
@@ -112,10 +114,16 @@ const MCPServerSelector: React.FC<MCPServerSelectorProps> = ({
 
   const selectOptions: MultiSelectOption[] = [
     ...(allowAllProxyMcpServers || hasAllProxyMcpServersSelected
-      ? [{ label: "All Proxy MCP Servers", value: ALL_PROXY_MCP_SERVERS_SENTINEL }]
+      ? [{ label: t("mcpServerManagement.serverSelector.allProxyServers"), value: ALL_PROXY_MCP_SERVERS_SENTINEL }]
       : []),
     ...(allowNoMcpServers
-      ? [{ label: "No MCP Servers", value: NO_MCP_SERVERS_SENTINEL, description: "Block all" }]
+      ? [
+          {
+            label: t("mcpServerManagement.serverSelector.noServers"),
+            value: NO_MCP_SERVERS_SENTINEL,
+            description: t("mcpServerManagement.serverSelector.blockAll"),
+          },
+        ]
       : []),
     ...options.map((opt) => ({
       ...opt,
@@ -129,8 +137,8 @@ const MCPServerSelector: React.FC<MCPServerSelectorProps> = ({
         options={selectOptions}
         value={selectedValues}
         onValueChange={handleChange}
-        placeholder={placeholder}
-        emptyText="No MCP servers found"
+        placeholder={placeholder ?? t("mcpServerManagement.serverSelector.placeholder")}
+        emptyText={t("mcpServerManagement.serverSelector.empty")}
         loading={loading}
         disabled={disabled}
         className={`w-full ${className ?? ""}`}
diff --git a/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx b/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx
index b12b31601b8..27ba0a47fb7 100644
--- a/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx
@@ -1,4 +1,6 @@
 import React, { useEffect, useRef, useState, useMemo } from "react";
+import type { TFunction } from "i18next";
+import { Trans, useTranslation } from "react-i18next";
 import { listMCPTools } from "../networking";
 import { MCPTool } from "../mcp_tools/types";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
@@ -40,16 +42,25 @@ interface InheritedBadge {
   readonly className: string;
 }
 
-const inheritedBadgeFor = (source: McpGrantSource): InheritedBadge | null => {
+const inheritedBadgeFor = (source: McpGrantSource, t: TFunction): InheritedBadge | null => {
   switch (source.kind) {
     case "direct":
       return null;
     case "accessGroup":
-      return { label: `Via access group: ${source.name}`, className: "text-green-700 bg-green-50 border-green-200" };
+      return {
+        label: t("mcpServerManagement.toolPermissions.inherited.accessGroup", { name: source.name }),
+        className: "text-green-700 bg-green-50 border-green-200",
+      };
     case "toolset":
-      return { label: `Via toolset: ${source.name}`, className: "text-purple-700 bg-purple-50 border-purple-200" };
+      return {
+        label: t("mcpServerManagement.toolPermissions.inherited.toolset", { name: source.name }),
+        className: "text-purple-700 bg-purple-50 border-purple-200",
+      };
     case "toolPermission":
-      return { label: "Via tool permissions", className: "text-amber-700 bg-amber-50 border-amber-200" };
+      return {
+        label: t("mcpServerManagement.toolPermissions.inherited.toolPermission"),
+        className: "text-amber-700 bg-amber-50 border-amber-200",
+      };
   }
 };
 
@@ -63,6 +74,7 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
   disabled = false,
   preserveUnrestrictedServers = NO_SELECTION,
 }) => {
+  const { t } = useTranslation();
   const {
     data: allServers = [],
     isError: serversFailed,
@@ -120,7 +132,10 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
       const response = await listMCPTools(token, serverId);
 
       if (response.error) {
-        setToolErrors((prev) => ({ ...prev, [serverId]: response.message || "Failed to fetch tools" }));
+        setToolErrors((prev) => ({
+          ...prev,
+          [serverId]: response.message || t("mcpServerManagement.toolPermissions.fetchFailed"),
+        }));
         setServerTools((prev) => ({ ...prev, [serverId]: [] }));
       } else {
         const fetchedTools: MCPTool[] = response.tools || [];
@@ -151,7 +166,7 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
       }
     } catch (err) {
       console.error(`Error fetching tools for server ${serverId}:`, err);
-      setToolErrors((prev) => ({ ...prev, [serverId]: "Failed to fetch tools" }));
+      setToolErrors((prev) => ({ ...prev, [serverId]: t("mcpServerManagement.toolPermissions.fetchFailed") }));
       setServerTools((prev) => ({ ...prev, [serverId]: [] }));
     } finally {
       setLoadingTools((prev) => ({ ...prev, [serverId]: false }));
@@ -211,10 +226,11 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
     <div className="space-y-4">
       {serversFailed && (
         <div className="p-4 bg-yellow-50 border border-yellow-200 rounded-lg">
-          <p className="text-sm text-yellow-800 font-medium">Unable to load MCP servers</p>
+          <p className="text-sm text-yellow-800 font-medium">
+            {t("mcpServerManagement.toolPermissions.serversFailed.title")}
+          </p>
           <p className="text-sm text-yellow-700 mt-1">
-            This list is incomplete; servers granted directly or through an access group may be missing. Reload before
-            changing tool permissions
+            {t("mcpServerManagement.toolPermissions.serversFailed.description")}
           </p>
         </div>
       )}
@@ -223,19 +239,25 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
         accessGroupsLoaded &&
         emptyMcpAccessGroups(allServers, populatedAccessGroups, selectedAccessGroups).map((group) => (
           <div key={group} className="p-4 bg-yellow-50 border border-yellow-200 rounded-lg">
-            <p className="text-sm text-yellow-800 font-medium">Access group &quot;{group}&quot; has 0 servers</p>
+            <p className="text-sm text-yellow-800 font-medium">
+              {t("mcpServerManagement.toolPermissions.emptyAccessGroup.title", { group })}
+            </p>
             <p className="text-sm text-yellow-700 mt-1">
-              No MCP server lists this group, so it grants nothing. A server defined in config.yaml joins a group
-              through its <code>access_groups</code> key; <code>mcp_access_groups</code> is ignored there
+              <Trans
+                i18nKey="mcpServerManagement.toolPermissions.emptyAccessGroup.description"
+                components={{ code: <code /> }}
+              />
             </p>
           </div>
         ))}
 
       {toolsetsFailed && selectedToolsets.length > 0 && (
         <div className="p-4 bg-yellow-50 border border-yellow-200 rounded-lg">
-          <p className="text-sm text-yellow-800 font-medium">Unable to load toolsets</p>
+          <p className="text-sm text-yellow-800 font-medium">
+            {t("mcpServerManagement.toolPermissions.toolsetsFailed.title")}
+          </p>
           <p className="text-sm text-yellow-700 mt-1">
-            Servers reached through the selected toolsets are not listed below
+            {t("mcpServerManagement.toolPermissions.toolsetsFailed.description")}
           </p>
         </div>
       )}
@@ -243,7 +265,9 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
       {serversLoading && (
         <div className="flex items-center justify-center py-6">
           <UiLoadingSpinner />
-          <p className="ml-3 text-sm text-muted-foreground">Loading MCP servers...</p>
+          <p className="ml-3 text-sm text-muted-foreground">
+            {t("mcpServerManagement.toolPermissions.loadingServers")}
+          </p>
         </div>
       )}
 
@@ -257,7 +281,7 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
         const isLoading = loadingTools[serverId];
         const error = toolErrors[serverId];
         const viewMode = viewModes[serverId] ?? "crud";
-        const inherited = inheritedBadgeFor(entry.source);
+        const inherited = inheritedBadgeFor(entry.source, t);
         // The backend adds a toolset's tools to whatever this map allows, so these stay on however
         // the boxes are ticked. Locking them is what keeps the matrix an honest picture of the grant.
         const toolsetTools = entry.toolsetTools ?? [];
@@ -280,19 +304,22 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
                 {server.description && <p className="text-sm text-muted-foreground">{server.description}</p>}
                 {grantsAll && (
                   <p className="text-sm text-muted-foreground mt-1">
-                    All tools allowed, including tools added to this server later
+                    {t("mcpServerManagement.toolPermissions.allToolsAllowed")}
                   </p>
                 )}
                 {entry.ambiguousKeys.length > 0 && (
                   <p className="text-sm text-amber-700 mt-1">
-                    {`Also granted by ${entry.ambiguousKeys.map((key) => `"${key}"`).join(", ")}, which names another server too. Those tools stay allowed here until the servers no longer share that name`}
+                    {t("mcpServerManagement.toolPermissions.ambiguousKeys", {
+                      keys: entry.ambiguousKeys.map((key) => `"${key}"`).join(", "),
+                    })}
                   </p>
                 )}
                 {toolsetTools.length > 0 && (
                   <p className="text-sm text-purple-700 mt-1">
-                    {toolsetTools.length === 1
-                      ? `${toolsetTools[0]} is granted by a selected toolset, so it stays allowed here; edit the toolset to revoke it`
-                      : `${toolsetTools.join(", ")} are granted by a selected toolset, so they stay allowed here; edit the toolset to revoke them`}
+                    {t("mcpServerManagement.toolPermissions.lockedByToolset", {
+                      count: toolsetTools.length,
+                      tools: toolsetTools.join(", "),
+                    })}
                   </p>
                 )}
               </div>
@@ -305,11 +332,11 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
                   >
                     <label className="flex items-center gap-2 text-sm">
                       <RadioGroupItem value="crud" />
-                      Risk Groups
+                      {t("mcpServerManagement.toolPermissions.viewModes.riskGroups")}
                     </label>
                     <label className="flex items-center gap-2 text-sm">
                       <RadioGroupItem value="flat" />
-                      Flat List
+                      {t("mcpServerManagement.toolPermissions.viewModes.flatList")}
                     </label>
                   </RadioGroup>
                 )}
@@ -321,7 +348,7 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
                       onClick={() => handleSelectAll(entry)}
                       disabled={isLoading}
                     >
-                      Select All
+                      {t("mcpServerManagement.toolPermissions.selectAll")}
                     </button>
                     <button
                       type="button"
@@ -329,7 +356,7 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
                       onClick={() => writeAllowedTools(entry, [])}
                       disabled={isLoading}
                     >
-                      Deselect All
+                      {t("mcpServerManagement.toolPermissions.deselectAll")}
                     </button>
                   </>
                 )}
@@ -342,14 +369,18 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
               {isLoading && (
                 <div className="flex items-center justify-center py-8">
                   <UiLoadingSpinner />
-                  <p className="ml-3 text-sm text-muted-foreground">Loading tools...</p>
+                  <p className="ml-3 text-sm text-muted-foreground">
+                    {t("mcpServerManagement.toolPermissions.loadingTools")}
+                  </p>
                 </div>
               )}
 
               {/* Error */}
               {error && !isLoading && (
                 <div className="p-4 bg-destructive/10 border border-destructive/20 rounded-lg text-center">
-                  <p className="text-sm text-destructive font-medium">Unable to load tools</p>
+                  <p className="text-sm text-destructive font-medium">
+                    {t("mcpServerManagement.toolPermissions.loadToolsFailed")}
+                  </p>
                   <p className="text-sm text-destructive mt-1">{error}</p>
                 </div>
               )}
@@ -390,7 +421,9 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
                         <div className="flex-1 min-w-0">
                           <div className="flex items-center gap-2">
                             <p className="text-sm font-medium text-foreground">{tool.name}</p>
-                            <p className="text-sm text-muted-foreground">- {tool.description || "No description"}</p>
+                            <p className="text-sm text-muted-foreground">
+                              - {tool.description || t("mcpServerManagement.toolPermissions.noDescription")}
+                            </p>
                           </div>
                         </div>
                       </div>
@@ -402,7 +435,7 @@ const MCPToolPermissions: React.FC<MCPToolPermissionsProps> = ({
               {/* Empty State */}
               {!isLoading && !error && tools.length === 0 && (
                 <div className="text-center py-6">
-                  <p className="text-sm text-muted-foreground">No tools available</p>
+                  <p className="text-sm text-muted-foreground">{t("mcpServerManagement.toolPermissions.noTools")}</p>
                 </div>
               )}
             </div>
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx b/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
index 64dd066b535..72d38d65418 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import React, { useId, useState } from "react";
+import type { TFunction } from "i18next";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import { fetchClient } from "@/lib/http/api";
 import { ApiError } from "@/lib/http/client";
@@ -10,12 +12,12 @@ import { Dialog, DialogContent } from "@/components/ui/dialog";
 import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Switch } from "@/components/ui/switch";
 
-const byokSaveErrorMessage = (e: unknown): string => {
+const byokSaveErrorMessage = (e: unknown, t: TFunction): string => {
   if (e instanceof ApiError) {
     const detail = (e.body as { detail?: { error?: string } } | null)?.detail?.error;
     if (detail) return detail;
   }
-  return e instanceof Error && e.message ? e.message : "Failed to connect";
+  return e instanceof Error && e.message ? e.message : t("mcpTools.byokCredentialModal.errors.connectFailed");
 };
 
 interface ByokCredentialModalProps {
@@ -26,13 +28,14 @@ interface ByokCredentialModalProps {
 }
 
 export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server, open, onClose, onSuccess }) => {
+  const { t } = useTranslation();
   const [step, setStep] = useState<1 | 2>(1);
   const [apiKey, setApiKey] = useState("");
   const [saveKey, setSaveKey] = useState(true);
   const [loading, setLoading] = useState(false);
   const apiKeyInputId = useId();
 
-  const serverDisplayName = server.alias || server.server_name || "Service";
+  const serverDisplayName = server.alias || server.server_name || t("mcpTools.byokCredentialModal.fallbackServiceName");
   const firstLetter = serverDisplayName.charAt(0).toUpperCase();
 
   const handleClose = () => {
@@ -45,7 +48,7 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
 
   const handleAuthorize = async () => {
     if (!apiKey.trim()) {
-      toast.error("Please enter your API key");
+      toast.error(t("mcpTools.byokCredentialModal.toasts.apiKeyRequired"));
       return;
     }
     setLoading(true);
@@ -54,11 +57,11 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
         params: { path: { server_id: server.server_id } },
         body: { credential: apiKey.trim(), save: saveKey },
       });
-      toast.success(`Connected to ${serverDisplayName}`);
+      toast.success(t("mcpTools.byokCredentialModal.toasts.connected", { server: serverDisplayName }));
       onSuccess(server.server_id);
       handleClose();
     } catch (e) {
-      toast.error(byokSaveErrorMessage(e));
+      toast.error(byokSaveErrorMessage(e, t));
     } finally {
       setLoading(false);
     }
@@ -78,7 +81,7 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                 onClick={() => setStep(1)}
                 className="flex items-center gap-1 text-muted-foreground hover:text-foreground text-sm"
               >
-                <ArrowLeft className="size-3.5" /> Back
+                <ArrowLeft className="size-3.5" /> {t("mcpTools.byokCredentialModal.back")}
               </button>
             ) : (
               <div />
@@ -105,9 +108,11 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                 </div>
               </div>
 
-              <h2 className="text-2xl font-bold text-foreground mb-2">Connect {serverDisplayName}</h2>
+              <h2 className="text-2xl font-bold text-foreground mb-2">
+                {t("mcpTools.byokCredentialModal.intro.title", { server: serverDisplayName })}
+              </h2>
               <p className="text-muted-foreground mb-6">
-                LiteLLM needs access to {serverDisplayName} to complete your request.
+                {t("mcpTools.byokCredentialModal.intro.description", { server: serverDisplayName })}
               </p>
 
               {/* How it works */}
@@ -120,10 +125,11 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                     </svg>
                   </div>
                   <div>
-                    <p className="font-semibold text-foreground mb-1">How it works</p>
+                    <p className="font-semibold text-foreground mb-1">
+                      {t("mcpTools.byokCredentialModal.intro.howItWorksTitle")}
+                    </p>
                     <p className="text-muted-foreground text-sm">
-                      LiteLLM acts as a secure bridge. Your requests are routed through our MCP client directly to{" "}
-                      {serverDisplayName}&apos;s API.
+                      {t("mcpTools.byokCredentialModal.intro.howItWorks", { server: serverDisplayName })}
                     </p>
                   </div>
                 </div>
@@ -137,7 +143,7 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                       <path d="M12 2L12 22M2 12L22 12" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
                       <circle cx="12" cy="12" r="9" stroke="currentColor" strokeWidth="2" />
                     </svg>
-                    Requested Access
+                    {t("mcpTools.byokCredentialModal.intro.requestedAccess")}
                   </p>
                   <ul className="space-y-2">
                     {server.byok_description.map((item, i) => (
@@ -154,13 +160,13 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                 onClick={() => setStep(2)}
                 className="w-full bg-gray-900 hover:bg-gray-700 text-white font-medium py-3 px-6 rounded-xl flex items-center justify-center gap-2 transition-colors"
               >
-                Continue to Authentication <ArrowRight className="size-4" />
+                {t("mcpTools.byokCredentialModal.intro.continue")} <ArrowRight className="size-4" />
               </button>
               <button
                 onClick={handleClose}
                 className="mt-3 w-full text-muted-foreground hover:text-foreground text-sm py-2"
               >
-                Cancel
+                {t("mcpTools.byokCredentialModal.intro.cancel")}
               </button>
             </div>
           ) : (
@@ -170,18 +176,20 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                 <Key className="size-5 text-info" />
               </div>
 
-              <h2 className="text-2xl font-bold text-foreground mb-2">Provide API Key</h2>
+              <h2 className="text-2xl font-bold text-foreground mb-2">
+                {t("mcpTools.byokCredentialModal.apiKey.title")}
+              </h2>
               <p className="text-muted-foreground mb-6">
-                Enter your {serverDisplayName} API key to authorize this connection.
+                {t("mcpTools.byokCredentialModal.apiKey.description", { server: serverDisplayName })}
               </p>
 
               <div className="mb-4">
                 <label htmlFor={apiKeyInputId} className="block text-sm font-semibold text-foreground mb-2">
-                  {serverDisplayName} API Key
+                  {t("mcpTools.byokCredentialModal.apiKey.label", { server: serverDisplayName })}
                 </label>
                 <PasswordInput
                   id={apiKeyInputId}
-                  placeholder="Enter your API key"
+                  placeholder={t("mcpTools.byokCredentialModal.apiKey.placeholder")}
                   value={apiKey}
                   onChange={(e) => setApiKey(e.target.value)}
                   groupClassName="rounded-lg"
@@ -193,7 +201,7 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                     rel="noopener noreferrer"
                     className="text-info hover:text-info/80 text-sm mt-2 flex items-center gap-1"
                   >
-                    Where do I find my API key? <Link2 className="size-3.5" />
+                    {t("mcpTools.byokCredentialModal.apiKey.helpLink")} <Link2 className="size-3.5" />
                   </a>
                 )}
               </div>
@@ -207,17 +215,21 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                       fill="currentColor"
                     />
                   </svg>
-                  <span className="text-sm font-medium text-foreground">Save key for future use</span>
+                  <span className="text-sm font-medium text-foreground">
+                    {t("mcpTools.byokCredentialModal.apiKey.saveForFuture")}
+                  </span>
                 </div>
-                <Switch checked={saveKey} onCheckedChange={setSaveKey} aria-label="Save key for future use" />
+                <Switch
+                  checked={saveKey}
+                  onCheckedChange={setSaveKey}
+                  aria-label={t("mcpTools.byokCredentialModal.apiKey.saveForFuture")}
+                />
               </div>
 
               {/* Security note */}
               <div className="bg-info/10 rounded-xl p-4 flex items-start gap-3 mb-6">
                 <Lock className="mt-0.5 size-4 shrink-0 text-info" />
-                <p className="text-sm text-info">
-                  Your key is stored securely and transmitted over HTTPS. It is never shared with third parties.
-                </p>
+                <p className="text-sm text-info">{t("mcpTools.byokCredentialModal.apiKey.securityNote")}</p>
               </div>
 
               <button
@@ -225,7 +237,7 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
                 disabled={loading}
                 className="w-full bg-info hover:bg-info/80 disabled:opacity-60 text-info-foreground font-medium py-3 px-6 rounded-xl flex items-center justify-center gap-2 transition-colors"
               >
-                <Lock className="size-4" /> Connect &amp; Authorize
+                <Lock className="size-4" /> {t("mcpTools.byokCredentialModal.apiKey.authorize")}
               </button>
             </div>
           )}
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx b/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx
index 829667af796..d33b28e9ba7 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx
@@ -10,6 +10,7 @@
  */
 
 import React, { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Checkbox } from "@/components/ui/checkbox";
 import { ChevronDownIcon, ChevronRightIcon } from "lucide-react";
 import { CrudOp, MCPToolEntry, CRUD_GROUP_META, groupToolsByCrud } from "../../utils/mcpToolCrudClassification";
@@ -76,6 +77,7 @@ const McpCrudPermissionPanel: React.FC<McpCrudPermissionPanelProps> = ({
   readOnly = false,
   searchFilter = "",
 }) => {
+  const { t } = useTranslation();
   const [collapsed, setCollapsed] = useState<Record<CrudOp, boolean>>({
     read: false,
     create: false,
@@ -182,26 +184,33 @@ const McpCrudPermissionPanel: React.FC<McpCrudPermissionPanelProps> = ({
                 <span className="font-semibold text-foreground text-sm">{meta.label}</span>
                 <span className={`text-xs px-2 py-0.5 rounded-full ${RISK_BADGE[meta.risk]}`}>
                   {meta.risk === "high"
-                    ? "High Risk"
+                    ? t("mcpTools.crudPermissionPanel.risk.high")
                     : meta.risk === "medium"
-                      ? "Medium Risk"
+                      ? t("mcpTools.crudPermissionPanel.risk.medium")
                       : meta.risk === "low"
-                        ? "Safe"
-                        : "Unclassified"}
+                        ? t("mcpTools.crudPermissionPanel.risk.low")
+                        : t("mcpTools.crudPermissionPanel.risk.unknown")}
                 </span>
                 <span className="text-xs text-muted-foreground ml-1">
-                  {group.filter((t) => effectiveAllowed.has(t.name)).length}/{group.length} allowed
+                  {t("mcpTools.crudPermissionPanel.allowedCount", {
+                    allowed: group.filter((tool) => effectiveAllowed.has(tool.name)).length,
+                    total: group.length,
+                  })}
                 </span>
               </button>
 
               {!readOnly && (
                 <div className="flex items-center gap-2 ml-4">
                   <p className="text-xs text-muted-foreground">
-                    {fullyAllowed ? "All on" : partial ? "Partial" : "All off"}
+                    {fullyAllowed
+                      ? t("mcpTools.crudPermissionPanel.groupState.allOn")
+                      : partial
+                        ? t("mcpTools.crudPermissionPanel.groupState.partial")
+                        : t("mcpTools.crudPermissionPanel.groupState.allOff")}
                   </p>
                   {/* Checkbox supports `indeterminate`; Switch does not. */}
                   <Checkbox
-                    aria-label={`Allow all ${meta.label} tools`}
+                    aria-label={t("mcpTools.crudPermissionPanel.allowAllAria", { label: meta.label })}
                     checked={fullyAllowed}
                     indeterminate={partial}
                     onCheckedChange={(checked) => toggleGroup(op, checked)}
@@ -256,7 +265,9 @@ const McpCrudPermissionPanel: React.FC<McpCrudPermissionPanelProps> = ({
                             allowed ? "bg-success/15 text-success" : "bg-muted text-muted-foreground"
                           }`}
                         >
-                          {allowed ? "on" : "off"}
+                          {allowed
+                            ? t("mcpTools.crudPermissionPanel.toolState.on")
+                            : t("mcpTools.crudPermissionPanel.toolState.off")}
                         </span>
                       </div>
                     );
diff --git a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx
index ffe1b413778..10bc6dd9f29 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import React, { useEffect, useMemo } from "react";
+import type { ParseKeys } from "i18next";
+import { useTranslation } from "react-i18next";
 import { useWatch } from "react-hook-form";
 import { z } from "zod";
 import { FieldGroup } from "@/components/ui/field";
@@ -48,8 +50,8 @@ interface RoutingGroupModalProps {
   saving?: boolean;
 }
 
-const ARGS_EXAMPLES: Record<string, string> = {
-  "latency-based-routing": 'Example: { "ttl": 3600, "lowest_latency_buffer": 0 }',
+const ARGS_EXAMPLES: Record<string, ParseKeys> = {
+  "latency-based-routing": "routingGroups.modal.latencyArgsExample",
 };
 
 const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
@@ -65,13 +67,14 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
   onSubmit,
   saving,
 }) => {
+  const { t } = useTranslation();
   const modelsAnchor = useComboboxAnchor();
   const selectableStrategies =
     mode === "edit" && initialValue
       ? Array.from(new Set([...availableStrategies, initialValue.routing_strategy]))
       : availableStrategies;
   const strategyItems = selectableStrategies.map((strategy) => ({
-    label: strategy === "priority" ? "Priority" : strategy,
+    label: strategy === "priority" ? t("routingGroups.strategies.priority") : strategy,
     value: strategy,
   }));
 
@@ -85,22 +88,22 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
       group_name: z
         .string()
         .trim()
-        .min(1, "Group name is required")
-        .max(GROUP_NAME_MAX_LENGTH, `Must be ${GROUP_NAME_MAX_LENGTH} characters or fewer`)
-        .refine((value) => !reservedNames.has(value.toLowerCase()), "A group with this name already exists"),
-      models: z.array(z.string()).min(1, "Select at least one model"),
-      routing_strategy: z.string().min(1, "Strategy is required"),
+        .min(1, t("routingGroups.modal.validation.nameRequired"))
+        .max(GROUP_NAME_MAX_LENGTH, t("routingGroups.modal.validation.nameTooLong", { max: GROUP_NAME_MAX_LENGTH }))
+        .refine((value) => !reservedNames.has(value.toLowerCase()), t("routingGroups.modal.validation.nameTaken")),
+      models: z.array(z.string()).min(1, t("routingGroups.modal.validation.modelsRequired")),
+      routing_strategy: z.string().min(1, t("routingGroups.modal.validation.strategyRequired")),
       routing_strategy_args: z.string(),
       model_priorities: z.array(z.object({ model: z.string(), priority: z.string() })),
     };
     return z.object(shape).superRefine((values, ctx) => {
       if (values.routing_strategy === "priority") return;
-      const conflict = modelConflictError(values.models, groupNameByModel);
+      const conflict = modelConflictError(values.models, groupNameByModel, t);
       if (conflict !== null) {
         ctx.addIssue({ code: "custom", message: conflict, path: ["models"] });
       }
     });
-  }, [reservedNames, groupNameByModel]);
+  }, [reservedNames, groupNameByModel, t]);
 
   const form = useZodForm(schema, { defaultValues: toRoutingGroupFormValues(initialValue, availableStrategies) });
 
@@ -112,7 +115,7 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
   const selectedModels = useWatch({ control: form.control, name: "models" });
 
   const handleSubmit = async (values: z.infer<typeof schema>) => {
-    const payload = buildRoutingGroupPayload(values);
+    const payload = buildRoutingGroupPayload(values, t);
     if (!payload.ok) {
       form.setError(payload.field, { message: payload.message });
       return;
@@ -125,7 +128,9 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
       <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[560px]">
         <DialogHeader>
           <DialogTitle>
-            {mode === "create" ? "Create Routing Group" : `Edit ${initialValue?.group_name ?? ""}`}
+            {mode === "create"
+              ? t("routingGroups.modal.createTitle")
+              : t("routingGroups.modal.editTitle", { name: initialValue?.group_name ?? "" })}
           </DialogTitle>
         </DialogHeader>
         <form onSubmit={(event) => event.preventDefault()} noValidate>
@@ -133,8 +138,8 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
             <FormField
               control={form.control}
               name="group_name"
-              label="Group Name"
-              description="Use this name as the model in API calls. LiteLLM routes the request to one of the group's models."
+              label={t("routingGroups.modal.groupName")}
+              description={t("routingGroups.modal.groupNameDescription")}
             >
               {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="fast-chat" disabled={mode === "edit"} />}
             </FormField>
@@ -142,11 +147,11 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
             <FormField
               control={form.control}
               name="models"
-              label="Models"
+              label={t("routingGroups.modal.models")}
               description={
                 selectedStrategy === "priority"
-                  ? "Models from your model list that this group routes between. Models can belong to multiple priority groups."
-                  : "Models from your model list that this group routes between. A model can belong to one non-priority group."
+                  ? t("routingGroups.modal.modelsPriorityDescription")
+                  : t("routingGroups.modal.modelsDescription")
               }
             >
               {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
@@ -172,14 +177,14 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
                             id={id}
                             aria-invalid={ariaInvalid}
                             aria-describedby={ariaDescribedBy}
-                            placeholder="Select models"
+                            placeholder={t("routingGroups.modal.modelsPlaceholder")}
                           />
                         </>
                       )}
                     </ComboboxValue>
                   </ComboboxChips>
                   <ComboboxContent anchor={modelsAnchor}>
-                    <ComboboxEmpty>No models found</ComboboxEmpty>
+                    <ComboboxEmpty>{t("routingGroups.modal.noModelsFound")}</ComboboxEmpty>
                     <ComboboxList>
                       {(model: string) => (
                         <ComboboxItem key={model} value={model}>
@@ -195,10 +200,10 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
             <FormField
               control={form.control}
               name="routing_strategy"
-              label="Routing Strategy"
+              label={t("routingGroups.modal.routingStrategy")}
               description={
                 selectedStrategy === "priority"
-                  ? "Lower priorities are tried first. Models with the same priority share traffic. Applies only when calling this group."
+                  ? t("routingGroups.modal.priorityStrategyDescription")
                   : strategyDescriptions[selectedStrategy]
               }
             >
@@ -215,7 +220,7 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
                   }}
                 >
                   <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
-                    <SelectValue placeholder="Select strategy" />
+                    <SelectValue placeholder={t("routingGroups.modal.strategyPlaceholder")} />
                   </SelectTrigger>
                   <SelectContent>
                     {strategyItems.map((strategy) => (
@@ -232,25 +237,34 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
               <FormField
                 control={form.control}
                 name="model_priorities"
-                label="Model Priorities"
-                description="Use 1 for your first choice, 2 for your next choice, and so on. Unavailable models are skipped."
+                label={t("routingGroups.modal.modelPriorities")}
+                description={t("routingGroups.modal.modelPrioritiesDescription")}
               >
                 {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                  <div id={id} className="space-y-2" role="group" aria-label="Model priorities">
+                  <div
+                    id={id}
+                    className="space-y-2"
+                    role="group"
+                    aria-label={t("routingGroups.modal.modelPrioritiesAriaLabel")}
+                  >
                     {value.length === 0 && (
-                      <p className="text-sm text-muted-foreground">Select models to set priorities</p>
+                      <p className="text-sm text-muted-foreground">
+                        {t("routingGroups.modal.selectModelsForPriorities")}
+                      </p>
                     )}
                     {value.map((entry, index) => (
                       <div key={entry.model} className="flex items-center justify-between gap-3">
                         <label htmlFor={`${id}-${index}`} className="min-w-0 flex-1 break-words text-sm">
                           {entry.model}
                           {!selectedModels.includes(entry.model) && (
-                            <span className="block text-xs text-destructive">Model is not selected</span>
+                            <span className="block text-xs text-destructive">
+                              {t("routingGroups.modal.modelNotSelected")}
+                            </span>
                           )}
                         </label>
                         <Input
                           id={`${id}-${index}`}
-                          aria-label={`Priority for ${entry.model}`}
+                          aria-label={t("routingGroups.modal.priorityFor", { model: entry.model })}
                           aria-invalid={ariaInvalid}
                           aria-describedby={ariaDescribedBy}
                           inputMode="numeric"
@@ -269,10 +283,10 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
                             type="button"
                             variant="ghost"
                             size="sm"
-                            aria-label={`Remove priority for ${entry.model}`}
+                            aria-label={t("routingGroups.modal.removePriorityFor", { model: entry.model })}
                             onClick={() => onChange(value.filter((_, itemIndex) => itemIndex !== index))}
                           >
-                            Remove
+                            {t("routingGroups.modal.remove")}
                           </Button>
                         )}
                       </div>
@@ -286,8 +300,8 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
               <FormField
                 control={form.control}
                 name="routing_strategy_args"
-                label="Strategy Arguments (JSON)"
-                description={ARGS_EXAMPLES[selectedStrategy] ?? 'Example: { "ttl": 60 }'}
+                label={t("routingGroups.modal.strategyArgs")}
+                description={t(ARGS_EXAMPLES[selectedStrategy] ?? "routingGroups.modal.defaultArgsExample")}
               >
                 {({ ref, ...field }) => (
                   <Textarea {...field} ref={ref} rows={4} placeholder='{ "ttl": 3600 }' className="font-mono text-xs" />
@@ -297,17 +311,17 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
 
             <p className="text-xs text-muted-foreground">
               {selectedStrategy === "priority"
-                ? "Direct requests to a member model keep their existing routing behavior."
-                : "Models outside non-priority groups use the proxy's top-level routing strategy."}
+                ? t("routingGroups.modal.priorityFootnote")
+                : t("routingGroups.modal.strategyFootnote")}
             </p>
           </FieldGroup>
         </form>
         <DialogFooter>
           <Button variant="outline" onClick={onClose}>
-            Cancel
+            {t("routingGroups.modal.cancel")}
           </Button>
           <Button onClick={() => void form.handleSubmit(handleSubmit)()} disabled={saving} aria-busy={saving}>
-            {mode === "create" ? "Create Group" : "Save Changes"}
+            {mode === "create" ? t("routingGroups.modal.createGroup") : t("routingGroups.modal.saveChanges")}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupUsagePanel.tsx b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupUsagePanel.tsx
index 0ad4d7bb08f..569d522878a 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupUsagePanel.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupUsagePanel.tsx
@@ -2,6 +2,7 @@
 
 import { Code2 } from "lucide-react";
 import React from "react";
+import { Trans, useTranslation } from "react-i18next";
 
 import CodeBlock from "@/components/CodeBlock";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -64,23 +65,28 @@ const SNIPPET_TABS = [
 ] as const;
 
 export function RoutingGroupUsagePanel({ group, baseUrl }: RoutingGroupUsagePanelProps) {
+  const { t } = useTranslation();
   return (
     <div className="border-y bg-muted/40 px-4 py-4">
       <div className="mb-2 flex items-center gap-2">
         <Code2 className="size-4 text-primary" />
-        <span className="text-sm font-medium text-foreground">How routing works for this group</span>
+        <span className="text-sm font-medium text-foreground">{t("routingGroups.usagePanel.title")}</span>
       </div>
       <p className="mb-3 text-sm text-muted-foreground">
         {group.routing_strategy === "priority" ? (
-          <>
-            Request <span className="font-medium text-foreground">{group.group_name}</span> to try eligible models in
-            priority order. Direct requests to a member model keep their existing routing behavior.
-          </>
+          <Trans
+            i18nKey="routingGroups.usagePanel.priorityExplanation"
+            components={{ group: <span className="font-medium text-foreground">{group.group_name}</span> }}
+          />
         ) : (
-          <>
-            Callers request any model in the group by name; LiteLLM picks a deployment behind the scenes using the{" "}
-            <span className="font-medium text-foreground">{formatStrategyLabel(group.routing_strategy)}</span> strategy.
-          </>
+          <Trans
+            i18nKey="routingGroups.usagePanel.strategyExplanation"
+            components={{
+              strategy: (
+                <span className="font-medium text-foreground">{formatStrategyLabel(group.routing_strategy, t)}</span>
+              ),
+            }}
+          />
         )}
       </p>
       <Tabs defaultValue="curl">
diff --git a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx
index 1d2ef75361f..1cdaea02aab 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx
@@ -3,6 +3,7 @@
 import type { ExpandedState, SortingState } from "@tanstack/react-table";
 import { Inbox } from "lucide-react";
 import React, { useCallback, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { DataTable } from "@/components/shared/DataTable";
 
@@ -25,15 +26,14 @@ const resolveBaseUrl = (proxyBaseUrl?: string): string => {
 };
 
 function EmptyState() {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col items-center gap-1 py-6">
       <div className="mb-1 flex size-10 items-center justify-center rounded-lg bg-muted">
         <Inbox className="size-5 text-muted-foreground" />
       </div>
-      <div className="text-sm font-medium text-foreground">No routing groups yet</div>
-      <div className="text-sm text-muted-foreground">
-        Create a group to load-balance a set of models behind one name.
-      </div>
+      <div className="text-sm font-medium text-foreground">{t("routingGroups.table.emptyTitle")}</div>
+      <div className="text-sm text-muted-foreground">{t("routingGroups.table.emptyDescription")}</div>
     </div>
   );
 }
@@ -45,6 +45,7 @@ const RoutingGroupsTable: React.FC<RoutingGroupsTableProps> = ({
   onDelete,
   proxyBaseUrl,
 }) => {
+  const { t } = useTranslation();
   const [sorting, setSorting] = useState<SortingState>([]);
   const [expanded, setExpanded] = useState<ExpandedState>({});
   const baseUrl = resolveBaseUrl(proxyBaseUrl);
@@ -58,8 +59,8 @@ const RoutingGroupsTable: React.FC<RoutingGroupsTableProps> = ({
 
   const columns = useMemo(() => {
     const deps = { onEdit, onDelete, onToggleUsage: toggleUsage };
-    return getRoutingGroupsTableColumns(deps);
-  }, [onEdit, onDelete, toggleUsage]);
+    return getRoutingGroupsTableColumns(deps, t);
+  }, [onEdit, onDelete, toggleUsage, t]);
 
   return (
     <DataTable
@@ -75,7 +76,7 @@ const RoutingGroupsTable: React.FC<RoutingGroupsTableProps> = ({
       getRowCanExpand={() => true}
       renderSubComponent={({ row }) => <RoutingGroupUsagePanel group={row.original} baseUrl={baseUrl} />}
       isLoading={isLoading}
-      loadingMessage="Loading routing groups…"
+      loadingMessage={t("routingGroups.table.loading")}
       noDataMessage={<EmptyState />}
       size="compact"
     />
diff --git a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTableColumns.tsx b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTableColumns.tsx
index 586df60c4f7..6ae2e4f518d 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTableColumns.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTableColumns.tsx
@@ -1,7 +1,9 @@
 "use client";
 
 import type { ColumnDef } from "@tanstack/react-table";
+import type { TFunction } from "i18next";
 import { GitBranch, MoreHorizontal, Pencil, Trash2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
 
 import { DataTableSortHeader } from "@/components/shared/DataTable";
 import { IdentityCell, ModelsCell } from "@/components/shared/table_cells";
@@ -24,10 +26,11 @@ interface RoutingGroupRowActionsProps {
 }
 
 function RoutingGroupRowActions({ group, onEdit, onDelete }: RoutingGroupRowActionsProps) {
+  const { t } = useTranslation();
   return (
     <DropdownMenu>
       <DropdownMenuTrigger
-        aria-label={`Open actions for ${group.group_name}`}
+        aria-label={t("routingGroups.table.rowActions.openFor", { name: group.group_name })}
         data-testid={`routing-group-actions-${group.group_name}`}
         className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }), "text-muted-foreground")}
       >
@@ -36,7 +39,7 @@ function RoutingGroupRowActions({ group, onEdit, onDelete }: RoutingGroupRowActi
       <DropdownMenuContent align="end" className="w-44">
         <DropdownMenuItem data-testid="routing-group-action-edit" onClick={() => onEdit(group)}>
           <Pencil />
-          Edit
+          {t("routingGroups.table.rowActions.edit")}
         </DropdownMenuItem>
         <DropdownMenuItem
           variant="destructive"
@@ -44,7 +47,7 @@ function RoutingGroupRowActions({ group, onEdit, onDelete }: RoutingGroupRowActi
           onClick={() => onDelete(group)}
         >
           <Trash2 />
-          Delete
+          {t("routingGroups.table.rowActions.delete")}
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -57,16 +60,15 @@ interface RoutingGroupsTableColumnsDeps {
   onToggleUsage: (group: RoutingGroup) => void;
 }
 
-export const getRoutingGroupsTableColumns = ({
-  onEdit,
-  onDelete,
-  onToggleUsage,
-}: RoutingGroupsTableColumnsDeps): ColumnDef<RoutingGroup>[] => [
+export const getRoutingGroupsTableColumns = (
+  { onEdit, onDelete, onToggleUsage }: RoutingGroupsTableColumnsDeps,
+  t: TFunction,
+): ColumnDef<RoutingGroup>[] => [
   {
     id: "group_name",
     accessorKey: "group_name",
-    meta: { title: "Group Name", skeleton: "text" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Group Name" />,
+    meta: { title: t("routingGroups.table.columns.groupName"), skeleton: "text" },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("routingGroups.table.columns.groupName")} />,
     size: 240,
     enableSorting: true,
     cell: ({ row }) => (
@@ -75,8 +77,8 @@ export const getRoutingGroupsTableColumns = ({
   },
   {
     id: "models",
-    meta: { title: "Models", skeleton: "chips" },
-    header: "Models",
+    meta: { title: t("routingGroups.table.columns.models"), skeleton: "chips" },
+    header: t("routingGroups.table.columns.models"),
     size: 320,
     enableSorting: false,
     cell: ({ row }) => <ModelsCell models={row.original.models} />,
@@ -84,21 +86,21 @@ export const getRoutingGroupsTableColumns = ({
   {
     id: "routing_strategy",
     accessorKey: "routing_strategy",
-    meta: { title: "Strategy", skeleton: "text" },
-    header: ({ column }) => <DataTableSortHeader column={column} title="Strategy" />,
+    meta: { title: t("routingGroups.table.columns.strategy"), skeleton: "text" },
+    header: ({ column }) => <DataTableSortHeader column={column} title={t("routingGroups.table.columns.strategy")} />,
     size: 180,
     enableSorting: true,
     cell: ({ row }) => (
       <span className="flex items-center gap-1.5 text-sm">
         <GitBranch className="size-4 shrink-0 text-muted-foreground" />
-        {formatStrategyLabel(row.original.routing_strategy)}
+        {formatStrategyLabel(row.original.routing_strategy, t)}
       </span>
     ),
   },
   {
     id: "actions",
     meta: { className: "text-right", headerClassName: "text-right" },
-    header: () => <span className="sr-only">Actions</span>,
+    header: () => <span className="sr-only">{t("routingGroups.table.columns.actions")}</span>,
     size: 64,
     enableSorting: false,
     enableHiding: false,
diff --git a/ui/litellm-dashboard/src/components/routing_groups/index.tsx b/ui/litellm-dashboard/src/components/routing_groups/index.tsx
index ae2d62ae20f..6bf28519ef2 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/index.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/index.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import React, { useMemo, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
@@ -18,6 +19,7 @@ import { groupNameByModel } from "./modelOwnership";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const RoutingGroups: React.FC = () => {
+  const { t } = useTranslation();
   const { data, isLoading, refetch, isFetching } = useRoutingGroups();
   const { data: routerFields } = useRouterFields();
   const { data: modelHub } = useModelHub();
@@ -86,12 +88,12 @@ const RoutingGroups: React.FC = () => {
       await saveMutation.mutateAsync(next);
       toast.success(
         drawerMode === "create"
-          ? `Created routing group "${incoming.group_name}"`
-          : `Updated routing group "${incoming.group_name}"`,
+          ? t("routingGroups.page.toasts.created", { name: incoming.group_name })
+          : t("routingGroups.page.toasts.updated", { name: incoming.group_name }),
       );
       setDrawerOpen(false);
     } catch (err) {
-      toast.error(err instanceof Error ? err.message : "Failed to save routing group");
+      toast.error(err instanceof Error ? err.message : t("routingGroups.page.toasts.saveFailed"));
     }
   };
 
@@ -100,10 +102,10 @@ const RoutingGroups: React.FC = () => {
     const next = groups.filter((g) => g.group_name !== deletingGroup.group_name);
     try {
       await saveMutation.mutateAsync(next);
-      toast.success(`Deleted routing group "${deletingGroup.group_name}"`);
+      toast.success(t("routingGroups.page.toasts.deleted", { name: deletingGroup.group_name }));
       setDeletingGroup(null);
     } catch (err) {
-      toast.error(err instanceof Error ? err.message : "Failed to delete routing group");
+      toast.error(err instanceof Error ? err.message : t("routingGroups.page.toasts.deleteFailed"));
     }
   };
 
@@ -117,13 +119,17 @@ const RoutingGroups: React.FC = () => {
                 <Search className="size-4 text-muted-foreground" />
               </InputGroupAddon>
               <InputGroupInput
-                placeholder="Search groups..."
+                placeholder={t("routingGroups.page.searchPlaceholder")}
                 value={searchQuery}
                 onChange={(e) => setSearchQuery(e.target.value)}
               />
               {searchQuery && (
                 <InputGroupAddon align="inline-end">
-                  <InputGroupButton size="icon-xs" aria-label="Clear search" onClick={() => setSearchQuery("")}>
+                  <InputGroupButton
+                    size="icon-xs"
+                    aria-label={t("routingGroups.page.clearSearch")}
+                    onClick={() => setSearchQuery("")}
+                  >
                     <X />
                   </InputGroupButton>
                 </InputGroupAddon>
@@ -137,14 +143,14 @@ const RoutingGroups: React.FC = () => {
                 aria-busy={isFetching && !isLoading}
               >
                 <RefreshCw />
-                Refresh
+                {t("routingGroups.page.refresh")}
               </Button>
               <Button onClick={openCreate}>
                 <Plus />
-                Create Group
+                {t("routingGroups.page.createGroup")}
               </Button>
               <span className="text-sm whitespace-nowrap text-muted-foreground">
-                Showing {filteredGroups.length} {filteredGroups.length === 1 ? "result" : "results"}
+                {t("routingGroups.page.showingResults", { count: filteredGroups.length })}
               </span>
             </div>
           </div>
@@ -176,24 +182,24 @@ const RoutingGroups: React.FC = () => {
       <Dialog open={Boolean(deletingGroup)} onOpenChange={(open) => !open && setDeletingGroup(null)}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
           <DialogHeader>
-            <DialogTitle>Delete routing group?</DialogTitle>
+            <DialogTitle>{t("routingGroups.page.deleteDialog.title")}</DialogTitle>
           </DialogHeader>
           <p className="text-sm text-foreground">
             {deletingGroup?.routing_strategy === "priority" ? (
-              <>
-                Calls to <span className="font-medium">{deletingGroup.group_name}</span> will stop working. Direct
-                requests to its member models keep their existing routing behavior. This cannot be undone.
-              </>
+              <Trans
+                i18nKey="routingGroups.page.deleteDialog.priorityBody"
+                components={{ group: <span className="font-medium">{deletingGroup.group_name}</span> }}
+              />
             ) : (
-              <>
-                Models in <span className="font-medium">{deletingGroup?.group_name}</span> will fall back to the
-                proxy&apos;s top-level routing strategy. This cannot be undone.
-              </>
+              <Trans
+                i18nKey="routingGroups.page.deleteDialog.strategyBody"
+                components={{ group: <span className="font-medium">{deletingGroup?.group_name}</span> }}
+              />
             )}
           </p>
           <DialogFooter>
             <Button variant="outline" onClick={() => setDeletingGroup(null)}>
-              Cancel
+              {t("routingGroups.page.deleteDialog.cancel")}
             </Button>
             <Button
               onClick={confirmDelete}
@@ -201,7 +207,7 @@ const RoutingGroups: React.FC = () => {
               disabled={saveMutation.isPending}
               aria-busy={saveMutation.isPending}
             >
-              Delete
+              {t("routingGroups.page.deleteDialog.delete")}
             </Button>
           </DialogFooter>
         </DialogContent>
diff --git a/ui/litellm-dashboard/src/components/routing_groups/modelOwnership.ts b/ui/litellm-dashboard/src/components/routing_groups/modelOwnership.ts
index fdc09062e9b..cd6cbb1c933 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/modelOwnership.ts
+++ b/ui/litellm-dashboard/src/components/routing_groups/modelOwnership.ts
@@ -1,3 +1,5 @@
+import type { TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
 import type { RoutingGroup } from "./types";
 
 export const groupNameByModel = (groups: RoutingGroup[], excludeGroupName?: string): Record<string, string> =>
@@ -10,9 +12,12 @@ export const groupNameByModel = (groups: RoutingGroup[], excludeGroupName?: stri
 export const modelConflictError = (
   models: string[] | undefined,
   ownerByModel: Record<string, string>,
+  t: TFunction = i18n.t.bind(i18n),
 ): string | null => {
   const conflicts = (models ?? []).filter((model) => Object.hasOwn(ownerByModel, model));
   if (conflicts.length === 0) return null;
-  const detail = conflicts.map((model) => `${model} (in "${ownerByModel[model]}")`).join(", ");
-  return `Each model may belong to at most one non-priority group. Already claimed: ${detail}`;
+  const detail = conflicts
+    .map((model) => t("routingGroups.modelOwnership.claimedBy", { model, group: ownerByModel[model] }))
+    .join(", ");
+  return t("routingGroups.modelOwnership.conflict", { detail });
 };
diff --git a/ui/litellm-dashboard/src/components/routing_groups/routingGroupPayload.ts b/ui/litellm-dashboard/src/components/routing_groups/routingGroupPayload.ts
index 30ba49f5e7a..5abc9bf5791 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/routingGroupPayload.ts
+++ b/ui/litellm-dashboard/src/components/routing_groups/routingGroupPayload.ts
@@ -1,3 +1,5 @@
+import type { TFunction } from "i18next";
+import i18n from "@/i18n/i18n";
 import type { RoutingGroup } from "./types";
 
 export const STRATEGIES_WITH_ARGS = new Set<string>(["latency-based-routing", "usage-based-routing"]);
@@ -52,7 +54,10 @@ export const toRoutingGroupFormValues = (
 export const argsForStrategy = (routingStrategy: string, routingStrategyArgs: string): string =>
   STRATEGIES_WITH_ARGS.has(routingStrategy) ? routingStrategyArgs : "";
 
-export const buildRoutingGroupPayload = (values: RoutingGroupFormValues): RoutingGroupPayload => {
+export const buildRoutingGroupPayload = (
+  values: RoutingGroupFormValues,
+  t: TFunction = i18n.t.bind(i18n),
+): RoutingGroupPayload => {
   const base = {
     group_name: values.group_name.trim(),
     models: values.models,
@@ -69,7 +74,7 @@ export const buildRoutingGroupPayload = (values: RoutingGroupFormValues): Routin
       return {
         ok: false,
         field: "model_priorities",
-        message: "Set a priority for each selected model and remove unused priorities",
+        message: t("routingGroups.payload.prioritiesMismatch"),
       };
     }
     if (
@@ -81,7 +86,7 @@ export const buildRoutingGroupPayload = (values: RoutingGroupFormValues): Routin
       return {
         ok: false,
         field: "model_priorities",
-        message: "Priorities must be whole numbers from 1 to 9007199254740991",
+        message: t("routingGroups.payload.prioritiesInvalid"),
       };
     }
     return {
@@ -101,6 +106,6 @@ export const buildRoutingGroupPayload = (values: RoutingGroupFormValues): Routin
   try {
     return { ok: true, group: { ...base, routing_strategy_args: JSON.parse(args) as Record<string, unknown> } };
   } catch {
-    return { ok: false, field: "routing_strategy_args", message: "Must be valid JSON" };
+    return { ok: false, field: "routing_strategy_args", message: t("routingGroups.payload.invalidJson") };
   }
 };
diff --git a/ui/litellm-dashboard/src/components/routing_groups/strategy.ts b/ui/litellm-dashboard/src/components/routing_groups/strategy.ts
index 2efa70bf152..d3c1334563c 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/strategy.ts
+++ b/ui/litellm-dashboard/src/components/routing_groups/strategy.ts
@@ -1,9 +1,12 @@
-const STRATEGY_LABELS: Readonly<Record<string, string>> = {
-  "simple-shuffle": "Simple Shuffle",
-  "least-busy": "Least Busy",
-  "usage-based-routing": "Usage Based",
-  "latency-based-routing": "Latency Based",
-  priority: "Priority",
+import type { ParseKeys, TFunction } from "i18next";
+
+const STRATEGY_LABELS: Readonly<Record<string, ParseKeys>> = {
+  "simple-shuffle": "routingGroups.strategies.simpleShuffle",
+  "least-busy": "routingGroups.strategies.leastBusy",
+  "usage-based-routing": "routingGroups.strategies.usageBased",
+  "latency-based-routing": "routingGroups.strategies.latencyBased",
+  priority: "routingGroups.strategies.priority",
 };
 
-export const formatStrategyLabel = (strategy: string): string => STRATEGY_LABELS[strategy] ?? strategy;
+export const formatStrategyLabel = (strategy: string, t: TFunction): string =>
+  Object.hasOwn(STRATEGY_LABELS, strategy) ? t(STRATEGY_LABELS[strategy]) : strategy;
diff --git a/ui/litellm-dashboard/src/components/settings.tsx b/ui/litellm-dashboard/src/components/settings.tsx
index 7b08c53df87..4153de19499 100644
--- a/ui/litellm-dashboard/src/components/settings.tsx
+++ b/ui/litellm-dashboard/src/components/settings.tsx
@@ -1,5 +1,7 @@
+import type { ParseKeys } from "i18next";
 import React, { useEffect, useState } from "react";
 import { Controller, FormProvider, useForm, useFormContext } from "react-hook-form";
+import { Trans, useTranslation } from "react-i18next";
 
 import { Field, FieldError, FieldLabel } from "@/components/ui/field";
 import { Button } from "@/components/ui/button";
@@ -60,6 +62,7 @@ interface DynamicParamsFieldsProps {
 }
 
 const DynamicParamsFields: React.FC<DynamicParamsFieldsProps> = ({ params, callbackConfigs, selectedCallback }) => {
+  const { t } = useTranslation();
   const { register, control, formState } = useFormContext<CallbackFormValues>();
   const fieldIdPrefix = React.useId();
 
@@ -79,7 +82,9 @@ const DynamicParamsFields: React.FC<DynamicParamsFieldsProps> = ({ params, callb
         const isSelect = paramType === "select" && selectOptions.length > 0;
         const isBoolean = paramType === "boolean";
         const fieldId = `${fieldIdPrefix}-${param}`;
-        const validationRules = isRequired ? { required: `Please enter the ${fieldLabel.toLowerCase()}` } : undefined;
+        const validationRules = isRequired
+          ? { required: t("loggingAndAlerts.loggingCallbacks.params.required", { field: fieldLabel.toLowerCase() }) }
+          : undefined;
         const registration = isSelect || isBoolean ? undefined : register(param, validationRules);
 
         return (
@@ -99,7 +104,11 @@ const DynamicParamsFields: React.FC<DynamicParamsFieldsProps> = ({ params, callb
                     onValueChange={(selected: string | null) => field.onChange(selected ?? "")}
                   >
                     <SelectTrigger id={fieldId} className="w-full" onBlur={field.onBlur}>
-                      <SelectValue placeholder={`Select ${fieldLabel.toLowerCase()}`} />
+                      <SelectValue
+                        placeholder={t("loggingAndAlerts.loggingCallbacks.params.selectPlaceholder", {
+                          field: fieldLabel.toLowerCase(),
+                        })}
+                      />
                     </SelectTrigger>
                     <SelectContent>
                       {selectOptions.map((option) => (
@@ -132,21 +141,31 @@ const DynamicParamsFields: React.FC<DynamicParamsFieldsProps> = ({ params, callb
                 <Input
                   id={fieldId}
                   type="password"
-                  placeholder={`Enter your ${fieldLabel.toLowerCase()}`}
+                  placeholder={t("loggingAndAlerts.loggingCallbacks.params.inputPlaceholder", {
+                    field: fieldLabel.toLowerCase(),
+                  })}
                   {...registration}
                 />
               ) : paramType === "number" ? (
                 <Input
                   id={fieldId}
                   type="number"
-                  placeholder={`Enter ${fieldLabel.toLowerCase()}`}
+                  placeholder={t("loggingAndAlerts.loggingCallbacks.params.numberPlaceholder", {
+                    field: fieldLabel.toLowerCase(),
+                  })}
                   min={0}
                   max={1}
                   step={0.1}
                   {...registration}
                 />
               ) : (
-                <Input id={fieldId} placeholder={`Enter your ${fieldLabel.toLowerCase()}`} {...registration} />
+                <Input
+                  id={fieldId}
+                  placeholder={t("loggingAndAlerts.loggingCallbacks.params.inputPlaceholder", {
+                    field: fieldLabel.toLowerCase(),
+                  })}
+                  {...registration}
+                />
               ))}
             <FieldError errors={[formState.errors[param]]} />
           </Field>
@@ -176,6 +195,7 @@ export const CallbackSelector: React.FC<CallbackSelectorProps> = ({
   onCallbackChange,
   disabled = false,
 }) => {
+  const { t } = useTranslation();
   const { control } = useFormContext<CallbackFormValues>();
   const inputId = React.useId();
   const selectedConfig = findCallbackConfig(callbackConfigs, selectedCallback) ?? null;
@@ -184,10 +204,10 @@ export const CallbackSelector: React.FC<CallbackSelectorProps> = ({
     <Controller
       control={control}
       name="callback"
-      rules={disabled ? undefined : { required: "Please select a callback" }}
+      rules={disabled ? undefined : { required: t("loggingAndAlerts.loggingCallbacks.selector.required") }}
       render={({ field, fieldState }) => (
         <Field>
-          <FieldLabel htmlFor={inputId}>Callback</FieldLabel>
+          <FieldLabel htmlFor={inputId}>{t("loggingAndAlerts.loggingCallbacks.selector.label")}</FieldLabel>
           <Combobox
             items={callbackConfigs}
             value={selectedConfig}
@@ -204,14 +224,14 @@ export const CallbackSelector: React.FC<CallbackSelectorProps> = ({
           >
             <ComboboxInput
               id={inputId}
-              placeholder="Choose a logging callback..."
+              placeholder={t("loggingAndAlerts.loggingCallbacks.selector.placeholder")}
               className="w-full"
               disabled={disabled}
               onBlur={field.onBlur}
               aria-invalid={fieldState.error !== undefined || undefined}
             />
             <ComboboxContent>
-              <ComboboxEmpty>No results</ComboboxEmpty>
+              <ComboboxEmpty>{t("loggingAndAlerts.loggingCallbacks.selector.noResults")}</ComboboxEmpty>
               <ComboboxList>
                 {(callbackConfig: CallbackConfigOption) => (
                   <ComboboxItem key={callbackConfig.id} value={callbackConfig}>
@@ -293,6 +313,7 @@ const buildCallbackPayload = (formValues: Record<string, any>, callbackName: str
 };
 
 const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID, premiumUser }) => {
+  const { t } = useTranslation();
   const [callbacks, setCallbacks] = useState<AlertingObject[]>([]);
   const [isLoadingCallbacks, setIsLoadingCallbacks] = useState(true);
   const [alerts, setAlerts] = useState<any[]>([]);
@@ -335,9 +356,11 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
         setCallbackConfigs(data || []);
       })
       .catch((error) => {
-        toast.fromError("Failed to load callback configs: " + parseErrorMessage(error));
+        toast.fromError(
+          t("loggingAndAlerts.loggingCallbacks.toasts.configsLoadFailed", { error: parseErrorMessage(error) }),
+        );
       });
-  }, [accessToken]);
+  }, [accessToken, t]);
 
   useEffect(() => {
     if (showEditCallback && selectedEditCallback) {
@@ -372,18 +395,18 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
       setActiveAlerts([...activeAlerts, alertName]);
     }
   };
-  const alerts_to_UI_NAME: Record<string, string> = {
-    llm_exceptions: "LLM Exceptions",
-    llm_too_slow: "LLM Responses Too Slow",
-    llm_requests_hanging: "LLM Requests Hanging",
-    budget_alerts: "Budget Alerts (API Keys, Users)",
-    user_spend_thresholds: "User Spend Thresholds (Daily/Monthly)",
-    user_spend_anomalies: "User Spend Anomaly Detection",
-    db_exceptions: "Database Exceptions (Read/Write)",
-    daily_reports: "Weekly/Monthly Spend Reports",
-    outage_alerts: "Outage Alerts",
-    region_outage_alerts: "Region Outage Alerts",
-    model_deprecation_warnings: "Model Deprecation Warnings",
+  const alerts_to_UI_NAME: Record<string, ParseKeys> = {
+    llm_exceptions: "loggingAndAlerts.alertTypes.labels.llmExceptions",
+    llm_too_slow: "loggingAndAlerts.alertTypes.labels.llmTooSlow",
+    llm_requests_hanging: "loggingAndAlerts.alertTypes.labels.llmRequestsHanging",
+    budget_alerts: "loggingAndAlerts.alertTypes.labels.budgetAlerts",
+    user_spend_thresholds: "loggingAndAlerts.alertTypes.labels.userSpendThresholds",
+    user_spend_anomalies: "loggingAndAlerts.alertTypes.labels.userSpendAnomalies",
+    db_exceptions: "loggingAndAlerts.alertTypes.labels.dbExceptions",
+    daily_reports: "loggingAndAlerts.alertTypes.labels.dailyReports",
+    outage_alerts: "loggingAndAlerts.alertTypes.labels.outageAlerts",
+    region_outage_alerts: "loggingAndAlerts.alertTypes.labels.regionOutageAlerts",
+    model_deprecation_warnings: "loggingAndAlerts.alertTypes.labels.modelDeprecationWarnings",
   };
 
   useEffect(() => {
@@ -438,7 +461,11 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
 
     try {
       await setCallbacksCall(accessToken, payload);
-      toast.success(isEdit ? "Callback updated successfully" : `Callback ${callbackName} added successfully`);
+      toast.success(
+        isEdit
+          ? t("loggingAndAlerts.loggingCallbacks.toasts.updated")
+          : t("loggingAndAlerts.loggingCallbacks.toasts.added", { name: callbackName }),
+      );
 
       if (isEdit) {
         setShowEditCallback(false);
@@ -529,7 +556,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
     } catch (error) {
       toast.fromError(error);
     }
-    toast.success("Alerts updated successfully");
+    toast.success(t("loggingAndAlerts.alertTypes.toasts.saved"));
   };
 
   const handleDeleteCallback = (callback: any) => {
@@ -545,7 +572,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
     try {
       setIsDeletingCallback(true);
       await deleteCallback(accessToken, callbackToDelete.name);
-      toast.success(`Callback ${callbackToDelete.name} deleted successfully`);
+      toast.success(t("loggingAndAlerts.loggingCallbacks.toasts.deleted", { name: callbackToDelete.name }));
 
       // Refresh the callbacks list
       if (userID && userRole) {
@@ -572,12 +599,12 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
       <div className="grid grid-cols-1 gap-2 p-8 w-full mt-2">
         <Tabs defaultValue="logging-callbacks">
           <TabsList variant="line">
-            <TabsTrigger value="logging-callbacks">Logging Callbacks</TabsTrigger>
-            <TabsTrigger value="cloudzero-cost-tracking">CloudZero Cost Tracking</TabsTrigger>
-            <TabsTrigger value="alerting-types">Alerting Types</TabsTrigger>
-            <TabsTrigger value="alerting-settings">Alerting Settings</TabsTrigger>
-            <TabsTrigger value="email-alerts">Email Alerts</TabsTrigger>
-            <TabsTrigger value="ms-teams-alerts">MS Teams Alerts</TabsTrigger>
+            <TabsTrigger value="logging-callbacks">{t("loggingAndAlerts.page.tabs.loggingCallbacks")}</TabsTrigger>
+            <TabsTrigger value="cloudzero-cost-tracking">{t("loggingAndAlerts.page.tabs.cloudZero")}</TabsTrigger>
+            <TabsTrigger value="alerting-types">{t("loggingAndAlerts.page.tabs.alertingTypes")}</TabsTrigger>
+            <TabsTrigger value="alerting-settings">{t("loggingAndAlerts.page.tabs.alertingSettings")}</TabsTrigger>
+            <TabsTrigger value="email-alerts">{t("loggingAndAlerts.page.tabs.emailAlerts")}</TabsTrigger>
+            <TabsTrigger value="ms-teams-alerts">{t("loggingAndAlerts.page.tabs.msTeamsAlerts")}</TabsTrigger>
           </TabsList>
           <TabsContent value="logging-callbacks" keepMounted>
             <LoggingCallbacksTable
@@ -593,7 +620,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
               onTest={async (cb) => {
                 try {
                   await serviceHealthCheck(accessToken, cb.name);
-                  toast.success("Health check triggered");
+                  toast.success(t("loggingAndAlerts.loggingCallbacks.toasts.healthCheckTriggered"));
                 } catch (error) {
                   toast.fromError(parseErrorMessage(error));
                 }
@@ -608,18 +635,21 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
           <TabsContent value="alerting-types" keepMounted>
             <Card className="p-6">
               <p className="my-2">
-                Alerts are sent to any Slack-compatible incoming webhook URL (Slack, Rocket.Chat, Mattermost, etc.). Get
-                Slack webhook urls from{" "}
-                <a href="https://api.slack.com/messaging/webhooks" target="_blank" style={{ color: "blue" }}>
-                  here
-                </a>
+                <Trans
+                  i18nKey="loggingAndAlerts.alertTypes.intro"
+                  components={{
+                    docs: (
+                      <a href="https://api.slack.com/messaging/webhooks" target="_blank" style={{ color: "blue" }} />
+                    ),
+                  }}
+                />
               </p>
               <Table>
                 <TableHeader>
                   <TableRow>
                     <TableHead></TableHead>
                     <TableHead></TableHead>
-                    <TableHead>Webhook URL (Slack-compatible)</TableHead>
+                    <TableHead>{t("loggingAndAlerts.alertTypes.columns.webhookUrl")}</TableHead>
                   </TableRow>
                 </TableHeader>
 
@@ -638,7 +668,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
                           ) : (
                             <Button className="flex items-center justify-center">
                               <a href="https://forms.gle/W3U4PZpJGFHWtHyA9" target="_blank">
-                                ✨ Enterprise Feature
+                                {t("loggingAndAlerts.alertTypes.enterpriseFeature")}
                               </a>
                             </Button>
                           )
@@ -652,7 +682,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
                         )}
                       </TableCell>
                       <TableCell className="whitespace-normal break-words">
-                        <p>{value}</p>
+                        <p>{t(value)}</p>
                       </TableCell>
                       <TableCell>
                         <Input
@@ -670,23 +700,21 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
                 </TableBody>
               </Table>
               <Button size="xs" className="mt-2" onClick={handleSaveAlerts}>
-                Save Changes
+                {t("loggingAndAlerts.alertTypes.saveChanges")}
               </Button>
 
               <Button
                 onClick={async () => {
                   try {
                     await serviceHealthCheck(accessToken, "slack");
-                    toast.success(
-                      "Alert test triggered. Test request to slack made - check logs/alerts on slack to verify",
-                    );
+                    toast.success(t("loggingAndAlerts.alertTypes.toasts.testTriggered"));
                   } catch (error) {
                     toast.fromError(parseErrorMessage(error));
                   }
                 }}
                 className="mx-2"
               >
-                Test Alerts
+                {t("loggingAndAlerts.alertTypes.testAlerts")}
               </Button>
             </Card>
           </TabsContent>
@@ -705,7 +733,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
       <Dialog open={showAddCallbacksModal} onOpenChange={(open) => !open && closeAddCallbackModal()}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
           <DialogHeader>
-            <DialogTitle>Add Logging Callback</DialogTitle>
+            <DialogTitle>{t("loggingAndAlerts.loggingCallbacks.addDialog.title")}</DialogTitle>
           </DialogHeader>
           <a
             href="https://docs.litellm.ai/docs/proxy/logging"
@@ -714,7 +742,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
             style={{ color: "blue" }}
           >
             {" "}
-            LiteLLM Docs: Logging
+            {t("loggingAndAlerts.loggingCallbacks.addDialog.docsLink")}
           </a>
 
           <FormProvider {...addForm}>
@@ -733,10 +761,12 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
 
               <div className="flex justify-end space-x-3 pt-6 mt-6 border-t border-border">
                 <Button type="button" variant="outline" onClick={cancelAddCallback} disabled={isAddingCallback}>
-                  Cancel
+                  {t("loggingAndAlerts.loggingCallbacks.addDialog.cancel")}
                 </Button>
                 <Button type="submit" disabled={isAddingCallback}>
-                  {isAddingCallback ? "Adding..." : "Add Callback"}
+                  {isAddingCallback
+                    ? t("loggingAndAlerts.loggingCallbacks.addDialog.submitting")
+                    : t("loggingAndAlerts.loggingCallbacks.addDialog.submit")}
                 </Button>
               </div>
             </form>
@@ -747,7 +777,7 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
       <Dialog open={showEditCallback} onOpenChange={(open) => !open && closeEditCallbackModal()}>
         <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
           <DialogHeader>
-            <DialogTitle>Edit Callback Settings</DialogTitle>
+            <DialogTitle>{t("loggingAndAlerts.loggingCallbacks.editDialog.title")}</DialogTitle>
           </DialogHeader>
           <FormProvider {...editForm}>
             <form onSubmit={editForm.handleSubmit(updateCallbackCall)}>
@@ -774,10 +804,12 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
 
               <div className="flex justify-end space-x-3 pt-6 mt-6 border-t border-border">
                 <Button type="button" variant="outline" onClick={closeEditCallbackModal} disabled={isUpdatingCallback}>
-                  Cancel
+                  {t("loggingAndAlerts.loggingCallbacks.editDialog.cancel")}
                 </Button>
                 <Button type="submit" disabled={isUpdatingCallback}>
-                  {isUpdatingCallback ? "Saving..." : "Save Changes"}
+                  {isUpdatingCallback
+                    ? t("loggingAndAlerts.loggingCallbacks.editDialog.submitting")
+                    : t("loggingAndAlerts.loggingCallbacks.editDialog.submit")}
                 </Button>
               </div>
             </form>
@@ -787,12 +819,15 @@ const Settings: React.FC<SettingsPageProps> = ({ accessToken, userRole, userID,
 
       <DeleteResourceModal
         isOpen={showDeleteConfirmModal}
-        title="Delete Callback"
-        message="Are you sure you want to delete this callback? This action cannot be undone."
-        resourceInformationTitle="Callback Information"
+        title={t("loggingAndAlerts.loggingCallbacks.deleteDialog.title")}
+        message={t("loggingAndAlerts.loggingCallbacks.deleteDialog.message")}
+        resourceInformationTitle={t("loggingAndAlerts.loggingCallbacks.deleteDialog.infoTitle")}
         resourceInformation={[
-          { label: "Callback Name", value: callbackToDelete?.name },
-          { label: "Mode", value: callbackToDelete?.mode || "success" },
+          { label: t("loggingAndAlerts.loggingCallbacks.deleteDialog.callbackName"), value: callbackToDelete?.name },
+          {
+            label: t("loggingAndAlerts.loggingCallbacks.deleteDialog.mode"),
+            value: callbackToDelete?.mode || "success",
+          },
         ]}
         onCancel={() => {
           setShowDeleteConfirmModal(false);
diff --git a/ui/litellm-dashboard/src/components/skills/SkillSelector.tsx b/ui/litellm-dashboard/src/components/skills/SkillSelector.tsx
index b21c8b7e872..8eb1ca33b5a 100644
--- a/ui/litellm-dashboard/src/components/skills/SkillSelector.tsx
+++ b/ui/litellm-dashboard/src/components/skills/SkillSelector.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
 import {
   Combobox,
   ComboboxChip,
@@ -45,9 +46,10 @@ const SkillSelector: React.FC<SkillSelectorProps> = ({
   value,
   className,
   accessToken,
-  placeholder = "Select skills (optional)",
+  placeholder,
   disabled = false,
 }) => {
+  const { t } = useTranslation();
   const anchor = useComboboxAnchor();
   const [options, setOptions] = useState<SkillOption[]>([]);
   const [loading, setLoading] = useState(false);
@@ -85,18 +87,28 @@ const SkillSelector: React.FC<SkillSelectorProps> = ({
             ))
           }
         </ComboboxValue>
-        <ComboboxChipsInput placeholder={placeholder} aria-label={placeholder} disabled={disabled} />
-        {value && value.length > 0 && <ComboboxClear aria-label="Clear all skills" disabled={disabled} />}
+        <ComboboxChipsInput
+          placeholder={placeholder ?? t("skillSelector.placeholder")}
+          aria-label={placeholder ?? t("skillSelector.placeholder")}
+          disabled={disabled}
+        />
+        {value && value.length > 0 && <ComboboxClear aria-label={t("skillSelector.clearAll")} disabled={disabled} />}
       </ComboboxChips>
       <ComboboxContent anchor={anchor}>
-        <ComboboxEmpty>{loading ? "Loading skills…" : "No skills found"}</ComboboxEmpty>
+        <ComboboxEmpty>{loading ? t("skillSelector.loading") : t("skillSelector.empty")}</ComboboxEmpty>
         <ComboboxList>
           {(skill: string) => {
             const isPrivate = options.some((option) => option.name === skill && !option.enabled);
             return (
-              <ComboboxItem key={skill} value={skill} aria-label={isPrivate ? `${skill} (private)` : skill}>
+              <ComboboxItem
+                key={skill}
+                value={skill}
+                aria-label={isPrivate ? t("skillSelector.privateOptionLabel", { skill }) : skill}
+              >
                 {skill}
-                {isPrivate && <span className="ml-2 text-xs text-muted-foreground">private</span>}
+                {isPrivate && (
+                  <span className="ml-2 text-xs text-muted-foreground">{t("skillSelector.privateBadge")}</span>
+                )}
               </ComboboxItem>
             );
           }}
diff --git a/ui/litellm-dashboard/src/components/ui/switch.tsx b/ui/litellm-dashboard/src/components/ui/switch.tsx
index 5d7171965d4..31233e049c5 100644
--- a/ui/litellm-dashboard/src/components/ui/switch.tsx
+++ b/ui/litellm-dashboard/src/components/ui/switch.tsx
@@ -16,7 +16,7 @@ function Switch({
       data-slot="switch"
       data-size={size}
       className={cn(
-        "peer group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=default]:h-[18.4px] data-[size=default]:w-[32px] data-[size=sm]:h-[14px] data-[size=sm]:w-[24px] dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:bg-primary data-unchecked:bg-input dark:data-unchecked:bg-input/80 data-disabled:cursor-not-allowed data-disabled:opacity-50",
+        "peer group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=default]:h-[18.4px] data-[size=default]:w-[32px] data-[size=sm]:h-[14px] data-[size=sm]:w-[24px] dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:bg-primary data-unchecked:bg-muted-foreground dark:data-unchecked:bg-input/80 data-disabled:cursor-not-allowed data-disabled:opacity-50",
         className,
       )}
       {...props}
diff --git a/ui/litellm-dashboard/src/components/vector_store_providers.tsx b/ui/litellm-dashboard/src/components/vector_store_providers.tsx
index e953d6e3db6..b76405d3085 100644
--- a/ui/litellm-dashboard/src/components/vector_store_providers.tsx
+++ b/ui/litellm-dashboard/src/components/vector_store_providers.tsx
@@ -1,3 +1,4 @@
+import type { ParseKeys } from "i18next";
 import { getProviderLogoAndName, Providers, providerLogoMap } from "@/components/provider_info_helpers";
 import awsLogo from "../../public/assets/logos/aws.svg";
 import milvusLogo from "../../public/assets/logos/milvus.svg";
@@ -51,8 +52,8 @@ export const vectorStoreProviderLogoMap: Record<string, string> = {
 // Define field types for provider-specific configurations
 export interface VectorStoreFieldConfig {
   name: string;
-  label: string;
-  tooltip: string;
+  label: ParseKeys;
+  tooltip: ParseKeys;
   placeholder?: string;
   required: boolean;
   type?: "text" | "password" | "select";
@@ -66,16 +67,16 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   pg_vector: [
     {
       name: "api_base",
-      label: "API Base",
-      tooltip: "Enter the base URL of your deployed litellm-pgvector server (e.g., http://your-server:8000)",
+      label: "vectorStores.providerFields.labels.apiBase",
+      tooltip: "vectorStores.providerFields.tooltips.pgVector.apiBase",
       placeholder: "http://your-deployed-server:8000",
       required: true,
       type: "text",
     },
     {
       name: "api_key",
-      label: "API Key",
-      tooltip: "Enter the API key from your deployed litellm-pgvector server",
+      label: "vectorStores.providerFields.labels.apiKey",
+      tooltip: "vectorStores.providerFields.tooltips.pgVector.apiKey",
       placeholder: "your-deployed-api-key",
       required: true,
       type: "password",
@@ -85,16 +86,16 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   "vertex_ai/search_api": [
     {
       name: "vertex_project",
-      label: "Vertex Project",
-      tooltip: "Google Cloud project ID that hosts the Vertex AI Search data store.",
+      label: "vectorStores.providerFields.labels.vertexProject",
+      tooltip: "vectorStores.providerFields.tooltips.vertexAiSearch.project",
       placeholder: "my-gcp-project-id",
       required: true,
       type: "text",
     },
     {
       name: "vertex_location",
-      label: "Vertex Location",
-      tooltip: "Vertex AI Search data store location. Must be one of global, us, or eu.",
+      label: "vectorStores.providerFields.labels.vertexLocation",
+      tooltip: "vectorStores.providerFields.tooltips.vertexAiSearch.location",
       required: true,
       type: "select",
       options: [
@@ -106,17 +107,16 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "vertex_collection_id",
-      label: "Collection ID (optional)",
-      tooltip: "Discovery Engine collection ID. Leave blank to use the default collection.",
+      label: "vectorStores.providerFields.labels.collectionIdOptional",
+      tooltip: "vectorStores.providerFields.tooltips.vertexAiSearch.collectionId",
       placeholder: "e.g. my-custom-collection",
       required: false,
       type: "text",
     },
     {
       name: "vertex_engine_id",
-      label: "Engine ID (optional)",
-      tooltip:
-        "Search app (engine) ID. Required for website, healthcare, and connector-based data stores (Workspace, Slack, Jira, etc.) because these sources route search through an engine. Leave blank to query the data store directly.",
+      label: "vectorStores.providerFields.labels.engineIdOptional",
+      tooltip: "vectorStores.providerFields.tooltips.vertexAiSearch.engineId",
       placeholder: "e.g. my-search-app_1234567890",
       required: false,
       type: "text",
@@ -125,8 +125,8 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   openai: [
     {
       name: "api_key",
-      label: "API Key",
-      tooltip: "Enter your OpenAI API key",
+      label: "vectorStores.providerFields.labels.apiKey",
+      tooltip: "vectorStores.providerFields.tooltips.openai.apiKey",
       placeholder: "sk-...",
       required: true,
       type: "password",
@@ -135,16 +135,16 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   azure: [
     {
       name: "api_key",
-      label: "API Key",
-      tooltip: "Enter your Azure OpenAI API key",
+      label: "vectorStores.providerFields.labels.apiKey",
+      tooltip: "vectorStores.providerFields.tooltips.azure.apiKey",
       placeholder: "your-azure-api-key",
       required: true,
       type: "password",
     },
     {
       name: "api_base",
-      label: "API Base",
-      tooltip: "Enter your Azure OpenAI endpoint (e.g., https://your-resource.openai.azure.com/)",
+      label: "vectorStores.providerFields.labels.apiBase",
+      tooltip: "vectorStores.providerFields.tooltips.azure.apiBase",
       placeholder: "https://your-resource.openai.azure.com/",
       required: true,
       type: "text",
@@ -153,25 +153,24 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   milvus: [
     {
       name: "api_key",
-      label: "API Key",
-      tooltip:
-        "To obtain a token, you should use a colon (:) to concatenate the username and password that you use to access your Milvus instance (e.g., username:password)",
+      label: "vectorStores.providerFields.labels.apiKey",
+      tooltip: "vectorStores.providerFields.tooltips.milvus.apiKey",
       placeholder: "username:password or api key",
       required: true,
       type: "password",
     },
     {
       name: "api_base",
-      label: "API Base",
-      tooltip: "Enter your Milvus endpoint (e.g., https://your-milvus-endpoint.com/)",
+      label: "vectorStores.providerFields.labels.apiBase",
+      tooltip: "vectorStores.providerFields.tooltips.milvus.apiBase",
       placeholder: "https://your-milvus-endpoint.com/",
       required: true,
       type: "text",
     },
     {
       name: "embedding_model",
-      label: "Embedding Model",
-      tooltip: "Select the embedding model to use",
+      label: "vectorStores.providerFields.labels.embeddingModel",
+      tooltip: "vectorStores.providerFields.tooltips.milvus.embeddingModel",
       placeholder: "text-embedding-3-small",
       required: true,
       type: "select",
@@ -180,50 +179,48 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   mongodb: [
     {
       name: "api_base",
-      label: "Sidecar URL",
-      tooltip: "Use HTTPS for a remote sidecar, or HTTP with a loopback IP for a sidecar on the same host or Pod",
+      label: "vectorStores.providerFields.labels.sidecarUrl",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.apiBase",
       placeholder: "http://127.0.0.1:8080",
       required: true,
       type: "text",
     },
     {
       name: "api_key",
-      label: "Sidecar API Key",
-      tooltip: "The MONGODB_SIDECAR_API_KEY configured in your MongoDB sidecar",
+      label: "vectorStores.providerFields.labels.sidecarApiKey",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.apiKey",
       placeholder: "Enter sidecar API key",
       required: true,
       type: "password",
     },
     {
       name: "mongodb_database",
-      label: "Database",
-      tooltip: "The MongoDB database holding the collection you want to search",
+      label: "vectorStores.providerFields.labels.database",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.database",
       placeholder: "sample_mflix",
       required: true,
       type: "text",
     },
     {
       name: "mongodb_collection",
-      label: "Collection",
-      tooltip: "The collection your MongoDB Vector Search index was built on",
+      label: "vectorStores.providerFields.labels.collection",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.collection",
       placeholder: "embedded_movies",
       required: true,
       type: "text",
     },
     {
       name: "embedding_model",
-      label: "Embedding Model",
-      tooltip:
-        "The embedding model on this proxy that created the vectors already stored in your collection. LiteLLM embeds every search query with it, so it must be the same model. A different model of the same size will not error, it will just return wrong results. Add it under Models first if it is not listed",
+      label: "vectorStores.providerFields.labels.embeddingModel",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.embeddingModel",
       placeholder: "text-embedding-3-small",
       required: true,
       type: "select",
     },
     {
       name: "mongodb_embedding_field",
-      label: "Vector Field Name",
-      tooltip:
-        "The field in each document that holds its embedding. It must match the path your MongoDB Vector Search index was created on (default: embedding)",
+      label: "vectorStores.providerFields.labels.vectorFieldName",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.embeddingField",
       placeholder: "embedding",
       required: false,
       type: "text",
@@ -231,9 +228,8 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "mongodb_text_field",
-      label: "Text Field",
-      tooltip:
-        "The field in each document that holds its readable text. LiteLLM returns this text in search results, and it accepts a dotted path such as metadata.body (default: text)",
+      label: "vectorStores.providerFields.labels.textField",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.textField",
       placeholder: "text",
       required: false,
       type: "text",
@@ -241,9 +237,8 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "mongodb_num_candidates",
-      label: "Candidates Considered",
-      tooltip:
-        "How many nearest neighbours MongoDB examines before returning the top results. Higher is more accurate and slower. Leave blank to let LiteLLM scale it with the requested result count",
+      label: "vectorStores.providerFields.labels.candidatesConsidered",
+      tooltip: "vectorStores.providerFields.tooltips.mongodb.numCandidates",
       placeholder: "100",
       required: false,
       type: "text",
@@ -252,16 +247,16 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   valkey: [
     {
       name: "valkey_host",
-      label: "Valkey Host",
-      tooltip: "Hostname or IP of your Valkey server, without redis:// or a port (e.g. my-valkey.example.com)",
+      label: "vectorStores.providerFields.labels.valkeyHost",
+      tooltip: "vectorStores.providerFields.tooltips.valkey.host",
       placeholder: "my-valkey.example.com",
       required: true,
       type: "text",
     },
     {
       name: "valkey_port",
-      label: "Valkey Port",
-      tooltip: "Port your Valkey server listens on. Leave as 6379 unless you changed it",
+      label: "vectorStores.providerFields.labels.valkeyPort",
+      tooltip: "vectorStores.providerFields.tooltips.valkey.port",
       placeholder: "6379",
       required: false,
       type: "text",
@@ -269,16 +264,15 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "valkey_password",
-      label: "Valkey Password",
-      tooltip: "Password used to log in to your Valkey server. Leave blank if it has no password",
+      label: "vectorStores.providerFields.labels.valkeyPassword",
+      tooltip: "vectorStores.providerFields.tooltips.valkey.password",
       required: false,
       type: "password",
     },
     {
       name: "valkey_ssl",
-      label: "Use TLS",
-      tooltip:
-        "Set to true if your Valkey server requires an encrypted (TLS) connection, for example AWS ElastiCache with in-transit encryption turned on",
+      label: "vectorStores.providerFields.labels.useTls",
+      tooltip: "vectorStores.providerFields.tooltips.valkey.ssl",
       required: false,
       type: "select",
       options: [
@@ -289,18 +283,16 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "embedding_model",
-      label: "Embedding Model",
-      tooltip:
-        "The embedding model on this proxy that was used to create the embeddings already stored in your Valkey index. LiteLLM uses it to embed each search query, so it must be the same model or results will be wrong. Add it under Models first if it is not listed",
+      label: "vectorStores.providerFields.labels.embeddingModel",
+      tooltip: "vectorStores.providerFields.tooltips.valkey.embeddingModel",
       placeholder: "text-embedding-3-small",
       required: true,
       type: "select",
     },
     {
       name: "valkey_text_field",
-      label: "Text Field",
-      tooltip:
-        "The field in each stored document that holds its readable text. LiteLLM returns this text in search results. Must match how your documents were stored (default: text)",
+      label: "vectorStores.providerFields.labels.textField",
+      tooltip: "vectorStores.providerFields.tooltips.valkey.textField",
       placeholder: "text",
       required: false,
       type: "text",
@@ -308,9 +300,8 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "valkey_embedding_field",
-      label: "Vector Field Name",
-      tooltip:
-        "The field in each stored document that holds its embedding. LiteLLM searches against this field, so it must match the field your index was created on (default: embedding)",
+      label: "vectorStores.providerFields.labels.vectorFieldName",
+      tooltip: "vectorStores.providerFields.tooltips.valkey.embeddingField",
       placeholder: "embedding",
       required: false,
       type: "text",
@@ -320,36 +311,32 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   opensearch: [
     {
       name: "api_base",
-      label: "OpenSearch Endpoint",
-      tooltip:
-        "The endpoint of your OpenSearch Serverless collection or OpenSearch Service domain, starting with https://",
+      label: "vectorStores.providerFields.labels.opensearchEndpoint",
+      tooltip: "vectorStores.providerFields.tooltips.opensearch.apiBase",
       placeholder: "https://abc123.us-east-1.aoss.amazonaws.com",
       required: true,
       type: "text",
     },
     {
       name: "aws_region_name",
-      label: "AWS Region (optional)",
-      tooltip:
-        "The AWS region of the collection or domain. Leave blank to use the region in the endpoint, and set it when the endpoint is a custom domain",
+      label: "vectorStores.providerFields.labels.awsRegionOptional",
+      tooltip: "vectorStores.providerFields.tooltips.opensearch.region",
       placeholder: "us-east-1",
       required: false,
       type: "text",
     },
     {
       name: "embedding_model",
-      label: "Embedding Model",
-      tooltip:
-        "The embedding model on this proxy that created the vectors already stored in your index. LiteLLM embeds every search query with it, so it must be the same model. Add it under Models first if it is not listed",
+      label: "vectorStores.providerFields.labels.embeddingModel",
+      tooltip: "vectorStores.providerFields.tooltips.opensearch.embeddingModel",
       placeholder: "text-embedding-3-small",
       required: true,
       type: "select",
     },
     {
       name: "opensearch_embedding_field",
-      label: "Vector Field Name",
-      tooltip:
-        "The top-level knn_vector field in your index mapping that holds each document's embedding (default: embedding)",
+      label: "vectorStores.providerFields.labels.vectorFieldName",
+      tooltip: "vectorStores.providerFields.tooltips.opensearch.embeddingField",
       placeholder: "embedding",
       required: false,
       type: "text",
@@ -357,9 +344,8 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "opensearch_text_field",
-      label: "Text Field",
-      tooltip:
-        "The top-level field in each document that holds its readable text. LiteLLM returns this text in search results (default: text)",
+      label: "vectorStores.providerFields.labels.textField",
+      tooltip: "vectorStores.providerFields.tooltips.opensearch.textField",
       placeholder: "text",
       required: false,
       type: "text",
@@ -367,9 +353,8 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
     },
     {
       name: "opensearch_index_name",
-      label: "Index Name (optional)",
-      tooltip:
-        "The OpenSearch index to search. Leave blank to use the Vector Store ID, and set it to register same-named indexes from two endpoints under different IDs",
+      label: "vectorStores.providerFields.labels.indexNameOptional",
+      tooltip: "vectorStores.providerFields.tooltips.opensearch.indexName",
       placeholder: "my-knn-index",
       required: false,
       type: "text",
@@ -378,32 +363,32 @@ export const vectorStoreProviderFields: Record<string, VectorStoreFieldConfig[]>
   s3_vectors: [
     {
       name: "vector_bucket_name",
-      label: "Vector Bucket Name",
-      tooltip: "S3 bucket name for vector storage (will be auto-created if it doesn't exist)",
+      label: "vectorStores.providerFields.labels.vectorBucketName",
+      tooltip: "vectorStores.providerFields.tooltips.s3Vectors.bucketName",
       placeholder: "my-vector-bucket",
       required: true,
       type: "text",
     },
     {
       name: "index_name",
-      label: "Index Name",
-      tooltip: "Name for the vector index (optional, will be auto-generated if not provided)",
+      label: "vectorStores.providerFields.labels.indexName",
+      tooltip: "vectorStores.providerFields.tooltips.s3Vectors.indexName",
       placeholder: "my-vector-index",
       required: false,
       type: "text",
     },
     {
       name: "aws_region_name",
-      label: "AWS Region",
-      tooltip: "AWS region where the S3 bucket is located (e.g., us-west-2)",
+      label: "vectorStores.providerFields.labels.awsRegion",
+      tooltip: "vectorStores.providerFields.tooltips.s3Vectors.region",
       placeholder: "us-west-2",
       required: true,
       type: "text",
     },
     {
       name: "embedding_model",
-      label: "Embedding Model",
-      tooltip: "Select the embedding model to use for vector generation",
+      label: "vectorStores.providerFields.labels.embeddingModel",
+      tooltip: "vectorStores.providerFields.tooltips.s3Vectors.embeddingModel",
       placeholder: "text-embedding-3-small",
       required: true,
       type: "select",
diff --git a/ui/litellm-dashboard/src/hooks/useMcpOAuthFlow.tsx b/ui/litellm-dashboard/src/hooks/useMcpOAuthFlow.tsx
index 25e8790e367..41a170d7059 100644
--- a/ui/litellm-dashboard/src/hooks/useMcpOAuthFlow.tsx
+++ b/ui/litellm-dashboard/src/hooks/useMcpOAuthFlow.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useCallback, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { toast } from "@/lib/toast";
 import {
   buildMcpOAuthAuthorizeUrl,
@@ -82,6 +83,7 @@ export const useMcpOAuthFlow = ({
   onBeforeRedirect,
   flowSource,
 }: UseMcpOAuthFlowOptions): UseMcpOAuthFlowResult => {
+  const { t } = useTranslation();
   const [status, setStatus] = useState<McpOAuthStatus>("idle");
   const [error, setError] = useState<string | null>(null);
   const [tokenResponse, setTokenResponse] = useState<Record<string, any> | null>(null);
@@ -155,14 +157,14 @@ export const useMcpOAuthFlow = ({
     const credentials = getCredentials() || {};
 
     if (!accessToken) {
-      setError("Missing admin token");
-      toast.error("Access token missing. Please re-authenticate and try again.");
+      setError(t("mcpServers.useMcpOAuthFlow.errors.missingAdminToken"));
+      toast.error(t("mcpServers.useMcpOAuthFlow.errors.accessTokenMissing"));
       return;
     }
 
     const temporaryPayload = getTemporaryPayload();
     if (!temporaryPayload || !temporaryPayload.url || !temporaryPayload.transport) {
-      const message = "Please complete server URL and transport before starting OAuth.";
+      const message = t("mcpServers.useMcpOAuthFlow.errors.incompleteServer");
       setError(message);
       toast.error(message);
       return;
@@ -250,7 +252,7 @@ export const useMcpOAuthFlow = ({
       setError(message);
       toast.error(message);
     }
-  }, [accessToken, getCredentials, getTemporaryPayload, onBeforeRedirect]);
+  }, [accessToken, getCredentials, getTemporaryPayload, onBeforeRedirect, t]);
 
   const resumeOAuthFlow = useCallback(async () => {
     if (typeof window === "undefined") {
@@ -288,9 +290,9 @@ export const useMcpOAuthFlow = ({
     } catch (err) {
       clearStoredFlow();
       processingRef.current = false;
-      setError("Failed to resume OAuth flow. Please retry.");
+      setError(t("mcpServers.useMcpOAuthFlow.errors.resumeFailed"));
       setStatus("error");
-      toast.error("Failed to resume OAuth flow. Please retry.");
+      toast.error(t("mcpServers.useMcpOAuthFlow.errors.resumeFailed"));
       return;
     }
 
@@ -360,7 +362,7 @@ export const useMcpOAuthFlow = ({
       setTokenResponse(token);
       setStatus("success");
       setError(null);
-      toast.success("OAuth token retrieved successfully");
+      toast.success(t("mcpServers.useMcpOAuthFlow.toasts.tokenRetrieved"));
     } catch (err) {
       if (resetVersion !== resetVersionRef.current) {
         return;
@@ -378,7 +380,7 @@ export const useMcpOAuthFlow = ({
         }, 1000);
       }
     }
-  }, [onTokenReceived]);
+  }, [onTokenReceived, t]);
 
   useEffect(() => {
     resumeOAuthFlow();
diff --git a/ui/litellm-dashboard/src/hooks/useTestMCPConnection.tsx b/ui/litellm-dashboard/src/hooks/useTestMCPConnection.tsx
index d27e1ca8bf9..d01174d2de6 100644
--- a/ui/litellm-dashboard/src/hooks/useTestMCPConnection.tsx
+++ b/ui/litellm-dashboard/src/hooks/useTestMCPConnection.tsx
@@ -1,4 +1,5 @@
 import { useState, useEffect, useCallback } from "react";
+import { useTranslation } from "react-i18next";
 import { testMCPToolsListRequest } from "../components/networking";
 import { AUTH_TYPE, OAUTH_FLOW, TRANSPORT, isClientForwardedTokenMode } from "@/components/mcp_tools/types";
 
@@ -47,6 +48,7 @@ export const useTestMCPConnection = ({
   formValues,
   enabled = true,
 }: UseTestMCPConnectionProps): UseTestMCPConnectionReturn => {
+  const { t } = useTranslation();
   const [tools, setTools] = useState<any[]>([]);
   const [isLoadingTools, setIsLoadingTools] = useState(false);
   const [toolsError, setToolsError] = useState<string | null>(null);
@@ -165,7 +167,7 @@ export const useTestMCPConnection = ({
           setHasShownSuccessMessage(true);
         }
       } else {
-        const errorMessage = toolsResponse.message || "Failed to retrieve tools list";
+        const errorMessage = toolsResponse.message || t("mcpServers.useTestMcpConnection.errors.toolsListFailed");
         setToolsError(errorMessage);
         setToolsErrorStatus(typeof toolsResponse.status === "number" ? toolsResponse.status : null);
         setToolsErrorStackTrace(toolsResponse.status === 403 ? null : toolsResponse.stack_trace || null);
diff --git a/ui/litellm-dashboard/src/hooks/useToolsOAuthFlow.tsx b/ui/litellm-dashboard/src/hooks/useToolsOAuthFlow.tsx
index 3d5aee972ea..860b5d6fc85 100644
--- a/ui/litellm-dashboard/src/hooks/useToolsOAuthFlow.tsx
+++ b/ui/litellm-dashboard/src/hooks/useToolsOAuthFlow.tsx
@@ -14,6 +14,7 @@
  */
 
 import { useCallback, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { buildMcpOAuthAuthorizeUrl, exchangeMcpOAuthToken, registerMcpOAuthClient } from "@/components/networking";
 import { toast } from "@/lib/toast";
 import { extractErrorMessage } from "@/utils/errorUtils";
@@ -71,6 +72,7 @@ export const useToolsOAuthFlow = ({
   gatewayMintsClient,
   onSuccess,
 }: UseToolsOAuthFlowOptions): UseToolsOAuthFlowResult => {
+  const { t } = useTranslation();
   const [status, setStatus] = useState<ToolsOAuthStatus>("idle");
   const [error, setError] = useState<string | null>(null);
   const processingRef = useRef(false);
@@ -173,7 +175,7 @@ export const useToolsOAuthFlow = ({
       payload = JSON.parse(storedResult);
       flowState = peeked;
     } catch (_) {
-      setError("Failed to resume OAuth flow. Please retry.");
+      setError(t("mcpServers.useToolsOAuthFlow.errors.resumeFailed"));
       setStatus("error");
       processingRef.current = false;
       clearStorage(FLOW_STATE_KEY);
@@ -218,7 +220,7 @@ export const useToolsOAuthFlow = ({
 
       setStatus("success");
       setError(null);
-      toast.success("Connected successfully");
+      toast.success(t("mcpServers.useToolsOAuthFlow.toasts.connected"));
       onSuccessRef.current(token.access_token);
     } catch (err) {
       const msg = extractErrorMessage(err);
@@ -231,7 +233,7 @@ export const useToolsOAuthFlow = ({
         processingRef.current = false;
       }, 1000);
     }
-  }, [accessToken, serverId, userId]);
+  }, [accessToken, serverId, userId, t]);
 
   useEffect(() => {
     resumeOAuthFlow();
diff --git a/ui/litellm-dashboard/src/i18n/locales/en.json b/ui/litellm-dashboard/src/i18n/locales/en.json
index 2399d5a56c1..d6ffe8e6dc0 100644
--- a/ui/litellm-dashboard/src/i18n/locales/en.json
+++ b/ui/litellm-dashboard/src/i18n/locales/en.json
@@ -1,4 +1,1807 @@
 {
+  "agents": {
+    "killSwitchConfig": {
+      "authTypes": {
+        "none": "None",
+        "bearer": "Bearer token",
+        "apiKey": "API key header",
+        "basic": "Basic auth"
+      },
+      "errors": {
+        "invalidJson": "Body must be valid JSON"
+      }
+    },
+    "killSwitchFields": {
+      "errors": {
+        "nameRequired": "Name required",
+        "tokenRequired": "Token required",
+        "apiKeyRequired": "API key required",
+        "usernameRequired": "Username required",
+        "passwordRequired": "Password required"
+      },
+      "auth": {
+        "bearerToken": "Bearer token",
+        "headerName": "Header name",
+        "apiKey": "API key",
+        "username": "Username",
+        "password": "Password"
+      },
+      "webhookUrl": {
+        "label": "Webhook URL",
+        "hint": "Absolute http(s) URL LiteLLM calls when the kill switch is triggered. Leave empty to remove the kill switch."
+      },
+      "method": "Method",
+      "headers": {
+        "title": "Headers",
+        "add": "Add Header",
+        "keyPlaceholder": "Header name",
+        "valuePlaceholder": "Header value"
+      },
+      "queryParams": {
+        "title": "Query Parameters",
+        "add": "Add Query Parameter",
+        "keyPlaceholder": "Parameter name",
+        "valuePlaceholder": "Parameter value"
+      },
+      "body": {
+        "label": "JSON Body",
+        "hint": "Optional JSON object sent as the request body"
+      },
+      "authentication": "Authentication",
+      "removeItem": "Remove {{item}}"
+    },
+    "dangerZone": {
+      "toasts": {
+        "fired": "Kill switch fired (HTTP {{status}})",
+        "fireFailed": "Failed to fire kill switch"
+      },
+      "title": "Danger Zone",
+      "killSwitch": "Kill switch",
+      "configuredDescription": "Calls the configured webhook to stop this agent's upstream runtime. This can cause an outage for everyone using the agent and cannot be undone from LiteLLM",
+      "notConfigured": "Not configured. Add a kill switch webhook under Settings to enable this action",
+      "fire": "Fire Kill Switch",
+      "lastResult": "Last result: HTTP {{status}}",
+      "confirm": {
+        "title": "Fire kill switch for {{name}}?",
+        "outageTitle": "This can cause an outage",
+        "outageDescription": "LiteLLM will call {{method}} {{url}} immediately. Whatever that webhook does to the agent is outside LiteLLM's control and cannot be reverted here",
+        "typeToConfirm": "Type <name/> to confirm:",
+        "inputLabel": "Confirm agent name",
+        "cancel": "Cancel",
+        "firing": "Firing..."
+      }
+    },
+    "identityDetails": {
+      "evidence": {
+        "loadFailed": "Could not load authentication evidence",
+        "lastMatch": "Last authenticated identity match: {{date}}",
+        "awaiting": "Configured, awaiting an authenticated request",
+        "unbound": "Identity unbound; execution is disabled"
+      },
+      "execution": {
+        "enabled": "Enabled",
+        "disabled": "Disabled"
+      },
+      "loading": "Loading",
+      "regionLabel": "Agent Identity",
+      "title": "Agent Identity: Microsoft Entra ID",
+      "tenant": "Tenant:",
+      "clientId": "Application (Client) ID:",
+      "servicePrincipal": "Enterprise application Object ID:",
+      "notConfigured": "Not configured",
+      "executionSummary": "Execution: {{execution}} · Mode: {{mode}}",
+      "evidenceNote": "Recent evidence comes from a validated Entra token matching this binding. It is persisted across restarts and cleared when the binding changes. Tool and model permissions are checked separately.",
+      "refresh": "Refresh authentication evidence",
+      "viewLogs": "View request logs"
+    },
+    "identityFields": {
+      "providers": {
+        "none": "No explicit identity binding",
+        "microsoftEntra": "Microsoft Entra ID"
+      },
+      "executionModes": {
+        "autonomous": "Autonomous",
+        "delegated": "On behalf of a user",
+        "both": "Both"
+      },
+      "execution": {
+        "enabled": "Enabled",
+        "disabled": "Disabled"
+      },
+      "errors": {
+        "providersLoadFailed": "Could not load the gateway's trusted identity providers"
+      },
+      "regionLabel": "Agent Identity",
+      "title": "Agent Identity",
+      "description": "Connect an existing identity provider application to this agent. Its name and runtime address can change independently.",
+      "provider": "Identity Provider",
+      "tenant": {
+        "label": "Trusted Entra Tenant",
+        "required": "Select a trusted tenant",
+        "placeholder": "Select the gateway's trusted tenant",
+        "noneAvailable": "No trusted Entra tenant is available. Configure JWT issuer and audience validation on the gateway first. Dashboard Microsoft SSO is configured separately."
+      },
+      "clientId": {
+        "label": "Application (Client) ID",
+        "required": "Enter the Entra application client ID",
+        "invalid": "Enter a valid application client UUID",
+        "description": "Find this under <registrations>Entra App registrations</registrations>, select your agent application, then Overview. No client secret is required here."
+      },
+      "executionMode": "Execution Mode",
+      "servicePrincipal": {
+        "label": "Enterprise Application Object ID",
+        "required": "Enter the service principal Object ID",
+        "invalid": "Enter a valid service principal UUID",
+        "description": "Open <enterprise>Entra Enterprise applications</enterprise>, select this application, and copy its Object ID. The App registrations Object ID is a different value."
+      },
+      "requiredRoles": {
+        "label": "Required Application Roles",
+        "description": "Comma-separated role values required on autonomous application tokens"
+      },
+      "requiredScopes": {
+        "label": "Required Delegated Scopes",
+        "required": "Enter a delegated scope",
+        "note": "Users must first sign in through this gateway's Microsoft SSO. Subsequent delegated calls must satisfy both user and agent permissions."
+      },
+      "executionLabel": "Execution",
+      "verificationNote": "LiteLLM verifies the agent's Entra token before matching this identity. Saving these fields configures the binding; an authenticated request provides verification. Runtime authentication headers are configured separately."
+    },
+    "formKit": {
+      "noMatchingOptions": "No matching options"
+    },
+    "formConfig": {
+      "basic": {
+        "title": "Basic Information",
+        "protocolVersionHelp": "LiteLLM serves this version to clients and converts the upstream agent's responses to match it, regardless of the original agent's version."
+      },
+      "skills": {
+        "title": "Skills"
+      },
+      "capabilities": {
+        "title": "Capabilities"
+      },
+      "optional": {
+        "title": "Optional Settings"
+      },
+      "litellm": {
+        "title": "LiteLLM Parameters"
+      },
+      "cost": {
+        "title": "Cost Configuration"
+      },
+      "tracing": {
+        "title": "Tracing"
+      },
+      "skillFields": {
+        "id": "Skill ID",
+        "idPlaceholder": "e.g., hello_world",
+        "name": "Skill Name",
+        "namePlaceholder": "e.g., Returns hello world",
+        "description": "Description",
+        "descriptionPlaceholder": "What this skill does",
+        "tags": "Tags",
+        "tagsPlaceholder": "Type a tag and press Enter",
+        "examples": "Examples",
+        "examplesPlaceholder": "Type an example and press Enter"
+      }
+    },
+    "formFields": {
+      "errors": {
+        "required": "Required",
+        "enterField": "Please enter {{field}}"
+      },
+      "skills": {
+        "remove": "Remove Skill",
+        "add": "Add Skill"
+      },
+      "staticHeaders": {
+        "errors": {
+          "nameRequired": "Header name required",
+          "valueRequired": "Value required"
+        },
+        "namePlaceholder": "Header name (e.g. Authorization)",
+        "valuePlaceholder": "Value (e.g. Bearer token123)",
+        "remove": "Remove static header",
+        "add": "Add Static Header"
+      },
+      "agentName": {
+        "label": "Agent Name",
+        "hint": "Unique identifier for the agent",
+        "required": "Please enter a unique agent name",
+        "placeholder": "e.g., customer-support-agent"
+      },
+      "requiredSection": "{{section}} (Required)",
+      "authHeaders": {
+        "title": "Authentication Headers",
+        "staticHeaders": "Static Headers",
+        "staticHeadersHint": "Headers always sent to the backend agent, regardless of the client request. Admin-configured, static wins on conflict.",
+        "forwardHeaders": "Forward Client Headers",
+        "forwardHeadersHint": "Header names to extract from the client's request and forward to the agent. Type a name and press Enter.",
+        "forwardHeadersPlaceholder": "e.g. x-api-key, Authorization"
+      },
+      "killSwitch": "Kill Switch"
+    },
+    "dynamicFields": {
+      "errors": {
+        "malformed": "{{field}} looks incomplete or malformed",
+        "enterField": "Please enter {{field}}"
+      },
+      "agentName": {
+        "label": "Agent Name",
+        "hint": "Unique identifier for the agent",
+        "required": "Please enter a unique agent name",
+        "placeholder": "e.g., my-langgraph-agent"
+      },
+      "description": {
+        "label": "Description",
+        "hint": "Brief description of what this agent does",
+        "placeholder": "Describe what this agent does..."
+      },
+      "killSwitch": "Kill Switch"
+    },
+    "costView": {
+      "title": "Cost Configuration",
+      "costPerQuery": "Cost Per Query",
+      "inputCostPerToken": "Input Cost Per Token",
+      "outputCostPerToken": "Output Cost Per Token"
+    },
+    "virtualKeys": {
+      "title": "Virtual Keys",
+      "loading": "Loading keys...",
+      "empty": "No virtual key assigned to this agent.",
+      "unnamed": "Unnamed key"
+    },
+    "table": {
+      "empty": {
+        "filteredTitle": "No matching agents",
+        "title": "No agents yet",
+        "filteredDescription": "Adjust the search to see more agents.",
+        "description": "Add an agent to make it available in your organization."
+      },
+      "loading": "Loading agents…",
+      "searchPlaceholder": "Search agents by name, ID, or description...",
+      "clearSearch": "Clear search",
+      "healthCheck": {
+        "label": "Health Check",
+        "hint": "When enabled, only agents with reachable URLs are shown"
+      },
+      "actions": {
+        "open": "Open agent actions",
+        "delete": "Delete"
+      },
+      "columns": {
+        "name": "Agent Name",
+        "id": "Agent ID",
+        "spend": "Spend (USD)",
+        "model": "Model",
+        "created": "Created",
+        "status": "Status",
+        "actions": "Actions"
+      },
+      "noModel": "N/A",
+      "status": {
+        "jwtConfigured": "JWT configured",
+        "active": "Active",
+        "needsSetup": "Needs Setup"
+      }
+    },
+    "cardDiscovery": {
+      "errors": {
+        "noAccessToken": "No access token available",
+        "fillConnectionDetails": "Fill in the agent's connection details above first",
+        "enterBaseUrl": "Enter the agent's base URL first",
+        "discoverFailed": "Failed to discover agent card"
+      },
+      "rediscover": "Re-discover",
+      "discover": "Discover",
+      "title": "Discover from agent URL",
+      "titleHint": "LiteLLM will fetch {{path}} from this URL and let you pick which skills and capabilities to expose through the proxy.",
+      "parentDrivenIntro": "Using the connection details you entered above. We'll fetch:",
+      "fillFieldsFirst": "Fill in the fields above first",
+      "manualIntro": "Paste the upstream agent's base URL. We'll try <cardfile/>, <agentfile/>, and <rootfile/> in order.",
+      "failedTitle": "Discovery failed",
+      "dismissError": "Dismiss error",
+      "cardLoaded": "Upstream card loaded",
+      "nameLabel": "Name (shown to API clients)",
+      "namePlaceholder": "Agent name",
+      "descriptionLabel": "Description",
+      "descriptionPlaceholder": "What this agent does",
+      "skills": "Skills",
+      "skillsSelected": "{{selected}} / {{total}} selected",
+      "noSkills": "Upstream card has no skills",
+      "capabilities": "Capabilities",
+      "capabilitiesHint": "Only capabilities LiteLLM can faithfully proxy today are listed. Others (push notifications, extensions) are coming soon.",
+      "notAdvertised": "not advertised upstream"
+    },
+    "panel": {
+      "toasts": {
+        "deleted": "Agent \"{{name}}\" deleted successfully",
+        "deleteFailed": "Failed to delete agent"
+      },
+      "title": "Agents",
+      "description": "List of A2A-spec agents that are available to be used in your organization. Go to AI Hub, to make agents public.",
+      "authAlert": {
+        "title": "How do agents authenticate?",
+        "description": "Agents can authenticate with a virtual key or a trusted identity provider using JWT. Configure an identity binding when adding or editing an agent. JWT authentication does not require a virtual key."
+      },
+      "addAgent": "Add New Agent",
+      "deleteDialog": {
+        "title": "Delete Agent",
+        "description": "Are you sure you want to delete agent: {{name}}? This action cannot be undone.",
+        "cancel": "Cancel",
+        "confirm": "Delete"
+      }
+    },
+    "info": {
+      "toasts": {
+        "loadFailed": "Failed to load agent information",
+        "updated": "Agent updated successfully",
+        "updateFailed": "Failed to update agent"
+      },
+      "notFound": "Agent not found",
+      "backToList": "Back to Agents List",
+      "unlimited": "Unlimited",
+      "backToAgent": "Back to Agent",
+      "backToAgents": "Back to Agents",
+      "unnamed": "Unnamed Agent",
+      "tabs": {
+        "overview": "Overview",
+        "settings": "Settings"
+      },
+      "details": {
+        "agentId": "Agent ID",
+        "agentName": "Agent Name",
+        "displayName": "Display Name",
+        "description": "Description",
+        "url": "URL",
+        "version": "Version",
+        "protocolVersion": "Protocol Version",
+        "streaming": "Streaming",
+        "pushNotifications": "Push Notifications",
+        "stateTransitionHistory": "State Transition History",
+        "skills": "Skills",
+        "model": "Model",
+        "makePublic": "Make Public",
+        "iconUrl": "Icon URL",
+        "documentationUrl": "Documentation URL",
+        "tpmLimit": "TPM Limit",
+        "rpmLimit": "RPM Limit",
+        "sessionTpmLimit": "Session TPM Limit",
+        "sessionRpmLimit": "Session RPM Limit",
+        "accessGroups": "Access Groups",
+        "createdAt": "Created At",
+        "updatedAt": "Updated At"
+      },
+      "yes": "Yes",
+      "no": "No",
+      "skillsConfigured_one": "{{count}} configured",
+      "skillsConfigured_other": "{{count}} configured",
+      "none": "None",
+      "mcpPermissions": {
+        "title": "MCP Tool Permissions",
+        "servers": "MCP Servers",
+        "accessGroups": "MCP Access Groups",
+        "toolsets": "MCP Toolsets",
+        "toolsPerServer": "Tool permissions per server"
+      },
+      "skillsSection": {
+        "title": "Skills",
+        "fallbackName": "Skill {{number}}",
+        "id": "ID:",
+        "description": "Description:",
+        "tags": "Tags:",
+        "examples": "Examples:"
+      },
+      "settings": {
+        "title": "Agent Settings",
+        "edit": "Edit Settings",
+        "agentId": "Agent ID",
+        "rateLimits": "Rate Limits",
+        "tpmLimit": "TPM Limit",
+        "rpmLimit": "RPM Limit",
+        "sessionTpmLimit": "Session TPM Limit",
+        "sessionRpmLimit": "Session RPM Limit",
+        "accessGroups": {
+          "title": "Access Groups",
+          "label": "Access Groups",
+          "hint": "Attached groups cap which models, MCP servers, and agents this agent can reach, on top of its key and team permissions. Leave empty to apply no extra cap.",
+          "placeholder": "Select access groups (optional)"
+        },
+        "mcpServers": {
+          "title": "MCP Servers",
+          "label": "Allowed MCP Servers",
+          "hint": "Select which MCP servers or access groups this agent can access. Keys bound to this agent can only reach servers granted here.",
+          "placeholder": "Select MCP servers or access groups (optional)"
+        },
+        "cancel": "Cancel",
+        "save": "Save Changes",
+        "editHint": "Click \"Edit Settings\" to modify agent configuration."
+      }
+    },
+    "addForm": {
+      "steps": {
+        "configure": "Configure",
+        "entitlements": "Entitlements",
+        "governance": "Governance",
+        "agentManagement": "Agent Management",
+        "ready": "Ready",
+        "ariaLabel": "Agent creation steps"
+      },
+      "agentType": {
+        "custom": "Custom / Other"
+      },
+      "toasts": {
+        "noAccessToken": "No access token available",
+        "selectExistingKey": "Please select an existing key to assign",
+        "buildFailed": "Failed to build agent data",
+        "createFailedWithError": "Failed to create agent: {{error}}",
+        "createFailed": "Failed to create agent"
+      },
+      "entitlements": {
+        "description": "Configure which models, agents, and MCP tools this agent is allowed to use. Leave fields empty to allow all (subject to key/team permissions).",
+        "models": {
+          "label": "Allowed Models",
+          "hint": "Restrict which models this agent can call. Leave empty to allow all.",
+          "loading": "Loading models...",
+          "placeholder": "Select models (leave empty for all)"
+        },
+        "agents": {
+          "label": "Allowed Agents (Sub-Agents)",
+          "hint": "Restrict which other agents this agent can invoke as sub-agents. Leave empty to allow all.",
+          "loading": "Loading agents...",
+          "placeholder": "Select agents (leave empty for all)"
+        },
+        "accessGroups": {
+          "label": "Access Groups",
+          "hint": "Attach access groups to this agent. Attached groups cap which models, MCP servers, and agents the agent can reach, on top of its key and team permissions. Leave empty to apply no extra cap.",
+          "placeholder": "Select access groups (optional)"
+        },
+        "mcpServers": {
+          "label": "Allowed MCP Servers",
+          "hint": "Select which MCP servers or access groups this agent can access",
+          "placeholder": "Select MCP servers or access groups (optional)"
+        }
+      },
+      "governance": {
+        "tracing": {
+          "title": "Tracing",
+          "inbound": {
+            "label": "Require {{header}} on calls TO this agent",
+            "description": "Only accept this agent being invoked with a trace-id (e.g. when used as a sub-agent)."
+          },
+          "outbound": {
+            "label": "Require {{header}} on calls BY this agent",
+            "description": "Requires LLM/MCP calls made by this agent to include {{header}} for session tracking."
+          }
+        },
+        "budgets": {
+          "title": "Budgets & Rate Limits",
+          "requiresOutbound": "Enable \"Require {{header}} on calls BY this agent\" in Tracing to configure budgets and rate limits.",
+          "session": {
+            "title": "Session Budgets",
+            "maxIterations": {
+              "label": "Max Iterations",
+              "placeholder": "e.g. 25",
+              "hint": "Hard cap on LLM calls per session"
+            },
+            "maxBudget": {
+              "label": "Max Budget Per Session ($)",
+              "placeholder": "e.g. 5.00",
+              "hint": "Max spend per trace before returning 429"
+            }
+          }
+        },
+        "rateLimits": {
+          "agent": {
+            "title": "Agent Rate Limits",
+            "description": "Global rate limits applied across all callers of this agent.",
+            "tpm": {
+              "label": "TPM Limit",
+              "placeholder": "e.g. 100000"
+            },
+            "rpm": {
+              "label": "RPM Limit",
+              "placeholder": "e.g. 100"
+            }
+          },
+          "session": {
+            "tpm": {
+              "label": "Session TPM Limit",
+              "placeholder": "e.g. 10000"
+            },
+            "rpm": {
+              "label": "Session RPM Limit",
+              "placeholder": "e.g. 20"
+            },
+            "title": "Per-Session Rate Limits",
+            "description": "Rate limits per session ({{header}}). Each session gets its own counters."
+          }
+        },
+        "guardrails": {
+          "title": "Guardrails",
+          "description": "Apply guardrails to this agent. Selected guardrails will run on all calls made by this agent."
+        }
+      },
+      "configure": {
+        "agentType": {
+          "label": "Agent Type",
+          "hint": "Select the type of agent you want to create",
+          "notListed": "Not listed?",
+          "genericBadge": "GENERIC",
+          "customDescription": "For outbound agents using an identity provider or virtual key"
+        },
+        "custom": {
+          "agentName": {
+            "label": "Agent Name",
+            "required": "Please enter an agent name",
+            "placeholder": "e.g. my-custom-agent"
+          },
+          "description": {
+            "label": "Description",
+            "placeholder": "Describe what this agent does…"
+          }
+        },
+        "typeSettings": "{{type}} Settings",
+        "enterField": "Please enter {{field}}"
+      },
+      "assignKey": {
+        "agentNameFallback": "your-agent",
+        "team": {
+          "label": "Assign to Team",
+          "hint": "Optionally select a team for the virtual key. The agent identity and its permissions are managed separately."
+        },
+        "entraNotice": "This agent will authenticate with Microsoft Entra ID. You can skip virtual key creation.",
+        "createNew": {
+          "title": "Create a new key for this agent",
+          "description": "A dedicated key scoped to this agent.",
+          "keyName": {
+            "label": "Key Name",
+            "placeholder": "e.g. my-agent-key"
+          },
+          "recommended": "Recommended"
+        },
+        "existing": {
+          "title": "Assign an existing key",
+          "description": "Re-assign a key you already have to this agent.",
+          "loading": "Loading keys…",
+          "placeholder": "Search by key name…"
+        },
+        "skip": {
+          "entra": "Use Entra JWT authentication",
+          "later": "Skip for now, I’ll assign a key later"
+        }
+      },
+      "ready": {
+        "title": "Agent Created!",
+        "keyAssigned": "Key <alias/> has been assigned to this agent.",
+        "entraConfigured": "Microsoft Entra ID is configured. Send an authenticated agent request to verify the connection.",
+        "noKey": "No key assigned. You can create one from the Virtual Keys page."
+      },
+      "dialog": {
+        "logoLabel": "Agent",
+        "title": "Add New Agent",
+        "back": "← Back",
+        "cancel": "Cancel",
+        "next": "Next →",
+        "creating": "Creating...",
+        "create": "Create Agent →",
+        "done": "Done"
+      }
+    }
+  },
+  "vectorStores": {
+    "page": {
+      "title": "Vector Store Management",
+      "lastRefreshed": "Last Refreshed: {{time}}",
+      "refresh": "Refresh",
+      "description": "You can use vector stores to store and retrieve LLM embeddings.",
+      "tabs": {
+        "create": "Create Vector Store",
+        "manage": "Manage Vector Stores",
+        "test": "Test Vector Store",
+        "indexes": "Indexes"
+      },
+      "addVectorStore": "+ Add Vector Store",
+      "deleteModal": {
+        "title": "Delete Vector Store",
+        "message": "Are you sure you want to delete this vector store? This action cannot be undone.",
+        "resourceTitle": "Vector Store Information",
+        "vectorStoreId": "Vector Store ID"
+      },
+      "toasts": {
+        "fetchStoresFailed": "Error fetching vector stores: {{error}}",
+        "fetchCredentialsFailed": "Error fetching credentials: {{error}}",
+        "deleted": "Vector store deleted successfully",
+        "deleteFailed": "Error deleting vector store: {{error}}"
+      }
+    },
+    "table": {
+      "loading": "Loading vector stores…",
+      "empty": {
+        "title": "No vector stores",
+        "description": "Connect a vector store to enable retrieval-augmented generation."
+      },
+      "columns": {
+        "vectorStoreId": "Vector Store ID",
+        "name": "Name",
+        "description": "Description",
+        "source": "Source",
+        "files": "Files",
+        "provider": "Provider",
+        "createdAt": "Created At",
+        "updatedAt": "Updated At",
+        "actions": "Actions"
+      },
+      "source": {
+        "config": "Config",
+        "db": "DB"
+      },
+      "files": {
+        "unknown": "Unknown",
+        "count_one": "{{count}} file",
+        "count_other": "{{count}} files"
+      },
+      "actions": {
+        "open": "Open vector store actions",
+        "edit": "Edit",
+        "copyId": "Copy vector store ID",
+        "idCopied": "Vector store ID copied",
+        "delete": "Delete",
+        "configHint": "Read only: this vector store is defined in the config file and cannot be edited or deleted on the dashboard."
+      }
+    },
+    "documents": {
+      "empty": {
+        "title": "No documents uploaded yet",
+        "description": "Upload documents above to get started."
+      },
+      "columns": {
+        "name": "Name",
+        "status": "Status",
+        "actions": "Actions"
+      },
+      "actions": {
+        "open": "Open document actions",
+        "copyId": "Copy document ID",
+        "idCopied": "Document ID copied to clipboard",
+        "remove": "Remove"
+      }
+    },
+    "indexes": {
+      "intro": "Vector store indexes registered on this proxy via the <endpoint/> API. See the <docs>vector store index docs</docs> for how this works. Index passthrough is supported for Azure AI Search and Milvus today; support for more providers can be added, so please <issues>file a GitHub issue</issues> if you want your provider supported.",
+      "loading": "Loading indexes…",
+      "empty": {
+        "title": "No indexes registered yet",
+        "description": "Indexes registered on this proxy will appear here."
+      },
+      "columns": {
+        "indexName": "Index Name",
+        "vectorStore": "Vector Store",
+        "providerIndex": "Provider Index",
+        "createdBy": "Created By",
+        "createdAt": "Created At"
+      },
+      "toasts": {
+        "fetchFailed": "Error fetching indexes: {{error}}"
+      }
+    },
+    "testTab": {
+      "noToken": "Access token is required to test vector stores.",
+      "noStores": "No vector stores available. Create one first to test it.",
+      "selectTitle": "Select Vector Store",
+      "selectDescription": "Choose a vector store to test search queries against",
+      "selectPlaceholder": "Select a vector store",
+      "noMatch": "No matching vector stores"
+    },
+    "tester": {
+      "title": "Test Vector Store",
+      "clearHistory": "Clear History",
+      "emptyHint": "Test your vector store by entering a search query below",
+      "query": "Query",
+      "results": "Vector Store Results",
+      "resultCount_one": "{{count}} results",
+      "resultCount_other": "{{count}} results",
+      "result": "Result {{number}}",
+      "score": "Score: {{score}}",
+      "content": "Content ({{type}})",
+      "metadata": "Metadata",
+      "fileId": "File ID:",
+      "filename": "Filename:",
+      "attributes": "Attributes:",
+      "searchFailed": "Search failed: {{error}}",
+      "noResults": "No results found",
+      "placeholder": "Enter your search query... (Shift+Enter for new line)",
+      "search": "Search",
+      "toasts": {
+        "emptyQuery": "Please enter a search query",
+        "historyCleared": "Search history cleared"
+      }
+    },
+    "s3Config": {
+      "errors": {
+        "bucketTooShort": "Bucket name must be at least 3 characters",
+        "indexTooShort": "Index name must be at least 3 characters if provided"
+      },
+      "setup": {
+        "title": "AWS S3 Vectors Setup",
+        "intro": "AWS S3 Vectors allows you to store and query vector embeddings directly in S3:",
+        "autoCreate": "Vector buckets and indexes will be automatically created if they don't exist",
+        "dimensions": "Vector dimensions are auto-detected from your selected embedding model",
+        "permissions": "Ensure your AWS credentials have permissions for S3 Vectors operations",
+        "learnMore": "Learn more: <docs>AWS S3 Vectors Documentation</docs>"
+      },
+      "fields": {
+        "bucketName": "Vector Bucket Name",
+        "bucketNameHint": "S3 bucket name for vector storage (must be at least 3 characters, lowercase letters, numbers, hyphens, and periods only)",
+        "bucketNamePlaceholder": "my-vector-bucket (min 3 chars)",
+        "indexName": "Index Name",
+        "indexNameHint": "Name for the vector index (optional, will be auto-generated if not provided). If provided, must be at least 3 characters.",
+        "indexNamePlaceholder": "my-vector-index (optional, min 3 chars)",
+        "region": "AWS Region",
+        "regionHint": "AWS region where the S3 bucket is located (e.g., us-west-2)",
+        "embeddingModel": "Embedding Model",
+        "embeddingModelHint": "Select the embedding model to use for vector generation",
+        "embeddingModelPlaceholder": "Select an embedding model",
+        "loadingModels": "Loading models...",
+        "noModels": "No embedding models found."
+      }
+    },
+    "create": {
+      "title": "Create Vector Store",
+      "description": "Upload documents and select a provider to create a new vector store with embedded content.",
+      "upload": {
+        "title": "Step 1: Upload Documents",
+        "description": "Upload one or more documents (PDF, TXT, DOCX, MD). Maximum file size: 50MB per file.",
+        "dropzone": "Click or drag files to this area to upload",
+        "formats": "Support for single or bulk upload. Supported formats: PDF, TXT, DOCX, MD"
+      },
+      "uploadedDocuments_one": "Uploaded Documents ({{count}})",
+      "uploadedDocuments_other": "Uploaded Documents ({{count}})",
+      "configure": {
+        "title": "Step 2: Configure Vector Store",
+        "description": "Choose the provider and optionally provide a name and description for your vector store."
+      },
+      "fields": {
+        "name": "Vector Store Name",
+        "nameHint": "Optional: Give your vector store a meaningful name",
+        "namePlaceholder": "e.g., Product Documentation, Customer Support KB",
+        "description": "Description",
+        "descriptionHint": "Optional: Describe what this vector store contains",
+        "descriptionPlaceholder": "e.g., Contains all product documentation and user guides",
+        "provider": "Provider",
+        "providerHint": "Select the provider for embedding and vector store operations",
+        "providerPlaceholder": "Select a provider"
+      },
+      "buttons": {
+        "create": "Create Vector Store",
+        "creating": "Creating Vector Store..."
+      },
+      "success": {
+        "title": "Vector Store Created Successfully",
+        "vectorStoreId": "Vector Store ID:",
+        "documentsIngested": "Documents Ingested:",
+        "close": "Close"
+      },
+      "toasts": {
+        "unsupportedType": "{{name}} is not a supported file type. Please upload PDF, TXT, DOCX, or MD files.",
+        "tooLarge": "{{name}} must be smaller than 50MB!",
+        "noDocuments": "Please upload at least one document",
+        "noProvider": "Please select a provider",
+        "fieldRequired": "Please provide {{field}}",
+        "bucketTooShort": "Vector bucket name must be at least 3 characters",
+        "indexTooShort": "Index name must be at least 3 characters if provided",
+        "noAccessToken": "No access token available",
+        "partialFailure_one": "Vector store {{id}} was created with {{count}} document(s), but {{name}} failed to ingest",
+        "partialFailure_other": "Vector store {{id}} was created with {{count}} document(s), but {{name}} failed to ingest",
+        "created_one": "Successfully created vector store with {{count}} document(s). Vector Store ID: {{id}}",
+        "created_other": "Successfully created vector store with {{count}} document(s). Vector Store ID: {{id}}",
+        "createFailed": "Failed to create vector store: {{error}}"
+      }
+    },
+    "info": {
+      "back": "Back to Vector Stores",
+      "notFound": {
+        "title": "Vector store not found",
+        "description": "Vector store {{id}} could not be loaded. It may have been deleted."
+      },
+      "loading": "Loading...",
+      "heading": "Vector Store ID: {{id}}",
+      "source": {
+        "config": "Config",
+        "db": "DB"
+      },
+      "noDescription": "No description",
+      "editButton": "Edit Vector Store",
+      "readOnly": {
+        "title": "Read only: defined in the config file",
+        "description": "This vector store comes from the proxy config YAML, so it cannot be edited or deleted on the dashboard. Change or remove it in the config file and restart the proxy."
+      },
+      "tabs": {
+        "details": "Details",
+        "test": "Test Vector Store"
+      },
+      "edit": {
+        "title": "Edit Vector Store",
+        "vectorStoreId": "Vector Store ID",
+        "name": "Vector Store Name",
+        "description": "Description",
+        "provider": "Provider",
+        "providerHint": "Select the provider for this vector store",
+        "credentialsHint": "Either select existing credentials OR enter provider credentials below",
+        "credentials": "Existing Credentials",
+        "credentialsPlaceholder": "Select or search for existing credentials",
+        "or": "OR",
+        "metadata": "Metadata",
+        "metadataHint": "JSON metadata for the vector store",
+        "cancel": "Cancel",
+        "save": "Save Changes"
+      },
+      "details": {
+        "title": "Vector Store Details",
+        "id": "ID",
+        "name": "Name",
+        "description": "Description",
+        "provider": "Provider",
+        "metadata": "Metadata",
+        "created": "Created",
+        "lastUpdated": "Last Updated"
+      },
+      "errors": {
+        "idRequired": "Please input a vector store ID",
+        "providerRequired": "Please select a provider"
+      },
+      "toasts": {
+        "fetchFailed": "Error fetching vector store details: {{error}}",
+        "invalidMetadata": "Invalid JSON in metadata field",
+        "updated": "Vector store updated successfully",
+        "updateFailed": "Error updating vector store: {{error}}"
+      }
+    },
+    "form": {
+      "title": "Add New Vector Store",
+      "fields": {
+        "provider": "Provider",
+        "providerHint": "Select the provider for this vector store",
+        "vectorStoreId": "Vector Store ID",
+        "vectorStoreIdHint": "Enter the vector store ID from your api provider",
+        "name": "Vector Store Name",
+        "nameHint": "Custom name you want to give to the vector store, this name will be rendered on the LiteLLM UI",
+        "description": "Description",
+        "credentials": "Existing Credentials",
+        "credentialsHint": "Optionally select API provider credentials for this vector store eg. Bedrock API KEY",
+        "credentialsPlaceholder": "Select or search for existing credentials",
+        "metadata": "Metadata",
+        "metadataHint": "JSON metadata for the vector store (optional)"
+      },
+      "idPlaceholders": {
+        "default": "Enter vector store ID from your provider",
+        "vertexRagEngine": "6917529027641081856 (corpus ID from Vertex AI / \"RAG Engine\" console)",
+        "vertexAiSearch": "my-datastore_1234567890 (data store ID from Vertex AI / \"Agent Search\" console)",
+        "vertexAiSearchWithEngine": "Any identifier you'll use to reference this in LiteLLM",
+        "valkey": "my-search-index (FT index name in Valkey)",
+        "mongodb": "my-vector-index (MongoDB Vector Search index name)",
+        "opensearch": "my-knn-index (OpenSearch index name)"
+      },
+      "password": {
+        "show": "Show Password",
+        "hide": "Hide Password"
+      },
+      "noMatchingOptions": "No matching options",
+      "buttons": {
+        "cancel": "Cancel",
+        "create": "Create"
+      },
+      "errors": {
+        "providerRequired": "Please select a provider",
+        "vectorStoreIdRequired": "Please input the vector store ID from your api provider",
+        "selectField": "Please select the {{field}}",
+        "inputField": "Please input the {{field}}"
+      },
+      "toasts": {
+        "invalidMetadata": "Invalid JSON in metadata field",
+        "created": "Vector store created successfully",
+        "createFailed": "Error creating vector store: {{error}}"
+      },
+      "pgVector": {
+        "title": "PG Vector Setup Required",
+        "intro": "LiteLLM provides a server to connect to PG Vector. To use this provider:",
+        "steps": {
+          "deploy": "Deploy the litellm-pgvector server from:",
+          "configure": "Configure your PostgreSQL database with pgvector extension",
+          "start": "Start the server and note the API base URL and API key",
+          "enter": "Enter those details in the fields below"
+        }
+      },
+      "valkey": {
+        "title": "Valkey Setup Required",
+        "intro": "LiteLLM searches documents you have already stored in Valkey. It does not create the index or upload documents for you. Before creating this vector store, make sure:",
+        "steps": {
+          "searchEnabled": "Your Valkey server has vector search enabled (the valkey-search module, included in the valkey-bundle image and in AWS ElastiCache / MemoryDB for Valkey)",
+          "indexLoaded": "You have already created a search index and loaded your documents and their embeddings into it. Enter that index name as the Vector Store ID",
+          "embeddingModel": "You know which embedding model created those stored embeddings. That model must be added to this proxy under Models so you can pick it below. Using a different model returns wrong results",
+          "fieldNames": "You know the field names your documents use for their text and their embedding. If they are not \"text\" and \"embedding\", set them below"
+        },
+        "howItWorks": "When a query comes in, LiteLLM converts it to an embedding with the model below and returns the closest matching documents from your index."
+      },
+      "opensearch": {
+        "title": "OpenSearch Setup Required",
+        "intro": "LiteLLM searches a k-NN index you already have in an OpenSearch Serverless collection or an OpenSearch Service domain. It does not create the index or upload documents. Before creating this vector store, make sure:",
+        "steps": {
+          "knnField": "The index has a knn_vector field holding each document's embedding. Enter the index name as the Vector Store ID, or under Index Name when another endpoint already uses that ID",
+          "embeddingModel": "You know which embedding model created those embeddings. That model must be added to this proxy under Models so you can pick it below. Using a different model returns wrong results",
+          "credentials": "The proxy has AWS credentials that can read the index, either its own (environment variables or an IAM role) or a saved credential picked under Existing Credentials. A Serverless collection needs a data access policy for them, and a domain needs its access policy to allow them"
+        }
+      },
+      "vertexRagEngine": {
+        "title": "Vertex AI RAG Engine Setup",
+        "intro": "To use Vertex AI RAG Engine:",
+        "renameNote": "Note: Google Cloud has renamed this to \"RAG Engine\" in its console — the steps below still apply.",
+        "steps": {
+          "guide": "Set up your Vertex AI RAG Engine corpus following the guide: <guide>Vertex AI RAG Engine Overview</guide>",
+          "createCorpus": "Create a corpus in your Google Cloud project",
+          "noteCorpusId": "Note the corpus ID from the Vertex AI console (now labeled \"RAG Engine\" in Google Cloud)",
+          "enterCorpusId": "Enter the corpus ID in the Vector Store ID field below"
+        }
+      },
+      "vertexAiSearch": {
+        "title": "Vertex AI Search Setup",
+        "intro": "To use Vertex AI Search (Discovery Engine):",
+        "renameNote": "Note: Google Cloud has renamed this to \"Agent Search\" in its console — the steps below still apply.",
+        "steps": {
+          "guide": "Enable the Discovery Engine API on your Google Cloud project and create a data store following the guide: <guide>Create a Vertex AI Search data store</guide>",
+          "location": "Pick a supported location: global, us, or eu",
+          "dataStoreId": "For most data store types (Cloud Storage, BigQuery, Media): copy the data store ID and enter it in the Vector Store ID field below.",
+          "engineId": "For website, healthcare, and connector-based sources (Drive, Gmail, Slack, Jira, etc.): create a search app on top of the data store, then copy the <strong>Engine ID</strong> and enter it in the Engine ID field. The Vector Store ID is still required as the LiteLLM-side name for this record, but it isn't used in the GCP URL when Engine ID is set."
+        }
+      }
+    },
+    "providerFields": {
+      "labels": {
+        "apiBase": "API Base",
+        "apiKey": "API Key",
+        "vertexProject": "Vertex Project",
+        "vertexLocation": "Vertex Location",
+        "collectionIdOptional": "Collection ID (optional)",
+        "engineIdOptional": "Engine ID (optional)",
+        "embeddingModel": "Embedding Model",
+        "sidecarUrl": "Sidecar URL",
+        "sidecarApiKey": "Sidecar API Key",
+        "database": "Database",
+        "collection": "Collection",
+        "vectorFieldName": "Vector Field Name",
+        "textField": "Text Field",
+        "candidatesConsidered": "Candidates Considered",
+        "valkeyHost": "Valkey Host",
+        "valkeyPort": "Valkey Port",
+        "valkeyPassword": "Valkey Password",
+        "useTls": "Use TLS",
+        "opensearchEndpoint": "OpenSearch Endpoint",
+        "awsRegionOptional": "AWS Region (optional)",
+        "indexNameOptional": "Index Name (optional)",
+        "vectorBucketName": "Vector Bucket Name",
+        "indexName": "Index Name",
+        "awsRegion": "AWS Region"
+      },
+      "tooltips": {
+        "pgVector": {
+          "apiBase": "Enter the base URL of your deployed litellm-pgvector server (e.g., http://your-server:8000)",
+          "apiKey": "Enter the API key from your deployed litellm-pgvector server"
+        },
+        "vertexAiSearch": {
+          "project": "Google Cloud project ID that hosts the Vertex AI Search data store.",
+          "location": "Vertex AI Search data store location. Must be one of global, us, or eu.",
+          "collectionId": "Discovery Engine collection ID. Leave blank to use the default collection.",
+          "engineId": "Search app (engine) ID. Required for website, healthcare, and connector-based data stores (Workspace, Slack, Jira, etc.) because these sources route search through an engine. Leave blank to query the data store directly."
+        },
+        "openai": {
+          "apiKey": "Enter your OpenAI API key"
+        },
+        "azure": {
+          "apiKey": "Enter your Azure OpenAI API key",
+          "apiBase": "Enter your Azure OpenAI endpoint (e.g., https://your-resource.openai.azure.com/)"
+        },
+        "milvus": {
+          "apiKey": "To obtain a token, you should use a colon (:) to concatenate the username and password that you use to access your Milvus instance (e.g., username:password)",
+          "apiBase": "Enter your Milvus endpoint (e.g., https://your-milvus-endpoint.com/)",
+          "embeddingModel": "Select the embedding model to use"
+        },
+        "mongodb": {
+          "apiBase": "Use HTTPS for a remote sidecar, or HTTP with a loopback IP for a sidecar on the same host or Pod",
+          "apiKey": "The MONGODB_SIDECAR_API_KEY configured in your MongoDB sidecar",
+          "database": "The MongoDB database holding the collection you want to search",
+          "collection": "The collection your MongoDB Vector Search index was built on",
+          "embeddingModel": "The embedding model on this proxy that created the vectors already stored in your collection. LiteLLM embeds every search query with it, so it must be the same model. A different model of the same size will not error, it will just return wrong results. Add it under Models first if it is not listed",
+          "embeddingField": "The field in each document that holds its embedding. It must match the path your MongoDB Vector Search index was created on (default: embedding)",
+          "textField": "The field in each document that holds its readable text. LiteLLM returns this text in search results, and it accepts a dotted path such as metadata.body (default: text)",
+          "numCandidates": "How many nearest neighbours MongoDB examines before returning the top results. Higher is more accurate and slower. Leave blank to let LiteLLM scale it with the requested result count"
+        },
+        "valkey": {
+          "host": "Hostname or IP of your Valkey server, without redis:// or a port (e.g. my-valkey.example.com)",
+          "port": "Port your Valkey server listens on. Leave as 6379 unless you changed it",
+          "password": "Password used to log in to your Valkey server. Leave blank if it has no password",
+          "ssl": "Set to true if your Valkey server requires an encrypted (TLS) connection, for example AWS ElastiCache with in-transit encryption turned on",
+          "embeddingModel": "The embedding model on this proxy that was used to create the embeddings already stored in your Valkey index. LiteLLM uses it to embed each search query, so it must be the same model or results will be wrong. Add it under Models first if it is not listed",
+          "textField": "The field in each stored document that holds its readable text. LiteLLM returns this text in search results. Must match how your documents were stored (default: text)",
+          "embeddingField": "The field in each stored document that holds its embedding. LiteLLM searches against this field, so it must match the field your index was created on (default: embedding)"
+        },
+        "opensearch": {
+          "apiBase": "The endpoint of your OpenSearch Serverless collection or OpenSearch Service domain, starting with https://",
+          "region": "The AWS region of the collection or domain. Leave blank to use the region in the endpoint, and set it when the endpoint is a custom domain",
+          "embeddingModel": "The embedding model on this proxy that created the vectors already stored in your index. LiteLLM embeds every search query with it, so it must be the same model. Add it under Models first if it is not listed",
+          "embeddingField": "The top-level knn_vector field in your index mapping that holds each document's embedding (default: embedding)",
+          "textField": "The top-level field in each document that holds its readable text. LiteLLM returns this text in search results (default: text)",
+          "indexName": "The OpenSearch index to search. Leave blank to use the Vector Store ID, and set it to register same-named indexes from two endpoints under different IDs"
+        },
+        "s3Vectors": {
+          "bucketName": "S3 bucket name for vector storage (will be auto-created if it doesn't exist)",
+          "indexName": "Name for the vector index (optional, will be auto-generated if not provided)",
+          "region": "AWS region where the S3 bucket is located (e.g., us-west-2)",
+          "embeddingModel": "Select the embedding model to use for vector generation"
+        }
+      }
+    }
+  },
+  "prompts": {
+    "panel": {
+      "environments": {
+        "all": "All Environments",
+        "development": "Development",
+        "staging": "Staging",
+        "production": "Production"
+      },
+      "addNew": "Add New Prompt",
+      "uploadFile": "Upload .prompt File",
+      "deleteDialog": {
+        "title": "Delete Prompt",
+        "description": "Are you sure you want to delete the {{environment}} copy of prompt: {{name}}? This action cannot be undone.",
+        "cancel": "Cancel",
+        "confirm": "Delete"
+      },
+      "toasts": {
+        "deleted": "Prompt \"{{name}}\" deleted successfully from {{environment}}",
+        "deleteFailed": "Failed to delete prompt"
+      }
+    },
+    "table": {
+      "empty": {
+        "title": "No prompts yet",
+        "description": "Add a prompt to start managing reusable templates."
+      },
+      "loading": "Loading prompts…",
+      "columns": {
+        "promptId": "Prompt ID",
+        "model": "Model",
+        "createdAt": "Created At",
+        "updatedAt": "Updated At",
+        "environment": "Environment",
+        "createdBy": "Created By",
+        "type": "Type",
+        "actions": "Actions"
+      },
+      "rowActions": {
+        "open": "Open prompt actions",
+        "copyId": "Copy prompt ID",
+        "idCopied": "Prompt ID copied",
+        "delete": "Delete",
+        "unknownPrompt": "Unknown Prompt"
+      }
+    },
+    "addForm": {
+      "title": "Add New Prompt",
+      "fields": {
+        "promptId": "Prompt ID",
+        "promptIdPlaceholder": "Enter unique prompt ID (e.g., my_prompt_id)",
+        "integration": "Prompt Integration",
+        "file": "Prompt File",
+        "fileInput": "Prompt file",
+        "selectFile": "Select .prompt File",
+        "selected": "Selected: {{name}}",
+        "removeFile": "Remove {{name}}",
+        "fileDescription": "Upload a .prompt file that follows the Dotprompt specification"
+      },
+      "errors": {
+        "idRequired": "Please enter a prompt ID",
+        "idInvalid": "Prompt ID can only contain letters, numbers, underscores, and hyphens"
+      },
+      "toasts": {
+        "fileRequired": "Please upload a .prompt file",
+        "convertFailed": "Failed to convert prompt file to JSON",
+        "tokenRequired": "Access token is required",
+        "created": "Prompt created successfully!",
+        "createFailed": "Failed to create prompt"
+      },
+      "cancel": "Cancel",
+      "submit": "Create Prompt"
+    },
+    "info": {
+      "loading": "Loading...",
+      "notFound": "Prompt not found",
+      "toasts": {
+        "loadFailed": "Failed to load prompt information",
+        "deleted": "Prompt \"{{name}}\" deleted successfully",
+        "deleteFailed": "Failed to delete prompt",
+        "loadVersionFailed": "Failed to load version v{{version}}"
+      },
+      "back": "Back to Prompts",
+      "title": "Prompt Details",
+      "openStudio": "Prompt Studio",
+      "deletePrompt": "Delete Prompt",
+      "environmentVersion": "(v{{version}})",
+      "oldVersionBanner": "Viewing v{{selected}} — not the latest version (v{{latest}})",
+      "goToLatest": "Go to latest",
+      "tabs": {
+        "overview": "Overview",
+        "template": "Prompt Template",
+        "rawJson": "Raw JSON"
+      },
+      "overview": {
+        "version": "Version",
+        "promptType": "Prompt Type",
+        "createdBy": "Created By",
+        "createdAt": "Created At",
+        "updated": "Updated: {{date}}"
+      },
+      "versionLabel": "v{{version}}",
+      "history": {
+        "title": "Version History — {{environment}}",
+        "loading": "Loading versions...",
+        "columns": {
+          "version": "Version",
+          "createdBy": "Created By",
+          "date": "Date",
+          "actions": "Actions"
+        },
+        "latest": "latest",
+        "edit": "Edit",
+        "empty": "No versions found in {{environment}}"
+      },
+      "copied": "Copied!",
+      "template": {
+        "title": "Prompt Template",
+        "copy": "Copy Content",
+        "id": "Template ID",
+        "content": "Content",
+        "metadata": "Template Metadata"
+      },
+      "rawJson": {
+        "title": "Raw API Response",
+        "copy": "Copy JSON"
+      },
+      "deleteDialog": {
+        "title": "Delete Prompt",
+        "description": "Are you sure you want to delete prompt: <strong><name/></strong> from every environment?",
+        "warning": "This action cannot be undone.",
+        "cancel": "Cancel",
+        "confirm": "Delete"
+      }
+    },
+    "editor": {
+      "unnamedTool": "Unnamed Tool",
+      "viewModes": {
+        "pretty": "PRETTY"
+      },
+      "toasts": {
+        "parseFailed": "Failed to parse prompt data",
+        "invalidJson": "Invalid JSON format",
+        "loadVersionFailed": "Failed to load prompt version",
+        "tokenRequired": "Access token is required",
+        "nameRequired": "Please enter a valid prompt name",
+        "updated": "Prompt updated successfully!",
+        "created": "Prompt created successfully!",
+        "updateFailed": "Failed to update prompt",
+        "saveFailed": "Failed to save prompt"
+      }
+    },
+    "editorHeader": {
+      "environments": {
+        "development": "Development",
+        "staging": "Staging",
+        "production": "Production"
+      },
+      "back": "Back",
+      "nameLabel": "Prompt name",
+      "environmentLabel": "Environment",
+      "draft": "Draft",
+      "unsaved": "Unsaved changes",
+      "history": "History",
+      "update": "Update",
+      "save": "Save"
+    },
+    "codeSnippets": {
+      "trigger": "Get Code",
+      "title": "Generated Code",
+      "language": "Language",
+      "copy": "Copy to Clipboard",
+      "copied": "Copied to clipboard!",
+      "typeLabel": "Generated code type",
+      "tabs": {
+        "basic": "Basic",
+        "messages": "With Messages",
+        "version": "With Version"
+      }
+    },
+    "modelConfig": {
+      "parameters": "Parameters",
+      "title": "Model Parameters",
+      "temperature": "Temperature",
+      "maxTokens": "Max Tokens"
+    },
+    "developerMessage": {
+      "title": "Developer message",
+      "description": "Optional system instructions for the model",
+      "placeholder": "e.g., You are a helpful assistant..."
+    },
+    "messagesCard": {
+      "title": "Prompt messages",
+      "syntaxHint": "Use <code><variable/></code> syntax for template variables",
+      "roles": {
+        "user": "User",
+        "assistant": "Assistant",
+        "system": "System"
+      },
+      "roleLabel": "Message {{number}} role",
+      "remove": "Remove message {{number}}",
+      "contentPlaceholder": "Enter prompt content...",
+      "add": "Add message"
+    },
+    "toolsCard": {
+      "title": "Tools",
+      "add": "Add",
+      "empty": "No tools added",
+      "edit": "Edit",
+      "remove": "Remove {{name}}"
+    },
+    "toolModal": {
+      "title": "Add Tool",
+      "invalidJson": "Invalid JSON format. Please check your syntax.",
+      "jsonLabel": "Tool JSON",
+      "jsonPlaceholder": "Paste your tool JSON here...",
+      "cancel": "Cancel",
+      "add": "Add"
+    },
+    "variableTextarea": {
+      "detected": "Detected variables:",
+      "editTitle": "Edit variable name",
+      "namePlaceholder": "Variable name",
+      "save": "Save",
+      "cancel": "Cancel"
+    },
+    "publishModal": {
+      "title": "Publish Prompt",
+      "description": "Published prompts are versioned and can be used in API calls.",
+      "nameLabel": "Name",
+      "namePlaceholder": "Enter prompt name",
+      "hint": "Published prompts can be used in API calls and are versioned for easy tracking.",
+      "cancel": "Cancel",
+      "publish": "Publish"
+    },
+    "versionHistory": {
+      "title": "Version History",
+      "close": "Close",
+      "loading": "Loading version history",
+      "empty": "No version history available.",
+      "latest": "Latest",
+      "active": "Active",
+      "savedToDatabase": "Saved to Database",
+      "configPrompt": "Config Prompt"
+    },
+    "dotpromptView": {
+      "title": "Generated .prompt file",
+      "description": "This is the dotprompt format that will be saved to the database"
+    },
+    "conversation": {
+      "emptyState": {
+        "withVariables": "Fill in the variables above, then type a message to start testing",
+        "withoutVariables": "Type a message below to start testing your prompt"
+      },
+      "input": {
+        "placeholder": "Type your message... (Shift+Enter for new line)",
+        "send": "Send message",
+        "cancel": "Cancel"
+      },
+      "list": {
+        "loadingResponse": "Loading response"
+      },
+      "variables": {
+        "title": "Fill in template variables to start testing",
+        "placeholder": "Enter value for {{name}}"
+      },
+      "warning": {
+        "title": "Please fill in all template variables above",
+        "missing": "Missing: {{variables}}"
+      },
+      "panel": {
+        "clearChat": "Clear Chat"
+      },
+      "toasts": {
+        "tokenRequired": "Access token is required",
+        "variablesRequired": "Please fill in all template variables",
+        "cancelled": "Request cancelled",
+        "cleared": "Chat history cleared."
+      }
+    }
+  },
+  "searchTools": {
+    "page": {
+      "title": "Search Tools",
+      "subtitle": "Configure and manage your search providers",
+      "addButton": "+ Add New Search Tool",
+      "missingAuth": "Missing required authentication parameters.",
+      "toasts": {
+        "deleted": "Deleted search tool successfully",
+        "deleteFailed": "Failed to delete search tool",
+        "updated": "Search tool updated successfully",
+        "updateFailed": "Failed to update search tool"
+      },
+      "deleteModal": {
+        "title": "Delete Search Tool",
+        "message": "Are you sure you want to delete this search tool? This action cannot be undone.",
+        "infoTitle": "Search Tool Information",
+        "fields": {
+          "name": "Name",
+          "id": "ID",
+          "provider": "Provider",
+          "description": "Description"
+        }
+      },
+      "editModal": {
+        "title": "Edit Search Tool",
+        "cancel": "Cancel",
+        "ok": "OK"
+      },
+      "editForm": {
+        "labels": {
+          "name": "Search Tool Name",
+          "provider": "Search Provider",
+          "apiKey": "API Key",
+          "cost": "Cost per Query (USD)",
+          "description": "Description"
+        },
+        "descriptions": {
+          "apiKey": "API key for the search provider",
+          "cost": "Overrides the cost map price for this tool. Leave blank to use the provider's default price"
+        },
+        "placeholders": {
+          "name": "e.g., my-perplexity-search",
+          "provider": "Select a search provider",
+          "apiKey": "Enter API key",
+          "cost": "e.g., 0.007",
+          "description": "Description of this search tool"
+        },
+        "errors": {
+          "nameRequired": "Please enter a search tool name",
+          "providerRequired": "Please select a search provider",
+          "costNegative": "Cost per query cannot be negative"
+        }
+      }
+    },
+    "createForm": {
+      "title": "Add New Search Tool",
+      "labels": {
+        "name": "Search Tool Name",
+        "provider": "Search Provider",
+        "apiKey": "API Key",
+        "cost": "Cost per Query (USD, Optional)",
+        "description": "Description (Optional)"
+      },
+      "hints": {
+        "name": "A unique name to identify this search tool configuration (e.g., 'perplexity-search', 'tavily-news-search').",
+        "provider": "Select the search provider you want to use. Each provider has different capabilities and pricing.",
+        "apiKey": "The API key for authenticating with the search provider. This will be securely stored.",
+        "cost": "Your negotiated price per search query. It overrides the LiteLLM cost map price for this tool in the response cost header and spend logs. Leave blank to use the provider's default price."
+      },
+      "placeholders": {
+        "name": "e.g., perplexity-search, my-tavily-tool",
+        "provider": "Select a search provider",
+        "apiKey": "Enter your API key",
+        "cost": "e.g., 0.007",
+        "description": "Brief description of this search tool's purpose"
+      },
+      "noProviders": "No matching search providers",
+      "help": "Need Help?",
+      "helpTooltip": "Get help on our github",
+      "testConnection": "Test Connection",
+      "submit": "Add Search Tool",
+      "testResultsTitle": "Connection Test Results",
+      "close": "Close",
+      "errors": {
+        "nameRequired": "Please enter a search tool name",
+        "nameInvalid": "Name can only contain letters, numbers, hyphens, and underscores",
+        "providerRequired": "Please select a search provider",
+        "costNegative": "Cost per query cannot be negative"
+      },
+      "toasts": {
+        "created": "Search tool created successfully",
+        "createFailed": "Error creating search tool: {{error}}",
+        "testMissingFields": "Please fill in Search Provider and API Key before testing"
+      }
+    },
+    "connectionTest": {
+      "toastSuccess": "Connection test successful!",
+      "unknownErrorOccurred": "Unknown error occurred",
+      "unknownError": "Unknown error",
+      "authFailed": "Authentication failed: Invalid API key or credentials",
+      "authError": "Authentication error - please check your API key",
+      "fallbackProvider": "search provider",
+      "testing": "Testing connection to {{provider}}...",
+      "success": "Connection to {{provider}} successful!",
+      "testQuery": "Test query: <query/>",
+      "resultsRetrieved": "Results retrieved: {{results}}",
+      "failed": "Connection to {{provider}} failed",
+      "errorLabel": "Error: ",
+      "errorType": "Error type:",
+      "hideDetails": "Hide Details",
+      "showDetails": "Show Details",
+      "fullDetails": "Full Error Details",
+      "troubleshooting": {
+        "title": "Troubleshooting tips:",
+        "apiKey": "Verify your API key is correct and active",
+        "serviceStatus": "Check if the search provider service is operational",
+        "quota": "Ensure you have sufficient credits/quota with the provider",
+        "docs": "Review the provider's documentation for any additional requirements"
+      },
+      "docsLink": "View Search Documentation"
+    },
+    "table": {
+      "empty": {
+        "title": "No search tools configured",
+        "description": "Add a search tool to enable web search for your models."
+      },
+      "loading": "Loading search tools…",
+      "configEditHint": "Config search tools cannot be edited on the dashboard. Please edit the config file.",
+      "configDeleteHint": "Config search tools cannot be deleted on the dashboard. Please edit the config file.",
+      "actions": {
+        "open": "Open search tool actions",
+        "edit": "Edit search tool",
+        "delete": "Delete search tool"
+      },
+      "columns": {
+        "id": "Search Tool ID",
+        "name": "Name",
+        "provider": "Provider",
+        "createdAt": "Created At",
+        "updatedAt": "Updated At",
+        "source": "Source",
+        "actions": "Actions"
+      },
+      "source": {
+        "config": "Config",
+        "db": "DB"
+      }
+    },
+    "view": {
+      "back": "Back to All Search Tools",
+      "copyName": "Copy search tool name",
+      "copyId": "Copy search tool ID",
+      "provider": "Provider",
+      "apiKey": "API Key",
+      "apiKeyNotSet": "Not set",
+      "cost": "Cost per Query",
+      "costDefault": "Provider default",
+      "createdAt": "Created At",
+      "createdUnknown": "Unknown",
+      "description": "Description"
+    },
+    "tester": {
+      "title": "Test Search Tool",
+      "placeholder": "Enter your search query...",
+      "search": "Search",
+      "emptyTitle": "Test your search tool",
+      "emptyDescription": "Enter a query above to see search results",
+      "searching": "Searching...",
+      "queryLabel": "Search Query",
+      "resultCount_one": "{{count}} result",
+      "resultCount_other": "{{count}} results",
+      "latency": "{{latency}}ms",
+      "openResult": "Open result in new tab",
+      "showLess": "Show less",
+      "showMore": "Show more",
+      "noResults": "No results found",
+      "noResultsHint": "Try a different search query",
+      "previous": "Previous Searches",
+      "clearAll": "Clear All",
+      "toasts": {
+        "emptyQuery": "Please enter a search query",
+        "cleared": "Search history cleared"
+      }
+    }
+  },
+  "memory": {
+    "page": {
+      "title": "Memory"
+    },
+    "view": {
+      "title": "Memory",
+      "intro": "Inspect what your agents have stored under <endpoint/>. Scoped to memories visible to your user / team (admins see all).",
+      "newMemory": "New memory",
+      "toasts": {
+        "created": "Created {{name}}",
+        "updated": "Updated {{name}}",
+        "deleted": "Deleted {{name}}",
+        "saveFailed": "Save failed: {{error}}",
+        "deleteFailed": "Delete failed: {{error}}",
+        "invalidMetadata": "Metadata must be valid JSON (or leave empty)."
+      },
+      "deleteModal": {
+        "title": "Delete memory",
+        "message": "This action cannot be undone.",
+        "infoTitle": "Memory",
+        "fields": {
+          "key": "Key",
+          "memoryId": "Memory ID",
+          "userId": "User ID",
+          "teamId": "Team ID"
+        }
+      }
+    },
+    "editModal": {
+      "createTitle": "Create memory",
+      "editTitle": "Edit {{name}}",
+      "labels": {
+        "key": "Key",
+        "value": "Value",
+        "metadata": "Metadata <muted>(optional JSON)</muted>"
+      },
+      "hints": {
+        "key": "Globally unique — two memories cannot share a key. Namespace your own keys if you need per-user isolation (e.g. user:123:notes).",
+        "value": "Markdown/text injected into LLM context. Plain strings are fine.",
+        "metadata": "Optional structured metadata — must be valid JSON if provided."
+      },
+      "placeholders": {
+        "key": "e.g. user_role",
+        "value": "What the agent should remember…"
+      },
+      "errors": {
+        "keyRequired": "Key is required",
+        "valueRequired": "Value is required"
+      },
+      "cancel": "Cancel",
+      "create": "Create",
+      "save": "Save"
+    },
+    "table": {
+      "empty": {
+        "titleSearch": "No matching memories",
+        "title": "No memories stored yet",
+        "descriptionSearch": "No memories match your search.",
+        "description": "Memories your agents store under /v1/memory will appear here."
+      },
+      "loading": "Loading memories…",
+      "searchPlaceholder": "Search by key prefix or memory ID…",
+      "actions": {
+        "open": "Open memory actions",
+        "view": "View",
+        "edit": "Edit",
+        "delete": "Delete"
+      },
+      "columns": {
+        "id": "ID",
+        "name": "Name",
+        "preview": "Preview",
+        "userId": "User ID",
+        "teamId": "Team ID",
+        "updated": "Updated",
+        "actions": "Actions"
+      }
+    },
+    "detailDrawer": {
+      "title": "Memory",
+      "memoryId": "Memory ID",
+      "userId": "User ID",
+      "teamId": "Team ID",
+      "value": "Value",
+      "metadata": "Metadata",
+      "created": "Created {{time}}",
+      "updated": "Updated {{time}}",
+      "by": " by {{name}}"
+    }
+  },
+  "skills": {
+    "panel": {
+      "title": "Skills",
+      "intro": "Register Claude Code skills. Published skills appear in the Skill Hub for all users and are served via <endpoint/>.",
+      "addButton": "+ Add Skill",
+      "deleteDialog": {
+        "title": "Delete Skill",
+        "confirm": "Are you sure you want to delete skill: <name/>?",
+        "irreversible": "This action cannot be undone.",
+        "cancel": "Cancel",
+        "delete": "Delete"
+      },
+      "toasts": {
+        "deleted": "Skill \"{{name}}\" deleted successfully",
+        "deleteFailed": "Failed to delete skill"
+      }
+    },
+    "table": {
+      "empty": {
+        "title": "No skills found",
+        "description": "Add one to get started."
+      },
+      "loading": "Loading skills…",
+      "uncategorized": "Uncategorized",
+      "noDescription": "No description",
+      "versionMissing": "N/A",
+      "publicYes": "Yes",
+      "publicNo": "No",
+      "actions": {
+        "open": "Open skill actions",
+        "copyId": "Copy skill ID",
+        "idCopied": "Skill ID copied",
+        "delete": "Delete"
+      },
+      "columns": {
+        "name": "Skill Name",
+        "version": "Version",
+        "description": "Description",
+        "category": "Category",
+        "public": "Public",
+        "createdAt": "Created At",
+        "actions": "Actions"
+      }
+    },
+    "addForm": {
+      "title": "Add New Skill",
+      "labels": {
+        "sourceUrl": "Source URL",
+        "subPath": "Subfolder path (Optional)",
+        "sha256": "Archive SHA-256 (Optional)",
+        "name": "Skill Name",
+        "domain": "Domain (Optional)",
+        "namespace": "Namespace (Optional)",
+        "description": "Description (Optional)",
+        "category": "Category (Optional)",
+        "keywords": "Keywords (Optional)",
+        "version": "Version (Optional)",
+        "authorName": "Author Name (Optional)",
+        "authorEmail": "Author Email (Optional)"
+      },
+      "hints": {
+        "sourceUrl": "Paste an HTTPS git repository URL from GitHub, GitLab, Bitbucket, or a self-hosted host (e.g. github.com/org/repo or github.com/org/repo/tree/main/my-skill), or an HTTPS link to a .zip archive of the skill hosted on S3 or any static file server. For a private repository use its SSH clone URL (git@ghe.example.com:org/repo.git) so Claude Code clones it with your own SSH key.",
+        "subPath": "Path within the repository where the skill lives (e.g., plugins/my-skill). Leave empty if the skill is at the repo root.",
+        "sha256": "Hex digest of the zip file. Claude Code refuses to install the archive if its checksum does not match.",
+        "name": "Unique identifier in kebab-case format (e.g., my-skill)",
+        "domain": "Top-level grouping in the Skill Hub (e.g., Productivity)",
+        "namespace": "Sub-grouping within domain (e.g., workflows)",
+        "description": "Brief description of what the skill does",
+        "category": "Select a category or enter a custom one",
+        "keywords": "Comma-separated list of keywords for search",
+        "version": "Semantic version (e.g., 1.0.0)",
+        "authorName": "Name of the skill author or organization",
+        "authorEmail": "Contact email for the skill author"
+      },
+      "placeholders": {
+        "sourceUrl": "https://github.com/org/repo or https://bucket.s3.amazonaws.com/my-skill.zip",
+        "sha256": "64 hex characters",
+        "domain": "Productivity",
+        "description": "A skill that helps with...",
+        "category": "Select or type a category",
+        "keywords": "search, web, api",
+        "authorName": "Your Name or Organization"
+      },
+      "subPathLock": {
+        "gitSubdir": "The URL already points to a subfolder, so this field is disabled",
+        "archive": "A zip archive is installed as a whole, so this field is disabled"
+      },
+      "detected": "Detected: {{source}}",
+      "noCategories": "No matching categories",
+      "cancel": "Cancel",
+      "adding": "Adding...",
+      "submit": "Add Skill",
+      "errors": {
+        "urlRequired": "Please enter a repository or zip archive URL",
+        "subPathInvalid": "Subfolder must be a relative path like plugins/my-skill (letters, numbers, dots, hyphens, underscores)",
+        "sha256Invalid": "SHA-256 must be a 64-character hex digest",
+        "nameRequired": "Please enter skill name",
+        "nameInvalid": "Name must be kebab-case (lowercase, numbers, hyphens only)",
+        "emailInvalid": "Please enter a valid email"
+      },
+      "toasts": {
+        "noToken": "No access token available",
+        "invalidUrl": "Please enter a valid repository or zip archive URL",
+        "invalidName": "Skill name must be kebab-case (lowercase letters, numbers, and hyphens only)",
+        "invalidVersion": "Version must be in semantic versioning format (e.g., 1.0.0)",
+        "invalidEmail": "Invalid email format",
+        "registered": "Skill registered successfully",
+        "registerFailed": "Failed to register skill"
+      }
+    }
+  },
+  "claudeCodePlugins": {
+    "sources": {
+      "githubRepo": "GitHub repo — {{repo}}",
+      "githubSubdir": "GitHub subdir — {{repo}} @ {{path}}",
+      "gitRepo": "{{kind}} repo — {{url}}",
+      "gitSubdir": "{{kind}} subdir — {{url}} @ {{path}}",
+      "zipArchive": "Zip archive — {{location}}",
+      "githubDisplay": "GitHub: {{repo}}",
+      "unknown": "Unknown source"
+    },
+    "skillDetail": {
+      "back": "Skills",
+      "tabs": {
+        "overview": "Overview",
+        "usage": "How to Use"
+      },
+      "properties": {
+        "category": "Category",
+        "domain": "Domain",
+        "namespace": "Namespace",
+        "version": "Version",
+        "author": "Author",
+        "added": "Added"
+      },
+      "overview": {
+        "title": "Skill Details",
+        "subtitle": "Metadata registered with this skill",
+        "propertyHeader": "Property",
+        "status": "Status",
+        "public": "Public",
+        "draft": "Draft",
+        "source": "Source",
+        "tags": "Tags",
+        "skillId": "Skill ID"
+      },
+      "runInClaudeCode": "Run in Claude Code",
+      "copy": "Copy",
+      "copied": "Copied",
+      "usage": {
+        "title": "Using this skill",
+        "intro": "Once your proxy is set as a marketplace, enable this skill in Claude Code with one command:",
+        "staleCatalog": "If you see \"Plugin {{name}} not found in marketplace\", update the catalog first:",
+        "notConfigured": "Don't have the marketplace configured yet?",
+        "seeSetup": "See one-time setup →"
+      },
+      "setup": {
+        "title": "One-time marketplace setup",
+        "removeFirst": "If you added this marketplace before without a key, remove it first in Claude Code. Removing it also uninstalls the plugins you installed from it, so install them again from /plugin after you add the snippet:",
+        "requiresKey": "This proxy requires a LiteLLM key to read the marketplace. Add this to <settings/> and replace <placeholder/> with your key:",
+        "runCommand": "Run this command in Claude Code to register the marketplace:",
+        "orSettings": "Or add this to <settings/> for a persistent configuration:"
+      }
+    },
+    "makePublic": {
+      "title": "Publish to Skill Hub",
+      "steps": {
+        "select": "Select Skills",
+        "confirm": "Confirm"
+      },
+      "step1": {
+        "title": "Select Skills to Publish",
+        "selectAll": "Select All ({{total}})",
+        "description": "Selected skills will be visible to all users in the Skill Hub. Deselected skills will be unpublished.",
+        "empty": "No skills registered yet.",
+        "public": "Public",
+        "selectedCount_one": "<strong>{{count}}</strong> skill will be published",
+        "selectedCount_other": "<strong>{{count}}</strong> skills will be published"
+      },
+      "step2": {
+        "title": "Confirm Publish to Skill Hub",
+        "note": "<strong>Note:</strong> Published skills will be visible to all users in the Skill Hub tab. Skills not in the list below will be unpublished.",
+        "listTitle": "Skills to be published:",
+        "total_one": "Total: <strong>{{count}}</strong> skill will be published",
+        "total_other": "Total: <strong>{{count}}</strong> skills will be published"
+      },
+      "buttons": {
+        "cancel": "Cancel",
+        "previous": "Previous",
+        "next": "Next",
+        "publish": "Publish to Hub"
+      },
+      "toasts": {
+        "selectAtLeastOne": "Please select at least one skill",
+        "published_one": "Skill Hub updated — {{count}} skill(s) published",
+        "published_other": "Skill Hub updated — {{count}} skill(s) published",
+        "publishFailed": "Failed to update skills. Please try again."
+      }
+    }
+  },
+  "modelSelector": {
+    "placeholder": "Select a Model",
+    "label": "Select Model",
+    "customOption": "Enter custom model",
+    "customPlaceholder": "Enter custom model name"
+  },
   "workflows": {
     "header": {
       "title": "Workflow Runs",
@@ -710,6 +2513,1845 @@
       }
     }
   },
+  "adminPanel": {
+    "page": {
+      "title": "Admin Access",
+      "subtitle": "Go to 'Internal Users' page to add other admins.",
+      "tabs": {
+        "ssoSettings": "SSO Settings",
+        "securitySettings": "Security Settings",
+        "uiSettings": "UI Settings",
+        "loggingSettings": "Logging Settings",
+        "plugins": "Plugins",
+        "webSearchInterception": "Web Search Interception"
+      },
+      "security": {
+        "title": "✨ Security Settings",
+        "deprecatedTitle": "SSO Configuration Deprecated",
+        "deprecatedDescription": "Editing SSO Settings on this page is deprecated and will be removed in a future version. Please use the SSO Settings tab for SSO configuration.",
+        "editSso": "Edit SSO Settings",
+        "addSso": "Add SSO",
+        "allowedIps": "Allowed IPs",
+        "uiAccessControl": "UI Access Control",
+        "loginWithoutSsoTitle": "Login without SSO",
+        "loginWithoutSso": "If you need to login without sso, you can access <url/>"
+      },
+      "allowedIps": {
+        "title": "Manage Allowed IP Addresses",
+        "columns": {
+          "ipAddress": "IP Address",
+          "action": "Action"
+        },
+        "allAllowed": "All IP Addresses Allowed",
+        "delete": "Delete",
+        "addIp": "Add IP Address",
+        "close": "Close"
+      },
+      "addIp": {
+        "title": "Add Allowed IP Address",
+        "placeholder": "Enter IP address",
+        "submit": "Add IP Address",
+        "required": "Please enter an IP address"
+      },
+      "deleteIp": {
+        "title": "Confirm Delete",
+        "message": "Are you sure you want to delete the IP address: <ip/>?",
+        "confirm": "Yes",
+        "close": "Close"
+      },
+      "uiAccessControlModal": {
+        "title": "UI Access Control Settings"
+      },
+      "toasts": {
+        "premiumRequired": "This feature is only available for premium users. Please upgrade your account.",
+        "uiAccessControlPremiumRequired": "Only premium users can configure UI access control",
+        "fetchIpsFailed": "Failed to fetch allowed IPs {{error}}",
+        "addIpSuccess": "IP address added successfully",
+        "addIpFailed": "Failed to add IP address {{error}}",
+        "deleteIpSuccess": "IP address deleted successfully",
+        "deleteIpFailed": "Failed to delete IP address {{error}}",
+        "uiAccessControlUpdated": "UI Access Control settings updated successfully"
+      }
+    },
+    "ssoSettings": {
+      "header": {
+        "title": "SSO Configuration",
+        "description": "Manage Single Sign-On authentication settings",
+        "loading": "Loading SSO configuration"
+      },
+      "actions": {
+        "edit": "Edit SSO Settings",
+        "delete": "Delete SSO Settings"
+      },
+      "details": {
+        "provider": "Provider",
+        "clientId": "Client ID",
+        "clientSecret": "Client Secret",
+        "proxyBaseUrl": "Proxy Base URL",
+        "tenant": "Tenant",
+        "authorizationEndpoint": "Authorization Endpoint",
+        "tokenEndpoint": "Token Endpoint",
+        "userInfoEndpoint": "User Info Endpoint",
+        "scopes": "Scopes",
+        "teamIdsJwtField": "Team IDs JWT Field",
+        "samlIdpMetadataUrl": "IdP Metadata URL",
+        "samlIdpMetadataXml": "IdP Metadata XML",
+        "samlSpEntityId": "SP Entity ID",
+        "samlAllowUnsolicited": "Allow IdP-initiated (unsolicited) responses",
+        "provided": "Provided",
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "notConfigured": "Not configured",
+        "copyValue": "Copy value",
+        "copied": "Copied to clipboard"
+      },
+      "redactableField": {
+        "notConfigured": "Not configured",
+        "showValue": "Show value",
+        "hideValue": "Hide value"
+      },
+      "emptyPlaceholder": {
+        "title": "No SSO Configuration Found",
+        "description": "Configure Single Sign-On (SSO) to enable seamless authentication for your team members using your identity provider.",
+        "configure": "Configure SSO"
+      },
+      "roleMappings": {
+        "title": "Role Mappings",
+        "groupClaim": "Group Claim",
+        "defaultRole": "Default Role",
+        "columns": {
+          "role": "Role",
+          "mappedGroups": "Mapped Groups"
+        },
+        "noGroups": "No groups mapped"
+      },
+      "roles": {
+        "internalUserViewer": "Internal Viewer",
+        "internalUser": "Internal User",
+        "proxyAdminViewer": "Proxy Admin Viewer",
+        "proxyAdmin": "Proxy Admin"
+      },
+      "providers": {
+        "google": "Google SSO",
+        "microsoft": "Microsoft SSO",
+        "okta": "Okta / Auth0 SSO",
+        "generic": "Generic SSO",
+        "saml": "SAML SSO",
+        "fallback": "{{name}} SSO"
+      },
+      "form": {
+        "fields": {
+          "ssoProvider": "SSO Provider",
+          "proxyAdminEmail": "Proxy Admin Email",
+          "proxyBaseUrl": "Proxy Base URL",
+          "useRoleMappings": "Use Role Mappings",
+          "useTeamMappings": "Use Team Mappings",
+          "groupClaim": "Group Claim",
+          "defaultRole": "Default Role",
+          "proxyAdminTeams": "Proxy Admin Teams",
+          "adminViewerTeams": "Admin Viewer Teams",
+          "internalUserTeams": "Internal User Teams",
+          "internalViewerTeams": "Internal Viewer Teams",
+          "teamIdsJwtField": "Team IDs JWT Field",
+          "googleClientId": "Google Client ID",
+          "googleClientSecret": "Google Client Secret",
+          "microsoftClientId": "Microsoft Client ID",
+          "microsoftClientSecret": "Microsoft Client Secret",
+          "microsoftTenant": "Microsoft Tenant",
+          "genericClientId": "Generic Client ID",
+          "genericClientSecret": "Generic Client Secret",
+          "authorizationEndpoint": "Authorization Endpoint",
+          "tokenEndpoint": "Token Endpoint",
+          "userinfoEndpoint": "Userinfo Endpoint",
+          "scopes": "Scopes",
+          "samlIdpMetadataUrl": "IdP Metadata URL",
+          "samlIdpMetadataXml": "IdP Metadata XML",
+          "samlSpEntityId": "SP Entity ID",
+          "samlAllowUnsolicited": "Allow IdP-initiated (unsolicited) responses"
+        },
+        "placeholders": {
+          "samlIdpMetadataUrl": "https://idp.example.com/metadata (use this or the metadata XML below)",
+          "samlIdpMetadataXml": "Paste the IdP metadata XML here if you do not have a metadata URL",
+          "samlSpEntityId": "Defaults to <proxy base url>/sso/saml/metadata"
+        },
+        "defaultRoles": {
+          "internalUserViewer": "Internal Viewer",
+          "internalUser": "Internal User",
+          "proxyAdminViewer": "Admin Viewer",
+          "proxyAdmin": "Proxy Admin"
+        },
+        "errors": {
+          "providerRequired": "Please select an SSO provider",
+          "userEmailRequired": "Please enter the email of the proxy admin",
+          "proxyBaseUrlRequired": "Please enter the proxy base url",
+          "groupClaimRequired": "Please enter the group claim",
+          "teamIdsJwtFieldRequired": "Please enter the team IDs JWT field",
+          "fieldRequired": "Please enter the {{field}}",
+          "urlScheme": "URL must start with http:// or https://",
+          "urlTrailingSlash": "URL must not end with a trailing slash"
+        }
+      },
+      "addModal": {
+        "title": "Add SSO",
+        "cancel": "Cancel",
+        "submit": "Add SSO",
+        "submitting": "Adding...",
+        "toasts": {
+          "success": "SSO settings added successfully",
+          "saveFailed": "Failed to save SSO settings: {{error}}"
+        }
+      },
+      "editModal": {
+        "title": "Edit SSO Settings",
+        "cancel": "Cancel",
+        "save": "Save",
+        "saving": "Saving...",
+        "toasts": {
+          "success": "SSO settings updated successfully",
+          "saveFailed": "Failed to save SSO settings: {{error}}",
+          "processFailed": "Failed to process SSO settings: {{error}}"
+        }
+      },
+      "deleteModal": {
+        "title": "Confirm Clear SSO Settings",
+        "alert": "This action cannot be undone.",
+        "message": "Are you sure you want to clear all SSO settings? Users will no longer be able to login using SSO after this change.",
+        "resourceTitle": "SSO Settings",
+        "provider": "Provider",
+        "providerFallback": "Generic",
+        "toasts": {
+          "success": "SSO settings cleared successfully",
+          "failed": "Failed to clear SSO settings: {{error}}"
+        }
+      }
+    },
+    "ssoModals": {
+      "titleEdit": "Edit SSO Settings",
+      "titleAdd": "Add SSO",
+      "useRoleMappings": "Use Role Mappings",
+      "clear": "Clear",
+      "save": "Save",
+      "clearConfirm": {
+        "title": "Confirm Clear SSO Settings",
+        "message": "Are you sure you want to clear all SSO settings? This action cannot be undone.",
+        "warning": "Users will no longer be able to login using SSO after this change.",
+        "cancel": "Cancel",
+        "confirm": "Yes, Clear"
+      },
+      "instructions": {
+        "title": "SSO Setup Instructions",
+        "intro": "Follow these steps to complete the SSO setup:",
+        "step1": "1. DO NOT Exit this TAB",
+        "step2": "2. Open a new tab, visit your proxy base url",
+        "step3": "3. Confirm your SSO is configured correctly and you can login on the new Tab",
+        "step4": "4. If Step 3 is successful, you can close this tab",
+        "done": "Done"
+      },
+      "toasts": {
+        "noAccessToken": "No access token available",
+        "saveFailed": "Failed to save SSO settings: {{error}}",
+        "clearSuccess": "SSO settings cleared successfully",
+        "clearFailed": "Failed to clear SSO settings"
+      }
+    },
+    "scim": {
+      "title": "SCIM Configuration",
+      "description": "System for Cross-domain Identity Management (SCIM) allows you to automatically provision and manage users and groups in LiteLLM.",
+      "tenantUrl": {
+        "title": "SCIM Tenant URL",
+        "description": "Use this URL in your identity provider SCIM integration settings.",
+        "copy": "Copy"
+      },
+      "token": {
+        "title": "Authentication Token",
+        "alertTitle": "Using SCIM",
+        "alertDescription": "You need a SCIM token to authenticate with the SCIM API. Create one below and use it in your SCIM provider configuration.",
+        "nameLabel": "Token Name",
+        "namePlaceholder": "SCIM Access Token",
+        "nameRequired": "Please enter a name for your token",
+        "create": "Create SCIM Token"
+      },
+      "created": {
+        "title": "Your SCIM Token",
+        "warning": "Make sure to copy this token now. You will not be able to see it again.",
+        "copy": "Copy",
+        "createAnother": "Create Another Token"
+      },
+      "toasts": {
+        "notLoggedIn": "You need to be logged in to create a SCIM token",
+        "created": "SCIM token created successfully",
+        "createFailed": "Failed to create SCIM token: {{error}}",
+        "urlCopied": "URL copied to clipboard",
+        "tokenCopied": "Token copied to clipboard"
+      }
+    },
+    "uiAccessControl": {
+      "description": "Configure who can access the UI interface and how group information is extracted from JWT tokens.",
+      "fields": {
+        "accessMode": "UI Access Mode",
+        "accessModeHint": "Controls who can access the UI interface",
+        "accessModePlaceholder": "Select access mode",
+        "restrictedGroup": "Restricted SSO Group",
+        "jwtField": "SSO Group JWT Field",
+        "jwtFieldHint": "JWT field name that contains team/group information. Use dot notation to access nested fields."
+      },
+      "modes": {
+        "allAuthenticatedUsers": "All Authenticated Users",
+        "restrictedSsoGroup": "Restricted SSO Group"
+      },
+      "errors": {
+        "restrictedGroupRequired": "Please enter the restricted SSO group"
+      },
+      "submit": "Update UI Access Control",
+      "toasts": {
+        "noAccessToken": "No access token available",
+        "saveFailed": "Failed to save UI access settings"
+      }
+    },
+    "uiSettings": {
+      "title": "UI Settings",
+      "loadingAriaLabel": "Loading UI settings",
+      "errors": {
+        "loadFailed": "Could not load UI settings",
+        "updateFailed": "Could not update UI settings"
+      },
+      "toasts": {
+        "updated": "UI settings updated successfully",
+        "updatedRefreshing": "UI settings updated successfully. Refreshing page...",
+        "pageVisibilityUpdated": "Page visibility settings updated successfully"
+      },
+      "usageRange": {
+        "label": "Default Usage time range",
+        "help": "The starting range for everyone opening Usage. Shared links and manual date selections take precedence. Calendar ranges use your browser’s timezone.",
+        "managedByConfig": "Managed by the deployment configuration."
+      },
+      "settings": {
+        "disableModelAdd": {
+          "label": "Disable model add for internal users"
+        },
+        "disableTeamAdminDelete": {
+          "label": "Disable team admin delete team user"
+        },
+        "requireAuthForPublicAIHub": {
+          "label": "Require authentication for public AI Hub"
+        },
+        "forwardClientHeaders": {
+          "label": "Forward client headers to LLM API",
+          "description": "Forwards client headers (Authorization, anthropic-beta, and x-* custom headers) to the upstream LLM. Enable for Claude Code with a Max subscription (forwards the OAuth token) or to pass custom/tracing headers through to the provider. Independent of the BYOK toggle — enable only the one(s) you need."
+        },
+        "forwardLLMProviderAuthHeaders": {
+          "label": "Forward LLM provider auth headers",
+          "description": "Forwards provider auth headers (x-api-key, x-goog-api-key, api-key, ocp-apim-subscription-key) to the upstream LLM, overriding any deployment-configured key for that request. Enable for Claude Code BYOK (clients bring their own API key). Independent of the client-headers toggle — enable only the one(s) you need."
+        },
+        "enableProjects": {
+          "ariaLabel": "Enable Projects UI",
+          "label": "[BETA] Enable Projects (page will refresh)",
+          "description": "If enabled, shows the Projects feature in the UI sidebar and the project field in key management."
+        },
+        "enableChat": {
+          "ariaLabel": "Enable Chat page",
+          "label": "Enable Chat page (page will refresh)",
+          "description": "If enabled, shows the Chat page in the UI sidebar, letting users chat with an LLM and connect their own MCP server credentials via OAuth."
+        },
+        "disableAgents": {
+          "label": "Disable agents for internal users"
+        },
+        "allowAgentsTeamAdmins": {
+          "label": "Allow agents for team admins"
+        },
+        "disableVectorStores": {
+          "label": "Disable vector stores for internal users"
+        },
+        "allowVectorStoresTeamAdmins": {
+          "label": "Allow vector stores for team admins"
+        },
+        "scopeUserSearch": {
+          "label": "Scope user search to organization",
+          "description": "If enabled, the user search endpoint restricts results by organization. When off, any authenticated user can search all users."
+        },
+        "disableCustomApiKeys": {
+          "label": "Disable custom Virtual key values",
+          "description": "If true, users cannot specify custom key values. All keys must be auto-generated."
+        }
+      },
+      "moyai": {
+        "connectedTo": "Connected to {{url}}",
+        "notConnected": "Not connected",
+        "disconnect": "Disconnect",
+        "connectLink": "Connect from the Moyai page"
+      }
+    },
+    "pageVisibility": {
+      "title": "Internal User Page Visibility",
+      "selectedCount_one": "{{count}} page selected",
+      "selectedCount_other": "{{count}} pages selected",
+      "notSet": "Not set (all pages visible)",
+      "defaultHint": "By default, all pages are visible to internal users. Select specific pages to restrict visibility.",
+      "adminOnlyNote": "Note: Only pages accessible to internal user roles are shown here. Admin-only pages are excluded as they cannot be made visible to internal users regardless of this setting.",
+      "configure": "Configure Page Visibility",
+      "save": "Save Page Visibility Settings",
+      "reset": "Reset to Default (All Pages)"
+    },
+    "teamAdminEditableFields": {
+      "title": "Team admin editable fields",
+      "enabledCount_one": "{{count}} field enabled",
+      "enabledCount_other": "{{count}} fields enabled",
+      "noneEnabled": "Team admins cannot edit team settings",
+      "defaultDescription": "Team settings fields a team admin may change on the teams they administer.",
+      "unsupported": "This proxy version does not support enabling any team settings fields for team admins yet.",
+      "raiseMaxBudgetHelp": {
+        "ariaLabel": "About raising the team's max budget",
+        "tooltip": "Lets team admins raise the budget too, capped by the organization's budget when the team has one. Only proxy admins can remove it."
+      },
+      "metadataHelp": {
+        "ariaLabel": "About editing team metadata",
+        "tooltip": "Lets team admins add, change and remove their own metadata keys. Keys the proxy reads as settings stay with proxy admins, and keys declared in the team metadata schema can be changed but not removed."
+      },
+      "learnMore": "Learn more",
+      "saving": "Saving...",
+      "save": "Save",
+      "toasts": {
+        "updated": "Team admin editable fields updated successfully"
+      }
+    },
+    "hashicorpVault": {
+      "description": "Manage secret manager configuration",
+      "loadingAriaLabel": "Loading Hashicorp Vault configuration",
+      "errors": {
+        "loadFailed": "Could not load Hashicorp Vault configuration"
+      },
+      "authMethodLabel": "Auth Method",
+      "authMethods": {
+        "tlsCertificate": "TLS Certificate",
+        "token": "Token",
+        "none": "None"
+      },
+      "notConfigured": "Not configured",
+      "actions": {
+        "testConnection": "Test Connection",
+        "testing": "Testing...",
+        "edit": "Edit Configuration",
+        "delete": "Delete Configuration",
+        "clearField": "Clear {{field}}"
+      },
+      "secretsInfo": {
+        "title": "Secrets must be stored with the field name \"key\"",
+        "docsLink": "View documentation"
+      },
+      "toasts": {
+        "connectionSuccess": "Connection to Vault successful!",
+        "deleted": "Hashicorp Vault configuration deleted",
+        "fieldCleared": "{{field}} cleared",
+        "updated": "Hashicorp Vault configuration updated successfully"
+      },
+      "deleteModal": {
+        "title": "Delete Hashicorp Vault Configuration?",
+        "message": "Models using Vault secrets will lose access to their API keys until a new configuration is saved.",
+        "resourceTitle": "Vault Configuration",
+        "vaultAddress": "Vault Address"
+      },
+      "clearModal": {
+        "title": "Clear {{field}}?",
+        "message": "This will remove the stored value.",
+        "resourceTitle": "Field",
+        "fieldLabel": "Field"
+      },
+      "fields": {
+        "vaultAddr": "Vault Address",
+        "vaultNamespace": "Namespace",
+        "vaultLoginNamespace": "Login Namespace",
+        "vaultSecretNamespace": "Secret Namespace",
+        "vaultMountName": "KV Mount Name",
+        "vaultPathPrefix": "Path Prefix",
+        "vaultToken": "Token",
+        "approleRoleId": "Role ID",
+        "approleSecretId": "Secret ID",
+        "approleMountPath": "Mount Path",
+        "clientCert": "Client Certificate",
+        "clientKey": "Client Key",
+        "vaultCertRole": "Certificate Role"
+      },
+      "emptyPlaceholder": {
+        "title": "No Vault Configuration Found",
+        "description": "Configure Hashicorp Vault to securely manage provider API keys and secrets for your LiteLLM deployment.",
+        "configure": "Configure Vault"
+      },
+      "editModal": {
+        "title": "Edit Hashicorp Vault Configuration",
+        "groups": {
+          "connection": {
+            "title": "Connection"
+          },
+          "token": {
+            "title": "Token Authentication",
+            "subtitle": "Use a Vault token to authenticate. Only one auth method is required."
+          },
+          "appRole": {
+            "title": "AppRole Authentication",
+            "subtitle": "Use AppRole credentials to authenticate. Only one auth method is required."
+          },
+          "tls": {
+            "title": "TLS",
+            "subtitle": "Optional client certificate for mTLS."
+          }
+        },
+        "keepExistingPlaceholder": "Leave blank to keep existing ({{value}})",
+        "errors": {
+          "invalidUrl": "Must start with http:// or https://"
+        },
+        "cancel": "Cancel",
+        "saving": "Saving...",
+        "save": "Save"
+      }
+    },
+    "cyberArk": {
+      "description": "Manage secret manager configuration",
+      "loadingAriaLabel": "Loading CyberArk configuration",
+      "errors": {
+        "loadFailed": "Could not load CyberArk configuration"
+      },
+      "authMethodLabel": "Auth Method",
+      "authMethods": {
+        "apiKey": "API Key",
+        "tlsCertificate": "TLS Certificate",
+        "none": "None"
+      },
+      "notConfigured": "Not configured",
+      "actions": {
+        "testConnection": "Test Connection",
+        "testing": "Testing...",
+        "edit": "Edit Configuration",
+        "delete": "Delete Configuration",
+        "clearField": "Clear {{field}}"
+      },
+      "hotReloadInfo": {
+        "title": "Configuration changes are hot-reloaded across all proxy instances",
+        "docsLink": "View documentation"
+      },
+      "toasts": {
+        "connectionSuccess": "Connection to CyberArk Conjur successful!",
+        "deleted": "CyberArk configuration deleted",
+        "fieldCleared": "{{field}} cleared",
+        "updated": "CyberArk configuration updated successfully"
+      },
+      "deleteModal": {
+        "title": "Delete CyberArk Configuration?",
+        "message": "Models using CyberArk secrets will lose access to their API keys until a new configuration is saved.",
+        "resourceTitle": "CyberArk Configuration",
+        "serverUrl": "Conjur Server URL"
+      },
+      "clearModal": {
+        "title": "Clear {{field}}?",
+        "message": "This will remove the stored value.",
+        "resourceTitle": "Field",
+        "fieldLabel": "Field"
+      },
+      "fields": {
+        "apiBase": "Conjur Server URL",
+        "account": "Account",
+        "username": "Username",
+        "apiKey": "API Key",
+        "clientCert": "Client Certificate",
+        "clientKey": "Client Key",
+        "sslVerify": "SSL Verification",
+        "refreshInterval": "Token Refresh Interval (seconds)"
+      },
+      "emptyPlaceholder": {
+        "title": "No CyberArk Configuration Found",
+        "description": "Configure CyberArk Conjur to securely manage provider API keys and secrets for your LiteLLM deployment.",
+        "configure": "Configure CyberArk"
+      },
+      "editModal": {
+        "title": "Edit CyberArk Configuration",
+        "groups": {
+          "connection": {
+            "title": "Connection"
+          },
+          "apiKey": {
+            "title": "API Key Authentication",
+            "subtitle": "Use a Conjur API key to authenticate. Only one auth method is required."
+          },
+          "certificate": {
+            "title": "Certificate Authentication",
+            "subtitle": "Use a client TLS certificate and key to authenticate. Only one auth method is required."
+          },
+          "advanced": {
+            "title": "Advanced",
+            "subtitle": "Optional TLS and token caching settings."
+          }
+        },
+        "keepExistingPlaceholder": "Leave blank to keep existing ({{value}})",
+        "errors": {
+          "invalidUrl": "Must start with http:// or https://"
+        },
+        "cancel": "Cancel",
+        "saving": "Saving...",
+        "save": "Save"
+      }
+    },
+    "pluginSettings": {
+      "title": "Plugins",
+      "description": "Register external services as plugins. Once added, users can toggle to the plugin from the mode switcher in the top-left of the sidebar.",
+      "manifestHint": "Each plugin must expose <code>{{endpoint}}</code> returning nav items and capabilities.",
+      "addPlugin": "Add Plugin",
+      "columns": {
+        "name": "Name",
+        "displayName": "Display Name",
+        "url": "URL",
+        "pluginKey": "Plugin Key",
+        "actions": "Actions"
+      },
+      "noData": "No data",
+      "editAriaLabel": "Edit {{name}}",
+      "deleteAriaLabel": "Delete {{name}}",
+      "modal": {
+        "addTitle": "Add Plugin",
+        "editTitle": "Edit Plugin",
+        "fields": {
+          "name": {
+            "label": "Name (identifier)",
+            "description": "Used in URLs and config. No spaces. E.g. litellm-platform-plugin"
+          },
+          "displayName": {
+            "label": "Display Name"
+          },
+          "url": {
+            "label": "URL",
+            "description": "Base URL of the plugin service"
+          },
+          "pluginKey": {
+            "label": "Plugin Key",
+            "description": "Optional. The plugin's own credential, injected as Authorization: Bearer <key> only when litellm reverse-proxies API calls to the plugin's backend (/plugin-proxy/<name>/*). Leave blank for plugins that use the forwarded litellm user token (e.g. iframe plugins) — that path uses the user's token, not this key.",
+            "keepCurrentPlaceholder": "Leave blank to keep current key",
+            "newPlaceholder": "sk-... (optional)",
+            "show": "Show plugin key",
+            "hide": "Hide plugin key"
+          }
+        },
+        "cancel": "Cancel",
+        "save": "Save"
+      },
+      "errors": {
+        "required": "Required",
+        "invalidUrl": "Must be a valid URL"
+      }
+    },
+    "loggingSettings": {
+      "title": "Logging Settings",
+      "description": "Proxy-wide settings that control how request and response data are written to spend logs.",
+      "fields": {
+        "storePrompts": {
+          "label": "Store Prompts in Spend Logs",
+          "hint": "When enabled, prompts will be stored in spend logs for tracking and analysis purposes."
+        },
+        "retentionPeriod": {
+          "label": "Maximum Spend Logs Retention Period (Optional)",
+          "placeholder": "e.g., 7d, 30d",
+          "hint": "Set the maximum retention period for spend logs (e.g., '7d' for 7 days, '30d' for 30 days). Leave empty for no limit."
+        },
+        "cleanupBatchSize": {
+          "label": "Spend Logs Cleanup Batch Size (Optional)",
+          "placeholder": "e.g., 1000",
+          "hint": "Rows deleted per DELETE statement during cleanup. Leave empty to use the default of 1000."
+        },
+        "cleanupMaxBatches": {
+          "label": "Spend Logs Cleanup Max Batches (Optional)",
+          "placeholder": "e.g., 500",
+          "hint": "Maximum number of DELETE statements run per table per cleanup run. Leave empty to use the default of 500."
+        },
+        "cleanupRunBudget": {
+          "label": "Spend Logs Cleanup Run Budget (Optional)",
+          "placeholder": "e.g., 5m",
+          "hint": "Wall-clock budget for a whole cleanup run, shared across every table it cleans (e.g., '5m'). Leave empty to use the default of 5m."
+        },
+        "cleanupBatchTimeout": {
+          "label": "Spend Logs Cleanup Batch Timeout (Optional)",
+          "placeholder": "e.g., 30s",
+          "hint": "Postgres statement and lock timeout applied to each cleanup batch, so cleanup never monopolizes a connection (e.g., '30s'). Leave empty to use the default of 30s."
+        }
+      },
+      "savingAriaLabel": "loading",
+      "saving": "Saving...",
+      "save": "Save Settings",
+      "toasts": {
+        "updated": "Spend logs settings updated successfully",
+        "saveFailed": "Failed to save spend logs settings: {{error}}",
+        "clearFailed": "Failed to clear saved value for: {{fields}}"
+      }
+    },
+    "webSearchInterception": {
+      "notLoggedIn": "Please log in to configure web search interception settings.",
+      "errors": {
+        "loadFailed": "Could not load web search interception settings",
+        "updateFailed": "Could not update settings"
+      },
+      "notApplied": {
+        "title": "Not running on the proxy that answered this page",
+        "description": "Interception is switched on for the cluster, but the proxy serving this page has not applied it. That is expected for about 10 seconds after a change or a restart. If it persists, check that proxy's logs: requests it handles are not being intercepted."
+      },
+      "info": {
+        "title": "Web Search Interception",
+        "description": "Serve web search tool calls from a configured search tool instead of passing them upstream, so models without native web search can still answer with fresh results. Click 'Save Settings' to apply changes across all pods (takes effect within 10 seconds)."
+      },
+      "fields": {
+        "enabled": {
+          "label": "Enable Web Search Interception",
+          "hint": "When enabled, web search tool calls are executed server-side through the selected search tool"
+        },
+        "providers": {
+          "label": "Providers",
+          "hint": "Which LLM providers to intercept for. Leave empty to intercept Bedrock only.",
+          "placeholder": "Select providers (defaults to Bedrock)"
+        },
+        "searchTool": {
+          "label": "Search Tool",
+          "hint": "Which configured search tool runs the searches. Leave empty to use the first one available.",
+          "placeholder": "Select a search tool (defaults to the first available)"
+        },
+        "maxAgenticLoops": {
+          "label": "Max Agentic Loops",
+          "hint": "How many follow-up model calls one intercepted request may chain. Leave empty for the default of 3."
+        }
+      },
+      "save": "Save Settings",
+      "toasts": {
+        "updated": "Settings updated successfully. Changes will be applied across all pods within 10 seconds."
+      }
+    },
+    "userBannerSettings": {
+      "title": "User Banner",
+      "description": "Publish an announcement to all dashboard users. Markdown is supported; the banner appears below the header on every page until you unpublish it. Users can dismiss it, and it reappears whenever the content changes.",
+      "publish": "Publish user banner",
+      "message": {
+        "label": "Message",
+        "placeholder": "**Scheduled maintenance** tonight at 10 PM UTC. See [status page](https://example.com).",
+        "missing": "Add a message before publishing."
+      },
+      "severity": {
+        "label": "Severity",
+        "ariaLabel": "Banner severity",
+        "placeholder": "Severity",
+        "options": {
+          "info": "Info",
+          "warning": "Warning",
+          "error": "Error"
+        }
+      },
+      "preview": "Preview",
+      "saving": "Saving...",
+      "save": "Save banner",
+      "toasts": {
+        "updated": "User banner updated successfully"
+      }
+    },
+    "backgroundChat": {
+      "toasts": {
+        "saved": "Background chat settings saved."
+      },
+      "errors": {
+        "loadFailed": "Could not load background chat settings."
+      },
+      "retry": "Retry",
+      "label": "Continue chats in the background",
+      "description": "Keep replies and tool runs going after users close the browser. Return to the same browser to see the result.",
+      "requiresRedis": "Requires Redis. <cachingLink>Configure it in Caching → Coordination Redis</cachingLink>, then restart the proxy.",
+      "managedByConfig": "Managed by your config file. Update its background polling setting to change this.",
+      "dbConfigRequired": "Enable database-backed configuration to save this setting.",
+      "autoApply": "Changes apply automatically when the proxy refreshes its configuration."
+    }
+  },
+  "caching": {
+    "dashboard": {
+      "tabs": {
+        "analytics": "Cache Analytics",
+        "health": "Cache Health",
+        "settings": "Cache Settings",
+        "coordination": "Coordination Redis"
+      },
+      "lastRefreshed": "Last Refreshed: ",
+      "refresh": "Refresh",
+      "description": "Analytics for LiteLLM's <cacheDocs>response cache</cacheDocs> (e.g. Redis / in-memory): requests answered from cache without calling the LLM provider. Provider-side <promptDocs>prompt caching</promptDocs> (cached input tokens from Anthropic, OpenAI, etc.) is not shown here; see \"Prompt Caching Metrics\" on the Usage page or individual requests in the Logs page.",
+      "filters": {
+        "virtualKeysPlaceholder": "Select Virtual Keys",
+        "noVirtualKeys": "No virtual keys found",
+        "modelsPlaceholder": "Select Models",
+        "noModels": "No models found"
+      },
+      "stats": {
+        "cacheHitRatio": "Cache Hit Ratio",
+        "cacheHits": "Cache Hits",
+        "cachedCompletionTokens": "Cached Completion Tokens"
+      },
+      "series": {
+        "apiRequests": "LLM API requests",
+        "cacheHits": "Cache hit",
+        "failed": "Failed requests",
+        "cachedCompletionTokens": "Cached Completion Tokens",
+        "generatedCompletionTokens": "Generated Completion Tokens"
+      },
+      "requestsChart": {
+        "title": "Cache Hits vs API Requests",
+        "hint": "Click a red failed-requests segment to see which error codes caused those failures.",
+        "unknownCallTypeNote": "Unknown groups spend logs that recorded no endpoint. Older proxy versions wrote those for requests rejected before routing, so they are not necessarily LLM API requests.",
+        "loadFailed": "Failed to load cache activity"
+      },
+      "tokensChart": {
+        "title": "Cached Completion Tokens vs Generated Completion Tokens"
+      },
+      "healthCheck": {
+        "running": "Running cache health check...",
+        "unknownError": "Unknown error occurred"
+      }
+    },
+    "errorDrilldown": {
+      "title": "Failed requests by error code: ",
+      "close": "Close error breakdown",
+      "hint": "Hover a bar to see the error classes behind that code.",
+      "tooltipTitle": "Error code {{code}}: {{total}} failed"
+    },
+    "responseTime": "{{value}}ms",
+    "health": {
+      "runButton": "Run Health Check",
+      "running": "Running Health Check...",
+      "tabs": {
+        "summary": "Summary",
+        "raw": "Raw Response"
+      },
+      "cacheStatus": "Cache Status: ",
+      "notAvailable": "N/A",
+      "unknownError": "Unknown error",
+      "noTraceback": "No traceback available",
+      "parseFailed": "Error parsing details",
+      "errorDetails": "Error Details",
+      "errorMessage": "Error Message",
+      "traceback": "Traceback",
+      "cacheDetails": "Cache Details",
+      "cacheConfiguration": "Cache Configuration",
+      "pingResponse": "Ping Response",
+      "setCacheResponse": "Set Cache Response",
+      "redisDetails": "Redis Details",
+      "redisHost": "Redis Host",
+      "redisPort": "Redis Port",
+      "redisVersion": "Redis Version",
+      "startupNodes": "Startup Nodes",
+      "namespace": "Namespace",
+      "formatFailed": "Error formatting JSON: {{message}}"
+    },
+    "settings": {
+      "title": "Cache Settings",
+      "subtitle": "Configure Redis cache for LiteLLM",
+      "sections": {
+        "connection": "Connection Settings",
+        "cluster": "Cluster Configuration",
+        "sentinel": "Sentinel Configuration",
+        "semantic": "Semantic Configuration",
+        "ssl": "SSL Settings",
+        "cacheManagement": "Cache Management",
+        "gcp": "GCP Authentication"
+      },
+      "advanced": "Advanced Settings",
+      "testConnection": "Test Connection",
+      "testing": "Testing...",
+      "saveChanges": "Save Changes",
+      "saving": "Saving...",
+      "toasts": {
+        "loadFailed": "Failed to load cache settings",
+        "testSucceeded": "Cache connection test successful!",
+        "testFailed": "Connection test failed: {{error}}",
+        "unknownError": "Unknown error",
+        "saved": "Cache settings updated successfully",
+        "saveFailed": "Failed to update cache settings"
+      },
+      "redisType": {
+        "label": "Redis Type",
+        "fallbackDescription": "Select the type of Redis deployment you're using",
+        "options": {
+          "node": "Node (Single Instance)",
+          "cluster": "Cluster",
+          "sentinel": "Sentinel",
+          "semantic": "Semantic"
+        },
+        "descriptions": {
+          "node": "Standard Redis node/single instance",
+          "cluster": "Redis Cluster mode for high availability and horizontal scaling",
+          "sentinel": "Redis Sentinel mode for high availability with automatic failover",
+          "semantic": "Semantic caching that reuses responses for similar prompts"
+        }
+      },
+      "field": {
+        "secretAlreadySet": "Already set. Enter a new value to replace it.",
+        "selectPlaceholder": "Select an option",
+        "modelSearchPlaceholder": "Search and select a model...",
+        "noModels": "No models found"
+      },
+      "validation": {
+        "port": "Port must be an integer between 1 and 65535",
+        "jsonArrayInvalid": "Must be a valid JSON array (use double quotes)",
+        "jsonArrayRequired": "Must be a JSON array",
+        "nonNegativeInteger": "Must be a non-negative integer",
+        "number": "Must be a number"
+      },
+      "fields": {
+        "url": {
+          "label": "Redis URL",
+          "helpText": "Full Redis/Valkey connection URL (e.g. redis://:password@host:6379/1). When set, it takes precedence over Host, Port, Password, and Database Index."
+        },
+        "host": {
+          "label": "Host",
+          "helpText": "Redis server hostname or IP address"
+        },
+        "port": {
+          "label": "Port",
+          "helpText": "Redis server port number"
+        },
+        "db": {
+          "label": "Database Index",
+          "helpText": "Logical database index to isolate the cache (e.g. 1 for redis://host:6379/1)"
+        },
+        "password": {
+          "label": "Password",
+          "helpText": "Redis server password"
+        },
+        "username": {
+          "label": "Username",
+          "helpText": "Redis server username (if required)"
+        },
+        "redisStartupNodes": {
+          "label": "Startup Nodes",
+          "helpText": "List of startup nodes for Redis Cluster (e.g., [{\"host\": \"127.0.0.1\", \"port\": \"7001\"}])"
+        },
+        "sentinelNodes": {
+          "label": "Sentinel Nodes",
+          "helpText": "List of Sentinel nodes (e.g., [[\"localhost\", 26379]])"
+        },
+        "serviceName": {
+          "label": "Service Name",
+          "helpText": "Master service name for Redis Sentinel"
+        },
+        "sentinelPassword": {
+          "label": "Sentinel Password",
+          "helpText": "Password for Redis Sentinel authentication"
+        },
+        "similarityThreshold": {
+          "label": "Similarity Threshold",
+          "helpText": "Similarity threshold for semantic cache"
+        },
+        "embeddingModel": {
+          "label": "Embedding Model",
+          "helpText": "Embedding model for semantic cache"
+        },
+        "semanticCacheScope": {
+          "label": "Semantic Cache Scope",
+          "helpText": "Who can share a semantic cache hit. Key shares hits between all end users of a key/team/org. End user also isolates per end user; requests without an end user fall back to the key scope."
+        },
+        "ssl": {
+          "label": "SSL",
+          "helpText": "Enable SSL/TLS connection"
+        },
+        "sslCertReqs": {
+          "label": "SSL Cert Reqs",
+          "helpText": "SSL certificate requirements (None, CERT_REQUIRED, CERT_OPTIONAL)"
+        },
+        "sslCheckHostname": {
+          "label": "SSL Check Hostname",
+          "helpText": "Enable SSL hostname verification"
+        },
+        "namespace": {
+          "label": "Namespace",
+          "helpText": "Namespace prefix for cache keys"
+        },
+        "ttl": {
+          "label": "TTL (seconds)",
+          "helpText": "Time-to-live for cached items in seconds"
+        },
+        "maxConnections": {
+          "label": "Max Connections",
+          "helpText": "Maximum number of connections in the connection pool"
+        },
+        "gcpServiceAccount": {
+          "label": "GCP Service Account",
+          "helpText": "GCP service account for IAM authentication (e.g., projects/-/serviceAccounts/your-sa@project.iam.gserviceaccount.com)"
+        },
+        "gcpSslCaCerts": {
+          "label": "GCP SSL CA Certs",
+          "helpText": "Path to SSL CA certificate file for GCP Memorystore Redis"
+        }
+      },
+      "scopeOptions": {
+        "key": "Key (shared by all end users of the key/team/org)",
+        "endUser": "End user (isolated per end user)"
+      }
+    },
+    "coordinationRedis": {
+      "title": "Coordination Redis",
+      "description": "Redis used to coordinate work across proxy pods: cross-pod rate limits, spend tracking, and the pod lock manager. It is configured independently of the response cache.",
+      "restartNote": "Saved changes take effect on proxy restart.",
+      "sections": {
+        "connection": "Connection Settings",
+        "cluster": "Cluster Configuration",
+        "sentinel": "Sentinel Configuration",
+        "ssl": "SSL Settings"
+      },
+      "testConnection": "Test Connection",
+      "testing": "Testing...",
+      "saveChanges": "Save Changes",
+      "saving": "Saving...",
+      "toasts": {
+        "loadFailed": "Failed to load coordination Redis settings",
+        "testSucceeded": "Coordination Redis connection test successful!",
+        "testFailed": "Connection test failed: {{error}}",
+        "unknownError": "Unknown error",
+        "saved": "Coordination Redis settings saved. Restart the proxy to apply them.",
+        "saveFailed": "Failed to update coordination Redis settings"
+      },
+      "redisType": {
+        "label": "Redis Type",
+        "options": {
+          "node": "Node (Single Instance)",
+          "cluster": "Cluster",
+          "sentinel": "Sentinel"
+        },
+        "descriptions": {
+          "node": "Standard Redis node/single instance",
+          "cluster": "Redis Cluster mode for high availability and horizontal scaling",
+          "sentinel": "Redis Sentinel mode for high availability with automatic failover"
+        }
+      },
+      "field": {
+        "secretAlreadySet": "Already set. Enter a new value to replace it."
+      },
+      "validation": {
+        "port": "Port must be an integer between 1 and 65535",
+        "jsonArrayInvalid": "Must be a valid JSON array (use double quotes)",
+        "jsonArrayRequired": "Must be a JSON array"
+      },
+      "fields": {
+        "url": {
+          "label": "Redis URL",
+          "helpText": "Full Redis/Valkey connection URL (e.g. redis://:password@host:6379/1). When set, it takes precedence over Host, Port, Username, and Password."
+        },
+        "host": {
+          "label": "Host",
+          "helpText": "Redis server hostname or IP address"
+        },
+        "port": {
+          "label": "Port",
+          "helpText": "Redis server port number"
+        },
+        "username": {
+          "label": "Username",
+          "helpText": "Redis server username (if required)"
+        },
+        "password": {
+          "label": "Password",
+          "helpText": "Redis server password"
+        },
+        "startupNodes": {
+          "label": "Startup Nodes",
+          "helpText": "List of startup nodes for Redis Cluster (e.g., [{\"host\": \"127.0.0.1\", \"port\": 7001}])"
+        },
+        "sentinelNodes": {
+          "label": "Sentinel Nodes",
+          "helpText": "List of Sentinel nodes (e.g., [[\"localhost\", 26379]])"
+        },
+        "serviceName": {
+          "label": "Service Name",
+          "helpText": "Master service name for Redis Sentinel"
+        },
+        "sentinelPassword": {
+          "label": "Sentinel Password",
+          "helpText": "Password for Redis Sentinel authentication"
+        },
+        "ssl": {
+          "label": "SSL",
+          "helpText": "Enable SSL/TLS connection"
+        }
+      },
+      "source": {
+        "coordinationRedis": {
+          "label": "Configured here",
+          "tooltip": "general_settings.coordination_redis is set, so coordination uses its own Redis connection."
+        },
+        "cacheBackend": {
+          "label": "Borrowed from response cache",
+          "tooltip": "No coordination Redis is configured; the proxy reuses the response cache's Redis connection."
+        },
+        "environment": {
+          "label": "From REDIS_* environment",
+          "tooltip": "No coordination Redis is configured; the proxy falls back to the REDIS_* environment variables."
+        },
+        "notConfigured": {
+          "label": "Not configured",
+          "tooltip": "Cross-pod rate limits, spend tracking, and the pod lock manager have no Redis to coordinate through."
+        }
+      }
+    }
+  },
+  "accessGroups": {
+    "page": {
+      "title": "Access Groups",
+      "description": "Manage resource permissions for your organization",
+      "create": "Create Access Group",
+      "searchPlaceholder": "Search groups by name, ID, or description...",
+      "clearSearch": "Clear search",
+      "deleteModal": {
+        "title": "Delete Access Group",
+        "message": "Are you sure you want to delete this access group? This action cannot be undone.",
+        "informationTitle": "Access Group Information",
+        "id": "ID",
+        "name": "Name",
+        "description": "Description"
+      }
+    },
+    "table": {
+      "loading": "Loading access groups…",
+      "empty": {
+        "title": "No access groups yet",
+        "description": "Create an access group to manage resource permissions for your organization.",
+        "filteredTitle": "No matching access groups",
+        "filteredDescription": "Try a different search term."
+      },
+      "columns": {
+        "id": "ID",
+        "name": "Name",
+        "resources": "Resources",
+        "created": "Created",
+        "updated": "Updated",
+        "actions": "Actions"
+      },
+      "resources": {
+        "models": "{{count}} Models",
+        "mcpServers": "{{count}} MCP Servers",
+        "agents": "{{count}} Agents",
+        "skills": "{{count}} Skills"
+      },
+      "rowActions": {
+        "open": "Open access group actions",
+        "delete": "Delete access group"
+      }
+    },
+    "detail": {
+      "back": "Back",
+      "notFound": "Access group not found",
+      "idLabel": "ID: ",
+      "copyId": "Copy access group ID",
+      "edit": "Edit Access Group",
+      "groupDetails": "Group Details",
+      "description": "Description",
+      "created": "Created",
+      "lastUpdated": "Last Updated",
+      "by": "by",
+      "attachedKeys": "Attached Keys",
+      "attachedTeams": "Attached Teams",
+      "showLess": "Show Less",
+      "viewAll": "View All ({{count}})",
+      "noKeys": "No keys attached",
+      "noTeams": "No teams attached",
+      "tabs": {
+        "models": "Models",
+        "mcpServers": "MCP Servers",
+        "agents": "Agents",
+        "skills": "Skills"
+      },
+      "empty": {
+        "models": "No models assigned to this group",
+        "mcpServers": "No MCP servers assigned to this group",
+        "agents": "No agents assigned to this group",
+        "skills": "No skills assigned to this group"
+      },
+      "toolPermissions": {
+        "label": "MCP tool permissions",
+        "allTools": "All tools",
+        "noTools": "No tools"
+      }
+    },
+    "form": {
+      "tabs": {
+        "general": "General Info",
+        "models": "Models",
+        "mcpServers": "MCP Servers",
+        "agents": "Agents",
+        "skills": "Skills"
+      },
+      "name": {
+        "label": "Group Name",
+        "placeholder": "e.g. Engineering Team",
+        "required": "Please enter the access group name"
+      },
+      "description": {
+        "label": "Description",
+        "placeholder": "Describe the purpose of this access group..."
+      },
+      "models": {
+        "label": "Allowed Models"
+      },
+      "mcpServers": {
+        "label": "Allowed MCP Servers",
+        "placeholder": "Select MCP servers"
+      },
+      "agents": {
+        "label": "Allowed Agents",
+        "placeholder": "Select agents"
+      },
+      "skills": {
+        "label": "Allowed Skills",
+        "description": "Enabled skills are visible to everyone. Grant disabled (private) Claude Code plugins to the teams and keys in this group here.",
+        "placeholder": "Select skills (optional)"
+      }
+    },
+    "create": {
+      "title": "Create Access Group",
+      "cancel": "Cancel",
+      "submit": "Create Group",
+      "submitting": "Creating...",
+      "success": "Access group created successfully",
+      "failed": "Failed to create access group"
+    },
+    "edit": {
+      "title": "Edit Access Group",
+      "cancel": "Cancel",
+      "save": "Save Changes",
+      "success": "Access group updated successfully"
+    }
+  },
+  "skillSelector": {
+    "placeholder": "Select skills (optional)",
+    "clearAll": "Clear all skills",
+    "loading": "Loading skills…",
+    "empty": "No skills found",
+    "privateOptionLabel": "{{skill}} (private)",
+    "privateBadge": "private"
+  },
+  "loggingAndAlerts": {
+    "page": {
+      "tabs": {
+        "loggingCallbacks": "Logging Callbacks",
+        "cloudZero": "CloudZero Cost Tracking",
+        "alertingTypes": "Alerting Types",
+        "alertingSettings": "Alerting Settings",
+        "emailAlerts": "Email Alerts",
+        "msTeamsAlerts": "MS Teams Alerts"
+      }
+    },
+    "alertTypes": {
+      "intro": "Alerts are sent to any Slack-compatible incoming webhook URL (Slack, Rocket.Chat, Mattermost, etc.). Get Slack webhook urls from <docs>here</docs>",
+      "columns": {
+        "webhookUrl": "Webhook URL (Slack-compatible)"
+      },
+      "labels": {
+        "llmExceptions": "LLM Exceptions",
+        "llmTooSlow": "LLM Responses Too Slow",
+        "llmRequestsHanging": "LLM Requests Hanging",
+        "budgetAlerts": "Budget Alerts (API Keys, Users)",
+        "userSpendThresholds": "User Spend Thresholds (Daily/Monthly)",
+        "userSpendAnomalies": "User Spend Anomaly Detection",
+        "dbExceptions": "Database Exceptions (Read/Write)",
+        "dailyReports": "Weekly/Monthly Spend Reports",
+        "outageAlerts": "Outage Alerts",
+        "regionOutageAlerts": "Region Outage Alerts",
+        "modelDeprecationWarnings": "Model Deprecation Warnings"
+      },
+      "enterpriseFeature": "✨ Enterprise Feature",
+      "saveChanges": "Save Changes",
+      "testAlerts": "Test Alerts",
+      "toasts": {
+        "saved": "Alerts updated successfully",
+        "testTriggered": "Alert test triggered. Test request to slack made - check logs/alerts on slack to verify"
+      }
+    },
+    "loggingCallbacks": {
+      "table": {
+        "title": "Active Logging Callbacks",
+        "add": "Add Callback",
+        "loading": "Loading callbacks…",
+        "empty": {
+          "title": "No callbacks configured",
+          "description": "Add your first callback to start logging data to external services."
+        },
+        "columns": {
+          "name": "Callback Name",
+          "mode": "Mode",
+          "actions": "Actions"
+        },
+        "modes": {
+          "success": "Success",
+          "failure": "Failure",
+          "successAndFailure": "Success & Failure"
+        },
+        "readOnly": "Read only",
+        "readOnlyHint": "Active callback that was not added through the dashboard. Edit it where it was configured.",
+        "actions": {
+          "open": "Open callback actions",
+          "test": "Test",
+          "edit": "Edit",
+          "delete": "Delete"
+        }
+      },
+      "selector": {
+        "label": "Callback",
+        "placeholder": "Choose a logging callback...",
+        "noResults": "No results",
+        "required": "Please select a callback"
+      },
+      "params": {
+        "required": "Please enter the {{field}}",
+        "selectPlaceholder": "Select {{field}}",
+        "inputPlaceholder": "Enter your {{field}}",
+        "numberPlaceholder": "Enter {{field}}"
+      },
+      "addDialog": {
+        "title": "Add Logging Callback",
+        "docsLink": "LiteLLM Docs: Logging",
+        "cancel": "Cancel",
+        "submit": "Add Callback",
+        "submitting": "Adding..."
+      },
+      "editDialog": {
+        "title": "Edit Callback Settings",
+        "cancel": "Cancel",
+        "submit": "Save Changes",
+        "submitting": "Saving..."
+      },
+      "deleteDialog": {
+        "title": "Delete Callback",
+        "message": "Are you sure you want to delete this callback? This action cannot be undone.",
+        "infoTitle": "Callback Information",
+        "callbackName": "Callback Name",
+        "mode": "Mode"
+      },
+      "toasts": {
+        "configsLoadFailed": "Failed to load callback configs: {{error}}",
+        "added": "Callback {{name}} added successfully",
+        "updated": "Callback updated successfully",
+        "deleted": "Callback {{name}} deleted successfully",
+        "healthCheckTriggered": "Health check triggered"
+      }
+    },
+    "emailSettings": {
+      "title": "Email Server Settings",
+      "docsLink": "LiteLLM Docs: email alerts",
+      "required": " Required * ",
+      "help": {
+        "smtpHost": "Enter the SMTP host address, e.g. `smtp.resend.com`",
+        "smtpPort": "Enter the SMTP port number, e.g. `587`",
+        "smtpUsername": "Enter the SMTP username, e.g. `username`",
+        "smtpSenderEmail": "Enter the sender email address, e.g. `sender@berri.ai`",
+        "testEmailAddress": "Email Address to send `Test Email Alert` to. example: `info@berri.ai`",
+        "emailLogoUrl": "(Optional) Customize the Logo that appears in the email, pass a url to your logo",
+        "emailSupportContact": "(Optional) Customize the support email address that appears in the email. Default is support@berri.ai"
+      },
+      "showCredential": "Show credential",
+      "hideCredential": "Hide credential",
+      "saveChanges": "Save Changes",
+      "testEmailAlerts": "Test Email Alerts",
+      "toasts": {
+        "saved": "Email settings updated successfully",
+        "testTriggered": "Email test triggered. Check your configured email inbox/logs."
+      }
+    },
+    "emailEvents": {
+      "title": "Email Notifications",
+      "description": "Select which events should trigger email notifications.",
+      "descriptions": {
+        "virtualKeyCreated": "An email will be sent to the user when a new virtual key is created with their user ID",
+        "newUserInvitation": "An email will be sent to the email address of the user when a new user is created",
+        "generic": "Receive an email notification when {{event}}"
+      },
+      "saveChanges": "Save Changes",
+      "resetToDefaults": "Reset to Defaults",
+      "toasts": {
+        "saved": "Email event settings updated successfully",
+        "reset": "Email event settings reset to defaults"
+      }
+    },
+    "msTeams": {
+      "title": "Microsoft Teams Alerting Settings",
+      "intro": "Send LiteLLM alerts to a Microsoft Teams channel via an incoming webhook. Create one from <docs>Microsoft Docs: incoming webhooks</docs>",
+      "required": " Required * ",
+      "help": {
+        "webhookUrl": "Incoming webhook URL for your Teams channel (Workflows or incoming webhook connector)"
+      },
+      "showCredential": "Show credential",
+      "hideCredential": "Hide credential",
+      "saveChanges": "Save Changes",
+      "testAlerts": "Test MS Teams Alerts",
+      "toasts": {
+        "saved": "MS Teams settings updated successfully",
+        "testTriggered": "MS Teams test alert triggered. Check your Teams channel."
+      }
+    },
+    "alerting": {
+      "enterpriseFeature": "✨ Enterprise Feature",
+      "storage": {
+        "inDb": "In DB",
+        "inConfig": "In Config",
+        "notSet": "Not Set"
+      },
+      "resetField": "Reset {{field}}",
+      "submit": "Update Settings",
+      "toasts": {
+        "saved": "Wait 10s for proxy to update."
+      }
+    },
+    "cloudZero": {
+      "page": {
+        "loading": "Loading CloudZero settings...",
+        "loadErrorPrefix": "Error loading CloudZero settings: "
+      },
+      "emptyPlaceholder": {
+        "title": "No CloudZero Integration Found",
+        "description": "Connect your CloudZero account to start tracking and analyzing your cloud costs directly from LiteLLM.",
+        "add": "Add CloudZero Integration"
+      },
+      "form": {
+        "apiKey": "CloudZero API Key",
+        "apiKeyPlaceholder": "Enter your CloudZero API key",
+        "apiKeyRequired": "Please enter your CloudZero API key",
+        "connectionId": "Connection ID",
+        "connectionIdPlaceholder": "Enter your CloudZero connection ID",
+        "connectionIdRequired": "Please enter your CloudZero connection ID",
+        "timezone": "Timezone",
+        "timezoneHint": "Timezone for date handling (defaults to UTC if not provided)",
+        "showApiKey": "Show API key",
+        "hideApiKey": "Hide API key"
+      },
+      "createModal": {
+        "title": "Create CloudZero Integration",
+        "cancel": "Cancel",
+        "submit": "Create",
+        "submitting": "Creating...",
+        "toasts": {
+          "created": "CloudZero integration created successfully",
+          "createFailed": "Failed to create CloudZero integration"
+        }
+      },
+      "updateModal": {
+        "title": "Edit CloudZero Integration",
+        "apiKeyHint": "Leave empty to keep the existing API key",
+        "apiKeyPlaceholder": "Leave empty to keep existing",
+        "cancel": "Cancel",
+        "submit": "Update",
+        "submitting": "Updating...",
+        "toasts": {
+          "updated": "CloudZero integration updated successfully",
+          "updateFailed": "Failed to update CloudZero integration"
+        }
+      },
+      "settings": {
+        "title": "CloudZero Configuration",
+        "statusFallback": "Active",
+        "edit": "Edit",
+        "delete": "Delete",
+        "fields": {
+          "apiKey": "API Key (Redacted)",
+          "connectionId": "Connection ID",
+          "timezone": "Timezone"
+        },
+        "notConfigured": "Not configured",
+        "defaultTimezone": "Default (UTC)",
+        "actions": "Actions",
+        "dryRun": "Run Dry Run Simulation",
+        "exportNow": "Export Data Now",
+        "dryRunResults": "Dry Run Results",
+        "simulationOutputPrefix": "Simulation output for connection: ",
+        "exportDialog": {
+          "title": "Export Data to CloudZero",
+          "description": "This will push the current accumulated cost data to CloudZero. Continue?",
+          "cancel": "Cancel",
+          "confirm": "Export"
+        },
+        "deleteDialog": {
+          "title": "Delete CloudZero Integration?",
+          "message": "Are you sure you want to delete this CloudZero integration? All associated settings and configurations will be permanently removed.",
+          "infoTitle": "Integration Details",
+          "connectionId": "Connection ID",
+          "timezone": "Timezone"
+        },
+        "toasts": {
+          "dryRunSucceeded": "Dry run completed successfully",
+          "dryRunFailed": "Failed to perform dry run",
+          "exported": "Data successfully exported to CloudZero",
+          "exportFailed": "Failed to export data",
+          "deleted": "CloudZero integration deleted successfully",
+          "deleteFailed": "Failed to delete CloudZero integration"
+        }
+      }
+    }
+  },
+  "tagManagement": {
+    "page": {
+      "title": "Tag Management",
+      "lastRefreshedPrefix": "Last Refreshed: ",
+      "refresh": "Refresh tags",
+      "intro": "Click on a tag name to view and edit its details.",
+      "routingHelp": "You can use tags to restrict the usage of certain LLMs based on tags passed in the request. Read more about tag routing <docs>here</docs>.",
+      "create": "+ Create New Tag",
+      "deleteDialog": {
+        "title": "Delete Tag",
+        "message": "Are you sure you want to delete this tag? This action cannot be undone.",
+        "infoTitle": "Tag Information",
+        "tagName": "Tag Name"
+      },
+      "toasts": {
+        "fetchTagsFailed": "Error fetching tags: {{error}}",
+        "fetchModelsFailed": "Error fetching models: {{error}}",
+        "created": "Tag created successfully",
+        "createFailed": "Error creating tag: {{error}}",
+        "deleted": "Tag deleted successfully",
+        "deleteFailed": "Error deleting tag: {{error}}"
+      }
+    },
+    "table": {
+      "loading": "Loading tags…",
+      "empty": {
+        "title": "No tags yet",
+        "description": "Create a tag to start routing and restricting model usage."
+      },
+      "noMatch": {
+        "title": "No matching tags",
+        "description": "Try a different tag name or description."
+      },
+      "filters": {
+        "name": "Filter by tag name",
+        "namePlaceholder": "Filter by tag name…",
+        "description": "Filter by description",
+        "descriptionPlaceholder": "Filter by description…"
+      },
+      "columns": {
+        "name": "Tag Name",
+        "description": "Description",
+        "models": "Allowed Models",
+        "created": "Created",
+        "actions": "Actions"
+      },
+      "dynamicTagHint": "You cannot view the information of a dynamically generated spend tag",
+      "allModels": "All Models",
+      "modelId": "ID: {{id}}",
+      "actions": {
+        "open": "Open tag actions",
+        "edit": "Edit",
+        "delete": "Delete",
+        "editDisabled": "Dynamically generated spend tags cannot be edited",
+        "deleteDisabled": "Dynamically generated spend tags cannot be deleted"
+      }
+    },
+    "createModal": {
+      "title": "Create New Tag",
+      "fields": {
+        "name": "Tag Name",
+        "description": "Description",
+        "models": "Allowed Models",
+        "modelsHint": "Select which models are allowed to process requests from this tag",
+        "modelsPlaceholder": "Select Models",
+        "maxBudget": "Max Budget (USD)",
+        "maxBudgetHint": "Maximum amount in USD this tag can spend. When reached, requests with this tag will be blocked",
+        "resetBudget": "Reset Budget",
+        "resetBudgetHint": "How often the budget should reset. For example, setting 'daily' will reset the budget every 24 hours"
+      },
+      "budgetSection": "Budget & Rate Limits (Optional)",
+      "rateLimitsNotice": "TPM/RPM limits for tags are not currently supported. If you need this feature, please <issue>create a GitHub issue</issue>.",
+      "submit": "Create Tag",
+      "validation": {
+        "nameRequired": "Please input a tag name"
+      }
+    },
+    "info": {
+      "loading": "Loading...",
+      "back": "← Back to Tags",
+      "tagNameLabel": "Tag Name:",
+      "noDescription": "No description",
+      "editTag": "Edit Tag",
+      "details": {
+        "title": "Tag Details",
+        "name": "Name",
+        "description": "Description",
+        "models": "Allowed Models",
+        "allModels": "All Models",
+        "modelId": "ID: {{id}}",
+        "created": "Created",
+        "lastUpdated": "Last Updated"
+      },
+      "budget": {
+        "title": "Budget & Rate Limits",
+        "maxBudget": "Max Budget",
+        "duration": "Budget Duration",
+        "tpmLimit": "TPM Limit",
+        "rpmLimit": "RPM Limit"
+      },
+      "toasts": {
+        "fetchFailed": "Error fetching tag details: {{error}}",
+        "updated": "Tag updated successfully",
+        "updateFailed": "Error updating tag: {{error}}"
+      }
+    },
+    "editForm": {
+      "fields": {
+        "name": "Tag Name",
+        "description": "Description",
+        "models": "Allowed Models",
+        "modelsDescription": "Select which models are allowed to process this type of data",
+        "modelsPlaceholder": "Select Models",
+        "maxBudget": "Max Budget (USD)",
+        "maxBudgetDescription": "Maximum amount in USD this tag can spend",
+        "resetBudget": "Reset Budget",
+        "resetBudgetDescription": "How often the budget should reset"
+      },
+      "budgetSection": "Budget & Rate Limits",
+      "rateLimitsNotice": "TPM/RPM limits for tags are not currently supported. If you need this feature, please <issue>create a GitHub issue</issue>.",
+      "cancel": "Cancel",
+      "save": "Save Changes",
+      "validation": {
+        "nameRequired": "Please input a tag name",
+        "budgetNonnegative": "Enter a nonnegative budget"
+      }
+    }
+  },
+  "routerSettings": {
+    "generalSettings": {
+      "tabs": {
+        "loadbalancing": "Loadbalancing",
+        "routingGroups": "Routing Groups",
+        "fallbacks": "Fallbacks",
+        "promptCaching": "Prompt Caching",
+        "general": "General"
+      },
+      "columns": {
+        "setting": "Setting",
+        "value": "Value",
+        "status": "Status",
+        "action": "Action"
+      },
+      "status": {
+        "inDb": "In DB",
+        "inConfig": "In Config",
+        "notSet": "Not Set"
+      },
+      "update": "Update",
+      "listPlaceholder": "Comma-separated values",
+      "selectDefault": "Default"
+    },
+    "promptCaching": {
+      "title": "Prompt Caching",
+      "anthropicCaching": "Automatic Anthropic prompt caching",
+      "cacheLifetime": "Cache lifetime (TTL)",
+      "ttlDefault": "5m (default)",
+      "systemMessagesFirst": "System messages first for OpenAI"
+    },
+    "requestTagMappings": {
+      "priorityHint": "Exact value mappings take priority over any-value rules for the same key.",
+      "modes": {
+        "exact": "Exact value",
+        "any": "Any value"
+      },
+      "problems": {
+        "keyRequired": "Enter a baggage key",
+        "keyInvalid": "Use only letters, digits, and !#$%&'*+-.^_`|~ in the baggage key",
+        "valueRequired": "Enter a match value",
+        "tagRequired": "Enter a tag",
+        "tagPrefixRequired": "Enter a tag prefix",
+        "duplicate": "Another mapping already matches this key and value"
+      },
+      "mappingLabel": "Mapping {{number}}",
+      "modeAriaLabel": "Mapping {{number}} mode",
+      "deleteAriaLabel": "Delete mapping {{number}}",
+      "baggageKey": "Baggage key",
+      "baggageKeyAriaLabel": "Mapping {{number}} baggage key",
+      "matchValue": "Match value",
+      "matchValueAriaLabel": "Mapping {{number}} match value",
+      "tag": "Tag",
+      "tagAriaLabel": "Mapping {{number}} tag",
+      "tagPrefix": "Tag prefix",
+      "tagPrefixAriaLabel": "Mapping {{number}} tag prefix",
+      "previewValue": "value",
+      "previewTag": "tag",
+      "required": "Require a mapped value",
+      "requiredAriaLabel": "Mapping {{number}} required",
+      "requireBudget": "Require an existing tag budget",
+      "requireBudgetAriaLabel": "Mapping {{number}} require budget",
+      "configManaged": "Managed in config.yaml. Edit the YAML to change these rules.",
+      "addMapping": "Add mapping"
+    },
+    "fallbacks": {
+      "empty": "No fallbacks configured. Add fallbacks to automatically try another model when the primary fails.",
+      "columns": {
+        "modelName": "Model Name",
+        "fallbacks": "Fallbacks",
+        "actions": "Actions"
+      },
+      "actions": {
+        "test": "Test fallback",
+        "edit": "Edit fallback",
+        "delete": "Delete fallback"
+      },
+      "deleteModal": {
+        "title": "Delete Fallback?",
+        "message": "Are you sure you want to delete this fallback? This action cannot be undone.",
+        "informationTitle": "Fallback Information",
+        "modelName": "Model Name"
+      },
+      "toasts": {
+        "updated": "Router settings updated successfully",
+        "updateFailed": "Failed to update router settings: {{error}}",
+        "testing": "Testing fallback model response...",
+        "testResult": "Test model=<model/>, received model=<received/>. See <docs>curl</docs>",
+        "testFailed": "Error occurred while generating model response. Please try again. Error: {{error}}"
+      }
+    },
+    "addFallbacks": {
+      "addButton": "Add Fallbacks",
+      "cancel": "Cancel",
+      "saving": "Saving Configuration...",
+      "saveAll": "Save All Configurations",
+      "toasts": {
+        "incomplete_one": "Please complete configuration for all groups. {{count}} group(s) incomplete.",
+        "incomplete_other": "Please complete configuration for all groups. {{count}} group(s) incomplete.",
+        "added_one": "{{count}} fallback configuration(s) added successfully!",
+        "added_other": "{{count}} fallback configuration(s) added successfully!",
+        "noOnChange": "onChange callback not provided"
+      }
+    },
+    "addFallbacksModal": {
+      "title": "Configure Model Fallbacks",
+      "description": "Manage multiple fallback chains for different models (up to 5 groups at a time)"
+    },
+    "editFallbacks": {
+      "cancel": "Cancel",
+      "saving": "Saving Changes...",
+      "save": "Save Changes",
+      "toasts": {
+        "updated": "Fallbacks for {{model}} updated successfully!"
+      }
+    },
+    "fallbackSelectionForm": {
+      "atLeastOneGroup": "At least one group is required",
+      "groupLabel": "Group {{number}}",
+      "removeGroup": "Remove {{group}}",
+      "empty": "No fallback groups configured",
+      "createFirstGroup": "Create First Group",
+      "addGroup": "Add fallback group"
+    },
+    "fallbackGroupConfig": {
+      "primaryModel": "Primary Model",
+      "primaryPlaceholder": "Select primary model",
+      "noModelsFound": "No models found",
+      "selectPrimaryHint": "Select a model to begin configuring fallbacks",
+      "ifFails": "IF FAILS, TRY...",
+      "fallbackChain": "Fallback Chain",
+      "maxAtATime": "(Max {{max}} fallbacks at a time)",
+      "addPlaceholder": "Select fallback models to add...",
+      "maxReached": "Maximum {{max}} fallbacks reached",
+      "searchHint": "Search and select multiple models. Selected models will appear below in order. ({{used}}/{{max}} used)",
+      "maxReachedHint": "Maximum {{max}} fallbacks reached. Remove some to add more.",
+      "noFallbacksSelected": "No fallback models selected",
+      "addFromDropdown": "Add models from the dropdown above",
+      "chainAriaLabel": "Fallback chain",
+      "removeModel": "Remove {{model}}"
+    }
+  },
+  "routingGroups": {
+    "strategies": {
+      "simpleShuffle": "Simple Shuffle",
+      "leastBusy": "Least Busy",
+      "usageBased": "Usage Based",
+      "latencyBased": "Latency Based",
+      "priority": "Priority"
+    },
+    "page": {
+      "searchPlaceholder": "Search groups...",
+      "clearSearch": "Clear search",
+      "refresh": "Refresh",
+      "createGroup": "Create Group",
+      "showingResults_one": "Showing {{count}} result",
+      "showingResults_other": "Showing {{count}} results",
+      "toasts": {
+        "created": "Created routing group \"{{name}}\"",
+        "updated": "Updated routing group \"{{name}}\"",
+        "saveFailed": "Failed to save routing group",
+        "deleted": "Deleted routing group \"{{name}}\"",
+        "deleteFailed": "Failed to delete routing group"
+      },
+      "deleteDialog": {
+        "title": "Delete routing group?",
+        "priorityBody": "Calls to <group/> will stop working. Direct requests to its member models keep their existing routing behavior. This cannot be undone.",
+        "strategyBody": "Models in <group/> will fall back to the proxy's top-level routing strategy. This cannot be undone.",
+        "cancel": "Cancel",
+        "delete": "Delete"
+      }
+    },
+    "table": {
+      "columns": {
+        "groupName": "Group Name",
+        "models": "Models",
+        "strategy": "Strategy",
+        "actions": "Actions"
+      },
+      "rowActions": {
+        "openFor": "Open actions for {{name}}",
+        "edit": "Edit",
+        "delete": "Delete"
+      },
+      "loading": "Loading routing groups…",
+      "emptyTitle": "No routing groups yet",
+      "emptyDescription": "Create a group to load-balance a set of models behind one name."
+    },
+    "usagePanel": {
+      "title": "How routing works for this group",
+      "priorityExplanation": "Request <group/> to try eligible models in priority order. Direct requests to a member model keep their existing routing behavior.",
+      "strategyExplanation": "Callers request any model in the group by name; LiteLLM picks a deployment behind the scenes using the <strategy/> strategy."
+    },
+    "modal": {
+      "createTitle": "Create Routing Group",
+      "editTitle": "Edit {{name}}",
+      "validation": {
+        "nameRequired": "Group name is required",
+        "nameTooLong": "Must be {{max}} characters or fewer",
+        "nameTaken": "A group with this name already exists",
+        "modelsRequired": "Select at least one model",
+        "strategyRequired": "Strategy is required"
+      },
+      "groupName": "Group Name",
+      "groupNameDescription": "Use this name as the model in API calls. LiteLLM routes the request to one of the group's models.",
+      "models": "Models",
+      "modelsPriorityDescription": "Models from your model list that this group routes between. Models can belong to multiple priority groups.",
+      "modelsDescription": "Models from your model list that this group routes between. A model can belong to one non-priority group.",
+      "modelsPlaceholder": "Select models",
+      "noModelsFound": "No models found",
+      "routingStrategy": "Routing Strategy",
+      "priorityStrategyDescription": "Lower priorities are tried first. Models with the same priority share traffic. Applies only when calling this group.",
+      "strategyPlaceholder": "Select strategy",
+      "modelPriorities": "Model Priorities",
+      "modelPrioritiesDescription": "Use 1 for your first choice, 2 for your next choice, and so on. Unavailable models are skipped.",
+      "modelPrioritiesAriaLabel": "Model priorities",
+      "selectModelsForPriorities": "Select models to set priorities",
+      "modelNotSelected": "Model is not selected",
+      "priorityFor": "Priority for {{model}}",
+      "removePriorityFor": "Remove priority for {{model}}",
+      "remove": "Remove",
+      "strategyArgs": "Strategy Arguments (JSON)",
+      "latencyArgsExample": "Example: { \"ttl\": 3600, \"lowest_latency_buffer\": 0 }",
+      "defaultArgsExample": "Example: { \"ttl\": 60 }",
+      "priorityFootnote": "Direct requests to a member model keep their existing routing behavior.",
+      "strategyFootnote": "Models outside non-priority groups use the proxy's top-level routing strategy.",
+      "cancel": "Cancel",
+      "createGroup": "Create Group",
+      "saveChanges": "Save Changes"
+    },
+    "payload": {
+      "prioritiesMismatch": "Set a priority for each selected model and remove unused priorities",
+      "prioritiesInvalid": "Priorities must be whole numbers from 1 to 9007199254740991",
+      "invalidJson": "Must be valid JSON"
+    },
+    "modelOwnership": {
+      "claimedBy": "{{model}} (in \"{{group}}\")",
+      "conflict": "Each model may belong to at most one non-priority group. Already claimed: {{detail}}"
+    }
+  },
+  "metadataKeyValueFields": {
+    "keyPlaceholder": "Key",
+    "valuePlaceholder": "Value",
+    "removePair": "Remove key-value pair",
+    "addPair": "Add Key-Value Pair"
+  },
   "toolPolicies": {
     "view": {
       "adminOnly": {
@@ -817,6 +4459,1323 @@
       }
     }
   },
+  "guardrails": {
+    "garden": {
+      "searchPlaceholder": "Search guardrails",
+      "litellmHeading": "LiteLLM Content Filter",
+      "showLess": "Show less",
+      "showAll": "Show all ({{total}})",
+      "litellmDescription": "Built-in guardrails powered by LiteLLM. Zero latency, no external dependencies, no additional cost.",
+      "decisionModelHeading": "Decision Model",
+      "decisionModelDescription": "Ask a decision model yes/no questions about each request or response, and block or log when a score reaches its threshold.",
+      "partnerHeading": "Partner Guardrails",
+      "partnerDescription": "Third-party guardrail integrations from leading AI security providers."
+    },
+    "gardenCard": {
+      "testCases": "test cases"
+    },
+    "gardenDetail": {
+      "categories": {
+        "litellm": {
+          "provider": "LiteLLM Content Filter",
+          "type": "Content Filter"
+        },
+        "decisionModel": {
+          "provider": "Decision Model",
+          "type": "Decision Model"
+        },
+        "partner": {
+          "provider": "Partner Guardrail",
+          "type": "Partner"
+        }
+      },
+      "detailRows": {
+        "provider": "Provider",
+        "subcategory": "Subcategory",
+        "cost": "Cost",
+        "externalDependencies": "External Dependencies",
+        "latency": "Latency"
+      },
+      "detailValues": {
+        "decisionModelCost": "Billed per call by the decision model provider",
+        "litellmCost": "$0 / request",
+        "noExternalDependencies": "None"
+      },
+      "evalMetrics": {
+        "precision": "Precision",
+        "recall": "Recall",
+        "f1Score": "F1 Score",
+        "testCases": "Test Cases",
+        "falsePositives": "False Positives",
+        "falseNegatives": "False Negatives",
+        "latencyP50": "Latency (p50)"
+      },
+      "tabs": {
+        "overview": "Overview",
+        "evalResults": "Eval Results"
+      },
+      "createGuardrail": "Create Guardrail",
+      "overviewHeading": "Overview",
+      "detailsHeading": "Guardrail Details",
+      "detailsSubtitle": "Details are as follows",
+      "propertyColumn": "Property",
+      "guardrailIdLabel": "Guardrail ID",
+      "typeLabel": "Type",
+      "tagsLabel": "Tags",
+      "evalResultsHeading": "Eval Results",
+      "metricColumn": "Metric",
+      "valueColumn": "Value"
+    },
+    "gardenCatalog": {
+      "contentFilter": {
+        "deniedFinancial": {
+          "name": "Denied Financial Advice",
+          "description": "Detects requests for personalized financial advice, investment recommendations, or financial planning."
+        },
+        "deniedInsults": {
+          "name": "Insults & Personal Attacks",
+          "description": "Detects insults, name-calling, and personal attacks directed at the chatbot, staff, or other people."
+        },
+        "deniedLegal": {
+          "name": "Denied Legal Advice",
+          "description": "Detects requests for unauthorized legal advice, case analysis, or legal recommendations."
+        },
+        "deniedMedical": {
+          "name": "Denied Medical Advice",
+          "description": "Detects requests for medical diagnosis, treatment recommendations, or health advice."
+        },
+        "harmfulViolence": {
+          "name": "Harmful Violence",
+          "description": "Detects content related to violence, criminal planning, attacks, and violent threats."
+        },
+        "harmfulSelfHarm": {
+          "name": "Harmful Self-Harm",
+          "description": "Detects content related to self-harm, suicide, and dangerous self-destructive behavior."
+        },
+        "harmfulChildSafety": {
+          "name": "Harmful Child Safety",
+          "description": "Detects content that could endanger child safety or exploit minors."
+        },
+        "harmfulIllegalWeapons": {
+          "name": "Harmful Illegal Weapons",
+          "description": "Detects content related to illegal weapons manufacturing, distribution, or acquisition."
+        },
+        "biasGender": {
+          "name": "Bias: Gender",
+          "description": "Detects gender-based discrimination, stereotypes, and biased language."
+        },
+        "biasRacial": {
+          "name": "Bias: Racial",
+          "description": "Detects racial discrimination, stereotypes, and racially biased content."
+        },
+        "biasReligious": {
+          "name": "Bias: Religious",
+          "description": "Detects religious discrimination, intolerance, and religiously biased content."
+        },
+        "biasSexualOrientation": {
+          "name": "Bias: Sexual Orientation",
+          "description": "Detects discrimination based on sexual orientation and related biased content."
+        },
+        "promptInjectionJailbreak": {
+          "name": "Prompt Injection: Jailbreak",
+          "description": "Detects jailbreak attempts designed to bypass AI safety guidelines and restrictions."
+        },
+        "promptInjectionDataExfil": {
+          "name": "Prompt Injection: Data Exfiltration",
+          "description": "Detects attempts to extract sensitive data through prompt manipulation."
+        },
+        "promptInjectionSql": {
+          "name": "Prompt Injection: SQL",
+          "description": "Detects SQL injection attempts embedded in prompts."
+        },
+        "promptInjectionMaliciousCode": {
+          "name": "Prompt Injection: Malicious Code",
+          "description": "Detects attempts to inject malicious code through prompts."
+        },
+        "promptInjectionSystemPrompt": {
+          "name": "Prompt Injection: System Prompt",
+          "description": "Detects attempts to extract or override system prompts."
+        },
+        "toxicAbuse": {
+          "name": "Toxic & Abusive Language",
+          "description": "Detects toxic, abusive, and hateful language across multiple languages (EN, AU, DE, ES, FR)."
+        },
+        "patterns": {
+          "name": "Pattern Matching",
+          "description": "Detect and block sensitive data patterns like SSNs, credit card numbers, API keys, and custom regex patterns."
+        },
+        "keywords": {
+          "name": "Keyword Blocking",
+          "description": "Block or mask content containing specific keywords or phrases. Upload custom word lists or add individual terms."
+        },
+        "blockCodeExecution": {
+          "name": "Block Code Execution",
+          "description": "Detects markdown fenced code blocks in requests and responses. Block or mask executable code (e.g. Python, JavaScript, Bash) by language with configurable confidence."
+        },
+        "competitorIntent": {
+          "name": "Competitor Name Blocking",
+          "description": "Block or reframe competitor comparison and ranking intent. Detect when users ask to compare or recommend competitors (airline or generic competitor lists)."
+        }
+      },
+      "decisionModel": {
+        "typesafeJev": {
+          "description": "TypeSafe's Jev decision model answers your yes/no questions about each request, such as prompt injection or policy checks."
+        },
+        "perplexity": {
+          "name": "Perplexity Decision",
+          "description": "Perplexity's pplx-decider model answers your yes/no questions about each request or response."
+        },
+        "microsoft": {
+          "name": "Microsoft Decision Model",
+          "description": "Microsoft Foundry decision models, such as Microsoft-Decision-1, answer your yes/no questions about each request or response."
+        },
+        "openai": {
+          "name": "OpenAI Decision Model",
+          "description": "OpenAI decision models, such as gpt-6-luna, answer your yes/no questions about each request or response."
+        },
+        "databricks": {
+          "name": "Databricks Decision Model",
+          "description": "Decision models served on Databricks, such as OpenJev, answer your yes/no questions about each request or response."
+        }
+      },
+      "partner": {
+        "presidio": {
+          "description": "Microsoft Presidio for PII detection and anonymization. Supports 30+ entity types with configurable actions."
+        },
+        "bedrock": {
+          "description": "AWS Bedrock Guardrails for content filtering, topic avoidance, and sensitive information detection."
+        },
+        "lakera": {
+          "description": "AI security platform protecting against prompt injections, data leakage, and harmful content."
+        },
+        "openaiModeration": {
+          "description": "OpenAI's content moderation API for detecting harmful content across multiple categories."
+        },
+        "googleModelArmor": {
+          "description": "Google Cloud's model protection service for safe and responsible AI deployments."
+        },
+        "guardrailsAi": {
+          "description": "Open-source framework for adding structural, type, and quality guarantees to LLM outputs."
+        },
+        "zscaler": {
+          "description": "Enterprise AI security from Zscaler for monitoring and protecting AI/ML workloads."
+        },
+        "panw": {
+          "description": "Palo Alto Networks Prisma AI Runtime Security for securing AI applications in production."
+        },
+        "ciscoAiDefense": {
+          "description": "Cisco AI Defense Inspection API for runtime protection: prompt injection, PII/PCI/PHI, harassment, hate speech, profanity, violence, and code detection."
+        },
+        "noma": {
+          "description": "AI security platform for detecting and preventing AI-specific threats and vulnerabilities."
+        },
+        "aporia": {
+          "description": "Real-time AI guardrails for hallucination detection, topic control, and policy enforcement."
+        },
+        "aim": {
+          "description": "AIM Security guardrails for comprehensive AI threat detection and mitigation."
+        },
+        "catoNetworks": {
+          "description": "Cato Networks guardrails for comprehensive AI threat detection and mitigation."
+        },
+        "promptSecurity": {
+          "description": "Protect against prompt injection attacks, data leakage, and other LLM security threats."
+        },
+        "lasso": {
+          "description": "Content moderation and safety guardrails for responsible AI deployments."
+        },
+        "pangea": {
+          "description": "Pangea's AI guardrails for secure, compliant, and trustworthy AI applications."
+        },
+        "enkryptai": {
+          "description": "AI security and governance platform for enterprise AI safety and compliance."
+        },
+        "javelin": {
+          "description": "AI gateway with built-in guardrails for secure and compliant AI operations."
+        },
+        "pillar": {
+          "description": "AI safety platform for monitoring, testing, and securing AI systems."
+        },
+        "akto": {
+          "description": "AI security platform from Akto.io with automatic monitoring and guardrails for AI/ML applications."
+        },
+        "promptguard": {
+          "description": "AI security gateway with prompt injection detection, PII redaction, topic filtering, entity blocklists, and hallucination detection. Self-hostable with drop-in proxy integration."
+        },
+        "xecguard": {
+          "description": "CyCraft XecGuard AI security gateway. Multi-policy scanning (prompt injection, harmful content, PII, system-prompt enforcement) plus RAG context grounding."
+        },
+        "deepkeep": {
+          "description": "DeepKeep AI Firewall for comprehensive LLM security — prompt injection detection, PII protection, content moderation, and policy enforcement with configurable guardrail pipelines."
+        },
+        "repelloai": {
+          "description": "RepelloAI Argus scans prompts and responses against policies configured per asset in the Repello dashboard."
+        },
+        "straiker": {
+          "description": "Defend AI Agentic Guardrails: Indirect/Direct Prompt Injection, Tool Misuse, Malicious MCP and Skills"
+        },
+        "alice": {
+          "description": "Policy-based guardrails for prompts and model responses, evaluated per application so one proxy can enforce a different policy set per team or product."
+        },
+        "agent365": {
+          "description": "Microsoft Agent 365 tool-call governance: Defender threat evaluation and observability for MCP tool calls, acting on behalf of the signed-in user"
+        },
+        "llmShieldProxy": {
+          "description": "Self-hosted PII redaction that puts the original values back into the model's response, so the provider never receives personal data while the end user still sees it."
+        },
+        "conduct": {
+          "description": "Conduct Guard evaluates prompts against workspace rules before the model call: prompt injection, PII, and custom policies, with block, warning, and approval verdicts."
+        },
+        "wingback": {
+          "description": "Wingback runtime security for LiteLLM — PII detection, prompt injection, toxic content, and policy enforcement via the Wingback connectors service."
+        },
+        "airia": {
+          "description": "Airia AI security and governance platform. Runtime guardrails for prompt injection, data leakage prevention, and responsible AI, enforced on every prompt and response."
+        }
+      },
+      "subcategories": {
+        "contentCategory": "Content Category",
+        "patterns": "Patterns",
+        "keywords": "Keywords",
+        "codeSafety": "Code Safety"
+      },
+      "tags": {
+        "contentCategory": "Content Category",
+        "topicBlocker": "Topic Blocker",
+        "safety": "Safety",
+        "bias": "Bias",
+        "promptInjection": "Prompt Injection",
+        "toxicity": "Toxicity",
+        "pii": "PII",
+        "regex": "Regex",
+        "dataProtection": "Data Protection",
+        "keywords": "Keywords",
+        "blocklist": "Blocklist",
+        "code": "Code",
+        "competitor": "Competitor",
+        "decisionModel": "Decision Model",
+        "contentSafety": "Content Safety",
+        "security": "Security",
+        "contentModeration": "Content Moderation",
+        "openSource": "Open Source",
+        "validation": "Validation",
+        "enterprise": "Enterprise",
+        "threatDetection": "Threat Detection",
+        "hallucination": "Hallucination",
+        "policy": "Policy",
+        "compliance": "Compliance",
+        "governance": "Governance",
+        "gateway": "Gateway",
+        "monitoring": "Monitoring",
+        "grounding": "Grounding",
+        "rag": "RAG",
+        "firewall": "Firewall",
+        "agentic": "Agentic",
+        "toolMisuse": "Tool Misuse",
+        "skills": "Skills",
+        "observability": "Observability",
+        "dataPrivacy": "Data Privacy",
+        "streaming": "Streaming",
+        "runtime": "Runtime",
+        "secrets": "Secrets",
+        "redaction": "Redaction"
+      }
+    },
+    "panel": {
+      "tabs": {
+        "garden": "Guardrail Garden",
+        "guardrails": "Guardrails",
+        "playground": "Test Playground",
+        "submitted": "Submitted Guardrails"
+      },
+      "addMenu": {
+        "trigger": "Add New Guardrail",
+        "provider": "Add Provider Guardrail",
+        "customCode": "Create Custom Code Guardrail"
+      }
+    },
+    "table": {
+      "loading": "Loading guardrails…",
+      "empty": {
+        "title": "No guardrails yet",
+        "description": "Add a guardrail to start filtering requests and responses."
+      },
+      "columns": {
+        "guardrailId": "Guardrail ID",
+        "name": "Name",
+        "provider": "Provider",
+        "mode": "Mode",
+        "defaultOn": "Default On",
+        "createdAt": "Created At",
+        "updatedAt": "Updated At",
+        "actions": "Actions"
+      },
+      "defaultOnStatus": {
+        "on": "Default On",
+        "off": "Default Off"
+      },
+      "actions": {
+        "open": "Open guardrail actions",
+        "delete": "Delete"
+      },
+      "configDeleteHint": "Config guardrails are defined in the config file and cannot be deleted from the dashboard.",
+      "unnamed": "Unnamed Guardrail"
+    },
+    "deleteModal": {
+      "title": "Delete Guardrail",
+      "danglingReferenceWarning": "Keys, teams, and policies that list this guardrail will silently stop running it. Policy pipeline steps that use it will block every request with a 400 error, unless the step's on_error is next or allow (or its on_fail, when on_error is not set).",
+      "message": "Are you sure you want to delete guardrail: {{name}}? This action cannot be undone.",
+      "infoTitle": "Guardrail Information",
+      "info": {
+        "name": "Name",
+        "id": "ID",
+        "provider": "Provider",
+        "mode": "Mode",
+        "defaultOn": "Default On",
+        "yes": "Yes",
+        "no": "No"
+      },
+      "toast": {
+        "deleted": "Guardrail \"{{name}}\" deleted successfully",
+        "deleteFailed": "Failed to delete guardrail"
+      }
+    },
+    "settingsActions": {
+      "editCode": "Edit Code",
+      "editSettings": "Edit Settings",
+      "delete": "Delete"
+    },
+    "testPanel": {
+      "title": "Test Guardrails:",
+      "subtitle_zero": "Test <noun>guardrail</noun> and compare results",
+      "subtitle_one": "Test <noun>guardrail</noun> and compare results",
+      "subtitle_other": "Test <noun>guardrails</noun> and compare results",
+      "inputLabel": "Input Text",
+      "inputTooltip": "Press Enter to submit. Use Shift+Enter for new line.",
+      "copyInput": "Copy Input",
+      "inputPlaceholder": "Enter text to test with guardrails...",
+      "keyboardHint": "Press <kbd>Enter</kbd> to submit • <kbd>Shift+Enter</kbd> for new line",
+      "characters": "Characters: <length/>",
+      "metadataLabel": "Metadata (optional)",
+      "metadataTooltip": "JSON object forwarded to the guardrail as request_data['metadata']. Custom guardrails can read per-request configuration from it.",
+      "errors": {
+        "metadataNotObject": "Metadata must be a JSON object",
+        "invalidJson": "Invalid JSON"
+      },
+      "toast": {
+        "emptyText": "Please enter text to test",
+        "metadataError": "Metadata: {{error}}",
+        "copied": "Input copied to clipboard",
+        "copyFailed": "Failed to copy input"
+      },
+      "submit": {
+        "idle_zero": "Test {{count}} guardrail",
+        "idle_one": "Test {{count}} guardrail",
+        "idle_other": "Test {{count}} guardrails",
+        "running_zero": "Testing {{count}} guardrail...",
+        "running_one": "Testing {{count}} guardrail...",
+        "running_other": "Testing {{count}} guardrails..."
+      }
+    },
+    "testPlayground": {
+      "sidebarTitle": "Guardrails",
+      "searchPlaceholder": "Search guardrails...",
+      "noMatches": "No guardrails match your search",
+      "noGuardrails": "No guardrails available",
+      "typeLabel": "Type: ",
+      "modeLabel": "Mode: ",
+      "selectedCount": "<selected/> of <total/> selected",
+      "title": "Guardrail Testing Playground",
+      "emptyState": {
+        "title": "Select Guardrails to Test",
+        "description": "Choose one or more guardrails from the left sidebar to start testing and comparing results."
+      },
+      "toast": {
+        "applied_one": "{{count}} guardrail applied successfully",
+        "applied_other": "{{count}} guardrails applied successfully",
+        "failed_one": "{{count}} guardrail failed",
+        "failed_other": "{{count}} guardrails failed"
+      }
+    },
+    "testResults": {
+      "title": "Results",
+      "latency": "<value/>ms",
+      "copy": "Copy",
+      "outputLabel": "Output Text",
+      "charactersLabel": "Characters:",
+      "errorTitle": "<name/> - Error",
+      "toast": {
+        "copied": "Result copied to clipboard",
+        "copyFailed": "Failed to copy result"
+      }
+    },
+    "teamTab": {
+      "modes": {
+        "preCall": "Pre Call",
+        "postCall": "Post Call",
+        "duringCall": "During Call"
+      },
+      "validation": {
+        "teamRequired": "Select a team",
+        "nameRequired": "Enter a guardrail name",
+        "modeRequired": "Select a mode",
+        "apiBaseRequired": "Enter the API base URL",
+        "apiBaseInvalid": "Must be a valid URL",
+        "notJsonObject": "Must be a JSON object",
+        "invalidJson": "Invalid JSON"
+      },
+      "status": {
+        "active": "Active",
+        "pending": "Pending Review",
+        "rejected": "Rejected"
+      },
+      "stats": {
+        "total": "Total Submitted",
+        "pending": "Pending Review",
+        "active": "Active",
+        "rejected": "Rejected"
+      },
+      "card": {
+        "team": "Team: <team/>",
+        "model": "Model: <value/>",
+        "submitted": "Submitted: <value/>",
+        "forwardApiKey": "Forward API Key",
+        "review": "Review",
+        "close": "Close",
+        "approve": "Approve",
+        "reject": "Reject",
+        "staticHeaders": "Static headers",
+        "noStaticHeaders": "No static headers configured."
+      },
+      "detail": {
+        "team": "Team: <team/>",
+        "submittedBy": "Submitted by <by/> on <at/>",
+        "closeLabel": "Close detail panel",
+        "endpoint": "Endpoint",
+        "method": "Method",
+        "forwardKeyTitle": "Forward LiteLLM API Key",
+        "forwardKeyDescription": "When enabled, the caller's LiteLLM API key is forwarded as an <code>Authorization</code> header to your guardrail endpoint. This allows your guardrail to authenticate model calls using the original caller's credentials.",
+        "staticHeaders": "Static headers",
+        "staticHeadersHint": "Sent with every request to the guardrail.",
+        "noStaticHeaders": "No static headers configured.",
+        "removeHeader": "Remove {{name}}",
+        "headerNamePlaceholder": "Header name (e.g. X-API-Key)",
+        "headerValuePlaceholder": "Value",
+        "addStaticHeader": "Add",
+        "forwardClientHeaders": "Forward client headers",
+        "forwardClientHeadersHint": "Allowed header names to forward from the client request to the guardrail (e.g. x-request-id).",
+        "noForwardClientHeaders": "No forward client headers configured.",
+        "forwardHeaderPlaceholder": "e.g. x-request-id",
+        "addForwardHeader": "Add",
+        "equivalentConfig": "Equivalent config",
+        "separateInstanceNote": "This guardrail runs on a separate instance. It receives the user request and forwards the result to the next step in the pipeline. See <docs>LiteLLM Generic Guardrail API docs</docs> for configuration details.",
+        "testEndpoint": "Test Endpoint",
+        "approve": "Approve",
+        "reject": "Reject"
+      },
+      "confirm": {
+        "approveTitle": "Approve Guardrail",
+        "rejectTitle": "Reject Guardrail",
+        "approveMessage": "Are you sure you want to approve <name/>? This will make it active and available for use.",
+        "rejectMessage": "Are you sure you want to reject <name/>? This will mark it as rejected and notify the team.",
+        "cancel": "Cancel",
+        "approve": "Approve",
+        "reject": "Reject"
+      },
+      "toolbar": {
+        "searchPlaceholder": "Search guardrails...",
+        "statusFilterLabel": "Filter by status",
+        "statusFilter": {
+          "all": "All Status",
+          "pending": "Pending Review",
+          "active": "Active",
+          "rejected": "Rejected"
+        },
+        "addGuardrail": "Add Guardrail"
+      },
+      "list": {
+        "loading": "Loading submissions…",
+        "empty": "No guardrails match your filters.",
+        "loadFailed": "Failed to load submissions"
+      },
+      "submitModal": {
+        "title": "Submit Guardrail for Review",
+        "notice": "Your guardrail will be sent for admin review before it becomes active.",
+        "team": "Team",
+        "guardrailName": "Guardrail Name",
+        "guardrailNamePlaceholder": "e.g. pii-detection",
+        "mode": "Mode",
+        "apiBase": "API Base URL",
+        "extraParams": "Additional litellm_params (optional)",
+        "extraParamsHint": "JSON object merged into litellm_params. e.g. forward_api_key, headers, model, unreachable_fallback",
+        "guardrailInfo": "Guardrail Info (optional)",
+        "cancel": "Cancel",
+        "submit": "Submit for Review"
+      },
+      "toast": {
+        "submitted": "Guardrail submitted for review",
+        "forwardKeyEnabled": "Forward API key enabled",
+        "forwardKeyDisabled": "Forward API key disabled",
+        "forwardKeyFailed": "Failed to update forward API key",
+        "staticHeadersUpdated": "Static headers updated",
+        "staticHeadersFailed": "Failed to update static headers",
+        "forwardHeadersUpdated": "Forward client headers updated",
+        "forwardHeadersFailed": "Failed to update forward client headers",
+        "approved": "Guardrail approved",
+        "approveFailed": "Failed to approve guardrail",
+        "rejected": "Guardrail rejected",
+        "rejectFailed": "Failed to reject guardrail"
+      }
+    },
+    "customCode": {
+      "title": {
+        "create": "Create Custom Guardrail",
+        "edit": "Edit Custom Guardrail"
+      },
+      "description": "Define custom logic using Python-like syntax",
+      "nameLabel": "Guardrail Name",
+      "namePlaceholder": "e.g., block-pii-custom",
+      "modeLabel": {
+        "tagScoped": "Mode (tag-scoped, read-only)",
+        "multiple": "Mode (can select multiple)"
+      },
+      "tagScopedModeAriaLabel": "Mode (tag-scoped)",
+      "modePlaceholder": "Select modes",
+      "noMatchingModes": "No matching modes",
+      "continueObserving": "Continue observing the response after a flagged request",
+      "templateLabel": "Template",
+      "standardTemplates": "STANDARD",
+      "browseCommunity": "Browse Community templates",
+      "defaultOn": "Default On",
+      "pythonLogic": "Python Logic",
+      "restrictedEnvironment": "Restricted environment (no imports)",
+      "loggingOnlyScope": {
+        "label": "Logging only scope"
+      },
+      "test": {
+        "title": "Test Your Guardrail",
+        "inputLabel": "Test Input (JSON)",
+        "loadExample": "Load example:",
+        "examples": {
+          "preCall": "Pre-call",
+          "preMcp": "Pre MCP",
+          "postCall": "Post-call"
+        },
+        "fields": {
+          "texts": "<field/>: Message content (always)",
+          "images": "<field/>: Base64 images (vision)",
+          "tools": "<field/>: Tool definitions <preCall/>, MCP as OpenAI tool <preMcpCall/>",
+          "toolCalls": "<field/>: LLM tool calls <postCall/>",
+          "structuredMessages": "<field/>: Full messages",
+          "model": "<field/>: Model name (always)"
+        },
+        "run": "Run Test",
+        "running": "Running...",
+        "result": {
+          "allowed": "Allowed",
+          "blocked": "Blocked:",
+          "modified": "Modified",
+          "unknownAction": "Unknown"
+        },
+        "errors": {
+          "noAccessToken": "No access token available",
+          "invalidInput": "Invalid test input JSON",
+          "unknown": "Unknown error occurred",
+          "failed": "Failed to test custom code"
+        }
+      },
+      "contribute": {
+        "title": "Built a useful guardrail?",
+        "description": "Share it with the community and help others build faster",
+        "button": "Contribute Template"
+      },
+      "primitives": {
+        "title": "Available Primitives",
+        "hint": "Click to copy functions to clipboard",
+        "copied": "Copied!",
+        "categories": {
+          "returnValues": "Return Values",
+          "httpRequests": "HTTP Requests (async)",
+          "regex": "Regex Functions",
+          "json": "JSON Functions",
+          "url": "URL Functions",
+          "codeDetection": "Code Detection",
+          "textUtilities": "Text Utilities"
+        },
+        "descriptions": {
+          "allow": "Let request/response through",
+          "block": "Reject with message",
+          "flag": "Let through, record a non-blocking violation",
+          "modify": "Transform content",
+          "httpRequest": "Make async HTTP request",
+          "httpGet": "Async GET request",
+          "httpPost": "Async POST request",
+          "regexMatch": "Returns True if pattern found",
+          "regexReplace": "Replace all matches",
+          "regexFindAll": "Return list of matches",
+          "jsonParse": "Parse JSON string, returns None on error",
+          "jsonStringify": "Convert to JSON string",
+          "jsonSchemaValid": "Validate against JSON schema",
+          "extractUrls": "Extract all URLs from text",
+          "isValidUrl": "Check if URL is valid",
+          "allUrlsValid": "Check all URLs in text are valid",
+          "detectCode": "Returns True if code detected",
+          "detectCodeLanguages": "Returns list of detected languages",
+          "containsCodeLanguage": "Check for specific languages",
+          "contains": "Check if substring exists",
+          "containsAny": "Check if any substring exists",
+          "wordCount": "Count words",
+          "charCount": "Count characters",
+          "stringTransforms": "String transforms"
+        }
+      },
+      "templates": {
+        "empty": "Empty Template",
+        "blockSsn": "Block SSN",
+        "redactEmail": "Redact Emails",
+        "blockSql": "Block SQL Injection",
+        "validateJson": "Validate JSON",
+        "externalApi": "External API Check (async)"
+      },
+      "modes": {
+        "preCall": "pre_call (Request)",
+        "postCall": "post_call (Response)",
+        "duringCall": "during_call (Parallel)",
+        "loggingOnly": "logging_only",
+        "preMcpCall": "pre_mcp_call (Before MCP Tool Call)",
+        "postMcpCall": "post_mcp_call (After MCP Tool Call)",
+        "duringMcpCall": "during_mcp_call (During MCP Tool Call)"
+      },
+      "footer": {
+        "autosaveNote": "Changes are auto-saved to local draft",
+        "cancel": "Cancel",
+        "save": "Save Guardrail",
+        "update": "Update Guardrail"
+      },
+      "toast": {
+        "nameRequired": "Please enter a guardrail name",
+        "codeRequired": "Please enter custom code",
+        "noAccessToken": "No access token available",
+        "updated": "Custom code guardrail updated successfully",
+        "created": "Custom code guardrail created successfully",
+        "createFailed": "Failed to create guardrail: {{error}}",
+        "updateFailed": "Failed to update guardrail: {{error}}"
+      }
+    },
+    "addForm": {
+      "title": "Create guardrail",
+      "modeDescriptions": {
+        "preCall": "Before LLM Call - Runs before the LLM call and checks the input (Recommended)",
+        "duringCall": "During LLM Call - Runs in parallel with the LLM call, with response held until check completes",
+        "postCall": "After LLM Call - Runs after the LLM call and checks only the output",
+        "loggingOnly": "Logging Only - Only runs on logging callbacks without affecting the LLM call",
+        "preMcpCall": "Before MCP Tool Call - Runs before MCP tool execution and validates tool calls",
+        "duringMcpCall": "During MCP Tool Call - Runs in parallel with MCP tool execution for monitoring",
+        "postMcpCall": "After MCP Tool Call - Runs after MCP tool execution and checks the tool result"
+      },
+      "fields": {
+        "name": {
+          "label": "Guardrail Name",
+          "required": "Please enter a guardrail name",
+          "placeholder": "Enter a name for this guardrail"
+        },
+        "provider": {
+          "label": "Guardrail Provider",
+          "required": "Please select a provider",
+          "placeholder": "Select a guardrail provider",
+          "empty": "No matching providers"
+        },
+        "mode": {
+          "label": "Mode",
+          "hint": "How the guardrail should be applied",
+          "required": "Please select a mode"
+        },
+        "alwaysOn": {
+          "label": "Always On",
+          "hint": "If enabled, this guardrail will be applied to all requests by default.",
+          "placeholder": "Select an option",
+          "yes": "Yes",
+          "no": "No"
+        },
+        "skipSystemMessages": {
+          "label": "Skip system messages in guardrail",
+          "hint": "Unified guardrails only: omit role: system from guardrail evaluation input (OpenAI chat + Anthropic messages). The model still receives full messages. Use global default follows litellm_settings.skip_system_message_in_guardrail."
+        },
+        "skipToolMessages": {
+          "label": "Skip tool messages in guardrail",
+          "hint": "Unified guardrails only: omit role: tool from guardrail evaluation input (OpenAI chat + Anthropic messages). The model still receives full messages. Use global default follows litellm_settings.skip_tool_message_in_guardrail."
+        }
+      },
+      "endpoint": {
+        "intro": "Configure settings for a specific call type. Most guardrails don't need this — skip it unless you're using a specific endpoint like <code>/v1/realtime</code>.",
+        "callType": {
+          "label": "Call type",
+          "placeholder": "Select a call type",
+          "comingSoon": "More call types coming soon."
+        },
+        "realtime": {
+          "title": "/v1/realtime settings",
+          "endSessionAfter": {
+            "label": "End session after X violations",
+            "description": "Automatically close the session after this many guardrail violations. Leave empty to never auto-close.",
+            "placeholder": "e.g. 3"
+          },
+          "onViolation": {
+            "label": "On violation",
+            "warn": {
+              "label": "Warn",
+              "description": "Bot speaks the message, session continues"
+            },
+            "endSession": {
+              "label": "End session",
+              "description": "Bot speaks the message, connection closes immediately"
+            }
+          },
+          "message": {
+            "label": "Message the user hears",
+            "description": "What the bot says aloud when this guardrail fires. Falls back to the default violation message if empty.",
+            "placeholder": "e.g. I'm not able to continue this conversation. Please contact us at 1-800-774-2678."
+          }
+        }
+      },
+      "steps": {
+        "basicInfo": "Basic Info",
+        "topics": "Topics",
+        "patterns": "Patterns",
+        "keywords": "Keywords",
+        "endpointSettings": "Endpoint Settings (Optional)",
+        "piiConfiguration": "PII Configuration",
+        "decisionModelConfiguration": "Decision Model Configuration",
+        "providerConfiguration": "Provider Configuration",
+        "optional": "optional",
+        "edit": "Edit"
+      },
+      "actions": {
+        "cancel": "Cancel",
+        "previous": "Previous",
+        "next": "Next",
+        "create": "Create Guardrail"
+      },
+      "toasts": {
+        "loadFailed": "Failed to load guardrail configuration",
+        "piiEntityRequired": "Please select at least one PII entity to continue",
+        "fixHighlightedFields": "Failed to create guardrail: please fix the highlighted fields",
+        "contentFilterRequired": "Please configure at least one content filter setting (category, pattern, keyword, or competitor intent)",
+        "invalidJson": "Invalid JSON in configuration",
+        "criterionRequired": "Add at least one evaluation criterion",
+        "criterionWeights": "Criterion weights must sum to 100% (currently {{total}}%)",
+        "toolRuleRequired": "Add at least one tool permission rule",
+        "created": "Guardrail created successfully",
+        "createFailed": "Failed to create guardrail: {{message}}"
+      }
+    },
+    "providerFields": {
+      "boolean": {
+        "true": "True",
+        "false": "False"
+      },
+      "errors": {
+        "invalidJsonObject": "{{field}} must be a valid JSON object",
+        "required": "{{field}} is required"
+      },
+      "toasts": {
+        "invalidJsonObject": "Enter a valid JSON object for this configuration"
+      },
+      "loading": "Loading provider parameters...",
+      "loadFailed": "Failed to load provider parameters",
+      "noFields": "No configuration fields available for this provider."
+    },
+    "optionalParams": {
+      "title": "Optional Parameters",
+      "defaultDescription": "Configure additional settings for this guardrail provider",
+      "boolean": {
+        "true": "True",
+        "false": "False"
+      },
+      "dict": {
+        "enterValue": "Enter {{name}} value",
+        "selectValue": "Select {{name}} value",
+        "remove": "Remove",
+        "keyPlaceholder": "Select category to configure",
+        "addHint": "Select a category to add threshold configuration"
+      },
+      "errors": {
+        "required": "{{field}} is required"
+      }
+    },
+    "formField": {
+      "skipMessage": {
+        "placeholder": "Select an option",
+        "options": {
+          "inherit": "Use global default",
+          "yes": "Yes — exclude from guardrail scan",
+          "no": "No — always include in scan"
+        }
+      },
+      "loggingOnlyScope": {
+        "label": "Logging only scope",
+        "hint": "Which direction a logging_only scan observes. Observe-only scans never block; pre_call and post_call on this guardrail still block.",
+        "placeholder": "Select an option"
+      },
+      "continueOnInputFailure": {
+        "label": "Continue observing the response after a flagged request",
+        "hint": "When on, a flagged or failing request scan is logged and the response is still scanned, so both verdicts land."
+      }
+    },
+    "streamScope": {
+      "appliesTo": "{{mode}} applies to",
+      "placeholder": "Streaming and non-streaming",
+      "requestShape": "Request shape",
+      "requestShapeHint": "Run this guardrail on streaming requests, non-streaming requests, or both, for each selected mode."
+    },
+    "pii": {
+      "configuration": {
+        "title": "Configure PII Protection",
+        "selectedCount_one": "{{count}} items selected",
+        "selectedCount_other": "{{count}} items selected"
+      },
+      "categoryFilter": {
+        "title": "Filter by category",
+        "placeholder": "Select categories to filter by",
+        "empty": "No matching categories"
+      },
+      "quickActions": {
+        "title": "Quick Actions",
+        "hint": "Apply action to all PII types at once",
+        "unselectAll": "Unselect All",
+        "selectAllMask": "Select All & Mask",
+        "selectAllBlock": "Select All & Block"
+      },
+      "entityList": {
+        "typeColumn": "PII Type",
+        "actionColumn": "Action",
+        "actionSelect": "Action",
+        "empty": "No PII types match your filter criteria"
+      }
+    },
+    "decisionModel": {
+      "intro": "The <strong>Decision Model</strong> answers yes/no questions about each request (pre_call, during_call) or response (post_call). A question whose probability reaches its threshold blocks the call, or is recorded when set to Log only.",
+      "actionOptions": {
+        "block": "Block",
+        "log": "Log only"
+      },
+      "noModels": {
+        "ariaLabel": "No decision models",
+        "title": "No decision models yet",
+        "description": "Add a decision model to use this guardrail. A model shows up here once its mode is decisions.",
+        "descriptionForProvider": "Add a decision model from the {{provider}} provider to use this guardrail. A model shows up here once its mode is decisions.",
+        "addModel": "Add a model"
+      },
+      "model": {
+        "label": "Decision Model",
+        "hint": "A decisions-API model on this proxy, such as typesafe/jev-latest. It scores every question below.",
+        "required": "Select a decision model",
+        "placeholder": "Select a decision model",
+        "placeholderEmpty": "No decision models yet",
+        "empty": "No matching models"
+      },
+      "questions": {
+        "label": "Questions",
+        "description": "Yes/no questions the decision model answers about the text. Block stops the call once a score reaches the threshold, and Log only records it.",
+        "add": "Add question"
+      },
+      "question": {
+        "remove": "Remove question {{position}}",
+        "nameLabel": "Name",
+        "nameAriaLabel": "Question {{position}} name",
+        "namePlaceholder": "Name (e.g. invoice_policy)",
+        "duplicateName": "Another question already uses this name",
+        "questionLabel": "Question",
+        "questionAriaLabel": "Question {{position}}",
+        "questionPlaceholder": "The question the decision model answers, e.g. Does the text ask about invoices?",
+        "actionLabel": "Action",
+        "actionAriaLabel": "Question {{position}} action",
+        "thresholdLabel": "Threshold",
+        "thresholdAriaLabel": "Question {{position}} threshold"
+      },
+      "problems": {
+        "noQuestions": "Add at least one question",
+        "incompleteQuestion": "Give every question a name and a question, or remove it",
+        "duplicateNames": "Each question needs a different name"
+      },
+      "test": {
+        "label": "Test",
+        "description": "Try your questions on a sample input before you save. Uses the thresholds above. Each run is a real decision model call, so it is billed and shows up in Logs.",
+        "inputAriaLabel": "Test input",
+        "inputPlaceholder": "Paste a sample input to score against your questions",
+        "run": "Run test",
+        "running": "Running…",
+        "disabled": {
+          "noModel": "Select a decision model to run a test",
+          "noInput": "Type an input to run a test",
+          "noQuestions": "Add a question to run a test"
+        },
+        "historyHint": "Latest first. Each run keeps its input so you can compare.",
+        "stale": "The model or questions changed since this run. Run it again to score them.",
+        "overall": {
+          "block": "Block",
+          "pass": "Pass"
+        },
+        "chip": {
+          "block": "Block",
+          "logged": "Pass · logged",
+          "pass": "Pass",
+          "noAnswer": "No answer"
+        }
+      }
+    },
+    "llmJudge": {
+      "intro": "The <strong>Judge Model</strong> scores the user request (pre_call, during_call) or the LLM response (post_call) 0–100 against your criteria. If the weighted average falls below the threshold, it is blocked (or logged).",
+      "judgeModel": {
+        "label": "Judge Model",
+        "hint": "The LLM that reads each response and grades it. Pick a capable model — it never sees end-user data beyond what the LLM returned.",
+        "required": "Select a judge model",
+        "placeholder": "Select a model",
+        "empty": "No matching models"
+      },
+      "threshold": {
+        "label": "Minimum Score to Pass",
+        "hint": "0–100. If the weighted average of criterion scores falls below this, the guardrail triggers. 80 is a good default."
+      },
+      "onFailure": {
+        "label": "On Failure",
+        "hint": "Block: return HTTP 422 when the score is too low. Log: record the result but let the response through.",
+        "placeholder": "Select an action",
+        "options": {
+          "block": "Block (return 422)",
+          "log": "Log only"
+        }
+      },
+      "criteria": {
+        "label": "Evaluation Criteria",
+        "hint": "Each criterion is something the judge checks. Weights must add up to 100%.",
+        "nameRequired": "Enter criterion name",
+        "namePlaceholder": "Criterion name (e.g. Policy accuracy)",
+        "weightLabel": "Weight",
+        "weightHint": "How much this criterion counts toward the final score. All weights must add up to 100%.",
+        "weightRequired": "Enter weight",
+        "weightPlaceholder": "e.g. 50",
+        "remove": "Remove criterion",
+        "descriptionRequired": "Describe what to check",
+        "descriptionPlaceholder": "What should the judge check for this criterion?",
+        "add": "Add Criterion",
+        "weightsTotalOk": "Weights total: {{total}}% ✓",
+        "weightsTotalOff": "Weights total: {{total}}% — must add up to 100%"
+      }
+    },
+    "toolPermission": {
+      "title": "LiteLLM Tool Permission Guardrail",
+      "description": "Provide regex patterns (e.g., {{example}}) for tool names or types and optionally constrain payload fields.",
+      "addRule": "Add Rule",
+      "empty": "No tool rules added yet",
+      "decisionOptions": {
+        "allow": "Allow",
+        "deny": "Deny"
+      },
+      "onDisallowedOptions": {
+        "block": "Block",
+        "rewrite": "Rewrite"
+      },
+      "rule": {
+        "title": "Rule {{number}}",
+        "remove": "Remove",
+        "id": "Rule ID",
+        "toolName": "Tool Name (optional)",
+        "toolType": "Tool Type (optional)",
+        "decision": "Decision"
+      },
+      "constraints": {
+        "restrict": "+ Restrict tool arguments (optional)",
+        "title": "Argument constraints (dot or array paths)",
+        "remove": "Remove constraint",
+        "addAnother": "+ Add another constraint"
+      },
+      "defaultAction": "Default action",
+      "onDisallowed": {
+        "label": "On disallowed action",
+        "hint": "Block returns an error when a forbidden tool is invoked. Rewrite strips the tool call but lets the rest of the response continue."
+      },
+      "violationMessage": {
+        "label": "Violation message (optional)",
+        "placeholder": "This violates our org policy..."
+      }
+    },
+    "info": {
+      "loading": "Loading...",
+      "back": "Back to Guardrails",
+      "notFound": "Guardrail not found",
+      "unnamed": "Unnamed Guardrail",
+      "tabs": {
+        "overview": "Overview",
+        "settings": "Settings"
+      },
+      "overview": {
+        "provider": "Provider",
+        "createdAt": "Created At",
+        "lastUpdated": "Last Updated:",
+        "piiProtection": "PII Protection",
+        "piiEntitiesConfigured_one": "PII entities configured",
+        "piiEntitiesConfigured_other": "PII entities configured",
+        "piiEntityConfiguration": "PII Entity Configuration",
+        "entityType": "Entity Type",
+        "configuration": "Configuration",
+        "customCode": "Custom Code",
+        "editCode": "Edit Code"
+      },
+      "settings": {
+        "heading": "Guardrail Settings",
+        "configTooltip": "Guardrail is defined in the config file and cannot be edited.",
+        "configDetailsLabel": "Config guardrail details",
+        "nameLabel": "Guardrail Name",
+        "nameRequired": "Please input a guardrail name",
+        "namePlaceholder": "Enter guardrail name",
+        "defaultOnLabel": "Default On",
+        "defaultOnPlaceholder": "Select an option",
+        "defaultOnOptions": {
+          "yes": "Yes",
+          "no": "No"
+        },
+        "skipSystemMessagesLabel": "Skip system messages in guardrail",
+        "skipSystemMessagesHint": "Unified guardrails: omit role: system from guardrail input (LLM still gets full messages). Use global default follows litellm_settings.skip_system_message_in_guardrail.",
+        "skipToolMessagesLabel": "Skip tool messages in guardrail",
+        "skipToolMessagesHint": "Unified guardrails: omit role: tool from guardrail input (LLM still gets full messages). Use global default follows litellm_settings.skip_tool_message_in_guardrail.",
+        "sections": {
+          "piiProtection": "PII Protection",
+          "providerSettings": "Provider Settings",
+          "advancedSettings": "Advanced Settings"
+        },
+        "guardrailInfoLabel": "Guardrail Information",
+        "cancel": "Cancel",
+        "save": "Save Changes"
+      },
+      "toasts": {
+        "loadFailed": "Failed to load guardrail information",
+        "noChanges": "No changes detected",
+        "updated": "Guardrail updated successfully",
+        "updateFailed": "Failed to update guardrail"
+      }
+    },
+    "readOnlyDetails": {
+      "guardrailId": "Guardrail ID",
+      "guardrailName": "Guardrail Name",
+      "unnamed": "Unnamed Guardrail",
+      "provider": "Provider",
+      "defaultOn": "Default On",
+      "yes": "Yes",
+      "no": "No",
+      "piiProtection": "PII Protection",
+      "piiEntitiesConfigured_one": "PII entities configured",
+      "piiEntitiesConfigured_other": "PII entities configured",
+      "createdAt": "Created At",
+      "lastUpdated": "Last Updated",
+      "decisionModel": {
+        "heading": "Decision Model",
+        "checks": "Checks",
+        "columns": {
+          "check": "Check",
+          "action": "Action",
+          "threshold": "Threshold"
+        }
+      }
+    },
+    "modeDisplay": {
+      "mode": "Mode",
+      "defaultOn": "Default On",
+      "defaultOff": "Default Off",
+      "loggingOnlyScope": "Logging only scope",
+      "continueAfterFlagged": "Continue after a flagged request",
+      "on": "On",
+      "off": "Off"
+    },
+    "contentFilter": {
+      "options": {
+        "action": {
+          "block": "Block",
+          "mask": "Mask"
+        },
+        "severity": {
+          "high": "High",
+          "medium": "Medium",
+          "low": "Low"
+        }
+      },
+      "manager": {
+        "heading": "Content Filter Configuration",
+        "unsavedChanges": "You have unsaved changes to patterns or keywords. Remember to click \"Save Changes\" at the bottom."
+      },
+      "configuration": {
+        "intro": "Configure patterns, keywords, and content categories to detect and filter sensitive information in requests and responses.",
+        "patterns": {
+          "title": "Pattern Detection",
+          "description": "Detect sensitive information using regex patterns (SSN, credit cards, API keys, etc.)",
+          "addPrebuilt": "Add prebuilt pattern",
+          "addCustom": "Add custom regex"
+        },
+        "keywords": {
+          "title": "Blocked Keywords",
+          "description": "Block or mask specific sensitive terms and phrases",
+          "addKeyword": "Add keyword",
+          "uploadYaml": "Upload YAML file"
+        },
+        "toasts": {
+          "selectPattern": "Please select a pattern",
+          "patternNameAndRegexRequired": "Please provide pattern name and regex",
+          "keywordRequired": "Please enter a keyword",
+          "uploadSucceeded": "File uploaded successfully",
+          "invalidFile": "Invalid file",
+          "validationFailed": "Validation failed: {{error}}",
+          "uploadFailed": "Failed to upload file: {{error}}"
+        }
+      },
+      "display": {
+        "categoriesTitle": "Content Categories",
+        "categoriesConfigured_one": "categories configured",
+        "categoriesConfigured_other": "categories configured",
+        "patternsTitle": "Pattern Detection",
+        "patternsConfigured_one": "patterns configured",
+        "patternsConfigured_other": "patterns configured",
+        "keywordsTitle": "Blocked Keywords",
+        "keywordsConfigured_one": "keywords configured",
+        "keywordsConfigured_other": "keywords configured"
+      },
+      "categoryTable": {
+        "columns": {
+          "category": "Category",
+          "severityThreshold": "Severity Threshold",
+          "action": "Action"
+        },
+        "delete": "Delete",
+        "empty": "No categories configured."
+      },
+      "keywordTable": {
+        "columns": {
+          "keyword": "Keyword",
+          "action": "Action",
+          "description": "Description"
+        },
+        "delete": "Delete",
+        "empty": "No keywords added."
+      },
+      "patternTable": {
+        "columns": {
+          "type": "Type",
+          "name": "Pattern name",
+          "regex": "Regex pattern",
+          "action": "Action"
+        },
+        "types": {
+          "prebuilt": "Prebuilt",
+          "custom": "Custom"
+        },
+        "delete": "Delete",
+        "empty": "No patterns added."
+      },
+      "patternModal": {
+        "title": "Add prebuilt pattern",
+        "patternTypeLabel": "Pattern type",
+        "patternTypePlaceholder": "Choose pattern type",
+        "noMatches": "No matching patterns",
+        "actionLabel": "Action",
+        "actionDescription": "Choose what action the guardrail should take when this pattern is detected",
+        "cancel": "Cancel",
+        "add": "Add"
+      },
+      "customPatternModal": {
+        "title": "Add custom regex pattern",
+        "nameLabel": "Pattern name",
+        "namePlaceholder": "e.g., {{example}}",
+        "regexLabel": "Regex pattern",
+        "regexPlaceholder": "e.g., {{example}}",
+        "regexHelp": "Enter a valid regular expression to match sensitive data",
+        "actionLabel": "Action",
+        "actionDescription": "Choose what action the guardrail should take when this pattern is detected",
+        "cancel": "Cancel",
+        "add": "Add"
+      },
+      "keywordModal": {
+        "title": "Add blocked keyword",
+        "keywordLabel": "Keyword",
+        "keywordPlaceholder": "Enter sensitive keyword or phrase",
+        "actionLabel": "Action",
+        "actionDescription": "Choose what action the guardrail should take when this keyword is detected",
+        "descriptionLabel": "Description (optional)",
+        "descriptionPlaceholder": "Explain why this keyword is sensitive",
+        "cancel": "Cancel",
+        "add": "Add"
+      },
+      "categoryConfiguration": {
+        "title": "Blocked topics",
+        "subtitle": "Select topics to block using keyword and semantic analysis",
+        "placeholder": "Select a content category",
+        "noMatches": "No matching categories",
+        "add": "Add",
+        "preview": "Preview:",
+        "loadingContent": "Loading content...",
+        "previewUnavailable": "Unable to load category content",
+        "viewContent": "View {{fileType}} for {{name}}",
+        "contentLoadsOnExpand": "Content will load when expanded",
+        "empty": "No blocked topics selected. Add topics to detect and block harmful content.",
+        "columns": {
+          "category": "Category",
+          "action": "Action",
+          "severityThreshold": "Severity Threshold"
+        },
+        "remove": "Remove"
+      },
+      "competitorIntent": {
+        "title": "Competitor Intent Filter",
+        "disabledDescription": "Block or reframe competitor comparison questions. When enabled, airline type auto-loads competitors from IATA; generic type requires manual competitor list.",
+        "enabledDescription": "Block or reframe competitor comparison questions. Airline type uses major airlines (excluding your brand); generic requires manual competitor list.",
+        "typeLabel": "Type",
+        "intentTypes": {
+          "airline": "Airline (auto-load competitors from IATA)",
+          "generic": "Generic (specify competitors manually)"
+        },
+        "brandSelfLabel": "Your Brand ({{field}})",
+        "airlinePlaceholder": "Search or select airline, or type to add custom",
+        "typeToAddPlaceholder": "Type and press Enter to add",
+        "airlineBrandDescription": "Select your airline from the list (excluded from competitors) or type to add a custom term",
+        "genericBrandDescription": "Names/codes users use for your brand",
+        "locationsLabel": "Locations (optional)",
+        "locationsDescription": "Countries, cities, airports for disambiguation (e.g. qatar, doha)",
+        "competitorsLabel": "Competitors",
+        "competitorsDescription": "Competitor names to detect (required for generic type)",
+        "competitorComparisonLabel": "Policy: Competitor comparison",
+        "possibleCompetitorComparisonLabel": "Policy: Possible competitor comparison",
+        "policies": {
+          "refuse": "Refuse (block request)",
+          "reframe": "Reframe (suggest alternative)",
+          "reframeToBackend": "Reframe (suggest alternative to backend LLM)"
+        },
+        "thresholdsLabel": "Confidence thresholds",
+        "thresholds": {
+          "high": "High",
+          "medium": "Medium",
+          "low": "Low",
+          "example": "e.g. {{value}}"
+        },
+        "thresholdsHelp": {
+          "intro": "Classify competitor intent by confidence (0–1). Higher confidence -> stronger intent.",
+          "high": "<strong>High (≥)</strong>: Treat as full competitor comparison -> uses \"Competitor comparison\" policy",
+          "medium": "<strong>Medium (≥)</strong>: Treat as possible comparison -> uses \"Possible competitor comparison\" policy",
+          "low": "<strong>Low (≥)</strong>: Log only; allow request. Below Low -> allow with no action",
+          "outro": "Raise thresholds to be more permissive; lower them to be stricter."
+        }
+      }
+    },
+    "modeOptions": {
+      "loggingOnlyScope": {
+        "default": "Default (request and response)",
+        "input": "Input only (request)",
+        "output": "Output only (response)"
+      },
+      "streamScope": {
+        "both": "Streaming and non-streaming",
+        "streaming": "Streaming only",
+        "nonStreaming": "Non-streaming only"
+      }
+    }
+  },
   "guardrailsMonitor": {
     "page": {
       "title": "Guardrails Monitor"
@@ -983,5 +5942,1773 @@
       "message_one": "{{value}} unit with no known price is left out of the cost. <githubLink>Request pricing on GitHub</githubLink>",
       "message_other": "{{value}} units with no known price are left out of the cost. <githubLink>Request pricing on GitHub</githubLink>"
     }
+  },
+  "mcpServers": {
+    "duplicateServerCheck": {
+      "duplicateIdentifier": "An MCP server with this name/alias already exists."
+    },
+    "editServerPayload": {
+      "errors": {
+        "invalidToolDisplayName": "Tool display name \"{{displayName}}\" is invalid. Only letters, digits, underscores, and hyphens are allowed (no spaces).",
+        "stdioConfigMissingCommand": "Stdio configuration must include a command",
+        "invalidStdioJson": "Invalid JSON in stdio configuration",
+        "invalidStdioEnvJson": "Invalid JSON in stdio env configuration",
+        "stdioCommandRequired": "Stdio transport requires a command",
+        "invalidTokenValidationJson": "Invalid JSON in Token Validation Rules"
+      }
+    },
+    "editToolPreview": {
+      "originChanged": "The server origin changed. Enter credentials and replace or remove saved static headers to preview tools."
+    },
+    "fieldRules": {
+      "tagsControl": {
+        "emptyText": "Type to add"
+      }
+    },
+    "stdioConfiguration": {
+      "label": "Stdio Configuration (JSON)",
+      "tooltip": "Paste your stdio MCP server configuration in JSON format. You can use the full mcpServers structure from config.yaml or just the inner server configuration.",
+      "errors": {
+        "required": "Please enter stdio configuration",
+        "invalidJson": "Please enter valid JSON"
+      }
+    },
+    "stdioAvailability": {
+      "disabledMessage": "stdio MCP servers are disabled on this proxy. Set LITELLM_ENABLE_MCP_STDIO=true on the proxy and restart to enable them",
+      "banner": {
+        "title": "stdio is disabled on this proxy",
+        "description": "{{disabledMessage}}. Until then this server cannot start or be saved as stdio."
+      }
+    },
+    "openApiFormSection": {
+      "specUrl": {
+        "label": "OpenAPI Spec URL",
+        "tooltip": "URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.",
+        "required": "Please enter an OpenAPI spec URL"
+      }
+    },
+    "openApiQuickPicker": {
+      "title": "Popular APIs",
+      "hint": "Select an API to pre-fill the spec URL and OAuth 2.0 settings, or enter your own spec URL below."
+    },
+    "useTestMcpConnection": {
+      "errors": {
+        "toolsListFailed": "Failed to retrieve tools list"
+      }
+    },
+    "serverCostConfig": {
+      "title": "Cost Configuration",
+      "titleTooltipLabel": "About cost configuration",
+      "titleTooltip": "Configure costs for this MCP server's tool calls. Set a default rate and per-tool overrides.",
+      "defaultCost": {
+        "label": "Default Cost per Query ($)",
+        "tooltipLabel": "About the default cost",
+        "tooltip": "Default cost charged for each tool call to this server.",
+        "help": "Set a default cost for all tool calls to this server"
+      },
+      "toolCosts": {
+        "label": "Tool-Specific Costs ($)",
+        "tooltipLabel": "About per-tool costs",
+        "tooltip": "Override the default cost for specific tools. Leave blank to use the default rate.",
+        "availableTools": "Available Tools",
+        "useDefaultPlaceholder": "Use default"
+      },
+      "summary": {
+        "title": "Cost Summary:",
+        "defaultCost": "• Default cost: ${{cost}} per query",
+        "toolCost": "• {{toolName}}: ${{cost}} per query"
+      }
+    },
+    "connectionStatus": {
+      "title": "Connection Status",
+      "incomplete": {
+        "title": "Complete required fields to test connection",
+        "description": "Fill in URL, Transport, and Authentication to test MCP server connection"
+      },
+      "state": {
+        "testing": "Testing connection to MCP server...",
+        "successful": "Connection successful",
+        "readyToSubmit": "Ready to submit",
+        "failed": "Connection failed",
+        "readyToTest": "Ready to test connection"
+      },
+      "server": "Server: {{server}}",
+      "badge": {
+        "connecting": "Connecting...",
+        "connected": "Connected",
+        "failed": "Failed"
+      },
+      "loadingTools": "Testing connection and loading tools...",
+      "previewUnavailable": "Tool preview unavailable",
+      "error": {
+        "title": "Connection Failed",
+        "stackTrace": "Stack Trace",
+        "retry": "Retry"
+      },
+      "noTools": {
+        "title": "Connection successful!",
+        "description": "No tools found for this MCP server"
+      }
+    },
+    "logoSelector": {
+      "label": "Logo",
+      "tooltipLabel": "About the logo",
+      "tooltip": "Select a well-known logo or paste a URL to any image. The logo is shown on the admin and chat pages.",
+      "selectedLabel": "Selected",
+      "customUrlPlaceholder": "Or paste a custom logo URL..."
+    },
+    "permissionManagement": {
+      "title": "Permission Management / Access Control",
+      "subtitle": "Configure access permissions and security settings (Optional)",
+      "allowAllKeys": {
+        "label": "Allow All LiteLLM Keys",
+        "tooltip": "When enabled, every API key can access this MCP server.",
+        "description": "Enable if this server should be \"public\" to all keys."
+      },
+      "internalNetworkOnly": {
+        "label": "Internal network only",
+        "tooltip": "When on, requests must come from your internal network unless the server ID is explicitly published in public_mcp_servers. Turn off to allow public IPs. Authentication and access permissions still apply.",
+        "description": "Turn on to restrict public IPs. Explicitly published server IDs remain accessible from public IPs."
+      },
+      "delegateAuth": {
+        "label": "Delegate auth to upstream (PKCE passthrough)",
+        "tooltip": "When on, LiteLLM skips its own API key/SSO check for this server and lets the client complete PKCE directly with the upstream MCP server. Only honored when Auth Type is oauth2. No spend tracking or per-key rate limiting will run on this route.",
+        "description": "Bypass LiteLLM auth so clients authenticate directly with the upstream OAuth MCP server."
+      },
+      "oauthPassthrough": {
+        "label": "OAuth pass-through",
+        "tooltip": "When on, this server is treated as an OAuth pass-through: the gateway proxies the upstream /.well-known/oauth-protected-resource metadata, emits spec-compliant 401 challenges when no bearer is supplied, and propagates upstream 401/403 responses. Only honored when Auth Type is None and 'Authorization' is in Extra Headers.",
+        "description": "Forward upstream OAuth discovery and 401 challenges so clients negotiate OAuth directly with the upstream MCP server."
+      },
+      "internalDelegateWarning": {
+        "title": "Internal server with upstream OAuth delegation",
+        "description": "This MCP server is configured as internal-only but delegates auth to upstream. Anonymous users will be able to reach the upstream OAuth2 /authorize flow without a LiteLLM session. Ensure your upstream provider and network enforce access controls."
+      },
+      "accessGroups": {
+        "label": "MCP Access Groups",
+        "tooltip": "Specify access groups for this MCP server. Users must be in at least one of these groups to access the server.",
+        "placeholder": "Select existing groups or type to create new ones"
+      },
+      "extraHeaders": {
+        "label": "Extra Headers",
+        "tooltip": "Forward custom headers from incoming requests to this MCP server (e.g., Authorization, X-Custom-Header, User-Agent)",
+        "configuredCount": "{{count}} configured",
+        "currentlyPlaceholder": "Currently: {{headers}}",
+        "placeholder": "Enter header names (e.g., Authorization, X-Custom-Header)"
+      },
+      "staticHeaders": {
+        "label": "Static Headers",
+        "tooltip": "Send these key-value headers with every request to this MCP server.",
+        "headerNameRequired": "Header name is required",
+        "headerNamePlaceholder": "Header name (e.g., X-API-Key)",
+        "clearHeaderName": "Clear header name",
+        "headerValueRequired": "Header value is required",
+        "headerValuePlaceholder": "Header value",
+        "clearHeaderValue": "Clear header value",
+        "add": "Add Static Header"
+      }
+    },
+    "createMcpServer": {
+      "payloadErrors": {
+        "invalidToolDisplayName": "Tool display name \"{{displayName}}\" is invalid. Only letters, digits, underscores, and hyphens are allowed (no spaces).",
+        "invalidStdioJson": "Invalid JSON in stdio configuration",
+        "invalidTokenValidationJson": "Invalid JSON in Token Validation Rules"
+      },
+      "toasts": {
+        "browserTokenHeld": "Token held for this browser session. Tools can now be previewed and configured; the token is not saved to LiteLLM.",
+        "oauthAuthorized": "OAuth authorization successful! Please click 'Create MCP Server' to save the configuration.",
+        "created": "MCP Server created successfully",
+        "submittedForReview": "MCP Server submitted for admin review",
+        "submittedForReviewDescription": "Once an admin approves it, the server will appear in your MCP Servers list.",
+        "createFailed": "Error creating MCP Server: {{reason}}",
+        "submitFailed": "Error submitting MCP Server: {{reason}}"
+      },
+      "logoAlt": "MCP Logo",
+      "title": {
+        "admin": "Add New MCP Server",
+        "submitForReview": "Submit MCP Server for Review"
+      },
+      "reviewNotice": "Your submission will be sent for admin review. Once approved, the server will appear in your MCP Servers list. The request must be made with a team-scoped API key.",
+      "serverName": {
+        "label": "MCP Server Name",
+        "tooltip": "Best practice: Use a descriptive name that indicates the server's purpose (e.g., 'GitHub_MCP', 'Email_Service'). Cannot contain spaces or hyphens; use underscores instead. Names must comply with SEP-986 and will be rejected if invalid (https://modelcontextprotocol.io/specification/2025-11-25/server/tools#tool-names).",
+        "placeholder": "e.g., GitHub_MCP, Zapier_MCP, etc."
+      },
+      "alias": {
+        "label": "Alias",
+        "tooltip": "A short, unique identifier for this server. Defaults to the server name if not provided. Cannot contain spaces or hyphens; use underscores instead.",
+        "placeholder": "e.g., GitHub_MCP, Zapier_MCP, etc."
+      },
+      "description": {
+        "label": "Description",
+        "placeholder": "Brief description of what this server does"
+      },
+      "sourceUrl": {
+        "label": "GitHub / Source URL"
+      },
+      "transport": {
+        "label": "Transport Type",
+        "required": "Please select a transport type",
+        "placeholder": "Select transport"
+      },
+      "url": {
+        "label": "MCP Server URL",
+        "required": "Please enter a server URL"
+      },
+      "maxConcurrentRequests": {
+        "label": "Max Concurrent Requests (optional)",
+        "tooltip": "Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.",
+        "placeholder": "e.g. 10"
+      },
+      "rpm": {
+        "label": "RPM limit (all callers)",
+        "tooltip": "Max requests per minute to this server across all keys and teams. Leave empty for no limit",
+        "placeholder": "e.g. 60"
+      },
+      "auth": {
+        "sectionTitle": "Authentication settings",
+        "typeLabel": "Authentication",
+        "typeRequired": "Please select an auth type",
+        "typePlaceholder": "Select auth type",
+        "valueLabel": "Authentication Value",
+        "valueTooltip": "Token, password, or header value to send with each request for the selected auth type.",
+        "valueWhitespace": "Authentication value cannot be empty whitespace",
+        "valuePlaceholder": "Enter token or secret"
+      },
+      "actions": {
+        "cancel": "Cancel",
+        "creating": "Creating...",
+        "submit": "Add MCP Server"
+      }
+    },
+    "serverEdit": {
+      "toasts": {
+        "browserTokenHeld": "Token held for this browser session. Tools can now be loaded and configured; the token is not saved to LiteLLM.",
+        "oauthAuthorized": "OAuth authorization successful! Please click 'Update MCP Server' to save the credentials.",
+        "persistTokenFailed": "MCP Server updated, but failed to persist OAuth token",
+        "persistTokenFailedWithReason": "MCP Server updated, but failed to persist OAuth token: {{reason}}",
+        "updated": "MCP Server updated successfully",
+        "updateFailed": "Failed to update MCP Server",
+        "updateFailedWithReason": "Failed to update MCP Server: {{reason}}"
+      },
+      "tools": {
+        "incompleteSettings": "Complete the URL, authentication, and header settings to load tools.",
+        "loadFailed": "Failed to load tools",
+        "authorizeUpstream": "Authorize with the upstream (browser-only, in the Authentication section) to load and configure this server's tools.",
+        "authenticateInToolsTab": "Authenticate with this server in the Tools tab to load and configure its tools."
+      },
+      "tabs": {
+        "server": "Server Configuration",
+        "cost": "Cost Configuration"
+      },
+      "formLabel": "Edit MCP server",
+      "fields": {
+        "serverName": "MCP Server Name",
+        "alias": "Alias",
+        "description": "Description",
+        "transport": "Transport Type",
+        "transportRequired": "Transport Type is required",
+        "url": "MCP Server URL",
+        "urlRequired": "Please enter a server URL",
+        "specUrl": "OpenAPI Spec URL",
+        "specUrlTooltip": "URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.",
+        "specUrlRequired": "Please enter an OpenAPI spec URL",
+        "maxConcurrentRequests": "Max Concurrent Requests (optional)",
+        "maxConcurrentRequestsTooltip": "Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.",
+        "maxConcurrentRequestsPlaceholder": "e.g. 10",
+        "rpm": "RPM limit (all callers)",
+        "rpmTooltip": "Max requests per minute to this server across all keys and teams. Leave empty for no limit",
+        "rpmPlaceholder": "e.g. 60",
+        "authType": "Authentication",
+        "authTypeRequired": "Authentication is required",
+        "authValue": "Authentication Value",
+        "authValueTooltip": "Token, password, or header value to send with each request for the selected auth type.",
+        "authValueWhitespace": "Authentication value cannot be empty",
+        "authValuePlaceholder": "Enter token or secret (leave blank to keep existing)"
+      },
+      "stdio": {
+        "description": "Configure the stdio transport used to launch the MCP server process. You can either fill in the fields below or paste a JSON configuration.",
+        "command": "Command",
+        "commandRequired": "Please enter a command for stdio transport",
+        "commandPlaceholder": "e.g., npx",
+        "args": "Args",
+        "argsPlaceholder": "Add args (press enter or comma)",
+        "env": "Environment (JSON object)",
+        "envInvalidJson": "Please enter valid JSON",
+        "envNotObject": "Env must be a JSON object"
+      },
+      "missingOAuthFlow": {
+        "title": "This server has no OAuth flow set",
+        "description": "Choose Machine-to-Machine (M2M) or Interactive (PKCE) so LiteLLM authenticates it the way you intend, then save. Until it is set, LiteLLM falls back to interactive per-user auth and treats a machine-to-machine credential shape conservatively."
+      },
+      "aws": {
+        "intro": "For MCP servers hosted on AWS Bedrock AgentCore.",
+        "viewDocs": "View docs →",
+        "region": {
+          "label": "AWS Region",
+          "tooltip": "AWS region for SigV4 signing (e.g., us-east-1)",
+          "placeholder": "us-east-1 (leave blank to keep existing)"
+        },
+        "serviceName": {
+          "label": "AWS Service Name",
+          "tooltip": "AWS service name for SigV4 signing. Defaults to 'bedrock-agentcore'.",
+          "placeholder": "bedrock-agentcore (leave blank to keep existing)"
+        },
+        "accessKeyId": {
+          "label": "AWS Access Key ID",
+          "tooltip": "Optional. If not provided, falls back to the boto3 credential chain (IAM role, env vars, etc.)."
+        },
+        "secretAccessKey": {
+          "label": "AWS Secret Access Key",
+          "tooltip": "Optional. Required if AWS Access Key ID is provided."
+        },
+        "sessionToken": {
+          "label": "AWS Session Token",
+          "tooltip": "Optional. Only needed for temporary STS credentials."
+        },
+        "roleArn": {
+          "label": "AWS Role ARN",
+          "tooltip": "Optional. IAM role ARN to assume via STS before signing. If set, LiteLLM calls sts:AssumeRole to get temporary credentials."
+        },
+        "sessionName": {
+          "label": "AWS Session Name",
+          "tooltip": "Optional. Session name for the AssumeRole call — appears in CloudTrail logs. Auto-generated if omitted."
+        },
+        "keepExistingPlaceholder": "Leave blank to keep existing"
+      },
+      "actions": {
+        "cancel": "Cancel",
+        "save": "Save Changes"
+      }
+    },
+    "oauthFormFields": {
+      "flowType": {
+        "label": "OAuth Flow Type",
+        "tooltip": "Choose how the proxy authenticates with this MCP server. M2M is for server-to-server communication using client credentials. Interactive (PKCE) is for user-facing flows that require browser-based authorization.",
+        "placeholder": "Select OAuth flow",
+        "m2m": {
+          "label": "Machine-to-Machine (M2M)",
+          "description": "server-to-server, no user interaction"
+        },
+        "interactive": {
+          "label": "Interactive (PKCE)",
+          "description": "browser-based user authorization"
+        }
+      },
+      "upstreamResource": {
+        "label": "Resource Indicator (optional)",
+        "tooltip": "RFC 8707 resource indicator sent to the authorization server so it mints a token audienced for this MCP server. Leave blank to send nothing, which is the default and what most providers expect. Use 'auto' to send this server's own URL. Set an exact identifier when the authorization server expects a specific one. Some providers reject this parameter and take the audience from scopes instead; if you see AADSTS901002, leave it blank. If you see invalid_target, the authorization server needs it set.",
+        "placeholder": "auto, or https://mcp.example.com/mcp"
+      },
+      "m2m": {
+        "clientId": {
+          "label": "Client ID",
+          "tooltip": "OAuth2 client ID for the client_credentials grant.",
+          "required": "Client ID is required for M2M OAuth",
+          "placeholder": "Enter OAuth client ID",
+          "placeholderEditing": "Enter OAuth client ID (leave blank to keep existing)"
+        },
+        "clientSecret": {
+          "label": "Client Secret",
+          "tooltip": "OAuth2 client secret for the client_credentials grant.",
+          "required": "Client Secret is required for M2M OAuth",
+          "placeholder": "Enter OAuth client secret",
+          "placeholderEditing": "Enter OAuth client secret (leave blank to keep existing)"
+        },
+        "tokenUrl": {
+          "label": "Token URL",
+          "tooltip": "Token endpoint URL for the client_credentials grant.",
+          "required": "Token URL is required for M2M OAuth"
+        },
+        "scopes": {
+          "label": "Scopes (optional)",
+          "tooltip": "Optional scopes to request with the client_credentials grant.",
+          "placeholder": "Add scopes"
+        }
+      },
+      "interactive": {
+        "clientId": {
+          "label": "Client ID (optional)",
+          "tooltip": "Provide only if your MCP server cannot handle dynamic client registration.",
+          "createOAuthApp": "Create OAuth App →",
+          "placeholder": "Enter client ID",
+          "placeholderEditing": "Enter client ID (leave blank to keep existing)"
+        },
+        "clientSecret": {
+          "label": "Client Secret (optional)",
+          "tooltip": "Provide only if your MCP server cannot handle dynamic client registration.",
+          "placeholder": "Enter client secret",
+          "placeholderEditing": "Enter client secret (leave blank to keep existing)"
+        },
+        "scopes": {
+          "label": "Scopes (optional)",
+          "tooltip": "Optional scopes requested during token exchange. Separate multiple scopes with enter or commas.",
+          "placeholder": "Add scopes"
+        },
+        "issuer": {
+          "label": "Issuer (optional)",
+          "tooltip": "OAuth 2.0 authorization server issuer (RFC 8414). Leave empty to discover endpoints from the upstream resource; set it to pin the trust anchor, which makes this issuer's document the only endpoint source (RFC 8414 §3.3), overriding the Authorization/Token/Registration URLs above and failing closed if its metadata cannot be fetched."
+        },
+        "authorizationUrl": {
+          "label": "Authorization URL (optional)",
+          "tooltip": "Optional override for the authorization endpoint."
+        },
+        "tokenUrl": {
+          "label": "Token URL (optional)",
+          "tooltip": "Optional override for the token endpoint."
+        },
+        "registrationUrl": {
+          "label": "Registration URL (optional)",
+          "tooltip": "Optional override for the dynamic client registration endpoint."
+        },
+        "tokenValidation": {
+          "label": "Token Validation Rules (optional)",
+          "tooltip": "JSON object of key-value rules checked against the OAuth token response before storing. Supports dot-notation for nested fields (e.g. {\"organization\": \"my-org\", \"team.id\": \"123\"}). Tokens that fail validation are rejected with HTTP 403.",
+          "invalidJson": "Must be valid JSON"
+        },
+        "tokenStorageTtl": {
+          "label": "Token Storage TTL (seconds, optional)",
+          "tooltip": "How long to cache each user's OAuth access token in Redis before evicting it (never longer than the token's own expires_in). Leave blank to derive the TTL from the token's expires_in, or fall back to the 12-hour default.",
+          "placeholder": "e.g. 3600"
+        },
+        "authorize": {
+          "description": "Use OAuth to fetch a fresh access token and temporarily save it in the session as the authentication value.",
+          "authorizing": "Waiting for authorization...",
+          "exchanging": "Exchanging authorization code...",
+          "start": "Authorize & Fetch Token",
+          "success": "Token fetched. Expires in {{expiresIn}} seconds."
+        }
+      }
+    },
+    "idJagFormFields": {
+      "orgTokenEndpoint": {
+        "label": "Org Token Endpoint (leg 1)",
+        "tooltip": "Your IdP org authorization server's token endpoint. LiteLLM exchanges the user's identity assertion here for an ID-JAG assertion (RFC 8693 with requested_token_type=urn:ietf:params:oauth:token-type:id-jag).",
+        "required": "The org token endpoint is required for ID-JAG"
+      },
+      "resourceTokenEndpoint": {
+        "label": "Resource Token Endpoint (leg 2)",
+        "tooltip": "The upstream resource authorization server's token endpoint. LiteLLM posts the ID-JAG assertion here as an RFC 7523 jwt-bearer grant to get the access token the MCP server accepts.",
+        "required": "The resource token endpoint is required for ID-JAG"
+      },
+      "clientId": {
+        "label": "Client ID",
+        "tooltip": "OAuth2 client ID LiteLLM authenticates as on both legs.",
+        "required": "Client ID is required for ID-JAG",
+        "placeholder": "Enter OAuth client ID",
+        "placeholderEditing": "Enter OAuth client ID (leave blank to keep existing)"
+      },
+      "clientSecret": {
+        "label": "Client Secret",
+        "tooltip": "Authenticates LiteLLM as the OAuth client via client_secret_post. Leave blank when using a private key instead; a private key takes precedence over this secret.",
+        "secretOrPrivateKey": "Provide either a client secret or a client private key",
+        "placeholder": "Enter OAuth client secret",
+        "placeholderEditing": "Enter OAuth client secret (leave blank to keep existing)"
+      },
+      "privateKey": {
+        "label": "Client Private Key (PEM)",
+        "tooltip": "PEM private key signing the RFC 7523 private_key_jwt client assertion. Okta Cross App Access normally requires this. When set it takes precedence over the client secret.",
+        "placeholderEditing": "{{pemHeader}} (leave blank to keep existing)"
+      },
+      "privateKeyId": {
+        "label": "Private Key ID (optional)",
+        "tooltip": "The kid advertised in the client assertion JWT header, so the IdP can select the right registered key."
+      },
+      "signingAlg": {
+        "label": "Client Assertion Signing Algorithm (optional)",
+        "tooltip": "Algorithm signing the client assertion JWT. Defaults to RS256."
+      },
+      "audience": {
+        "label": "Audience (optional)",
+        "tooltip": "RFC 8693 audience sent on leg 1, identifying the upstream the ID-JAG assertion is minted for."
+      },
+      "resource": {
+        "label": "Resource Indicator (optional)",
+        "tooltip": "RFC 8707 resource indicator sent on leg 1. Separate from Audience, which is the RFC 8693 parameter."
+      },
+      "subjectTokenType": {
+        "label": "Subject Token Type (optional)",
+        "tooltip": "Type of the identity assertion exchanged on leg 1. Defaults to urn:ietf:params:oauth:token-type:id_token."
+      },
+      "scopes": {
+        "label": "Scopes (optional)",
+        "tooltip": "Scopes requested on leg 1 of the exchange.",
+        "placeholder": "Add scopes"
+      }
+    },
+    "tokenExchangeFormFields": {
+      "profile": {
+        "label": "Profile",
+        "tooltip": "Token-exchange wire dialect. RFC 8693 is the standard token-exchange grant. Microsoft Entra OBO uses Entra's On-Behalf-Of dialect (the RFC 7523 jwt-bearer grant with requested_token_use=on_behalf_of) and carries the target resource in a scope like api://<app-id>/.default.",
+        "rfc8693": "RFC 8693 (standard)"
+      },
+      "endpoint": {
+        "label": "Token Exchange Endpoint (optional)",
+        "tooltip": "RFC 8693 token endpoint. The proxy exchanges the user's incoming token here for a scoped token used to call the upstream MCP server. Leave blank to auto-discover it from the upstream's protected-resource metadata (RFC 9728 then RFC 8414)."
+      },
+      "clientId": {
+        "label": "Client ID",
+        "tooltip": "OAuth2 client ID used to authenticate to the token exchange endpoint.",
+        "required": "Client ID is required for token exchange",
+        "placeholder": "Enter OAuth client ID",
+        "placeholderEditing": "Enter OAuth client ID (leave blank to keep existing)"
+      },
+      "clientSecret": {
+        "label": "Client Secret",
+        "tooltip": "OAuth2 client secret used to authenticate to the token exchange endpoint.",
+        "required": "Client Secret is required for token exchange",
+        "placeholder": "Enter OAuth client secret",
+        "placeholderEditing": "Enter OAuth client secret (leave blank to keep existing)"
+      },
+      "audience": {
+        "label": "Audience (optional)",
+        "tooltip": "Target audience for the exchanged token (RFC 8693 audience). Identifies the upstream MCP server the token is for."
+      },
+      "subjectTokenType": {
+        "label": "Subject Token Type (optional)",
+        "tooltip": "Type of the user's incoming token (RFC 8693 subject_token_type). Defaults to urn:ietf:params:oauth:token-type:access_token."
+      },
+      "scopes": {
+        "label": "Scopes (optional)",
+        "labelEntraObo": "Scopes",
+        "tooltip": "Optional scopes to request during the token exchange.",
+        "tooltipEntraObo": "Microsoft Entra OBO carries the target resource in the scope, so at least one is required (e.g. api://<app-id>/.default).",
+        "requiredEntraObo": "Microsoft Entra OBO requires a scope, e.g. api://<app-id>/.default",
+        "placeholder": "Add scopes"
+      }
+    },
+    "awsSigV4Fields": {
+      "intro": "For MCP servers hosted on AWS Bedrock AgentCore.",
+      "viewDocs": "View docs →",
+      "region": {
+        "label": "AWS Region",
+        "tooltip": "AWS region for SigV4 signing (e.g., us-east-1)",
+        "required": "AWS region is required for SigV4 auth"
+      },
+      "serviceName": {
+        "label": "AWS Service Name",
+        "tooltip": "AWS service name for SigV4 signing. Defaults to 'bedrock-agentcore'."
+      },
+      "accessKeyId": {
+        "label": "AWS Access Key ID",
+        "tooltip": "Optional. If not provided, falls back to the boto3 credential chain (IAM role, env vars, etc.).",
+        "requiredWithSecret": "Access Key ID is required when Secret Access Key is provided",
+        "placeholder": "AKIA... (optional — uses IAM role if blank)"
+      },
+      "secretAccessKey": {
+        "label": "AWS Secret Access Key",
+        "tooltip": "Optional. Required if AWS Access Key ID is provided.",
+        "requiredWithAccessKey": "Secret Access Key is required when Access Key ID is provided",
+        "placeholder": "Enter secret key (optional — uses IAM role if blank)"
+      },
+      "sessionToken": {
+        "label": "AWS Session Token",
+        "tooltip": "Optional. Only needed for temporary STS credentials.",
+        "placeholder": "Enter session token (optional)"
+      },
+      "roleArn": {
+        "label": "AWS Role ARN",
+        "tooltip": "Optional. IAM role ARN to assume via STS before signing. If set, LiteLLM calls sts:AssumeRole to get temporary credentials. Uses ambient credentials (IAM role, env vars) as the source identity unless explicit keys are also provided.",
+        "placeholder": "arn:aws:iam::123456789012:role/MyRole (optional)"
+      },
+      "sessionName": {
+        "label": "AWS Session Name",
+        "tooltip": "Optional. Session name for the AssumeRole call — appears in CloudTrail logs. Auto-generated if omitted.",
+        "placeholder": "litellm-prod (optional, auto-generated if blank)"
+      }
+    },
+    "passthroughAuthorizeSection": {
+      "description": "Callers bring their own upstream token for this auth type, so LiteLLM never stores tokens. To preview tools and configure the tool allowlist, authorize against the upstream here: the token stays in this browser session only and is never saved to LiteLLM. An OAuth app configured below IS saved with the server, so internal users who authorize from the Tools page go through it.",
+      "appMayNotMatchUpstream": "You changed the upstream URL or endpoints; the OAuth app entered here was registered for the previous upstream and may not be valid. Update the client ID, or clear it to use dynamic client registration.",
+      "clientId": {
+        "label": "OAuth Client ID (optional)",
+        "placeholderKeepSaved": "Leave blank to keep the currently saved app (if any)",
+        "placeholderDcr": "Leave blank to use dynamic client registration",
+        "helpKeepSaved": "Set this to make everyone authorize through a specific app; required for upstreams without dynamic client registration (e.g. a pre-registered Slack app).",
+        "helpClassChanged": "Switching the auth type discards the previously saved app; enter a client ID here or leave blank to use dynamic client registration."
+      },
+      "clientSecret": {
+        "label": "OAuth Client Secret (optional)",
+        "placeholderKeepSaved": "Leave blank to keep the currently saved secret (if any)",
+        "placeholderPublicClient": "Leave blank for public clients / PKCE"
+      },
+      "authorizationUrl": {
+        "label": "Authorization URL (optional)",
+        "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."
+      },
+      "tokenUrl": {
+        "label": "Token URL (optional)",
+        "help": "Token endpoint of the same authorization server. Leave blank to discover it from the upstream."
+      },
+      "scopes": {
+        "label": "Scopes (optional)",
+        "help": "Scopes requested from the upstream when a user authorizes. Press enter or comma between scopes.",
+        "placeholder": "Add scopes"
+      },
+      "removeStoredApp": "Remove the saved OAuth app on save (the server goes back to dynamic client registration)",
+      "authorize": {
+        "authorizing": "Waiting for authorization...",
+        "exchanging": "Exchanging authorization code...",
+        "start": "Authorize & Fetch Tools (browser-only)",
+        "success": "Token held for this browser session. Tools can now be previewed and configured; the token was not saved to LiteLLM."
+      }
+    },
+    "envVarsSection": {
+      "title": "Variables",
+      "tooltip": "Define variables you can interpolate in Static Headers or Authentication using <code>{{variableSyntax}}</code>. <br/><b>Instance</b>: admin-defined value used for every user.<br/><b>Per-user</b>: each user supplies their own value (e.g. personal credentials) via the MCP Gateway dashboard.",
+      "reference": "Reference these in Static Headers or Authentication as <code>{{variableSyntax}}</code>. For example:",
+      "columns": {
+        "name": "Variable Name",
+        "value": "Value / Description",
+        "scope": "Scope"
+      },
+      "scopes": {
+        "instance": "Instance",
+        "perUser": "Per-user"
+      },
+      "name": {
+        "required": "Variable name is required",
+        "invalid": "Use letters, digits, underscores; cannot start with a digit.",
+        "placeholder": "e.g. DB_PROTOCOL"
+      },
+      "value": {
+        "placeholder": "e.g. postgresql"
+      },
+      "hint": {
+        "label": "Hint",
+        "tooltip": "Per-user variables have no shared value. This text is only a hint shown to each user when they fill in their own value.",
+        "placeholder": "e.g. Your DB username"
+      },
+      "addVariable": "Add Variable"
+    },
+    "openApiByokFields": {
+      "byok": {
+        "label": "BYOK (Bring Your Own Key)",
+        "tooltip": "When enabled, each user provides their own API key for this service. Keys are stored per-user and never shared."
+      },
+      "headerFormat": "User keys will be sent as:",
+      "authTypeMissing": "Set the <strong>Authentication Type</strong> below to specify how user keys are sent (e.g., Bearer Token, API Key header).",
+      "accessDescription": {
+        "label": "Access Description",
+        "tooltip": "List of permissions shown to users in the connection modal (e.g. 'Create and manage Jira issues')",
+        "placeholder": "Add access description items (press Enter after each)"
+      },
+      "apiKeyHelpUrl": {
+        "label": "API Key Help URL",
+        "tooltip": "Optional link shown to users to help them find their API key"
+      }
+    },
+    "tokenEndpointAuthMethodField": {
+      "label": "Token Endpoint Auth Method (optional)",
+      "tooltip": "How the proxy authenticates to the upstream OAuth token endpoint. Client Secret Basic sends the client credentials in an HTTP Basic Authorization header; leave blank to use the default, Client Secret Post, which sends them in the request body.",
+      "placeholder": "Default (Client Secret Post)",
+      "placeholderEditing": "Leave blank to keep existing (default Client Secret Post)",
+      "methods": {
+        "clientSecretBasic": "Client Secret Basic",
+        "clientSecretPost": "Client Secret Post"
+      }
+    },
+    "upstreamTokenHeaderField": {
+      "label": "Token Header (optional)",
+      "tooltip": "Which upstream header carries the token LiteLLM resolves for this server. Leave blank to send it as 'Authorization: Bearer <token>', which is the default and what most servers expect. Set a header name when the upstream expects it elsewhere, for example an API gateway that terminates its own credential on 'esb-oauth' while a separate Authorization from Static Headers passes through to the server behind it."
+    },
+    "dcrBridgeToggle": {
+      "label": "Gateway-hosted sign-in (DCR bridge)",
+      "tooltip": "Lets OAuth-only clients like Claude Desktop register and sign in through the gateway. Turn off to relay the upstream server's own OAuth metadata instead (for clients pre-registered with the upstream IdP)."
+    },
+    "truePassthroughWarning": {
+      "title": "True Passthrough disables LiteLLM authentication for this server",
+      "description": "Anyone who can reach the gateway can call this server without a LiteLLM key. The caller's Authorization header is forwarded to the upstream verbatim, per-key and per-team rate limits and spend tracking do not apply, and the upstream is fully responsible for authenticating callers. Choose OAuth Delegate instead if callers should still authenticate to LiteLLM."
+    },
+    "servers": {
+      "sort": {
+        "label": "Sort",
+        "options": {
+          "createdDesc": "Recently created",
+          "updatedDesc": "Recently updated",
+          "nameAsc": "Name (A→Z)",
+          "health": "Health (unhealthy first)"
+        }
+      },
+      "deleteDialog": {
+        "title": "Delete MCP Server?",
+        "body": "This action is permanent and cannot be undone. All associated configurations will be removed.",
+        "fields": {
+          "name": "Name",
+          "id": "ID",
+          "url": "URL"
+        },
+        "cancel": "Cancel",
+        "deleting": "Deleting...",
+        "delete": "Delete"
+      },
+      "filters": {
+        "team": {
+          "label": "Team",
+          "allServers": "All Servers",
+          "allAvailableServers": "All Available Servers",
+          "personal": "Personal"
+        },
+        "accessGroup": {
+          "label": "Access Group",
+          "all": "All Access Groups",
+          "helpLabel": "About access groups",
+          "help": "An MCP Access Group is a set of users or teams that have permission to access specific MCP servers. Use access groups to control and organize who can connect to which servers."
+        }
+      },
+      "toasts": {
+        "deleted": "Deleted MCP Server successfully"
+      },
+      "missingAuth": "Missing required authentication parameters.",
+      "header": {
+        "title": "MCP Servers",
+        "subtitle": "Configure and manage your MCP servers",
+        "myConnections": "My Connections",
+        "importFromJson": "Import from JSON",
+        "addServer": "+ Add New MCP Server",
+        "submitServer": "+ Submit MCP Server"
+      },
+      "tabs": {
+        "allServers": "All Servers",
+        "toolsets": "Toolsets",
+        "connect": "Connect",
+        "semanticFilter": "Semantic Filter",
+        "toolSearch": "Tool Search",
+        "networkSettings": "Network Settings",
+        "submitted": "Submitted MCPs",
+        "liveConnections": "Live Connections"
+      },
+      "searchPlaceholder": "Search by name, alias, URL, or ID",
+      "resultCount": "{{shown}} of {{total}} servers",
+      "loading": "Loading MCP servers...",
+      "empty": {
+        "noServers": "No MCP servers configured. Click '+ Add New MCP Server' to get started.",
+        "noMatches": "No servers match the current filters or search."
+      }
+    },
+    "submissionsTab": {
+      "status": {
+        "active": "Active",
+        "pendingReview": "Pending Review",
+        "rejected": "Rejected"
+      },
+      "confirmDialog": {
+        "approveTitle": "Approve MCP Server",
+        "rejectTitle": "Reject MCP Server",
+        "approvePrompt": "Are you sure you want to approve <name>\"<server/>\"</name>?",
+        "rejectPrompt": "Are you sure you want to reject <name>\"<server/>\"</name>?",
+        "approveBody": "This will activate the server. The submitting user will see it in their MCP Servers list once approved.",
+        "rejectBodyLive": "This server is currently live. Rejecting it will immediately remove it from the proxy runtime.",
+        "rejectBody": "This will mark the submission as rejected.",
+        "reasonPlaceholder": "Reason for rejection (optional)",
+        "cancel": "Cancel",
+        "approve": "Approve",
+        "reject": "Reject"
+      },
+      "rulesPanel": {
+        "title": "Submission Rules",
+        "requiredFieldCount_one": "({{count}} required field)",
+        "requiredFieldCount_other": "({{count}} required fields)",
+        "noRules": "no rules set",
+        "help": "Select which fields must be filled in before a submission is considered compliant. LiteLLM will show ✓ / ✗ for each rule on every submission card below.",
+        "saving": "Saving…",
+        "save": "Save Rules",
+        "cancel": "Cancel"
+      },
+      "reviewActions": {
+        "approve": "Approve",
+        "reapprove": "Re-approve",
+        "reject": "Reject"
+      },
+      "compliance": {
+        "allPassed": "All checks passed",
+        "failedCount_one": "{{count}} check failed",
+        "failedCount_other": "{{count}} checks failed",
+        "summary": "{{passCount}} passing, {{failCount}} failing",
+        "passes": "Passes",
+        "missing": "Missing"
+      },
+      "card": {
+        "transport": "Transport:",
+        "submittedBy": "Submitted by:",
+        "rejectionReason": "Rejection reason: {{reason}}"
+      },
+      "errors": {
+        "loadFailed": "Failed to load submissions"
+      },
+      "toasts": {
+        "rulesSaved": "Submission rules saved",
+        "rulesSaveFailed": "Failed to save submission rules",
+        "approved": "MCP server \"{{serverName}}\" approved",
+        "approveFailed": "Failed to approve MCP server",
+        "rejected": "MCP server \"{{serverName}}\" rejected",
+        "rejectFailed": "Failed to reject MCP server"
+      },
+      "stats": {
+        "total": "Total Submitted"
+      },
+      "filters": {
+        "searchPlaceholder": "Search MCP servers...",
+        "allStatuses": "All Status"
+      },
+      "loading": "Loading submissions…",
+      "empty": "No MCP server submissions match your filters."
+    },
+    "toolsetsTab": {
+      "form": {
+        "errors": {
+          "nameRequired": "Please enter a toolset name"
+        }
+      },
+      "toolIssues": {
+        "serverNotFound": "server not found",
+        "serverUnreachable": "server unreachable",
+        "toolNotFound": "tool not found"
+      },
+      "serverGroup": {
+        "loadError": "Couldn't load tools for this server.",
+        "noMatchingTools": "No matching tools on this server.",
+        "noTools": "No tools found for this server.",
+        "selectMatching": "Select matching tools on {{serverName}}",
+        "selectAll": "Select all tools on {{serverName}}",
+        "selectedCount": "{{count}} selected"
+      },
+      "modal": {
+        "editTitle": "Edit Toolset",
+        "createTitle": "New Toolset",
+        "nameLabel": "Toolset Name",
+        "namePlaceholder": "e.g. github-linear-tools",
+        "descriptionLabel": "Description",
+        "descriptionPlaceholder": "Optional description",
+        "availableTools": "Available Tools",
+        "searchPlaceholder": "Search tools or servers...",
+        "searchLabel": "Search tools or servers",
+        "clearSearch": "Clear search",
+        "matchingTools_one": "{{count}} matching tool",
+        "matchingTools_other": "{{count}} matching tools",
+        "loadingServers_one": "loading {{count}} server…",
+        "loadingServers_other": "loading {{count}} servers…",
+        "selectAllMatching": "Select all matching",
+        "deselectAllMatching": "Deselect all matching",
+        "noServers": "No MCP servers configured",
+        "noSearchMatches": "No tools or servers match your search",
+        "yourToolset": "Your Toolset",
+        "toolCount": "({{count}} tools)",
+        "clearAll": "Clear all",
+        "noToolsAdded": "No tools added yet",
+        "removeTool": "Remove {{toolName}}",
+        "cancel": "Cancel",
+        "saveChanges": "Save Changes",
+        "create": "Create Toolset"
+      },
+      "emptyState": {
+        "title": "No toolsets yet",
+        "body": "Create a toolset to give keys and teams a curated set of MCP tools."
+      },
+      "usageGuide": {
+        "title": "How toolsets work",
+        "body": "Create a toolset, assign it to a key via <menu>API Keys → Edit Key → MCP Servers</menu>, then point your MCP client at the toolset URL. The client only sees the tools you picked.",
+        "configLabel": "Claude Code / Cursor config",
+        "copy": "copy"
+      },
+      "toasts": {
+        "created": "Toolset created",
+        "updated": "Toolset updated",
+        "deleted": "Toolset deleted"
+      },
+      "header": {
+        "title": "MCP Toolsets",
+        "description": "Curated collections of tools from one or more MCP servers. Assign toolsets to keys and teams via the MCP permissions dropdown.",
+        "newToolset": "New Toolset"
+      },
+      "loading": "Loading toolsets…",
+      "deleteDialog": {
+        "title": "Delete Toolset",
+        "body": "Are you sure you want to delete this toolset? Keys and teams using it will lose access to the scoped tools.",
+        "cancel": "Cancel",
+        "delete": "Delete"
+      }
+    },
+    "toolsetTableColumns": {
+      "actions": {
+        "open": "Open toolset actions",
+        "copyUrl": "Copy endpoint URL",
+        "urlCopied": "Endpoint URL copied",
+        "copyId": "Copy toolset ID",
+        "idCopied": "Toolset ID copied",
+        "edit": "Edit",
+        "delete": "Delete"
+      },
+      "columns": {
+        "toolsetId": "Toolset ID",
+        "name": "Name",
+        "description": "Description",
+        "tools": "Tools",
+        "created": "Created",
+        "actions": "Actions"
+      },
+      "moreTools": "+{{count}} more"
+    },
+    "importMcpServers": {
+      "title": "Import MCP Connectors",
+      "description": "Paste an Anthropic connector configuration: the <code>mcpServers</code> mapping from a Claude Desktop / Claude Code config file, or the <code>mcp_servers</code> array from the Anthropic Messages API.",
+      "connectorJsonLabel": "Connector JSON",
+      "toasts": {
+        "imported_one": "Imported {{count}} MCP server",
+        "imported_other": "Imported {{count}} MCP servers"
+      },
+      "errors": {
+        "requestFailed": "Import request failed. Check the proxy logs for details."
+      },
+      "result": {
+        "imported": "Imported:",
+        "skipped": "Skipped:",
+        "failed": "Failed:"
+      },
+      "close": "Close",
+      "importing": "Importing...",
+      "import": "Import"
+    },
+    "importConnectorConfig": {
+      "errors": {
+        "emptyInput": "Paste your connector JSON before importing.",
+        "invalidJson": "Invalid JSON. Check for missing quotes, commas, or brackets.",
+        "unrecognizedShape": "Expected a JSON object with an mcpServers or mcp_servers key.",
+        "mappingNotObject": "mcpServers must be an object mapping connector names to definitions.",
+        "mappingEmpty": "mcpServers contains no connectors.",
+        "listNotArray": "mcp_servers must be an array of connector definitions.",
+        "listEmpty": "mcp_servers contains no connectors."
+      }
+    },
+    "discovery": {
+      "title": "Add MCP Server",
+      "logoAlt": "MCP Logo",
+      "customServer": "+ Custom Server",
+      "allCategories": "All",
+      "otherCategory": "Other",
+      "searchPlaceholder": "Search servers...",
+      "errors": {
+        "loadFailed": "Failed to load MCP servers"
+      },
+      "loadError": "Failed to load servers: {{error}}",
+      "noServers": "No servers found.",
+      "addCustomServer": "Add a custom server"
+    },
+    "gatewaySessionsTab": {
+      "unknown": "(unknown)",
+      "idle": {
+        "seconds": "{{seconds}}s",
+        "minutes": "{{minutes}}m",
+        "minutesSeconds": "{{minutes}}m {{seconds}}s"
+      },
+      "selector": {
+        "user": "every live session opened by user {{user}}",
+        "session": "session {{sessionId}}"
+      },
+      "terminateResult_one": "Disconnected {{count}} session on worker pid {{pid}}.",
+      "terminateResult_other": "Disconnected {{count}} sessions on worker pid {{pid}}.",
+      "disconnectUser": {
+        "ariaLabel": "Disconnect all sessions for user {{user}}",
+        "label": "Disconnect all"
+      },
+      "columns": {
+        "sessions": "Sessions",
+        "actions": "Actions",
+        "session": "Session",
+        "client": "Client",
+        "user": "User",
+        "keyAlias": "Key alias",
+        "team": "Team",
+        "clientIp": "Client IP",
+        "idle": "Idle",
+        "inFlight": "In flight"
+      },
+      "loading": "Loading live connections...",
+      "loadError": {
+        "title": "Could not load live connections"
+      },
+      "empty": {
+        "noConnections": "No live MCP connections on this worker (pid {{pid}}).",
+        "connectHint": "Connect an AI client to the gateway to see it here."
+      },
+      "stats": {
+        "liveSessions": "Live sessions",
+        "aiClients": "AI clients",
+        "users": "Users"
+      },
+      "groups": {
+        "byClient": "Sessions by AI client",
+        "byUser": "Sessions by user"
+      },
+      "liveSessions": {
+        "regionLabel": "Live sessions",
+        "heading": "Live sessions (worker pid {{pid}})"
+      },
+      "disconnectSession": {
+        "ariaLabel": "Disconnect session {{sessionId}}",
+        "label": "Disconnect"
+      },
+      "header": {
+        "title": "Live Connections",
+        "description": "Stateful Streamable HTTP sessions currently open on this proxy worker, grouped by the AI client that sent the MCP initialize request and by the authenticated LiteLLM user. Stateless requests and SSE connections are not counted."
+      },
+      "refresh": {
+        "ariaLabel": "Refresh live connections",
+        "label": "Refresh"
+      },
+      "terminateError": {
+        "title": "Could not disconnect"
+      },
+      "terminateSuccess": {
+        "title": "Disconnected",
+        "followUp": "Clients holding those sessions must send a new initialize request, which re-runs authentication. Sessions on other proxy workers are not affected."
+      },
+      "confirm": {
+        "title": "Disconnect MCP session",
+        "target": "This force-closes {{target}} on this proxy worker.",
+        "consequence": "In-flight requests fail and the client must initialize again before it can call tools.",
+        "cancel": "Cancel",
+        "confirm": "Disconnect"
+      }
+    },
+    "networkSettings": {
+      "clientDialog": {
+        "addTitle": "Add client",
+        "editTitle": "Edit client",
+        "description": "The alias is the name shown in the dashboard and gateway logs. The value is the exact JWT claim or header value that identifies the client, such as the OAuth client ID your identity provider issues.",
+        "aliasLabel": "Alias",
+        "aliasPlaceholder": "e.g. Coding CLI",
+        "valueLabel": "Value",
+        "valuePlaceholder": "e.g. 0oa1b2c3d4e5f6g7h8i9",
+        "remove": "Remove client",
+        "cancel": "Cancel",
+        "add": "Add",
+        "done": "Done"
+      },
+      "saved": "MCP network settings saved",
+      "privateRanges": {
+        "title": "Private IP Ranges",
+        "description": "Define which IP ranges are part of your private network. Callers from these IPs can see all MCP servers. Callers from any other IP can only see servers marked \"Available on Public Internet\".",
+        "currentIp": "Your current IP:",
+        "suggestedRange": "Suggested range:",
+        "listTitle": "Your Private Network Ranges",
+        "removeAriaLabel": "Remove {{range}}",
+        "placeholder": "Leave empty to use defaults: 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8",
+        "hint": "Enter CIDR ranges (e.g., 10.0.0.0/8). When empty, standard private IP ranges are used."
+      },
+      "allowedClients": {
+        "title": "Allowed Clients",
+        "description": "Only the MCP client applications listed here can use the gateway. Leave empty to allow every client. A client that authenticates with a JWT is identified by the claim named in litellm_jwtauth.mcp_client_id_jwt_field in your proxy config (for example azp or client_id), which your identity provider asserts and the client cannot change. Any other client is identified by the request header configured below, if you enable one.",
+        "malformedWarning": "The stored allowlist is not a list of alias and value pairs, so every client is denied. Add the clients you want and save to replace it, or save with the list empty to remove it and allow every client again.",
+        "emptyWarning": "An empty allowlist is currently stored, so every client is denied. Save with the list empty to remove it and allow every client again.",
+        "add": "Add client",
+        "hint": "Click a client to edit or remove it. Leave the list empty to allow every client. Every MCP request from an unlisted client, or from one with no resolvable identity, gets a 403."
+      },
+      "clientIdHeader": {
+        "title": "Client Identity Header (less secure)",
+        "ariaLabel": "Client identity header",
+        "placeholder": "Leave empty to identify clients by JWT only, e.g. x-mcp-client",
+        "hint": "Optional header whose value names the client for callers without a JWT identity. Clients pick this value themselves, so it is a policy control rather than a security boundary. Without it, callers that do not carry the JWT claim are rejected while the allowlist is set."
+      },
+      "capabilities": {
+        "title": "Served Capabilities",
+        "description": "Turn off prompts or resources when none of your MCP servers offer them. A capability that is turned off is left out of the initialize response, its list calls return an empty list without contacting any upstream server, and its get or read calls are rejected.",
+        "prompts": {
+          "label": "Prompts",
+          "description": "Advertise prompts and answer prompts/list and prompts/get"
+        },
+        "resources": {
+          "label": "Resources",
+          "description": "Advertise resources and answer resources/list, resources/templates/list and resources/read"
+        }
+      },
+      "save": "Save"
+    },
+    "standardsSettings": {
+      "groups": {
+        "documentation": "Documentation",
+        "source": "Source",
+        "connection": "Connection",
+        "security": "Security"
+      },
+      "fields": {
+        "description": {
+          "label": "Description",
+          "description": "Must have a non-empty description"
+        },
+        "alias": {
+          "label": "Alias",
+          "description": "Must have a display alias"
+        },
+        "sourceUrl": {
+          "label": "GitHub / Source URL",
+          "description": "Must link to a source repository"
+        },
+        "url": {
+          "label": "Server URL",
+          "description": "Must have a URL configured"
+        },
+        "authType": {
+          "label": "Auth configured",
+          "description": "Must use authentication (not 'none')"
+        }
+      }
+    },
+    "semanticFilterTestUtils": {
+      "missingInput": "Please enter a query and select a model",
+      "notFiltered": "Semantic filter is not enabled or no tools were filtered",
+      "completed": "Semantic filter test completed successfully",
+      "failed": "Failed to test semantic filter"
+    },
+    "semanticFilterTestPanel": {
+      "title": "Test Configuration",
+      "tabs": {
+        "test": "Test",
+        "api": "API Usage"
+      },
+      "testQuery": {
+        "label": "Test Query",
+        "placeholder": "Enter a test query to see which tools would be selected..."
+      },
+      "modelLabel": "Select Model",
+      "runButton": "Test Filter",
+      "disabledAlert": {
+        "title": "Semantic filtering is disabled",
+        "description": "Enable semantic filtering and save settings to test the filter."
+      },
+      "errorAlert": {
+        "title": "Semantic filtering did not run"
+      },
+      "results": {
+        "title": "Results",
+        "summary": "{{selected}} of {{total}} tools selected",
+        "filteredOut": "{{filtered}} tools filtered out",
+        "selectedToolsLabel": "Selected Tools:",
+        "moreNotShown": "+{{more}} more selected tools not shown"
+      },
+      "api": {
+        "title": "API Usage",
+        "description": "Use this curl command to test the semantic filter with your current configuration.",
+        "headersTitle": "Response headers to check:",
+        "filterHeader": "{{header}}: shows total tools → selected tools",
+        "filterHeaderExample": "Example: 10→3",
+        "toolsHeader": "{{header}}: CSV of selected tool names",
+        "toolsHeaderExample": "Example: wikipedia-fetch,github-search,slack-post"
+      }
+    },
+    "semanticFilterSettings": {
+      "saveSuccess": {
+        "title": "Settings saved successfully",
+        "close": "Close"
+      },
+      "toasts": {
+        "updated": "Settings updated successfully. Changes will be applied across all pods within 10 seconds."
+      },
+      "loginRequired": "Please log in to configure semantic filter settings.",
+      "loadError": {
+        "title": "Could not load MCP Semantic Filter settings"
+      },
+      "intro": {
+        "title": "Semantic Tool Filtering",
+        "description": "Filter MCP tools semantically based on query relevance. This reduces context window size and improves tool selection accuracy. Click 'Save Settings' to apply changes across all pods (takes effect within 10 seconds)."
+      },
+      "updateError": {
+        "title": "Could not update settings"
+      },
+      "configuration": {
+        "title": "Configuration"
+      },
+      "fields": {
+        "enabled": {
+          "label": "Enable Semantic Filtering",
+          "hint": "When enabled, only the most relevant MCP tools will be included in requests based on semantic similarity"
+        },
+        "embeddingModel": {
+          "label": "Embedding Model",
+          "hint": "The model used to generate embeddings for semantic matching",
+          "loadingPlaceholder": "Loading models...",
+          "placeholder": "Select embedding model",
+          "loadingEmpty": "Loading...",
+          "empty": "No embedding models available"
+        },
+        "topK": {
+          "label": "Top K Results",
+          "hint": "Maximum number of tools to return after filtering"
+        },
+        "similarityThreshold": {
+          "label": "Similarity Threshold",
+          "hint": "Minimum similarity score (0-1) for a tool to be included"
+        }
+      },
+      "save": "Save Settings"
+    },
+    "toolSearchSettings": {
+      "toasts": {
+        "updated": "Settings updated successfully. Changes will be applied across all pods within 10 seconds."
+      },
+      "loginRequired": "Please log in to configure tool search.",
+      "loadError": {
+        "title": "Could not load MCP tool search settings"
+      },
+      "intro": {
+        "title": "Native MCP Tool Search",
+        "description": "Controls the <code>mcp_tool_search</code> virtual tool that native MCP clients call to discover tools. With an embedding model set, tools are ranked by the meaning of their name and description, so a query like \"FX\" finds a \"foreign exchange rates\" tool. Without one, keyword matching is used. Callers only ever see tools their key, team and server permissions already allow."
+      },
+      "ranking": {
+        "title": "Ranking"
+      },
+      "coreTools": {
+        "title": "Core Tools"
+      },
+      "fields": {
+        "embeddingModel": {
+          "label": "Embedding Model",
+          "hint": "Embedding model from your model list used to rank tools by meaning. Clear it to fall back to keyword matching.",
+          "loadingPlaceholder": "Loading models...",
+          "placeholder": "Keyword matching (no embedding model)",
+          "loadingEmpty": "Loading...",
+          "empty": "No embedding models available"
+        },
+        "topK": {
+          "label": "Top K Results",
+          "hint": "Most ranked tools a search returns. A smaller top_k in the tool call wins. Core tools do not count."
+        },
+        "similarityThreshold": {
+          "label": "Similarity Threshold",
+          "hint": "Lowest cosine similarity a tool needs to appear in semantic results. 0 means no cutoff."
+        },
+        "coreTools": {
+          "label": "Always Returned First",
+          "hint": "One tool name per line, e.g. my_server-get_rates. Listed before ranked results whenever the caller is allowed to use them."
+        }
+      },
+      "save": "Save Settings"
+    },
+    "connect": {
+      "title": "Connect to your MCP client",
+      "description": "Use tools directly from any MCP client with LiteLLM MCP. Enable your AI assistant to perform real-world tasks through a simple, secure connection.",
+      "featureCard": {
+        "serverHeaderToggle": "Limit tools to specific MCP servers or MCP groups by passing the <code>x-mcp-servers</code> header",
+        "optionsTitle": "Two Options",
+        "optionServer": "<strong>Option 1:</strong> Get a specific server: <code>\"<server/>\"</code>",
+        "optionGroup": "<strong>Option 2:</strong> Get a group of MCPs: <code>\"{{group}}\"</code>",
+        "optionMix": "You can also mix both: <code>\"{{example}}\"</code>"
+      },
+      "codeBlocks": {
+        "environmentVariable": "Environment Variable",
+        "serverUrl": "Server URL",
+        "headersConfiguration": "Headers Configuration"
+      },
+      "serverInfoCard": {
+        "title": "MCP Server Information",
+        "description": "Connection details for your LiteLLM MCP server"
+      },
+      "implementationExampleCard": {
+        "title": "Implementation Example"
+      },
+      "litellmTab": {
+        "title": "LiteLLM Proxy API Integration",
+        "description": "Connect to LiteLLM Proxy Responses API for seamless tool integration with multiple model providers",
+        "virtualKeyCard": {
+          "title": "Virtual Key Setup",
+          "description": "Configure your LiteLLM Proxy Virtual Key for authentication",
+          "instructions": "Get your Virtual Key from your LiteLLM Proxy dashboard or contact your administrator"
+        },
+        "exampleDescription": "Complete cURL example for using the LiteLLM Proxy Responses API"
+      },
+      "openaiTab": {
+        "title": "OpenAI Responses API Integration",
+        "description": "Connect OpenAI Responses API to your LiteLLM MCP server for seamless tool integration",
+        "apiKeyCard": {
+          "title": "API Key Setup",
+          "description": "Configure your OpenAI API key for authentication",
+          "instructions": "Get your API key from the <docs>OpenAI platform <icon/></docs>"
+        },
+        "exampleDescription": "Complete cURL example for using the Responses API"
+      },
+      "cursorTab": {
+        "title": "Cursor IDE Integration",
+        "description": "Use tools directly from Cursor IDE with LiteLLM MCP. Enable your AI assistant to perform real-world tasks without leaving your coding environment.",
+        "setupTitle": "Setup Instructions",
+        "steps": {
+          "openSettings": {
+            "title": "Open Cursor Settings",
+            "body": "Use the keyboard shortcut <kbd>⇧+⌘+J</kbd> (Mac) or <kbd>Ctrl+Shift+J</kbd> (Windows/Linux)"
+          },
+          "navigate": {
+            "title": "Navigate to MCP Tools",
+            "body": "Go to the \"MCP Tools\" tab and click \"New MCP Server\""
+          },
+          "addConfiguration": {
+            "title": "Add Configuration",
+            "body": "Copy the JSON configuration below and paste it into Cursor, then save with <kbd>Cmd+S</kbd> or <kbd>Ctrl+S</kbd>"
+          }
+        },
+        "configurationCard": {
+          "title": "Configuration",
+          "description": "Cursor MCP configuration"
+        }
+      },
+      "httpTab": {
+        "title": "Streamable HTTP Transport",
+        "description": "Connect to LiteLLM MCP using HTTP transport. Compatible with any MCP client that supports HTTP streaming.",
+        "connectionCard": {
+          "title": "Universal MCP Connection",
+          "description": "Use this URL with any MCP client that supports HTTP transport",
+          "instructions": "Each MCP client supports different transports. Refer to your client documentation to determine the appropriate transport method."
+        },
+        "learnMore": "Learn more about MCP transports"
+      }
+    },
+    "serverCard": {
+      "actionsMenu": {
+        "label": "Server actions",
+        "testConnection": "Test Connection",
+        "delete": "Delete"
+      },
+      "stdioDisabled": "stdio disabled",
+      "oauthFlowUnset": {
+        "badge": "OAuth flow not set",
+        "tooltip": "This OAuth server has no flow set (Machine-to-Machine vs Interactive). Open it and choose an OAuth Flow Type so LiteLLM authenticates it as you intend."
+      },
+      "missingFields": {
+        "summary_one": "{{count}} user field missing",
+        "summary_other": "{{count}} user fields missing",
+        "tooltipTitle": "Missing user fields:",
+        "set": "Set"
+      },
+      "healthChip": {
+        "checking": "Checking",
+        "health": "Health: {{status}}",
+        "lastCheck": "Last check: {{time}}",
+        "error": "Error",
+        "noData": "No health data",
+        "clickToRecheck": "Click to recheck"
+      },
+      "userFieldsRow": {
+        "label": "Per-user credentials",
+        "set": "Set",
+        "update": "Update"
+      },
+      "byokRow": {
+        "label": "BYOK credential",
+        "connected": "Connected",
+        "update": "Update",
+        "connect": "Connect"
+      }
+    },
+    "userEnvVarsModal": {
+      "title": "Set your credentials",
+      "perUserBadge": "Per-user",
+      "fallbackServerName": "MCP Server",
+      "loadFailed": "Failed to load env vars",
+      "noFields": "No per-user fields configured for this server.",
+      "intro": "These values are private to you. Your admin configured this MCP server to require these per-user credentials. Saved values are never shown back; leave an already-set field blank to keep it, or enter a value to set or change it.",
+      "form": {
+        "setBadge": "Set",
+        "required": "{{name}} is required",
+        "overwritePlaceholder": "Enter a new value to overwrite",
+        "placeholder": "Enter your {{name}}",
+        "clear": "Clear",
+        "cancel": "Cancel",
+        "save": "Save Credentials"
+      },
+      "toasts": {
+        "saved": "Credentials saved",
+        "saveFailed": "Failed to save env vars: {{error}}",
+        "cleared": "Credentials cleared",
+        "clearFailed": "Failed to clear env vars: {{error}}"
+      },
+      "clearDialog": {
+        "title": "Clear saved credentials",
+        "description": "This deletes every per-user value you saved for {{server}}. Your next MCP request to this server fails until you set them again.",
+        "cancel": "Cancel",
+        "confirm": "Clear credentials"
+      }
+    },
+    "serverUserCredentialsPanel": {
+      "title": "User Credentials",
+      "description": "Per-user OAuth2 tokens and BYOK API keys stored for this server. Revoking one deletes it from the database and clears the cached copy, so the user must connect again before the gateway will call this server for them.",
+      "refresh": "Refresh",
+      "refreshAriaLabel": "Refresh user credentials",
+      "credentialTypes": {
+        "byokApiKey": "BYOK API key"
+      },
+      "loading": "Loading user credentials...",
+      "loadError": "Could not load user credentials",
+      "empty": "No user has a stored credential for this server.",
+      "tableLabel": "Stored user credentials",
+      "columns": {
+        "user": "User",
+        "type": "Type",
+        "connected": "Connected",
+        "expires": "Expires",
+        "updated": "Updated",
+        "actions": "Actions"
+      },
+      "revoke": "Revoke",
+      "revokeAriaLabel": "Revoke credential for user {{user}}",
+      "revokeError": "Could not revoke credential",
+      "revokeSuccess": {
+        "title": "Credential revoked",
+        "description": "The stored {{type}} credential for user {{user}} was deleted."
+      },
+      "revokeDialog": {
+        "title": "Revoke stored credential",
+        "target": "This deletes the {{type}} credential stored for user {{user}}.",
+        "consequence": "Their next MCP request to this server fails until they connect again.",
+        "cancel": "Cancel",
+        "confirm": "Revoke"
+      }
+    },
+    "useMcpOAuthFlow": {
+      "errors": {
+        "missingAdminToken": "Missing admin token",
+        "accessTokenMissing": "Access token missing. Please re-authenticate and try again.",
+        "incompleteServer": "Please complete server URL and transport before starting OAuth.",
+        "resumeFailed": "Failed to resume OAuth flow. Please retry."
+      },
+      "toasts": {
+        "tokenRetrieved": "OAuth token retrieved successfully"
+      }
+    },
+    "useToolsOAuthFlow": {
+      "errors": {
+        "resumeFailed": "Failed to resume OAuth flow. Please retry."
+      },
+      "toasts": {
+        "connected": "Connected successfully"
+      }
+    },
+    "utils": {
+      "networkAccess": {
+        "allNetworks": {
+          "label": "All Networks",
+          "publicDescription": "Allows requests from public and internal IPs. Authentication and access permissions still apply",
+          "hubDescription": "Allows requests from public and internal IPs because this server is published in MCP Hub. Authentication and access permissions still apply"
+        },
+        "internalOnly": {
+          "label": "Internal Only",
+          "description": "Allows requests only from internal/private IP ranges. Authentication and access permissions still apply"
+        },
+        "unknown": {
+          "label": "Unknown",
+          "description": "The proxy did not report enough network and publication settings to determine allowed client IPs"
+        }
+      },
+      "validation": {
+        "invalidUrl": "Please enter a valid URL (e.g., http://service-name.domain:1234/path or https://example.com)",
+        "invalidServerName": "Cannot contain '-' (hyphen) or spaces. Please use '_' (underscore) instead.",
+        "invalidToolDisplayName": "Only letters, digits, underscores, and hyphens are allowed (no spaces)."
+      }
+    },
+    "serverCostDisplay": {
+      "noConfig": "No cost configuration set for this server. Tool calls will be charged at $0.00 per tool call.",
+      "defaultCostTitle": "Default Cost per Query",
+      "toolCostsTitle": "Tool-Specific Costs",
+      "costPerQuery": "${{cost}} per query",
+      "summaryTitle": "Cost Summary:",
+      "summaryDefaultCost": "• Default cost: ${{cost}} per query",
+      "summaryToolCount": "• {{toolCount}} tool(s) with custom pricing"
+    },
+    "toolCallArguments": {
+      "validation": {
+        "required": "Please enter {{field}}",
+        "invalidOption": "Please select a valid {{field}}",
+        "invalidJson": "Invalid JSON",
+        "expectedObject": "Please enter a JSON object",
+        "expectedArray": "Please enter a JSON array"
+      }
+    },
+    "serverView": {
+      "backToServers": "Back to All Servers",
+      "unnamedServer": "Unnamed Server",
+      "copyServerName": "Copy server name",
+      "copyServerId": "Copy server id",
+      "hideFullUrl": "Hide full URL",
+      "showFullUrl": "Show full URL",
+      "tabs": {
+        "overview": "Overview",
+        "tools": "MCP Tools",
+        "settings": "Settings",
+        "userCredentials": "User Credentials"
+      },
+      "overview": {
+        "transport": "Transport",
+        "authentication": "Authentication",
+        "hostUrl": "Host URL",
+        "costConfiguration": "Cost Configuration"
+      },
+      "settings": {
+        "title": "MCP Server Settings",
+        "edit": "Edit Settings",
+        "definedInConfig": "Defined in config. Edit your YAML configuration to make changes",
+        "fields": {
+          "serverName": "Server Name",
+          "alias": "Alias",
+          "description": "Description",
+          "url": "URL",
+          "transport": "Transport",
+          "authentication": "Authentication",
+          "extraHeaders": "Extra Headers",
+          "allowAllKeys": "Allow All Keys",
+          "networkAccess": "Network access",
+          "delegateAuth": "Delegate Auth to Upstream",
+          "oauthPassthrough": "OAuth Pass-through",
+          "accessGroups": "Access Groups",
+          "allowedTools": "Allowed Tools",
+          "cost": "Cost"
+        },
+        "status": {
+          "enabled": "Enabled",
+          "disabled": "Disabled",
+          "enabledPkcePassthrough": "Enabled (PKCE passthrough)",
+          "allToolsEnabled": "All tools enabled"
+        }
+      }
+    },
+    "toolConfiguration": {
+      "toolRow": {
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "customName": "Custom name",
+        "callable": "✓ Users can call this tool",
+        "notCallable": "✗ Users cannot call this tool",
+        "editTitle": "Edit display name and description",
+        "displayNameLabel": "Display Name",
+        "displayNameInvalid": "Only letters, digits, underscores, and hyphens are allowed (no spaces).",
+        "displayNameHelp": "Override how this tool's name appears to users. Leave blank to use original.",
+        "descriptionLabel": "Description",
+        "noDescription": "No description",
+        "descriptionHelp": "Override the tool description shown to users. Leave blank to use original."
+      },
+      "title": "Tool Configuration",
+      "viewModes": {
+        "riskGroups": "Risk Groups",
+        "flatList": "Flat List"
+      },
+      "intro": "<strong>Select which tools users can call:</strong> Only checked tools will be available for users to invoke. Unchecked tools will be blocked from execution.",
+      "loading": "Loading tools...",
+      "loadError": "Unable to load tools",
+      "noToolsFromSpec": "No tools loaded from spec",
+      "expectedTools": "Expected tools: {{tools}}",
+      "noTools": {
+        "title": "No tools available for configuration",
+        "hint": "Connect to an MCP server with tools to configure them"
+      },
+      "incomplete": {
+        "title": "Complete required fields to configure tools",
+        "hint": "Fill in URL, Transport, and Authentication to load available tools"
+      },
+      "enabledSummary_one": "{{enabled}} of {{count}} tool enabled for user access",
+      "enabledSummary_other": "{{enabled}} of {{count}} tools enabled for user access",
+      "searchPlaceholder": "Search tools by name or description...",
+      "noMatches": "No tools found matching \"{{searchTerm}}\"",
+      "suggestedTools": "Suggested tools",
+      "allTools": "All tools",
+      "tools": "Tools",
+      "enableAll": "Enable all",
+      "disableAll": "Disable all"
+    },
+    "toolTestPanel": {
+      "defaultInputDescription": "Input for this tool",
+      "toasts": {
+        "resultCopied": "Result copied to clipboard",
+        "resultCopyFailed": "Failed to copy result",
+        "toolNameCopied": "Tool name copied to clipboard",
+        "toolNameCopyFailed": "Failed to copy tool name"
+      },
+      "logoAlt": "{{serverName}} logo",
+      "title": "Test Tool:",
+      "copyToolNameTitle": "Click to copy tool name",
+      "provider": "Provider: {{serverName}}",
+      "close": "Close",
+      "inputParameters": "Input Parameters",
+      "inputParametersTooltip": "Configure the input parameters for this tool call",
+      "toolResult": "Tool Result",
+      "empty": {
+        "title": "Ready to Call Tool",
+        "description": "Configure the input parameters and click \"Call Tool\" to see the results here."
+      },
+      "success": "Tool executed successfully",
+      "duration": "• {{seconds}}s",
+      "formatted": "Formatted",
+      "copyResponse": "Copy response",
+      "calling": {
+        "title": "Calling tool...",
+        "description": "Please wait while we process your request"
+      },
+      "failed": "Tool Call Failed",
+      "textResponse": "Text Response",
+      "imageResponse": "Image Response",
+      "imageAlt": "Tool result",
+      "embeddedResource": "Embedded Resource",
+      "resourceType": "Resource Type: {{resourceType}}",
+      "viewResource": "View Resource"
+    },
+    "tools": {
+      "title": "MCP Tools",
+      "additionalHeaders": "Additional Headers",
+      "hide": "Hide",
+      "configure": "Configure",
+      "headersRequired": "This server requires additional headers. Click \"Configure\" to provide values.",
+      "headerPlaceholder": "Enter {{headerName}}",
+      "loadTools": "Load Tools",
+      "headersConfigured": "{{headerCount}} header(s) configured",
+      "availableTools": "Available Tools",
+      "authRequired": "Authentication required",
+      "authenticateToView": "Authenticate to view available tools",
+      "authenticateUpstream": "Authenticate with the upstream provider to view available tools",
+      "authorize": "Authorize",
+      "searchPlaceholder": "Search tools...",
+      "loading": "Loading tools...",
+      "error": "Error: {{message}}",
+      "noTools": {
+        "title": "No tools available",
+        "description": "No tools found for this server"
+      },
+      "noMatches": {
+        "title": "No tools found",
+        "description": "No tools match \"{{searchTerm}}\""
+      },
+      "logoAlt": "{{serverName}} logo",
+      "selected": "Selected",
+      "playground": {
+        "title": "Tool Testing Playground",
+        "emptyTitle": "Select a Tool to Test",
+        "emptyDescription": "Choose a tool from the left sidebar to start testing its functionality with custom inputs."
+      }
+    },
+    "toolArgumentsForm": {
+      "boolean": {
+        "true": "True",
+        "false": "False"
+      },
+      "jsonObjectPlaceholder": "Enter JSON object for {{field}}",
+      "jsonArrayPlaceholder": "Enter JSON array for {{field}}",
+      "jsonObjectHint": "Provide a valid JSON object.",
+      "jsonArrayHint": "Provide a valid JSON array.",
+      "selectPlaceholder": "Select {{field}}",
+      "emptyString": "Empty string",
+      "enterPlaceholder": "Enter {{field}}",
+      "singleInput": {
+        "label": "Input",
+        "placeholder": "Enter input for this tool"
+      },
+      "noParameters": {
+        "title": "No Parameters Required",
+        "description": "This tool can be called without any input parameters."
+      },
+      "callButton": {
+        "calling": "Calling Tool...",
+        "callAgain": "Call Again",
+        "call": "Call Tool"
+      }
+    }
+  },
+  "mcpTools": {
+    "byokCredentialModal": {
+      "errors": {
+        "connectFailed": "Failed to connect"
+      },
+      "fallbackServiceName": "Service",
+      "toasts": {
+        "apiKeyRequired": "Please enter your API key",
+        "connected": "Connected to {{server}}"
+      },
+      "back": "Back",
+      "intro": {
+        "title": "Connect {{server}}",
+        "description": "LiteLLM needs access to {{server}} to complete your request.",
+        "howItWorksTitle": "How it works",
+        "howItWorks": "LiteLLM acts as a secure bridge. Your requests are routed through our MCP client directly to {{server}}'s API.",
+        "requestedAccess": "Requested Access",
+        "continue": "Continue to Authentication",
+        "cancel": "Cancel"
+      },
+      "apiKey": {
+        "title": "Provide API Key",
+        "description": "Enter your {{server}} API key to authorize this connection.",
+        "label": "{{server}} API Key",
+        "placeholder": "Enter your API key",
+        "helpLink": "Where do I find my API key?",
+        "saveForFuture": "Save key for future use",
+        "securityNote": "Your key is stored securely and transmitted over HTTPS. It is never shared with third parties.",
+        "authorize": "Connect & Authorize"
+      }
+    },
+    "crudPermissionPanel": {
+      "risk": {
+        "high": "High Risk",
+        "medium": "Medium Risk",
+        "low": "Safe",
+        "unknown": "Unclassified"
+      },
+      "allowedCount": "{{allowed}}/{{total}} allowed",
+      "groupState": {
+        "allOn": "All on",
+        "partial": "Partial",
+        "allOff": "All off"
+      },
+      "allowAllAria": "Allow all {{label}} tools",
+      "toolState": {
+        "on": "on",
+        "off": "off"
+      }
+    }
+  },
+  "mcpOAuthCallback": {
+    "authorizationComplete": "Authorization complete. You may close this window and return to the LiteLLM dashboard.",
+    "manualCloseHint": "If the window does not close automatically, everything is still saved—you can close it manually.",
+    "loading": "Loading..."
+  },
+  "mcpServerManagement": {
+    "toolPermissions": {
+      "inherited": {
+        "accessGroup": "Via access group: {{name}}",
+        "toolset": "Via toolset: {{name}}",
+        "toolPermission": "Via tool permissions"
+      },
+      "fetchFailed": "Failed to fetch tools",
+      "serversFailed": {
+        "title": "Unable to load MCP servers",
+        "description": "This list is incomplete; servers granted directly or through an access group may be missing. Reload before changing tool permissions"
+      },
+      "emptyAccessGroup": {
+        "title": "Access group \"{{group}}\" has 0 servers",
+        "description": "No MCP server lists this group, so it grants nothing. A server defined in config.yaml joins a group through its <code>access_groups</code> key; <code>mcp_access_groups</code> is ignored there"
+      },
+      "toolsetsFailed": {
+        "title": "Unable to load toolsets",
+        "description": "Servers reached through the selected toolsets are not listed below"
+      },
+      "loadingServers": "Loading MCP servers...",
+      "allToolsAllowed": "All tools allowed, including tools added to this server later",
+      "ambiguousKeys": "Also granted by {{keys}}, which names another server too. Those tools stay allowed here until the servers no longer share that name",
+      "lockedByToolset_one": "{{tools}} is granted by a selected toolset, so it stays allowed here; edit the toolset to revoke it",
+      "lockedByToolset_other": "{{tools}} are granted by a selected toolset, so they stay allowed here; edit the toolset to revoke them",
+      "viewModes": {
+        "riskGroups": "Risk Groups",
+        "flatList": "Flat List"
+      },
+      "selectAll": "Select All",
+      "deselectAll": "Deselect All",
+      "loadingTools": "Loading tools...",
+      "loadToolsFailed": "Unable to load tools",
+      "noDescription": "No description",
+      "noTools": "No tools available"
+    },
+    "serverSelector": {
+      "placeholder": "Select MCP servers",
+      "optionTypes": {
+        "accessGroup": "Access Group",
+        "mcpServer": "MCP Server",
+        "toolset": "Toolset"
+      },
+      "allProxyServers": "All Proxy MCP Servers",
+      "noServers": "No MCP Servers",
+      "blockAll": "Block all",
+      "empty": "No MCP servers found"
+    }
   }
 }
diff --git a/ui/litellm-dashboard/src/lib/http/schema.d.ts b/ui/litellm-dashboard/src/lib/http/schema.d.ts
index 96d4c0e1bc4..3aa7c888e98 100644
--- a/ui/litellm-dashboard/src/lib/http/schema.d.ts
+++ b/ui/litellm-dashboard/src/lib/http/schema.d.ts
@@ -38948,6 +38948,11 @@ export interface components {
              * @default false
              */
             supports_background_chat: boolean;
+            /**
+             * Supports Continuation
+             * @default false
+             */
+            supports_continuation: boolean;
             /**
              * Supports Fast Mode
              * @default false
diff --git a/ui/litellm-dashboard/src/lib/toast.test.ts b/ui/litellm-dashboard/src/lib/toast.test.ts
index b4a776f123a..8f50bd5f5c7 100644
--- a/ui/litellm-dashboard/src/lib/toast.test.ts
+++ b/ui/litellm-dashboard/src/lib/toast.test.ts
@@ -108,6 +108,93 @@ describe("toast", () => {
       });
     });
 
+    it.each([
+      {
+        status: 403,
+        type: "permission_error",
+        litellmType: "team_model_access_denied",
+        fn: sonner.error,
+        title: "Access Denied",
+      },
+      {
+        status: 401,
+        type: "authentication_error",
+        litellmType: "auth_error",
+        fn: sonner.error,
+        title: "Authentication Error",
+      },
+      {
+        status: 422,
+        type: "invalid_request_error",
+        litellmType: "budget_exceeded",
+        fn: sonner.warning,
+        title: "Budget Exceeded",
+      },
+      {
+        status: 503,
+        type: "api_error",
+        litellmType: "no_db_connection",
+        fn: sonner.error,
+        title: "Service Unavailable",
+      },
+      {
+        status: 429,
+        type: "rate_limit_error",
+        litellmType: undefined,
+        fn: sonner.warning,
+        title: "Rate Limit Exceeded",
+      },
+      {
+        status: 422,
+        type: "invalid_request_error",
+        litellmType: undefined,
+        fn: sonner.error,
+        title: "Validation Error",
+      },
+    ])(
+      "titles an Anthropic SDK $status $type error from the Messages playground by its proxy type $litellmType, else its status",
+      ({ status, type, litellmType, fn, title }) => {
+        const body = JSON.stringify({
+          type: "error",
+          error: { type, message: "Team not allowed to access model", litellm_error_type: litellmType },
+        });
+        toast.fromError(
+          `Error occurred while generating model response. Please try again. Error: Error: ${status} ${body}`,
+        );
+        expect(fn).toHaveBeenCalledWith(title, {
+          description: `Error occurred while generating model response. Please try again. Error: Error: ${status} Team not allowed to access model`,
+          duration: 6000,
+        });
+      },
+    );
+
+    it("titles an Anthropic error body with no status by its Anthropic type", () => {
+      toast.fromError(JSON.stringify({ type: "error", error: { type: "permission_error", message: "denied" } }));
+      expect(sonner.error).toHaveBeenCalledWith("Access Denied", { description: "denied", duration: 6000 });
+    });
+
+    it.each([
+      ["billing_error", "Request Error"],
+      ["conflict_error", "Already Exists"],
+      ["timeout_error", "Server Error"],
+    ])("titles an Anthropic %s body with no status as %s", (type, title) => {
+      toast.fromError(JSON.stringify({ type: "error", error: { type, message: "boom" } }));
+      expect(sonner.error).toHaveBeenCalledWith(title, { description: "boom", duration: 6000 });
+    });
+
+    it.each([
+      ["an OpenAI envelope", { error: { type: "invalid_request_error", message: "boom" } }],
+      ["a body with no Anthropic type", { detail: { error: "boom" } }],
+    ])("keeps the plain Error title for %s after a status in the message", (_, payload) => {
+      toast.fromError(`Request failed: 404 ${JSON.stringify(payload)}`);
+      expect(sonner.error).toHaveBeenCalledWith("Error", { description: "Request failed: 404 boom", duration: 6000 });
+    });
+
+    it("reads no status from a number longer than three digits before the envelope", () => {
+      toast.fromError(`request 98765 ${JSON.stringify({ error: { message: "boom" } })}`);
+      expect(sonner.error).toHaveBeenCalledWith("Error", { description: "request 98765 boom", duration: 6000 });
+    });
+
     it("leaves a string alone when its braces are not a JSON envelope", () => {
       toast.fromError("Template {name} is invalid");
       expect(sonner.error).toHaveBeenCalledWith("Error", {
diff --git a/ui/litellm-dashboard/src/lib/toast.ts b/ui/litellm-dashboard/src/lib/toast.ts
index a7a4ce45ad0..1546156803c 100644
--- a/ui/litellm-dashboard/src/lib/toast.ts
+++ b/ui/litellm-dashboard/src/lib/toast.ts
@@ -13,6 +13,7 @@ export type ToastOptions = {
 type ErrorFacts = {
   readonly status: number | undefined;
   readonly proxyType: string | undefined;
+  readonly anthropicType: string | undefined;
   readonly text: string;
 };
 
@@ -46,6 +47,20 @@ const STATUS_TITLES: Readonly<Record<number, string>> = {
   503: "Service Unavailable",
 };
 
+const ANTHROPIC_TYPE_TITLES: Readonly<Record<string, string>> = {
+  invalid_request_error: "Request Error",
+  authentication_error: "Authentication Error",
+  billing_error: "Request Error",
+  permission_error: "Access Denied",
+  not_found_error: "Not Found",
+  conflict_error: "Already Exists",
+  request_too_large: "Request Error",
+  rate_limit_error: "Rate Limit Exceeded",
+  api_error: "Server Error",
+  timeout_error: "Server Error",
+  overloaded_error: "Service Unavailable",
+};
+
 const WARNING_TITLES: ReadonlySet<string> = new Set(["Budget Exceeded", "Rate Limit Exceeded"]);
 
 const asRecord = (value: unknown): Record<string, unknown> | undefined =>
@@ -71,28 +86,47 @@ const proxyEnvelope = (payload: unknown): Record<string, unknown> | undefined =>
 };
 
 const proxyTypeOf = (payload: unknown): string | undefined => {
-  const type = proxyEnvelope(payload)?.type;
+  const envelope = proxyEnvelope(payload);
+  const type = envelope?.litellm_error_type ?? envelope?.type;
   return typeof type === "string" ? type : undefined;
 };
 
+const anthropicTypeOf = (payload: unknown): string | undefined => {
+  const record = asRecord(payload);
+  const type = asRecord(record?.error)?.type;
+  return record?.type === "error" && typeof type === "string" ? type : undefined;
+};
+
 const EMBEDDED_JSON = /\{[\s\S]*\}/;
+const STATUS_BEFORE_JSON = /(?<!\d)([1-5]\d{2})\s*$/;
+
+const statusBefore = (text: string, embedded: string): number | undefined =>
+  toStatus(text.slice(0, text.indexOf(embedded)).match(STATUS_BEFORE_JSON)?.[1]);
 
 const describeText = (text: string): ErrorFacts => {
   const embedded = text.match(EMBEDDED_JSON)?.[0];
   const parsed = embedded === undefined ? undefined : parseJson(embedded);
   if (embedded === undefined || asRecord(parsed) === undefined) {
-    return { status: undefined, proxyType: undefined, text: unwrapProxyErrorMessage(text) };
+    return { status: undefined, proxyType: undefined, anthropicType: undefined, text: unwrapProxyErrorMessage(text) };
   }
+  const anthropicType = anthropicTypeOf(parsed);
   return {
-    status: toStatus(proxyEnvelope(parsed)?.code),
+    status:
+      toStatus(proxyEnvelope(parsed)?.code) ?? (anthropicType === undefined ? undefined : statusBefore(text, embedded)),
     proxyType: proxyTypeOf(parsed),
+    anthropicType,
     text: text.replace(embedded, unwrapProxyErrorMessage(deriveErrorMessage(parsed))).trim(),
   };
 };
 
 const describeError = (input: unknown): ErrorFacts => {
   if (input instanceof ApiError) {
-    return { status: input.status, proxyType: proxyTypeOf(input.body), text: unwrapProxyErrorMessage(input.message) };
+    return {
+      status: input.status,
+      proxyType: proxyTypeOf(input.body),
+      anthropicType: anthropicTypeOf(input.body),
+      text: unwrapProxyErrorMessage(input.message),
+    };
   }
   if (input instanceof Error || typeof input === "string") {
     return describeText(input instanceof Error ? input.message : input);
@@ -107,6 +141,7 @@ const describeError = (input: unknown): ErrorFacts => {
       toStatus(record.code) ??
       toStatus(proxyEnvelope(payload)?.code),
     proxyType: proxyTypeOf(payload),
+    anthropicType: anthropicTypeOf(payload),
     text: unwrapProxyErrorMessage(deriveErrorMessage(payload)),
   };
 };
@@ -119,11 +154,12 @@ const titleForStatus = (status: number): string => {
   return "Error";
 };
 
-const titleFor = ({ status, proxyType }: ErrorFacts): string => {
+const titleFor = ({ status, proxyType, anthropicType }: ErrorFacts): string => {
   if (proxyType?.endsWith("_access_denied")) return "Access Denied";
   const byType = proxyType === undefined ? undefined : PROXY_TYPE_TITLES[proxyType];
   if (byType !== undefined) return byType;
-  return status === undefined ? "Error" : titleForStatus(status);
+  if (status !== undefined) return titleForStatus(status);
+  return (anthropicType === undefined ? undefined : ANTHROPIC_TYPE_TITLES[anthropicType]) ?? "Error";
 };
 
 const show = (kind: ToastKind, message: ReactNode, options?: ToastOptions): void => {
diff --git a/uv.lock b/uv.lock
index 19d3a1ffd4f..e5948530f17 100644
--- a/uv.lock
+++ b/uv.lock
@@ -5262,7 +5262,7 @@ requires-dist = [
     { name = "httpx", extras = ["http2"], specifier = ">=0.28.0,<1.0" },
     { name = "httpx2", marker = "extra == 'mcp'", specifier = ">=2.10.0,<3" },
     { name = "httpx2", marker = "extra == 'proxy'", specifier = ">=2.10.0,<3" },
-    { name = "huggingface-hub", specifier = ">=0.34.0,<2.0" },
+    { name = "huggingface-hub", specifier = ">=0.34.0,<3.0" },
     { name = "importlib-metadata", specifier = ">=8.0.0,<9.0" },
     { name = "inquirerpy", marker = "extra == 'cli'", specifier = ">=0.3.4,<1.0" },
     { name = "inquirerpy", marker = "extra == 'proxy'", specifier = ">=0.3.4,<1.0" },