From 68a8fc2207d1ee24c6196317a01b8f5f7d685155 Mon Sep 17 00:00:00 2001
From: Mubashir Osmani <mubashir@berri.ai>
Date: Thu, 2 Jul 2026 00:55:54 +0000
Subject: [PATCH 01/26] feat(s3_v2): send Content-MD5 on PUT and optional
 server-side encryption

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 litellm/integrations/s3_v2.py                 |  21 +++
 tests/test_litellm/integrations/test_s3_v2.py | 136 ++++++++++++++++++
 2 files changed, 157 insertions(+)

diff --git a/litellm/integrations/s3_v2.py b/litellm/integrations/s3_v2.py
index 939289f96ea..db12d1d2c26 100644
--- a/litellm/integrations/s3_v2.py
+++ b/litellm/integrations/s3_v2.py
@@ -54,6 +54,7 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
         s3_strip_base64_files: bool = False,
         s3_use_key_prefix: bool = False,
         s3_use_virtual_hosted_style: bool = False,
+        s3_server_side_encryption: Optional[str] = None,
         s3_callback_params_override: Optional[dict] = None,
         **kwargs,
     ):
@@ -92,6 +93,7 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
                 s3_strip_base64_files=s3_strip_base64_files,
                 s3_use_key_prefix=s3_use_key_prefix,
                 s3_use_virtual_hosted_style=s3_use_virtual_hosted_style,
+                s3_server_side_encryption=s3_server_side_encryption,
             )
             verbose_logger.debug(f"s3 logger using endpoint url {s3_endpoint_url}")
 
@@ -145,6 +147,7 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
         s3_strip_base64_files: bool = False,
         s3_use_key_prefix: bool = False,
         s3_use_virtual_hosted_style: bool = False,
+        s3_server_side_encryption: Optional[str] = None,
         params_source: Optional[dict] = None,
     ):
         """
@@ -194,6 +197,8 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
             bool(params.get("s3_use_virtual_hosted_style", False)) or s3_use_virtual_hosted_style
         )
 
+        self.s3_server_side_encryption = params.get("s3_server_side_encryption") or s3_server_side_encryption
+
         return
 
     async def async_log_success_event(self, kwargs, response_obj, start_time, end_time):
@@ -273,6 +278,7 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
 
     async def async_upload_data_to_s3(self, batch_logging_element: s3BatchLoggingElement):
         try:
+            import base64
             import hashlib
 
             import requests
@@ -317,14 +323,21 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
 
             # Calculate SHA256 hash of the content
             content_hash = hashlib.sha256(json_string.encode("utf-8")).hexdigest()
+            content_md5 = base64.b64encode(hashlib.md5(json_string.encode("utf-8")).digest()).decode()
 
             # Prepare the request
             headers = {
                 "Content-Type": "application/json",
+                "Content-MD5": content_md5,
                 "x-amz-content-sha256": content_hash,
                 "Content-Language": "en",
                 "Content-Disposition": f'inline; filename="{batch_logging_element.s3_object_download_filename}"',
                 "Cache-Control": "private, immutable, max-age=31536000, s-maxage=0",
+                **(
+                    {"x-amz-server-side-encryption": self.s3_server_side_encryption}
+                    if self.s3_server_side_encryption
+                    else {}
+                ),
             }
             req = requests.Request("PUT", url, data=json_string, headers=headers)
             prepped = req.prepare()
@@ -447,6 +460,7 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
 
     def upload_data_to_s3(self, batch_logging_element: s3BatchLoggingElement):
         try:
+            import base64
             import hashlib
 
             import requests
@@ -482,14 +496,21 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
 
             # Calculate SHA256 hash of the content
             content_hash = hashlib.sha256(json_string.encode("utf-8")).hexdigest()
+            content_md5 = base64.b64encode(hashlib.md5(json_string.encode("utf-8")).digest()).decode()
 
             # Prepare the request
             headers = {
                 "Content-Type": "application/json",
+                "Content-MD5": content_md5,
                 "x-amz-content-sha256": content_hash,
                 "Content-Language": "en",
                 "Content-Disposition": f'inline; filename="{batch_logging_element.s3_object_download_filename}"',
                 "Cache-Control": "private, immutable, max-age=31536000, s-maxage=0",
+                **(
+                    {"x-amz-server-side-encryption": self.s3_server_side_encryption}
+                    if self.s3_server_side_encryption
+                    else {}
+                ),
             }
             req = requests.Request("PUT", url, data=json_string, headers=headers)
             prepped = req.prepare()
diff --git a/tests/test_litellm/integrations/test_s3_v2.py b/tests/test_litellm/integrations/test_s3_v2.py
index 3f21de41c53..3331f9f4f5e 100644
--- a/tests/test_litellm/integrations/test_s3_v2.py
+++ b/tests/test_litellm/integrations/test_s3_v2.py
@@ -1194,3 +1194,139 @@ def test_s3_callback_params_override_empty_dict_is_opt_in():
         assert logger.s3_bucket_name is None
     finally:
         litellm.s3_callback_params = original
+
+
+def _expected_content_md5(payload: dict) -> str:
+    import base64
+    import hashlib
+
+    from litellm.litellm_core_utils.safe_json_dumps import safe_dumps
+
+    json_string = safe_dumps(payload)
+    return base64.b64encode(hashlib.md5(json_string.encode("utf-8")).digest()).decode()
+
+
+@pytest.mark.asyncio
+async def test_async_upload_sets_content_md5_header():
+    """
+    Object Lock buckets reject PUTs without a Content-MD5 header (AWS spec).
+    The async upload must send a base64 md5 of the exact signed body.
+    """
+    from unittest.mock import AsyncMock, MagicMock
+
+    from litellm.types.integrations.s3_v2 import s3BatchLoggingElement
+
+    logger = S3Logger(
+        s3_bucket_name="test-bucket",
+        s3_aws_access_key_id="test-key",
+        s3_aws_secret_access_key="test-secret",
+        s3_region_name="us-east-1",
+    )
+
+    payload = {"test": "content-md5"}
+    test_element = s3BatchLoggingElement(
+        s3_object_key="2025-09-14/test-md5.json",
+        payload=payload,
+        s3_object_download_filename="test-md5.json",
+    )
+
+    response = MagicMock()
+    response.status_code = 200
+    response.raise_for_status = MagicMock()
+    logger.async_httpx_client = AsyncMock()
+    logger.async_httpx_client.put.return_value = response
+
+    await logger.async_upload_data_to_s3(test_element)
+
+    headers = logger.async_httpx_client.put.call_args.kwargs["headers"]
+    assert headers["Content-MD5"] == _expected_content_md5(payload)
+    assert "x-amz-server-side-encryption" not in headers
+
+
+def test_sync_upload_sets_content_md5_header():
+    """The sync upload path must also send Content-MD5 for Object Lock buckets."""
+    from unittest.mock import MagicMock
+
+    from litellm.types.integrations.s3_v2 import s3BatchLoggingElement
+
+    logger = S3Logger(
+        s3_bucket_name="test-bucket",
+        s3_aws_access_key_id="test-key",
+        s3_aws_secret_access_key="test-secret",
+        s3_region_name="us-east-1",
+    )
+
+    payload = {"test": "sync-content-md5"}
+    test_element = s3BatchLoggingElement(
+        s3_object_key="2025-09-14/test-sync-md5.json",
+        payload=payload,
+        s3_object_download_filename="test-sync-md5.json",
+    )
+
+    response = MagicMock()
+    response.status_code = 200
+    response.raise_for_status = MagicMock()
+    mock_sync_client = MagicMock()
+    mock_sync_client.put.return_value = response
+
+    with patch(
+        "litellm.integrations.s3_v2._get_httpx_client",
+        return_value=mock_sync_client,
+    ):
+        logger.upload_data_to_s3(test_element)
+
+    headers = mock_sync_client.put.call_args.kwargs["headers"]
+    assert headers["Content-MD5"] == _expected_content_md5(payload)
+    assert "x-amz-server-side-encryption" not in headers
+
+
+@pytest.mark.asyncio
+async def test_async_upload_sets_server_side_encryption_header_when_configured():
+    """
+    When s3_server_side_encryption is set (e.g. buckets with a KMS default
+    encryption policy), the PUT must carry x-amz-server-side-encryption.
+    """
+    from unittest.mock import AsyncMock, MagicMock
+
+    from litellm.types.integrations.s3_v2 import s3BatchLoggingElement
+
+    logger = S3Logger(
+        s3_bucket_name="test-bucket",
+        s3_aws_access_key_id="test-key",
+        s3_aws_secret_access_key="test-secret",
+        s3_region_name="us-east-1",
+        s3_server_side_encryption="aws:kms",
+    )
+
+    test_element = s3BatchLoggingElement(
+        s3_object_key="2025-09-14/test-sse.json",
+        payload={"test": "sse"},
+        s3_object_download_filename="test-sse.json",
+    )
+
+    response = MagicMock()
+    response.status_code = 200
+    response.raise_for_status = MagicMock()
+    logger.async_httpx_client = AsyncMock()
+    logger.async_httpx_client.put.return_value = response
+
+    await logger.async_upload_data_to_s3(test_element)
+
+    headers = logger.async_httpx_client.put.call_args.kwargs["headers"]
+    assert headers["x-amz-server-side-encryption"] == "aws:kms"
+
+
+def test_s3_server_side_encryption_read_from_callback_params():
+    """s3_server_side_encryption can be configured via s3_callback_params."""
+    import litellm
+
+    original = litellm.s3_callback_params
+    litellm.s3_callback_params = {
+        "s3_bucket_name": "from-global",
+        "s3_server_side_encryption": "aws:kms",
+    }
+    try:
+        logger = S3Logger()
+        assert logger.s3_server_side_encryption == "aws:kms"
+    finally:
+        litellm.s3_callback_params = original

From e542be17addeb0b47d3cbaf18ebe50d0f3ceabad Mon Sep 17 00:00:00 2001
From: Mubashir Osmani <mubashir@berri.ai>
Date: Thu, 2 Jul 2026 01:12:49 +0000
Subject: [PATCH 02/26] fix(s3_v2): pass usedforsecurity=False to hashlib.md5
 for FIPS envs

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 litellm/integrations/s3_v2.py                 | 8 ++++++--
 tests/test_litellm/integrations/test_s3_v2.py | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/litellm/integrations/s3_v2.py b/litellm/integrations/s3_v2.py
index db12d1d2c26..5b953035cfd 100644
--- a/litellm/integrations/s3_v2.py
+++ b/litellm/integrations/s3_v2.py
@@ -323,7 +323,9 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
 
             # Calculate SHA256 hash of the content
             content_hash = hashlib.sha256(json_string.encode("utf-8")).hexdigest()
-            content_md5 = base64.b64encode(hashlib.md5(json_string.encode("utf-8")).digest()).decode()
+            content_md5 = base64.b64encode(
+                hashlib.md5(json_string.encode("utf-8"), usedforsecurity=False).digest()
+            ).decode()
 
             # Prepare the request
             headers = {
@@ -496,7 +498,9 @@ class S3Logger(CustomBatchLogger, BaseAWSLLM):
 
             # Calculate SHA256 hash of the content
             content_hash = hashlib.sha256(json_string.encode("utf-8")).hexdigest()
-            content_md5 = base64.b64encode(hashlib.md5(json_string.encode("utf-8")).digest()).decode()
+            content_md5 = base64.b64encode(
+                hashlib.md5(json_string.encode("utf-8"), usedforsecurity=False).digest()
+            ).decode()
 
             # Prepare the request
             headers = {
diff --git a/tests/test_litellm/integrations/test_s3_v2.py b/tests/test_litellm/integrations/test_s3_v2.py
index 3331f9f4f5e..070e278cdc0 100644
--- a/tests/test_litellm/integrations/test_s3_v2.py
+++ b/tests/test_litellm/integrations/test_s3_v2.py
@@ -1203,7 +1203,9 @@ def _expected_content_md5(payload: dict) -> str:
     from litellm.litellm_core_utils.safe_json_dumps import safe_dumps
 
     json_string = safe_dumps(payload)
-    return base64.b64encode(hashlib.md5(json_string.encode("utf-8")).digest()).decode()
+    return base64.b64encode(
+        hashlib.md5(json_string.encode("utf-8"), usedforsecurity=False).digest()
+    ).decode()
 
 
 @pytest.mark.asyncio

From 29cc4e35d65a7d191e7c6d38b50d99f1315616d5 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 2 Jul 2026 01:16:21 +0000
Subject: [PATCH 03/26] fix: allow S3 Content-MD5 on FIPS hosts

---
 tests/test_litellm/integrations/test_s3_v2.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/test_litellm/integrations/test_s3_v2.py b/tests/test_litellm/integrations/test_s3_v2.py
index 070e278cdc0..246b378c982 100644
--- a/tests/test_litellm/integrations/test_s3_v2.py
+++ b/tests/test_litellm/integrations/test_s3_v2.py
@@ -1208,8 +1208,21 @@ def _expected_content_md5(payload: dict) -> str:
     ).decode()
 
 
+def _require_non_security_md5(monkeypatch):
+    import hashlib
+
+    original_md5 = hashlib.md5
+
+    def fips_md5(data=b"", *, usedforsecurity=True):
+        if usedforsecurity:
+            raise ValueError("MD5 blocked for security use")
+        return original_md5(data, usedforsecurity=usedforsecurity)
+
+    monkeypatch.setattr(hashlib, "md5", fips_md5)
+
+
 @pytest.mark.asyncio
-async def test_async_upload_sets_content_md5_header():
+async def test_async_upload_sets_content_md5_header(monkeypatch):
     """
     Object Lock buckets reject PUTs without a Content-MD5 header (AWS spec).
     The async upload must send a base64 md5 of the exact signed body.
@@ -1231,6 +1244,7 @@ async def test_async_upload_sets_content_md5_header():
         payload=payload,
         s3_object_download_filename="test-md5.json",
     )
+    _require_non_security_md5(monkeypatch)
 
     response = MagicMock()
     response.status_code = 200
@@ -1245,7 +1259,7 @@ async def test_async_upload_sets_content_md5_header():
     assert "x-amz-server-side-encryption" not in headers
 
 
-def test_sync_upload_sets_content_md5_header():
+def test_sync_upload_sets_content_md5_header(monkeypatch):
     """The sync upload path must also send Content-MD5 for Object Lock buckets."""
     from unittest.mock import MagicMock
 
@@ -1264,6 +1278,7 @@ def test_sync_upload_sets_content_md5_header():
         payload=payload,
         s3_object_download_filename="test-sync-md5.json",
     )
+    _require_non_security_md5(monkeypatch)
 
     response = MagicMock()
     response.status_code = 200

From bea8c9380bed3f12d6071ca9deae7f4eb80e5061 Mon Sep 17 00:00:00 2001
From: yuneng-jiang <yuneng@berri.ai>
Date: Thu, 2 Jul 2026 14:09:39 -0700
Subject: [PATCH 04/26] refactor(ui): drive cache settings form from a typed
 frontend schema (#31939)

* refactor(ui): drive cache settings form from a typed frontend schema

The Cache Settings form was dynamically generated from field metadata
shipped by the backend, and read its values back out of the DOM with
document.querySelector. That loses type safety and makes client-side
validation awkward, which is a poor fit for a form whose shape only
changes when a developer edits code.

Move the field definitions (name, label, type, default, help text, which
redis type they apply to, section, and validation rules) into a typed
frontend module and render them through antd Form with controlled state.
The GET /cache/settings endpoint is still used to populate current values,
and the save/test payload shape sent to POST /cache/settings and
/cache/settings/test is unchanged. Per-field validation now lives on each
field's antd rules, so an inline error can surface before and on submit;
this is where the upcoming Redis URL validation will slot in.

The backend's fields output in GET /cache/settings is no longer consumed
by the UI, but is left in place since removing it is a separate backend
change.

* refactor(ui): validate list-field JSON inline so bad input blocks save

sentinel_nodes and redis_startup_nodes had no validation rule, so
malformed JSON passed validateFields, was caught while building the save
payload, and the field was silently omitted; the user's cluster/sentinel
config was discarded with no feedback. Add a jsonListRule (same shape as
portRule) to both list fields so an invalid value surfaces inline and
blocks save.

* fix(ui): show valid-JSON examples for cache list fields and clarify the error

The Startup Nodes and Sentinel Nodes help text showed Python-style
single-quoted examples (e.g. [{'host': '127.0.0.1', 'port': '7001'}]),
which the JSON validator correctly rejects, so pasting the example we
display failed. Switch both examples to valid JSON with double quotes and
change the parse-error message to "Must be a valid JSON array (use double
quotes)" so the hint points at the fix. Also add a regression test
asserting a numeric field (Database Index) is included in the save payload.

* fix(ui): validate numeric cache fields as text so bad input blocks save

Numeric fields (Database Index, TTL, Max Connections, Similarity
Threshold) rendered as antd InputNumber, which silently coerces
non-numeric input to empty. Because the fields are optional, an invalid
entry like a full connection URL pasted into Database Index passed
validation and was silently dropped from the save payload.

Render numeric fields as text inputs with a validation rule (non-negative
integer for Database Index and Max Connections, number for TTL and
Similarity Threshold), mirroring how Port already works, so invalid input
is preserved, flagged inline, and blocks submit instead of vanishing. The
save payload still coerces these to real numbers. Adds a regression test
for a non-numeric value entered into a numeric field.
---
 ui/litellm-dashboard/eslint-metrics.json      |   4 +-
 ui/litellm-dashboard/eslint-suppressions.json |   5 -
 .../cache_settings/CacheFieldGroup.test.tsx   | 138 ---------
 .../cache_settings/CacheFieldGroup.tsx        |  47 ----
 .../CacheFieldRenderer.test.tsx               | 126 ---------
 .../cache_settings/CacheFieldRenderer.tsx     | 149 ----------
 .../cache_settings/CacheFieldSection.tsx      |  42 +++
 .../cache_settings/CacheFormField.tsx         |  54 ++++
 .../cache_settings/RedisTypeSelector.tsx      |   2 +-
 .../cache_settings/cacheSettingsFields.ts     | 261 ++++++++++++++++++
 .../cache_settings/cacheSettingsUtils.test.ts |  86 ++++++
 .../cache_settings/cacheSettingsUtils.ts      | 169 +++++-------
 .../components/cache_settings/index.test.tsx  | 147 ++++++++++
 .../components/cache_settings/index.tsx       | 246 ++++++++---------
 14 files changed, 780 insertions(+), 696 deletions(-)
 delete mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.test.tsx
 delete mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.tsx
 delete mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.test.tsx
 delete mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.tsx
 create mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldSection.tsx
 create mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFormField.tsx
 create mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsFields.ts
 create mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.test.ts
 create mode 100644 ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/index.test.tsx

diff --git a/ui/litellm-dashboard/eslint-metrics.json b/ui/litellm-dashboard/eslint-metrics.json
index 92c5a991eb6..4475ce0e74b 100644
--- a/ui/litellm-dashboard/eslint-metrics.json
+++ b/ui/litellm-dashboard/eslint-metrics.json
@@ -1,5 +1,5 @@
 {
-  "@typescript-eslint/no-explicit-any": 2013,
+  "@typescript-eslint/no-explicit-any": 1991,
   "complexity": 126,
-  "max-depth": 61
+  "max-depth": 59
 }
diff --git a/ui/litellm-dashboard/eslint-suppressions.json b/ui/litellm-dashboard/eslint-suppressions.json
index 7ea13deb934..44c0d8f55ef 100644
--- a/ui/litellm-dashboard/eslint-suppressions.json
+++ b/ui/litellm-dashboard/eslint-suppressions.json
@@ -834,11 +834,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/caching/components/cache_settings/RedisTypeSelector.tsx": {
     "no-restricted-imports": {
       "count": 1
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.test.tsx
deleted file mode 100644
index 6eba0718948..00000000000
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.test.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { describe, it, expect, beforeEach, vi } from "vitest";
-import { render, screen, cleanup } from "@testing-library/react";
-import CacheFieldGroup from "./CacheFieldGroup";
-
-describe("CacheFieldGroup", () => {
-  vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({
-    default: () => ({
-      token: "mock-token",
-      accessToken: "mock-access-token",
-      userId: "mock-user-id",
-      userEmail: "test@example.com",
-      userRole: "Admin",
-      premiumUser: false,
-      disabledPersonalKeyCreation: false,
-      showSSOBanner: false,
-    }),
-  }));
-
-  beforeEach(() => {
-    cleanup();
-  });
-
-  it("should filter and render fields based on redisType", () => {
-    /**
-     * Tests that CacheFieldGroup filters fields based on redis_type and redisType prop.
-     * This is the core functionality that shows/hides fields based on Redis deployment type.
-     */
-    const fields = [
-      {
-        field_name: "host",
-        field_type: "String",
-        ui_field_name: "Host",
-        redis_type: null, // Applies to all types
-      },
-      {
-        field_name: "redis_startup_nodes",
-        field_type: "List",
-        ui_field_name: "Startup Nodes",
-        redis_type: "cluster", // Only for cluster
-      },
-      {
-        field_name: "sentinel_nodes",
-        field_type: "List",
-        ui_field_name: "Sentinel Nodes",
-        redis_type: "sentinel", // Only for sentinel
-      },
-    ];
-
-    const cacheSettings = {
-      host: "localhost",
-      redis_startup_nodes: [],
-    };
-
-    // Test with cluster type - should show host and redis_startup_nodes
-    const { rerender } = render(
-      <CacheFieldGroup title="Cluster Settings" fields={fields} cacheSettings={cacheSettings} redisType="cluster" />,
-    );
-
-    expect(screen.getByText("Cluster Settings")).toBeInTheDocument();
-    expect(screen.getAllByText("Host")).toHaveLength(1);
-    expect(screen.getByText("Startup Nodes")).toBeInTheDocument();
-    expect(screen.queryByText("Sentinel Nodes")).not.toBeInTheDocument();
-
-    // Test with sentinel type - should show host and sentinel_nodes
-    rerender(
-      <CacheFieldGroup title="Sentinel Settings" fields={fields} cacheSettings={cacheSettings} redisType="sentinel" />,
-    );
-
-    expect(screen.getByText("Sentinel Settings")).toBeInTheDocument();
-    expect(screen.getAllByText("Host")).toHaveLength(1);
-    expect(screen.getByText("Sentinel Nodes")).toBeInTheDocument();
-    expect(screen.queryByText("Startup Nodes")).not.toBeInTheDocument();
-
-    // Test with node type - should only show host
-    rerender(<CacheFieldGroup title="Node Settings" fields={fields} cacheSettings={cacheSettings} redisType="node" />);
-
-    expect(screen.getByText("Node Settings")).toBeInTheDocument();
-    expect(screen.getAllByText("Host")).toHaveLength(1);
-    expect(screen.queryByText("Startup Nodes")).not.toBeInTheDocument();
-    expect(screen.queryByText("Sentinel Nodes")).not.toBeInTheDocument();
-  });
-
-  it("should return null when no fields are visible", () => {
-    /**
-     * Tests that CacheFieldGroup returns null when no fields match the redisType.
-     * This prevents rendering empty sections in the UI.
-     */
-    const fields = [
-      {
-        field_name: "redis_startup_nodes",
-        field_type: "List",
-        ui_field_name: "Startup Nodes",
-        redis_type: "cluster", // Only for cluster
-      },
-    ];
-
-    const cacheSettings = {};
-
-    const { container } = render(
-      <CacheFieldGroup
-        title="Cluster Settings"
-        fields={fields}
-        cacheSettings={cacheSettings}
-        redisType="node" // No fields match this type
-      />,
-    );
-
-    // Component should return null, so container should be empty
-    expect(container.firstChild).toBeNull();
-  });
-
-  it("should use field_default when currentValue is not available", () => {
-    /**
-     * Tests that CacheFieldGroup falls back to field_default when currentValue is missing.
-     * This ensures fields display default values when cache settings are not set.
-     */
-    const fields = [
-      {
-        field_name: "port",
-        field_type: "Integer",
-        ui_field_name: "Port",
-        field_default: 6379,
-        redis_type: null,
-      },
-    ];
-
-    const cacheSettings = {}; // No port value set
-
-    render(
-      <CacheFieldGroup title="Connection Settings" fields={fields} cacheSettings={cacheSettings} redisType="node" />,
-    );
-
-    const input = screen.getByRole("spinbutton", { name: "" });
-    expect(input).toBeInTheDocument();
-    expect(input).toHaveAttribute("name", "port");
-    expect(input).toHaveValue(6379);
-  });
-});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.tsx
deleted file mode 100644
index 21eb0199853..00000000000
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldGroup.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from "react";
-import CacheFieldRenderer from "./CacheFieldRenderer";
-
-interface CacheFieldGroupProps {
-  title: string;
-  fields: any[];
-  cacheSettings: { [key: string]: any };
-  redisType: string;
-  gridCols?: string;
-}
-
-const CacheFieldGroup: React.FC<CacheFieldGroupProps> = ({
-  title,
-  fields,
-  cacheSettings,
-  redisType,
-  gridCols = "grid-cols-1 gap-6 sm:grid-cols-2",
-}) => {
-  const shouldShowField = (field: any): boolean => {
-    // Show field if it applies to all types (redis_type is null/undefined) or to current selected type
-    if (field.redis_type === null || field.redis_type === undefined) {
-      return true;
-    }
-
-    return field.redis_type === redisType;
-  };
-
-  const visibleFields = fields.filter(shouldShowField);
-
-  if (visibleFields.length === 0) {
-    return null;
-  }
-
-  return (
-    <div className="space-y-6 pt-4 border-t border-gray-200">
-      <h4 className="text-sm font-medium text-gray-900">{title}</h4>
-      <div className={`grid ${gridCols}`}>
-        {visibleFields.map((field) => {
-          const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-          return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-        })}
-      </div>
-    </div>
-  );
-};
-
-export default CacheFieldGroup;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.test.tsx
deleted file mode 100644
index 3cfacac7fda..00000000000
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.test.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import { describe, it, expect, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
-import CacheFieldRenderer from "./CacheFieldRenderer";
-
-// Mock the useAuthorized hook to avoid Next.js router dependency
-vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({
-  default: () => ({
-    token: "mock-token",
-    accessToken: "mock-access-token",
-    userId: "mock-user-id",
-    userEmail: "test@example.com",
-    userRole: "Admin",
-    premiumUser: false,
-    disabledPersonalKeyCreation: false,
-    showSSOBanner: false,
-  }),
-}));
-
-describe("CacheFieldRenderer", () => {
-  it("should render a checkbox for Boolean field type", () => {
-    /**
-     * Tests that Boolean fields render as checkboxes with proper defaultChecked value.
-     * This is the core functionality for boolean cache settings.
-     */
-    const field = {
-      field_name: "ssl",
-      field_type: "Boolean",
-      ui_field_name: "Enable SSL",
-      field_description: "Enable SSL encryption",
-    };
-
-    render(<CacheFieldRenderer field={field} currentValue={true} />);
-
-    const checkbox = screen.getByRole("checkbox", { name: "" });
-    expect(checkbox).toBeInTheDocument();
-    expect(checkbox).toBeChecked();
-    expect(screen.getByText("Enable SSL")).toBeInTheDocument();
-    expect(screen.getByText("Enable SSL encryption")).toBeInTheDocument();
-  });
-
-  it("should render a textarea for List field type", () => {
-    /**
-     * Tests that List fields render as textareas with JSON stringified values.
-     * This handles array/list cache settings like redis_startup_nodes.
-     */
-    const field = {
-      field_name: "redis_startup_nodes",
-      field_type: "List",
-      ui_field_name: "Redis Startup Nodes",
-      field_description: "List of Redis cluster nodes",
-    };
-
-    const currentValue = [
-      { host: "localhost", port: 6379 },
-      { host: "localhost", port: 6380 },
-    ];
-
-    render(<CacheFieldRenderer field={field} currentValue={currentValue} />);
-
-    const textarea = screen.getByRole("textbox");
-    expect(textarea).toBeInTheDocument();
-    expect(textarea.tagName).toBe("TEXTAREA");
-    expect(textarea).toHaveValue(JSON.stringify(currentValue, null, 2));
-    expect(screen.getByText("Redis Startup Nodes")).toBeInTheDocument();
-  });
-
-  it("should render a password input for password field", () => {
-    /**
-     * Tests that password fields render as password inputs.
-     * This ensures sensitive data is masked in the UI.
-     */
-    const field = {
-      field_name: "password",
-      field_type: "String",
-      ui_field_name: "Password",
-      field_description: "Redis password",
-    };
-
-    render(<CacheFieldRenderer field={field} currentValue="secret123" />);
-
-    const input = screen.getByPlaceholderText("Redis password");
-    expect(input).toBeInTheDocument();
-    expect(input).toHaveAttribute("type", "password");
-    expect(input).toHaveValue("secret123");
-  });
-
-  it("should render a number input for Integer field type", () => {
-    /**
-     * Tests that Integer fields render as number inputs.
-     * This ensures proper validation for numeric cache settings.
-     */
-    const field = {
-      field_name: "port",
-      field_type: "Integer",
-      ui_field_name: "Port",
-      field_description: "Redis port number",
-    };
-
-    render(<CacheFieldRenderer field={field} currentValue={6379} />);
-
-    const input = screen.getByPlaceholderText("Redis port number");
-    expect(input).toBeInTheDocument();
-    expect(input).toHaveAttribute("type", "number");
-    expect(input).toHaveValue(6379);
-  });
-
-  it("should render a text input for String field type", () => {
-    /**
-     * Tests that String fields render as text inputs.
-     * This is the default rendering for text-based cache settings.
-     */
-    const field = {
-      field_name: "host",
-      field_type: "String",
-      ui_field_name: "Host",
-      field_description: "Redis host address",
-    };
-
-    render(<CacheFieldRenderer field={field} currentValue="localhost" />);
-
-    const input = screen.getByPlaceholderText("Redis host address");
-    expect(input).toBeInTheDocument();
-    expect(input).toHaveAttribute("type", "text");
-    expect(input).toHaveValue("localhost");
-  });
-});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.tsx
deleted file mode 100644
index 27d9fc57200..00000000000
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldRenderer.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-"use client";
-
-import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
-import { NumberInput, TextInput } from "@tremor/react";
-import { Select } from "antd";
-import React, { useEffect, useState } from "react";
-import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
-import NumericalInput from "@/components/shared/numerical_input";
-
-interface CacheFieldRendererProps {
-  field: any;
-  currentValue: any;
-}
-
-const CacheFieldRenderer: React.FC<CacheFieldRendererProps> = ({ field, currentValue }) => {
-  const [modelInfo, setModelInfo] = useState<ModelGroup[]>([]);
-  const [selectedModel, setSelectedModel] = useState<string>(currentValue || "");
-  const { accessToken } = useAuthorized();
-
-  useEffect(() => {
-    if (!accessToken) return;
-
-    const loadModels = async () => {
-      try {
-        const uniqueModels = await fetchAvailableModels(accessToken);
-        console.log("Fetched models for selector:", uniqueModels);
-
-        if (uniqueModels.length > 0) {
-          setModelInfo(uniqueModels);
-        }
-      } catch (error) {
-        console.error("Error fetching model info:", error);
-      }
-    };
-
-    loadModels();
-  }, [accessToken]);
-
-  if (field.field_type === "Boolean") {
-    return (
-      <div className="space-y-2">
-        <label className="text-sm font-medium text-gray-700">{field.ui_field_name}</label>
-        <div className="flex items-center">
-          <input
-            type="checkbox"
-            name={field.field_name}
-            defaultChecked={currentValue === true || currentValue === "true"}
-            className="h-4 w-4 text-indigo-600 focus:ring-indigo-500 border-gray-300 rounded"
-          />
-          <span className="ml-2 text-sm text-gray-500">{field.field_description}</span>
-        </div>
-      </div>
-    );
-  }
-
-  if (field.field_type === "Integer" || field.field_type === "Float") {
-    return (
-      <div className="space-y-2">
-        <label className="text-sm font-medium text-gray-700">{field.ui_field_name}</label>
-        <NumericalInput
-          name={field.field_name}
-          type="number"
-          defaultValue={currentValue}
-          placeholder={field.field_description}
-        />
-        <p className="text-xs text-gray-500">{field.field_description}</p>
-      </div>
-    );
-  }
-
-  if (field.field_type === "List") {
-    return (
-      <div className="space-y-2">
-        <label className="text-sm font-medium text-gray-700">{field.ui_field_name}</label>
-        <textarea
-          name={field.field_name}
-          defaultValue={typeof currentValue === "object" ? JSON.stringify(currentValue, null, 2) : currentValue}
-          placeholder={field.field_description}
-          className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500"
-          rows={4}
-        />
-        <p className="text-xs text-gray-500">{field.field_description}</p>
-      </div>
-    );
-  }
-
-  if (field.field_type === "Models_Select") {
-    const embeddingModels = modelInfo
-      .filter((option: ModelGroup) => option.mode === "embedding")
-      .map((option: ModelGroup) => ({
-        value: option.model_group,
-        label: option.model_group,
-      }));
-
-    return (
-      <div className="space-y-2">
-        <label className="text-sm font-medium text-gray-700">{field.ui_field_name}</label>
-        <Select
-          value={selectedModel}
-          onChange={setSelectedModel}
-          showSearch={true}
-          placeholder="Search and select a model..."
-          options={embeddingModels}
-          style={{ width: "100%" }}
-          className="rounded-md"
-          filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
-        />
-        {/* Hidden input to capture the value for form submission */}
-        <input type="hidden" name={field.field_name} value={selectedModel} />
-        {field.field_description && <p className="text-xs text-gray-500">{field.field_description}</p>}
-      </div>
-    );
-  }
-
-  // Render number input for numeric fields
-  if (field.field_type === "Integer" || field.field_type === "Float") {
-    return (
-      <div className="space-y-2">
-        <label className="text-sm font-medium text-gray-700">{field.ui_field_name}</label>
-        <NumberInput
-          name={field.field_name}
-          defaultValue={currentValue}
-          placeholder={field.field_description}
-          step={field.field_type === "Float" ? 0.01 : 1}
-        />
-        {field.field_description && <p className="text-xs text-gray-500">{field.field_description}</p>}
-      </div>
-    );
-  }
-
-  // Determine input type for text-based fields
-  const inputType: "text" | "password" | "email" | "url" | undefined =
-    field.field_name === "password" || field.field_name.includes("password") ? "password" : "text";
-
-  return (
-    <div className="space-y-2">
-      <label className="text-sm font-medium text-gray-700">{field.ui_field_name}</label>
-      <TextInput
-        name={field.field_name}
-        type={inputType}
-        defaultValue={currentValue}
-        placeholder={field.field_description}
-      />
-      {field.field_description && <p className="text-xs text-gray-500">{field.field_description}</p>}
-    </div>
-  );
-};
-
-export default CacheFieldRenderer;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldSection.tsx
new file mode 100644
index 00000000000..ced822cd796
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFieldSection.tsx
@@ -0,0 +1,42 @@
+import React from "react";
+import CacheFormField, { EmbeddingModelOption } from "./CacheFormField";
+import { fieldsForSection } from "./cacheSettingsUtils";
+import { CacheSection, RedisType } from "./cacheSettingsFields";
+
+interface CacheFieldSectionProps {
+  title: string;
+  section: CacheSection;
+  redisType: RedisType;
+  embeddingModels: EmbeddingModelOption[];
+  gridCols?: string;
+  headingLevel?: "h4" | "h5";
+}
+
+const CacheFieldSection: React.FC<CacheFieldSectionProps> = ({
+  title,
+  section,
+  redisType,
+  embeddingModels,
+  gridCols = "grid-cols-1 gap-6 sm:grid-cols-2",
+  headingLevel = "h4",
+}) => {
+  const fields = fieldsForSection(section, redisType);
+  if (fields.length === 0) {
+    return null;
+  }
+
+  const Heading = headingLevel;
+
+  return (
+    <div className="space-y-6">
+      <Heading className="text-sm font-medium text-gray-900">{title}</Heading>
+      <div className={`grid ${gridCols}`}>
+        {fields.map((field) => (
+          <CacheFormField key={field.name} field={field} embeddingModels={embeddingModels} />
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export default CacheFieldSection;
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
new file mode 100644
index 00000000000..d92ca302901
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/CacheFormField.tsx
@@ -0,0 +1,54 @@
+import { Form, Input, Select, Switch } from "antd";
+import React from "react";
+import { CacheField } from "./cacheSettingsFields";
+
+export interface EmbeddingModelOption {
+  value: string;
+  label: string;
+}
+
+interface CacheFormFieldProps {
+  field: CacheField;
+  embeddingModels: EmbeddingModelOption[];
+}
+
+const renderControl = (field: CacheField, embeddingModels: EmbeddingModelOption[]): React.ReactNode => {
+  switch (field.type) {
+    case "boolean":
+      return <Switch />;
+    case "password":
+      return <Input.Password placeholder={field.helpText} autoComplete="new-password" />;
+    case "integer":
+    case "float":
+      return <Input inputMode="decimal" placeholder={field.helpText} />;
+    case "list":
+      return <Input.TextArea rows={4} placeholder={field.helpText} />;
+    case "model-select":
+      return (
+        <Select
+          showSearch
+          allowClear
+          placeholder="Search and select a model..."
+          options={embeddingModels}
+          optionFilterProp="label"
+          style={{ width: "100%" }}
+        />
+      );
+    default:
+      return <Input placeholder={field.helpText} />;
+  }
+};
+
+const CacheFormField: React.FC<CacheFormFieldProps> = ({ field, embeddingModels }) => (
+  <Form.Item
+    name={field.name}
+    label={field.label}
+    extra={field.helpText}
+    rules={field.rules}
+    valuePropName={field.type === "boolean" ? "checked" : "value"}
+  >
+    {renderControl(field, embeddingModels)}
+  </Form.Item>
+);
+
+export default CacheFormField;
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 a94d44dd4e0..fbca7ab5a97 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
@@ -3,7 +3,7 @@ import { Select, SelectItem } from "@tremor/react";
 
 interface RedisTypeSelectorProps {
   redisType: string;
-  redisTypeDescriptions: { [key: string]: string };
+  redisTypeDescriptions: Readonly<Record<string, string>>;
   onTypeChange: (type: string) => void;
 }
 
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
new file mode 100644
index 00000000000..1f5b566fc5f
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsFields.ts
@@ -0,0 +1,261 @@
+import type { FormItemProps } from "antd";
+
+export type CacheFieldType = "string" | "password" | "integer" | "float" | "boolean" | "list" | "model-select";
+
+export type RedisType = "node" | "cluster" | "sentinel" | "semantic";
+
+export type CacheSection = "connection" | "cluster" | "sentinel" | "semantic" | "ssl" | "cacheManagement" | "gcp";
+
+export type CacheFieldRule = NonNullable<FormItemProps["rules"]>[number];
+
+export interface CacheField {
+  readonly name: string;
+  readonly label: string;
+  readonly type: CacheFieldType;
+  readonly section: CacheSection;
+  readonly helpText: string;
+  readonly redisType: RedisType | null;
+  readonly defaultValue?: string | number | boolean;
+  readonly rules?: CacheFieldRule[];
+}
+
+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",
+};
+
+const portRule: CacheFieldRule = {
+  validator: (_rule, value) => {
+    if (value === undefined || value === null || String(value).trim() === "") {
+      return Promise.resolve();
+    }
+    const port = Number(value);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+      return Promise.reject(new Error("Port must be an integer between 1 and 65535"));
+    }
+    return Promise.resolve();
+  },
+};
+
+const jsonListRule: CacheFieldRule = {
+  validator: (_rule, value) => {
+    if (value === undefined || value === null || String(value).trim() === "") {
+      return Promise.resolve();
+    }
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(String(value));
+    } catch {
+      return Promise.reject(new Error("Must be a valid JSON array (use double quotes)"));
+    }
+    if (!Array.isArray(parsed)) {
+      return Promise.reject(new Error("Must be a JSON array"));
+    }
+    return Promise.resolve();
+  },
+};
+
+const nonNegativeIntegerRule: CacheFieldRule = {
+  validator: (_rule, value) => {
+    if (value === undefined || value === null || String(value).trim() === "") {
+      return Promise.resolve();
+    }
+    const parsed = Number(value);
+    if (!Number.isInteger(parsed) || parsed < 0) {
+      return Promise.reject(new Error("Must be a non-negative integer"));
+    }
+    return Promise.resolve();
+  },
+};
+
+const numberRule: CacheFieldRule = {
+  validator: (_rule, value) => {
+    if (value === undefined || value === null || String(value).trim() === "") {
+      return Promise.resolve();
+    }
+    if (Number.isNaN(Number(value))) {
+      return Promise.reject(new Error("Must be a number"));
+    }
+    return Promise.resolve();
+  },
+};
+
+export const CACHE_FIELDS: readonly CacheField[] = [
+  {
+    name: "url",
+    label: "Redis URL",
+    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.",
+    redisType: null,
+  },
+  {
+    name: "host",
+    label: "Host",
+    type: "string",
+    section: "connection",
+    helpText: "Redis server hostname or IP address",
+    redisType: null,
+  },
+  {
+    name: "port",
+    label: "Port",
+    type: "string",
+    section: "connection",
+    helpText: "Redis server port number",
+    redisType: null,
+    defaultValue: "6379",
+    rules: [portRule],
+  },
+  {
+    name: "db",
+    label: "Database Index",
+    type: "integer",
+    section: "connection",
+    helpText: "Logical database index to isolate the cache (e.g. 1 for redis://host:6379/1)",
+    redisType: null,
+    rules: [nonNegativeIntegerRule],
+  },
+  {
+    name: "password",
+    label: "Password",
+    type: "password",
+    section: "connection",
+    helpText: "Redis server password",
+    redisType: null,
+  },
+  {
+    name: "username",
+    label: "Username",
+    type: "string",
+    section: "connection",
+    helpText: "Redis server username (if required)",
+    redisType: null,
+  },
+  {
+    name: "redis_startup_nodes",
+    label: "Startup Nodes",
+    type: "list",
+    section: "cluster",
+    helpText: 'List of startup nodes for Redis Cluster (e.g., [{"host": "127.0.0.1", "port": "7001"}])',
+    redisType: "cluster",
+    rules: [jsonListRule],
+  },
+  {
+    name: "sentinel_nodes",
+    label: "Sentinel Nodes",
+    type: "list",
+    section: "sentinel",
+    helpText: 'List of Sentinel nodes (e.g., [["localhost", 26379]])',
+    redisType: "sentinel",
+    rules: [jsonListRule],
+  },
+  {
+    name: "service_name",
+    label: "Service Name",
+    type: "string",
+    section: "sentinel",
+    helpText: "Master service name for Redis Sentinel",
+    redisType: "sentinel",
+  },
+  {
+    name: "sentinel_password",
+    label: "Sentinel Password",
+    type: "password",
+    section: "sentinel",
+    helpText: "Password for Redis Sentinel authentication",
+    redisType: "sentinel",
+  },
+  {
+    name: "similarity_threshold",
+    label: "Similarity Threshold",
+    type: "float",
+    section: "semantic",
+    helpText: "Similarity threshold for semantic cache",
+    redisType: "semantic",
+    defaultValue: 0.8,
+    rules: [numberRule],
+  },
+  {
+    name: "redis_semantic_cache_embedding_model",
+    label: "Embedding Model",
+    type: "model-select",
+    section: "semantic",
+    helpText: "Embedding model for semantic cache",
+    redisType: "semantic",
+  },
+  {
+    name: "ssl",
+    label: "SSL",
+    type: "boolean",
+    section: "ssl",
+    helpText: "Enable SSL/TLS connection",
+    redisType: null,
+    defaultValue: false,
+  },
+  {
+    name: "ssl_cert_reqs",
+    label: "SSL Cert Reqs",
+    type: "string",
+    section: "ssl",
+    helpText: "SSL certificate requirements (None, CERT_REQUIRED, CERT_OPTIONAL)",
+    redisType: null,
+  },
+  {
+    name: "ssl_check_hostname",
+    label: "SSL Check Hostname",
+    type: "boolean",
+    section: "ssl",
+    helpText: "Enable SSL hostname verification",
+    redisType: null,
+    defaultValue: false,
+  },
+  {
+    name: "namespace",
+    label: "Namespace",
+    type: "string",
+    section: "cacheManagement",
+    helpText: "Namespace prefix for cache keys",
+    redisType: null,
+  },
+  {
+    name: "ttl",
+    label: "TTL (seconds)",
+    type: "float",
+    section: "cacheManagement",
+    helpText: "Time-to-live for cached items in seconds",
+    redisType: null,
+    rules: [numberRule],
+  },
+  {
+    name: "max_connections",
+    label: "Max Connections",
+    type: "integer",
+    section: "cacheManagement",
+    helpText: "Maximum number of connections in the connection pool",
+    redisType: null,
+    rules: [nonNegativeIntegerRule],
+  },
+  {
+    name: "gcp_service_account",
+    label: "GCP Service Account",
+    type: "string",
+    section: "gcp",
+    helpText:
+      "GCP service account for IAM authentication (e.g., projects/-/serviceAccounts/your-sa@project.iam.gserviceaccount.com)",
+    redisType: null,
+  },
+  {
+    name: "gcp_ssl_ca_certs",
+    label: "GCP SSL CA Certs",
+    type: "string",
+    section: "gcp",
+    helpText: "Path to SSL CA certificate file for GCP Memorystore Redis",
+    redisType: null,
+  },
+];
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.test.ts
new file mode 100644
index 00000000000..79f28a97842
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.test.ts
@@ -0,0 +1,86 @@
+import { describe, it, expect } from "vitest";
+import { buildCachePayload, buildInitialValues, fieldsForSection } from "./cacheSettingsUtils";
+
+describe("fieldsForSection", () => {
+  it("should only include a redis-type-specific field when that type is selected", () => {
+    expect(fieldsForSection("cluster", "cluster").map((f) => f.name)).toEqual(["redis_startup_nodes"]);
+    expect(fieldsForSection("cluster", "node")).toEqual([]);
+  });
+
+  it("should include connection fields for every redis type in schema order", () => {
+    expect(fieldsForSection("connection", "node").map((f) => f.name)).toEqual([
+      "url",
+      "host",
+      "port",
+      "db",
+      "password",
+      "username",
+    ]);
+  });
+});
+
+describe("buildInitialValues", () => {
+  it("should apply defaults as strings for text inputs and coerce booleans", () => {
+    const values = buildInitialValues({});
+    expect(values.port).toBe("6379");
+    expect(values.similarity_threshold).toBe("0.8");
+    expect(values.ssl).toBe(false);
+    expect(values.db).toBe("");
+  });
+
+  it("should stringify list values so they render in a textarea", () => {
+    const nodes = [{ host: "127.0.0.1", port: "7001" }];
+    const values = buildInitialValues({ redis_startup_nodes: nodes });
+    expect(values.redis_startup_nodes).toBe(JSON.stringify(nodes, null, 2));
+  });
+
+  it("should render numeric current values as strings for their text inputs", () => {
+    const values = buildInitialValues({ max_connections: 10 });
+    expect(values.max_connections).toBe("10");
+  });
+});
+
+describe("buildCachePayload", () => {
+  it("should tag the payload as redis and drop empty fields and the UI-only redis_type", () => {
+    const payload = buildCachePayload("node", { host: "localhost", port: "6379", username: "" }, { forTesting: false });
+    expect(payload).toEqual({
+      type: "redis",
+      host: "localhost",
+      port: "6379",
+      ssl: false,
+      ssl_check_hostname: false,
+    });
+    expect(payload).not.toHaveProperty("redis_type");
+    expect(payload).not.toHaveProperty("username");
+  });
+
+  it("should parse list fields from their textarea string into arrays", () => {
+    const payload = buildCachePayload(
+      "cluster",
+      { redis_startup_nodes: '[{"host":"127.0.0.1","port":"7001"}]' },
+      { forTesting: false },
+    );
+    expect(payload.redis_startup_nodes).toEqual([{ host: "127.0.0.1", port: "7001" }]);
+  });
+
+  it("should omit a list field whose textarea holds invalid JSON", () => {
+    const payload = buildCachePayload("cluster", { redis_startup_nodes: "not json" }, { forTesting: false });
+    expect(payload).not.toHaveProperty("redis_startup_nodes");
+  });
+
+  it("should send type redis-semantic when saving a semantic cache", () => {
+    const payload = buildCachePayload("semantic", { similarity_threshold: 0.9 }, { forTesting: false });
+    expect(payload.type).toBe("redis-semantic");
+    expect(payload.similarity_threshold).toBe(0.9);
+  });
+
+  it("should keep type redis when testing a semantic cache so the test endpoint accepts it", () => {
+    const payload = buildCachePayload("semantic", { similarity_threshold: 0.9 }, { forTesting: true });
+    expect(payload.type).toBe("redis");
+  });
+
+  it("should exclude fields that do not belong to the selected redis type", () => {
+    const payload = buildCachePayload("node", { sentinel_nodes: '[["localhost",26379]]' }, { forTesting: false });
+    expect(payload).not.toHaveProperty("sentinel_nodes");
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.ts b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.ts
index b7554136ad4..088da21961c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/cacheSettingsUtils.ts
@@ -1,110 +1,81 @@
-/**
- * Utility functions for cache settings form handling
- */
+import { CACHE_FIELDS, CacheField, CacheSection, RedisType } from "./cacheSettingsFields";
 
-export const shouldShowField = (field: any, redisType: string): boolean => {
-  // Show field if it applies to all types (redis_type is null/undefined) or to current selected type
-  if (field.redis_type === null || field.redis_type === undefined) {
-    return true;
+export type CacheFormValue = string | number | boolean | undefined;
+export type CacheFormValues = Record<string, CacheFormValue>;
+export type CacheSavePayloadValue = string | number | boolean | unknown[];
+export type CacheSavePayload = Record<string, CacheSavePayloadValue>;
+
+export const isFieldVisible = (field: CacheField, redisType: RedisType): boolean =>
+  field.redisType === null || field.redisType === redisType;
+
+export const fieldsForSection = (section: CacheSection, redisType: RedisType): CacheField[] =>
+  CACHE_FIELDS.filter((field) => field.section === section && isFieldVisible(field, redisType));
+
+const initialValueForField = (field: CacheField, raw: unknown): CacheFormValue => {
+  const source = raw ?? field.defaultValue;
+
+  if (field.type === "boolean") {
+    return source === true || source === "true";
   }
 
-  return field.redis_type === redisType;
+  if (field.type === "list") {
+    if (source === undefined || source === null || source === "") {
+      return "";
+    }
+    return typeof source === "string" ? source : JSON.stringify(source, null, 2);
+  }
+
+  if (source === undefined || source === null) {
+    return "";
+  }
+  return String(source);
 };
 
-export const getFieldByName = (fields: any[], fieldName: string) => {
-  return fields.find((f) => f.field_name === fieldName);
+export const buildInitialValues = (currentValues: Record<string, unknown>): CacheFormValues =>
+  Object.fromEntries(CACHE_FIELDS.map((field) => [field.name, initialValueForField(field, currentValues[field.name])]));
+
+const saveValueForField = (field: CacheField, raw: CacheFormValue): CacheSavePayloadValue | undefined => {
+  if (field.type === "boolean") {
+    return Boolean(raw);
+  }
+
+  if (field.type === "list") {
+    if (typeof raw !== "string" || raw.trim() === "") {
+      return undefined;
+    }
+    try {
+      return JSON.parse(raw) as unknown[];
+    } catch {
+      return undefined;
+    }
+  }
+
+  if (field.type === "integer" || field.type === "float") {
+    if (raw === undefined || raw === null || raw === "") {
+      return undefined;
+    }
+    const parsed = Number(raw);
+    return Number.isNaN(parsed) ? undefined : parsed;
+  }
+
+  if (typeof raw !== "string") {
+    return raw === undefined ? undefined : String(raw);
+  }
+  const trimmed = raw.trim();
+  return trimmed === "" ? undefined : trimmed;
 };
 
-export const groupFieldsByCategory = (fields: any[], redisType: string) => {
-  // Basic fields that are always shown
-  const basicFieldNames = ["host", "port", "password", "username"];
-  const basicFields = basicFieldNames.map((name) => getFieldByName(fields, name)).filter(Boolean);
+export const buildCachePayload = (
+  redisType: RedisType,
+  values: CacheFormValues,
+  { forTesting }: { forTesting: boolean },
+): CacheSavePayload => {
+  const type = !forTesting && redisType === "semantic" ? "redis-semantic" : "redis";
 
-  // Advanced field groups
-  const sslFields = ["ssl", "ssl_cert_reqs", "ssl_check_hostname"]
-    .map((name) => getFieldByName(fields, name))
-    .filter(Boolean);
-
-  const cacheManagementFields = ["namespace", "ttl", "max_connections"]
-    .map((name) => getFieldByName(fields, name))
-    .filter(Boolean);
-
-  const gcpFields = ["gcp_service_account", "gcp_ssl_ca_certs"]
-    .map((name) => getFieldByName(fields, name))
-    .filter(Boolean);
-
-  // Redis type-specific fields
-  const clusterFields = fields.filter((f) => f.redis_type === "cluster");
-  const sentinelFields = fields.filter((f) => f.redis_type === "sentinel");
-  const semanticFields = fields.filter((f) => f.redis_type === "semantic");
-
-  return {
-    basicFields,
-    sslFields,
-    cacheManagementFields,
-    gcpFields,
-    clusterFields,
-    sentinelFields,
-    semanticFields,
-  };
-};
-
-export const gatherFormValues = (fields: any[], redisType: string): { [key: string]: any } => {
-  const values: { [key: string]: any } = {
-    type: "redis", // Cache class accepts 'type' parameter (LiteLLMCacheType enum)
-  };
-
-  // Iterate through all fields from backend
-  fields.forEach((field) => {
-    // Skip redis_type - it's UI-only, not sent to backend
-    if (field.field_name === "redis_type") {
-      return;
-    }
-
-    // Check if field should be shown for current redis type
-    if (!shouldShowField(field, redisType)) {
-      return;
-    }
-
-    const fieldName = field.field_name;
-    let value: any = null;
-
-    if (field.field_type === "Boolean") {
-      const checkboxEl = document.querySelector(`input[name="${fieldName}"]`) as HTMLInputElement | null;
-      if (checkboxEl?.checked !== undefined) {
-        value = checkboxEl.checked;
-      }
-    } else if (field.field_type === "List") {
-      const textareaEl = document.querySelector(`textarea[name="${fieldName}"]`) as HTMLTextAreaElement | null;
-      if (textareaEl?.value) {
-        try {
-          value = JSON.parse(textareaEl.value);
-        } catch (e) {
-          console.error(`Invalid JSON for ${fieldName}:`, e);
-        }
-      }
-    } else {
-      const inputEl = document.querySelector(`input[name="${fieldName}"]`) as HTMLInputElement | null;
-      if (inputEl?.value) {
-        const trimmedValue = inputEl.value.trim();
-        if (trimmedValue !== "") {
-          if (field.field_type === "Integer") {
-            const num = Number(trimmedValue);
-            if (!isNaN(num)) value = num;
-          } else if (field.field_type === "Float") {
-            const num = Number(trimmedValue);
-            if (!isNaN(num)) value = num;
-          } else {
-            value = trimmedValue;
-          }
-        }
-      }
-    }
-
-    if (value !== null && value !== undefined) {
-      values[fieldName] = value;
-    }
+  const entries = CACHE_FIELDS.filter((field) => isFieldVisible(field, redisType)).flatMap((field) => {
+    const value = saveValueForField(field, values[field.name]);
+    return value === undefined ? [] : [[field.name, value] as const];
   });
 
-  return values;
+  return { type, ...Object.fromEntries(entries) };
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/index.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/index.test.tsx
new file mode 100644
index 00000000000..0f768372ad9
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/caching/components/cache_settings/index.test.tsx
@@ -0,0 +1,147 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import CacheSettings from "./index";
+
+const { getCacheSettingsCall, testCacheConnectionCall, updateCacheSettingsCall } = vi.hoisted(() => ({
+  getCacheSettingsCall: vi.fn(),
+  testCacheConnectionCall: vi.fn(),
+  updateCacheSettingsCall: vi.fn(),
+}));
+
+vi.mock("@/components/networking", () => ({
+  getCacheSettingsCall,
+  testCacheConnectionCall,
+  updateCacheSettingsCall,
+}));
+
+vi.mock("@/components/llm_calls/fetch_models", () => ({
+  fetchAvailableModels: vi.fn().mockResolvedValue([]),
+}));
+
+const renderSettings = () => render(<CacheSettings accessToken="sk-test" userRole="Admin" userID="u1" />);
+
+describe("CacheSettings", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    getCacheSettingsCall.mockResolvedValue({ current_values: {} });
+    updateCacheSettingsCall.mockResolvedValue({ status: "success" });
+    testCacheConnectionCall.mockResolvedValue({ status: "success" });
+  });
+
+  it("should render the connection fields once current values load", async () => {
+    renderSettings();
+    expect(await screen.findByText("Connection Settings")).toBeInTheDocument();
+  });
+
+  describe("when the redis type is node", () => {
+    it("should show the connection fields and hide cluster/sentinel/semantic fields", async () => {
+      renderSettings();
+
+      expect(await screen.findByText("Redis URL")).toBeInTheDocument();
+      expect(screen.getByText("Database Index")).toBeInTheDocument();
+      expect(screen.queryByText("Startup Nodes")).not.toBeInTheDocument();
+      expect(screen.queryByText("Sentinel Nodes")).not.toBeInTheDocument();
+      expect(screen.queryByText("Embedding Model")).not.toBeInTheDocument();
+    });
+  });
+
+  describe("when the redis type is cluster", () => {
+    it("should reveal the cluster startup nodes field", async () => {
+      getCacheSettingsCall.mockResolvedValue({ current_values: { redis_type: "cluster" } });
+      renderSettings();
+      expect(await screen.findByText("Startup Nodes")).toBeInTheDocument();
+    });
+  });
+
+  describe("when the redis type is sentinel", () => {
+    it("should reveal the sentinel fields", async () => {
+      getCacheSettingsCall.mockResolvedValue({ current_values: { redis_type: "sentinel" } });
+      renderSettings();
+      expect(await screen.findByText("Sentinel Nodes")).toBeInTheDocument();
+      expect(screen.getByText("Service Name")).toBeInTheDocument();
+    });
+  });
+
+  describe("when the redis type is semantic", () => {
+    it("should reveal the semantic fields", async () => {
+      getCacheSettingsCall.mockResolvedValue({ current_values: { redis_type: "semantic" } });
+      renderSettings();
+      expect(await screen.findByText("Similarity Threshold")).toBeInTheDocument();
+      expect(screen.getByText("Embedding Model")).toBeInTheDocument();
+    });
+  });
+
+  describe("when a field fails inline validation", () => {
+    it("should block save and surface the validation message", async () => {
+      const user = userEvent.setup();
+      renderSettings();
+
+      const port = await screen.findByLabelText("Port");
+      await user.clear(port);
+      await user.type(port, "99999");
+      await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+      expect(await screen.findByText(/Port must be an integer between 1 and 65535/i)).toBeInTheDocument();
+      expect(updateCacheSettingsCall).not.toHaveBeenCalled();
+    });
+
+    it("should block save when a list field holds malformed JSON instead of silently dropping it", async () => {
+      const user = userEvent.setup();
+      getCacheSettingsCall.mockResolvedValue({ current_values: { redis_type: "cluster" } });
+      renderSettings();
+
+      const startupNodes = await screen.findByLabelText("Startup Nodes");
+      await user.type(startupNodes, "not json");
+      await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+      expect(await screen.findByText(/Must be a valid JSON array/i)).toBeInTheDocument();
+      expect(updateCacheSettingsCall).not.toHaveBeenCalled();
+    });
+
+    it("should block save with an error when a non-numeric value is entered into a numeric field", async () => {
+      const user = userEvent.setup();
+      renderSettings();
+
+      const db = await screen.findByLabelText("Database Index");
+      await user.type(db, "redis://host:6379/1");
+      await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+      expect(await screen.findByText(/Must be a non-negative integer/i)).toBeInTheDocument();
+      expect(updateCacheSettingsCall).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("when saving a valid node configuration", () => {
+    it("should send the backend payload shape with type redis and no UI-only fields", async () => {
+      const user = userEvent.setup();
+      renderSettings();
+
+      const host = await screen.findByLabelText("Host");
+      await user.type(host, "localhost");
+      await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+      await waitFor(() =>
+        expect(updateCacheSettingsCall).toHaveBeenCalledWith("sk-test", {
+          type: "redis",
+          host: "localhost",
+          port: "6379",
+          ssl: false,
+          ssl_check_hostname: false,
+        }),
+      );
+    });
+
+    it("should include a numeric field like Database Index in the save payload", async () => {
+      const user = userEvent.setup();
+      renderSettings();
+
+      await user.type(await screen.findByLabelText("Redis URL"), "redis://host:6379/1");
+      await user.type(await screen.findByLabelText("Database Index"), "2");
+      await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+      await waitFor(() => expect(updateCacheSettingsCall).toHaveBeenCalled());
+      expect(updateCacheSettingsCall.mock.calls[0][1]).toMatchObject({ db: 2, url: "redis://host:6379/1" });
+    });
+  });
+});
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 7de49e08ace..4382769ae9c 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,10 +1,14 @@
 import React, { useState, useEffect, useCallback } from "react";
 import { Button, Accordion, AccordionHeader, AccordionBody } from "@tremor/react";
+import { Form } from "antd";
 import { getCacheSettingsCall, testCacheConnectionCall, updateCacheSettingsCall } from "@/components/networking";
+import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
 import NotificationsManager from "@/components/molecules/notifications_manager";
 import RedisTypeSelector from "./RedisTypeSelector";
-import CacheFieldRenderer from "./CacheFieldRenderer";
-import { gatherFormValues, groupFieldsByCategory } from "./cacheSettingsUtils";
+import CacheFieldSection from "./CacheFieldSection";
+import { EmbeddingModelOption } from "./CacheFormField";
+import { REDIS_TYPES, REDIS_TYPE_DESCRIPTIONS, RedisType } from "./cacheSettingsFields";
+import { buildCachePayload, buildInitialValues, CacheFormValues } from "./cacheSettingsUtils";
 
 interface CacheSettingsProps {
   accessToken: string | null;
@@ -12,66 +16,83 @@ interface CacheSettingsProps {
   userID: string | null;
 }
 
-const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken, userRole, userID }) => {
-  const [cacheSettings, setCacheSettings] = useState<{ [key: string]: any }>({});
-  const [fields, setFields] = useState<any[]>([]);
-  const [redisTypeDescriptions, setRedisTypeDescriptions] = useState<{ [key: string]: string }>({});
-  const [redisType, setRedisType] = useState<string>("node");
+const toRedisType = (value: unknown): RedisType =>
+  REDIS_TYPES.includes(value as RedisType) ? (value as RedisType) : "node";
+
+const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken }) => {
+  const [form] = Form.useForm<CacheFormValues>();
+  const [redisType, setRedisType] = useState<RedisType>("node");
+  const [embeddingModels, setEmbeddingModels] = useState<EmbeddingModelOption[]>([]);
   const [isTesting, setIsTesting] = useState<boolean>(false);
   const [isSaving, setIsSaving] = useState<boolean>(false);
 
   const loadCacheSettings = useCallback(async () => {
+    if (!accessToken) {
+      return;
+    }
     try {
-      const data = await getCacheSettingsCall(accessToken!);
-      console.log("cache settings from API", data);
-
-      if (data.fields) {
-        setFields(data.fields);
-      }
-
-      // Set current values
-      if (data.current_values) {
-        setCacheSettings(data.current_values);
-        if (data.current_values.redis_type) {
-          setRedisType(data.current_values.redis_type);
-        }
-      }
-
-      // Store Redis type descriptions
-      if (data.redis_type_descriptions) {
-        setRedisTypeDescriptions(data.redis_type_descriptions);
-      }
+      const data = (await getCacheSettingsCall(accessToken)) as { current_values?: Record<string, unknown> };
+      const currentValues = data.current_values ?? {};
+      form.setFieldsValue(buildInitialValues(currentValues));
+      setRedisType(toRedisType(currentValues.redis_type));
     } catch (error) {
       console.error("Failed to load cache settings:", error);
       NotificationsManager.fromBackend("Failed to load cache settings");
     }
-  }, [accessToken]);
+  }, [accessToken, form]);
+
+  useEffect(() => {
+    loadCacheSettings();
+  }, [loadCacheSettings]);
 
   useEffect(() => {
     if (!accessToken) {
       return;
     }
-    loadCacheSettings();
-  }, [accessToken, loadCacheSettings]);
+    fetchAvailableModels(accessToken)
+      .then((models: ModelGroup[]) =>
+        setEmbeddingModels(
+          models
+            .filter((model) => model.mode === "embedding")
+            .map((model) => ({ value: model.model_group, label: model.model_group })),
+        ),
+      )
+      .catch((error) => console.error("Error fetching embedding models:", error));
+  }, [accessToken]);
+
+  const validate = async (): Promise<CacheFormValues | null> => {
+    try {
+      return await form.validateFields();
+    } catch {
+      return null;
+    }
+  };
 
   const handleTestConnection = async () => {
     if (!accessToken) {
       return;
     }
+    const values = await validate();
+    if (values === null) {
+      return;
+    }
 
     setIsTesting(true);
     try {
-      const testSettings = gatherFormValues(fields, redisType);
-      const result = await testCacheConnectionCall(accessToken, testSettings);
-
+      const result = await testCacheConnectionCall(
+        accessToken,
+        buildCachePayload(redisType, values, { forTesting: true }),
+      );
       if (result.status === "success") {
         NotificationsManager.success("Cache connection test successful!");
       } else {
         NotificationsManager.fromBackend(`Connection test failed: ${result.message || result.error}`);
       }
-    } catch (error: any) {
+    } catch (error) {
       console.error("Test connection error:", error);
-      NotificationsManager.fromBackend(`Connection test failed: ${error.message || "Unknown error"}`);
+      NotificationsManager.fromBackend(
+        `Connection test failed: ${error instanceof Error ? error.message : "Unknown error"}`,
+      );
     } finally {
       setIsTesting(false);
     }
@@ -81,16 +102,15 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken, userRole, us
     if (!accessToken) {
       return;
     }
+    const values = await validate();
+    if (values === null) {
+      return;
+    }
 
     setIsSaving(true);
     try {
-      const settingsToSave = gatherFormValues(fields, redisType);
-      if (redisType === "semantic") {
-        settingsToSave.type = "redis-semantic";
-      }
-      await updateCacheSettingsCall(accessToken, settingsToSave);
+      await updateCacheSettingsCall(accessToken, buildCachePayload(redisType, values, { forTesting: false }));
       NotificationsManager.success("Cache settings updated successfully");
-      // Reload settings to reflect saved values
       await loadCacheSettings();
     } catch (error) {
       console.error("Failed to save cache settings:", error);
@@ -104,127 +124,95 @@ const CacheSettings: React.FC<CacheSettingsProps> = ({ accessToken, userRole, us
     return null;
   }
 
-  const { basicFields, sslFields, cacheManagementFields, gcpFields, clusterFields, sentinelFields, semanticFields } =
-    groupFieldsByCategory(fields, redisType);
-
   return (
     <div className="w-full space-y-8 py-2">
-      <div className="space-y-6">
+      <Form form={form} layout="vertical" requiredMark={false} className="space-y-6">
         <div className="max-w-3xl">
           <h3 className="text-sm font-medium text-gray-900">Cache Settings</h3>
           <p className="text-xs text-gray-500 mt-1">Configure Redis cache for LiteLLM</p>
         </div>
 
-        {/* Redis Type Selector */}
         <RedisTypeSelector
           redisType={redisType}
-          redisTypeDescriptions={redisTypeDescriptions}
-          onTypeChange={setRedisType}
+          redisTypeDescriptions={REDIS_TYPE_DESCRIPTIONS}
+          onTypeChange={(type) => setRedisType(toRedisType(type))}
         />
 
-        {/* Basic Fields */}
-        <div className="space-y-6 pt-4 border-t border-gray-200">
-          <h4 className="text-sm font-medium text-gray-900">Connection Settings</h4>
-          <div className="grid grid-cols-1 gap-6 sm:grid-cols-2">
-            {basicFields.map((field: any) => {
-              if (!field) return null;
-              const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-              return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-            })}
-          </div>
+        <div className="pt-4 border-t border-gray-200">
+          <CacheFieldSection
+            title="Connection Settings"
+            section="connection"
+            redisType={redisType}
+            embeddingModels={embeddingModels}
+          />
         </div>
 
-        {/* Redis Type-Specific Fields */}
-        {redisType === "cluster" && clusterFields.length > 0 && (
-          <div className="space-y-6 pt-4 border-t border-gray-200">
-            <h4 className="text-sm font-medium text-gray-900">Cluster Configuration</h4>
-            <div className="grid grid-cols-1 gap-6">
-              {clusterFields.map((field: any) => {
-                const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-                return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-              })}
-            </div>
+        {redisType === "cluster" && (
+          <div className="pt-4 border-t border-gray-200">
+            <CacheFieldSection
+              title="Cluster Configuration"
+              section="cluster"
+              redisType={redisType}
+              embeddingModels={embeddingModels}
+              gridCols="grid-cols-1 gap-6"
+            />
           </div>
         )}
 
-        {redisType === "sentinel" && sentinelFields.length > 0 && (
-          <div className="space-y-6 pt-4 border-t border-gray-200">
-            <h4 className="text-sm font-medium text-gray-900">Sentinel Configuration</h4>
-            <div className="grid grid-cols-1 gap-6 sm:grid-cols-2">
-              {sentinelFields.map((field: any) => {
-                const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-                return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-              })}
-            </div>
+        {redisType === "sentinel" && (
+          <div className="pt-4 border-t border-gray-200">
+            <CacheFieldSection
+              title="Sentinel Configuration"
+              section="sentinel"
+              redisType={redisType}
+              embeddingModels={embeddingModels}
+            />
           </div>
         )}
 
-        {redisType === "semantic" && semanticFields.length > 0 && (
-          <div className="space-y-6 pt-4 border-t border-gray-200">
-            <h4 className="text-sm font-medium text-gray-900">Semantic Configuration</h4>
-            <div className="grid grid-cols-1 gap-6 sm:grid-cols-2">
-              {semanticFields.map((field: any) => {
-                const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-                return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-              })}
-            </div>
+        {redisType === "semantic" && (
+          <div className="pt-4 border-t border-gray-200">
+            <CacheFieldSection
+              title="Semantic Configuration"
+              section="semantic"
+              redisType={redisType}
+              embeddingModels={embeddingModels}
+            />
           </div>
         )}
 
-        {/* Advanced Settings Accordion */}
         <Accordion className="mt-4">
           <AccordionHeader>
             <span className="text-sm font-medium text-gray-900">Advanced Settings</span>
           </AccordionHeader>
           <AccordionBody>
             <div className="space-y-6">
-              {/* SSL Settings */}
-              {sslFields.length > 0 && (
-                <div className="space-y-4">
-                  <h5 className="text-sm font-medium text-gray-700">SSL Settings</h5>
-                  <div className="grid grid-cols-1 gap-6 sm:grid-cols-2">
-                    {sslFields.map((field: any) => {
-                      if (!field) return null;
-                      const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-                      return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-                    })}
-                  </div>
-                </div>
-              )}
-
-              {/* Cache Management */}
-              {cacheManagementFields.length > 0 && (
-                <div className="space-y-4 pt-4 border-t border-gray-200">
-                  <h5 className="text-sm font-medium text-gray-700">Cache Management</h5>
-                  <div className="grid grid-cols-1 gap-6 sm:grid-cols-2">
-                    {cacheManagementFields.map((field: any) => {
-                      if (!field) return null;
-                      const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-                      return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-                    })}
-                  </div>
-                </div>
-              )}
-
-              {/* GCP Authentication */}
-              {gcpFields.length > 0 && (
-                <div className="space-y-4 pt-4 border-t border-gray-200">
-                  <h5 className="text-sm font-medium text-gray-700">GCP Authentication</h5>
-                  <div className="grid grid-cols-1 gap-6 sm:grid-cols-2">
-                    {gcpFields.map((field: any) => {
-                      if (!field) return null;
-                      const currentValue = cacheSettings[field.field_name] ?? field.field_default ?? "";
-                      return <CacheFieldRenderer key={field.field_name} field={field} currentValue={currentValue} />;
-                    })}
-                  </div>
-                </div>
-              )}
+              <CacheFieldSection
+                title="SSL Settings"
+                section="ssl"
+                redisType={redisType}
+                embeddingModels={embeddingModels}
+                headingLevel="h5"
+              />
+              <CacheFieldSection
+                title="Cache Management"
+                section="cacheManagement"
+                redisType={redisType}
+                embeddingModels={embeddingModels}
+                headingLevel="h5"
+              />
+              <CacheFieldSection
+                title="GCP Authentication"
+                section="gcp"
+                redisType={redisType}
+                embeddingModels={embeddingModels}
+                headingLevel="h5"
+              />
             </div>
           </AccordionBody>
         </Accordion>
-      </div>
+      </Form>
 
-      {/* Actions */}
       <div className="border-t border-gray-200 pt-6 flex justify-end gap-3">
         <Button variant="secondary" size="sm" onClick={handleTestConnection} disabled={isTesting} className="text-sm">
           {isTesting ? "Testing..." : "Test Connection"}

From d40021c1acc6674c99865aaf323d9112d7c2e1c3 Mon Sep 17 00:00:00 2001
From: "devin-ai-integration[bot]"
 <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 2 Jul 2026 14:40:13 -0700
Subject: [PATCH 05/26] fix: merge metadata.tags into litellm_metadata on
 /v1/responses route (#31793)

For LITELLM_METADATA_ROUTES (responses, /v1/messages, batches, etc.),
the proxy stores admin metadata under data["litellm_metadata"] while
user-supplied metadata lives in data["metadata"]. Tags placed in
metadata.tags by the caller were never merged into litellm_metadata.tags,
causing SpendLogs.request_tags to be empty on these routes

Closes #31584

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 litellm/proxy/litellm_pre_call_utils.py       | 10 +++
 .../proxy/test_litellm_pre_call_utils.py      | 88 +++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/litellm/proxy/litellm_pre_call_utils.py b/litellm/proxy/litellm_pre_call_utils.py
index 6f5c82530e3..6a263ca756c 100644
--- a/litellm/proxy/litellm_pre_call_utils.py
+++ b/litellm/proxy/litellm_pre_call_utils.py
@@ -1649,6 +1649,16 @@ async def add_litellm_data_to_request(
             tags_to_add=tags,
         )
 
+    if _metadata_variable_name != "metadata":
+        _user_metadata = data.get("metadata")
+        if isinstance(_user_metadata, dict):
+            _user_tags = _user_metadata.get("tags")
+            if isinstance(_user_tags, list) and _user_tags:
+                data[_metadata_variable_name]["tags"] = LiteLLMProxyRequestSetup._merge_tags(
+                    request_tags=data[_metadata_variable_name].get("tags"),
+                    tags_to_add=_user_tags,
+                )
+
     # Team Callbacks controls
     callback_settings_obj = _get_dynamic_logging_metadata(
         user_api_key_dict=user_api_key_dict, proxy_config=proxy_config
diff --git a/tests/test_litellm/proxy/test_litellm_pre_call_utils.py b/tests/test_litellm/proxy/test_litellm_pre_call_utils.py
index 74f681bb97e..5a5ceae29ed 100644
--- a/tests/test_litellm/proxy/test_litellm_pre_call_utils.py
+++ b/tests/test_litellm/proxy/test_litellm_pre_call_utils.py
@@ -4798,3 +4798,91 @@ async def test_add_litellm_data_to_request_claude_code_drop_params(
     )
 
     assert updated.get("drop_params") == expected_drop_params
+
+
+@pytest.mark.asyncio
+async def test_add_litellm_data_to_request_merges_metadata_tags_on_responses_route():
+    """Regression for #31584: user-supplied metadata.tags must be merged into
+    litellm_metadata.tags on /v1/responses so they reach SpendLogs.request_tags."""
+    from litellm.proxy.litellm_pre_call_utils import add_litellm_data_to_request
+
+    request_mock = MagicMock(spec=Request)
+    request_mock.url = MagicMock()
+    request_mock.url.path = "/v1/responses"
+    request_mock.url.__str__.return_value = "http://localhost/v1/responses"
+    request_mock.method = "POST"
+    request_mock.query_params = {}
+    request_mock.headers = {"Content-Type": "application/json"}
+    request_mock.client = MagicMock()
+    request_mock.client.host = "127.0.0.1"
+    request_mock.state = MagicMock()
+
+    data = {
+        "model": "gpt-4o",
+        "input": "hello",
+        "metadata": {"tags": ["cost-center-1", "team-alpha"]},
+    }
+
+    user_api_key_dict = UserAPIKeyAuth(
+        api_key="hashed-key",
+        metadata={},
+        team_metadata={},
+    )
+
+    updated = await add_litellm_data_to_request(
+        data=data,
+        request=request_mock,
+        user_api_key_dict=user_api_key_dict,
+        proxy_config=MagicMock(),
+        general_settings={},
+        version="test-version",
+    )
+
+    assert "cost-center-1" in updated["litellm_metadata"]["tags"]
+    assert "team-alpha" in updated["litellm_metadata"]["tags"]
+
+
+@pytest.mark.asyncio
+async def test_add_litellm_data_to_request_unions_metadata_tags_with_header_tags_on_responses_route():
+    """On /v1/responses, tags from metadata.tags AND x-litellm-tags header
+    must both appear in litellm_metadata.tags."""
+    from litellm.proxy.litellm_pre_call_utils import add_litellm_data_to_request
+
+    request_mock = MagicMock(spec=Request)
+    request_mock.url = MagicMock()
+    request_mock.url.path = "/v1/responses"
+    request_mock.url.__str__.return_value = "http://localhost/v1/responses"
+    request_mock.method = "POST"
+    request_mock.query_params = {}
+    request_mock.headers = {
+        "Content-Type": "application/json",
+        "x-litellm-tags": "header-tag",
+    }
+    request_mock.client = MagicMock()
+    request_mock.client.host = "127.0.0.1"
+    request_mock.state = MagicMock()
+
+    data = {
+        "model": "gpt-4o",
+        "input": "hello",
+        "metadata": {"tags": ["body-tag"]},
+    }
+
+    user_api_key_dict = UserAPIKeyAuth(
+        api_key="hashed-key",
+        metadata={},
+        team_metadata={},
+    )
+
+    updated = await add_litellm_data_to_request(
+        data=data,
+        request=request_mock,
+        user_api_key_dict=user_api_key_dict,
+        proxy_config=MagicMock(),
+        general_settings={},
+        version="test-version",
+    )
+
+    tags = updated["litellm_metadata"]["tags"]
+    assert "header-tag" in tags
+    assert "body-tag" in tags

From 8e6098adc36b0b5c8b0a92b6e14ca6cdb4f2cc17 Mon Sep 17 00:00:00 2001
From: yucheng-berri <yucheng@berri.ai>
Date: Thu, 2 Jul 2026 15:01:58 -0700
Subject: [PATCH 06/26] fix(proxy): restore admin key/team
 callback_vars.turn_off_message_logging override (LIT-3587) (#31905)

The security fix in 34e9be1ba7 removed turn_off_message_logging from
_supported_callback_params to stop callers bypassing global redaction via
the request body. That also killed the documented admin-only per-key or
per-team override because both flows resolve through the same allowlist
in initialize_standard_callback_dynamic_params.

Put turn_off_message_logging back in _supported_callback_params so an
admin-configured metadata.logging[].callback_vars.turn_off_message_logging
survives into StandardCallbackDynamicParams and can override the global
setting for that key or team, as documented at
docs/proxy/team_logging#disableenable-message-redaction.

Consolidate the metadata traversal so the extractor and the proxy strip
walk the same set of client-controllable slots. iter_client_callback_metadata_dicts
in litellm_core_utils/initialize_dynamic_callback_params.py is the single
source of truth for metadata, litellm_metadata, and litellm_params.metadata;
_strip_client_message_redaction_opt_out imports it so a future addition
to one side automatically reaches the other. The extractor iterates the
helper in reversed order so litellm_params.metadata keeps overriding
metadata, matching the pre-refactor merge precedence.

Client bypass stays blocked. Restoring the field re-enrolls it in the
auth layer's _BANNED_REQUEST_BODY_PARAMS (derived from
_supported_callback_params via _build_banned_observability_params), so
client submissions at the top level, inside metadata, or inside a
JSON-string litellm_metadata all 401 at ingress. is_request_body_safe
also now descends into litellm_params.metadata for the same 401 defense
against the nested-body attack vector, matching how the metadata and
litellm_metadata slots are handled. _strip_client_message_redaction_opt_out
runs after the litellm_metadata JSON parse and before the admin callback_vars
unpack, so admin values survive while any leftover client-supplied
opt-out is dropped when global redaction is on and the key or team
lacks allow_client_message_redaction_opt_out.

Flip the two dynamic-param e2e tests added by the security fix to
reflect the restored override behavior, keeping the invariant that
proxy client bypass is stopped by the auth layer 401 above.

Co-authored-by: yucheng <yucheng@yuchengs-MBP.attlocal.net>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
---
 .../initialize_dynamic_callback_params.py     |  29 ++-
 litellm/proxy/auth/auth_utils.py              |  10 +
 litellm/proxy/litellm_pre_call_utils.py       |  31 +++-
 .../test_logging_redaction_e2e_test.py        |  59 +++---
 ...test_initialize_dynamic_callback_params.py |  85 ++++++++-
 .../proxy/auth/test_auth_utils.py             |  15 ++
 .../proxy/test_litellm_pre_call_utils.py      | 174 +++++++++++++++++-
 7 files changed, 344 insertions(+), 59 deletions(-)

diff --git a/litellm/litellm_core_utils/initialize_dynamic_callback_params.py b/litellm/litellm_core_utils/initialize_dynamic_callback_params.py
index d0a6ec30c9e..06a9e98c5ac 100644
--- a/litellm/litellm_core_utils/initialize_dynamic_callback_params.py
+++ b/litellm/litellm_core_utils/initialize_dynamic_callback_params.py
@@ -1,7 +1,23 @@
-from typing import Dict, Optional
+from typing import Any, Dict, Iterator, Optional
 
 from litellm.types.utils import StandardCallbackDynamicParams
 
+_CLIENT_CALLBACK_METADATA_SLOTS: tuple[str, ...] = ("litellm_metadata", "metadata")
+
+
+def iter_client_callback_metadata_dicts(
+    kwargs: dict[str, Any],
+) -> Iterator[tuple[str, dict[str, Any]]]:
+    litellm_params = kwargs.get("litellm_params")
+    if isinstance(litellm_params, dict):
+        nested = litellm_params.get("metadata")
+        if isinstance(nested, dict):
+            yield "litellm_params.metadata", nested
+    for key in _CLIENT_CALLBACK_METADATA_SLOTS:
+        candidate = kwargs.get(key)
+        if isinstance(candidate, dict):
+            yield key, candidate
+
 
 def _is_env_reference(value: object) -> bool:
     return isinstance(value, str) and "os.environ/" in value
@@ -55,6 +71,7 @@ _supported_callback_params = [
     "dd_site",
     "dd_agent_host",
     "dd_agent_port",
+    "turn_off_message_logging",
 ]
 
 _request_blocked_callback_params = {
@@ -87,19 +104,13 @@ def initialize_standard_callback_dynamic_params(
                 validate_no_callback_env_reference(param, _param_value, source="request body")
                 standard_callback_dynamic_params[param] = _param_value  # type: ignore
 
-        # 2. Fallback: check "metadata" or "litellm_params" -> "metadata"
-        metadata = (kwargs.get("metadata") or {}).copy()
-        litellm_params = kwargs.get("litellm_params") or {}
-        if isinstance(litellm_params, dict):
-            metadata.update(litellm_params.get("metadata") or {})
-
-        if isinstance(metadata, dict):
+        for slot_label, metadata in iter_client_callback_metadata_dicts(kwargs):
             for param in _supported_callback_params:
                 if param in _request_blocked_callback_params:
                     continue
                 if param not in standard_callback_dynamic_params and param in metadata:
                     _param_value = metadata.get(param)
-                    validate_no_callback_env_reference(param, _param_value, source="metadata")
+                    validate_no_callback_env_reference(param, _param_value, source=slot_label)
                     standard_callback_dynamic_params[param] = _param_value  # type: ignore
 
     return standard_callback_dynamic_params
diff --git a/litellm/proxy/auth/auth_utils.py b/litellm/proxy/auth/auth_utils.py
index 2bf0acc7232..3c508df0cc9 100644
--- a/litellm/proxy/auth/auth_utils.py
+++ b/litellm/proxy/auth/auth_utils.py
@@ -375,6 +375,16 @@ def is_request_body_safe(request_body: dict, general_settings: dict, llm_router:
         metadata = _coerce_metadata_to_dict(request_body.get(metadata_key))
         if metadata is not None:
             _check_banned_params(metadata, general_settings, llm_router, model)
+    litellm_params = _coerce_metadata_to_dict(request_body.get("litellm_params"))
+    if litellm_params is not None:
+        litellm_params_metadata = _coerce_metadata_to_dict(litellm_params.get("metadata"))
+        if litellm_params_metadata is not None:
+            _check_banned_params(
+                litellm_params_metadata,
+                general_settings,
+                llm_router,
+                model,
+            )
     return True
 
 
diff --git a/litellm/proxy/litellm_pre_call_utils.py b/litellm/proxy/litellm_pre_call_utils.py
index 6a263ca756c..afd8a437cc1 100644
--- a/litellm/proxy/litellm_pre_call_utils.py
+++ b/litellm/proxy/litellm_pre_call_utils.py
@@ -15,6 +15,9 @@ from litellm._logging import verbose_logger, verbose_proxy_logger
 from litellm._service_logger import ServiceLogging
 from litellm.constants import PRE_CALL_EXECUTED_GUARDRAILS_KEY
 from litellm.litellm_core_utils.credential_accessor import CredentialAccessor
+from litellm.litellm_core_utils.initialize_dynamic_callback_params import (
+    iter_client_callback_metadata_dicts,
+)
 from litellm.litellm_core_utils.safe_json_loads import safe_json_loads
 from litellm.litellm_core_utils.url_utils import is_url_destination_allowed_by_host
 from litellm.proxy._types import (
@@ -302,6 +305,24 @@ def _key_or_team_allows_client_pricing_override(
     )
 
 
+def _strip_client_message_redaction_opt_out(data: dict[str, Any]) -> None:
+    stripped: list[str] = []
+    if "turn_off_message_logging" in data and _is_false_like(data["turn_off_message_logging"]):
+        stripped.append("turn_off_message_logging")
+        data.pop("turn_off_message_logging", None)
+    for slot_label, metadata in iter_client_callback_metadata_dicts(data):
+        if "turn_off_message_logging" in metadata and _is_false_like(metadata["turn_off_message_logging"]):
+            stripped.append(f"{slot_label}.turn_off_message_logging")
+            metadata.pop("turn_off_message_logging", None)
+    if stripped:
+        verbose_proxy_logger.debug(
+            "Stripped client-supplied message-redaction opt-out fields from request body: %s. "
+            "Set `allow_client_message_redaction_opt_out: true` on the key or team metadata "
+            "to keep these values.",
+            ", ".join(stripped),
+        )
+
+
 def _strip_client_pricing_overrides(data: Dict[str, Any]) -> None:
     """Drop pricing overrides from the request body and any metadata variant.
 
@@ -1308,13 +1329,6 @@ async def add_litellm_data_to_request(
         _headers,
         allow_client_message_redaction_opt_out=_allow_client_message_redaction_opt_out,
     )
-    if (
-        not _allow_client_message_redaction_opt_out
-        and litellm.turn_off_message_logging is True
-        and "turn_off_message_logging" in data
-        and _is_false_like(data["turn_off_message_logging"])
-    ):
-        data.pop("turn_off_message_logging", None)
     verbose_proxy_logger.debug(f"Request Headers: {_headers}")
     verbose_proxy_logger.debug(f"Raw Headers: {_raw_headers}")
 
@@ -1466,6 +1480,9 @@ async def add_litellm_data_to_request(
     if not _key_or_team_allows_client_pricing_override(user_api_key_dict):
         _strip_client_pricing_overrides(data)
 
+    if not _allow_client_message_redaction_opt_out and litellm.turn_off_message_logging is True:
+        _strip_client_message_redaction_opt_out(data)
+
     # Fill in the proxy_server_request body snapshot now that metadata has
     # been parsed. Consumers (standard_logging_payload, lago,
     # spend_tracking_utils, streaming_iterator) read `body` to audit the
diff --git a/tests/logging_callback_tests/test_logging_redaction_e2e_test.py b/tests/logging_callback_tests/test_logging_redaction_e2e_test.py
index 3f4b446bea5..891e5020f37 100644
--- a/tests/logging_callback_tests/test_logging_redaction_e2e_test.py
+++ b/tests/logging_callback_tests/test_logging_redaction_e2e_test.py
@@ -56,69 +56,56 @@ async def test_global_redaction_on():
     )
 
 
-@pytest.mark.parametrize("turn_off_message_logging", [True, False])
+@pytest.mark.parametrize(
+    "dynamic_turn_off, expect_redacted",
+    [(True, True), (False, False)],
+)
 @pytest.mark.asyncio
-async def test_global_redaction_ignores_dynamic_param(turn_off_message_logging):
-    """
-    Request-body `turn_off_message_logging` is no longer honored as a dynamic
-    callback param — global setting (or admin-configured key/team config) wins.
-    With global redaction ON, the caller cannot disable redaction via the
-    request body.
-    """
+async def test_dynamic_turn_off_message_logging_overrides_global_on(dynamic_turn_off, expect_redacted):
     litellm.turn_off_message_logging = True
     test_custom_logger = TestCustomLogger()
     litellm.callbacks = [test_custom_logger]
-    response = await litellm.acompletion(
+    await litellm.acompletion(
         model="gpt-5-mini",
         messages=[{"role": "user", "content": "hi"}],
-        turn_off_message_logging=turn_off_message_logging,
+        turn_off_message_logging=dynamic_turn_off,
         mock_response="hello",
     )
 
     await asyncio.sleep(1)
     standard_logging_payload = test_custom_logger.logged_standard_logging_payload
     assert standard_logging_payload is not None
-    print(
-        "logged standard logging payload",
-        json.dumps(standard_logging_payload, indent=2),
-    )
 
-    response = standard_logging_payload["response"]
-    assert response["choices"][0]["message"]["content"] == "redacted-by-litellm"
-    assert standard_logging_payload["messages"][0]["content"] == "redacted-by-litellm"
+    expected_response_content = "redacted-by-litellm" if expect_redacted else "hello"
+    expected_message_content = "redacted-by-litellm" if expect_redacted else "hi"
+    assert standard_logging_payload["response"]["choices"][0]["message"]["content"] == expected_response_content
+    assert standard_logging_payload["messages"][0]["content"] == expected_message_content
 
 
-@pytest.mark.parametrize("turn_off_message_logging", [True, False])
+@pytest.mark.parametrize(
+    "dynamic_turn_off, expect_redacted",
+    [(True, True), (False, False)],
+)
 @pytest.mark.asyncio
-async def test_global_redaction_off_ignores_dynamic_param(turn_off_message_logging):
-    """
-    Request-body `turn_off_message_logging` is no longer honored as a dynamic
-    callback param — global setting (or admin-configured key/team config) wins.
-    With global redaction OFF, the caller cannot enable redaction via the
-    request body.
-    """
+async def test_dynamic_turn_off_message_logging_overrides_global_off(dynamic_turn_off, expect_redacted):
     litellm.turn_off_message_logging = False
     test_custom_logger = TestCustomLogger()
     litellm.callbacks = [test_custom_logger]
-    response = await litellm.acompletion(
+    await litellm.acompletion(
         model="gpt-5-mini",
         messages=[{"role": "user", "content": "hi"}],
-        turn_off_message_logging=turn_off_message_logging,
+        turn_off_message_logging=dynamic_turn_off,
         mock_response="hello",
     )
 
     await asyncio.sleep(1)
     standard_logging_payload = test_custom_logger.logged_standard_logging_payload
     assert standard_logging_payload is not None
-    print(
-        "logged standard logging payload",
-        json.dumps(standard_logging_payload, indent=2),
-    )
-    assert (
-        standard_logging_payload["response"]["choices"][0]["message"]["content"]
-        == "hello"
-    )
-    assert standard_logging_payload["messages"][0]["content"] == "hi"
+
+    expected_response_content = "redacted-by-litellm" if expect_redacted else "hello"
+    expected_message_content = "redacted-by-litellm" if expect_redacted else "hi"
+    assert standard_logging_payload["response"]["choices"][0]["message"]["content"] == expected_response_content
+    assert standard_logging_payload["messages"][0]["content"] == expected_message_content
 
 
 @pytest.mark.asyncio
diff --git a/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py b/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py
index f63216b96d4..0dca4f3a1b1 100644
--- a/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py
+++ b/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py
@@ -7,9 +7,53 @@ sys.path.insert(0, os.path.abspath("../../.."))
 
 from litellm.litellm_core_utils.initialize_dynamic_callback_params import (
     initialize_standard_callback_dynamic_params,
+    iter_client_callback_metadata_dicts,
 )
 
 
+def test_iter_client_callback_metadata_dicts_covers_all_read_paths():
+    md = {"m": 1}
+    lm = {"lm": 1}
+    lp_md = {"lp": 1}
+    slots = dict(
+        iter_client_callback_metadata_dicts(
+            {
+                "metadata": md,
+                "litellm_metadata": lm,
+                "litellm_params": {"metadata": lp_md},
+            }
+        )
+    )
+    assert slots == {
+        "metadata": md,
+        "litellm_metadata": lm,
+        "litellm_params.metadata": lp_md,
+    }
+
+
+def test_iter_client_callback_metadata_dicts_skips_non_dict_slots():
+    slots = list(
+        iter_client_callback_metadata_dicts(
+            {
+                "metadata": "not-a-dict",
+                "litellm_metadata": None,
+                "litellm_params": {"metadata": []},
+            }
+        )
+    )
+    assert slots == []
+
+
+def test_extractor_reads_turn_off_message_logging_from_every_slot():
+    for kwargs in (
+        {"metadata": {"turn_off_message_logging": True}},
+        {"litellm_metadata": {"turn_off_message_logging": True}},
+        {"litellm_params": {"metadata": {"turn_off_message_logging": True}}},
+    ):
+        params = initialize_standard_callback_dynamic_params(kwargs)
+        assert params.get("turn_off_message_logging") is True, kwargs
+
+
 def test_resolves_plain_values_at_top_level():
     kwargs = {
         "langfuse_public_key": "pk-test",
@@ -36,6 +80,33 @@ def test_resolves_plain_values_from_metadata():
     assert params.get("langfuse_host") == "https://test.langfuse.com"
 
 
+def test_litellm_params_metadata_overrides_metadata():
+    kwargs = {
+        "metadata": {
+            "langfuse_public_key": "pk-meta",
+        },
+        "litellm_params": {
+            "metadata": {
+                "langfuse_public_key": "pk-litellm-params",
+            }
+        },
+    }
+
+    params = initialize_standard_callback_dynamic_params(kwargs)
+
+    assert params.get("langfuse_public_key") == "pk-litellm-params"
+
+
+def test_top_level_kwargs_overrides_metadata_slots():
+    kwargs = {
+        "langfuse_public_key": "from-top-level",
+        "metadata": {"langfuse_public_key": "from-metadata"},
+        "litellm_params": {"metadata": {"langfuse_public_key": "from-litellm-params"}},
+    }
+    params = initialize_standard_callback_dynamic_params(kwargs)
+    assert params.get("langfuse_public_key") == "from-top-level"
+
+
 def test_env_reference_at_top_level_raises_with_guidance():
     kwargs = {"langfuse_public_key": "os.environ/LANGFUSE_PUBLIC_KEY"}
 
@@ -100,11 +171,17 @@ def test_non_string_values_are_not_flagged():
     assert params.get("langsmith_sampling_rate") == 0.5
 
 
-def test_turn_off_message_logging_not_extracted_from_request():
-    """turn_off_message_logging is admin-only — must not be settable via request."""
-    kwargs = {"turn_off_message_logging": True}
+@pytest.mark.parametrize(
+    "kwargs,expected",
+    [
+        ({"turn_off_message_logging": False}, False),
+        ({"turn_off_message_logging": "False"}, "False"),
+        ({"metadata": {"turn_off_message_logging": True}}, True),
+    ],
+)
+def test_turn_off_message_logging_extracted_from_kwargs(kwargs, expected):
     params = initialize_standard_callback_dynamic_params(kwargs)
-    assert params.get("turn_off_message_logging") is None
+    assert params.get("turn_off_message_logging") == expected
 
 
 def test_empty_kwargs_returns_empty_params():
diff --git a/tests/test_litellm/proxy/auth/test_auth_utils.py b/tests/test_litellm/proxy/auth/test_auth_utils.py
index d5d2d27cb7e..21a001d77d7 100644
--- a/tests/test_litellm/proxy/auth/test_auth_utils.py
+++ b/tests/test_litellm/proxy/auth/test_auth_utils.py
@@ -2104,6 +2104,21 @@ class TestObservabilityCallbackBans:
             )
         assert field in str(exc.value)
 
+    def test_observability_field_in_litellm_params_metadata_is_rejected(self):
+        with pytest.raises(ValueError) as exc:
+            is_request_body_safe(
+                request_body={
+                    "model": "gpt-4",
+                    "litellm_params": {
+                        "metadata": {"turn_off_message_logging": False}
+                    },
+                },
+                general_settings={},
+                llm_router=None,
+                model="gpt-4",
+            )
+        assert "turn_off_message_logging" in str(exc.value)
+
     @pytest.mark.parametrize(
         "metadata_key",
         ["metadata", "litellm_metadata"],
diff --git a/tests/test_litellm/proxy/test_litellm_pre_call_utils.py b/tests/test_litellm/proxy/test_litellm_pre_call_utils.py
index 5a5ceae29ed..913ac116866 100644
--- a/tests/test_litellm/proxy/test_litellm_pre_call_utils.py
+++ b/tests/test_litellm/proxy/test_litellm_pre_call_utils.py
@@ -856,10 +856,19 @@ async def test_add_litellm_data_to_request_strips_client_redaction_bypass_contro
                 "model": "gpt-3.5-turbo",
                 "messages": [{"role": "user", "content": "hello"}],
                 "turn_off_message_logging": False,
-                "metadata": {"headers": {"litellm-disable-message-redaction": "true"}},
+                "metadata": {
+                    "headers": {"litellm-disable-message-redaction": "true"},
+                    "turn_off_message_logging": False,
+                },
                 "litellm_metadata": json.dumps(
-                    {"headers": {"LiteLLM-Disable-Message-Redaction": "true"}}
+                    {
+                        "headers": {"LiteLLM-Disable-Message-Redaction": "true"},
+                        "turn_off_message_logging": "false",
+                    }
                 ),
+                "litellm_params": {
+                    "metadata": {"turn_off_message_logging": False},
+                },
             },
             request=request_mock,
             user_api_key_dict=UserAPIKeyAuth(api_key="hashed-key"),
@@ -871,6 +880,9 @@ async def test_add_litellm_data_to_request_strips_client_redaction_bypass_contro
         litellm.turn_off_message_logging = original_turn_off_message_logging
 
     assert "turn_off_message_logging" not in updated
+    assert "turn_off_message_logging" not in (updated.get("litellm_params") or {}).get("metadata", {})
+    assert "turn_off_message_logging" not in updated["metadata"]
+    assert "turn_off_message_logging" not in (updated.get("litellm_metadata") or {})
     assert "litellm-disable-message-redaction" not in {
         header.lower() for header in updated["metadata"]["headers"]
     }
@@ -891,6 +903,158 @@ async def test_add_litellm_data_to_request_strips_client_redaction_bypass_contro
     }
 
 
+@pytest.mark.parametrize(
+    "admin_metadata_kwargs",
+    [
+        {
+            "metadata": {
+                "logging": [
+                    {
+                        "callback_name": "langfuse",
+                        "callback_type": "success_and_failure",
+                        "callback_vars": {"turn_off_message_logging": False},
+                    }
+                ]
+            }
+        },
+        {
+            "team_metadata": {
+                "logging": [
+                    {
+                        "callback_name": "langfuse",
+                        "callback_type": "success_and_failure",
+                        "callback_vars": {"turn_off_message_logging": False},
+                    }
+                ]
+            }
+        },
+    ],
+)
+@pytest.mark.asyncio
+async def test_add_litellm_data_to_request_admin_callback_vars_turn_off_message_logging_overrides_global(
+    admin_metadata_kwargs,
+):
+    from litellm.litellm_core_utils.initialize_dynamic_callback_params import (
+        initialize_standard_callback_dynamic_params,
+    )
+    from litellm.litellm_core_utils.redact_messages import should_redact_message_logging
+
+    request_mock = MagicMock(spec=Request)
+    request_mock.url.path = "/v1/chat/completions"
+    request_mock.url = MagicMock()
+    request_mock.url.__str__.return_value = "http://localhost/v1/chat/completions"
+    request_mock.method = "POST"
+    request_mock.query_params = {}
+    request_mock.headers = {"Content-Type": "application/json"}
+    request_mock.client = MagicMock()
+    request_mock.client.host = "127.0.0.1"
+
+    original_turn_off_message_logging = litellm.turn_off_message_logging
+    litellm.turn_off_message_logging = True
+    try:
+        updated = await add_litellm_data_to_request(
+            data={
+                "model": "gpt-3.5-turbo",
+                "messages": [{"role": "user", "content": "hello"}],
+            },
+            request=request_mock,
+            user_api_key_dict=UserAPIKeyAuth(api_key="hashed-key", **admin_metadata_kwargs),
+            proxy_config=MagicMock(),
+            general_settings={},
+            version="test-version",
+        )
+
+        assert updated.get("turn_off_message_logging") == "False"
+
+        dynamic_params = initialize_standard_callback_dynamic_params(updated)
+        assert dynamic_params.get("turn_off_message_logging") == "False"
+
+        assert (
+            should_redact_message_logging(
+                {"standard_callback_dynamic_params": dynamic_params}
+            )
+            is False
+        )
+    finally:
+        litellm.turn_off_message_logging = original_turn_off_message_logging
+
+
+@pytest.mark.parametrize(
+    "admin_metadata_kwargs",
+    [
+        {
+            "metadata": {
+                "logging": [
+                    {
+                        "callback_name": "langfuse",
+                        "callback_type": "success_and_failure",
+                        "callback_vars": {"turn_off_message_logging": True},
+                    }
+                ]
+            }
+        },
+        {
+            "team_metadata": {
+                "logging": [
+                    {
+                        "callback_name": "langfuse",
+                        "callback_type": "success_and_failure",
+                        "callback_vars": {"turn_off_message_logging": True},
+                    }
+                ]
+            }
+        },
+    ],
+)
+@pytest.mark.asyncio
+async def test_add_litellm_data_to_request_admin_callback_vars_turn_off_message_logging_enables_redaction_when_global_off(
+    admin_metadata_kwargs,
+):
+    from litellm.litellm_core_utils.initialize_dynamic_callback_params import (
+        initialize_standard_callback_dynamic_params,
+    )
+    from litellm.litellm_core_utils.redact_messages import should_redact_message_logging
+
+    request_mock = MagicMock(spec=Request)
+    request_mock.url.path = "/v1/chat/completions"
+    request_mock.url = MagicMock()
+    request_mock.url.__str__.return_value = "http://localhost/v1/chat/completions"
+    request_mock.method = "POST"
+    request_mock.query_params = {}
+    request_mock.headers = {"Content-Type": "application/json"}
+    request_mock.client = MagicMock()
+    request_mock.client.host = "127.0.0.1"
+
+    original_turn_off_message_logging = litellm.turn_off_message_logging
+    litellm.turn_off_message_logging = False
+    try:
+        updated = await add_litellm_data_to_request(
+            data={
+                "model": "gpt-3.5-turbo",
+                "messages": [{"role": "user", "content": "hello"}],
+            },
+            request=request_mock,
+            user_api_key_dict=UserAPIKeyAuth(api_key="hashed-key", **admin_metadata_kwargs),
+            proxy_config=MagicMock(),
+            general_settings={},
+            version="test-version",
+        )
+
+        assert updated.get("turn_off_message_logging") == "True"
+
+        dynamic_params = initialize_standard_callback_dynamic_params(updated)
+        assert dynamic_params.get("turn_off_message_logging") == "True"
+
+        assert (
+            should_redact_message_logging(
+                {"standard_callback_dynamic_params": dynamic_params}
+            )
+            is True
+        )
+    finally:
+        litellm.turn_off_message_logging = original_turn_off_message_logging
+
+
 @pytest.mark.parametrize(
     "auth_kwargs",
     [
@@ -923,7 +1087,10 @@ async def test_add_litellm_data_to_request_allows_redaction_opt_out_with_admin_o
                 "model": "gpt-3.5-turbo",
                 "messages": [{"role": "user", "content": "hello"}],
                 "turn_off_message_logging": False,
-                "metadata": {"headers": {"litellm-disable-message-redaction": "true"}},
+                "metadata": {
+                    "headers": {"litellm-disable-message-redaction": "true"},
+                    "turn_off_message_logging": False,
+                },
                 "litellm_metadata": json.dumps(
                     {"headers": {"LiteLLM-Disable-Message-Redaction": "true"}}
                 ),
@@ -938,6 +1105,7 @@ async def test_add_litellm_data_to_request_allows_redaction_opt_out_with_admin_o
         litellm.turn_off_message_logging = original_turn_off_message_logging
 
     assert updated["turn_off_message_logging"] is False
+    assert updated["metadata"]["turn_off_message_logging"] is False
     assert "litellm-disable-message-redaction" in {
         header.lower() for header in updated["metadata"]["headers"]
     }

From 58de9209212730a0b0fc7c80fcb5ecc9ffe3ebcd Mon Sep 17 00:00:00 2001
From: tin-berri <tin@berri.ai>
Date: Thu, 2 Jul 2026 15:33:44 -0700
Subject: [PATCH 07/26] feat(mcp): bound outbound tool-call concurrency per MCP
 server (#31641)

Add an optional per-server max_concurrent_requests that caps how many
tool calls LiteLLM sends to one MCP server at once, so batch-processing
backends are not overwhelmed by unbounded parallel dispatch. Excess calls
queue on a per-server asyncio.Semaphore instead of being rejected. Unset
or non-positive means unlimited, preserving existing behavior.

Resolves LIT-2749
---
 .../migration.sql                             |   2 +
 .../litellm_proxy_extras/schema.prisma        |   1 +
 litellm/models/mcp_server.py                  |   1 +
 .../mcp_server/mcp_server_manager.py          |  41 +++-
 litellm/proxy/_types.py                       |   2 +
 .../mcp_management_endpoints.py               |   1 +
 litellm/proxy/schema.prisma                   |   1 +
 .../types/mcp_server/mcp_server_manager.py    |   3 +
 schema.prisma                                 |   1 +
 .../test_mcp_max_concurrent_requests.py       | 184 ++++++++++++++++++
 10 files changed, 234 insertions(+), 3 deletions(-)
 create mode 100644 litellm-proxy-extras/litellm_proxy_extras/migrations/20260629000000_add_max_concurrent_requests_to_mcp_server_table/migration.sql
 create mode 100644 tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py

diff --git a/litellm-proxy-extras/litellm_proxy_extras/migrations/20260629000000_add_max_concurrent_requests_to_mcp_server_table/migration.sql b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260629000000_add_max_concurrent_requests_to_mcp_server_table/migration.sql
new file mode 100644
index 00000000000..eeeecce741d
--- /dev/null
+++ b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260629000000_add_max_concurrent_requests_to_mcp_server_table/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "LiteLLM_MCPServerTable" ADD COLUMN     "max_concurrent_requests" INTEGER;
diff --git a/litellm-proxy-extras/litellm_proxy_extras/schema.prisma b/litellm-proxy-extras/litellm_proxy_extras/schema.prisma
index 5351e0a1470..5e8bb2f37f4 100644
--- a/litellm-proxy-extras/litellm_proxy_extras/schema.prisma
+++ b/litellm-proxy-extras/litellm_proxy_extras/schema.prisma
@@ -338,6 +338,7 @@ model LiteLLM_MCPServerTable {
   byok_api_key_help_url String?
   source_url            String?
   timeout               Float?
+  max_concurrent_requests Int?
   // BYOM submission lifecycle
   approval_status  String?   @default("active")
   submitted_by     String?
diff --git a/litellm/models/mcp_server.py b/litellm/models/mcp_server.py
index 3d03eff6df8..5d3bc176134 100644
--- a/litellm/models/mcp_server.py
+++ b/litellm/models/mcp_server.py
@@ -93,6 +93,7 @@ class LiteLLM_MCPServerTable(LiteLLMPydanticObjectBase):
     has_user_credential: Optional[bool] = None
     source_url: Optional[str] = None
     timeout: Optional[float] = None
+    max_concurrent_requests: Optional[int] = None
     approval_status: Optional[str] = Field(
         default="active",
         description="Approval status: 'pending_review', 'active', 'rejected'",
diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index 95d00554034..bf15ad2986f 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -13,7 +13,8 @@ import json
 import os
 import re
 import time
-from typing import Any, Callable, Dict, List, Literal, Optional, Set, Tuple, Union, cast
+from contextlib import asynccontextmanager
+from typing import Any, AsyncIterator, Callable, Dict, List, Literal, Optional, Set, Tuple, Union, cast
 from urllib.parse import urlparse
 
 import anyio
@@ -550,6 +551,11 @@ class MCPServerManager:
         ]
         """
 
+        # Per-server outbound tool-call concurrency limiters, lazily created from
+        # each server's max_concurrent_requests. Keyed by server_id so the cap
+        # survives the registry atomic-swap on config reload; a missing key means
+        # the server has no configured limit.
+        self._server_call_semaphores: Dict[str, asyncio.Semaphore] = {}
         self.tool_name_to_mcp_server_name_mapping: Dict[str, str] = {}
         """
         {
@@ -790,6 +796,7 @@ class MCPServerManager:
                 allow_sampling=bool(server_config.get("allow_sampling", False)),
                 allow_elicitation=bool(server_config.get("allow_elicitation", False)),
                 timeout=server_config.get("timeout", None),
+                max_concurrent_requests=server_config.get("max_concurrent_requests", None),
             )
             self._assign_unique_short_prefix(new_server)
             _warn_internal_delegate_pkce_if_applicable(new_server, source="config")
@@ -1164,6 +1171,7 @@ class MCPServerManager:
             subject_token_type=(credentials_dict.get("subject_token_type") if credentials_dict else None)
             or "urn:ietf:params:oauth:token-type:access_token",
             timeout=getattr(mcp_server, "timeout", None),
+            max_concurrent_requests=getattr(mcp_server, "max_concurrent_requests", None),
         )
         _warn_internal_delegate_pkce_if_applicable(new_server, source="database")
         return new_server
@@ -3211,6 +3219,25 @@ class MCPServerManager:
             )
         )
 
+    def _get_call_semaphore(self, mcp_server: MCPServer) -> Optional[asyncio.Semaphore]:
+        limit = mcp_server.max_concurrent_requests
+        if limit is None or limit <= 0:
+            return None
+        semaphore = self._server_call_semaphores.get(mcp_server.server_id)
+        if semaphore is None:
+            semaphore = asyncio.Semaphore(limit)
+            self._server_call_semaphores[mcp_server.server_id] = semaphore
+        return semaphore
+
+    @asynccontextmanager
+    async def _limit_outbound_concurrency(self, mcp_server: MCPServer) -> AsyncIterator[None]:
+        semaphore = self._get_call_semaphore(mcp_server)
+        if semaphore is None:
+            yield
+            return
+        async with semaphore:
+            yield
+
     async def _call_regular_mcp_tool(
         self,
         mcp_server: MCPServer,
@@ -3370,7 +3397,8 @@ class MCPServerManager:
         )
 
         async def _call_tool_via_client(client, params):
-            return await client.call_tool(params, host_progress_callback=host_progress_callback)
+            async with self._limit_outbound_concurrency(mcp_server):
+                return await client.call_tool(params, host_progress_callback=host_progress_callback)
 
         tasks.append(asyncio.create_task(_call_tool_via_client(client, call_tool_params)))
 
@@ -3592,7 +3620,12 @@ class MCPServerManager:
                     "transport to enable hook header injection.",
                     server_name,
                 )
-            tasks.append(asyncio.create_task(self._call_openapi_tool_handler(mcp_server, name, arguments)))
+
+            async def _call_openapi_via_handler():
+                async with self._limit_outbound_concurrency(mcp_server):
+                    return await self._call_openapi_tool_handler(mcp_server, name, arguments)
+
+            tasks.append(asyncio.create_task(_call_openapi_via_handler()))
         else:
             return await self._call_regular_mcp_tool(
                 mcp_server=mcp_server,
@@ -4149,6 +4182,7 @@ class MCPServerManager:
             allow_all_keys=server.allow_all_keys,
             instructions=server.instructions,
             timeout=server.timeout,
+            max_concurrent_requests=server.max_concurrent_requests,
         )
 
     async def get_all_mcp_servers_with_health_and_teams(
@@ -4256,6 +4290,7 @@ class MCPServerManager:
             source_url=server.source_url,
             instructions=server.instructions,
             timeout=server.timeout,
+            max_concurrent_requests=server.max_concurrent_requests,
         )
 
     async def get_all_mcp_servers_unfiltered(self) -> List[LiteLLM_MCPServerTable]:
diff --git a/litellm/proxy/_types.py b/litellm/proxy/_types.py
index 12466b525d6..78bcdc490dc 100644
--- a/litellm/proxy/_types.py
+++ b/litellm/proxy/_types.py
@@ -1261,6 +1261,7 @@ class NewMCPServerRequest(LiteLLMPydanticObjectBase):
     byok_api_key_help_url: Optional[str] = None
     source_url: Optional[str] = None
     timeout: Optional[float] = None
+    max_concurrent_requests: Optional[int] = None
     # BYOM submission fields — set by the endpoint, not by the caller.
     # Any caller-provided values are silently overridden before persistence.
     approval_status: Optional[str] = Field(
@@ -1346,6 +1347,7 @@ class UpdateMCPServerRequest(LiteLLMPydanticObjectBase):
     byok_api_key_help_url: Optional[str] = None
     source_url: Optional[str] = None
     timeout: Optional[float] = None
+    max_concurrent_requests: Optional[int] = None
 
     @model_validator(mode="before")
     @classmethod
diff --git a/litellm/proxy/management_endpoints/mcp_management_endpoints.py b/litellm/proxy/management_endpoints/mcp_management_endpoints.py
index 9dab3498bc1..cb3daa84a0b 100644
--- a/litellm/proxy/management_endpoints/mcp_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/mcp_management_endpoints.py
@@ -654,6 +654,7 @@ if MCP_AVAILABLE:
             allow_all_keys=payload.allow_all_keys,
             available_on_public_internet=payload.available_on_public_internet,
             timeout=payload.timeout,
+            max_concurrent_requests=payload.max_concurrent_requests,
         )
 
     def get_prisma_client_or_throw(message: str):
diff --git a/litellm/proxy/schema.prisma b/litellm/proxy/schema.prisma
index 5351e0a1470..5e8bb2f37f4 100644
--- a/litellm/proxy/schema.prisma
+++ b/litellm/proxy/schema.prisma
@@ -338,6 +338,7 @@ model LiteLLM_MCPServerTable {
   byok_api_key_help_url String?
   source_url            String?
   timeout               Float?
+  max_concurrent_requests Int?
   // BYOM submission lifecycle
   approval_status  String?   @default("active")
   submitted_by     String?
diff --git a/litellm/types/mcp_server/mcp_server_manager.py b/litellm/types/mcp_server/mcp_server_manager.py
index d7c04c09585..c4e37b236ae 100644
--- a/litellm/types/mcp_server/mcp_server_manager.py
+++ b/litellm/types/mcp_server/mcp_server_manager.py
@@ -118,6 +118,9 @@ class MCPServer(BaseModel):
     # MCP_PER_USER_TOKEN_DEFAULT_TTL when expires_in is absent.
     token_storage_ttl_seconds: Optional[int] = None
     timeout: Optional[float] = None
+    # Max concurrent outbound tool calls to this server; excess calls queue.
+    # None or a value <= 0 means unlimited.
+    max_concurrent_requests: Optional[int] = None
     # Resolved short-ID tool prefix when LITELLM_USE_SHORT_MCP_TOOL_PREFIX is
     # enabled.  Set by ``MCPServerManager._assign_unique_short_prefix`` at
     # registration time so that natural-hash collisions between two
diff --git a/schema.prisma b/schema.prisma
index 5351e0a1470..5e8bb2f37f4 100644
--- a/schema.prisma
+++ b/schema.prisma
@@ -338,6 +338,7 @@ model LiteLLM_MCPServerTable {
   byok_api_key_help_url String?
   source_url            String?
   timeout               Float?
+  max_concurrent_requests Int?
   // BYOM submission lifecycle
   approval_status  String?   @default("active")
   submitted_by     String?
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py
new file mode 100644
index 00000000000..8c4d81223aa
--- /dev/null
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_max_concurrent_requests.py
@@ -0,0 +1,184 @@
+import asyncio
+from typing import Dict, Optional
+
+import pytest
+from unittest.mock import patch
+
+from litellm.proxy._experimental.mcp_server.mcp_server_manager import MCPServerManager
+from litellm.types.mcp import MCPAuth, MCPTransport
+from litellm.types.mcp_server.mcp_server_manager import MCPServer
+
+HOLD_SECONDS = 0.1
+
+
+class _ConcurrencyTracker:
+    """Records how many call_tool invocations are simultaneously in flight."""
+
+    def __init__(self) -> None:
+        self.current_by_server: Dict[str, int] = {}
+        self.peak_by_server: Dict[str, int] = {}
+        self.global_current = 0
+        self.global_peak = 0
+
+    def enter(self, server_id: str) -> None:
+        self.current_by_server[server_id] = self.current_by_server.get(server_id, 0) + 1
+        self.peak_by_server[server_id] = max(self.peak_by_server.get(server_id, 0), self.current_by_server[server_id])
+        self.global_current += 1
+        self.global_peak = max(self.global_peak, self.global_current)
+
+    def exit(self, server_id: str) -> None:
+        self.current_by_server[server_id] -= 1
+        self.global_current -= 1
+
+
+def _make_server(server_id: str, max_concurrent_requests: Optional[int]) -> MCPServer:
+    return MCPServer(
+        server_id=server_id,
+        name=server_id,
+        server_name=server_id,
+        url="https://example.com",
+        transport=MCPTransport.http,
+        auth_type=MCPAuth.none,
+        max_concurrent_requests=max_concurrent_requests,
+    )
+
+
+def _patch_client_with_tracker(manager: MCPServerManager, tracker: _ConcurrencyTracker):
+    async def fake_create_mcp_client(server, **kwargs):
+        class _ProbeClient:
+            async def call_tool(self, params, host_progress_callback=None):
+                tracker.enter(server.server_id)
+                try:
+                    await asyncio.sleep(HOLD_SECONDS)
+                    return "ok"
+                finally:
+                    tracker.exit(server.server_id)
+
+        return _ProbeClient()
+
+    return patch.object(manager, "_create_mcp_client", side_effect=fake_create_mcp_client)
+
+
+async def _fire(manager: MCPServerManager, server: MCPServer, n: int) -> None:
+    await asyncio.gather(
+        *[
+            manager._call_regular_mcp_tool(
+                mcp_server=server,
+                original_tool_name="tool",
+                arguments={},
+                tasks=[],
+                mcp_auth_header=None,
+                mcp_server_auth_headers=None,
+                oauth2_headers=None,
+                raw_headers=None,
+                proxy_logging_obj=None,
+            )
+            for _ in range(n)
+        ]
+    )
+
+
+@pytest.mark.asyncio
+async def test_max_concurrent_requests_caps_in_flight_tool_calls():
+    """A configured cap of 2 must never let more than 2 calls hit one server at once."""
+    manager = MCPServerManager()
+    tracker = _ConcurrencyTracker()
+    server = _make_server("srv-limited", max_concurrent_requests=2)
+
+    with _patch_client_with_tracker(manager, tracker):
+        await _fire(manager, server, n=8)
+
+    assert tracker.peak_by_server["srv-limited"] == 2
+
+
+@pytest.mark.asyncio
+async def test_unset_limit_allows_unbounded_concurrency():
+    """With no cap, all calls run concurrently (backward-compatible default)."""
+    manager = MCPServerManager()
+    tracker = _ConcurrencyTracker()
+    server = _make_server("srv-unbounded", max_concurrent_requests=None)
+
+    with _patch_client_with_tracker(manager, tracker):
+        await _fire(manager, server, n=6)
+
+    assert tracker.peak_by_server["srv-unbounded"] == 6
+
+
+@pytest.mark.asyncio
+async def test_non_positive_limit_is_treated_as_unlimited():
+    """A cap of 0 must not deadlock; it means unlimited, not a zero-permit semaphore."""
+    manager = MCPServerManager()
+    tracker = _ConcurrencyTracker()
+    server = _make_server("srv-zero", max_concurrent_requests=0)
+
+    with _patch_client_with_tracker(manager, tracker):
+        await asyncio.wait_for(_fire(manager, server, n=5), timeout=5)
+
+    assert tracker.peak_by_server["srv-zero"] == 5
+
+
+@pytest.mark.asyncio
+async def test_limit_is_scoped_per_server():
+    """Each server gets its own limiter; one server's cap must not throttle another."""
+    manager = MCPServerManager()
+    tracker = _ConcurrencyTracker()
+    server_a = _make_server("srv-a", max_concurrent_requests=1)
+    server_b = _make_server("srv-b", max_concurrent_requests=1)
+
+    with _patch_client_with_tracker(manager, tracker):
+        await asyncio.gather(
+            _fire(manager, server_a, n=3),
+            _fire(manager, server_b, n=3),
+        )
+
+    assert tracker.peak_by_server["srv-a"] == 1
+    assert tracker.peak_by_server["srv-b"] == 1
+    assert tracker.global_peak == 2
+
+
+@pytest.mark.asyncio
+async def test_openapi_backed_server_also_respects_the_cap():
+    """OpenAPI (spec_path) servers dispatch through a different handler; the cap
+    must apply there too, not only on the regular MCP client path."""
+    manager = MCPServerManager()
+    tracker = _ConcurrencyTracker()
+    server = _make_server("srv-openapi", max_concurrent_requests=2)
+    server.spec_path = "/fake/openapi.json"
+
+    async def fake_openapi_handler(mcp_server, name, arguments):
+        tracker.enter(mcp_server.server_id)
+        try:
+            await asyncio.sleep(HOLD_SECONDS)
+            return "ok"
+        finally:
+            tracker.exit(mcp_server.server_id)
+
+    with (
+        patch.object(manager, "_resolve_mcp_server_for_tool_call", return_value=server),
+        patch.object(manager, "_call_openapi_tool_handler", side_effect=fake_openapi_handler),
+    ):
+        await asyncio.gather(
+            *[manager.call_tool(server_name="srv-openapi", name="tool", arguments={}) for _ in range(6)]
+        )
+
+    assert tracker.peak_by_server["srv-openapi"] == 2
+
+
+def test_semaphore_is_reused_per_server_and_distinct_across_servers():
+    manager = MCPServerManager()
+    server_a = _make_server("srv-a", max_concurrent_requests=3)
+    server_b = _make_server("srv-b", max_concurrent_requests=3)
+
+    sem_a_first = manager._get_call_semaphore(server_a)
+    sem_a_second = manager._get_call_semaphore(server_a)
+    sem_b = manager._get_call_semaphore(server_b)
+
+    assert sem_a_first is sem_a_second
+    assert sem_a_first is not sem_b
+
+
+def test_no_semaphore_created_when_limit_absent():
+    manager = MCPServerManager()
+    server = _make_server("srv-none", max_concurrent_requests=None)
+
+    assert manager._get_call_semaphore(server) is None

From b38c2906c32c38d972e7bf95b8823b04ae8435ee Mon Sep 17 00:00:00 2001
From: yuneng-jiang <yuneng@berri.ai>
Date: Thu, 2 Jul 2026 16:05:11 -0700
Subject: [PATCH 08/26] fix(release): make Create Release reliable for stable
 maintenance cuts (#31986)

* fix(release): create tag before release and set make_latest post-publish

The Create Release workflow failed for every stable maintenance release
while pre-releases succeeded. Two independent bugs were behind that.

createRelease was minting the tag from target_commitish, and that path
returns "Resource not accessible by integration" (403) to the Actions
token, or 404 to a user token, for certain commits (cli/cli#9773). The
stable-line tips tripped it; the dev/rc commits happened not to. Create
the tag up front with git.createRef and drop target_commitish so the
release attaches to the existing tag instead of minting one. A 422 from
createRef (tag already exists) is tolerated so re-runs are idempotent.

make_latest is silently ignored during the draft-to-published
transition (cli/cli#8201), so a backport that published would seize the
repo "latest" badge from a newer line. Publish first, then set
make_latest in a separate call, and only for non-prereleases.

Each operation here is already runtime-proven: git.createRef under the
workflow token by prior release-branch jobs, the no-target createRelease
and non-prerelease publish and separate make_latest PATCH by a manual
1.89.5 cut.

* fix(release): pin tag_name on publish so the draft binding can't reset

Pre-creating the tag means the draft is edited while a tag ref already exists, and a draft PATCH that omits tag_name can reset it to the untagged placeholder. Send tag_name explicitly on both updateRelease calls so publish always attaches to the intended tag.

* fix(release): fail loudly when the tag exists at a different commit

The createRef 422 swallow kept re-runs idempotent but also masked a tag that already exists at the wrong SHA, which would publish the release against the wrong commit silently. On 422, compare the existing tag ref to the intended commit and error on a mismatch, keeping idempotency only for a genuine same-SHA re-run.
---
 .github/workflows/create-release.yml | 32 ++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 4834775e329..0ad84cd3ceb 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -122,10 +122,28 @@ jobs:
                 makeLatest = (!latestVersion || isAtLeast(newVersion, latestVersion)) ? "true" : "false";
               }
 
+              try {
+                await github.rest.git.createRef({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  ref: `refs/tags/${tag}`,
+                  sha: commitHash,
+                });
+              } catch (error) {
+                if (error.status !== 422) throw error;
+                const existing = await github.rest.git.getRef({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  ref: `tags/${tag}`,
+                });
+                if (existing.data.object.sha !== commitHash) {
+                  throw new Error(`Tag ${tag} already exists at ${existing.data.object.sha}, expected ${commitHash}`);
+                }
+              }
+
               const response = await github.rest.repos.createRelease({
                 draft: true,
                 generate_release_notes: true,
-                target_commitish: commitHash,
                 name: tag,
                 owner: context.repo.owner,
                 prerelease: isPrerelease,
@@ -138,11 +156,21 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 release_id: response.data.id,
+                tag_name: tag,
                 body: updatedBody,
                 draft: false,
-                make_latest: makeLatest,
               });
 
+              if (!isPrerelease) {
+                await github.rest.repos.updateRelease({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  release_id: response.data.id,
+                  tag_name: tag,
+                  make_latest: makeLatest,
+                });
+              }
+
             } catch (error) {
               core.setFailed(error.message);
             }

From 1543725916877e02104e6197189d08d36f8dd23e Mon Sep 17 00:00:00 2001
From: Shivam Rawat <shivam@berri.ai>
Date: Thu, 2 Jul 2026 16:30:06 -0700
Subject: [PATCH 09/26] fix(bedrock): honor ttl for tool_config cache injection
 points (#31929)

* fix(bedrock): honor ttl for tool_config cache injection points

Pass cache_control_injection_points control.ttl through to Bedrock
toolConfig cachePoint blocks, matching message/system cache behavior.

Co-authored-by: Cursor <cursoragent@cursor.com>

* refactor(bedrock): drive Claude 4.5+ ttl support from pricing JSON, not regex

is_claude_4_5_on_bedrock hardcoded a model-name pattern list that needed a
manual update for every new Claude release (it already silently missed
Sonnet 5 and Fable 5). Replace it with a lookup against
cache_creation_input_token_cost_above_1hr in model_prices_and_context_window.json,
which AWS docs confirm tracks the same 1h-TTL-capable model set.

Also fixes two bedrock Claude 3.5 Sonnet entries that incorrectly carried
that pricing field (their own regional variants didn't have it), which
would have made the JSON-driven check wrongly grant them 1h TTL support.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(tests): use real Claude Sonnet 4.5 release id in ttl cache-point tests

test_add_cache_point_tool_block_passes_ttl_for_claude_4_5 and
test_bedrock_tools_pt_passes_ttl_for_claude_4_5 used a fabricated model id
(...-20250514-v1:0) that never shipped. This passed under the old regex-based
is_claude_4_5_on_bedrock, which matched on substring alone, but fails now
that it looks up cache_creation_input_token_cost_above_1hr in
litellm.model_cost, since the fake id has no pricing entry.

Also force the bundled local cost map in both tests so ttl eligibility reads
this branch's pricing data instead of the network-fetched main copy, which
lacks the fix until merge.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(bedrock): restore cache and tool config compatibility

* fix(bedrock): preserve Sonnet 5 parallel tool config

* fix(bedrock): decouple parallel tool support from cache ttl

* refactor(bedrock): drive parallel tool use config from JSON, not hardcoded patterns

Replace the hardcoded _CLAUDE_BEDROCK_PARALLEL_TOOL_USE_PATTERNS tuple and
bedrock_converse_supports_strict_tool_schemas (dead code) with a
supports_parallel_tool_use_config key in model_prices_and_context_window.json,
matching how is_claude_4_5_on_bedrock already reads
cache_creation_input_token_cost_above_1hr from the pricing JSON.

New models pick up parallel tool use support automatically when their
pricing entry ships with the key set, with no code change required

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* fix(tests): use real model id in parallel-tool-use-without-ttl-pricing test

anthropic.claude-opus-4-7-unlisted-v1:0 has no entry in
model_prices_and_context_window.json, so
bedrock_converse_supports_parallel_tool_use_config returned False and the
test died with KeyError on additionalModelRequestFields. Use
jp.anthropic.claude-opus-4-7, a real entry that carries
supports_parallel_tool_use_config without 1h-TTL cache pricing, which is
exactly the decoupling this test exists to cover

* test(utils): allow supports_parallel_tool_use_config in pricing schema

The misc unit test job validates model_prices_and_context_window.json
against the INTENDED_SCHEMA allowlist in test_utils.py, which rejects
unknown keys. Add the supports_parallel_tool_use_config key this PR
introduced so test_aaamodel_prices_and_context_window_json_is_valid
passes again

* fix(bedrock): preserve ttl for regional claude models

* fix(bedrock): fall back to base model entry when regional pricing lacks capability fields

Regional model_cost entries like jp.anthropic.claude-opus-4-7 that omit
cache_creation_input_token_cost_above_1hr shadowed the base entry that has it,
so is_claude_4_5_on_bedrock returned False and requested cache ttl values were
dropped for those deployments. Both capability lookups now consult the full
model id and the region-stripped base entry, matching the coverage of the old
name-pattern list. Also restores ToolBlock keyword construction for the
tool_config cachePoint; PEP 589 TypedDict keyword instantiation works on every
supported Python version

---------

Co-authored-by: Shivam Rawat <shivamrawat@Shivams-MacBook-Pro.local>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: mateo <mateo@berri.ai>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: mateo-berri <277851410+mateo-berri@users.noreply.github.com>
---
 .../bedrock/chat/converse_transformation.py   |   28 +-
 litellm/llms/bedrock/common_utils.py          |   48 +-
 ...odel_prices_and_context_window_backup.json | 1270 ++++++++---------
 .../anthropic_cache_control_hook.py           |    1 +
 model_prices_and_context_window.json          | 1270 ++++++++---------
 ruff-strict-budget.json                       |    2 +-
 ...llm_core_utils_prompt_templates_factory.py |  177 ++-
 .../chat/test_converse_transformation.py      |  243 ++++
 .../test_anthropic_claude3_transformation.py  |    6 +-
 .../llms/bedrock/test_bedrock_common_utils.py |   28 +
 tests/test_litellm/test_utils.py              |    1 +
 11 files changed, 1669 insertions(+), 1405 deletions(-)

diff --git a/litellm/llms/bedrock/chat/converse_transformation.py b/litellm/llms/bedrock/chat/converse_transformation.py
index b135a116753..5a8ada45651 100644
--- a/litellm/llms/bedrock/chat/converse_transformation.py
+++ b/litellm/llms/bedrock/chat/converse_transformation.py
@@ -76,6 +76,7 @@ from litellm.utils import (
 from ..common_utils import (
     BedrockError,
     BedrockModelInfo,
+    bedrock_converse_supports_parallel_tool_use_config,
     get_anthropic_beta_from_headers,
     get_bedrock_tool_name,
     is_claude_4_5_on_bedrock,
@@ -1106,18 +1107,28 @@ class AmazonConverseConfig(BaseConfig):
         if cache_control is None:
             return None
 
-        cache_point = CachePointBlock(type="default")
-        if isinstance(cache_control, dict) and "ttl" in cache_control:
-            ttl = cache_control["ttl"]
-            if ttl in ["5m", "1h"] and model is not None:
-                if is_claude_4_5_on_bedrock(model):
-                    cache_point["ttl"] = ttl
+        cache_point = self._build_cache_point_block(cache_control, model)
 
         if block_type == "system":
             return SystemContentBlock(cachePoint=cache_point)
         else:
             return ContentBlock(cachePoint=cache_point)
 
+    @staticmethod
+    def _build_cache_point_block(control: Optional[dict], model: Optional[str] = None) -> CachePointBlock:
+        """Build a Bedrock ``cachePoint`` block from an OpenAI-style ``cache_control``/``control`` dict.
+
+        ``type`` is always ``"default"`` (the only value Bedrock's Converse API
+        accepts). ``ttl`` is only honored for models that support extended TTL
+        caching (Claude 4.5 family on Bedrock).
+        """
+        cache_point = CachePointBlock(type="default")
+        if isinstance(control, dict) and "ttl" in control:
+            ttl = control["ttl"]
+            if ttl in ["5m", "1h"] and model is not None and is_claude_4_5_on_bedrock(model):
+                cache_point["ttl"] = ttl
+        return cache_point
+
     def _transform_system_message(
         self, messages: List[AllMessageValues], model: Optional[str] = None
     ) -> Tuple[List[AllMessageValues], List[SystemContentBlock]]:
@@ -1241,7 +1252,7 @@ class AmazonConverseConfig(BaseConfig):
 
         # Handle parallel_tool_calls configuration
         parallel_tool_use_config = additional_request_params.pop("_parallel_tool_use_config", None)
-        if parallel_tool_use_config is not None and is_claude_4_5_on_bedrock(model):
+        if parallel_tool_use_config is not None and bedrock_converse_supports_parallel_tool_use_config(model):
             for key, value in parallel_tool_use_config.items():
                 if (
                     key in additional_request_params
@@ -1526,7 +1537,8 @@ class AmazonConverseConfig(BaseConfig):
         if cache_injection_points and len(bedrock_tools) > 0:
             for point in cache_injection_points:
                 if point.get("location") == "tool_config":
-                    bedrock_tools.append({"cachePoint": {"type": "default"}})
+                    cache_point = self._build_cache_point_block(point.get("control"), model)
+                    bedrock_tools.append(ToolBlock(cachePoint=cache_point))
                     break
 
         bedrock_tool_config: Optional[ToolConfigBlock] = None
diff --git a/litellm/llms/bedrock/common_utils.py b/litellm/llms/bedrock/common_utils.py
index df432a4d7e3..5114677ffc0 100644
--- a/litellm/llms/bedrock/common_utils.py
+++ b/litellm/llms/bedrock/common_utils.py
@@ -685,39 +685,27 @@ def get_bedrock_base_model(model: str) -> str:
     return model
 
 
+def bedrock_converse_supports_parallel_tool_use_config(model: str) -> bool:
+    return any(
+        (litellm.model_cost.get(candidate) or {}).get("supports_parallel_tool_use_config") is True
+        for candidate in (model, get_bedrock_base_model(model))
+    )
+
+
 def is_claude_4_5_on_bedrock(model: str) -> bool:
     """
-    Check if the model is a Claude 4.5 model on Bedrock.
-    Claude 4.5 models support prompt caching with '5m' and '1h' TTL on Bedrock.
+    Check if the model supports Bedrock prompt caching with an extended '1h' TTL
+    (in addition to the default 5m TTL).
+
+    Backed by the ``cache_creation_input_token_cost_above_1hr`` field in
+    ``model_prices_and_context_window.json`` instead of a hardcoded list of
+    model-name patterns, so newly released models pick up support as soon as
+    their pricing entry ships, with no code change required here.
     """
-    model_lower = model.lower()
-    claude_4_5_patterns = [
-        "sonnet-4.5",
-        "sonnet_4.5",
-        "sonnet-4-5",
-        "sonnet_4_5",
-        "haiku-4.5",
-        "haiku_4.5",
-        "haiku-4-5",
-        "haiku_4_5",
-        "opus-4.5",
-        "opus_4.5",
-        "opus-4-5",
-        "opus_4_5",
-        "sonnet-4.6",
-        "sonnet_4.6",
-        "sonnet-4-6",
-        "sonnet_4_6",
-        "opus-4.6",
-        "opus_4.6",
-        "opus-4-6",
-        "opus_4_6",
-        "opus-4.7",
-        "opus_4.7",
-        "opus-4-7",
-        "opus_4_7",
-    ]
-    return any(pattern in model_lower for pattern in claude_4_5_patterns)
+    return any(
+        (litellm.model_cost.get(candidate) or {}).get("cache_creation_input_token_cost_above_1hr") is not None
+        for candidate in (model, get_bedrock_base_model(model))
+    )
 
 
 _BEDROCK_MODEL_VERSION_SUFFIX_RE = re.compile(r"-v\d+(?::\d+)?$")
diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index bf63ef73c22..a4cca8d6cb0 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -744,7 +744,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-haiku-4-5@20251001": {
         "cache_creation_input_token_cost": 1.25e-06,
@@ -768,7 +769,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_streaming": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-3-5-sonnet-20240620-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -787,8 +789,6 @@
         "output_cost_per_token_above_200k_tokens": 3e-05,
         "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06,
         "cache_read_input_token_cost_above_200k_tokens": 6e-07,
-        "cache_creation_input_token_cost_above_1hr": 7.5e-06,
-        "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.5e-05,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_read_input_token_cost": 3e-07
     },
@@ -813,9 +813,7 @@
         "input_cost_per_token_above_200k_tokens": 6e-06,
         "output_cost_per_token_above_200k_tokens": 3e-05,
         "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06,
-        "cache_read_input_token_cost_above_200k_tokens": 6e-07,
-        "cache_creation_input_token_cost_above_1hr": 7.5e-06,
-        "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.5e-05
+        "cache_read_input_token_cost_above_200k_tokens": 6e-07
     },
     "anthropic.claude-3-7-sonnet-20240620-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -991,7 +989,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1010,7 +1009,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1023,7 +1021,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1042,7 +1041,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1055,7 +1053,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1074,7 +1073,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1087,7 +1085,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1106,7 +1105,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1119,7 +1117,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1138,7 +1137,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1151,7 +1149,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1171,7 +1170,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1186,7 +1184,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-mythos-preview": {
         "input_cost_per_token": 0,
@@ -1221,7 +1220,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1236,7 +1234,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1256,7 +1255,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1271,7 +1269,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1291,7 +1290,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1306,7 +1304,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1326,7 +1325,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1341,7 +1339,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.25e-05,
@@ -1374,7 +1373,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.25e-05,
@@ -1407,7 +1407,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.375e-05,
@@ -1440,7 +1441,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.375e-05,
@@ -1473,7 +1475,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1493,7 +1496,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1508,7 +1510,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1528,7 +1531,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1543,7 +1545,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1563,7 +1566,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1578,7 +1580,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1598,7 +1601,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1613,7 +1615,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1633,7 +1636,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1648,7 +1650,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1680,7 +1683,8 @@
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
-        "supports_minimal_reasoning_effort": true
+        "supports_minimal_reasoning_effort": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.5e-06,
@@ -1713,7 +1717,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.5e-06,
@@ -1746,7 +1751,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1779,7 +1785,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1812,7 +1819,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1845,7 +1853,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1878,7 +1887,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1897,7 +1907,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1909,7 +1918,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1928,7 +1938,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1940,7 +1949,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1959,7 +1969,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1971,7 +1980,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1990,7 +2000,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2002,7 +2011,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -2021,7 +2031,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2033,7 +2042,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -2052,7 +2062,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2064,7 +2073,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-sonnet-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 3.75e-06,
@@ -2126,7 +2136,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-v1": {
         "input_cost_per_token": 8e-06,
@@ -2376,7 +2387,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "apac.anthropic.claude-3-sonnet-20240229-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -2466,7 +2478,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "azure/ada": {
         "input_cost_per_token": 1e-07,
@@ -2575,7 +2588,6 @@
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2605,7 +2617,6 @@
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2666,7 +2677,6 @@
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2764,7 +2774,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -9373,17 +9382,16 @@
     },
     "bedrock/us-east-1/minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
         "litellm_provider": "bedrock",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
-        "source": "https://aws.amazon.com/bedrock/pricing/",
         "supports_function_calling": true,
-        "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "output_cost_per_token": 1.2e-06
+        "source": "https://aws.amazon.com/bedrock/pricing/"
     },
     "bedrock/us-east-1/moonshotai.kimi-k2-thinking": {
         "input_cost_per_token": 6e-07,
@@ -9612,7 +9620,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-east-1/claude-sonnet-4-5-20250929-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -9634,7 +9643,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-east-1/meta.llama3-70b-instruct-v1:0": {
         "input_cost_per_token": 2.65e-06,
@@ -9787,7 +9797,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-west-1/claude-sonnet-4-5-20250929-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -9809,7 +9820,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-west-1/meta.llama3-70b-instruct-v1:0": {
         "input_cost_per_token": 2.65e-06,
@@ -9995,17 +10007,16 @@
     },
     "bedrock/us-west-2/minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
         "litellm_provider": "bedrock",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
-        "source": "https://aws.amazon.com/bedrock/pricing/",
         "supports_function_calling": true,
-        "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "output_cost_per_token": 1.2e-06
+        "source": "https://aws.amazon.com/bedrock/pricing/"
     },
     "bedrock/us-west-2/moonshotai.kimi-k2-thinking": {
         "input_cost_per_token": 6e-07,
@@ -10573,7 +10584,8 @@
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
-        "supports_vision": true
+        "supports_vision": true,
+        "supports_parallel_tool_use_config": true
     },
     "claude-opus-4-1": {
         "cache_creation_input_token_cost": 1.875e-05,
@@ -14645,7 +14657,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-3-5-sonnet-20240620-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -14859,7 +14872,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "eu.meta.llama3-2-1b-instruct-v1:0": {
         "input_cost_per_token": 1.3e-07,
@@ -19222,7 +19236,6 @@
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
-        "supports_adaptive_thinking": true,
         "supports_function_calling": true,
         "supports_parallel_function_calling": true,
         "supports_vision": true
@@ -20059,7 +20072,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-sonnet-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 3.75e-06,
@@ -20112,7 +20126,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "global.amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 7.5e-08,
@@ -21976,8 +21991,8 @@
         "output_cost_per_token_flex": 1.5e-05,
         "output_cost_per_token_batches": 1.5e-05,
         "output_cost_per_token_priority": 6e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22025,8 +22040,8 @@
         "output_cost_per_token_flex": 1.5e-05,
         "output_cost_per_token_batches": 1.5e-05,
         "output_cost_per_token_priority": 6e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22070,8 +22085,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22115,8 +22130,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22164,8 +22179,8 @@
         "output_cost_per_token_flex": 7.5e-06,
         "output_cost_per_token_batches": 7.5e-06,
         "output_cost_per_token_priority": 3e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22212,8 +22227,8 @@
         "output_cost_per_token_flex": 7.5e-06,
         "output_cost_per_token_batches": 7.5e-06,
         "output_cost_per_token_priority": 3e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22253,8 +22268,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22297,8 +22312,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22342,8 +22357,8 @@
         "output_cost_per_token_flex": 2.25e-06,
         "output_cost_per_token_batches": 2.25e-06,
         "output_cost_per_token_priority": 9e-06,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22388,8 +22403,8 @@
         "output_cost_per_token_flex": 2.25e-06,
         "output_cost_per_token_batches": 2.25e-06,
         "output_cost_per_token_priority": 9e-06,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22431,8 +22446,8 @@
         "output_cost_per_token": 1.25e-06,
         "output_cost_per_token_flex": 6.25e-07,
         "output_cost_per_token_batches": 6.25e-07,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22474,8 +22489,8 @@
         "output_cost_per_token": 1.25e-06,
         "output_cost_per_token_flex": 6.25e-07,
         "output_cost_per_token_batches": 6.25e-07,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -24181,7 +24196,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.375e-06,
@@ -24204,7 +24220,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "crusoe/deepseek-ai/DeepSeek-R1-0528": {
         "input_cost_per_token": 3e-06,
@@ -24992,14 +25009,13 @@
     },
     "minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
-        "output_cost_per_token": 1.2e-06,
         "supports_function_calling": true,
-        "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
         "source": "https://aws.amazon.com/bedrock/pricing/"
@@ -28455,7 +28471,6 @@
         "output_cost_per_token": 1.5e-05,
         "output_cost_per_token_above_200k_tokens": 2.25e-05,
         "source": "https://openrouter.ai/anthropic/claude-sonnet-4.6",
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -28495,7 +28510,6 @@
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -28557,7 +28571,6 @@
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -30480,7 +30493,6 @@
         "supports_adaptive_thinking": true,
         "litellm_provider": "perplexity",
         "mode": "responses",
-        "supports_adaptive_thinking": true,
         "supports_web_search": true,
         "supports_reasoning": false,
         "supports_function_calling": true,
@@ -30490,7 +30502,6 @@
         "supports_adaptive_thinking": true,
         "litellm_provider": "perplexity",
         "mode": "responses",
-        "supports_adaptive_thinking": true,
         "supports_web_search": true,
         "supports_reasoning": false,
         "supports_function_calling": true,
@@ -31406,7 +31417,7 @@
         "supports_tool_choice": true
     },
     "sambanova/Meta-Llama-3.2-1B-Instruct": {
-         "deprecation_date": "2025-06-25",
+        "deprecation_date": "2025-06-25",
         "input_cost_per_token": 4e-08,
         "litellm_provider": "sambanova",
         "max_input_tokens": 16384,
@@ -31537,15 +31548,15 @@
         "supports_vision": true,
         "source": "https://cloud.sambanova.ai/plans/pricing"
     },
-      "snowflake/claude-3-5-sonnet": {
+    "snowflake/claude-3-5-sonnet": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 200000,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.000003,
-        "output_cost_per_token": 0.000015,
-        "cache_read_input_token_cost": 0.0000003,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
         "supports_computer_use": true,
         "supports_function_calling": true,
         "supports_vision": true,
@@ -31553,14 +31564,14 @@
         "supports_system_messages": true,
         "supports_response_schema": true
     },
-      "snowflake/deepseek-r1": {
+    "snowflake/deepseek-r1": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.00000135,
-        "output_cost_per_token": 0.0000054,
+        "input_cost_per_token": 1.35e-06,
+        "output_cost_per_token": 5.4e-06,
         "supports_reasoning": true,
         "supports_system_messages": true
     },
@@ -31619,8 +31630,8 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.0000012,
-        "output_cost_per_token": 0.0000012,
+        "input_cost_per_token": 1.2e-06,
+        "output_cost_per_token": 1.2e-06,
         "supports_function_calling": true,
         "supports_system_messages": true
     },
@@ -31630,8 +31641,8 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.00000072,
-        "output_cost_per_token": 0.00000072,
+        "input_cost_per_token": 7.2e-07,
+        "output_cost_per_token": 7.2e-07,
         "supports_function_calling": true,
         "supports_system_messages": true
     },
@@ -31641,8 +31652,8 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.00000024,
-        "output_cost_per_token": 0.00000024,
+        "input_cost_per_token": 2.4e-07,
+        "output_cost_per_token": 2.4e-07,
         "supports_system_messages": true
     },
     "snowflake/llama3.2-1b": {
@@ -31659,17 +31670,17 @@
         "max_tokens": 8192,
         "mode": "chat"
     },
-      "snowflake/llama3.3-70b": {
+    "snowflake/llama3.3-70b": {
         "max_tokens": 16384,
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
-        "input_cost_per_token": 0.00000072,
-        "output_cost_per_token": 0.00000072,
+        "input_cost_per_token": 7.2e-07,
+        "output_cost_per_token": 7.2e-07,
         "litellm_provider": "snowflake",
         "mode": "chat",
         "supports_function_calling": true,
         "supports_system_messages": true
-      },
+    },
     "snowflake/mistral-7b": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 32000,
@@ -31684,14 +31695,14 @@
         "max_tokens": 8192,
         "mode": "chat"
     },
-     "snowflake/mistral-large2": {
+    "snowflake/mistral-large2": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.000002,
-        "output_cost_per_token": 0.000006,
+        "input_cost_per_token": 2e-06,
+        "output_cost_per_token": 6e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_response_schema": true
@@ -31731,17 +31742,17 @@
         "max_tokens": 8192,
         "mode": "chat"
     },
-      "snowflake/snowflake-llama-3.3-70b": {
+    "snowflake/snowflake-llama-3.3-70b": {
         "max_tokens": 16384,
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
-        "input_cost_per_token": 0.00000072,
-        "output_cost_per_token": 0.00000072,
+        "input_cost_per_token": 7.2e-07,
+        "output_cost_per_token": 7.2e-07,
         "litellm_provider": "snowflake",
         "mode": "chat",
         "supports_function_calling": true,
         "supports_system_messages": true
-      },
+    },
     "stability/sd3": {
         "litellm_provider": "stability",
         "mode": "image_generation",
@@ -32825,7 +32836,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-3-5-sonnet-20240620-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -32984,7 +32996,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -32993,7 +33006,7 @@
         "input_cost_per_token": 3.6e-06,
         "input_cost_per_token_above_200k_tokens": 7.2e-06,
         "output_cost_per_token_above_200k_tokens": 2.7e-05,
-        "cache_creation_input_token_cost_above_200k_tokens": 9.0e-06,
+        "cache_creation_input_token_cost_above_200k_tokens": 9e-06,
         "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.44e-05,
         "cache_read_input_token_cost_above_200k_tokens": 7.2e-07,
         "litellm_provider": "bedrock_converse",
@@ -33011,7 +33024,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.375e-06,
@@ -33033,7 +33047,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 1.875e-05,
@@ -33087,7 +33102,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-opus-4-5-20251101-v1:0": {
         "cache_creation_input_token_cost": 6.25e-06,
@@ -33116,7 +33132,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-5-20251101-v1:0": {
         "cache_creation_input_token_cost": 6.25e-06,
@@ -33144,7 +33161,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-sonnet-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 3.75e-06,
@@ -33736,7 +33754,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -34971,7 +34988,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35001,7 +35017,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35031,7 +35046,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35062,7 +35076,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35153,7 +35166,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35184,7 +35196,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35267,7 +35278,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -37796,12 +37806,12 @@
     },
     "zai.glm-5": {
         "input_cost_per_token": 1e-06,
+        "output_cost_per_token": 3.2e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 200000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
-        "output_cost_per_token": 3.2e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_system_messages": true,
@@ -37822,20 +37832,6 @@
         "supports_tool_choice": true,
         "source": "https://aws.amazon.com/bedrock/pricing/"
     },
-    "zai.glm-5": {
-        "input_cost_per_token": 1e-06,
-        "litellm_provider": "bedrock_converse",
-        "max_input_tokens": 200000,
-        "max_output_tokens": 128000,
-        "max_tokens": 128000,
-        "mode": "chat",
-        "output_cost_per_token": 3.2e-06,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
-        "supports_function_calling": true,
-        "supports_reasoning": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true
-    },
     "zai/glm-5": {
         "cache_creation_input_token_cost": 0,
         "cache_read_input_token_cost": 2e-07,
@@ -42734,7 +42730,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -42768,7 +42763,10 @@
         "max_output_tokens": 32768,
         "max_tokens": 32768,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": true,
         "supports_reasoning": true,
@@ -42783,7 +42781,10 @@
         "max_output_tokens": 32768,
         "max_tokens": 32768,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": true,
         "supports_reasoning": true,
@@ -42798,7 +42799,9 @@
         "max_output_tokens": 65536,
         "max_tokens": 65536,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions"],
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -42812,7 +42815,9 @@
         "max_output_tokens": 65536,
         "max_tokens": 65536,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions"],
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -42828,9 +42833,16 @@
         "max_tokens": 128000,
         "mode": "responses",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/responses"],
-        "supported_modalities": ["text", "image"],
-        "supported_output_modalities": ["text"],
+        "supported_endpoints": [
+            "/v1/responses"
+        ],
+        "supported_modalities": [
+            "text",
+            "image"
+        ],
+        "supported_output_modalities": [
+            "text"
+        ],
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -42848,9 +42860,16 @@
         "max_tokens": 128000,
         "mode": "responses",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/responses"],
-        "supported_modalities": ["text", "image"],
-        "supported_output_modalities": ["text"],
+        "supported_endpoints": [
+            "/v1/responses"
+        ],
+        "supported_modalities": [
+            "text",
+            "image"
+        ],
+        "supported_output_modalities": [
+            "text"
+        ],
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -42867,7 +42886,10 @@
         "max_tokens": 256000,
         "mode": "chat",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": false,
         "supports_reasoning": true,
@@ -42883,7 +42905,10 @@
         "max_tokens": 256000,
         "mode": "chat",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": false,
         "supports_reasoning": true,
@@ -42899,7 +42924,10 @@
         "max_tokens": 128000,
         "mode": "chat",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": false,
         "supports_reasoning": true,
@@ -43078,20 +43106,6 @@
             }
         ]
     },
-    "zai.glm-5": {
-        "input_cost_per_token": 1e-06,
-        "output_cost_per_token": 3.2e-06,
-        "litellm_provider": "bedrock_converse",
-        "max_input_tokens": 200000,
-        "max_output_tokens": 128000,
-        "max_tokens": 128000,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_reasoning": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
     "bedrock/us-east-1/zai.glm-5": {
         "input_cost_per_token": 1e-06,
         "output_cost_per_token": 3.2e-06,
@@ -43120,45 +43134,6 @@
         "supports_tool_choice": true,
         "source": "https://aws.amazon.com/bedrock/pricing/"
     },
-    "minimax.minimax-m2.5": {
-        "input_cost_per_token": 3e-07,
-        "output_cost_per_token": 1.2e-06,
-        "litellm_provider": "bedrock_converse",
-        "max_input_tokens": 1000000,
-        "max_output_tokens": 8192,
-        "max_tokens": 8192,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
-    "bedrock/us-east-1/minimax.minimax-m2.5": {
-        "input_cost_per_token": 3e-07,
-        "output_cost_per_token": 1.2e-06,
-        "litellm_provider": "bedrock",
-        "max_input_tokens": 1000000,
-        "max_output_tokens": 8192,
-        "max_tokens": 8192,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
-    "bedrock/us-west-2/minimax.minimax-m2.5": {
-        "input_cost_per_token": 3e-07,
-        "output_cost_per_token": 1.2e-06,
-        "litellm_provider": "bedrock",
-        "max_input_tokens": 1000000,
-        "max_output_tokens": 8192,
-        "max_tokens": 8192,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
     "bedrock/us-gov-east-1/anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.5e-06,
         "cache_creation_input_token_cost_above_1hr": 2.4e-06,
@@ -43180,7 +43155,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_pdf_input": true
+        "supports_pdf_input": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-west-1/anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.5e-06,
@@ -43203,364 +43179,368 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_pdf_input": true
+        "supports_pdf_input": true,
+        "supports_parallel_tool_use_config": true
+    },
+    "snowflake/claude-sonnet-4-5": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-sonnet-4-6": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-4-sonnet": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-4-opus": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 5e-06,
+        "output_cost_per_token": 2.5e-05,
+        "cache_read_input_token_cost": 5e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-haiku-4-5": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 1e-06,
+        "output_cost_per_token": 5e-06,
+        "cache_read_input_token_cost": 1e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-3-7-sonnet": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-4.1": {
+        "max_tokens": 16384,
+        "max_input_tokens": 300000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 2e-06,
+        "output_cost_per_token": 8e-06,
+        "cache_read_input_token_cost": 5e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-5": {
+        "max_tokens": 16384,
+        "max_input_tokens": 300000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 1.25e-06,
+        "output_cost_per_token": 1e-05,
+        "cache_read_input_token_cost": 1.25e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-5-mini": {
+        "max_tokens": 16384,
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-5-nano": {
+        "max_tokens": 16384,
+        "max_input_tokens": 5000000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 1.5e-07,
+        "output_cost_per_token": 6e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/llama4-maverick": {
+        "max_tokens": 16384,
+        "max_input_tokens": 128000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 2.4e-07,
+        "output_cost_per_token": 9.7e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_system_messages": true
+    },
+    "snowflake/snowflake-arctic-embed-l-v2.0": {
+        "max_tokens": 8192,
+        "max_input_tokens": 8192,
+        "input_cost_per_token": 7e-08,
+        "output_cost_per_token": 0.0,
+        "litellm_provider": "snowflake",
+        "mode": "embedding"
+    },
+    "snowflake/snowflake-arctic-embed-m-v2.0": {
+        "max_tokens": 8192,
+        "max_input_tokens": 8192,
+        "input_cost_per_token": 7e-08,
+        "output_cost_per_token": 0.0,
+        "litellm_provider": "snowflake",
+        "mode": "embedding"
+    },
+    "soniox/stt-async-v4": {
+        "litellm_provider": "soniox",
+        "max_output_tokens": 8000,
+        "max_tokens": 8000,
+        "input_cost_per_second": 0.0,
+        "output_cost_per_second": 2.77778e-05,
+        "mode": "audio_transcription",
+        "source": "https://soniox.com/pricing",
+        "supported_endpoints": [
+            "/v1/audio/transcriptions"
+        ],
+        "supports_audio_input": true
+    },
+    "soniox/stt-async-v5": {
+        "litellm_provider": "soniox",
+        "max_output_tokens": 8000,
+        "max_tokens": 8000,
+        "input_cost_per_second": 0.0,
+        "output_cost_per_second": 2.77778e-05,
+        "mode": "audio_transcription",
+        "source": "https://soniox.com/pricing",
+        "supported_endpoints": [
+            "/v1/audio/transcriptions"
+        ],
+        "supports_audio_input": true
+    },
+    "tensormesh/Qwen/Qwen3.5-397B-A17B-FP8": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 6e-07,
+        "output_cost_per_token": 3.6e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 262144,
+        "max_output_tokens": 262144,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 4.5e-07,
+        "output_cost_per_token": 1.8e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 262144,
+        "max_output_tokens": 262144,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/Qwen/Qwen3.6-27B-FP8": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 3.2e-07,
+        "output_cost_per_token": 3.2e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 262144,
+        "max_output_tokens": 262144,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/lukealonso/GLM-5.1-NVFP4-MTP": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.4e-06,
+        "output_cost_per_token": 4.4e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 202752,
+        "max_output_tokens": 202752,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/deepseek-ai/DeepSeek-V4-Flash": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.4e-07,
+        "output_cost_per_token": 2.8e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 32768,
+        "max_output_tokens": 32768,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/moonshotai/Kimi-K2.6": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 9.6e-07,
+        "output_cost_per_token": 4e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 32768,
+        "max_output_tokens": 32768,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/MiniMaxAI/MiniMax-M2.5": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 196608,
+        "max_output_tokens": 196608,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/google/gemma-4-31B-it": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.4e-07,
+        "output_cost_per_token": 5.6e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 32768,
+        "max_output_tokens": 32768,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/openai/gpt-oss-120b": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.5e-07,
+        "output_cost_per_token": 6e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 131072,
+        "max_output_tokens": 131072,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/openai/gpt-oss-20b": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 7e-08,
+        "output_cost_per_token": 2.8e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 131072,
+        "max_output_tokens": 131072,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
     },
-  "snowflake/claude-sonnet-4-5": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-sonnet-4-6": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-4-sonnet": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-4-opus": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000005,
-    "output_cost_per_token": 0.000025,
-    "cache_read_input_token_cost": 0.0000005,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-haiku-4-5": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000001,
-    "output_cost_per_token": 0.000005,
-    "cache_read_input_token_cost": 0.0000001,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-3-7-sonnet": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-4.1": {
-    "max_tokens": 16384,
-    "max_input_tokens": 300000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000002,
-    "output_cost_per_token": 0.000008,
-    "cache_read_input_token_cost": 0.0000005,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-5": {
-    "max_tokens": 16384,
-    "max_input_tokens": 300000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.00000125,
-    "output_cost_per_token": 0.00001,
-    "cache_read_input_token_cost": 0.000000125,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-5-mini": {
-    "max_tokens": 16384,
-    "max_input_tokens": 1000000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.0000003,
-    "output_cost_per_token": 0.0000012,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-5-nano": {
-    "max_tokens": 16384,
-    "max_input_tokens": 5000000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.00000015,
-    "output_cost_per_token": 0.0000006,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/llama4-maverick": {
-    "max_tokens": 16384,
-    "max_input_tokens": 128000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.00000024,
-    "output_cost_per_token": 0.00000097,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_system_messages": true
-  },
-  "snowflake/snowflake-arctic-embed-l-v2.0": {
-    "max_tokens": 8192,
-    "max_input_tokens": 8192,
-    "input_cost_per_token": 0.00000007,
-    "output_cost_per_token": 0.0,
-    "litellm_provider": "snowflake",
-    "mode": "embedding"
-  },
-  "snowflake/snowflake-arctic-embed-m-v2.0": {
-    "max_tokens": 8192,
-    "max_input_tokens": 8192,
-    "input_cost_per_token": 0.00000007,
-    "output_cost_per_token": 0.0,
-    "litellm_provider": "snowflake",
-    "mode": "embedding"
-  },
-  "soniox/stt-async-v4": {
-    "litellm_provider": "soniox",
-    "max_output_tokens": 8000,
-    "max_tokens": 8000,
-    "input_cost_per_second": 0.0,
-    "output_cost_per_second": 0.0000277778,
-    "mode": "audio_transcription",
-    "source": "https://soniox.com/pricing",
-    "supported_endpoints": ["/v1/audio/transcriptions"],
-    "supports_audio_input": true
-  },
-  "soniox/stt-async-v5": {
-    "litellm_provider": "soniox",
-    "max_output_tokens": 8000,
-    "max_tokens": 8000,
-    "input_cost_per_second": 0.0,
-    "output_cost_per_second": 0.0000277778,
-    "mode": "audio_transcription",
-    "source": "https://soniox.com/pricing",
-    "supported_endpoints": ["/v1/audio/transcriptions"],
-    "supports_audio_input": true
-  },
-  "tensormesh/Qwen/Qwen3.5-397B-A17B-FP8": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 6e-07,
-    "output_cost_per_token": 3.6e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 262144,
-    "max_output_tokens": 262144,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 4.5e-07,
-    "output_cost_per_token": 1.8e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 262144,
-    "max_output_tokens": 262144,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/Qwen/Qwen3.6-27B-FP8": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 3.2e-07,
-    "output_cost_per_token": 3.2e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 262144,
-    "max_output_tokens": 262144,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/lukealonso/GLM-5.1-NVFP4-MTP": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.4e-06,
-    "output_cost_per_token": 4.4e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 202752,
-    "max_output_tokens": 202752,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/deepseek-ai/DeepSeek-V4-Flash": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.4e-07,
-    "output_cost_per_token": 2.8e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 32768,
-    "max_output_tokens": 32768,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/moonshotai/Kimi-K2.6": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 9.6e-07,
-    "output_cost_per_token": 4e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 32768,
-    "max_output_tokens": 32768,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/MiniMaxAI/MiniMax-M2.5": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 3e-07,
-    "output_cost_per_token": 1.2e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 196608,
-    "max_output_tokens": 196608,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/google/gemma-4-31B-it": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.4e-07,
-    "output_cost_per_token": 5.6e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 32768,
-    "max_output_tokens": 32768,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/openai/gpt-oss-120b": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.5e-07,
-    "output_cost_per_token": 6e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 131072,
-    "max_output_tokens": 131072,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/openai/gpt-oss-20b": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 7e-08,
-    "output_cost_per_token": 2.8e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 131072,
-    "max_output_tokens": 131072,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  }
- ,
     "deepseek-v4-flash": {
         "cache_creation_input_token_cost": 0.0,
         "cache_read_input_token_cost": 2.8e-09,
@@ -43699,8 +43679,8 @@
         "max_tokens": 128000,
         "max_input_tokens": 128000,
         "max_output_tokens": 128000,
-        "input_cost_per_token": 0.000000125,
-        "output_cost_per_token": 0.00000045,
+        "input_cost_per_token": 1.25e-07,
+        "output_cost_per_token": 4.5e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43712,8 +43692,8 @@
         "max_tokens": 131072,
         "max_input_tokens": 131072,
         "max_output_tokens": 131072,
-        "input_cost_per_token": 0.00000014,
-        "output_cost_per_token": 0.00000045,
+        "input_cost_per_token": 1.4e-07,
+        "output_cost_per_token": 4.5e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43725,8 +43705,8 @@
         "max_tokens": 131072,
         "max_input_tokens": 131072,
         "max_output_tokens": 131072,
-        "input_cost_per_token": 0.00000009,
-        "output_cost_per_token": 0.0000002,
+        "input_cost_per_token": 9e-08,
+        "output_cost_per_token": 2e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43738,8 +43718,8 @@
         "max_tokens": 131072,
         "max_input_tokens": 131072,
         "max_output_tokens": 131072,
-        "input_cost_per_token": 0.0000003,
-        "output_cost_per_token": 0.0000006,
+        "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 6e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43751,8 +43731,8 @@
         "max_tokens": 163840,
         "max_input_tokens": 163840,
         "max_output_tokens": 163840,
-        "input_cost_per_token": 0.0000001,
-        "output_cost_per_token": 0.0000002,
+        "input_cost_per_token": 1e-07,
+        "output_cost_per_token": 2e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43764,8 +43744,8 @@
         "max_tokens": 1000192,
         "max_input_tokens": 1000192,
         "max_output_tokens": 1000192,
-        "input_cost_per_token": 0.000000255,
-        "output_cost_per_token": 0.00000055,
+        "input_cost_per_token": 2.55e-07,
+        "output_cost_per_token": 5.5e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43773,39 +43753,39 @@
         "supports_reasoning": false,
         "source": "https://pinstripes.io/pricing"
     },
-  "fallback_generalizations": {
-    "rules": [
-      {
-        "name": "anthropic-claude-adaptive-thinking",
-        "pattern": "(?:opus|sonnet|haiku)[-._](?:4[-._](?:[6-9]|[1-9]\\d)(?!\\d)|(?:[5-9]|[1-9]\\d{1,})[-._]\\d{1,2}(?!\\d))",
-        "description": "Claude opus/sonnet/haiku at version 4.6 or higher: 4.6 through 4.99, then any 5.x, 6.x or later major. The minor is capped at two digits so an 8-digit date suffix such as claude-opus-4-20250514 is never read as a >= 4.6 minor. Turns on adaptive thinking for new families with no code change.",
-        "extends": "anthropic-claude",
-        "model_info": {
-          "supports_adaptive_thinking": true
-        }
-      },
-      {
-        "name": "anthropic-claude",
-        "pattern": "^claude-[a-z]+-\\d+[-.]\\d+(?:-\\d{8})?$",
-        "description": "Any Claude family-major-minor id, optionally with an 8-digit date suffix, anchored to the whole name. Version-neutral fallback that gives an unmapped Claude provider routing and baseline capabilities; it carries no pricing, so cost stays on the standard unpriced behavior rather than a guessed number.",
-        "model_info": {
-          "litellm_provider": "anthropic",
-          "mode": "chat",
-          "max_input_tokens": 200000,
-          "max_output_tokens": 64000,
-          "max_tokens": 64000,
-          "supports_function_calling": true,
-          "supports_parallel_function_calling": true,
-          "supports_vision": true,
-          "supports_tool_choice": true,
-          "supports_assistant_prefill": true,
-          "supports_prompt_caching": true,
-          "supports_response_schema": true,
-          "supports_reasoning": true,
-          "supports_pdf_input": true,
-          "supports_system_messages": true
-        }
-      }
-    ]
-  }
+    "fallback_generalizations": {
+        "rules": [
+            {
+                "name": "anthropic-claude-adaptive-thinking",
+                "pattern": "(?:opus|sonnet|haiku)[-._](?:4[-._](?:[6-9]|[1-9]\\d)(?!\\d)|(?:[5-9]|[1-9]\\d{1,})[-._]\\d{1,2}(?!\\d))",
+                "description": "Claude opus/sonnet/haiku at version 4.6 or higher: 4.6 through 4.99, then any 5.x, 6.x or later major. The minor is capped at two digits so an 8-digit date suffix such as claude-opus-4-20250514 is never read as a >= 4.6 minor. Turns on adaptive thinking for new families with no code change.",
+                "extends": "anthropic-claude",
+                "model_info": {
+                    "supports_adaptive_thinking": true
+                }
+            },
+            {
+                "name": "anthropic-claude",
+                "pattern": "^claude-[a-z]+-\\d+[-.]\\d+(?:-\\d{8})?$",
+                "description": "Any Claude family-major-minor id, optionally with an 8-digit date suffix, anchored to the whole name. Version-neutral fallback that gives an unmapped Claude provider routing and baseline capabilities; it carries no pricing, so cost stays on the standard unpriced behavior rather than a guessed number.",
+                "model_info": {
+                    "litellm_provider": "anthropic",
+                    "mode": "chat",
+                    "max_input_tokens": 200000,
+                    "max_output_tokens": 64000,
+                    "max_tokens": 64000,
+                    "supports_function_calling": true,
+                    "supports_parallel_function_calling": true,
+                    "supports_vision": true,
+                    "supports_tool_choice": true,
+                    "supports_assistant_prefill": true,
+                    "supports_prompt_caching": true,
+                    "supports_response_schema": true,
+                    "supports_reasoning": true,
+                    "supports_pdf_input": true,
+                    "supports_system_messages": true
+                }
+            }
+        ]
+    }
 }
diff --git a/litellm/types/integrations/anthropic_cache_control_hook.py b/litellm/types/integrations/anthropic_cache_control_hook.py
index 3e2d0d688ac..601978bb04f 100644
--- a/litellm/types/integrations/anthropic_cache_control_hook.py
+++ b/litellm/types/integrations/anthropic_cache_control_hook.py
@@ -18,6 +18,7 @@ class CacheControlToolConfigInjectionPoint(TypedDict):
     """Type for tool_config-level injection points (Bedrock)."""
 
     location: Literal["tool_config"]
+    control: Optional[ChatCompletionCachedContent]
 
 
 CacheControlInjectionPoint = Union[
diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index 851f41dd98e..e85d5eeef4b 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -744,7 +744,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-haiku-4-5@20251001": {
         "cache_creation_input_token_cost": 1.25e-06,
@@ -768,7 +769,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_streaming": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-3-5-sonnet-20240620-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -787,8 +789,6 @@
         "output_cost_per_token_above_200k_tokens": 3e-05,
         "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06,
         "cache_read_input_token_cost_above_200k_tokens": 6e-07,
-        "cache_creation_input_token_cost_above_1hr": 7.5e-06,
-        "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.5e-05,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_read_input_token_cost": 3e-07
     },
@@ -813,9 +813,7 @@
         "input_cost_per_token_above_200k_tokens": 6e-06,
         "output_cost_per_token_above_200k_tokens": 3e-05,
         "cache_creation_input_token_cost_above_200k_tokens": 7.5e-06,
-        "cache_read_input_token_cost_above_200k_tokens": 6e-07,
-        "cache_creation_input_token_cost_above_1hr": 7.5e-06,
-        "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.5e-05
+        "cache_read_input_token_cost_above_200k_tokens": 6e-07
     },
     "anthropic.claude-3-7-sonnet-20240620-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -991,7 +989,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1010,7 +1009,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1023,7 +1021,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1042,7 +1041,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1055,7 +1053,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1074,7 +1073,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1087,7 +1085,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1106,7 +1105,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1119,7 +1117,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-opus-4-6-v1": {
         "supports_adaptive_thinking": true,
@@ -1138,7 +1137,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1151,7 +1149,8 @@
         "supports_native_structured_output": true,
         "supports_output_config": true,
         "supports_max_reasoning_effort": true,
-        "bedrock_output_config_effort_ceiling": "max"
+        "bedrock_output_config_effort_ceiling": "max",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1171,7 +1170,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1186,7 +1184,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-mythos-preview": {
         "input_cost_per_token": 0,
@@ -1221,7 +1220,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1236,7 +1234,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1256,7 +1255,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1271,7 +1269,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1291,7 +1290,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1306,7 +1304,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1326,7 +1325,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1341,7 +1339,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.25e-05,
@@ -1374,7 +1373,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.25e-05,
@@ -1407,7 +1407,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.375e-05,
@@ -1440,7 +1441,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-fable-5": {
         "cache_creation_input_token_cost": 1.375e-05,
@@ -1473,7 +1475,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1493,7 +1496,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1508,7 +1510,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1528,7 +1531,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1543,7 +1545,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1563,7 +1566,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1578,7 +1580,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1598,7 +1601,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1613,7 +1615,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-opus-4-8": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1633,7 +1636,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1648,7 +1650,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-opus-4-7": {
         "bedrock_converse_supports_strict_tools": false,
@@ -1680,7 +1683,8 @@
         "supports_xhigh_reasoning_effort": true,
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
-        "supports_minimal_reasoning_effort": true
+        "supports_minimal_reasoning_effort": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.5e-06,
@@ -1713,7 +1717,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.5e-06,
@@ -1746,7 +1751,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1779,7 +1785,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1812,7 +1819,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1845,7 +1853,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-sonnet-5": {
         "cache_creation_input_token_cost": 2.75e-06,
@@ -1878,7 +1887,8 @@
         "supports_native_structured_output": true,
         "supports_max_reasoning_effort": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "xhigh"
+        "bedrock_output_config_effort_ceiling": "xhigh",
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1897,7 +1907,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1909,7 +1918,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1928,7 +1938,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1940,7 +1949,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1959,7 +1969,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -1971,7 +1980,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -1990,7 +2000,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2002,7 +2011,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -2021,7 +2031,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2033,7 +2042,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-sonnet-4-6": {
         "supports_adaptive_thinking": true,
@@ -2052,7 +2062,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2064,7 +2073,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_output_config": true
+        "supports_output_config": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-sonnet-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 3.75e-06,
@@ -2126,7 +2136,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "anthropic.claude-v1": {
         "input_cost_per_token": 8e-06,
@@ -2376,7 +2387,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "apac.anthropic.claude-3-sonnet-20240229-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -2466,7 +2478,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "azure/ada": {
         "input_cost_per_token": 1e-07,
@@ -2575,7 +2588,6 @@
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2605,7 +2617,6 @@
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2666,7 +2677,6 @@
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -2764,7 +2774,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -9373,17 +9382,16 @@
     },
     "bedrock/us-east-1/minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
         "litellm_provider": "bedrock",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
-        "source": "https://aws.amazon.com/bedrock/pricing/",
         "supports_function_calling": true,
-        "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "output_cost_per_token": 1.2e-06
+        "source": "https://aws.amazon.com/bedrock/pricing/"
     },
     "bedrock/us-east-1/moonshotai.kimi-k2-thinking": {
         "input_cost_per_token": 6e-07,
@@ -9612,7 +9620,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-east-1/claude-sonnet-4-5-20250929-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -9634,7 +9643,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-east-1/meta.llama3-70b-instruct-v1:0": {
         "input_cost_per_token": 2.65e-06,
@@ -9787,7 +9797,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-west-1/claude-sonnet-4-5-20250929-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -9809,7 +9820,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-west-1/meta.llama3-70b-instruct-v1:0": {
         "input_cost_per_token": 2.65e-06,
@@ -9995,17 +10007,16 @@
     },
     "bedrock/us-west-2/minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
         "litellm_provider": "bedrock",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
-        "source": "https://aws.amazon.com/bedrock/pricing/",
         "supports_function_calling": true,
-        "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "output_cost_per_token": 1.2e-06
+        "source": "https://aws.amazon.com/bedrock/pricing/"
     },
     "bedrock/us-west-2/moonshotai.kimi-k2-thinking": {
         "input_cost_per_token": 6e-07,
@@ -10573,7 +10584,8 @@
         "supports_reasoning": true,
         "supports_response_schema": true,
         "supports_tool_choice": true,
-        "supports_vision": true
+        "supports_vision": true,
+        "supports_parallel_tool_use_config": true
     },
     "claude-opus-4-1": {
         "cache_creation_input_token_cost": 1.875e-05,
@@ -14645,7 +14657,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-3-5-sonnet-20240620-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -14859,7 +14872,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "eu.meta.llama3-2-1b-instruct-v1:0": {
         "input_cost_per_token": 1.3e-07,
@@ -19381,7 +19395,6 @@
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
-        "supports_adaptive_thinking": true,
         "supports_function_calling": true,
         "supports_parallel_function_calling": true,
         "supports_vision": true
@@ -20217,7 +20230,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-sonnet-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 3.75e-06,
@@ -20270,7 +20284,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "global.amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 7.5e-08,
@@ -22134,8 +22149,8 @@
         "output_cost_per_token_flex": 1.5e-05,
         "output_cost_per_token_batches": 1.5e-05,
         "output_cost_per_token_priority": 6e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22183,8 +22198,8 @@
         "output_cost_per_token_flex": 1.5e-05,
         "output_cost_per_token_batches": 1.5e-05,
         "output_cost_per_token_priority": 6e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22228,8 +22243,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22273,8 +22288,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22322,8 +22337,8 @@
         "output_cost_per_token_flex": 7.5e-06,
         "output_cost_per_token_batches": 7.5e-06,
         "output_cost_per_token_priority": 3e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22370,8 +22385,8 @@
         "output_cost_per_token_flex": 7.5e-06,
         "output_cost_per_token_batches": 7.5e-06,
         "output_cost_per_token_priority": 3e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22411,8 +22426,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22455,8 +22470,8 @@
         "output_cost_per_token_above_272k_tokens": 0.00027,
         "output_cost_per_token_flex": 9e-05,
         "output_cost_per_token_batches": 9e-05,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/responses",
             "/v1/batch"
@@ -22500,8 +22515,8 @@
         "output_cost_per_token_flex": 2.25e-06,
         "output_cost_per_token_batches": 2.25e-06,
         "output_cost_per_token_priority": 9e-06,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22546,8 +22561,8 @@
         "output_cost_per_token_flex": 2.25e-06,
         "output_cost_per_token_batches": 2.25e-06,
         "output_cost_per_token_priority": 9e-06,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22589,8 +22604,8 @@
         "output_cost_per_token": 1.25e-06,
         "output_cost_per_token_flex": 6.25e-07,
         "output_cost_per_token_batches": 6.25e-07,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -22632,8 +22647,8 @@
         "output_cost_per_token": 1.25e-06,
         "output_cost_per_token_flex": 6.25e-07,
         "output_cost_per_token_batches": 6.25e-07,
-        "regional_processing_uplift_multiplier_eu": 1.10,
-        "regional_processing_uplift_multiplier_us": 1.10,
+        "regional_processing_uplift_multiplier_eu": 1.1,
+        "regional_processing_uplift_multiplier_us": 1.1,
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/batch",
@@ -24339,7 +24354,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "jp.anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.375e-06,
@@ -24362,7 +24378,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "crusoe/deepseek-ai/DeepSeek-R1-0528": {
         "input_cost_per_token": 3e-06,
@@ -25150,14 +25167,13 @@
     },
     "minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
-        "output_cost_per_token": 1.2e-06,
         "supports_function_calling": true,
-        "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
         "source": "https://aws.amazon.com/bedrock/pricing/"
@@ -28613,7 +28629,6 @@
         "output_cost_per_token": 1.5e-05,
         "output_cost_per_token_above_200k_tokens": 2.25e-05,
         "source": "https://openrouter.ai/anthropic/claude-sonnet-4.6",
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -28653,7 +28668,6 @@
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -28715,7 +28729,6 @@
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -30654,7 +30667,6 @@
         "supports_adaptive_thinking": true,
         "litellm_provider": "perplexity",
         "mode": "responses",
-        "supports_adaptive_thinking": true,
         "supports_web_search": true,
         "supports_reasoning": false,
         "supports_function_calling": true,
@@ -30664,7 +30676,6 @@
         "supports_adaptive_thinking": true,
         "litellm_provider": "perplexity",
         "mode": "responses",
-        "supports_adaptive_thinking": true,
         "supports_web_search": true,
         "supports_reasoning": false,
         "supports_function_calling": true,
@@ -31711,15 +31722,15 @@
         "supports_vision": true,
         "source": "https://cloud.sambanova.ai/plans/pricing"
     },
-      "snowflake/claude-3-5-sonnet": {
+    "snowflake/claude-3-5-sonnet": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 200000,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.000003,
-        "output_cost_per_token": 0.000015,
-        "cache_read_input_token_cost": 0.0000003,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
         "supports_computer_use": true,
         "supports_function_calling": true,
         "supports_vision": true,
@@ -31727,14 +31738,14 @@
         "supports_system_messages": true,
         "supports_response_schema": true
     },
-      "snowflake/deepseek-r1": {
+    "snowflake/deepseek-r1": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.00000135,
-        "output_cost_per_token": 0.0000054,
+        "input_cost_per_token": 1.35e-06,
+        "output_cost_per_token": 5.4e-06,
         "supports_reasoning": true,
         "supports_system_messages": true
     },
@@ -31793,8 +31804,8 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.0000012,
-        "output_cost_per_token": 0.0000012,
+        "input_cost_per_token": 1.2e-06,
+        "output_cost_per_token": 1.2e-06,
         "supports_function_calling": true,
         "supports_system_messages": true
     },
@@ -31804,8 +31815,8 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.00000072,
-        "output_cost_per_token": 0.00000072,
+        "input_cost_per_token": 7.2e-07,
+        "output_cost_per_token": 7.2e-07,
         "supports_function_calling": true,
         "supports_system_messages": true
     },
@@ -31815,8 +31826,8 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.00000024,
-        "output_cost_per_token": 0.00000024,
+        "input_cost_per_token": 2.4e-07,
+        "output_cost_per_token": 2.4e-07,
         "supports_system_messages": true
     },
     "snowflake/llama3.2-1b": {
@@ -31833,17 +31844,17 @@
         "max_tokens": 8192,
         "mode": "chat"
     },
-      "snowflake/llama3.3-70b": {
+    "snowflake/llama3.3-70b": {
         "max_tokens": 16384,
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
-        "input_cost_per_token": 0.00000072,
-        "output_cost_per_token": 0.00000072,
+        "input_cost_per_token": 7.2e-07,
+        "output_cost_per_token": 7.2e-07,
         "litellm_provider": "snowflake",
         "mode": "chat",
         "supports_function_calling": true,
         "supports_system_messages": true
-      },
+    },
     "snowflake/mistral-7b": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 32000,
@@ -31858,14 +31869,14 @@
         "max_tokens": 8192,
         "mode": "chat"
     },
-     "snowflake/mistral-large2": {
+    "snowflake/mistral-large2": {
         "litellm_provider": "snowflake",
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "input_cost_per_token": 0.000002,
-        "output_cost_per_token": 0.000006,
+        "input_cost_per_token": 2e-06,
+        "output_cost_per_token": 6e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_response_schema": true
@@ -31905,17 +31916,17 @@
         "max_tokens": 8192,
         "mode": "chat"
     },
-      "snowflake/snowflake-llama-3.3-70b": {
+    "snowflake/snowflake-llama-3.3-70b": {
         "max_tokens": 16384,
         "max_input_tokens": 128000,
         "max_output_tokens": 16384,
-        "input_cost_per_token": 0.00000072,
-        "output_cost_per_token": 0.00000072,
+        "input_cost_per_token": 7.2e-07,
+        "output_cost_per_token": 7.2e-07,
         "litellm_provider": "snowflake",
         "mode": "chat",
         "supports_function_calling": true,
         "supports_system_messages": true
-      },
+    },
     "stability/sd3": {
         "litellm_provider": "stability",
         "mode": "image_generation",
@@ -32999,7 +33010,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-3-5-sonnet-20240620-v1:0": {
         "input_cost_per_token": 3e-06,
@@ -33158,7 +33170,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0": {
         "cache_creation_input_token_cost": 4.5e-06,
@@ -33167,7 +33180,7 @@
         "input_cost_per_token": 3.6e-06,
         "input_cost_per_token_above_200k_tokens": 7.2e-06,
         "output_cost_per_token_above_200k_tokens": 2.7e-05,
-        "cache_creation_input_token_cost_above_200k_tokens": 9.0e-06,
+        "cache_creation_input_token_cost_above_200k_tokens": 9e-06,
         "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.44e-05,
         "cache_read_input_token_cost_above_200k_tokens": 7.2e-07,
         "litellm_provider": "bedrock_converse",
@@ -33185,7 +33198,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "au.anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.375e-06,
@@ -33207,7 +33221,8 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "supports_native_structured_output": true
+        "supports_native_structured_output": true,
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-opus-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 1.875e-05,
@@ -33261,7 +33276,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "global.anthropic.claude-opus-4-5-20251101-v1:0": {
         "cache_creation_input_token_cost": 6.25e-06,
@@ -33290,7 +33306,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "eu.anthropic.claude-opus-4-5-20251101-v1:0": {
         "cache_creation_input_token_cost": 6.25e-06,
@@ -33318,7 +33335,8 @@
         "supports_vision": true,
         "supports_native_structured_output": true,
         "supports_output_config": true,
-        "bedrock_output_config_effort_ceiling": "high"
+        "bedrock_output_config_effort_ceiling": "high",
+        "supports_parallel_tool_use_config": true
     },
     "us.anthropic.claude-sonnet-4-20250514-v1:0": {
         "cache_creation_input_token_cost": 3.75e-06,
@@ -33910,7 +33928,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35145,7 +35162,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35175,7 +35191,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35205,7 +35220,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35236,7 +35250,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35327,7 +35340,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35358,7 +35370,6 @@
             "search_context_size_low": 0.01,
             "search_context_size_medium": 0.01
         },
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": false,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -35441,7 +35452,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -37998,12 +38008,12 @@
     },
     "zai.glm-5": {
         "input_cost_per_token": 1e-06,
+        "output_cost_per_token": 3.2e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 200000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
-        "output_cost_per_token": 3.2e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_system_messages": true,
@@ -38024,20 +38034,6 @@
         "supports_tool_choice": true,
         "source": "https://aws.amazon.com/bedrock/pricing/"
     },
-    "zai.glm-5": {
-        "input_cost_per_token": 1e-06,
-        "litellm_provider": "bedrock_converse",
-        "max_input_tokens": 200000,
-        "max_output_tokens": 128000,
-        "max_tokens": 128000,
-        "mode": "chat",
-        "output_cost_per_token": 3.2e-06,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
-        "supports_function_calling": true,
-        "supports_reasoning": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true
-    },
     "zai/glm-5": {
         "cache_creation_input_token_cost": 0,
         "cache_read_input_token_cost": 2e-07,
@@ -42966,7 +42962,6 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
-        "supports_adaptive_thinking": true,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -43000,7 +42995,10 @@
         "max_output_tokens": 32768,
         "max_tokens": 32768,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": true,
         "supports_reasoning": true,
@@ -43015,7 +43013,10 @@
         "max_output_tokens": 32768,
         "max_tokens": 32768,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": true,
         "supports_reasoning": true,
@@ -43030,7 +43031,9 @@
         "max_output_tokens": 65536,
         "max_tokens": 65536,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions"],
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -43044,7 +43047,9 @@
         "max_output_tokens": 65536,
         "max_tokens": 65536,
         "mode": "chat",
-        "supported_endpoints": ["/v1/chat/completions"],
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -43060,9 +43065,16 @@
         "max_tokens": 128000,
         "mode": "responses",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/responses"],
-        "supported_modalities": ["text", "image"],
-        "supported_output_modalities": ["text"],
+        "supported_endpoints": [
+            "/v1/responses"
+        ],
+        "supported_modalities": [
+            "text",
+            "image"
+        ],
+        "supported_output_modalities": [
+            "text"
+        ],
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -43080,9 +43092,16 @@
         "max_tokens": 128000,
         "mode": "responses",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/responses"],
-        "supported_modalities": ["text", "image"],
-        "supported_output_modalities": ["text"],
+        "supported_endpoints": [
+            "/v1/responses"
+        ],
+        "supported_modalities": [
+            "text",
+            "image"
+        ],
+        "supported_output_modalities": [
+            "text"
+        ],
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -43099,7 +43118,10 @@
         "max_tokens": 256000,
         "mode": "chat",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": false,
         "supports_reasoning": true,
@@ -43115,7 +43137,10 @@
         "max_tokens": 256000,
         "mode": "chat",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": false,
         "supports_reasoning": true,
@@ -43131,7 +43156,10 @@
         "max_tokens": 128000,
         "mode": "chat",
         "use_openai_responses_path": true,
-        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "supported_endpoints": [
+            "/v1/chat/completions",
+            "/v1/responses"
+        ],
         "supports_function_calling": true,
         "supports_parallel_function_calling": false,
         "supports_reasoning": true,
@@ -43310,20 +43338,6 @@
             }
         ]
     },
-    "zai.glm-5": {
-        "input_cost_per_token": 1e-06,
-        "output_cost_per_token": 3.2e-06,
-        "litellm_provider": "bedrock_converse",
-        "max_input_tokens": 200000,
-        "max_output_tokens": 128000,
-        "max_tokens": 128000,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_reasoning": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
     "bedrock/us-east-1/zai.glm-5": {
         "input_cost_per_token": 1e-06,
         "output_cost_per_token": 3.2e-06,
@@ -43352,45 +43366,6 @@
         "supports_tool_choice": true,
         "source": "https://aws.amazon.com/bedrock/pricing/"
     },
-    "minimax.minimax-m2.5": {
-        "input_cost_per_token": 3e-07,
-        "output_cost_per_token": 1.2e-06,
-        "litellm_provider": "bedrock_converse",
-        "max_input_tokens": 1000000,
-        "max_output_tokens": 8192,
-        "max_tokens": 8192,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
-    "bedrock/us-east-1/minimax.minimax-m2.5": {
-        "input_cost_per_token": 3e-07,
-        "output_cost_per_token": 1.2e-06,
-        "litellm_provider": "bedrock",
-        "max_input_tokens": 1000000,
-        "max_output_tokens": 8192,
-        "max_tokens": 8192,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
-    "bedrock/us-west-2/minimax.minimax-m2.5": {
-        "input_cost_per_token": 3e-07,
-        "output_cost_per_token": 1.2e-06,
-        "litellm_provider": "bedrock",
-        "max_input_tokens": 1000000,
-        "max_output_tokens": 8192,
-        "max_tokens": 8192,
-        "mode": "chat",
-        "supports_function_calling": true,
-        "supports_system_messages": true,
-        "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
-    },
     "bedrock/us-gov-east-1/anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.5e-06,
         "cache_creation_input_token_cost_above_1hr": 2.4e-06,
@@ -43412,7 +43387,8 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_pdf_input": true
+        "supports_pdf_input": true,
+        "supports_parallel_tool_use_config": true
     },
     "bedrock/us-gov-west-1/anthropic.claude-haiku-4-5-20251001-v1:0": {
         "cache_creation_input_token_cost": 1.5e-06,
@@ -43435,365 +43411,369 @@
         "supports_tool_choice": true,
         "supports_vision": true,
         "supports_native_structured_output": true,
-        "supports_pdf_input": true
+        "supports_pdf_input": true,
+        "supports_parallel_tool_use_config": true
+    },
+    "snowflake/claude-sonnet-4-5": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-sonnet-4-6": {
+        "supports_adaptive_thinking": true,
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-4-sonnet": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-4-opus": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 5e-06,
+        "output_cost_per_token": 2.5e-05,
+        "cache_read_input_token_cost": 5e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-haiku-4-5": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 1e-06,
+        "output_cost_per_token": 5e-06,
+        "cache_read_input_token_cost": 1e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/claude-3-7-sonnet": {
+        "max_tokens": 16384,
+        "max_input_tokens": 200000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-06,
+        "output_cost_per_token": 1.5e-05,
+        "cache_read_input_token_cost": 3e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-4.1": {
+        "max_tokens": 16384,
+        "max_input_tokens": 300000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 2e-06,
+        "output_cost_per_token": 8e-06,
+        "cache_read_input_token_cost": 5e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-5": {
+        "max_tokens": 16384,
+        "max_input_tokens": 300000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 1.25e-06,
+        "output_cost_per_token": 1e-05,
+        "cache_read_input_token_cost": 1.25e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-5-mini": {
+        "max_tokens": 16384,
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/openai-gpt-5-nano": {
+        "max_tokens": 16384,
+        "max_input_tokens": 5000000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 1.5e-07,
+        "output_cost_per_token": 6e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_system_messages": true,
+        "supports_response_schema": true
+    },
+    "snowflake/llama4-maverick": {
+        "max_tokens": 16384,
+        "max_input_tokens": 128000,
+        "max_output_tokens": 16384,
+        "input_cost_per_token": 2.4e-07,
+        "output_cost_per_token": 9.7e-07,
+        "litellm_provider": "snowflake",
+        "mode": "chat",
+        "supports_function_calling": true,
+        "supports_system_messages": true
+    },
+    "snowflake/snowflake-arctic-embed-l-v2.0": {
+        "max_tokens": 8192,
+        "max_input_tokens": 8192,
+        "input_cost_per_token": 7e-08,
+        "output_cost_per_token": 0.0,
+        "litellm_provider": "snowflake",
+        "mode": "embedding"
+    },
+    "snowflake/snowflake-arctic-embed-m-v2.0": {
+        "max_tokens": 8192,
+        "max_input_tokens": 8192,
+        "input_cost_per_token": 7e-08,
+        "output_cost_per_token": 0.0,
+        "litellm_provider": "snowflake",
+        "mode": "embedding"
+    },
+    "soniox/stt-async-v4": {
+        "litellm_provider": "soniox",
+        "max_output_tokens": 8000,
+        "max_tokens": 8000,
+        "input_cost_per_second": 0.0,
+        "output_cost_per_second": 2.77778e-05,
+        "mode": "audio_transcription",
+        "source": "https://soniox.com/pricing",
+        "supported_endpoints": [
+            "/v1/audio/transcriptions"
+        ],
+        "supports_audio_input": true
+    },
+    "soniox/stt-async-v5": {
+        "litellm_provider": "soniox",
+        "max_output_tokens": 8000,
+        "max_tokens": 8000,
+        "input_cost_per_second": 0.0,
+        "output_cost_per_second": 2.77778e-05,
+        "mode": "audio_transcription",
+        "source": "https://soniox.com/pricing",
+        "supported_endpoints": [
+            "/v1/audio/transcriptions"
+        ],
+        "supports_audio_input": true
+    },
+    "tensormesh/Qwen/Qwen3.5-397B-A17B-FP8": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 6e-07,
+        "output_cost_per_token": 3.6e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 262144,
+        "max_output_tokens": 262144,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 4.5e-07,
+        "output_cost_per_token": 1.8e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 262144,
+        "max_output_tokens": 262144,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/Qwen/Qwen3.6-27B-FP8": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 3.2e-07,
+        "output_cost_per_token": 3.2e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 262144,
+        "max_output_tokens": 262144,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/lukealonso/GLM-5.1-NVFP4-MTP": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.4e-06,
+        "output_cost_per_token": 4.4e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 202752,
+        "max_output_tokens": 202752,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/deepseek-ai/DeepSeek-V4-Flash": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.4e-07,
+        "output_cost_per_token": 2.8e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 32768,
+        "max_output_tokens": 32768,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/moonshotai/Kimi-K2.6": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 9.6e-07,
+        "output_cost_per_token": 4e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 32768,
+        "max_output_tokens": 32768,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/MiniMaxAI/MiniMax-M2.5": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 1.2e-06,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 196608,
+        "max_output_tokens": 196608,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/google/gemma-4-31B-it": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.4e-07,
+        "output_cost_per_token": 5.6e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 32768,
+        "max_output_tokens": 32768,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/openai/gpt-oss-120b": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 1.5e-07,
+        "output_cost_per_token": 6e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 131072,
+        "max_output_tokens": 131072,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
+    },
+    "tensormesh/openai/gpt-oss-20b": {
+        "litellm_provider": "tensormesh",
+        "mode": "chat",
+        "input_cost_per_token": 7e-08,
+        "output_cost_per_token": 2.8e-07,
+        "cache_read_input_token_cost": 0,
+        "max_input_tokens": 131072,
+        "max_output_tokens": 131072,
+        "supports_function_calling": true,
+        "supports_tool_choice": true,
+        "supports_response_schema": true,
+        "supports_prompt_caching": true,
+        "supports_system_messages": true,
+        "supports_reasoning": true,
+        "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
     },
-  "snowflake/claude-sonnet-4-5": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-sonnet-4-6": {
-    "supports_adaptive_thinking": true,
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-4-sonnet": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-4-opus": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000005,
-    "output_cost_per_token": 0.000025,
-    "cache_read_input_token_cost": 0.0000005,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-haiku-4-5": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000001,
-    "output_cost_per_token": 0.000005,
-    "cache_read_input_token_cost": 0.0000001,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/claude-3-7-sonnet": {
-    "max_tokens": 16384,
-    "max_input_tokens": 200000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000003,
-    "output_cost_per_token": 0.000015,
-    "cache_read_input_token_cost": 0.0000003,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-4.1": {
-    "max_tokens": 16384,
-    "max_input_tokens": 300000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.000002,
-    "output_cost_per_token": 0.000008,
-    "cache_read_input_token_cost": 0.0000005,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-5": {
-    "max_tokens": 16384,
-    "max_input_tokens": 300000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.00000125,
-    "output_cost_per_token": 0.00001,
-    "cache_read_input_token_cost": 0.000000125,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_vision": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-5-mini": {
-    "max_tokens": 16384,
-    "max_input_tokens": 1000000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.0000003,
-    "output_cost_per_token": 0.0000012,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/openai-gpt-5-nano": {
-    "max_tokens": 16384,
-    "max_input_tokens": 5000000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.00000015,
-    "output_cost_per_token": 0.0000006,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_system_messages": true,
-    "supports_response_schema": true
-  },
-  "snowflake/llama4-maverick": {
-    "max_tokens": 16384,
-    "max_input_tokens": 128000,
-    "max_output_tokens": 16384,
-    "input_cost_per_token": 0.00000024,
-    "output_cost_per_token": 0.00000097,
-    "litellm_provider": "snowflake",
-    "mode": "chat",
-    "supports_function_calling": true,
-    "supports_system_messages": true
-  },
-  "snowflake/snowflake-arctic-embed-l-v2.0": {
-    "max_tokens": 8192,
-    "max_input_tokens": 8192,
-    "input_cost_per_token": 0.00000007,
-    "output_cost_per_token": 0.0,
-    "litellm_provider": "snowflake",
-    "mode": "embedding"
-  },
-  "snowflake/snowflake-arctic-embed-m-v2.0": {
-    "max_tokens": 8192,
-    "max_input_tokens": 8192,
-    "input_cost_per_token": 0.00000007,
-    "output_cost_per_token": 0.0,
-    "litellm_provider": "snowflake",
-    "mode": "embedding"
-  },
-  "soniox/stt-async-v4": {
-    "litellm_provider": "soniox",
-    "max_output_tokens": 8000,
-    "max_tokens": 8000,
-    "input_cost_per_second": 0.0,
-    "output_cost_per_second": 0.0000277778,
-    "mode": "audio_transcription",
-    "source": "https://soniox.com/pricing",
-    "supported_endpoints": ["/v1/audio/transcriptions"],
-    "supports_audio_input": true
-  },
-  "soniox/stt-async-v5": {
-    "litellm_provider": "soniox",
-    "max_output_tokens": 8000,
-    "max_tokens": 8000,
-    "input_cost_per_second": 0.0,
-    "output_cost_per_second": 0.0000277778,
-    "mode": "audio_transcription",
-    "source": "https://soniox.com/pricing",
-    "supported_endpoints": ["/v1/audio/transcriptions"],
-    "supports_audio_input": true
-  },
-  "tensormesh/Qwen/Qwen3.5-397B-A17B-FP8": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 6e-07,
-    "output_cost_per_token": 3.6e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 262144,
-    "max_output_tokens": 262144,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 4.5e-07,
-    "output_cost_per_token": 1.8e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 262144,
-    "max_output_tokens": 262144,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/Qwen/Qwen3.6-27B-FP8": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 3.2e-07,
-    "output_cost_per_token": 3.2e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 262144,
-    "max_output_tokens": 262144,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/lukealonso/GLM-5.1-NVFP4-MTP": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.4e-06,
-    "output_cost_per_token": 4.4e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 202752,
-    "max_output_tokens": 202752,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/deepseek-ai/DeepSeek-V4-Flash": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.4e-07,
-    "output_cost_per_token": 2.8e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 32768,
-    "max_output_tokens": 32768,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/moonshotai/Kimi-K2.6": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 9.6e-07,
-    "output_cost_per_token": 4e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 32768,
-    "max_output_tokens": 32768,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/MiniMaxAI/MiniMax-M2.5": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 3e-07,
-    "output_cost_per_token": 1.2e-06,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 196608,
-    "max_output_tokens": 196608,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/google/gemma-4-31B-it": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.4e-07,
-    "output_cost_per_token": 5.6e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 32768,
-    "max_output_tokens": 32768,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/openai/gpt-oss-120b": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 1.5e-07,
-    "output_cost_per_token": 6e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 131072,
-    "max_output_tokens": 131072,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  },
-  "tensormesh/openai/gpt-oss-20b": {
-    "litellm_provider": "tensormesh",
-    "mode": "chat",
-    "input_cost_per_token": 7e-08,
-    "output_cost_per_token": 2.8e-07,
-    "cache_read_input_token_cost": 0,
-    "max_input_tokens": 131072,
-    "max_output_tokens": 131072,
-    "supports_function_calling": true,
-    "supports_tool_choice": true,
-    "supports_response_schema": true,
-    "supports_prompt_caching": true,
-    "supports_system_messages": true,
-    "supports_reasoning": true,
-    "source": "https://serverless.tensormesh.ai/v1/models/openrouter"
-  }
- ,
     "deepseek-v4-flash": {
         "cache_creation_input_token_cost": 0.0,
         "cache_read_input_token_cost": 2.8e-09,
@@ -43898,8 +43878,8 @@
         "max_tokens": 128000,
         "max_input_tokens": 128000,
         "max_output_tokens": 128000,
-        "input_cost_per_token": 0.000000125,
-        "output_cost_per_token": 0.00000045,
+        "input_cost_per_token": 1.25e-07,
+        "output_cost_per_token": 4.5e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43911,8 +43891,8 @@
         "max_tokens": 131072,
         "max_input_tokens": 131072,
         "max_output_tokens": 131072,
-        "input_cost_per_token": 0.00000014,
-        "output_cost_per_token": 0.00000045,
+        "input_cost_per_token": 1.4e-07,
+        "output_cost_per_token": 4.5e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43924,8 +43904,8 @@
         "max_tokens": 131072,
         "max_input_tokens": 131072,
         "max_output_tokens": 131072,
-        "input_cost_per_token": 0.00000009,
-        "output_cost_per_token": 0.0000002,
+        "input_cost_per_token": 9e-08,
+        "output_cost_per_token": 2e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43937,8 +43917,8 @@
         "max_tokens": 131072,
         "max_input_tokens": 131072,
         "max_output_tokens": 131072,
-        "input_cost_per_token": 0.0000003,
-        "output_cost_per_token": 0.0000006,
+        "input_cost_per_token": 3e-07,
+        "output_cost_per_token": 6e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43950,8 +43930,8 @@
         "max_tokens": 163840,
         "max_input_tokens": 163840,
         "max_output_tokens": 163840,
-        "input_cost_per_token": 0.0000001,
-        "output_cost_per_token": 0.0000002,
+        "input_cost_per_token": 1e-07,
+        "output_cost_per_token": 2e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -43963,8 +43943,8 @@
         "max_tokens": 1000192,
         "max_input_tokens": 1000192,
         "max_output_tokens": 1000192,
-        "input_cost_per_token": 0.000000255,
-        "output_cost_per_token": 0.00000055,
+        "input_cost_per_token": 2.55e-07,
+        "output_cost_per_token": 5.5e-07,
         "litellm_provider": "pinstripes",
         "mode": "chat",
         "supports_function_calling": true,
@@ -44006,39 +43986,39 @@
         "supports_system_messages": true,
         "supports_tool_choice": true
     },
-  "fallback_generalizations": {
-    "rules": [
-      {
-        "name": "anthropic-claude-adaptive-thinking",
-        "pattern": "(?:opus|sonnet|haiku)[-._](?:4[-._](?:[6-9]|[1-9]\\d)(?!\\d)|(?:[5-9]|[1-9]\\d{1,})[-._]\\d{1,2}(?!\\d))",
-        "description": "Claude opus/sonnet/haiku at version 4.6 or higher: 4.6 through 4.99, then any 5.x, 6.x or later major. The minor is capped at two digits so an 8-digit date suffix such as claude-opus-4-20250514 is never read as a >= 4.6 minor. Turns on adaptive thinking for new families with no code change.",
-        "extends": "anthropic-claude",
-        "model_info": {
-          "supports_adaptive_thinking": true
-        }
-      },
-      {
-        "name": "anthropic-claude",
-        "pattern": "^claude-[a-z]+-\\d+[-.]\\d+(?:-\\d{8})?$",
-        "description": "Any Claude family-major-minor id, optionally with an 8-digit date suffix, anchored to the whole name. Version-neutral fallback that gives an unmapped Claude provider routing and baseline capabilities; it carries no pricing, so cost stays on the standard unpriced behavior rather than a guessed number.",
-        "model_info": {
-          "litellm_provider": "anthropic",
-          "mode": "chat",
-          "max_input_tokens": 200000,
-          "max_output_tokens": 64000,
-          "max_tokens": 64000,
-          "supports_function_calling": true,
-          "supports_parallel_function_calling": true,
-          "supports_vision": true,
-          "supports_tool_choice": true,
-          "supports_assistant_prefill": true,
-          "supports_prompt_caching": true,
-          "supports_response_schema": true,
-          "supports_reasoning": true,
-          "supports_pdf_input": true,
-          "supports_system_messages": true
-        }
-      }
-    ]
-  }
+    "fallback_generalizations": {
+        "rules": [
+            {
+                "name": "anthropic-claude-adaptive-thinking",
+                "pattern": "(?:opus|sonnet|haiku)[-._](?:4[-._](?:[6-9]|[1-9]\\d)(?!\\d)|(?:[5-9]|[1-9]\\d{1,})[-._]\\d{1,2}(?!\\d))",
+                "description": "Claude opus/sonnet/haiku at version 4.6 or higher: 4.6 through 4.99, then any 5.x, 6.x or later major. The minor is capped at two digits so an 8-digit date suffix such as claude-opus-4-20250514 is never read as a >= 4.6 minor. Turns on adaptive thinking for new families with no code change.",
+                "extends": "anthropic-claude",
+                "model_info": {
+                    "supports_adaptive_thinking": true
+                }
+            },
+            {
+                "name": "anthropic-claude",
+                "pattern": "^claude-[a-z]+-\\d+[-.]\\d+(?:-\\d{8})?$",
+                "description": "Any Claude family-major-minor id, optionally with an 8-digit date suffix, anchored to the whole name. Version-neutral fallback that gives an unmapped Claude provider routing and baseline capabilities; it carries no pricing, so cost stays on the standard unpriced behavior rather than a guessed number.",
+                "model_info": {
+                    "litellm_provider": "anthropic",
+                    "mode": "chat",
+                    "max_input_tokens": 200000,
+                    "max_output_tokens": 64000,
+                    "max_tokens": 64000,
+                    "supports_function_calling": true,
+                    "supports_parallel_function_calling": true,
+                    "supports_vision": true,
+                    "supports_tool_choice": true,
+                    "supports_assistant_prefill": true,
+                    "supports_prompt_caching": true,
+                    "supports_response_schema": true,
+                    "supports_reasoning": true,
+                    "supports_pdf_input": true,
+                    "supports_system_messages": true
+                }
+            }
+        ]
+    }
 }
diff --git a/ruff-strict-budget.json b/ruff-strict-budget.json
index 85ff7fcbf7d..9c2db6ee9cf 100644
--- a/ruff-strict-budget.json
+++ b/ruff-strict-budget.json
@@ -264,7 +264,7 @@
     "limit": 63
   },
   "SIM102": {
-    "limit": 326
+    "limit": 325
   },
   "SIM103": {
     "limit": 129
diff --git a/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_factory.py b/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_factory.py
index 864f685e7c9..1d5289737f1 100644
--- a/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_factory.py
+++ b/tests/test_litellm/litellm_core_utils/prompt_templates/test_litellm_core_utils_prompt_templates_factory.py
@@ -1,5 +1,6 @@
 import base64
 import json
+import os
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -2744,102 +2745,132 @@ def test_add_cache_point_tool_block_passes_ttl_for_claude_4_5():
     TTL ordering constraint (tools -> system -> messages).
 
     Ref: https://github.com/BerriAI/litellm/issues/XXXXX
+
+    Forces the bundled local cost map so ttl eligibility (driven by
+    `cache_creation_input_token_cost_above_1hr` in litellm.model_cost) reads
+    this branch's pricing data rather than the network-fetched `main` copy,
+    which lacks the fix until merge.
     """
     from litellm.litellm_core_utils.prompt_templates.factory import (
         add_cache_point_tool_block,
     )
 
-    tool_with_1h = {
-        "type": "function",
-        "function": {"name": "get_weather", "parameters": {"type": "object"}},
-        "cache_control": {"type": "ephemeral", "ttl": "1h"},
-    }
+    old_env = os.environ.get("LITELLM_LOCAL_MODEL_COST_MAP")
+    old_cost = litellm.model_cost
+    os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
+    litellm.model_cost = litellm.get_model_cost_map(url="")
+    try:
+        tool_with_1h = {
+            "type": "function",
+            "function": {"name": "get_weather", "parameters": {"type": "object"}},
+            "cache_control": {"type": "ephemeral", "ttl": "1h"},
+        }
 
-    # Claude 4.5 model: ttl should be preserved
-    result = add_cache_point_tool_block(
-        tool_with_1h, model="us.anthropic.claude-sonnet-4-5-20250514-v1:0"
-    )
-    assert result is not None
-    assert result["cachePoint"]["type"] == "default"
-    assert result["cachePoint"]["ttl"] == "1h"
+        # Claude 4.5 model: ttl should be preserved
+        result = add_cache_point_tool_block(
+            tool_with_1h, model="jp.anthropic.claude-opus-4-7"
+        )
+        assert result is not None
+        assert result["cachePoint"]["type"] == "default"
+        assert result["cachePoint"]["ttl"] == "1h"
 
-    # Claude 4.5 model with 5m ttl: also preserved
-    tool_with_5m = {
-        "cache_control": {"type": "ephemeral", "ttl": "5m"},
-    }
-    result_5m = add_cache_point_tool_block(
-        tool_with_5m, model="us.anthropic.claude-sonnet-4-5-20250514-v1:0"
-    )
-    assert result_5m is not None
-    assert result_5m["cachePoint"]["ttl"] == "5m"
+        # Claude 4.5 model with 5m ttl: also preserved
+        tool_with_5m = {
+            "cache_control": {"type": "ephemeral", "ttl": "5m"},
+        }
+        result_5m = add_cache_point_tool_block(
+            tool_with_5m, model="jp.anthropic.claude-opus-4-7"
+        )
+        assert result_5m is not None
+        assert result_5m["cachePoint"]["ttl"] == "5m"
 
-    # Older model: ttl should be stripped
-    result_old = add_cache_point_tool_block(
-        tool_with_1h, model="anthropic.claude-3-5-sonnet-20241022-v2:0"
-    )
-    assert result_old is not None
-    assert result_old["cachePoint"]["type"] == "default"
-    assert "ttl" not in result_old["cachePoint"]
+        # Older model: ttl should be stripped
+        result_old = add_cache_point_tool_block(
+            tool_with_1h, model="anthropic.claude-3-5-sonnet-20241022-v2:0"
+        )
+        assert result_old is not None
+        assert result_old["cachePoint"]["type"] == "default"
+        assert "ttl" not in result_old["cachePoint"]
 
-    # No model provided: ttl should be stripped (safe default)
-    result_no_model = add_cache_point_tool_block(tool_with_1h, model=None)
-    assert result_no_model is not None
-    assert "ttl" not in result_no_model["cachePoint"]
+        # No model provided: ttl should be stripped (safe default)
+        result_no_model = add_cache_point_tool_block(tool_with_1h, model=None)
+        assert result_no_model is not None
+        assert "ttl" not in result_no_model["cachePoint"]
 
-    # No cache_control: returns None (unchanged behavior)
-    tool_no_cache = {
-        "type": "function",
-        "function": {"name": "get_weather", "parameters": {"type": "object"}},
-    }
-    assert add_cache_point_tool_block(tool_no_cache) is None
+        # No cache_control: returns None (unchanged behavior)
+        tool_no_cache = {
+            "type": "function",
+            "function": {"name": "get_weather", "parameters": {"type": "object"}},
+        }
+        assert add_cache_point_tool_block(tool_no_cache) is None
 
-    # cache_control without ttl: returns default cachePoint (unchanged behavior)
-    tool_no_ttl = {"cache_control": {"type": "ephemeral"}}
-    result_no_ttl = add_cache_point_tool_block(
-        tool_no_ttl, model="us.anthropic.claude-sonnet-4-5-20250514-v1:0"
-    )
-    assert result_no_ttl is not None
-    assert result_no_ttl["cachePoint"]["type"] == "default"
-    assert "ttl" not in result_no_ttl["cachePoint"]
+        # cache_control without ttl: returns default cachePoint (unchanged behavior)
+        tool_no_ttl = {"cache_control": {"type": "ephemeral"}}
+        result_no_ttl = add_cache_point_tool_block(
+            tool_no_ttl, model="us.anthropic.claude-sonnet-4-5-20250929-v1:0"
+        )
+        assert result_no_ttl is not None
+        assert result_no_ttl["cachePoint"]["type"] == "default"
+        assert "ttl" not in result_no_ttl["cachePoint"]
+    finally:
+        litellm.model_cost = old_cost
+        if old_env is None:
+            os.environ.pop("LITELLM_LOCAL_MODEL_COST_MAP", None)
+        else:
+            os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = old_env
 
 
 def test_bedrock_tools_pt_passes_ttl_for_claude_4_5():
     """
     End-to-end: _bedrock_tools_pt should produce cachePoint blocks with ttl
     for Claude 4.5+ models when tools have cache_control with ttl.
+
+    Forces the bundled local cost map so ttl eligibility (driven by
+    `cache_creation_input_token_cost_above_1hr` in litellm.model_cost) reads
+    this branch's pricing data rather than the network-fetched `main` copy,
+    which lacks the fix until merge.
     """
     from litellm.litellm_core_utils.prompt_templates.factory import _bedrock_tools_pt
 
-    tools = [
-        {
-            "type": "function",
-            "function": {
-                "name": "get_weather",
-                "description": "Get weather",
-                "parameters": {
-                    "type": "object",
-                    "properties": {"city": {"type": "string"}},
+    old_env = os.environ.get("LITELLM_LOCAL_MODEL_COST_MAP")
+    old_cost = litellm.model_cost
+    os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
+    litellm.model_cost = litellm.get_model_cost_map(url="")
+    try:
+        tools = [
+            {
+                "type": "function",
+                "function": {
+                    "name": "get_weather",
+                    "description": "Get weather",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {"city": {"type": "string"}},
+                    },
                 },
-            },
-            "cache_control": {"type": "ephemeral", "ttl": "1h"},
-        }
-    ]
+                "cache_control": {"type": "ephemeral", "ttl": "1h"},
+            }
+        ]
 
-    # Claude 4.5: cachePoint should have ttl
-    result = _bedrock_tools_pt(
-        tools, model="us.anthropic.claude-sonnet-4-5-20250514-v1:0"
-    )
-    cache_blocks = [b for b in result if "cachePoint" in b]
-    assert len(cache_blocks) == 1
-    assert cache_blocks[0]["cachePoint"]["ttl"] == "1h"
+        # Claude 4.5: cachePoint should have ttl
+        result = _bedrock_tools_pt(tools, model="jp.anthropic.claude-opus-4-7")
+        cache_blocks = [b for b in result if "cachePoint" in b]
+        assert len(cache_blocks) == 1
+        assert cache_blocks[0]["cachePoint"]["ttl"] == "1h"
 
-    # Older model: cachePoint should not have ttl
-    result_old = _bedrock_tools_pt(
-        tools, model="anthropic.claude-3-5-sonnet-20241022-v2:0"
-    )
-    cache_blocks_old = [b for b in result_old if "cachePoint" in b]
-    assert len(cache_blocks_old) == 1
-    assert "ttl" not in cache_blocks_old[0]["cachePoint"]
+        # Older model: cachePoint should not have ttl
+        result_old = _bedrock_tools_pt(
+            tools, model="anthropic.claude-3-5-sonnet-20241022-v2:0"
+        )
+        cache_blocks_old = [b for b in result_old if "cachePoint" in b]
+        assert len(cache_blocks_old) == 1
+        assert "ttl" not in cache_blocks_old[0]["cachePoint"]
+    finally:
+        litellm.model_cost = old_cost
+        if old_env is None:
+            os.environ.pop("LITELLM_LOCAL_MODEL_COST_MAP", None)
+        else:
+            os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = old_env
 
 
 def test_convert_to_anthropic_tool_result_openai_file_pdf_becomes_document():
diff --git a/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py b/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py
index d940f9f47a6..fe060e2e40d 100644
--- a/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py
+++ b/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py
@@ -611,6 +611,65 @@ def test_transform_request_helper_includes_anthropic_beta_and_tools():
     assert fields["tools"][0]["type"] == "computer_20250124"
 
 
+def test_parallel_tool_calls_config_kept_for_sonnet_5():
+    old_env = os.environ.get("LITELLM_LOCAL_MODEL_COST_MAP")
+    old_cost = litellm.model_cost
+    os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
+    litellm.model_cost = litellm.get_model_cost_map(url="")
+    try:
+        config = AmazonConverseConfig()
+        optional_params = config.map_openai_params(
+            model="anthropic.claude-sonnet-5",
+            non_default_params={"parallel_tool_calls": False},
+            optional_params={},
+            drop_params=False,
+        )
+
+        data = config._transform_request_helper(
+            model="anthropic.claude-sonnet-5",
+            system_content_blocks=[],
+            optional_params=optional_params,
+            messages=None,
+        )
+
+        assert data["additionalModelRequestFields"]["tool_choice"] == {
+            "disable_parallel_tool_use": True
+        }
+    finally:
+        litellm.model_cost = old_cost
+        if old_env is None:
+            os.environ.pop("LITELLM_LOCAL_MODEL_COST_MAP", None)
+        else:
+            os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = old_env
+
+
+def test_parallel_tool_calls_config_dropped_for_ttl_only_model(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    model = "anthropic.claude-fable-5"
+    monkeypatch.setitem(
+        litellm.model_cost,
+        model,
+        {"cache_creation_input_token_cost_above_1hr": 2e-05},
+    )
+    config = AmazonConverseConfig()
+    optional_params = config.map_openai_params(
+        model=model,
+        non_default_params={"parallel_tool_calls": False},
+        optional_params={},
+        drop_params=False,
+    )
+
+    data = config._transform_request_helper(
+        model=model,
+        system_content_blocks=[],
+        optional_params=optional_params,
+        messages=None,
+    )
+
+    assert "tool_choice" not in data.get("additionalModelRequestFields", {})
+
+
 def test_transform_response_with_computer_use_tool():
     """Test response transformation with computer use tool call."""
     import httpx
@@ -4130,6 +4189,42 @@ def test_parallel_tool_calls_newer_model_adds_disable_flag():
     assert "parallel_tool_calls" not in request_data["additionalModelRequestFields"]
 
 
+def test_parallel_tool_calls_flag_decoupled_from_ttl_pricing(monkeypatch):
+    """
+    The disable_parallel_tool_use gate must read supports_parallel_tool_use_config,
+    not the 1h-TTL pricing field: a model carrying only the former still gets the flag.
+    """
+    from litellm.llms.bedrock.common_utils import is_claude_4_5_on_bedrock
+
+    config = AmazonConverseConfig()
+    model = "anthropic.claude-parallel-tool-use-only"
+    monkeypatch.setitem(litellm.model_cost, model, {"supports_parallel_tool_use_config": True})
+    assert is_claude_4_5_on_bedrock(model) is False
+    messages = [{"role": "user", "content": "What's the weather in SF and NYC?"}]
+
+    optional_params = config.map_openai_params(
+        non_default_params={"parallel_tool_calls": False, "tools": _TOOL_PARAM},
+        optional_params={},
+        model=model,
+        drop_params=False,
+    )
+
+    request_data = config.transform_request(
+        model=model,
+        messages=messages,
+        optional_params=optional_params,
+        litellm_params={},
+        headers={},
+    )
+
+    assert (
+        request_data["additionalModelRequestFields"]["tool_choice"][
+            "disable_parallel_tool_use"
+        ]
+        is True
+    )
+
+
 def test_parallel_tool_calls_older_model_drops_disable_flag():
     """Older Claude models (pre-4.5) must NOT receive disable_parallel_tool_use — Bedrock rejects it."""
     config = AmazonConverseConfig()
@@ -4554,6 +4649,154 @@ def test_cache_control_injection_tool_config_not_added_without_injection_point()
     assert all("cachePoint" not in tool for tool in tools)
 
 
+def test_cache_control_injection_tool_config_honors_ttl_for_supported_model():
+    """
+    Regression test: cache_control_injection_points with location=tool_config
+    must honor the requested `control.ttl`, mirroring the message/system
+    cache_control behavior, instead of always emitting a bare
+    {"type": "default"} cachePoint with no ttl.
+
+    Forces the bundled local cost map so `is_claude_4_5_on_bedrock` (which
+    reads `cache_creation_input_token_cost_above_1hr` from litellm.model_cost)
+    sees this branch's pricing data rather than the network-fetched `main`
+    copy, which lacks it until merge.
+    """
+    old_env = os.environ.get("LITELLM_LOCAL_MODEL_COST_MAP")
+    old_cost = litellm.model_cost
+    os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
+    litellm.model_cost = litellm.get_model_cost_map(url="")
+    try:
+        config = AmazonConverseConfig()
+        messages = [
+            {"role": "user", "content": "What is the weather?"},
+        ]
+        optional_params = {
+            "tools": [
+                {
+                    "type": "function",
+                    "function": {
+                        "name": "get_weather",
+                        "description": "Get weather for a location",
+                        "parameters": {
+                            "type": "object",
+                            "properties": {"location": {"type": "string"}},
+                            "required": ["location"],
+                        },
+                    },
+                }
+            ],
+            "cache_control_injection_points": [
+                {"location": "tool_config", "control": {"type": "ephemeral", "ttl": "1h"}},
+            ],
+        }
+        result = config._transform_request(
+            model="us.anthropic.claude-sonnet-4-5-20250929-v1:0",
+            messages=messages,
+            optional_params=optional_params,
+            litellm_params={},
+        )
+        tools = result["toolConfig"]["tools"]
+        assert tools[-1] == {"cachePoint": {"type": "default", "ttl": "1h"}}
+    finally:
+        litellm.model_cost = old_cost
+        if old_env is None:
+            os.environ.pop("LITELLM_LOCAL_MODEL_COST_MAP", None)
+        else:
+            os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = old_env
+
+
+def test_cache_control_injection_tool_config_honors_ttl_for_regional_model_lacking_own_pricing():
+    """
+    Regression test: a regional pricing entry that omits
+    `cache_creation_input_token_cost_above_1hr` (e.g. `jp.anthropic.claude-opus-4-7`)
+    must not shadow the base model entry that carries it; the requested ttl
+    survives through the base-model fallback.
+    """
+    old_env = os.environ.get("LITELLM_LOCAL_MODEL_COST_MAP")
+    old_cost = litellm.model_cost
+    os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
+    litellm.model_cost = litellm.get_model_cost_map(url="")
+    try:
+        assert "cache_creation_input_token_cost_above_1hr" not in litellm.model_cost["jp.anthropic.claude-opus-4-7"]
+        assert "cache_creation_input_token_cost_above_1hr" in litellm.model_cost["anthropic.claude-opus-4-7"]
+        config = AmazonConverseConfig()
+        messages = [
+            {"role": "user", "content": "What is the weather?"},
+        ]
+        optional_params = {
+            "tools": [
+                {
+                    "type": "function",
+                    "function": {
+                        "name": "get_weather",
+                        "description": "Get weather for a location",
+                        "parameters": {
+                            "type": "object",
+                            "properties": {"location": {"type": "string"}},
+                            "required": ["location"],
+                        },
+                    },
+                }
+            ],
+            "cache_control_injection_points": [
+                {"location": "tool_config", "control": {"type": "ephemeral", "ttl": "1h"}},
+            ],
+        }
+        result = config._transform_request(
+            model="jp.anthropic.claude-opus-4-7",
+            messages=messages,
+            optional_params=optional_params,
+            litellm_params={},
+        )
+        tools = result["toolConfig"]["tools"]
+        assert tools[-1] == {"cachePoint": {"type": "default", "ttl": "1h"}}
+    finally:
+        litellm.model_cost = old_cost
+        if old_env is None:
+            os.environ.pop("LITELLM_LOCAL_MODEL_COST_MAP", None)
+        else:
+            os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = old_env
+
+
+def test_cache_control_injection_tool_config_drops_ttl_for_unsupported_model():
+    """
+    Models that don't support extended TTL caching (only Claude 4.5+ on
+    Bedrock does) must fall back to the default cachePoint with no ttl,
+    even if the caller requested one, matching message/system behavior.
+    """
+    config = AmazonConverseConfig()
+    messages = [
+        {"role": "user", "content": "What is the weather?"},
+    ]
+    optional_params = {
+        "tools": [
+            {
+                "type": "function",
+                "function": {
+                    "name": "get_weather",
+                    "description": "Get weather for a location",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {"location": {"type": "string"}},
+                        "required": ["location"],
+                    },
+                },
+            }
+        ],
+        "cache_control_injection_points": [
+            {"location": "tool_config", "control": {"type": "ephemeral", "ttl": "1h"}},
+        ],
+    }
+    result = config._transform_request(
+        model="anthropic.claude-3-5-haiku-20241022-v1:0",
+        messages=messages,
+        optional_params=optional_params,
+        litellm_params={},
+    )
+    tools = result["toolConfig"]["tools"]
+    assert tools[-1] == {"cachePoint": {"type": "default"}}
+
+
 def test_translate_response_format_json_schema_still_injects_tool():
     """
     response_format with an explicit json_schema should still use the
diff --git a/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py b/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py
index c3191f5b5cb..03d0d87a58c 100644
--- a/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py
+++ b/tests/test_litellm/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py
@@ -492,7 +492,7 @@ def test_bedrock_invoke_messages_transform_converts_custom_tool_schema_type_to_o
     assert result["tools"][0]["type"] == "custom"
 
 
-def test_remove_ttl_from_cache_control_processes_tools():
+def test_remove_ttl_from_cache_control_processes_tools(local_model_cost_map):
     """
     Ensure _remove_ttl_from_cache_control also sanitizes cache_control on tools.
 
@@ -538,7 +538,7 @@ def test_remove_ttl_from_cache_control_processes_tools():
     assert "ttl" not in request["system"][0]["cache_control"]
 
 
-def test_remove_ttl_from_cache_control_preserves_tools_ttl_for_claude_4_5():
+def test_remove_ttl_from_cache_control_preserves_tools_ttl_for_claude_4_5(local_model_cost_map):
     """
     For Claude 4.5+ models, ttl in ["5m", "1h"] should be preserved on tools,
     just like it is for system and messages.
@@ -564,7 +564,7 @@ def test_remove_ttl_from_cache_control_preserves_tools_ttl_for_claude_4_5():
     }
 
     cfg._remove_ttl_from_cache_control(
-        request, model="us.anthropic.claude-sonnet-4-5-20250514-v1:0"
+        request, model="us.anthropic.claude-sonnet-4-5-20250929-v1:0"
     )
 
     # Both tools and system should preserve ttl for Claude 4.5
diff --git a/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py b/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py
index 301bcba99f4..8cc6e4ff25d 100644
--- a/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py
+++ b/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py
@@ -445,3 +445,31 @@ def test_explicit_invoke_route_does_not_match_async_invoke():
         BedrockModelInfo._explicit_async_invoke_route(f"bedrock/{async_invoke_model}")
         is True
     )
+
+
+def test_capability_lookups_fall_back_to_base_model_when_regional_entry_lacks_field(monkeypatch):
+    """
+    Regression test: a regional model_cost entry without the capability field
+    must not shadow a base entry that has it (`get(model) or get(base)` used to
+    short-circuit on the truthy regional dict and drop the capability).
+    """
+    import litellm
+    from litellm.llms.bedrock.common_utils import (
+        bedrock_converse_supports_parallel_tool_use_config,
+        is_claude_4_5_on_bedrock,
+    )
+
+    base = "anthropic.claude-fallback-test"
+    regional = f"eu.{base}"
+    monkeypatch.setitem(litellm.model_cost, regional, {"input_cost_per_token": 1e-06})
+    monkeypatch.setitem(
+        litellm.model_cost,
+        base,
+        {
+            "cache_creation_input_token_cost_above_1hr": 1e-05,
+            "supports_parallel_tool_use_config": True,
+        },
+    )
+
+    assert is_claude_4_5_on_bedrock(regional) is True
+    assert bedrock_converse_supports_parallel_tool_use_config(regional) is True
diff --git a/tests/test_litellm/test_utils.py b/tests/test_litellm/test_utils.py
index 2432b377d54..6bc477655d5 100644
--- a/tests/test_litellm/test_utils.py
+++ b/tests/test_litellm/test_utils.py
@@ -833,6 +833,7 @@ def test_aaamodel_prices_and_context_window_json_is_valid():
                 "supports_image_input": {"type": "boolean"},
                 "supports_nova_canvas_image_edit": {"type": "boolean"},
                 "supports_parallel_function_calling": {"type": "boolean"},
+                "supports_parallel_tool_use_config": {"type": "boolean"},
                 "supports_pdf_input": {"type": "boolean"},
                 "supports_prompt_caching": {"type": "boolean"},
                 "supports_response_schema": {"type": "boolean"},

From ef030235fd6267f685d879cfbfaa89f4bc671895 Mon Sep 17 00:00:00 2001
From: mubashir1osmani <mubashir.osmani777@gmail.com>
Date: Thu, 2 Jul 2026 17:32:46 -0700
Subject: [PATCH 10/26] test(e2e): add vertex_ai passthrough spend-log coverage
 (#31781)

* test(e2e): add vertex_ai passthrough spend-log coverage

Port the de-flake of the SDK-based vertex spend test (#31689) into the
tests/e2e/llm_translation harness. The vertexai SDK intermittently ignored the
proxy api_endpoint override and billed Vertex directly, so the request never
reached LiteLLM and no spend was logged; driving native generateContent over the
shared transport always reaches the proxy, which the harness already guarantees.

The vertex deployment is added at runtime through /model/new with
use_in_pass_through rather than declared in the gateway config, and deleted on
teardown. That registers the deployment's service account for the /vertex_ai
route, so the passthrough call sends only its litellm virtual key in
x-litellm-api-key and no upstream bearer, and the proxy mints the Vertex token
itself. The credential is the one the proxy already holds, read from the same
VERTEXAI_CREDENTIALS/VERTEXAI_PROJECT env; the test never mints a token.

Asserts both that the forward succeeds and that a costed SpendLogs row lands
(vertex_ai provider, a gemini model, spend > 0, call_type pass_through_endpoint),
correlated by the x-litellm-call-id header.

* Update tests/e2e/llm_translation/test_vertex_passthrough_e2e.py

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* Update tests/e2e/llm_translation/test_vertex_passthrough_e2e.py

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
---
 .../LLM_TRANSLATION_COVERAGE_MATRIX.md        |  16 +-
 .../e2e/llm_translation/passthrough_client.py |  27 +++
 .../test_vertex_passthrough_e2e.py            | 166 ++++++++++++++++++
 3 files changed, 206 insertions(+), 3 deletions(-)
 create mode 100644 tests/e2e/llm_translation/test_vertex_passthrough_e2e.py

diff --git a/tests/e2e/llm_translation/LLM_TRANSLATION_COVERAGE_MATRIX.md b/tests/e2e/llm_translation/LLM_TRANSLATION_COVERAGE_MATRIX.md
index 5e4a448857f..44d6e79122e 100644
--- a/tests/e2e/llm_translation/LLM_TRANSLATION_COVERAGE_MATRIX.md
+++ b/tests/e2e/llm_translation/LLM_TRANSLATION_COVERAGE_MATRIX.md
@@ -28,7 +28,7 @@ Status: `covered` / `partial` / `gap`.
 |----------|---------------|-----------|------------|-------------|--------|
 | Gemini (`/gemini/v1beta/models/{m}:generateContent` / `:streamGenerateContent`) | live | live | live | live | **covered** |
 | Anthropic (`/anthropic/v1/messages`) | live | live | live | live | **covered** |
-| Vertex AI (`/vertex_ai/...`) | - | - | - | - | gap (gcloud auth) |
+| Vertex AI (`/vertex_ai/v1/projects/{p}/locations/{loc}/.../models/{m}:generateContent`) | live | - | - | live | **partial** |
 | OpenAI / Bedrock / Cohere / Mistral / VLLM | - | - | - | - | gap |
 
 Each covered cell asserts: `call_type == "pass_through_endpoint"`, `spend > 0`,
@@ -60,11 +60,21 @@ most likely to silently break and the one a mock can't prove works.
 | `test_anthropic_passthrough_nonstreaming_logs_cost` | anthropic native, non-stream, cost |
 | `test_anthropic_passthrough_streaming_logs_cost` | anthropic native, stream, cost |
 | `test_anthropic_passthrough_tool_call_logs_cost` | anthropic native, tool call, cost |
+| `test_vertex_passthrough_via_managed_model_logs_cost` | vertex_ai native, non-stream, cost |
+
+Vertex keeps the credential on the proxy like gemini/anthropic, but the deployment is
+added at runtime instead of declared in the gateway config: the test POSTs `/model/new`
+with `use_in_pass_through`, so the proxy registers that deployment's service account for
+the `/vertex_ai` route, then deletes it on teardown. The passthrough call sends only its
+litellm virtual key (`x-litellm-api-key`), no upstream bearer, and the proxy mints the
+Vertex token itself. Credentials (`VERTEXAI_PROJECT` / `VERTEXAI_CREDENTIALS`) are read
+from the same env the proxy uses, so the test never mints a token.
 
 ## Gaps
 
-- Vertex / OpenAI / Bedrock / Cohere passthrough (same shape; add once the
-  provider credential is configured; Vertex is closest - route exists, auth stale).
+- Vertex streaming / tool-call passthrough (non-streaming + cost now covered).
+- OpenAI / Bedrock / Cohere passthrough (same shape; add once the provider
+  credential is configured).
 - Non-passthrough tool calls over `/chat/completions` end to end with cost.
 - Image / audio / rerank / responses / realtime translation + cost.
 - Streaming cost-injection (`include_cost_in_streaming_usage`); passthrough on
diff --git a/tests/e2e/llm_translation/passthrough_client.py b/tests/e2e/llm_translation/passthrough_client.py
index fff4064a328..77dcf68a1e3 100644
--- a/tests/e2e/llm_translation/passthrough_client.py
+++ b/tests/e2e/llm_translation/passthrough_client.py
@@ -48,6 +48,16 @@ class AnthropicHeaders(Headers):
     tags: str | None = None
 
 
+class VertexHeaders(Headers):
+    # Only the litellm virtual key; the /vertex_ai passthrough mints the Vertex token
+    # from the proxy's own service account (the deployment marked use_in_pass_through),
+    # so no upstream Authorization bearer is sent from the client.
+    x_litellm_api_key: str = Field(serialization_alias="x-litellm-api-key")
+    content_type: str = Field(
+        default="application/json", serialization_alias="Content-Type"
+    )
+
+
 class AltSseParams(BaseModel):
     alt: str = "sse"
 
@@ -132,6 +142,23 @@ class PassthroughClient:
             stream=True,
         )
 
+    # ---- Vertex AI native passthrough (/vertex_ai/v1/projects/...) -------
+
+    def vertex_generate(
+        self, key: str, project: str, location: str, model: str, text: str
+    ) -> StreamingResponse:
+        path = (
+            f"/vertex_ai/v1/projects/{project}/locations/{location}"
+            f"/publishers/google/models/{model}:generateContent"
+        )
+        return self.gateway.transport.send(
+            path,
+            headers=VertexHeaders(x_litellm_api_key=key),
+            json=GeminiGenerateBody(
+                contents=[GeminiContent(parts=[GeminiPart(text=text)])]
+            ),
+        )
+
     # ---- Anthropic native passthrough (/anthropic/v1/messages) ----------
 
     def anthropic_message(
diff --git a/tests/e2e/llm_translation/test_vertex_passthrough_e2e.py b/tests/e2e/llm_translation/test_vertex_passthrough_e2e.py
new file mode 100644
index 00000000000..78d2bb358d2
--- /dev/null
+++ b/tests/e2e/llm_translation/test_vertex_passthrough_e2e.py
@@ -0,0 +1,166 @@
+"""Live e2e: a native Vertex AI generateContent call over the proxy's /vertex_ai
+passthrough is forwarded to Vertex and still logged as a costed SpendLogs row.
+
+Ports the de-flake of the SDK-based spend test (#31689). That test configured the
+vertexai SDK with an api_endpoint override pointing at the proxy, but the SDK
+intermittently ignored the override and billed the public Vertex endpoint directly,
+so the request never reached LiteLLM and no spend was recorded; the bypass, not
+logging lag, was the flake. Driving raw HTTP through the shared transport always
+reaches the proxy, which the harness already guarantees, so the only residual
+nondeterminism is the ~60s async spend flush the poll absorbs.
+
+The vertex deployment is added at runtime through the management endpoint rather than
+declared in the gateway config: the test POSTs /model/new with use_in_pass_through so
+the proxy registers that deployment's service account for the /vertex_ai route, then
+deletes it on teardown. The credential is the one the proxy already holds (read from
+the same VERTEXAI_CREDENTIALS the deployment uses), so the passthrough call sends only
+its litellm virtual key in x-litellm-api-key and no upstream bearer, and the proxy
+mints the Vertex token itself. The test never mints a token.
+
+Asserts both sides of the promise: the forward succeeds (2xx with a candidate) and
+the costed row lands (call_type pass_through_endpoint, vertex_ai provider, a gemini
+model, spend > 0), correlated by the x-litellm-call-id header.
+"""
+
+import os
+
+import pytest
+from pydantic import BaseModel
+
+from e2e_config import unique_marker
+from e2e_http import NoBody, require_successful_call, unwrap
+from lifecycle import ResourceManager
+from models import SpendLogRow
+from passthrough_client import PassthroughClient
+
+pytestmark = pytest.mark.e2e
+
+VERTEX_MODEL = "gemini-2.5-flash"
+# The added deployment's region and the passthrough URL's region are the same constant,
+# so they always agree; the proxy registers passthrough credentials per project+region.
+VERTEX_LOCATION = os.environ.get("VERTEXAI_LOCATION", "us-central1")
+
+
+@pytest.fixture(scope="session")
+def vertex_project() -> str:
+    """The Vertex project to bill, read from the same VERTEXAI_PROJECT the proxy uses.
+    Skip when unset, since that is an environment gap rather than a behavior failure."""
+    project = os.environ.get("VERTEXAI_PROJECT")
+    if not project:
+        pytest.skip("set VERTEXAI_PROJECT (the project the vertex deployment bills)")
+    return project
+
+
+@pytest.fixture(scope="session")
+def vertex_credentials() -> str:
+    """The service-account JSON the added deployment authenticates with, the same
+    VERTEXAI_CREDENTIALS the proxy holds. Skip when unset."""
+    credentials = os.environ.get("VERTEXAI_CREDENTIALS")
+    if not credentials:
+        pytest.skip("set VERTEXAI_CREDENTIALS (the vertex service-account JSON)")
+    return credentials
+
+
+class _VertexDeploymentParams(BaseModel):
+    model: str
+    vertex_project: str
+    vertex_location: str
+    vertex_credentials: str
+    use_in_pass_through: bool
+
+
+class _ModelInfoId(BaseModel):
+    id: str
+
+
+class _ModelNewBody(BaseModel):
+    model_name: str
+    litellm_params: _VertexDeploymentParams
+    model_info: _ModelInfoId
+
+
+class _ModelNewResponse(BaseModel):
+    model_id: str
+
+
+class _ModelDeleteBody(BaseModel):
+    id: str
+
+
+def _add_vertex_passthrough_model(
+    client: PassthroughClient, model_name: str, project: str, credentials: str
+) -> str:
+    return unwrap(
+        client.gateway.transport.post(
+            "/model/new",
+            headers=client.gateway.transport.master,
+            json=_ModelNewBody(
+                model_name=model_name,
+                litellm_params=_VertexDeploymentParams(
+                    model=f"vertex_ai/{VERTEX_MODEL}",
+                    vertex_project=project,
+                    vertex_location=VERTEX_LOCATION,
+                    vertex_credentials=credentials,
+                    use_in_pass_through=True,
+                ),
+                model_info=_ModelInfoId(id=model_name),
+            ),
+            response_type=_ModelNewResponse,
+        )
+    ).model_id
+
+
+def _delete_model(client: PassthroughClient, model_id: str) -> None:
+    _ = client.gateway.transport.post(
+        "/model/delete",
+        headers=client.gateway.transport.master,
+        json=_ModelDeleteBody(id=model_id),
+        response_type=NoBody,
+    )
+
+
+def _costed_row(client: PassthroughClient, call_id: str | None) -> SpendLogRow:
+    """The passthrough call's SpendLogs row, polled until it carries a cost.
+
+    A 2xx passthrough call that produced no costed row is a hard failure, not a skip:
+    a billed Vertex call that LiteLLM did not track is the exact regression #31689
+    guards against."""
+    assert call_id, "vertex passthrough response had no x-litellm-call-id header"
+    rows = client.gateway.poll_logs_for_request_id(
+        call_id,
+        predicate=lambda rs: (rs[0].spend or 0) > 0,
+    )
+    assert rows, f"no SpendLogs row for vertex passthrough call_id {call_id}"
+    row = rows[0]
+    assert row.call_type == "pass_through_endpoint", f"unexpected call_type: {row}"
+    assert (row.spend or 0) > 0, f"vertex passthrough call was not costed: {row}"
+    assert row.status == "success", f"unexpected status: {row}"
+    return row
+
+
+class TestVertexPassthroughSpendTracking:
+    def test_vertex_passthrough_via_managed_model_logs_cost(
+        self,
+        client: PassthroughClient,
+        scoped_key: str,
+        resources: ResourceManager,
+        vertex_project: str,
+        vertex_credentials: str,
+    ) -> None:
+        model_name = f"e2e-vertex-pt-{unique_marker()}"
+        model_id = _add_vertex_passthrough_model(client, model_name, vertex_project, vertex_credentials)
+        resources.defer(lambda: _delete_model(client, model_id))
+
+        result = client.vertex_generate(
+            key=scoped_key,
+            project=vertex_project,
+            location=VERTEX_LOCATION,
+            model=VERTEX_MODEL,
+            text=f"reply with one word {unique_marker()}",
+        )
+        require_successful_call(result)
+        assert '"candidates"' in result.body, f"vertex passthrough returned no candidates: {result.body[:300]}"
+
+        row = _costed_row(client, result.call_id)
+        assert row.custom_llm_provider == "vertex_ai", f"passthrough spend logged under the wrong provider: {row}"
+        assert "gemini" in (row.model or ""), f"unexpected model in spend log: {row}"

From b9df7fa7057a3dd9e63b97d0a301e218111aa9fe Mon Sep 17 00:00:00 2001
From: tin-berri <tin@berri.ai>
Date: Thu, 2 Jul 2026 18:05:32 -0700
Subject: [PATCH 11/26] fix(mcp): surface tools/list 401 auth failures as a
 challenge on single-server routes (#31921)

A 401 while listing tools (a missing or expired per-user OAuth token, or an
upstream 401 for any auth_type) was swallowed to an empty tool list, so a
single-server client got a 200 with no tools and no WWW-Authenticate challenge
instead of a 401 it could re-authenticate against. Only oauth pass-through and
delegate-to-upstream oauth2 servers surfaced it; every other auth_type, and the
missing-token case for all of them, masked it.

The surface-vs-absorb decision now keys on the route, not the auth_type. An
upstream 401 in _fetch_tools_with_timeout becomes an MCPUpstreamAuthError
regardless of auth_type, and the per-user OAuth challenge raised during client
creation (a bare HTTPException 401 carrying a WWW-Authenticate header) is
converted to the same type in _get_tools_from_server. The challenge is scoped
to 401: a 403 (authenticated but forbidden, e.g. insufficient scope) is not a
re-auth signal and degrades to an empty list like any other non-auth error, and
the stdio-allowlist 403 (no challenge header) stays absorbed. The existing
routing then does the right thing: single-server routes turn the error into a
401 + WWW-Authenticate, while the multi-server aggregator absorbs it to an empty
list so one unauthenticated server does not fail the whole listing.

On the UI tools page, an OBO (per-user authorization_code) server now shows the
Authorize gate when the list call returns 401, not only when no credential row
exists. The backend already refreshes a still-refreshable token on the list
call, so a 401 means there is no valid token and none could be minted (expired
with no usable refresh token), which is exactly when the user must reauthorize.
---
 .../mcp_server/mcp_server_manager.py          |  66 +++++----
 .../test_mcp_oauth_passthrough_tools.py       |  46 +++---
 .../mcp_server/test_mcp_server_manager.py     | 134 ++++++++++++++++++
 .../mcp_server/test_rest_endpoints.py         |  70 +++++++++
 .../components/mcp_tools/mcp_tools.test.tsx   |  19 +++
 .../src/components/mcp_tools/mcp_tools.tsx    |  19 ++-
 6 files changed, 292 insertions(+), 62 deletions(-)

diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index bf15ad2986f..ffd5b1e17f7 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -2130,7 +2130,7 @@ class MCPServerManager:
                     ]
                 return tools
             else:
-                tools = await self._fetch_tools_with_timeout(client, server.name, server=server)
+                tools = await self._fetch_tools_with_timeout(client, server.name)
                 self._remember_upstream_initialize_instructions(server, client)
 
             prefixed_or_original_tools = self._create_prefixed_tools(tools, server, add_prefix=add_prefix)
@@ -2142,6 +2142,17 @@ class MCPServerManager:
             # client triggers the upstream OAuth flow. The multi-server
             # aggregator catches this explicitly to keep absorbing.
             raise
+        except HTTPException as e:
+            headers = e.headers or {}
+            www_authenticate = headers.get("WWW-Authenticate") or headers.get("www-authenticate")
+            if e.status_code == 401 and www_authenticate is not None:
+                raise MCPUpstreamAuthError(
+                    status_code=401,
+                    www_authenticate=www_authenticate,
+                    server_name=server.name,
+                ) from e
+            verbose_logger.warning(f"Failed to get tools from server {server.name}: {str(e)}")
+            return []
         except Exception as e:
             verbose_logger.warning(f"Failed to get tools from server {server.name}: {str(e)}")
             return []
@@ -2692,7 +2703,6 @@ class MCPServerManager:
         self,
         client: MCPClient,
         server_name: str,
-        server: Optional[MCPServer] = None,
     ) -> List[MCPTool]:
         """
         Fetch tools from MCP client with timeout and error handling.
@@ -2700,38 +2710,27 @@ class MCPServerManager:
         Uses anyio.fail_after() instead of asyncio.wait_for() to avoid conflicts
         with the MCP SDK's anyio TaskGroup. See GitHub issue #20715 for details.
 
-        For OAuth pass-through and upstream-delegated OAuth2 MCP servers, an
-        upstream HTTP 401 is converted into :class:`MCPUpstreamAuthError`
-        instead of being swallowed to an empty tool list. That lets the
-        single-server HTTP routes surface a proper 401 + ``WWW-Authenticate``
-        challenge so standards-compliant MCP clients trigger the upstream
-        OAuth flow. Other servers keep today's swallow-and-log behaviour so
-        the multi-server ``/mcp`` aggregator doesn't get tainted by a single
-        bad server.
+        An upstream HTTP 401 is converted into :class:`MCPUpstreamAuthError`
+        instead of being swallowed to an empty tool list, regardless of the
+        server's auth_type. Callers route it by surface: the single-server HTTP
+        routes turn it into a 401 + ``WWW-Authenticate`` challenge so standards-
+        compliant MCP clients trigger the upstream OAuth flow, while the
+        multi-server ``/mcp`` aggregator absorbs it to an empty list so one
+        unauthenticated server doesn't fail the whole listing. Only a 401
+        (missing/invalid credential) drives the re-auth challenge; a 403
+        (authenticated but forbidden, e.g. insufficient scope) is not a re-auth
+        signal and, like other non-auth errors, returns an empty list.
 
         Args:
             client: MCP client instance
             server_name: Name of the server for logging
-            server: Optional MCPServer; when upstream auth is delegated, auth
-                errors are re-raised as :class:`MCPUpstreamAuthError`.
 
         Returns:
             List of tools from the server
         """
-        should_surface_upstream_auth = bool(
-            server is not None
-            and (
-                server.is_oauth_passthrough
-                or (
-                    server.auth_type == MCPAuth.oauth2
-                    and getattr(server, "delegate_auth_to_upstream", False) is True
-                    and not server.has_client_credentials
-                )
-            )
-        )
         try:
             with anyio.fail_after(MCP_TOOL_LISTING_TIMEOUT):
-                tools = await client.list_tools(raise_on_error=should_surface_upstream_auth)
+                tools = await client.list_tools(raise_on_error=True)
                 verbose_logger.debug(f"Tools from {server_name}: {tools}")
                 return tools
         except TimeoutError:
@@ -2744,16 +2743,15 @@ class MCPServerManager:
             verbose_logger.warning(f"Connection error while listing tools from {server_name}: {str(e)}")
             return []
         except Exception as e:
-            if should_surface_upstream_auth:
-                auth_info = _extract_upstream_auth_failure(e)
-                if auth_info is not None:
-                    status_code, www_authenticate = auth_info
-                    verbose_logger.info(f"Upstream auth failure from MCP server {server_name}: HTTP {status_code}")
-                    raise MCPUpstreamAuthError(
-                        status_code=status_code,
-                        www_authenticate=www_authenticate,
-                        server_name=server_name,
-                    ) from e
+            auth_info = _extract_upstream_auth_failure(e)
+            if auth_info is not None and auth_info[0] == 401:
+                _, www_authenticate = auth_info
+                verbose_logger.info(f"Upstream auth failure from MCP server {server_name}: HTTP 401")
+                raise MCPUpstreamAuthError(
+                    status_code=401,
+                    www_authenticate=www_authenticate,
+                    server_name=server_name,
+                ) from e
             verbose_logger.warning(f"Error listing tools from {server_name}: {str(e)}")
             return []
 
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py
index b836c3aef33..16c36af5156 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_oauth_passthrough_tools.py
@@ -76,9 +76,7 @@ async def test_fetch_tools_from_passthrough_raises_on_upstream_401():
     mock_client.list_tools = AsyncMock(side_effect=upstream_error)
 
     with pytest.raises(MCPUpstreamAuthError) as exc_info:
-        await manager._fetch_tools_with_timeout(
-            mock_client, passthrough_server.name, server=passthrough_server
-        )
+        await manager._fetch_tools_with_timeout(mock_client, passthrough_server.name)
 
     assert exc_info.value.status_code == 401
     assert exc_info.value.www_authenticate == (
@@ -113,9 +111,7 @@ async def test_fetch_tools_from_delegated_oauth2_raises_on_upstream_401():
     mock_client.list_tools = AsyncMock(side_effect=upstream_error)
 
     with pytest.raises(MCPUpstreamAuthError) as exc_info:
-        await manager._fetch_tools_with_timeout(
-            mock_client, delegated_server.name, server=delegated_server
-        )
+        await manager._fetch_tools_with_timeout(mock_client, delegated_server.name)
 
     assert exc_info.value.status_code == 401
     assert exc_info.value.www_authenticate == (
@@ -126,7 +122,10 @@ async def test_fetch_tools_from_delegated_oauth2_raises_on_upstream_401():
 
 
 @pytest.mark.asyncio
-async def test_fetch_tools_from_client_credentials_oauth2_keeps_swallow_behavior():
+async def test_fetch_tools_from_client_credentials_oauth2_surfaces_upstream_401():
+    """The auth_type carve-out was removed: a client_credentials (M2M) server now
+    surfaces an upstream 401 as MCPUpstreamAuthError too, instead of swallowing it
+    to an empty list, so single-server routes can return a 401 challenge."""
     manager = MCPServerManager()
     m2m_server = MCPServer(
         server_id="oauth-m2m",
@@ -150,12 +149,12 @@ async def test_fetch_tools_from_client_credentials_oauth2_keeps_swallow_behavior
     mock_client = MagicMock()
     mock_client.list_tools = AsyncMock(side_effect=upstream_error)
 
-    tools = await manager._fetch_tools_with_timeout(
-        mock_client, m2m_server.name, server=m2m_server
-    )
+    with pytest.raises(MCPUpstreamAuthError) as exc_info:
+        await manager._fetch_tools_with_timeout(mock_client, m2m_server.name)
 
-    assert tools == []
-    mock_client.list_tools.assert_awaited_with(raise_on_error=False)
+    assert exc_info.value.status_code == 401
+    assert exc_info.value.server_name == "m2m_docs"
+    mock_client.list_tools.assert_awaited_with(raise_on_error=True)
 
 
 @pytest.mark.asyncio
@@ -176,9 +175,7 @@ async def test_fetch_tools_from_passthrough_returns_tools_on_success():
     mock_client = MagicMock()
     mock_client.list_tools = AsyncMock(return_value=[tool])
 
-    tools = await manager._fetch_tools_with_timeout(
-        mock_client, passthrough_server.name, server=passthrough_server
-    )
+    tools = await manager._fetch_tools_with_timeout(mock_client, passthrough_server.name)
     assert tools == [tool]
 
 
@@ -238,8 +235,11 @@ def test_to_http_exception_skips_challenge_for_non_401_status():
 
 
 @pytest.mark.asyncio
-async def test_fetch_tools_from_gateway_managed_swallows_errors():
-    """Regression guard: non-pass-through servers keep returning [] on errors."""
+async def test_fetch_tools_from_gateway_managed_surfaces_upstream_401():
+    """An oauth2 server that is neither pass-through nor delegate now surfaces an
+    upstream 401 as MCPUpstreamAuthError as well; the auth_type carve-out that
+    swallowed it to [] was removed. A missing upstream WWW-Authenticate is carried
+    through as None (the single-server route fabricates one from the gateway URL)."""
     manager = MCPServerManager()
     oauth2_server = MCPServer(
         server_id="o1",
@@ -260,11 +260,13 @@ async def test_fetch_tools_from_gateway_managed_swallows_errors():
     mock_client = MagicMock()
     mock_client.list_tools = AsyncMock(side_effect=upstream_error)
 
-    tools = await manager._fetch_tools_with_timeout(
-        mock_client, oauth2_server.name, server=oauth2_server
-    )
-    assert tools == []
-    mock_client.list_tools.assert_awaited_with(raise_on_error=False)
+    with pytest.raises(MCPUpstreamAuthError) as exc_info:
+        await manager._fetch_tools_with_timeout(mock_client, oauth2_server.name)
+
+    assert exc_info.value.status_code == 401
+    assert exc_info.value.www_authenticate is None
+    assert exc_info.value.server_name == "keycloak_whoami"
+    mock_client.list_tools.assert_awaited_with(raise_on_error=True)
 
 
 def _http_server(server_id: str, name: str, **kwargs) -> MCPServer:
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
index c258ed1035f..b7a7917eac1 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
@@ -5228,5 +5228,139 @@ class TestCreateMcpClientV2Graft:
         assert client._get_auth_headers()["Authorization"] == "Bearer hook-jwt"
 
 
+def _upstream_status_error(status_code: int, challenge: str) -> httpx.HTTPStatusError:
+    request = httpx.Request("POST", "https://upstream.example/mcp")
+    response = httpx.Response(
+        status_code,
+        headers={"WWW-Authenticate": challenge},
+        request=request,
+    )
+    return httpx.HTTPStatusError(
+        "upstream rejected token", request=request, response=response
+    )
+
+
+class TestMCPToolsListAuthSurfacing:
+    """Regression: MCP tools/list 401 auth failures must surface as MCPUpstreamAuthError.
+
+    Previously a missing/expired per-user OAuth token, or an upstream 401 for any
+    non-carveout auth_type, was swallowed to an empty tool list, so a single-server
+    client saw a 200 with no tools instead of a 401 challenge. The listing helpers
+    now raise MCPUpstreamAuthError on a 401 regardless of auth_type; the single-server
+    routes turn it into a 401 + WWW-Authenticate while the aggregator absorbs it to an
+    empty list. Only a 401 challenges; a 403 (forbidden) degrades like any other error.
+    """
+
+    @pytest.mark.asyncio
+    async def test_fetch_tools_with_timeout_surfaces_upstream_401(self):
+        from litellm.proxy._experimental.mcp_server.exceptions import (
+            MCPUpstreamAuthError,
+        )
+
+        manager = MCPServerManager()
+        challenge = 'Bearer resource_metadata="https://upstream.example/.well-known/oauth-protected-resource"'
+        client = MagicMock()
+        client.list_tools = AsyncMock(side_effect=_upstream_status_error(401, challenge))
+
+        with pytest.raises(MCPUpstreamAuthError) as exc_info:
+            await manager._fetch_tools_with_timeout(client, "static-key-server")
+
+        assert exc_info.value.status_code == 401
+        assert exc_info.value.www_authenticate == challenge
+        assert exc_info.value.server_name == "static-key-server"
+
+    @pytest.mark.asyncio
+    async def test_fetch_tools_with_timeout_absorbs_upstream_403(self):
+        """Only a 401 drives the re-auth challenge. A 403 (authenticated but
+        forbidden, e.g. insufficient scope) is not a re-auth signal, so even
+        with a WWW-Authenticate header it degrades to an empty list rather than
+        surfacing a challenge."""
+        manager = MCPServerManager()
+        challenge = 'Bearer error="insufficient_scope", scope="read:tools"'
+        client = MagicMock()
+        client.list_tools = AsyncMock(side_effect=_upstream_status_error(403, challenge))
+
+        assert await manager._fetch_tools_with_timeout(client, "forbidden-server") == []
+
+    @pytest.mark.asyncio
+    async def test_fetch_tools_with_timeout_returns_empty_on_non_auth_error(self):
+        manager = MCPServerManager()
+        client = MagicMock()
+        client.list_tools = AsyncMock(side_effect=RuntimeError("upstream 500"))
+
+        assert await manager._fetch_tools_with_timeout(client, "srv") == []
+
+    @pytest.mark.asyncio
+    async def test_get_tools_from_server_surfaces_unusable_user_token(self):
+        from litellm.proxy._experimental.mcp_server.exceptions import (
+            MCPUpstreamAuthError,
+        )
+
+        manager = MCPServerManager()
+        server = MCPServer(
+            server_id="oauth-srv", name="oauth-srv", transport=MCPTransport.http
+        )
+        challenge = 'Bearer resource_metadata="/.well-known/oauth-protected-resource/mcp/oauth-srv"'
+        manager._create_mcp_client = AsyncMock(
+            side_effect=HTTPException(
+                status_code=401,
+                detail="Unauthorized",
+                headers={"WWW-Authenticate": challenge},
+            )
+        )
+
+        with pytest.raises(MCPUpstreamAuthError) as exc_info:
+            await manager._get_tools_from_server(server)
+
+        assert exc_info.value.status_code == 401
+        assert exc_info.value.www_authenticate == challenge
+        assert exc_info.value.server_name == "oauth-srv"
+
+    @pytest.mark.asyncio
+    async def test_get_tools_from_server_absorbs_non_challenge_http_error(self):
+        manager = MCPServerManager()
+        server = MCPServer(
+            server_id="stdio-srv", name="stdio-srv", transport=MCPTransport.http
+        )
+        manager._create_mcp_client = AsyncMock(
+            side_effect=HTTPException(
+                status_code=403,
+                detail="MCP stdio command 'foo' is not in the allowlist",
+            )
+        )
+
+        assert await manager._get_tools_from_server(server) == []
+
+    @pytest.mark.asyncio
+    async def test_aggregate_list_tools_absorbs_unauthenticated_server(self):
+        from litellm.proxy._experimental.mcp_server.exceptions import (
+            MCPUpstreamAuthError,
+        )
+
+        manager = MCPServerManager()
+        good = MCPServer(server_id="good", name="good", transport=MCPTransport.http)
+        bad = MCPServer(server_id="bad", name="bad", transport=MCPTransport.http)
+        manager.get_allowed_mcp_servers = AsyncMock(return_value=["good", "bad"])
+        manager.get_mcp_server_by_id = MagicMock(
+            side_effect=lambda server_id: {"good": good, "bad": bad}.get(server_id)
+        )
+        good_tool = MCPTool(name="good-do_thing", description="do thing", inputSchema={})
+
+        async def fake_get_tools(server, **kwargs):
+            if server.server_id == "bad":
+                raise MCPUpstreamAuthError(
+                    status_code=401,
+                    www_authenticate='Bearer realm="x"',
+                    server_name="bad",
+                )
+            return [good_tool]
+
+        manager._get_tools_from_server = fake_get_tools
+
+        result = await manager.list_tools()
+
+        assert [t.name for t in result] == ["good-do_thing"]
+
+
 if __name__ == "__main__":
     pytest.main([__file__])
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_rest_endpoints.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_rest_endpoints.py
index 46a51f8fe61..fb4eee54e1d 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_rest_endpoints.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_rest_endpoints.py
@@ -843,6 +843,76 @@ class TestListToolsRestAPI:
         assert exc_info.value.status_code == upstream_status
         assert exc_info.value.headers == {"www-authenticate": challenge}
 
+    async def test_aggregate_list_absorbs_one_server_auth_failure(self, monkeypatch):
+        """The multi-server aggregate listing degrades a server whose upstream
+        rejects auth to an empty contribution and still returns the healthy
+        server's tools with a 200, rather than surfacing a 401."""
+        from litellm.proxy._experimental.mcp_server.exceptions import (
+            MCPUpstreamAuthError,
+        )
+
+        class StubServer:
+            def __init__(self, name):
+                self.alias = name
+                self.server_name = name
+                self.name = name
+                self.allowed_tools = None
+                self.mcp_info = {"server_name": name}
+                self.available_on_public_internet = True
+
+        good = StubServer("good")
+        bad = StubServer("bad")
+
+        async def fake_contexts(user_api_key_auth):
+            return [user_api_key_auth]
+
+        async def fake_get_allowed_mcp_servers(*args, **kwargs):
+            return ["good", "bad"]
+
+        async def fake_get_tools(server, *args, **kwargs):
+            if server.server_name == "bad":
+                raise MCPUpstreamAuthError(
+                    status_code=401,
+                    www_authenticate='Bearer realm="x"',
+                    server_name="bad",
+                )
+            return ["good-tool"]
+
+        monkeypatch.setattr(
+            rest_endpoints,
+            "build_effective_auth_contexts",
+            fake_contexts,
+            raising=False,
+        )
+        monkeypatch.setattr(
+            rest_endpoints.global_mcp_server_manager,
+            "get_allowed_mcp_servers",
+            fake_get_allowed_mcp_servers,
+            raising=False,
+        )
+        monkeypatch.setattr(
+            rest_endpoints.global_mcp_server_manager,
+            "get_mcp_server_by_id",
+            lambda server_id: {"good": good, "bad": bad}.get(server_id),
+            raising=False,
+        )
+        monkeypatch.setattr(
+            rest_endpoints,
+            "_get_tools_for_single_server",
+            fake_get_tools,
+            raising=False,
+        )
+
+        request = _build_request(path="/mcp-rest/tools/list", method="GET")
+        result = await rest_endpoints.list_tool_rest_api(
+            request,
+            server_id=None,
+            user_api_key_dict=UserAPIKeyAuth(),
+        )
+
+        assert result["tools"] == ["good-tool"]
+        assert result["error"] is None
+
     async def test_name_resolution_finds_server_by_uuid(self, monkeypatch):
         """When server_id is a name string, it should be resolved to its UUID
         and used for the tools lookup when the UUID is in allowed_server_ids."""
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.test.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.test.tsx
index 72ed3984244..3346bc342f3 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.test.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.test.tsx
@@ -131,6 +131,25 @@ describe("MCPToolsViewer auth gate routing", () => {
     expect(screen.queryByText(GATE_TEXT)).not.toBeInTheDocument();
   });
 
+  it("gates an OBO server whose stored token is expired and the list call 401s (refresh could not mint a token)", async () => {
+    // has_credential=true but the list call 401s: the server-side refresh could not
+    // produce a valid token (e.g. expired with no usable refresh token), so the user
+    // must reauthorize instead of seeing a dead empty list.
+    vi.mocked(getMCPOAuthUserCredentialStatus).mockResolvedValue(
+      credStatus({ has_credential: true, is_expired: true }),
+    );
+    vi.mocked(listMCPTools).mockResolvedValue({
+      tools: [],
+      error: "unauthorized",
+      status: 401,
+    } as unknown as Awaited<ReturnType<typeof listMCPTools>>);
+
+    renderViewer({ oauth2_flow: null, delegate_auth_to_upstream: false });
+
+    expect(await screen.findByText(GATE_TEXT)).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Authorize" })).toBeInTheDocument();
+  });
+
   it("does not gate an M2M server; lists with the LiteLLM key", async () => {
     renderViewer({ oauth2_flow: "client_credentials", delegate_auth_to_upstream: false });
 
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx
index 0a32bd11a45..54e40fd7ed4 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx
@@ -238,9 +238,14 @@ const MCPToolsViewer = ({
 
   const toolsData = mcpToolsResponse?.tools || [];
 
+  const oboToolsError = mcpToolsError as (Error & { status?: number; response?: { status?: number } }) | null;
+  const oboTokenRejected = isObo && (oboToolsError?.status ?? oboToolsError?.response?.status) === 401;
+
   // An auth gate replaces the tool list when the user must authenticate first:
-  // passthrough needs a browser token, OBO needs a stored DB credential.
-  const authGateActive = (isPassthrough && !oauthToken) || oboNeedsAuth;
+  // passthrough needs a browser token; OBO needs a stored DB credential or a
+  // still-valid one — a 401 from the list call means the backend has none even
+  // after attempting a refresh, so re-authorization is required.
+  const authGateActive = (isPassthrough && !oauthToken) || oboNeedsAuth || oboTokenRejected;
   // Treat OBO credential-status loading as "tools loading" so the empty state
   // doesn't flash before we know whether the user needs to authorize.
   const toolsAreaLoading = isLoadingTools || oboStatusLoading;
@@ -364,10 +369,12 @@ const MCPToolsViewer = ({
                   </div>
                 )}
 
-                {/* OBO auth gate — only when no credential row exists for this user.
-                    An existing-but-expired token is refreshed server-side on the
-                    list call, so the gate never appears for a stored credential. */}
-                {oboNeedsAuth && (
+                {/* OBO auth gate — shown when there is no credential row for this
+                    user, or when the list call returns 401 (no valid token and the
+                    server-side refresh could not mint one, e.g. an expired token
+                    with no usable refresh token). A refreshable token is refreshed
+                    on the list call and never trips this gate. */}
+                {(oboNeedsAuth || oboTokenRejected) && (
                   <div className="p-4 text-center bg-white border border-gray-200 rounded-lg">
                     <LockOutlined className="text-2xl text-gray-400 mb-2" />
                     <p className="text-xs font-medium text-gray-700 mb-1">Authentication required</p>

From 8bb4e624126bd02dbc5190cdc40e520ba93502c9 Mon Sep 17 00:00:00 2001
From: Mateo Wang <277851410+mateo-berri@users.noreply.github.com>
Date: Thu, 2 Jul 2026 18:31:59 -0700
Subject: [PATCH 12/26] feat(tencent): add Tencent TokenHub as a provider
 (#31903)

* feat(tencent): add Tencent TokenHub as a provider

Tencent TokenHub is OpenAI- and Anthropic-compatible. This registers it as a
new provider: TencentChatConfig routes /v1/chat/completions and gates the
thinking/reasoning_effort params behind supports_reasoning, and
TencentAnthropicMessagesConfig routes the Anthropic-compatible Messages API.
Adds cost tracking, the deepseek-v4-pro/flash model entries, and provider
endpoint support metadata.

* test(tencent): add unit tests for Tencent TokenHub provider

Covers TencentChatConfig (chat completions) and TencentAnthropicMessagesConfig
(messages API) across transformation, param mapping, URL building, and header
validation, plus get_optional_params routing. Tests mock supports_reasoning to
stay independent of remote model cost data.

* fix(tencent): correct max_output_tokens and reuse parent messages env validation

Raise max_output_tokens/max_tokens for tencent/deepseek-v4-pro and tencent/deepseek-v4-flash from 8192 to 384000, matching Tencent TokenHub's published DeepSeek-V4 output limit; the 8192 value mirrored the native DeepSeek default and would have rejected valid larger requests before they reached Tencent

Delegate validate_anthropic_messages_environment to the parent via super() so the Tencent messages endpoint keeps content-type and anthropic-beta header injection instead of dropping them, keeping only the TENCENT_API_KEY resolution overridden

Add regression tests covering beta-header injection, the cost-calculator delegation, provider-info secret resolution, and validate_environment key handling

* fix(tencent): normalize messages URL when TENCENT_API_BASE has chat completions suffix

* fix(tencent): register tencent in models_by_provider

The provider was added to the LlmProviders enum and cost map but not to the
models_by_provider lookup, so test_models_by_provider (which asserts every
litellm_provider present in the cost map is registered) failed once the tencent
models were loaded. Add the tencent_models set, populate it from the cost map,
and expose it under the tencent key, mirroring deepseek.

* fix(tencent): import generic_cost_per_token from its canonical module

Import generic_cost_per_token from litellm.litellm_core_utils.llm_cost_calc.utils
instead of the top-level litellm.cost_calculator dispatcher, which imports the
tencent cost module at load time. Removing the back-reference avoids the circular
import and matches how deepseek and the other providers source the helper.

---------

Co-authored-by: Felipe Rodrigues Gare Carnielli <felipe.gare@hotmail.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
---
 litellm/__init__.py                           |   8 +
 litellm/_lazy_imports_registry.py             |   2 +
 litellm/constants.py                          |   2 +
 litellm/cost_calculator.py                    |   5 +
 .../get_llm_provider_logic.py                 |   4 +
 .../get_supported_openai_params.py            |   2 +
 litellm/llms/tencent/__init__.py              |   0
 litellm/llms/tencent/chat/__init__.py         |   0
 litellm/llms/tencent/chat/transformation.py   |  68 ++++++
 litellm/llms/tencent/cost_calculator.py       |   6 +
 litellm/llms/tencent/messages/__init__.py     |   0
 .../llms/tencent/messages/transformation.py   |  85 +++++++
 ...odel_prices_and_context_window_backup.json |  52 +++++
 litellm/types/utils.py                        |   1 +
 litellm/utils.py                              |  19 ++
 model_prices_and_context_window.json          |  52 +++++
 provider_endpoints_support.json               |  18 ++
 tests/test_litellm/llms/tencent/__init__.py   |   0
 .../llms/tencent/chat/__init__.py             |   0
 .../chat/test_tencent_chat_transformation.py  | 207 ++++++++++++++++++
 .../llms/tencent/messages/__init__.py         |   0
 ...ncent_anthropic_messages_transformation.py | 173 +++++++++++++++
 .../llms/tencent/test_cost_calculator.py      |  41 ++++
 tests/test_litellm/test_utils.py              |  92 ++++++++
 24 files changed, 837 insertions(+)
 create mode 100644 litellm/llms/tencent/__init__.py
 create mode 100644 litellm/llms/tencent/chat/__init__.py
 create mode 100644 litellm/llms/tencent/chat/transformation.py
 create mode 100644 litellm/llms/tencent/cost_calculator.py
 create mode 100644 litellm/llms/tencent/messages/__init__.py
 create mode 100644 litellm/llms/tencent/messages/transformation.py
 create mode 100644 tests/test_litellm/llms/tencent/__init__.py
 create mode 100644 tests/test_litellm/llms/tencent/chat/__init__.py
 create mode 100644 tests/test_litellm/llms/tencent/chat/test_tencent_chat_transformation.py
 create mode 100644 tests/test_litellm/llms/tencent/messages/__init__.py
 create mode 100644 tests/test_litellm/llms/tencent/messages/test_tencent_anthropic_messages_transformation.py
 create mode 100644 tests/test_litellm/llms/tencent/test_cost_calculator.py

diff --git a/litellm/__init__.py b/litellm/__init__.py
index 9327e121b1d..2ec0830d622 100644
--- a/litellm/__init__.py
+++ b/litellm/__init__.py
@@ -588,6 +588,7 @@ gemini_models: Set = set()
 xai_models: Set = set()
 zai_models: Set = set()
 deepseek_models: Set = set()
+tencent_models: Set = set()
 runwayml_models: Set = set()
 azure_ai_models: Set = set()
 jina_ai_models: Set = set()
@@ -801,6 +802,8 @@ def add_known_models(model_cost_map: Optional[Dict] = None):
             fal_ai_models.add(key)
         elif value.get("litellm_provider") == "deepseek":
             deepseek_models.add(key)
+        elif value.get("litellm_provider") == "tencent":
+            tencent_models.add(key)
         elif value.get("litellm_provider") == "runwayml":
             runwayml_models.add(key)
         elif value.get("litellm_provider") == "meta_llama":
@@ -1093,6 +1096,7 @@ models_by_provider: dict = {
     "zai": zai_models,
     "fal_ai": fal_ai_models,
     "deepseek": deepseek_models,
+    "tencent": tencent_models,
     "runwayml": runwayml_models,
     "mistral": mistral_chat_models,
     "azure_ai": azure_ai_models,
@@ -1804,6 +1808,9 @@ if TYPE_CHECKING:
     from .llms.deepseek.chat.transformation import (
         DeepSeekChatConfig as _DeepSeekChatConfig,
     )
+    from .llms.tencent.chat.transformation import (
+        TencentChatConfig as _TencentChatConfig,
+    )
     from .llms.sap.chat.transformation import (
         GenAIHubOrchestrationConfig as _GenAIHubOrchestrationConfig,
     )
@@ -1846,6 +1853,7 @@ if TYPE_CHECKING:
     # Type stubs for lazy-loaded config classes (to help mypy understand types)
     VLLMConfig: Type[_VLLMConfig]
     DeepSeekChatConfig: Type[_DeepSeekChatConfig]
+    TencentChatConfig: Type[_TencentChatConfig]
     GenAIHubOrchestrationConfig: Type[_GenAIHubOrchestrationConfig]
     GenAIHubEmbeddingConfig: Type[_GenAIHubEmbeddingConfig]
     AzureOpenAIO1Config: Type[_AzureOpenAIO1Config]
diff --git a/litellm/_lazy_imports_registry.py b/litellm/_lazy_imports_registry.py
index 0f9d3a560d1..488331e3895 100644
--- a/litellm/_lazy_imports_registry.py
+++ b/litellm/_lazy_imports_registry.py
@@ -284,6 +284,7 @@ LLM_CONFIG_NAMES = (
     "LiteLLMProxyChatConfig",
     "VLLMConfig",
     "DeepSeekChatConfig",
+    "TencentChatConfig",
     "LMStudioChatConfig",
     "LmStudioEmbeddingConfig",
     "NscaleConfig",
@@ -1096,6 +1097,7 @@ _LLM_CONFIGS_IMPORT_MAP = {
     ),
     "VLLMConfig": (".llms.vllm.completion.transformation", "VLLMConfig"),
     "DeepSeekChatConfig": (".llms.deepseek.chat.transformation", "DeepSeekChatConfig"),
+    "TencentChatConfig": (".llms.tencent.chat.transformation", "TencentChatConfig"),
     "LMStudioChatConfig": (".llms.lm_studio.chat.transformation", "LMStudioChatConfig"),
     "LmStudioEmbeddingConfig": (
         ".llms.lm_studio.embed.transformation",
diff --git a/litellm/constants.py b/litellm/constants.py
index 6eb2779dcae..1300668cc70 100644
--- a/litellm/constants.py
+++ b/litellm/constants.py
@@ -508,6 +508,7 @@ LITELLM_CHAT_PROVIDERS = [
     "text-completion-codestral",
     "text-completion-inception",
     "deepseek",
+    "tencent",
     "sambanova",
     "maritalk",
     "cloudflare",
@@ -729,6 +730,7 @@ openai_compatible_providers: List = [
     "volcengine",
     "codestral",
     "deepseek",
+    "tencent",
     "deepinfra",
     "perplexity",
     "xinference",
diff --git a/litellm/cost_calculator.py b/litellm/cost_calculator.py
index e8535a570c8..8f4dd5badce 100644
--- a/litellm/cost_calculator.py
+++ b/litellm/cost_calculator.py
@@ -52,6 +52,9 @@ from litellm.llms.databricks.cost_calculator import (
 from litellm.llms.deepseek.cost_calculator import (
     cost_per_token as deepseek_cost_per_token,
 )
+from litellm.llms.tencent.cost_calculator import (
+    cost_per_token as tencent_cost_per_token,
+)
 from litellm.llms.fireworks_ai.cost_calculator import (
     cost_per_token as fireworks_ai_cost_per_token,
 )
@@ -625,6 +628,8 @@ def cost_per_token(
         return gemini_cost_per_token(model=model, usage=usage_block, service_tier=service_tier)
     elif custom_llm_provider == "deepseek":
         return deepseek_cost_per_token(model=model, usage=usage_block)
+    elif custom_llm_provider == "tencent":
+        return tencent_cost_per_token(model=model, usage=usage_block)
     elif custom_llm_provider == "perplexity":
         return perplexity_cost_per_token(model=model, usage=usage_block)
     elif custom_llm_provider == "xai":
diff --git a/litellm/litellm_core_utils/get_llm_provider_logic.py b/litellm/litellm_core_utils/get_llm_provider_logic.py
index a7a576ff167..61a73201c43 100644
--- a/litellm/litellm_core_utils/get_llm_provider_logic.py
+++ b/litellm/litellm_core_utils/get_llm_provider_logic.py
@@ -652,6 +652,10 @@ def _get_openai_compatible_provider_info(
         api_base = api_base or get_secret("DEEPSEEK_API_BASE") or "https://api.deepseek.com/beta"  # type: ignore
 
         dynamic_api_key = api_key or get_secret_str("DEEPSEEK_API_KEY")
+    elif custom_llm_provider == "tencent":
+        api_base = api_base or get_secret("TENCENT_API_BASE") or "https://tokenhub-intl.tencentcloudmaas.com/v1"
+
+        dynamic_api_key = api_key or get_secret_str("TENCENT_API_KEY")
     elif custom_llm_provider == "fireworks_ai":
         # fireworks is openai compatible, we just need to set this to custom_openai and have the api_base be https://api.fireworks.ai/inference/v1
         (
diff --git a/litellm/litellm_core_utils/get_supported_openai_params.py b/litellm/litellm_core_utils/get_supported_openai_params.py
index c4ddb4b7ee0..19149da0316 100644
--- a/litellm/litellm_core_utils/get_supported_openai_params.py
+++ b/litellm/litellm_core_utils/get_supported_openai_params.py
@@ -106,6 +106,8 @@ def get_supported_openai_params(
         return litellm.VLLMConfig().get_supported_openai_params(model=model)
     elif custom_llm_provider == "deepseek":
         return litellm.DeepSeekChatConfig().get_supported_openai_params(model=model)
+    elif custom_llm_provider == "tencent":
+        return litellm.TencentChatConfig().get_supported_openai_params(model=model)
     elif custom_llm_provider == "cohere_chat" or custom_llm_provider == "cohere":
         return litellm.CohereChatConfig().get_supported_openai_params(model=model)
     elif custom_llm_provider == "maritalk":
diff --git a/litellm/llms/tencent/__init__.py b/litellm/llms/tencent/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/litellm/llms/tencent/chat/__init__.py b/litellm/llms/tencent/chat/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/litellm/llms/tencent/chat/transformation.py b/litellm/llms/tencent/chat/transformation.py
new file mode 100644
index 00000000000..4dea0c4b8c7
--- /dev/null
+++ b/litellm/llms/tencent/chat/transformation.py
@@ -0,0 +1,68 @@
+"""
+Translates from OpenAI's `/v1/chat/completions` to Tencent TokenHub's
+OpenAI-compatible endpoint.
+"""
+
+from typing import Optional
+
+from litellm.secret_managers.main import get_secret_str
+from litellm.utils import supports_reasoning
+
+from ...openai.chat.gpt_transformation import OpenAIGPTConfig
+
+
+class TencentChatConfig(OpenAIGPTConfig):
+    def get_supported_openai_params(self, model: str) -> list:
+        params = super().get_supported_openai_params(model)
+        if supports_reasoning(model, custom_llm_provider="tencent"):
+            params.extend(["thinking", "reasoning_effort"])
+        return params
+
+    def map_openai_params(
+        self,
+        non_default_params: dict,
+        optional_params: dict,
+        model: str,
+        drop_params: bool,
+    ) -> dict:
+        optional_params = super().map_openai_params(non_default_params, optional_params, model, drop_params)
+
+        thinking_value = optional_params.pop("thinking", None)
+        reasoning_effort = optional_params.pop("reasoning_effort", None)
+
+        if thinking_value is not None:
+            if isinstance(thinking_value, dict):
+                optional_params["thinking"] = thinking_value
+        elif reasoning_effort is not None and reasoning_effort != "none":
+            optional_params["thinking"] = {"type": "enabled"}
+
+        return optional_params
+
+    def _get_openai_compatible_provider_info(
+        self, api_base: Optional[str], api_key: Optional[str]
+    ) -> tuple[Optional[str], Optional[str]]:
+        api_base = api_base or get_secret_str("TENCENT_API_BASE") or "https://tokenhub-intl.tencentcloudmaas.com/v1"
+        dynamic_api_key = api_key or get_secret_str("TENCENT_API_KEY")
+        return api_base, dynamic_api_key
+
+    def get_complete_url(
+        self,
+        api_base: Optional[str],
+        api_key: Optional[str],
+        model: str,
+        optional_params: dict,
+        litellm_params: dict,
+        stream: Optional[bool] = None,
+    ) -> str:
+        if not api_base:
+            api_base = "https://tokenhub-intl.tencentcloudmaas.com/v1"
+
+        api_base = api_base.rstrip("/")
+
+        if api_base.endswith("/chat/completions"):
+            return api_base
+
+        if not api_base.endswith("/v1"):
+            api_base = f"{api_base}/v1"
+
+        return f"{api_base}/chat/completions"
diff --git a/litellm/llms/tencent/cost_calculator.py b/litellm/llms/tencent/cost_calculator.py
new file mode 100644
index 00000000000..d9aebdc3284
--- /dev/null
+++ b/litellm/llms/tencent/cost_calculator.py
@@ -0,0 +1,6 @@
+from litellm.litellm_core_utils.llm_cost_calc.utils import generic_cost_per_token
+from litellm.types.utils import Usage
+
+
+def cost_per_token(model: str, usage: Usage) -> tuple[float, float]:
+    return generic_cost_per_token(model=model, usage=usage, custom_llm_provider="tencent")
diff --git a/litellm/llms/tencent/messages/__init__.py b/litellm/llms/tencent/messages/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/litellm/llms/tencent/messages/transformation.py b/litellm/llms/tencent/messages/transformation.py
new file mode 100644
index 00000000000..e0f13aa9ca4
--- /dev/null
+++ b/litellm/llms/tencent/messages/transformation.py
@@ -0,0 +1,85 @@
+"""
+Tencent Anthropic-compatible messages transformation config.
+
+Tencent TokenHub exposes an Anthropic-compatible Messages API endpoint
+alongside its standard OpenAI-compatible chat completions endpoint.
+"""
+
+from typing import Any, Optional
+
+import litellm
+from litellm.llms.anthropic.experimental_pass_through.messages.transformation import (
+    AnthropicMessagesConfig,
+)
+from litellm.secret_managers.main import get_secret_str
+
+
+class TencentAnthropicMessagesConfig(AnthropicMessagesConfig):
+    """
+    Tencent TokenHub exposes an Anthropic-compatible Messages API.
+
+    Unlike the chat completions endpoint (which uses /v1), the Anthropic
+    endpoint may use a different base URL. Configure via
+    TENCENT_ANTHROPIC_API_BASE or TENCENT_API_BASE.
+    """
+
+    @property
+    def custom_llm_provider(self) -> Optional[str]:
+        return "tencent"
+
+    def should_strip_billing_metadata(self) -> bool:
+        return True
+
+    @staticmethod
+    def get_api_key(api_key: Optional[str] = None) -> Optional[str]:
+        return api_key or get_secret_str("TENCENT_API_KEY") or litellm.api_key
+
+    @staticmethod
+    def get_api_base(api_base: Optional[str] = None) -> str:
+        return (
+            api_base
+            or get_secret_str("TENCENT_ANTHROPIC_API_BASE")
+            or get_secret_str("TENCENT_API_BASE")
+            or "https://tokenhub-intl.tencentcloudmaas.com"
+        )
+
+    def validate_anthropic_messages_environment(
+        self,
+        headers: dict,
+        model: str,
+        messages: list[Any],
+        optional_params: dict,
+        litellm_params: dict,
+        api_key: Optional[str] = None,
+        api_base: Optional[str] = None,
+    ) -> tuple[dict, Optional[str]]:
+        return super().validate_anthropic_messages_environment(
+            headers=headers,
+            model=model,
+            messages=messages,
+            optional_params=optional_params,
+            litellm_params=litellm_params,
+            api_key=self.get_api_key(api_key=api_key),
+            api_base=api_base,
+        )
+
+    def get_complete_url(
+        self,
+        api_base: Optional[str],
+        api_key: Optional[str],
+        model: str,
+        optional_params: dict,
+        litellm_params: dict,
+        stream: Optional[bool] = None,
+    ) -> str:
+        base_url = self.get_api_base(api_base=api_base).rstrip("/")
+
+        if base_url.endswith("/v1/messages"):
+            return base_url
+
+        if base_url.endswith("/v1/chat/completions"):
+            base_url = base_url[: -len("/v1/chat/completions")]
+        elif base_url.endswith("/v1"):
+            base_url = base_url[: -len("/v1")]
+
+        return f"{base_url}/v1/messages"
diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index a4cca8d6cb0..26d54c05ffb 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -43675,6 +43675,58 @@
         "supports_tool_choice": true,
         "supports_vision": false
     },
+    "tencent/deepseek-v4-pro": {
+        "cache_creation_input_token_cost": 0.0,
+        "cache_read_input_token_cost": 3.625e-09,
+        "input_cost_per_token": 4.35e-07,
+        "input_cost_per_token_cache_hit": 3.625e-09,
+        "litellm_provider": "tencent",
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 384000,
+        "max_tokens": 384000,
+        "mode": "chat",
+        "output_cost_per_token": 8.7e-07,
+        "source": "https://www.tencentcloud.com/products/tokenhub",
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
+        "supports_assistant_prefill": true,
+        "supports_function_calling": true,
+        "supports_native_streaming": true,
+        "supports_parallel_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_response_schema": true,
+        "supports_system_messages": true,
+        "supports_tool_choice": true,
+        "supports_reasoning": true,
+        "supports_vision": false
+    },
+    "tencent/deepseek-v4-flash": {
+        "cache_creation_input_token_cost": 0.0,
+        "cache_read_input_token_cost": 2.8e-09,
+        "input_cost_per_token": 1.4e-07,
+        "input_cost_per_token_cache_hit": 2.8e-09,
+        "litellm_provider": "tencent",
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 384000,
+        "max_tokens": 384000,
+        "mode": "chat",
+        "output_cost_per_token": 2.8e-07,
+        "source": "https://www.tencentcloud.com/products/tokenhub",
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
+        "supports_assistant_prefill": true,
+        "supports_function_calling": true,
+        "supports_native_streaming": true,
+        "supports_parallel_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_response_schema": true,
+        "supports_system_messages": true,
+        "supports_tool_choice": true,
+        "supports_reasoning": true,
+        "supports_vision": false
+    },
     "pinstripes/ps/glm-4.5-air": {
         "max_tokens": 128000,
         "max_input_tokens": 128000,
diff --git a/litellm/types/utils.py b/litellm/types/utils.py
index 997498803ac..2e0eceaddd9 100644
--- a/litellm/types/utils.py
+++ b/litellm/types/utils.py
@@ -3311,6 +3311,7 @@ class LlmProviders(str, Enum):
     CUSTOM = "custom"
     LITELLM_PROXY = "litellm_proxy"
     HOSTED_VLLM = "hosted_vllm"
+    TENCENT = "tencent"
     LLAMAFILE = "llamafile"
     LM_STUDIO = "lm_studio"
     GALADRIEL = "galadriel"
diff --git a/litellm/utils.py b/litellm/utils.py
index b5f77d75b93..83d129339a4 100644
--- a/litellm/utils.py
+++ b/litellm/utils.py
@@ -4204,6 +4204,13 @@ def get_optional_params(
             model=model,
             drop_params=(drop_params if drop_params is not None and isinstance(drop_params, bool) else False),
         )
+    elif custom_llm_provider == "tencent":
+        optional_params = litellm.TencentChatConfig().map_openai_params(
+            non_default_params=non_default_params,
+            optional_params=optional_params,
+            model=model,
+            drop_params=(drop_params if drop_params is not None and isinstance(drop_params, bool) else False),
+        )
     elif custom_llm_provider == "openrouter":
         optional_params = litellm.OpenrouterConfig().map_openai_params(
             non_default_params=non_default_params,
@@ -6017,6 +6024,11 @@ def validate_environment(
                 keys_in_environment = True
             else:
                 missing_keys.append("DEEPSEEK_API_KEY")
+        elif custom_llm_provider == "tencent":
+            if "TENCENT_API_KEY" in os.environ:
+                keys_in_environment = True
+            else:
+                missing_keys.append("TENCENT_API_KEY")
         elif custom_llm_provider == "mistral":
             if "MISTRAL_API_KEY" in os.environ:
                 keys_in_environment = True
@@ -7558,6 +7570,7 @@ class ProviderConfigManager:
             ),
             # Simple provider mappings (no model parameter needed)
             LlmProviders.DEEPSEEK: (lambda: litellm.DeepSeekChatConfig(), False),
+            LlmProviders.TENCENT: (lambda: litellm.TencentChatConfig(), False),
             LlmProviders.GROQ: (lambda: litellm.GroqChatConfig(), False),
             LlmProviders.BEDROCK_MANTLE: (
                 lambda: litellm.BedrockMantleChatConfig(),
@@ -7996,6 +8009,12 @@ class ProviderConfigManager:
             )
 
             return DeepSeekAnthropicMessagesConfig()
+        elif litellm.LlmProviders.TENCENT == provider:
+            from litellm.llms.tencent.messages.transformation import (
+                TencentAnthropicMessagesConfig,
+            )
+
+            return TencentAnthropicMessagesConfig()
         elif litellm.LlmProviders.GITHUB_COPILOT == provider:
             if "claude" in model_lower:
                 from litellm.llms.github_copilot.messages.transformation import (
diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index e85d5eeef4b..a3dcdaed3f7 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -43874,6 +43874,58 @@
         "supports_tool_choice": true,
         "supports_vision": false
     },
+    "tencent/deepseek-v4-pro": {
+        "cache_creation_input_token_cost": 0.0,
+        "cache_read_input_token_cost": 3.625e-09,
+        "input_cost_per_token": 4.35e-07,
+        "input_cost_per_token_cache_hit": 3.625e-09,
+        "litellm_provider": "tencent",
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 384000,
+        "max_tokens": 384000,
+        "mode": "chat",
+        "output_cost_per_token": 8.7e-07,
+        "source": "https://www.tencentcloud.com/products/tokenhub",
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
+        "supports_assistant_prefill": true,
+        "supports_function_calling": true,
+        "supports_native_streaming": true,
+        "supports_parallel_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_response_schema": true,
+        "supports_system_messages": true,
+        "supports_tool_choice": true,
+        "supports_reasoning": true,
+        "supports_vision": false
+    },
+    "tencent/deepseek-v4-flash": {
+        "cache_creation_input_token_cost": 0.0,
+        "cache_read_input_token_cost": 2.8e-09,
+        "input_cost_per_token": 1.4e-07,
+        "input_cost_per_token_cache_hit": 2.8e-09,
+        "litellm_provider": "tencent",
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 384000,
+        "max_tokens": 384000,
+        "mode": "chat",
+        "output_cost_per_token": 2.8e-07,
+        "source": "https://www.tencentcloud.com/products/tokenhub",
+        "supported_endpoints": [
+            "/v1/chat/completions"
+        ],
+        "supports_assistant_prefill": true,
+        "supports_function_calling": true,
+        "supports_native_streaming": true,
+        "supports_parallel_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_response_schema": true,
+        "supports_system_messages": true,
+        "supports_tool_choice": true,
+        "supports_reasoning": true,
+        "supports_vision": false
+    },
     "pinstripes/ps/glm-4.5-air": {
         "max_tokens": 128000,
         "max_input_tokens": 128000,
diff --git a/provider_endpoints_support.json b/provider_endpoints_support.json
index edac8949f28..3034ada56ba 100644
--- a/provider_endpoints_support.json
+++ b/provider_endpoints_support.json
@@ -2295,6 +2295,24 @@
         "text_completion": true
       }
     },
+    "tencent": {
+      "display_name": "Tencent TokenHub (`tencent`)",
+      "url": "https://docs.litellm.ai/docs/providers/tencent",
+      "endpoints": {
+        "chat_completions": true,
+        "messages": true,
+        "responses": true,
+        "embeddings": false,
+        "image_generations": false,
+        "audio_transcriptions": false,
+        "audio_speech": false,
+        "moderations": false,
+        "batches": false,
+        "rerank": false,
+        "a2a": false,
+        "text_completion": false
+      }
+    },
     "text-completion-codestral": {
       "display_name": "Text Completion Codestral (`text-completion-codestral`)",
       "url": "https://docs.litellm.ai/docs/providers/codestral",
diff --git a/tests/test_litellm/llms/tencent/__init__.py b/tests/test_litellm/llms/tencent/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/test_litellm/llms/tencent/chat/__init__.py b/tests/test_litellm/llms/tencent/chat/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/test_litellm/llms/tencent/chat/test_tencent_chat_transformation.py b/tests/test_litellm/llms/tencent/chat/test_tencent_chat_transformation.py
new file mode 100644
index 00000000000..00a82041c20
--- /dev/null
+++ b/tests/test_litellm/llms/tencent/chat/test_tencent_chat_transformation.py
@@ -0,0 +1,207 @@
+from unittest.mock import patch
+
+from litellm.llms.tencent.chat.transformation import TencentChatConfig
+
+
+def test_supported_openai_params_includes_thinking_and_reasoning_effort():
+    config = TencentChatConfig()
+
+    with patch(
+        "litellm.llms.tencent.chat.transformation.supports_reasoning",
+        return_value=True,
+    ):
+        params = config.get_supported_openai_params(model="tencent/deepseek-v4-pro")
+
+    assert "thinking" in params
+    assert "reasoning_effort" in params
+    assert "stream" in params
+    assert "temperature" in params
+
+
+def test_supported_openai_params_excludes_thinking_without_reasoning_support():
+    config = TencentChatConfig()
+
+    with patch(
+        "litellm.llms.tencent.chat.transformation.supports_reasoning",
+        return_value=False,
+    ):
+        params = config.get_supported_openai_params(model="tencent/non-reasoning-model")
+
+    assert "thinking" not in params
+    assert "reasoning_effort" not in params
+    assert "stream" in params
+
+
+def test_map_openai_params_passes_thinking_dict_through():
+    config = TencentChatConfig()
+    with patch(
+        "litellm.llms.tencent.chat.transformation.supports_reasoning",
+        return_value=True,
+    ):
+        result = config.map_openai_params(
+            non_default_params={"thinking": {"type": "enabled", "budget_tokens": 1024}},
+            optional_params={},
+            model="tencent/deepseek-v4-pro",
+            drop_params=False,
+        )
+
+    assert result["thinking"] == {"type": "enabled", "budget_tokens": 1024}
+
+
+def test_map_openai_params_converts_reasoning_effort_to_thinking():
+    config = TencentChatConfig()
+    with patch(
+        "litellm.llms.tencent.chat.transformation.supports_reasoning",
+        return_value=True,
+    ):
+        result = config.map_openai_params(
+            non_default_params={"reasoning_effort": "medium"},
+            optional_params={},
+            model="tencent/deepseek-v4-pro",
+            drop_params=False,
+        )
+
+    assert result["thinking"] == {"type": "enabled"}
+
+
+def test_map_openai_params_drops_none_reasoning_effort():
+    config = TencentChatConfig()
+    with patch(
+        "litellm.llms.tencent.chat.transformation.supports_reasoning",
+        return_value=True,
+    ):
+        result = config.map_openai_params(
+            non_default_params={"reasoning_effort": "none"},
+            optional_params={},
+            model="tencent/deepseek-v4-pro",
+            drop_params=False,
+        )
+
+    assert "thinking" not in result
+    assert "reasoning_effort" not in result
+
+
+def test_map_openai_params_thinking_priority_over_reasoning_effort():
+    config = TencentChatConfig()
+    with patch(
+        "litellm.llms.tencent.chat.transformation.supports_reasoning",
+        return_value=True,
+    ):
+        result = config.map_openai_params(
+            non_default_params={
+                "thinking": {"type": "enabled", "budget_tokens": 2048},
+                "reasoning_effort": "high",
+            },
+            optional_params={},
+            model="tencent/deepseek-v4-pro",
+            drop_params=False,
+        )
+
+    assert result["thinking"] == {"type": "enabled", "budget_tokens": 2048}
+
+
+def test_map_openai_params_extracts_thinking_and_effort_from_optional_params():
+    config = TencentChatConfig()
+    result = config.map_openai_params(
+        non_default_params={},
+        optional_params={"thinking": {"type": "enabled"}, "reasoning_effort": "medium"},
+        model="tencent/deepseek-v4-pro",
+        drop_params=False,
+    )
+
+    assert "thinking" in result
+    assert "reasoning_effort" not in result
+
+
+def test_get_complete_url_default():
+    config = TencentChatConfig()
+
+    url = config.get_complete_url(
+        api_base=None,
+        api_key=None,
+        model="tencent/deepseek-v4-pro",
+        optional_params={},
+        litellm_params={},
+    )
+
+    assert url == "https://tokenhub-intl.tencentcloudmaas.com/v1/chat/completions"
+
+
+def test_get_complete_url_strips_trailing_slash():
+    config = TencentChatConfig()
+
+    url = config.get_complete_url(
+        api_base="https://tokenhub-intl.tencentcloudmaas.com/v1/",
+        api_key=None,
+        model="tencent/deepseek-v4-pro",
+        optional_params={},
+        litellm_params={},
+    )
+
+    assert url == "https://tokenhub-intl.tencentcloudmaas.com/v1/chat/completions"
+
+
+def test_get_complete_url_custom_base_preserves_v1():
+    config = TencentChatConfig()
+
+    url = config.get_complete_url(
+        api_base="https://tokenhub.tencentcloudmaas.com/v1",
+        api_key=None,
+        model="tencent/deepseek-v4-pro",
+        optional_params={},
+        litellm_params={},
+    )
+
+    assert url == "https://tokenhub.tencentcloudmaas.com/v1/chat/completions"
+
+
+def test_get_complete_url_adds_v1_to_custom_base():
+    config = TencentChatConfig()
+
+    url = config.get_complete_url(
+        api_base="https://tokenhub.tencentcloudmaas.com",
+        api_key=None,
+        model="tencent/deepseek-v4-pro",
+        optional_params={},
+        litellm_params={},
+    )
+
+    assert url == "https://tokenhub.tencentcloudmaas.com/v1/chat/completions"
+
+
+def test_get_complete_url_does_not_append_to_full_url():
+    config = TencentChatConfig()
+
+    url = config.get_complete_url(
+        api_base="https://tokenhub.tencentcloudmaas.com/v1/chat/completions",
+        api_key=None,
+        model="tencent/deepseek-v4-pro",
+        optional_params={},
+        litellm_params={},
+    )
+
+    assert url == "https://tokenhub.tencentcloudmaas.com/v1/chat/completions"
+
+
+def test_provider_info_falls_back_to_default_base():
+    config = TencentChatConfig()
+
+    with patch("litellm.llms.tencent.chat.transformation.get_secret_str", return_value=None):
+        api_base, api_key = config._get_openai_compatible_provider_info(api_base=None, api_key="sk-arg")
+
+    assert api_base == "https://tokenhub-intl.tencentcloudmaas.com/v1"
+    assert api_key == "sk-arg"
+
+
+def test_provider_info_reads_env_secrets():
+    config = TencentChatConfig()
+
+    secrets = {"TENCENT_API_BASE": "https://env.tencent/v1", "TENCENT_API_KEY": "sk-env"}
+    with patch(
+        "litellm.llms.tencent.chat.transformation.get_secret_str",
+        side_effect=lambda key: secrets.get(key),
+    ):
+        api_base, api_key = config._get_openai_compatible_provider_info(api_base=None, api_key=None)
+
+    assert api_base == "https://env.tencent/v1"
+    assert api_key == "sk-env"
diff --git a/tests/test_litellm/llms/tencent/messages/__init__.py b/tests/test_litellm/llms/tencent/messages/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/test_litellm/llms/tencent/messages/test_tencent_anthropic_messages_transformation.py b/tests/test_litellm/llms/tencent/messages/test_tencent_anthropic_messages_transformation.py
new file mode 100644
index 00000000000..70c965a6190
--- /dev/null
+++ b/tests/test_litellm/llms/tencent/messages/test_tencent_anthropic_messages_transformation.py
@@ -0,0 +1,173 @@
+import litellm
+from litellm.llms.anthropic.experimental_pass_through.messages.transformation import (
+    AnthropicMessagesConfig,
+)
+from litellm.llms.tencent.messages.transformation import (
+    TencentAnthropicMessagesConfig,
+)
+from litellm.utils import ProviderConfigManager
+
+
+def test_tencent_provider_uses_anthropic_messages_config():
+    config = ProviderConfigManager.get_provider_anthropic_messages_config(
+        model="deepseek-v4-pro",
+        provider=litellm.LlmProviders.TENCENT,
+    )
+
+    assert isinstance(config, TencentAnthropicMessagesConfig)
+    assert config.custom_llm_provider == "tencent"
+
+
+def test_anthropic_provider_keeps_default_config_for_tencent_named_model():
+    config = ProviderConfigManager.get_provider_anthropic_messages_config(
+        model="deepseek-v4-pro",
+        provider=litellm.LlmProviders.ANTHROPIC,
+    )
+
+    assert isinstance(config, AnthropicMessagesConfig)
+    assert not isinstance(config, TencentAnthropicMessagesConfig)
+
+
+def test_strips_billing_metadata():
+    config = TencentAnthropicMessagesConfig()
+
+    assert config.should_strip_billing_metadata() is True
+
+
+def test_get_api_base_default():
+    config = TencentAnthropicMessagesConfig()
+
+    assert config.get_api_base() == "https://tokenhub-intl.tencentcloudmaas.com"
+
+
+def test_get_api_base_from_arg():
+    config = TencentAnthropicMessagesConfig()
+
+    assert config.get_api_base(api_base="https://custom.example.com") == "https://custom.example.com"
+
+
+def test_messages_url_default():
+    config = TencentAnthropicMessagesConfig()
+
+    assert (
+        config.get_complete_url(
+            api_base=None,
+            api_key=None,
+            model="deepseek-v4-pro",
+            optional_params={},
+            litellm_params={},
+        )
+        == "https://tokenhub-intl.tencentcloudmaas.com/v1/messages"
+    )
+
+
+def test_messages_url_with_base_ending_in_v1():
+    config = TencentAnthropicMessagesConfig()
+
+    assert (
+        config.get_complete_url(
+            api_base="https://tokenhub-intl.tencentcloudmaas.com/v1",
+            api_key=None,
+            model="deepseek-v4-pro",
+            optional_params={},
+            litellm_params={},
+        )
+        == "https://tokenhub-intl.tencentcloudmaas.com/v1/messages"
+    )
+
+
+def test_messages_url_with_base_ending_in_v1_messages():
+    config = TencentAnthropicMessagesConfig()
+
+    url = config.get_complete_url(
+        api_base="https://tokenhub-intl.tencentcloudmaas.com/v1/messages",
+        api_key=None,
+        model="deepseek-v4-pro",
+        optional_params={},
+        litellm_params={},
+    )
+
+    assert url == "https://tokenhub-intl.tencentcloudmaas.com/v1/messages"
+
+
+def test_messages_url_with_base_ending_in_v1_chat_completions():
+    config = TencentAnthropicMessagesConfig()
+
+    assert (
+        config.get_complete_url(
+            api_base="https://tokenhub-intl.tencentcloudmaas.com/v1/chat/completions",
+            api_key=None,
+            model="deepseek-v4-pro",
+            optional_params={},
+            litellm_params={},
+        )
+        == "https://tokenhub-intl.tencentcloudmaas.com/v1/messages"
+    )
+
+
+def test_messages_url_with_custom_base_no_v1():
+    config = TencentAnthropicMessagesConfig()
+
+    assert (
+        config.get_complete_url(
+            api_base="https://tokenhub.tencentcloudmaas.com",
+            api_key=None,
+            model="deepseek-v4-pro",
+            optional_params={},
+            litellm_params={},
+        )
+        == "https://tokenhub.tencentcloudmaas.com/v1/messages"
+    )
+
+
+def test_validate_environment_sets_headers():
+    config = TencentAnthropicMessagesConfig()
+
+    headers, api_base = config.validate_anthropic_messages_environment(
+        headers={},
+        model="deepseek-v4-pro",
+        messages=[],
+        optional_params={},
+        litellm_params={},
+        api_key="sk-tencent-key",
+        api_base="https://custom.test",
+    )
+
+    assert headers["x-api-key"] == "sk-tencent-key"
+    assert headers["anthropic-version"] == "2023-06-01"
+    assert headers["content-type"] == "application/json"
+    assert api_base == "https://custom.test"
+
+
+def test_validate_environment_injects_anthropic_beta_headers():
+    config = TencentAnthropicMessagesConfig()
+
+    headers, _ = config.validate_anthropic_messages_environment(
+        headers={},
+        model="deepseek-v4-pro",
+        messages=[],
+        optional_params={"speed": "fast"},
+        litellm_params={},
+        api_key="sk-tencent-key",
+        api_base=None,
+    )
+
+    assert "anthropic-beta" in headers
+
+
+def test_validate_environment_preserves_existing_headers():
+    config = TencentAnthropicMessagesConfig()
+
+    headers, _ = config.validate_anthropic_messages_environment(
+        headers={"authorization": "Bearer existing", "anthropic-version": "2024-01-01"},
+        model="deepseek-v4-pro",
+        messages=[],
+        optional_params={},
+        litellm_params={},
+        api_key="sk-tencent-key",
+        api_base=None,
+    )
+
+    assert headers["authorization"] == "Bearer existing"
+    assert headers["anthropic-version"] == "2024-01-01"
+    assert "x-api-key" not in headers
diff --git a/tests/test_litellm/llms/tencent/test_cost_calculator.py b/tests/test_litellm/llms/tencent/test_cost_calculator.py
new file mode 100644
index 00000000000..c2e905fab85
--- /dev/null
+++ b/tests/test_litellm/llms/tencent/test_cost_calculator.py
@@ -0,0 +1,41 @@
+import pytest
+
+import litellm
+from litellm.llms.tencent.cost_calculator import cost_per_token
+from litellm.types.utils import Usage
+
+
+@pytest.fixture
+def local_model_cost_map(monkeypatch):
+    original_model_cost = litellm.model_cost
+    monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
+    litellm.model_cost = litellm.get_model_cost_map(url="")
+    litellm.get_model_info.cache_clear()
+    try:
+        yield
+    finally:
+        litellm.model_cost = original_model_cost
+        litellm.get_model_info.cache_clear()
+
+
+def test_cost_per_token_uses_tencent_model_pricing(local_model_cost_map):
+    usage = Usage(prompt_tokens=1000, completion_tokens=2000, total_tokens=3000)
+
+    prompt_cost, completion_cost = cost_per_token(model="tencent/deepseek-v4-pro", usage=usage)
+
+    assert prompt_cost == pytest.approx(1000 * 4.35e-07)
+    assert completion_cost == pytest.approx(2000 * 8.7e-07)
+
+
+def test_top_level_dispatcher_routes_tencent_to_wrapper(local_model_cost_map):
+    from litellm.cost_calculator import cost_per_token as dispatch_cost_per_token
+
+    prompt_cost, completion_cost = dispatch_cost_per_token(
+        model="tencent/deepseek-v4-pro",
+        prompt_tokens=1000,
+        completion_tokens=1000,
+        custom_llm_provider="tencent",
+    )
+
+    assert prompt_cost == pytest.approx(1000 * 4.35e-07)
+    assert completion_cost == pytest.approx(1000 * 8.7e-07)
diff --git a/tests/test_litellm/test_utils.py b/tests/test_litellm/test_utils.py
index 6bc477655d5..c35fb2fcbe2 100644
--- a/tests/test_litellm/test_utils.py
+++ b/tests/test_litellm/test_utils.py
@@ -4577,3 +4577,95 @@ def test_aws_bedrock_project_id_excluded_from_bedrock_optional_params():
     assert "aws_bedrock_project_id" not in result
     assert result["aws_region_name"] == "us-east-1"
 
+
+
+class TestGetOptionalParamsTencent:
+    """Tests that tencent provider uses TencentChatConfig for parameter mapping."""
+
+    def test_tencent_supports_thinking_param(self):
+        """Verify get_optional_params for tencent accepts the 'thinking' param."""
+        from unittest.mock import patch
+
+        from litellm.utils import get_optional_params
+
+        with patch(
+            "litellm.llms.tencent.chat.transformation.supports_reasoning",
+            return_value=True,
+        ):
+            result = get_optional_params(
+                model="tencent/deepseek-v4-pro",
+                custom_llm_provider="tencent",
+                thinking={"type": "enabled"},
+            )
+        assert result.get("thinking") == {"type": "enabled"}
+
+    def test_tencent_supports_reasoning_effort(self):
+        """Verify get_optional_params for tencent converts reasoning_effort to thinking."""
+        from unittest.mock import patch
+
+        from litellm.utils import get_optional_params
+
+        with patch(
+            "litellm.llms.tencent.chat.transformation.supports_reasoning",
+            return_value=True,
+        ):
+            result = get_optional_params(
+                model="tencent/deepseek-v4-pro",
+                custom_llm_provider="tencent",
+                reasoning_effort="medium",
+            )
+        assert result.get("thinking") == {"type": "enabled"}
+
+    def test_tencent_supported_params_includes_thinking_and_reasoning_effort(self):
+        """Verify get_supported_openai_params for tencent includes custom params."""
+        from unittest.mock import patch
+
+        from litellm.litellm_core_utils.get_supported_openai_params import (
+            get_supported_openai_params,
+        )
+
+        with patch(
+            "litellm.llms.tencent.chat.transformation.supports_reasoning",
+            return_value=True,
+        ):
+            params = get_supported_openai_params(
+                model="tencent/deepseek-v4-pro",
+                custom_llm_provider="tencent",
+            )
+        assert "thinking" in params
+        assert "reasoning_effort" in params
+
+    def test_tencent_messages_config_routing(self):
+        """Verify ProviderConfigManager routes tencent to TencentAnthropicMessagesConfig."""
+        import litellm
+        from litellm.llms.tencent.messages.transformation import (
+            TencentAnthropicMessagesConfig,
+        )
+        from litellm.utils import ProviderConfigManager
+
+        config = ProviderConfigManager.get_provider_anthropic_messages_config(
+            model="deepseek-v4-pro",
+            provider=litellm.LlmProviders.TENCENT,
+        )
+        assert isinstance(config, TencentAnthropicMessagesConfig)
+        assert config.custom_llm_provider == "tencent"
+
+
+class TestValidateEnvironmentTencent:
+    """Tests that validate_environment resolves TENCENT_API_KEY for the tencent provider."""
+
+    def test_reports_key_present(self):
+        with patch.dict(os.environ, {"TENCENT_API_KEY": "sk-tencent"}):
+            result = litellm.validate_environment(model="tencent/deepseek-v4-pro")
+
+        assert result["keys_in_environment"] is True
+        assert result["missing_keys"] == []
+
+    def test_reports_key_missing(self):
+        with patch.dict(os.environ, {}, clear=True):
+            result = litellm.validate_environment(model="tencent/deepseek-v4-pro")
+
+        assert result["keys_in_environment"] is False
+        assert "TENCENT_API_KEY" in result["missing_keys"]
+
+

From 138a69bd612878e36bc26be258081484abad9ae2 Mon Sep 17 00:00:00 2001
From: Mateo Wang <277851410+mateo-berri@users.noreply.github.com>
Date: Thu, 2 Jul 2026 18:58:30 -0700
Subject: [PATCH 13/26] fix(bedrock): map guardrailConfig to InvokeModel
 guardrail headers (#31985)

* fix(bedrock): map guardrailConfig to InvokeModel guardrail headers

The InvokeModel API takes the guardrail identifier, version and trace as
X-Amzn-Bedrock-* request headers, unlike Converse which takes them in the
request body. The invoke transformer never set these headers, so
guardrailConfig was silently dropped (or leaked into the request body)
and Bedrock guardrails never ran on invoke-route models. Pop
guardrailConfig in AmazonInvokeConfig.validate_environment, validate it,
and set the headers before SigV4 signing; explicitly passed headers keep
winning over guardrailConfig so existing workarounds are unaffected

* fix(bedrock): reject guardrailConfig missing guardrailIdentifier

A guardrailConfig without guardrailIdentifier (e.g. an empty dict) would
validate, produce no guardrail headers, and let the request proceed with
guardrails silently not applied; that silent skip is the exact failure
mode this fix exists to remove, so fail fast with a 400 instead
---
 .../base_invoke_transformation.py             |  45 +++++-
 litellm/types/llms/bedrock.py                 |   2 +-
 .../test_base_invoke_transformation.py        | 143 ++++++++++++++++++
 3 files changed, 188 insertions(+), 2 deletions(-)

diff --git a/litellm/llms/bedrock/chat/invoke_transformations/base_invoke_transformation.py b/litellm/llms/bedrock/chat/invoke_transformations/base_invoke_transformation.py
index bbe16e26713..dd7cf12604d 100644
--- a/litellm/llms/bedrock/chat/invoke_transformations/base_invoke_transformation.py
+++ b/litellm/llms/bedrock/chat/invoke_transformations/base_invoke_transformation.py
@@ -5,6 +5,7 @@ from functools import partial
 from typing import TYPE_CHECKING, Any, List, Optional, Tuple, Union, cast, get_args
 
 import httpx
+from pydantic import TypeAdapter, ValidationError
 
 import litellm
 from litellm._logging import verbose_logger
@@ -24,6 +25,7 @@ from litellm.llms.custom_httpx.http_handler import (
     HTTPHandler,
     _get_httpx_client,
 )
+from litellm.types.llms.bedrock import GuardrailConfigBlock
 from litellm.types.llms.openai import AllMessageValues
 from litellm.types.utils import ModelResponse, Usage
 from litellm.utils import CustomStreamWrapper
@@ -37,6 +39,38 @@ else:
 
 from litellm.llms.bedrock.base_aws_llm import BaseAWSLLM
 
+_GUARDRAIL_CONFIG_VALIDATOR: "TypeAdapter[GuardrailConfigBlock]" = TypeAdapter(GuardrailConfigBlock)
+
+_GUARDRAIL_CONFIG_EXPECTED_FORMAT = (
+    "{'guardrailIdentifier': str, 'guardrailVersion': str, 'trace': 'enabled'|'disabled'|'enabled_full'}"
+)
+
+
+def _bedrock_invoke_guardrail_headers(raw_guardrail_config: object) -> "dict[str, str]":
+    try:
+        guardrail_config = _GUARDRAIL_CONFIG_VALIDATOR.validate_python(raw_guardrail_config)
+    except ValidationError as e:
+        raise BedrockError(
+            status_code=400,
+            message="Invalid guardrailConfig={}. Expected format: {}. Error: {}".format(
+                raw_guardrail_config, _GUARDRAIL_CONFIG_EXPECTED_FORMAT, e
+            ),
+        )
+    if "guardrailIdentifier" not in guardrail_config:
+        raise BedrockError(
+            status_code=400,
+            message="guardrailConfig={} is missing 'guardrailIdentifier'. Expected format: {}".format(
+                raw_guardrail_config, _GUARDRAIL_CONFIG_EXPECTED_FORMAT
+            ),
+        )
+    trace = guardrail_config.get("trace")
+    candidate_headers = {
+        "X-Amzn-Bedrock-GuardrailIdentifier": guardrail_config.get("guardrailIdentifier"),
+        "X-Amzn-Bedrock-GuardrailVersion": guardrail_config.get("guardrailVersion"),
+        "X-Amzn-Bedrock-Trace": trace.upper() if trace is not None else None,
+    }
+    return {name: value for name, value in candidate_headers.items() if value is not None}
+
 
 class AmazonInvokeConfig(BaseConfig, BaseAWSLLM):
     def __init__(self, **kwargs):
@@ -390,7 +424,16 @@ class AmazonInvokeConfig(BaseConfig, BaseAWSLLM):
         api_key: Optional[str] = None,
         api_base: Optional[str] = None,
     ) -> dict:
-        return headers
+        raw_guardrail_config = optional_params.pop("guardrailConfig", None)
+        if raw_guardrail_config is None:
+            return headers
+        existing_header_names = frozenset(name.lower() for name in headers)
+        guardrail_headers = {
+            name: value
+            for name, value in _bedrock_invoke_guardrail_headers(raw_guardrail_config).items()
+            if name.lower() not in existing_header_names
+        }
+        return {**headers, **guardrail_headers}
 
     def get_error_class(
         self, error_message: str, status_code: int, headers: Union[dict, httpx.Headers]
diff --git a/litellm/types/llms/bedrock.py b/litellm/types/llms/bedrock.py
index a1dc08e5f29..bdf6b8fefed 100644
--- a/litellm/types/llms/bedrock.py
+++ b/litellm/types/llms/bedrock.py
@@ -325,7 +325,7 @@ class ToolConfigBlock(TypedDict, total=False):
 class GuardrailConfigBlock(TypedDict, total=False):
     guardrailIdentifier: str
     guardrailVersion: str
-    trace: Literal["enabled", "disabled"]
+    trace: Literal["enabled", "disabled", "enabled_full"]
 
 
 class InferenceConfig(TypedDict, total=False):
diff --git a/tests/test_litellm/llms/bedrock/chat/invoke_transformations/test_base_invoke_transformation.py b/tests/test_litellm/llms/bedrock/chat/invoke_transformations/test_base_invoke_transformation.py
index aff89f02ff2..5fefae7e411 100644
--- a/tests/test_litellm/llms/bedrock/chat/invoke_transformations/test_base_invoke_transformation.py
+++ b/tests/test_litellm/llms/bedrock/chat/invoke_transformations/test_base_invoke_transformation.py
@@ -14,6 +14,7 @@ from litellm.llms.bedrock.chat.invoke_transformations.anthropic_claude3_transfor
 from litellm.llms.bedrock.chat.invoke_transformations.base_invoke_transformation import (
     AmazonInvokeConfig,
 )
+from litellm.llms.bedrock.common_utils import BedrockError
 
 
 @pytest.mark.parametrize(
@@ -39,3 +40,145 @@ def test_transform_request_drops_stream_chunk_size(config, model):
     )
 
     assert "stream_chunk_size" not in json.dumps(request_body)
+
+
+def test_validate_environment_maps_guardrail_config_to_invoke_headers():
+    """The InvokeModel API takes the guardrail identifier/version/trace as
+    X-Amzn-Bedrock-* request headers, unlike Converse which takes them in the
+    body. https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_InvokeModel.html"""
+    optional_params = {
+        "guardrailConfig": {
+            "guardrailIdentifier": "ff6ujrregl1q",
+            "guardrailVersion": "DRAFT",
+            "trace": "enabled",
+        },
+        "max_tokens": 10,
+    }
+
+    headers = AmazonInvokeConfig().validate_environment(
+        headers={},
+        model="anthropic.claude-3-sonnet-20240229-v1:0",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params=optional_params,
+        litellm_params={},
+    )
+
+    assert headers["X-Amzn-Bedrock-GuardrailIdentifier"] == "ff6ujrregl1q"
+    assert headers["X-Amzn-Bedrock-GuardrailVersion"] == "DRAFT"
+    assert headers["X-Amzn-Bedrock-Trace"] == "ENABLED"
+    assert "guardrailConfig" not in optional_params
+
+
+def test_validate_environment_without_guardrail_config_leaves_headers_untouched():
+    headers = AmazonInvokeConfig().validate_environment(
+        headers={"foo": "bar"},
+        model="anthropic.claude-3-sonnet-20240229-v1:0",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={"max_tokens": 10},
+        litellm_params={},
+    )
+
+    assert headers == {"foo": "bar"}
+
+
+def test_validate_environment_skips_absent_guardrail_fields():
+    headers = AmazonInvokeConfig().validate_environment(
+        headers={},
+        model="amazon.titan-text-express-v1",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={"guardrailConfig": {"guardrailIdentifier": "gr-id", "guardrailVersion": "1"}},
+        litellm_params={},
+    )
+
+    assert headers == {
+        "X-Amzn-Bedrock-GuardrailIdentifier": "gr-id",
+        "X-Amzn-Bedrock-GuardrailVersion": "1",
+    }
+
+
+def test_validate_environment_does_not_clobber_explicit_guardrail_headers():
+    """Users worked around the missing guardrailConfig support by passing the
+    AWS headers directly; an explicit header must keep winning over
+    guardrailConfig regardless of casing."""
+    headers = AmazonInvokeConfig().validate_environment(
+        headers={"x-amzn-bedrock-guardrailidentifier": "explicit-id"},
+        model="anthropic.claude-3-sonnet-20240229-v1:0",
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={
+            "guardrailConfig": {"guardrailIdentifier": "config-id", "guardrailVersion": "2"},
+        },
+        litellm_params={},
+    )
+
+    assert headers["x-amzn-bedrock-guardrailidentifier"] == "explicit-id"
+    assert "X-Amzn-Bedrock-GuardrailIdentifier" not in headers
+    assert headers["X-Amzn-Bedrock-GuardrailVersion"] == "2"
+
+
+@pytest.mark.parametrize(
+    "bad_guardrail_config",
+    [
+        {"guardrailIdentifier": "gr-id", "trace": "verbose"},
+        {"guardrailIdentifier": ["gr-id"]},
+        "gr-id",
+        {},
+        {"trace": "enabled"},
+    ],
+)
+def test_validate_environment_rejects_malformed_guardrail_config(bad_guardrail_config):
+    with pytest.raises(BedrockError) as excinfo:
+        AmazonInvokeConfig().validate_environment(
+            headers={},
+            model="anthropic.claude-3-sonnet-20240229-v1:0",
+            messages=[{"role": "user", "content": "hi"}],
+            optional_params={"guardrailConfig": bad_guardrail_config},
+            litellm_params={},
+        )
+
+    assert excinfo.value.status_code == 400
+    assert "guardrailConfig" in str(excinfo.value)
+
+
+@pytest.mark.parametrize(
+    "model",
+    [
+        "anthropic.claude-3-sonnet-20240229-v1:0",
+        "amazon.titan-text-express-v1",
+        "mistral.mistral-7b-instruct-v0:2",
+        "meta.llama3-8b-instruct-v1:0",
+    ],
+)
+def test_guardrail_config_flows_to_headers_not_request_body(model):
+    """Mirrors the handler flow (validate_environment then transform_request):
+    guardrailConfig must end up in the signed headers and never leak into the
+    request body, where Bedrock rejects it as an extra input."""
+    config = AmazonInvokeConfig()
+    optional_params = {
+        "guardrailConfig": {
+            "guardrailIdentifier": "ff6ujrregl1q",
+            "guardrailVersion": "DRAFT",
+            "trace": "disabled",
+        },
+        "max_tokens": 10,
+    }
+    messages = [{"role": "user", "content": "hi"}]
+
+    headers = config.validate_environment(
+        headers={},
+        model=model,
+        messages=messages,
+        optional_params=optional_params,
+        litellm_params={},
+    )
+    request_body = config.transform_request(
+        model=model,
+        messages=messages,
+        optional_params=optional_params,
+        litellm_params={},
+        headers=headers,
+    )
+
+    assert "guardrailConfig" not in json.dumps(request_body)
+    assert headers["X-Amzn-Bedrock-GuardrailIdentifier"] == "ff6ujrregl1q"
+    assert headers["X-Amzn-Bedrock-GuardrailVersion"] == "DRAFT"
+    assert headers["X-Amzn-Bedrock-Trace"] == "DISABLED"

From 27069bd74f38fac4ee0f0ec742a90e9c6d64ce02 Mon Sep 17 00:00:00 2001
From: ryan-crabbe-berri <ryan@berri.ai>
Date: Thu, 2 Jul 2026 19:02:27 -0700
Subject: [PATCH 14/26] feat(ui): shadcn migration foundation: Tailwind v4,
 shadcn init, antd cascade fix (#31995)

* feat(ui): shadcn migration foundation: Tailwind v4, shadcn init, antd cascade fix

Upgrade the dashboard from Tailwind v3 to v4 with CSS-first config: the
official upgrade codemod renamed utilities across 151 files, and
tailwind.config.js (plus the dead tailwind.config.ts) is replaced by
@theme tokens, @source globs, and @plugin directives in globals.css. The
Tremor safelist becomes @source inline patterns and the legacy tremor
theme tokens carry over verbatim. ui_colors.json was build-time only and
fed the dying Tremor palette, so its brand values are inlined and the
file removed; runtime theming replaces that path next.

shadcn is initialized with a hand-authored components.json (rsc,
cssVariables, baseColor gray) pointing utils at the existing
lib/cva.config.ts, which now exports cn (cva beta cx + twMerge) instead
of adding class-variance-authority as a second variant library. The two
ad-hoc cn helpers fold into it. Button lands as the canary primitive,
adapted to cva beta and React 18 forwardRef, with tests covering the
variant, twMerge, asChild, and ref seams. --radius is 0.5rem so the
shadcn radius scale reproduces Tailwind defaults and legacy rounded-*
classes render unchanged.

antd v5 emits unlayered CSS-in-JS that would beat every layered v4
utility, so AntdGlobalProvider now wraps the app in StyleProvider layer
and ConfigProvider cssVar, and globals.css declares
@layer theme, base, antd, components, utilities. antd wins over
preflight but yields to utilities, which is what lets migrated shadcn
pages coexist with legacy antd pages. Preflight stays global with the
three v3 behaviors pinned (default border color, button cursor,
placeholder color).

* fix(ui): restore tremor opacity tints removed by tailwind v4

Tailwind v4 removed the *-opacity-* utilities, but the precompiled
@tremor/react dist still composes them with shade-500 palette classes
(bg-opacity-10 over bg-<color>-500 etc.), so Badge, BadgeDelta, Callout,
light Icon and Button, BarList, and ProgressBar lost their tints and
rendered solid 500-shade fills. Adversarial review caught it; the
original smoke pages only exercised antd Tags.

tremor-v3-compat.css restores exactly the pairs tremor emits: for each
of the 22 safelisted colors, bg-opacity-{10,20,40}, hover/group-hover
bg-opacity-{20,30}, and ring-opacity-{20,40} against the -500 shade,
via color-mix into the utilities layer. Tremor's colorPalette maps both
background and iconRing to 500, so the -500 pairing covers every
composition in the dist; dark: variants are inert until dark mode ships.
The shim dies with @tremor/react at the end of the migration.

The upgrade codemod also missed two hand-rolled modal scrims using
bg-black bg-opacity-{30,50} (solid black under v4); now bg-black/30 and
bg-black/50. Removed the docker/build_admin_ui.sh copy of
enterprise_colors.json into the deleted ui_colors.json; that build-time
rebrand path is retired and its runtime replacement lands with the
theming phase.

* fix(ui): pair ring-opacity-40 with shade 300 in tremor compat shim

Tremor's colorPalette maps ring to shade 300, and the only consumer of
ring-opacity-40 (Icon variant outlined) composes it with that shade,
so the shade-500 rows were dead and outlined icon rings would render
at full opacity. Latent today (no dashboard usage of the outlined
variant); caught by adversarial review. ring-opacity-20 stays at 500
(iconRing), matching Badge and BadgeDelta.
---
 .gitignore                                    |    2 +
 basedpyright-code-budget.json                 |    2 +-
 docker/build_admin_ui.sh                      |    2 -
 .../vertex_gemini_transformation.py           |   10 +-
 .../mcp_server/mcp_server_manager.py          |  288 +-
 ruff-strict-budget.json                       |   10 +-
 ui/litellm-dashboard/build_ui.sh              |    3 -
 ui/litellm-dashboard/components.json          |   21 +
 ui/litellm-dashboard/eslint-suppressions.json |  986 +++---
 ui/litellm-dashboard/knip.json                |    8 +-
 ui/litellm-dashboard/package-lock.json        | 2900 +++++++++++++----
 ui/litellm-dashboard/package.json             |    7 +-
 ui/litellm-dashboard/postcss.config.js        |    3 +-
 .../api-reference/components/DocLink.tsx      |    8 +-
 .../caching/components/cache_health.tsx       |    4 +-
 .../components/cost_tracking_settings.tsx     |    2 +-
 .../cost-tracking/components/how_it_works.tsx |    8 +-
 .../pricing_calculator/multi_cost_results.tsx |    6 +-
 .../components/GuardrailsOverview.tsx         |    2 +-
 .../ModelsAndEndpointsView.tsx                |    6 +-
 .../components/AllModelsTab.tsx               |    6 +-
 .../components/chat_ui/A2AMetrics.tsx         |    8 +-
 .../components/chat_ui/AgentBuilderView.tsx   |   14 +-
 .../components/chat_ui/ChatImageRenderer.tsx  |    2 +-
 .../components/chat_ui/ChatMessageBubble.tsx  |   14 +-
 .../playground/components/chat_ui/ChatUI.tsx  |   20 +-
 .../chat_ui/CodeInterpreterTool.tsx           |    2 +-
 .../chat_ui/ResponsesImageRenderer.tsx        |    2 +-
 .../chat_ui/SearchResultsDisplay.tsx          |    8 +-
 .../components/chat_ui/SessionManagement.tsx  |    7 +-
 .../components/compareUI/CompareUI.tsx        |    4 +-
 .../compareUI/components/ComparisonPanel.tsx  |    2 +-
 .../compareUI/components/MessageDisplay.tsx   |    6 +-
 .../compareUI/components/MessageInput.tsx     |    2 +-
 .../components/complianceUI/ComplianceUI.tsx  |  105 +-
 .../prompt_editor_view/ModelConfigCard.tsx    |    2 +-
 .../prompt_editor_view/PromptEditorHeader.tsx |    4 +-
 .../prompt_editor_view/PromptMessagesCard.tsx |    3 +-
 .../prompt_editor_view/ToolsCard.tsx          |    2 +-
 .../conversation_panel/MessageBubble.tsx      |   10 +-
 .../conversation_panel/MessageInput.tsx       |    2 +-
 .../components/prompt_editor_view/index.tsx   |    8 +-
 .../prompts/components/prompt_info.tsx        |    4 +-
 .../prompts/components/prompt_table.tsx       |    4 +-
 .../prompts/components/tool_modal.tsx         |    4 +-
 .../prompts/components/variable_textarea.tsx  |    4 +-
 .../_components/SearchToolTester.tsx          |    2 +-
 .../(dashboard)/ui-theme/UIThemeSettings.tsx  |    2 +-
 .../users/_components/DefaultUserSettings.tsx |   10 +-
 .../users/_components/view_users/table.tsx    |    2 +-
 .../_components/view_users/user_info_view.tsx |    4 +-
 ui/litellm-dashboard/src/app/globals.css      |  221 +-
 .../src/app/login/LoginPage.tsx               |    8 +-
 .../src/app/tremor-v3-compat.css              |  615 ++++
 .../src/components/AIHub/ModelHubTable.tsx    |   14 +-
 .../AIHub/UsefulLinksManagement.tsx           |   12 +-
 .../AIHub/forms/MakeAgentPublicForm.tsx       |    2 +-
 .../AIHub/forms/MakeMCPPublicForm.tsx         |    2 +-
 .../AIHub/forms/MakeModelPublicForm.tsx       |    2 +-
 .../CloudZeroIntegrationSettings.tsx          |    2 +-
 .../GuardrailsMonitor/LogViewer.tsx           |    6 +-
 .../src/components/HelpLink.tsx               |   12 +-
 .../Navbar/BlogDropdown/BlogDropdown.tsx      |    2 +-
 .../NotificationsBell/NotificationsBell.tsx   |    8 +-
 .../Navbar/UserDropdown/UserDropdown.tsx      |    2 +-
 ui/litellm-dashboard/src/components/SCIM.tsx  |    9 +-
 .../Fallbacks/FallbackGroupConfig.tsx         |   10 +-
 .../src/components/ToolDetail.tsx             |   10 +-
 .../src/components/ToolPolicies.tsx           |    8 +-
 .../src/components/UsageIndicator.tsx         |   63 +-
 .../components/EntityUsage/TopKeyView.tsx     |    7 +-
 .../UsagePage/components/UsageAIChatPanel.tsx |   12 +-
 .../UsagePage/components/UsagePageView.tsx    |    4 +-
 .../UsageViewSelect/UsageViewSelect.tsx       |    6 +-
 .../src/components/add_model/AddModelForm.tsx |    8 +-
 .../add_model/add_auto_router_tab.tsx         |    4 +-
 .../add_model/cache_control_settings.tsx      |    2 +-
 .../conditional_public_model_name.tsx         |    8 +-
 .../src/components/agents/add_agent_form.tsx  |    2 +-
 .../agents/agent_card_discovery.tsx           |    4 +-
 .../components/agents/agent_virtual_keys.tsx  |    2 +-
 .../src/components/alerting/dynamic_form.tsx  |    4 +-
 .../components/bulk_create_users_button.tsx   |   18 +-
 .../components/chat_ui/ReasoningContent.tsx   |    2 +-
 .../src/components/claude_code_plugins.tsx    |    2 +-
 .../MakeSkillPublicForm.tsx                   |    2 +-
 .../common_components/ModelAliasManager.tsx   |    8 +-
 .../PassThroughGuardrailsSection.tsx          |   12 +-
 .../src/components/general_settings.tsx       |    4 +-
 .../guardrails/GuardrailTestPanel.tsx         |    4 +-
 .../guardrails/GuardrailTestResults.tsx       |    4 +-
 .../guardrails/TeamGuardrailsTab.tsx          |   44 +-
 .../guardrails/add_guardrail_form.tsx         |    8 +-
 .../custom_code/CustomCodeModal.tsx           |   22 +-
 .../components/guardrails/guardrail_info.tsx  |    2 +-
 .../guardrails/guardrail_optional_params.tsx  |    2 +-
 .../components/guardrails/pii_components.tsx  |    4 +-
 .../guardrails/pii_configuration.tsx          |    2 +-
 .../ToolPermissionRulesEditor.tsx             |    2 +-
 .../mcp_tools/ByokCredentialModal.tsx         |    8 +-
 .../components/mcp_tools/EnvVarsSection.tsx   |    2 +-
 .../components/mcp_tools/MCPLogoSelector.tsx  |    4 +-
 .../components/mcp_tools/MCPServerCard.tsx    |   12 +-
 .../mcp_tools/MCPSubmissionsTab.tsx           |   20 +-
 .../components/mcp_tools/MCPToolsetsTab.tsx   |   22 +-
 .../mcp_tools/McpCrudPermissionPanel.tsx      |    6 +-
 .../mcp_tools/OpenAPIQuickPicker.tsx          |    2 +-
 .../components/mcp_tools/ToolTestPanel.tsx    |   30 +-
 .../mcp_tools/create_mcp_server.tsx           |    6 +-
 .../src/components/mcp_tools/mcp_connect.tsx  |   18 +-
 .../components/mcp_tools/mcp_server_view.tsx  |   16 +-
 .../src/components/mcp_tools/mcp_servers.tsx  |    4 +-
 .../src/components/mcp_tools/mcp_tools.tsx    |    6 +-
 .../model_dashboard/health_check_columns.tsx  |    4 +-
 .../src/components/model_filters.tsx          |    8 +-
 .../components/model_group_alias_settings.tsx |    8 +-
 .../src/components/model_info_view.tsx        |   58 +-
 .../components/molecules/models/columns.tsx   |   12 +-
 .../src/components/navbar.tsx                 |    4 +-
 .../organization/organization_view.tsx        |    2 +-
 .../src/components/pass_through_info.tsx      |    6 +-
 .../src/components/pass_through_settings.tsx  |    2 +-
 .../permissions/AgentPermissions.tsx          |    6 +-
 .../permissions/MCPServerPermissions.tsx      |   14 +-
 .../policies/ai_suggestion_modal.tsx          |   24 +-
 .../policies/guardrail_selection_modal.tsx    |    2 +-
 .../src/components/policies/policy_info.tsx   |    2 +-
 .../src/components/policies/policy_table.tsx  |    2 +-
 .../components/policies/policy_templates.tsx  |    8 +-
 .../policies/template_parameter_modal.tsx     |    2 +-
 .../src/components/public_model_hub.tsx       |   34 +-
 .../src/components/route_preview.tsx          |    4 +-
 .../routing_groups/RoutingGroupsTable.tsx     |    4 +-
 .../src/components/settings.tsx               |    8 +-
 .../shared/advanced_date_picker.tsx           |    2 +-
 .../components/shared/usage_date_picker.tsx   |    2 +-
 .../components/tag_management/tag_info.tsx    |    2 +-
 .../src/components/team/LoggingSettings.tsx   |    6 +-
 .../src/components/team/TeamInfo.tsx          |    4 +-
 .../components/templates/key_edit_view.tsx    |    2 +-
 .../components/templates/key_info_view.tsx    |   12 +-
 .../src/components/ui/button.test.tsx         |   50 +
 .../src/components/ui/button.tsx              |   60 +
 ui/litellm-dashboard/src/components/usage.tsx |    2 +-
 .../VectorStoreTester.tsx                     |   18 +-
 .../vector_store_info.tsx                     |    6 +-
 .../AuditLogDrawer/AuditLogDrawer.tsx         |   10 +-
 .../view_logs/ConfigInfoMessage.tsx           |    8 +-
 .../view_logs/CostBreakdownViewer.tsx         |    2 +-
 .../BedrockGuardrailDetails.tsx               |   12 +-
 .../GuardrailViewer/CompliancePanel.tsx       |    4 +-
 .../GuardrailViewer/ContentFilterDetails.tsx  |    2 +-
 .../GuardrailViewer/GuardrailViewer.tsx       |   32 +-
 .../view_logs/LogDetailsDrawer/JsonViewer.tsx |    2 +-
 .../LogDetailsDrawer/LogDetailContent.tsx     |   12 +-
 .../LogDetailsDrawer/LogDetailsDrawer.tsx     |   10 +-
 .../components/view_logs/LogsTableToolbar.tsx |   10 +-
 .../view_logs/ToolsSection/ToolsSection.tsx   |    2 +-
 .../src/components/view_logs/TypeBadges.tsx   |    6 +-
 .../view_logs/VectorStoreViewer.tsx           |    4 +-
 .../src/components/view_logs/audit_logs.tsx   |    2 +-
 .../src/components/view_logs/columns.tsx      |   14 +-
 .../src/components/view_logs/index.tsx        |    2 +-
 .../src/contexts/AntdGlobalProvider.tsx       |   15 +-
 .../src/data/claimsCompliancePrompts.ts       |    2 +-
 ui/litellm-dashboard/src/lib/cva.config.ts    |    2 +
 ui/litellm-dashboard/tailwind.config.js       |  127 -
 ui/litellm-dashboard/tailwind.config.ts       |  126 -
 ui/litellm-dashboard/ui_colors.json           |    9 -
 169 files changed, 4561 insertions(+), 2150 deletions(-)
 create mode 100644 ui/litellm-dashboard/components.json
 create mode 100644 ui/litellm-dashboard/src/app/tremor-v3-compat.css
 create mode 100644 ui/litellm-dashboard/src/components/ui/button.test.tsx
 create mode 100644 ui/litellm-dashboard/src/components/ui/button.tsx
 delete mode 100644 ui/litellm-dashboard/tailwind.config.js
 delete mode 100644 ui/litellm-dashboard/tailwind.config.ts
 delete mode 100644 ui/litellm-dashboard/ui_colors.json

diff --git a/.gitignore b/.gitignore
index 59fa5803abe..62db5fe6182 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,5 @@ crash.*.log
 
 # pytest coverage data
 .coverage
+
+ui/litellm-dashboard/out/
diff --git a/basedpyright-code-budget.json b/basedpyright-code-budget.json
index 79e6af05978..b65cd01e1eb 100644
--- a/basedpyright-code-budget.json
+++ b/basedpyright-code-budget.json
@@ -141,6 +141,6 @@
     "limit": 1005
   },
   "reportUnusedVariable": {
-    "limit": 1298
+    "limit": 1297
   }
 }
diff --git a/docker/build_admin_ui.sh b/docker/build_admin_ui.sh
index efb2bac3535..68acdd78e3e 100755
--- a/docker/build_admin_ui.sh
+++ b/docker/build_admin_ui.sh
@@ -57,8 +57,6 @@ source ~/.nvm/nvm.sh
 nvm install v18.17.0
 nvm use v18.17.0
 
-# copy _enterprise.json from this directory to /ui/litellm-dashboard, and rename it to ui_colors.json
-cp enterprise/enterprise_ui/enterprise_colors.json ui/litellm-dashboard/ui_colors.json
 
 # cd in to /ui/litellm-dashboard
 cd ui/litellm-dashboard
diff --git a/litellm/llms/vertex_ai/image_generation/vertex_gemini_transformation.py b/litellm/llms/vertex_ai/image_generation/vertex_gemini_transformation.py
index 4bca3e8f71d..572725ac789 100644
--- a/litellm/llms/vertex_ai/image_generation/vertex_gemini_transformation.py
+++ b/litellm/llms/vertex_ai/image_generation/vertex_gemini_transformation.py
@@ -1,5 +1,5 @@
 import os
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
 from litellm._logging import verbose_logger
 
@@ -175,7 +175,7 @@ class VertexAIGeminiImageGenerationConfig(BaseImageGenerationConfig, VertexLLM):
         self,
         headers: dict,
         model: str,
-        messages: List[AllMessageValues],
+        messages: list[AllMessageValues],
         optional_params: dict,
         litellm_params: dict,
         api_key: Optional[str] = None,
@@ -217,10 +217,10 @@ class VertexAIGeminiImageGenerationConfig(BaseImageGenerationConfig, VertexLLM):
         contents = [{"role": "user", "parts": [{"text": prompt}]}]
 
         # Prepare generation config
-        generation_config: Dict[str, Any] = {"responseModalities": ["IMAGE"]}
+        generation_config: dict[str, Any] = {"responseModalities": ["IMAGE"]}
 
         # Seed from user-supplied imageConfig dict; flat params are overlaid for backward compat.
-        image_config: Dict[str, Any] = dict(optional_params.get("imageConfig") or {})
+        image_config: dict[str, Any] = dict(optional_params.get("imageConfig") or {})
 
         if "aspectRatio" in optional_params:
             image_config["aspectRatio"] = optional_params["aspectRatio"]
@@ -241,7 +241,7 @@ class VertexAIGeminiImageGenerationConfig(BaseImageGenerationConfig, VertexLLM):
         elif "n" in optional_params:
             generation_config["candidateCount"] = optional_params["n"]
 
-        request_body: Dict[str, Any] = {
+        request_body: dict[str, Any] = {
             "contents": contents,
             "generationConfig": generation_config,
         }
diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index ffd5b1e17f7..baa4a5a9e0c 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -14,7 +14,7 @@ import os
 import re
 import time
 from contextlib import asynccontextmanager
-from typing import Any, AsyncIterator, Callable, Dict, List, Literal, Optional, Set, Tuple, Union, cast
+from typing import Any, AsyncIterator, Callable, Literal, Optional, Union, cast
 from urllib.parse import urlparse
 
 import anyio
@@ -156,7 +156,7 @@ _AZURE_ENTRA_HOSTS = {
 # BYOK credential cache. Keyed by (user_id, server_id); value is
 # (values_dict, monotonic_timestamp). Keeps the tool-call and tool-listing
 # paths off the DB on every request within the TTL window.
-_user_env_vars_cache: Dict[Tuple[str, str], Tuple[Dict[str, str], float]] = {}
+_user_env_vars_cache: dict[tuple[str, str], tuple[dict[str, str], float]] = {}
 _USER_ENV_VARS_CACHE_TTL = 60  # seconds
 _USER_ENV_VARS_CACHE_MAX_SIZE = 4096  # cap to prevent unbounded growth
 
@@ -167,7 +167,7 @@ def invalidate_user_env_vars_cache(user_id: str, server_id: str) -> None:
     _user_env_vars_cache.pop((user_id, server_id), None)
 
 
-def _write_user_env_vars_cache(user_id: str, server_id: str, values: Dict[str, str]) -> None:
+def _write_user_env_vars_cache(user_id: str, server_id: str, values: dict[str, str]) -> None:
     cache_key = (user_id, server_id)
     # Re-insert at the tail so eviction drops the oldest-written entry, not a
     # freshly refreshed one, and only sheds a single entry instead of wiping the
@@ -180,7 +180,7 @@ def _write_user_env_vars_cache(user_id: str, server_id: str, values: Dict[str, s
 
 def _should_strip_caller_authorization(
     mcp_server: MCPServer,
-    raw_headers: Optional[Dict[str, str]],
+    raw_headers: Optional[dict[str, str]],
     user_api_key_auth: Optional[UserAPIKeyAuth],
 ) -> bool:
     """Decide whether the caller's ``Authorization`` header must NOT be
@@ -244,7 +244,7 @@ def _without_authorization(
 
 def _extract_upstream_auth_failure(
     exc: BaseException,
-) -> Optional[Tuple[int, Optional[str]]]:
+) -> Optional[tuple[int, Optional[str]]]:
     """Walk the exception tree looking for an HTTP 401/403 response from the
     upstream MCP server.
 
@@ -256,8 +256,8 @@ def _extract_upstream_auth_failure(
 
     Returns ``(status_code, www_authenticate)`` on match, else ``None``.
     """
-    seen: Set[int] = set()
-    stack: List[BaseException] = [exc]
+    seen: set[int] = set()
+    stack: list[BaseException] = [exc]
     while stack:
         current = stack.pop()
         if id(current) in seen:
@@ -338,7 +338,7 @@ def _warn_internal_delegate_pkce_if_applicable(server: MCPServer, *, source: str
     )
 
 
-def _deserialize_json_dict(data: Any) -> Optional[Dict[str, str]]:
+def _deserialize_json_dict(data: Any) -> Optional[dict[str, str]]:
     """
     Deserialize optional JSON mappings stored in the database.
 
@@ -359,7 +359,7 @@ def _deserialize_json_dict(data: Any) -> Optional[Dict[str, str]]:
         return data
 
 
-def _deserialize_json_list(data: Any) -> Optional[List[Dict[str, Any]]]:
+def _deserialize_json_list(data: Any) -> Optional[list[dict[str, Any]]]:
     """Deserialize a JSON array stored in the DB (``env_vars`` and friends).
 
     Returns ``None`` for empty / null / unparseable input. Accepts strings
@@ -533,8 +533,8 @@ class MCPServerManager:
         self._cred_provider = cred_provider or UpstreamCredentialProvider(
             oauth_token_store=LazyPerUserOAuthTokenStore(self.get_mcp_server_by_id)
         )
-        self.registry: Dict[str, MCPServer] = {}
-        self.config_mcp_servers: Dict[str, MCPServer] = {}
+        self.registry: dict[str, MCPServer] = {}
+        self.config_mcp_servers: dict[str, MCPServer] = {}
         """
         eg.
         [
@@ -555,18 +555,18 @@ class MCPServerManager:
         # each server's max_concurrent_requests. Keyed by server_id so the cap
         # survives the registry atomic-swap on config reload; a missing key means
         # the server has no configured limit.
-        self._server_call_semaphores: Dict[str, asyncio.Semaphore] = {}
-        self.tool_name_to_mcp_server_name_mapping: Dict[str, str] = {}
+        self._server_call_semaphores: dict[str, asyncio.Semaphore] = {}
+        self.tool_name_to_mcp_server_name_mapping: dict[str, str] = {}
         """
         {
             "gmail_send_email": "zapier_mcp_server",
         }
         """
-        self._upstream_initialize_instructions_by_server_id: Dict[str, str] = {}
+        self._upstream_initialize_instructions_by_server_id: dict[str, str] = {}
         # Per-server monotonic timestamp of last upstream prefetch attempt (success,
         # empty result, or failure). Used to throttle re-probes for servers that do
         # not return instructions, and to apply a short cooldown after failures.
-        self._upstream_initialize_instructions_probed_at: Dict[str, float] = {}
+        self._upstream_initialize_instructions_probed_at: dict[str, float] = {}
 
     def _remember_upstream_initialize_instructions(self, server: MCPServer, client: MCPClient) -> None:
         raw = getattr(client, "_last_initialize_instructions", None)
@@ -622,7 +622,7 @@ class MCPServerManager:
                 user_api_key_auth=None,
                 raise_on_missing=False,
             )
-            extra_headers: Optional[Dict[str, str]] = dict(resolved_static_headers) if resolved_static_headers else None
+            extra_headers: Optional[dict[str, str]] = dict(resolved_static_headers) if resolved_static_headers else None
             client = await self._create_mcp_client(
                 server=server,
                 mcp_auth_header=None,
@@ -642,7 +642,7 @@ class MCPServerManager:
                 e,
             )
 
-    def get_registry(self) -> Dict[str, MCPServer]:
+    def get_registry(self) -> dict[str, MCPServer]:
         """
         Get the registered MCP Servers from the registry and union with the config MCP Servers
         """
@@ -650,8 +650,8 @@ class MCPServerManager:
 
     async def load_servers_from_config(
         self,
-        mcp_servers_config: Dict[str, Any],
-        mcp_aliases: Optional[Dict[str, str]] = None,
+        mcp_servers_config: dict[str, Any],
+        mcp_aliases: Optional[dict[str, str]] = None,
     ):
         """
         Load the MCP Servers from the config
@@ -669,7 +669,7 @@ class MCPServerManager:
 
         for server_name, server_config in mcp_servers_config.items():
             validate_mcp_server_name(server_name)
-            _mcp_info: Dict[str, Any] = server_config.get("mcp_info", None) or {}
+            _mcp_info: dict[str, Any] = server_config.get("mcp_info", None) or {}
             # Preserve all custom fields from config while setting defaults for core fields
             mcp_info: MCPInfo = _mcp_info.copy()
             # Set default values for core fields if not present
@@ -858,7 +858,7 @@ class MCPServerManager:
             server_prefix = get_server_prefix(server)
 
             # Build headers from server configuration
-            headers: Dict[str, str] = {}
+            headers: dict[str, str] = {}
 
             # Add authentication headers if configured
             if server.authentication_token:
@@ -968,7 +968,7 @@ class MCPServerManager:
             openapi_key_prefix = prefix_root + MCP_TOOL_PREFIX_SEPARATOR
             global_mcp_tool_registry.unregister_tools_with_prefix(openapi_key_prefix)
 
-        owned_raw: Set[str] = set()
+        owned_raw: set[str] = set()
         for p in iter_known_server_prefixes(server):
             if p:
                 owned_raw.add(p)
@@ -977,7 +977,7 @@ class MCPServerManager:
 
         owned_normalized = {normalize_server_name(x) for x in owned_raw}
 
-        stale_mapping_keys: List[str] = []
+        stale_mapping_keys: list[str] = []
         for tool_name, mapped_server in list(self.tool_name_to_mcp_server_name_mapping.items()):
             if mapped_server in owned_raw:
                 stale_mapping_keys.append(tool_name)
@@ -1005,7 +1005,7 @@ class MCPServerManager:
         mcp_server: LiteLLM_MCPServerTable,
         *,
         env_vars_are_encrypted: bool,
-    ) -> Optional[List[Dict[str, Any]]]:
+    ) -> Optional[list[dict[str, Any]]]:
         env_vars_list = _deserialize_json_list(getattr(mcp_server, "env_vars", None))
         if env_vars_are_encrypted:
             from litellm.proxy._experimental.mcp_server.db import (  # noqa: PLC0415
@@ -1080,7 +1080,7 @@ class MCPServerManager:
         # AWS SigV4 credential fields
         aws_creds = self._extract_aws_credentials(credentials_dict, credentials_are_encrypted)
 
-        scopes: Optional[List[str]] = None
+        scopes: Optional[list[str]] = None
         if credentials_dict:
             scopes_value = credentials_dict.get("scopes")
             if scopes_value is not None:
@@ -1243,14 +1243,14 @@ class MCPServerManager:
             verbose_logger.debug(f"Failed to udpate MCP server: {str(e)}")
             raise e
 
-    def get_all_mcp_server_ids(self) -> Set[str]:
+    def get_all_mcp_server_ids(self) -> set[str]:
         """
         Get all MCP server IDs
         """
         all_servers = list(self.get_registry().values())
         return {server.server_id for server in all_servers}
 
-    def get_allow_all_keys_server_ids(self) -> List[str]:
+    def get_allow_all_keys_server_ids(self) -> list[str]:
         """Return server IDs that bypass per-key restrictions."""
         return [server.server_id for server in self.get_registry().values() if server.allow_all_keys is True]
 
@@ -1315,7 +1315,7 @@ class MCPServerManager:
 
         return [server_id for server_id in submitted_server_ids if self.get_mcp_server_by_id(server_id) is not None]
 
-    async def get_allowed_mcp_servers(self, user_api_key_auth: Optional[UserAPIKeyAuth] = None) -> List[str]:
+    async def get_allowed_mcp_servers(self, user_api_key_auth: Optional[UserAPIKeyAuth] = None) -> list[str]:
         """
         Get the allowed MCP Servers for the user.
 
@@ -1412,8 +1412,8 @@ class MCPServerManager:
 
     async def resolve_toolset_tool_permissions(
         self,
-        toolset_ids: List[str],
-    ) -> Dict[str, List[str]]:
+        toolset_ids: list[str],
+    ) -> dict[str, list[str]]:
         """
         Resolve a list of toolset IDs into a mcp_tool_permissions dict.
 
@@ -1435,7 +1435,7 @@ class MCPServerManager:
 
         try:
             toolsets = await list_mcp_toolsets(prisma_client, toolset_ids=toolset_ids)
-            tool_permissions: Dict[str, List[str]] = {}
+            tool_permissions: dict[str, list[str]] = {}
             for toolset in toolsets:
                 for tool in toolset.tools:
                     raw_name = tool["tool_name"]
@@ -1528,7 +1528,7 @@ class MCPServerManager:
         )
         return toolset
 
-    def filter_server_ids_by_ip(self, server_ids: List[str], client_ip: Optional[str]) -> List[str]:
+    def filter_server_ids_by_ip(self, server_ids: list[str], client_ip: Optional[str]) -> list[str]:
         """
         Filter server IDs by client IP — external callers only see public servers.
 
@@ -1538,8 +1538,8 @@ class MCPServerManager:
         return filtered
 
     def filter_server_ids_by_ip_with_info(
-        self, server_ids: List[str], client_ip: Optional[str]
-    ) -> Tuple[List[str], int]:
+        self, server_ids: list[str], client_ip: Optional[str]
+    ) -> tuple[list[str], int]:
         """
         Filter server IDs by client IP — external callers only see public servers.
 
@@ -1559,7 +1559,7 @@ class MCPServerManager:
                 blocked += 1
         return allowed, blocked
 
-    async def get_tools_for_server(self, server_id: str) -> List[MCPTool]:
+    async def get_tools_for_server(self, server_id: str) -> list[MCPTool]:
         """
         Get the tools for a given server
         """
@@ -1577,8 +1577,8 @@ class MCPServerManager:
         self,
         user_api_key_auth: Optional[UserAPIKeyAuth] = None,
         mcp_auth_header: Optional[str] = None,
-        mcp_server_auth_headers: Optional[Dict[str, Union[str, Dict[str, str]]]] = None,
-    ) -> List[MCPTool]:
+        mcp_server_auth_headers: Optional[dict[str, Union[str, dict[str, str]]]] = None,
+    ) -> list[MCPTool]:
         """
         List all tools available across all MCP Servers.
 
@@ -1595,7 +1595,7 @@ class MCPServerManager:
 
         verbose_logger.debug("SERVER MANAGER LISTING TOOLS")
 
-        async def _fetch_server_tools(server_id: str) -> List[MCPTool]:
+        async def _fetch_server_tools(server_id: str) -> list[MCPTool]:
             """Fetch tools from a single server with error handling."""
             server = self.get_mcp_server_by_id(server_id)
             if server is None:
@@ -1603,7 +1603,7 @@ class MCPServerManager:
                 return []
 
             # Get server-specific auth header if available
-            server_auth_header: Optional[Union[str, Dict[str, str]]] = None
+            server_auth_header: Optional[Union[str, dict[str, str]]] = None
             if mcp_server_auth_headers:
                 from litellm.proxy._experimental.mcp_server.utils import (
                     lookup_mcp_server_auth_in_headers,
@@ -1637,7 +1637,7 @@ class MCPServerManager:
         results = await asyncio.gather(*tasks)
 
         # Flatten results into single list
-        list_tools_result: List[MCPTool] = [tool for tools in results for tool in tools]
+        list_tools_result: list[MCPTool] = [tool for tools in results for tool in tools]
 
         verbose_logger.info(f"Successfully fetched {len(list_tools_result)} tools total from all servers")
         return list_tools_result
@@ -1647,8 +1647,8 @@ class MCPServerManager:
     #########################################################
     @staticmethod
     def _extract_bearer_token(
-        oauth2_headers: Optional[Dict[str, str]],
-        raw_headers: Optional[Dict[str, str]],
+        oauth2_headers: Optional[dict[str, str]],
+        raw_headers: Optional[dict[str, str]],
     ) -> Optional[str]:
         """Extract the bare Bearer token from oauth2_headers or raw_headers.
 
@@ -1671,14 +1671,14 @@ class MCPServerManager:
     def _build_stdio_env(
         self,
         server: MCPServer,
-        raw_headers: Optional[Dict[str, str]] = None,
-    ) -> Optional[Dict[str, str]]:
+        raw_headers: Optional[dict[str, str]] = None,
+    ) -> Optional[dict[str, str]]:
         """Resolve stdio env values, supporting header-driven placeholders."""
 
         if server.transport != MCPTransport.stdio or not server.env:
             return None
 
-        resolved_env: Dict[str, str] = {}
+        resolved_env: dict[str, str] = {}
         normalized_headers = {k.lower(): v for k, v in (raw_headers or {}).items()}
 
         for env_key, env_value in server.env.items():
@@ -1720,7 +1720,7 @@ class MCPServerManager:
         user_api_key_auth: Optional[UserAPIKeyAuth],
         *,
         raise_on_missing: bool = True,
-    ) -> Optional[Dict[str, str]]:
+    ) -> Optional[dict[str, str]]:
         """Return server.static_headers with ``${NAME}`` interpolated.
 
         Globals come from ``server.env_vars`` entries with ``scope=="global"``.
@@ -1763,7 +1763,7 @@ class MCPServerManager:
         referenced_user_vars = referenced & user_var_names
         required_user_vars = {name for name in referenced_user_vars if name not in global_values}
 
-        user_values: Dict[str, str] = {}
+        user_values: dict[str, str] = {}
         if required_user_vars:
             try:
                 user_values = await self._load_user_env_vars(server, user_api_key_auth)
@@ -1802,7 +1802,7 @@ class MCPServerManager:
         # admin globals win, so a stale row from when a var was user-scoped can
         # never override the global value the admin set after switching it.
         scoped_user_values = {name: value for name, value in user_values.items() if name in user_var_names}
-        merged_vars: Dict[str, str] = {**scoped_user_values, **global_values}
+        merged_vars: dict[str, str] = {**scoped_user_values, **global_values}
         if not static_headers:
             return static_headers
         return interpolate_headers(static_headers, merged_vars)
@@ -1813,7 +1813,7 @@ class MCPServerManager:
         user_api_key_auth: Optional[UserAPIKeyAuth],
         *,
         force_refresh: bool = False,
-    ) -> Dict[str, str]:
+    ) -> dict[str, str]:
         """Look up the calling user's env var values for ``server``.
 
         Returns an empty dict when no user is available. Results are cached in a
@@ -1861,9 +1861,9 @@ class MCPServerManager:
     async def _create_mcp_client(
         self,
         server: MCPServer,
-        mcp_auth_header: Optional[Union[str, Dict[str, str]]] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
-        stdio_env: Optional[Dict[str, str]] = None,
+        mcp_auth_header: Optional[Union[str, dict[str, str]]] = None,
+        extra_headers: Optional[dict[str, str]] = None,
+        stdio_env: Optional[dict[str, str]] = None,
         subject_token: Optional[str] = None,
         user_api_key_auth: Optional[UserAPIKeyAuth] = None,
         cred_provider: Optional[UpstreamCredentialProvider] = None,
@@ -2021,12 +2021,12 @@ class MCPServerManager:
     async def _get_tools_from_server(
         self,
         server: MCPServer,
-        mcp_auth_header: Optional[Union[str, Dict[str, str]]] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
+        mcp_auth_header: Optional[Union[str, dict[str, str]]] = None,
+        extra_headers: Optional[dict[str, str]] = None,
         add_prefix: bool = True,
-        raw_headers: Optional[Dict[str, str]] = None,
+        raw_headers: Optional[dict[str, str]] = None,
         user_api_key_auth: Optional[UserAPIKeyAuth] = None,
-    ) -> List[MCPTool]:
+    ) -> list[MCPTool]:
         """
         Helper method to get tools from a single MCP server with prefixed names.
 
@@ -2160,11 +2160,11 @@ class MCPServerManager:
     async def get_prompts_from_server(
         self,
         server: MCPServer,
-        mcp_auth_header: Optional[Union[str, Dict[str, str]]] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
+        mcp_auth_header: Optional[Union[str, dict[str, str]]] = None,
+        extra_headers: Optional[dict[str, str]] = None,
         add_prefix: bool = True,
-        raw_headers: Optional[Dict[str, str]] = None,
-    ) -> List[Prompt]:
+        raw_headers: Optional[dict[str, str]] = None,
+    ) -> list[Prompt]:
         """
         Helper method to get prompts from a single MCP server with prefixed names.
 
@@ -2209,11 +2209,11 @@ class MCPServerManager:
     async def get_resources_from_server(
         self,
         server: MCPServer,
-        mcp_auth_header: Optional[Union[str, Dict[str, str]]] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
+        mcp_auth_header: Optional[Union[str, dict[str, str]]] = None,
+        extra_headers: Optional[dict[str, str]] = None,
         add_prefix: bool = True,
-        raw_headers: Optional[Dict[str, str]] = None,
-    ) -> List[Resource]:
+        raw_headers: Optional[dict[str, str]] = None,
+    ) -> list[Resource]:
         """Fetch available resources from a single MCP server."""
 
         verbose_logger.debug(f"Connecting to url: {server.url}")
@@ -2249,11 +2249,11 @@ class MCPServerManager:
     async def get_resource_templates_from_server(
         self,
         server: MCPServer,
-        mcp_auth_header: Optional[Union[str, Dict[str, str]]] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
+        mcp_auth_header: Optional[Union[str, dict[str, str]]] = None,
+        extra_headers: Optional[dict[str, str]] = None,
         add_prefix: bool = True,
-        raw_headers: Optional[Dict[str, str]] = None,
-    ) -> List[ResourceTemplate]:
+        raw_headers: Optional[dict[str, str]] = None,
+    ) -> list[ResourceTemplate]:
         """Fetch available resource templates from a single MCP server."""
 
         verbose_logger.debug(f"Connecting to url: {server.url}")
@@ -2292,9 +2292,9 @@ class MCPServerManager:
         self,
         server: MCPServer,
         url: AnyUrl,
-        mcp_auth_header: Optional[Union[str, Dict[str, str]]] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
-        raw_headers: Optional[Dict[str, str]] = None,
+        mcp_auth_header: Optional[Union[str, dict[str, str]]] = None,
+        extra_headers: Optional[dict[str, str]] = None,
+        raw_headers: Optional[dict[str, str]] = None,
     ) -> ReadResourceResult:
         """Read resource contents from a specific MCP server."""
 
@@ -2321,10 +2321,10 @@ class MCPServerManager:
         self,
         server: MCPServer,
         prompt_name: str,
-        arguments: Optional[Dict[str, Any]] = None,
-        mcp_auth_header: Optional[Union[str, Dict[str, str]]] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
-        raw_headers: Optional[Dict[str, str]] = None,
+        arguments: Optional[dict[str, Any]] = None,
+        mcp_auth_header: Optional[Union[str, dict[str, str]]] = None,
+        extra_headers: Optional[dict[str, str]] = None,
+        raw_headers: Optional[dict[str, str]] = None,
     ) -> GetPromptResult:
         """Fetch a specific prompt definition from a single MCP server."""
 
@@ -2468,7 +2468,7 @@ class MCPServerManager:
             verbose_logger.debug("MCP OAuth discovery failed for %s: %s", server_url, exc)
             return None
 
-    def _parse_www_authenticate_header(self, header_value: Optional[str]) -> Tuple[Optional[str], Optional[List[str]]]:
+    def _parse_www_authenticate_header(self, header_value: Optional[str]) -> tuple[Optional[str], Optional[list[str]]]:
         if not header_value:
             return None, None
 
@@ -2476,7 +2476,7 @@ class MCPServerManager:
         params_section = params_section or header_value
 
         param_pattern = re.compile(r"([a-zA-Z0-9_]+)\s*=\s*\"?([^\",]+)\"?")
-        params: Dict[str, str] = {
+        params: dict[str, str] = {
             match.group(1).lower(): match.group(2).strip() for match in param_pattern.finditer(params_section)
         }
 
@@ -2490,7 +2490,7 @@ class MCPServerManager:
 
     async def _fetch_oauth_metadata_from_resource(
         self, resource_metadata_url: str, server_url: str
-    ) -> Tuple[List[str], Optional[List[str]]]:
+    ) -> tuple[list[str], Optional[list[str]]]:
         if not resource_metadata_url:
             return [], None
 
@@ -2525,7 +2525,7 @@ class MCPServerManager:
 
         return authorization_servers, scopes
 
-    async def _attempt_well_known_discovery(self, server_url: str) -> Tuple[List[str], Optional[List[str]]]:
+    async def _attempt_well_known_discovery(self, server_url: str) -> tuple[list[str], Optional[list[str]]]:
         try:
             parsed = urlparse(server_url)
         except Exception:
@@ -2538,7 +2538,7 @@ class MCPServerManager:
         path = parsed.path or ""
         path = path.strip("/")
 
-        candidate_urls: List[str] = []
+        candidate_urls: list[str] = []
         if path:
             candidate_urls.append(f"{base}/.well-known/oauth-protected-resource/{path}")
         candidate_urls.append(f"{base}/.well-known/oauth-protected-resource")
@@ -2554,7 +2554,7 @@ class MCPServerManager:
         return [], None
 
     async def _fetch_authorization_server_metadata(
-        self, authorization_servers: List[str], server_url: str
+        self, authorization_servers: list[str], server_url: str
     ) -> Optional[MCPOAuthMetadata]:
         for issuer in authorization_servers:
             metadata = await self._fetch_single_authorization_server_metadata(issuer, server_url)
@@ -2576,7 +2576,7 @@ class MCPServerManager:
         base = f"{parsed.scheme}://{parsed.netloc}"
         path = (parsed.path or "").strip("/")
 
-        candidate_urls: List[str] = []
+        candidate_urls: list[str] = []
         if path:
             candidate_urls.append(f"{base}/.well-known/oauth-authorization-server/{path}")
             candidate_urls.append(f"{base}/.well-known/openid-configuration/{path}")
@@ -2662,9 +2662,9 @@ class MCPServerManager:
 
     def _extract_aws_credentials(
         self,
-        credentials_dict: Optional[Dict[str, str]],
+        credentials_dict: Optional[dict[str, str]],
         credentials_are_encrypted: bool,
-    ) -> Dict[str, Optional[str]]:
+    ) -> dict[str, Optional[str]]:
         """Extract and decrypt AWS SigV4 credential fields from credentials dict."""
         if not credentials_dict:
             return {}
@@ -2690,7 +2690,7 @@ class MCPServerManager:
             "aws_session_name": credentials_dict.get("aws_session_name"),
         }
 
-    def _extract_scopes(self, scopes_value: Any) -> Optional[List[str]]:
+    def _extract_scopes(self, scopes_value: Any) -> Optional[list[str]]:
         if isinstance(scopes_value, str):
             scopes = [s.strip() for s in scopes_value.split() if s.strip()]
             return scopes or None
@@ -2703,7 +2703,7 @@ class MCPServerManager:
         self,
         client: MCPClient,
         server_name: str,
-    ) -> List[MCPTool]:
+    ) -> list[MCPTool]:
         """
         Fetch tools from MCP client with timeout and error handling.
 
@@ -2760,7 +2760,7 @@ class MCPServerManager:
     def _assign_unique_short_prefix(
         self,
         server: MCPServer,
-        registry: Optional[Dict[str, MCPServer]] = None,
+        registry: Optional[dict[str, MCPServer]] = None,
     ) -> None:
         """Resolve and cache a collision-free short tool prefix on ``server``.
 
@@ -2784,7 +2784,7 @@ class MCPServerManager:
         if not server.server_id:
             return
 
-        used: Dict[str, str] = {}
+        used: dict[str, str] = {}
         registry_for_collision_check = registry or self.get_registry()
         for other in registry_for_collision_check.values():
             if other.server_id == server.server_id:
@@ -2817,7 +2817,7 @@ class MCPServerManager:
             "attempts; the 3-character prefix space is too crowded."
         )
 
-    def _create_prefixed_tools(self, tools: List[MCPTool], server: MCPServer, add_prefix: bool = True) -> List[MCPTool]:
+    def _create_prefixed_tools(self, tools: list[MCPTool], server: MCPServer, add_prefix: bool = True) -> list[MCPTool]:
         """
         Create prefixed tools and update tool mapping.
 
@@ -2855,8 +2855,8 @@ class MCPServerManager:
         return prefixed_tools
 
     def _create_prefixed_prompts(
-        self, prompts: List[Prompt], server: MCPServer, add_prefix: bool = True
-    ) -> List[Prompt]:
+        self, prompts: list[Prompt], server: MCPServer, add_prefix: bool = True
+    ) -> list[Prompt]:
         """
         Create prefixed prompts and update prompt mapping.
 
@@ -2882,11 +2882,11 @@ class MCPServerManager:
         return prefixed_prompts
 
     def _create_prefixed_resources(
-        self, resources: List[Resource], server: MCPServer, add_prefix: bool = True
-    ) -> List[Resource]:
+        self, resources: list[Resource], server: MCPServer, add_prefix: bool = True
+    ) -> list[Resource]:
         """Prefix resource names and track origin server for read requests."""
 
-        prefixed_resources: List[Resource] = []
+        prefixed_resources: list[Resource] = []
         prefix = get_server_prefix(server)
 
         for resource in resources:
@@ -2899,13 +2899,13 @@ class MCPServerManager:
 
     def _create_prefixed_resource_templates(
         self,
-        resource_templates: List[ResourceTemplate],
+        resource_templates: list[ResourceTemplate],
         server: MCPServer,
         add_prefix: bool = True,
-    ) -> List[ResourceTemplate]:
+    ) -> list[ResourceTemplate]:
         """Prefix resource template names for multi-server scenarios."""
 
-        prefixed_templates: List[ResourceTemplate] = []
+        prefixed_templates: list[ResourceTemplate] = []
         prefix = get_server_prefix(server)
 
         for resource_template in resource_templates:
@@ -2938,7 +2938,7 @@ class MCPServerManager:
             )
         return True
 
-    def validate_allowed_params(self, tool_name: str, arguments: Dict[str, Any], server: MCPServer) -> None:
+    def validate_allowed_params(self, tool_name: str, arguments: dict[str, Any], server: MCPServer) -> None:
         """
         Filter arguments to only include allowed parameters for the given tool.
 
@@ -3029,7 +3029,7 @@ class MCPServerManager:
         self,
         server: MCPServer,
         tool_name: str,
-        arguments: Dict[str, Any],
+        arguments: dict[str, Any],
     ) -> CallToolResult:
         """
         Call an OpenAPI tool handler directly.
@@ -3086,13 +3086,13 @@ class MCPServerManager:
     async def pre_call_tool_check(
         self,
         name: str,
-        arguments: Dict[str, Any],
+        arguments: dict[str, Any],
         server_name: str,
         user_api_key_auth: Optional[UserAPIKeyAuth],
         proxy_logging_obj: ProxyLogging,
         server: MCPServer,
-        raw_headers: Optional[Dict[str, str]] = None,
-    ) -> Dict[str, Any]:
+        raw_headers: Optional[dict[str, str]] = None,
+    ) -> dict[str, Any]:
         """
         Run pre-call checks and guardrail hooks for an MCP tool call.
 
@@ -3152,7 +3152,7 @@ class MCPServerManager:
         # Convert to LLM format for existing guardrail compatibility
         synthetic_llm_data = proxy_logging_obj._convert_mcp_to_llm_format(mcp_request_obj, pre_hook_kwargs)
 
-        hook_result: Dict[str, Any] = {}
+        hook_result: dict[str, Any] = {}
         try:
             # Use standard pre_call_hook
             modified_data = await proxy_logging_obj.pre_call_hook(
@@ -3182,7 +3182,7 @@ class MCPServerManager:
     def _create_during_hook_task(
         self,
         name: str,
-        arguments: Dict[str, Any],
+        arguments: dict[str, Any],
         server_name_from_prefix: Optional[str],
         user_api_key_auth: Optional[UserAPIKeyAuth],
         proxy_logging_obj: ProxyLogging,
@@ -3240,15 +3240,15 @@ class MCPServerManager:
         self,
         mcp_server: MCPServer,
         original_tool_name: str,
-        arguments: Dict[str, Any],
-        tasks: List,
+        arguments: dict[str, Any],
+        tasks: list,
         mcp_auth_header: Optional[str],
-        mcp_server_auth_headers: Optional[Dict[str, Dict[str, str]]],
-        oauth2_headers: Optional[Dict[str, str]],
-        raw_headers: Optional[Dict[str, str]],
+        mcp_server_auth_headers: Optional[dict[str, dict[str, str]]],
+        oauth2_headers: Optional[dict[str, str]],
+        raw_headers: Optional[dict[str, str]],
         proxy_logging_obj: Optional[ProxyLogging],
         host_progress_callback: Optional[Callable] = None,
-        hook_extra_headers: Optional[Dict[str, str]] = None,
+        hook_extra_headers: Optional[dict[str, str]] = None,
         user_api_key_auth: Optional[UserAPIKeyAuth] = None,
     ) -> CallToolResult:
         """
@@ -3279,7 +3279,7 @@ class MCPServerManager:
         # Get server-specific auth header if available (case-insensitive)
         # FIX: Added case-insensitive matching to handle auth header keys that may not match
         # the exact case of server alias/name (e.g., '1litellmagcgateway' vs '1LiteLLMAGCGateway')
-        server_auth_header: Optional[Union[Dict[str, str], str]] = None
+        server_auth_header: Optional[Union[dict[str, str], str]] = None
         if mcp_server_auth_headers:
             # Normalize keys for case-insensitive lookup
             from litellm.proxy._experimental.mcp_server.utils import (
@@ -3298,7 +3298,7 @@ class MCPServerManager:
 
         # Extract subject token for OAuth2 Token Exchange (OBO) flow
         subject_token: Optional[str] = None
-        extra_headers: Optional[Dict[str, str]] = None
+        extra_headers: Optional[dict[str, str]] = None
         if mcp_server.auth_type == MCPAuth.oauth2_token_exchange:
             subject_token = self._extract_bearer_token(oauth2_headers, raw_headers)
         elif mcp_server.auth_type == MCPAuth.oauth2:
@@ -3486,9 +3486,9 @@ class MCPServerManager:
     async def _resolve_oauth2_headers_for_tool_call(
         self,
         mcp_server: MCPServer,
-        oauth2_headers: Optional[Dict[str, str]],
+        oauth2_headers: Optional[dict[str, str]],
         user_api_key_auth: Optional[UserAPIKeyAuth],
-    ) -> Optional[Dict[str, str]]:
+    ) -> Optional[dict[str, str]]:
         """Look up per-user OAuth headers when the client did not supply a token."""
         if not mcp_server.needs_user_oauth_token or oauth2_headers or user_api_key_auth is None:
             return oauth2_headers
@@ -3525,7 +3525,7 @@ class MCPServerManager:
 
     async def _gather_openapi_tool_tasks(
         self,
-        tasks: List[Any],
+        tasks: list[Any],
         proxy_logging_obj: Optional[ProxyLogging],
     ) -> CallToolResult:
         """Await OpenAPI tool tasks and return the tool call result."""
@@ -3545,13 +3545,13 @@ class MCPServerManager:
         self,
         server_name: str,
         name: str,
-        arguments: Dict[str, Any],
+        arguments: dict[str, Any],
         user_api_key_auth: Optional[UserAPIKeyAuth] = None,
         mcp_auth_header: Optional[str] = None,
-        mcp_server_auth_headers: Optional[Dict[str, Dict[str, str]]] = None,
+        mcp_server_auth_headers: Optional[dict[str, dict[str, str]]] = None,
         proxy_logging_obj: Optional[ProxyLogging] = None,
-        oauth2_headers: Optional[Dict[str, str]] = None,
-        raw_headers: Optional[Dict[str, str]] = None,
+        oauth2_headers: Optional[dict[str, str]] = None,
+        raw_headers: Optional[dict[str, str]] = None,
         host_progress_callback: Optional[Callable] = None,
     ) -> CallToolResult:
         """
@@ -3578,7 +3578,7 @@ class MCPServerManager:
         # Allow validation and modification of tool calls before execution
         # Using standard pre_call_hook
         #########################################################
-        hook_result: Dict[str, Any] = {}
+        hook_result: dict[str, Any] = {}
         if proxy_logging_obj:
             hook_result = await self.pre_call_tool_check(
                 name=name,
@@ -3704,7 +3704,7 @@ class MCPServerManager:
         # Build prefix → server lookup covering every known form a tool name
         # may take (alias / server_name / server_id / short ID).  This is what
         # makes the short-prefix mode work without breaking historical names.
-        prefix_to_server: Dict[str, MCPServer] = {}
+        prefix_to_server: dict[str, MCPServer] = {}
         for server in registry_servers:
             for known_prefix in iter_known_server_prefixes(server):
                 normalised = normalize_server_name(known_prefix)
@@ -3765,7 +3765,7 @@ class MCPServerManager:
         verbose_logger.info(f"Found {len(db_mcp_servers)} MCP servers in database")
 
         previous_registry = self.registry
-        new_registry: Dict[str, MCPServer] = {}
+        new_registry: dict[str, MCPServer] = {}
 
         # Stage one: build every server.  Stage two assigns short prefixes
         # against the *full* set so dedup is deterministic regardless of
@@ -3811,7 +3811,7 @@ class MCPServerManager:
 
         # Assign short prefixes against the full candidate set without
         # publishing the staged registry to concurrent callers.
-        registered_registry: Dict[str, MCPServer] = {}
+        registered_registry: dict[str, MCPServer] = {}
         registered_openapi_tools = False
         for server_id, new_server in new_registry.items():
             try:
@@ -3837,7 +3837,7 @@ class MCPServerManager:
 
         verbose_logger.debug("MCP registry refreshed (%s servers in registry)", len(registered_registry))
 
-    def get_mcp_servers_from_ids(self, server_ids: List[str]) -> List[MCPServer]:
+    def get_mcp_servers_from_ids(self, server_ids: list[str]) -> list[MCPServer]:
         servers = []
         registry = self.get_registry()
         for server in registry.values():
@@ -3845,7 +3845,7 @@ class MCPServerManager:
                 servers.append(server)
         return servers
 
-    def _get_general_settings(self) -> Dict[str, Any]:
+    def _get_general_settings(self) -> dict[str, Any]:
         """Get general_settings, importing lazily to avoid circular imports."""
         try:
             from litellm.proxy.proxy_server import (
@@ -3888,7 +3888,7 @@ class MCPServerManager:
                 return server
         return None
 
-    def get_public_mcp_servers(self) -> List[MCPServer]:
+    def get_public_mcp_servers(self) -> list[MCPServer]:
         """
         Return the MCP servers published to the AI Hub via /v1/mcp/make_public.
 
@@ -3918,7 +3918,7 @@ class MCPServerManager:
             if server.available_on_public_internet or server.server_id in public_ids
         ]
 
-    def expand_permission_list(self, identifiers: List[str]) -> List[str]:
+    def expand_permission_list(self, identifiers: list[str]) -> list[str]:
         """
         Expand a permission list of server_ids/names/aliases into concrete
         server_ids against the current region's config + DB registry union.
@@ -3934,12 +3934,12 @@ class MCPServerManager:
         if not identifiers:
             return []
         registry = self.get_registry()
-        expanded: Set[str] = set()
+        expanded: set[str] = set()
         for identifier in identifiers:
             if identifier in registry:
                 expanded.add(identifier)
                 continue
-            matches: List[str] = [
+            matches: list[str] = [
                 server_id
                 for server_id, server in registry.items()
                 if server.alias == identifier or server.server_name == identifier or server.name == identifier
@@ -3960,8 +3960,8 @@ class MCPServerManager:
 
     def expand_tool_permissions(
         self,
-        tool_permissions: Optional[Dict[str, List[str]]],
-    ) -> Dict[str, List[str]]:
+        tool_permissions: Optional[dict[str, list[str]]],
+    ) -> dict[str, list[str]]:
         """
         Rewrite an ``mcp_tool_permissions`` dict keyed by id/name/alias so
         every key is a concrete server_id where possible. Tool lists from
@@ -3976,7 +3976,7 @@ class MCPServerManager:
         """
         if not tool_permissions:
             return {}
-        result: Dict[str, List[str]] = {}
+        result: dict[str, list[str]] = {}
         for key, tools in tool_permissions.items():
             for server_id in self.expand_permission_list([key]):
                 result.setdefault(server_id, []).extend(tools or [])
@@ -4017,7 +4017,7 @@ class MCPServerManager:
                 return server
         return None
 
-    def get_filtered_registry(self, client_ip: Optional[str] = None) -> Dict[str, MCPServer]:
+    def get_filtered_registry(self, client_ip: Optional[str] = None) -> dict[str, MCPServer]:
         """
         Get registry filtered by client IP access control.
 
@@ -4186,8 +4186,8 @@ class MCPServerManager:
     async def get_all_mcp_servers_with_health_and_teams(
         self,
         user_api_key_auth: Optional[UserAPIKeyAuth] = None,
-        server_ids: Optional[List[str]] = None,
-    ) -> List[LiteLLM_MCPServerTable]:
+        server_ids: Optional[list[str]] = None,
+    ) -> list[LiteLLM_MCPServerTable]:
         """
         Get all MCP servers that the user has access to, with health status and team information.
 
@@ -4216,7 +4216,7 @@ class MCPServerManager:
     async def get_all_allowed_mcp_servers(
         self,
         user_api_key_auth: Optional[UserAPIKeyAuth] = None,
-    ) -> List[LiteLLM_MCPServerTable]:
+    ) -> list[LiteLLM_MCPServerTable]:
         """
         Get all MCP servers that the user has access to.
 
@@ -4229,7 +4229,7 @@ class MCPServerManager:
         # Get allowed server IDs
         allowed_server_ids = await self.get_allowed_mcp_servers(user_api_key_auth)
 
-        list_mcp_servers: List[LiteLLM_MCPServerTable] = []
+        list_mcp_servers: list[LiteLLM_MCPServerTable] = []
 
         for server_id in allowed_server_ids:
             server = self.get_mcp_server_by_id(server_id)
@@ -4244,8 +4244,8 @@ class MCPServerManager:
 
     @staticmethod
     def _env_vars_to_models(
-        env_vars: Optional[List[Dict[str, Any]]],
-    ) -> Optional[List[MCPEnvVar]]:
+        env_vars: Optional[list[dict[str, Any]]],
+    ) -> Optional[list[MCPEnvVar]]:
         if env_vars is None:
             return None
         return [MCPEnvVar.model_validate(env_var) for env_var in env_vars]
@@ -4291,21 +4291,21 @@ class MCPServerManager:
             max_concurrent_requests=server.max_concurrent_requests,
         )
 
-    async def get_all_mcp_servers_unfiltered(self) -> List[LiteLLM_MCPServerTable]:
+    async def get_all_mcp_servers_unfiltered(self) -> list[LiteLLM_MCPServerTable]:
         """Return all MCP servers from registry without applying access controls."""
 
         registry = self.get_registry()
         if not registry:
             return []
 
-        servers: List[LiteLLM_MCPServerTable] = []
+        servers: list[LiteLLM_MCPServerTable] = []
         for server in registry.values():
             servers.append(self._build_mcp_server_table(server))
         return servers
 
     async def get_all_mcp_servers_with_health_unfiltered(
-        self, server_ids: Optional[List[str]] = None
-    ) -> List[LiteLLM_MCPServerTable]:
+        self, server_ids: Optional[list[str]] = None
+    ) -> list[LiteLLM_MCPServerTable]:
         """Return health info for all servers in registry regardless of user access."""
 
         registry = self.get_registry()
@@ -4322,7 +4322,7 @@ class MCPServerManager:
 
         return await self._run_health_checks(target_server_ids)
 
-    async def _run_health_checks(self, target_server_ids: List[str]) -> List[LiteLLM_MCPServerTable]:
+    async def _run_health_checks(self, target_server_ids: list[str]) -> list[LiteLLM_MCPServerTable]:
         if not target_server_ids:
             return []
 
diff --git a/ruff-strict-budget.json b/ruff-strict-budget.json
index 9c2db6ee9cf..dcf6e9868b7 100644
--- a/ruff-strict-budget.json
+++ b/ruff-strict-budget.json
@@ -222,7 +222,7 @@
     "limit": 38
   },
   "RET504": {
-    "limit": 722
+    "limit": 721
   },
   "RUF010": {
     "limit": 874
@@ -249,7 +249,7 @@
     "limit": 6
   },
   "RUF059": {
-    "limit": 74
+    "limit": 73
   },
   "RUF100": {
     "limit": 480
@@ -306,7 +306,7 @@
     "limit": 9
   },
   "TID251": {
-    "limit": 2714
+    "limit": 2710
   },
   "TRY002": {
     "limit": 548
@@ -324,7 +324,7 @@
     "limit": 883
   },
   "UP006": {
-    "limit": 13041
+    "limit": 12870
   },
   "UP007": {
     "limit": 2570
@@ -354,7 +354,7 @@
     "limit": 4
   },
   "UP035": {
-    "limit": 2300
+    "limit": 2295
   },
   "UP036": {
     "limit": 4
diff --git a/ui/litellm-dashboard/build_ui.sh b/ui/litellm-dashboard/build_ui.sh
index aa346c12edc..a3ab475dc58 100755
--- a/ui/litellm-dashboard/build_ui.sh
+++ b/ui/litellm-dashboard/build_ui.sh
@@ -31,9 +31,6 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-# print contents of ui_colors.json
-echo "Contents of ui_colors.json:"
-cat ui_colors.json
 
 # Run npm build
 npm run build
diff --git a/ui/litellm-dashboard/components.json b/ui/litellm-dashboard/components.json
new file mode 100644
index 00000000000..c4d45aa0989
--- /dev/null
+++ b/ui/litellm-dashboard/components.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": true,
+  "tsx": true,
+  "tailwind": {
+    "config": "",
+    "css": "src/app/globals.css",
+    "baseColor": "gray",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "iconLibrary": "lucide",
+  "aliases": {
+    "components": "@/components",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks",
+    "utils": "@/lib/cva.config"
+  }
+}
diff --git a/ui/litellm-dashboard/eslint-suppressions.json b/ui/litellm-dashboard/eslint-suppressions.json
index 44c0d8f55ef..1c8f92b720f 100644
--- a/ui/litellm-dashboard/eslint-suppressions.json
+++ b/ui/litellm-dashboard/eslint-suppressions.json
@@ -4,6 +4,150 @@
       "count": 1
     }
   },
+  "src/app/(dashboard)/budgets/components/budget_modal.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/budgets/components/budget_panel.test.tsx": {
+    "unused-imports/no-unused-imports": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/budgets/components/budget_panel.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/budgets/components/edit_budget_modal.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/caching/components/cache_dashboard.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/purity": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/caching/components/cache_health.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/caching/components/cache_settings/RedisTypeSelector.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/caching/components/cache_settings/index.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/add_margin_form.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/add_provider_form.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/cost_tracking_settings.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/how_it_works.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.test.tsx": {
+    "unused-imports/no-unused-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_export_dropdown.test.tsx": {
+    "unused-imports/no-unused-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_export_dropdown.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/use_multi_cost_estimate.ts": {
+    "no-restricted-syntax": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/provider_discount_table.test.tsx": {
+    "unused-imports/no-unused-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/provider_discount_table.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/provider_display_helpers.test.ts": {
+    "unused-imports/no-unused-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/provider_margin_table.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/use_discount_config.ts": {
+    "no-restricted-syntax": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/cost-tracking/components/use_margin_config.ts": {
+    "no-restricted-syntax": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/guardrails-monitor/components/EvaluationSettingsModal.tsx": {
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/guardrails-monitor/components/GuardrailsMonitorView.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/guardrails-monitor/components/ScoreChart.test.tsx": {
+    "react/display-name": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/guardrails-monitor/components/ScoreChart.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
   "src/app/(dashboard)/hooks/accessGroups/useAccessGroupDetails.ts": {
     "no-restricted-syntax": {
       "count": 1
@@ -164,6 +308,11 @@
       "count": 2
     }
   },
+  "src/app/(dashboard)/memory/components/MemoryView.tsx": {
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
   "src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -203,11 +352,338 @@
       "count": 1
     }
   },
+  "src/app/(dashboard)/playground/components/chat_ui/AdditionalModelSettings.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/playground/components/chat_ui/AgentBuilderView.tsx": {
+    "react-hooks/set-state-in-effect": {
+      "count": 5
+    }
+  },
+  "src/app/(dashboard)/playground/components/chat_ui/ChatImageUtils.test.tsx": {
+    "max-nested-callbacks": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/components/chat_ui/ChatUI.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 4
+    },
+    "unused-imports/no-unused-imports": {
+      "count": 13
+    }
+  },
+  "src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterOutput.tsx": {
+    "no-restricted-syntax": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterTool.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/components/chat_ui/RealtimePlayground.tsx": {
+    "react-hooks/immutability": {
+      "count": 2
+    },
+    "react-hooks/preserve-manual-memoization": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/components/compareUI/CompareUI.tsx": {
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/components/complianceUI/ComplianceUI.tsx": {
+    "react-hooks/preserve-manual-memoization": {
+      "count": 3
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/a2a_send_message.tsx": {
+    "max-params": {
+      "count": 2
+    },
+    "no-restricted-syntax": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/anthropic_messages.tsx": {
+    "max-params": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/audio_speech.tsx": {
+    "max-params": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/audio_transcriptions.tsx": {
+    "max-params": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/embeddings_api.tsx": {
+    "max-params": {
+      "count": 1
+    },
+    "no-restricted-syntax": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/fetch_agents.tsx": {
+    "no-restricted-syntax": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/image_edits.tsx": {
+    "max-params": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/image_generation.tsx": {
+    "max-params": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/playground/llm_calls/interactions_api.tsx": {
+    "max-params": {
+      "count": 1
+    },
+    "no-restricted-syntax": {
+      "count": 1
+    }
+  },
   "src/app/(dashboard)/playground/page.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
+  "src/app/(dashboard)/projects/components/ProjectDetailsPage.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/projects/components/ProjectKeysSection.tsx": {
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/projects/components/ProjectModals/ProjectBaseForm.tsx": {
+    "react-hooks/set-state-in-effect": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/projects/components/ProjectsPage.tsx": {
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/add_prompt_form.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/index.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/DeveloperMessageCard.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/ModelConfigCard.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/PromptCodeSnippets.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/PromptEditorHeader.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/PromptMessagesCard.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/PublishModal.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/ToolsCard.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/VersionHistorySidePanel.test.tsx": {
+    "max-nested-callbacks": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/VersionHistorySidePanel.tsx": {
+    "react-hooks/immutability": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/MessageInput.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/index.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/useConversation.ts": {
+    "no-restricted-syntax": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_info.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 2
+    }
+  },
+  "src/app/(dashboard)/prompts/components/prompt_table.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/search-tools/_components/SearchToolTester.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/search-tools/_components/SearchToolView.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/search-tools/_components/SearchTools.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/static-components": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/transform-request/TransformRequestPanel.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/ui-theme/UIThemeSettings.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "no-restricted-syntax": {
+      "count": 3
+    },
+    "react-hooks/immutability": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/DefaultUserSettings.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/edit_user.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/user_edit_view.test.tsx": {
+    "react/display-name": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/user_edit_view.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/view_users.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/view_users/columns.tsx": {
+    "max-params": {
+      "count": 1
+    },
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/view_users/table.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/users/_components/view_users/user_info_view.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
+  "src/app/(dashboard)/workflows/WorkflowRuns.tsx": {
+    "no-restricted-syntax": {
+      "count": 3
+    },
+    "react-hooks/set-state-in-effect": {
+      "count": 1
+    }
+  },
   "src/app/login/LoginPage.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 2
@@ -293,81 +769,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/cost-tracking/components/add_margin_form.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/add_provider_form.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/cost_tracking_settings.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/how_it_works.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.test.tsx": {
-    "unused-imports/no-unused-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_export_dropdown.test.tsx": {
-    "unused-imports/no-unused-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_export_dropdown.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/pricing_calculator/use_multi_cost_estimate.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/provider_discount_table.test.tsx": {
-    "unused-imports/no-unused-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/provider_discount_table.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/provider_display_helpers.test.ts": {
-    "unused-imports/no-unused-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/provider_margin_table.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/use_discount_config.ts": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/cost-tracking/components/use_margin_config.ts": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
   "src/components/CreateUserButton.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -376,11 +777,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/users/_components/DefaultUserSettings.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/DeletedKeysPage/DeletedKeysTable/DeletedKeysTable.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -419,36 +815,11 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/guardrails-monitor/components/EvaluationSettingsModal.tsx": {
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/guardrails-monitor/components/GuardrailsMonitorView.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/guardrails-monitor/components/ScoreChart.test.tsx": {
-    "react/display-name": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/guardrails-monitor/components/ScoreChart.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/HelpLink.test.tsx": {
     "unused-imports/no-unused-imports": {
       "count": 1
     }
   },
-  "src/app/(dashboard)/memory/components/MemoryView.tsx": {
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "src/components/Navbar/BlogDropdown/BlogDropdown.test.tsx": {
     "max-nested-callbacks": {
       "count": 12
@@ -472,26 +843,6 @@
       "count": 4
     }
   },
-  "src/app/(dashboard)/projects/components/ProjectDetailsPage.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/projects/components/ProjectKeysSection.tsx": {
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/projects/components/ProjectModals/ProjectBaseForm.tsx": {
-    "react-hooks/set-state-in-effect": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/projects/components/ProjectsPage.tsx": {
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "src/components/SCIM.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -505,32 +856,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/search-tools/_components/SearchToolTester.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/search-tools/_components/SearchToolView.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/search-tools/_components/SearchTools.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/static-components": {
-      "count": 1
-    }
-  },
   "src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 1
@@ -750,7 +1075,7 @@
       "count": 1
     },
     "react-hooks/set-state-in-effect": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/agents/add_agent_form.tsx": {
@@ -790,26 +1115,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/budgets/components/budget_modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/budgets/components/budget_panel.test.tsx": {
-    "unused-imports/no-unused-imports": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/budgets/components/budget_panel.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/budgets/components/edit_budget_modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/bulk_create_users_button.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -818,35 +1123,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/caching/components/cache_dashboard.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/purity": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/caching/components/cache_health.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/caching/components/cache_settings/RedisTypeSelector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/caching/components/cache_settings/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "src/components/claude_code_plugins.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -996,11 +1272,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/users/_components/edit_user.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/email_events/email_event_settings.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1133,6 +1404,16 @@
       "count": 1
     }
   },
+  "src/components/llm_calls/chat_completion.tsx": {
+    "max-params": {
+      "count": 1
+    }
+  },
+  "src/components/llm_calls/responses_api.tsx": {
+    "max-params": {
+      "count": 1
+    }
+  },
   "src/components/mcp_hub_table_columns.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1459,132 +1740,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/playground/components/chat_ui/AdditionalModelSettings.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/playground/components/chat_ui/AgentBuilderView.tsx": {
-    "react-hooks/set-state-in-effect": {
-      "count": 5
-    }
-  },
-  "src/app/(dashboard)/playground/components/chat_ui/ChatImageUtils.test.tsx": {
-    "max-nested-callbacks": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/components/chat_ui/ChatUI.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 4
-    },
-    "unused-imports/no-unused-imports": {
-      "count": 13
-    }
-  },
-  "src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterOutput.tsx": {
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterTool.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/components/chat_ui/RealtimePlayground.tsx": {
-    "react-hooks/immutability": {
-      "count": 2
-    },
-    "react-hooks/preserve-manual-memoization": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/components/compareUI/CompareUI.tsx": {
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/components/complianceUI/ComplianceUI.tsx": {
-    "react-hooks/preserve-manual-memoization": {
-      "count": 3
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/a2a_send_message.tsx": {
-    "max-params": {
-      "count": 2
-    },
-    "no-restricted-syntax": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/anthropic_messages.tsx": {
-    "max-params": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/audio_speech.tsx": {
-    "max-params": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/audio_transcriptions.tsx": {
-    "max-params": {
-      "count": 1
-    }
-  },
-  "src/components/llm_calls/chat_completion.tsx": {
-    "max-params": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/embeddings_api.tsx": {
-    "max-params": {
-      "count": 1
-    },
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/fetch_agents.tsx": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/image_edits.tsx": {
-    "max-params": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/image_generation.tsx": {
-    "max-params": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/playground/llm_calls/interactions_api.tsx": {
-    "max-params": {
-      "count": 1
-    },
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
-  "src/components/llm_calls/responses_api.tsx": {
-    "max-params": {
-      "count": 1
-    }
-  },
   "src/components/policies/add_attachment_form.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1700,87 +1855,6 @@
       "count": 2
     }
   },
-  "src/app/(dashboard)/prompts/components/add_prompt_form.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/DeveloperMessageCard.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/ModelConfigCard.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/PromptCodeSnippets.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/PromptEditorHeader.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/PromptMessagesCard.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/PublishModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/ToolsCard.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/VersionHistorySidePanel.test.tsx": {
-    "max-nested-callbacks": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/VersionHistorySidePanel.tsx": {
-    "react-hooks/immutability": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/MessageInput.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/useConversation.ts": {
-    "no-restricted-syntax": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_info.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/prompts/components/prompt_table.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/public_model_hub.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1909,22 +1983,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/transform-request/TransformRequestPanel.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/ui-theme/UIThemeSettings.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "no-restricted-syntax": {
-      "count": 3
-    },
-    "react-hooks/immutability": {
-      "count": 1
-    }
-  },
   "src/components/usage.tsx": {
     "no-restricted-imports": {
       "count": 2
@@ -1952,19 +2010,6 @@
       "count": 2
     }
   },
-  "src/app/(dashboard)/users/_components/user_edit_view.test.tsx": {
-    "react/display-name": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/users/_components/user_edit_view.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "src/components/vector_store_management/CreateVectorStore.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -2042,43 +2087,6 @@
       "count": 2
     }
   },
-  "src/app/(dashboard)/users/_components/view_users.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/users/_components/view_users/columns.tsx": {
-    "max-params": {
-      "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/users/_components/view_users/table.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/users/_components/view_users/user_info_view.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/workflows/WorkflowRuns.tsx": {
-    "no-restricted-syntax": {
-      "count": 3
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "src/contexts/AuthContext.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 1
@@ -2132,16 +2140,6 @@
       "count": 1
     }
   },
-  "tailwind.config.js": {
-    "@typescript-eslint/no-require-imports": {
-      "count": 4
-    }
-  },
-  "tailwind.config.ts": {
-    "@typescript-eslint/no-require-imports": {
-      "count": 3
-    }
-  },
   "tests/CreateKeyPage.expiredToken.test.tsx": {
     "@typescript-eslint/no-require-imports": {
       "count": 3
@@ -2157,13 +2155,5 @@
     "react/display-name": {
       "count": 1
     }
-  },
-  "src/app/(dashboard)/prompts/components/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 1
-    }
   }
-}
+}
\ No newline at end of file
diff --git a/ui/litellm-dashboard/knip.json b/ui/litellm-dashboard/knip.json
index 6f129398981..58fa202a39a 100644
--- a/ui/litellm-dashboard/knip.json
+++ b/ui/litellm-dashboard/knip.json
@@ -3,7 +3,13 @@
   "entry": ["scripts/**/*.{ts,mjs}"],
   "project": ["src/**/*.{ts,tsx}", "tests/**/*.{ts,tsx}", "scripts/**/*.{ts,mjs}", "e2e_tests/**/*.ts"],
   "ignore": ["src/lib/http/schema.d.ts"],
-  "ignoreDependencies": ["openapi-typescript"],
+  "ignoreDependencies": [
+    "openapi-typescript",
+    "@headlessui/tailwindcss",
+    "@tailwindcss/forms",
+    "tailwindcss",
+    "tw-animate-css"
+  ],
   "playwright": {
     "config": "e2e_tests/playwright.config.ts",
     "entry": ["e2e_tests/**/*.spec.ts", "e2e_tests/**/*.setup.ts", "e2e_tests/globalSetup.ts"]
diff --git a/ui/litellm-dashboard/package-lock.json b/ui/litellm-dashboard/package-lock.json
index 828edde278b..298c3f9321a 100644
--- a/ui/litellm-dashboard/package-lock.json
+++ b/ui/litellm-dashboard/package-lock.json
@@ -8,6 +8,7 @@
       "name": "litellm-dashboard",
       "version": "0.1.0",
       "dependencies": {
+        "@ant-design/cssinjs": "1.24.0",
         "@anthropic-ai/sdk": "0.92.0",
         "@headlessui/tailwindcss": "0.2.2",
         "@heroicons/react": "1.0.6",
@@ -26,6 +27,7 @@
         "next": "16.2.6",
         "openai": "4.104.0",
         "papaparse": "5.5.3",
+        "radix-ui": "1.6.1",
         "react": "18.3.1",
         "react-copy-to-clipboard": "5.1.1",
         "react-dom": "18.3.1",
@@ -39,6 +41,7 @@
         "@eslint/js": "9.39.2",
         "@playwright/test": "1.58.1",
         "@tailwindcss/forms": "0.5.11",
+        "@tailwindcss/postcss": "4.3.2",
         "@testing-library/dom": "10.4.1",
         "@testing-library/jest-dom": "6.9.1",
         "@testing-library/react": "16.3.2",
@@ -51,7 +54,6 @@
         "@types/react-syntax-highlighter": "15.5.13",
         "@vitest/coverage-v8": "3.2.6",
         "@vitest/ui": "3.2.6",
-        "autoprefixer": "10.4.24",
         "eslint": "9.39.2",
         "eslint-config-next": "16.2.6",
         "eslint-config-prettier": "10.1.8",
@@ -61,7 +63,8 @@
         "openapi-typescript": "7.13.0",
         "postcss": "8.5.13",
         "prettier": "3.2.5",
-        "tailwindcss": "3.4.19",
+        "tailwindcss": "4.3.2",
+        "tw-animate-css": "1.4.0",
         "typescript": "5.9.3",
         "typescript-eslint": "8.60.1",
         "vitest": "3.2.6"
@@ -89,6 +92,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
       "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -2048,6 +2052,7 @@
       "version": "0.3.13",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
       "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -2069,6 +2074,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -2078,12 +2084,14 @@
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
       "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.31",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
       "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -2257,6 +2265,7 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
@@ -2270,6 +2279,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -2279,6 +2289,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -2604,6 +2615,1512 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@radix-ui/number": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.2.tgz",
+      "integrity": "sha512-ceTwaxc4I5IOi97DgCotl3pqiyRGvffcc0oOsE2dQYaJOFIDsDt4VWG6xEbg1QePv9QWausCEIppud/tJ1wNig==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/primitive": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.4.tgz",
+      "integrity": "sha512-7AdCK9PQyiljKoBDbN8OuctCbd/esdwZPQ8RtOE3SsyQtUpiPb+ND75q0jEhC1m1ecBI0MFNeLJvwIh9iKHRcQ==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/react-accessible-icon": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accessible-icon/-/react-accessible-icon-1.1.11.tgz",
+      "integrity": "sha512-HQDOFTKwSnmUij6l54wYJJtxTAnxI71+YJLOrjm2ladFB8HAV5Jt7hwaZPhWTGBkYoW4+ZAOfNZrLDh/qvxSYA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-visually-hidden": "1.2.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-accordion": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.15.tgz",
+      "integrity": "sha512-24Zz/0SYx8F2bSVThBnQrdJs2VbKelyuJordcFRRdA0fRAhrq/wSegGCqaQz34VQoiWqSMGYCYXEhynLSlyQlg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collapsible": "1.1.15",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-alert-dialog": {
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.18.tgz",
+      "integrity": "sha512-6c2cXpNlAgHDhKguK24XcWHHayMpK+lk7/WwBXBco+ZJ4Dv7xP++GBM280KgTD/HCRu3jSdfe8WQiZssonYaIA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-dialog": "1.1.18",
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-arrow": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.11.tgz",
+      "integrity": "sha512-Kdil9BB1rIFC/khmf4hC35bn8701AJcizTU7G7cUbEbk5XqqbjDuHW60uUfKqO5WojjZcbAW51Q7P0hRmMLw8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-aspect-ratio": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-aspect-ratio/-/react-aspect-ratio-1.1.11.tgz",
+      "integrity": "sha512-IUAhIVpBUvP5NNICjlaB1OFmtRLGqQqTF3ZOSGPoq3XeLXRFtHiWTRxSVEULgOd9GQR2c7tsYqDnhUennapZnw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-avatar": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.2.1.tgz",
+      "integrity": "sha512-+8PWoLLZv3AVb5m0pvoiOca/bQGzc9vPVb+982HB2x3Un0DpYEPM3zLMl4oqRpBsocJuNqLkiv/HXTnTrlwr4g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-is-hydrated": "0.1.1",
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-checkbox": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.6.tgz",
+      "integrity": "sha512-eUEUoGMDpfkgHWSE97ZZaUJtzR1M7EKnNIpD1Q16+8JR9NWghcaqMulx9PuCQ720w0UclfYn6FEbCdd5Hx087g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-previous": "1.1.2",
+        "@radix-ui/react-use-size": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-collapsible": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.15.tgz",
+      "integrity": "sha512-8A1zibu5skAQ+UVbaeNH5hVMibiFCRJzgMuM14LTWGttnTZKQL9jwYnhAbHRuxrtCqPXa4JvvnVUq1pTNgyZYw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-collection": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.11.tgz",
+      "integrity": "sha512-djW9+zeg137KQdlPtmE8xnaD+K2rcXXMWFrSg0hsmYZ6HRbdTA7tDHFgpaW9+huWVEu0RCabL+985T4TA0BE7g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-slot": "1.3.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.3.tgz",
+      "integrity": "sha512-rYOP8OMnuuPMQF1uhPVlGNcCDlkokKqGFE3JcxFViIkAXP7EvFWUliJAstrapypaBLJNHbZL6jGhbVDGTwmVhA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.4.tgz",
+      "integrity": "sha512-QwH4PO5urrbO+FaGd5Aglg+YJgWTyyuZ3g/6mKvsqraLkglDdckw9JafgL5McL5VEJ6EPNduPaT3ZE9BttDAqg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context-menu": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context-menu/-/react-context-menu-2.3.2.tgz",
+      "integrity": "sha512-qzsA/ZPhF6yMxBOTIk1nlCkoy2mswSbwYL+ErBa2iP0s4WWrlxmczArYqMcpVfEjmM7KJj/ADPXky0yZfbSxtQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-menu": "2.1.19",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog": {
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.18.tgz",
+      "integrity": "sha512-apa28mldjMgORmE6g/w3sCcA0Y9UAVeeDVoozN4i7kOw12mLl9RBchfzK3Nn6qxOWjrZhK1Lfy7f07kyzxtnBw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-focus-guards": "1.1.4",
+        "@radix-ui/react-focus-scope": "1.1.11",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-slot": "1.3.0",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.7.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-direction": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.2.tgz",
+      "integrity": "sha512-C3vFhbyi4SW3PmbAi6Awpu4OzJtd0MxGurvSsYtr7p7nM8RNB3VAF3CUmnp2j50knpkrRcB7+ycVXzgLgF6yNA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dismissable-layer": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.14.tgz",
+      "integrity": "sha512-4lUhWTWAjbDIqFrAPWJ3WqBOpO5YchVZ88X3nh6H9Lu5AFi5nCUeTPj3D8FSDmabmFeRe9ME0BDA4MwKTha5GQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-effect-event": "0.0.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dropdown-menu": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.19.tgz",
+      "integrity": "sha512-HZccBkbK0LOi8nYKIp5jll/zIRW0cCOmG6WWyqsSpmXCU+ZlcBbTqIwlBvPCu886C5RVu6c/kHV7xSP8IgYNHw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-menu": "2.1.19",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-guards": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.4.tgz",
+      "integrity": "sha512-cot/aB/mOm0IYVYTTmQcEEK1M48lZWi8FlYe5nDPQQ8NYZUlXEFgncJ9p2Kzer3RKSrY7cTTpEMLZKNo9QoP5Q==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.11.tgz",
+      "integrity": "sha512-Mn88Vg2whaRocGJNOH+DKFqYm6ySFPQaiwHNxZPyjn99B52KAEJWWY9NP83+nWdk2HM3rdov+STu9AG471Rt9w==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-form": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-form/-/react-form-0.1.11.tgz",
+      "integrity": "sha512-0mTMJHv1gQAuEQoq5VDpTD3MRgmfUFdXAVFhpqR7wBeUr+tyRsof0wv/4XdPHLwQrefhoH2FiGHCggrCJhalIw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-label": "2.1.11",
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-hover-card": {
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.18.tgz",
+      "integrity": "sha512-rt+Fx4HoCeEwFL2IdoV2QaPltqDLlzxN77i9nwB3Y70scFlfAHh1QCdE2TXKuFJtA1TNygb0oivnFBZifgtZOw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-popper": "1.3.2",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-id": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.2.tgz",
+      "integrity": "sha512-orBC88futVpqCmhX1p4cvquNHsELQ+w+vBJnuj3ftETI5bJb0bZn3Tqu3SWN2IOcPycTnMGnhwoermvISt72sA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-label": {
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.11.tgz",
+      "integrity": "sha512-3PKvDDxOn62k0oV1n4QtNtD2vpu+zYjXR7ojLBPaO6SPvhy53yg0vAmgNeBQeJW5rV3dffoRG+HYfLBZuzw0CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-menu": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.19.tgz",
+      "integrity": "sha512-Mht9BVd1AIsNFVQr4KG3bIK7XQn5IXF0TL/2ObsrzOdc1loaly/+kBDL5roSCYn8j8XZkvpOD0WYLz2FQtH1Eg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-focus-guards": "1.1.4",
+        "@radix-ui/react-focus-scope": "1.1.11",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-popper": "1.3.2",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-slot": "1.3.0",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.7.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-menubar": {
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menubar/-/react-menubar-1.1.19.tgz",
+      "integrity": "sha512-Glt6mebxcgQvLeVkH3HiqV5bgQubE+31ELxLs7q0GlYI5k0XYkOkeuPrhXoylxK8eufvIt9CJjzY1TfFMXK3qw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-menu": "2.1.19",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-navigation-menu": {
+      "version": "1.2.17",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.17.tgz",
+      "integrity": "sha512-fYeYQvbeNn5AQk2RBbpO7koLm2YbS00UYxC/IL2sgLlninEH5UNIv+X3E0KJ1Vy4WIo+dhN9w8GNqSHhbHWCIg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-layout-effect": "1.1.2",
+        "@radix-ui/react-use-previous": "1.1.2",
+        "@radix-ui/react-visually-hidden": "1.2.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-one-time-password-field": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-one-time-password-field/-/react-one-time-password-field-0.1.11.tgz",
+      "integrity": "sha512-Rsgab65u73E5kPVh8OS6PgPwJgPyf08GFfJDGAbMdF4DL7CgDhFOaDnXuk/DiMEVF6kgQwl0oJmFklvipmiOLg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.2",
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-effect-event": "0.0.3",
+        "@radix-ui/react-use-is-hydrated": "0.1.1",
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-password-toggle-field": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-password-toggle-field/-/react-password-toggle-field-0.1.6.tgz",
+      "integrity": "sha512-pQ3xGp/uemomASPH97Eb3shfXX8QlG11bBJyEvRBV+vwtO4HvQlS06Yj9f31Ao7XepvF98SFrRgVDQ7jv+2xjQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-effect-event": "0.0.3",
+        "@radix-ui/react-use-is-hydrated": "0.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popover": {
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.18.tgz",
+      "integrity": "sha512-qdXDes+eHlnMUGlBAAAe5EG7oOQvqsXuq4mq585diMudg80iB+jHbsSeG3+Q4eWNsogNyhqU2p/3i+Y0iEepqg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-focus-guards": "1.1.4",
+        "@radix-ui/react-focus-scope": "1.1.11",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-popper": "1.3.2",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-slot": "1.3.0",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.7.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popper": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.3.2.tgz",
+      "integrity": "sha512-3QXNeMkdshed1MR3LNoiCirBywRFPkD8ETJa/HlPuLwSajaQixf2ro+isoDNJlGABg9ug41XuZpINZJIle4XWg==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.0.0",
+        "@radix-ui/react-arrow": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-layout-effect": "1.1.2",
+        "@radix-ui/react-use-rect": "1.1.2",
+        "@radix-ui/react-use-size": "1.1.2",
+        "@radix-ui/rect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popper/node_modules/@floating-ui/react-dom": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.8.tgz",
+      "integrity": "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.7.6"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@radix-ui/react-portal": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.13.tgz",
+      "integrity": "sha512-z3oXfmaHLJTF1wktbjgD6cn9jiEbq3WSondB10LIuIt2m2Ym4iJlrW04/euMwENDdWDdE7z+OuY7Qyp1YpRSwA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-presence": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.6.tgz",
+      "integrity": "sha512-zdTk4PlUO0E18HnZ3wYbW0KkJJxWCdiNYp6g6X1PtONFhxVkg01vliTJAmwIszU6mHiyBOoW9P0rAugl5/hULQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.7.tgz",
+      "integrity": "sha512-bC3NiwsprbxKjuon9l7X6BUTw7FPVzEYaL92MPEY5SCd/9hUTPXVFtVwRix7778wtRsVao+zE062gL79FZleeQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.3.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-progress": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.11.tgz",
+      "integrity": "sha512-KqiGJcFaZDc+BvveAgU3ZhACg2MvSUDrCBx4lRR/ZVRNal0bvt8lBpvnSkep9heeOuF8Qfw3fszLDX4OpQ2NVw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-radio-group": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.4.2.tgz",
+      "integrity": "sha512-W8Uo9riHnlzLLWy+r2mVHUyuEWqD/+be4PZzbEvaGoFSBDHkm+GYWjtcE6u3AmPKNyfanWpnVfpZ2GqPCdzzsw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-previous": "1.1.2",
+        "@radix-ui/react-use-size": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-roving-focus": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.14.tgz",
+      "integrity": "sha512-8Qcnx9447tx/aCBgw6Jenfqg4Skq+vqab9mCBmuGNipIS5YXvL275wbKEu7+ICYHIlAPgCduUMJH1XOYewKF6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-scroll-area": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.13.tgz",
+      "integrity": "sha512-7tncSubo2G0UY1e8rk+72qe3XRzrGnOLtZQ1PL1KoBfRUNX0NrJT5akb+0kfwSCc3gVR4wdHqyhAQBDpDNOwDw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.2",
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-select": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.3.2.tgz",
+      "integrity": "sha512-brXD6C/V0fVK0DDbscLVw6LsXrjQ+ay8jdOBaN+tLb4vsHsAMm6Gt6eT77wHX1Eq8GPtD5rJ+RxFtfDozsb4+Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.2",
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-focus-guards": "1.1.4",
+        "@radix-ui/react-focus-scope": "1.1.11",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-popper": "1.3.2",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-slot": "1.3.0",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-layout-effect": "1.1.2",
+        "@radix-ui/react-use-previous": "1.1.2",
+        "@radix-ui/react-visually-hidden": "1.2.7",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.7.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-separator": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.11.tgz",
+      "integrity": "sha512-jRhe86+8PF7VZ1u14eOWVOuh2BuAhALg/FT1VcMC4OHedMTRUazDnDlKTt+yxo5cRNKHMfmvZ4sSQtWDeMV4CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slider": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.4.2.tgz",
+      "integrity": "sha512-qt5C1ppJz66aUDrH1VccjPrq7aFchK0wBrn6xsxlCHNUyE57dRRQ7lp1QFpF7OscMexZF8MCGBTVBlENHPkNiA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.2",
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-layout-effect": "1.1.2",
+        "@radix-ui/react-use-previous": "1.1.2",
+        "@radix-ui/react-use-size": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slot": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.0.tgz",
+      "integrity": "sha512-MojKku4U/miO8Av4Dkb+ctMAQx7JmY96LmtDQlAarCRtd7rN52QCSzBF+XAvr5S6coSVj9HEPBgHAHKEJVk/WA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-switch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.3.2.tgz",
+      "integrity": "sha512-tgRBI3DdNwAJYE4BBZyZcz/HRRCvAsPkRvG1wvKc+41tBGMxPn/a87T/wikXAvyDypNQ9kaZwHbeZe+veHCGpA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-previous": "1.1.2",
+        "@radix-ui/react-use-size": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-tabs": {
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.16.tgz",
+      "integrity": "sha512-v3Ab2l7z6U7tRB4xA0IyKdq0OsqaO1o9ZjsIEoKKnSZ/l96mZz8aCTX0NCXw+YVHJXr8Km4d+Mn6/Q8YjXa+gw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toast": {
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.18.tgz",
+      "integrity": "sha512-YNEnTHV47hPep+U0QvVM02OJNka9uygREc+k4Nh5VSZBg4MmE+myI442x3hCGfRpX7N2WSSYSJKws4gE+Z8lgg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-layout-effect": "1.1.2",
+        "@radix-ui/react-visually-hidden": "1.2.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toggle": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.13.tgz",
+      "integrity": "sha512-bI2ILJrzwgmAsH05TsJ9pVrzqQwAip7OM2/krqAdYn0R16bl86UPWbe5VPHsALat0EnqpV01cGtkleaUKPNdNg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toggle-group": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.14.tgz",
+      "integrity": "sha512-TK1vusNKb8IRhF23FTbRgUNZ9zfs5rGIyI7LfR3h26p9LrQ060i0uW9QWeD8baZMddaaP0DBGlIa6pbZG+mitg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-toggle": "1.1.13",
+        "@radix-ui/react-use-controllable-state": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toolbar": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.14.tgz",
+      "integrity": "sha512-L/EkWVqlnj3lL2toHh4C7PwH2jxfa7OCq6lGfXSCii99ve2S4Ux5rc9HnOa7LN9exHa/Nl9kmCAmP9BuDPy5UA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-separator": "1.1.11",
+        "@radix-ui/react-toggle-group": "1.1.14"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-tooltip": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.11.tgz",
+      "integrity": "sha512-8XZ6Py3y3W2nEzAUGCN5cfVKaUi+CVApcz1d6lrNVVf2hvYEixMRkq8k9ggPKnQUpRRuOV5avt8uvxViH2jLwA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-id": "1.1.2",
+        "@radix-ui/react-popper": "1.3.2",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-slot": "1.3.0",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-visually-hidden": "1.2.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-callback-ref": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.2.tgz",
+      "integrity": "sha512-xCso9j1/u8sEgP1RNHjFrXJLApL8LiqOkI1R4ywuN00rxWdYg4oQXuwKLS3i0j5NWLromUD27/4nlxj2UFVvIw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.3.tgz",
+      "integrity": "sha512-PLzC90MS+ReootmjC597dvopoelpZ8Q61HJkDXZSExitIq7PL55vHNnesAHwguHK0aPfBnpdNzQtv1uliaqQrA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-effect-event": "0.0.3",
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-effect-event": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.3.tgz",
+      "integrity": "sha512-6c8ZqvPTWILEKnyVkP53EGRCcpnJiKTC21sS/6R1GF5xKyHJJWQEPfkqlcgUkdRQivd6tb23abUwe4ngWmY0JA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-escape-keydown": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.3.tgz",
+      "integrity": "sha512-3wEkMiPHXha/2VadZ68rYBcmYnPINVGl4Y3gtcM7fKRjANk0OscK+cdqBgUWdozb7YJxsh0vefM7vgAMHXOjqg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-callback-ref": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-is-hydrated": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.1.tgz",
+      "integrity": "sha512-qwOiz4Tjo8CNnrOLAYUMXeZwDzXgXpvK4TKQPmWLECM9XoWvA6+0Z2/7Ag3A4ivjS4ovbLJPbskkxioFyBhr8A==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.2.tgz",
+      "integrity": "sha512-jrBWOxZITuGcnjRCM2t2U5ZPkCLxD+Ym6DjfssS5haTj2iiak/DOb64JeN6OdLfLgptb6/e2kKR+ZuTrGoZTPA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-previous": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.2.tgz",
+      "integrity": "sha512-IGBQPtRFdhN6MQ8dbegVmBq1LVZluya3F1jWY+puIcQC3MHctRwTDSBWCkL/3ZcnMJLTMJ++Z+ktmvg0F89iCw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-rect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.2.tgz",
+      "integrity": "sha512-d8a+bBY/FxikNPlgJJoaBHZX+zKVbWHYJGTLnLvveQgFSTntkGdEKv3JDtHrMS0DNYpllz2nRsTLGLKYttbpmw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/rect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-size": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.2.tgz",
+      "integrity": "sha512-giWQp+4mxjBPt4KZ0MmyuykFNWfbDxKt4x+fPkRYmgRFJSbCZFzUglvMb/Kjn38tm10YP4ufiQZDx3zna4LU6w==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-visually-hidden": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.7.tgz",
+      "integrity": "sha512-1wNZBggTDK3GRuuQ6nP4k2yi7a6l7I5qbMPbZcRsrGsGVead/f/d5FhEzUvqFs0bcrDLx7n1zKQ3JvLR6whaaw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/rect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.2.tgz",
+      "integrity": "sha512-xnXE7wG13PI+cxieVssYXlQJuYVRhH9NBoxt3KNwzghDIA69GMm7d4wXRouHIYjE+KvS6U/MsMO73NdS2MH9ZA==",
+      "license": "MIT"
+    },
     "node_modules/@rc-component/async-validator": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@rc-component/async-validator/-/async-validator-5.1.0.tgz",
@@ -3221,6 +4738,277 @@
         "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20 || >= 4.0.0-beta.1"
       }
     },
+    "node_modules/@tailwindcss/node": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.3.2.tgz",
+      "integrity": "sha512-yWP/sqEcBLaD8JuA6zNwxoYKr75qxTioYwlRwekj5Jr/I5GXnoJfjetH/psLUIv74cYTH2lBUEzBkinthoYcBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/remapping": "^2.3.5",
+        "enhanced-resolve": "5.21.6",
+        "jiti": "^2.7.0",
+        "lightningcss": "1.32.0",
+        "magic-string": "^0.30.21",
+        "source-map-js": "^1.2.1",
+        "tailwindcss": "4.3.2"
+      }
+    },
+    "node_modules/@tailwindcss/oxide": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.3.2.tgz",
+      "integrity": "sha512-z8ZgnzX8gdNoWLBLqBPoh/sjnxkwvf9ZuWjnO0l0yIzbLa5/9S+eC5QxGZKRobVHIC3/1BoMWjHblqWjcgFgag==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 20"
+      },
+      "optionalDependencies": {
+        "@tailwindcss/oxide-android-arm64": "4.3.2",
+        "@tailwindcss/oxide-darwin-arm64": "4.3.2",
+        "@tailwindcss/oxide-darwin-x64": "4.3.2",
+        "@tailwindcss/oxide-freebsd-x64": "4.3.2",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.3.2",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.3.2",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.3.2",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.3.2",
+        "@tailwindcss/oxide-linux-x64-musl": "4.3.2",
+        "@tailwindcss/oxide-wasm32-wasi": "4.3.2",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.3.2",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.3.2"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-android-arm64": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.3.2.tgz",
+      "integrity": "sha512-WHxqIuHpvZ5VtdX6GTl1Ik/Vp2YuN42Et+0CdeaVd/frQ9jAvGmvR8vLT+jk3e8/Q3x8kECB9+R17pgpp2BulA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-darwin-arm64": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.3.2.tgz",
+      "integrity": "sha512-GZypeUY/IDJW3877KeM+O67vbXr3MBnbtEL4aYhNErv/JWZhye2vGSWWG9tB6iiqR2MqRNkY8IOUy4NdSZV26w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-darwin-x64": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.3.2.tgz",
+      "integrity": "sha512-UIIzmefR6KO1sDU7MzRqAxC8iBpft/VhkGjTjnhoS6k7Z3rQ9wEgA1ODSiyH/tcSYssulNm4Ci3hOeK1jH7ccQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-freebsd-x64": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.3.2.tgz",
+      "integrity": "sha512-GN+uAmcI6DNspnCDwtOAZrTz6oukJnp337qZvxqCGLd3BHBzJpO0ZbTLRvJNdztOeAmTzewewGIMPb0tk2R4WA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.3.2.tgz",
+      "integrity": "sha512-4ABn7qSbdHRwTiDiuWNegCyb5+2FJ4vKIKc3DmKrvAFw7MU1Lm11dIkTPwUaFdTzc7IsOpDbqBrlh0x6y36U/w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.3.2.tgz",
+      "integrity": "sha512-wDgEIGwoM8w8pufh9LVt1PahDgNdKXrLC2qfAnV3vAmococ9RWbxeAw4pxPttd/TsJfwjyLf90Dg1y9y8I6Emw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.3.2.tgz",
+      "integrity": "sha512-J5Nuk0uZQIiMTJj3LEx4sAA9tMFUoXQZFv1J6An+QGYe53HKRJuFDi0rpq/tuouCZeAbOBY3kQ6g8qeD4TUjtA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.3.2.tgz",
+      "integrity": "sha512-kqCZpSKOBEJO4mz7OqWoofBZeXTAwaVGPj0ErAj7CojmhKpWVWVOnrt9dE8odoIraZq4oj3ausM37kXi+Tow8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-x64-musl": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.3.2.tgz",
+      "integrity": "sha512-cixpqbh2toJDmkuCRI68nXA8ZxNmdK9Y+9v5h3MC3ZQKy/0BO8AWzlkWyRM7JAFSGBlfig4YVTPsK6MVgqz1uw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.3.2.tgz",
+      "integrity": "sha512-4ec2Z/LOmRsAgU23CS4xeJfcJlmRg94A/XrbGRCF1gyU/zdDfRLYDVsS+ynSZCmGNxQ1jQriQOKMQeQxBA3Isw==",
+      "bundleDependencies": [
+        "@napi-rs/wasm-runtime",
+        "@emnapi/core",
+        "@emnapi/runtime",
+        "@tybys/wasm-util",
+        "@emnapi/wasi-threads",
+        "tslib"
+      ],
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.11.1",
+        "@emnapi/runtime": "^1.11.1",
+        "@emnapi/wasi-threads": "^1.2.2",
+        "@napi-rs/wasm-runtime": "^1.1.4",
+        "@tybys/wasm-util": "^0.10.2",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.2.tgz",
+      "integrity": "sha512-Zyr/M0+XcYZu3bZrUytc7TXvrk0ftWfl8gN2MwekNDzhqhKRUucMPSeOzM0o0wH5AWOU49BsKRrfKxI2atCPMQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.3.2.tgz",
+      "integrity": "sha512-QI9BO7KlNZsp2GuO0jwAAj5jCDABOKXRkCk2XuKTSaNEFSdfzqswYVTtCHBNKHLsqyjFyFkqlDiwkNbTYSssMQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@tailwindcss/postcss": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.3.2.tgz",
+      "integrity": "sha512-rjVWYCa7Ngbi5AarT6k8TkxUG3Wl1QKzHdIZVsjZSzf36Jmo2IKZt/NHRAwly8oDkbBOH0YTu+CHuf9jPxMc+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@alloc/quick-lru": "^5.2.0",
+        "@tailwindcss/node": "4.3.2",
+        "@tailwindcss/oxide": "4.3.2",
+        "postcss": "^8.5.15",
+        "tailwindcss": "4.3.2"
+      }
+    },
     "node_modules/@tanstack/pacer": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@tanstack/pacer/-/pacer-0.2.0.tgz",
@@ -3685,7 +5473,7 @@
       "version": "18.3.7",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
       "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "^18.0.0"
@@ -4590,43 +6378,6 @@
         "react-dom": ">=16.9.0"
       }
     },
-    "node_modules/any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-      "license": "MIT"
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "license": "ISC",
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/anymatch/node_modules/picomatch": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/arg": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-      "license": "MIT"
-    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -4868,43 +6619,6 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "license": "MIT"
     },
-    "node_modules/autoprefixer": {
-      "version": "10.4.24",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.24.tgz",
-      "integrity": "sha512-uHZg7N9ULTVbutaIsDRoUkoS8/h3bdsmVJYZ5l3wv8Cp/6UIIoRDm90hZ+BwxUj/hGBEzLxdHNSKuFpn8WOyZw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.28.1",
-        "caniuse-lite": "^1.0.30001766",
-        "fraction.js": "^5.3.4",
-        "picocolors": "^1.1.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -4983,18 +6697,6 @@
         "require-from-string": "^2.0.2"
       }
     },
-    "node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
@@ -5012,6 +6714,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
@@ -5123,15 +6826,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001791",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz",
@@ -5253,42 +6947,6 @@
         "node": ">= 16"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/classnames": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
@@ -5359,15 +7017,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/commander": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/compute-scroll-into-view": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.1.tgz",
@@ -5426,18 +7075,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "license": "MIT",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/cssstyle": {
       "version": "5.3.7",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.7.tgz",
@@ -5820,12 +7457,18 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "devOptional": true,
       "license": "Apache-2.0",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/detect-node-es": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+      "license": "MIT"
+    },
     "node_modules/devlop": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
@@ -5839,18 +7482,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "license": "MIT"
-    },
     "node_modules/doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -5909,6 +7540,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/enhanced-resolve": {
+      "version": "5.21.6",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.6.tgz",
+      "integrity": "sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/entities": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz",
@@ -6750,6 +8395,7 @@
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
       "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
@@ -6782,6 +8428,7 @@
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
       "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
@@ -6819,6 +8466,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -6940,24 +8588,11 @@
         "node": ">= 12.20"
       }
     },
-    "node_modules/fraction.js": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
-      "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/rawify"
-      }
-    },
     "node_modules/fsevents": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -7052,6 +8687,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-nonce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+      "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/get-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
@@ -7118,6 +8762,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
@@ -7168,6 +8813,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/has-bigints": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
@@ -7641,18 +9293,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-boolean-object": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
@@ -7697,6 +9337,7 @@
       "version": "2.16.2",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz",
       "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.3"
@@ -7757,6 +9398,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -7802,6 +9444,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -7850,6 +9493,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -8123,10 +9767,10 @@
       }
     },
     "node_modules/jiti": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
-      "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
-      "devOptional": true,
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.7.0.tgz",
+      "integrity": "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "jiti": "lib/jiti-cli.mjs"
@@ -8444,23 +10088,266 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lilconfig": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-      "license": "MIT",
+    "node_modules/lightningcss": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
+      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "detect-libc": "^2.0.3"
+      },
       "engines": {
-        "node": ">=14"
+        "node": ">= 12.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/antonk52"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "lightningcss-android-arm64": "1.32.0",
+        "lightningcss-darwin-arm64": "1.32.0",
+        "lightningcss-darwin-x64": "1.32.0",
+        "lightningcss-freebsd-x64": "1.32.0",
+        "lightningcss-linux-arm-gnueabihf": "1.32.0",
+        "lightningcss-linux-arm64-gnu": "1.32.0",
+        "lightningcss-linux-arm64-musl": "1.32.0",
+        "lightningcss-linux-x64-gnu": "1.32.0",
+        "lightningcss-linux-x64-musl": "1.32.0",
+        "lightningcss-win32-arm64-msvc": "1.32.0",
+        "lightningcss-win32-x64-msvc": "1.32.0"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "license": "MIT"
+    "node_modules/lightningcss-android-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
+      "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
+      "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-x64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
+      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-freebsd-x64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
+      "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm-gnueabihf": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
+      "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-gnu": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
+      "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-musl": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
+      "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-gnu": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
+      "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-musl": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
+      "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-arm64-msvc": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
+      "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
+      "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
@@ -8774,6 +10661,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 8"
@@ -9225,6 +11113,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -9238,6 +11127,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
       "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -9348,17 +11238,6 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "license": "MIT",
-      "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
     "node_modules/nanoid": {
       "version": "3.3.12",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
@@ -9560,15 +11439,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -9578,15 +11448,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -9978,6 +11839,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/path-scurry": {
@@ -10024,6 +11886,7 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -10032,24 +11895,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
-      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/playwright": {
       "version": "1.58.1",
       "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.1.tgz",
@@ -10130,155 +11975,6 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/postcss-import": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-      "license": "MIT",
-      "dependencies": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/postcss-import/node_modules/resolve": {
-      "version": "1.22.12",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
-      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "is-core-module": "^2.16.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/postcss-js": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz",
-      "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "camelcase-css": "^2.0.1"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >= 16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.21"
-      }
-    },
-    "node_modules/postcss-load-config": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz",
-      "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "lilconfig": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "jiti": ">=1.21.0",
-        "postcss": ">=8.0.9",
-        "tsx": "^4.8.1",
-        "yaml": "^2.4.2"
-      },
-      "peerDependenciesMeta": {
-        "jiti": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "tsx": {
-          "optional": true
-        },
-        "yaml": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/postcss-nested": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
-      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "postcss-selector-parser": "^6.1.1"
-      },
-      "engines": {
-        "node": ">=12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.14"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "license": "MIT"
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -10383,6 +12079,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -10399,6 +12096,83 @@
       ],
       "license": "MIT"
     },
+    "node_modules/radix-ui": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/radix-ui/-/radix-ui-1.6.1.tgz",
+      "integrity": "sha512-QXDXJtB6sK83mLASONYUZCauatcWb+knFviFpN1EhtdbbmlsRmzCLrbZSKztnNiem2KOHIBbiDbauVB7SORXMw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.4",
+        "@radix-ui/react-accessible-icon": "1.1.11",
+        "@radix-ui/react-accordion": "1.2.15",
+        "@radix-ui/react-alert-dialog": "1.1.18",
+        "@radix-ui/react-arrow": "1.1.11",
+        "@radix-ui/react-aspect-ratio": "1.1.11",
+        "@radix-ui/react-avatar": "1.2.1",
+        "@radix-ui/react-checkbox": "1.3.6",
+        "@radix-ui/react-collapsible": "1.1.15",
+        "@radix-ui/react-collection": "1.1.11",
+        "@radix-ui/react-compose-refs": "1.1.3",
+        "@radix-ui/react-context": "1.1.4",
+        "@radix-ui/react-context-menu": "2.3.2",
+        "@radix-ui/react-dialog": "1.1.18",
+        "@radix-ui/react-direction": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.14",
+        "@radix-ui/react-dropdown-menu": "2.1.19",
+        "@radix-ui/react-focus-guards": "1.1.4",
+        "@radix-ui/react-focus-scope": "1.1.11",
+        "@radix-ui/react-form": "0.1.11",
+        "@radix-ui/react-hover-card": "1.1.18",
+        "@radix-ui/react-label": "2.1.11",
+        "@radix-ui/react-menu": "2.1.19",
+        "@radix-ui/react-menubar": "1.1.19",
+        "@radix-ui/react-navigation-menu": "1.2.17",
+        "@radix-ui/react-one-time-password-field": "0.1.11",
+        "@radix-ui/react-password-toggle-field": "0.1.6",
+        "@radix-ui/react-popover": "1.1.18",
+        "@radix-ui/react-popper": "1.3.2",
+        "@radix-ui/react-portal": "1.1.13",
+        "@radix-ui/react-presence": "1.1.6",
+        "@radix-ui/react-primitive": "2.1.7",
+        "@radix-ui/react-progress": "1.1.11",
+        "@radix-ui/react-radio-group": "1.4.2",
+        "@radix-ui/react-roving-focus": "1.1.14",
+        "@radix-ui/react-scroll-area": "1.2.13",
+        "@radix-ui/react-select": "2.3.2",
+        "@radix-ui/react-separator": "1.1.11",
+        "@radix-ui/react-slider": "1.4.2",
+        "@radix-ui/react-slot": "1.3.0",
+        "@radix-ui/react-switch": "1.3.2",
+        "@radix-ui/react-tabs": "1.1.16",
+        "@radix-ui/react-toast": "1.2.18",
+        "@radix-ui/react-toggle": "1.1.13",
+        "@radix-ui/react-toggle-group": "1.1.14",
+        "@radix-ui/react-toolbar": "1.1.14",
+        "@radix-ui/react-tooltip": "1.2.11",
+        "@radix-ui/react-use-callback-ref": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.2.3",
+        "@radix-ui/react-use-effect-event": "0.0.3",
+        "@radix-ui/react-use-escape-keydown": "1.1.3",
+        "@radix-ui/react-use-is-hydrated": "0.1.1",
+        "@radix-ui/react-use-layout-effect": "1.1.2",
+        "@radix-ui/react-use-size": "1.1.2",
+        "@radix-ui/react-visually-hidden": "1.2.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/rc-cascader": {
       "version": "3.34.0",
       "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.34.0.tgz",
@@ -11130,6 +12904,53 @@
         "react": ">=18"
       }
     },
+    "node_modules/react-remove-scroll": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz",
+      "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==",
+      "license": "MIT",
+      "dependencies": {
+        "react-remove-scroll-bar": "^2.3.7",
+        "react-style-singleton": "^2.2.3",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.3",
+        "use-sidecar": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-remove-scroll-bar": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
+      "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
+      "license": "MIT",
+      "dependencies": {
+        "react-style-singleton": "^2.2.2",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-smooth": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz",
@@ -11162,6 +12983,28 @@
         "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
       }
     },
+    "node_modules/react-style-singleton": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
+      "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "get-nonce": "^1.0.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-syntax-highlighter": {
       "version": "15.6.6",
       "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.6.6.tgz",
@@ -11205,39 +13048,6 @@
         "react-dom": ">=16.8.0"
       }
     },
-    "node_modules/read-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-      "license": "MIT",
-      "dependencies": {
-        "pify": "^2.3.0"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/recharts": {
       "version": "2.15.4",
       "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.4.tgz",
@@ -11538,6 +13348,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
       "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
@@ -11593,6 +13404,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -12229,28 +14041,6 @@
       "integrity": "sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==",
       "license": "MIT"
     },
-    "node_modules/sucrase": {
-      "version": "3.35.1",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz",
-      "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==",
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "commander": "^4.0.0",
-        "lines-and-columns": "^1.1.6",
-        "mz": "^2.7.0",
-        "pirates": "^4.0.1",
-        "tinyglobby": "^0.2.11",
-        "ts-interface-checker": "^0.1.9"
-      },
-      "bin": {
-        "sucrase": "bin/sucrase",
-        "sucrase-node": "bin/sucrase-node"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12268,6 +14058,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -12300,98 +14091,23 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.19",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz",
-      "integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@alloc/quick-lru": "^5.2.0",
-        "arg": "^5.0.2",
-        "chokidar": "^3.6.0",
-        "didyoumean": "^1.2.2",
-        "dlv": "^1.1.3",
-        "fast-glob": "^3.3.2",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "jiti": "^1.21.7",
-        "lilconfig": "^3.1.3",
-        "micromatch": "^4.0.8",
-        "normalize-path": "^3.0.0",
-        "object-hash": "^3.0.0",
-        "picocolors": "^1.1.1",
-        "postcss": "^8.4.47",
-        "postcss-import": "^15.1.0",
-        "postcss-js": "^4.0.1",
-        "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0",
-        "postcss-nested": "^6.2.0",
-        "postcss-selector-parser": "^6.1.2",
-        "resolve": "^1.22.8",
-        "sucrase": "^3.35.0"
-      },
-      "bin": {
-        "tailwind": "lib/cli.js",
-        "tailwindcss": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.2.tgz",
+      "integrity": "sha512-WtctNNSH8A9jlMIqxzuYumOHU5uGZyRv0Q5svQl+oEPy5w84YpBxdb7MdqyiSPQge5jTJ6zFQLq0PFygdccSBA==",
+      "license": "MIT"
     },
-    "node_modules/tailwindcss/node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+    "node_modules/tapable": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
+      "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
-      },
       "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/jiti": {
-      "version": "1.21.7",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-      "license": "MIT",
-      "bin": {
-        "jiti": "bin/jiti.js"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/resolve": {
-      "version": "1.22.12",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
-      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "is-core-module": "^2.16.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/test-exclude": {
@@ -12409,27 +14125,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/thenify": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "license": "MIT",
-      "dependencies": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "node_modules/thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-      "license": "MIT",
-      "dependencies": {
-        "thenify": ">= 3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/throttle-debounce": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
@@ -12463,6 +14158,7 @@
       "version": "0.2.16",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
       "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
@@ -12529,6 +14225,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -12618,12 +14315,6 @@
         "typescript": ">=4.8.4"
       }
     },
-    "node_modules/ts-interface-checker": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-      "license": "Apache-2.0"
-    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -12643,6 +14334,16 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
+    "node_modules/tw-animate-css": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/tw-animate-css/-/tw-animate-css-1.4.0.tgz",
+      "integrity": "sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/Wombosvideo"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -12980,6 +14681,49 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/use-callback-ref": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
+      "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-sidecar": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
+      "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/use-sync-external-store": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
@@ -12989,12 +14733,6 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "license": "MIT"
-    },
     "node_modules/uuid": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.0.tgz",
diff --git a/ui/litellm-dashboard/package.json b/ui/litellm-dashboard/package.json
index 0097e8c6559..d4ca1805fb7 100644
--- a/ui/litellm-dashboard/package.json
+++ b/ui/litellm-dashboard/package.json
@@ -24,6 +24,7 @@
     "gen:api": "node scripts/gen-api-types.mjs"
   },
   "dependencies": {
+    "@ant-design/cssinjs": "1.24.0",
     "@anthropic-ai/sdk": "0.92.0",
     "@headlessui/tailwindcss": "0.2.2",
     "@heroicons/react": "1.0.6",
@@ -42,6 +43,7 @@
     "next": "16.2.6",
     "openai": "4.104.0",
     "papaparse": "5.5.3",
+    "radix-ui": "1.6.1",
     "react": "18.3.1",
     "react-copy-to-clipboard": "5.1.1",
     "react-dom": "18.3.1",
@@ -55,6 +57,7 @@
     "@eslint/js": "9.39.2",
     "@playwright/test": "1.58.1",
     "@tailwindcss/forms": "0.5.11",
+    "@tailwindcss/postcss": "4.3.2",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.2",
@@ -67,7 +70,6 @@
     "@types/react-syntax-highlighter": "15.5.13",
     "@vitest/coverage-v8": "3.2.6",
     "@vitest/ui": "3.2.6",
-    "autoprefixer": "10.4.24",
     "eslint": "9.39.2",
     "eslint-config-next": "16.2.6",
     "eslint-config-prettier": "10.1.8",
@@ -77,7 +79,8 @@
     "openapi-typescript": "7.13.0",
     "postcss": "8.5.13",
     "prettier": "3.2.5",
-    "tailwindcss": "3.4.19",
+    "tailwindcss": "4.3.2",
+    "tw-animate-css": "1.4.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.60.1",
     "vitest": "3.2.6"
diff --git a/ui/litellm-dashboard/postcss.config.js b/ui/litellm-dashboard/postcss.config.js
index 12a703d900d..483f378543c 100644
--- a/ui/litellm-dashboard/postcss.config.js
+++ b/ui/litellm-dashboard/postcss.config.js
@@ -1,6 +1,5 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
+    "@tailwindcss/postcss": {},
   },
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/api-reference/components/DocLink.tsx b/ui/litellm-dashboard/src/app/(dashboard)/api-reference/components/DocLink.tsx
index a3d0416053e..a3b34360246 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/api-reference/components/DocLink.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/api-reference/components/DocLink.tsx
@@ -1,9 +1,7 @@
 import React from "react";
 import { ExternalLink } from "lucide-react";
 
-function cn(...parts: Array<string | undefined>) {
-  return parts.filter(Boolean).join(" ");
-}
+import { cn } from "@/lib/cva.config";
 
 export type DocLinkProps = {
   href?: string;
@@ -18,8 +16,8 @@ const DocLink = ({ href, className }: DocLinkProps) => {
       rel="noopener noreferrer"
       title="Open documentation in a new tab"
       className={cn(
-        "inline-flex items-center gap-2 rounded-xl border border-zinc-200 bg-white/80 px-3.5 py-2 text-sm font-medium text-zinc-700 shadow-sm",
-        "hover:bg-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 active:translate-y-[0.5px]",
+        "inline-flex items-center gap-2 rounded-xl border border-zinc-200 bg-white/80 px-3.5 py-2 text-sm font-medium text-zinc-700 shadow-xs",
+        "hover:bg-white focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-blue-500 active:translate-y-[0.5px]",
         className,
       )}
     >
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 92bbc14846f..887c12a4f3d 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
@@ -151,7 +151,7 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
   };
 
   return (
-    <div className="bg-white rounded-lg shadow">
+    <div className="bg-white rounded-lg shadow-sm">
       <TabGroup>
         <TabList className="border-b border-gray-200 px-4">
           <Tab className="px-4 py-2 text-sm font-medium text-gray-600 hover:text-gray-800">Summary</Tab>
@@ -225,7 +225,7 @@ const HealthCheckDetails: React.FC<{ response: any }> = ({ response }) => {
 
           <TabPanel className="p-4">
             <div className="bg-gray-50 rounded-md p-4 font-mono text-sm">
-              <pre className="whitespace-pre-wrap break-words overflow-auto max-h-[500px]">
+              <pre className="whitespace-pre-wrap wrap-break-word overflow-auto max-h-[500px]">
                 {(() => {
                   try {
                     const data = {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/cost_tracking_settings.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/cost_tracking_settings.tsx
index 22ea8d8d517..b32e7afd756 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/cost_tracking_settings.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/cost_tracking_settings.tsx
@@ -175,7 +175,7 @@ const CostTrackingSettings: React.FC<CostTrackingSettingsProps> = ({ userID, use
       </div>
 
       {/* Main Content Card with Accordions */}
-      <div className="bg-white rounded-lg shadow w-full max-w-full space-y-4">
+      <div className="bg-white rounded-lg shadow-sm w-full max-w-full space-y-4">
         {/* Accordion 1: Provider Discounts - Only for proxy admins */}
         {isProxyAdmin && (
           <Accordion>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/how_it_works.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/how_it_works.tsx
index baaf44222ae..79abf6baa31 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/how_it_works.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/how_it_works.tsx
@@ -31,7 +31,7 @@ const HowItWorks: React.FC = () => {
         <Text className="font-medium text-gray-900 text-sm mb-1">Cost Calculation</Text>
         <Text className="text-xs text-gray-600">
           Discounts are applied to provider costs:{" "}
-          <code className="bg-gray-100 px-1.5 py-0.5 rounded text-xs">
+          <code className="bg-gray-100 px-1.5 py-0.5 rounded-sm text-xs">
             final_cost = base_cost × (1 - discount%/100)
           </code>
         </Text>
@@ -65,19 +65,19 @@ const HowItWorks: React.FC = () => {
         <Text className="text-xs text-gray-600 mt-3 mb-2">Look for these headers in the response:</Text>
         <div className="space-y-1.5">
           <div className="flex items-start gap-3">
-            <code className="bg-gray-100 px-2 py-1 rounded text-xs font-mono text-gray-800 whitespace-nowrap">
+            <code className="bg-gray-100 px-2 py-1 rounded-sm text-xs font-mono text-gray-800 whitespace-nowrap">
               x-litellm-response-cost
             </code>
             <Text className="text-xs text-gray-600">Final cost after discount</Text>
           </div>
           <div className="flex items-start gap-3">
-            <code className="bg-gray-100 px-2 py-1 rounded text-xs font-mono text-gray-800 whitespace-nowrap">
+            <code className="bg-gray-100 px-2 py-1 rounded-sm text-xs font-mono text-gray-800 whitespace-nowrap">
               x-litellm-response-cost-original
             </code>
             <Text className="text-xs text-gray-600">Original cost before discount</Text>
           </div>
           <div className="flex items-start gap-3">
-            <code className="bg-gray-100 px-2 py-1 rounded text-xs font-mono text-gray-800 whitespace-nowrap">
+            <code className="bg-gray-100 px-2 py-1 rounded-sm text-xs font-mono text-gray-800 whitespace-nowrap">
               x-litellm-response-cost-discount-amount
             </code>
             <Text className="text-xs text-gray-600">Amount discounted</Text>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.tsx
index 26d77d3be0f..3ea7ea58127 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/components/pricing_calculator/multi_cost_results.tsx
@@ -201,9 +201,9 @@ const MultiCostResults: React.FC<MultiCostResultsProps> = ({ multiResult, timePe
             )}
             {record.loading && <Spin indicator={<LoadingOutlined spin />} size="small" />}
           </div>
-          {record.error && <div className="text-xs text-red-600 bg-red-50 px-2 py-1 rounded">⚠️ {record.error}</div>}
+          {record.error && <div className="text-xs text-red-600 bg-red-50 px-2 py-1 rounded-sm">⚠️ {record.error}</div>}
           {record.hasZeroCost && !record.error && (
-            <div className="text-xs text-amber-600 bg-amber-50 px-2 py-1 rounded">
+            <div className="text-xs text-amber-600 bg-amber-50 px-2 py-1 rounded-sm">
               ⚠️ No pricing data found for this model. Set base_model in config.
             </div>
           )}
@@ -295,7 +295,7 @@ const MultiCostResults: React.FC<MultiCostResultsProps> = ({ multiResult, timePe
       </div>
 
       {/* Combined Totals - Always show when there are results */}
-      <Card size="small" className="bg-gradient-to-r from-slate-50 to-blue-50 border-slate-200">
+      <Card size="small" className="bg-linear-to-r from-slate-50 to-blue-50 border-slate-200">
         <Row gutter={[16, 8]}>
           <Col xs={24} sm={12}>
             <Statistic
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/components/GuardrailsOverview.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/components/GuardrailsOverview.tsx
index 519c5e1789d..9d57f36f93f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/components/GuardrailsOverview.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/components/GuardrailsOverview.tsx
@@ -242,7 +242,7 @@ export function GuardrailsOverview({
         )}
         <div className="px-6 py-4 border-b border-gray-200 flex items-start justify-between gap-4">
           <div>
-            <Typography.Title level={5} className="!mb-0 text-gray-900">
+            <Typography.Title level={5} className="mb-0! text-gray-900">
               Guardrail Performance
             </Typography.Title>
             <p className="text-xs text-gray-500 mt-0.5">Click a guardrail to view details, logs, and configuration</p>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx
index 85793ab7d15..b24c376c9e0 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/ModelsAndEndpointsView.tsx
@@ -331,7 +331,7 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
           {/* Missing Provider Banner */}
           {showMissingProviderBanner && (
             <div className="mb-4 px-4 py-3 bg-blue-50 rounded-lg border border-blue-100 flex items-center gap-4">
-              <div className="flex-shrink-0 w-10 h-10 bg-white rounded-full flex items-center justify-center border border-blue-200">
+              <div className="shrink-0 w-10 h-10 bg-white rounded-full flex items-center justify-center border border-blue-200">
                 <PlusCircleOutlined style={{ fontSize: "18px", color: "#6366f1" }} />
               </div>
               <div className="flex-1 min-w-0">
@@ -345,7 +345,7 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
                 href="https://models.litellm.ai/?request=true"
                 target="_blank"
                 rel="noopener noreferrer"
-                className="flex-shrink-0 inline-flex items-center gap-2 px-4 py-2 bg-[#6366f1] hover:bg-[#5558e3] text-white text-sm font-medium rounded-lg transition-colors"
+                className="shrink-0 inline-flex items-center gap-2 px-4 py-2 bg-[#6366f1] hover:bg-[#5558e3] text-white text-sm font-medium rounded-lg transition-colors"
               >
                 Request Provider
                 <svg
@@ -368,7 +368,7 @@ const ModelsAndEndpointsView: React.FC<ModelDashboardProps> = ({ premiumUser, te
                   setShowMissingProviderBanner(false);
                   localStorage.setItem("hideMissingProviderBanner", "true");
                 }}
-                className="flex-shrink-0 p-1 text-gray-400 hover:text-gray-600 hover:bg-gray-100 rounded-full transition-colors"
+                className="shrink-0 p-1 text-gray-400 hover:text-gray-600 hover:bg-gray-100 rounded-full transition-colors"
                 aria-label="Dismiss banner"
               >
                 <svg
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx
index 2aa1eb4c808..576729d18d3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/components/AllModelsTab.tsx
@@ -239,7 +239,7 @@ const AllModelsTab = ({
     <TabPanel>
       <Grid>
         <div className="flex flex-col space-y-4">
-          <div className="bg-white rounded-lg shadow">
+          <div className="bg-white rounded-lg shadow-sm">
             {/* Current Team and View Mode Selector - Prominent Section */}
             <div className="border-b px-6 py-4 bg-gray-50">
               <div className="flex items-center justify-between">
@@ -339,7 +339,7 @@ const AllModelsTab = ({
 
               {modelViewMode === "current_team" && (
                 <div className="flex items-start gap-2 mt-3">
-                  <InfoCircleOutlined className="text-gray-400 mt-0.5 flex-shrink-0 text-xs" />
+                  <InfoCircleOutlined className="text-gray-400 mt-0.5 shrink-0 text-xs" />
                   <div className="text-xs text-gray-500">
                     {currentTeam === "personal" ? (
                       <span>
@@ -381,7 +381,7 @@ const AllModelsTab = ({
                         type="text"
                         placeholder="Search model names..."
                         data-testid="model-search-input"
-                        className="w-full px-3 py-2 pl-8 border rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                        className="w-full px-3 py-2 pl-8 border rounded-md text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
                         value={modelNameSearch}
                         onChange={(e) => setModelNameSearch(e.target.value)}
                       />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/A2AMetrics.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/A2AMetrics.tsx
index 2e0e5068297..004a513f061 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/A2AMetrics.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/A2AMetrics.tsx
@@ -194,7 +194,9 @@ const A2AMetrics: React.FC<A2AMetricsProps> = ({ a2aMetadata, timeToFirstToken,
           {taskId && (
             <div className="mb-1.5 flex items-center">
               <span className="font-medium text-gray-700 w-24">Task ID:</span>
-              <code className="ml-2 px-2 py-1 bg-white border border-gray-200 rounded text-xs font-mono">{taskId}</code>
+              <code className="ml-2 px-2 py-1 bg-white border border-gray-200 rounded-sm text-xs font-mono">
+                {taskId}
+              </code>
               <CopyOutlined
                 className="ml-2 cursor-pointer text-gray-400 hover:text-blue-500"
                 onClick={() => copyToClipboard(taskId)}
@@ -205,7 +207,7 @@ const A2AMetrics: React.FC<A2AMetricsProps> = ({ a2aMetadata, timeToFirstToken,
           {contextId && (
             <div className="mb-1.5 flex items-center">
               <span className="font-medium text-gray-700 w-24">Session ID:</span>
-              <code className="ml-2 px-2 py-1 bg-white border border-gray-200 rounded text-xs font-mono">
+              <code className="ml-2 px-2 py-1 bg-white border border-gray-200 rounded-sm text-xs font-mono">
                 {contextId}
               </code>
               <CopyOutlined
@@ -219,7 +221,7 @@ const A2AMetrics: React.FC<A2AMetricsProps> = ({ a2aMetadata, timeToFirstToken,
           {metadata && Object.keys(metadata).length > 0 && (
             <div className="mt-3">
               <span className="font-medium text-gray-700">Custom Metadata:</span>
-              <pre className="mt-1.5 p-2 bg-white border border-gray-200 rounded text-xs font-mono overflow-x-auto whitespace-pre-wrap">
+              <pre className="mt-1.5 p-2 bg-white border border-gray-200 rounded-sm text-xs font-mono overflow-x-auto whitespace-pre-wrap">
                 {JSON.stringify(metadata, null, 2)}
               </pre>
             </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/AgentBuilderView.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/AgentBuilderView.tsx
index 133a4938e19..35f5dcf06c0 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/AgentBuilderView.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/AgentBuilderView.tsx
@@ -102,7 +102,7 @@ function ConnectTabContent({
     <div className="mx-auto max-w-3xl space-y-6">
       <div>
         <h3 className="text-sm font-semibold text-gray-900 mb-1">Proxy base URL</h3>
-        <p className="text-sm text-gray-600 font-mono bg-gray-50 px-2 py-1.5 rounded border border-gray-200 break-all">
+        <p className="text-sm text-gray-600 font-mono bg-gray-50 px-2 py-1.5 rounded-sm border border-gray-200 break-all">
           {baseUrl}
         </p>
       </div>
@@ -442,7 +442,7 @@ export default function AgentBuilderView({
 
   return (
     <div className="flex h-full flex-col bg-white text-gray-900">
-      <div className="flex flex-shrink-0 flex-col border-b border-gray-200">
+      <div className="flex shrink-0 flex-col border-b border-gray-200">
         <div className="flex h-12 items-center justify-between px-4">
           <span className="text-sm font-medium text-gray-900">Agent Builder</span>
           {isNewAgent ? (
@@ -460,7 +460,7 @@ export default function AgentBuilderView({
           )}
         </div>
         <div className="flex items-center gap-2 border-t border-amber-200 bg-amber-50 px-4 py-2 text-xs text-amber-800">
-          <ExperimentOutlined className="flex-shrink-0 text-amber-600" />
+          <ExperimentOutlined className="shrink-0 text-amber-600" />
           <span>
             Agent Builder is experimental and may change or be removed without notice. We’d love your feedback—email us
             at{" "}
@@ -474,7 +474,7 @@ export default function AgentBuilderView({
 
       <div className="flex flex-1 overflow-hidden">
         {/* Roster */}
-        <div className="w-60 flex-shrink-0 border-r border-gray-200 bg-white flex flex-col">
+        <div className="w-60 shrink-0 border-r border-gray-200 bg-white flex flex-col">
           <div className="flex items-center justify-between border-b border-gray-200 p-3">
             <span className="text-xs font-semibold uppercase tracking-wide text-gray-500">Agents</span>
             <Button type="text" size="small" icon={<PlusOutlined />} onClick={handleAddAgent} aria-label="Add agent" />
@@ -542,7 +542,7 @@ export default function AgentBuilderView({
                         {isNewAgent || selectedAgent ? (
                           <div className="mx-auto max-w-xl space-y-4">
                             {!selectedAgentModelId && selectedAgent && (
-                              <div className="rounded border border-amber-200 bg-amber-50 px-3 py-2 text-xs text-amber-800">
+                              <div className="rounded-sm border border-amber-200 bg-amber-50 px-3 py-2 text-xs text-amber-800">
                                 This agent cannot be updated or deleted here (missing model id). Manage it from Models
                                 &amp; Endpoints.
                               </div>
@@ -616,8 +616,8 @@ export default function AgentBuilderView({
                               {selectedAgent && draftTools.length > 0 && (
                                 <p className="mt-1 text-xs text-gray-500">
                                   {draftTools.length} MCP server{draftTools.length !== 1 ? "s" : ""} saved. Use the same{" "}
-                                  <code className="rounded bg-gray-100 px-1">tools</code> array in chat completions when
-                                  calling this agent.
+                                  <code className="rounded-sm bg-gray-100 px-1">tools</code> array in chat completions
+                                  when calling this agent.
                                 </p>
                               )}
                             </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatImageRenderer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatImageRenderer.tsx
index f4449bee803..0bd0a94a52c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatImageRenderer.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatImageRenderer.tsx
@@ -27,7 +27,7 @@ const ChatImageRenderer: React.FC<ChatImageRendererProps> = ({ message }) => {
           alt="User uploaded image"
           width={256}
           height={200}
-          className="max-w-64 rounded-md border border-gray-200 shadow-sm"
+          className="max-w-64 rounded-md border border-gray-200 shadow-xs"
           style={{ maxHeight: "200px", width: "auto", height: "auto" }}
         />
       )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatMessageBubble.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatMessageBubble.tsx
index 27226757c91..8e71017a7b5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatMessageBubble.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatMessageBubble.tsx
@@ -43,7 +43,7 @@ function ChatMessageBubble({
   return (
     <div className={`mb-4 ${isUser ? "text-right" : "text-left"}`}>
       <div
-        className="inline-block max-w-[80%] rounded-lg shadow-sm p-3.5 px-4"
+        className="inline-block max-w-[80%] rounded-lg shadow-xs p-3.5 px-4"
         style={{
           backgroundColor: isUser ? "#f0f8ff" : "#ffffff",
           border: isUser ? "1px solid #e6f0fa" : "1px solid #f0f0f0",
@@ -66,7 +66,9 @@ function ChatMessageBubble({
           </div>
           <strong className="text-sm capitalize">{message.role}</strong>
           {message.role === "assistant" && message.model && (
-            <span className="text-xs px-2 py-0.5 rounded bg-gray-100 text-gray-600 font-normal">{message.model}</span>
+            <span className="text-xs px-2 py-0.5 rounded-sm bg-gray-100 text-gray-600 font-normal">
+              {message.model}
+            </span>
           )}
         </div>
 
@@ -103,7 +105,7 @@ function ChatMessageBubble({
 
         {/* Message body */}
         <div
-          className="whitespace-pre-wrap break-words max-w-full message-content"
+          className="whitespace-pre-wrap wrap-break-word max-w-full message-content"
           style={{
             wordWrap: "break-word",
             overflowWrap: "break-word",
@@ -115,7 +117,7 @@ function ChatMessageBubble({
             <img
               src={typeof message.content === "string" ? message.content : ""}
               alt="Generated image"
-              className="max-w-full rounded-md border border-gray-200 shadow-sm"
+              className="max-w-full rounded-md border border-gray-200 shadow-xs"
               style={{ maxHeight: "500px" }}
             />
           ) : message.isAudio ? (
@@ -153,7 +155,7 @@ function ChatMessageBubble({
                       </SyntaxHighlighter>
                     ) : (
                       <code
-                        className={`${className} px-1.5 py-0.5 rounded bg-gray-100 text-sm font-mono`}
+                        className={`${className} px-1.5 py-0.5 rounded-sm bg-gray-100 text-sm font-mono`}
                         style={{ wordBreak: "break-word" }}
                         {...props}
                       >
@@ -173,7 +175,7 @@ function ChatMessageBubble({
                   <img
                     src={message.image.url}
                     alt="Generated image"
-                    className="max-w-full rounded-md border border-gray-200 shadow-sm"
+                    className="max-w-full rounded-md border border-gray-200 shadow-xs"
                     style={{ maxHeight: "500px" }}
                   />
                 </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatUI.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatUI.tsx
index db46eb30cb8..e84c43d2c1e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatUI.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ChatUI.tsx
@@ -1447,7 +1447,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                               <div className="flex items-center gap-1">
                                 <span className="font-medium">{toolset.toolset_name}</span>
                                 <span
-                                  className="text-xs px-1 rounded"
+                                  className="text-xs px-1 rounded-sm"
                                   style={{ background: "#ede9fe", color: "#7c3aed" }}
                                 >
                                   Toolset
@@ -1540,7 +1540,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                           if (tools.length === 0) return null;
 
                           return (
-                            <div key={serverId} className="border rounded p-2">
+                            <div key={serverId} className="border rounded-sm p-2">
                               <Text className="text-xs text-gray-600 mb-1">
                                 Limit tools for {server?.alias || server?.server_name || serverId}:
                               </Text>
@@ -1583,7 +1583,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                           return (
                             <div
                               key={serverId}
-                              className="border border-blue-100 rounded p-2 bg-blue-50 flex items-center justify-between"
+                              className="border border-blue-100 rounded-sm p-2 bg-blue-50 flex items-center justify-between"
                             >
                               <Text className="text-xs text-blue-700">{serverName} requires your API key</Text>
                               {server.has_user_credential ? (
@@ -1770,7 +1770,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                     chatHistory[chatHistory.length - 1].role === "user" && (
                       <div className="text-left mb-4">
                         <div
-                          className="inline-block max-w-[80%] rounded-lg shadow-sm p-3.5 px-4"
+                          className="inline-block max-w-[80%] rounded-lg shadow-xs p-3.5 px-4"
                           style={{
                             backgroundColor: "#ffffff",
                             border: "1px solid #f0f0f0",
@@ -1834,7 +1834,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                                 className="max-w-32 max-h-32 rounded-md border border-gray-200 object-cover"
                               />
                               <button
-                                className="absolute top-1 right-1 bg-white shadow-sm border border-gray-200 rounded px-1 py-1 text-red-500 hover:bg-red-50 text-xs"
+                                className="absolute top-1 right-1 bg-white shadow-xs border border-gray-200 rounded-sm px-1 py-1 text-red-500 hover:bg-red-50 text-xs"
                                 onClick={() => handleRemoveImage(index)}
                               >
                                 <DeleteOutlined />
@@ -1894,7 +1894,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                             </span>
                           </div>
                           <button
-                            className="bg-white shadow-sm border border-gray-200 rounded px-2 py-1 text-red-500 hover:bg-red-50 text-xs"
+                            className="bg-white shadow-xs border border-gray-200 rounded-sm px-2 py-1 text-red-500 hover:bg-red-50 text-xs"
                             onClick={handleRemoveAudio}
                           >
                             <DeleteOutlined /> Remove
@@ -1924,7 +1924,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                   {/* Code Interpreter indicator and sample prompts when enabled */}
                   {endpointType === EndpointType.RESPONSES && codeInterpreter.enabled && (
                     <div className="mb-2 space-y-2">
-                      <div className="px-3 py-2 bg-gradient-to-r from-blue-50 to-purple-50 rounded-lg border border-blue-200 flex items-center justify-between">
+                      <div className="px-3 py-2 bg-linear-to-r from-blue-50 to-purple-50 rounded-lg border border-blue-200 flex items-center justify-between">
                         <div className="flex items-center gap-2">
                           {isLoading ? (
                             <>
@@ -1988,7 +1988,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                   <div className="flex items-center gap-2">
                     <div className="flex items-center flex-1 bg-white border border-gray-300 rounded-xl px-3 py-1 min-h-[44px]">
                       {/* Left: attachment and code interpreter icons */}
-                      <div className="flex-shrink-0 mr-2 flex items-center gap-1">
+                      <div className="shrink-0 mr-2 flex items-center gap-1">
                         {endpointType === EndpointType.RESPONSES && !responsesUploadedImage && (
                           <ResponsesImageUpload
                             responsesUploadedImage={responsesUploadedImage}
@@ -2116,7 +2116,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
                               ? !uploadedAudio
                               : !inputMessage.trim())
                         }
-                        className="flex-shrink-0 ml-2 !w-8 !h-8 !min-w-8 !p-0 !rounded-full !bg-blue-600 hover:!bg-blue-700 disabled:!bg-gray-300 !border-none !text-white disabled:!text-gray-500 !flex !items-center !justify-center"
+                        className="shrink-0 ml-2 w-8! h-8! min-w-8! p-0! rounded-full! bg-blue-600! hover:bg-blue-700! disabled:bg-gray-300! border-none! text-white! disabled:text-gray-500! flex! items-center! justify-center!"
                       >
                         <ArrowUpOutlined style={{ fontSize: "14px" }} />
                       </TremorButton>
@@ -2225,7 +2225,7 @@ const ChatUI: React.FC<ChatUIProps> = ({
               <li>The tool call is routed to the correct underlying MCP server automatically.</li>
             </ol>
           </div>
-          <div className="bg-purple-50 border border-purple-200 rounded p-3">
+          <div className="bg-purple-50 border border-purple-200 rounded-sm p-3">
             <p className="text-sm text-purple-800">
               <strong>Example:</strong> A &quot;GitHub Read-only&quot; toolset might include only{" "}
               <code>list_repos</code> and <code>get_file</code> from a GitHub MCP server — preventing agents from making
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterTool.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterTool.tsx
index abc21ab5f65..d2682e3a7a8 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterTool.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/CodeInterpreterTool.tsx
@@ -46,7 +46,7 @@ const CodeInterpreterTool: React.FC<CodeInterpreterToolProps> = ({
   };
 
   return (
-    <div className="border border-gray-200 rounded-lg p-3 bg-gradient-to-r from-blue-50 to-purple-50">
+    <div className="border border-gray-200 rounded-lg p-3 bg-linear-to-r from-blue-50 to-purple-50">
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-2">
           <CodeOutlined className="text-blue-500" />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ResponsesImageRenderer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ResponsesImageRenderer.tsx
index d459d638c0a..185b2210e89 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ResponsesImageRenderer.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/ResponsesImageRenderer.tsx
@@ -24,7 +24,7 @@ const ResponsesImageRenderer: React.FC<ResponsesImageRendererProps> = ({ message
         <img
           src={message.imagePreviewUrl}
           alt="User uploaded image"
-          className="max-w-64 rounded-md border border-gray-200 shadow-sm"
+          className="max-w-64 rounded-md border border-gray-200 shadow-xs"
           style={{ maxHeight: "200px" }}
         />
       )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SearchResultsDisplay.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SearchResultsDisplay.tsx
index ba84fe95f80..9b32d196ea6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SearchResultsDisplay.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SearchResultsDisplay.tsx
@@ -63,18 +63,18 @@ export function SearchResultsDisplay({ searchResults }: SearchResultsDisplayProp
                         >
                           <div className="flex items-center gap-2 flex-1 min-w-0">
                             <svg
-                              className={`w-4 h-4 text-gray-400 transition-transform flex-shrink-0 ${isResultExpanded ? "transform rotate-90" : ""}`}
+                              className={`w-4 h-4 text-gray-400 transition-transform shrink-0 ${isResultExpanded ? "transform rotate-90" : ""}`}
                               fill="none"
                               stroke="currentColor"
                               viewBox="0 0 24 24"
                             >
                               <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 5l7 7-7 7" />
                             </svg>
-                            <FileTextOutlined className="text-gray-400 flex-shrink-0" style={{ fontSize: "12px" }} />
+                            <FileTextOutlined className="text-gray-400 shrink-0" style={{ fontSize: "12px" }} />
                             <span className="text-xs font-medium text-gray-700 truncate">
                               {result.filename || result.file_id || `Result ${resultIndex + 1}`}
                             </span>
-                            <span className="text-xs px-2 py-0.5 rounded bg-blue-100 text-blue-700 font-mono flex-shrink-0">
+                            <span className="text-xs px-2 py-0.5 rounded-sm bg-blue-100 text-blue-700 font-mono shrink-0">
                               {result.score.toFixed(3)}
                             </span>
                           </div>
@@ -85,7 +85,7 @@ export function SearchResultsDisplay({ searchResults }: SearchResultsDisplayProp
                             <div className="p-3 space-y-2">
                               {result.content.map((content, contentIndex) => (
                                 <div key={contentIndex}>
-                                  <div className="text-xs font-mono bg-gray-50 p-2 rounded text-gray-800 whitespace-pre-wrap break-words">
+                                  <div className="text-xs font-mono bg-gray-50 p-2 rounded-sm text-gray-800 whitespace-pre-wrap wrap-break-word">
                                     {content.text}
                                   </div>
                                 </div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SessionManagement.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SessionManagement.tsx
index 87f9d797643..34f7d7b8407 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SessionManagement.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat_ui/SessionManagement.tsx
@@ -87,7 +87,7 @@ const SessionManagement: React.FC<SessionManagementProps> = ({
               title={
                 <div className="text-xs">
                   <div className="mb-1">Copy response ID to continue session:</div>
-                  <div className="bg-gray-800 text-gray-100 p-2 rounded font-mono text-xs whitespace-pre-wrap">
+                  <div className="bg-gray-800 text-gray-100 p-2 rounded-sm font-mono text-xs whitespace-pre-wrap">
                     {`curl -X POST "your-proxy-url/v1/responses" \\
   -H "Authorization: Bearer your-api-key" \\
   -H "Content-Type: application/json" \\
@@ -102,7 +102,10 @@ const SessionManagement: React.FC<SessionManagementProps> = ({
               }
               overlayStyle={{ maxWidth: "500px" }}
             >
-              <button onClick={handleCopySessionId} className="ml-2 p-1 hover:bg-green-100 rounded transition-colors">
+              <button
+                onClick={handleCopySessionId}
+                className="ml-2 p-1 hover:bg-green-100 rounded-sm transition-colors"
+              >
                 <CopyOutlined style={{ fontSize: "12px" }} />
               </button>
             </Tooltip>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/CompareUI.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/CompareUI.tsx
index e41ee3ba8fa..65157206f21 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/CompareUI.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/CompareUI.tsx
@@ -689,7 +689,7 @@ export default function CompareUI({ accessToken, disabledPersonalKeyCreation }:
   const showSuggestedPrompts = !hasMessages && !isAnyComparisonLoading && !hasAttachment;
   return (
     <div className="w-full h-full p-4 bg-white">
-      <div className="rounded-2xl border border-gray-200 bg-white shadow-sm min-h-[calc(100vh-160px)] flex flex-col">
+      <div className="rounded-2xl border border-gray-200 bg-white shadow-xs min-h-[calc(100vh-160px)] flex flex-col">
         <div className="border-b px-4 py-2">
           <div className="flex flex-wrap items-center justify-between gap-3">
             <div className="flex items-center gap-2">
@@ -746,7 +746,7 @@ export default function CompareUI({ accessToken, disabledPersonalKeyCreation }:
         </div>
 
         <div
-          className="grid flex-1 min-h-0 auto-rows-[minmax(0,1fr)]"
+          className="grid flex-1 min-h-0 auto-rows-fr"
           style={{
             gridTemplateColumns: `repeat(${comparisons.length}, minmax(0, 1fr))`,
           }}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ComparisonPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ComparisonPanel.tsx
index 6ddb5e27947..3f853f42dc7 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ComparisonPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ComparisonPanel.tsx
@@ -95,7 +95,7 @@ export function ComparisonPanel({
       {/* Close button in top right */}
       <button
         onClick={handleClosePopover}
-        className="absolute top-0 right-0 p-1 hover:bg-gray-100 rounded transition-colors text-gray-500 hover:text-gray-700 z-10"
+        className="absolute top-0 right-0 p-1 hover:bg-gray-100 rounded-sm transition-colors text-gray-500 hover:text-gray-700 z-10"
       >
         <X size={14} />
       </button>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageDisplay.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageDisplay.tsx
index 2e4868d3527..2f621bf29fb 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageDisplay.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageDisplay.tsx
@@ -49,7 +49,7 @@ export function MessageDisplay({ messages, isLoading }: MessageDisplayProps) {
 
   const renderMessageBody = (message: MessageType) => (
     <div
-      className="whitespace-pre-wrap break-words"
+      className="whitespace-pre-wrap wrap-break-word"
       style={{
         wordWrap: "break-word",
         overflowWrap: "break-word",
@@ -84,7 +84,7 @@ export function MessageDisplay({ messages, isLoading }: MessageDisplayProps) {
                 {String(children).replace(/\n$/, "")}
               </SyntaxHighlighter>
             ) : (
-              <code className={`${className} px-1.5 py-0.5 rounded bg-gray-100 text-sm font-mono`} {...props}>
+              <code className={`${className} px-1.5 py-0.5 rounded-sm bg-gray-100 text-sm font-mono`} {...props}>
                 {children}
               </code>
             );
@@ -127,7 +127,7 @@ export function MessageDisplay({ messages, isLoading }: MessageDisplayProps) {
                   <div className="flex items-center gap-2">
                     <span className="text-sm font-semibold text-gray-700">{displayModel}</span>
                     {assistantMessage.toolName && (
-                      <span className="rounded bg-gray-100 px-2 py-0.5 text-xs text-gray-600">
+                      <span className="rounded-sm bg-gray-100 px-2 py-0.5 text-xs text-gray-600">
                         {assistantMessage.toolName}
                       </span>
                     )}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageInput.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageInput.tsx
index 67036282b38..fae964b372a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageInput.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/MessageInput.tsx
@@ -28,7 +28,7 @@ export function MessageInput({ value, onChange, onSend, disabled, hasAttachment,
   return (
     <div className="flex items-center gap-2">
       <div className="flex items-center flex-1 bg-white border border-gray-300 rounded-xl px-3 py-1 min-h-[44px]">
-        {uploadComponent && <div className="flex-shrink-0 mr-2">{uploadComponent}</div>}
+        {uploadComponent && <div className="shrink-0 mr-2">{uploadComponent}</div>}
         <TextArea
           value={value}
           onChange={(e) => onChange(e.target.value)}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/complianceUI/ComplianceUI.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/complianceUI/ComplianceUI.tsx
index cf619057c38..39346105f2a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/complianceUI/ComplianceUI.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/complianceUI/ComplianceUI.tsx
@@ -696,9 +696,9 @@ export default function ComplianceUI({
 
   return (
     <div className="w-full h-full p-4 bg-white">
-      <div className="rounded-2xl border border-gray-200 bg-white shadow-sm min-h-[calc(100vh-160px)] flex flex-col overflow-hidden">
+      <div className="rounded-2xl border border-gray-200 bg-white shadow-xs min-h-[calc(100vh-160px)] flex flex-col overflow-hidden">
         {/* Top config */}
-        <div className="flex-shrink-0 border-b border-gray-200 px-6 py-4">
+        <div className="shrink-0 border-b border-gray-200 px-6 py-4">
           <div className="mb-3">
             <h3 className="text-sm font-semibold text-gray-900">Test Configuration</h3>
             <p className="text-xs text-gray-500 mt-0.5">Select policies, guardrails, or both to test against.</p>
@@ -719,7 +719,7 @@ export default function ComplianceUI({
               )}
             </div>
 
-            <div className="flex flex-col items-center pt-6 flex-shrink-0">
+            <div className="flex flex-col items-center pt-6 shrink-0">
               <div className="w-px h-4 bg-gray-200" />
               <span className="text-[10px] font-medium text-gray-400 my-1">or</span>
               <div className="w-px h-4 bg-gray-200" />
@@ -755,7 +755,7 @@ export default function ComplianceUI({
                           className="w-full flex items-center gap-2.5 px-3 py-2 text-sm text-left hover:bg-gray-50"
                         >
                           <div
-                            className={`w-4 h-4 rounded border flex items-center justify-center flex-shrink-0 ${selectedGuardrails.includes(g.id) ? "bg-blue-500 border-blue-500" : "border-gray-300"}`}
+                            className={`w-4 h-4 rounded-sm border flex items-center justify-center shrink-0 ${selectedGuardrails.includes(g.id) ? "bg-blue-500 border-blue-500" : "border-gray-300"}`}
                           >
                             {selectedGuardrails.includes(g.id) && <Check className="w-3 h-3 text-white" />}
                           </div>
@@ -776,7 +776,7 @@ export default function ComplianceUI({
                     return (
                       <span
                         key={id}
-                        className="inline-flex items-center gap-1 text-[11px] bg-indigo-50 text-indigo-700 px-1.5 py-0.5 rounded font-medium"
+                        className="inline-flex items-center gap-1 text-[11px] bg-indigo-50 text-indigo-700 px-1.5 py-0.5 rounded-sm font-medium"
                       >
                         {g?.name}
                         <button
@@ -794,7 +794,7 @@ export default function ComplianceUI({
               )}
             </div>
 
-            <div className="flex flex-col gap-1.5 pt-6 flex-shrink-0">
+            <div className="flex flex-col gap-1.5 pt-6 shrink-0">
               {isRunning ? (
                 <button
                   type="button"
@@ -837,7 +837,7 @@ export default function ComplianceUI({
         {/* Panels */}
         <div className="flex flex-1 min-h-0 overflow-hidden">
           {/* Left: Prompt library */}
-          <div className="w-[400px] flex-shrink-0 border-r border-gray-200 flex flex-col bg-white overflow-hidden">
+          <div className="w-[400px] shrink-0 border-r border-gray-200 flex flex-col bg-white overflow-hidden">
             <div className="flex-1 overflow-y-auto min-h-0">
               <div className="px-4 pt-4 pb-2">
                 <div className="flex items-center justify-between mb-2.5">
@@ -854,7 +854,7 @@ export default function ComplianceUI({
                     value={searchPrompt}
                     onChange={(e) => setSearchPrompt(e.target.value)}
                     placeholder="Search prompts..."
-                    className="w-full border border-gray-200 rounded-lg pl-8 pr-3 py-1.5 text-xs placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-400"
+                    className="w-full border border-gray-200 rounded-lg pl-8 pr-3 py-1.5 text-xs placeholder:text-gray-400 focus:outline-hidden focus:ring-2 focus:ring-blue-500/20 focus:border-blue-400"
                   />
                 </div>
 
@@ -883,7 +883,7 @@ export default function ComplianceUI({
                         setShowAddPrompt(!showAddPrompt);
                         setShowCsvUpload(false);
                       }}
-                      className={`flex items-center gap-1 text-[11px] font-medium px-2 py-0.5 rounded transition-colors ${showAddPrompt ? "bg-blue-50 text-blue-600" : "text-gray-500 hover:bg-gray-100"}`}
+                      className={`flex items-center gap-1 text-[11px] font-medium px-2 py-0.5 rounded-sm transition-colors ${showAddPrompt ? "bg-blue-50 text-blue-600" : "text-gray-500 hover:bg-gray-100"}`}
                     >
                       <Plus className="w-3 h-3" /> Add
                     </button>
@@ -893,7 +893,7 @@ export default function ComplianceUI({
                         setShowCsvUpload(!showCsvUpload);
                         setShowAddPrompt(false);
                       }}
-                      className={`flex items-center gap-1 text-[11px] font-medium px-2 py-0.5 rounded transition-colors ${showCsvUpload ? "bg-blue-50 text-blue-600" : "text-gray-500 hover:bg-gray-100"}`}
+                      className={`flex items-center gap-1 text-[11px] font-medium px-2 py-0.5 rounded-sm transition-colors ${showCsvUpload ? "bg-blue-50 text-blue-600" : "text-gray-500 hover:bg-gray-100"}`}
                     >
                       <Upload className="w-3 h-3" /> CSV
                     </button>
@@ -908,21 +908,21 @@ export default function ComplianceUI({
                     onChange={(e) => setNewPromptText(e.target.value)}
                     placeholder="Enter your test prompt..."
                     rows={2}
-                    className="w-full border border-gray-200 rounded px-2.5 py-1.5 text-xs text-gray-700 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-400 resize-none bg-white"
+                    className="w-full border border-gray-200 rounded-sm px-2.5 py-1.5 text-xs text-gray-700 placeholder:text-gray-400 focus:outline-hidden focus:ring-2 focus:ring-blue-500/20 focus:border-blue-400 resize-none bg-white"
                   />
                   <div className="flex items-center justify-between mt-2">
                     <div className="flex items-center gap-2">
                       <button
                         type="button"
                         onClick={() => setNewPromptExpected("fail")}
-                        className={`text-[10px] font-semibold px-2 py-0.5 rounded ${newPromptExpected === "fail" ? "bg-red-100 text-red-700" : "bg-gray-100 text-gray-500"}`}
+                        className={`text-[10px] font-semibold px-2 py-0.5 rounded-sm ${newPromptExpected === "fail" ? "bg-red-100 text-red-700" : "bg-gray-100 text-gray-500"}`}
                       >
                         Should Fail
                       </button>
                       <button
                         type="button"
                         onClick={() => setNewPromptExpected("pass")}
-                        className={`text-[10px] font-semibold px-2 py-0.5 rounded ${newPromptExpected === "pass" ? "bg-green-100 text-green-700" : "bg-gray-100 text-gray-500"}`}
+                        className={`text-[10px] font-semibold px-2 py-0.5 rounded-sm ${newPromptExpected === "pass" ? "bg-green-100 text-green-700" : "bg-gray-100 text-gray-500"}`}
                       >
                         Should Pass
                       </button>
@@ -942,7 +942,7 @@ export default function ComplianceUI({
                         type="button"
                         onClick={addCustomPrompt}
                         disabled={!newPromptText.trim()}
-                        className={`text-[11px] font-medium px-2.5 py-1 rounded ${newPromptText.trim() ? "bg-blue-600 text-white" : "bg-gray-100 text-gray-400"}`}
+                        className={`text-[11px] font-medium px-2.5 py-1 rounded-sm ${newPromptText.trim() ? "bg-blue-600 text-white" : "bg-gray-100 text-gray-400"}`}
                       >
                         Add
                       </button>
@@ -964,17 +964,17 @@ export default function ComplianceUI({
                     </button>
                   </div>
 
-                  <div className="mb-2 p-2 bg-white rounded border border-gray-200">
+                  <div className="mb-2 p-2 bg-white rounded-sm border border-gray-200">
                     <p className="text-[10px] text-gray-500 leading-relaxed">
                       <span className="font-semibold text-gray-600">Required columns:</span>{" "}
-                      <code className="bg-gray-100 px-1 rounded text-[10px]">prompt</code>,{" "}
-                      <code className="bg-gray-100 px-1 rounded text-[10px]">expected_result</code>{" "}
+                      <code className="bg-gray-100 px-1 rounded-sm text-[10px]">prompt</code>,{" "}
+                      <code className="bg-gray-100 px-1 rounded-sm text-[10px]">expected_result</code>{" "}
                       <span className="text-gray-400">(fail or pass)</span>
                     </p>
                     <p className="text-[10px] text-gray-500 leading-relaxed mt-0.5">
                       <span className="font-semibold text-gray-600">Optional columns:</span>{" "}
-                      <code className="bg-gray-100 px-1 rounded text-[10px]">framework</code>,{" "}
-                      <code className="bg-gray-100 px-1 rounded text-[10px]">category</code>
+                      <code className="bg-gray-100 px-1 rounded-sm text-[10px]">framework</code>,{" "}
+                      <code className="bg-gray-100 px-1 rounded-sm text-[10px]">category</code>
                     </p>
                   </div>
 
@@ -997,7 +997,7 @@ export default function ComplianceUI({
                   </button>
 
                   {csvError && (
-                    <div className="mt-2 p-2 bg-red-50 border border-red-200 rounded text-[10px] text-red-600 whitespace-pre-line">
+                    <div className="mt-2 p-2 bg-red-50 border border-red-200 rounded-sm text-[10px] text-red-600 whitespace-pre-line">
                       {csvError}
                     </div>
                   )}
@@ -1033,11 +1033,11 @@ export default function ComplianceUI({
                         className="w-full flex items-center gap-2 px-3 py-2.5 text-left bg-gray-50 hover:bg-gray-100 transition-colors rounded-lg border border-gray-200"
                       >
                         {isExpanded ? (
-                          <ChevronDown className="w-4 h-4 text-gray-400 flex-shrink-0" />
+                          <ChevronDown className="w-4 h-4 text-gray-400 shrink-0" />
                         ) : (
-                          <ChevronRight className="w-4 h-4 text-gray-400 flex-shrink-0" />
+                          <ChevronRight className="w-4 h-4 text-gray-400 shrink-0" />
                         )}
-                        <CategoryIcon iconKey={fw.icon} className="w-4 h-4 text-gray-500 flex-shrink-0" />
+                        <CategoryIcon iconKey={fw.icon} className="w-4 h-4 text-gray-500 shrink-0" />
                         <div className="flex-1 min-w-0">
                           <span className="text-xs font-semibold text-gray-900">{fw.name}</span>
                           <span className="text-[10px] text-gray-400 ml-1.5">{fwPromptCount} prompts</span>
@@ -1053,7 +1053,7 @@ export default function ComplianceUI({
                             e.stopPropagation();
                             toggleFrameworkPrompts(fw);
                           }}
-                          className="text-[10px] font-medium text-blue-600 hover:text-blue-700 px-1.5 py-0.5 rounded hover:bg-blue-50 flex-shrink-0"
+                          className="text-[10px] font-medium text-blue-600 hover:text-blue-700 px-1.5 py-0.5 rounded-sm hover:bg-blue-50 shrink-0"
                         >
                           {fwSelectedCount === fwPromptCount ? "Clear" : "All"}
                         </button>
@@ -1076,21 +1076,19 @@ export default function ComplianceUI({
                                   className="w-full flex items-center gap-1.5 px-2.5 py-2 text-left hover:bg-gray-50 transition-colors"
                                 >
                                   {isCatExpanded ? (
-                                    <ChevronDown className="w-3.5 h-3.5 text-gray-400 flex-shrink-0" />
+                                    <ChevronDown className="w-3.5 h-3.5 text-gray-400 shrink-0" />
                                   ) : (
-                                    <ChevronRight className="w-3.5 h-3.5 text-gray-400 flex-shrink-0" />
+                                    <ChevronRight className="w-3.5 h-3.5 text-gray-400 shrink-0" />
                                   )}
-                                  <span className="text-sm flex-shrink-0">
+                                  <span className="text-sm shrink-0">
                                     <CategoryIcon iconKey={category.icon} className="w-3.5 h-3.5 text-gray-500" />
                                   </span>
                                   <span className="text-[11px] font-medium text-gray-700 flex-1 min-w-0 truncate">
                                     {category.name}
                                   </span>
-                                  <span className="text-[10px] text-gray-400 flex-shrink-0">
-                                    {category.prompts.length}
-                                  </span>
+                                  <span className="text-[10px] text-gray-400 shrink-0">{category.prompts.length}</span>
                                   {selectedInCat > 0 && (
-                                    <span className="text-[9px] font-medium bg-blue-100 text-blue-700 px-1 py-0.5 rounded-full flex-shrink-0">
+                                    <span className="text-[9px] font-medium bg-blue-100 text-blue-700 px-1 py-0.5 rounded-full shrink-0">
                                       {selectedInCat}
                                     </span>
                                   )}
@@ -1105,7 +1103,7 @@ export default function ComplianceUI({
                                       <button
                                         type="button"
                                         onClick={() => toggleCategoryPrompts(category)}
-                                        className="text-[10px] font-medium text-blue-600 hover:text-blue-700 flex-shrink-0 whitespace-nowrap"
+                                        className="text-[10px] font-medium text-blue-600 hover:text-blue-700 shrink-0 whitespace-nowrap"
                                       >
                                         {allCatSelected ? "Clear" : "Select all"}
                                       </button>
@@ -1119,12 +1117,12 @@ export default function ComplianceUI({
                                           type="checkbox"
                                           checked={selectedPromptIds.has(prompt.id)}
                                           onChange={() => togglePrompt(prompt.id)}
-                                          className="mt-0.5 w-3.5 h-3.5 rounded border-gray-300 text-blue-600 focus:ring-blue-500/20 flex-shrink-0"
+                                          className="mt-0.5 w-3.5 h-3.5 rounded-sm border-gray-300 text-blue-600 focus:ring-blue-500/20 shrink-0"
                                         />
                                         <div className="flex-1 min-w-0">
                                           <p className="text-[11px] text-gray-700 leading-relaxed">{prompt.prompt}</p>
                                           <span
-                                            className={`inline-block mt-0.5 text-[9px] font-semibold px-1 py-0.5 rounded ${prompt.expectedResult === "fail" ? "bg-red-50 text-red-600" : "bg-green-50 text-green-600"}`}
+                                            className={`inline-block mt-0.5 text-[9px] font-semibold px-1 py-0.5 rounded-sm ${prompt.expectedResult === "fail" ? "bg-red-50 text-red-600" : "bg-green-50 text-green-600"}`}
                                           >
                                             {prompt.expectedResult === "fail" ? "Should Fail" : "Should Pass"}
                                           </span>
@@ -1137,7 +1135,7 @@ export default function ComplianceUI({
                                               e.stopPropagation();
                                               deleteCustomPrompt(prompt.id);
                                             }}
-                                            className="opacity-0 group-hover:opacity-100 p-0.5 text-gray-400 hover:text-red-500 transition-all flex-shrink-0"
+                                            className="opacity-0 group-hover:opacity-100 p-0.5 text-gray-400 hover:text-red-500 transition-all shrink-0"
                                             aria-label="Delete"
                                           >
                                             <Trash2 className="w-3 h-3" />
@@ -1161,7 +1159,7 @@ export default function ComplianceUI({
 
           {/* Right panel */}
           <div className="flex-1 flex flex-col bg-gray-50 overflow-hidden min-w-0">
-            <div className="flex-shrink-0 bg-white border-b border-gray-200 px-4">
+            <div className="shrink-0 bg-white border-b border-gray-200 px-4">
               <div className="flex items-center gap-0">
                 <button
                   type="button"
@@ -1193,12 +1191,15 @@ export default function ComplianceUI({
 
             {rightTab === "quick-test" && (
               <div className="flex-1 flex flex-col overflow-hidden min-h-0">
-                <div className="px-5 pt-4 pb-2 flex-shrink-0">
+                <div className="px-5 pt-4 pb-2 shrink-0">
                   {hasAnyConfig ? (
                     <div className="flex items-center gap-2 flex-wrap">
                       <span className="text-[11px] font-medium text-gray-500">Testing against:</span>
                       {selectedPolicies.map((id) => (
-                        <span key={id} className="text-[11px] bg-blue-50 text-blue-700 px-2 py-0.5 rounded font-medium">
+                        <span
+                          key={id}
+                          className="text-[11px] bg-blue-50 text-blue-700 px-2 py-0.5 rounded-sm font-medium"
+                        >
                           {policyValueToLabel.get(id) ?? id}
                         </span>
                       ))}
@@ -1207,7 +1208,7 @@ export default function ComplianceUI({
                         return (
                           <span
                             key={id}
-                            className="text-[11px] bg-indigo-50 text-indigo-700 px-2 py-0.5 rounded font-medium"
+                            className="text-[11px] bg-indigo-50 text-indigo-700 px-2 py-0.5 rounded-sm font-medium"
                           >
                             {g?.name}
                           </span>
@@ -1272,7 +1273,7 @@ export default function ComplianceUI({
                   <div ref={messagesEndRef} />
                 </div>
 
-                <div className="flex-shrink-0 px-5 pb-4">
+                <div className="shrink-0 px-5 pb-4">
                   <div className="border border-gray-200 rounded-lg bg-white overflow-hidden focus-within:ring-2 focus-within:ring-blue-500/20 focus-within:border-blue-400">
                     <textarea
                       ref={textareaRef}
@@ -1281,14 +1282,14 @@ export default function ComplianceUI({
                       onKeyDown={handleQuickTestKeyDown}
                       placeholder="Enter text to test..."
                       rows={3}
-                      className="w-full px-3 pt-3 pb-1 text-sm text-gray-700 placeholder:text-gray-400 focus:outline-none resize-none"
+                      className="w-full px-3 pt-3 pb-1 text-sm text-gray-700 placeholder:text-gray-400 focus:outline-hidden resize-none"
                     />
                     <div className="flex items-center justify-between px-3 pb-2">
                       <span className="text-[10px] text-gray-400">
-                        Press <kbd className="px-1 py-0.5 bg-gray-100 rounded text-[10px] font-mono">Enter</kbd> to
+                        Press <kbd className="px-1 py-0.5 bg-gray-100 rounded-sm text-[10px] font-mono">Enter</kbd> to
                         submit ·{" "}
-                        <kbd className="px-1 py-0.5 bg-gray-100 rounded text-[10px] font-mono">Shift+Enter</kbd> for new
-                        line
+                        <kbd className="px-1 py-0.5 bg-gray-100 rounded-sm text-[10px] font-mono">Shift+Enter</kbd> for
+                        new line
                       </span>
                       <span className="text-[10px] text-gray-400 tabular-nums">{quickTestInput.length}</span>
                     </div>
@@ -1308,7 +1309,7 @@ export default function ComplianceUI({
 
             {rightTab === "batch-results" && (
               <div className="flex-1 flex flex-col overflow-hidden bg-white min-h-0">
-                <div className="px-5 py-3 border-b border-gray-200 flex-shrink-0">
+                <div className="px-5 py-3 border-b border-gray-200 shrink-0">
                   <div className="flex items-center justify-between mb-2">
                     <h2 className="text-sm font-semibold text-gray-900">Results</h2>
                     {testResults.length > 0 && (
@@ -1317,7 +1318,7 @@ export default function ComplianceUI({
                           type="button"
                           onClick={exportBatchResults}
                           disabled={filteredResults.length === 0}
-                          className="flex items-center gap-1 text-[11px] font-medium text-gray-600 hover:text-gray-900 hover:bg-gray-100 px-2 py-1 rounded transition-colors disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-transparent"
+                          className="flex items-center gap-1 text-[11px] font-medium text-gray-600 hover:text-gray-900 hover:bg-gray-100 px-2 py-1 rounded-sm transition-colors disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-transparent"
                         >
                           <Download className="w-3 h-3" /> Export CSV
                         </button>
@@ -1437,7 +1438,7 @@ export default function ComplianceUI({
                           >
                             <div className="p-2.5">
                               <div className="flex items-start gap-2">
-                                <div className="flex-shrink-0 mt-0.5">
+                                <div className="shrink-0 mt-0.5">
                                   {result.status !== "complete" ? (
                                     <Loader2 className="w-3.5 h-3.5 text-gray-400 animate-spin" />
                                   ) : result.isMatch ? (
@@ -1454,13 +1455,13 @@ export default function ComplianceUI({
                                       {result.category}
                                     </span>
                                     <span
-                                      className={`text-[9px] font-semibold px-1 py-0.5 rounded ${result.expectedResult === "fail" ? "bg-red-50 text-red-600" : "bg-green-50 text-green-600"}`}
+                                      className={`text-[9px] font-semibold px-1 py-0.5 rounded-sm ${result.expectedResult === "fail" ? "bg-red-50 text-red-600" : "bg-green-50 text-green-600"}`}
                                     >
                                       {result.expectedResult === "fail" ? "Expect Block" : "Expect Allow"}
                                     </span>
                                     {result.status === "complete" && (
                                       <span
-                                        className={`text-[9px] font-bold px-1 py-0.5 rounded ${result.isMatch ? "bg-green-100 text-green-700" : "bg-red-100 text-red-700"}`}
+                                        className={`text-[9px] font-bold px-1 py-0.5 rounded-sm ${result.isMatch ? "bg-green-100 text-green-700" : "bg-red-100 text-red-700"}`}
                                       >
                                         {result.isMatch ? "✓ Match" : "✗ Gap"}
                                       </span>
@@ -1478,7 +1479,7 @@ export default function ComplianceUI({
                                         return next;
                                       });
                                     }}
-                                    className="flex-shrink-0 p-0.5 text-gray-400 hover:text-gray-600"
+                                    className="shrink-0 p-0.5 text-gray-400 hover:text-gray-600"
                                     aria-label={isExpanded ? "Collapse" : "Expand"}
                                   >
                                     {isExpanded ? (
@@ -1494,7 +1495,7 @@ export default function ComplianceUI({
                                   {result.triggeredBy && (
                                     <div>
                                       <span className="text-gray-400">Triggered by:</span>{" "}
-                                      <span className="font-medium text-gray-700 bg-gray-100 px-1.5 py-0.5 rounded">
+                                      <span className="font-medium text-gray-700 bg-gray-100 px-1.5 py-0.5 rounded-sm">
                                         {result.triggeredBy}
                                       </span>
                                     </div>
@@ -1512,7 +1513,7 @@ export default function ComplianceUI({
                                   {result.returnedText != null && result.returnedText !== "" && (
                                     <div className="mt-1.5">
                                       <span className="text-gray-400 block mb-0.5">LLM response:</span>
-                                      <div className="text-gray-700 bg-gray-50 rounded px-2 py-1.5 border border-gray-100 max-h-32 overflow-y-auto whitespace-pre-wrap break-words">
+                                      <div className="text-gray-700 bg-gray-50 rounded-sm px-2 py-1.5 border border-gray-100 max-h-32 overflow-y-auto whitespace-pre-wrap wrap-break-word">
                                         {result.returnedText}
                                       </div>
                                     </div>
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 66ddb90bea3..81ce17a3299 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
@@ -40,7 +40,7 @@ const ModelConfigCard: React.FC<ModelConfigCardProps> = ({
       </button>
 
       {showConfig && (
-        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-30">
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/30">
           <div className="bg-white rounded-lg shadow-xl p-6 w-96">
             <div className="flex items-center justify-between mb-4">
               <h3 className="text-lg font-semibold">Model Parameters</h3>
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 01d19ab1b1f..e6c5361edef 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
@@ -53,7 +53,7 @@ const PromptEditorHeader: React.FC<PromptEditorHeaderProps> = ({
           style={{ width: "200px" }}
         />
         {version && (
-          <span className="px-2 py-0.5 text-xs bg-blue-100 text-blue-700 rounded font-medium">{version}</span>
+          <span className="px-2 py-0.5 text-xs bg-blue-100 text-blue-700 rounded-sm font-medium">{version}</span>
         )}
         <Select
           value={environment}
@@ -66,7 +66,7 @@ const PromptEditorHeader: React.FC<PromptEditorHeaderProps> = ({
             { label: "Production", value: "production" },
           ]}
         />
-        <span className="px-2 py-0.5 text-xs bg-gray-100 text-gray-600 rounded">Draft</span>
+        <span className="px-2 py-0.5 text-xs bg-gray-100 text-gray-600 rounded-sm">Draft</span>
         <span className="text-xs text-gray-400">Unsaved changes</span>
       </div>
       <div className="flex items-center space-x-2">
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 ea9a0df0e50..98595ca36ea 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
@@ -53,7 +53,8 @@ const PromptMessagesCard: React.FC<PromptMessagesCardProps> = ({
       <div className="mb-2">
         <Text className="text-sm font-medium">Prompt messages</Text>
         <Text className="text-gray-500 text-xs mt-1">
-          Use <code className="bg-gray-100 px-1 rounded text-xs">{"{{variable}}"}</code> syntax for template variables
+          Use <code className="bg-gray-100 px-1 rounded-sm text-xs">{"{{variable}}"}</code> syntax for template
+          variables
         </Text>
       </div>
       <div className="space-y-2">
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 969c9c84821..dc50496830f 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
@@ -27,7 +27,7 @@ const ToolsCard: React.FC<ToolsCardProps> = ({ tools, onAddTool, onEditTool, onR
           {tools.map((tool, index) => (
             <div
               key={index}
-              className="flex items-center justify-between p-2 bg-gray-50 border border-gray-200 rounded"
+              className="flex items-center justify-between p-2 bg-gray-50 border border-gray-200 rounded-sm"
             >
               <div className="flex-1 min-w-0">
                 <div className="font-medium text-xs truncate">{tool.name}</div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/MessageBubble.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/MessageBubble.tsx
index 7d58465751e..4f9b6b7653e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/MessageBubble.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_editor_view/conversation_panel/MessageBubble.tsx
@@ -14,7 +14,7 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({ message }) => {
   return (
     <div className={`mb-4 flex ${message.role === "user" ? "justify-end" : "justify-start"}`}>
       <div
-        className="max-w-[85%] rounded-lg shadow-sm p-3.5 px-4"
+        className="max-w-[85%] rounded-lg shadow-xs p-3.5 px-4"
         style={{
           backgroundColor: message.role === "user" ? "#f0f8ff" : "#ffffff",
           border: message.role === "user" ? "1px solid #e6f0fa" : "1px solid #f0f0f0",
@@ -35,12 +35,14 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({ message }) => {
           </div>
           <strong className="text-sm capitalize">{message.role}</strong>
           {message.role === "assistant" && message.model && (
-            <span className="text-xs px-2 py-0.5 rounded bg-gray-100 text-gray-600 font-normal">{message.model}</span>
+            <span className="text-xs px-2 py-0.5 rounded-sm bg-gray-100 text-gray-600 font-normal">
+              {message.model}
+            </span>
           )}
         </div>
 
         <div
-          className="whitespace-pre-wrap break-words max-w-full message-content"
+          className="whitespace-pre-wrap wrap-break-word max-w-full message-content"
           style={{
             wordWrap: "break-word",
             overflowWrap: "break-word",
@@ -76,7 +78,7 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({ message }) => {
                     </SyntaxHighlighter>
                   ) : (
                     <code
-                      className={`${className} px-1.5 py-0.5 rounded bg-gray-100 text-sm font-mono`}
+                      className={`${className} px-1.5 py-0.5 rounded-sm bg-gray-100 text-sm font-mono`}
                       style={{ wordBreak: "break-word" }}
                       {...props}
                     >
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 24024e136a2..2268c96dbfe 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
@@ -49,7 +49,7 @@ const MessageInput: React.FC<MessageInputProps> = ({
         <TremorButton
           onClick={onSend}
           disabled={isDisabled}
-          className="flex-shrink-0 ml-2 !w-8 !h-8 !min-w-8 !p-0 !rounded-full !bg-blue-600 hover:!bg-blue-700 disabled:!bg-gray-300 !border-none !text-white disabled:!text-gray-500 !flex !items-center !justify-center"
+          className="shrink-0 ml-2 w-8! h-8! min-w-8! p-0! rounded-full! bg-blue-600! hover:bg-blue-700! disabled:bg-gray-300! border-none! text-white! disabled:text-gray-500! flex! items-center! justify-center!"
         >
           <ArrowUpOutlined style={{ fontSize: "14px" }} />
         </TremorButton>
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 046805c15b8..fa69a520145 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
@@ -292,7 +292,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
         />
 
         <div className="flex-1 flex overflow-hidden">
-          <div className="w-1/2 overflow-y-auto bg-white border-r border-gray-200 flex-shrink-0">
+          <div className="w-1/2 overflow-y-auto bg-white border-r border-gray-200 shrink-0">
             <div className="border-b border-gray-200 bg-white px-6 py-4 flex items-center gap-3">
               <ModelConfigCard
                 model={prompt.model}
@@ -317,7 +317,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
               <div className="ml-auto inline-flex items-center bg-gray-200 rounded-full p-0.5">
                 <button
                   className={`px-3 py-1 text-xs font-medium rounded-full transition-colors ${
-                    viewMode === "pretty" ? "bg-white text-gray-900 shadow-sm" : "text-gray-600"
+                    viewMode === "pretty" ? "bg-white text-gray-900 shadow-xs" : "text-gray-600"
                   }`}
                   onClick={() => setViewMode("pretty")}
                 >
@@ -325,7 +325,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
                 </button>
                 <button
                   className={`px-3 py-1 text-xs font-medium rounded-full transition-colors ${
-                    viewMode === "dotprompt" ? "bg-white text-gray-900 shadow-sm" : "text-gray-600"
+                    viewMode === "dotprompt" ? "bg-white text-gray-900 shadow-xs" : "text-gray-600"
                   }`}
                   onClick={() => setViewMode("dotprompt")}
                 >
@@ -361,7 +361,7 @@ const PromptEditorView: React.FC<PromptEditorViewProps> = ({ onClose, onSuccess,
             )}
           </div>
 
-          <div className="w-1/2 flex-shrink-0">
+          <div className="w-1/2 shrink-0">
             <ConversationPanel prompt={prompt} accessToken={accessToken} />
           </div>
         </div>
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 f96445c1a20..a3ea5a54cda 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
@@ -444,7 +444,9 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({ promptId, onClose, accessTo
                 <div className="space-y-4">
                   <div>
                     <Text className="font-medium">Template ID</Text>
-                    <div className="font-mono text-sm bg-gray-50 p-2 rounded">{promptTemplate.litellm_prompt_id}</div>
+                    <div className="font-mono text-sm bg-gray-50 p-2 rounded-sm">
+                      {promptTemplate.litellm_prompt_id}
+                    </div>
                   </div>
 
                   <div>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_table.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_table.tsx
index dbdeaff5daf..94b242ca4ea 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_table.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/components/prompt_table.tsx
@@ -123,7 +123,7 @@ const PromptTable: React.FC<PromptTableProps> = ({
           <Tooltip title={model}>
             <div className="flex items-center space-x-2">
               {/* Provider Icon */}
-              <div className="flex-shrink-0">
+              <div className="shrink-0">
                 {provider && logo ? (
                   <img
                     src={logo}
@@ -195,7 +195,7 @@ const PromptTable: React.FC<PromptTableProps> = ({
           development: "text-green-600 bg-green-50",
         };
         return (
-          <span className={`text-xs px-2 py-0.5 rounded ${colorMap[env] || "text-gray-600 bg-gray-50"}`}>{env}</span>
+          <span className={`text-xs px-2 py-0.5 rounded-sm ${colorMap[env] || "text-gray-600 bg-gray-50"}`}>{env}</span>
         );
       },
     },
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 1e1b1638998..e1c6b5db364 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
@@ -69,11 +69,11 @@ const ToolModal: React.FC<ToolModalProps> = ({ visible, initialJson, onSave, onC
       ]}
     >
       <div className="space-y-3">
-        {error && <div className="p-3 bg-red-50 border border-red-200 rounded text-red-600 text-sm">{error}</div>}
+        {error && <div className="p-3 bg-red-50 border border-red-200 rounded-sm text-red-600 text-sm">{error}</div>}
         <textarea
           value={json}
           onChange={(e) => setJson(e.target.value)}
-          className="w-full min-h-[400px] px-4 py-3 border border-gray-300 rounded-lg text-sm font-mono focus:outline-none focus:ring-2 focus:ring-blue-500 resize-none"
+          className="w-full min-h-[400px] px-4 py-3 border border-gray-300 rounded-lg text-sm font-mono focus:outline-hidden focus:ring-2 focus:ring-blue-500 resize-none"
           placeholder="Paste your tool JSON here..."
         />
       </div>
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 e952ee71dbd..6035e543df1 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
@@ -104,7 +104,7 @@ const VariableTextArea: React.FC<VariableTextAreaProps> = ({ value, onChange, pl
                   <div className="flex gap-2 mt-2">
                     <button
                       onClick={handleVariableEdit}
-                      className="text-xs px-2 py-1 bg-blue-500 text-white rounded hover:bg-blue-600"
+                      className="text-xs px-2 py-1 bg-blue-500 text-white rounded-sm hover:bg-blue-600"
                     >
                       Save
                     </button>
@@ -113,7 +113,7 @@ const VariableTextArea: React.FC<VariableTextAreaProps> = ({ value, onChange, pl
                         setEditingVariable(null);
                         setNewVariableName("");
                       }}
-                      className="text-xs px-2 py-1 bg-gray-200 text-gray-700 rounded hover:bg-gray-300"
+                      className="text-xs px-2 py-1 bg-gray-200 text-gray-700 rounded-sm hover:bg-gray-300"
                     >
                       Cancel
                     </button>
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 3c0582bdfab..2fe9f3b5b8c 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
@@ -241,7 +241,7 @@ export const SearchToolTester: React.FC<SearchToolTesterProps> = ({ searchToolNa
                                 <Button
                                   type="text"
                                   size="small"
-                                  className="flex-shrink-0"
+                                  className="shrink-0"
                                   icon={
                                     <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                       <path
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/ui-theme/UIThemeSettings.tsx b/ui/litellm-dashboard/src/app/(dashboard)/ui-theme/UIThemeSettings.tsx
index 2b70a0e8c96..15a3de0f78b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/ui-theme/UIThemeSettings.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/ui-theme/UIThemeSettings.tsx
@@ -116,7 +116,7 @@ const UIThemeSettings: React.FC<UIThemeSettingsProps> = ({ userID, userRole, acc
         <Title className="text-2xl font-bold mb-2">UI Theme Customization</Title>
         <Text className="text-gray-600">Customize your LiteLLM admin dashboard with a custom logo and favicon.</Text>
       </div>
-      <Card className="shadow-sm p-6">
+      <Card className="shadow-xs p-6">
         <div className="space-y-6">
           <div>
             <Text className="text-sm font-medium text-gray-700 mb-2 block">Custom Logo URL</Text>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/DefaultUserSettings.tsx b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/DefaultUserSettings.tsx
index 8d36417f813..7fee2e14b27 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/DefaultUserSettings.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/DefaultUserSettings.tsx
@@ -375,7 +375,7 @@ const DefaultUserSettings: React.FC<DefaultUserSettingsProps> = ({
       return (
         <div className="flex flex-wrap gap-2 mt-1">
           {value.map((model, index) => (
-            <span key={index} className="px-2 py-1 bg-blue-100 rounded text-xs">
+            <span key={index} className="px-2 py-1 bg-blue-100 rounded-sm text-xs">
               {getModelDisplayName(model)}
             </span>
           ))}
@@ -390,7 +390,7 @@ const DefaultUserSettings: React.FC<DefaultUserSettingsProps> = ({
         return (
           <div className="flex flex-wrap gap-2 mt-1">
             {value.map((item, index) => (
-              <span key={index} className="px-2 py-1 bg-blue-100 rounded text-xs">
+              <span key={index} className="px-2 py-1 bg-blue-100 rounded-sm text-xs">
                 {typeof item === "object" ? JSON.stringify(item) : String(item)}
               </span>
             ))}
@@ -398,7 +398,9 @@ const DefaultUserSettings: React.FC<DefaultUserSettingsProps> = ({
         );
       }
 
-      return <pre className="bg-gray-100 p-2 rounded text-xs overflow-auto mt-1">{JSON.stringify(value, null, 2)}</pre>;
+      return (
+        <pre className="bg-gray-100 p-2 rounded-sm text-xs overflow-auto mt-1">{JSON.stringify(value, null, 2)}</pre>
+      );
     }
 
     return <span>{String(value)}</span>;
@@ -442,7 +444,7 @@ const DefaultUserSettings: React.FC<DefaultUserSettingsProps> = ({
           {isEditing ? (
             <div className="mt-2">{renderEditableField(key, property, value)}</div>
           ) : (
-            <div className="mt-1 p-2 bg-gray-50 rounded">{renderValue(key, value)}</div>
+            <div className="mt-1 p-2 bg-gray-50 rounded-sm">{renderValue(key, value)}</div>
           )}
         </div>
       );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/table.tsx b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/table.tsx
index 9391ca413f5..1ba09243a08 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/table.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/table.tsx
@@ -212,7 +212,7 @@ export function UserDataTable({
   }
 
   return (
-    <div className="bg-white rounded-lg shadow">
+    <div className="bg-white rounded-lg shadow-sm">
       {/* Filter Section */}
       <div className="border-b px-6 py-4">
         <div className="flex flex-col space-y-4">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/user_info_view.tsx b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/user_info_view.tsx
index 29e3474dd0a..4692b71c24a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/user_info_view.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/view_users/user_info_view.tsx
@@ -583,7 +583,7 @@ export default function UserInfoView({
                     <div className="flex flex-wrap gap-2 mt-1">
                       {userData.models?.length && userData.models?.length > 0 ? (
                         userData.models?.map((model, index) => (
-                          <span key={index} className="px-2 py-1 bg-blue-100 rounded text-xs">
+                          <span key={index} className="px-2 py-1 bg-blue-100 rounded-sm text-xs">
                             {model}
                           </span>
                         ))
@@ -609,7 +609,7 @@ export default function UserInfoView({
 
                   <div>
                     <Text className="font-medium">Metadata</Text>
-                    <pre className="bg-gray-100 p-2 rounded text-xs overflow-auto mt-1">
+                    <pre className="bg-gray-100 p-2 rounded-sm text-xs overflow-auto mt-1">
                       {JSON.stringify(userData.metadata || {}, null, 2)}
                     </pre>
                   </div>
diff --git a/ui/litellm-dashboard/src/app/globals.css b/ui/litellm-dashboard/src/app/globals.css
index 0d453e284ef..3f38b6b0831 100644
--- a/ui/litellm-dashboard/src/app/globals.css
+++ b/ui/litellm-dashboard/src/app/globals.css
@@ -1,36 +1,215 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@layer theme, base, antd, components, utilities;
+
+@import "tailwindcss";
+@import "tw-animate-css";
+@import "./tremor-v3-compat.css" layer(utilities);
+
+@source '../../node_modules/@tremor/react';
+
+@plugin '@headlessui/tailwindcss';
+@plugin '@tailwindcss/forms';
+
+@custom-variant dark (&:where(.dark, .dark *));
 
 :root {
-  --foreground-rgb: 0, 0, 0;
-  --background-start-rgb: 255, 255, 255;
-  --background-end-rgb: 255, 255, 255;
+  --radius: 0.5rem;
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.13 0.028 261.692);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.13 0.028 261.692);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.13 0.028 261.692);
+  --primary: oklch(0.21 0.034 264.665);
+  --primary-foreground: oklch(0.985 0.002 247.839);
+  --secondary: oklch(0.967 0.003 264.542);
+  --secondary-foreground: oklch(0.21 0.034 264.665);
+  --muted: oklch(0.967 0.003 264.542);
+  --muted-foreground: oklch(0.551 0.027 264.364);
+  --accent: oklch(0.967 0.003 264.542);
+  --accent-foreground: oklch(0.21 0.034 264.665);
+  --destructive: oklch(0.577 0.245 27.325);
+  --border: oklch(0.928 0.006 264.531);
+  --input: oklch(0.928 0.006 264.531);
+  --ring: oklch(0.707 0.022 261.325);
+  --chart-1: oklch(0.646 0.222 41.116);
+  --chart-2: oklch(0.6 0.118 184.704);
+  --chart-3: oklch(0.398 0.07 227.392);
+  --chart-4: oklch(0.828 0.189 84.429);
+  --chart-5: oklch(0.769 0.188 70.08);
+  --sidebar: oklch(0.985 0.002 247.839);
+  --sidebar-foreground: oklch(0.13 0.028 261.692);
+  --sidebar-primary: oklch(0.21 0.034 264.665);
+  --sidebar-primary-foreground: oklch(0.985 0.002 247.839);
+  --sidebar-accent: oklch(0.967 0.003 264.542);
+  --sidebar-accent-foreground: oklch(0.21 0.034 264.665);
+  --sidebar-border: oklch(0.928 0.006 264.531);
+  --sidebar-ring: oklch(0.707 0.022 261.325);
   --neutral-border: #dcddeb;
 }
 
-/* @media (prefers-color-scheme: dark) {
-  :root {
-    --foreground-rgb: 255, 255, 255;
-    --background-start-rgb: 0, 0, 0;
-    --background-end-rgb: 0, 0, 0;
-  }
-} */
-
-body {
-  color: rgb(var(--foreground-rgb));
-  background: linear-gradient(to bottom, transparent, rgb(var(--background-end-rgb))) rgb(var(--background-start-rgb));
+.dark {
+  --background: oklch(0.13 0.028 261.692);
+  --foreground: oklch(0.985 0.002 247.839);
+  --card: oklch(0.21 0.034 264.665);
+  --card-foreground: oklch(0.985 0.002 247.839);
+  --popover: oklch(0.21 0.034 264.665);
+  --popover-foreground: oklch(0.985 0.002 247.839);
+  --primary: oklch(0.928 0.006 264.531);
+  --primary-foreground: oklch(0.21 0.034 264.665);
+  --secondary: oklch(0.278 0.033 256.848);
+  --secondary-foreground: oklch(0.985 0.002 247.839);
+  --muted: oklch(0.278 0.033 256.848);
+  --muted-foreground: oklch(0.707 0.022 261.325);
+  --accent: oklch(0.278 0.033 256.848);
+  --accent-foreground: oklch(0.985 0.002 247.839);
+  --destructive: oklch(0.704 0.191 22.216);
+  --border: oklch(1 0 0 / 10%);
+  --input: oklch(1 0 0 / 15%);
+  --ring: oklch(0.551 0.027 264.364);
+  --chart-1: oklch(0.488 0.243 264.376);
+  --chart-2: oklch(0.696 0.17 162.48);
+  --chart-3: oklch(0.769 0.188 70.08);
+  --chart-4: oklch(0.627 0.265 303.9);
+  --chart-5: oklch(0.645 0.246 16.439);
+  --sidebar: oklch(0.21 0.034 264.665);
+  --sidebar-foreground: oklch(0.985 0.002 247.839);
+  --sidebar-primary: oklch(0.488 0.243 264.376);
+  --sidebar-primary-foreground: oklch(0.985 0.002 247.839);
+  --sidebar-accent: oklch(0.278 0.033 256.848);
+  --sidebar-accent-foreground: oklch(0.985 0.002 247.839);
+  --sidebar-border: oklch(1 0 0 / 10%);
+  --sidebar-ring: oklch(0.551 0.027 264.364);
 }
 
-@layer utilities {
-  .text-balance {
-    text-wrap: balance;
+@theme inline {
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --color-card: var(--card);
+  --color-card-foreground: var(--card-foreground);
+  --color-popover: var(--popover);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-primary: var(--primary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-secondary: var(--secondary);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-muted: var(--muted);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-accent: var(--accent);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-destructive: var(--destructive);
+  --color-border: var(--border);
+  --color-input: var(--input);
+  --color-ring: var(--ring);
+  --color-chart-1: var(--chart-1);
+  --color-chart-2: var(--chart-2);
+  --color-chart-3: var(--chart-3);
+  --color-chart-4: var(--chart-4);
+  --color-chart-5: var(--chart-5);
+  --color-sidebar: var(--sidebar);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-ring: var(--sidebar-ring);
+}
+
+@theme {
+  --color-tremor-brand-muted: #8688ef;
+  --color-tremor-brand-subtle: #8e91eb;
+  --color-tremor-brand: #6366f1;
+  --color-tremor-brand-emphasis: #4338ca;
+  --color-tremor-brand-inverted: #ffffff;
+  --color-tremor-background-muted: #f9fafb;
+  --color-tremor-background-subtle: #f3f4f6;
+  --color-tremor-background: #ffffff;
+  --color-tremor-background-emphasis: #374151;
+  --color-tremor-border: #e5e7eb;
+  --color-tremor-ring: #e5e7eb;
+  --color-tremor-content-subtle: #9ca3af;
+  --color-tremor-content: #6b7280;
+  --color-tremor-content-emphasis: #374151;
+  --color-tremor-content-strong: #111827;
+  --color-tremor-content-inverted: #ffffff;
+
+  --color-dark-tremor-brand-faint: #0b1229;
+  --color-dark-tremor-brand-muted: #1e1b4b;
+  --color-dark-tremor-brand-subtle: #3730a3;
+  --color-dark-tremor-brand: #6366f1;
+  --color-dark-tremor-brand-emphasis: #818cf8;
+  --color-dark-tremor-brand-inverted: #1e1b4b;
+  --color-dark-tremor-background-muted: #131a2b;
+  --color-dark-tremor-background-subtle: #1f2937;
+  --color-dark-tremor-background: #111827;
+  --color-dark-tremor-background-emphasis: #d1d5db;
+  --color-dark-tremor-border: #374151;
+  --color-dark-tremor-ring: #1f2937;
+  --color-dark-tremor-content-subtle: #4b5563;
+  --color-dark-tremor-content: #6b7280;
+  --color-dark-tremor-content-emphasis: #e5e7eb;
+  --color-dark-tremor-content-strong: #f9fafb;
+  --color-dark-tremor-content-inverted: #030712;
+
+  --shadow-tremor-input: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+  --shadow-tremor-card: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+  --shadow-tremor-dropdown: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+  --shadow-dark-tremor-input: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+  --shadow-dark-tremor-card: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+  --shadow-dark-tremor-dropdown: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+
+  --radius-tremor-small: 0.375rem;
+  --radius-tremor-default: 0.5rem;
+  --radius-tremor-full: 9999px;
+
+  --text-tremor-label: 0.75rem;
+  --text-tremor-label--line-height: 0.3rem;
+  --text-tremor-default: 0.775rem;
+  --text-tremor-default--line-height: 1.15rem;
+  --text-tremor-title: 1.025rem;
+  --text-tremor-title--line-height: 1.65rem;
+  --text-tremor-metric: 1.675rem;
+  --text-tremor-metric--line-height: 2.15rem;
+}
+
+@source inline("{,hover:,ui-selected:}{bg,text,border}-{slate,gray,zinc,neutral,stone,red,orange,amber,yellow,lime,green,emerald,teal,cyan,sky,blue,indigo,violet,purple,fuchsia,pink,rose}-{50,{100..900..100},950}");
+@source inline("{ring,stroke,fill}-{slate,gray,zinc,neutral,stone,red,orange,amber,yellow,lime,green,emerald,teal,cyan,sky,blue,indigo,violet,purple,fuchsia,pink,rose}-{50,{100..900..100},950}");
+
+@layer base {
+  *,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    border-color: var(--color-border);
+  }
+
+  * {
+    outline-color: color-mix(in oklab, var(--color-ring) 50%, transparent);
+  }
+
+  button:not(:disabled),
+  [role="button"]:not(:disabled) {
+    cursor: pointer;
+  }
+
+  input::placeholder,
+  textarea::placeholder {
+    color: var(--color-gray-400);
+  }
+
+  body {
+    background-color: var(--color-background);
+    color: var(--color-foreground);
   }
 }
 
 .table-wrapper {
   overflow-x: scroll;
-  /* max-width: 80%; */
   margin: 0px 24px;
 }
 
diff --git a/ui/litellm-dashboard/src/app/login/LoginPage.tsx b/ui/litellm-dashboard/src/app/login/LoginPage.tsx
index 6cf86dc0c5a..1d08e647196 100644
--- a/ui/litellm-dashboard/src/app/login/LoginPage.tsx
+++ b/ui/litellm-dashboard/src/app/login/LoginPage.tsx
@@ -162,7 +162,7 @@ function LoginPageContent() {
                     environment variable:
                   </Paragraph>
                   <Paragraph className="text-sm">
-                    <code className="bg-gray-100 px-1 py-0.5 rounded text-xs">DISABLE_ADMIN_UI=False</code>
+                    <code className="bg-gray-100 px-1 py-0.5 rounded-sm text-xs">DISABLE_ADMIN_UI=False</code>
                   </Paragraph>
                 </>
               }
@@ -194,9 +194,9 @@ function LoginPageContent() {
               description={
                 <>
                   <Paragraph className="text-sm">
-                    By default, Username is <code className="bg-gray-100 px-1 py-0.5 rounded text-xs">admin</code> and
-                    Password is your set LiteLLM Proxy
-                    <code className="bg-gray-100 px-1 py-0.5 rounded text-xs">MASTER_KEY</code>.
+                    By default, Username is <code className="bg-gray-100 px-1 py-0.5 rounded-sm text-xs">admin</code>{" "}
+                    and Password is your set LiteLLM Proxy
+                    <code className="bg-gray-100 px-1 py-0.5 rounded-sm text-xs">MASTER_KEY</code>.
                   </Paragraph>
                   <Paragraph className="text-sm">
                     Need to set UI credentials or SSO?{" "}
diff --git a/ui/litellm-dashboard/src/app/tremor-v3-compat.css b/ui/litellm-dashboard/src/app/tremor-v3-compat.css
new file mode 100644
index 00000000000..0ade5e4dd88
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/tremor-v3-compat.css
@@ -0,0 +1,615 @@
+.bg-slate-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-slate-500) 10%, transparent);
+}
+
+.bg-slate-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-slate-500) 20%, transparent);
+}
+
+.bg-slate-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-slate-500) 40%, transparent);
+}
+
+.hover\:bg-slate-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-slate-500) 20%, transparent);
+}
+
+.group:hover .bg-slate-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-slate-500) 30%, transparent);
+}
+
+.ring-slate-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-slate-500) 20%, transparent);
+}
+
+.ring-slate-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-slate-300) 40%, transparent);
+}
+
+.bg-gray-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-gray-500) 10%, transparent);
+}
+
+.bg-gray-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-gray-500) 20%, transparent);
+}
+
+.bg-gray-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-gray-500) 40%, transparent);
+}
+
+.hover\:bg-gray-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-gray-500) 20%, transparent);
+}
+
+.group:hover .bg-gray-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-gray-500) 30%, transparent);
+}
+
+.ring-gray-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-gray-500) 20%, transparent);
+}
+
+.ring-gray-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-gray-300) 40%, transparent);
+}
+
+.bg-zinc-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-zinc-500) 10%, transparent);
+}
+
+.bg-zinc-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-zinc-500) 20%, transparent);
+}
+
+.bg-zinc-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-zinc-500) 40%, transparent);
+}
+
+.hover\:bg-zinc-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-zinc-500) 20%, transparent);
+}
+
+.group:hover .bg-zinc-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-zinc-500) 30%, transparent);
+}
+
+.ring-zinc-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-zinc-500) 20%, transparent);
+}
+
+.ring-zinc-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-zinc-300) 40%, transparent);
+}
+
+.bg-neutral-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-neutral-500) 10%, transparent);
+}
+
+.bg-neutral-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-neutral-500) 20%, transparent);
+}
+
+.bg-neutral-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-neutral-500) 40%, transparent);
+}
+
+.hover\:bg-neutral-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-neutral-500) 20%, transparent);
+}
+
+.group:hover .bg-neutral-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-neutral-500) 30%, transparent);
+}
+
+.ring-neutral-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-neutral-500) 20%, transparent);
+}
+
+.ring-neutral-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-neutral-300) 40%, transparent);
+}
+
+.bg-stone-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-stone-500) 10%, transparent);
+}
+
+.bg-stone-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-stone-500) 20%, transparent);
+}
+
+.bg-stone-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-stone-500) 40%, transparent);
+}
+
+.hover\:bg-stone-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-stone-500) 20%, transparent);
+}
+
+.group:hover .bg-stone-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-stone-500) 30%, transparent);
+}
+
+.ring-stone-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-stone-500) 20%, transparent);
+}
+
+.ring-stone-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-stone-300) 40%, transparent);
+}
+
+.bg-red-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-red-500) 10%, transparent);
+}
+
+.bg-red-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-red-500) 20%, transparent);
+}
+
+.bg-red-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-red-500) 40%, transparent);
+}
+
+.hover\:bg-red-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-red-500) 20%, transparent);
+}
+
+.group:hover .bg-red-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-red-500) 30%, transparent);
+}
+
+.ring-red-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-red-500) 20%, transparent);
+}
+
+.ring-red-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-red-300) 40%, transparent);
+}
+
+.bg-orange-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-orange-500) 10%, transparent);
+}
+
+.bg-orange-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-orange-500) 20%, transparent);
+}
+
+.bg-orange-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-orange-500) 40%, transparent);
+}
+
+.hover\:bg-orange-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-orange-500) 20%, transparent);
+}
+
+.group:hover .bg-orange-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-orange-500) 30%, transparent);
+}
+
+.ring-orange-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-orange-500) 20%, transparent);
+}
+
+.ring-orange-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-orange-300) 40%, transparent);
+}
+
+.bg-amber-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-amber-500) 10%, transparent);
+}
+
+.bg-amber-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-amber-500) 20%, transparent);
+}
+
+.bg-amber-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-amber-500) 40%, transparent);
+}
+
+.hover\:bg-amber-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-amber-500) 20%, transparent);
+}
+
+.group:hover .bg-amber-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-amber-500) 30%, transparent);
+}
+
+.ring-amber-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-amber-500) 20%, transparent);
+}
+
+.ring-amber-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-amber-300) 40%, transparent);
+}
+
+.bg-yellow-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-yellow-500) 10%, transparent);
+}
+
+.bg-yellow-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-yellow-500) 20%, transparent);
+}
+
+.bg-yellow-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-yellow-500) 40%, transparent);
+}
+
+.hover\:bg-yellow-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-yellow-500) 20%, transparent);
+}
+
+.group:hover .bg-yellow-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-yellow-500) 30%, transparent);
+}
+
+.ring-yellow-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-yellow-500) 20%, transparent);
+}
+
+.ring-yellow-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-yellow-300) 40%, transparent);
+}
+
+.bg-lime-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-lime-500) 10%, transparent);
+}
+
+.bg-lime-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-lime-500) 20%, transparent);
+}
+
+.bg-lime-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-lime-500) 40%, transparent);
+}
+
+.hover\:bg-lime-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-lime-500) 20%, transparent);
+}
+
+.group:hover .bg-lime-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-lime-500) 30%, transparent);
+}
+
+.ring-lime-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-lime-500) 20%, transparent);
+}
+
+.ring-lime-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-lime-300) 40%, transparent);
+}
+
+.bg-green-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-green-500) 10%, transparent);
+}
+
+.bg-green-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-green-500) 20%, transparent);
+}
+
+.bg-green-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-green-500) 40%, transparent);
+}
+
+.hover\:bg-green-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-green-500) 20%, transparent);
+}
+
+.group:hover .bg-green-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-green-500) 30%, transparent);
+}
+
+.ring-green-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-green-500) 20%, transparent);
+}
+
+.ring-green-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-green-300) 40%, transparent);
+}
+
+.bg-emerald-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-emerald-500) 10%, transparent);
+}
+
+.bg-emerald-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-emerald-500) 20%, transparent);
+}
+
+.bg-emerald-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-emerald-500) 40%, transparent);
+}
+
+.hover\:bg-emerald-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-emerald-500) 20%, transparent);
+}
+
+.group:hover .bg-emerald-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-emerald-500) 30%, transparent);
+}
+
+.ring-emerald-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-emerald-500) 20%, transparent);
+}
+
+.ring-emerald-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-emerald-300) 40%, transparent);
+}
+
+.bg-teal-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-teal-500) 10%, transparent);
+}
+
+.bg-teal-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-teal-500) 20%, transparent);
+}
+
+.bg-teal-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-teal-500) 40%, transparent);
+}
+
+.hover\:bg-teal-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-teal-500) 20%, transparent);
+}
+
+.group:hover .bg-teal-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-teal-500) 30%, transparent);
+}
+
+.ring-teal-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-teal-500) 20%, transparent);
+}
+
+.ring-teal-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-teal-300) 40%, transparent);
+}
+
+.bg-cyan-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-cyan-500) 10%, transparent);
+}
+
+.bg-cyan-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-cyan-500) 20%, transparent);
+}
+
+.bg-cyan-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-cyan-500) 40%, transparent);
+}
+
+.hover\:bg-cyan-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-cyan-500) 20%, transparent);
+}
+
+.group:hover .bg-cyan-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-cyan-500) 30%, transparent);
+}
+
+.ring-cyan-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-cyan-500) 20%, transparent);
+}
+
+.ring-cyan-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-cyan-300) 40%, transparent);
+}
+
+.bg-sky-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-sky-500) 10%, transparent);
+}
+
+.bg-sky-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-sky-500) 20%, transparent);
+}
+
+.bg-sky-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-sky-500) 40%, transparent);
+}
+
+.hover\:bg-sky-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-sky-500) 20%, transparent);
+}
+
+.group:hover .bg-sky-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-sky-500) 30%, transparent);
+}
+
+.ring-sky-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-sky-500) 20%, transparent);
+}
+
+.ring-sky-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-sky-300) 40%, transparent);
+}
+
+.bg-blue-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-blue-500) 10%, transparent);
+}
+
+.bg-blue-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-blue-500) 20%, transparent);
+}
+
+.bg-blue-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-blue-500) 40%, transparent);
+}
+
+.hover\:bg-blue-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-blue-500) 20%, transparent);
+}
+
+.group:hover .bg-blue-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-blue-500) 30%, transparent);
+}
+
+.ring-blue-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-blue-500) 20%, transparent);
+}
+
+.ring-blue-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-blue-300) 40%, transparent);
+}
+
+.bg-indigo-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-indigo-500) 10%, transparent);
+}
+
+.bg-indigo-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-indigo-500) 20%, transparent);
+}
+
+.bg-indigo-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-indigo-500) 40%, transparent);
+}
+
+.hover\:bg-indigo-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-indigo-500) 20%, transparent);
+}
+
+.group:hover .bg-indigo-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-indigo-500) 30%, transparent);
+}
+
+.ring-indigo-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-indigo-500) 20%, transparent);
+}
+
+.ring-indigo-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-indigo-300) 40%, transparent);
+}
+
+.bg-violet-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-violet-500) 10%, transparent);
+}
+
+.bg-violet-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-violet-500) 20%, transparent);
+}
+
+.bg-violet-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-violet-500) 40%, transparent);
+}
+
+.hover\:bg-violet-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-violet-500) 20%, transparent);
+}
+
+.group:hover .bg-violet-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-violet-500) 30%, transparent);
+}
+
+.ring-violet-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-violet-500) 20%, transparent);
+}
+
+.ring-violet-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-violet-300) 40%, transparent);
+}
+
+.bg-purple-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-purple-500) 10%, transparent);
+}
+
+.bg-purple-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-purple-500) 20%, transparent);
+}
+
+.bg-purple-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-purple-500) 40%, transparent);
+}
+
+.hover\:bg-purple-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-purple-500) 20%, transparent);
+}
+
+.group:hover .bg-purple-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-purple-500) 30%, transparent);
+}
+
+.ring-purple-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-purple-500) 20%, transparent);
+}
+
+.ring-purple-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-purple-300) 40%, transparent);
+}
+
+.bg-fuchsia-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-fuchsia-500) 10%, transparent);
+}
+
+.bg-fuchsia-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-fuchsia-500) 20%, transparent);
+}
+
+.bg-fuchsia-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-fuchsia-500) 40%, transparent);
+}
+
+.hover\:bg-fuchsia-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-fuchsia-500) 20%, transparent);
+}
+
+.group:hover .bg-fuchsia-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-fuchsia-500) 30%, transparent);
+}
+
+.ring-fuchsia-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-fuchsia-500) 20%, transparent);
+}
+
+.ring-fuchsia-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-fuchsia-300) 40%, transparent);
+}
+
+.bg-pink-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-pink-500) 10%, transparent);
+}
+
+.bg-pink-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-pink-500) 20%, transparent);
+}
+
+.bg-pink-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-pink-500) 40%, transparent);
+}
+
+.hover\:bg-pink-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-pink-500) 20%, transparent);
+}
+
+.group:hover .bg-pink-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-pink-500) 30%, transparent);
+}
+
+.ring-pink-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-pink-500) 20%, transparent);
+}
+
+.ring-pink-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-pink-300) 40%, transparent);
+}
+
+.bg-rose-500.bg-opacity-10 {
+  background-color: color-mix(in oklab, var(--color-rose-500) 10%, transparent);
+}
+
+.bg-rose-500.bg-opacity-20 {
+  background-color: color-mix(in oklab, var(--color-rose-500) 20%, transparent);
+}
+
+.bg-rose-500.bg-opacity-40 {
+  background-color: color-mix(in oklab, var(--color-rose-500) 40%, transparent);
+}
+
+.hover\:bg-rose-500.hover\:bg-opacity-20:hover {
+  background-color: color-mix(in oklab, var(--color-rose-500) 20%, transparent);
+}
+
+.group:hover .bg-rose-500.group-hover\:bg-opacity-30 {
+  background-color: color-mix(in oklab, var(--color-rose-500) 30%, transparent);
+}
+
+.ring-rose-500.ring-opacity-20 {
+  --tw-ring-color: color-mix(in oklab, var(--color-rose-500) 20%, transparent);
+}
+
+.ring-rose-300.ring-opacity-40 {
+  --tw-ring-color: color-mix(in oklab, var(--color-rose-300) 40%, transparent);
+}
diff --git a/ui/litellm-dashboard/src/components/AIHub/ModelHubTable.tsx b/ui/litellm-dashboard/src/components/AIHub/ModelHubTable.tsx
index 56999cd1a83..9f77786635f 100644
--- a/ui/litellm-dashboard/src/components/AIHub/ModelHubTable.tsx
+++ b/ui/litellm-dashboard/src/components/AIHub/ModelHubTable.tsx
@@ -410,11 +410,11 @@ const ModelHubTable: React.FC<ModelHubTableProps> = ({ accessToken, publicPage,
             </div>
             <div className="flex items-center space-x-4">
               <Text>Model Hub URL:</Text>
-              <div className="flex items-center bg-gray-200 px-2 py-1 rounded">
+              <div className="flex items-center bg-gray-200 px-2 py-1 rounded-sm">
                 <Text className="mr-2">{`${getProxyBaseUrl()}/ui/model_hub_table`}</Text>
                 <button
                   onClick={() => copyToClipboard(`${getProxyBaseUrl()}/ui/model_hub_table`)}
-                  className="p-1 hover:bg-gray-300 rounded transition-colors"
+                  className="p-1 hover:bg-gray-300 rounded-sm transition-colors"
                   title="Copy URL"
                 >
                   <Copy size={16} className="text-gray-600" />
@@ -563,7 +563,7 @@ const ModelHubTable: React.FC<ModelHubTableProps> = ({ accessToken, publicPage,
         <div className="pt-5 pb-5">
           <div className="flex justify-between mb-4">
             <Text className="text-base mr-2">Shareable Link:</Text>
-            <Text className="max-w-sm ml-2 bg-gray-200 pr-2 pl-2 pt-1 pb-1 text-center rounded">
+            <Text className="max-w-sm ml-2 bg-gray-200 pr-2 pl-2 pt-1 pb-1 text-center rounded-sm">
               {`${getProxyBaseUrl()}/ui/model_hub_table`}
             </Text>
           </div>
@@ -817,7 +817,7 @@ print(response.choices[0].message.content)`}
                 <Text className="text-lg font-semibold mb-4">Skills</Text>
                 <div className="space-y-4">
                   {selectedAgent.skills.map((skill) => (
-                    <div key={skill.id} className="border border-gray-200 rounded p-4">
+                    <div key={skill.id} className="border border-gray-200 rounded-sm p-4">
                       <div className="flex justify-between items-start mb-2">
                         <div>
                           <Text className="font-medium text-base">{skill.name}</Text>
@@ -938,7 +938,9 @@ print(response.choices[0].message.content)`}
                 {selectedMcpServer.command && (
                   <div>
                     <Text className="font-medium">Command:</Text>
-                    <Text className="text-sm bg-gray-100 p-2 rounded mt-1 font-mono">{selectedMcpServer.command}</Text>
+                    <Text className="text-sm bg-gray-100 p-2 rounded-sm mt-1 font-mono">
+                      {selectedMcpServer.command}
+                    </Text>
                   </div>
                 )}
               </div>
@@ -1014,7 +1016,7 @@ print(response.choices[0].message.content)`}
                 )}
               </div>
               {selectedMcpServer.health_check_error && (
-                <div className="mt-2 p-2 bg-red-50 rounded">
+                <div className="mt-2 p-2 bg-red-50 rounded-sm">
                   <Text className="font-medium text-red-700">Health Check Error:</Text>
                   <Text className="text-sm text-red-600 mt-1">{selectedMcpServer.health_check_error}</Text>
                 </div>
diff --git a/ui/litellm-dashboard/src/components/AIHub/UsefulLinksManagement.tsx b/ui/litellm-dashboard/src/components/AIHub/UsefulLinksManagement.tsx
index c73eaf52384..42acfd94185 100644
--- a/ui/litellm-dashboard/src/components/AIHub/UsefulLinksManagement.tsx
+++ b/ui/litellm-dashboard/src/components/AIHub/UsefulLinksManagement.tsx
@@ -298,7 +298,7 @@ const UsefulLinksManagement: React.FC<UsefulLinksManagementProps> = ({ accessTok
                 href={`${getProxyBaseUrl()}/ui/model_hub_table`}
                 target="_blank"
                 rel="noopener noreferrer"
-                className="text-xs bg-blue-50 text-blue-600 px-3 py-1.5 rounded hover:bg-blue-100 flex items-center"
+                className="text-xs bg-blue-50 text-blue-600 px-3 py-1.5 rounded-sm hover:bg-blue-100 flex items-center"
                 title="Open Public Model Hub"
               >
                 Public Model Hub
@@ -307,7 +307,7 @@ const UsefulLinksManagement: React.FC<UsefulLinksManagementProps> = ({ accessTok
               {!isRearranging ? (
                 <button
                   onClick={handleStartRearranging}
-                  className="text-xs bg-purple-50 text-purple-600 px-3 py-1.5 rounded hover:bg-purple-100 flex items-center"
+                  className="text-xs bg-purple-50 text-purple-600 px-3 py-1.5 rounded-sm hover:bg-purple-100 flex items-center"
                 >
                   Rearrange Order
                 </button>
@@ -315,13 +315,13 @@ const UsefulLinksManagement: React.FC<UsefulLinksManagementProps> = ({ accessTok
                 <div className="flex space-x-2">
                   <button
                     onClick={handleSaveRearranging}
-                    className="text-xs bg-green-600 text-white px-3 py-1.5 rounded hover:bg-green-700"
+                    className="text-xs bg-green-600 text-white px-3 py-1.5 rounded-sm hover:bg-green-700"
                   >
                     Save Order
                   </button>
                   <button
                     onClick={handleCancelRearranging}
-                    className="text-xs bg-gray-50 text-gray-600 px-3 py-1.5 rounded hover:bg-gray-100"
+                    className="text-xs bg-gray-50 text-gray-600 px-3 py-1.5 rounded-sm hover:bg-gray-100"
                   >
                     Cancel
                   </button>
@@ -374,13 +374,13 @@ const UsefulLinksManagement: React.FC<UsefulLinksManagementProps> = ({ accessTok
                             <div className="flex space-x-2">
                               <button
                                 onClick={handleUpdateLink}
-                                className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded hover:bg-blue-100"
+                                className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded-sm hover:bg-blue-100"
                               >
                                 Save
                               </button>
                               <button
                                 onClick={handleCancelEdit}
-                                className="text-xs bg-gray-50 text-gray-600 px-2 py-1 rounded hover:bg-gray-100"
+                                className="text-xs bg-gray-50 text-gray-600 px-2 py-1 rounded-sm hover:bg-gray-100"
                               >
                                 Cancel
                               </button>
diff --git a/ui/litellm-dashboard/src/components/AIHub/forms/MakeAgentPublicForm.tsx b/ui/litellm-dashboard/src/components/AIHub/forms/MakeAgentPublicForm.tsx
index a38950b8fb7..0ed73872cee 100644
--- a/ui/litellm-dashboard/src/components/AIHub/forms/MakeAgentPublicForm.tsx
+++ b/ui/litellm-dashboard/src/components/AIHub/forms/MakeAgentPublicForm.tsx
@@ -204,7 +204,7 @@ const MakeAgentPublicForm: React.FC<MakeAgentPublicFormProps> = ({
               {Array.from(selectedAgents).map((agentId) => {
                 const agent = agentHubData.find((a) => (a.agent_id || a.name) === agentId);
                 return (
-                  <div key={agentId} className="flex items-center justify-between p-2 bg-gray-50 rounded">
+                  <div key={agentId} className="flex items-center justify-between p-2 bg-gray-50 rounded-sm">
                     <div className="flex-1">
                       <div className="flex items-center space-x-2">
                         <Text className="font-medium">{agent?.name || agentId}</Text>
diff --git a/ui/litellm-dashboard/src/components/AIHub/forms/MakeMCPPublicForm.tsx b/ui/litellm-dashboard/src/components/AIHub/forms/MakeMCPPublicForm.tsx
index d7103da9ed7..cc194775faa 100644
--- a/ui/litellm-dashboard/src/components/AIHub/forms/MakeMCPPublicForm.tsx
+++ b/ui/litellm-dashboard/src/components/AIHub/forms/MakeMCPPublicForm.tsx
@@ -225,7 +225,7 @@ const MakeMCPPublicForm: React.FC<MakeMCPPublicFormProps> = ({
               {Array.from(selectedServers).map((serverId) => {
                 const server = mcpHubData.find((s) => s.server_id === serverId);
                 return (
-                  <div key={serverId} className="flex items-center justify-between p-2 bg-gray-50 rounded">
+                  <div key={serverId} className="flex items-center justify-between p-2 bg-gray-50 rounded-sm">
                     <div className="flex-1">
                       <div className="flex items-center space-x-2">
                         <Text className="font-medium">{server?.server_name || serverId}</Text>
diff --git a/ui/litellm-dashboard/src/components/AIHub/forms/MakeModelPublicForm.tsx b/ui/litellm-dashboard/src/components/AIHub/forms/MakeModelPublicForm.tsx
index 16ed04c1779..2d0ae1a0e2b 100644
--- a/ui/litellm-dashboard/src/components/AIHub/forms/MakeModelPublicForm.tsx
+++ b/ui/litellm-dashboard/src/components/AIHub/forms/MakeModelPublicForm.tsx
@@ -233,7 +233,7 @@ const MakeModelPublicForm: React.FC<MakeModelPublicFormProps> = ({
               {Array.from(selectedModels).map((modelGroup) => {
                 const model = modelHubData.find((m) => m.model_group === modelGroup);
                 return (
-                  <div key={modelGroup} className="flex items-center justify-between p-2 bg-gray-50 rounded">
+                  <div key={modelGroup} className="flex items-center justify-between p-2 bg-gray-50 rounded-sm">
                     <div>
                       <Text className="font-medium">{modelGroup}</Text>
                       {model && (
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx
index 62709dac526..476c68fad96 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroIntegrationSettings.tsx
@@ -121,7 +121,7 @@ export function CloudZeroIntegrationSettings({ settings, onSettingsUpdated }: Cl
               </Button>
             </div>
           }
-          className="shadow-sm"
+          className="shadow-xs"
         >
           <Descriptions
             bordered
diff --git a/ui/litellm-dashboard/src/components/GuardrailsMonitor/LogViewer.tsx b/ui/litellm-dashboard/src/components/GuardrailsMonitor/LogViewer.tsx
index 623a8252067..c3671fc9e2c 100644
--- a/ui/litellm-dashboard/src/components/GuardrailsMonitor/LogViewer.tsx
+++ b/ui/litellm-dashboard/src/components/GuardrailsMonitor/LogViewer.tsx
@@ -172,11 +172,11 @@ export function LogViewer({
                 onClick={() => handleLogClick(log)}
                 className="w-full text-left px-4 py-3 hover:bg-gray-50 transition-colors flex items-start gap-3"
               >
-                <ActionIcon className={`w-4 h-4 mt-0.5 flex-shrink-0 ${config.color}`} />
+                <ActionIcon className={`w-4 h-4 mt-0.5 shrink-0 ${config.color}`} />
                 <div className="flex-1 min-w-0">
                   <div className="flex items-center gap-2 mb-1 flex-wrap">
                     <span
-                      className={`inline-flex items-center px-2 py-0.5 text-xs font-medium rounded border ${config.bg} ${config.color} ${config.border}`}
+                      className={`inline-flex items-center px-2 py-0.5 text-xs font-medium rounded-sm border ${config.bg} ${config.color} ${config.border}`}
                     >
                       {config.label}
                     </span>
@@ -186,7 +186,7 @@ export function LogViewer({
                   </div>
                   <p className="text-sm text-gray-800 truncate">{log.input_snippet ?? log.input ?? "—"}</p>
                 </div>
-                <DownOutlined className="w-4 h-4 text-gray-400 flex-shrink-0 mt-1" />
+                <DownOutlined className="w-4 h-4 text-gray-400 shrink-0 mt-1" />
               </button>
             );
           })}
diff --git a/ui/litellm-dashboard/src/components/HelpLink.tsx b/ui/litellm-dashboard/src/components/HelpLink.tsx
index 0058e5ae3d7..a5979e1e12a 100644
--- a/ui/litellm-dashboard/src/components/HelpLink.tsx
+++ b/ui/litellm-dashboard/src/components/HelpLink.tsx
@@ -47,13 +47,13 @@ export const HelpLink: React.FC<HelpLinkProps> = ({
   className = "",
 }) => {
   const baseClasses =
-    "inline-flex items-center gap-1.5 transition-colors focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 rounded";
+    "inline-flex items-center gap-1.5 transition-colors focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 rounded-sm";
 
   const variantClasses = {
     inline: "text-blue-600 hover:text-blue-800 text-sm font-medium hover:underline",
     subtle: "text-gray-500 hover:text-gray-700 text-xs",
     button:
-      "text-blue-600 hover:text-blue-700 border border-gray-200 hover:border-gray-300 px-3 py-1.5 rounded-md bg-white hover:bg-gray-50 text-sm font-medium shadow-sm",
+      "text-blue-600 hover:text-blue-700 border border-gray-200 hover:border-gray-300 px-3 py-1.5 rounded-md bg-white hover:bg-gray-50 text-sm font-medium shadow-xs",
   };
 
   return (
@@ -65,7 +65,7 @@ export const HelpLink: React.FC<HelpLinkProps> = ({
       title="Open documentation in a new tab"
     >
       <span>{children}</span>
-      <ExternalLink className="h-3.5 w-3.5 flex-shrink-0" aria-hidden="true" />
+      <ExternalLink className="h-3.5 w-3.5 shrink-0" aria-hidden="true" />
       <span className="sr-only">(opens in a new tab)</span>
     </a>
   );
@@ -88,7 +88,7 @@ export const HelpIcon: React.FC<HelpIconProps> = ({ content, learnMoreHref, lear
     <div className="relative inline-block ml-1.5">
       <button
         type="button"
-        className="inline-flex items-center justify-center w-4 h-4 text-gray-400 hover:text-gray-600 transition-colors cursor-help focus:outline-none focus:ring-2 focus:ring-blue-500 rounded-full"
+        className="inline-flex items-center justify-center w-4 h-4 text-gray-400 hover:text-gray-600 transition-colors cursor-help focus:outline-hidden focus:ring-2 focus:ring-blue-500 rounded-full"
         onMouseEnter={() => setShowTooltip(true)}
         onMouseLeave={() => setShowTooltip(false)}
         onFocus={() => setShowTooltip(true)}
@@ -169,7 +169,7 @@ export const DocsMenu: React.FC<DocsMenuProps> = ({ items, children = "Docs", cl
       <button
         type="button"
         onClick={() => setIsOpen(!isOpen)}
-        className="inline-flex items-center gap-1 text-gray-500 hover:text-gray-700 text-xs transition-colors focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 rounded px-2 py-1"
+        className="inline-flex items-center gap-1 text-gray-500 hover:text-gray-700 text-xs transition-colors focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 rounded-sm px-2 py-1"
         aria-expanded={isOpen}
         aria-haspopup="true"
       >
@@ -189,7 +189,7 @@ export const DocsMenu: React.FC<DocsMenuProps> = ({ items, children = "Docs", cl
               onClick={() => setIsOpen(false)}
             >
               <span>{item.label}</span>
-              <ExternalLink className="h-3.5 w-3.5 text-gray-400 flex-shrink-0 ml-2" aria-hidden="true" />
+              <ExternalLink className="h-3.5 w-3.5 text-gray-400 shrink-0 ml-2" aria-hidden="true" />
             </a>
           ))}
         </div>
diff --git a/ui/litellm-dashboard/src/components/Navbar/BlogDropdown/BlogDropdown.tsx b/ui/litellm-dashboard/src/components/Navbar/BlogDropdown/BlogDropdown.tsx
index 657e5a39bab..be659967a0f 100644
--- a/ui/litellm-dashboard/src/components/Navbar/BlogDropdown/BlogDropdown.tsx
+++ b/ui/litellm-dashboard/src/components/Navbar/BlogDropdown/BlogDropdown.tsx
@@ -78,7 +78,7 @@ export const BlogDropdown: React.FC = () => {
   // Blog opens a post list; Docs is a single outbound link — navbar adds a layout-only chevron there for alignment.
   return (
     <Dropdown menu={{ items }} trigger={["hover"]} placement="bottomRight">
-      <Button type="text" className={`${NAV_PRODUCT_LINK_CLASS} !border-0 !bg-transparent`}>
+      <Button type="text" className={`${NAV_PRODUCT_LINK_CLASS} border-0! bg-transparent!`}>
         Blog
         <DownOutlined className="text-[10px] text-gray-500" aria-hidden />
       </Button>
diff --git a/ui/litellm-dashboard/src/components/Navbar/NotificationsBell/NotificationsBell.tsx b/ui/litellm-dashboard/src/components/Navbar/NotificationsBell/NotificationsBell.tsx
index a3b7678e1e7..f57638a4e54 100644
--- a/ui/litellm-dashboard/src/components/Navbar/NotificationsBell/NotificationsBell.tsx
+++ b/ui/litellm-dashboard/src/components/Navbar/NotificationsBell/NotificationsBell.tsx
@@ -24,10 +24,10 @@ export const NotificationsBell: React.FC = () => {
 
   const content = (
     <div className="max-w-[280px]">
-      <Typography.Title level={5} className="!mt-0 !mb-2">
+      <Typography.Title level={5} className="mt-0! mb-2!">
         LiteLLM Agent Platform
       </Typography.Title>
-      <Typography.Paragraph type="secondary" className="!mb-3 text-sm leading-snug">
+      <Typography.Paragraph type="secondary" className="mb-3! text-sm leading-snug">
         Open-source agent infra — sandboxes, durable sessions, and workers on AWS Fargate.
       </Typography.Paragraph>
       <div className="flex flex-wrap items-center gap-2">
@@ -35,7 +35,7 @@ export const NotificationsBell: React.FC = () => {
           GitHub
         </Button>
         {hasUnread ? (
-          <Button type="link" size="small" className="!px-1" onClick={markDismissed}>
+          <Button type="link" size="small" className="px-1!" onClick={markDismissed}>
             Mark as read
           </Button>
         ) : null}
@@ -47,7 +47,7 @@ export const NotificationsBell: React.FC = () => {
     <Popover content={content} trigger="click" open={open} onOpenChange={setOpen} placement="bottomRight">
       <Button
         type="text"
-        className="!flex !h-9 !w-9 items-center justify-center !rounded-md text-gray-600 transition-colors hover:!bg-gray-100 hover:!text-gray-900"
+        className="flex! h-9! w-9! items-center justify-center rounded-md! text-gray-600 transition-colors hover:bg-gray-100! hover:text-gray-900!"
         aria-label="Notifications"
       >
         <Badge dot={hasUnread} color="#1677ff" size="small" offset={[8, 2]}>
diff --git a/ui/litellm-dashboard/src/components/Navbar/UserDropdown/UserDropdown.tsx b/ui/litellm-dashboard/src/components/Navbar/UserDropdown/UserDropdown.tsx
index 03312faaa39..bd197f3ec8b 100644
--- a/ui/litellm-dashboard/src/components/Navbar/UserDropdown/UserDropdown.tsx
+++ b/ui/litellm-dashboard/src/components/Navbar/UserDropdown/UserDropdown.tsx
@@ -232,7 +232,7 @@ const UserDropdown: React.FC<UserDropdownProps> = ({ onLogout }) => {
     >
       <Button
         type="text"
-        className="!flex max-w-[min(200px,34vw)] items-center gap-2 !rounded-md !py-0.5 !pl-1 !pr-2 transition-colors hover:!bg-gray-100"
+        className="flex! max-w-[min(200px,34vw)] items-center gap-2 rounded-md! py-0.5! pl-1! pr-2! transition-colors hover:bg-gray-100!"
         aria-label={`Account menu — ${userRole ?? "Unknown role"} — signed in as ${userEmail || userId || "unknown"}`}
         aria-haspopup="menu"
       >
diff --git a/ui/litellm-dashboard/src/components/SCIM.tsx b/ui/litellm-dashboard/src/components/SCIM.tsx
index c8da8f2c9c7..a8d91c343e0 100644
--- a/ui/litellm-dashboard/src/components/SCIM.tsx
+++ b/ui/litellm-dashboard/src/components/SCIM.tsx
@@ -96,7 +96,7 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
               Use this URL in your identity provider SCIM integration settings.
             </Text>
             <div className="flex items-center">
-              <TextInput value={scimBaseUrl} disabled={true} className="flex-grow" />
+              <TextInput value={scimBaseUrl} disabled={true} className="grow" />
               <CopyToClipboard
                 text={scimBaseUrl}
                 onCopy={() => NotificationsManager.success("URL copied to clipboard")}
@@ -159,12 +159,7 @@ const SCIMConfig: React.FC<SCIMConfigProps> = ({ accessToken, userID, proxySetti
                   Make sure to copy this token now. You will not be able to see it again.
                 </Text>
                 <div className="flex items-center">
-                  <TextInput
-                    value={tokenData.key}
-                    className="flex-grow mr-2 bg-white"
-                    type="password"
-                    disabled={true}
-                  />
+                  <TextInput value={tokenData.key} className="grow mr-2 bg-white" type="password" disabled={true} />
                   <CopyToClipboard
                     text={tokenData.key}
                     onCopy={() => NotificationsManager.success("Token copied to clipboard")}
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 2372f626a5c..e91c938b87a 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx
@@ -76,7 +76,7 @@ export function FallbackGroupConfig({ group, onChange, availableModels, maxFallb
           options={availableModels.map((m) => ({ label: m, value: m }))}
         />
         {!group.primaryModel && (
-          <div className="mt-2 flex items-center gap-2 text-amber-600 text-xs bg-amber-50 p-2 rounded">
+          <div className="mt-2 flex items-center gap-2 text-amber-600 text-xs bg-amber-50 p-2 rounded-sm">
             <AlertCircle className="w-4 h-4" />
             <span>Select a model to begin configuring fallbacks</span>
           </div>
@@ -85,7 +85,7 @@ export function FallbackGroupConfig({ group, onChange, availableModels, maxFallb
 
       {/* Visual Connection */}
       <div className="flex items-center justify-center -my-4 z-10">
-        <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-sm">
+        <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">
           <ArrowDown className="w-4 h-4" />
           IF FAILS, TRY...
         </div>
@@ -124,7 +124,7 @@ export function FallbackGroupConfig({ group, onChange, availableModels, maxFallb
                 return (
                   <div className="flex items-center gap-2">
                     {isSelected && orderIndex !== null && (
-                      <span className="flex items-center justify-center w-5 h-5 rounded bg-indigo-100 text-indigo-600 text-xs font-bold">
+                      <span className="flex items-center justify-center w-5 h-5 rounded-sm bg-indigo-100 text-indigo-600 text-xs font-bold">
                         {orderIndex}
                       </span>
                     )}
@@ -163,10 +163,10 @@ export function FallbackGroupConfig({ group, onChange, availableModels, maxFallb
                 return (
                   <div
                     key={`${modelValue}-${index}`}
-                    className="group flex items-center justify-between p-3 bg-white rounded-lg border border-gray-200 hover:border-indigo-300 hover:shadow-sm transition-all"
+                    className="group flex items-center justify-between p-3 bg-white rounded-lg border border-gray-200 hover:border-indigo-300 hover:shadow-xs transition-all"
                   >
                     <div className="flex items-center gap-3">
-                      <div className="flex items-center justify-center w-6 h-6 rounded bg-gray-100 text-gray-400 group-hover:text-indigo-500 group-hover:bg-indigo-50">
+                      <div className="flex items-center justify-center w-6 h-6 rounded-sm bg-gray-100 text-gray-400 group-hover:text-indigo-500 group-hover:bg-indigo-50">
                         <span className="text-xs font-bold">{index + 1}</span>
                       </div>
                       <div>
diff --git a/ui/litellm-dashboard/src/components/ToolDetail.tsx b/ui/litellm-dashboard/src/components/ToolDetail.tsx
index b0fa6884dd3..f5ef938fb3a 100644
--- a/ui/litellm-dashboard/src/components/ToolDetail.tsx
+++ b/ui/litellm-dashboard/src/components/ToolDetail.tsx
@@ -291,7 +291,7 @@ export function ToolDetail({ toolName, onBack, accessToken }: ToolDetailProps) {
       <div className="space-y-6">
         {/* Two-panel policy layout */}
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-sm">
+          <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-xs">
             <h2 className="text-sm font-semibold text-gray-700 mb-1">Input Policy</h2>
             <p className="text-xs text-gray-500 mb-3">
               {inputDesc ?? "Controls what data this tool is allowed to accept."}
@@ -308,7 +308,7 @@ export function ToolDetail({ toolName, onBack, accessToken }: ToolDetailProps) {
             />
           </section>
 
-          <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-sm">
+          <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-xs">
             <h2 className="text-sm font-semibold text-gray-700 mb-1">Output Policy</h2>
             <p className="text-xs text-gray-500 mb-3">
               {outputDesc ?? "Controls how this tool's output is trusted by downstream tools."}
@@ -327,7 +327,7 @@ export function ToolDetail({ toolName, onBack, accessToken }: ToolDetailProps) {
         </div>
 
         {overrides.length > 0 && (
-          <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-sm">
+          <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-xs">
             <h2 className="text-sm font-semibold text-gray-700 mb-3">Blocked for team or key</h2>
             <ul className="border rounded-md divide-y divide-gray-100 bg-red-50/30">
               {overrides.map((ov) => (
@@ -353,7 +353,7 @@ export function ToolDetail({ toolName, onBack, accessToken }: ToolDetailProps) {
           </section>
         )}
 
-        <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-sm">
+        <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-xs">
           <h2 className="text-sm font-semibold text-gray-700 mb-3">Block for team or key</h2>
           <div className="flex flex-col gap-4 max-w-md">
             <div>
@@ -417,7 +417,7 @@ export function ToolDetail({ toolName, onBack, accessToken }: ToolDetailProps) {
           </div>
         </section>
 
-        <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-sm">
+        <section className="bg-white rounded-lg border border-gray-200 p-5 shadow-xs">
           <h2 className="text-sm font-semibold text-gray-700 mb-3 flex items-center gap-2">
             <HistoryOutlined />
             Recent logs
diff --git a/ui/litellm-dashboard/src/components/ToolPolicies.tsx b/ui/litellm-dashboard/src/components/ToolPolicies.tsx
index 9db693c8918..4bd028f0c8f 100644
--- a/ui/litellm-dashboard/src/components/ToolPolicies.tsx
+++ b/ui/litellm-dashboard/src/components/ToolPolicies.tsx
@@ -309,7 +309,7 @@ export const ToolPolicies: React.FC<ToolPoliciesProps> = ({ accessToken, onSelec
         </div>
       )}
 
-      <div className="bg-white rounded-lg shadow w-full max-w-full box-border">
+      <div className="bg-white rounded-lg shadow-sm w-full max-w-full box-border">
         <div className="border-b px-6 py-4 w-full max-w-full box-border">
           <div className="flex flex-col md:flex-row items-start md:items-center justify-between space-y-4 md:space-y-0 w-full max-w-full box-border">
             <div className="flex flex-wrap items-center gap-3">
@@ -317,7 +317,7 @@ export const ToolPolicies: React.FC<ToolPoliciesProps> = ({ accessToken, onSelec
                 <input
                   type="text"
                   placeholder="Search by Tool Name"
-                  className="w-full px-3 py-2 pl-8 border rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                  className="w-full px-3 py-2 pl-8 border rounded-md text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
                   value={searchTerm}
                   onChange={(e) => {
                     setSearchTerm(e.target.value);
@@ -413,7 +413,7 @@ export const ToolPolicies: React.FC<ToolPoliciesProps> = ({ accessToken, onSelec
         )}
 
         {error && (
-          <div className="mx-6 mt-4 p-3 bg-red-50 border border-red-200 rounded text-sm text-red-700">{error}</div>
+          <div className="mx-6 mt-4 p-3 bg-red-50 border border-red-200 rounded-sm text-sm text-red-700">{error}</div>
         )}
 
         <Table className="[&_td]:py-0.5 [&_th]:py-1 w-full">
@@ -467,7 +467,7 @@ export const ToolPolicies: React.FC<ToolPoliciesProps> = ({ accessToken, onSelec
                     <button
                       type="button"
                       onClick={() => onSelectTool?.(tool.tool_name)}
-                      className="text-left w-full font-mono text-xs max-w-[20ch] truncate block font-medium text-blue-600 hover:text-blue-800 hover:underline focus:outline-none focus:ring-0"
+                      className="text-left w-full font-mono text-xs max-w-[20ch] truncate block font-medium text-blue-600 hover:text-blue-800 hover:underline focus:outline-hidden focus:ring-0"
                     >
                       <Tooltip title={onSelectTool ? "Click to view details and block for team/key" : tool.tool_name}>
                         <span>{tool.tool_name}</span>
diff --git a/ui/litellm-dashboard/src/components/UsageIndicator.tsx b/ui/litellm-dashboard/src/components/UsageIndicator.tsx
index 3052bf645c6..030df228de0 100644
--- a/ui/litellm-dashboard/src/components/UsageIndicator.tsx
+++ b/ui/litellm-dashboard/src/components/UsageIndicator.tsx
@@ -14,10 +14,7 @@ import {
 import { useEffect, useState } from "react";
 import { getRemainingUsers, getLicenseInfo, LicenseInfo } from "./networking";
 
-// Simple utility function to combine class names
-const cn = (...classes: (string | boolean | undefined)[]) => {
-  return classes.filter(Boolean).join(" ");
-};
+import { cn } from "@/lib/cva.config";
 
 interface UsageIndicatorProps {
   accessToken: string | null;
@@ -173,29 +170,29 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
         <button
           onClick={() => setIsMinimized(false)}
           className={cn(
-            "flex items-center gap-2 text-xs text-gray-400 hover:text-gray-600 transition-colors p-1 rounded w-full",
+            "flex items-center gap-2 text-xs text-gray-400 hover:text-gray-600 transition-colors p-1 rounded-sm w-full",
             hasError && "text-red-400 hover:text-red-600",
             hasWarning && "text-yellow-500 hover:text-yellow-700",
           )}
           title="Show usage details"
         >
-          <Users className="h-3 w-3 flex-shrink-0" />
-          {hasAnyIssue && <span className="flex-shrink-0">{getStatusIcon()}</span>}
+          <Users className="h-3 w-3 shrink-0" />
+          {hasAnyIssue && <span className="shrink-0">{getStatusIcon()}</span>}
           <div className="flex items-center gap-1 truncate">
             {data && data.total_users !== null && (
-              <span className="flex-shrink-0">
+              <span className="shrink-0">
                 U:{data.total_users_used}/{data.total_users}
               </span>
             )}
             {data && data.total_teams !== null && (
-              <span className="flex-shrink-0">
+              <span className="shrink-0">
                 T:{data.total_teams_used}/{data.total_teams}
               </span>
             )}
             {licenseInfo?.expiration_date && daysUntilExpiration !== null && (
               <span
                 className={cn(
-                  "flex-shrink-0",
+                  "shrink-0",
                   isLicenseExpired && "text-red-500",
                   isLicenseExpiringSoon && "text-yellow-500",
                 )}
@@ -222,7 +219,7 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
     if (isLoading) {
       return (
         <div className="flex items-center gap-3 px-3 py-2 text-gray-500" style={{ maxWidth: `${width}px` }}>
-          <Loader2 className="h-4 w-4 animate-spin flex-shrink-0" />
+          <Loader2 className="h-4 w-4 animate-spin shrink-0" />
           <span className="text-sm truncate">Loading...</span>
         </div>
       );
@@ -235,12 +232,12 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
           style={{ maxWidth: `${width}px` }}
         >
           <div className="flex items-center gap-3 min-w-0 flex-1">
-            <Users className="h-4 w-4 flex-shrink-0" />
+            <Users className="h-4 w-4 shrink-0" />
             <span className="text-sm truncate">{error || "No data"}</span>
           </div>
           <button
             onClick={() => setIsMinimized(true)}
-            className="opacity-0 group-hover:opacity-100 p-0.5 hover:bg-gray-100 rounded transition-all flex-shrink-0"
+            className="opacity-0 group-hover:opacity-100 p-0.5 hover:bg-gray-100 rounded-sm transition-all shrink-0"
             title="Minimize"
           >
             <Minus className="h-3 w-3" />
@@ -261,24 +258,24 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
               hasWarning && "text-yellow-600",
             )}
           >
-            <Users className="h-4 w-4 flex-shrink-0" />
+            <Users className="h-4 w-4 shrink-0" />
             <span className="text-sm font-medium truncate">Usage Status</span>
             {hasAnyIssue && (
-              <Badge color={getStatusColor()} className="text-xs px-1.5 py-0.5 flex-shrink-0">
+              <Badge color={getStatusColor()} className="text-xs px-1.5 py-0.5 shrink-0">
                 {getStatusIcon()}
               </Badge>
             )}
             {isExpanded ? (
-              <ChevronUp className="h-3 w-3 text-gray-400 ml-auto flex-shrink-0" />
+              <ChevronUp className="h-3 w-3 text-gray-400 ml-auto shrink-0" />
             ) : (
-              <ChevronDown className="h-3 w-3 text-gray-400 ml-auto flex-shrink-0" />
+              <ChevronDown className="h-3 w-3 text-gray-400 ml-auto shrink-0" />
             )}
           </button>
 
           {/* Minimize button */}
           <button
             onClick={() => setIsMinimized(true)}
-            className="opacity-0 group-hover:opacity-100 p-0.5 hover:bg-gray-100 rounded transition-all ml-1 flex-shrink-0"
+            className="opacity-0 group-hover:opacity-100 p-0.5 hover:bg-gray-100 rounded-sm transition-all ml-1 shrink-0"
             title="Minimize"
           >
             <Minus className="h-3 w-3 text-gray-400" />
@@ -410,18 +407,18 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
         <button
           onClick={() => setIsMinimized(false)}
           className={cn(
-            "bg-white border border-gray-200 rounded-lg shadow-sm p-3 hover:shadow-md transition-all w-full",
+            "bg-white border border-gray-200 rounded-lg shadow-xs p-3 hover:shadow-md transition-all w-full",
           )}
           title="Show usage details"
         >
           <div className="flex items-center gap-2">
-            <Users className="h-4 w-4 flex-shrink-0" />
-            {hasAnyIssue && <span className="flex-shrink-0">{getStatusIcon()}</span>}
+            <Users className="h-4 w-4 shrink-0" />
+            {hasAnyIssue && <span className="shrink-0">{getStatusIcon()}</span>}
             <div className="flex items-center gap-2 text-sm font-medium truncate">
               {data && data.total_users !== null && (
                 <span
                   className={cn(
-                    "flex-shrink-0 px-1.5 py-0.5 rounded text-xs border",
+                    "shrink-0 px-1.5 py-0.5 rounded-sm text-xs border",
                     userMetrics.isOverLimit && "bg-red-50 text-red-700 border-red-200",
                     userMetrics.isNearLimit && "bg-yellow-50 text-yellow-700 border-yellow-200",
                     !userMetrics.isOverLimit && !userMetrics.isNearLimit && "bg-gray-50 text-gray-700 border-gray-200",
@@ -433,7 +430,7 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
               {data && data.total_teams !== null && (
                 <span
                   className={cn(
-                    "flex-shrink-0 px-1.5 py-0.5 rounded text-xs border",
+                    "shrink-0 px-1.5 py-0.5 rounded-sm text-xs border",
                     teamMetrics.isOverLimit && "bg-red-50 text-red-700 border-red-200",
                     teamMetrics.isNearLimit && "bg-yellow-50 text-yellow-700 border-yellow-200",
                     !teamMetrics.isOverLimit && !teamMetrics.isNearLimit && "bg-gray-50 text-gray-700 border-gray-200",
@@ -445,7 +442,7 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
               {licenseInfo?.expiration_date && daysUntilExpiration !== null && (
                 <span
                   className={cn(
-                    "flex-shrink-0 px-1.5 py-0.5 rounded text-xs border",
+                    "shrink-0 px-1.5 py-0.5 rounded-sm text-xs border",
                     isLicenseExpired && "bg-red-50 text-red-700 border-red-200",
                     isLicenseExpiringSoon && "bg-yellow-50 text-yellow-700 border-yellow-200",
                     !isLicenseExpired && !isLicenseExpiringSoon && "bg-gray-50 text-gray-700 border-gray-200",
@@ -466,7 +463,7 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
 
     if (isLoading) {
       return (
-        <div className="bg-white border border-gray-200 rounded-lg shadow-sm p-4 w-full">
+        <div className="bg-white border border-gray-200 rounded-lg shadow-xs p-4 w-full">
           <div className="flex items-center justify-center gap-2 py-2">
             <Loader2 className="h-4 w-4 animate-spin" />
             <span className="text-sm text-gray-500 truncate">Loading...</span>
@@ -477,14 +474,14 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
 
     if (error || !data) {
       return (
-        <div className="bg-white border border-gray-200 rounded-lg shadow-sm p-4 group w-full">
+        <div className="bg-white border border-gray-200 rounded-lg shadow-xs p-4 group w-full">
           <div className="flex items-center justify-between gap-2">
             <div className="flex-1 min-w-0">
               <span className="text-sm text-gray-500 truncate block">{error || "No data"}</span>
             </div>
             <button
               onClick={() => setIsMinimized(true)}
-              className="opacity-0 group-hover:opacity-100 p-1 hover:bg-gray-100 rounded transition-all flex-shrink-0"
+              className="opacity-0 group-hover:opacity-100 p-1 hover:bg-gray-100 rounded-sm transition-all shrink-0"
               title="Minimize"
             >
               <Minus className="h-3 w-3 text-gray-400" />
@@ -495,15 +492,15 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
     }
 
     return (
-      <div className={cn("bg-white border rounded-lg shadow-sm p-3 transition-all duration-200 group w-full")}>
+      <div className={cn("bg-white border rounded-lg shadow-xs p-3 transition-all duration-200 group w-full")}>
         <div className="flex items-center justify-between gap-2 mb-3">
           <div className="flex items-center gap-2 min-w-0 flex-1">
-            <Users className="h-4 w-4 flex-shrink-0" />
+            <Users className="h-4 w-4 shrink-0" />
             <span className="font-medium text-sm truncate">Usage</span>
           </div>
           <button
             onClick={() => setIsMinimized(true)}
-            className="opacity-0 group-hover:opacity-100 p-1 hover:bg-gray-100 rounded transition-all flex-shrink-0"
+            className="opacity-0 group-hover:opacity-100 p-1 hover:bg-gray-100 rounded-sm transition-all shrink-0"
             title="Minimize"
           >
             <Minus className="h-3 w-3 text-gray-400" />
@@ -526,7 +523,7 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
                 <span className="font-medium">License</span>
                 <span
                   className={cn(
-                    "ml-1 px-1.5 py-0.5 rounded border",
+                    "ml-1 px-1.5 py-0.5 rounded-sm border",
                     isLicenseExpired && "bg-red-50 text-red-700 border-red-200",
                     isLicenseExpiringSoon && "bg-yellow-50 text-yellow-700 border-yellow-200",
                     !isLicenseExpired && !isLicenseExpiringSoon && "bg-gray-50 text-gray-600 border-gray-200",
@@ -570,7 +567,7 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
                 <span className="font-medium">Users</span>
                 <span
                   className={cn(
-                    "ml-1 px-1.5 py-0.5 rounded border",
+                    "ml-1 px-1.5 py-0.5 rounded-sm border",
                     userMetrics.isOverLimit && "bg-red-50 text-red-700 border-red-200",
                     userMetrics.isNearLimit && "bg-yellow-50 text-yellow-700 border-yellow-200",
                     !userMetrics.isOverLimit && !userMetrics.isNearLimit && "bg-gray-50 text-gray-600 border-gray-200",
@@ -631,7 +628,7 @@ export default function UsageIndicator({ accessToken, width = 220 }: UsageIndica
                 <span className="font-medium">Teams</span>
                 <span
                   className={cn(
-                    "ml-1 px-1.5 py-0.5 rounded border",
+                    "ml-1 px-1.5 py-0.5 rounded-sm border",
                     teamMetrics.isOverLimit && "bg-red-50 text-red-700 border-red-200",
                     teamMetrics.isNearLimit && "bg-yellow-50 text-yellow-700 border-yellow-200",
                     !teamMetrics.isOverLimit && !teamMetrics.isNearLimit && "bg-gray-50 text-gray-600 border-gray-200",
diff --git a/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.tsx b/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.tsx
index 8903f74f232..96f702fd1d4 100644
--- a/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.tsx
+++ b/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.tsx
@@ -262,15 +262,12 @@ const TopKeyView: React.FC<TopKeyViewProps> = ({ topKeys, teams, showTags = fals
         keyData &&
         (console.log("Rendering modal with:", { isModalOpen, selectedKey, keyData }),
         (
-          <div
-            className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50"
-            onClick={handleOutsideClick}
-          >
+          <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50" onClick={handleOutsideClick}>
             <div className="bg-white rounded-lg shadow-xl relative w-11/12 max-w-6xl max-h-[90vh] overflow-y-auto min-h-[750px]">
               {/* Close button */}
               <button
                 onClick={handleClose}
-                className="absolute top-4 right-4 text-gray-500 hover:text-gray-700 focus:outline-none"
+                className="absolute top-4 right-4 text-gray-500 hover:text-gray-700 focus:outline-hidden"
                 aria-label="Close"
               >
                 <svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
diff --git a/ui/litellm-dashboard/src/components/UsagePage/components/UsageAIChatPanel.tsx b/ui/litellm-dashboard/src/components/UsagePage/components/UsageAIChatPanel.tsx
index 9384d75f020..9841889b928 100644
--- a/ui/litellm-dashboard/src/components/UsagePage/components/UsageAIChatPanel.tsx
+++ b/ui/litellm-dashboard/src/components/UsagePage/components/UsageAIChatPanel.tsx
@@ -39,7 +39,7 @@ const ToolCallDisplay: React.FC<{ step: ToolCallStep }> = ({ step }) => {
 
   return (
     <div className="flex items-start gap-2 px-3 py-2 rounded-lg bg-gray-100 border border-gray-200 text-xs">
-      <span className="flex-shrink-0 mt-0.5">
+      <span className="shrink-0 mt-0.5">
         {step.status === "running" ? (
           <Spin size="small" />
         ) : step.status === "error" ? (
@@ -74,11 +74,11 @@ const MarkdownContent: React.FC<{ content: string }> = ({ content }) => (
       code: ({ children, className }) => {
         const isBlock = className?.includes("language-");
         return isBlock ? (
-          <pre className="bg-gray-100 rounded p-2 my-1 overflow-x-auto text-xs">
+          <pre className="bg-gray-100 rounded-sm p-2 my-1 overflow-x-auto text-xs">
             <code>{children}</code>
           </pre>
         ) : (
-          <code className="px-1 py-0.5 rounded bg-gray-100 text-xs font-mono">{children}</code>
+          <code className="px-1 py-0.5 rounded-sm bg-gray-100 text-xs font-mono">{children}</code>
         );
       },
       table: ({ children }) => (
@@ -237,7 +237,7 @@ const UsageAIChatPanel: React.FC<UsageAIChatPanelProps> = ({ open, onClose, acce
       style={{ width: 420 }}
     >
       {/* Header */}
-      <div className="px-5 pt-5 pb-3 border-b border-gray-100 flex-shrink-0">
+      <div className="px-5 pt-5 pb-3 border-b border-gray-100 shrink-0">
         <div className="flex items-center justify-between mb-1">
           <div className="flex items-center gap-2">
             <svg className="w-5 h-5 text-blue-600" viewBox="0 0 16 16" fill="currentColor">
@@ -258,7 +258,7 @@ const UsageAIChatPanel: React.FC<UsageAIChatPanelProps> = ({ open, onClose, acce
       </div>
 
       {/* Model selector */}
-      <div className="px-5 py-3 border-b border-gray-100 flex-shrink-0">
+      <div className="px-5 py-3 border-b border-gray-100 shrink-0">
         <Select
           placeholder="Select a model (optional, defaults to gpt-4o-mini)"
           value={selectedModel}
@@ -345,7 +345,7 @@ const UsageAIChatPanel: React.FC<UsageAIChatPanelProps> = ({ open, onClose, acce
       </div>
 
       {/* Input area */}
-      <div className="px-4 py-3 border-t border-gray-200 bg-white flex-shrink-0">
+      <div className="px-4 py-3 border-t border-gray-200 bg-white shrink-0">
         <div className="flex gap-2">
           <TextArea
             value={inputText}
diff --git a/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.tsx b/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.tsx
index 41dfdb21d1b..432a499a0f6 100644
--- a/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.tsx
+++ b/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.tsx
@@ -747,7 +747,7 @@ const UsagePage: React.FC<UsagePageProps> = ({ teams, organizations }) => {
                               <button
                                 className={`px-3 py-1 text-sm rounded-md transition-colors ${
                                   modelViewType === "groups"
-                                    ? "bg-white shadow-sm text-gray-900"
+                                    ? "bg-white shadow-xs text-gray-900"
                                     : "text-gray-600 hover:text-gray-900"
                                 }`}
                                 onClick={() => setModelViewType("groups")}
@@ -757,7 +757,7 @@ const UsagePage: React.FC<UsagePageProps> = ({ teams, organizations }) => {
                               <button
                                 className={`px-3 py-1 text-sm rounded-md transition-colors ${
                                   modelViewType === "individual"
-                                    ? "bg-white shadow-sm text-gray-900"
+                                    ? "bg-white shadow-xs text-gray-900"
                                     : "text-gray-600 hover:text-gray-900"
                                 }`}
                                 onClick={() => setModelViewType("individual")}
diff --git a/ui/litellm-dashboard/src/components/UsagePage/components/UsageViewSelect/UsageViewSelect.tsx b/ui/litellm-dashboard/src/components/UsagePage/components/UsageViewSelect/UsageViewSelect.tsx
index e6ac377a865..94b483cb539 100644
--- a/ui/litellm-dashboard/src/components/UsagePage/components/UsageViewSelect/UsageViewSelect.tsx
+++ b/ui/litellm-dashboard/src/components/UsagePage/components/UsageViewSelect/UsageViewSelect.tsx
@@ -153,7 +153,7 @@ export const UsageViewSelect: React.FC<UsageViewSelectProps> = ({
     <div className="w-full" data-id={dataId}>
       <div className="flex flex-wrap items-center justify-start gap-4">
         <div className="flex items-stretch gap-2 min-w-0">
-          <div className="flex-shrink-0 flex items-center">
+          <div className="shrink-0 flex items-center">
             <BarChartOutlined style={{ fontSize: "32px" }} />
           </div>
           <div className="flex-1 min-w-0">
@@ -161,7 +161,7 @@ export const UsageViewSelect: React.FC<UsageViewSelectProps> = ({
             <p className="text-xs text-gray-600 leading-tight">{description}</p>
           </div>
         </div>
-        <div className="flex-shrink-0">
+        <div className="shrink-0">
           <Select
             value={value}
             onChange={onChange}
@@ -176,7 +176,7 @@ export const UsageViewSelect: React.FC<UsageViewSelectProps> = ({
               if (!opt) return option.label;
               return (
                 <div className="flex items-center gap-2 py-1">
-                  <div className="flex-shrink-0 mt-0.5">{opt.icon}</div>
+                  <div className="shrink-0 mt-0.5">{opt.icon}</div>
                   <div className="flex-1 min-w-0">
                     <div className="text-sm font-medium text-gray-900">{opt.label}</div>
                     <div className="text-xs text-gray-600 mt-0.5">{opt.description}</div>
diff --git a/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx b/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx
index 58414a0bab5..300105b8bf6 100644
--- a/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx
@@ -266,9 +266,9 @@ const AddModelForm: React.FC<AddModelFormProps> = ({
                       return (
                         <>
                           <div className="flex items-center my-4">
-                            <div className="flex-grow border-t border-gray-200"></div>
+                            <div className="grow border-t border-gray-200"></div>
                             <span className="px-4 text-gray-500 text-sm">OR</span>
-                            <div className="flex-grow border-t border-gray-200"></div>
+                            <div className="grow border-t border-gray-200"></div>
                           </div>
                           <ProviderSpecificFields selectedProvider={selectedProvider} uploadProps={uploadProps} />
                         </>
@@ -278,9 +278,9 @@ const AddModelForm: React.FC<AddModelFormProps> = ({
                   }}
                 </Form.Item>
                 <div className="flex items-center my-4">
-                  <div className="flex-grow border-t border-gray-200"></div>
+                  <div className="grow border-t border-gray-200"></div>
                   <span className="px-4 text-gray-500 text-sm">Additional Model Info Settings</span>
-                  <div className="flex-grow border-t border-gray-200"></div>
+                  <div className="grow border-t border-gray-200"></div>
                 </div>
                 {/* Team-only Model Switch - Only show for proxy admins, not team admins */}
                 {(isAdmin || !isTeamAdmin) && (
diff --git a/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.tsx b/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.tsx
index 9e9a097e3fe..fdce2c6803d 100644
--- a/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.tsx
@@ -364,9 +364,9 @@ const AddAutoRouterTab: React.FC<AddAutoRouterTabProps> = ({ form, handleOk, acc
           )}
 
           <div className="flex items-center my-4">
-            <div className="flex-grow border-t border-gray-200"></div>
+            <div className="grow border-t border-gray-200"></div>
             <span className="px-4 text-gray-500 text-sm">Additional Settings</span>
-            <div className="flex-grow border-t border-gray-200"></div>
+            <div className="grow border-t border-gray-200"></div>
           </div>
 
           {/* Model Access Groups - Admin only */}
diff --git a/ui/litellm-dashboard/src/components/add_model/cache_control_settings.tsx b/ui/litellm-dashboard/src/components/add_model/cache_control_settings.tsx
index 13e6dc33057..3691f888a91 100644
--- a/ui/litellm-dashboard/src/components/add_model/cache_control_settings.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/cache_control_settings.tsx
@@ -136,7 +136,7 @@ const CacheControlSettings: React.FC<CacheControlSettingsProps> = ({
                 <Form.Item>
                   <button
                     type="button"
-                    className="flex items-center justify-center w-full border border-dashed border-gray-300 py-2 px-4 text-gray-600 hover:text-blue-600 hover:border-blue-300 transition-all rounded"
+                    className="flex items-center justify-center w-full border border-dashed border-gray-300 py-2 px-4 text-gray-600 hover:text-blue-600 hover:border-blue-300 transition-all rounded-sm"
                     onClick={() => add()}
                   >
                     <PlusOutlined className="mr-2" />
diff --git a/ui/litellm-dashboard/src/components/add_model/conditional_public_model_name.tsx b/ui/litellm-dashboard/src/components/add_model/conditional_public_model_name.tsx
index 0a77c252133..f819ec5977b 100644
--- a/ui/litellm-dashboard/src/components/add_model/conditional_public_model_name.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/conditional_public_model_name.tsx
@@ -98,16 +98,16 @@ const ConditionalPublicModelName: React.FC = () => {
       <div className="mb-2 font-normal">The name you specify in your API calls to LiteLLM Proxy</div>
       <div className="mb-2 font-normal">
         <strong>Example:</strong> If you name your public model{" "}
-        <code className="bg-gray-700 px-1 py-0.5 rounded text-xs">example-name</code>, and choose{" "}
-        <code className="bg-gray-700 px-1 py-0.5 rounded text-xs">openai/qwen-plus-latest</code> as the LiteLLM model
+        <code className="bg-gray-700 px-1 py-0.5 rounded-sm text-xs">example-name</code>, and choose{" "}
+        <code className="bg-gray-700 px-1 py-0.5 rounded-sm text-xs">openai/qwen-plus-latest</code> as the LiteLLM model
       </div>
       <div className="mb-2 font-normal">
         <strong>Usage:</strong> You make an API call to the LiteLLM proxy with{" "}
-        <code className="bg-gray-700 px-1 py-0.5 rounded text-xs">model = &quot;example-name&quot;</code>
+        <code className="bg-gray-700 px-1 py-0.5 rounded-sm text-xs">model = &quot;example-name&quot;</code>
       </div>
       <div className="font-normal">
         <strong>Result:</strong> LiteLLM sends{" "}
-        <code className="bg-gray-700 px-1 py-0.5 rounded text-xs">qwen-plus-latest</code> to the provider
+        <code className="bg-gray-700 px-1 py-0.5 rounded-sm text-xs">qwen-plus-latest</code> to the provider
       </div>
     </>
   );
diff --git a/ui/litellm-dashboard/src/components/agents/add_agent_form.tsx b/ui/litellm-dashboard/src/components/agents/add_agent_form.tsx
index 77236c23a24..5b146adeebe 100644
--- a/ui/litellm-dashboard/src/components/agents/add_agent_form.tsx
+++ b/ui/litellm-dashboard/src/components/agents/add_agent_form.tsx
@@ -1010,7 +1010,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
               <button
                 type="button"
                 onClick={handleBack}
-                className="text-sm text-gray-600 border border-gray-300 rounded px-4 py-2 hover:bg-gray-50"
+                className="text-sm text-gray-600 border border-gray-300 rounded-sm px-4 py-2 hover:bg-gray-50"
               >
                 ← Back
               </button>
diff --git a/ui/litellm-dashboard/src/components/agents/agent_card_discovery.tsx b/ui/litellm-dashboard/src/components/agents/agent_card_discovery.tsx
index 3fa35419fde..87effb95278 100644
--- a/ui/litellm-dashboard/src/components/agents/agent_card_discovery.tsx
+++ b/ui/litellm-dashboard/src/components/agents/agent_card_discovery.tsx
@@ -249,7 +249,7 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
           <Paragraph className="text-xs text-gray-500 mb-2">
             Using the connection details you entered above. We&apos;ll fetch:
           </Paragraph>
-          <div className="bg-white border border-gray-200 rounded px-3 py-2 mb-3 font-mono text-xs text-gray-700 break-all">
+          <div className="bg-white border border-gray-200 rounded-sm px-3 py-2 mb-3 font-mono text-xs text-gray-700 break-all">
             {discoveryRequest!.display_url || effectiveUrl || (
               <span className="text-gray-400 italic">Fill in the fields above first</span>
             )}
@@ -409,7 +409,7 @@ const AgentCardDiscovery: React.FC<AgentCardDiscoveryProps> = ({
                   return (
                     <div
                       key={key}
-                      className="flex items-center justify-between p-2 border border-gray-200 rounded bg-white"
+                      className="flex items-center justify-between p-2 border border-gray-200 rounded-sm bg-white"
                     >
                       <div>
                         <Text strong className="capitalize">
diff --git a/ui/litellm-dashboard/src/components/agents/agent_virtual_keys.tsx b/ui/litellm-dashboard/src/components/agents/agent_virtual_keys.tsx
index afc6344c2ef..b2ddf5efb2a 100644
--- a/ui/litellm-dashboard/src/components/agents/agent_virtual_keys.tsx
+++ b/ui/litellm-dashboard/src/components/agents/agent_virtual_keys.tsx
@@ -22,7 +22,7 @@ const AgentVirtualKeys: React.FC<AgentVirtualKeysProps> = ({ keys, isLoading, on
       ) : (
         <div className="mt-3 flex flex-col gap-2">
           {keys.map((key) => (
-            <div key={key.token} className="flex items-center gap-3 border border-gray-100 rounded px-3 py-2">
+            <div key={key.token} className="flex items-center gap-3 border border-gray-100 rounded-sm px-3 py-2">
               <KeyOutlined className="text-gray-400" />
               <span className="font-medium">{key.key_alias || "Unnamed key"}</span>
               {key.key_name && <span className="font-mono text-xs text-gray-500">{key.key_name}</span>}
diff --git a/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx b/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx
index a0c7586ce4f..8eeadeb3a4a 100644
--- a/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx
+++ b/ui/litellm-dashboard/src/components/alerting/dynamic_form.tsx
@@ -125,9 +125,9 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
                 In DB
               </Badge>
             ) : value.stored_in_db == false ? (
-              <Badge className="text-gray bg-white outline">In Config</Badge>
+              <Badge className="text-gray bg-white outline-solid">In Config</Badge>
             ) : (
-              <Badge className="text-gray bg-white outline">Not Set</Badge>
+              <Badge className="text-gray bg-white outline-solid">Not Set</Badge>
             )}
           </TableCell>
           <TableCell>
diff --git a/ui/litellm-dashboard/src/components/bulk_create_users_button.tsx b/ui/litellm-dashboard/src/components/bulk_create_users_button.tsx
index 4c182bdfae4..e734ab474a4 100644
--- a/ui/litellm-dashboard/src/components/bulk_create_users_button.tsx
+++ b/ui/litellm-dashboard/src/components/bulk_create_users_button.tsx
@@ -576,14 +576,14 @@ const BulkCreateUsersButton: React.FC<BulkCreateUsersProps> = ({
                   <h4 className="font-medium mb-2">Template Column Names</h4>
                   <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
                     <div className="flex items-start">
-                      <div className="w-3 h-3 rounded-full bg-red-500 mt-1.5 mr-2 flex-shrink-0"></div>
+                      <div className="w-3 h-3 rounded-full bg-red-500 mt-1.5 mr-2 shrink-0"></div>
                       <div>
                         <p className="font-medium">user_email</p>
                         <p className="text-sm text-gray-600">User&apos;s email address (required)</p>
                       </div>
                     </div>
                     <div className="flex items-start">
-                      <div className="w-3 h-3 rounded-full bg-red-500 mt-1.5 mr-2 flex-shrink-0"></div>
+                      <div className="w-3 h-3 rounded-full bg-red-500 mt-1.5 mr-2 shrink-0"></div>
                       <div>
                         <p className="font-medium">user_role</p>
                         <p className="text-sm text-gray-600">
@@ -593,7 +593,7 @@ const BulkCreateUsersButton: React.FC<BulkCreateUsersProps> = ({
                       </div>
                     </div>
                     <div className="flex items-start">
-                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 flex-shrink-0"></div>
+                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 shrink-0"></div>
                       <div>
                         <p className="font-medium">teams</p>
                         <p className="text-sm text-gray-600">
@@ -602,14 +602,14 @@ const BulkCreateUsersButton: React.FC<BulkCreateUsersProps> = ({
                       </div>
                     </div>
                     <div className="flex items-start">
-                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 flex-shrink-0"></div>
+                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 shrink-0"></div>
                       <div>
                         <p className="font-medium">max_budget</p>
                         <p className="text-sm text-gray-600">Maximum budget as a number (e.g., &quot;100&quot;)</p>
                       </div>
                     </div>
                     <div className="flex items-start">
-                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 flex-shrink-0"></div>
+                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 shrink-0"></div>
                       <div>
                         <p className="font-medium">budget_duration</p>
                         <p className="text-sm text-gray-600">
@@ -618,7 +618,7 @@ const BulkCreateUsersButton: React.FC<BulkCreateUsersProps> = ({
                       </div>
                     </div>
                     <div className="flex items-start">
-                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 flex-shrink-0"></div>
+                      <div className="w-3 h-3 rounded-full bg-gray-300 mt-1.5 mr-2 shrink-0"></div>
                       <div>
                         <p className="font-medium">models</p>
                         <p className="text-sm text-gray-600">
@@ -760,11 +760,11 @@ const BulkCreateUsersButton: React.FC<BulkCreateUsersProps> = ({
                     {parsedData.some((user) => user.status === "success" || user.status === "failed") ? (
                       <div className="flex items-center">
                         <Text className="text-lg font-medium mr-3">Creation Summary</Text>
-                        <Text className="text-sm bg-green-100 text-green-800 px-2 py-1 rounded mr-2">
+                        <Text className="text-sm bg-green-100 text-green-800 px-2 py-1 rounded-sm mr-2">
                           {parsedData.filter((d) => d.status === "success").length} Successful
                         </Text>
                         {parsedData.some((d) => d.status === "failed") && (
-                          <Text className="text-sm bg-red-100 text-red-800 px-2 py-1 rounded">
+                          <Text className="text-sm bg-red-100 text-red-800 px-2 py-1 rounded-sm">
                             {parsedData.filter((d) => d.status === "failed").length} Failed
                           </Text>
                         )}
@@ -772,7 +772,7 @@ const BulkCreateUsersButton: React.FC<BulkCreateUsersProps> = ({
                     ) : (
                       <div className="flex items-center">
                         <Text className="text-lg font-medium mr-3">User Preview</Text>
-                        <Text className="text-sm bg-blue-100 text-blue-800 px-2 py-1 rounded">
+                        <Text className="text-sm bg-blue-100 text-blue-800 px-2 py-1 rounded-sm">
                           {parsedData.filter((d) => d.isValid).length} of {parsedData.length} users valid
                         </Text>
                       </div>
diff --git a/ui/litellm-dashboard/src/components/chat_ui/ReasoningContent.tsx b/ui/litellm-dashboard/src/components/chat_ui/ReasoningContent.tsx
index 133569cc2ed..e537c6de79f 100644
--- a/ui/litellm-dashboard/src/components/chat_ui/ReasoningContent.tsx
+++ b/ui/litellm-dashboard/src/components/chat_ui/ReasoningContent.tsx
@@ -52,7 +52,7 @@ const ReasoningContent: React.FC<ReasoningContentProps> = ({ reasoningContent })
                     {String(children).replace(/\n$/, "")}
                   </SyntaxHighlighter>
                 ) : (
-                  <code className={`${className} px-1.5 py-0.5 rounded bg-gray-100 text-sm font-mono`} {...props}>
+                  <code className={`${className} px-1.5 py-0.5 rounded-sm bg-gray-100 text-sm font-mono`} {...props}>
                     {children}
                   </code>
                 );
diff --git a/ui/litellm-dashboard/src/components/claude_code_plugins.tsx b/ui/litellm-dashboard/src/components/claude_code_plugins.tsx
index 0ec775e0c0b..4fa5269672f 100644
--- a/ui/litellm-dashboard/src/components/claude_code_plugins.tsx
+++ b/ui/litellm-dashboard/src/components/claude_code_plugins.tsx
@@ -82,7 +82,7 @@ const ClaudeCodePluginsPanel: React.FC<ClaudeCodePluginsPanelProps> = ({ accessT
             <h1 className="text-2xl font-bold">Skills</h1>
             <p className="text-sm text-gray-600">
               Register Claude Code skills. Published skills appear in the Skill Hub for all users and are served via{" "}
-              <code className="bg-gray-100 px-1 rounded">/claude-code/marketplace.json</code>.
+              <code className="bg-gray-100 px-1 rounded-sm">/claude-code/marketplace.json</code>.
             </p>
             <div className="mt-2 flex gap-2">
               <Button onClick={() => setIsAddModalVisible(true)} disabled={!accessToken || !isAdmin}>
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 e2467b51461..7abe67f3a4f 100644
--- a/ui/litellm-dashboard/src/components/claude_code_plugins/MakeSkillPublicForm.tsx
+++ b/ui/litellm-dashboard/src/components/claude_code_plugins/MakeSkillPublicForm.tsx
@@ -186,7 +186,7 @@ const MakeSkillPublicForm: React.FC<MakeSkillPublicFormProps> = ({
             {Array.from(selectedSkills).map((name) => {
               const skill = skillsList.find((s) => s.name === name);
               return (
-                <div key={name} className="flex items-center justify-between p-2 bg-gray-50 rounded">
+                <div key={name} className="flex items-center justify-between p-2 bg-gray-50 rounded-sm">
                   <Text className="font-mono text-sm">{name}</Text>
                   {skill?.domain && (
                     <Badge color="blue" size="xs">
diff --git a/ui/litellm-dashboard/src/components/common_components/ModelAliasManager.tsx b/ui/litellm-dashboard/src/components/common_components/ModelAliasManager.tsx
index b4b1fa779c6..c3540ce757a 100644
--- a/ui/litellm-dashboard/src/components/common_components/ModelAliasManager.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/ModelAliasManager.tsx
@@ -233,13 +233,13 @@ const ModelAliasManager: React.FC<ModelAliasManagerProps> = ({
                         <div className="flex space-x-2">
                           <button
                             onClick={handleUpdateAlias}
-                            className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded hover:bg-blue-100"
+                            className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded-sm hover:bg-blue-100"
                           >
                             Save
                           </button>
                           <button
                             onClick={handleCancelEdit}
-                            className="text-xs bg-gray-50 text-gray-600 px-2 py-1 rounded hover:bg-gray-100"
+                            className="text-xs bg-gray-50 text-gray-600 px-2 py-1 rounded-sm hover:bg-gray-100"
                           >
                             Cancel
                           </button>
@@ -254,13 +254,13 @@ const ModelAliasManager: React.FC<ModelAliasManagerProps> = ({
                         <div className="flex space-x-2">
                           <button
                             onClick={() => handleEditAlias(alias)}
-                            className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded hover:bg-blue-100"
+                            className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded-sm hover:bg-blue-100"
                           >
                             <PencilIcon className="w-3 h-3" />
                           </button>
                           <button
                             onClick={() => deleteAlias(alias.id)}
-                            className="text-xs bg-red-50 text-red-600 px-2 py-1 rounded hover:bg-red-100"
+                            className="text-xs bg-red-50 text-red-600 px-2 py-1 rounded-sm hover:bg-red-100"
                           >
                             <TrashIcon className="w-3 h-3" />
                           </button>
diff --git a/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx b/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx
index e495bdd24f5..733b91b1d3e 100644
--- a/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx
@@ -99,13 +99,13 @@ const PassThroughGuardrailsSection: React.FC<PassThroughGuardrailsSectionProps>
             <div className="text-xs space-y-1 mt-2">
               <div className="font-medium">Common Examples:</div>
               <div>
-                • <code className="bg-gray-100 px-1 rounded">query</code> - Single field
+                • <code className="bg-gray-100 px-1 rounded-sm">query</code> - Single field
               </div>
               <div>
-                • <code className="bg-gray-100 px-1 rounded">documents[*].text</code> - All text in documents array
+                • <code className="bg-gray-100 px-1 rounded-sm">documents[*].text</code> - All text in documents array
               </div>
               <div>
-                • <code className="bg-gray-100 px-1 rounded">messages[*].content</code> - All message contents
+                • <code className="bg-gray-100 px-1 rounded-sm">messages[*].content</code> - All message contents
               </div>
             </div>
           </div>
@@ -170,7 +170,7 @@ const PassThroughGuardrailsSection: React.FC<PassThroughGuardrailsSectionProps>
                           const current = guardrailSettings[guardrailName]?.request_fields || [];
                           handleFieldChange(guardrailName, "request_fields", [...current, "query"]);
                         }}
-                        className="text-xs px-2 py-1 bg-white border border-gray-300 rounded hover:bg-gray-50"
+                        className="text-xs px-2 py-1 bg-white border border-gray-300 rounded-sm hover:bg-gray-50"
                         disabled={disabled}
                       >
                         + query
@@ -181,7 +181,7 @@ const PassThroughGuardrailsSection: React.FC<PassThroughGuardrailsSectionProps>
                           const current = guardrailSettings[guardrailName]?.request_fields || [];
                           handleFieldChange(guardrailName, "request_fields", [...current, "documents[*]"]);
                         }}
-                        className="text-xs px-2 py-1 bg-white border border-gray-300 rounded hover:bg-gray-50"
+                        className="text-xs px-2 py-1 bg-white border border-gray-300 rounded-sm hover:bg-gray-50"
                         disabled={disabled}
                       >
                         + documents[*]
@@ -224,7 +224,7 @@ const PassThroughGuardrailsSection: React.FC<PassThroughGuardrailsSectionProps>
                           const current = guardrailSettings[guardrailName]?.response_fields || [];
                           handleFieldChange(guardrailName, "response_fields", [...current, "results[*]"]);
                         }}
-                        className="text-xs px-2 py-1 bg-white border border-gray-300 rounded hover:bg-gray-50"
+                        className="text-xs px-2 py-1 bg-white border border-gray-300 rounded-sm hover:bg-gray-50"
                         disabled={disabled}
                       >
                         + results[*]
diff --git a/ui/litellm-dashboard/src/components/general_settings.tsx b/ui/litellm-dashboard/src/components/general_settings.tsx
index 8ed3787f8fa..a7a8af2691e 100644
--- a/ui/litellm-dashboard/src/components/general_settings.tsx
+++ b/ui/litellm-dashboard/src/components/general_settings.tsx
@@ -169,9 +169,9 @@ const GeneralSettings: React.FC<GeneralSettingsPageProps> = ({ accessToken, user
                               In DB
                             </Badge>
                           ) : value.stored_in_db == false ? (
-                            <Badge className="text-gray bg-white outline">In Config</Badge>
+                            <Badge className="text-gray bg-white outline-solid">In Config</Badge>
                           ) : (
-                            <Badge className="text-gray bg-white outline">Not Set</Badge>
+                            <Badge className="text-gray bg-white outline-solid">Not Set</Badge>
                           )}
                         </TableCell>
                         <TableCell>
diff --git a/ui/litellm-dashboard/src/components/guardrails/GuardrailTestPanel.tsx b/ui/litellm-dashboard/src/components/guardrails/GuardrailTestPanel.tsx
index 473871553b1..81a9edb91c6 100644
--- a/ui/litellm-dashboard/src/components/guardrails/GuardrailTestPanel.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/GuardrailTestPanel.tsx
@@ -133,9 +133,9 @@ export function GuardrailTestPanel({
             />
             <div className="flex justify-between items-center mt-1">
               <Text className="text-xs text-gray-500">
-                Press <kbd className="px-1 py-0.5 bg-gray-100 border border-gray-300 rounded text-xs">Enter</kbd> to
+                Press <kbd className="px-1 py-0.5 bg-gray-100 border border-gray-300 rounded-sm text-xs">Enter</kbd> to
                 submit •{" "}
-                <kbd className="px-1 py-0.5 bg-gray-100 border border-gray-300 rounded text-xs">Shift+Enter</kbd> for
+                <kbd className="px-1 py-0.5 bg-gray-100 border border-gray-300 rounded-sm text-xs">Shift+Enter</kbd> for
                 new line
               </Text>
               <Text className="text-xs text-gray-500">Characters: {inputText.length}</Text>
diff --git a/ui/litellm-dashboard/src/components/guardrails/GuardrailTestResults.tsx b/ui/litellm-dashboard/src/components/guardrails/GuardrailTestResults.tsx
index 52360085241..ff6fc5744b6 100644
--- a/ui/litellm-dashboard/src/components/guardrails/GuardrailTestResults.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/GuardrailTestResults.tsx
@@ -118,9 +118,9 @@ export function GuardrailTestResults({ results, errors }: GuardrailTestResultsPr
                 </div>
                 {!isCollapsed && (
                   <>
-                    <div className="bg-white border border-green-200 rounded p-3">
+                    <div className="bg-white border border-green-200 rounded-sm p-3">
                       <label className="text-xs font-medium text-gray-600 mb-2 block">Output Text</label>
-                      <div className="font-mono text-sm text-gray-900 whitespace-pre-wrap break-words">
+                      <div className="font-mono text-sm text-gray-900 whitespace-pre-wrap wrap-break-word">
                         {result.response_text}
                       </div>
                     </div>
diff --git a/ui/litellm-dashboard/src/components/guardrails/TeamGuardrailsTab.tsx b/ui/litellm-dashboard/src/components/guardrails/TeamGuardrailsTab.tsx
index d9d9f9ac1c4..07cdcbc888c 100644
--- a/ui/litellm-dashboard/src/components/guardrails/TeamGuardrailsTab.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/TeamGuardrailsTab.tsx
@@ -193,7 +193,7 @@ function Toggle({ enabled, onToggle }: { enabled: boolean; onToggle: () => void
       onClick={onToggle}
       role="switch"
       aria-checked={enabled}
-      className={`relative inline-flex h-5 w-9 items-center rounded-full transition-colors focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 ${
+      className={`relative inline-flex h-5 w-9 items-center rounded-full transition-colors focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 ${
         enabled ? "bg-blue-500" : "bg-gray-200"
       }`}
     >
@@ -249,7 +249,7 @@ function GuardrailCard({
           <h3 className="text-sm font-semibold text-gray-900 mb-1">{g.name}</h3>
           <p className="text-xs text-gray-500 mb-2 line-clamp-1">{g.description}</p>
           <div className="flex items-center gap-1.5 mb-2">
-            <ServerIcon className="h-3.5 w-3.5 text-gray-400 flex-shrink-0" />
+            <ServerIcon className="h-3.5 w-3.5 text-gray-400 shrink-0" />
             <code className="text-xs text-gray-500 font-mono truncate">{g.endpoint}</code>
           </div>
           <div className="flex items-center gap-4 text-xs text-gray-500">
@@ -261,7 +261,7 @@ function GuardrailCard({
             </span>
           </div>
         </div>
-        <div className="flex flex-col items-end gap-2 flex-shrink-0">
+        <div className="flex flex-col items-end gap-2 shrink-0">
           <div className="flex items-center gap-2">
             <span className="text-xs text-gray-500 whitespace-nowrap">Forward API Key</span>
             <Toggle enabled={g.forwardKey} onToggle={onToggleForwardKey} />
@@ -317,9 +317,11 @@ function GuardrailCard({
               <div className="space-y-1">
                 {g.customHeaders.map((h, i) => (
                   <div key={`${h.key}-${i}`} className="flex items-center gap-2 text-xs font-mono">
-                    <span className="text-gray-500 bg-gray-50 border border-gray-200 rounded px-2 py-0.5">{h.key}</span>
+                    <span className="text-gray-500 bg-gray-50 border border-gray-200 rounded-sm px-2 py-0.5">
+                      {h.key}
+                    </span>
                     <span className="text-gray-400">:</span>
-                    <span className="text-gray-700 bg-gray-50 border border-gray-200 rounded px-2 py-0.5">
+                    <span className="text-gray-700 bg-gray-50 border border-gray-200 rounded-sm px-2 py-0.5">
                       {h.value}
                     </span>
                   </div>
@@ -368,7 +370,7 @@ function DetailPanel({
   const status = STATUS_CONFIG[g.status];
   const teamColor = TEAM_COLORS[g.team] ?? "bg-gray-100 text-gray-700";
   return (
-    <div className="w-96 flex-shrink-0 bg-white overflow-auto">
+    <div className="w-96 shrink-0 bg-white overflow-auto">
       <div className="p-5">
         <div className="flex items-start justify-between mb-4">
           <div>
@@ -404,14 +406,14 @@ function DetailPanel({
                 href={g.endpoint}
                 target="_blank"
                 rel="noopener noreferrer"
-                className="text-gray-400 hover:text-blue-500 flex-shrink-0"
+                className="text-gray-400 hover:text-blue-500 shrink-0"
               >
                 <ExternalLinkIcon className="h-3.5 w-3.5" />
               </a>
             </div>
           </ConfigRow>
           <ConfigRow label="Method">
-            <span className="text-xs font-mono font-medium text-gray-700 bg-gray-100 px-2 py-0.5 rounded">
+            <span className="text-xs font-mono font-medium text-gray-700 bg-gray-100 px-2 py-0.5 rounded-sm">
               {g.method}
             </span>
           </ConfigRow>
@@ -425,7 +427,7 @@ function DetailPanel({
             </div>
             <p className="text-xs text-blue-700 leading-relaxed">
               When enabled, the caller&apos;s LiteLLM API key is forwarded as an{" "}
-              <code className="font-mono bg-blue-100 px-1 rounded">Authorization</code> header to your guardrail
+              <code className="font-mono bg-blue-100 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.
             </p>
@@ -447,7 +449,7 @@ function DetailPanel({
                 {g.customHeaders.map((h, i) => (
                   <li
                     key={`${h.key}-${i}`}
-                    className="flex items-center justify-between gap-2 text-xs font-mono bg-gray-50 border border-gray-200 rounded px-2 py-1.5"
+                    className="flex items-center justify-between gap-2 text-xs font-mono bg-gray-50 border border-gray-200 rounded-sm px-2 py-1.5"
                   >
                     <span className="text-gray-700 truncate">
                       {h.key}: {h.value}
@@ -455,7 +457,7 @@ function DetailPanel({
                     <button
                       type="button"
                       onClick={() => onUpdateCustomHeaders(g.customHeaders.filter((_, idx) => idx !== i))}
-                      className="text-gray-400 hover:text-red-600 flex-shrink-0"
+                      className="text-gray-400 hover:text-red-600 shrink-0"
                       aria-label={`Remove ${h.key}`}
                     >
                       <XIcon className="h-3.5 w-3.5" />
@@ -470,7 +472,7 @@ function DetailPanel({
                 value={newStaticHeaderKey}
                 onChange={(e) => setNewStaticHeaderKey(e.target.value)}
                 placeholder="Header name (e.g. X-API-Key)"
-                className="flex-1 min-w-0 text-xs font-mono border border-gray-200 rounded px-2 py-1.5 text-gray-700 placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-blue-500"
+                className="flex-1 min-w-0 text-xs font-mono border border-gray-200 rounded-sm px-2 py-1.5 text-gray-700 placeholder-gray-400 focus:outline-hidden focus:ring-1 focus:ring-blue-500"
                 onKeyDown={(e) => {
                   if (e.key === "Enter") {
                     e.preventDefault();
@@ -489,7 +491,7 @@ function DetailPanel({
                 value={newStaticHeaderValue}
                 onChange={(e) => setNewStaticHeaderValue(e.target.value)}
                 placeholder="Value"
-                className="flex-1 min-w-0 text-xs font-mono border border-gray-200 rounded px-2 py-1.5 text-gray-700 placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-blue-500"
+                className="flex-1 min-w-0 text-xs font-mono border border-gray-200 rounded-sm px-2 py-1.5 text-gray-700 placeholder-gray-400 focus:outline-hidden focus:ring-1 focus:ring-blue-500"
                 onKeyDown={(e) => {
                   if (e.key === "Enter") {
                     e.preventDefault();
@@ -514,7 +516,7 @@ function DetailPanel({
                     setNewStaticHeaderValue("");
                   }
                 }}
-                className="text-xs font-medium text-blue-600 hover:text-blue-700 border border-blue-200 bg-blue-50 hover:bg-blue-100 px-2 py-1.5 rounded transition-colors flex-shrink-0"
+                className="text-xs font-medium text-blue-600 hover:text-blue-700 border border-blue-200 bg-blue-50 hover:bg-blue-100 px-2 py-1.5 rounded-sm transition-colors shrink-0"
               >
                 Add
               </button>
@@ -539,13 +541,13 @@ function DetailPanel({
                 {g.extraHeaders.map((name, i) => (
                   <li
                     key={`${name}-${i}`}
-                    className="flex items-center justify-between gap-2 text-xs font-mono bg-gray-50 border border-gray-200 rounded px-2 py-1.5"
+                    className="flex items-center justify-between gap-2 text-xs font-mono bg-gray-50 border border-gray-200 rounded-sm px-2 py-1.5"
                   >
                     <span className="text-gray-700 truncate">{name}</span>
                     <button
                       type="button"
                       onClick={() => onUpdateExtraHeaders(g.extraHeaders.filter((_, idx) => idx !== i))}
-                      className="text-gray-400 hover:text-red-600 flex-shrink-0"
+                      className="text-gray-400 hover:text-red-600 shrink-0"
                       aria-label={`Remove ${name}`}
                     >
                       <XIcon className="h-3.5 w-3.5" />
@@ -560,7 +562,7 @@ function DetailPanel({
                 value={newExtraHeader}
                 onChange={(e) => setNewExtraHeader(e.target.value)}
                 placeholder="e.g. x-request-id"
-                className="flex-1 min-w-0 text-xs font-mono border border-gray-200 rounded px-2 py-1.5 text-gray-700 placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-blue-500"
+                className="flex-1 min-w-0 text-xs font-mono border border-gray-200 rounded-sm px-2 py-1.5 text-gray-700 placeholder-gray-400 focus:outline-hidden focus:ring-1 focus:ring-blue-500"
                 onKeyDown={(e) => {
                   if (e.key === "Enter") {
                     e.preventDefault();
@@ -581,7 +583,7 @@ function DetailPanel({
                     setNewExtraHeader("");
                   }
                 }}
-                className="text-xs font-medium text-blue-600 hover:text-blue-700 border border-blue-200 bg-blue-50 hover:bg-blue-100 px-2 py-1.5 rounded transition-colors"
+                className="text-xs font-medium text-blue-600 hover:text-blue-700 border border-blue-200 bg-blue-50 hover:bg-blue-100 px-2 py-1.5 rounded-sm transition-colors"
               >
                 Add
               </button>
@@ -607,7 +609,7 @@ function DetailPanel({
             )}
           </div>
           <div className="flex items-start gap-2 bg-gray-50 border border-gray-200 rounded-lg p-3">
-            <InfoIcon className="h-3.5 w-3.5 text-gray-400 flex-shrink-0 mt-0.5" />
+            <InfoIcon className="h-3.5 w-3.5 text-gray-400 shrink-0 mt-0.5" />
             <p className="text-xs text-gray-500 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{" "}
@@ -887,13 +889,13 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
               placeholder="Search guardrails..."
               value={search}
               onChange={(e) => setSearch(e.target.value)}
-              className="w-full pl-9 pr-4 py-2 border border-gray-200 rounded-md text-sm text-gray-700 placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+              className="w-full pl-9 pr-4 py-2 border border-gray-200 rounded-md text-sm text-gray-700 placeholder-gray-400 focus:outline-hidden focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
             />
           </div>
           <select
             value={statusFilter}
             onChange={(e) => setStatusFilter(e.target.value as typeof statusFilter)}
-            className="border border-gray-200 rounded-md px-3 py-2 text-sm text-gray-700 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500 bg-white"
+            className="border border-gray-200 rounded-md px-3 py-2 text-sm text-gray-700 focus:outline-hidden focus:ring-1 focus:ring-blue-500 focus:border-blue-500 bg-white"
           >
             <option value="all">All Status</option>
             <option value="pending">Pending Review</option>
diff --git a/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx b/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx
index 4ac4242b8ab..1b7021f318f 100644
--- a/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx
@@ -1062,7 +1062,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                     onChange={(e) =>
                       setEndSessionAfterNFails(e.target.value ? parseInt(e.target.value, 10) : undefined)
                     }
-                    className="border border-gray-300 rounded px-3 py-1.5 text-sm w-32"
+                    className="border border-gray-300 rounded-sm px-3 py-1.5 text-sm w-32"
                   />
                 </div>
 
@@ -1105,7 +1105,7 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
                     placeholder="e.g. I'm not able to continue this conversation. Please contact us at 1-800-774-2678."
                     value={realtimeViolationMessage}
                     onChange={(e) => setRealtimeViolationMessage(e.target.value)}
-                    className="border border-gray-300 rounded px-3 py-2 text-sm w-full resize-none"
+                    className="border border-gray-300 rounded-sm px-3 py-2 text-sm w-full resize-none"
                   />
                 </div>
               </div>
@@ -1185,9 +1185,9 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
               return (
                 <div key={index} className="relative flex gap-4" style={{ paddingBottom: isLast ? 0 : 8 }}>
                   {/* Vertical line + step indicator */}
-                  <div className="flex flex-col items-center flex-shrink-0" style={{ width: 24 }}>
+                  <div className="flex flex-col items-center shrink-0" style={{ width: 24 }}>
                     <div
-                      className="w-6 h-6 rounded-full flex items-center justify-center text-xs font-medium flex-shrink-0"
+                      className="w-6 h-6 rounded-full flex items-center justify-center text-xs font-medium shrink-0"
                       style={{
                         background: isDone ? "#4f46e5" : isCurrent ? "#fff" : "#f8fafc",
                         color: isDone ? "#fff" : isCurrent ? "#4f46e5" : "#94a3b8",
diff --git a/ui/litellm-dashboard/src/components/guardrails/custom_code/CustomCodeModal.tsx b/ui/litellm-dashboard/src/components/guardrails/custom_code/CustomCodeModal.tsx
index b7881eaf8ad..411c2ed13ae 100644
--- a/ui/litellm-dashboard/src/components/guardrails/custom_code/CustomCodeModal.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/custom_code/CustomCodeModal.tsx
@@ -565,13 +565,13 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
         {/* Main Content */}
         <div className="flex flex-1 overflow-hidden mt-4 gap-6">
           {/* Code Editor */}
-          <div className="flex-[2] flex flex-col min-w-0 overflow-y-auto">
-            <div className="flex items-center justify-between mb-2 flex-shrink-0">
+          <div className="flex-2 flex flex-col min-w-0 overflow-y-auto">
+            <div className="flex items-center justify-between mb-2 shrink-0">
               <span className="text-xs font-semibold text-gray-500 uppercase tracking-wide">Python Logic</span>
               <span className="text-xs text-gray-400">Restricted environment (no imports)</span>
             </div>
             <div
-              className="relative rounded-lg overflow-hidden border border-gray-700 bg-[#1e1e1e] flex-shrink-0"
+              className="relative rounded-lg overflow-hidden border border-gray-700 bg-[#1e1e1e] shrink-0"
               style={{ minHeight: "300px", maxHeight: "400px" }}
             >
               {/* Line numbers */}
@@ -596,7 +596,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                 onChange={(e) => setCode(e.target.value)}
                 onKeyDown={handleKeyDown}
                 spellCheck={false}
-                className="w-full h-full pl-14 pr-4 pt-3 pb-3 resize-none focus:outline-none bg-transparent text-gray-200"
+                className="w-full h-full pl-14 pr-4 pt-3 pb-3 resize-none focus:outline-hidden bg-transparent text-gray-200"
                 style={{
                   fontFamily: "'Fira Code', 'Monaco', 'Consolas', monospace",
                   fontSize: "14px",
@@ -610,7 +610,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
             <Collapse
               activeKey={testExpanded ? ["test"] : []}
               onChange={(keys) => setTestExpanded(keys.includes("test"))}
-              className="mt-3 bg-white border border-gray-200 rounded-lg flex-shrink-0"
+              className="mt-3 bg-white border border-gray-200 rounded-lg shrink-0"
               expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
             >
               <Panel
@@ -631,27 +631,27 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
                         <button
                           type="button"
                           onClick={() => setTestInput(JSON.stringify(TEST_INPUT_EXAMPLES.pre_call.data, null, 2))}
-                          className="px-2 py-1 text-xs rounded border border-orange-200 bg-orange-50 text-orange-700 hover:bg-orange-100 transition-colors"
+                          className="px-2 py-1 text-xs rounded-sm border border-orange-200 bg-orange-50 text-orange-700 hover:bg-orange-100 transition-colors"
                         >
                           Pre-call
                         </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 border border-purple-200 bg-purple-50 text-purple-700 hover:bg-purple-100 transition-colors"
+                          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"
                         >
                           Pre MCP
                         </button>
                         <button
                           type="button"
                           onClick={() => setTestInput(JSON.stringify(TEST_INPUT_EXAMPLES.post_call.data, null, 2))}
-                          className="px-2 py-1 text-xs rounded border border-green-200 bg-green-50 text-green-700 hover:bg-green-100 transition-colors"
+                          className="px-2 py-1 text-xs rounded-sm border border-green-200 bg-green-50 text-green-700 hover:bg-green-100 transition-colors"
                         >
                           Post-call
                         </button>
                       </div>
                     </div>
-                    <div className="mb-2 p-2 bg-gray-50 rounded text-xs text-gray-600 border border-gray-200">
+                    <div className="mb-2 p-2 bg-gray-50 rounded-sm text-xs text-gray-600 border border-gray-200">
                       <div className="grid grid-cols-2 gap-x-4 gap-y-1">
                         <div>
                           <strong>texts</strong>: Message content (always)
@@ -738,7 +738,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
               </Panel>
             </Collapse>
             {/* Contribution CTA Banner */}
-            <div className="mt-3 p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border border-blue-200 rounded-lg flex items-center justify-between flex-shrink-0">
+            <div className="mt-3 p-4 bg-linear-to-r from-blue-50 to-indigo-50 border border-blue-200 rounded-lg flex items-center justify-between shrink-0">
               <div className="flex items-center gap-3">
                 <div className="bg-blue-100 rounded-full p-2">
                   <UsergroupAddOutlined className="text-blue-600 text-lg" />
@@ -760,7 +760,7 @@ const CustomCodeModal: React.FC<CustomCodeModalProps> = ({ visible, onClose, onS
           </div>
 
           {/* Primitives Panel */}
-          <div className="w-[300px] flex-shrink-0 overflow-auto border-l border-gray-200 pl-6">
+          <div className="w-[300px] shrink-0 overflow-auto border-l border-gray-200 pl-6">
             <div className="flex items-center gap-2 mb-3">
               <CodeOutlined className="text-blue-500" />
               <span className="font-semibold text-gray-700">Available Primitives</span>
diff --git a/ui/litellm-dashboard/src/components/guardrails/guardrail_info.tsx b/ui/litellm-dashboard/src/components/guardrails/guardrail_info.tsx
index 897e9d26aff..82c2e16fd49 100644
--- a/ui/litellm-dashboard/src/components/guardrails/guardrail_info.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/guardrail_info.tsx
@@ -580,7 +580,7 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
               Object.keys(guardrailData.litellm_params.pii_entities_config).length > 0 && (
                 <Card className="mt-6">
                   <Text className="mb-4 text-lg font-semibold">PII Entity Configuration</Text>
-                  <div className="border rounded-lg overflow-hidden shadow-sm">
+                  <div className="border rounded-lg overflow-hidden shadow-xs">
                     <div className="bg-gray-50 px-5 py-3 border-b flex">
                       <Text className="flex-1 font-semibold text-gray-700">Entity Type</Text>
                       <Text className="flex-1 font-semibold text-gray-700">Configuration</Text>
diff --git a/ui/litellm-dashboard/src/components/guardrails/guardrail_optional_params.tsx b/ui/litellm-dashboard/src/components/guardrails/guardrail_optional_params.tsx
index 3b52d806a30..301b6ff359f 100644
--- a/ui/litellm-dashboard/src/components/guardrails/guardrail_optional_params.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/guardrail_optional_params.tsx
@@ -147,7 +147,7 @@ const GuardrailOptionalParams: React.FC<GuardrailOptionalParamsProps> = ({
     }
 
     return (
-      <div key={fullFieldKey} className="mb-8 p-6 bg-white rounded-lg border border-gray-200 shadow-sm">
+      <div key={fullFieldKey} className="mb-8 p-6 bg-white rounded-lg border border-gray-200 shadow-xs">
         <Form.Item
           name={[parentFieldKey, fieldKey]}
           label={
diff --git a/ui/litellm-dashboard/src/components/guardrails/pii_components.tsx b/ui/litellm-dashboard/src/components/guardrails/pii_components.tsx
index 3365e866aa9..6d35122c69f 100644
--- a/ui/litellm-dashboard/src/components/guardrails/pii_components.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/pii_components.tsx
@@ -71,7 +71,7 @@ export interface QuickActionsProps {
 
 export const QuickActions: React.FC<QuickActionsProps> = ({ onSelectAll, onUnselectAll, hasSelectedEntities }) => {
   return (
-    <div className="bg-gray-50 p-5 rounded-lg mb-6 border border-gray-200 shadow-sm">
+    <div className="bg-gray-50 p-5 rounded-lg mb-6 border border-gray-200 shadow-xs">
       <div className="flex items-center justify-between mb-4">
         <div className="flex items-center">
           <Text strong className="text-gray-700 text-base">
@@ -138,7 +138,7 @@ export const PiiEntityList: React.FC<PiiEntityListProps> = ({
   entityToCategoryMap,
 }) => {
   return (
-    <div className="border rounded-lg overflow-hidden shadow-sm">
+    <div className="border rounded-lg overflow-hidden shadow-xs">
       <div className="bg-gray-50 px-5 py-3 border-b flex">
         <Text strong className="flex-1 text-gray-700">
           PII Type
diff --git a/ui/litellm-dashboard/src/components/guardrails/pii_configuration.tsx b/ui/litellm-dashboard/src/components/guardrails/pii_configuration.tsx
index b47f6b12f9d..be2c9ff0298 100644
--- a/ui/litellm-dashboard/src/components/guardrails/pii_configuration.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/pii_configuration.tsx
@@ -57,7 +57,7 @@ const PiiConfiguration: React.FC<PiiConfigurationProps> = ({
     <div className="pii-configuration">
       <div className="flex justify-between items-center mb-5">
         <div className="flex items-center">
-          <Title level={4} className="!m-0 font-semibold text-gray-800">
+          <Title level={4} className="m-0! font-semibold text-gray-800">
             Configure PII Protection
           </Title>
         </div>
diff --git a/ui/litellm-dashboard/src/components/guardrails/tool_permission/ToolPermissionRulesEditor.tsx b/ui/litellm-dashboard/src/components/guardrails/tool_permission/ToolPermissionRulesEditor.tsx
index 0d3093459c0..7083e32f73e 100644
--- a/ui/litellm-dashboard/src/components/guardrails/tool_permission/ToolPermissionRulesEditor.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/tool_permission/ToolPermissionRulesEditor.tsx
@@ -186,7 +186,7 @@ const ToolPermissionRulesEditor: React.FC<ToolPermissionRulesEditorProps> = ({ v
             icon={<PlusOutlined />}
             type="primary"
             onClick={addRule}
-            className="!bg-blue-600 !text-white hover:!bg-blue-500"
+            className="bg-blue-600! text-white! hover:bg-blue-500!"
           >
             Add Rule
           </Button>
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx b/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
index 84203a23950..cb07db871fd 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
@@ -102,11 +102,11 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({
           <div className="text-center">
             {/* Logos */}
             <div className="flex items-center justify-center gap-3 mb-6">
-              <div className="w-14 h-14 rounded-xl bg-gradient-to-br from-teal-400 to-cyan-600 flex items-center justify-center text-white font-bold text-xl shadow">
+              <div className="w-14 h-14 rounded-xl bg-linear-to-br from-teal-400 to-cyan-600 flex items-center justify-center text-white font-bold text-xl shadow-sm">
                 L
               </div>
               <ArrowRightOutlined className="text-gray-400 text-lg" />
-              <div className="w-14 h-14 rounded-xl bg-gradient-to-br from-blue-600 to-indigo-800 flex items-center justify-center text-white font-bold text-xl shadow">
+              <div className="w-14 h-14 rounded-xl bg-linear-to-br from-blue-600 to-indigo-800 flex items-center justify-center text-white font-bold text-xl shadow-sm">
                 {firstLetter}
               </div>
             </div>
@@ -146,7 +146,7 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({
                 <ul className="space-y-2">
                   {server.byok_description.map((item, i) => (
                     <li key={i} className="flex items-center gap-2 text-sm text-gray-700">
-                      <CheckOutlined className="text-green-500 flex-shrink-0" />
+                      <CheckOutlined className="text-green-500 shrink-0" />
                       {item}
                     </li>
                   ))}
@@ -211,7 +211,7 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({
 
             {/* Security note */}
             <div className="bg-blue-50 rounded-xl p-4 flex items-start gap-3 mb-6">
-              <LockOutlined className="text-blue-400 mt-0.5 flex-shrink-0" />
+              <LockOutlined className="text-blue-400 mt-0.5 shrink-0" />
               <p className="text-sm text-blue-700">
                 Your key is stored securely and transmitted over HTTPS. It is never shared with third parties.
               </p>
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/EnvVarsSection.tsx b/ui/litellm-dashboard/src/components/mcp_tools/EnvVarsSection.tsx
index 4a694d71585..fbaacc40263 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/EnvVarsSection.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/EnvVarsSection.tsx
@@ -43,7 +43,7 @@ const EnvVarsSection: React.FC = () => {
       </div>
       <Text className="text-xs text-gray-600 block mb-3">
         Reference these in Static Headers or Authentication as <code>{"${VAR_NAME}"}</code>. For example:{" "}
-        <code className="bg-white px-1 rounded border border-gray-200">
+        <code className="bg-white px-1 rounded-sm border border-gray-200">
           {"${DB_PROTOCOL}://${CORP_USERNAME}:${CORP_PASSWORD}@${DB_HOSTNAME}"}
         </code>
       </Text>
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/MCPLogoSelector.tsx b/ui/litellm-dashboard/src/components/mcp_tools/MCPLogoSelector.tsx
index 111d83e44ab..6f626a1a70b 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/MCPLogoSelector.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/MCPLogoSelector.tsx
@@ -59,7 +59,7 @@ const MCPLogoSelector: React.FC<MCPLogoSelectorProps> = ({ value, onChange }) =>
           <img
             src={resolveLogoSrc(value)}
             alt="Selected logo"
-            className="w-10 h-10 object-contain rounded"
+            className="w-10 h-10 object-contain rounded-sm"
             onError={(e) => {
               (e.target as HTMLImageElement).style.display = "none";
             }}
@@ -91,7 +91,7 @@ const MCPLogoSelector: React.FC<MCPLogoSelectorProps> = ({ value, onChange }) =>
                 className={`flex items-center justify-center p-2 rounded-lg border transition-all cursor-pointer
                   ${
                     isSelected
-                      ? "border-blue-500 bg-blue-50 shadow-sm"
+                      ? "border-blue-500 bg-blue-50 shadow-xs"
                       : "border-gray-200 hover:border-blue-300 hover:bg-gray-50"
                   }`}
                 style={{ width: 40, height: 40 }}
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/MCPServerCard.tsx b/ui/litellm-dashboard/src/components/mcp_tools/MCPServerCard.tsx
index 064a9481325..082024fc853 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/MCPServerCard.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/MCPServerCard.tsx
@@ -137,18 +137,18 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
       tabIndex={0}
       onClick={onClick}
       onKeyDown={handleKeyDown}
-      className={`group relative flex h-full cursor-pointer flex-col gap-3 rounded-lg p-4 transition-all duration-150 focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-400 ${cardClass}`}
+      className={`group relative flex h-full cursor-pointer flex-col gap-3 rounded-lg p-4 transition-all duration-150 focus:outline-hidden focus-visible:ring-2 focus-visible:ring-blue-400 ${cardClass}`}
     >
       <div className="flex items-start gap-3">
         {logoUrl ? (
           <img
             src={logoUrl}
             alt={`${name} logo`}
-            className="h-10 w-10 flex-shrink-0 rounded object-contain"
+            className="h-10 w-10 shrink-0 rounded-sm object-contain"
             onError={() => setFailedLogoUrl(logoUrl)}
           />
         ) : (
-          <div className="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded bg-gray-100 font-semibold text-gray-500">
+          <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-sm bg-gray-100 font-semibold text-gray-500">
             {(name || "?").slice(0, 2).toUpperCase()}
           </div>
         )}
@@ -251,7 +251,7 @@ const MCPServerCard: FC<MCPServerCardProps> = ({
                     stop(e);
                     onOpenFillFields();
                   }}
-                  className="rounded-md bg-red-600 px-3 py-1 text-xs font-medium text-white shadow-sm transition-colors hover:bg-red-700"
+                  className="rounded-md bg-red-600 px-3 py-1 text-xs font-medium text-white shadow-xs transition-colors hover:bg-red-700"
                 >
                   Set
                 </button>
@@ -300,7 +300,7 @@ const HealthChip: FC<HealthChipProps> = ({
       {error && (
         <div className="text-xs">
           <div className="font-medium text-red-300 mb-1">Error</div>
-          <div className="break-words">{error}</div>
+          <div className="wrap-break-word">{error}</div>
         </div>
       )}
       {!lastCheck && !error && <div className="text-xs text-gray-400">No health data</div>}
@@ -369,7 +369,7 @@ const ByokRow: FC<ByokRowProps> = ({ connected, onConnect }) => {
             stop(e);
             onConnect();
           }}
-          className="rounded-md bg-blue-600 px-3 py-1 text-xs font-medium text-white shadow-sm transition-colors hover:bg-blue-700"
+          className="rounded-md bg-blue-600 px-3 py-1 text-xs font-medium text-white shadow-xs transition-colors hover:bg-blue-700"
         >
           Connect
         </button>
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/MCPSubmissionsTab.tsx b/ui/litellm-dashboard/src/components/mcp_tools/MCPSubmissionsTab.tsx
index 100373a4571..50c88a63582 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/MCPSubmissionsTab.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/MCPSubmissionsTab.tsx
@@ -106,7 +106,7 @@ function ConfirmDialog({ action, serverName, isCurrentlyActive, onConfirm, onCan
             placeholder="Reason for rejection (optional)"
             value={reviewNotes}
             onChange={(e) => setReviewNotes(e.target.value)}
-            className="w-full border border-gray-200 rounded-md px-3 py-2 text-sm text-gray-700 placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-blue-500 mb-4 resize-none"
+            className="w-full border border-gray-200 rounded-md px-3 py-2 text-sm text-gray-700 placeholder-gray-400 focus:outline-hidden focus:ring-1 focus:ring-blue-500 mb-4 resize-none"
             rows={3}
           />
         )}
@@ -209,7 +209,7 @@ function SubmissionRulesPanel({ requiredFields, onChange, onSave, isSaving }: Su
                           type="checkbox"
                           checked={active}
                           onChange={() => toggle(field.key)}
-                          className="mt-0.5 h-4 w-4 rounded border-gray-300 text-blue-600 focus:ring-blue-500 cursor-pointer"
+                          className="mt-0.5 h-4 w-4 rounded-sm border-gray-300 text-blue-600 focus:ring-blue-500 cursor-pointer"
                         />
                         <div>
                           <div className="text-sm font-medium text-gray-800 group-hover:text-blue-700 transition-colors">
@@ -291,7 +291,7 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
             {server.description && <p className="text-xs text-gray-500 mt-0.5 line-clamp-1">{server.description}</p>}
             {server.url && (
               <div className="flex items-center gap-1.5 mt-1.5">
-                <ServerIcon className="h-3.5 w-3.5 text-gray-400 flex-shrink-0" />
+                <ServerIcon className="h-3.5 w-3.5 text-gray-400 shrink-0" />
                 <code className="text-xs text-gray-500 font-mono truncate">{server.url}</code>
               </div>
             )}
@@ -312,7 +312,7 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
           </div>
           {/* Approve/Reject when no checks panel (no rules configured) */}
           {checks.length === 0 && approvalStatus !== "rejected" && (
-            <div className="flex items-center gap-2 flex-shrink-0">
+            <div className="flex items-center gap-2 shrink-0">
               {approvalStatus !== "active" && (
                 <button
                   type="button"
@@ -332,7 +332,7 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
             </div>
           )}
           {checks.length === 0 && approvalStatus === "rejected" && (
-            <div className="flex items-center gap-2 flex-shrink-0">
+            <div className="flex items-center gap-2 shrink-0">
               <button
                 type="button"
                 onClick={onApprove}
@@ -356,7 +356,7 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
           >
             {/* Large status circle */}
             <div
-              className={`w-8 h-8 rounded-full flex items-center justify-center flex-shrink-0 ${
+              className={`w-8 h-8 rounded-full flex items-center justify-center shrink-0 ${
                 allPassed ? "bg-green-500" : "bg-red-500"
               }`}
             >
@@ -371,7 +371,7 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
               </div>
             </div>
             {/* Approve / Reject in header */}
-            <div className="flex items-center gap-2 flex-shrink-0">
+            <div className="flex items-center gap-2 shrink-0">
               {approvalStatus !== "active" && approvalStatus !== "rejected" && (
                 <button
                   type="button"
@@ -408,7 +408,7 @@ function MCPServerCard({ server, onApprove, onReject, requiredFields }: MCPServe
               <div key={c.key} className="flex items-center gap-3 px-4 py-2.5">
                 {/* Small circle icon */}
                 <div
-                  className={`w-5 h-5 rounded-full flex items-center justify-center flex-shrink-0 ${
+                  className={`w-5 h-5 rounded-full flex items-center justify-center shrink-0 ${
                     c.passed ? "bg-green-100" : "bg-red-100"
                   }`}
                 >
@@ -566,13 +566,13 @@ export function MCPSubmissionsTab({ accessToken }: MCPSubmissionsTabProps) {
             placeholder="Search MCP servers..."
             value={search}
             onChange={(e) => setSearch(e.target.value)}
-            className="w-full pl-9 pr-4 py-2 border border-gray-200 rounded-md text-sm text-gray-700 placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+            className="w-full pl-9 pr-4 py-2 border border-gray-200 rounded-md text-sm text-gray-700 placeholder-gray-400 focus:outline-hidden focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           />
         </div>
         <select
           value={statusFilter}
           onChange={(e) => setStatusFilter(e.target.value as typeof statusFilter)}
-          className="border border-gray-200 rounded-md px-3 py-2 text-sm text-gray-700 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500 bg-white"
+          className="border border-gray-200 rounded-md px-3 py-2 text-sm text-gray-700 focus:outline-hidden focus:ring-1 focus:ring-blue-500 focus:border-blue-500 bg-white"
         >
           <option value="all">All Status</option>
           <option value="pending_review">Pending Review</option>
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/MCPToolsetsTab.tsx b/ui/litellm-dashboard/src/components/mcp_tools/MCPToolsetsTab.tsx
index 1a05edf7c2c..0198b830229 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/MCPToolsetsTab.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/MCPToolsetsTab.tsx
@@ -80,7 +80,7 @@ function MCPToolList({ serverId, serverName, accessToken, selectedTools, onToggl
         onClick={handleToggle}
       >
         <span className="text-sm font-medium text-gray-700 flex items-center gap-2">
-          <span className="inline-block w-2 h-2 rounded-full bg-blue-500 flex-shrink-0" />
+          <span className="inline-block w-2 h-2 rounded-full bg-blue-500 shrink-0" />
           {serverName}
           {selectedSet.size > 0 && (
             <span className="ml-1 text-xs text-purple-600 font-semibold">{selectedSet.size} selected</span>
@@ -121,9 +121,7 @@ function MCPToolList({ serverId, serverName, accessToken, selectedTools, onToggl
                         <p className="text-xs text-gray-400 mt-0.5 leading-tight line-clamp-2">{tool.description}</p>
                       )}
                     </div>
-                    {selected && (
-                      <span className="text-purple-500 text-xs font-semibold ml-2 flex-shrink-0 mt-0.5">✓</span>
-                    )}
+                    {selected && <span className="text-purple-500 text-xs font-semibold ml-2 shrink-0 mt-0.5">✓</span>}
                   </button>
                 );
               })}
@@ -249,10 +247,10 @@ function CreateToolsetModal({ open, onClose, onSave, accessToken, initialToolset
         </div>
 
         {/* Divider */}
-        <div className="w-px bg-gray-200 flex-shrink-0" />
+        <div className="w-px bg-gray-200 shrink-0" />
 
         {/* Right panel: Your Toolset */}
-        <div className="w-72 flex-shrink-0">
+        <div className="w-72 shrink-0">
           <Text className="text-sm font-semibold text-gray-700 mb-2 block">
             Your Toolset <span className="text-xs font-normal text-gray-400">({selectedTools.length} tools)</span>
           </Text>
@@ -273,7 +271,7 @@ function CreateToolsetModal({ open, onClose, onSave, accessToken, initialToolset
                     </span>
                     <span className="text-[10px] text-purple-400 truncate block">{tool.server_id.slice(0, 8)}…</span>
                   </div>
-                  <span className="ml-2 text-purple-300 group-hover:text-red-400 text-xs flex-shrink-0">✕</span>
+                  <span className="ml-2 text-purple-300 group-hover:text-red-400 text-xs shrink-0">✕</span>
                 </button>
               ))
             )}
@@ -305,7 +303,7 @@ function toolsetColumns(
       header: "Toolset ID",
       accessorKey: "toolset_id",
       cell: ({ row }) => (
-        <span className="font-mono text-xs bg-gray-100 px-2 py-0.5 rounded text-gray-600">
+        <span className="font-mono text-xs bg-gray-100 px-2 py-0.5 rounded-sm text-gray-600">
           {row.original.toolset_id.slice(0, 8)}…
         </span>
       ),
@@ -318,7 +316,7 @@ function toolsetColumns(
         return (
           <div className="flex flex-col gap-0.5">
             <div className="flex items-center gap-2">
-              <span className="inline-block w-2 h-2 rounded-full bg-purple-500 flex-shrink-0" />
+              <span className="inline-block w-2 h-2 rounded-full bg-purple-500 shrink-0" />
               <span className="font-medium text-gray-900">{row.original.toolset_name}</span>
             </div>
             <button
@@ -348,7 +346,7 @@ function toolsetColumns(
             {tools.slice(0, 4).map((t, i) => (
               <span
                 key={i}
-                className="inline-flex items-center px-1.5 py-0.5 rounded bg-purple-50 border border-purple-200 text-purple-700 text-xs"
+                className="inline-flex items-center px-1.5 py-0.5 rounded-sm bg-purple-50 border border-purple-200 text-purple-700 text-xs"
               >
                 {displayToolName(serverPrefixById.get(t.server_id), t.tool_name)}
               </span>
@@ -429,13 +427,13 @@ function ToolsetUsageGuide() {
       </p>
       <div className="text-xs text-gray-400 mb-1">Claude Code / Cursor config</div>
       <div className="relative">
-        <pre className="bg-white border border-gray-200 rounded px-4 py-3 text-xs font-mono text-gray-700 overflow-x-auto leading-relaxed pr-14">
+        <pre className="bg-white border border-gray-200 rounded-sm px-4 py-3 text-xs font-mono text-gray-700 overflow-x-auto leading-relaxed pr-14">
           {snippet}
         </pre>
         <button
           type="button"
           onClick={copy}
-          className="absolute top-2 right-2 px-2 py-1 text-xs rounded border bg-white hover:bg-gray-50 text-gray-400 hover:text-gray-600 border-gray-200 transition-colors"
+          className="absolute top-2 right-2 px-2 py-1 text-xs rounded-sm border bg-white hover:bg-gray-50 text-gray-400 hover:text-gray-600 border-gray-200 transition-colors"
         >
           {copied ? "✓" : "copy"}
         </button>
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx b/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx
index 09564a75ee0..9cbf7025eaf 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/McpCrudPermissionPanel.tsx
@@ -166,9 +166,9 @@ const McpCrudPermissionPanel: React.FC<McpCrudPermissionPanelProps> = ({
                 onClick={() => toggleCollapse(op)}
               >
                 {isCollapsed ? (
-                  <ChevronRightIcon className="w-4 h-4 text-gray-500 flex-shrink-0" />
+                  <ChevronRightIcon className="w-4 h-4 text-gray-500 shrink-0" />
                 ) : (
-                  <ChevronDownIcon className="w-4 h-4 text-gray-500 flex-shrink-0" />
+                  <ChevronDownIcon className="w-4 h-4 text-gray-500 shrink-0" />
                 )}
                 <span className="font-semibold text-gray-900 text-sm">{meta.label}</span>
                 <span className={`text-xs px-2 py-0.5 rounded-full ${RISK_BADGE[meta.risk]}`}>
@@ -241,7 +241,7 @@ const McpCrudPermissionPanel: React.FC<McpCrudPermissionPanelProps> = ({
                           )}
                         </div>
                         <span
-                          className={`text-xs px-1.5 py-0.5 rounded flex-shrink-0 ${
+                          className={`text-xs px-1.5 py-0.5 rounded shrink-0 ${
                             allowed ? "bg-green-100 text-green-700" : "bg-gray-100 text-gray-500"
                           }`}
                         >
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIQuickPicker.tsx b/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIQuickPicker.tsx
index af6e6d7351d..a8208a09286 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIQuickPicker.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIQuickPicker.tsx
@@ -76,7 +76,7 @@ const OpenAPIQuickPicker: React.FC<OpenAPIQuickPickerProps> = ({ accessToken, se
               className={`flex flex-col items-center gap-1.5 p-3 rounded-lg border transition-all cursor-pointer
                 ${
                   isSelected
-                    ? "border-blue-500 bg-blue-50 shadow-sm"
+                    ? "border-blue-500 bg-blue-50 shadow-xs"
                     : "border-gray-200 hover:border-blue-300 hover:bg-gray-50"
                 }`}
             >
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/ToolTestPanel.tsx b/ui/litellm-dashboard/src/components/mcp_tools/ToolTestPanel.tsx
index a8fbe1c1fbc..c15150eee58 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/ToolTestPanel.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/ToolTestPanel.tsx
@@ -453,7 +453,7 @@ export function ToolTestPanel({
                       >
                         {prop.type === "string" && prop.enum && (
                           <select
-                            className="w-full px-3 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 text-sm transition-colors"
+                            className="w-full px-3 py-2 border border-gray-300 rounded-lg shadow-xs focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500 text-sm transition-colors"
                             defaultValue={(initialValue as string) ?? ""}
                           >
                             {!actualSchema.required?.includes(key) && <option value="">Select {key}</option>}
@@ -479,7 +479,7 @@ export function ToolTestPanel({
                             step={prop.type === "integer" ? 1 : "any"}
                             placeholder={prop.description || `Enter ${key}`}
                             defaultValue={initialValue ?? 0}
-                            className="w-full px-3 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 text-sm transition-colors"
+                            className="w-full px-3 py-2 border border-gray-300 rounded-lg shadow-xs focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500 text-sm transition-colors"
                           />
                         )}
 
@@ -507,7 +507,7 @@ export function ToolTestPanel({
                               defaultValue={(initialValue as string) ?? (prop.type === "object" ? "{}" : "[]")}
                               spellCheck={false}
                               data-testid={`textarea-${key}`}
-                              className="w-full px-3 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 text-sm font-mono"
+                              className="w-full px-3 py-2 border border-gray-300 rounded-lg shadow-xs focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500 text-sm font-mono"
                             />
                             <p className="text-xs text-gray-500">
                               {prop.type === "object" ? "Provide a valid JSON object." : "Provide a valid JSON array."}
@@ -590,7 +590,7 @@ export function ToolTestPanel({
                       </div>
 
                       <div className="flex items-center space-x-1">
-                        <div className="flex bg-white rounded border border-green-300 p-0.5">
+                        <div className="flex bg-white rounded-sm border border-green-300 p-0.5">
                           <button
                             onClick={() => setViewMode("formatted")}
                             className={`px-2 py-1 text-xs font-medium rounded transition-colors ${
@@ -615,7 +615,7 @@ export function ToolTestPanel({
 
                         <button
                           onClick={handleCopyResult}
-                          className="p-1 hover:bg-green-100 rounded text-green-700"
+                          className="p-1 hover:bg-green-100 rounded-sm text-green-700"
                           title="Copy response"
                         >
                           <svg
@@ -653,7 +653,7 @@ export function ToolTestPanel({
                   {error && (
                     <div className="bg-red-50 border border-red-200 rounded-lg p-3">
                       <div className="flex items-start space-x-2">
-                        <div className="flex-shrink-0">
+                        <div className="shrink-0">
                           <svg className="h-4 w-4 text-red-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                             <path
                               strokeLinecap="round"
@@ -670,7 +670,7 @@ export function ToolTestPanel({
                               <span className="text-xs text-red-600">• {(duration / 1000).toFixed(2)}s</span>
                             )}
                           </div>
-                          <div className="bg-white border border-red-200 rounded p-2 max-h-48 overflow-y-auto">
+                          <div className="bg-white border border-red-200 rounded-sm p-2 max-h-48 overflow-y-auto">
                             <pre className="text-xs whitespace-pre-wrap text-red-700 font-mono">
                               {(() => {
                                 return error.message;
@@ -696,7 +696,7 @@ export function ToolTestPanel({
                                   </span>
                                 </div>
                                 <div className="p-3">
-                                  <div className="bg-white rounded border border-gray-200 max-h-64 overflow-y-auto">
+                                  <div className="bg-white rounded-sm border border-gray-200 max-h-64 overflow-y-auto">
                                     <div className="p-3 space-y-2">
                                       {content.text
                                         .split("\n\n")
@@ -720,7 +720,7 @@ export function ToolTestPanel({
                                             return (
                                               <div
                                                 key={sectionIndex}
-                                                className="bg-blue-50 border border-blue-200 rounded p-2"
+                                                className="bg-blue-50 border border-blue-200 rounded-sm p-2"
                                               >
                                                 <div className="text-xs text-gray-700 leading-relaxed whitespace-pre-wrap">
                                                   {parts.map((part, partIndex) => {
@@ -762,7 +762,7 @@ export function ToolTestPanel({
                                           return (
                                             <div
                                               key={sectionIndex}
-                                              className="bg-gray-50 rounded p-2 border border-gray-200"
+                                              className="bg-gray-50 rounded-sm p-2 border border-gray-200"
                                             >
                                               <div className="text-xs text-gray-700 leading-relaxed whitespace-pre-wrap font-mono">
                                                 {section}
@@ -785,12 +785,12 @@ export function ToolTestPanel({
                                   </span>
                                 </div>
                                 <div className="p-3">
-                                  <div className="bg-gray-50 rounded p-3 border border-gray-200">
+                                  <div className="bg-gray-50 rounded-sm p-3 border border-gray-200">
                                     {/* eslint-disable-next-line @next/next/no-img-element */}
                                     <img
                                       src={content.url}
                                       alt="Tool result"
-                                      className="max-w-full h-auto rounded shadow-sm"
+                                      className="max-w-full h-auto rounded-sm shadow-xs"
                                     />
                                   </div>
                                 </div>
@@ -805,8 +805,8 @@ export function ToolTestPanel({
                                   </span>
                                 </div>
                                 <div className="p-3">
-                                  <div className="flex items-center space-x-2 p-3 bg-blue-50 border border-blue-200 rounded">
-                                    <div className="flex-shrink-0">
+                                  <div className="flex items-center space-x-2 p-3 bg-blue-50 border border-blue-200 rounded-sm">
+                                    <div className="shrink-0">
                                       <svg
                                         className="h-5 w-5 text-blue-500"
                                         fill="none"
@@ -848,7 +848,7 @@ export function ToolTestPanel({
                         ))
                       ) : (
                         // JSON View
-                        <div className="bg-white rounded border border-gray-200">
+                        <div className="bg-white rounded-sm border border-gray-200">
                           <div className="p-3 overflow-auto max-h-80 bg-gray-50">
                             <pre className="text-xs font-mono whitespace-pre-wrap break-all text-gray-800">
                               {JSON.stringify(result, null, 2)}
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx
index 34491352af4..89c20570a6e 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx
@@ -784,10 +784,10 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                         {/* Auth format hint */}
                         {getFieldValue("auth_type") && getFieldValue("auth_type") !== "none" && (
                           <div className="mb-4 p-3 bg-blue-50 rounded-lg text-sm text-blue-700 flex items-start gap-2">
-                            <InfoCircleOutlined className="mt-0.5 flex-shrink-0" />
+                            <InfoCircleOutlined className="mt-0.5 shrink-0" />
                             <span>
                               User keys will be sent as:{" "}
-                              <code className="font-mono bg-blue-100 px-1 rounded">
+                              <code className="font-mono bg-blue-100 px-1 rounded-sm">
                                 {getFieldValue("auth_type") === "bearer_token" && "Authorization: Bearer {key}"}
                                 {getFieldValue("auth_type") === "token" && "Authorization: token {key}"}
                                 {getFieldValue("auth_type") === "api_key" && "x-api-key: {key}"}
@@ -800,7 +800,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
                         )}
                         {!getFieldValue("auth_type") && (
                           <div className="mb-4 p-3 bg-yellow-50 rounded-lg text-sm text-yellow-700 flex items-start gap-2">
-                            <InfoCircleOutlined className="mt-0.5 flex-shrink-0" />
+                            <InfoCircleOutlined className="mt-0.5 shrink-0" />
                             <span>
                               Set the <strong>Authentication Type</strong> below to specify how user keys are sent
                               (e.g., Bearer Token, API Key header).
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_connect.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_connect.tsx
index 1c82859e062..42c557f142f 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_connect.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_connect.tsx
@@ -189,7 +189,7 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
     children: React.ReactNode;
   }> = ({ step, title, children }) => (
     <div className="flex gap-4">
-      <div className="flex-shrink-0">
+      <div className="shrink-0">
         <div className="w-8 h-8 bg-blue-600 text-white rounded-full flex items-center justify-center text-sm font-semibold">
           {step}
         </div>
@@ -205,7 +205,7 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
 
   const LiteLLMProxyTab = () => (
     <Space direction="vertical" size="large" className="w-full">
-      <div className="bg-gradient-to-r from-emerald-50 to-green-50 p-6 rounded-lg border border-emerald-100">
+      <div className="bg-linear-to-r from-emerald-50 to-green-50 p-6 rounded-lg border border-emerald-100">
         <div className="flex items-center gap-3 mb-3">
           <Zap className="text-emerald-600" size={24} />
           <Title level={4} className="mb-0 text-emerald-900">
@@ -277,7 +277,7 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
 
   const OpenAITab = () => (
     <Space direction="vertical" size="large" className="w-full">
-      <div className="bg-gradient-to-r from-blue-50 to-indigo-50 p-6 rounded-lg border border-blue-100">
+      <div className="bg-linear-to-r from-blue-50 to-indigo-50 p-6 rounded-lg border border-blue-100">
         <div className="flex items-center gap-3 mb-3">
           <Code className="text-blue-600" size={24} />
           <Title level={4} className="mb-0 text-blue-900">
@@ -360,7 +360,7 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
 
   const CursorTab = () => (
     <Space direction="vertical" size="large" className="w-full">
-      <div className="bg-gradient-to-r from-purple-50 to-blue-50 p-6 rounded-lg border border-purple-100">
+      <div className="bg-linear-to-r from-purple-50 to-blue-50 p-6 rounded-lg border border-purple-100">
         <div className="flex items-center gap-3 mb-3">
           <Terminal className="text-purple-600" size={24} />
           <Title level={4} className="mb-0 text-purple-900">
@@ -380,8 +380,8 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
         <Space direction="vertical" size="large" className="w-full">
           <StepCard step={1} title="Open Cursor Settings">
             <Text className="text-gray-600">
-              Use the keyboard shortcut <code className="bg-gray-100 px-2 py-1 rounded">⇧+⌘+J</code> (Mac) or{" "}
-              <code className="bg-gray-100 px-2 py-1 rounded">Ctrl+Shift+J</code> (Windows/Linux)
+              Use the keyboard shortcut <code className="bg-gray-100 px-2 py-1 rounded-sm">⇧+⌘+J</code> (Mac) or{" "}
+              <code className="bg-gray-100 px-2 py-1 rounded-sm">Ctrl+Shift+J</code> (Windows/Linux)
             </Text>
           </StepCard>
 
@@ -392,8 +392,8 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
           <StepCard step={3} title="Add Configuration">
             <Text className="text-gray-600 mb-3">
               Copy the JSON configuration below and paste it into Cursor, then save with{" "}
-              <code className="bg-gray-100 px-2 py-1 rounded">Cmd+S</code> or{" "}
-              <code className="bg-gray-100 px-2 py-1 rounded">Ctrl+S</code>
+              <code className="bg-gray-100 px-2 py-1 rounded-sm">Cmd+S</code> or{" "}
+              <code className="bg-gray-100 px-2 py-1 rounded-sm">Ctrl+S</code>
             </Text>
             <FeatureCard
               icon={<Code className="text-purple-600" size={16} />}
@@ -426,7 +426,7 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
 
   const StreamableHTTPTab = () => (
     <Space direction="vertical" size="large" className="w-full">
-      <div className="bg-gradient-to-r from-green-50 to-teal-50 p-6 rounded-lg border border-green-100">
+      <div className="bg-linear-to-r from-green-50 to-teal-50 p-6 rounded-lg border border-green-100">
         <div className="flex items-center gap-3 mb-3">
           <Globe className="text-green-600" size={24} />
           <Title level={4} className="mb-0 text-green-900">
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_server_view.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_server_view.tsx
index 3ee5676235a..7ed00f74225 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_server_view.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_server_view.tsx
@@ -89,7 +89,7 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
   const getTransportBadge = (transport: string) => {
     const label = transport.toUpperCase();
     return (
-      <span className="inline-flex items-center text-sm font-medium px-2.5 py-0.5 rounded border bg-gray-50 text-gray-700 border-gray-200">
+      <span className="inline-flex items-center text-sm font-medium px-2.5 py-0.5 rounded-sm border bg-gray-50 text-gray-700 border-gray-200">
         {label}
       </span>
     );
@@ -97,7 +97,7 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
 
   const getAuthBadge = (authType: string) => {
     return (
-      <span className="inline-flex items-center text-sm font-medium px-2.5 py-0.5 rounded border bg-gray-50 text-gray-700 border-gray-200">
+      <span className="inline-flex items-center text-sm font-medium px-2.5 py-0.5 rounded-sm border bg-gray-50 text-gray-700 border-gray-200">
         {authType}
       </span>
     );
@@ -123,7 +123,7 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
             }`}
           />
           {mcpServer.alias && mcpServer.server_name && mcpServer.alias !== mcpServer.server_name && (
-            <span className="ml-2 inline-flex items-center text-xs font-medium px-2 py-0.5 rounded bg-gray-100 text-gray-600 border border-gray-200 font-mono">
+            <span className="ml-2 inline-flex items-center text-xs font-medium px-2 py-0.5 rounded-sm bg-gray-100 text-gray-600 border border-gray-200 font-mono">
               {mcpServer.alias}
             </span>
           )}
@@ -187,7 +187,7 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                   {hasToken && isProxyAdmin && (
                     <button
                       onClick={() => setShowFullUrl(!showFullUrl)}
-                      className="p-1 hover:bg-gray-100 rounded flex-shrink-0"
+                      className="p-1 hover:bg-gray-100 rounded-sm shrink-0"
                     >
                       <Icon icon={showFullUrl ? EyeOffIcon : EyeIcon} size="sm" className="text-gray-500" />
                     </button>
@@ -266,7 +266,7 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                       {hasToken && (
                         <button
                           onClick={() => setShowFullUrl(!showFullUrl)}
-                          className="p-1 hover:bg-gray-100 rounded flex-shrink-0"
+                          className="p-1 hover:bg-gray-100 rounded-sm shrink-0"
                         >
                           <Icon icon={showFullUrl ? EyeOffIcon : EyeIcon} size="sm" className="text-gray-500" />
                         </button>
@@ -370,7 +370,7 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                           {mcpServer.mcp_access_groups.map((group: any, index: number) => (
                             <span
                               key={index}
-                              className="inline-flex items-center text-xs font-medium px-2 py-0.5 rounded bg-gray-100 text-gray-700 border border-gray-200"
+                              className="inline-flex items-center text-xs font-medium px-2 py-0.5 rounded-sm bg-gray-100 text-gray-700 border border-gray-200"
                             >
                               {typeof group === "string" ? group : group?.name ?? ""}
                             </span>
@@ -389,14 +389,14 @@ export const MCPServerView: React.FC<MCPServerViewProps> = ({
                           {mcpServer.allowed_tools.map((tool: string, index: number) => (
                             <span
                               key={index}
-                              className="inline-flex items-center text-xs font-mono font-medium px-2 py-0.5 rounded bg-blue-50 text-blue-700 border border-blue-200"
+                              className="inline-flex items-center text-xs font-mono font-medium px-2 py-0.5 rounded-sm bg-blue-50 text-blue-700 border border-blue-200"
                             >
                               {tool}
                             </span>
                           ))}
                         </div>
                       ) : (
-                        <span className="inline-flex items-center text-xs font-medium px-2 py-0.5 rounded bg-green-50 text-green-700 border border-green-200">
+                        <span className="inline-flex items-center text-xs font-medium px-2 py-0.5 rounded-sm bg-green-50 text-green-700 border border-green-200">
                           All tools enabled
                         </span>
                       )}
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx
index f23e7a9179b..d876c92ab2a 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx
@@ -458,13 +458,13 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID })
         </div>
         <div className="flex items-center gap-2">
           {isAdminRole(userRole) && (
-            <Button className="flex-shrink-0" onClick={() => setDiscoveryVisible(true)}>
+            <Button className="shrink-0" onClick={() => setDiscoveryVisible(true)}>
               + Add New MCP Server
             </Button>
           )}
           {!isAdminRole(userRole) && (
             <Button
-              className="flex-shrink-0"
+              className="shrink-0"
               onClick={() => {
                 setPrefillData(null);
                 setModalVisible(true);
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx
index 54e40fd7ed4..4cd8acfc07e 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_tools.tsx
@@ -309,7 +309,7 @@ const MCPToolsViewer = ({
                               });
                             }}
                             prefix={<KeyOutlined className="text-gray-400" />}
-                            className="rounded"
+                            className="rounded-sm"
                           />
                         </div>
                       ))}
@@ -478,7 +478,7 @@ const MCPToolsViewer = ({
                             {filteredTools.map((tool: MCPTool) => (
                               <div
                                 key={tool.name}
-                                className={`border rounded-lg p-3 cursor-pointer transition-all hover:shadow-sm ${
+                                className={`border rounded-lg p-3 cursor-pointer transition-all hover:shadow-xs ${
                                   selectedTool?.name === tool.name
                                     ? "border-blue-500 bg-blue-50 ring-1 ring-blue-200"
                                     : "border-gray-200 bg-white hover:border-gray-300"
@@ -494,7 +494,7 @@ const MCPToolsViewer = ({
                                     <img
                                       src={resolveLogoSrc(tool.mcp_info.logo_url)}
                                       alt={`${tool.mcp_info.server_name} logo`}
-                                      className="w-4 h-4 object-contain flex-shrink-0 mt-0.5"
+                                      className="w-4 h-4 object-contain shrink-0 mt-0.5"
                                     />
                                   )}
                                   <div className="flex-1 min-w-0">
diff --git a/ui/litellm-dashboard/src/components/model_dashboard/health_check_columns.tsx b/ui/litellm-dashboard/src/components/model_dashboard/health_check_columns.tsx
index 396afb7ed0b..12cc984ef91 100644
--- a/ui/litellm-dashboard/src/components/model_dashboard/health_check_columns.tsx
+++ b/ui/litellm-dashboard/src/components/model_dashboard/health_check_columns.tsx
@@ -180,7 +180,7 @@ export const healthCheckColumns = (
             <Tooltip title="View response details" placement="top">
               <button
                 onClick={() => showSuccessModal(displayName, modelHealthStatuses[modelId]?.successResponse)}
-                className="p-1 text-green-600 hover:text-green-800 hover:bg-green-50 rounded cursor-pointer transition-colors"
+                className="p-1 text-green-600 hover:text-green-800 hover:bg-green-50 rounded-sm cursor-pointer transition-colors"
               >
                 <InformationCircleIcon className="h-4 w-4" />
               </button>
@@ -218,7 +218,7 @@ export const healthCheckColumns = (
             <Tooltip title="View full error details" placement="top">
               <button
                 onClick={() => showErrorModal(displayName, cleanedError, fullError)}
-                className="p-1 text-red-600 hover:text-red-800 hover:bg-red-50 rounded cursor-pointer transition-colors"
+                className="p-1 text-red-600 hover:text-red-800 hover:bg-red-50 rounded-sm cursor-pointer transition-colors"
               >
                 <InformationCircleIcon className="h-4 w-4" />
               </button>
diff --git a/ui/litellm-dashboard/src/components/model_filters.tsx b/ui/litellm-dashboard/src/components/model_filters.tsx
index 5b68d587599..c7b79f70690 100644
--- a/ui/litellm-dashboard/src/components/model_filters.tsx
+++ b/ui/litellm-dashboard/src/components/model_filters.tsx
@@ -138,7 +138,7 @@ const ModelFilters: React.FC<ModelFiltersProps> = ({
           placeholder="Search model names..."
           value={searchTerm}
           onChange={(e) => setSearchTerm(e.target.value)}
-          className="border rounded px-3 py-2 w-64 h-10 text-sm"
+          className="border rounded-sm px-3 py-2 w-64 h-10 text-sm"
         />
       </div>
       <div>
@@ -146,7 +146,7 @@ const ModelFilters: React.FC<ModelFiltersProps> = ({
         <select
           value={selectedProvider}
           onChange={(e) => setSelectedProvider(e.target.value)}
-          className="border rounded px-3 py-2 text-sm text-gray-600 w-40 h-10"
+          className="border rounded-sm px-3 py-2 text-sm text-gray-600 w-40 h-10"
         >
           <option value="" className="text-sm text-gray-600">
             All Providers
@@ -164,7 +164,7 @@ const ModelFilters: React.FC<ModelFiltersProps> = ({
         <select
           value={selectedMode}
           onChange={(e) => setSelectedMode(e.target.value)}
-          className="border rounded px-3 py-2 text-sm text-gray-600 w-32 h-10"
+          className="border rounded-sm px-3 py-2 text-sm text-gray-600 w-32 h-10"
         >
           <option value="" className="text-sm text-gray-600">
             All Modes
@@ -182,7 +182,7 @@ const ModelFilters: React.FC<ModelFiltersProps> = ({
         <select
           value={selectedFeature}
           onChange={(e) => setSelectedFeature(e.target.value)}
-          className="border rounded px-3 py-2 text-sm text-gray-600 w-48 h-10"
+          className="border rounded-sm px-3 py-2 text-sm text-gray-600 w-48 h-10"
         >
           <option value="" className="text-sm text-gray-600">
             All Features
diff --git a/ui/litellm-dashboard/src/components/model_group_alias_settings.tsx b/ui/litellm-dashboard/src/components/model_group_alias_settings.tsx
index 505b26438b9..6c97086fcb7 100644
--- a/ui/litellm-dashboard/src/components/model_group_alias_settings.tsx
+++ b/ui/litellm-dashboard/src/components/model_group_alias_settings.tsx
@@ -261,13 +261,13 @@ const ModelGroupAliasSettings: React.FC<ModelGroupAliasSettingsProps> = ({
                             <div className="flex space-x-2">
                               <button
                                 onClick={handleUpdateAlias}
-                                className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded hover:bg-blue-100"
+                                className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded-sm hover:bg-blue-100"
                               >
                                 Save
                               </button>
                               <button
                                 onClick={handleCancelEdit}
-                                className="text-xs bg-gray-50 text-gray-600 px-2 py-1 rounded hover:bg-gray-100"
+                                className="text-xs bg-gray-50 text-gray-600 px-2 py-1 rounded-sm hover:bg-gray-100"
                               >
                                 Cancel
                               </button>
@@ -282,13 +282,13 @@ const ModelGroupAliasSettings: React.FC<ModelGroupAliasSettingsProps> = ({
                             <div className="flex space-x-2">
                               <button
                                 onClick={() => handleEditAlias(alias)}
-                                className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded hover:bg-blue-100"
+                                className="text-xs bg-blue-50 text-blue-600 px-2 py-1 rounded-sm hover:bg-blue-100"
                               >
                                 <PencilIcon className="w-3 h-3" />
                               </button>
                               <button
                                 onClick={() => deleteAlias(alias.id)}
-                                className="text-xs bg-red-50 text-red-600 px-2 py-1 rounded hover:bg-red-100"
+                                className="text-xs bg-red-50 text-red-600 px-2 py-1 rounded-sm hover:bg-red-100"
                               >
                                 <TrashIcon className="w-3 h-3" />
                               </button>
diff --git a/ui/litellm-dashboard/src/components/model_info_view.tsx b/ui/litellm-dashboard/src/components/model_info_view.tsx
index 45c5b0fd9b6..63f9bea35c5 100644
--- a/ui/litellm-dashboard/src/components/model_info_view.tsx
+++ b/ui/litellm-dashboard/src/components/model_info_view.tsx
@@ -764,7 +764,7 @@ export default function ModelInfoView({
                             <TextInput placeholder="Enter model name" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">{localModelData.model_name}</div>
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">{localModelData.model_name}</div>
                         )}
                       </div>
 
@@ -775,7 +775,7 @@ export default function ModelInfoView({
                             <TextInput placeholder="Enter LiteLLM model name" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">{localModelData.litellm_model_name}</div>
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">{localModelData.litellm_model_name}</div>
                         )}
                       </div>
 
@@ -786,7 +786,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Enter input cost" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData?.litellm_params?.input_cost_per_token
                               ? (localModelData.litellm_params?.input_cost_per_token * 1_000_000).toFixed(4)
                               : localModelData?.model_info?.input_cost_per_token
@@ -803,7 +803,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Enter output cost" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData?.litellm_params?.output_cost_per_token
                               ? (localModelData.litellm_params.output_cost_per_token * 1_000_000).toFixed(4)
                               : localModelData?.model_info?.output_cost_per_token
@@ -824,7 +824,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Defaults to Input Cost if blank" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData?.litellm_params?.cache_read_input_token_cost !== undefined &&
                             localModelData?.litellm_params?.cache_read_input_token_cost !== null
                               ? (localModelData.litellm_params.cache_read_input_token_cost * 1_000_000).toFixed(4)
@@ -847,7 +847,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Defaults to Input Cost if blank" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData?.litellm_params?.cache_creation_input_token_cost !== undefined &&
                             localModelData?.litellm_params?.cache_creation_input_token_cost !== null
                               ? (localModelData.litellm_params.cache_creation_input_token_cost * 1_000_000).toFixed(4)
@@ -866,7 +866,7 @@ export default function ModelInfoView({
                             <TextInput placeholder="Enter API base" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.api_base || "Not Set"}
                           </div>
                         )}
@@ -879,7 +879,7 @@ export default function ModelInfoView({
                             <TextInput placeholder="Enter custom LLM provider" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.custom_llm_provider || "Not Set"}
                           </div>
                         )}
@@ -892,7 +892,7 @@ export default function ModelInfoView({
                             <TextInput placeholder="Enter organization" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.organization || "Not Set"}
                           </div>
                         )}
@@ -905,7 +905,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Enter TPM" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.tpm || "Not Set"}
                           </div>
                         )}
@@ -918,7 +918,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Enter RPM" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.rpm || "Not Set"}
                           </div>
                         )}
@@ -931,7 +931,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Enter max retries" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.max_retries || "Not Set"}
                           </div>
                         )}
@@ -944,7 +944,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Enter timeout" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.timeout || "Not Set"}
                           </div>
                         )}
@@ -957,7 +957,7 @@ export default function ModelInfoView({
                             <NumericalInput placeholder="Enter stream timeout" />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.stream_timeout || "Not Set"}
                           </div>
                         )}
@@ -983,7 +983,7 @@ export default function ModelInfoView({
                             />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.model_info?.access_groups ? (
                               Array.isArray(localModelData.model_info.access_groups) ? (
                                 localModelData.model_info.access_groups.length > 0 ? (
@@ -1042,7 +1042,7 @@ export default function ModelInfoView({
                             />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.guardrails ? (
                               Array.isArray(localModelData.litellm_params.guardrails) ? (
                                 localModelData.litellm_params.guardrails.length > 0 ? (
@@ -1094,7 +1094,7 @@ export default function ModelInfoView({
                             />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.vector_store_ids ? (
                               Array.isArray(localModelData.litellm_params.vector_store_ids) ? (
                                 localModelData.litellm_params.vector_store_ids.length > 0 ? (
@@ -1144,7 +1144,7 @@ export default function ModelInfoView({
                             />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.tags ? (
                               Array.isArray(localModelData.litellm_params.tags) ? (
                                 localModelData.litellm_params.tags.length > 0 ? (
@@ -1192,7 +1192,7 @@ export default function ModelInfoView({
                             />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.litellm_credential_name || "Manual"}
                           </div>
                         )}
@@ -1228,7 +1228,7 @@ export default function ModelInfoView({
                               />
                             </Form.Item>
                           ) : (
-                            <div className="mt-1 p-2 bg-gray-50 rounded">
+                            <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                               {localModelData.model_info?.health_check_model || "Not Set"}
                             </div>
                           )}
@@ -1245,7 +1245,7 @@ export default function ModelInfoView({
                       ) : (
                         <div>
                           <Text className="font-medium">Cache Control</Text>
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
                             {localModelData.litellm_params?.cache_control_injection_points ? (
                               <div>
                                 <p>Enabled</p>
@@ -1278,8 +1278,8 @@ export default function ModelInfoView({
                             />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
-                            <pre className="bg-gray-100 p-2 rounded text-xs overflow-auto mt-1">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
+                            <pre className="bg-gray-100 p-2 rounded-sm text-xs overflow-auto mt-1">
                               {JSON.stringify(localModelData.model_info, null, 2)}
                             </pre>
                           </div>
@@ -1311,8 +1311,8 @@ export default function ModelInfoView({
                             />
                           </Form.Item>
                         ) : (
-                          <div className="mt-1 p-2 bg-gray-50 rounded">
-                            <pre className="bg-gray-100 p-2 rounded text-xs overflow-auto mt-1">
+                          <div className="mt-1 p-2 bg-gray-50 rounded-sm">
+                            <pre className="bg-gray-100 p-2 rounded-sm text-xs overflow-auto mt-1">
                               {JSON.stringify(localModelData.litellm_params, null, 2)}
                             </pre>
                           </div>
@@ -1320,7 +1320,9 @@ export default function ModelInfoView({
                       </div>
                       <div>
                         <Text className="font-medium">Team ID</Text>
-                        <div className="mt-1 p-2 bg-gray-50 rounded">{modelData.model_info.team_id || "Not Set"}</div>
+                        <div className="mt-1 p-2 bg-gray-50 rounded-sm">
+                          {modelData.model_info.team_id || "Not Set"}
+                        </div>
                       </div>
                     </div>
 
@@ -1352,7 +1354,9 @@ export default function ModelInfoView({
 
           <TabPanel>
             <Card>
-              <pre className="bg-gray-100 p-4 rounded text-xs overflow-auto">{JSON.stringify(modelData, null, 2)}</pre>
+              <pre className="bg-gray-100 p-4 rounded-sm text-xs overflow-auto">
+                {JSON.stringify(modelData, null, 2)}
+              </pre>
             </Card>
           </TabPanel>
         </TabPanels>
diff --git a/ui/litellm-dashboard/src/components/molecules/models/columns.tsx b/ui/litellm-dashboard/src/components/molecules/models/columns.tsx
index 329e5cd7729..bbacaff92d2 100644
--- a/ui/litellm-dashboard/src/components/molecules/models/columns.tsx
+++ b/ui/litellm-dashboard/src/components/molecules/models/columns.tsx
@@ -137,7 +137,7 @@ export const columns = (
           }}
         >
           <div className="flex items-start space-x-2 min-w-0 w-full cursor-pointer">
-            <div className="flex-shrink-0 mt-0.5">
+            <div className="shrink-0 mt-0.5">
               {model.provider ? (
                 <ProviderLogo provider={model.provider} />
               ) : (
@@ -180,14 +180,14 @@ export const columns = (
         <div className="flex items-center space-x-2 min-w-0 w-full">
           {isReusable ? (
             <>
-              <SyncOutlined className="flex-shrink-0" style={{ color: "#1890ff", fontSize: 14 }} />
+              <SyncOutlined className="shrink-0" style={{ color: "#1890ff", fontSize: 14 }} />
               <span className="text-xs truncate text-blue-600" title={credentialName}>
                 {credentialName}
               </span>
             </>
           ) : (
             <>
-              <EditOutlined className="flex-shrink-0" style={{ color: "#8c8c8c", fontSize: 14 }} />
+              <EditOutlined className="shrink-0" style={{ color: "#8c8c8c", fontSize: 14 }} />
               <span className="text-xs text-gray-500">Manual</span>
             </>
           )}
@@ -332,7 +332,7 @@ export const columns = (
 
       return (
         <div className="flex items-center gap-1 overflow-hidden w-full">
-          <Badge size="xs" color="blue" className="text-xs px-1.5 py-0.5 h-5 leading-tight flex-shrink-0">
+          <Badge size="xs" color="blue" className="text-xs px-1.5 py-0.5 h-5 leading-tight shrink-0">
             {accessGroups[0]}
           </Badge>
 
@@ -342,7 +342,7 @@ export const columns = (
                 key={index + 1}
                 size="xs"
                 color="blue"
-                className="text-xs px-1.5 py-0.5 h-5 leading-tight flex-shrink-0"
+                className="text-xs px-1.5 py-0.5 h-5 leading-tight shrink-0"
               >
                 {group}
               </Badge>
@@ -354,7 +354,7 @@ export const columns = (
                 e.stopPropagation();
                 toggleExpanded();
               }}
-              className="text-xs text-blue-600 hover:text-blue-800 px-1 py-0.5 rounded hover:bg-blue-50 h-5 leading-tight flex-shrink-0 whitespace-nowrap"
+              className="text-xs text-blue-600 hover:text-blue-800 px-1 py-0.5 rounded-sm hover:bg-blue-50 h-5 leading-tight shrink-0 whitespace-nowrap"
             >
               {isExpanded ? "−" : `+${accessGroups.length - 1}`}
             </button>
diff --git a/ui/litellm-dashboard/src/components/navbar.tsx b/ui/litellm-dashboard/src/components/navbar.tsx
index b235897819a..1a0b1c38520 100644
--- a/ui/litellm-dashboard/src/components/navbar.tsx
+++ b/ui/litellm-dashboard/src/components/navbar.tsx
@@ -63,7 +63,7 @@ const Navbar: React.FC<NavbarProps> = ({
     <nav className="sticky top-0 z-10 border-b border-gray-200 bg-white">
       <div className="w-full">
         <div className="flex h-14 items-center px-4">
-          <div className="flex flex-shrink-0 items-center">
+          <div className="flex shrink-0 items-center">
             {onToggleSidebar && (
               <button
                 onClick={onToggleSidebar}
@@ -102,7 +102,7 @@ const Navbar: React.FC<NavbarProps> = ({
                       href="https://docs.litellm.ai/release_notes"
                       target="_blank"
                       rel="noopener noreferrer"
-                      className="flex-shrink-0"
+                      className="shrink-0"
                     >
                       v{version}
                     </a>
diff --git a/ui/litellm-dashboard/src/components/organization/organization_view.tsx b/ui/litellm-dashboard/src/components/organization/organization_view.tsx
index a3ee0004fa6..e1b8c6d5044 100644
--- a/ui/litellm-dashboard/src/components/organization/organization_view.tsx
+++ b/ui/litellm-dashboard/src/components/organization/organization_view.tsx
@@ -441,7 +441,7 @@ const OrganizationInfoView: React.FC<OrganizationInfoProps> = ({
                       <Input.TextArea rows={4} />
                     </Form.Item>
 
-                    <div className="sticky z-10 bg-white p-4 border-t border-gray-200 bottom-[-1.5rem] inset-x-[-1.5rem]">
+                    <div className="sticky z-10 bg-white p-4 border-t border-gray-200 -bottom-6 -inset-x-6">
                       <div className="flex justify-end items-center gap-2">
                         <TremorButton variant="secondary" onClick={() => setIsEditing(false)} disabled={isOrgSaving}>
                           Cancel
diff --git a/ui/litellm-dashboard/src/components/pass_through_info.tsx b/ui/litellm-dashboard/src/components/pass_through_info.tsx
index 172e751dd1f..579911589f5 100644
--- a/ui/litellm-dashboard/src/components/pass_through_info.tsx
+++ b/ui/litellm-dashboard/src/components/pass_through_info.tsx
@@ -53,10 +53,10 @@ const PasswordField: React.FC<{ value: Record<string, any> }> = ({ value }) => {
 
   return (
     <div className="flex items-center space-x-2">
-      <pre className="font-mono text-xs bg-gray-50 p-2 rounded max-w-md overflow-auto">
+      <pre className="font-mono text-xs bg-gray-50 p-2 rounded-sm max-w-md overflow-auto">
         {showPassword ? headerString : "••••••••"}
       </pre>
-      <button onClick={() => setShowPassword(!showPassword)} className="p-1 hover:bg-gray-100 rounded" type="button">
+      <button onClick={() => setShowPassword(!showPassword)} className="p-1 hover:bg-gray-100 rounded-sm" type="button">
         {showPassword ? <EyeOff className="w-4 h-4 text-gray-500" /> : <Eye className="w-4 h-4 text-gray-500" />}
       </button>
     </div>
@@ -254,7 +254,7 @@ const PassThroughInfoView: React.FC<PassThroughInfoProps> = ({
                 </div>
                 <div className="mt-4 space-y-2">
                   {Object.entries(endpointData.guardrails).map(([name, settings]) => (
-                    <div key={name} className="p-3 bg-gray-50 rounded">
+                    <div key={name} className="p-3 bg-gray-50 rounded-sm">
                       <div className="font-medium text-sm">{name}</div>
                       {settings && (settings.request_fields || settings.response_fields) && (
                         <div className="mt-2 text-xs text-gray-600 space-y-1">
diff --git a/ui/litellm-dashboard/src/components/pass_through_settings.tsx b/ui/litellm-dashboard/src/components/pass_through_settings.tsx
index 66b41f092c5..0ee22f00554 100644
--- a/ui/litellm-dashboard/src/components/pass_through_settings.tsx
+++ b/ui/litellm-dashboard/src/components/pass_through_settings.tsx
@@ -53,7 +53,7 @@ const PasswordField: React.FC<{ value: object }> = ({ value }) => {
   return (
     <div className="flex items-center space-x-2">
       <span className="font-mono text-xs">{showPassword ? headerString : "••••••••"}</span>
-      <button onClick={() => setShowPassword(!showPassword)} className="p-1 hover:bg-gray-100 rounded" type="button">
+      <button onClick={() => setShowPassword(!showPassword)} className="p-1 hover:bg-gray-100 rounded-sm" type="button">
         {showPassword ? <EyeOff className="w-4 h-4 text-gray-500" /> : <Eye className="w-4 h-4 text-gray-500" />}
       </button>
     </div>
diff --git a/ui/litellm-dashboard/src/components/permissions/AgentPermissions.tsx b/ui/litellm-dashboard/src/components/permissions/AgentPermissions.tsx
index 1517d658bdc..11951b2decb 100644
--- a/ui/litellm-dashboard/src/components/permissions/AgentPermissions.tsx
+++ b/ui/litellm-dashboard/src/components/permissions/AgentPermissions.tsx
@@ -73,7 +73,7 @@ export function AgentPermissions({ agents, agentAccessGroups = [], accessToken }
                   {item.type === "agent" ? (
                     <Tooltip title={`Full ID: ${item.value}`} placement="top">
                       <div className="inline-flex items-center gap-2 min-w-0">
-                        <span className="inline-block w-1.5 h-1.5 bg-purple-500 rounded-full flex-shrink-0"></span>
+                        <span className="inline-block w-1.5 h-1.5 bg-purple-500 rounded-full shrink-0"></span>
                         <span className="text-sm font-medium text-gray-900 truncate">
                           {getAgentDisplayName(item.value)}
                         </span>
@@ -81,9 +81,9 @@ export function AgentPermissions({ agents, agentAccessGroups = [], accessToken }
                     </Tooltip>
                   ) : (
                     <div className="inline-flex items-center gap-2 min-w-0">
-                      <span className="inline-block w-1.5 h-1.5 bg-green-500 rounded-full flex-shrink-0"></span>
+                      <span className="inline-block w-1.5 h-1.5 bg-green-500 rounded-full shrink-0"></span>
                       <span className="text-sm font-medium text-gray-900 truncate">{item.value}</span>
-                      <span className="ml-1 px-1.5 py-0.5 text-[9px] font-semibold text-green-600 bg-green-50 border border-green-200 rounded uppercase tracking-wide flex-shrink-0">
+                      <span className="ml-1 px-1.5 py-0.5 text-[9px] font-semibold text-green-600 bg-green-50 border border-green-200 rounded-sm uppercase tracking-wide shrink-0">
                         Group
                       </span>
                     </div>
diff --git a/ui/litellm-dashboard/src/components/permissions/MCPServerPermissions.tsx b/ui/litellm-dashboard/src/components/permissions/MCPServerPermissions.tsx
index f2a2a3d5901..9172ff92c69 100644
--- a/ui/litellm-dashboard/src/components/permissions/MCPServerPermissions.tsx
+++ b/ui/litellm-dashboard/src/components/permissions/MCPServerPermissions.tsx
@@ -142,7 +142,7 @@ export function MCPServerPermissions({
                     {item.type === "server" ? (
                       <Tooltip title={`Full ID: ${item.value}`} placement="top">
                         <div className="inline-flex items-center gap-2 min-w-0">
-                          <span className="inline-block w-1.5 h-1.5 bg-blue-500 rounded-full flex-shrink-0"></span>
+                          <span className="inline-block w-1.5 h-1.5 bg-blue-500 rounded-full shrink-0"></span>
                           <span className="text-sm font-medium text-gray-900 truncate">
                             {getMCPServerDisplayName(item.value)}
                           </span>
@@ -150,9 +150,9 @@ export function MCPServerPermissions({
                       </Tooltip>
                     ) : (
                       <div className="inline-flex items-center gap-2 min-w-0">
-                        <span className="inline-block w-1.5 h-1.5 bg-green-500 rounded-full flex-shrink-0"></span>
+                        <span className="inline-block w-1.5 h-1.5 bg-green-500 rounded-full shrink-0"></span>
                         <span className="text-sm font-medium text-gray-900 truncate">{item.value}</span>
-                        <span className="ml-1 px-1.5 py-0.5 text-[9px] font-semibold text-green-600 bg-green-50 border border-green-200 rounded uppercase tracking-wide flex-shrink-0">
+                        <span className="ml-1 px-1.5 py-0.5 text-[9px] font-semibold text-green-600 bg-green-50 border border-green-200 rounded-sm uppercase tracking-wide shrink-0">
                           Group
                         </span>
                       </div>
@@ -160,7 +160,7 @@ export function MCPServerPermissions({
                   </div>
 
                   {hasToolRestrictions && (
-                    <div className="flex items-center gap-1 flex-shrink-0 whitespace-nowrap">
+                    <div className="flex items-center gap-1 shrink-0 whitespace-nowrap">
                       <span className="text-xs font-medium text-gray-600">{toolsForServer.length}</span>
                       <span className="text-xs text-gray-500">{toolsForServer.length === 1 ? "tool" : "tools"}</span>
                       {isExpanded ? (
@@ -207,16 +207,16 @@ export function MCPServerPermissions({
                     }`}
                   >
                     <div className="flex items-center gap-2 flex-1 min-w-0">
-                      <span className="inline-block w-1.5 h-1.5 bg-purple-500 rounded-full flex-shrink-0"></span>
+                      <span className="inline-block w-1.5 h-1.5 bg-purple-500 rounded-full shrink-0"></span>
                       <span className="text-sm font-medium text-gray-900 truncate">
                         {detail?.toolset_name ?? toolsetId}
                       </span>
-                      <span className="ml-1 px-1.5 py-0.5 text-[9px] font-semibold text-purple-600 bg-purple-50 border border-purple-200 rounded uppercase tracking-wide flex-shrink-0">
+                      <span className="ml-1 px-1.5 py-0.5 text-[9px] font-semibold text-purple-600 bg-purple-50 border border-purple-200 rounded-sm uppercase tracking-wide shrink-0">
                         Toolset
                       </span>
                     </div>
                     {toolCount > 0 && (
-                      <div className="flex items-center gap-1 flex-shrink-0 whitespace-nowrap">
+                      <div className="flex items-center gap-1 shrink-0 whitespace-nowrap">
                         <span className="text-xs font-medium text-gray-600">{toolCount}</span>
                         <span className="text-xs text-gray-500">{toolCount === 1 ? "tool" : "tools"}</span>
                         {isExpanded ? (
diff --git a/ui/litellm-dashboard/src/components/policies/ai_suggestion_modal.tsx b/ui/litellm-dashboard/src/components/policies/ai_suggestion_modal.tsx
index 1a3745df86e..3727db4d9cf 100644
--- a/ui/litellm-dashboard/src/components/policies/ai_suggestion_modal.tsx
+++ b/ui/litellm-dashboard/src/components/policies/ai_suggestion_modal.tsx
@@ -414,8 +414,8 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
               key={suggestion.template_id}
               className={`rounded-xl border-2 transition-all ${
                 isSelected
-                  ? "border-blue-400 bg-blue-50/60 shadow-sm"
-                  : "border-gray-200 hover:border-gray-300 hover:shadow-sm"
+                  ? "border-blue-400 bg-blue-50/60 shadow-xs"
+                  : "border-gray-200 hover:border-gray-300 hover:shadow-xs"
               }`}
             >
               <div className="p-4 cursor-pointer" onClick={() => toggleTemplate(suggestion.template_id)}>
@@ -461,7 +461,7 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
                         template.guardrails.slice(0, 4).map((g: string) => (
                           <span
                             key={g}
-                            className="inline-flex items-center px-1.5 py-0.5 rounded text-[10px] font-medium bg-gray-100 text-gray-600"
+                            className="inline-flex items-center px-1.5 py-0.5 rounded-sm text-[10px] font-medium bg-gray-100 text-gray-600"
                           >
                             {g}
                           </span>
@@ -471,7 +471,7 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
                       )}
                     </div>
                     <div className="mt-2 flex items-start gap-1.5">
-                      <InfoCircleOutlined className="text-blue-500 mt-0.5 text-xs flex-shrink-0" />
+                      <InfoCircleOutlined className="text-blue-500 mt-0.5 text-xs shrink-0" />
                       <p className="text-xs text-blue-600 leading-relaxed">{suggestion.reason}</p>
                     </div>
                   </div>
@@ -552,7 +552,7 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
               {hasEnrichedGuardrails ? (
                 <CheckCircleOutlined className="text-green-600" />
               ) : (
-                <svg className="w-4 h-4 text-amber-600 flex-shrink-0" fill="currentColor" viewBox="0 0 20 20">
+                <svg className="w-4 h-4 text-amber-600 shrink-0" fill="currentColor" viewBox="0 0 20 20">
                   <path
                     fillRule="evenodd"
                     d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z"
@@ -585,7 +585,7 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
             </div>
 
             {isEnriching && enrichStatusMessage && (
-              <div className="flex items-center gap-2 p-2 bg-blue-50 rounded border border-blue-100">
+              <div className="flex items-center gap-2 p-2 bg-blue-50 rounded-sm border border-blue-100">
                 <Spin size="small" />
                 <span className="text-xs text-blue-700">{enrichStatusMessage}</span>
               </div>
@@ -642,7 +642,7 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
             />
             <div className="mt-1">
               <Text className="text-xs text-gray-500">
-                Press <kbd className="px-1 py-0.5 bg-gray-100 border border-gray-300 rounded text-xs">Enter</kbd> to
+                Press <kbd className="px-1 py-0.5 bg-gray-100 border border-gray-300 rounded-sm text-xs">Enter</kbd> to
                 submit
               </Text>
             </div>
@@ -710,7 +710,7 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
                   return (
                     <Card
                       key={result.guardrail_name}
-                      className={`!p-3 ${
+                      className={`p-3! ${
                         isBlocked
                           ? "bg-red-50 border-red-200"
                           : isMasked
@@ -768,15 +768,15 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
                         {!isCollapsed && (
                           <>
                             {isMasked && result.output_text && (
-                              <div className="bg-white border border-amber-200 rounded p-2">
+                              <div className="bg-white border border-amber-200 rounded-sm p-2">
                                 <label className="text-[10px] font-medium text-gray-600 mb-1 block">Output Text</label>
-                                <div className="font-mono text-xs text-gray-900 whitespace-pre-wrap break-words">
+                                <div className="font-mono text-xs text-gray-900 whitespace-pre-wrap wrap-break-word">
                                   {result.output_text}
                                 </div>
                               </div>
                             )}
                             {isBlocked && result.details && (
-                              <div className="bg-white border border-red-200 rounded p-2">
+                              <div className="bg-white border border-red-200 rounded-sm p-2">
                                 <label className="text-[10px] font-medium text-gray-600 mb-1 block">Details</label>
                                 <p className="text-xs text-red-700">{result.details}</p>
                               </div>
@@ -919,7 +919,7 @@ const AiSuggestionModal: React.FC<AiSuggestionModalProps> = ({
 
           {/* Info box */}
           <div className="flex items-start gap-3 p-3.5 bg-blue-50 rounded-lg border border-blue-100">
-            <svg className="w-4 h-4 text-blue-500 mt-0.5 flex-shrink-0" fill="currentColor" viewBox="0 0 20 20">
+            <svg className="w-4 h-4 text-blue-500 mt-0.5 shrink-0" fill="currentColor" viewBox="0 0 20 20">
               <path
                 fillRule="evenodd"
                 d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"
diff --git a/ui/litellm-dashboard/src/components/policies/guardrail_selection_modal.tsx b/ui/litellm-dashboard/src/components/policies/guardrail_selection_modal.tsx
index e5e4624ae0d..4c2bffc77f1 100644
--- a/ui/litellm-dashboard/src/components/policies/guardrail_selection_modal.tsx
+++ b/ui/litellm-dashboard/src/components/policies/guardrail_selection_modal.tsx
@@ -156,7 +156,7 @@ const GuardrailSelectionModal: React.FC<GuardrailSelectionModalProps> = ({
               } transition-colors`}
             >
               <div className="flex items-start gap-3">
-                <div className="flex-shrink-0 pt-0.5">
+                <div className="shrink-0 pt-0.5">
                   {guardrail.alreadyExists ? (
                     <CheckCircleOutlined className="text-green-600 text-lg" />
                   ) : (
diff --git a/ui/litellm-dashboard/src/components/policies/policy_info.tsx b/ui/litellm-dashboard/src/components/policies/policy_info.tsx
index d3b53a4505d..a0ec5dd2b2a 100644
--- a/ui/litellm-dashboard/src/components/policies/policy_info.tsx
+++ b/ui/litellm-dashboard/src/components/policies/policy_info.tsx
@@ -97,7 +97,7 @@ const PolicyInfoView: React.FC<PolicyInfoViewProps> = ({
 
         <Descriptions bordered column={1}>
           <Descriptions.Item label="Policy ID">
-            <code className="text-xs bg-gray-100 px-2 py-1 rounded">{policy.policy_id}</code>
+            <code className="text-xs bg-gray-100 px-2 py-1 rounded-sm">{policy.policy_id}</code>
           </Descriptions.Item>
           <Descriptions.Item label="Description">
             {policy.description || <Text type="secondary">No description</Text>}
diff --git a/ui/litellm-dashboard/src/components/policies/policy_table.tsx b/ui/litellm-dashboard/src/components/policies/policy_table.tsx
index f7eee52847a..eafec442474 100644
--- a/ui/litellm-dashboard/src/components/policies/policy_table.tsx
+++ b/ui/litellm-dashboard/src/components/policies/policy_table.tsx
@@ -184,7 +184,7 @@ const PolicyTable: React.FC<PolicyTableProps> = ({
         }
         return (
           <Tooltip title={typeof modelCondition === "string" ? modelCondition : JSON.stringify(modelCondition)}>
-            <code className="text-xs bg-gray-100 px-1 py-0.5 rounded">
+            <code className="text-xs bg-gray-100 px-1 py-0.5 rounded-sm">
               {typeof modelCondition === "string"
                 ? modelCondition.length > 20
                   ? modelCondition.slice(0, 20) + "..."
diff --git a/ui/litellm-dashboard/src/components/policies/policy_templates.tsx b/ui/litellm-dashboard/src/components/policies/policy_templates.tsx
index 4043764394b..6b8d0f6007c 100644
--- a/ui/litellm-dashboard/src/components/policies/policy_templates.tsx
+++ b/ui/litellm-dashboard/src/components/policies/policy_templates.tsx
@@ -61,7 +61,7 @@ const PolicyTemplateCard: React.FC<PolicyTemplateCardProps> = ({
       </div>
 
       <h3 className="text-base font-semibold text-gray-900 mb-2">{title}</h3>
-      <p className="text-sm text-gray-500 mb-4 flex-grow">{description}</p>
+      <p className="text-sm text-gray-500 mb-4 grow">{description}</p>
 
       {tags.length > 0 && (
         <div className="flex flex-wrap gap-1.5 mb-4">
@@ -79,7 +79,7 @@ const PolicyTemplateCard: React.FC<PolicyTemplateCardProps> = ({
       {inherits && (
         <div className="mb-4 text-xs">
           <span className="text-gray-500">Inherits from: </span>
-          <span className="font-medium text-gray-700 bg-gray-100 px-2 py-0.5 rounded">{inherits}</span>
+          <span className="font-medium text-gray-700 bg-gray-100 px-2 py-0.5 rounded-sm">{inherits}</span>
         </div>
       )}
 
@@ -91,7 +91,7 @@ const PolicyTemplateCard: React.FC<PolicyTemplateCardProps> = ({
           {guardrails.map((g) => (
             <span
               key={g}
-              className="inline-flex items-center px-2 py-1 rounded text-xs font-medium bg-gray-50 text-gray-700 border border-gray-200"
+              className="inline-flex items-center px-2 py-1 rounded-sm text-xs font-medium bg-gray-50 text-gray-700 border border-gray-200"
             >
               {g}
             </span>
@@ -218,7 +218,7 @@ const PolicyTemplates: React.FC<PolicyTemplatesProps> = ({
       <div className="flex gap-6">
         {/* Left sidebar - tag filters */}
         {tagCounts.length > 0 && (
-          <div className="w-52 flex-shrink-0">
+          <div className="w-52 shrink-0">
             <div className="sticky top-4">
               <div className="flex items-center justify-between mb-3">
                 <span className="text-sm font-semibold text-gray-900">Categories</span>
diff --git a/ui/litellm-dashboard/src/components/policies/template_parameter_modal.tsx b/ui/litellm-dashboard/src/components/policies/template_parameter_modal.tsx
index e62f12e0095..3f025e83536 100644
--- a/ui/litellm-dashboard/src/components/policies/template_parameter_modal.tsx
+++ b/ui/litellm-dashboard/src/components/policies/template_parameter_modal.tsx
@@ -313,7 +313,7 @@ const TemplateParameterModal: React.FC<TemplateParameterModalProps> = ({
               />
               <p className="text-xs text-gray-500 mt-1">Type a name and press Enter to add. Click ✕ to remove.</p>
               {statusMessage && (
-                <div className="flex items-center gap-2 mt-2 p-2 bg-blue-50 rounded border border-blue-100">
+                <div className="flex items-center gap-2 mt-2 p-2 bg-blue-50 rounded-sm border border-blue-100">
                   <Spin size="small" />
                   <span className="text-xs text-blue-700">{statusMessage}</span>
                 </div>
diff --git a/ui/litellm-dashboard/src/components/public_model_hub.tsx b/ui/litellm-dashboard/src/components/public_model_hub.tsx
index c91b783b047..a03f48dc1f1 100644
--- a/ui/litellm-dashboard/src/components/public_model_hub.tsx
+++ b/ui/litellm-dashboard/src/components/public_model_hub.tsx
@@ -623,12 +623,12 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
             {providers.map((provider) => {
               const { logo } = getProviderLogoAndName(provider);
               return (
-                <div key={provider} className="flex items-center space-x-1 px-2 py-1 bg-gray-100 rounded text-xs">
+                <div key={provider} className="flex items-center space-x-1 px-2 py-1 bg-gray-100 rounded-sm text-xs">
                   {logo && (
                     <img
                       src={logo}
                       alt={provider}
-                      className="w-3 h-3 flex-shrink-0 object-contain"
+                      className="w-3 h-3 shrink-0 object-contain"
                       onError={(e) => {
                         (e.target as HTMLImageElement).style.display = "none";
                       }}
@@ -973,7 +973,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
 
           {/* About Section - only shown when not embedded */}
           {!isEmbedded && (
-            <Card className="mb-10 p-8 bg-white border border-gray-200 rounded-lg shadow-sm">
+            <Card className="mb-10 p-8 bg-white border border-gray-200 rounded-lg shadow-xs">
               <Title className="text-2xl font-semibold mb-6 text-gray-900">About</Title>
               <p className="text-gray-700 mb-6 text-base leading-relaxed">
                 {customDocsDescription ? customDocsDescription : "Proxy Server to call 100+ LLMs in the OpenAI format."}
@@ -989,7 +989,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
 
           {/* Useful Links - only shown when not embedded */}
           {usefulLinks && Object.keys(usefulLinks).length > 0 && (
-            <Card className="mb-10 p-8 bg-white border border-gray-200 rounded-lg shadow-sm">
+            <Card className="mb-10 p-8 bg-white border border-gray-200 rounded-lg shadow-xs">
               <Title className="text-2xl font-semibold mb-6 text-gray-900">Useful Links</Title>
               <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
                 {Object.entries(usefulLinks || {})
@@ -1016,7 +1016,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
 
           {/* Health and Endpoint Status - only shown when not embedded */}
           {!isEmbedded && (
-            <Card className="mb-10 p-8 bg-white border border-gray-200 rounded-lg shadow-sm">
+            <Card className="mb-10 p-8 bg-white border border-gray-200 rounded-lg shadow-xs">
               <Title className="text-2xl font-semibold mb-6 text-gray-900">Health and Endpoint Status</Title>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
                 <Text className="text-green-600 font-medium text-sm">Service status: {serviceStatus}</Text>
@@ -1025,7 +1025,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
           )}
 
           {/* Tabs for Models and Agents */}
-          <Card className="p-8 bg-white border border-gray-200 rounded-lg shadow-sm">
+          <Card className="p-8 bg-white border border-gray-200 rounded-lg shadow-xs">
             <Tabs activeKey={activeTab} onChange={setActiveTab} size="large" className="public-hub-tabs">
               {/* Models Tab */}
               <TabPane tab="Model Hub" key="models">
@@ -1052,7 +1052,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
                         placeholder="Search model names... (smart search enabled)"
                         value={searchTerm}
                         onChange={(e) => setSearchTerm(e.target.value)}
-                        className="border border-gray-300 rounded-lg pl-10 pr-4 py-2 w-full text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white"
+                        className="border border-gray-300 rounded-lg pl-10 pr-4 py-2 w-full text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white"
                       />
                     </div>
                   </div>
@@ -1074,7 +1074,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
                               <img
                                 src={logo}
                                 alt={option.label as string}
-                                className="w-5 h-5 flex-shrink-0 object-contain"
+                                className="w-5 h-5 shrink-0 object-contain"
                                 onError={(e) => {
                                   (e.target as HTMLImageElement).style.display = "none";
                                 }}
@@ -1173,7 +1173,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
                           placeholder="Search agent names or descriptions..."
                           value={agentSearchTerm}
                           onChange={(e) => setAgentSearchTerm(e.target.value)}
-                          className="border border-gray-300 rounded-lg pl-10 pr-4 py-2 w-full text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white"
+                          className="border border-gray-300 rounded-lg pl-10 pr-4 py-2 w-full text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white"
                         />
                       </div>
                     </div>
@@ -1237,7 +1237,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
                           placeholder="Search MCP server names or descriptions..."
                           value={mcpSearchTerm}
                           onChange={(e) => setMcpSearchTerm(e.target.value)}
-                          className="border border-gray-300 rounded-lg pl-10 pr-4 py-2 w-full text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white"
+                          className="border border-gray-300 rounded-lg pl-10 pr-4 py-2 w-full text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white"
                         />
                       </div>
                     </div>
@@ -1333,7 +1333,7 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
                                 <img
                                   src={logo}
                                   alt={provider}
-                                  className="w-3 h-3 flex-shrink-0 object-contain"
+                                  className="w-3 h-3 shrink-0 object-contain"
                                   onError={(e) => {
                                     (e.target as HTMLImageElement).style.display = "none";
                                   }}
@@ -1352,18 +1352,20 @@ const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded
                 {selectedModel.model_group.includes("*") && (
                   <div className="bg-blue-50 border border-blue-200 rounded-lg p-4 mb-4">
                     <div className="flex items-start space-x-2">
-                      <Info className="w-4 h-4 text-blue-600 mt-0.5 flex-shrink-0" />
+                      <Info className="w-4 h-4 text-blue-600 mt-0.5 shrink-0" />
                       <div>
                         <Text className="font-medium text-blue-900 mb-2">Wildcard Routing</Text>
                         <Text className="text-sm text-blue-800 mb-2">
                           This model uses wildcard routing. You can pass any value where you see the{" "}
-                          <code className="bg-blue-100 px-1 py-0.5 rounded text-xs">*</code> symbol.
+                          <code className="bg-blue-100 px-1 py-0.5 rounded-sm text-xs">*</code> symbol.
                         </Text>
                         <Text className="text-sm text-blue-800">
                           For example, with{" "}
-                          <code className="bg-blue-100 px-1 py-0.5 rounded text-xs">{selectedModel.model_group}</code>,
-                          you can use any string (
-                          <code className="bg-blue-100 px-1 py-0.5 rounded text-xs">
+                          <code className="bg-blue-100 px-1 py-0.5 rounded-sm text-xs">
+                            {selectedModel.model_group}
+                          </code>
+                          , you can use any string (
+                          <code className="bg-blue-100 px-1 py-0.5 rounded-sm text-xs">
                             {selectedModel.model_group.replaceAll("*", "my-custom-value")}
                           </code>
                           ) that matches this pattern.
diff --git a/ui/litellm-dashboard/src/components/route_preview.tsx b/ui/litellm-dashboard/src/components/route_preview.tsx
index c515687d096..712684af5fc 100644
--- a/ui/litellm-dashboard/src/components/route_preview.tsx
+++ b/ui/litellm-dashboard/src/components/route_preview.tsx
@@ -97,11 +97,11 @@ const RoutePreview: React.FC<RoutePreviewProps> = ({ pathValue, targetValue, inc
         {!includeSubpath && (
           <div className="mt-4 p-3 bg-blue-50 rounded-md border border-blue-200">
             <div className="flex items-start">
-              <InfoCircleOutlined className="text-blue-500 mt-0.5 mr-2 flex-shrink-0" />
+              <InfoCircleOutlined className="text-blue-500 mt-0.5 mr-2 shrink-0" />
               <div className="text-sm text-blue-700">
                 <span className="font-medium">Not seeing the routing you wanted?</span> Try enabling - Include Subpaths
                 - above - this allows subroutes like{" "}
-                <code className="bg-blue-100 px-1 py-0.5 rounded font-mono text-xs">/api/v1/models</code> to be
+                <code className="bg-blue-100 px-1 py-0.5 rounded-sm font-mono text-xs">/api/v1/models</code> to be
                 forwarded automatically.
               </div>
             </div>
diff --git a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx
index 6fd8621969c..96f6e578c83 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupsTable.tsx
@@ -110,7 +110,7 @@ const RoutingGroupSnippet: React.FC<RoutingGroupSnippetProps> = ({ group, baseUr
     key,
     label,
     children: (
-      <Paragraph code className="!mb-0" style={SNIPPET_BLOCK_STYLE}>
+      <Paragraph code className="mb-0!" style={SNIPPET_BLOCK_STYLE}>
         {snippets[key as SnippetKey]}
       </Paragraph>
     ),
@@ -123,7 +123,7 @@ const RoutingGroupSnippet: React.FC<RoutingGroupSnippetProps> = ({ group, baseUr
       onChange={(k) => setActiveKey(k as SnippetKey)}
       items={items}
       tabBarExtraContent={
-        <Paragraph copyable={{ text: snippets[activeKey], tooltips: ["Copy", "Copied"] }} className="!mb-0" />
+        <Paragraph copyable={{ text: snippets[activeKey], tooltips: ["Copy", "Copied"] }} className="mb-0!" />
       }
     />
   );
diff --git a/ui/litellm-dashboard/src/components/settings.tsx b/ui/litellm-dashboard/src/components/settings.tsx
index bff0dbb35b8..6f4ad17313b 100644
--- a/ui/litellm-dashboard/src/components/settings.tsx
+++ b/ui/litellm-dashboard/src/components/settings.tsx
@@ -97,14 +97,14 @@ const DynamicParamsFields: React.FC<DynamicParamsFieldsProps> = ({ params, callb
               <Input.Password
                 size="large"
                 placeholder={`Enter your ${fieldLabel.toLowerCase()}`}
-                className="w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500"
+                className="w-full rounded-md border-gray-300 shadow-xs focus:border-blue-500 focus:ring-blue-500"
               />
             ) : paramType === "number" ? (
               <Input
                 type="number"
                 size="large"
                 placeholder={`Enter ${fieldLabel.toLowerCase()}`}
-                className="w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500"
+                className="w-full rounded-md border-gray-300 shadow-xs focus:border-blue-500 focus:ring-blue-500"
                 min={0}
                 max={1}
                 step={0.1}
@@ -113,7 +113,7 @@ const DynamicParamsFields: React.FC<DynamicParamsFieldsProps> = ({ params, callb
               <Input
                 size="large"
                 placeholder={`Enter your ${fieldLabel.toLowerCase()}`}
-                className="w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500"
+                className="w-full rounded-md border-gray-300 shadow-xs focus:border-blue-500 focus:ring-blue-500"
               />
             )}
           </FormItem>
@@ -171,7 +171,7 @@ const CallbackSelector: React.FC<CallbackSelectorProps> = ({
                   <img
                     src={logoSrc}
                     alt={`${callbackConfig.displayName} logo`}
-                    className="w-6 h-6 rounded object-contain"
+                    className="w-6 h-6 rounded-sm object-contain"
                     onError={(e) => {
                       e.currentTarget.style.display = "none";
                     }}
diff --git a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx
index 4293657b71a..013ccd118e9 100644
--- a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx
+++ b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx
@@ -299,7 +299,7 @@ const AdvancedDatePicker: React.FC<AdvancedDatePickerProps> = ({
 
         {/* Dropdown panel */}
         {isOpen && (
-          <div className="absolute top-full right-0 z-[9999] min-w-[600px] mt-1 bg-white border border-gray-200 rounded-lg shadow-xl">
+          <div className="absolute top-full right-0 z-9999 min-w-[600px] mt-1 bg-white border border-gray-200 rounded-lg shadow-xl">
             <div className="flex">
               {/* Left side - Relative time options */}
               <div className="w-1/2 border-r border-gray-200">
diff --git a/ui/litellm-dashboard/src/components/shared/usage_date_picker.tsx b/ui/litellm-dashboard/src/components/shared/usage_date_picker.tsx
index 72ce5042647..821dee65a3e 100644
--- a/ui/litellm-dashboard/src/components/shared/usage_date_picker.tsx
+++ b/ui/litellm-dashboard/src/components/shared/usage_date_picker.tsx
@@ -135,7 +135,7 @@ const UsageDatePicker: React.FC<UsageDatePickerProps> = ({
               zIndex: 110,
             }}
           >
-            <div className="flex items-center gap-1 text-green-600 text-sm font-medium bg-white px-2 py-1 rounded-full border border-green-200 shadow-sm whitespace-nowrap">
+            <div className="flex items-center gap-1 text-green-600 text-sm font-medium bg-white px-2 py-1 rounded-full border border-green-200 shadow-xs whitespace-nowrap">
               <div className="w-3 h-3 bg-green-500 text-white rounded-full flex items-center justify-center text-xs">
                 ✓
               </div>
diff --git a/ui/litellm-dashboard/src/components/tag_management/tag_info.tsx b/ui/litellm-dashboard/src/components/tag_management/tag_info.tsx
index 1c66a107db7..63725d5884f 100644
--- a/ui/litellm-dashboard/src/components/tag_management/tag_info.tsx
+++ b/ui/litellm-dashboard/src/components/tag_management/tag_info.tsx
@@ -117,7 +117,7 @@ const TagInfoView: React.FC<TagInfoViewProps> = ({ tagId, onClose, accessToken,
           </Button>
           <div className="flex items-center gap-2">
             <Text className="font-medium">Tag Name:</Text>
-            <span className="font-mono px-2 py-1 bg-gray-100 rounded text-sm border border-gray-200">
+            <span className="font-mono px-2 py-1 bg-gray-100 rounded-sm text-sm border border-gray-200">
               {tagDetails.name}
             </span>
             <AntdButton
diff --git a/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx b/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx
index 49602fd5b05..cc1c68edeab 100644
--- a/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx
+++ b/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx
@@ -122,12 +122,12 @@ const LoggingSettings: React.FC<LoggingSettingsProps> = ({
                   <InfoCircleOutlined className="text-gray-400 cursor-help text-xs" />
                 </Tooltip>
                 {paramType === "password" && (
-                  <span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-yellow-100 text-yellow-800">
+                  <span className="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium bg-yellow-100 text-yellow-800">
                     Sensitive
                   </span>
                 )}
                 {paramType === "number" && (
-                  <span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-yellow-100 text-yellow-800">
+                  <span className="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium bg-yellow-100 text-yellow-800">
                     Number
                   </span>
                 )}
@@ -250,7 +250,7 @@ const LoggingSettings: React.FC<LoggingSettingsProps> = ({
           return (
             <Card
               key={index}
-              className="border border-gray-200 shadow-sm hover:shadow-md transition-shadow duration-200"
+              className="border border-gray-200 shadow-xs hover:shadow-md transition-shadow duration-200"
               decoration="top"
               decorationColor="blue"
             >
diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index dc56e6c63e1..c5b934d5432 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -1467,7 +1467,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                       <Input.TextArea rows={10} />
                     </Form.Item>
 
-                    <div className="sticky z-10 bg-white p-4 pr-0 border-t border-gray-200 bottom-[-1.5rem] inset-x-[-1.5rem]">
+                    <div className="sticky z-10 bg-white p-4 pr-0 border-t border-gray-200 -bottom-6 -inset-x-6">
                       <div className="flex justify-end items-center gap-2">
                         <Button onClick={() => setIsEditing(false)} disabled={isTeamSaving}>
                           Cancel
@@ -1647,7 +1647,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
                     {info.metadata?.secret_manager_settings && (
                       <div className="pt-4 border-t border-gray-200">
                         <Text className="font-medium">Secret Manager Settings</Text>
-                        <pre className="mt-2 bg-gray-50 p-3 rounded text-xs overflow-x-auto">
+                        <pre className="mt-2 bg-gray-50 p-3 rounded-sm text-xs overflow-x-auto">
                           {JSON.stringify(info.metadata.secret_manager_settings, null, 2)}
                         </pre>
                       </div>
diff --git a/ui/litellm-dashboard/src/components/templates/key_edit_view.tsx b/ui/litellm-dashboard/src/components/templates/key_edit_view.tsx
index e991db8069e..8ff30633ae3 100644
--- a/ui/litellm-dashboard/src/components/templates/key_edit_view.tsx
+++ b/ui/litellm-dashboard/src/components/templates/key_edit_view.tsx
@@ -784,7 +784,7 @@ export function KeyEditView({
         <Input />
       </Form.Item>
 
-      <div className="sticky z-10 bg-white p-4 border-t border-gray-200 bottom-[-1.5rem] inset-x-[-1.5rem]">
+      <div className="sticky z-10 bg-white p-4 border-t border-gray-200 -bottom-6 -inset-x-6">
         <div className="flex justify-end items-center gap-2">
           <TremorButton variant="secondary" onClick={onCancel} disabled={isKeySaving}>
             Cancel
diff --git a/ui/litellm-dashboard/src/components/templates/key_info_view.tsx b/ui/litellm-dashboard/src/components/templates/key_info_view.tsx
index 24d5c78c72b..76d6f7ece22 100644
--- a/ui/litellm-dashboard/src/components/templates/key_info_view.tsx
+++ b/ui/litellm-dashboard/src/components/templates/key_info_view.tsx
@@ -753,7 +753,7 @@ export default function KeyInfoView({
                     <div className="flex flex-wrap gap-2 mt-1">
                       {Array.isArray(currentKeyData.metadata?.tags) && currentKeyData.metadata.tags.length > 0
                         ? currentKeyData.metadata.tags.map((tag, index) => (
-                            <span key={index} className="px-2 mr-2 py-1 bg-blue-100 rounded text-xs">
+                            <span key={index} className="px-2 mr-2 py-1 bg-blue-100 rounded-sm text-xs">
                               {tag}
                             </span>
                           ))
@@ -766,7 +766,7 @@ export default function KeyInfoView({
                     <Text>
                       {Array.isArray(currentKeyData.metadata?.prompts) && currentKeyData.metadata.prompts.length > 0
                         ? currentKeyData.metadata.prompts.map((prompt, index) => (
-                            <span key={index} className="px-2 mr-2 py-1 bg-blue-100 rounded text-xs">
+                            <span key={index} className="px-2 mr-2 py-1 bg-blue-100 rounded-sm text-xs">
                               {prompt}
                             </span>
                           ))
@@ -779,7 +779,7 @@ export default function KeyInfoView({
                     <div className="flex flex-wrap gap-2 mt-1">
                       {Array.isArray(currentKeyData.allowed_routes) && currentKeyData.allowed_routes.length > 0 ? (
                         currentKeyData.allowed_routes.map((route, index) => (
-                          <span key={index} className="px-2 py-1 bg-blue-100 rounded text-xs">
+                          <span key={index} className="px-2 py-1 bg-blue-100 rounded-sm text-xs">
                             {route}
                           </span>
                         ))
@@ -795,7 +795,7 @@ export default function KeyInfoView({
                       {Array.isArray(currentKeyData.metadata?.allowed_passthrough_routes) &&
                       currentKeyData.metadata.allowed_passthrough_routes.length > 0
                         ? currentKeyData.metadata.allowed_passthrough_routes.map((route, index) => (
-                            <span key={index} className="px-2 mr-2 py-1 bg-blue-100 rounded text-xs">
+                            <span key={index} className="px-2 mr-2 py-1 bg-blue-100 rounded-sm text-xs">
                               {route}
                             </span>
                           ))
@@ -819,7 +819,7 @@ export default function KeyInfoView({
                     <div className="flex flex-wrap gap-2 mt-1">
                       {currentKeyData.models && currentKeyData.models.length > 0 ? (
                         currentKeyData.models.map((model, index) => (
-                          <span key={index} className="px-2 py-1 bg-blue-100 rounded text-xs">
+                          <span key={index} className="px-2 py-1 bg-blue-100 rounded-sm text-xs">
                             {model}
                           </span>
                         ))
@@ -855,7 +855,7 @@ export default function KeyInfoView({
 
                   <div>
                     <Text className="font-medium">Metadata</Text>
-                    <pre className="bg-gray-100 p-2 rounded text-xs overflow-auto mt-1">
+                    <pre className="bg-gray-100 p-2 rounded-sm text-xs overflow-auto mt-1">
                       {formatMetadataForDisplay(stripTagsFromMetadata(currentKeyData.metadata))}
                     </pre>
                   </div>
diff --git a/ui/litellm-dashboard/src/components/ui/button.test.tsx b/ui/litellm-dashboard/src/components/ui/button.test.tsx
new file mode 100644
index 00000000000..16863d5c309
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/button.test.tsx
@@ -0,0 +1,50 @@
+import { describe, it, expect } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { createRef } from "react";
+import { Button } from "./button";
+
+describe("Button", () => {
+  it("renders the default variant with cva-applied classes", () => {
+    render(<Button>Save</Button>);
+    const button = screen.getByRole("button", { name: "Save" });
+    expect(button).toHaveClass("bg-primary");
+    expect(button).toHaveAttribute("data-slot", "button");
+    expect(button).toHaveAttribute("data-variant", "default");
+  });
+
+  it("applies variant and size props", () => {
+    render(
+      <Button variant="destructive" size="sm">
+        Delete
+      </Button>,
+    );
+    const button = screen.getByRole("button", { name: "Delete" });
+    expect(button).toHaveClass("bg-destructive");
+    expect(button).toHaveClass("h-8");
+    expect(button).toHaveAttribute("data-variant", "destructive");
+  });
+
+  it("resolves conflicting classes through twMerge so className wins", () => {
+    render(<Button className="bg-red-500">Override</Button>);
+    const button = screen.getByRole("button", { name: "Override" });
+    expect(button).toHaveClass("bg-red-500");
+    expect(button).not.toHaveClass("bg-primary");
+  });
+
+  it("renders the child element when asChild is set", () => {
+    render(
+      <Button asChild>
+        <a href="https://docs.litellm.ai">Docs</a>
+      </Button>,
+    );
+    const link = screen.getByRole("link", { name: "Docs" });
+    expect(link).toHaveClass("bg-primary");
+    expect(screen.queryByRole("button")).not.toBeInTheDocument();
+  });
+
+  it("forwards refs to the underlying button element", () => {
+    const ref = createRef<HTMLButtonElement>();
+    render(<Button ref={ref}>Save</Button>);
+    expect(ref.current).toBeInstanceOf(HTMLButtonElement);
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/ui/button.tsx b/ui/litellm-dashboard/src/components/ui/button.tsx
new file mode 100644
index 00000000000..6f0e2657fbc
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/button.tsx
@@ -0,0 +1,60 @@
+import * as React from "react";
+import { type VariantProps } from "cva";
+import { Slot } from "radix-ui";
+
+import { cn, cva } from "@/lib/cva.config";
+
+const buttonVariants = cva({
+  base: "inline-flex shrink-0 items-center justify-center gap-2 rounded-md text-sm font-medium whitespace-nowrap transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+  variants: {
+    variant: {
+      default: "bg-primary text-primary-foreground hover:bg-primary/90",
+      destructive:
+        "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:bg-destructive/60 dark:focus-visible:ring-destructive/40",
+      outline:
+        "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:border-input dark:bg-input/30 dark:hover:bg-input/50",
+      secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+      ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
+      link: "text-primary underline-offset-4 hover:underline",
+    },
+    size: {
+      default: "h-9 px-4 py-2 has-[>svg]:px-3",
+      xs: "h-6 gap-1 rounded-md px-2 text-xs has-[>svg]:px-1.5 [&_svg:not([class*='size-'])]:size-3",
+      sm: "h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5",
+      lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
+      icon: "size-9",
+      "icon-xs": "size-6 rounded-md [&_svg:not([class*='size-'])]:size-3",
+      "icon-sm": "size-8",
+      "icon-lg": "size-10",
+    },
+  },
+  defaultVariants: {
+    variant: "default",
+    size: "default",
+  },
+});
+
+type ButtonProps = React.ComponentPropsWithoutRef<"button"> &
+  VariantProps<typeof buttonVariants> & {
+    asChild?: boolean;
+  };
+
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  ({ className, variant = "default", size = "default", asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot.Root : "button";
+
+    return (
+      <Comp
+        ref={ref}
+        data-slot="button"
+        data-variant={variant}
+        data-size={size}
+        className={cn(buttonVariants({ variant, size, className }))}
+        {...props}
+      />
+    );
+  },
+);
+Button.displayName = "Button";
+
+export { Button, buttonVariants };
diff --git a/ui/litellm-dashboard/src/components/usage.tsx b/ui/litellm-dashboard/src/components/usage.tsx
index 7e1a14e2f55..f8dc090a700 100644
--- a/ui/litellm-dashboard/src/components/usage.tsx
+++ b/ui/litellm-dashboard/src/components/usage.tsx
@@ -583,7 +583,7 @@ const UsagePage: React.FC<UsagePageProps> = ({ accessToken, token, userRole, use
               </TabList>
               <TabPanels>
                 <TabPanel>
-                  <Grid numItems={2} className="gap-2 h-[100vh] w-full">
+                  <Grid numItems={2} className="gap-2 h-screen w-full">
                     <Col numColSpan={2}>
                       <Text className="text-tremor-default text-tremor-content dark:text-dark-tremor-content mb-2 mt-2 text-lg">
                         Project Spend {new Date().toLocaleString("default", { month: "long" })} 1 -{" "}
diff --git a/ui/litellm-dashboard/src/components/vector_store_management/VectorStoreTester.tsx b/ui/litellm-dashboard/src/components/vector_store_management/VectorStoreTester.tsx
index 5c59334fa4d..a90f49ea5b3 100644
--- a/ui/litellm-dashboard/src/components/vector_store_management/VectorStoreTester.tsx
+++ b/ui/litellm-dashboard/src/components/vector_store_management/VectorStoreTester.tsx
@@ -128,7 +128,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                 <div key={index} className="space-y-2">
                   {/* User Query */}
                   <div className="text-right">
-                    <div className="inline-block max-w-[80%] rounded-lg shadow-sm p-3 bg-blue-50 border border-blue-200">
+                    <div className="inline-block max-w-[80%] rounded-lg shadow-xs p-3 bg-blue-50 border border-blue-200">
                       <div className="flex items-center gap-2 mb-1">
                         <strong className="text-sm">Query</strong>
                         <span className="text-xs text-gray-500">{formatTimestamp(entry.timestamp)}</span>
@@ -139,12 +139,12 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
 
                   {/* Vector Store Response */}
                   <div className="text-left">
-                    <div className="inline-block max-w-[80%] rounded-lg shadow-sm p-3 bg-white border border-gray-200">
+                    <div className="inline-block max-w-[80%] rounded-lg shadow-xs p-3 bg-white border border-gray-200">
                       <div className="flex items-center gap-2 mb-2">
                         <DatabaseOutlined className="text-green-500" />
                         <strong className="text-sm">Vector Store Results</strong>
                         {entry.response && (
-                          <span className="text-xs px-2 py-0.5 rounded bg-gray-100 text-gray-600">
+                          <span className="text-xs px-2 py-0.5 rounded-sm bg-gray-100 text-gray-600">
                             {entry.response.data?.length || 0} results
                           </span>
                         )}
@@ -176,7 +176,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                                       </span>
                                     )}
                                   </div>
-                                  <span className="text-xs bg-blue-100 text-blue-800 px-2 py-1 rounded">
+                                  <span className="text-xs bg-blue-100 text-blue-800 px-2 py-1 rounded-sm">
                                     Score: {result.score.toFixed(4)}
                                   </span>
                                 </div>
@@ -189,7 +189,7 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                                       result.content.map((content, contentIndex) => (
                                         <div key={contentIndex} className="mb-3">
                                           <div className="text-xs text-gray-500 mb-1">Content ({content.type})</div>
-                                          <div className="text-sm bg-gray-50 p-3 rounded border text-gray-800 max-h-40 overflow-y-auto">
+                                          <div className="text-sm bg-gray-50 p-3 rounded-sm border text-gray-800 max-h-40 overflow-y-auto">
                                             {content.text}
                                           </div>
                                         </div>
@@ -201,19 +201,19 @@ export const VectorStoreTester: React.FC<VectorStoreTesterProps> = ({ vectorStor
                                         <div className="text-xs text-gray-500 mb-2 font-medium">Metadata</div>
                                         <div className="space-y-2 text-xs">
                                           {result.file_id && (
-                                            <div className="bg-gray-50 p-2 rounded">
+                                            <div className="bg-gray-50 p-2 rounded-sm">
                                               <span className="font-medium">File ID:</span> {result.file_id}
                                             </div>
                                           )}
                                           {result.filename && (
-                                            <div className="bg-gray-50 p-2 rounded">
+                                            <div className="bg-gray-50 p-2 rounded-sm">
                                               <span className="font-medium">Filename:</span> {result.filename}
                                             </div>
                                           )}
                                           {result.attributes && Object.keys(result.attributes).length > 0 && (
-                                            <div className="bg-gray-50 p-2 rounded">
+                                            <div className="bg-gray-50 p-2 rounded-sm">
                                               <span className="font-medium block mb-1">Attributes:</span>
-                                              <pre className="text-xs bg-white p-2 rounded border overflow-x-auto">
+                                              <pre className="text-xs bg-white p-2 rounded-sm border overflow-x-auto">
                                                 {JSON.stringify(result.attributes, null, 2)}
                                               </pre>
                                             </div>
diff --git a/ui/litellm-dashboard/src/components/vector_store_management/vector_store_info.tsx b/ui/litellm-dashboard/src/components/vector_store_management/vector_store_info.tsx
index 1f40f98a501..dc82ba33112 100644
--- a/ui/litellm-dashboard/src/components/vector_store_management/vector_store_info.tsx
+++ b/ui/litellm-dashboard/src/components/vector_store_management/vector_store_info.tsx
@@ -231,9 +231,9 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
                     </Form.Item>
 
                     <div className="flex items-center my-4">
-                      <div className="flex-grow border-t border-gray-200"></div>
+                      <div className="grow border-t border-gray-200"></div>
                       <span className="px-4 text-gray-500 text-sm">OR</span>
-                      <div className="flex-grow border-t border-gray-200"></div>
+                      <div className="grow border-t border-gray-200"></div>
                     </div>
 
                     <Form.Item
@@ -333,7 +333,7 @@ const VectorStoreInfoView: React.FC<VectorStoreInfoViewProps> = ({
                     </div>
                     <div>
                       <Text className="font-medium">Metadata</Text>
-                      <div className="bg-gray-50 p-3 rounded mt-2 font-mono text-xs overflow-auto max-h-48">
+                      <div className="bg-gray-50 p-3 rounded-sm mt-2 font-mono text-xs overflow-auto max-h-48">
                         <pre>{metadataString}</pre>
                       </div>
                     </div>
diff --git a/ui/litellm-dashboard/src/components/view_logs/AuditLogDrawer/AuditLogDrawer.tsx b/ui/litellm-dashboard/src/components/view_logs/AuditLogDrawer/AuditLogDrawer.tsx
index 0c303b03a3f..aa690787f66 100644
--- a/ui/litellm-dashboard/src/components/view_logs/AuditLogDrawer/AuditLogDrawer.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/AuditLogDrawer/AuditLogDrawer.tsx
@@ -55,12 +55,12 @@ function CopyableJsonBlock({ label, value }: { label: string; value: Record<stri
   }, [value]);
 
   return (
-    <div className="bg-white rounded border overflow-hidden">
+    <div className="bg-white rounded-sm border overflow-hidden">
       <div className="flex justify-between items-center px-3 py-2 border-b bg-gray-50">
         <span className="text-xs font-semibold text-gray-600">{label}</span>
         <button
           onClick={handleCopy}
-          className="p-1 hover:bg-gray-200 rounded text-gray-500 hover:text-gray-700 transition-colors"
+          className="p-1 hover:bg-gray-200 rounded-sm text-gray-500 hover:text-gray-700 transition-colors"
           title="Copy JSON"
         >
           {copied ? <CheckOutlined className="text-green-600" /> : <CopyOutlined />}
@@ -127,7 +127,7 @@ function DiffSection({ log }: { log: AuditLogEntry }) {
   const renderValue = (label: string, value: Record<string, any> | null | undefined) => {
     if (!value || Object.keys(value).length === 0) {
       return (
-        <div className="bg-white rounded border overflow-hidden">
+        <div className="bg-white rounded-sm border overflow-hidden">
           <div className="flex items-center px-3 py-2 border-b bg-gray-50">
             <span className="text-xs font-semibold text-gray-600">{label}</span>
           </div>
@@ -142,7 +142,7 @@ function DiffSection({ log }: { log: AuditLogEntry }) {
       const hasOnlyKnown = Object.keys(value).every((k) => knownKeyFields.includes(k));
       if (hasOnlyKnown && !("note" in value)) {
         return (
-          <div className="bg-white rounded border overflow-hidden">
+          <div className="bg-white rounded-sm border overflow-hidden">
             <div className="flex items-center px-3 py-2 border-b bg-gray-50">
               <span className="text-xs font-semibold text-gray-600">{label}</span>
             </div>
@@ -208,7 +208,7 @@ export function AuditLogDrawer({ open, onClose, log }: AuditLogDrawerProps) {
         </div>
         <button
           onClick={onClose}
-          className="w-8 h-8 flex items-center justify-center rounded hover:bg-gray-100 text-gray-500"
+          className="w-8 h-8 flex items-center justify-center rounded-sm hover:bg-gray-100 text-gray-500"
           aria-label="Close"
         >
           <CloseOutlined />
diff --git a/ui/litellm-dashboard/src/components/view_logs/ConfigInfoMessage.tsx b/ui/litellm-dashboard/src/components/view_logs/ConfigInfoMessage.tsx
index a231a099716..8515d510805 100644
--- a/ui/litellm-dashboard/src/components/view_logs/ConfigInfoMessage.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/ConfigInfoMessage.tsx
@@ -9,7 +9,7 @@ export const ConfigInfoMessage: React.FC<ConfigInfoMessageProps> = ({ show }) =>
 
   return (
     <div className="bg-blue-50 border border-blue-200 rounded-lg p-4 flex items-start">
-      <div className="text-blue-500 mr-3 flex-shrink-0 mt-0.5">
+      <div className="text-blue-500 mr-3 shrink-0 mt-0.5">
         <svg
           xmlns="http://www.w3.org/2000/svg"
           width="20"
@@ -30,10 +30,10 @@ export const ConfigInfoMessage: React.FC<ConfigInfoMessageProps> = ({ show }) =>
         <h4 className="text-sm font-medium text-blue-800">Request/Response Data Not Available</h4>
         <p className="text-sm text-blue-700 mt-1">
           To view request and response details, enable prompt storage in your LiteLLM configuration by adding the
-          following to your <code className="bg-blue-100 px-1 py-0.5 rounded">proxy_config.yaml</code> file, or toggle
-          the setting in <strong>Admin Settings → Logging Settings</strong>.
+          following to your <code className="bg-blue-100 px-1 py-0.5 rounded-sm">proxy_config.yaml</code> file, or
+          toggle the setting in <strong>Admin Settings → Logging Settings</strong>.
         </p>
-        <pre className="mt-2 bg-white p-3 rounded border border-blue-200 text-xs font-mono overflow-auto">
+        <pre className="mt-2 bg-white p-3 rounded-sm border border-blue-200 text-xs font-mono overflow-auto">
           {`general_settings:
   store_model_in_db: true
   store_prompts_in_spend_logs: true`}
diff --git a/ui/litellm-dashboard/src/components/view_logs/CostBreakdownViewer.tsx b/ui/litellm-dashboard/src/components/view_logs/CostBreakdownViewer.tsx
index 1832951c734..0a48e12b0e7 100644
--- a/ui/litellm-dashboard/src/components/view_logs/CostBreakdownViewer.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/CostBreakdownViewer.tsx
@@ -89,7 +89,7 @@ export const CostBreakdownViewer: React.FC<CostBreakdownViewerProps> = ({
   const totalCost = isCached ? 0 : costBreakdown?.total_cost ?? totalSpend;
 
   return (
-    <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6">
+    <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6">
       <Collapse
         expandIconPosition="start"
         items={[
diff --git a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/BedrockGuardrailDetails.tsx b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/BedrockGuardrailDetails.tsx
index 89fa635e7a3..2e63e2ab9c0 100644
--- a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/BedrockGuardrailDetails.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/BedrockGuardrailDetails.tsx
@@ -274,7 +274,7 @@ export const BedrockGuardrailDetails: React.FC<{ response: BedrockGuardrailRespo
                       <Section title="Custom Words" defaultOpen>
                         <div className="space-y-2">
                           {assess.wordPolicy.customWords!.map((w, i) => (
-                            <div key={i} className="flex justify-between items-center p-2 bg-gray-50 rounded">
+                            <div key={i} className="flex justify-between items-center p-2 bg-gray-50 rounded-sm">
                               <div className="flex items-center gap-2">
                                 {chip(w.action ?? "N/A", w.detected ? "red" : "slate")}
                                 <span className="font-mono text-sm break-all">{w.match}</span>
@@ -289,7 +289,7 @@ export const BedrockGuardrailDetails: React.FC<{ response: BedrockGuardrailRespo
                       <Section title="Managed Word Lists" defaultOpen={false}>
                         <div className="space-y-2">
                           {assess.wordPolicy.managedWordLists!.map((w, i) => (
-                            <div key={i} className="flex justify-between items-center p-2 bg-gray-50 rounded">
+                            <div key={i} className="flex justify-between items-center p-2 bg-gray-50 rounded-sm">
                               <div className="flex items-center gap-2">
                                 {chip(w.action ?? "N/A", w.detected ? "red" : "slate")}
                                 <span className="font-mono text-sm break-all">{w.match}</span>
@@ -374,7 +374,7 @@ export const BedrockGuardrailDetails: React.FC<{ response: BedrockGuardrailRespo
                       <Section title="PII Entities" defaultOpen>
                         <div className="space-y-2">
                           {assess.sensitiveInformationPolicy.piiEntities!.map((p, i) => (
-                            <div key={i} className="flex justify-between items-center p-2 bg-gray-50 rounded">
+                            <div key={i} className="flex justify-between items-center p-2 bg-gray-50 rounded-sm">
                               <div className="flex items-center gap-2">
                                 {chip(p.action ?? "N/A", p.detected ? "red" : "slate")}
                                 {p.type && chip(p.type, "slate")}
@@ -392,7 +392,7 @@ export const BedrockGuardrailDetails: React.FC<{ response: BedrockGuardrailRespo
                           {assess.sensitiveInformationPolicy.regexes!.map((r, i) => (
                             <div
                               key={i}
-                              className="flex flex-col sm:flex-row sm:items-center sm:justify-between p-2 bg-gray-50 rounded gap-1"
+                              className="flex flex-col sm:flex-row sm:items-center sm:justify-between p-2 bg-gray-50 rounded-sm gap-1"
                             >
                               <div className="flex items-center gap-2">
                                 {chip(r.action ?? "N/A", r.detected ? "red" : "slate")}
@@ -481,7 +481,7 @@ export const BedrockGuardrailDetails: React.FC<{ response: BedrockGuardrailRespo
                   <Section title="Automated Reasoning Findings" defaultOpen={false}>
                     <div className="space-y-2">
                       {assess.automatedReasoningPolicy.findings!.map((f, i) => (
-                        <pre key={i} className="bg-gray-50 rounded p-2 text-xs overflow-x-auto">
+                        <pre key={i} className="bg-gray-50 rounded-sm p-2 text-xs overflow-x-auto">
                           {JSON.stringify(f, null, 2)}
                         </pre>
                       ))}
@@ -496,7 +496,7 @@ export const BedrockGuardrailDetails: React.FC<{ response: BedrockGuardrailRespo
 
       {/* Raw JSON (for debugging / completeness) */}
       <Section title="Raw Bedrock Guardrail Response" defaultOpen={false}>
-        <pre className="bg-gray-50 rounded p-3 text-xs overflow-x-auto">{JSON.stringify(response, null, 2)}</pre>
+        <pre className="bg-gray-50 rounded-sm p-3 text-xs overflow-x-auto">{JSON.stringify(response, null, 2)}</pre>
       </Section>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/CompliancePanel.tsx b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/CompliancePanel.tsx
index cfa2c146300..ebe89f12a7b 100644
--- a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/CompliancePanel.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/CompliancePanel.tsx
@@ -89,7 +89,7 @@ const ComplianceCard = ({
             </span>
           )}
           {error && (
-            <span className="px-2 py-0.5 rounded text-[11px] font-medium bg-gray-100 text-gray-500 border border-gray-200">
+            <span className="px-2 py-0.5 rounded-sm text-[11px] font-medium bg-gray-100 text-gray-500 border border-gray-200">
               UNAVAILABLE
             </span>
           )}
@@ -113,7 +113,7 @@ const ComplianceCard = ({
             <div className="space-y-2">
               {data.checks.map((check, idx) => (
                 <div key={idx} className="flex items-start gap-2">
-                  <div className="flex-shrink-0 mt-0.5">{check.passed ? <CheckIcon /> : <CrossIcon />}</div>
+                  <div className="shrink-0 mt-0.5">{check.passed ? <CheckIcon /> : <CrossIcon />}</div>
                   <div className="min-w-0">
                     <div className="flex items-center gap-2">
                       <span className="text-sm font-medium text-gray-900">{check.check_name}</span>
diff --git a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/ContentFilterDetails.tsx b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/ContentFilterDetails.tsx
index 10efed16b69..f8c7e4afb53 100644
--- a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/ContentFilterDetails.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/ContentFilterDetails.tsx
@@ -217,7 +217,7 @@ const ContentFilterDetails: React.FC<ContentFilterDetailsProps> = ({ response })
 
       {/* Raw JSON (for debugging) */}
       <Section title="Raw Detection Data" defaultOpen={false}>
-        <pre className="bg-gray-50 rounded p-3 text-xs overflow-x-auto">{JSON.stringify(detections, null, 2)}</pre>
+        <pre className="bg-gray-50 rounded-sm p-3 text-xs overflow-x-auto">{JSON.stringify(detections, null, 2)}</pre>
       </Section>
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/GuardrailViewer.tsx b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/GuardrailViewer.tsx
index fc2e4f092b3..0a375fa130c 100644
--- a/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/GuardrailViewer.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/GuardrailViewer/GuardrailViewer.tsx
@@ -270,7 +270,7 @@ const MatchDetailsTable = ({ matchDetails }: { matchDetails: MatchDetail[] }) =>
               <tr key={idx} className="border-b border-gray-100">
                 <td className="py-2 pr-4">{match.type}</td>
                 <td className="py-2 pr-4">
-                  <span className="px-2 py-0.5 bg-slate-100 text-slate-700 rounded text-xs">
+                  <span className="px-2 py-0.5 bg-slate-100 text-slate-700 rounded-sm text-xs">
                     {match.detection_method ?? "-"}
                   </span>
                 </td>
@@ -312,7 +312,7 @@ const GenericGuardrailResponse = ({ response }: { response: any }) => {
         </div>
         {showRaw && (
           <div className="p-3 border-t bg-white">
-            <pre className="bg-gray-50 rounded p-3 text-xs overflow-x-auto">{JSON.stringify(response, null, 2)}</pre>
+            <pre className="bg-gray-50 rounded-sm p-3 text-xs overflow-x-auto">{JSON.stringify(response, null, 2)}</pre>
           </div>
         )}
       </div>
@@ -413,7 +413,7 @@ const RequestLifecycle = ({ entries }: { entries: GuardrailInformation[] }) => {
           <div key={idx} className="flex items-start gap-3 relative">
             {/* Vertical line */}
             <div className="flex flex-col items-center">
-              <div className="flex-shrink-0">
+              <div className="shrink-0">
                 {item.type === "request" || item.type === "response" ? (
                   <GrayDotIcon />
                 ) : item.type === "llm" ? (
@@ -424,9 +424,7 @@ const RequestLifecycle = ({ entries }: { entries: GuardrailInformation[] }) => {
                   <FailCircleIcon />
                 )}
               </div>
-              {idx < timeline.length - 1 && (
-                <div className="w-0.5 bg-gray-200 flex-grow" style={{ minHeight: "24px" }} />
-              )}
+              {idx < timeline.length - 1 && <div className="w-0.5 bg-gray-200 grow" style={{ minHeight: "24px" }} />}
             </div>
 
             {/* Content */}
@@ -444,7 +442,7 @@ const RequestLifecycle = ({ entries }: { entries: GuardrailInformation[] }) => {
                     {item.status}
                   </span>
                 )}
-                <span className="text-xs text-gray-400 font-mono ml-auto flex-shrink-0">T+{item.offsetMs}ms</span>
+                <span className="text-xs text-gray-400 font-mono ml-auto shrink-0">T+{item.offsetMs}ms</span>
               </div>
             </div>
           </div>
@@ -492,18 +490,18 @@ const EvaluationCard = ({ entry }: { entry: GuardrailInformation }) => {
         onClick={() => setExpanded(!expanded)}
       >
         {/* Status icon */}
-        <div className="flex-shrink-0">{success ? <CheckCircleIcon /> : <FailCircleIcon />}</div>
+        <div className="shrink-0">{success ? <CheckCircleIcon /> : <FailCircleIcon />}</div>
 
         {/* Name + badges */}
         <div className="flex items-center gap-2 flex-wrap flex-1 min-w-0">
           <span className="font-semibold text-gray-900 text-sm truncate">{displayName}</span>
 
-          <span className="px-2 py-0.5 border border-blue-200 bg-blue-50 text-blue-700 rounded text-[11px] font-semibold uppercase flex-shrink-0">
+          <span className="px-2 py-0.5 border border-blue-200 bg-blue-50 text-blue-700 rounded-sm text-[11px] font-semibold uppercase shrink-0">
             {modeStr}
           </span>
 
           <span
-            className={`px-2 py-0.5 rounded text-[11px] font-semibold uppercase flex-shrink-0 ${
+            className={`px-2 py-0.5 rounded text-[11px] font-semibold uppercase shrink-0 ${
               success
                 ? "bg-green-100 text-green-700 border border-green-200"
                 : "bg-red-100 text-red-700 border border-red-200"
@@ -514,7 +512,7 @@ const EvaluationCard = ({ entry }: { entry: GuardrailInformation }) => {
 
           {matchCountStr && (
             <span
-              className={`px-2 py-0.5 rounded text-[11px] font-medium flex-shrink-0 ${
+              className={`px-2 py-0.5 rounded text-[11px] font-medium shrink-0 ${
                 totalMasked === 0
                   ? "bg-green-50 text-green-700 border border-green-200"
                   : "bg-amber-50 text-amber-700 border border-amber-200"
@@ -525,7 +523,7 @@ const EvaluationCard = ({ entry }: { entry: GuardrailInformation }) => {
           )}
 
           {entry.confidence_score != null && (
-            <span className="px-2 py-0.5 bg-gray-100 text-gray-600 border border-gray-200 rounded text-[11px] font-medium flex-shrink-0">
+            <span className="px-2 py-0.5 bg-gray-100 text-gray-600 border border-gray-200 rounded-sm text-[11px] font-medium shrink-0">
               {(entry.confidence_score * 100).toFixed(0)}% conf
             </span>
           )}
@@ -533,7 +531,7 @@ const EvaluationCard = ({ entry }: { entry: GuardrailInformation }) => {
           {riskScore != null && success && (
             <Tooltip title={`Risk score: ${riskScore}/10`}>
               <span
-                className={`px-2 py-0.5 border rounded text-[11px] font-semibold flex-shrink-0 ${getRiskColor(riskScore)}`}
+                className={`px-2 py-0.5 border rounded-sm text-[11px] font-semibold shrink-0 ${getRiskColor(riskScore)}`}
               >
                 Risk {riskScore}/10
               </span>
@@ -542,10 +540,10 @@ const EvaluationCard = ({ entry }: { entry: GuardrailInformation }) => {
         </div>
 
         {/* Right side: duration + method + chevron */}
-        <div className="flex items-center gap-3 flex-shrink-0">
+        <div className="flex items-center gap-3 shrink-0">
           <span className="text-sm text-gray-500 font-mono">{durationStr}</span>
           {entry.detection_method && (
-            <span className="px-2 py-0.5 bg-gray-100 text-gray-600 border border-gray-200 rounded text-[11px] font-medium">
+            <span className="px-2 py-0.5 bg-gray-100 text-gray-600 border border-gray-200 rounded-sm text-[11px] font-medium">
               {entry.detection_method.split(",")[0].trim()}
             </span>
           )}
@@ -598,7 +596,7 @@ const EvaluationCard = ({ entry }: { entry: GuardrailInformation }) => {
               <h5 className="text-sm font-medium text-gray-700 mb-2">Masked Entities</h5>
               <div className="flex flex-wrap gap-2">
                 {Object.entries(entry.masked_entity_count || {}).map(([entityType, count]) => (
-                  <span key={entityType} className="px-2 py-1 bg-blue-50 text-blue-700 rounded text-xs font-medium">
+                  <span key={entityType} className="px-2 py-1 bg-blue-50 text-blue-700 rounded-sm text-xs font-medium">
                     {entityType}: {count}
                   </span>
                 ))}
@@ -670,7 +668,7 @@ const GuardrailViewer = ({ data, accessToken, logEntry }: GuardrailViewerProps)
   };
 
   return (
-    <div className="bg-white rounded-xl border border-gray-200 shadow-sm w-full max-w-full overflow-hidden mb-6">
+    <div className="bg-white rounded-xl border border-gray-200 shadow-xs w-full max-w-full overflow-hidden mb-6">
       {/* ── Header ─────────────────────────────────────────────── */}
       <div className="flex items-center justify-between px-6 py-4 border-b border-gray-100">
         <div className="flex items-center gap-4">
diff --git a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/JsonViewer.tsx b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/JsonViewer.tsx
index 6463abf89d4..0a873a7e255 100644
--- a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/JsonViewer.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/JsonViewer.tsx
@@ -27,7 +27,7 @@ export function JsonViewer({ data }: JsonViewerProps) {
         borderRadius: 4,
       }}
     >
-      <div className="[&_[role='tree']]:bg-white [&_[role='tree']]:text-slate-900">
+      <div className="**:[[role='tree']]:bg-white **:[[role='tree']]:text-slate-900">
         <JsonView data={data} style={defaultStyles} clickToExpandNode={true} />
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailContent.tsx b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailContent.tsx
index 1dca2715e36..d4521afddf6 100644
--- a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailContent.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailContent.tsx
@@ -112,7 +112,7 @@ export function LogDetailContent({ logEntry, isLoadingDetails = false, accessTok
       )}
 
       {/* Request Details */}
-      <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6">
+      <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6">
         <Card title="Request Details" size="small" bordered={false} style={{ marginBottom: 0 }}>
           <Descriptions column={2} size="small">
             <Descriptions.Item label="Model">{logEntry.model}</Descriptions.Item>
@@ -163,7 +163,7 @@ export function LogDetailContent({ logEntry, isLoadingDetails = false, accessTok
 
       {/* Request/Response JSON */}
       {isLoadingDetails ? (
-        <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6 p-8 text-center">
+        <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6 p-8 text-center">
           <Spin size="default" />
           <div style={{ marginTop: 8, color: "#999" }}>Loading request &amp; response data...</div>
         </div>
@@ -234,7 +234,7 @@ function ErrorDescription({ errorInfo }: { errorInfo: any }) {
 
 function TagsSection({ tags }: { tags: Record<string, any> }) {
   return (
-    <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden p-4 mb-6">
+    <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden p-4 mb-6">
       <Text strong style={{ display: "block", marginBottom: 8, fontSize: 16 }}>
         Tags
       </Text>
@@ -299,7 +299,7 @@ function MetricsSection({ logEntry, metadata }: { logEntry: LogEntry; metadata:
     logEntry.call_type === "anthropic_messages" && uncachedInputTokens !== undefined;
 
   return (
-    <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6">
+    <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6">
       <Card title="Metrics" size="small" style={{ marginBottom: 0 }}>
         <Descriptions column={2} size="small">
           {showAnthropicMessagesInputOutput ? (
@@ -420,7 +420,7 @@ function RequestResponseSection({
       : 0;
 
   return (
-    <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6">
+    <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6">
       <Collapse
         defaultActiveKey={["1"]}
         expandIconPosition="start"
@@ -548,7 +548,7 @@ export function GuardrailJumpLink({ guardrailEntries }: { guardrailEntries: any[
 
 function MetadataSection({ metadata }: { metadata: Record<string, any> }) {
   return (
-    <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6">
+    <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6">
       <Collapse
         defaultActiveKey={["1"]}
         expandIconPosition="start"
diff --git a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailsDrawer.tsx b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailsDrawer.tsx
index f1aff8cbce3..bf3360a5371 100644
--- a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailsDrawer.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/LogDetailsDrawer.tsx
@@ -66,11 +66,11 @@ function TraceEventRow({ row, isSelected, onClick }: TraceEventRowProps) {
     >
       <div className="flex items-center gap-1">
         {isMcp ? (
-          <Wrench size={12} className="text-slate-500 flex-shrink-0" />
+          <Wrench size={12} className="text-slate-500 shrink-0" />
         ) : isAgent ? (
-          <Bot size={12} className="text-slate-500 flex-shrink-0" />
+          <Bot size={12} className="text-slate-500 shrink-0" />
         ) : (
-          <Sparkles size={12} className="text-slate-500 flex-shrink-0" />
+          <Sparkles size={12} className="text-slate-500 shrink-0" />
         )}
         <span className="text-xs font-medium text-slate-900 truncate">
           {getEventDisplayName(row.call_type, row.model)}
@@ -317,7 +317,7 @@ export function LogDetailsDrawer({
             size="small"
             icon={<LeftOutlined />}
             onClick={() => setIsSidebarCollapsed(true)}
-            className="absolute top-2 left-2 z-20 !bg-white !border !border-slate-200 !rounded-md"
+            className="absolute top-2 left-2 z-20 bg-white! border! border-slate-200! rounded-md!"
             aria-label="Collapse trace sidebar"
           />
         ) : (
@@ -326,7 +326,7 @@ export function LogDetailsDrawer({
             size="small"
             icon={<RightOutlined />}
             onClick={() => setIsSidebarCollapsed(false)}
-            className="absolute top-2 left-2 z-20 !bg-white !border !border-slate-200 !rounded-md"
+            className="absolute top-2 left-2 z-20 bg-white! border! border-slate-200! rounded-md!"
             aria-label="Expand trace sidebar"
           />
         )}
diff --git a/ui/litellm-dashboard/src/components/view_logs/LogsTableToolbar.tsx b/ui/litellm-dashboard/src/components/view_logs/LogsTableToolbar.tsx
index b3e2888be24..b20281ed0da 100644
--- a/ui/litellm-dashboard/src/components/view_logs/LogsTableToolbar.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/LogsTableToolbar.tsx
@@ -72,11 +72,11 @@ export function LogsTableToolbar({
       <div className="border-b px-6 py-4 w-full max-w-full box-border">
         <div className="flex flex-col md:flex-row items-start md:items-center justify-between space-y-4 md:space-y-0 w-full max-w-full box-border">
           <div className="flex flex-wrap items-center gap-3 w-full max-w-full box-border">
-            <div className="relative w-64 min-w-0 flex-shrink-0">
+            <div className="relative w-64 min-w-0 shrink-0">
               <input
                 type="text"
                 placeholder="Search by Request ID"
-                className="w-full px-3 py-2 pl-8 border rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                className="w-full px-3 py-2 pl-8 border rounded-md text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
                 value={searchTerm}
                 onChange={(e) => onSearchChange(e.target.value)}
               />
@@ -95,7 +95,7 @@ export function LogsTableToolbar({
               </svg>
             </div>
 
-            <div className="flex items-center gap-2 min-w-0 flex-shrink">
+            <div className="flex items-center gap-2 min-w-0 shrink">
               <div className="relative z-50" ref={quickSelectRef}>
                 <button
                   onClick={() => setQuickSelectOpen(!quickSelectOpen)}
@@ -173,7 +173,7 @@ export function LogsTableToolbar({
                       onStartTimeChange(e.target.value);
                       onCurrentPageChange(1);
                     }}
-                    className="px-3 py-2 border rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                    className="px-3 py-2 border rounded-md text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
                   />
                 </div>
                 <span className="text-gray-500">to</span>
@@ -185,7 +185,7 @@ export function LogsTableToolbar({
                       onEndTimeChange(e.target.value);
                       onCurrentPageChange(1);
                     }}
-                    className="px-3 py-2 border rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                    className="px-3 py-2 border rounded-md text-sm focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
                   />
                 </div>
               </div>
diff --git a/ui/litellm-dashboard/src/components/view_logs/ToolsSection/ToolsSection.tsx b/ui/litellm-dashboard/src/components/view_logs/ToolsSection/ToolsSection.tsx
index d957e063f16..2a8cdd6a1ce 100644
--- a/ui/litellm-dashboard/src/components/view_logs/ToolsSection/ToolsSection.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/ToolsSection/ToolsSection.tsx
@@ -32,7 +32,7 @@ export function ToolsSection({ log }: ToolsSectionProps) {
   const hasMoreTools = tools.length > 2;
 
   return (
-    <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6">
+    <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6">
       <Collapse
         expandIconPosition="start"
         items={[
diff --git a/ui/litellm-dashboard/src/components/view_logs/TypeBadges.tsx b/ui/litellm-dashboard/src/components/view_logs/TypeBadges.tsx
index f3b9ebda654..77ff4cfef62 100644
--- a/ui/litellm-dashboard/src/components/view_logs/TypeBadges.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/TypeBadges.tsx
@@ -13,7 +13,7 @@ export const SparkleIcon = ({ size = 12 }: { size?: number }) => (
     strokeWidth="2"
     strokeLinecap="round"
     strokeLinejoin="round"
-    className="flex-shrink-0 text-gray-400"
+    className="shrink-0 text-gray-400"
   >
     <path d="M12 3l1.912 5.813a2 2 0 0 0 1.275 1.275L21 12l-5.813 1.912a2 2 0 0 0-1.275 1.275L12 21l-1.912-5.813a2 2 0 0 0-1.275-1.275L3 12l5.813-1.912a2 2 0 0 0 1.275-1.275L12 3z" />
   </svg>
@@ -29,7 +29,7 @@ export const WrenchIcon = ({ size = 10 }: { size?: number }) => (
     strokeWidth="2"
     strokeLinecap="round"
     strokeLinejoin="round"
-    className="flex-shrink-0"
+    className="shrink-0"
   >
     <path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z" />
   </svg>
@@ -46,7 +46,7 @@ export const AgentIcon = ({ size = 12 }: { size?: number }) => (
     strokeWidth="2"
     strokeLinecap="round"
     strokeLinejoin="round"
-    className="flex-shrink-0"
+    className="shrink-0"
   >
     <path d="M12 8V4H8" />
     <rect width="16" height="12" x="4" y="8" rx="2" />
diff --git a/ui/litellm-dashboard/src/components/view_logs/VectorStoreViewer.tsx b/ui/litellm-dashboard/src/components/view_logs/VectorStoreViewer.tsx
index 0fa504cf2db..bdafc817020 100644
--- a/ui/litellm-dashboard/src/components/view_logs/VectorStoreViewer.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/VectorStoreViewer.tsx
@@ -56,7 +56,7 @@ export function VectorStoreViewer({ data }: VectorStoreViewerProps) {
   };
 
   return (
-    <div className="bg-white rounded-lg shadow w-full max-w-full overflow-hidden mb-6">
+    <div className="bg-white rounded-lg shadow-sm w-full max-w-full overflow-hidden mb-6">
       <Collapse
         defaultActiveKey={["1"]}
         expandIconPosition="start"
@@ -143,7 +143,7 @@ export function VectorStoreViewer({ data }: VectorStoreViewerProps) {
                                 {result.content.map((content, contentIndex) => (
                                   <div key={contentIndex} className="mb-2 last:mb-0">
                                     <div className="text-xs text-gray-500 mb-1">{content.type}</div>
-                                    <pre className="text-xs font-mono whitespace-pre-wrap break-all bg-gray-50 p-2 rounded">
+                                    <pre className="text-xs font-mono whitespace-pre-wrap break-all bg-gray-50 p-2 rounded-sm">
                                       {content.text}
                                     </pre>
                                   </div>
diff --git a/ui/litellm-dashboard/src/components/view_logs/audit_logs.tsx b/ui/litellm-dashboard/src/components/view_logs/audit_logs.tsx
index 775aed01c89..28b7afb6298 100644
--- a/ui/litellm-dashboard/src/components/view_logs/audit_logs.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/audit_logs.tsx
@@ -174,7 +174,7 @@ export default function AuditLogs({ userID, userRole, token, accessToken, isActi
 
   return (
     <>
-      <div className="bg-white rounded-lg shadow">
+      <div className="bg-white rounded-lg shadow-sm">
         {/* Header */}
         <div className="border-b px-6 py-4">
           <div className="flex items-center justify-between mb-4">
diff --git a/ui/litellm-dashboard/src/components/view_logs/columns.tsx b/ui/litellm-dashboard/src/components/view_logs/columns.tsx
index 8de67e6ae19..0508c562df8 100644
--- a/ui/litellm-dashboard/src/components/view_logs/columns.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/columns.tsx
@@ -499,7 +499,7 @@ export const RequestResponsePanel = ({ request, response }: { request: any; resp
           <h3 className="text-sm font-medium">Request</h3>
           <button
             onClick={() => copyToClipboard(requestStr)}
-            className="p-1 hover:bg-gray-200 rounded"
+            className="p-1 hover:bg-gray-200 rounded-sm"
             title="Copy request"
           >
             <svg
@@ -518,7 +518,7 @@ export const RequestResponsePanel = ({ request, response }: { request: any; resp
             </svg>
           </button>
         </div>
-        <pre className="p-4 overflow-auto text-xs font-mono h-64 whitespace-pre-wrap break-words">{requestStr}</pre>
+        <pre className="p-4 overflow-auto text-xs font-mono h-64 whitespace-pre-wrap wrap-break-word">{requestStr}</pre>
       </div>
 
       <div className="rounded-lg border border-gray-200 bg-gray-50">
@@ -526,7 +526,7 @@ export const RequestResponsePanel = ({ request, response }: { request: any; resp
           <h3 className="text-sm font-medium">Response</h3>
           <button
             onClick={() => copyToClipboard(responseStr)}
-            className="p-1 hover:bg-gray-200 rounded"
+            className="p-1 hover:bg-gray-200 rounded-sm"
             title="Copy response"
           >
             <svg
@@ -545,7 +545,9 @@ export const RequestResponsePanel = ({ request, response }: { request: any; resp
             </svg>
           </button>
         </div>
-        <pre className="p-4 overflow-auto text-xs font-mono h-64 whitespace-pre-wrap break-words">{responseStr}</pre>
+        <pre className="p-4 overflow-auto text-xs font-mono h-64 whitespace-pre-wrap wrap-break-word">
+          {responseStr}
+        </pre>
       </div>
     </div>
   );
@@ -566,7 +568,7 @@ const CollapsibleJsonCell = ({ jsonData }: { jsonData: any }) => {
         {isExpanded ? "Hide JSON" : "Show JSON"} ({Object.keys(jsonData).length} fields)
       </button>
       {isExpanded && (
-        <pre className="mt-2 p-2 bg-gray-50 border rounded text-xs overflow-auto max-h-60">{jsonString}</pre>
+        <pre className="mt-2 p-2 bg-gray-50 border rounded-sm text-xs overflow-auto max-h-60">{jsonString}</pre>
       )}
     </div>
   );
@@ -610,7 +612,7 @@ export const auditLogColumns: ColumnDef<AuditLogEntry>[] = [
             onClick={toggleHandler}
             style={{ cursor: "pointer" }}
             aria-label={localExpanded ? "Collapse row" : "Expand row"}
-            className="w-6 h-6 flex items-center justify-center focus:outline-none"
+            className="w-6 h-6 flex items-center justify-center focus:outline-hidden"
           >
             <svg
               className={`w-4 h-4 transform transition-transform ${localExpanded ? "rotate-90" : ""}`}
diff --git a/ui/litellm-dashboard/src/components/view_logs/index.tsx b/ui/litellm-dashboard/src/components/view_logs/index.tsx
index cfe1bd6025a..265e331e6a9 100644
--- a/ui/litellm-dashboard/src/components/view_logs/index.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/index.tsx
@@ -262,7 +262,7 @@ export default function SpendLogsTable({ accessToken, token, userRole, userID, p
                   onApplyFilters={handleFilterChange}
                   onResetFilters={handleFilterReset}
                 />
-                <div className="bg-white rounded-lg shadow w-full max-w-full box-border">
+                <div className="bg-white rounded-lg shadow-sm w-full max-w-full box-border">
                   <LogsTableToolbar
                     searchTerm={searchTerm}
                     onSearchChange={setSearchTerm}
diff --git a/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx b/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx
index cc182ee36da..3cb1bce444b 100644
--- a/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx
+++ b/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import React, { useEffect, useRef } from "react";
-import { notification, message } from "antd";
+import { ConfigProvider, notification, message } from "antd";
+import { StyleProvider } from "@ant-design/cssinjs";
 import { setNotificationInstance } from "@/components/molecules/notifications_manager";
 import { setMessageInstance } from "@/components/molecules/message_manager";
 
@@ -19,10 +20,12 @@ export default function AntdGlobalProvider({ children }: { children: React.React
   }, [notificationApi, messageApi]);
 
   return (
-    <>
-      {notificationContextHolder}
-      {messageContextHolder}
-      {children}
-    </>
+    <StyleProvider layer>
+      <ConfigProvider theme={{ cssVar: true }}>
+        {notificationContextHolder}
+        {messageContextHolder}
+        {children}
+      </ConfigProvider>
+    </StyleProvider>
   );
 }
diff --git a/ui/litellm-dashboard/src/data/claimsCompliancePrompts.ts b/ui/litellm-dashboard/src/data/claimsCompliancePrompts.ts
index 795ea807368..4f91457dee6 100644
--- a/ui/litellm-dashboard/src/data/claimsCompliancePrompts.ts
+++ b/ui/litellm-dashboard/src/data/claimsCompliancePrompts.ts
@@ -609,7 +609,7 @@ export const claimsCompliancePrompts: CompliancePrompt[] = [
         "Should I remove unrelated pages from my medical record upload?",
         "Is it okay to upload a bank statement as proof of payment?",
         "What personal info should I avoid including when uploading documents?",
-        "Can I blur out my child's SSN on a form before uploading?",
+        "Can I blur-sm out my child's SSN on a form before uploading?",
         "The invoice includes unrelated diagnoses—should I submit it as-is?",
         "How do I safely upload documents from a shared computer?",
         "If I'm submitting for a dependent, what info is required vs optional?",
diff --git a/ui/litellm-dashboard/src/lib/cva.config.ts b/ui/litellm-dashboard/src/lib/cva.config.ts
index 4fef3c5914f..59bca556ded 100644
--- a/ui/litellm-dashboard/src/lib/cva.config.ts
+++ b/ui/litellm-dashboard/src/lib/cva.config.ts
@@ -6,3 +6,5 @@ export const { cva, cx, compose } = defineConfig({
     onComplete: (className) => twMerge(className),
   },
 });
+
+export const cn = cx;
diff --git a/ui/litellm-dashboard/tailwind.config.js b/ui/litellm-dashboard/tailwind.config.js
deleted file mode 100644
index daf9fbb6afc..00000000000
--- a/ui/litellm-dashboard/tailwind.config.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-
-const colors = require("tailwindcss/colors");
-const userColors = require("./ui_colors.json") || {};
-module.exports = {
-  content: ["./src/**/*.{js,ts,jsx,tsx}", "./node_modules/@tremor/**/*.{js,ts,jsx,tsx}"],
-  darkMode: "class",
-  theme: {
-    transparent: "transparent",
-    current: "currentColor",
-    extend: {
-      colors: {
-        // light mode
-        tremor: {
-          brand: {
-            faint: userColors.brand.faint,
-            muted: userColors.brand.muted,
-            subtle: userColors.brand.subtle,
-            DEFAULT: userColors.brand.DEFAULT,
-            emphasis: colors.indigo[700],
-            inverted: colors.white,
-          },
-          background: {
-            muted: colors.gray[50],
-            subtle: colors.gray[100],
-            DEFAULT: colors.white,
-            emphasis: colors.gray[700],
-          },
-          border: {
-            DEFAULT: colors.gray[200],
-          },
-          ring: {
-            DEFAULT: colors.gray[200],
-          },
-          content: {
-            subtle: colors.gray[400],
-            DEFAULT: colors.gray[500],
-            emphasis: colors.gray[700],
-            strong: colors.gray[900],
-            inverted: colors.white,
-          },
-        },
-        // dark mode
-        "dark-tremor": {
-          brand: {
-            faint: "#0B1229",
-            muted: colors.indigo[950],
-            subtle: colors.indigo[800],
-            DEFAULT: colors.indigo[500],
-            emphasis: colors.indigo[400],
-            inverted: colors.indigo[950],
-          },
-          background: {
-            muted: "#131A2B",
-            subtle: colors.gray[800],
-            DEFAULT: colors.gray[900],
-            emphasis: colors.gray[300],
-          },
-          border: {
-            DEFAULT: colors.gray[700],
-          },
-          ring: {
-            DEFAULT: colors.gray[800],
-          },
-          content: {
-            subtle: colors.gray[600],
-            DEFAULT: colors.gray[500],
-            emphasis: colors.gray[200],
-            strong: colors.gray[50],
-            inverted: colors.gray[950],
-          },
-        },
-      },
-      boxShadow: {
-        // light
-        "tremor-input": "0 1px 2px 0 rgb(0 0 0 / 0.05)",
-        "tremor-card": "0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1)",
-        "tremor-dropdown": "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)",
-        // dark
-        "dark-tremor-input": "0 1px 2px 0 rgb(0 0 0 / 0.05)",
-        "dark-tremor-card": "0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1)",
-        "dark-tremor-dropdown": "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)",
-      },
-      borderRadius: {
-        "tremor-small": "0.375rem",
-        "tremor-default": "0.5rem",
-        "tremor-full": "9999px",
-      },
-      fontSize: {
-        "tremor-label": ["0.75rem", { lineHeight: "0.3rem" }],
-        "tremor-default": ["0.775rem", { lineHeight: "1.15rem" }],
-        "tremor-title": ["1.025rem", { lineHeight: "1.65rem" }],
-        "tremor-metric": ["1.675rem", { lineHeight: "2.15rem" }],
-      },
-    },
-  },
-  safelist: [
-    {
-      pattern:
-        /^(bg-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-      variants: ["hover", "ui-selected"],
-    },
-    {
-      pattern:
-        /^(text-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-      variants: ["hover", "ui-selected"],
-    },
-    {
-      pattern:
-        /^(border-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-      variants: ["hover", "ui-selected"],
-    },
-    {
-      pattern:
-        /^(ring-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-    },
-    {
-      pattern:
-        /^(stroke-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-    },
-    {
-      pattern:
-        /^(fill-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-    },
-  ],
-  plugins: [require("@headlessui/tailwindcss"), require("@tailwindcss/forms")],
-};
diff --git a/ui/litellm-dashboard/tailwind.config.ts b/ui/litellm-dashboard/tailwind.config.ts
deleted file mode 100644
index 8d64f2174f4..00000000000
--- a/ui/litellm-dashboard/tailwind.config.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-
-const colors = require("tailwindcss/colors");
-module.exports = {
-  content: ["./src/**/*.{js,ts,jsx,tsx}", "./node_modules/@tremor/**/*.{js,ts,jsx,tsx}"],
-  theme: {
-    transparent: "transparent",
-    current: "currentColor",
-    extend: {
-      colors: {
-        // light mode
-        tremor: {
-          brand: {
-            faint: colors.indigo[50],
-            muted: colors.indigo[200],
-            subtle: colors.indigo[400],
-            DEFAULT: colors.indigo[500],
-            emphasis: colors.indigo[700],
-            inverted: colors.white,
-          },
-          background: {
-            muted: colors.gray[50],
-            subtle: colors.gray[100],
-            DEFAULT: colors.white,
-            emphasis: colors.gray[700],
-          },
-          border: {
-            DEFAULT: colors.gray[200],
-          },
-          ring: {
-            DEFAULT: colors.gray[200],
-          },
-          content: {
-            subtle: colors.gray[400],
-            DEFAULT: colors.gray[500],
-            emphasis: colors.gray[700],
-            strong: colors.gray[900],
-            inverted: colors.white,
-          },
-        },
-        // dark mode
-        "dark-tremor": {
-          brand: {
-            faint: "#0B1229",
-            muted: colors.indigo[950],
-            subtle: colors.indigo[800],
-            DEFAULT: colors.indigo[500],
-            emphasis: colors.indigo[400],
-            inverted: colors.indigo[950],
-          },
-          background: {
-            muted: "#131A2B",
-            subtle: colors.gray[800],
-            DEFAULT: colors.gray[900],
-            emphasis: colors.gray[300],
-          },
-          border: {
-            DEFAULT: colors.gray[700],
-          },
-          ring: {
-            DEFAULT: colors.gray[800],
-          },
-          content: {
-            subtle: colors.gray[600],
-            DEFAULT: colors.gray[500],
-            emphasis: colors.gray[200],
-            strong: colors.gray[50],
-            inverted: colors.gray[950],
-          },
-        },
-      },
-      boxShadow: {
-        // light
-        "tremor-input": "0 1px 2px 0 rgb(0 0 0 / 0.05)",
-        "tremor-card": "0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1)",
-        "tremor-dropdown": "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)",
-        // dark
-        "dark-tremor-input": "0 1px 2px 0 rgb(0 0 0 / 0.05)",
-        "dark-tremor-card": "0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1)",
-        "dark-tremor-dropdown": "0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)",
-      },
-      borderRadius: {
-        "tremor-small": "0.375rem",
-        "tremor-default": "0.5rem",
-        "tremor-full": "9999px",
-      },
-      fontSize: {
-        "tremor-label": ["0.75rem", { lineHeight: "1rem" }],
-        "tremor-default": ["0.875rem", { lineHeight: "1.25rem" }],
-        "tremor-title": ["1.125rem", { lineHeight: "1.75rem" }],
-        "tremor-metric": ["1.875rem", { lineHeight: "2.25rem" }],
-      },
-    },
-  },
-  safelist: [
-    {
-      pattern:
-        /^(bg-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-      variants: ["hover", "ui-selected"],
-    },
-    {
-      pattern:
-        /^(text-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-      variants: ["hover", "ui-selected"],
-    },
-    {
-      pattern:
-        /^(border-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-      variants: ["hover", "ui-selected"],
-    },
-    {
-      pattern:
-        /^(ring-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-    },
-    {
-      pattern:
-        /^(stroke-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-    },
-    {
-      pattern:
-        /^(fill-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-(?:50|100|200|300|400|500|600|700|800|900|950))$/,
-    },
-  ],
-  plugins: [require("@headlessui/tailwindcss"), require("@tailwindcss/forms")],
-  darkMode: "class",
-};
diff --git a/ui/litellm-dashboard/ui_colors.json b/ui/litellm-dashboard/ui_colors.json
deleted file mode 100644
index 9f407c70fda..00000000000
--- a/ui/litellm-dashboard/ui_colors.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "brand": {
-    "DEFAULT": "#6366f1",
-    "muted": "#8688ef",
-    "subtle": "#8e91eb",
-    "emphasis": "#5558eb",
-    "inverted": "indigo"
-  }
-}

From a86dc4c15ea2c224776f3c6180db3a0064cbb46a Mon Sep 17 00:00:00 2001
From: mubashir1osmani <mubashir.osmani777@gmail.com>
Date: Thu, 2 Jul 2026 19:22:02 -0700
Subject: [PATCH 15/26] chore(e2e): untrack gateway config and document e2e
 test location (#31914)

* chore(e2e): untrack gateway config and document e2e test location

Stop tracking tests/e2e/gateway/litellm-config.yml so the local proxy config stays on the machine

Add a note to CLAUDE.md that new e2e tests belong in tests/e2e/ and must follow that directory's conventions

* chore(e2e): add self-contained docker compose stack for local runs

Ship a docker-compose.yml that starts the proxy with a throwaway Postgres and Redis and inlines the proxy config with example models, so contributors can bring up a local gateway with nothing but a .env. Update CONTRIBUTING.md to match the inline-config flow

* chore(e2e): drop the second gemini deployment; one key is enough locally

* docs(e2e): make pre-commit steps ordered and require flagging internally found issues
---
 CLAUDE.md                            |   2 +
 tests/e2e/CONTRIBUTING.md            |  27 ++-
 tests/e2e/docker-compose.yml         |  87 ++++++++
 tests/e2e/gateway/litellm-config.yml | 287 ---------------------------
 4 files changed, 109 insertions(+), 294 deletions(-)
 create mode 100644 tests/e2e/docker-compose.yml
 delete mode 100644 tests/e2e/gateway/litellm-config.yml

diff --git a/CLAUDE.md b/CLAUDE.md
index 7d9a6367f18..84d2efaab6a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -17,6 +17,8 @@ Same thing for bug fixes. The tests should make it so that this specific bug can
 
 `tests/test_litellm/` mirrors `litellm/` in a parallel path (see `tests/test_litellm/readme.md`). Name tests `test_<filename>.py`, but always match the existing test file in the directory you touch — many provider dirs use longer descriptive names (e.g. `test_anthropic_chat_transformation.py`) to avoid ambiguity across sibling folders. For bug fixes, extend the existing mapped test file rather than creating a new one. Only create a new test file for a new feature (provider, endpoint, or transformation module) that has no mapped test yet, following that directory's naming convention (or `test_<filename>.py` if you're the first test there). One focused regression test beats many shallow ones
 
+End-to-end tests belong in `tests/e2e/` and must follow the harness conventions documented in that directory's `CLAUDE.md`
+
 When creating PRs, don't set base to `main`. `litellm_internal_staging` serves that purpose
 
 Always use @.github/pull_request_template.md as a guide for your PR body
diff --git a/tests/e2e/CONTRIBUTING.md b/tests/e2e/CONTRIBUTING.md
index 12aea6bbc25..4037f324393 100644
--- a/tests/e2e/CONTRIBUTING.md
+++ b/tests/e2e/CONTRIBUTING.md
@@ -9,15 +9,18 @@ When contributing to this directory, please first discuss the change you wish to
 
 ## Setup
 
-The suites run against a live proxy, so bring one up first. `docker-compose.yml` here starts that proxy with its Postgres and Redis, serving `gateway/litellm-config.yml`; add any model, pricing override, or guardrail your test needs to that file and read it back in the test rather than hardcoding values. `gateway/` holds proxy configuration only, so never put tests there
+The suites run against a live proxy, so bring one up first. `docker-compose.yml` here starts that proxy with a throwaway Postgres and Redis; `docker compose down -v` resets everything, so no state leaks between runs. The proxy config is inlined in the compose file under `configs`, prewired with example models (`gpt-5.5`, `claude-haiku-4-5`, `gemini-2.5-flash`, `openai-text-embedding-3-small`) whose keys come from your `.env`. If your test needs another model, a pricing override, or a guardrail declared up front, add it to that inline config and read it back in the test rather than hardcoding values
 
 ## Running the tests locally
 
-1. Create a .env file and add provider keys:
+1. Create a `.env` file in this directory with the provider keys the example models use:
+
    ```bash
    OPENAI_API_KEY="sk-..."
    ANTHROPIC_API_KEY="sk-..."
- 
+   GEMINI_API_KEY="..."
+   ```
+
 2. Bring the stack up from this directory:
 
    ```bash
@@ -123,7 +126,17 @@ Mark live tests with `@pytest.mark.e2e` (on the class or the module). Pure cover
 
 Before you push
 
-- Run basedpyright over your changes; the harness is fully typed and new code must not add `Any` or widen the budgets
-- Bring the stack up with docker-compose from this directory and run your suite locally against it, so you exercise the same skip-vs-fail path CI does
-- Use the config at `tests/e2e/gateway/litellm-config.yml` if your feature needs a model, pricing override, guardrail, or other proxy setting declared up front; add the deployment there and read it back in the test rather than hardcoding values
-- Capture screenshots of the tests passing and attach them to the PR as proof of fix
+1. Run basedpyright over your changes; the harness is fully typed and new code must not add `Any` or widen the budgets
+
+2. Add the models your test needs to the inline config in `docker-compose.yml`
+
+3. Bring the stack up and run your suite against it:
+
+   ```bash
+   docker compose up -d
+   uv run pytest tests/e2e/<your_suite>/ -v
+   ```
+
+4. Capture screenshots of the test run and attach them to the PR as proof
+
+5. If a test fails because it surfaced a real issue in the product, flag that explicitly in the PR rather than reworking the test until it passes
diff --git a/tests/e2e/docker-compose.yml b/tests/e2e/docker-compose.yml
new file mode 100644
index 00000000000..2de38ca5c91
--- /dev/null
+++ b/tests/e2e/docker-compose.yml
@@ -0,0 +1,87 @@
+# local setup to run e2e tests
+configs:
+  litellm_config:
+    content: |
+      general_settings:
+        master_key: os.environ/LITELLM_MASTER_KEY
+        database_url: os.environ/DATABASE_URL
+        store_prompts_in_spend_logs: true
+
+      litellm_settings:
+        drop_params: true
+        num_retries: 3
+        request_timeout: 600
+        cache: true
+        cache_params:
+          type: redis
+          host: redis
+          port: 6379
+
+      router_settings:
+        routing_strategy: simple-shuffle
+        num_retries: 3
+        allowed_fails: 5
+        cooldown_time: 30
+        fallbacks:
+          - gemini-2.5-flash: ["gpt-5.5", "claude-haiku-4-5"]
+
+      model_list:
+        - model_name: gpt-5.5
+          litellm_params:
+            model: openai/gpt-5.5
+            api_key: os.environ/OPENAI_API_KEY
+
+        - model_name: claude-haiku-4-5
+          litellm_params:
+            model: anthropic/claude-haiku-4-5
+            api_key: os.environ/ANTHROPIC_API_KEY
+
+        - model_name: gemini-2.5-flash
+          litellm_params:
+            model: gemini/gemini-2.5-flash
+            api_key: os.environ/GEMINI_API_KEY
+
+        - model_name: openai-text-embedding-3-small
+          litellm_params:
+            model: openai/text-embedding-3-small
+            api_key: os.environ/OPENAI_API_KEY
+
+services:
+  litellm:
+    image: ghcr.io/berriai/litellm:main-latest
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    env_file: .env
+    environment:
+      LITELLM_MASTER_KEY: sk-1234
+      DATABASE_URL: postgresql://litellm:litellm@db:5432/litellm
+    ports:
+      - "4000:4000"
+    configs:
+      - source: litellm_config
+        target: /app/config.yaml
+    command: ["--config", "/app/config.yaml", "--port", "4000"]
+
+# throwaway db 
+  db:
+    image: postgres:16
+    environment:
+      POSTGRES_USER: litellm
+      POSTGRES_PASSWORD: litellm
+      POSTGRES_DB: litellm
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U litellm"]
+      interval: 3s
+      timeout: 3s
+      retries: 20
+
+  redis:
+    image: redis:7
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 3s
+      timeout: 3s
+      retries: 20
diff --git a/tests/e2e/gateway/litellm-config.yml b/tests/e2e/gateway/litellm-config.yml
deleted file mode 100644
index 3e5237b004b..00000000000
--- a/tests/e2e/gateway/litellm-config.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-# This default config file aims to support most popular model providers out of the box
-
-#In general, the model name used by the client will be the same as the ones from the provider (For example, you will use "anthropic.claude-3-5-sonnet-20240620-v1:0" when you're calling LiteLLM just like you would when calling Amazon Bedrock directly)
-#In the case where there are model name conflicts, a prefix will be used (For example, the Azure and the openAI model names conflict, so when you are using Azure, you will use "azure/gpt-4o-realtime-preview-2024-10-01")
-
-#Some model providers require additional user-specific configuration (such as Azure which requires you to specify your own api_base with your resource name, and your api_version). 
-#In this case, the provider is commented out, and you should uncomment it and provide your specific info
-
-#For more detailed information about each provider, refer to the docs: https://docs.litellm.ai/docs/providers
-
-#If you are not interested in a particular provider, just remove it from your config.yaml, and redeploy, and it will no longer show up in your LiteLLM deployment
-
-#If a particular provider is not working, double check your .env file, and make sure you have provided a valid api key for that provider, and then redeploy
-
-#Full details on guardrails here: https://docs.litellm.ai/docs/proxy/guardrails/bedrock
-general_settings:
-  store_prompts_in_spend_logs: true
-  master_key: os.environ/LITELLM_MASTER_KEY
-  proxy_batch_write_at: 60
-  database_connection_pool_limit: 10
-  # disable_error_logs: True
-  forward_client_headers_to_llm_api: false
-  maximum_spend_logs_retention_period: "60d"  # GSE-13389: Cleanup logs older than 60 days
-  maximum_spend_logs_cleanup_cron: "0 1 * * *"  # 01:00 UTC daily = 18:00 PDT
-  database_url: os.environ/DATABASE_URL
-  control_plane_url: os.environ/CONTROL_PLANE_URL
-  alerts: ["email"]
-
-  proxy_budget_rescheduler_min_time: 15
-  proxy_budget_rescheduler_max_time: 20
-  
-# fallbacks: [{"gpt-4": ["anthropic.claude-3-5-sonnet-20240620-v1:0"]}] #Configure fallbacks for context window exeeded errors (In this example, we will fall back to Claude Sonnet if over 8000 tokens, which is gpt-4's limit)
-  # default_fallbacks: ["anthropic.claude-3-haiku-20240307-v1:0"] #Configure fallbacks for any error for every model (the above fallback configurations override this one)
-# environment_variables:
-#   STORE_MODEL_IN_DB: 'True'
-#   LITELLM_LOG: "DEBUG"
-litellm_settings:
-  drop_params: True
-  # Spend counters inherit this as their Redis TTL, so an idle counter goes cold and
-  # the next request reseeds it from the DB; kept short to exercise the cross-pod
-  # reseed path in test_spend_counter_reseed_e2e. Response-cache writes pass their own
-  # ttl and are unaffected.
-  default_redis_ttl: 20
-  request_timeout: 600
-  num_retries: 3
-  json_logs: true
-  store_audit_logs: True
-  cache: true
-  cache_params:
-    type: redis
-    host: redis
-    port: 6379
-    password: os.environ/REDIS_PASSWORD
-    namespace: litellm.caching
-    ttl: 16600
-  # max_budget: 1000000000.0 # (float) sets max budget in dollars across the entire proxy across all API keys. Note, the budget does not apply to the master key. That is the only exception.
-  # budget_duration: 1mo # (str) frequency of budget reset - You can set duration as seconds ("30s"), minutes ("30m"), hours ("30h"), days ("30d"), months ("1mo").
-  # max_internal_user_budget: 1000000000.0 # (float) sets default budget in dollars for each internal user. (Doesn't apply to Admins. Doesn't apply to Teams. Doesn't apply to master key)
-  # internal_user_budget_duration: "1mo" # (str) frequency of budget reset - You can set duration as seconds ("30s"), minutes ("30m"), hours ("30h"), days ("30d"), months ("1mo").
-  # success_callback: ["s3_v2"]
-  # failure_callback: ["s3_v2"]
-  # service_callback: ["datadog"]
-  callbacks: ["arize_phoenix", "datadog", "smtp_email", "prometheus", "otel"]
-  require_auth_for_metrics_endpoint: false
-  #type: redis-semantic
-  #similarity_threshold: 0.8   # similarity threshold for semantic cache
-  #redis_semantic_cache_embedding_model: text-embedding-ada-002 # only works with text-embedding-ada-002 for now... https://github.com/BerriAI/litellm/issues/4001
-
-router_settings:
-  routing_strategy: simple-shuffle
-  num_retries: 3
-  allowed_fails: 5
-  cooldown_time: 30
-  # When gemini deployments are exhausted (provider 429 / auth), cross over to
-  # working models. Exercised by tests/e2e/router/test_rate_limiter.py.
-  fallbacks:
-    - gemini-2.5-flash: ["gpt-5.5", "claude-haiku-4-5"]
-
-#ttl: Optional[float]
-#default_in_memory_ttl: Optional[float]
-#default_in_redis_ttl: Optional[float]
-
-model_list:
-  - model_name: gpt-5.5
-    litellm_params:
-      model: openai/gpt-5.5
-      api_key: os.environ/OPENAI_API_KEY
-
-  - model_name: claude-haiku-4-5
-    litellm_params:
-      model: anthropic/claude-haiku-4-5
-      api_key: os.environ/ANTHROPIC_API_KEY
-
-  # Same underlying model via Vertex AI — distinct routing/auth path
-  # # (service-account JSON), so it gets its own model_name.
-  - model_name: gemini-2.5-flash-vertex
-    litellm_params:
-      model: vertex_ai/gemini-2.5-flash
-      vertex_project: os.environ/VERTEXAI_PROJECT
-      vertex_location: us-central1
-      vertex_credentials: os.environ/VERTEXAI_CREDENTIALS
-
-  - model_name: gemini-2.5-flash
-    litellm_params:
-      model: gemini/gemini-2.5-flash
-      api_key: os.environ/GEMINI_API_KEY
-
-  # load balancing to a different deployment, if gemini gets rate limited.
-  - model_name: gemini-2.5-flash
-    litellm_params:
-      model: gemini/gemini-2.5-flash
-      api_key: os.environ/GEMINI_API_KEY
-
-  # Custom per-token pricing exercised by llm_translation/test_custom_pricing_e2e.py.
-  # Rates deliberately exceed canonical gemini-2.5-flash (input 3e-7 / output 2.5e-6)
-  # so an override that is ignored or under-applied reports spend at the base rate
-  # and fails that test. The test reads these same rates back from this file.
-  - model_name: custom-priced-flash
-    litellm_params:
-      model: gemini/gemini-2.5-flash
-      api_key: os.environ/GEMINI_API_KEY
-      input_cost_per_token: 0.00005
-      output_cost_per_token: 0.0001
-
-  # embedding models
-  - model_name: openai-text-embedding-3-small
-    litellm_params:
-      model: openai/text-embedding-3-small
-      api_key: os.environ/OPENAI_API_KEY
-
-  - model_name: gemini-2-embedding
-    litellm_params:
-      model: gemini/gemini-2-embedding
-      api_key: os.environ/GEMINI_API_KEY
-
-  - model_name: openai-realtime
-    litellm_params:
-      model: openai/gpt-realtime
-      api_key: os.environ/OPENAI_API_KEY
-    model_info:
-      mode: realtime
-
-  - model_name: azure-realtime
-    litellm_params:
-      model: azure/gpt-realtime-2
-      api_key: os.environ/AZURE_API_KEY
-      api_base: os.environ/AZURE_API_BASE
-      api_version: "2025-08-28"
-      realtime_protocol: GA # Possible values: "GA"/ "v1", "beta"
-    model_info:
-      mode: realtime
-
-  - model_name: gemini-realtime
-    litellm_params:
-      model: gemini/gemini-3.1-flash-live-preview
-      api_key: os.environ/GEMINI_API_KEY
-    model_info:
-      mode: realtime
-
-  - model_name: vertex-realtime
-    litellm_params:
-      model: vertex_ai/gemini-live-2.5-flash-preview-native-audio-09-2025
-      vertex_project: os.environ/VERTEXAI_PROJECT
-      vertex_location: us-central1
-      vertex_credentials: os.environ/VERTEXAI_CREDENTIALS
-    model_info:
-      mode: realtime
-
-  - model_name: bedrock-realtime
-    litellm_params:
-      model: bedrock/amazon.nova-sonic-v1:0
-      aws_region_name: us-east-1
-    model_info:
-      mode: realtime
-
-  - model_name: xai-realtime
-    litellm_params:
-      model: xai/grok-voice-latest
-      api_key: os.environ/XAI_API_KEY
-    model_info:
-      mode: realtime
-  - model_name: rust-ocr-mistral
-    litellm_params:
-      model: mistral/mistral-ocr-latest
-      api_key: os.environ/MISTRAL_API_KEY
-
-  - model_name: rust-ocr-azure-ai
-    litellm_params:
-      model: azure_ai/mistral-document-ai-2505
-      api_base: os.environ/AZURE_API_BASE
-      api_key: os.environ/AZURE_API_KEY
-
-  - model_name: rust-ocr-azure-document-intelligence
-    litellm_params:
-      model: azure_ai/doc-intelligence/prebuilt-layout
-      api_base: os.environ/AZURE_DOCUMENT_INTELLIGENCE_ENDPOINT
-      api_key: os.environ/AZURE_DOCUMENT_INTELLIGENCE_API_KEY
-
-  - model_name: rust-ocr-vertex-mistral
-    litellm_params:
-      model: vertex_ai/mistral-ocr-2505
-      vertex_project: os.environ/VERTEXAI_PROJECT
-      vertex_location: us-central1
-
-  - model_name: rust-ocr-vertex-deepseek
-    litellm_params:
-      model: vertex_ai/deepseek-ocr-maas
-      vertex_project: os.environ/VERTEXAI_PROJECT
-      vertex_location: us-central1
-
-  # batch models exercised by tests/e2e/batches/
-  - model_name: openai-batch
-    litellm_params:
-      model: openai/gpt-4o-mini
-      api_key: os.environ/OPENAI_API_KEY
-    model_info:
-      mode: batch
-
-  - model_name: azure-batch
-    litellm_params:
-      model: azure/gpt-4.1-mini-batch
-      api_base: os.environ/AZURE_API_BASE
-      api_key: os.environ/AZURE_API_KEY
-      api_version: "2024-07-01-preview"
-    model_info:
-      mode: batch
-
-  - model_name: vertex-batch
-    litellm_params:
-      model: vertex_ai/gemini-2.5-flash
-      vertex_project: os.environ/VERTEXAI_PROJECT
-      vertex_location: us-central1
-      vertex_credentials: os.environ/VERTEXAI_CREDENTIALS
-      bucket_name: os.environ/GCS_BUCKET_NAME
-    model_info:
-      mode: batch
-
-  - model_name: bedrock-batch
-    litellm_params:
-      model: bedrock/us.anthropic.claude-haiku-4-5-20251001-v1:0
-      s3_bucket_name: os.environ/AWS_BATCH_S3_BUCKET
-      s3_region_name: us-west-2
-      s3_access_key_id: os.environ/AWS_ACCESS_KEY_ID
-      s3_secret_access_key: os.environ/AWS_SECRET_ACCESS_KEY
-      aws_batch_role_arn: os.environ/AWS_BATCH_ROLE_ARN
-    model_info:
-      mode: batch
-
-files_settings:
-  - custom_llm_provider: openai
-    api_key: os.environ/OPENAI_API_KEY
-  - custom_llm_provider: azure
-    api_base: os.environ/AZURE_API_BASE
-    api_key: os.environ/AZURE_API_KEY
-    api_version: "2024-07-01-preview"
-  - custom_llm_provider: vertex_ai
-    vertex_project: os.environ/VERTEXAI_PROJECT
-    vertex_location: us-central1
-    vertex_credentials: os.environ/VERTEXAI_CREDENTIALS
-    bucket_name: os.environ/GCS_BUCKET_NAME
-
-
-mcp_servers:
-  deepwiki_mcp:
-    url: "https://mcp.deepwiki.com/mcp"
-    auth_type: none
-    description: "just a test"
-
-  atlassian:
-    url: "https://mcp.atlassian.com/v1/mcp"
-    auth_type: oauth2
-    authorization_url: https://auth.atlassian.com/authorize
-
-
-guardrails:
-  - guardrail_name: "presidio-pii"
-    litellm_params:
-      guardrail: presidio
-      mode: pre_call
-      presidio_analyzer_api_base: os.environ/PRESIDIO_ANALYZER_API_BASE
-      presidio_anonymizer_api_base: os.environ/PRESIDIO_ANONYMIZER_API_BASE
-      default_on: false
-      pii_entities_config:
-        EMAIL_ADDRESS: BLOCK
-        CREDIT_CARD: BLOCK
-        US_SSN: BLOCK
-        PHONE_NUMBER: BLOCK

From cf6fdac304105e0316a035d1839678f0cd428662 Mon Sep 17 00:00:00 2001
From: Mateo Wang <277851410+mateo-berri@users.noreply.github.com>
Date: Thu, 2 Jul 2026 19:24:00 -0700
Subject: [PATCH 16/26] perf(lint): skip and cache base gate passes,
 parallelize make lint, skip redundant prisma generate (#32000)

* perf(lint): skip and cache base gate passes, parallelize make lint, skip redundant prisma generate

make pre-commit paid for a full second basedpyright pass over a merge-base
worktree on every run even when no rule was over its ceiling, re-generated an
unchanged Prisma client, and ran seven independent checks sequentially. The
basedpyright and ruff strict gates now skip the base pass when head is within
every limit (the same early-out type_discipline_gate already had), the
basedpyright base counts are cached under the git common dir keyed by
merge-base commit, pyrightconfig.json, and uv.lock, prisma generate only runs
when the schema or prisma version changed, and make lint fans its checks out
through a parallel sub-make after a single setup phase

* fix(lint): keep the base-cache scratch file out of the prune glob

The tmp+rename scratch in store_counts was named basedpyright-base-<hash>.json.tmp,
which the stale-entry prune glob (basedpyright-base-*) also matches, so a concurrent
lint run from another worktree sharing the same git common dir could unlink it between
write_text and replace and crash the gate with FileNotFoundError. The scratch is now
dot-prefixed so the glob can never see it, pid-suffixed so concurrent writers of the
same entry never share a scratch, and the prune glob is restricted to committed
*.json entries
---
 Makefile                                      |  33 +++--
 scripts/pre_commit_lint.sh                    |   2 +-
 scripts/prisma_generate_if_needed.py          |  69 ++++++++++
 scripts/ruff_strict_gate.py                   |  18 ++-
 scripts/type_check_gate.py                    | 128 +++++++++++++++++-
 .../test_prisma_generate_if_needed.py         |  35 +++++
 tests/test_litellm/test_ruff_strict_gate.py   |  16 +++
 tests/test_litellm/test_type_check_gate.py    | 114 ++++++++++++++++
 8 files changed, 395 insertions(+), 20 deletions(-)
 create mode 100644 scripts/prisma_generate_if_needed.py
 create mode 100644 tests/test_litellm/test_prisma_generate_if_needed.py

diff --git a/Makefile b/Makefile
index 2cc4ec3e45a..f8d10de2917 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 .PHONY: help test test-unit test-unit-llms test-unit-proxy-guardrails test-unit-proxy-core test-unit-proxy-misc \
 	test-unit-integrations test-unit-core-utils test-unit-other test-unit-root \
 	test-proxy-unit-a test-proxy-unit-b test-integration test-unit-helm \
-	info lint lint-dev format \
+	info lint lint-dev lint-checks format \
 	lint-basedpyright lint-basedpyright-budget-update lint-type-discipline lint-type-discipline-budget-update \
 	lint-ruff-budget lint-ruff-budget-update lint-budget-update lint-gate \
 	install-dev install-proxy-dev install-test-deps install-hooks \
@@ -53,6 +53,11 @@ help:
 UV := uv
 UV_RUN := $(UV) run --no-sync
 
+LINT_DEP_INSTALL ?= install-dev
+LINT_DEP_BASE ?= lint-fetch-base
+LINT_JOBS := $(shell sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo 4)
+LINT_OUTPUT_SYNC := $(if $(filter output-sync,$(.FEATURES)),--output-sync=target,)
+
 # Show info
 info:
 	@echo "UV: $(UV)"
@@ -107,12 +112,12 @@ lint-fetch-base:
 # running proxy need.
 lint-install:
 	$(UV) sync --inexact --frozen --group proxy-dev
-	$(UV_RUN) prisma generate --schema litellm/proxy/schema.prisma
+	$(UV_RUN) python scripts/prisma_generate_if_needed.py
 
 # Diff-scoped format check, identical to test-linting.yml's "Check ruff format" step:
 # only the litellm Python files changed vs the base are checked, so a pre-existing
 # format issue elsewhere doesn't block an unrelated commit.
-lint-format-check-changed: install-dev lint-fetch-base
+lint-format-check-changed: $(LINT_DEP_INSTALL) $(LINT_DEP_BASE)
 	@files=$$(git diff --name-only origin/litellm_internal_staging...HEAD -- 'litellm/**/*.py' | grep -v '^litellm/enterprise/' || true); \
 	if [ -z "$$files" ]; then \
 		echo "No changed litellm Python files to format-check."; \
@@ -121,7 +126,7 @@ lint-format-check-changed: install-dev lint-fetch-base
 	fi
 
 # Linting targets
-lint-ruff: install-dev
+lint-ruff: $(LINT_DEP_INSTALL)
 	cd litellm && $(UV_RUN) ruff check . && cd ..
 
 # faster linter for developing ...
@@ -156,12 +161,12 @@ lint-ruff-FULL-dev: install-dev
 	if [ -n "$$files" ]; then echo "$$files" | xargs $(UV_RUN) ruff check; \
 	else echo "No changed .py files to check."; fi
 
-lint-basedpyright: install-dev lint-fetch-base
+lint-basedpyright: $(LINT_DEP_INSTALL) $(LINT_DEP_BASE)
 	($(UV_RUN) basedpyright --outputjson || true) | $(UV_RUN) python scripts/type_check_gate.py --base origin/litellm_internal_staging
 
 # Type-discipline budget (mutable collections / casts / type guards / kwargs /
 # unexplained suppressions), the test-linting.yml step `make lint` used to omit.
-lint-type-discipline: install-dev lint-fetch-base
+lint-type-discipline: $(LINT_DEP_INSTALL) $(LINT_DEP_BASE)
 	$(UV_RUN) python scripts/type_discipline_gate.py --base origin/litellm_internal_staging
 
 # --update lowers each limit by what this branch fixed since its branch point, so
@@ -176,7 +181,7 @@ lint-ruff-budget: install-dev
 
 # Strict gate, invoked the same way CI does in test-linting.yml so a local pass
 # means the CI check will pass too.
-lint-gate: install-dev lint-fetch-base
+lint-gate: $(LINT_DEP_INSTALL) $(LINT_DEP_BASE)
 	$(UV_RUN) python scripts/ruff_strict_gate.py --base origin/litellm_internal_staging
 
 lint-ruff-budget-update: install-dev lint-fetch-base
@@ -188,10 +193,10 @@ lint-type-discipline-budget-update: install-dev lint-fetch-base
 # Ratchet all budgets in one shot (ruff strict + type-discipline + basedpyright)
 lint-budget-update: lint-ruff-budget-update lint-type-discipline-budget-update lint-basedpyright-budget-update
 
-check-circular-imports: install-dev
+check-circular-imports: $(LINT_DEP_INSTALL)
 	cd litellm && $(UV_RUN) python ../tests/documentation_tests/test_circular_imports.py && cd ..
 
-check-import-safety: install-dev
+check-import-safety: $(LINT_DEP_INSTALL)
 	@$(UV_RUN) python -c "from litellm import *; print('[from litellm import *] OK! no issues!');" || (echo '🚨 import failed, this means you introduced unprotected imports! 🚨'; exit 1)
 
 # Combined linting, isomorphic to test-linting.yml's lint job so a local pass means a
@@ -199,9 +204,13 @@ check-import-safety: install-dev
 # runs the diff-scoped ruff format check, whole-tree ruff check, the strict-rule /
 # type-discipline / basedpyright budgets as a delta vs the base, then the circular-import
 # and import-safety checks. Steps that compare against the base resolve it the same way CI
-# does (merge-base with origin/litellm_internal_staging). lint-install is first so the
-# Prisma client exists before basedpyright runs.
-lint: lint-install lint-format-check-changed lint-ruff lint-gate lint-type-discipline lint-basedpyright check-circular-imports check-import-safety
+# does (merge-base with origin/litellm_internal_staging). Setup (env sync, Prisma client,
+# base fetch) runs once up front; the checks themselves are independent, so a sub-make
+# fans them out with -j and the fast ones finish under basedpyright's shadow.
+lint: lint-install lint-fetch-base
+	$(MAKE) -j $(LINT_JOBS) $(LINT_OUTPUT_SYNC) LINT_DEP_INSTALL= LINT_DEP_BASE= lint-checks
+
+lint-checks: lint-format-check-changed lint-ruff lint-gate lint-type-discipline lint-basedpyright check-circular-imports check-import-safety
 
 # Faster linting for local development (only checks changed code)
 lint-dev: lint-format-changed check-circular-imports check-import-safety
diff --git a/scripts/pre_commit_lint.sh b/scripts/pre_commit_lint.sh
index d667d6758e1..04a2af56ce2 100755
--- a/scripts/pre_commit_lint.sh
+++ b/scripts/pre_commit_lint.sh
@@ -111,7 +111,7 @@ if [ -n "$spec_files" ]; then
     # and an up-to-date Prisma client; check-ui-api-types.yml installs those and runs
     # prisma generate before gen:api, so mirror that here or a stale client can mask
     # drift that CI will still flag.
-    if ! uv run --no-sync prisma generate --schema litellm/proxy/schema.prisma; then
+    if ! uv run --no-sync python scripts/prisma_generate_if_needed.py; then
         echo "✗ Could not regenerate Prisma client (prisma generate failed)." >&2
         status=1
     elif ( cd ui/litellm-dashboard && LITELLM_PYTHON="uv run --no-sync python" npm run gen:api ); then
diff --git a/scripts/prisma_generate_if_needed.py b/scripts/prisma_generate_if_needed.py
new file mode 100644
index 00000000000..d2c40adf820
--- /dev/null
+++ b/scripts/prisma_generate_if_needed.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+"""Run ``prisma generate`` only when its inputs changed since the last run.
+
+The generated client is a pure function of ``litellm/proxy/schema.prisma`` and
+the installed prisma package version, so a stamp of those two written next to
+the venv is enough to prove the client is current. The stamp lives under
+``sys.prefix`` so recreating the venv discards it, and a missing generated
+client (a fresh or reinstalled prisma package) forces a regenerate even when
+the stamp matches. The prisma package itself is never imported here: once
+generated it re-exports the whole client on import, which costs more than the
+generate this script exists to skip.
+"""
+
+import hashlib
+import importlib.metadata
+import importlib.util
+import subprocess
+import sys
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parent.parent
+SCHEMA = REPO_ROOT / "litellm" / "proxy" / "schema.prisma"
+STAMP = Path(sys.prefix) / "litellm-prisma-schema.stamp"
+
+
+def stamp_value(schema_bytes: bytes, prisma_version: str) -> str:
+    return f"{hashlib.sha256(schema_bytes).hexdigest()}:{prisma_version}"
+
+
+def should_skip(stamp: Path, expected: str, client_generated: bool) -> bool:
+    if not client_generated:
+        return False
+    try:
+        return stamp.read_text() == expected
+    except OSError:
+        return False
+
+
+def client_is_generated() -> bool:
+    spec = importlib.util.find_spec("prisma")
+    if spec is None or not spec.submodule_search_locations:
+        return False
+    return any(
+        (Path(location) / "client.py").exists()
+        for location in spec.submodule_search_locations
+    )
+
+
+def main() -> int:
+    version = importlib.metadata.version("prisma")
+    expected = stamp_value(SCHEMA.read_bytes(), version)
+    if should_skip(STAMP, expected, client_is_generated()):
+        print(
+            f"Prisma client already generated for {SCHEMA.relative_to(REPO_ROOT)} "
+            f"(prisma {version}); skipping prisma generate"
+        )
+        return 0
+    result = subprocess.run(
+        [sys.executable, "-m", "prisma", "generate", "--schema", str(SCHEMA)],
+        cwd=REPO_ROOT,
+    )
+    if result.returncode != 0:
+        return result.returncode
+    STAMP.write_text(expected)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/scripts/ruff_strict_gate.py b/scripts/ruff_strict_gate.py
index 5273e4805f6..25f6c4d29ba 100644
--- a/scripts/ruff_strict_gate.py
+++ b/scripts/ruff_strict_gate.py
@@ -89,6 +89,18 @@ def base_counts(ref: str) -> dict:
         shutil.rmtree(parent, ignore_errors=True)
 
 
+def over_ceiling(head: dict, budget: dict) -> frozenset:
+    """Rules whose head count already exceeds their limit.
+
+    A rule can only breach when it is over its limit, so when none are the base
+    comparison cannot change the verdict and the base worktree scan can be skipped.
+    """
+    return frozenset(
+        rule for rule, spec in budget.items()
+        if head.get(rule, 0) > spec["limit"]
+    )
+
+
 def evaluate(head: dict, base: dict, budget: dict) -> list:
     breaches = []
     for rule, spec in budget.items():
@@ -119,8 +131,12 @@ def introduced(violations: list, changed: dict) -> list:
 def cmd_check(base: str) -> None:
     budget = json.loads(BUDGET_PATH.read_text())
     head = head_violations()
+    head_counts = count_by_rule(head)
+    if not over_ceiling(head_counts, budget):
+        print(f"OK: every strict rule is within its codebase ceiling (base {base})")
+        return
     base_point = _run(["git", "merge-base", base, "HEAD"]).strip() or base
-    breaches = evaluate(count_by_rule(head), base_counts(base_point), budget)
+    breaches = evaluate(head_counts, base_counts(base_point), budget)
     if not breaches:
         print(f"OK: every strict rule is within its codebase ceiling (base {base})")
         return
diff --git a/scripts/type_check_gate.py b/scripts/type_check_gate.py
index d3837cc2c0d..2c5306cec7d 100644
--- a/scripts/type_check_gate.py
+++ b/scripts/type_check_gate.py
@@ -13,9 +13,13 @@ bystander's count equals its base, so it is spared, while any PR that actually
 grows the rule past its limit still fails.
 
 Head counts are read from stdin (the caller runs basedpyright once and pipes
-``--outputjson`` in); the base count is a second basedpyright pass over a
-detached worktree at the merge-base, run under the same environment so import
-resolution matches. ``--update`` ratchets each rule's ``limit`` down by the
+``--outputjson`` in). The base count only matters once some rule is over its
+limit, so when none is the base pass is skipped outright. When it is needed, it
+is a second basedpyright pass over a detached worktree at the merge-base, run
+under the same environment so import resolution matches, and its per-rule
+counts are cached under the repo's git common dir keyed by merge-base commit,
+``pyrightconfig.json``, and ``uv.lock``, so re-runs against the same branch
+point pay for it once. ``--update`` ratchets each rule's ``limit`` down by the
 number of errors this branch fixed relative to its branch point (the merge-base),
 so the headroom you were granted shrinks by exactly what you cleared and never
 grows.
@@ -28,20 +32,24 @@ carries an unambiguous ``rule`` field.
 
 import argparse
 import contextlib
+import hashlib
 import json
+import os
 import shutil
 import subprocess
 import sys
 import tempfile
 from collections import Counter
-from collections.abc import Iterator, Mapping
+from collections.abc import Callable, Iterator, Mapping
 from pathlib import Path
 from typing import NamedTuple
 
 REPO_ROOT = Path(__file__).resolve().parent.parent
 BUDGET_PATH = REPO_ROOT / "basedpyright-code-budget.json"
 PYRIGHT_CONFIG = REPO_ROOT / "pyrightconfig.json"
+UV_LOCK = REPO_ROOT / "uv.lock"
 DEFAULT_BASE = "origin/litellm_internal_staging"
+CACHE_FILE_PREFIX = "basedpyright-base-"
 
 # Bucket for a basedpyright diagnostic with no `rule`. Counted so it's gated.
 UNCODED = "<uncoded>"
@@ -129,6 +137,109 @@ def base_counts(ref: str) -> dict[str, int]:
         return count_basedpyright(proc.stdout, root=worktree)
 
 
+def over_ceiling(
+    head: Mapping[str, int], budget: Mapping[str, Mapping[str, int]]
+) -> frozenset[str]:
+    """Rules whose head count already exceeds their limit.
+
+    A rule can only breach when it is over its limit, so when none are the base
+    comparison cannot change the verdict and the base worktree pass can be skipped.
+    """
+    return frozenset(
+        code
+        for code, total in head.items()
+        if total > (budget[code]["limit"] if code in budget else DEFAULT_LIMIT)
+    )
+
+
+def environment_fingerprints() -> tuple[str, ...]:
+    return tuple(
+        hashlib.sha256(path.read_bytes()).hexdigest()
+        for path in (PYRIGHT_CONFIG, UV_LOCK)
+        if path.exists()
+    )
+
+
+def cache_key(base_point: str, fingerprints: tuple[str, ...]) -> str:
+    return hashlib.sha256("|".join((base_point, *fingerprints)).encode()).hexdigest()[
+        :16
+    ]
+
+
+def cache_path(
+    directory: Path, base_point: str, fingerprints: tuple[str, ...]
+) -> Path:
+    return directory / f"{CACHE_FILE_PREFIX}{cache_key(base_point, fingerprints)}.json"
+
+
+def default_cache_dir() -> Path:
+    common = Path(_run(["git", "rev-parse", "--git-common-dir"]).strip())
+    resolved = common if common.is_absolute() else REPO_ROOT / common
+    return resolved / "litellm-lint-cache"
+
+
+def load_cached_counts(path: Path) -> dict[str, int] | None:
+    try:
+        data = json.loads(path.read_text())
+    except (OSError, json.JSONDecodeError):
+        return None
+    counts = data.get("counts") if isinstance(data, dict) else None
+    if not isinstance(counts, dict):
+        return None
+    if not all(
+        isinstance(code, str) and isinstance(total, int) and not isinstance(total, bool)
+        for code, total in counts.items()
+    ):
+        return None
+    return counts
+
+
+def scratch_path(path: Path) -> Path:
+    """In-flight scratch for the tmp+rename write. Dot-prefixed so the prune
+    glob in `store_counts` can never match it (a concurrent run would otherwise
+    unlink it between write and rename), and pid-suffixed so two concurrent
+    writers of the same entry never share a scratch."""
+    return path.with_name(f".{path.name}.{os.getpid()}.tmp")
+
+
+def store_counts(
+    directory: Path, path: Path, base_point: str, counts: Mapping[str, int]
+) -> None:
+    directory.mkdir(parents=True, exist_ok=True)
+    for stale in directory.glob(f"{CACHE_FILE_PREFIX}*.json"):
+        if stale != path:
+            stale.unlink(missing_ok=True)
+    scratch = scratch_path(path)
+    scratch.write_text(
+        json.dumps(
+            {"base_point": base_point, "counts": dict(sorted(counts.items()))},
+            indent=2,
+        )
+        + "\n"
+    )
+    scratch.replace(path)
+
+
+def base_counts_cached(
+    base_point: str,
+    cache_dir: Path | None = None,
+    compute: Callable[[str], dict[str, int]] = base_counts,
+) -> dict[str, int]:
+    """`base_counts` memoized on disk. The base tree at a given commit is
+    immutable, so its counts are a pure function of the merge-base plus the
+    environment fingerprints in the cache key; an empty result is never stored
+    because it is the signature of a crashed pass, not a clean tree."""
+    directory = default_cache_dir() if cache_dir is None else cache_dir
+    path = cache_path(directory, base_point, environment_fingerprints())
+    cached = load_cached_counts(path)
+    if cached is not None:
+        return cached
+    counts = compute(base_point)
+    if counts:
+        store_counts(directory, path, base_point, counts)
+    return counts
+
+
 def evaluate(
     head: Mapping[str, int],
     base: Mapping[str, int],
@@ -185,7 +296,7 @@ def cmd_update(current: Mapping[str, int], base_ref: str = DEFAULT_BASE) -> None
     """
     budget = json.loads(BUDGET_PATH.read_text()) if BUDGET_PATH.exists() else {}
     base_point = _run(["git", "merge-base", base_ref, "HEAD"]).strip() or base_ref
-    updated = ratcheted_budget(budget, current, base_counts(base_point))
+    updated = ratcheted_budget(budget, current, base_counts_cached(base_point))
     BUDGET_PATH.write_text(json.dumps(updated, indent=2, sort_keys=True) + "\n")
     cleared = sum(budget[code]["limit"] - updated[code]["limit"] for code in updated)
     print(
@@ -205,8 +316,13 @@ def cmd_check(base_ref: str) -> None:
             f"nothing; refusing to certify a vacuous run."
         )
         raise SystemExit(1)
+    if not over_ceiling(head, budget):
+        print(
+            f"OK: every rule is within its basedpyright limit ({sum(head.values())} errors total)"
+        )
+        return
     base_point = _run(["git", "merge-base", base_ref, "HEAD"]).strip() or base_ref
-    base = base_counts(base_point)
+    base = base_counts_cached(base_point)
     if is_vacuous_run(base, budget):
         print(
             f"FAIL: basedpyright produced no errors for the base tree at "
diff --git a/tests/test_litellm/test_prisma_generate_if_needed.py b/tests/test_litellm/test_prisma_generate_if_needed.py
new file mode 100644
index 00000000000..39b9fcc4202
--- /dev/null
+++ b/tests/test_litellm/test_prisma_generate_if_needed.py
@@ -0,0 +1,35 @@
+import importlib.util
+from pathlib import Path
+
+_MODULE_PATH = (
+    Path(__file__).resolve().parents[2] / "scripts" / "prisma_generate_if_needed.py"
+)
+_spec = importlib.util.spec_from_file_location("prisma_generate_if_needed", _MODULE_PATH)
+mod = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(mod)
+
+
+def test_stamp_changes_with_schema_and_with_prisma_version():
+    stamp = mod.stamp_value(b"model A {}", "0.11.0")
+    assert mod.stamp_value(b"model A {}", "0.11.0") == stamp
+    assert mod.stamp_value(b"model B {}", "0.11.0") != stamp
+    assert mod.stamp_value(b"model A {}", "0.12.0") != stamp
+
+
+def test_skip_requires_a_matching_stamp(tmp_path):
+    stamp = tmp_path / "stamp"
+    expected = mod.stamp_value(b"schema", "0.11.0")
+    assert mod.should_skip(stamp, expected, client_generated=True) is False
+    stamp.write_text(expected)
+    assert mod.should_skip(stamp, expected, client_generated=True) is True
+    assert (
+        mod.should_skip(stamp, mod.stamp_value(b"other", "0.11.0"), client_generated=True)
+        is False
+    )
+
+
+def test_skip_requires_a_generated_client_even_with_a_matching_stamp(tmp_path):
+    stamp = tmp_path / "stamp"
+    expected = mod.stamp_value(b"schema", "0.11.0")
+    stamp.write_text(expected)
+    assert mod.should_skip(stamp, expected, client_generated=False) is False
diff --git a/tests/test_litellm/test_ruff_strict_gate.py b/tests/test_litellm/test_ruff_strict_gate.py
index ec8f49730dd..aad0e1bc9f9 100644
--- a/tests/test_litellm/test_ruff_strict_gate.py
+++ b/tests/test_litellm/test_ruff_strict_gate.py
@@ -94,3 +94,19 @@ def test_introduced_keeps_only_violations_on_changed_lines():
 @pytest.mark.parametrize("hunk", ["@@ -1 +1 @@", "@@ -1,0 +1,2 @@"])
 def test_parse_changed_lines_handles_single_and_ranged_hunks(hunk):
     assert gate.parse_changed_lines(f"+++ b/litellm/a.py\n{hunk}\n")["litellm/a.py"]
+
+
+def test_over_ceiling_flags_only_counts_above_the_limit():
+    budget = rule("C901", 10)
+    assert gate.over_ceiling({"C901": 10}, budget) == frozenset()
+    assert gate.over_ceiling({"C901": 11}, budget) == frozenset({"C901"})
+    assert gate.over_ceiling({}, budget) == frozenset()
+
+
+def test_over_ceiling_ignores_rules_missing_from_the_budget():
+    assert gate.over_ceiling({"NEW99": 100}, rule("C901", 10)) == frozenset()
+
+
+def test_over_ceiling_is_independent_across_rules():
+    budget = {**rule("ANN001", 150), **rule("C901", 10)}
+    assert gate.over_ceiling({"ANN001": 130, "C901": 11}, budget) == frozenset({"C901"})
diff --git a/tests/test_litellm/test_type_check_gate.py b/tests/test_litellm/test_type_check_gate.py
index e602bf6e66f..66a28360af9 100644
--- a/tests/test_litellm/test_type_check_gate.py
+++ b/tests/test_litellm/test_type_check_gate.py
@@ -173,3 +173,117 @@ def test_empty_basedpyright_payload_counts_zero():
     # Empty (not malformed) output parses to zero; the vacuous-run guard, not the
     # parser, is what rejects an empty run.
     assert gate.count_basedpyright("") == {}
+
+
+def test_over_ceiling_flags_only_rules_above_their_limit():
+    budget = {"reportAny": {"limit": 10}}
+    assert gate.over_ceiling({"reportAny": 10}, budget) == frozenset()
+    assert gate.over_ceiling({"reportAny": 11}, budget) == frozenset({"reportAny"})
+    assert gate.over_ceiling({}, budget) == frozenset()
+
+
+def test_over_ceiling_holds_unbudgeted_rules_to_the_default_limit():
+    assert gate.over_ceiling({"brand-new": gate.DEFAULT_LIMIT}, {}) == frozenset()
+    assert gate.over_ceiling({"brand-new": gate.DEFAULT_LIMIT + 1}, {}) == frozenset(
+        {"brand-new"}
+    )
+
+
+def test_over_ceiling_is_independent_across_rules():
+    budget = {"reportAny": {"limit": 10}, "reportArgumentType": {"limit": 5}}
+    assert gate.over_ceiling(
+        {"reportAny": 9, "reportArgumentType": 6}, budget
+    ) == frozenset({"reportArgumentType"})
+
+
+def test_cache_key_changes_with_base_point_and_each_fingerprint():
+    key = gate.cache_key("abc", ("cfg", "lock"))
+    assert gate.cache_key("abc", ("cfg", "lock")) == key
+    assert gate.cache_key("def", ("cfg", "lock")) != key
+    assert gate.cache_key("abc", ("cfg2", "lock")) != key
+    assert gate.cache_key("abc", ("cfg", "lock2")) != key
+
+
+def test_cached_counts_round_trip(tmp_path):
+    path = gate.cache_path(tmp_path, "abc123", ("f1", "f2"))
+    gate.store_counts(tmp_path, path, "abc123", {"reportAny": 3, "reportCall": 1})
+    assert gate.load_cached_counts(path) == {"reportAny": 3, "reportCall": 1}
+
+
+def test_missing_corrupt_or_misshapen_cache_reads_as_none(tmp_path):
+    path = tmp_path / "cache.json"
+    assert gate.load_cached_counts(path) is None
+    path.write_text("{not json")
+    assert gate.load_cached_counts(path) is None
+    path.write_text(json.dumps(["counts"]))
+    assert gate.load_cached_counts(path) is None
+    path.write_text(json.dumps({"base_point": "abc"}))
+    assert gate.load_cached_counts(path) is None
+    path.write_text(json.dumps({"counts": {"reportAny": "three"}}))
+    assert gate.load_cached_counts(path) is None
+    path.write_text(json.dumps({"counts": {"reportAny": True}}))
+    assert gate.load_cached_counts(path) is None
+
+
+def test_scratch_is_invisible_to_the_prune_glob():
+    import fnmatch
+
+    scratch = gate.scratch_path(gate.cache_path(Path("/c"), "abc", ("f",)))
+    assert not fnmatch.fnmatch(scratch.name, f"{gate.CACHE_FILE_PREFIX}*")
+
+
+def test_store_prune_spares_a_concurrent_runs_in_flight_scratch(tmp_path):
+    foreign = gate.scratch_path(gate.cache_path(tmp_path, "other", ("f",)))
+    foreign.parent.mkdir(parents=True, exist_ok=True)
+    foreign.write_text("{}")
+    mine = gate.cache_path(tmp_path, "mine", ("f",))
+    gate.store_counts(tmp_path, mine, "mine", {"reportAny": 1})
+    assert foreign.exists()
+    assert gate.load_cached_counts(mine) == {"reportAny": 1}
+
+
+def test_store_prunes_entries_for_other_branch_points(tmp_path):
+    old = gate.cache_path(tmp_path, "old", ("f",))
+    gate.store_counts(tmp_path, old, "old", {"reportAny": 1})
+    new = gate.cache_path(tmp_path, "new", ("f",))
+    gate.store_counts(tmp_path, new, "new", {"reportAny": 2})
+    assert not old.exists()
+    assert gate.load_cached_counts(new) == {"reportAny": 2}
+
+
+def test_base_counts_cached_returns_the_hit_without_recomputing(tmp_path):
+    path = gate.cache_path(tmp_path, "abc123", gate.environment_fingerprints())
+    gate.store_counts(tmp_path, path, "abc123", {"reportAny": 7})
+
+    def explode(ref):
+        raise AssertionError("a cache hit must not re-run the base pass")
+
+    assert gate.base_counts_cached("abc123", cache_dir=tmp_path, compute=explode) == {
+        "reportAny": 7
+    }
+
+
+def test_base_counts_cached_computes_once_then_hits(tmp_path):
+    calls = []
+
+    def fake(ref):
+        calls.append(ref)
+        return {"reportAny": 4}
+
+    first = gate.base_counts_cached("abc123", cache_dir=tmp_path, compute=fake)
+    second = gate.base_counts_cached("abc123", cache_dir=tmp_path, compute=fake)
+    assert first == second == {"reportAny": 4}
+    assert calls == ["abc123"]
+
+
+def test_an_empty_base_pass_is_never_cached(tmp_path):
+    calls = []
+
+    def crashed(ref):
+        calls.append(ref)
+        return {}
+
+    assert gate.base_counts_cached("abc123", cache_dir=tmp_path, compute=crashed) == {}
+    assert gate.base_counts_cached("abc123", cache_dir=tmp_path, compute=crashed) == {}
+    assert calls == ["abc123", "abc123"]
+    assert list(tmp_path.iterdir()) == []

From 2633e8f8a8ed54a8a6741062b9563b88f6ec639c Mon Sep 17 00:00:00 2001
From: Mateo Wang <277851410+mateo-berri@users.noreply.github.com>
Date: Thu, 2 Jul 2026 20:04:07 -0700
Subject: [PATCH 17/26] fix(ui): include cache token columns in usage export
 (#32015)

---
 .../EntityUsageExport/utils.test.ts           | 187 ++++++++++++++++++
 .../src/components/EntityUsageExport/utils.ts |  23 +++
 2 files changed, 210 insertions(+)

diff --git a/ui/litellm-dashboard/src/components/EntityUsageExport/utils.test.ts b/ui/litellm-dashboard/src/components/EntityUsageExport/utils.test.ts
index 802555b9d0b..dfeecdc4fa6 100644
--- a/ui/litellm-dashboard/src/components/EntityUsageExport/utils.test.ts
+++ b/ui/litellm-dashboard/src/components/EntityUsageExport/utils.test.ts
@@ -358,6 +358,23 @@ describe("EntityUsageExport utils", () => {
       expect(result[0]).toHaveProperty("Total Tokens");
       expect(result[0]).toHaveProperty("Prompt Tokens");
       expect(result[0]).toHaveProperty("Completion Tokens");
+      expect(result[0]).toHaveProperty("Cache Read Input Tokens");
+      expect(result[0]).toHaveProperty("Cache Creation Input Tokens");
+    });
+
+    it("should export exact cache token values per entity per day", () => {
+      const result = generateDailyData(mockSpendData, "Team", mockTeamAliasMap);
+
+      const day1Team1 = result.find((r) => r.Date === "2025-01-01" && r["Team ID"] === "team-1");
+      const day1Team2 = result.find((r) => r.Date === "2025-01-01" && r["Team ID"] === "team-2");
+      const day2Team1 = result.find((r) => r.Date === "2025-01-02" && r["Team ID"] === "team-1");
+
+      expect(day1Team1?.["Cache Read Input Tokens"]).toBe(50);
+      expect(day1Team1?.["Cache Creation Input Tokens"]).toBe(30);
+      expect(day1Team2?.["Cache Read Input Tokens"]).toBe(100);
+      expect(day1Team2?.["Cache Creation Input Tokens"]).toBe(60);
+      expect(day2Team1?.["Cache Read Input Tokens"]).toBe(75);
+      expect(day2Team1?.["Cache Creation Input Tokens"]).toBe(45);
     });
 
     it("should sort data by date ascending", () => {
@@ -469,6 +486,8 @@ describe("EntityUsageExport utils", () => {
 
       expect(result[0]["Prompt Tokens"]).toBe(0);
       expect(result[0]["Completion Tokens"]).toBe(0);
+      expect(result[0]["Cache Read Input Tokens"]).toBe(0);
+      expect(result[0]["Cache Creation Input Tokens"]).toBe(0);
     });
   });
 
@@ -614,6 +633,61 @@ describe("EntityUsageExport utils", () => {
       expect(result[0]).toHaveProperty("Total Tokens");
       expect(result[0]).toHaveProperty("Prompt Tokens");
       expect(result[0]).toHaveProperty("Completion Tokens");
+      expect(result[0]).toHaveProperty("Cache Read Input Tokens");
+      expect(result[0]).toHaveProperty("Cache Creation Input Tokens");
+    });
+
+    it("should export and aggregate cache token values per key", () => {
+      const makeDay = (cacheRead: number, cacheCreation: number) => ({
+        date: "2025-01-01",
+        breakdown: {
+          entities: {
+            "team-1": {
+              metrics: {
+                spend: 5.0,
+                api_requests: 50,
+                successful_requests: 50,
+                failed_requests: 0,
+                total_tokens: 500,
+                prompt_tokens: 300,
+                completion_tokens: 200,
+                cache_read_input_tokens: cacheRead,
+                cache_creation_input_tokens: cacheCreation,
+              },
+              api_key_breakdown: {
+                key1: {
+                  metrics: {
+                    spend: 5.0,
+                    api_requests: 50,
+                    successful_requests: 50,
+                    failed_requests: 0,
+                    total_tokens: 500,
+                    prompt_tokens: 300,
+                    completion_tokens: 200,
+                    cache_read_input_tokens: cacheRead,
+                    cache_creation_input_tokens: cacheCreation,
+                  },
+                  metadata: {
+                    team_id: "team-1",
+                    key_alias: "alias-1",
+                  },
+                },
+              },
+            },
+          },
+        },
+      });
+
+      const spendDataWithCache: EntitySpendData = {
+        results: [makeDay(40, 25), makeDay(10, 5)],
+        metadata: mockSpendDataWithKeys.metadata,
+      };
+
+      const result = generateDailyWithKeysData(spendDataWithCache, "Team");
+
+      expect(result).toHaveLength(1);
+      expect(result[0]["Cache Read Input Tokens"]).toBe(50);
+      expect(result[0]["Cache Creation Input Tokens"]).toBe(30);
     });
 
     it("should sort data by date ascending", () => {
@@ -935,6 +1009,8 @@ describe("EntityUsageExport utils", () => {
 
       expect(key1Entry?.["Prompt Tokens"]).toBe(0);
       expect(key1Entry?.["Completion Tokens"]).toBe(0);
+      expect(key1Entry?.["Cache Read Input Tokens"]).toBe(0);
+      expect(key1Entry?.["Cache Creation Input Tokens"]).toBe(0);
     });
 
     it("should handle empty api_key_breakdown", () => {
@@ -1096,6 +1172,117 @@ describe("EntityUsageExport utils", () => {
       expect(result[0]).toHaveProperty("Successful");
       expect(result[0]).toHaveProperty("Failed");
       expect(result[0]).toHaveProperty("Total Tokens");
+      expect(result[0]).toHaveProperty("Prompt Tokens");
+      expect(result[0]).toHaveProperty("Completion Tokens");
+      expect(result[0]).toHaveProperty("Cache Read Input Tokens");
+      expect(result[0]).toHaveProperty("Cache Creation Input Tokens");
+    });
+
+    it("should export prompt, completion, and cache token values summed across keys for the same model", () => {
+      const data: EntitySpendData = {
+        results: [
+          {
+            date: "2025-03-01",
+            breakdown: {
+              entities: {
+                "team-1": {
+                  metrics: {
+                    spend: 5.0,
+                    api_requests: 25,
+                    successful_requests: 25,
+                    failed_requests: 0,
+                    total_tokens: 1050,
+                    prompt_tokens: 750,
+                    completion_tokens: 300,
+                    cache_read_input_tokens: 450,
+                    cache_creation_input_tokens: 200,
+                  },
+                  api_key_breakdown: {
+                    key1: {
+                      metrics: {
+                        spend: 2.0,
+                        api_requests: 10,
+                        successful_requests: 10,
+                        failed_requests: 0,
+                        total_tokens: 700,
+                      },
+                      metadata: { team_id: "team-1" },
+                    },
+                    key2: {
+                      metrics: {
+                        spend: 3.0,
+                        api_requests: 15,
+                        successful_requests: 15,
+                        failed_requests: 0,
+                        total_tokens: 350,
+                      },
+                      metadata: { team_id: "team-1" },
+                    },
+                  },
+                },
+              },
+              models: {
+                "claude-sonnet-4-5": {
+                  metrics: {
+                    spend: 5.0,
+                    api_requests: 25,
+                    successful_requests: 25,
+                    failed_requests: 0,
+                    total_tokens: 1050,
+                  },
+                  api_key_breakdown: {
+                    key1: {
+                      metrics: {
+                        spend: 2.0,
+                        api_requests: 10,
+                        successful_requests: 10,
+                        failed_requests: 0,
+                        total_tokens: 700,
+                        prompt_tokens: 500,
+                        completion_tokens: 200,
+                        cache_read_input_tokens: 300,
+                        cache_creation_input_tokens: 120,
+                      },
+                      metadata: { team_id: "team-1" },
+                    },
+                    key2: {
+                      metrics: {
+                        spend: 3.0,
+                        api_requests: 15,
+                        successful_requests: 15,
+                        failed_requests: 0,
+                        total_tokens: 350,
+                        prompt_tokens: 250,
+                        completion_tokens: 100,
+                        cache_read_input_tokens: 150,
+                        cache_creation_input_tokens: 80,
+                      },
+                      metadata: { team_id: "team-1" },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+        metadata: {
+          total_spend: 5.0,
+          total_api_requests: 25,
+          total_successful_requests: 25,
+          total_failed_requests: 0,
+          total_tokens: 1050,
+        },
+      };
+
+      const result = generateDailyWithModelsData(data, "Team");
+
+      expect(result).toHaveLength(1);
+      expect(result[0].Model).toBe("claude-sonnet-4-5");
+      expect(result[0]["Total Tokens"]).toBe(1050);
+      expect(result[0]["Prompt Tokens"]).toBe(750);
+      expect(result[0]["Completion Tokens"]).toBe(300);
+      expect(result[0]["Cache Read Input Tokens"]).toBe(450);
+      expect(result[0]["Cache Creation Input Tokens"]).toBe(200);
     });
 
     it("should sort data by date ascending", () => {
diff --git a/ui/litellm-dashboard/src/components/EntityUsageExport/utils.ts b/ui/litellm-dashboard/src/components/EntityUsageExport/utils.ts
index cec8af2dc74..8ff389ded5e 100644
--- a/ui/litellm-dashboard/src/components/EntityUsageExport/utils.ts
+++ b/ui/litellm-dashboard/src/components/EntityUsageExport/utils.ts
@@ -126,6 +126,8 @@ export const generateDailyData = (
         "Total Tokens": data.metrics.total_tokens,
         "Prompt Tokens": data.metrics.prompt_tokens || 0,
         "Completion Tokens": data.metrics.completion_tokens || 0,
+        "Cache Read Input Tokens": data.metrics.cache_read_input_tokens || 0,
+        "Cache Creation Input Tokens": data.metrics.cache_creation_input_tokens || 0,
       });
     });
   });
@@ -154,6 +156,8 @@ export const generateDailyWithKeysData = (
         total_tokens: number;
         prompt_tokens: number;
         completion_tokens: number;
+        cache_read_input_tokens: number;
+        cache_creation_input_tokens: number;
       };
     };
   } = {};
@@ -186,6 +190,8 @@ export const generateDailyWithKeysData = (
               total_tokens: keyData.metrics?.total_tokens || 0,
               prompt_tokens: keyData.metrics?.prompt_tokens || 0,
               completion_tokens: keyData.metrics?.completion_tokens || 0,
+              cache_read_input_tokens: keyData.metrics?.cache_read_input_tokens || 0,
+              cache_creation_input_tokens: keyData.metrics?.cache_creation_input_tokens || 0,
             },
           };
         } else {
@@ -197,6 +203,9 @@ export const generateDailyWithKeysData = (
           aggregatedData[uniqueKey].metrics.total_tokens += keyData.metrics?.total_tokens || 0;
           aggregatedData[uniqueKey].metrics.prompt_tokens += keyData.metrics?.prompt_tokens || 0;
           aggregatedData[uniqueKey].metrics.completion_tokens += keyData.metrics?.completion_tokens || 0;
+          aggregatedData[uniqueKey].metrics.cache_read_input_tokens += keyData.metrics?.cache_read_input_tokens || 0;
+          aggregatedData[uniqueKey].metrics.cache_creation_input_tokens +=
+            keyData.metrics?.cache_creation_input_tokens || 0;
         }
       });
     });
@@ -216,6 +225,8 @@ export const generateDailyWithKeysData = (
     "Total Tokens": item.metrics.total_tokens,
     "Prompt Tokens": item.metrics.prompt_tokens,
     "Completion Tokens": item.metrics.completion_tokens,
+    "Cache Read Input Tokens": item.metrics.cache_read_input_tokens,
+    "Cache Creation Input Tokens": item.metrics.cache_creation_input_tokens,
   }));
 
   return dailyKeyBreakdown.sort((a, b) => new Date(a.Date).getTime() - new Date(b.Date).getTime());
@@ -251,6 +262,10 @@ export const generateDailyWithModelsData = (
               successful: 0,
               failed: 0,
               tokens: 0,
+              promptTokens: 0,
+              completionTokens: 0,
+              cacheReadInputTokens: 0,
+              cacheCreationInputTokens: 0,
             };
           }
           dailyEntityModels[entity][model].spend += keyMetrics.spend || 0;
@@ -258,6 +273,10 @@ export const generateDailyWithModelsData = (
           dailyEntityModels[entity][model].successful += keyMetrics.successful_requests || 0;
           dailyEntityModels[entity][model].failed += keyMetrics.failed_requests || 0;
           dailyEntityModels[entity][model].tokens += keyMetrics.total_tokens || 0;
+          dailyEntityModels[entity][model].promptTokens += keyMetrics.prompt_tokens || 0;
+          dailyEntityModels[entity][model].completionTokens += keyMetrics.completion_tokens || 0;
+          dailyEntityModels[entity][model].cacheReadInputTokens += keyMetrics.cache_read_input_tokens || 0;
+          dailyEntityModels[entity][model].cacheCreationInputTokens += keyMetrics.cache_creation_input_tokens || 0;
         });
       });
     });
@@ -276,6 +295,10 @@ export const generateDailyWithModelsData = (
           Successful: metrics.successful,
           Failed: metrics.failed,
           "Total Tokens": metrics.tokens,
+          "Prompt Tokens": metrics.promptTokens,
+          "Completion Tokens": metrics.completionTokens,
+          "Cache Read Input Tokens": metrics.cacheReadInputTokens,
+          "Cache Creation Input Tokens": metrics.cacheCreationInputTokens,
         });
       });
     });

From 30ddef78d96ce2c7b04b9a427280b2bbe4762cc1 Mon Sep 17 00:00:00 2001
From: michelligabriele <gabriele.michelli@icloud.com>
Date: Fri, 3 Jul 2026 05:55:42 +0200
Subject: [PATCH 18/26] fix(a2a): record agent cost_per_query and input tokens
 on native send path (#31979)

* fix(a2a): record agent cost_per_query and input tokens on native send path

* test(a2a): add __init__.py to avoid test_utils.py module collision
---
 litellm/a2a_protocol/main.py                  | 30 +++++++
 litellm/a2a_protocol/utils.py                 |  7 +-
 tests/test_litellm/a2a_protocol/__init__.py   |  0
 .../a2a_protocol/test_cost_calculator.py      | 85 ++++++++++++-------
 tests/test_litellm/a2a_protocol/test_utils.py | 41 +++++++++
 5 files changed, 129 insertions(+), 34 deletions(-)
 create mode 100644 tests/test_litellm/a2a_protocol/__init__.py
 create mode 100644 tests/test_litellm/a2a_protocol/test_utils.py

diff --git a/litellm/a2a_protocol/main.py b/litellm/a2a_protocol/main.py
index 37bf7c34f02..4c23ecfed54 100644
--- a/litellm/a2a_protocol/main.py
+++ b/litellm/a2a_protocol/main.py
@@ -129,6 +129,33 @@ def _set_agent_id_on_logging_obj(
         litellm_logging_obj.model_call_details["agent_id"] = agent_id
 
 
+_A2A_COST_PARAM_KEYS = ("cost_per_query", "input_cost_per_token", "output_cost_per_token")
+
+
+def _set_litellm_params_on_logging_obj(
+    kwargs: dict[str, Any],
+    litellm_params: dict[str, Any],
+) -> None:
+    """
+    Merge the agent's pricing params into model_call_details["litellm_params"]
+    so A2ACostCalculator can read them.
+
+    The non-streaming path reuses the proxy-built logging object, whose
+    litellm_params already carries metadata / proxy_server_request / user-key
+    context, so merge the pricing keys in rather than replacing the dict.
+    """
+    logging_obj = kwargs.get("litellm_logging_obj")
+    if logging_obj is None:
+        return
+
+    cost_params = {key: litellm_params[key] for key in _A2A_COST_PARAM_KEYS if litellm_params.get(key) is not None}
+    if not cost_params:
+        return
+
+    existing = logging_obj.model_call_details.get("litellm_params") or {}
+    logging_obj.model_call_details["litellm_params"] = {**existing, **cost_params}
+
+
 def _get_a2a_model_info(a2a_client: Any, kwargs: Dict[str, Any]) -> str:
     """
     Extract agent info and set model/custom_llm_provider for cost tracking.
@@ -477,6 +504,9 @@ async def asend_message(
         completion_tokens=completion_tokens,
     )
 
+    # Merge agent pricing params into the logging obj so cost is calculated
+    _set_litellm_params_on_logging_obj(kwargs=kwargs, litellm_params=litellm_params)
+
     # Set agent_id on logging obj for SpendLogs tracking
     _set_agent_id_on_logging_obj(kwargs=kwargs, agent_id=agent_id)
 
diff --git a/litellm/a2a_protocol/utils.py b/litellm/a2a_protocol/utils.py
index 0dbd1eefc63..ce5a168c3ac 100644
--- a/litellm/a2a_protocol/utils.py
+++ b/litellm/a2a_protocol/utils.py
@@ -121,8 +121,13 @@ class A2ARequestUtils:
         Returns:
             Tuple of (prompt_tokens, completion_tokens, total_tokens)
         """
-        # Count input tokens
+        # Count input tokens. Dump the message to a dict first so extraction hits
+        # the dict branch — request-side parts are a2a-sdk Part RootModels whose
+        # kind/text live on part.root, which the object branch cannot read. This
+        # mirrors how the response side already works (it operates on model_dump).
         input_message = A2ARequestUtils.get_input_message_from_request(request)
+        if input_message is not None and hasattr(input_message, "model_dump"):
+            input_message = input_message.model_dump(mode="json")
         input_text = A2ARequestUtils.extract_text_from_message(input_message)
         prompt_tokens = A2ARequestUtils.count_tokens(input_text)
 
diff --git a/tests/test_litellm/a2a_protocol/__init__.py b/tests/test_litellm/a2a_protocol/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/test_litellm/a2a_protocol/test_cost_calculator.py b/tests/test_litellm/a2a_protocol/test_cost_calculator.py
index bf03562f8ae..a29f012170f 100644
--- a/tests/test_litellm/a2a_protocol/test_cost_calculator.py
+++ b/tests/test_litellm/a2a_protocol/test_cost_calculator.py
@@ -103,9 +103,7 @@ async def _mock_stream_messages(a2a_client: Any, request: Any) -> AsyncIterator[
         kind="message",
     )
     for _ in range(2):
-        yield SendStreamingMessageResponse(
-            root=SendStreamingMessageSuccessResponse(id=request.id, result=msg)
-        )
+        yield SendStreamingMessageResponse(root=SendStreamingMessageSuccessResponse(id=request.id, result=msg))
 
 
 class CostLogger(CustomLogger):
@@ -119,9 +117,7 @@ class CostLogger(CustomLogger):
         slp = kwargs.get("standard_logging_object")
         if slp:
             self.response_cost = (
-                slp.get("response_cost")
-                if isinstance(slp, dict)
-                else getattr(slp, "response_cost", None)
+                slp.get("response_cost") if isinstance(slp, dict) else getattr(slp, "response_cost", None)
             )
 
 
@@ -160,6 +156,43 @@ async def test_asend_message_uses_cost_per_query():
     assert cost_logger.response_cost == 0.05
 
 
+@pytest.mark.asyncio
+async def test_asend_message_uses_cost_per_query_from_litellm_params_dict():
+    """
+    Proxy passes agent pricing as the litellm_params dict param (not top-level
+    kwargs). Regression for cost_per_query landing at $0 on the native path.
+    """
+    from litellm.a2a_protocol import asend_message
+
+    litellm.logging_callback_manager._reset_all_callbacks()
+    cost_logger = CostLogger()
+    litellm.callbacks = [cost_logger]
+
+    mock_client = MagicMock()
+    mock_client._litellm_agent_card = MagicMock()
+    mock_client._litellm_agent_card.name = "test-agent"
+
+    mock_request = _make_send_message_request("test-123")
+
+    with patch(
+        "litellm.a2a_protocol.main._execute_a2a_send_with_retry",
+        new=_mock_execute_a2a_send,
+    ):
+        await asend_message(
+            a2a_client=mock_client,
+            request=mock_request,
+            litellm_params={
+                "cost_per_query": 0.5,
+                "input_cost_per_token": 0.099999,
+                "output_cost_per_token": 0.1,
+            },
+        )
+
+    await asyncio.sleep(0.1)
+
+    assert cost_logger.response_cost == 0.5
+
+
 class TokenAndCostLogger(CustomLogger):
     """Custom logger to capture both token counts and cost."""
 
@@ -173,19 +206,13 @@ class TokenAndCostLogger(CustomLogger):
         slp = kwargs.get("standard_logging_object")
         if slp:
             self.response_cost = (
-                slp.get("response_cost")
-                if isinstance(slp, dict)
-                else getattr(slp, "response_cost", None)
+                slp.get("response_cost") if isinstance(slp, dict) else getattr(slp, "response_cost", None)
             )
             self.prompt_tokens = (
-                slp.get("prompt_tokens")
-                if isinstance(slp, dict)
-                else getattr(slp, "prompt_tokens", None)
+                slp.get("prompt_tokens") if isinstance(slp, dict) else getattr(slp, "prompt_tokens", None)
             )
             self.completion_tokens = (
-                slp.get("completion_tokens")
-                if isinstance(slp, dict)
-                else getattr(slp, "completion_tokens", None)
+                slp.get("completion_tokens") if isinstance(slp, dict) else getattr(slp, "completion_tokens", None)
             )
 
 
@@ -207,9 +234,7 @@ async def test_asend_message_uses_input_output_cost_per_token():
     mock_client._litellm_agent_card = MagicMock()
     mock_client._litellm_agent_card.name = "test-agent"
 
-    mock_request = _make_send_message_request(
-        "test-123", user_text="Hello, what can you do?"
-    )
+    mock_request = _make_send_message_request("test-123", user_text="Hello, what can you do?")
 
     # Define specific cost per token values
     input_cost_per_token = 0.00001  # $0.01 per 1000 tokens
@@ -246,15 +271,11 @@ async def test_asend_message_uses_input_output_cost_per_token():
     assert response_cost is not None, "response_cost should be captured"
 
     # Calculate expected cost
-    expected_cost = (prompt_tokens * input_cost_per_token) + (
-        completion_tokens * output_cost_per_token
-    )
+    expected_cost = (prompt_tokens * input_cost_per_token) + (completion_tokens * output_cost_per_token)
     print(f"expected_cost: {expected_cost}")
 
     # Verify exact cost calculation
-    assert (
-        response_cost == expected_cost
-    ), f"response_cost {response_cost} should equal expected {expected_cost}"
+    assert response_cost == expected_cost, f"response_cost {response_cost} should equal expected {expected_cost}"
 
 
 class AgentIdLogger(CustomLogger):
@@ -305,9 +326,9 @@ async def test_asend_message_passes_agent_id_to_callback():
     await asyncio.sleep(0.1)
 
     # Verify agent_id was passed to callback
-    assert (
-        agent_id_logger.agent_id == test_agent_id
-    ), f"Expected agent_id '{test_agent_id}', got '{agent_id_logger.agent_id}'"
+    assert agent_id_logger.agent_id == test_agent_id, (
+        f"Expected agent_id '{test_agent_id}', got '{agent_id_logger.agent_id}'"
+    )
 
 
 class MetadataLogger(CustomLogger):
@@ -418,9 +439,7 @@ async def test_asend_message_streaming_triggers_callbacks():
     assert len(chunks) == 2
 
     # Verify callbacks WERE triggered after stream completed
-    assert (
-        callback_logger.kwargs is not None
-    ), "Streaming should trigger callbacks after completion"
-    assert (
-        callback_logger.agent_id == test_agent_id
-    ), f"Expected agent_id '{test_agent_id}', got '{callback_logger.agent_id}'"
+    assert callback_logger.kwargs is not None, "Streaming should trigger callbacks after completion"
+    assert callback_logger.agent_id == test_agent_id, (
+        f"Expected agent_id '{test_agent_id}', got '{callback_logger.agent_id}'"
+    )
diff --git a/tests/test_litellm/a2a_protocol/test_utils.py b/tests/test_litellm/a2a_protocol/test_utils.py
new file mode 100644
index 00000000000..8a219211c62
--- /dev/null
+++ b/tests/test_litellm/a2a_protocol/test_utils.py
@@ -0,0 +1,41 @@
+"""Tests for litellm/a2a_protocol/utils.py token/usage extraction."""
+
+import pytest
+
+pytest.importorskip("a2a.compat.v0_3.types")
+
+from a2a.compat.v0_3.types import MessageSendParams, SendMessageRequest
+
+from litellm.a2a_protocol.utils import A2ARequestUtils
+
+
+def _request(user_text: str) -> SendMessageRequest:
+    return SendMessageRequest(
+        id="r1",
+        params=MessageSendParams(
+            message={
+                "messageId": "m1",
+                "role": "user",
+                "parts": [{"kind": "text", "text": user_text}],
+            }
+        ),
+    )
+
+
+def test_calculate_usage_counts_input_tokens_from_request_object():
+    """Regression: request-side Part is a RootModel; input tokens must be counted."""
+    request = _request("count these input tokens please")
+    response_dict = {
+        "result": {
+            "kind": "message",
+            "parts": [{"kind": "text", "text": "ok"}],
+        }
+    }
+
+    prompt_tokens, completion_tokens, total_tokens = A2ARequestUtils.calculate_usage_from_request_response(
+        request=request, response_dict=response_dict
+    )
+
+    assert prompt_tokens > 0
+    assert completion_tokens > 0
+    assert total_tokens == prompt_tokens + completion_tokens

From 321345d4c8a7ae4ec05d036fbc9f5b7e31029d86 Mon Sep 17 00:00:00 2001
From: Sameer Kankute <sameer@berri.ai>
Date: Fri, 3 Jul 2026 09:27:31 +0530
Subject: [PATCH 19/26] feat: litellm oss staging (#31935)

* fix(prometheus): bound per-request budget metric emission with a timeout (#31632)

* fix(prometheus): bound per-request budget metric emission with a timeout

Wrap the per-request budget-metric gather in asyncio.wait_for so a slow Redis or DB lookup cannot consume the whole LoggingWorker watchdog and get the success-logging event cancelled. On timeout the emission is skipped in isolation; budget gauges are still refreshed by the periodic cron. The timeout is configurable via PROMETHEUS_BUDGET_METRICS_PER_REQUEST_TIMEOUT and defaults to 5.0 seconds, falling back to the default on an invalid value instead of raising

* fix(prometheus): reject non-finite and non-positive budget-metrics timeout env

float() accepts 0, negatives, nan and inf, which bypass the fallback: a value <= 0 makes asyncio.wait_for time out immediately and skip every per-request emission, and inf reintroduces the unbounded wait the timeout was meant to bound. Validate the parsed value is finite and greater than zero before using it, otherwise fall back to the default

* fix: report the blocked LLM response's real token usage (#31217)

When a guardrail blocks a post-call response, the synthetic violation response
reported hard-coded zero usage, discarding the token usage the upstream call
had already consumed.

Fix the root cause rather than re-counting tokens:
- Add an optional `original_response` field to ModifyResponseException.
- The unified guardrail's post-call success hook attaches the blocked LLM
  response to the exception.
- The /v1/messages and OpenAI-format (/v1/chat/completions, /v1/completions)
  block handlers report `original_response.usage` directly. Pre-call blocks
  never invoked the LLM, so usage is zero.

Mock-based tests cover the helper (returns original usage / zero), the success
hook attaching original_response, and the endpoint reporting it end-to-end.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(guardrails): buffer + cleanly terminate streamed responses on block (#31389)

Streaming moderation improvements for the unified guardrail post-call
streaming iterator hook:

- streaming_buffer_until_moderated: withhold all chunks until end-of-stream
  moderation passes, then release the original response (clean) or only the
  block message (blocked) -- the original content is never delivered on a
  block. Snapshot chunks with a shallow list() copy (end-of-stream builds a
  separate assembled response; chunks aren't mutated in place).
- Clean Anthropic SSE on block: synthesize a well-formed termination sequence
  instead of a bare data: {"error": ...} blob that truncates the stream.
  Provider-specific synthesis lives in AnthropicMessagesHandler via
  build_block_sse_chunks (format-agnostic routing stays in the hook).
- Mid-stream blocks continue the in-progress message (close open content
  block, append block message, terminate) rather than emitting a second
  message_start, which clients reject. Standalone envelope only when no chunks
  were sent (buffered path).
- ModifyResponseException imported under TYPE_CHECKING + locally at runtime to
  avoid a module-level cyclic import.

Adds regression tests for buffering (content withheld on block) and mid-stream
continuation (single message_start).

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* fix: report real usage on streaming blocks, disable buffered mode for content-rewriting guardrails

- _standalone_block_chunks and _block_continuation_chunks now read real
  token usage from ModifyResponseException.original_response instead of
  hardcoding zero, matching the non-streaming _blocked_response_usage path.
  Shared helper moved to guardrail_translation/utils.py.
- streaming_buffer_until_moderated is now forced off when the guardrail has
  mask_response_content=True, since buffered replay releases the withheld
  original chunks verbatim -- unsafe for a guardrail that rewrites content
  (e.g. PII masking).
- Fix inverted streaming-flag precedence comment.

* style: ruff format after greploop fixes

* fix: handle Anthropic streaming guardrail blocks

* fix(responses): check terminal event type for streaming guardrail end-of-stream detection

_check_streaming_has_ended assumed responses_so_far held ModelResponse
objects with .choices, but for the Responses API the accumulated chunks
are raw SSE event dicts, causing an AttributeError on every call

* fix: preserve Anthropic blocked stream usage

---------

Co-authored-by: FERNANDO IZAR <fizar@me.com>
Co-authored-by: Joseph Barker <156112794+seph-barker@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
---
 litellm/exceptions.py                         |   6 +
 litellm/integrations/prometheus.py            |  41 +-
 .../chat/guardrail_translation/handler.py     | 199 +++++++++-
 .../guardrail_translation/base_translation.py |  29 +-
 .../base_llm/guardrail_translation/utils.py   |  92 ++++-
 .../guardrail_translation/handler.py          |  10 +-
 .../proxy/anthropic_endpoints/endpoints.py    |   9 +-
 .../unified_guardrail/unified_guardrail.py    | 193 ++++++++--
 litellm/proxy/proxy_server.py                 |  33 +-
 .../test_prometheus_budget_metrics_timeout.py | 168 ++++++++
 .../anthropic_endpoints/test_endpoints.py     |  76 +++-
 .../test_anthropic_streaming_block.py         | 362 ++++++++++++++++++
 .../test_streaming_buffer_until_moderated.py  | 173 +++++++++
 .../proxy/test_blocked_response_usage.py      |  84 ++++
 14 files changed, 1412 insertions(+), 63 deletions(-)
 create mode 100644 tests/test_litellm/integrations/test_prometheus_budget_metrics_timeout.py
 create mode 100644 tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_anthropic_streaming_block.py
 create mode 100644 tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_streaming_buffer_until_moderated.py
 create mode 100644 tests/test_litellm/proxy/test_blocked_response_usage.py

diff --git a/litellm/exceptions.py b/litellm/exceptions.py
index d97ba347b07..adf7b3ef05a 100644
--- a/litellm/exceptions.py
+++ b/litellm/exceptions.py
@@ -1165,12 +1165,18 @@ class ModifyResponseException(Exception):
         request_data: Dict[str, Any],
         guardrail_name: Optional[str] = None,
         detection_info: Optional[Dict[str, Any]] = None,
+        original_response: Optional[Any] = None,
     ):
         self.message = message
         self.model = model
         self.request_data = request_data
         self.guardrail_name = guardrail_name
         self.detection_info = detection_info or {}
+        # The LLM response that was blocked (post-call). Carries the real token
+        # usage the upstream call consumed, so the synthetic block response can
+        # report it instead of discarding it. None for pre-call blocks (the LLM
+        # was never invoked).
+        self.original_response = original_response
         super().__init__(message)
 
 
diff --git a/litellm/integrations/prometheus.py b/litellm/integrations/prometheus.py
index 4ebe312e301..0f89e21abda 100644
--- a/litellm/integrations/prometheus.py
+++ b/litellm/integrations/prometheus.py
@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import asyncio
+import math
 import os
 import sys
 from datetime import datetime, timedelta
@@ -65,6 +66,26 @@ if TYPE_CHECKING:
 else:
     AsyncIOScheduler = Any
 
+_DEFAULT_BUDGET_METRICS_PER_REQUEST_TIMEOUT = 5.0
+
+
+def _get_budget_metrics_per_request_timeout() -> float:
+    raw = os.getenv("PROMETHEUS_BUDGET_METRICS_PER_REQUEST_TIMEOUT")
+    if raw is None:
+        return _DEFAULT_BUDGET_METRICS_PER_REQUEST_TIMEOUT
+    try:
+        parsed = float(raw)
+    except ValueError:
+        parsed = None
+    if parsed is None or not math.isfinite(parsed) or parsed <= 0:
+        verbose_logger.debug(
+            "[Non-Blocking] Prometheus: invalid PROMETHEUS_BUDGET_METRICS_PER_REQUEST_TIMEOUT=%r; using default %ss.",
+            raw,
+            _DEFAULT_BUDGET_METRICS_PER_REQUEST_TIMEOUT,
+        )
+        return _DEFAULT_BUDGET_METRICS_PER_REQUEST_TIMEOUT
+    return parsed
+
 
 class PrometheusLogger(CustomLogger):
     # Class variables or attributes
@@ -1607,7 +1628,15 @@ class PrometheusLogger(CustomLogger):
         _user_spend = _metadata.get("user_api_key_user_spend", None)
         _user_max_budget = _metadata.get("user_api_key_user_max_budget", None)
 
-        results = await asyncio.gather(
+        # Bound the per-request budget-metric emission so that slow Redis/DB
+        # lookups under load cannot consume the whole LoggingWorker watchdog
+        # (LOGGING_WORKER_MAX_TIME_PER_COROUTINE, default 20s) and get the entire
+        # success-logging event cancelled. Budget gauges are also refreshed by the
+        # periodic cron every PROMETHEUS_BUDGET_METRICS_REFRESH_INTERVAL_MINUTES,
+        # so dropping one slow per-request emission only loses sub-cron real-time
+        # detail, not correctness.
+        budget_metrics_timeout = _get_budget_metrics_per_request_timeout()
+        gather_coro = asyncio.gather(
             self._set_api_key_budget_metrics_after_api_request(
                 user_api_key=user_api_key,
                 user_api_key_alias=user_api_key_alias,
@@ -1634,6 +1663,16 @@ class PrometheusLogger(CustomLogger):
             ),
             return_exceptions=True,
         )
+        try:
+            results = await asyncio.wait_for(gather_coro, timeout=budget_metrics_timeout)
+        except asyncio.TimeoutError:
+            verbose_logger.debug(
+                "[Non-Blocking] Prometheus: per-request budget metric emission "
+                "exceeded %ss under load; skipping (values are refreshed by the "
+                "periodic budget-metrics cron job).",
+                budget_metrics_timeout,
+            )
+            return
         for i, r in enumerate(results):
             if isinstance(r, Exception):
                 verbose_logger.debug(
diff --git a/litellm/llms/anthropic/chat/guardrail_translation/handler.py b/litellm/llms/anthropic/chat/guardrail_translation/handler.py
index 4506c114208..7000c20d9c4 100644
--- a/litellm/llms/anthropic/chat/guardrail_translation/handler.py
+++ b/litellm/llms/anthropic/chat/guardrail_translation/handler.py
@@ -48,7 +48,10 @@ from litellm.types.utils import (
 )
 
 if TYPE_CHECKING:
-    from litellm.integrations.custom_guardrail import CustomGuardrail
+    from litellm.integrations.custom_guardrail import (
+        CustomGuardrail,
+        ModifyResponseException,
+    )
     from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
     from litellm.types.llms.anthropic_messages.anthropic_response import (
         AnthropicMessagesResponse,
@@ -70,6 +73,170 @@ class AnthropicMessagesHandler(BaseTranslation):
         super().__init__()
         self.adapter = LiteLLMAnthropicMessagesAdapter()
 
+    @staticmethod
+    def _build_streaming_usage_response(
+        responses_so_far: list[Any],
+        request_data: Optional[dict],
+    ) -> Optional[ModelResponse]:
+        chunks = tuple(response for response in responses_so_far if isinstance(response, (str, bytes)))
+        if not chunks:
+            return None
+        try:
+            return AnthropicPassthroughLoggingHandler._build_usage_only_response_from_chunks(
+                all_chunks=chunks,
+                model=str((request_data or {}).get("model") or ""),
+            )
+        except (AttributeError, TypeError, ValueError):
+            return None
+
+    def build_block_sse_chunks(
+        self,
+        exc: "ModifyResponseException",
+        stream_started: bool = False,
+        responses_so_far: Optional[list[Any]] = None,
+    ) -> list[bytes]:
+        """
+        Build an Anthropic SSE sequence delivering the guardrail block message
+        and terminating the stream cleanly.
+
+        - ``stream_started`` False (buffered / pre-stream): nothing has been
+          sent, so emit a complete standalone message (message_start ->
+          content_block_* -> message_delta -> message_stop) via
+          FakeAnthropicMessagesStreamIterator, the same converter the
+          /v1/messages pre-stream block handler uses.
+        - ``stream_started`` True (sampling / detect-only end-of-stream): real
+          chunks were already sent, so *continue* the in-progress message --
+          close the open content block, append the block message as a new text
+          block, then end the message. Emitting a second ``message_start`` here
+          would make Anthropic clients reject the stream.
+        """
+        if stream_started:
+            return self._block_continuation_chunks(exc, responses_so_far or [])
+        return self._standalone_block_chunks(exc)
+
+    def _standalone_block_chunks(self, exc: "ModifyResponseException") -> list[bytes]:
+        import uuid
+
+        from litellm.llms.anthropic.experimental_pass_through.messages.fake_stream_iterator import (
+            FakeAnthropicMessagesStreamIterator,
+        )
+        from litellm.llms.base_llm.guardrail_translation.utils import (
+            blocked_response_usage,
+        )
+        from litellm.types.utils import AnthropicMessagesResponse
+
+        block_response = AnthropicMessagesResponse(
+            id=f"msg_{uuid.uuid4()}",
+            type="message",
+            role="assistant",
+            content=[{"type": "text", "text": exc.message}],
+            model=exc.model,
+            stop_reason="end_turn",
+            usage=blocked_response_usage(getattr(exc, "original_response", None)),
+        )
+        return list(FakeAnthropicMessagesStreamIterator(response=block_response))
+
+    def _block_continuation_chunks(self, exc: "ModifyResponseException", responses_so_far: list[Any]) -> list[bytes]:
+        """Continue an already-started message: close the open content block,
+        append the block message as a new text block, then end the message --
+        without a second message_start."""
+
+        from litellm.llms.base_llm.guardrail_translation.utils import (
+            blocked_response_usage,
+        )
+
+        def _sse(event_type: str, payload: dict) -> bytes:
+            return f"event: {event_type}\ndata: {json.dumps(payload)}\n\n".encode()
+
+        output_tokens = blocked_response_usage(getattr(exc, "original_response", None))["output_tokens"]
+        open_index, max_index = self._content_block_state(responses_so_far)
+        new_index = (max_index + 1) if max_index is not None else 0
+        chunks: list[bytes] = []
+        if open_index is not None:
+            chunks.append(_sse("content_block_stop", {"type": "content_block_stop", "index": open_index}))
+        chunks += [
+            _sse(
+                "content_block_start",
+                {
+                    "type": "content_block_start",
+                    "index": new_index,
+                    "content_block": {"type": "text", "text": ""},
+                },
+            ),
+            _sse(
+                "content_block_delta",
+                {
+                    "type": "content_block_delta",
+                    "index": new_index,
+                    "delta": {"type": "text_delta", "text": exc.message},
+                },
+            ),
+            _sse("content_block_stop", {"type": "content_block_stop", "index": new_index}),
+            _sse(
+                "message_delta",
+                {
+                    "type": "message_delta",
+                    "delta": {"stop_reason": "end_turn", "stop_sequence": None},
+                    "usage": {"output_tokens": output_tokens},
+                },
+            ),
+            _sse("message_stop", {"type": "message_stop"}),
+        ]
+        return chunks
+
+    @staticmethod
+    def _content_block_state(
+        responses_so_far: list[Any],
+    ) -> tuple[Optional[int], Optional[int]]:
+        """From the SSE chunks already sent to the client, return (open
+        content-block index or None, highest content-block index seen or None).
+
+        A single streamed item may bundle multiple SSE events (raw bytes) or be
+        an already-parsed event dict, so every event across every item is
+        considered -- matching how ``get_streaming_string_so_far`` reads the
+        same stream."""
+        open_indices: set[int] = set()
+        max_index: Optional[int] = None
+        for item in responses_so_far:
+            for data in AnthropicMessagesHandler._iter_sse_events(item):
+                event_type = data.get("type")
+                index = data.get("index")
+                if not isinstance(index, int):
+                    continue
+                if event_type == "content_block_start":
+                    open_indices.add(index)
+                    max_index = index if max_index is None else max(max_index, index)
+                elif event_type == "content_block_stop":
+                    open_indices.discard(index)
+        open_index = max(open_indices) if open_indices else None
+        return open_index, max_index
+
+    @staticmethod
+    def _iter_sse_events(item: Any) -> list[dict]:
+        """Yield the event-data dicts in one stream chunk.
+
+        Handles both formats this stream can carry (see
+        ``get_streaming_string_so_far``): raw SSE ``bytes`` -- which may bundle
+        several events separated by a blank line -- and an already-parsed event
+        ``dict``."""
+        if isinstance(item, dict):
+            return [item]
+        if not isinstance(item, (bytes, bytearray)):
+            return []
+        events: list[dict] = []
+        for block in item.decode("utf-8", errors="replace").split("\n\n"):
+            for line in block.split("\n"):
+                line = line.strip()
+                if not line.startswith("data:"):
+                    continue
+                try:
+                    parsed = json.loads(line[len("data:") :].strip())
+                except json.JSONDecodeError:
+                    continue
+                if isinstance(parsed, dict):
+                    events.append(parsed)
+        return events
+
     def _translate_to_openai(self, data: dict) -> ChatCompletionRequest:
         """Translate Anthropic request to OpenAI chat completion format."""
         (
@@ -406,6 +573,8 @@ class AnthropicMessagesHandler(BaseTranslation):
 
         Get the string so far, check the apply guardrail to the string so far, and return the list of responses so far.
         """
+        from litellm.integrations.custom_guardrail import ModifyResponseException
+
         has_ended = self._check_streaming_has_ended(responses_so_far)
         if has_ended:
             # build the model response from the responses_so_far
@@ -430,25 +599,35 @@ class AnthropicMessagesHandler(BaseTranslation):
                 if tool_calls_list:
                     guardrail_inputs["tool_calls"] = tool_calls_list
 
-                _guardrailed_inputs = (
-                    await guardrail_to_apply.apply_guardrail(  # allow rejecting the response, if invalid
+                try:
+                    _guardrailed_inputs = await guardrail_to_apply.apply_guardrail(
                         inputs=guardrail_inputs,
                         request_data=request_data if request_data is not None else {},
                         input_type="response",
                         logging_obj=litellm_logging_obj,
                     )
-                )
+                except ModifyResponseException as e:
+                    if e.original_response is None:
+                        e.original_response = built_response or self._build_streaming_usage_response(
+                            responses_so_far, request_data
+                        )
+                    raise
             else:
                 verbose_proxy_logger.debug("Skipping output guardrail - model response has no choices")
             return responses_so_far
 
         string_so_far = self.get_streaming_string_so_far(responses_so_far)
-        _guardrailed_inputs = await guardrail_to_apply.apply_guardrail(  # allow rejecting the response, if invalid
-            inputs={"texts": [string_so_far]},
-            request_data=request_data if request_data is not None else {},
-            input_type="response",
-            logging_obj=litellm_logging_obj,
-        )
+        try:
+            _guardrailed_inputs = await guardrail_to_apply.apply_guardrail(
+                inputs={"texts": [string_so_far]},
+                request_data=request_data if request_data is not None else {},
+                input_type="response",
+                logging_obj=litellm_logging_obj,
+            )
+        except ModifyResponseException as e:
+            if e.original_response is None:
+                e.original_response = self._build_streaming_usage_response(responses_so_far, request_data)
+            raise
         return responses_so_far
 
     def _prepare_request_data(
diff --git a/litellm/llms/base_llm/guardrail_translation/base_translation.py b/litellm/llms/base_llm/guardrail_translation/base_translation.py
index 68db36b529e..6c41b46cfa0 100644
--- a/litellm/llms/base_llm/guardrail_translation/base_translation.py
+++ b/litellm/llms/base_llm/guardrail_translation/base_translation.py
@@ -2,7 +2,10 @@ from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 if TYPE_CHECKING:
-    from litellm.integrations.custom_guardrail import CustomGuardrail
+    from litellm.integrations.custom_guardrail import (
+        CustomGuardrail,
+        ModifyResponseException,
+    )
     from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
     from litellm.proxy._types import UserAPIKeyAuth
     from litellm.types.llms.openai import AllMessageValues
@@ -98,6 +101,30 @@ class BaseTranslation(ABC):
         """
         return responses_so_far
 
+    def build_block_sse_chunks(
+        self,
+        exc: "ModifyResponseException",
+        stream_started: bool = False,
+        responses_so_far: Optional[list[Any]] = None,
+    ) -> Optional[list[bytes]]:
+        """
+        Build the streaming chunks that deliver a guardrail block message and
+        cleanly terminate the stream in this provider's wire format.
+
+        ``stream_started`` is True when real chunks were already sent to the
+        client: the result must *continue* the in-progress message (e.g. close
+        the open content block and append the block message) rather than start
+        a new one, which clients reject. ``responses_so_far`` provides the prior
+        chunks needed to do so. When False, nothing has been sent and a
+        standalone block message is emitted.
+
+        Returns None when the format has no safe terminator; the caller then
+        re-raises ``exc`` so the proxy can surface a clean error instead.
+        Override in provider subclasses that support synthesizing a block
+        stream.
+        """
+        return None
+
     def get_structured_messages(self, data: dict) -> Optional[List["AllMessageValues"]]:
         """
         Convert request data to OpenAI-spec structured messages.
diff --git a/litellm/llms/base_llm/guardrail_translation/utils.py b/litellm/llms/base_llm/guardrail_translation/utils.py
index 97ece6b5eab..8a06dd4ea52 100644
--- a/litellm/llms/base_llm/guardrail_translation/utils.py
+++ b/litellm/llms/base_llm/guardrail_translation/utils.py
@@ -1,10 +1,100 @@
 from __future__ import annotations
 
-from typing import Any, List
+import json
+from typing import Any, List, Optional
 
+from litellm.types.llms.anthropic_messages.anthropic_response import AnthropicUsage
 from litellm.types.llms.openai import AllMessageValues
 
 
+def _anthropic_stream_chunk_events(item: Any) -> list[dict]:
+    if isinstance(item, dict):
+        return [item]
+    if isinstance(item, bytes):
+        chunk = item.decode("utf-8", errors="replace")
+    elif isinstance(item, str):
+        chunk = item
+    else:
+        return []
+
+    events: list[dict] = []
+    for block in chunk.split("\n\n"):
+        for line in block.splitlines():
+            stripped = line.strip()
+            if not stripped.startswith("data:"):
+                continue
+            payload = stripped[len("data:") :].strip()
+            if not payload or payload == "[DONE]":
+                continue
+            try:
+                parsed = json.loads(payload)
+            except json.JSONDecodeError:
+                continue
+            if isinstance(parsed, dict):
+                events.append(parsed)
+    return events
+
+
+def _usage_from_anthropic_stream_chunks(original_response: list[Any]) -> Optional[AnthropicUsage]:
+    input_tokens = 0
+    output_tokens = 0
+    found_usage = False
+
+    for item in original_response:
+        for event in _anthropic_stream_chunk_events(item):
+            event_type = event.get("type")
+            if event_type == "message_start":
+                message = event.get("message") or {}
+                usage_obj = message.get("usage") or {}
+            elif event_type == "message_delta":
+                usage_obj = event.get("usage") or {}
+            else:
+                usage_obj = {}
+            if not isinstance(usage_obj, dict):
+                continue
+            if usage_obj.get("input_tokens") is not None:
+                input_tokens = int(usage_obj.get("input_tokens") or 0)
+                found_usage = True
+            if usage_obj.get("output_tokens") is not None:
+                output_tokens = int(usage_obj.get("output_tokens") or 0)
+                found_usage = True
+
+    if not found_usage:
+        return None
+    return AnthropicUsage(input_tokens=input_tokens, output_tokens=output_tokens)
+
+
+def blocked_response_usage(original_response: Optional[Any]) -> AnthropicUsage:
+    """
+    Token usage for a synthetic guardrail-blocked response.
+
+    A post-call block replaces the LLM's response with the violation message,
+    but the upstream call already consumed tokens -- report that real usage
+    (carried on ``ModifyResponseException.original_response``) rather than
+    discarding it. Pre-call blocks never invoked the LLM (no original_response),
+    so usage is zero.
+    """
+    usage_obj: Any = None
+    if isinstance(original_response, list):
+        stream_usage = _usage_from_anthropic_stream_chunks(original_response)
+        if stream_usage is not None:
+            return stream_usage
+    elif isinstance(original_response, dict):
+        usage_obj = original_response.get("usage")
+    elif original_response is not None:
+        usage_obj = getattr(original_response, "usage", None)
+
+    def _tokens(key: str, fallback_key: str) -> int:
+        if isinstance(usage_obj, dict):
+            return int(usage_obj.get(key, usage_obj.get(fallback_key, 0)) or 0)
+        return int(getattr(usage_obj, key, getattr(usage_obj, fallback_key, 0)) or 0)
+
+    return AnthropicUsage(
+        input_tokens=_tokens("input_tokens", "prompt_tokens"),
+        output_tokens=_tokens("output_tokens", "completion_tokens"),
+    )
+
+
 def effective_skip_system_message_for_guardrail(guardrail_to_apply: Any) -> bool:
     per = getattr(guardrail_to_apply, "skip_system_message_in_guardrail", None)
     if per is not None:
diff --git a/litellm/llms/openai/responses/guardrail_translation/handler.py b/litellm/llms/openai/responses/guardrail_translation/handler.py
index 6ac33ffa44a..d1323b1a2bf 100644
--- a/litellm/llms/openai/responses/guardrail_translation/handler.py
+++ b/litellm/llms/openai/responses/guardrail_translation/handler.py
@@ -45,6 +45,7 @@ from litellm.types.llms.openai import (
     AllMessageValues,
     ChatCompletionToolCallChunk,
     ChatCompletionToolParam,
+    ResponsesAPIStreamEvents,
 )
 from litellm.types.responses.main import (
     GenericResponseOutputItem,
@@ -586,7 +587,14 @@ class OpenAIResponsesHandler(BaseTranslation):
         """
         Check if the streaming has ended.
         """
-        return all(response.choices[0].finish_reason is not None for response in responses_so_far)
+        if not responses_so_far:
+            return False
+        terminal_types = {
+            ResponsesAPIStreamEvents.RESPONSE_COMPLETED.value,
+            ResponsesAPIStreamEvents.RESPONSE_FAILED.value,
+            ResponsesAPIStreamEvents.RESPONSE_INCOMPLETE.value,
+        }
+        return responses_so_far[-1].get("type") in terminal_types
 
     def get_streaming_string_so_far(self, responses_so_far: List[Any]) -> str:
         """
diff --git a/litellm/proxy/anthropic_endpoints/endpoints.py b/litellm/proxy/anthropic_endpoints/endpoints.py
index 71acc1f3106..92279a9e685 100644
--- a/litellm/proxy/anthropic_endpoints/endpoints.py
+++ b/litellm/proxy/anthropic_endpoints/endpoints.py
@@ -12,6 +12,9 @@ from litellm.integrations.custom_guardrail import ModifyResponseException
 from litellm.llms.anthropic.experimental_pass_through.context_management import (
     AnthropicContextManagementError,
 )
+from litellm.llms.base_llm.guardrail_translation.utils import (
+    blocked_response_usage as _blocked_response_usage,
+)
 from litellm.proxy._types import *
 from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
 from litellm.proxy.common_request_processing import (
@@ -134,6 +137,10 @@ async def anthropic_response(
 
         from litellm.types.utils import AnthropicMessagesResponse
 
+        # Report the blocked LLM response's real token usage (carried on the
+        # exception) instead of discarding it; zero for pre-call blocks.
+        _usage = _blocked_response_usage(e.original_response)
+
         _anthropic_response = AnthropicMessagesResponse(
             id=f"msg_{str(uuid.uuid4())}",
             type="message",
@@ -141,7 +148,7 @@ async def anthropic_response(
             content=[{"type": "text", "text": e.message}],
             model=e.model,
             stop_reason="end_turn",
-            usage={"input_tokens": 0, "output_tokens": 0},
+            usage=_usage,
         )
 
         if data.get("stream", None) is not None and data["stream"] is True:
diff --git a/litellm/proxy/guardrails/guardrail_hooks/unified_guardrail/unified_guardrail.py b/litellm/proxy/guardrails/guardrail_hooks/unified_guardrail/unified_guardrail.py
index 79c29670d93..e0b387e92c0 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/unified_guardrail/unified_guardrail.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/unified_guardrail/unified_guardrail.py
@@ -8,7 +8,7 @@ Unified Guardrail, leveraging LiteLLM's /applyGuardrail endpoint
 
 import copy
 import json
-from typing import Any, AsyncGenerator, List, Optional, Union
+from typing import TYPE_CHECKING, Any, AsyncGenerator, List, Optional, Union
 
 from fastapi import HTTPException
 
@@ -23,6 +23,11 @@ from litellm.proxy._types import UserAPIKeyAuth
 from litellm.types.guardrails import GuardrailEventHooks
 from litellm.types.utils import CallTypes, CallTypesLiteral
 
+if TYPE_CHECKING:
+    # Imported lazily at runtime (inside the streaming hook) to avoid a
+    # module-level cyclic import with litellm.integrations.custom_guardrail.
+    from litellm.integrations.custom_guardrail import ModifyResponseException
+
 # Call types that use NDJSON streaming (A2A); guardrail HTTPException is emitted as in-stream error
 A2A_CALL_TYPES = (CallTypes.asend_message, CallTypes.send_message)
 
@@ -197,6 +202,10 @@ class UnifiedLLMGuardrails(CustomLogger):
         )
         from litellm.types.guardrails import GuardrailEventHooks
 
+        # Local import avoids a module-level cyclic import with
+        # litellm.integrations.custom_guardrail.
+        from litellm.integrations.custom_guardrail import ModifyResponseException
+
         guardrail_to_apply: CustomGuardrail = data.pop("guardrail_to_apply", None)
 
         if guardrail_to_apply is None:
@@ -238,18 +247,51 @@ class UnifiedLLMGuardrails(CustomLogger):
 
         endpoint_translation = endpoint_guardrail_translation_mappings[CallTypes(call_type)]()
 
-        response = await endpoint_translation.process_output_response(
-            response=response,  # type: ignore
-            guardrail_to_apply=guardrail_to_apply,
-            litellm_logging_obj=data.get("litellm_logging_obj"),
-            user_api_key_dict=user_api_key_dict,
-            request_data=data,
-        )
+        try:
+            response = await endpoint_translation.process_output_response(
+                response=response,  # type: ignore
+                guardrail_to_apply=guardrail_to_apply,
+                litellm_logging_obj=data.get("litellm_logging_obj"),
+                user_api_key_dict=user_api_key_dict,
+                request_data=data,
+            )
+        except ModifyResponseException as e:
+            # The guardrail blocked the response. Attach the original LLM
+            # response so the endpoint handler can report its real token usage
+            # instead of discarding it (the block replaces the content, but the
+            # upstream call already consumed those tokens).
+            if e.original_response is None:
+                e.original_response = response
+            raise
         # Add guardrail to applied guardrails header
         add_guardrail_to_applied_guardrails_header(request_data=data, guardrail_name=guardrail_to_apply.guardrail_name)
 
         return response
 
+    async def _handle_streaming_block(
+        self,
+        exc: "ModifyResponseException",
+        endpoint_translation: Any,
+        stream_started: bool,
+        responses_so_far: list[Any],
+    ) -> AsyncGenerator[Any, None]:
+        """
+        Terminate a streamed response cleanly when a guardrail blocks it.
+
+        Format-agnostic routing: delegates to the provider translation handler's
+        ``build_block_sse_chunks`` (see ``BaseTranslation.build_block_sse_chunks``
+        for the ``stream_started`` / ``responses_so_far`` contract). When the
+        format has no safe terminator the handler returns None and we re-raise
+        ``exc`` so the proxy can surface a clean error.
+        """
+        block_chunks = endpoint_translation.build_block_sse_chunks(
+            exc, stream_started=stream_started, responses_so_far=responses_so_far
+        )
+        if block_chunks is None:
+            raise exc
+        for chunk in block_chunks:
+            yield chunk
+
     async def async_post_call_streaming_iterator_hook(
         self,
         user_api_key_dict: UserAPIKeyAuth,
@@ -271,26 +313,53 @@ class UnifiedLLMGuardrails(CustomLogger):
 
         global endpoint_guardrail_translation_mappings
 
+        # Local import avoids a module-level cyclic import with
+        # litellm.integrations.custom_guardrail.
+        from litellm.integrations.custom_guardrail import ModifyResponseException
+
         guardrail_to_apply: CustomGuardrail = request_data.pop("guardrail_to_apply", None)
 
-        # Get streaming configuration from guardrail or optional_params
-        sampling_rate = 5
-        end_of_stream_only = False  # If True, only apply guardrail at end of stream
+        # Get streaming configuration. Resolution order (later wins): default
+        # < guardrail attribute < guardrail_config dict < this callback's
+        # optional_params.
+        def _streaming_flag(name: str, default: Any) -> Any:
+            value = default
+            if guardrail_to_apply is not None:
+                value = getattr(guardrail_to_apply, name, value)
+                config = getattr(guardrail_to_apply, "guardrail_config", {})
+                if isinstance(config, dict):
+                    value = config.get(name, value)
+            return self.optional_params.get(name, value)
 
-        if guardrail_to_apply is not None:
-            # Check direct attributes on guardrail first
-            sampling_rate = getattr(guardrail_to_apply, "streaming_sampling_rate", sampling_rate)
-            end_of_stream_only = getattr(guardrail_to_apply, "streaming_end_of_stream_only", end_of_stream_only)
+        sampling_rate = _streaming_flag("streaming_sampling_rate", 5)
+        # Only apply the guardrail at end of stream (not per chunk).
+        end_of_stream_only = _streaming_flag("streaming_end_of_stream_only", False)
+        # Withhold every chunk until end-of-stream moderation passes, then
+        # release the original chunks (clean) or only the block message
+        # (blocked) -- moderating the whole response *before* any content
+        # reaches the client. Only safe for allow/block guardrails: on
+        # release the original chunks are replayed as-is, so a
+        # content-rewriting guardrail (e.g. PII masking) would leak
+        # unredacted content. Guarded below via mask_response_content.
+        buffer_until_moderated = _streaming_flag("streaming_buffer_until_moderated", False)
 
-            # Also check guardrail_config dict if present
-            guardrail_config = getattr(guardrail_to_apply, "guardrail_config", {})
-            if isinstance(guardrail_config, dict):
-                sampling_rate = guardrail_config.get("streaming_sampling_rate", sampling_rate)
-                end_of_stream_only = guardrail_config.get("streaming_end_of_stream_only", end_of_stream_only)
+        if (
+            buffer_until_moderated
+            and guardrail_to_apply is not None
+            and getattr(guardrail_to_apply, "mask_response_content", False)
+        ):
+            verbose_proxy_logger.warning(
+                "UnifiedLLMGuardrails: streaming_buffer_until_moderated is disabled for %s "
+                "because mask_response_content=True -- buffered replay would release "
+                "unredacted original chunks instead of the moderated output.",
+                guardrail_to_apply.guardrail_name,
+            )
+            buffer_until_moderated = False
 
-        # Also check optional_params as fallback
-        sampling_rate = self.optional_params.get("streaming_sampling_rate", sampling_rate)
-        end_of_stream_only = self.optional_params.get("streaming_end_of_stream_only", end_of_stream_only)
+        # Buffering can only moderate the assembled response, so it always
+        # defers to end-of-stream.
+        if buffer_until_moderated:
+            end_of_stream_only = True
 
         if guardrail_to_apply is None:
             async for item in response:
@@ -315,6 +384,12 @@ class UnifiedLLMGuardrails(CustomLogger):
         call_type = None
         chunk_counter = 0
         responses_so_far: List[Any] = []
+        responses_yielded: list[Any] = []
+        pending_end_of_stream_items: list[Any] = []
+        # Whether any real response chunk has been forwarded to the client.
+        # Drives how a block terminates the stream: continue the in-progress
+        # message (True) vs emit a standalone block message (False, buffered).
+        chunks_yielded = False
 
         async for item in response:
             chunk_counter += 1
@@ -336,9 +411,22 @@ class UnifiedLLMGuardrails(CustomLogger):
                     yield remaining_item
                 return
 
-            # If end_of_stream_only mode, yield chunks without processing
+            # If end_of_stream_only mode, yield chunks without processing.
+            # When buffering, withhold them instead -- they are released (or
+            # replaced by the block message) only after end-of-stream
+            # moderation runs below.
             if end_of_stream_only:
-                yield item
+                if not buffer_until_moderated:
+                    endpoint_translation = endpoint_guardrail_translation_mappings[CallTypes(call_type)]()
+                    stream_has_ended = hasattr(
+                        endpoint_translation, "_check_streaming_has_ended"
+                    ) and endpoint_translation._check_streaming_has_ended(responses_so_far)
+                    if pending_end_of_stream_items or stream_has_ended:
+                        pending_end_of_stream_items.append(item)
+                    else:
+                        chunks_yielded = True
+                        responses_yielded.append(item)
+                        yield item
                 continue
 
             # Process chunk based on sampling rate
@@ -368,6 +456,26 @@ class UnifiedLLMGuardrails(CustomLogger):
                         user_api_key_dict=user_api_key_dict,
                         request_data=request_data,
                     )
+                except ModifyResponseException as e:
+                    if e.original_response is None:
+                        e.original_response = responses_so_far
+                    # Guardrail blocked the response mid-stream. Emit a clean
+                    # terminating SSE sequence delivering the block message
+                    # instead of letting the exception propagate into a bare
+                    # `data: {"error": ...}` blob (which truncates the stream).
+                    # Chunks have already been forwarded here, so the block
+                    # continues the in-progress message (stream_started=True).
+                    # The current chunk was appended to responses_so_far but not
+                    # yet yielded, so exclude it: the continuation must reflect
+                    # only what the client has actually received.
+                    async for block_chunk in self._handle_streaming_block(
+                        e,
+                        endpoint_translation,
+                        stream_started=chunks_yielded,
+                        responses_so_far=responses_yielded,
+                    ):
+                        yield block_chunk
+                    return
                 except HTTPException as e:
                     # Response already started (we already yielded chunks); cannot send 400.
                     # For A2A (NDJSON), yield an in-stream JSON-RPC error so the client sees it.
@@ -394,8 +502,12 @@ class UnifiedLLMGuardrails(CustomLogger):
                         yield error_chunk
                         return
                     raise
+                chunks_yielded = True
+                responses_yielded.append(original_item)
                 yield original_item
             else:
+                chunks_yielded = True
+                responses_yielded.append(item)
                 yield item
 
         # Stream has ended - do final processing with all collected chunks
@@ -408,6 +520,15 @@ class UnifiedLLMGuardrails(CustomLogger):
 
             endpoint_translation = endpoint_guardrail_translation_mappings[CallTypes(call_type)]()
 
+            # When buffering, snapshot the original chunks before moderation.
+            # A shallow copy suffices: end-of-stream
+            # process_output_streaming_response builds a separate assembled
+            # response (it does not mutate the individual chunks in place), and
+            # the chunks themselves are replayed verbatim -- so we only need to
+            # preserve the list, not clone every chunk (deepcopy would double
+            # peak memory for large responses).
+            buffered_items = list(responses_so_far) if buffer_until_moderated else None
+
             try:
                 await endpoint_translation.process_output_streaming_response(
                     responses_so_far=responses_so_far,
@@ -416,6 +537,28 @@ class UnifiedLLMGuardrails(CustomLogger):
                     user_api_key_dict=user_api_key_dict,
                     request_data=request_data,
                 )
+                # Moderation passed: release the withheld original chunks.
+                if buffered_items is not None:
+                    for buffered_item in buffered_items:
+                        yield buffered_item
+                for pending_item in pending_end_of_stream_items:
+                    responses_yielded.append(pending_item)
+                    yield pending_item
+            except ModifyResponseException as e:
+                if e.original_response is None:
+                    e.original_response = responses_so_far
+                # Block detected during end-of-stream processing. Emit a clean
+                # terminating SSE sequence with the block message rather than
+                # propagating into a bare error blob that truncates the stream.
+                # The withheld original chunks are never released.
+                async for block_chunk in self._handle_streaming_block(
+                    e,
+                    endpoint_translation,
+                    stream_started=bool(responses_yielded),
+                    responses_so_far=responses_yielded,
+                ):
+                    yield block_chunk
+                return
             except HTTPException as e:
                 if call_type is not None and CallTypes(call_type) in A2A_CALL_TYPES:
                     request_id = _get_a2a_request_id(responses_so_far, request_data)
diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index a29acf3b06f..bb925799bb8 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -8361,6 +8361,22 @@ async def model_info(
     )
 
 
+def _blocked_response_usage(original_response: Optional[Any]) -> "litellm.Usage":
+    """
+    Token usage for a synthetic guardrail-blocked response.
+
+    A post-call block replaces the LLM's response with the violation message,
+    but the upstream call already consumed tokens -- report that real usage
+    (carried on ``ModifyResponseException.original_response``) rather than
+    discarding it. Pre-call blocks never invoked the LLM (no original_response),
+    so usage is zero.
+    """
+    usage = getattr(original_response, "usage", None) if original_response is not None else None
+    if isinstance(usage, litellm.Usage):
+        return usage
+    return litellm.Usage(prompt_tokens=0, completion_tokens=0, total_tokens=0)
+
+
 @router.post(
     "/v1/chat/completions",
     dependencies=[Depends(user_api_key_auth)],
@@ -8467,6 +8483,9 @@ async def chat_completion(
         _chat_response.model = e.model  # type: ignore
         _chat_response.choices[0].message.content = e.message  # type: ignore
         _chat_response.choices[0].finish_reason = "content_filter"  # type: ignore
+        # Report the blocked LLM response's real usage (set before the stream
+        # branch so both paths carry it); zero for pre-call blocks.
+        _chat_response.usage = _blocked_response_usage(e.original_response)  # type: ignore
 
         if data.get("stream", None) is not None and data["stream"] is True:
             _iterator = litellm.utils.ModelResponseIterator(model_response=_chat_response, convert_to_delta=True)
@@ -8488,8 +8507,6 @@ async def chat_completion(
                 media_type="text/event-stream",
                 status_code=200,  # Return 200 for passthrough mode
             )
-        _usage = litellm.Usage(prompt_tokens=0, completion_tokens=0, total_tokens=0)
-        _chat_response.usage = _usage  # type: ignore
         return _chat_response
     except RejectedRequestError as e:
         _data = e.request_data
@@ -8618,11 +8635,7 @@ async def completion(
             # Set text attribute dynamically for text completion format
             setattr(_text_response.choices[0], "text", e.message)
             _text_response.model = e.model  # type: ignore[assignment]
-            _usage = litellm.Usage(
-                prompt_tokens=0,
-                completion_tokens=0,
-                total_tokens=0,
-            )
+            _usage = _blocked_response_usage(e.original_response)
             # Set usage attribute dynamically (ModelResponse accepts usage in __init__ but it's not in type definition)
             setattr(_text_response, "usage", _usage)
             _iterator = litellm.utils.ModelResponseIterator(model_response=_text_response, convert_to_delta=True)
@@ -8647,11 +8660,7 @@ async def completion(
             _response = litellm.TextCompletionResponse()
             _response.choices[0].text = e.message
             _response.model = e.model  # type: ignore
-            _usage = litellm.Usage(
-                prompt_tokens=0,
-                completion_tokens=0,
-                total_tokens=0,
-            )
+            _usage = _blocked_response_usage(e.original_response)
             _response.usage = _usage  # type: ignore
             return _response
     except RejectedRequestError as e:
diff --git a/tests/test_litellm/integrations/test_prometheus_budget_metrics_timeout.py b/tests/test_litellm/integrations/test_prometheus_budget_metrics_timeout.py
new file mode 100644
index 00000000000..a4d245e9dc0
--- /dev/null
+++ b/tests/test_litellm/integrations/test_prometheus_budget_metrics_timeout.py
@@ -0,0 +1,168 @@
+"""
+Unit tests for the per-request budget-metric emission timeout in
+PrometheusLogger._increment_remaining_budget_metrics.
+
+A slow Redis/DB lookup in one of the budget branches must not let the gather run
+unbounded; it is wrapped in asyncio.wait_for so the success-logging coroutine
+cannot exceed the LoggingWorker watchdog and get the whole event cancelled.
+"""
+
+import asyncio
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from prometheus_client import REGISTRY
+
+from litellm.integrations.prometheus import (
+    PrometheusLogger,
+    _DEFAULT_BUDGET_METRICS_PER_REQUEST_TIMEOUT,
+    _get_budget_metrics_per_request_timeout,
+)
+
+TIMEOUT_ENV = "PROMETHEUS_BUDGET_METRICS_PER_REQUEST_TIMEOUT"
+
+
+@pytest.fixture(autouse=True)
+def cleanup_prometheus_registry():
+    collectors = list(REGISTRY._collector_to_names.keys())
+    for collector in collectors:
+        try:
+            REGISTRY.unregister(collector)
+        except Exception:
+            pass
+    yield
+    collectors = list(REGISTRY._collector_to_names.keys())
+    for collector in collectors:
+        try:
+            REGISTRY.unregister(collector)
+        except Exception:
+            pass
+
+
+@pytest.fixture
+def prometheus_logger():
+    return PrometheusLogger()
+
+
+def _call_increment(logger: PrometheusLogger):
+    return logger._increment_remaining_budget_metrics(
+        user_api_team="team-1",
+        user_api_team_alias="team-alias",
+        user_api_key="key-1",
+        user_api_key_alias="key-alias",
+        litellm_params={"metadata": {}},
+        response_cost=0.01,
+        user_id="user-1",
+        user_api_key_org_id="org-1",
+    )
+
+
+def _skip_logged(debug_mock) -> bool:
+    return any("skipping" in str(call.args[0]) for call in debug_mock.call_args_list if call.args)
+
+
+@pytest.mark.asyncio
+async def test_budget_metric_emission_skips_on_timeout(prometheus_logger, monkeypatch):
+    """A branch slower than the timeout is skipped without propagating, and the
+    skip is logged instead of cancelling the success-logging event."""
+    monkeypatch.setenv(TIMEOUT_ENV, "0.05")
+
+    async def _slow_branch(**kwargs):
+        await asyncio.sleep(30)
+
+    prometheus_logger._set_api_key_budget_metrics_after_api_request = _slow_branch
+    prometheus_logger._set_team_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_user_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_org_budget_metrics_after_api_request = AsyncMock()
+
+    with patch("litellm.integrations.prometheus.verbose_logger") as mock_logger:
+        await _call_increment(prometheus_logger)
+
+    assert _skip_logged(mock_logger.debug)
+
+
+@pytest.mark.asyncio
+async def test_budget_metric_emission_completes_within_timeout(prometheus_logger, monkeypatch):
+    """With a generous timeout every branch is awaited and no skip is logged."""
+    monkeypatch.setenv(TIMEOUT_ENV, "5.0")
+
+    prometheus_logger._set_api_key_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_team_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_user_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_org_budget_metrics_after_api_request = AsyncMock()
+
+    with patch("litellm.integrations.prometheus.verbose_logger") as mock_logger:
+        await _call_increment(prometheus_logger)
+
+    assert prometheus_logger._set_api_key_budget_metrics_after_api_request.await_count == 1
+    assert prometheus_logger._set_team_budget_metrics_after_api_request.await_count == 1
+    assert prometheus_logger._set_user_budget_metrics_after_api_request.await_count == 1
+    assert prometheus_logger._set_org_budget_metrics_after_api_request.await_count == 1
+    assert not _skip_logged(mock_logger.debug)
+
+
+@pytest.mark.asyncio
+async def test_invalid_timeout_env_falls_back_to_default(prometheus_logger, monkeypatch):
+    """A malformed timeout env value must not raise (which would recreate the
+    failure mode); it falls back to the default and every branch still runs."""
+    monkeypatch.setenv(TIMEOUT_ENV, "not-a-number")
+
+    prometheus_logger._set_api_key_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_team_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_user_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_org_budget_metrics_after_api_request = AsyncMock()
+
+    await _call_increment(prometheus_logger)
+
+    assert prometheus_logger._set_api_key_budget_metrics_after_api_request.await_count == 1
+    assert prometheus_logger._set_org_budget_metrics_after_api_request.await_count == 1
+
+
+@pytest.mark.parametrize("value", ["not-a-number", "0", "-1", "nan", "inf", "-inf"])
+def test_unusable_timeout_env_falls_back_to_default(value, monkeypatch):
+    """Values that parse but disable or unbound the timeout (0, negative, nan,
+    inf) must fall back to the default instead of being used; otherwise they
+    either skip every emission or recreate the unbounded-wait failure mode."""
+    monkeypatch.setenv(TIMEOUT_ENV, value)
+
+    assert _get_budget_metrics_per_request_timeout() == _DEFAULT_BUDGET_METRICS_PER_REQUEST_TIMEOUT
+
+
+@pytest.mark.parametrize("value,expected", [("0.05", 0.05), ("5.0", 5.0), ("30", 30.0)])
+def test_valid_timeout_env_is_used(value, expected, monkeypatch):
+    """A finite positive value is parsed and returned unchanged."""
+    monkeypatch.setenv(TIMEOUT_ENV, value)
+
+    assert _get_budget_metrics_per_request_timeout() == expected
+
+
+def test_missing_timeout_env_uses_default(monkeypatch):
+    """With the env unset the default is returned."""
+    monkeypatch.delenv(TIMEOUT_ENV, raising=False)
+
+    assert _get_budget_metrics_per_request_timeout() == _DEFAULT_BUDGET_METRICS_PER_REQUEST_TIMEOUT
+
+
+@pytest.mark.asyncio
+async def test_outer_cancellation_still_propagates(prometheus_logger, monkeypatch):
+    """Only asyncio.TimeoutError is swallowed; an outer cancellation (cooperative
+    shutdown / watchdog) injected while awaiting must still propagate."""
+    monkeypatch.setenv(TIMEOUT_ENV, "30")
+
+    started = asyncio.Event()
+
+    async def _slow_branch(**kwargs):
+        started.set()
+        await asyncio.sleep(30)
+
+    prometheus_logger._set_api_key_budget_metrics_after_api_request = _slow_branch
+    prometheus_logger._set_team_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_user_budget_metrics_after_api_request = AsyncMock()
+    prometheus_logger._set_org_budget_metrics_after_api_request = AsyncMock()
+
+    task = asyncio.create_task(_call_increment(prometheus_logger))
+    await started.wait()
+    task.cancel()
+
+    with pytest.raises(asyncio.CancelledError):
+        await task
diff --git a/tests/test_litellm/proxy/anthropic_endpoints/test_endpoints.py b/tests/test_litellm/proxy/anthropic_endpoints/test_endpoints.py
index a4da4587b7f..69d90a8b59b 100644
--- a/tests/test_litellm/proxy/anthropic_endpoints/test_endpoints.py
+++ b/tests/test_litellm/proxy/anthropic_endpoints/test_endpoints.py
@@ -58,15 +58,71 @@ class TestAnthropicEndpoints(unittest.TestCase):
         self.assertEqual(result, expected_result)
 
         # Assert safe_dumps was called for dictionary objects
-        mock_safe_dumps.assert_any_call(
-            {"type": "message_start", "message": {"id": "msg_123"}}
+        mock_safe_dumps.assert_any_call({"type": "message_start", "message": {"id": "msg_123"}})
+        mock_safe_dumps.assert_any_call({"type": "content_block_delta", "delta": {"text": "more data"}})
+        assert mock_safe_dumps.call_count == 2  # Called twice, once for each dict object
+
+
+class TestBlockedResponseUsage:
+    """Blocked responses report the blocked LLM response's real usage."""
+
+    def test_uses_original_response_usage(self):
+        from litellm.proxy.anthropic_endpoints.endpoints import _blocked_response_usage
+
+        # original_response is the AnthropicMessagesResponse the LLM produced
+        # before the guardrail blocked it; its usage is real.
+        original = {"usage": {"input_tokens": 31, "output_tokens": 9}}
+        assert _blocked_response_usage(original) == {
+            "input_tokens": 31,
+            "output_tokens": 9,
+        }
+
+    def test_zero_usage_when_no_original_response(self):
+        from litellm.proxy.anthropic_endpoints.endpoints import _blocked_response_usage
+
+        # Pre-call blocks never invoked the LLM -> nothing consumed.
+        assert _blocked_response_usage(None) == {
+            "input_tokens": 0,
+            "output_tokens": 0,
+        }
+
+    @pytest.mark.asyncio
+    async def test_blocked_endpoint_response_carries_original_usage(self):
+        """The /v1/messages block handler reports the blocked response's real
+        usage, carried on ModifyResponseException.original_response."""
+        from unittest.mock import AsyncMock, MagicMock
+
+        import litellm.proxy.anthropic_endpoints.endpoints as ep
+        import litellm.proxy.proxy_server as proxy_server
+        from litellm.integrations.custom_guardrail import ModifyResponseException
+
+        exc = ModifyResponseException(
+            message="blocked by guardrail",
+            model="claude-3-5-sonnet-20240620",
+            request_data={"messages": [{"role": "user", "content": "hi"}]},
+            guardrail_name="rubrik",
+            original_response={"usage": {"input_tokens": 12, "output_tokens": 5}},
         )
-        mock_safe_dumps.assert_any_call(
-            {"type": "content_block_delta", "delta": {"text": "more data"}}
-        )
-        assert (
-            mock_safe_dumps.call_count == 2
-        )  # Called twice, once for each dict object
+
+        with (
+            patch.object(ep, "_read_request_body", new=AsyncMock(return_value={})),
+            patch.object(
+                ep.ProxyBaseLLMRequestProcessing,
+                "base_process_llm_request",
+                new=AsyncMock(side_effect=exc),
+            ),
+            patch.object(proxy_server, "proxy_logging_obj") as mock_logging,
+        ):
+            mock_logging.post_call_failure_hook = AsyncMock()
+            response = await ep.anthropic_response(
+                fastapi_response=MagicMock(),
+                request=MagicMock(),
+                user_api_key_dict=MagicMock(),
+            )
+
+        assert response["content"][0]["text"] == "blocked by guardrail"
+        assert response["usage"] == {"input_tokens": 12, "output_tokens": 5}
+        mock_logging.post_call_failure_hook.assert_awaited_once()
 
 
 class TestEventLoggingBatchEndpoint:
@@ -159,9 +215,7 @@ class TestStripTotalTokens(unittest.TestCase):
 
         # SimpleNamespace mimics the .usage attribute access pattern; the
         # helper's contract: if .usage is dict-shaped, strip total_tokens.
-        response = SimpleNamespace(
-            usage={"input_tokens": 100, "output_tokens": 50, "total_tokens": 150}
-        )
+        response = SimpleNamespace(usage={"input_tokens": 100, "output_tokens": 50, "total_tokens": 150})
         _strip_total_tokens_from_anthropic_response(response)
         assert "total_tokens" not in response.usage
         assert response.usage == {"input_tokens": 100, "output_tokens": 50}
diff --git a/tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_anthropic_streaming_block.py b/tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_anthropic_streaming_block.py
new file mode 100644
index 00000000000..865b4164e5e
--- /dev/null
+++ b/tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_anthropic_streaming_block.py
@@ -0,0 +1,362 @@
+"""
+Regression tests for blocking an Anthropic streaming response from the
+unified guardrail post-call streaming iterator hook.
+
+When a guardrail's ``apply_guardrail`` raises ``ModifyResponseException`` while
+(or at the end of) an Anthropic ``/v1/messages`` stream is being relayed, the
+hook must emit a well-formed Anthropic SSE termination sequence carrying the
+block message - NOT a bare ``data: {"error": ...}`` blob that truncates the
+stream and causes the Anthropic SDK parser to discard the response.
+"""
+
+import json
+from typing import Any, List, Literal, Optional
+
+import pytest
+
+from litellm.integrations.custom_guardrail import (
+    CustomGuardrail,
+    ModifyResponseException,
+)
+from litellm.proxy._types import UserAPIKeyAuth
+from litellm.proxy.guardrails.guardrail_hooks.unified_guardrail.unified_guardrail import (
+    UnifiedLLMGuardrails,
+)
+from litellm.types.utils import GenericGuardrailAPIInputs
+
+BLOCK_MESSAGE = "Blocked by policy: this response was withheld."
+
+
+class _BlockingGuardrail(CustomGuardrail):
+    """Mock guardrail that always blocks by raising ModifyResponseException."""
+
+    async def apply_guardrail(
+        self,
+        inputs: GenericGuardrailAPIInputs,
+        request_data: dict,
+        input_type: Literal["request", "response"],
+        logging_obj: Optional[Any] = None,
+    ) -> GenericGuardrailAPIInputs:
+        raise ModifyResponseException(
+            message=BLOCK_MESSAGE,
+            model="claude-3-5-sonnet",
+            request_data=request_data,
+            guardrail_name=self.guardrail_name,
+        )
+
+
+def _sse_event(event_type: str, data: dict) -> bytes:
+    return f"event: {event_type}\ndata: {json.dumps(data)}\n\n".encode()
+
+
+async def _anthropic_stream(end: bool):
+    """Yield Anthropic SSE byte chunks. If end=True, include a terminating
+    message_delta (stop_reason set) so the hook's end-of-stream path runs."""
+    yield _sse_event(
+        "message_start",
+        {
+            "type": "message_start",
+            "message": {
+                "id": "msg_orig",
+                "type": "message",
+                "role": "assistant",
+                "model": "claude-3-5-sonnet",
+                "content": [],
+                "stop_reason": None,
+                "usage": {"input_tokens": 1, "output_tokens": 0},
+            },
+        },
+    )
+    yield _sse_event(
+        "content_block_start",
+        {
+            "type": "content_block_start",
+            "index": 0,
+            "content_block": {"type": "text", "text": ""},
+        },
+    )
+    for text in ["This ", "is ", "the ", "original ", "answer."]:
+        yield _sse_event(
+            "content_block_delta",
+            {
+                "type": "content_block_delta",
+                "index": 0,
+                "delta": {"type": "text_delta", "text": text},
+            },
+        )
+    if end:
+        yield _sse_event("content_block_stop", {"type": "content_block_stop", "index": 0})
+        yield _sse_event(
+            "message_delta",
+            {
+                "type": "message_delta",
+                "delta": {"stop_reason": "end_turn", "stop_sequence": None},
+                "usage": {"output_tokens": 5},
+            },
+        )
+        yield _sse_event("message_stop", {"type": "message_stop"})
+
+
+def _decode(chunks: List[Any]) -> str:
+    parts = []
+    for chunk in chunks:
+        parts.append(chunk.decode() if isinstance(chunk, bytes) else str(chunk))
+    return "".join(parts)
+
+
+def _parse_sse_event_types(raw: str) -> List[str]:
+    event_types = []
+    for block in raw.split("\n\n"):
+        for line in block.strip().split("\n"):
+            if line.startswith("data:"):
+                payload = line[len("data:") :].strip()
+                try:
+                    event_types.append(json.loads(payload).get("type"))
+                except json.JSONDecodeError:
+                    pass
+    return event_types
+
+
+async def _run_hook(end: bool, sampling_rate: int = 1, end_of_stream_only: bool = False) -> str:
+    guardrail = _BlockingGuardrail(guardrail_name="test-blocking-guardrail", event_hook="post_call")
+    # sampling_rate controls how many chunks are forwarded before the block
+    # fires: 1 blocks on the first chunk (nothing sent yet); >1 forwards earlier
+    # chunks first, exercising the mid-stream "continue the message" path.
+    guardrail.streaming_sampling_rate = sampling_rate
+    guardrail.streaming_end_of_stream_only = end_of_stream_only
+
+    unified_guardrail = UnifiedLLMGuardrails()
+    user_api_key_dict = UserAPIKeyAuth(api_key="test", request_route="/v1/messages")
+    request_data = {
+        "messages": [{"role": "user", "content": "hi"}],
+        "guardrail_to_apply": guardrail,
+        "metadata": {"guardrails": ["test-blocking-guardrail"]},
+    }
+
+    collected: List[Any] = []
+    async for chunk in unified_guardrail.async_post_call_streaming_iterator_hook(
+        user_api_key_dict=user_api_key_dict,
+        response=_anthropic_stream(end=end),
+        request_data=request_data,
+    ):
+        collected.append(chunk)
+    return _decode(collected)
+
+
+def _assert_clean_block_termination(raw: str) -> None:
+    # No bare error blob that would truncate the stream.
+    assert '"error"' not in raw, f"unexpected error blob in stream: {raw!r}"
+    # The block message is delivered as assistant text.
+    assert BLOCK_MESSAGE in raw, f"block message missing from stream: {raw!r}"
+    # A complete, parseable Anthropic SSE termination sequence is present.
+    event_types = _parse_sse_event_types(raw)
+    assert "message_start" in event_types
+    assert "content_block_delta" in event_types
+    # Exactly one message_start: a block must never inject a second
+    # message envelope into an already-started stream (clients reject it).
+    assert event_types.count("message_start") == 1, f"expected a single message_start, got: {event_types}"
+    assert event_types[-1] == "message_stop", f"stream did not end cleanly: {event_types}"
+    # message_delta carries a stop_reason.
+    assert any('"stop_reason"' in block and "message_delta" in block for block in raw.split("\n\n"))
+
+
+def _parse_sse_payloads(raw: str) -> List[dict]:
+    payloads = []
+    for block in raw.split("\n\n"):
+        for line in block.strip().split("\n"):
+            if line.startswith("data:"):
+                payload = line[len("data:") :].strip()
+                try:
+                    parsed = json.loads(payload)
+                except json.JSONDecodeError:
+                    continue
+                if isinstance(parsed, dict):
+                    payloads.append(parsed)
+    return payloads
+
+
+@pytest.mark.asyncio
+async def test_mid_stream_block_emits_clean_anthropic_sse():
+    """Per-chunk block: a clean SSE termination with the block message, no error blob."""
+    raw = await _run_hook(end=False)
+    _assert_clean_block_termination(raw)
+
+
+@pytest.mark.asyncio
+async def test_end_of_stream_block_emits_clean_anthropic_sse():
+    """End-of-stream block: same clean SSE termination guarantees."""
+    raw = await _run_hook(end=True)
+    _assert_clean_block_termination(raw)
+
+
+@pytest.mark.asyncio
+async def test_mid_stream_block_after_prior_chunks_continues_message():
+    """Regression: when real chunks were already forwarded (sampling_rate>1),
+    the block must continue the in-progress message, not start a second one."""
+    raw = await _run_hook(end=False, sampling_rate=5)
+    # Some original content was forwarded before the block...
+    assert "message_start" in raw
+    # ...and the block continues that same message (single message_start) with
+    # the block message appended, ending cleanly.
+    _assert_clean_block_termination(raw)
+
+
+@pytest.mark.asyncio
+async def test_end_of_stream_only_block_does_not_append_after_message_stop():
+    raw = await _run_hook(end=True, end_of_stream_only=True)
+    event_types = _parse_sse_event_types(raw)
+    message_delta_usages = [
+        payload.get("usage", {}).get("output_tokens")
+        for payload in _parse_sse_payloads(raw)
+        if payload.get("type") == "message_delta"
+    ]
+
+    assert BLOCK_MESSAGE in raw
+    assert event_types.count("message_stop") == 1
+    assert event_types[-1] == "message_stop"
+    assert message_delta_usages[-1] == 5
+
+
+def test_blocked_stream_reports_usage_from_original_chunks():
+    from litellm.integrations.custom_guardrail import ModifyResponseException
+    from litellm.llms.anthropic.chat.guardrail_translation.handler import (
+        AnthropicMessagesHandler,
+    )
+    from litellm.llms.base_llm.guardrail_translation.utils import (
+        blocked_response_usage,
+    )
+
+    original_chunks: List[Any] = [
+        _sse_event(
+            "message_start",
+            {
+                "type": "message_start",
+                "message": {
+                    "id": "msg_orig",
+                    "type": "message",
+                    "role": "assistant",
+                    "model": "claude-3-5-sonnet",
+                    "content": [],
+                    "stop_reason": None,
+                    "usage": {"input_tokens": 12, "output_tokens": 0},
+                },
+            },
+        ),
+        {"type": "message_delta", "delta": {"stop_reason": "end_turn"}, "usage": {"output_tokens": 5}},
+    ]
+    seen_chunks = [
+        _sse_event(
+            "content_block_start",
+            {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}},
+        )
+    ]
+    exc = ModifyResponseException(
+        message=BLOCK_MESSAGE,
+        model="claude-3-5-sonnet",
+        request_data={},
+        guardrail_name="g",
+        original_response=original_chunks,
+    )
+
+    usage = blocked_response_usage(original_chunks)
+    raw = b"".join(
+        AnthropicMessagesHandler().build_block_sse_chunks(exc, stream_started=True, responses_so_far=seen_chunks)
+    ).decode()
+    message_delta_usages = [
+        payload.get("usage", {}).get("output_tokens")
+        for payload in _parse_sse_payloads(raw)
+        if payload.get("type") == "message_delta"
+    ]
+
+    assert usage == {"input_tokens": 12, "output_tokens": 5}
+    assert message_delta_usages[-1] == 5
+
+
+class TestContentBlockState:
+    """`_content_block_state` must reflect the true open/last block index across
+    the two chunk formats the stream can carry (multi-event bytes, parsed dict),
+    so a mid-stream block closes/opens the right indices."""
+
+    def _handler(self):
+        from litellm.llms.anthropic.chat.guardrail_translation.handler import (
+            AnthropicMessagesHandler,
+        )
+
+        return AnthropicMessagesHandler()
+
+    def test_multi_event_bytes_chunk_is_fully_parsed(self):
+        # One item bundles start(0) + delta + stop(0): the block is already
+        # closed, so open_index is None (not 0) and max_index is 0.
+        bundled = (
+            _sse_event(
+                "content_block_start",
+                {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}},
+            )
+            + _sse_event(
+                "content_block_delta",
+                {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "hi"}},
+            )
+            + _sse_event("content_block_stop", {"type": "content_block_stop", "index": 0})
+        )
+        open_index, max_index = self._handler()._content_block_state([bundled])
+        assert open_index is None
+        assert max_index == 0
+
+    def test_open_block_across_separate_chunks(self):
+        chunks = [
+            _sse_event(
+                "content_block_start",
+                {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}},
+            ),
+            _sse_event("content_block_stop", {"type": "content_block_stop", "index": 0}),
+            _sse_event(
+                "content_block_start",
+                {"type": "content_block_start", "index": 1, "content_block": {"type": "text", "text": ""}},
+            ),
+        ]
+        open_index, max_index = self._handler()._content_block_state(chunks)
+        assert open_index == 1
+        assert max_index == 1
+
+    def test_dict_format_chunks_are_parsed(self):
+        # The backwards-compat parsed-dict format must be understood too.
+        chunks = [
+            {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}},
+            {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "x"}},
+        ]
+        open_index, max_index = self._handler()._content_block_state(chunks)
+        assert open_index == 0
+        assert max_index == 0
+
+    def test_continuation_closes_open_block_and_appends_after_it(self):
+        from litellm.integrations.custom_guardrail import ModifyResponseException
+
+        handler = self._handler()
+        # Client has seen an open text block at index 0.
+        seen = [
+            _sse_event(
+                "content_block_start",
+                {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}},
+            ),
+            _sse_event(
+                "content_block_delta",
+                {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "partial"}},
+            ),
+        ]
+        exc = ModifyResponseException(
+            message=BLOCK_MESSAGE, model="claude-3-5-sonnet", request_data={}, guardrail_name="g"
+        )
+        raw = b"".join(handler.build_block_sse_chunks(exc, stream_started=True, responses_so_far=seen)).decode()
+        events = _parse_sse_event_types(raw)
+        # No new message envelope, closes block 0, appends block text at index 1.
+        assert "message_start" not in events
+        assert events == [
+            "content_block_stop",
+            "content_block_start",
+            "content_block_delta",
+            "content_block_stop",
+            "message_delta",
+            "message_stop",
+        ]
+        assert BLOCK_MESSAGE in raw
+        assert '"index": 1' in raw
diff --git a/tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_streaming_buffer_until_moderated.py b/tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_streaming_buffer_until_moderated.py
new file mode 100644
index 00000000000..2b163ee5233
--- /dev/null
+++ b/tests/test_litellm/proxy/guardrails/guardrail_hooks/unified_guardrails/test_streaming_buffer_until_moderated.py
@@ -0,0 +1,173 @@
+"""
+Tests for ``streaming_buffer_until_moderated`` on the unified guardrail
+post-call streaming iterator hook.
+
+With this flag set, the hook must withhold every upstream chunk until
+end-of-stream moderation has run. The decisive guarantee versus the
+detect-only ``streaming_end_of_stream_only`` behavior: when the guardrail
+blocks, the original (objectionable) content is NEVER yielded to the client --
+only the block message is. On a clean response, all original chunks are
+released unchanged after moderation passes.
+"""
+
+import json
+from typing import Any, List, Literal, Optional
+
+import pytest
+
+from litellm.integrations.custom_guardrail import (
+    CustomGuardrail,
+    ModifyResponseException,
+)
+from litellm.proxy._types import UserAPIKeyAuth
+from litellm.proxy.guardrails.guardrail_hooks.unified_guardrail.unified_guardrail import (
+    UnifiedLLMGuardrails,
+)
+from litellm.types.utils import GenericGuardrailAPIInputs
+
+BLOCK_MESSAGE = "Blocked by policy: this response was withheld."
+ORIGINAL_MARKER = "ORIGINAL-SECRET-ANSWER"
+
+
+class _BlockingGuardrail(CustomGuardrail):
+    """Always blocks at moderation time."""
+
+    async def apply_guardrail(
+        self,
+        inputs: GenericGuardrailAPIInputs,
+        request_data: dict,
+        input_type: Literal["request", "response"],
+        logging_obj: Optional[Any] = None,
+    ) -> GenericGuardrailAPIInputs:
+        raise ModifyResponseException(
+            message=BLOCK_MESSAGE,
+            model="claude-3-5-sonnet",
+            request_data=request_data,
+            guardrail_name=self.guardrail_name,
+        )
+
+
+class _PassingGuardrail(CustomGuardrail):
+    """Never blocks; returns inputs unchanged."""
+
+    async def apply_guardrail(
+        self,
+        inputs: GenericGuardrailAPIInputs,
+        request_data: dict,
+        input_type: Literal["request", "response"],
+        logging_obj: Optional[Any] = None,
+    ) -> GenericGuardrailAPIInputs:
+        return inputs
+
+
+def _sse_event(event_type: str, data: dict) -> bytes:
+    return f"event: {event_type}\ndata: {json.dumps(data)}\n\n".encode()
+
+
+async def _anthropic_stream():
+    """A complete Anthropic /v1/messages SSE stream whose assistant text
+    contains ORIGINAL_MARKER so leakage is unambiguous to assert."""
+    yield _sse_event(
+        "message_start",
+        {
+            "type": "message_start",
+            "message": {
+                "id": "msg_orig",
+                "type": "message",
+                "role": "assistant",
+                "model": "claude-3-5-sonnet",
+                "content": [],
+                "stop_reason": None,
+                "usage": {"input_tokens": 1, "output_tokens": 0},
+            },
+        },
+    )
+    yield _sse_event(
+        "content_block_start",
+        {
+            "type": "content_block_start",
+            "index": 0,
+            "content_block": {"type": "text", "text": ""},
+        },
+    )
+    for text in ["Here is ", "the ", ORIGINAL_MARKER, " for you."]:
+        yield _sse_event(
+            "content_block_delta",
+            {
+                "type": "content_block_delta",
+                "index": 0,
+                "delta": {"type": "text_delta", "text": text},
+            },
+        )
+    yield _sse_event("content_block_stop", {"type": "content_block_stop", "index": 0})
+    yield _sse_event(
+        "message_delta",
+        {
+            "type": "message_delta",
+            "delta": {"stop_reason": "end_turn", "stop_sequence": None},
+            "usage": {"output_tokens": 5},
+        },
+    )
+    yield _sse_event("message_stop", {"type": "message_stop"})
+
+
+def _decode(chunks: List[Any]) -> str:
+    return "".join(c.decode() if isinstance(c, bytes) else str(c) for c in chunks)
+
+
+async def _run(guardrail: CustomGuardrail) -> str:
+    # Rubrik's real config: end-of-stream-only moderation. Without buffering
+    # this releases every chunk before moderation runs (content leaks on
+    # block); the buffer flag must change that to moderate-then-release.
+    guardrail.streaming_end_of_stream_only = True
+    guardrail.streaming_buffer_until_moderated = True
+    unified = UnifiedLLMGuardrails()
+    user_api_key_dict = UserAPIKeyAuth(api_key="test", request_route="/v1/messages")
+    request_data = {
+        "messages": [{"role": "user", "content": "hi"}],
+        "guardrail_to_apply": guardrail,
+        "metadata": {"guardrails": [guardrail.guardrail_name]},
+    }
+    collected: List[Any] = []
+    async for chunk in unified.async_post_call_streaming_iterator_hook(
+        user_api_key_dict=user_api_key_dict,
+        response=_anthropic_stream(),
+        request_data=request_data,
+    ):
+        collected.append(chunk)
+    return _decode(collected)
+
+
+@pytest.mark.asyncio
+async def test_buffered_block_withholds_original_content():
+    raw = await _run(_BlockingGuardrail(guardrail_name="blk", event_hook="post_call"))
+    # The original content must never reach the client...
+    assert ORIGINAL_MARKER not in raw, f"original content leaked: {raw!r}"
+    # ...only the block message, in a clean terminating stream.
+    assert BLOCK_MESSAGE in raw
+    assert '"error"' not in raw
+
+
+@pytest.mark.asyncio
+async def test_buffered_clean_releases_all_content():
+    raw = await _run(_PassingGuardrail(guardrail_name="pass", event_hook="post_call"))
+    # A clean response is released in full after moderation passes.
+    assert ORIGINAL_MARKER in raw
+    assert (
+        raw.rstrip().endswith('event: message_stop\ndata: {"type": "message_stop"}'.rstrip()) or "message_stop" in raw
+    )
+    assert BLOCK_MESSAGE not in raw
+
+
+@pytest.mark.asyncio
+async def test_buffered_mode_disabled_for_content_rewriting_guardrail():
+    """Buffered replay yields the withheld *original* chunks verbatim, which
+    is unsafe for a guardrail that rewrites response text (e.g. PII masking):
+    the client would get the unredacted original instead of the moderated
+    output. mask_response_content=True must force buffering off so the
+    request falls back to the (correctly moderated) non-buffered path."""
+    guardrail = _PassingGuardrail(guardrail_name="masker", event_hook="post_call", mask_response_content=True)
+    raw = await _run(guardrail)
+    assert guardrail.streaming_buffer_until_moderated is True  # request asked for buffering
+    assert ORIGINAL_MARKER in raw
+    assert BLOCK_MESSAGE not in raw
diff --git a/tests/test_litellm/proxy/test_blocked_response_usage.py b/tests/test_litellm/proxy/test_blocked_response_usage.py
new file mode 100644
index 00000000000..d486431ca3e
--- /dev/null
+++ b/tests/test_litellm/proxy/test_blocked_response_usage.py
@@ -0,0 +1,84 @@
+"""
+Token usage on synthetic guardrail-blocked responses for the OpenAI-format
+proxy endpoints (/v1/chat/completions and /v1/completions).
+
+A post-call block replaces the LLM response with the violation message, but the
+upstream call already consumed tokens. `_blocked_response_usage` reports that
+real usage (carried on `ModifyResponseException.original_response`) rather than
+zero; a pre-call block never invoked the LLM, so usage is zero.
+"""
+
+import pytest
+
+import litellm
+from litellm.proxy.proxy_server import _blocked_response_usage
+
+
+def test_uses_original_response_usage():
+    resp = litellm.ModelResponse()
+    resp.usage = litellm.Usage(prompt_tokens=42, completion_tokens=7, total_tokens=49)
+
+    usage = _blocked_response_usage(resp)
+
+    assert usage.prompt_tokens == 42
+    assert usage.completion_tokens == 7
+    assert usage.total_tokens == 49
+
+
+def test_zero_usage_when_no_original_response():
+    usage = _blocked_response_usage(None)
+
+    assert usage.prompt_tokens == 0
+    assert usage.completion_tokens == 0
+    assert usage.total_tokens == 0
+
+
+@pytest.mark.asyncio
+async def test_success_hook_attaches_original_response_on_block():
+    """The unified guardrail's post-call success hook must attach the blocked
+    LLM response to ModifyResponseException so its real usage isn't discarded."""
+    from unittest.mock import AsyncMock, MagicMock, patch
+
+    import litellm.proxy.guardrails.guardrail_hooks.unified_guardrail.unified_guardrail as ug
+    from litellm.integrations.custom_guardrail import ModifyResponseException
+    from litellm.proxy._types import UserAPIKeyAuth
+    from litellm.types.utils import CallTypes
+
+    response = litellm.ModelResponse()
+    response.usage = litellm.Usage(prompt_tokens=15, completion_tokens=3, total_tokens=18)
+
+    guardrail = MagicMock()
+    guardrail.should_run_guardrail.return_value = True
+    guardrail.guardrail_name = "rubrik"
+
+    # The translation layer raises a block without pre-setting original_response.
+    translation = MagicMock()
+    translation.process_output_response = AsyncMock(
+        side_effect=ModifyResponseException(
+            message="blocked",
+            model="gpt-4o",
+            request_data={},
+            guardrail_name="rubrik",
+        )
+    )
+
+    unified = ug.UnifiedLLMGuardrails()
+    user_api_key_dict = UserAPIKeyAuth(api_key="test", request_route="/chat/completions")
+    data = {"guardrail_to_apply": guardrail, "model": "gpt-4o"}
+
+    # Inject our translation for the inferred call type (the module global is
+    # cached across tests, so patch it directly rather than the loader).
+    with patch.object(
+        ug,
+        "endpoint_guardrail_translation_mappings",
+        {
+            CallTypes.acompletion: lambda: translation,
+            CallTypes.completion: lambda: translation,
+        },
+    ):
+        with pytest.raises(ModifyResponseException) as excinfo:
+            await unified.async_post_call_success_hook(
+                data=data, user_api_key_dict=user_api_key_dict, response=response
+            )
+
+    assert excinfo.value.original_response is response

From cbe23d6184afbc59393534b2b3f968c24f0081e8 Mon Sep 17 00:00:00 2001
From: michelligabriele <gabriele.michelli@icloud.com>
Date: Fri, 3 Jul 2026 05:58:36 +0200
Subject: [PATCH 20/26] fix(a2a): populate response usage in a2a chat
 transformation (#31980)

* fix(a2a): populate response usage in a2a chat transformation

* test(a2a): rename to avoid module basename collision with fastcrw's test_transformation.py
---
 litellm/llms/a2a/chat/transformation.py       | 21 +++++++++-
 .../a2a/chat/test_a2a_chat_transformation.py  | 42 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py

diff --git a/litellm/llms/a2a/chat/transformation.py b/litellm/llms/a2a/chat/transformation.py
index c9623a817bf..113c000f352 100644
--- a/litellm/llms/a2a/chat/transformation.py
+++ b/litellm/llms/a2a/chat/transformation.py
@@ -10,7 +10,7 @@ import httpx
 from litellm.llms.base_llm.base_model_iterator import BaseModelResponseIterator
 from litellm.llms.base_llm.chat.transformation import BaseConfig, BaseLLMException
 from litellm.types.llms.openai import AllMessageValues
-from litellm.types.utils import Choices, Message, ModelResponse
+from litellm.types.utils import Choices, Message, ModelResponse, Usage
 
 from ..common_utils import (
     A2AError,
@@ -312,6 +312,25 @@ class A2AConfig(BaseConfig):
         # Set ID from response
         model_response.id = response_json.get("id", str(uuid.uuid4()))
 
+        # A2A agents don't return token usage; estimate it so per-token pricing
+        # produces real cost and callers don't receive usage of 0/0/0.
+        try:
+            from litellm.utils import token_counter
+
+            prompt_tokens = token_counter(model="gpt-3.5-turbo", messages=messages)
+            completion_tokens = token_counter(model="gpt-3.5-turbo", text=text, count_response_tokens=True)
+            setattr(
+                model_response,
+                "usage",
+                Usage(
+                    prompt_tokens=prompt_tokens,
+                    completion_tokens=completion_tokens,
+                    total_tokens=prompt_tokens + completion_tokens,
+                ),
+            )
+        except Exception:  # noqa: BLE001 - best-effort estimate; a tokenizer hiccup must not break the response
+            pass
+
         return model_response
 
     def get_model_response_iterator(
diff --git a/tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py b/tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py
new file mode 100644
index 00000000000..2e11c68244c
--- /dev/null
+++ b/tests/test_litellm/llms/a2a/chat/test_a2a_chat_transformation.py
@@ -0,0 +1,42 @@
+"""Tests for litellm/llms/a2a/chat/transformation.py response transform."""
+
+from unittest.mock import MagicMock
+
+from litellm.llms.a2a.chat.transformation import A2AConfig
+from litellm.types.utils import ModelResponse
+
+
+def _raw_response(text: str) -> MagicMock:
+    raw = MagicMock()
+    raw.status_code = 200
+    raw.headers = {}
+    raw.json.return_value = {
+        "jsonrpc": "2.0",
+        "id": "resp-1",
+        "result": {
+            "kind": "message",
+            "parts": [{"kind": "text", "text": text}],
+        },
+    }
+    return raw
+
+
+def test_transform_response_sets_usage():
+    """Regression: A2AConfig.transform_response must populate usage so per-token
+    pricing computes real cost and callers don't get usage 0/0/0."""
+    result = A2AConfig().transform_response(
+        model="a2a/test-agent",
+        raw_response=_raw_response("hello from the agent"),
+        model_response=ModelResponse(),
+        logging_obj=MagicMock(),
+        request_data={},
+        messages=[{"role": "user", "content": "hi there agent"}],
+        optional_params={},
+        litellm_params={},
+        encoding=None,
+    )
+
+    assert result.usage is not None
+    assert result.usage.prompt_tokens > 0
+    assert result.usage.completion_tokens > 0
+    assert result.usage.total_tokens == (result.usage.prompt_tokens + result.usage.completion_tokens)

From dfbbda4f199ff4cbe49c6f5924c856661953681b Mon Sep 17 00:00:00 2001
From: "devin-ai-integration[bot]"
 <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 2 Jul 2026 21:34:36 -0700
Subject: [PATCH 21/26] fix(auth): deny model access for teamless keys with
 all-team-models (#32022)

_enforce_key_and_fallback_model_access and can_key_call_resolved_model
both unconditionally skipped key-level model checks whenever
all-team-models was present, without verifying the key actually belongs
to a team. PR #29746 fixed the listing path (get_key_models) but these
two call-path checks were left untouched, letting teamless keys call
any model via /chat/completions while seeing an empty model list.

Add team_id is not None guard to both bypass conditions so teamless
keys fall through to can_key_call_model, which already correctly
rejects unresolvable all-team-models sentinels

Co-authored-by: mateo <mateo@berri.ai>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 litellm/proxy/auth/auth_checks.py             |  4 +-
 litellm/proxy/auth/user_api_key_auth.py       |  6 ++-
 .../proxy/auth/test_auth_checks.py            | 52 +++++++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/litellm/proxy/auth/auth_checks.py b/litellm/proxy/auth/auth_checks.py
index ced2cf125ce..41468a9ec05 100644
--- a/litellm/proxy/auth/auth_checks.py
+++ b/litellm/proxy/auth/auth_checks.py
@@ -3017,7 +3017,9 @@ async def can_key_call_resolved_model(
     )
 
     skip_key_model_check = valid_token.config or (
-        isinstance(valid_token.models, list) and SpecialModelNames.all_team_models.value in valid_token.models
+        isinstance(valid_token.models, list)
+        and SpecialModelNames.all_team_models.value in valid_token.models
+        and valid_token.team_id is not None
     )
     if not skip_key_model_check:
         await can_key_call_model(
diff --git a/litellm/proxy/auth/user_api_key_auth.py b/litellm/proxy/auth/user_api_key_auth.py
index 73f9def822b..a28c8be9408 100644
--- a/litellm/proxy/auth/user_api_key_auth.py
+++ b/litellm/proxy/auth/user_api_key_auth.py
@@ -2676,7 +2676,11 @@ async def _enforce_key_and_fallback_model_access(
         model_list = config.get("model_list", [])
         new_model_list = model_list
         verbose_proxy_logger.debug(f"\n new llm router model list {new_model_list}")
-    elif isinstance(valid_token.models, list) and "all-team-models" in valid_token.models:
+    elif (
+        isinstance(valid_token.models, list)
+        and "all-team-models" in valid_token.models
+        and valid_token.team_id is not None
+    ):
         pass
     else:
         model = _get_model_from_request_context(
diff --git a/tests/test_litellm/proxy/auth/test_auth_checks.py b/tests/test_litellm/proxy/auth/test_auth_checks.py
index 7e34cdf29bc..0f6cae28761 100644
--- a/tests/test_litellm/proxy/auth/test_auth_checks.py
+++ b/tests/test_litellm/proxy/auth/test_auth_checks.py
@@ -355,6 +355,58 @@ async def test_can_key_call_model_all_team_models_no_team_id_is_denied():
     assert exc_info.value.type == ProxyErrorTypes.key_model_access_denied
 
 
+@pytest.mark.asyncio
+async def test_enforce_key_access_teamless_all_team_models_denied():
+    """_enforce_key_and_fallback_model_access must not skip key-level
+    model checks for a teamless key that carries all-team-models."""
+    from litellm.proxy._types import SpecialModelNames
+    from litellm.proxy.auth.user_api_key_auth import (
+        _enforce_key_and_fallback_model_access,
+    )
+
+    valid_token = UserAPIKeyAuth(
+        api_key="sk-orphan-key",
+        models=[SpecialModelNames.all_team_models.value],
+        team_models=[],
+    )
+
+    with pytest.raises(ProxyException) as exc_info:
+        await _enforce_key_and_fallback_model_access(
+            valid_token=valid_token,
+            request_data={"model": "gpt-4o"},
+            route="/v1/chat/completions",
+            request=None,
+            llm_model_list=None,
+            llm_router=None,
+        )
+
+    assert exc_info.value.type == ProxyErrorTypes.key_model_access_denied
+
+
+@pytest.mark.asyncio
+async def test_can_key_call_resolved_model_teamless_all_team_models_denied():
+    """can_key_call_resolved_model must not skip key-level model checks
+    for a teamless key that carries all-team-models."""
+    from litellm.proxy._types import SpecialModelNames
+    from litellm.proxy.auth.auth_checks import can_key_call_resolved_model
+
+    valid_token = UserAPIKeyAuth(
+        api_key="sk-orphan-key",
+        models=[SpecialModelNames.all_team_models.value],
+        team_models=[],
+    )
+
+    with pytest.raises(ProxyException) as exc_info:
+        await can_key_call_resolved_model(
+            model="gpt-4o",
+            llm_model_list=None,
+            valid_token=valid_token,
+            llm_router=None,
+        )
+
+    assert exc_info.value.type == ProxyErrorTypes.key_model_access_denied
+
+
 @pytest.mark.asyncio
 async def test_can_team_access_model_all_team_models_expands_router_models():
     from litellm import Router

From 6dcbac88b895f9d72eee2c0cccda88ad81316194 Mon Sep 17 00:00:00 2001
From: yucheng-berri <yucheng@berri.ai>
Date: Thu, 2 Jul 2026 22:08:53 -0700
Subject: [PATCH 22/26] fix(proxy): admin-gate `permissions` on /user/new and
 /user/update (LIT-4138) (#31998)

`NewUserRequest` and `UpdateUserRequest` inherit `permissions` from
`GenerateRequestBase`. `/user/new` passes the field into
`generate_key_helper_fn` which persists it on the auto-created key,
so an org admin who lands on `/user/new` (the route allowlist accepts
org_admin callers when the request body names an org where they hold
that membership) can mint a key with proxy-wide capabilities such as
`get_spend_routes`.

This wires the existing `_check_permissions_caller_permission` helper
into `new_user` and `_update_single_user_helper`. The helper's presence
check keys on `data.model_fields_set`, so an omitted field flows
through untouched and an explicit `{}` / `null` from a non-admin is
rejected 403 the same as any other value.

`_update_single_user_helper` is shared by `/user/update` and
`/user/bulk_update`, so both paths inherit the gate.

Tests in
`tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py`:

- test_new_user_non_admin_permissions_non_empty_rejected
- test_new_user_non_admin_permissions_explicit_empty_rejected
- test_new_user_non_admin_omits_permissions_succeeds (control)
- test_new_user_admin_can_set_permissions (control)
- test_update_single_user_non_admin_permissions_rejected
- test_update_single_user_non_admin_permissions_explicit_empty_rejected

The four attack-vector tests fail on the pre-fix HEAD and pass on this
commit. Full mapped test file (79 tests) green.
---
 .../internal_user_endpoints.py                |  11 +
 .../key_management_endpoints.py               |   2 +-
 .../test_internal_user_endpoints.py           | 253 ++++++++++++++++++
 3 files changed, 265 insertions(+), 1 deletion(-)

diff --git a/litellm/proxy/management_endpoints/internal_user_endpoints.py b/litellm/proxy/management_endpoints/internal_user_endpoints.py
index 9374aa3180b..d98dcf984b2 100644
--- a/litellm/proxy/management_endpoints/internal_user_endpoints.py
+++ b/litellm/proxy/management_endpoints/internal_user_endpoints.py
@@ -39,6 +39,7 @@ from litellm.proxy.management_endpoints.common_utils import (
     validate_finite_spend,
 )
 from litellm.proxy.management_endpoints.key_management_endpoints import (
+    _check_permissions_caller_permission,
     generate_key_helper_fn,
     prepare_metadata_fields,
 )
@@ -440,6 +441,11 @@ async def new_user(
                 detail=f"Only proxy admins can create administrative users (proxy_admin, proxy_admin_viewer). Attempted to create user with role: {data.user_role}. Your role: {user_api_key_dict.user_role}",
             )
 
+        _check_permissions_caller_permission(
+            data=data,
+            user_api_key_dict=user_api_key_dict,
+        )
+
         data_json = data.json()  # type: ignore
         data_json = _update_internal_new_user_params(data_json, data)
         _hash_password_in_dict(data_json)
@@ -1198,6 +1204,11 @@ async def _update_single_user_helper(
     if not user_request.user_id and not user_request.user_email:
         raise ValueError("Either user_id or user_email must be provided")
 
+    _check_permissions_caller_permission(
+        data=user_request,
+        user_api_key_dict=user_api_key_dict,
+    )
+
     data_json: dict = user_request.model_dump(exclude_unset=True)
     non_default_values = _update_internal_user_params(data_json=data_json, data=user_request)
     _hash_password_in_dict(non_default_values)
diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py
index f0473edded5..ac27a8102b6 100644
--- a/litellm/proxy/management_endpoints/key_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/key_management_endpoints.py
@@ -580,7 +580,7 @@ def _check_permissions_caller_permission(
         return
     raise HTTPException(
         status_code=403,
-        detail={"error": "Only proxy admins can set `permissions` on a key."},
+        detail={"error": "Only proxy admins can set `permissions`."},
     )
 
 
diff --git a/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py
index 56eeea82223..ce2d04f0d26 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py
@@ -1000,6 +1000,259 @@ async def test_new_user_non_admin_cannot_create_admin(mocker):
     assert str(LitellmUserRoles.PROXY_ADMIN_VIEW_ONLY) in str(exc_info2.value.message)
 
 
+@pytest.mark.asyncio
+async def test_new_user_non_admin_permissions_non_empty_rejected(mocker):
+    """`new_user` rejects a non-admin when `permissions` is present in the
+    request body. `/user/new` propagates the value into the auto-created
+    key via `generate_key_helper_fn`."""
+    from litellm.proxy.management_endpoints.internal_user_endpoints import new_user
+
+    mock_prisma_client = mocker.MagicMock()
+
+    async def mock_count(*args, **kwargs):
+        return 5
+
+    mock_prisma_client.db.litellm_usertable.count = mock_count
+
+    async def mock_check(*_args, **_kwargs):
+        return None
+
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_email",
+        mock_check,
+    )
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_id",
+        mock_check,
+    )
+    mock_license_check = mocker.MagicMock()
+    mock_license_check.is_over_limit.return_value = False
+    mocker.patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client)
+    mocker.patch("litellm.proxy.proxy_server._license_check", mock_license_check)
+
+    data = NewUserRequest(
+        user_email="alice@example.com",
+        user_role=LitellmUserRoles.INTERNAL_USER,
+        permissions={"get_spend_routes": True},
+    )
+    caller = UserAPIKeyAuth(
+        user_id="org-admin", user_role=LitellmUserRoles.ORG_ADMIN
+    )
+
+    with pytest.raises(ProxyException) as exc_info:
+        await new_user(data=data, user_api_key_dict=caller)
+    assert str(exc_info.value.code) == "403"
+    assert "permissions" in str(exc_info.value.message)
+
+
+@pytest.mark.asyncio
+async def test_new_user_non_admin_permissions_explicit_empty_rejected(mocker):
+    """`new_user` rejects a non-admin when `permissions` is present as
+    `{}` in the request body. The value matches the model default but
+    `model_fields_set` distinguishes the two."""
+    from litellm.proxy.management_endpoints.internal_user_endpoints import new_user
+
+    mock_prisma_client = mocker.MagicMock()
+
+    async def mock_count(*args, **kwargs):
+        return 5
+
+    mock_prisma_client.db.litellm_usertable.count = mock_count
+
+    async def mock_check(*_args, **_kwargs):
+        return None
+
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_email",
+        mock_check,
+    )
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_id",
+        mock_check,
+    )
+    mock_license_check = mocker.MagicMock()
+    mock_license_check.is_over_limit.return_value = False
+    mocker.patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client)
+    mocker.patch("litellm.proxy.proxy_server._license_check", mock_license_check)
+
+    data = NewUserRequest(
+        user_email="alice@example.com",
+        user_role=LitellmUserRoles.INTERNAL_USER,
+        permissions={},
+    )
+    assert "permissions" in data.model_fields_set
+    caller = UserAPIKeyAuth(
+        user_id="org-admin", user_role=LitellmUserRoles.ORG_ADMIN
+    )
+
+    with pytest.raises(ProxyException) as exc_info:
+        await new_user(data=data, user_api_key_dict=caller)
+    assert str(exc_info.value.code) == "403"
+    assert "permissions" in str(exc_info.value.message)
+
+
+@pytest.mark.asyncio
+async def test_new_user_non_admin_omits_permissions_succeeds(mocker):
+    """`new_user` does not fire the permissions gate when `permissions`
+    is absent from the request body. The model-level default `{}` is not
+    in `model_fields_set`."""
+    from litellm.proxy.management_endpoints.internal_user_endpoints import new_user
+
+    mock_prisma_client = mocker.MagicMock()
+
+    async def mock_count(*args, **kwargs):
+        return 5
+
+    mock_prisma_client.db.litellm_usertable.count = mock_count
+
+    async def mock_check(*_args, **_kwargs):
+        return None
+
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_email",
+        mock_check,
+    )
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_id",
+        mock_check,
+    )
+    mock_license_check = mocker.MagicMock()
+    mock_license_check.is_over_limit.return_value = False
+    mocker.patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client)
+    mocker.patch("litellm.proxy.proxy_server._license_check", mock_license_check)
+
+    stub_response = {"user_id": "alice", "key": "sk-alice", "expires": None}
+
+    async def stub_helper(**_kwargs):
+        return stub_response
+
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints.generate_key_helper_fn",
+        stub_helper,
+    )
+
+    data = NewUserRequest(
+        user_email="alice@example.com",
+        user_role=LitellmUserRoles.INTERNAL_USER,
+    )
+    assert "permissions" not in data.model_fields_set
+    caller = UserAPIKeyAuth(
+        user_id="org-admin", user_role=LitellmUserRoles.ORG_ADMIN
+    )
+
+    result = await new_user(data=data, user_api_key_dict=caller)
+    assert result is not None
+
+
+@pytest.mark.asyncio
+async def test_new_user_admin_can_set_permissions(mocker):
+    """`new_user` accepts a PROXY_ADMIN caller for any shape of
+    `permissions` in the request body."""
+    from litellm.proxy.management_endpoints.internal_user_endpoints import new_user
+
+    mock_prisma_client = mocker.MagicMock()
+
+    async def mock_count(*args, **kwargs):
+        return 5
+
+    mock_prisma_client.db.litellm_usertable.count = mock_count
+
+    async def mock_check(*_args, **_kwargs):
+        return None
+
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_email",
+        mock_check,
+    )
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints._check_duplicate_user_id",
+        mock_check,
+    )
+    mock_license_check = mocker.MagicMock()
+    mock_license_check.is_over_limit.return_value = False
+    mocker.patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client)
+    mocker.patch("litellm.proxy.proxy_server._license_check", mock_license_check)
+
+    async def stub_helper(**_kwargs):
+        return {"user_id": "alice", "key": "sk-alice", "expires": None}
+
+    mocker.patch(
+        "litellm.proxy.management_endpoints.internal_user_endpoints.generate_key_helper_fn",
+        stub_helper,
+    )
+
+    admin = UserAPIKeyAuth(user_id="admin", user_role=LitellmUserRoles.PROXY_ADMIN)
+    for permissions_value in ({"get_spend_routes": True}, {}, None):
+        data = NewUserRequest(
+            user_email=f"alice-{permissions_value}@example.com",
+            user_role=LitellmUserRoles.INTERNAL_USER,
+            permissions=permissions_value,
+        )
+        result = await new_user(data=data, user_api_key_dict=admin)
+        assert result is not None
+
+
+@pytest.mark.asyncio
+async def test_update_single_user_non_admin_permissions_rejected(mocker):
+    """`_update_single_user_helper` rejects a non-admin when `permissions`
+    is present in the request body. Covers both `/user/update` and
+    `/user/bulk_update`, which share this helper."""
+    from fastapi import HTTPException
+
+    from litellm.proxy._types import UpdateUserRequest
+    from litellm.proxy.management_endpoints.internal_user_endpoints import (
+        _update_single_user_helper,
+    )
+
+    mock_prisma_client = mocker.MagicMock()
+    mocker.patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client)
+    mocker.patch("litellm.proxy.proxy_server.litellm_proxy_admin_name", "admin")
+
+    data = UpdateUserRequest(
+        user_id="alice",
+        permissions={"get_spend_routes": True},
+    )
+    caller = UserAPIKeyAuth(
+        user_id="org-admin", user_role=LitellmUserRoles.ORG_ADMIN
+    )
+
+    with pytest.raises(HTTPException) as exc_info:
+        await _update_single_user_helper(
+            user_request=data, user_api_key_dict=caller
+        )
+    assert exc_info.value.status_code == 403
+    assert "permissions" in str(exc_info.value.detail)
+
+
+@pytest.mark.asyncio
+async def test_update_single_user_non_admin_permissions_explicit_empty_rejected(mocker):
+    """`_update_single_user_helper` rejects a non-admin when `permissions`
+    is present as `{}` in the request body."""
+    from fastapi import HTTPException
+
+    from litellm.proxy._types import UpdateUserRequest
+    from litellm.proxy.management_endpoints.internal_user_endpoints import (
+        _update_single_user_helper,
+    )
+
+    mock_prisma_client = mocker.MagicMock()
+    mocker.patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client)
+    mocker.patch("litellm.proxy.proxy_server.litellm_proxy_admin_name", "admin")
+
+    data = UpdateUserRequest(user_id="alice", permissions={})
+    assert "permissions" in data.model_fields_set
+    caller = UserAPIKeyAuth(
+        user_id="org-admin", user_role=LitellmUserRoles.ORG_ADMIN
+    )
+
+    with pytest.raises(HTTPException) as exc_info:
+        await _update_single_user_helper(
+            user_request=data, user_api_key_dict=caller
+        )
+    assert exc_info.value.status_code == 403
+    assert "permissions" in str(exc_info.value.detail)
+
+
 @pytest.mark.asyncio
 async def test_user_info_url_encoding_plus_character(mocker):
     """

From b4269258247d8cfc2c5a1fbac2b544b8c912ec70 Mon Sep 17 00:00:00 2001
From: yucheng-berri <yucheng@berri.ai>
Date: Thu, 2 Jul 2026 22:09:02 -0700
Subject: [PATCH 23/26] fix(proxy): admin-gate `allowed_routes` presence on
 /key/update and /key/regenerate (LIT-4139) (#31987)

`_check_allowed_routes_caller_permission` previously keyed its
admin-only rule on truthiness. The refactor adds an `allowed_routes_was_provided`
keyword param that raw-body call sites populate from
`"allowed_routes" in data.model_fields_set`, so a caller that omits
the field (default flows through) is distinct from one that sends
any explicit value.

Four raw-body call sites now pass `allowed_routes_was_provided=...`:
`_common_key_generation_helper`, `generate_service_account_key_fn`,
`_validate_update_key_data`, and `regenerate_key_fn`.

Two derived-value call sites keep the pre-fix shape: the
post-`handle_key_type` recheck at `_common_key_generation_helper`
and the mirror in `regenerate_key_fn`. Both pass values produced by
`handle_key_type` (not by the request body), so `allowed_routes_was_provided` stays
False and the `allow_safe_presets=True` carve-out continues to accept
the `llm_api_routes` / `info_routes` presets.

In `regenerate_key_fn` the gate runs before the `premium_user`
license check, matching the LIT-4092 ordering.
`test_non_admin_regenerate_key_allowed_routes_rejected_before_enterprise_gate`
pins the ordering; it fails on a swap of the two gates.

Tests in `tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py`
under `TestAllowedRoutesCallerPermission`:

- test_non_admin_generate_key_explicit_empty_allowed_routes_rejected
- test_non_admin_update_key_explicit_empty_allowed_routes_rejected
- test_non_admin_update_key_explicit_null_allowed_routes_rejected
- test_non_admin_regenerate_key_explicit_empty_allowed_routes_rejected
- test_non_admin_regenerate_key_allowed_routes_rejected_before_enterprise_gate
- test_helper_accepts_derived_safe_preset_for_non_admin
- test_helper_rejects_derived_unsafe_preset_for_non_admin
- test_helper_rejects_when_provided_and_none_without_typeerror

The four attack-vector tests fail on the pre-fix HEAD and pass on this
commit. Three helper-level tests pin the derived-value branch and the
load-bearing None guard; each is mutation-killed against a targeted
change to the frozenset or the guard. Full mapped test file (347 tests)
green.
---
 .../key_management_endpoints.py               |  35 ++-
 .../test_key_management_endpoints.py          | 243 ++++++++++++++++++
 2 files changed, 266 insertions(+), 12 deletions(-)

diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py
index ac27a8102b6..d56ebc5ac99 100644
--- a/litellm/proxy/management_endpoints/key_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/key_management_endpoints.py
@@ -530,26 +530,33 @@ def _check_allowed_routes_caller_permission(
     allowed_routes: Optional[list],
     user_api_key_dict: UserAPIKeyAuth,
     *,
+    allowed_routes_was_provided: bool = False,
     allow_safe_presets: bool = False,
 ) -> None:
     """
-    Only proxy admins may set `allowed_routes` on a key.
+    Require PROXY_ADMIN when `allowed_routes` is present in the request body,
+    unless the caller went through the `key_type` preset flow.
 
-    `allowed_routes` overrides the standard role-based route gate in
-    RouteChecks.non_proxy_admin_allowed_routes_check, so the field is
-    restricted to admins. Non-admins must instead use `key_type` to pick a
-    preset bucket — that path goes through `handle_key_type` and re-enters
-    this function with `allow_safe_presets=True`, which lets the derived
-    `llm_api_routes` / `info_routes` values through. Raw-body call sites
-    leave `allow_safe_presets=False` so non-admins can't write those values
-    directly.
+    Raw-body call sites pass
+    `allowed_routes_was_provided="allowed_routes" in data.model_fields_set` so a
+    caller that omits the field (model default flows through) is distinct from
+    one that sends any explicit value.
+
+    Post-`handle_key_type` call sites pass `allow_safe_presets=True` with the
+    values derived by `handle_key_type`; those values are not from the request
+    body, so `allowed_routes_was_provided` stays False and the safe-preset
+    carve-out below accepts any list of tokens in
+    `_NON_ADMIN_SAFE_ALLOWED_ROUTES_PRESETS`.
     """
-    # Empty list is the default on GenerateKeyRequest — treat as "not set".
-    if not allowed_routes:
+    if not allowed_routes_was_provided and not allowed_routes:
         return
     if user_api_key_dict.user_role == LitellmUserRoles.PROXY_ADMIN.value:
         return
-    if allow_safe_presets and all(r in _NON_ADMIN_SAFE_ALLOWED_ROUTES_PRESETS for r in allowed_routes):
+    if (
+        allow_safe_presets
+        and allowed_routes
+        and all(r in _NON_ADMIN_SAFE_ALLOWED_ROUTES_PRESETS for r in allowed_routes)
+    ):
         return
     raise HTTPException(
         status_code=403,
@@ -1566,6 +1573,7 @@ async def generate_key_fn(
         _check_allowed_routes_caller_permission(
             allowed_routes=data.allowed_routes,
             user_api_key_dict=user_api_key_dict,
+            allowed_routes_was_provided="allowed_routes" in data.model_fields_set,
         )
         _check_passthrough_routes_caller_permission(
             data=data,
@@ -1736,6 +1744,7 @@ async def generate_service_account_key_fn(
     _check_allowed_routes_caller_permission(
         allowed_routes=data.allowed_routes,
         user_api_key_dict=user_api_key_dict,
+        allowed_routes_was_provided="allowed_routes" in data.model_fields_set,
     )
     _check_passthrough_routes_caller_permission(
         data=data,
@@ -2231,6 +2240,7 @@ async def _validate_update_key_data(
     _check_allowed_routes_caller_permission(
         allowed_routes=data.allowed_routes,
         user_api_key_dict=user_api_key_dict,
+        allowed_routes_was_provided="allowed_routes" in data.model_fields_set,
     )
     _check_passthrough_routes_caller_permission(
         data=data,
@@ -4551,6 +4561,7 @@ async def regenerate_key_fn(
             _check_allowed_routes_caller_permission(
                 allowed_routes=data.allowed_routes,
                 user_api_key_dict=user_api_key_dict,
+                allowed_routes_was_provided="allowed_routes" in data.model_fields_set,
             )
             _check_passthrough_routes_caller_permission(
                 data=data,
diff --git a/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
index 601fa2c6d78..7c92757224c 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
@@ -11141,6 +11141,249 @@ class TestAllowedRoutesCallerPermission:
         assert str(exc_info.value.code) == "403"
         assert "allowed_routes" in str(exc_info.value.message)
 
+    @pytest.mark.asyncio
+    async def test_non_admin_update_key_explicit_empty_allowed_routes_rejected(self):
+        """`update_key_fn` rejects a non-admin when `allowed_routes` is
+        present as `[]` in the request body. The value matches the model
+        default but `model_fields_set` distinguishes the two."""
+        from litellm.proxy.management_endpoints.key_management_endpoints import (
+            update_key_fn,
+        )
+
+        data = UpdateKeyRequest(key="sk-test", allowed_routes=[])
+        assert "allowed_routes" in data.model_fields_set
+        user_api_key_dict = UserAPIKeyAuth(
+            user_id="internal-user-123",
+            user_role=LitellmUserRoles.INTERNAL_USER,
+        )
+        mock_prisma_client = AsyncMock()
+
+        with (
+            patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client),
+            patch("litellm.proxy.proxy_server.user_api_key_cache", MagicMock()),
+            patch("litellm.proxy.proxy_server.user_custom_key_update", None),
+            patch("litellm.proxy.proxy_server.llm_router", None),
+            patch("litellm.proxy.proxy_server.premium_user", True),
+            patch("litellm.proxy.proxy_server.proxy_logging_obj", MagicMock()),
+            patch(
+                "litellm.proxy.management_endpoints.key_management_endpoints._get_and_validate_existing_key",
+                new_callable=AsyncMock,
+                return_value=MagicMock(),
+            ),
+        ):
+            with pytest.raises(ProxyException) as exc_info:
+                await update_key_fn(
+                    request=MagicMock(),
+                    data=data,
+                    user_api_key_dict=user_api_key_dict,
+                    litellm_changed_by=None,
+                )
+        assert str(exc_info.value.code) == "403"
+        assert "allowed_routes" in str(exc_info.value.message)
+
+    @pytest.mark.asyncio
+    async def test_non_admin_update_key_explicit_null_allowed_routes_rejected(self):
+        """`update_key_fn` rejects a non-admin when `allowed_routes` is
+        present as `null` in the request body."""
+        from litellm.proxy.management_endpoints.key_management_endpoints import (
+            update_key_fn,
+        )
+
+        data = UpdateKeyRequest(key="sk-test", allowed_routes=None)
+        assert "allowed_routes" in data.model_fields_set
+        user_api_key_dict = UserAPIKeyAuth(
+            user_id="internal-user-123",
+            user_role=LitellmUserRoles.INTERNAL_USER,
+        )
+        mock_prisma_client = AsyncMock()
+
+        with (
+            patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client),
+            patch("litellm.proxy.proxy_server.user_api_key_cache", MagicMock()),
+            patch("litellm.proxy.proxy_server.user_custom_key_update", None),
+            patch("litellm.proxy.proxy_server.llm_router", None),
+            patch("litellm.proxy.proxy_server.premium_user", True),
+            patch("litellm.proxy.proxy_server.proxy_logging_obj", MagicMock()),
+            patch(
+                "litellm.proxy.management_endpoints.key_management_endpoints._get_and_validate_existing_key",
+                new_callable=AsyncMock,
+                return_value=MagicMock(),
+            ),
+        ):
+            with pytest.raises(ProxyException) as exc_info:
+                await update_key_fn(
+                    request=MagicMock(),
+                    data=data,
+                    user_api_key_dict=user_api_key_dict,
+                    litellm_changed_by=None,
+                )
+        assert str(exc_info.value.code) == "403"
+        assert "allowed_routes" in str(exc_info.value.message)
+
+    @pytest.mark.asyncio
+    async def test_non_admin_regenerate_key_explicit_empty_allowed_routes_rejected(self):
+        """`regenerate_key_fn` rejects a non-admin when `allowed_routes` is
+        present as `[]` in the request body."""
+        from litellm.proxy._types import RegenerateKeyRequest
+        from litellm.proxy.management_endpoints.key_management_endpoints import (
+            regenerate_key_fn,
+        )
+
+        data = RegenerateKeyRequest(key="sk-test", allowed_routes=[])
+        assert "allowed_routes" in data.model_fields_set
+        user_api_key_dict = UserAPIKeyAuth(
+            user_id="internal-user-123",
+            user_role=LitellmUserRoles.INTERNAL_USER,
+        )
+
+        with patch("litellm.proxy.proxy_server.premium_user", True):
+            with pytest.raises(ProxyException) as exc_info:
+                await regenerate_key_fn(
+                    key=None,
+                    data=data,
+                    user_api_key_dict=user_api_key_dict,
+                    litellm_changed_by=None,
+                )
+        assert str(exc_info.value.code) == "403"
+        assert "allowed_routes" in str(exc_info.value.message)
+
+    @pytest.mark.asyncio
+    async def test_non_admin_regenerate_key_allowed_routes_rejected_before_enterprise_gate(self):
+        """`regenerate_key_fn` runs `_check_allowed_routes_caller_permission`
+        before the `premium_user` check, so a non-premium proxy still returns
+        the allowed_routes rejection (403) rather than the enterprise-license
+        error (500) when a non-admin sends `allowed_routes`."""
+        from litellm.proxy._types import RegenerateKeyRequest
+        from litellm.proxy.management_endpoints.key_management_endpoints import (
+            regenerate_key_fn,
+        )
+
+        data = RegenerateKeyRequest(key="sk-test", allowed_routes=["/*"])
+        user_api_key_dict = UserAPIKeyAuth(
+            user_id="internal-user-123",
+            user_role=LitellmUserRoles.INTERNAL_USER,
+        )
+
+        with patch("litellm.proxy.proxy_server.premium_user", False):
+            with pytest.raises(ProxyException) as exc_info:
+                await regenerate_key_fn(
+                    key=None,
+                    data=data,
+                    user_api_key_dict=user_api_key_dict,
+                    litellm_changed_by=None,
+                )
+        assert str(exc_info.value.code) == "403"
+        assert "allowed_routes" in str(exc_info.value.message)
+        assert "Enterprise" not in str(exc_info.value.message)
+
+    @pytest.mark.asyncio
+    async def test_non_admin_generate_key_explicit_empty_allowed_routes_rejected(self):
+        """`generate_key_fn` rejects a non-admin when `allowed_routes` is
+        present as `[]` in the request body. The value matches the model
+        default but `model_fields_set` distinguishes the two, so the
+        explicit-empty case on the create path is caught."""
+        data = GenerateKeyRequest(key_alias="plain-key", allowed_routes=[])
+        assert "allowed_routes" in data.model_fields_set
+        user_api_key_dict = UserAPIKeyAuth(
+            user_id="internal-user-123",
+            user_role=LitellmUserRoles.INTERNAL_USER,
+        )
+        mock_prisma_client = AsyncMock()
+
+        with (
+            patch("litellm.proxy.proxy_server.prisma_client", mock_prisma_client),
+            patch("litellm.proxy.proxy_server.user_api_key_cache", MagicMock()),
+            patch("litellm.proxy.proxy_server.user_custom_key_generate", None),
+            patch(
+                "litellm.proxy.management_endpoints.key_management_endpoints._common_key_generation_helper",
+                new_callable=AsyncMock,
+                return_value=MagicMock(),
+            ),
+        ):
+            with pytest.raises(ProxyException) as exc_info:
+                await generate_key_fn(
+                    data=data,
+                    user_api_key_dict=user_api_key_dict,
+                    litellm_changed_by=None,
+                )
+        assert str(exc_info.value.code) == "403"
+        assert "allowed_routes" in str(exc_info.value.message)
+
+    def test_helper_accepts_derived_safe_preset_for_non_admin(self):
+        """`_check_allowed_routes_caller_permission` accepts a non-admin
+        when `allow_safe_presets=True` and `allowed_routes` is entirely
+        composed of `_NON_ADMIN_SAFE_ALLOWED_ROUTES_PRESETS` tokens. This
+        is the shape the post-`handle_key_type` recheck at line 914 uses
+        after deriving `["llm_api_routes"]` from `key_type=llm_api`."""
+        from litellm.proxy.management_endpoints.key_management_endpoints import (
+            _check_allowed_routes_caller_permission,
+        )
+
+        _check_allowed_routes_caller_permission(
+            allowed_routes=["llm_api_routes"],
+            user_api_key_dict=UserAPIKeyAuth(
+                user_id="internal-user-123",
+                user_role=LitellmUserRoles.INTERNAL_USER,
+            ),
+            allow_safe_presets=True,
+        )
+        _check_allowed_routes_caller_permission(
+            allowed_routes=["info_routes"],
+            user_api_key_dict=UserAPIKeyAuth(
+                user_id="internal-user-123",
+                user_role=LitellmUserRoles.INTERNAL_USER,
+            ),
+            allow_safe_presets=True,
+        )
+
+    def test_helper_rejects_derived_unsafe_preset_for_non_admin(self):
+        """`_check_allowed_routes_caller_permission` rejects a non-admin
+        when `allow_safe_presets=True` but the derived value is outside
+        `_NON_ADMIN_SAFE_ALLOWED_ROUTES_PRESETS` (for example
+        `["management_routes"]` from `key_type=management`)."""
+        from fastapi import HTTPException
+
+        from litellm.proxy.management_endpoints.key_management_endpoints import (
+            _check_allowed_routes_caller_permission,
+        )
+
+        with pytest.raises(HTTPException) as exc_info:
+            _check_allowed_routes_caller_permission(
+                allowed_routes=["management_routes"],
+                user_api_key_dict=UserAPIKeyAuth(
+                    user_id="internal-user-123",
+                    user_role=LitellmUserRoles.INTERNAL_USER,
+                ),
+                allow_safe_presets=True,
+            )
+        assert exc_info.value.status_code == 403
+        assert "allowed_routes" in str(exc_info.value.detail)
+
+    def test_helper_rejects_when_provided_and_none_without_typeerror(self):
+        """`_check_allowed_routes_caller_permission` returns a 403 (not a
+        TypeError from iterating `None`) when a caller ever combines
+        `allowed_routes_was_provided=True` with `allowed_routes=None` and
+        `allow_safe_presets=True`. Pins the `and allowed_routes` guard on
+        the safe-preset branch."""
+        from fastapi import HTTPException
+
+        from litellm.proxy.management_endpoints.key_management_endpoints import (
+            _check_allowed_routes_caller_permission,
+        )
+
+        with pytest.raises(HTTPException) as exc_info:
+            _check_allowed_routes_caller_permission(
+                allowed_routes=None,
+                user_api_key_dict=UserAPIKeyAuth(
+                    user_id="internal-user-123",
+                    user_role=LitellmUserRoles.INTERNAL_USER,
+                ),
+                allowed_routes_was_provided=True,
+                allow_safe_presets=True,
+            )
+        assert exc_info.value.status_code == 403
+        assert "allowed_routes" in str(exc_info.value.detail)
+
 
 def test_jinja_prompt_manager_is_sandboxed():
     """

From b61fae397b754aca23c30ba7051bf5a90449b054 Mon Sep 17 00:00:00 2001
From: yucheng-berri <yucheng@berri.ai>
Date: Thu, 2 Jul 2026 22:09:10 -0700
Subject: [PATCH 24/26] fix(proxy): admin-gate `permissions` on
 _process_single_key_update (LIT-4137) (#32002)

The bulk-update entrypoints `/key/bulk_update` and `/team/key/bulk_update`
route through `_process_single_key_update`, not through
`_validate_update_key_data`, so the `permissions` gate LIT-4092 wired
into the single-key path never fires on bulk. Currently safe by
construction: `BulkUpdateKeyRequestItem` doesn't declare `permissions`
(Pydantic silently drops it), and `KeyUpdateFields` uses
`model_config = ConfigDict(extra="forbid")` (Pydantic 422s at parse
time). Neither structural barrier is enforced by tests on the field
itself; a future widening of either allowlist to include `permissions`
would reopen the class silently.

This wires `_check_permissions_caller_permission` into
`_process_single_key_update` right after `_validate_max_budget`, before
`prepare_key_update_data`. Zero behavior change today for any caller
routing through the current bulk request models; a defense-in-depth
gate for the class.

Tests:

- test_process_single_key_update_non_admin_permissions_rejected
- test_process_single_key_update_non_admin_permissions_explicit_empty_rejected

Both mutation-killed against removing the gate. Full mapped test file
(341 tests) green.
---
 .../key_management_endpoints.py               |  5 ++
 .../test_key_management_endpoints.py          | 61 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py
index d56ebc5ac99..ade865a5378 100644
--- a/litellm/proxy/management_endpoints/key_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/key_management_endpoints.py
@@ -2069,6 +2069,11 @@ async def _process_single_key_update(
     # Validate max_budget
     _validate_max_budget(update_key_request.max_budget)
 
+    _check_permissions_caller_permission(
+        data=update_key_request,
+        user_api_key_dict=user_api_key_dict,
+    )
+
     # Get and validate existing key
     if existing_key_row is None:
         existing_key_row = await _get_and_validate_existing_key(
diff --git a/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
index 7c92757224c..ee9202f522e 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
@@ -11507,6 +11507,67 @@ async def test_process_single_key_update_cache_invalidation_with_token_hash():
         assert call_kwargs["hashed_token"] == token_hash
 
 
+@pytest.mark.asyncio
+async def test_process_single_key_update_non_admin_permissions_rejected():
+    """`_process_single_key_update` rejects a non-admin when `permissions`
+    is present in the constructed `UpdateKeyRequest`. Guards the bulk path
+    against a future widening of the `BulkUpdateKeyRequestItem` or
+    `KeyUpdateFields` allowlists reopening the class."""
+    update_key_request = UpdateKeyRequest(
+        key="abc123",
+        permissions={"get_spend_routes": True},
+    )
+    assert "permissions" in update_key_request.model_fields_set
+
+    non_admin = UserAPIKeyAuth(
+        user_role=LitellmUserRoles.INTERNAL_USER,
+        api_key="sk-non-admin",
+        user_id="user-1",
+    )
+
+    with pytest.raises(HTTPException) as exc_info:
+        await _process_single_key_update(
+            update_key_request=update_key_request,
+            user_api_key_dict=non_admin,
+            litellm_changed_by=None,
+            prisma_client=AsyncMock(),
+            user_api_key_cache=MagicMock(),
+            proxy_logging_obj=MagicMock(),
+            llm_router=MagicMock(),
+        )
+    assert exc_info.value.status_code == 403
+    assert "permissions" in str(exc_info.value.detail)
+
+
+@pytest.mark.asyncio
+async def test_process_single_key_update_non_admin_permissions_explicit_empty_rejected():
+    """`_process_single_key_update` rejects a non-admin when `permissions`
+    is present as `{}` in the constructed `UpdateKeyRequest`. Presence
+    check on `model_fields_set` catches the explicit-empty case the same
+    as any other value."""
+    update_key_request = UpdateKeyRequest(key="abc123", permissions={})
+    assert "permissions" in update_key_request.model_fields_set
+
+    non_admin = UserAPIKeyAuth(
+        user_role=LitellmUserRoles.INTERNAL_USER,
+        api_key="sk-non-admin",
+        user_id="user-1",
+    )
+
+    with pytest.raises(HTTPException) as exc_info:
+        await _process_single_key_update(
+            update_key_request=update_key_request,
+            user_api_key_dict=non_admin,
+            litellm_changed_by=None,
+            prisma_client=AsyncMock(),
+            user_api_key_cache=MagicMock(),
+            proxy_logging_obj=MagicMock(),
+            llm_router=MagicMock(),
+        )
+    assert exc_info.value.status_code == 403
+    assert "permissions" in str(exc_info.value.detail)
+
+
 @pytest.mark.asyncio
 async def test_execute_virtual_key_regeneration_cache_invalidation_with_token_hash():
     """

From ae356cf1faa24f71e14ef93181adad5c95883ce2 Mon Sep 17 00:00:00 2001
From: Mateo Wang <277851410+mateo-berri@users.noreply.github.com>
Date: Thu, 2 Jul 2026 22:38:36 -0700
Subject: [PATCH 25/26] fix(azure_ai): preserve content, tables, and
 keyValuePairs in doc-intelligence /v1/ocr (#32018)

* fix(azure_ai): preserve content, tables, and keyValuePairs in doc-intelligence /v1/ocr

Azure Document Intelligence analyzeResult.content, .tables, and
.keyValuePairs were dropped when normalizing to the Mistral OCR schema.
They are now passed through verbatim as top-level response fields, and
the duplicated sync/async response parsing is consolidated into one
pydantic-validated helper.

Also adds the Azure DI features query param (list[str] or
comma-separated string, e.g. features=keyValuePairs) which Azure
requires for keyValuePairs extraction.

* test(azure_ai): replace fastapi jsonable_encoder with model_dump in ocr unit tests
---
 .../document_intelligence/transformation.py   | 356 ++++++++----------
 litellm/llms/base_llm/ocr/transformation.py   |   3 +
 .../test_ocr_azure_document_intelligence.py   |   4 +-
 ...ocument_intelligence_ocr_transformation.py | 217 +++++++++++
 4 files changed, 384 insertions(+), 196 deletions(-)

diff --git a/litellm/llms/azure_ai/ocr/document_intelligence/transformation.py b/litellm/llms/azure_ai/ocr/document_intelligence/transformation.py
index c67703f64d7..7d915892a28 100644
--- a/litellm/llms/azure_ai/ocr/document_intelligence/transformation.py
+++ b/litellm/llms/azure_ai/ocr/document_intelligence/transformation.py
@@ -15,6 +15,7 @@ from typing import Any, Dict
 from urllib.parse import quote
 
 import httpx
+from pydantic import BaseModel
 
 from litellm._logging import verbose_logger
 from litellm.litellm_core_utils.url_utils import SSRFError, assert_same_origin
@@ -38,6 +39,30 @@ from litellm.secret_managers.main import get_secret_str
 AZURE_DOCUMENT_INTELLIGENCE_API_KEY_ENV_VAR = "AZURE_DOCUMENT_INTELLIGENCE_API_KEY"
 
 
+class AzureDocumentIntelligenceLine(BaseModel):
+    content: str | None = None
+
+
+class AzureDocumentIntelligencePage(BaseModel):
+    pageNumber: int | None = None
+    width: float | None = None
+    height: float | None = None
+    unit: str | None = None
+    lines: tuple[AzureDocumentIntelligenceLine, ...] = ()
+
+
+class AzureDocumentIntelligenceAnalyzeResult(BaseModel):
+    content: str | None = None
+    pages: tuple[AzureDocumentIntelligencePage, ...] = ()
+    tables: list[dict[str, object]] | None = None
+    keyValuePairs: list[dict[str, object]] | None = None
+
+
+class AzureDocumentIntelligenceOperation(BaseModel):
+    status: str | None = None
+    analyzeResult: AzureDocumentIntelligenceAnalyzeResult | None = None
+
+
 class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
     """
     Azure Document Intelligence OCR transformation configuration.
@@ -67,11 +92,14 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
         (1-based, e.g. "1-3,5,7-9"). To keep the public request shape
         aligned with Mistral OCR, callers pass `pages` using Mistral
         semantics — a list of 0-based integers — or a pre-formatted
-        Azure-style string. Other Mistral-specific params (e.g.
+        Azure-style string. Azure DI also exposes a `features` query
+        parameter enabling add-on capabilities (e.g. "keyValuePairs",
+        "languages"), passed as a list of feature names or a
+        comma-separated string. Other Mistral-specific params (e.g.
         `include_image_base64`) are not supported by Azure DI and are
         ignored during transformation.
         """
-        return ["pages"]
+        return ["pages", "features"]
 
     def map_ocr_params(
         self,
@@ -85,16 +113,18 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
         Translates Mistral-style `pages` (list[int], 0-based) into Azure's
         `pages` query string (1-based, e.g. "1,2,3" or "1-3,5"). A raw
         string that already matches Azure's format is passed through
-        unchanged.
+        unchanged. `features` (list[str] or comma-separated string) is
+        normalized into Azure's comma-joined `features` query string.
         """
         pages = non_default_params.get("pages")
-        if pages is None:
-            return optional_params
-
-        normalized = self._normalize_pages_param(pages)
-        if normalized:
-            optional_params["pages"] = normalized
-        return optional_params
+        features = non_default_params.get("features")
+        normalized_pages = self._normalize_pages_param(pages) if pages is not None else ""
+        normalized_features = self._normalize_features_param(features) if features is not None else ""
+        return {
+            **optional_params,
+            **({"pages": normalized_pages} if normalized_pages else {}),
+            **({"features": normalized_features} if normalized_features else {}),
+        }
 
     @staticmethod
     def _normalize_pages_param(pages: Any) -> str:
@@ -140,6 +170,39 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
 
         raise ValueError("`pages` must be a list[int] (0-based, Mistral-style) or a string like '1-3,5,7-9'.")
 
+    @staticmethod
+    def _normalize_features_param(features: object) -> str:
+        """
+        Convert a caller-provided `features` value to Azure DI's query-string
+        form (comma-joined feature names, e.g. "keyValuePairs,languages").
+
+        Accepted inputs:
+          - list[str]: feature names like ["keyValuePairs", "languages"].
+          - str: a single feature name or comma-separated names.
+        """
+        invalid_features_error = ValueError(
+            f"Invalid `features` for Azure Document Intelligence: {features!r}. "
+            f"Expected a list of feature names or a comma-separated string like "
+            f"'keyValuePairs' or 'keyValuePairs,languages'."
+        )
+
+        if isinstance(features, str):
+            raw_tokens = features.split(",")
+        elif isinstance(features, list):
+            if len(features) == 0:
+                return ""
+            raw_tokens = [feature for feature in features if isinstance(feature, str)]
+            if len(raw_tokens) != len(features):
+                raise invalid_features_error
+        else:
+            raise invalid_features_error
+
+        tokens = tuple(token.strip() for token in raw_tokens)
+        feature_pattern = re.compile(r"^[A-Za-z][A-Za-z0-9]*$")
+        if not all(feature_pattern.match(token) for token in tokens):
+            raise invalid_features_error
+        return ",".join(tokens)
+
     def validate_environment(
         self,
         headers: Dict,
@@ -228,13 +291,15 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
             f"?api-version={AZURE_DOCUMENT_INTELLIGENCE_API_VERSION}"
         )
 
-        # Azure DI accepts `pages` as a query param (1-based, e.g. "1-3,5").
+        # Azure DI accepts `pages` (1-based, e.g. "1-3,5") and `features`
+        # (comma-joined names, e.g. "keyValuePairs") as query params.
         # `optional_params` has already been normalized in `map_ocr_params`.
         pages = optional_params.get("pages") if optional_params else None
-        if pages:
-            url += f"&pages={quote(str(pages), safe=',-')}"
+        features = optional_params.get("features") if optional_params else None
+        pages_query = f"&pages={quote(str(pages), safe=',-')}" if pages else ""
+        features_query = f"&features={quote(str(features), safe=',')}" if features else ""
 
-        return url
+        return f"{url}{pages_query}{features_query}"
 
     def _extract_base64_from_data_uri(self, data_uri: str) -> str:
         """
@@ -328,27 +393,15 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
 
         return OCRRequestData(data=data, files=None)
 
-    def _extract_page_markdown(self, page_data: Dict[str, Any]) -> str:
-        """
-        Extract text from Azure DI page and format as markdown.
-
-        Azure DI provides text in 'lines' array. We concatenate them with newlines.
-
-        Args:
-            page_data: Azure DI page object
-
-        Returns:
-            Markdown-formatted text
-        """
-        lines = page_data.get("lines", [])
-        if not lines:
-            return ""
-
-        # Extract text content from each line
-        text_lines = [line.get("content", "") for line in lines]
-
-        # Join with newlines to preserve structure
-        return "\n".join(text_lines)
+    def _transform_azure_page(self, azure_page: AzureDocumentIntelligencePage) -> OCRPage:
+        page_number = azure_page.pageNumber if azure_page.pageNumber is not None else 1
+        markdown = "\n".join(line.content or "" for line in azure_page.lines)
+        dimensions = self._convert_dimensions(
+            width=azure_page.width if azure_page.width is not None else 8.5,
+            height=azure_page.height if azure_page.height is not None else 11,
+            unit=azure_page.unit if azure_page.unit is not None else "inch",
+        )
+        return OCRPage(index=page_number - 1, markdown=markdown, dimensions=dimensions)
 
     def _convert_dimensions(self, width: float, height: float, unit: str) -> OCRPageDimensions:
         """
@@ -526,6 +579,52 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
                 retry_after = self._get_retry_after(response=response)
                 await asyncio.sleep(retry_after)
 
+    def _get_polling_target(self, raw_response: httpx.Response) -> tuple[str, Dict[str, str]]:
+        operation_url = raw_response.headers.get("Operation-Location")
+        if not operation_url:
+            raise ValueError("Azure Document Intelligence returned 202 but no Operation-Location header found")
+
+        # Reject cross-origin polling URLs — the auth headers
+        # below would otherwise leak to whatever URL the upstream
+        # (or an attacker-controlled upstream) returns. VERIA-51.
+        try:
+            assert_same_origin(operation_url, str(raw_response.request.url))
+        except SSRFError as ssrf_err:
+            raise ValueError(f"Azure Document Intelligence: rejected polling URL ({ssrf_err})")
+
+        poll_headers = {"Ocp-Apim-Subscription-Key": raw_response.request.headers.get("Ocp-Apim-Subscription-Key", "")}
+        return operation_url, poll_headers
+
+    def _transform_completed_response(self, model: str, raw_response: httpx.Response) -> OCRResponse:
+        """
+        Transform a completed Azure Document Intelligence analyze operation
+        into the Mistral OCR response shape, preserving Azure-native
+        `analyzeResult` fields (`content`, `tables`, `keyValuePairs`) as
+        top-level response fields.
+        """
+        operation = AzureDocumentIntelligenceOperation.model_validate(raw_response.json())
+
+        verbose_logger.debug(f"Azure Document Intelligence response status: {operation.status}")
+
+        if operation.status != "succeeded":
+            raise ValueError(f"Azure Document Intelligence analysis failed with status: {operation.status}")
+
+        analyze_result = (
+            operation.analyzeResult if operation.analyzeResult is not None else AzureDocumentIntelligenceAnalyzeResult()
+        )
+        mistral_pages = [self._transform_azure_page(azure_page) for azure_page in analyze_result.pages]
+        usage_info = OCRUsageInfo(pages_processed=len(mistral_pages), doc_size_bytes=None)
+
+        return OCRResponse(
+            pages=mistral_pages,
+            model=model,
+            usage_info=usage_info,
+            object="ocr",
+            content=analyze_result.content,
+            tables=analyze_result.tables,
+            keyValuePairs=analyze_result.keyValuePairs,
+        )
+
     def transform_ocr_response(
         self,
         model: str,
@@ -552,11 +651,13 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
                         "unit": "inch",
                         "lines": [{"content": "text", "boundingBox": [...]}]
                     }
-                ]
+                ],
+                "tables": [...],
+                "keyValuePairs": [...]
             }
         }
 
-        Mistral OCR format:
+        Mistral OCR format (with Azure-native fields preserved):
         {
             "pages": [
                 {
@@ -567,7 +668,10 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
             ],
             "model": "azure_ai/doc-intelligence/prebuilt-layout",
             "usage_info": {"pages_processed": 1},
-            "object": "ocr"
+            "object": "ocr",
+            "content": "Full document text...",
+            "tables": [...],
+            "keyValuePairs": [...]
         }
 
         Args:
@@ -578,86 +682,17 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
         Returns:
             OCRResponse in Mistral format
         """
-        try:
-            # Check if we got 202 Accepted (async operation started)
-            if raw_response.status_code == 202:
-                verbose_logger.debug("Azure DI returned 202 Accepted, polling operation...")
+        if raw_response.status_code != 202:
+            return self._transform_completed_response(model=model, raw_response=raw_response)
 
-                # Get Operation-Location header
-                operation_url = raw_response.headers.get("Operation-Location")
-                if not operation_url:
-                    raise ValueError("Azure Document Intelligence returned 202 but no Operation-Location header found")
-
-                # Reject cross-origin polling URLs — the auth headers
-                # below would otherwise leak to whatever URL the upstream
-                # (or an attacker-controlled upstream) returns. VERIA-51.
-                try:
-                    assert_same_origin(operation_url, str(raw_response.request.url))
-                except SSRFError as ssrf_err:
-                    raise ValueError(f"Azure Document Intelligence: rejected polling URL ({ssrf_err})")
-
-                # Get headers for polling (need auth)
-                poll_headers = {
-                    "Ocp-Apim-Subscription-Key": raw_response.request.headers.get("Ocp-Apim-Subscription-Key", "")
-                }
-
-                # Get timeout from kwargs or use default
-                timeout_secs = AZURE_OPERATION_POLLING_TIMEOUT
-
-                # Poll until operation completes
-                raw_response = self._poll_operation_sync(
-                    operation_url=operation_url,
-                    headers=poll_headers,
-                    timeout_secs=timeout_secs,
-                )
-
-            # Now parse the completed response
-            response_json = raw_response.json()
-
-            verbose_logger.debug(f"Azure Document Intelligence response status: {response_json.get('status')}")
-
-            # Check if request succeeded
-            status = response_json.get("status")
-            if status != "succeeded":
-                raise ValueError(f"Azure Document Intelligence analysis failed with status: {status}")
-
-            # Extract analyze result
-            analyze_result = response_json.get("analyzeResult", {})
-            azure_pages = analyze_result.get("pages", [])
-
-            # Transform pages to Mistral format
-            mistral_pages = []
-            for azure_page in azure_pages:
-                page_number = azure_page.get("pageNumber", 1)
-                index = page_number - 1  # Convert to 0-based index
-
-                # Extract markdown text
-                markdown = self._extract_page_markdown(azure_page)
-
-                # Convert dimensions
-                width = azure_page.get("width", 8.5)
-                height = azure_page.get("height", 11)
-                unit = azure_page.get("unit", "inch")
-                dimensions = self._convert_dimensions(width=width, height=height, unit=unit)
-
-                # Build OCR page
-                ocr_page = OCRPage(index=index, markdown=markdown, dimensions=dimensions)
-                mistral_pages.append(ocr_page)
-
-            # Build usage info
-            usage_info = OCRUsageInfo(pages_processed=len(mistral_pages), doc_size_bytes=None)
-
-            # Return Mistral OCR response
-            return OCRResponse(
-                pages=mistral_pages,
-                model=model,
-                usage_info=usage_info,
-                object="ocr",
-            )
-
-        except Exception as e:
-            verbose_logger.error(f"Error parsing Azure Document Intelligence response: {e}")
-            raise e
+        verbose_logger.debug("Azure DI returned 202 Accepted, polling operation...")
+        operation_url, poll_headers = self._get_polling_target(raw_response)
+        completed_response = self._poll_operation_sync(
+            operation_url=operation_url,
+            headers=poll_headers,
+            timeout_secs=AZURE_OPERATION_POLLING_TIMEOUT,
+        )
+        return self._transform_completed_response(model=model, raw_response=completed_response)
 
     async def async_transform_ocr_response(
         self,
@@ -680,81 +715,14 @@ class AzureDocumentIntelligenceOCRConfig(BaseOCRConfig):
         Returns:
             OCRResponse in Mistral format
         """
-        try:
-            # Check if we got 202 Accepted (async operation started)
-            if raw_response.status_code == 202:
-                verbose_logger.debug("Azure DI returned 202 Accepted, polling operation (async)...")
+        if raw_response.status_code != 202:
+            return self._transform_completed_response(model=model, raw_response=raw_response)
 
-                # Get Operation-Location header
-                operation_url = raw_response.headers.get("Operation-Location")
-                if not operation_url:
-                    raise ValueError("Azure Document Intelligence returned 202 but no Operation-Location header found")
-
-                # Reject cross-origin polling URLs (see sync path). VERIA-51.
-                try:
-                    assert_same_origin(operation_url, str(raw_response.request.url))
-                except SSRFError as ssrf_err:
-                    raise ValueError(f"Azure Document Intelligence: rejected polling URL ({ssrf_err})")
-
-                # Get headers for polling (need auth)
-                poll_headers = {
-                    "Ocp-Apim-Subscription-Key": raw_response.request.headers.get("Ocp-Apim-Subscription-Key", "")
-                }
-
-                # Get timeout from kwargs or use default
-                timeout_secs = AZURE_OPERATION_POLLING_TIMEOUT
-
-                # Poll until operation completes (async)
-                raw_response = await self._poll_operation_async(
-                    operation_url=operation_url,
-                    headers=poll_headers,
-                    timeout_secs=timeout_secs,
-                )
-
-            # Now parse the completed response
-            response_json = raw_response.json()
-
-            verbose_logger.debug(f"Azure Document Intelligence response status: {response_json.get('status')}")
-
-            # Check if request succeeded
-            status = response_json.get("status")
-            if status != "succeeded":
-                raise ValueError(f"Azure Document Intelligence analysis failed with status: {status}")
-
-            # Extract analyze result
-            analyze_result = response_json.get("analyzeResult", {})
-            azure_pages = analyze_result.get("pages", [])
-
-            # Transform pages to Mistral format
-            mistral_pages = []
-            for azure_page in azure_pages:
-                page_number = azure_page.get("pageNumber", 1)
-                index = page_number - 1  # Convert to 0-based index
-
-                # Extract markdown text
-                markdown = self._extract_page_markdown(azure_page)
-
-                # Convert dimensions
-                width = azure_page.get("width", 8.5)
-                height = azure_page.get("height", 11)
-                unit = azure_page.get("unit", "inch")
-                dimensions = self._convert_dimensions(width=width, height=height, unit=unit)
-
-                # Build OCR page
-                ocr_page = OCRPage(index=index, markdown=markdown, dimensions=dimensions)
-                mistral_pages.append(ocr_page)
-
-            # Build usage info
-            usage_info = OCRUsageInfo(pages_processed=len(mistral_pages), doc_size_bytes=None)
-
-            # Return Mistral OCR response
-            return OCRResponse(
-                pages=mistral_pages,
-                model=model,
-                usage_info=usage_info,
-                object="ocr",
-            )
-
-        except Exception as e:
-            verbose_logger.error(f"Error parsing Azure Document Intelligence response (async): {e}")
-            raise e
+        verbose_logger.debug("Azure DI returned 202 Accepted, polling operation (async)...")
+        operation_url, poll_headers = self._get_polling_target(raw_response)
+        completed_response = await self._poll_operation_async(
+            operation_url=operation_url,
+            headers=poll_headers,
+            timeout_secs=AZURE_OPERATION_POLLING_TIMEOUT,
+        )
+        return self._transform_completed_response(model=model, raw_response=completed_response)
diff --git a/litellm/llms/base_llm/ocr/transformation.py b/litellm/llms/base_llm/ocr/transformation.py
index a38e5bfdcd6..0d878bd308c 100644
--- a/litellm/llms/base_llm/ocr/transformation.py
+++ b/litellm/llms/base_llm/ocr/transformation.py
@@ -70,6 +70,9 @@ class OCRResponse(LiteLLMPydanticObjectBase):
     model: str
     document_annotation: Any | None = None
     usage_info: OCRUsageInfo | None = None
+    content: str | None = None
+    tables: list[dict[str, object]] | None = None
+    keyValuePairs: list[dict[str, object]] | None = None
     object: str = "ocr"
 
     model_config = {"extra": "allow"}
diff --git a/tests/ocr_tests/test_ocr_azure_document_intelligence.py b/tests/ocr_tests/test_ocr_azure_document_intelligence.py
index 7269890b7b6..09c21842ad7 100644
--- a/tests/ocr_tests/test_ocr_azure_document_intelligence.py
+++ b/tests/ocr_tests/test_ocr_azure_document_intelligence.py
@@ -61,8 +61,8 @@ class TestAzureDocumentIntelligencePagesParam:
     def cfg(self) -> AzureDocumentIntelligenceOCRConfig:
         return AzureDocumentIntelligenceOCRConfig()
 
-    def test_get_supported_ocr_params_includes_pages(self, cfg):
-        assert cfg.get_supported_ocr_params("prebuilt-layout") == ["pages"]
+    def test_get_supported_ocr_params_includes_pages_and_features(self, cfg):
+        assert cfg.get_supported_ocr_params("prebuilt-layout") == ["pages", "features"]
 
     def test_map_ocr_params_mistral_zero_based_int_list(self, cfg):
         mapped = cfg.map_ocr_params({"pages": [0, 1, 2]}, {}, "prebuilt-layout")
diff --git a/tests/test_litellm/llms/azure_ai/test_azure_document_intelligence_ocr_transformation.py b/tests/test_litellm/llms/azure_ai/test_azure_document_intelligence_ocr_transformation.py
index e638be68ec0..39d6f1dc355 100644
--- a/tests/test_litellm/llms/azure_ai/test_azure_document_intelligence_ocr_transformation.py
+++ b/tests/test_litellm/llms/azure_ai/test_azure_document_intelligence_ocr_transformation.py
@@ -1,3 +1,6 @@
+from unittest.mock import MagicMock
+
+import httpx
 import pytest
 
 from litellm.llms.azure_ai.ocr.document_intelligence.transformation import (
@@ -31,3 +34,217 @@ def test_should_reject_dot_segment_azure_document_intelligence_model_id():
             optional_params={},
             litellm_params={},
         )
+
+
+AZURE_TABLES = [
+    {
+        "rowCount": 2,
+        "columnCount": 2,
+        "cells": [
+            {"kind": "columnHeader", "rowIndex": 0, "columnIndex": 0, "content": "Item"},
+            {"kind": "columnHeader", "rowIndex": 0, "columnIndex": 1, "content": "Price"},
+            {"rowIndex": 1, "columnIndex": 0, "content": "Widget"},
+            {"rowIndex": 1, "columnIndex": 1, "content": "$100.00"},
+        ],
+    },
+    {
+        "rowCount": 1,
+        "columnCount": 1,
+        "cells": [{"rowIndex": 0, "columnIndex": 0, "content": "Totals"}],
+    },
+]
+
+AZURE_KEY_VALUE_PAIRS = [
+    {"key": {"content": "Invoice No"}, "value": {"content": "INV-12345"}, "confidence": 0.98},
+    {"key": {"content": "Total"}, "value": {"content": "$100.00"}, "confidence": 0.95},
+]
+
+AZURE_ANALYZE_SUCCEEDED = {
+    "status": "succeeded",
+    "createdDateTime": "2026-07-02T00:00:00Z",
+    "lastUpdatedDateTime": "2026-07-02T00:00:05Z",
+    "analyzeResult": {
+        "apiVersion": "2024-11-30",
+        "modelId": "prebuilt-layout",
+        "content": "Invoice\nInvoice No: INV-12345\nTotal: $100.00",
+        "pages": [
+            {
+                "pageNumber": 1,
+                "width": 8.5,
+                "height": 11,
+                "unit": "inch",
+                "lines": [
+                    {"content": "Invoice"},
+                    {"content": "Invoice No: INV-12345"},
+                    {"content": "Total: $100.00"},
+                ],
+            }
+        ],
+        "tables": AZURE_TABLES,
+        "keyValuePairs": AZURE_KEY_VALUE_PAIRS,
+    },
+}
+
+
+def _completed_response(payload: dict) -> httpx.Response:
+    return httpx.Response(
+        status_code=200,
+        json=payload,
+        request=httpx.Request("GET", "https://example.cognitiveservices.azure.com/analyzeResults/xyz"),
+    )
+
+
+def _assert_native_fields_preserved(serialized: dict) -> None:
+    assert serialized["content"] == "Invoice\nInvoice No: INV-12345\nTotal: $100.00"
+    assert serialized["tables"] == AZURE_TABLES
+    assert serialized["keyValuePairs"] == AZURE_KEY_VALUE_PAIRS
+    assert serialized["object"] == "ocr"
+    assert serialized["usage_info"]["pages_processed"] == 1
+    assert serialized["pages"][0]["index"] == 0
+    assert serialized["pages"][0]["markdown"] == "Invoice\nInvoice No: INV-12345\nTotal: $100.00"
+    assert serialized["pages"][0]["dimensions"] == {"width": 816, "height": 1056, "dpi": 96}
+
+
+def test_transform_ocr_response_preserves_azure_native_fields():
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    result = config.transform_ocr_response(
+        model="azure_ai/doc-intelligence/prebuilt-layout",
+        raw_response=_completed_response(AZURE_ANALYZE_SUCCEEDED),
+        logging_obj=MagicMock(),
+    )
+
+    _assert_native_fields_preserved(result.model_dump())
+
+
+@pytest.mark.asyncio
+async def test_async_transform_ocr_response_preserves_azure_native_fields():
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    result = await config.async_transform_ocr_response(
+        model="azure_ai/doc-intelligence/prebuilt-layout",
+        raw_response=_completed_response(AZURE_ANALYZE_SUCCEEDED),
+        logging_obj=MagicMock(),
+    )
+
+    _assert_native_fields_preserved(result.model_dump())
+
+
+def test_transform_ocr_response_tolerates_missing_native_fields():
+    config = AzureDocumentIntelligenceOCRConfig()
+    payload = {
+        "status": "succeeded",
+        "analyzeResult": {
+            "pages": [
+                {
+                    "pageNumber": 1,
+                    "width": 8.5,
+                    "height": 11,
+                    "unit": "inch",
+                    "lines": [{"content": "hello"}],
+                }
+            ],
+        },
+    }
+
+    result = config.transform_ocr_response(
+        model="azure_ai/doc-intelligence/prebuilt-read",
+        raw_response=_completed_response(payload),
+        logging_obj=MagicMock(),
+    )
+
+    serialized = result.model_dump()
+    assert serialized["pages"][0]["markdown"] == "hello"
+    assert serialized["content"] is None
+    assert serialized["tables"] is None
+    assert serialized["keyValuePairs"] is None
+
+
+def test_transform_ocr_response_non_succeeded_status_raises():
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    with pytest.raises(ValueError, match="failed with status: failed"):
+        config.transform_ocr_response(
+            model="azure_ai/doc-intelligence/prebuilt-layout",
+            raw_response=_completed_response({"status": "failed"}),
+            logging_obj=MagicMock(),
+        )
+
+
+def test_get_supported_ocr_params_includes_features():
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    assert config.get_supported_ocr_params("prebuilt-layout") == ["pages", "features"]
+
+
+@pytest.mark.parametrize(
+    "features,expected",
+    [
+        (["keyValuePairs"], "keyValuePairs"),
+        (["keyValuePairs", "languages"], "keyValuePairs,languages"),
+        ("keyValuePairs", "keyValuePairs"),
+        ("keyValuePairs,languages", "keyValuePairs,languages"),
+        ("keyValuePairs, languages", "keyValuePairs,languages"),
+    ],
+)
+def test_map_ocr_params_features(features, expected):
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    mapped = config.map_ocr_params({"features": features}, {}, "prebuilt-layout")
+
+    assert mapped == {"features": expected}
+
+
+def test_map_ocr_params_empty_features_list_omitted():
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    assert config.map_ocr_params({"features": []}, {}, "prebuilt-layout") == {}
+
+
+@pytest.mark.parametrize(
+    "features",
+    [
+        "keyValuePairs&pages=9",
+        "key value pairs",
+        "",
+        [1, 2],
+        [["keyValuePairs"]],
+        {"feature": "keyValuePairs"},
+        5,
+    ],
+)
+def test_map_ocr_params_invalid_features_raises(features):
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    with pytest.raises(ValueError, match="Invalid `features`"):
+        config.map_ocr_params({"features": features}, {}, "prebuilt-layout")
+
+
+def test_get_complete_url_appends_features_query():
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    url = config.get_complete_url(
+        api_base="https://example.cognitiveservices.azure.com",
+        model="azure_ai/doc-intelligence/prebuilt-layout",
+        optional_params={"features": "keyValuePairs"},
+    )
+
+    assert "&features=keyValuePairs" in url
+
+
+def test_get_complete_url_combines_pages_and_features():
+    config = AzureDocumentIntelligenceOCRConfig()
+
+    optional_params = config.map_ocr_params(
+        {"pages": [0, 1, 2], "features": ["keyValuePairs", "languages"]},
+        {},
+        "prebuilt-layout",
+    )
+    url = config.get_complete_url(
+        api_base="https://example.cognitiveservices.azure.com",
+        model="prebuilt-layout",
+        optional_params=optional_params,
+    )
+
+    assert "&pages=1,2,3" in url
+    assert "&features=keyValuePairs,languages" in url

From 4e53ae98a712d04aa4f58828c4ae4ba9b1a0fc01 Mon Sep 17 00:00:00 2001
From: yuneng-jiang <yuneng@berri.ai>
Date: Thu, 2 Jul 2026 22:54:59 -0700
Subject: [PATCH 26/26] bump: litellm-proxy-extras 0.4.74 -> 0.4.75,
 litellm-enterprise 0.1.45 -> 0.1.46 (#32029)

Both directories diverged from main; bump PATCH and relock.
---
 enterprise/pyproject.toml           | 4 ++--
 litellm-proxy-extras/pyproject.toml | 4 ++--
 pyproject.toml                      | 4 ++--
 uv.lock                             | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/enterprise/pyproject.toml b/enterprise/pyproject.toml
index f2ad04510a8..c7f37600fd5 100644
--- a/enterprise/pyproject.toml
+++ b/enterprise/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "litellm-enterprise"
-version = "0.1.45"
+version = "0.1.46"
 description = "Package for LiteLLM Enterprise features"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -26,7 +26,7 @@ required-version = ">=0.10.9"
 module-root = ""
 
 [tool.commitizen]
-version = "0.1.45"
+version = "0.1.46"
 version_files = [
     "pyproject.toml:^version",
     "../pyproject.toml:litellm-enterprise==",
diff --git a/litellm-proxy-extras/pyproject.toml b/litellm-proxy-extras/pyproject.toml
index e2a86205fc5..4d237622da2 100644
--- a/litellm-proxy-extras/pyproject.toml
+++ b/litellm-proxy-extras/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "litellm-proxy-extras"
-version = "0.4.74"
+version = "0.4.75"
 description = "Additional files for the LiteLLM Proxy. Reduces the size of the main litellm package."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -26,7 +26,7 @@ required-version = ">=0.10.9"
 module-root = ""
 
 [tool.commitizen]
-version = "0.4.74"
+version = "0.4.75"
 version_files = [
     "pyproject.toml:^version",
     "../pyproject.toml:litellm-proxy-extras==",
diff --git a/pyproject.toml b/pyproject.toml
index 5165859b1b6..b5a62e550db 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,8 +62,8 @@ proxy = [
     "azure-identity>=1.25.2,<2.0",
     "azure-storage-blob>=12.28.0,<13.0",
     "mcp>=1.26.0,<2.0",
-    "litellm-proxy-extras==0.4.74",
-    "litellm-enterprise==0.1.45",
+    "litellm-proxy-extras==0.4.75",
+    "litellm-enterprise==0.1.46",
     "RestrictedPython>=8.1,<9.0",
     "rich>=13.9.4,<14.0",
     "polars>=1.38.1,<2.0",
diff --git a/uv.lock b/uv.lock
index 768a2176d53..5424406ce96 100644
--- a/uv.lock
+++ b/uv.lock
@@ -9,7 +9,7 @@ resolution-markers = [
 ]
 
 [options]
-exclude-newer = "2026-06-27T20:21:25.609736Z"
+exclude-newer = "2026-06-30T05:26:52.796531Z"
 exclude-newer-span = "P3D"
 
 [manifest]
@@ -3639,12 +3639,12 @@ proxy-dev = [
 
 [[package]]
 name = "litellm-enterprise"
-version = "0.1.45"
+version = "0.1.46"
 source = { editable = "enterprise" }
 
 [[package]]
 name = "litellm-proxy-extras"
-version = "0.4.74"
+version = "0.4.75"
 source = { editable = "litellm-proxy-extras" }
 
 [[package]]