diff --git a/.circleci/scripts/classify_changes.sh b/.circleci/scripts/classify_changes.sh
index 2ca2654a207..7aa0c3544ee 100755
--- a/.circleci/scripts/classify_changes.sh
+++ b/.circleci/scripts/classify_changes.sh
@@ -1,15 +1,17 @@
 #!/usr/bin/env bash
 set -uo pipefail
 
-category="${1:?usage: classify_changes.sh <backend|client>}"
+category="${1:?usage: classify_changes.sh <backend|client|ui>}"
 
 has_client=false
 has_backend=false
+has_ci=false
 while IFS= read -r file || [ -n "$file" ]; do
   [ -n "$file" ] || continue
   case "$file" in
     ui/* | tests/e2e/ui/*) has_client=true ;;
     docs/* | *.md | *.mdx) : ;;
+    .github/* | .circleci/*) has_ci=true; has_backend=true ;;
     *) has_backend=true ;;
   esac
 done
@@ -21,6 +23,9 @@ case "$category" in
   client)
     { [ "$has_client" = true ] || [ "$has_backend" = true ]; } && echo run || echo skip
     ;;
+  ui)
+    { [ "$has_client" = true ] || [ "$has_ci" = true ]; } && echo run || echo skip
+    ;;
   *)
     echo run
     ;;
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 51d489459d9..118e5491939 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,5 @@
 /ui/ @yuneng-jiang @ryan-crabbe-berri
 /litellm/proxy/_experimental/out/ @yuneng-jiang @ryan-crabbe-berri
 /ui/litellm-dashboard/src/lib/http/schema.d.ts
+/model_prices_and_context_window.json @mateo-berri
+/litellm/model_prices_and_context_window_backup.json @mateo-berri
diff --git a/.github/actions/detect-backend-changes/action.yml b/.github/actions/detect-backend-changes/action.yml
deleted file mode 100644
index af01038f294..00000000000
--- a/.github/actions/detect-backend-changes/action.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: "Detect backend-relevant changes"
-description: >-
-  Classify the pull request's changed files with .circleci/scripts/classify_changes.sh
-  and expose decision=run|skip. decision=skip means only ui/**, **.md or **.mdx files
-  changed, so callers can short-circuit expensive steps while the job still completes
-  successfully and satisfies its required status check. The decision defaults to run for
-  any non pull_request event or whenever the changed set cannot be resolved, so tests are
-  never skipped when the classification is uncertain.
-
-outputs:
-  decision:
-    description: "run when backend-relevant files changed, otherwise skip"
-    value: ${{ steps.classify.outputs.decision }}
-
-runs:
-  using: composite
-  steps:
-    - id: classify
-      shell: bash
-      env:
-        BASE_SHA: ${{ github.event.pull_request.base.sha }}
-      run: |
-        set -uo pipefail
-        if [ -z "${BASE_SHA:-}" ]; then
-          echo "detect-backend-changes: not a pull_request event; running job"
-          echo "decision=run" >> "${GITHUB_OUTPUT}"
-          exit 0
-        fi
-        if ! git fetch --no-tags --depth=1 origin "${BASE_SHA}" >/dev/null 2>&1; then
-          echo "detect-backend-changes: could not fetch base ${BASE_SHA}; running job"
-          echo "decision=run" >> "${GITHUB_OUTPUT}"
-          exit 0
-        fi
-        changed="$(git diff --name-only "${BASE_SHA}" HEAD 2>/dev/null)" || {
-          echo "detect-backend-changes: git diff failed; running job"
-          echo "decision=run" >> "${GITHUB_OUTPUT}"
-          exit 0
-        }
-        if [ -z "${changed}" ]; then
-          echo "detect-backend-changes: no changed files vs ${BASE_SHA}; skipping job"
-          echo "decision=skip" >> "${GITHUB_OUTPUT}"
-          exit 0
-        fi
-        echo "detect-backend-changes: changed files vs ${BASE_SHA}:"
-        printf '%s\n' "${changed}" | sed 's/^/  /'
-        decision="$(printf '%s\n' "${changed}" | bash .circleci/scripts/classify_changes.sh backend)" || decision="run"
-        echo "detect-backend-changes: decision=${decision}"
-        echo "decision=${decision}" >> "${GITHUB_OUTPUT}"
diff --git a/.github/actions/detect-changes/action.yml b/.github/actions/detect-changes/action.yml
new file mode 100644
index 00000000000..9b22d2c23a8
--- /dev/null
+++ b/.github/actions/detect-changes/action.yml
@@ -0,0 +1,41 @@
+name: "Detect relevant changes"
+description: >-
+  Classify the pull request's changed files with .circleci/scripts/classify_changes.sh
+  and expose decision=run|skip for one category. backend means anything outside ui/,
+  docs/ and markdown; ui means the dashboard sources alone. decision=skip lets callers
+  short-circuit expensive steps while the job still completes successfully and satisfies
+  its required status check, which a paths: filter cannot do because a workflow that
+  never starts never reports. The file list comes from the pull request itself rather
+  than from a git diff, because the checked-out merge ref is recomputed as the base
+  branch advances and would otherwise attribute the base branch's own commits to the
+  pull request. The decision defaults to run for any non pull_request event or whenever
+  the changed set cannot be resolved, so jobs are never skipped when the classification
+  is uncertain.
+
+inputs:
+  category:
+    description: "Which classification to apply: backend, client or ui"
+    required: false
+    default: backend
+  github-token:
+    description: "Token used to list the pull request's files; needs pull-requests: read"
+    required: false
+    default: ${{ github.token }}
+
+outputs:
+  decision:
+    description: "run when category-relevant files changed, otherwise skip"
+    value: ${{ steps.classify.outputs.decision }}
+
+runs:
+  using: composite
+  steps:
+    - id: classify
+      shell: bash
+      env:
+        GH_TOKEN: ${{ inputs.github-token }}
+        CATEGORY: ${{ inputs.category }}
+        REPO: ${{ github.repository }}
+        PR_NUMBER: ${{ github.event.pull_request.number }}
+        CHANGED_FILE_COUNT: ${{ github.event.pull_request.changed_files }}
+      run: bash "${GITHUB_ACTION_PATH}/../../scripts/detect_changes.sh"
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 10266228b1f..4e428d8cebf 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -53,7 +53,8 @@ After: the same request comes back with real token counts, so the dashboard show
 **Please complete all items before asking a LiteLLM maintainer to review your PR**
 
 - [ ] I have added meaningful tests
-- [ ] My PR passes all CI/CD checks (e.g., lint, format, unit tests)
+- [ ] The handful of test files covering my change pass locally, e.g. `uv run pytest tests/test_litellm/<your_test_file>.py -v`. Leave the suites (`make test-unit-*`, `make test-unit`) to CI: it finishes in ~15 minutes where a laptop takes an hour or more
+- [ ] My PR passes all required CI/CD checks (e.g., lint, schema.d.ts sync check, etc.)
 - [ ] My PR's scope is as isolated as possible; it only solves 1 specific problem
 - [ ] I have received a Greptile **Confidence Score of at least 4/5** before requesting a maintainer review (Greptile reviews automatically once the PR is opened; only comment `@greptileai` to re-request a review after pushing changes)
 
diff --git a/.github/scripts/detect_changes.sh b/.github/scripts/detect_changes.sh
new file mode 100755
index 00000000000..2d427c92fb5
--- /dev/null
+++ b/.github/scripts/detect_changes.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+readonly API_FILE_CEILING=3000
+readonly CATEGORY="${CATEGORY:-backend}"
+
+decide() {
+  echo "detect-changes[${CATEGORY}]: decision=$1"
+  [ -z "${GITHUB_OUTPUT:-}" ] || echo "decision=$1" >>"${GITHUB_OUTPUT}"
+  exit 0
+}
+
+run_full() {
+  echo "detect-changes[${CATEGORY}]: $1; running job"
+  decide run
+}
+
+here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+classify="${here}/../../.circleci/scripts/classify_changes.sh"
+
+[ -n "${PR_NUMBER:-}" ] || run_full "not a pull_request event"
+[ -n "${REPO:-}" ] || run_full "no repository in the environment"
+
+case "${CHANGED_FILE_COUNT:-}" in
+'' | *[!0-9]*) run_full "the event payload carries no changed_files count" ;;
+esac
+[ "${CHANGED_FILE_COUNT}" -le "${API_FILE_CEILING}" ] ||
+  run_full "PR #${PR_NUMBER} changes ${CHANGED_FILE_COUNT} files, past the ${API_FILE_CEILING}-file listing ceiling"
+
+changed="$(gh api "repos/${REPO}/pulls/${PR_NUMBER}/files" --paginate --jq '.[].filename')" ||
+  run_full "could not list the files on PR #${PR_NUMBER}"
+[ -n "${changed}" ] || run_full "the API listed no files on PR #${PR_NUMBER}"
+
+echo "detect-changes[${CATEGORY}]: files changed by PR #${PR_NUMBER}:"
+printf '%s\n' "${changed}" | sed 's/^/  /'
+
+decision="$(printf '%s\n' "${changed}" | bash "${classify}" "${CATEGORY}")" ||
+  run_full "classify_changes.sh failed"
+case "${decision}" in
+run | skip) decide "${decision}" ;;
+*) run_full "classify_changes.sh printed an unexpected decision: ${decision}" ;;
+esac
diff --git a/.github/workflows/_test-unit-base.yml b/.github/workflows/_test-unit-base.yml
index 58208988fca..4f4339a360a 100644
--- a/.github/workflows/_test-unit-base.yml
+++ b/.github/workflows/_test-unit-base.yml
@@ -60,6 +60,9 @@ jobs:
     name: Run tests
     runs-on: ubuntu-latest
     timeout-minutes: ${{ inputs.job-timeout-minutes }}
+    permissions:
+      contents: read
+      pull-requests: read
     outputs:
       decision: ${{ steps.changes.outputs.decision }}
 
@@ -69,24 +72,27 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Detect backend-relevant changes
+      - name: Detect relevant changes
         id: changes
         timeout-minutes: 2
-        uses: ./.github/actions/detect-backend-changes
+        uses: ./.github/actions/detect-changes
 
       - name: Set up Python
+        if: steps.changes.outputs.decision != 'skip'
         timeout-minutes: 3
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.12"
 
       - name: Set up uv
+        if: steps.changes.outputs.decision != 'skip'
         timeout-minutes: 3
         uses: ./.github/actions/setup-uv-with-retries
         with:
           version: "0.10.9"
 
       - name: Cache uv dependencies
+        if: steps.changes.outputs.decision != 'skip'
         timeout-minutes: 5
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
diff --git a/.github/workflows/test-linting.yml b/.github/workflows/test-linting.yml
index 69495cff896..7a0ae0faaa0 100644
--- a/.github/workflows/test-linting.yml
+++ b/.github/workflows/test-linting.yml
@@ -24,6 +24,7 @@ jobs:
     # re-running basedpyright over the merge-base tree.
     permissions:
       contents: read
+      pull-requests: read
       actions: read
 
     steps:
@@ -37,7 +38,12 @@ jobs:
           clean: true
           persist-credentials: false
 
+      - name: Detect relevant changes
+        id: changes
+        uses: ./.github/actions/detect-changes
+
       - name: Fetch gate base (merge-base with target branch)
+        if: steps.changes.outputs.decision != 'skip'
         env:
           GH_TOKEN: ${{ github.token }}
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
@@ -50,39 +56,47 @@ jobs:
           echo "GATE_BASE_SHA=$MERGE_BASE" >> "$GITHUB_ENV"
 
       - name: Set up Python
+        if: steps.changes.outputs.decision != 'skip'
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.12"
 
       - name: Set up uv
+        if: steps.changes.outputs.decision != 'skip'
         uses: ./.github/actions/setup-uv-with-retries
         with:
           version: "0.10.9"
 
       - name: Clean Python cache
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           find . -type d -name "__pycache__" -exec rm -rf {} + || true
           find . -name "*.pyc" -delete || true
 
       - name: Check uv.lock is up to date
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv lock --check || (echo "❌ uv.lock is out of sync with pyproject.toml. Run 'uv lock' locally and commit the result." && exit 1)
 
       - name: Install dependencies
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv sync --frozen --group proxy-dev --group e2e-dev
 
       - name: Cache Prisma binaries
+        if: steps.changes.outputs.decision != 'skip'
         uses: ./.github/actions/cache-prisma-binaries
 
       # basedpyright resolves Prisma's generated client (litellm/proxy/schema.prisma)
       # only after `prisma generate` writes prisma/client.py et al. Without this the
       # DB wrappers typed against the generated client would degrade to Unknown.
       - name: Generate Prisma client
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv run --no-sync prisma generate --schema litellm/proxy/schema.prisma
 
       - name: Check ruff format
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           git diff --name-only --diff-filter=ACMR "$GATE_BASE_SHA" HEAD -- 'litellm/**/*.py' | grep -v '^litellm/enterprise/' > "$RUNNER_TEMP/ruff_format_files.txt" || true
           if [ ! -s "$RUNNER_TEMP/ruff_format_files.txt" ]; then
@@ -92,6 +106,7 @@ jobs:
           xargs uv run --no-sync ruff format --check --exclude '/enterprise/' < "$RUNNER_TEMP/ruff_format_files.txt"
 
       - name: Debug - Check file state
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           echo "Current branch:"
           git branch --show-current
@@ -101,30 +116,36 @@ jobs:
           head -50 litellm/litellm_core_utils/custom_logger_registry.py | tail -10
 
       - name: Run Ruff linting
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           cd litellm
           uv run --no-sync ruff check .
           cd ..
 
       - name: Check strict-rule budget (delta vs base)
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv run --no-sync python scripts/ruff_strict_gate.py --base "$GATE_BASE_SHA"
 
       - name: Check type-discipline budget (mutable collections / casts / type guards / kwargs / unexplained suppressions, delta vs base)
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv run --no-sync python scripts/type_discipline_gate.py --base "$GATE_BASE_SHA"
 
       - name: Print OpenAI version
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv run --no-sync python -c "import openai; print(f'OpenAI version: {openai.__version__}')"
 
       - name: Check basedpyright budget (delta vs base)
+        if: steps.changes.outputs.decision != 'skip'
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
           uv run --no-sync python scripts/type_check_gate.py --base "$GATE_BASE_SHA"
 
       - name: Check tests/e2e basedpyright (zero errors)
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           if git diff --name-only --diff-filter=ACMRD "$GATE_BASE_SHA" HEAD -- 'tests/e2e/**/*.py' | grep -q .; then
             uv run --no-sync basedpyright tests/e2e
@@ -133,12 +154,14 @@ jobs:
           fi
 
       - name: Check for circular imports
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           cd litellm
           uv run --no-sync python ../tests/documentation_tests/test_circular_imports.py
           cd ..
 
       - name: Check import safety
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv run --no-sync python -c "from litellm import *" || (echo '🚨 import failed, this means you introduced unprotected imports! 🚨'; exit 1)
 
diff --git a/.github/workflows/test-litellm-ui-build.yml b/.github/workflows/test-litellm-ui-build.yml
index 618b0195b5a..b3a07a6e0ff 100644
--- a/.github/workflows/test-litellm-ui-build.yml
+++ b/.github/workflows/test-litellm-ui-build.yml
@@ -1,6 +1,7 @@
 name: UI Build Check
 permissions:
   contents: read
+  pull-requests: read
 
 on:
   pull_request:
@@ -28,7 +29,14 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Detect relevant changes
+        id: changes
+        uses: ./.github/actions/detect-changes
+        with:
+          category: ui
+
       - name: Setup Node.js
+        if: steps.changes.outputs.decision != 'skip'
         uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version-file: ui/litellm-dashboard/.nvmrc
@@ -36,7 +44,9 @@ jobs:
           cache-dependency-path: ui/litellm-dashboard/package-lock.json
 
       - name: Install dependencies
+        if: steps.changes.outputs.decision != 'skip'
         run: npm ci
 
       - name: Build
+        if: steps.changes.outputs.decision != 'skip'
         run: npm run build
diff --git a/.github/workflows/test-litellm-ui-unit.yml b/.github/workflows/test-litellm-ui-unit.yml
index 69cbc082d98..a7329432be5 100644
--- a/.github/workflows/test-litellm-ui-unit.yml
+++ b/.github/workflows/test-litellm-ui-unit.yml
@@ -1,6 +1,7 @@
 name: UI Unit Tests
 permissions:
   contents: read
+  pull-requests: read
 
 on:
   pull_request:
@@ -32,7 +33,14 @@ jobs:
           fetch-depth: 1
           persist-credentials: false
 
+      - name: Detect relevant changes
+        id: changes
+        uses: ./.github/actions/detect-changes
+        with:
+          category: ui
+
       - name: Setup Node.js
+        if: steps.changes.outputs.decision != 'skip'
         uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version-file: ui/litellm-dashboard/.nvmrc
@@ -40,14 +48,17 @@ jobs:
           cache-dependency-path: ui/litellm-dashboard/package-lock.json
 
       - name: Install dependencies
+        if: steps.changes.outputs.decision != 'skip'
         run: npm ci
 
       - name: Run UI type tests (Vitest)
+        if: steps.changes.outputs.decision != 'skip'
         env:
           CI: "true"
         run: npm run test:types
 
       - name: Run UI unit tests (Vitest)
+        if: steps.changes.outputs.decision != 'skip'
         env:
           CI: "true"
           GH_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/test-mcp.yml b/.github/workflows/test-mcp.yml
index 05cc13d0af2..95187ef2835 100644
--- a/.github/workflows/test-mcp.yml
+++ b/.github/workflows/test-mcp.yml
@@ -10,6 +10,7 @@ on:
 
 permissions:
   contents: read
+  pull-requests: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -25,26 +26,34 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Detect relevant changes
+        id: changes
+        uses: ./.github/actions/detect-changes
+
       - name: Thank You Message
         run: |
           echo "### 🙏 Thank you for contributing to LiteLLM!" >> $GITHUB_STEP_SUMMARY
           echo "Your PR is being tested now. We appreciate your help in making LiteLLM better!" >> $GITHUB_STEP_SUMMARY
 
       - name: Set up Python
+        if: steps.changes.outputs.decision != 'skip'
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.12"
 
       - name: Set up uv
+        if: steps.changes.outputs.decision != 'skip'
         uses: ./.github/actions/setup-uv-with-retries
         with:
           version: "0.10.9"
 
       - name: Install dependencies
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv lock --check
           .github/scripts/uv_sync_with_retries.sh --frozen --group proxy-dev --extra proxy --extra semantic-router
 
       - name: Run MCP tests
+        if: steps.changes.outputs.decision != 'skip'
         run: |
           uv run --no-sync pytest tests/mcp_tests -x -vv -n 4 --cov=./litellm --cov-report=xml --durations=5
diff --git a/.github/workflows/test-unit-documentation.yml b/.github/workflows/test-unit-documentation.yml
index c93779c177f..cb8035aafa1 100644
--- a/.github/workflows/test-unit-documentation.yml
+++ b/.github/workflows/test-unit-documentation.yml
@@ -23,34 +23,41 @@ jobs:
   documentation:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    permissions:
+      contents: read
+      pull-requests: read
 
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 
+      - name: Detect relevant changes
+        id: changes
+        uses: ./.github/actions/detect-changes
+
       - name: Checkout litellm-docs into docs/my-website (for documentation_tests)
+        if: steps.changes.outputs.decision != 'skip'
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           repository: BerriAI/litellm-docs
           path: docs/my-website
           persist-credentials: false
 
-      - name: Detect backend-relevant changes
-        id: changes
-        uses: ./.github/actions/detect-backend-changes
-
       - name: Set up Python
+        if: steps.changes.outputs.decision != 'skip'
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.12"
 
       - name: Set up uv
+        if: steps.changes.outputs.decision != 'skip'
         uses: ./.github/actions/setup-uv-with-retries
         with:
           version: "0.10.9"
 
       - name: Cache uv dependencies
+        if: steps.changes.outputs.decision != 'skip'
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: |
diff --git a/.gitignore b/.gitignore
index 3329f39ca10..201e02f2189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 .python-version
 .venv
+tests/e2e/.fixtures/
 .venv-typecheck
 .venv_policy_test
 .env
 .claude
+CLAUDE.local.md
 .newenv
 newenv/*
 litellm/proxy/myenv/*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d995ddcc87e..9ef1d5ae2b8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,8 +13,8 @@ Here are the core requirements for any PR submitted to LiteLLM:
 
 - [ ] **Add testing** - Adding at least 1 test is a hard requirement - [see details](#adding-testing)
 - [ ] **Ensure your PR passes all checks**:
-  - [ ] [Unit Tests](#running-unit-tests) - `make test-unit`
   - [ ] [Linting / Formatting](#running-linting-and-formatting-checks) - `make lint`
+  - [ ] [The tests covering your change](#running-unit-tests) pass, e.g. `uv run pytest tests/test_litellm/<your_test_file>.py -v`. CI runs the full unit test matrix, so you don't need to run the whole suite locally
 
 #### UI PRs
 
@@ -71,8 +71,8 @@ make format
 # Run all linting checks (matches CI exactly)
 make lint
 
-# Run unit tests to ensure nothing is broken
-make test-unit
+# Run the tests covering your change (CI runs the full suite)
+uv run pytest tests/test_litellm/<your_test_file>.py -v
 
 # Commit your changes (must follow Conventional Commits — see above)
 git add .
@@ -123,12 +123,13 @@ def test_your_feature():
 
 ### Running Unit Tests
 
-Run all unit tests (uses parallel execution for speed):
-
+Run the tests covering your change:
 ```bash
-make test-unit
+uv run pytest tests/test_litellm/test_your_file.py -v
 ```
 
+`tests/test_litellm` holds thousands of tests, so running all of it locally takes a long time. CI runs it as a parallel matrix (`make test-unit-llms`, `make test-unit-proxy-core`, and the other `test-unit-*` targets) on beefier boxes, so if, for whatever reason, you must run the whole suite, it's better to rely on CI to do that.
+
 If you're running broader test suites, proxy tests, or anything that touches PostgreSQL-backed fixtures/plugins, install the full local test environment first:
 
 ```bash
@@ -137,11 +138,6 @@ make install-test-deps
 
 This syncs the locked test environment used across the repo, including `psycopg` v3 plus `psycopg-binary` (used by `pytest-postgresql`), `psycopg2-binary` (used by some proxy E2E tests), and a generated Prisma client for DB-backed proxy tests, so pytest startup matches CI without manual package installs.
 
-Run specific test files:
-```bash
-uv run pytest tests/test_litellm/test_your_file.py -v
-```
-
 ### Running Linting and Formatting Checks
 
 Run all linting checks (matches CI exactly):
diff --git a/basedpyright-code-budget.json b/basedpyright-code-budget.json
index 1ce71c5bd2c..b4c324a2c4c 100644
--- a/basedpyright-code-budget.json
+++ b/basedpyright-code-budget.json
@@ -57,7 +57,7 @@
     "limit": 5663
   },
   "reportMissingTypeArgument": {
-    "limit": 15557
+    "limit": 15555
   },
   "reportMissingTypeStubs": {
     "limit": 40
@@ -105,13 +105,13 @@
     "limit": 109
   },
   "reportUnknownMemberType": {
-    "limit": 39043
+    "limit": 39017
   },
   "reportUnknownParameterType": {
-    "limit": 19887
+    "limit": 19885
   },
   "reportUnknownVariableType": {
-    "limit": 30574
+    "limit": 30572
   },
   "reportUnnecessaryCast": {
     "limit": 117
diff --git a/ci_cd/generate_model_prices_schema.py b/ci_cd/generate_model_prices_schema.py
index 153fbc0fdc2..252e3675329 100644
--- a/ci_cd/generate_model_prices_schema.py
+++ b/ci_cd/generate_model_prices_schema.py
@@ -145,6 +145,11 @@ NUMBER_KEYS: dict[str, JsonSchema] = {
         "minimum": 1,
         "description": "Multiplier applied to all token costs for US data residency (e.g. 1.10 = +10%).",
     },
+    "regional_endpoint_uplift_multiplier": {
+        "type": "number",
+        "minimum": 1,
+        "description": "Multiplier applied to all token costs when served from a non-global Vertex AI endpoint (e.g. 1.10 = +10%).",
+    },
 }
 
 COST_DESCRIPTIONS: dict[str, str] = {
diff --git a/helm/litellm-helm/Chart.yaml b/helm/litellm-helm/Chart.yaml
index 8ca217825b8..3959d85edf3 100644
--- a/helm/litellm-helm/Chart.yaml
+++ b/helm/litellm-helm/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.1
+version: 1.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/helm/litellm-helm/README.md b/helm/litellm-helm/README.md
index 4c8712ea7b9..b242373de5d 100644
--- a/helm/litellm-helm/README.md
+++ b/helm/litellm-helm/README.md
@@ -29,7 +29,7 @@ If `db.useStackgresOperator` is used (not yet implemented):
 | `masterkey`                 | The Master API Key for LiteLLM. If not specified, a random key in the `sk-...` format is generated.                                                                                                                                           | N/A                       |
 | `environmentSecrets`        | An optional array of Secret object names. The keys and values in these secrets will be presented to the LiteLLM proxy pod as environment variables. See below for an example Secret object.                                                   | `[]`                      |
 | `environmentConfigMaps`     | An optional array of ConfigMap object names. The keys and values in these configmaps will be presented to the LiteLLM proxy pod as environment variables. See below for an example Secret object.                                             | `[]`                      |
-| `image.repository`          | LiteLLM Proxy image repository                                                                                                                                                                                                                | `docker.litellm.ai/berriai/litellm` |
+| `image.repository`          | LiteLLM Proxy image repository                                                                                                                                                                                                                | `ghcr.io/berriai/litellm` |
 | `image.pullPolicy`          | LiteLLM Proxy image pull policy                                                                                                                                                                                                               | `IfNotPresent`            |
 | `image.tag`                 | Overrides the image tag whose default the latest version of LiteLLM at the time this chart was published.                                                                                                                                     | `""`                      |
 | `imagePullSecrets`          | Registry credentials for the LiteLLM and initContainer images.                                                                                                                                                                                | `[]`                      |
diff --git a/helm/litellm-helm/tests/deployment_tests.yaml b/helm/litellm-helm/tests/deployment_tests.yaml
index f3d62651d8f..b11c445889e 100644
--- a/helm/litellm-helm/tests/deployment_tests.yaml
+++ b/helm/litellm-helm/tests/deployment_tests.yaml
@@ -15,7 +15,7 @@ tests:
           pattern: -litellm$
       - equal:
           path: spec.template.spec.containers[0].image
-          value: ghcr.io/berriai/litellm-database:test
+          value: ghcr.io/berriai/litellm:test
   - it: should work with tolerations
     template: deployment.yaml
     set:
@@ -337,7 +337,7 @@ tests:
     template: deployment.yaml
     set:
       image:
-        repository: ghcr.io/berriai/litellm-database
+        repository: ghcr.io/berriai/litellm
         tag: test
       extraInitContainers:
         - name: init-tpl
@@ -348,7 +348,7 @@ tests:
           path: spec.template.spec.initContainers
           content:
             name: init-tpl
-            image: "ghcr.io/berriai/litellm-database:test"
+            image: "ghcr.io/berriai/litellm:test"
             command: ["echo", "hello"]
   - it: should work with extraContainers
     template: deployment.yaml
@@ -366,7 +366,7 @@ tests:
     template: deployment.yaml
     set:
       image:
-        repository: ghcr.io/berriai/litellm-database
+        repository: ghcr.io/berriai/litellm
         tag: test
       extraContainers:
         - name: sidecar-tpl
@@ -376,12 +376,12 @@ tests:
           path: spec.template.spec.containers
           content:
             name: sidecar-tpl
-            image: "ghcr.io/berriai/litellm-database:test"
+            image: "ghcr.io/berriai/litellm:test"
   - it: should support tpl in podAnnotations
     template: deployment.yaml
     set:
       image:
-        repository: ghcr.io/berriai/litellm-database
+        repository: ghcr.io/berriai/litellm
         tag: test
       # Mirrors the real-world scenario this feature unblocks:
       # user disables the built-in ConfigMap (and its built-in checksum/config
@@ -398,7 +398,7 @@ tests:
           value: "test"
       - equal:
           path: spec.template.metadata.annotations["example.com/some-key"]
-          value: "ghcr.io/berriai/litellm-database"
+          value: "ghcr.io/berriai/litellm"
       - equal:
           path: spec.template.metadata.annotations["example.com/literal"]
           value: "plain-string-value"
diff --git a/helm/litellm-helm/tests/migrations-job_tests.yaml b/helm/litellm-helm/tests/migrations-job_tests.yaml
index e327a3ec201..1fe545636d4 100644
--- a/helm/litellm-helm/tests/migrations-job_tests.yaml
+++ b/helm/litellm-helm/tests/migrations-job_tests.yaml
@@ -208,7 +208,7 @@ tests:
     template: migrations-job.yaml
     set:
       image:
-        repository: ghcr.io/berriai/litellm-database
+        repository: ghcr.io/berriai/litellm
         tag: test
       migrationJob:
         enabled: true
@@ -221,7 +221,7 @@ tests:
           path: spec.template.spec.initContainers
           content:
             name: init-tpl
-            image: "ghcr.io/berriai/litellm-database:test"
+            image: "ghcr.io/berriai/litellm:test"
             command: ["echo", "hello"]
   - it: should work with extraContainers
     template: migrations-job.yaml
@@ -241,7 +241,7 @@ tests:
     template: migrations-job.yaml
     set:
       image:
-        repository: ghcr.io/berriai/litellm-database
+        repository: ghcr.io/berriai/litellm
         tag: test
       migrationJob:
         enabled: true
@@ -253,7 +253,7 @@ tests:
           path: spec.template.spec.containers
           content:
             name: sidecar-tpl
-            image: "ghcr.io/berriai/litellm-database:test"
+            image: "ghcr.io/berriai/litellm:test"
   - it: should render the pod-level securityContext from podSecurityContext
     template: migrations-job.yaml
     set:
diff --git a/helm/litellm-helm/values.yaml b/helm/litellm-helm/values.yaml
index 628ca038339..4ef8fc97b27 100644
--- a/helm/litellm-helm/values.yaml
+++ b/helm/litellm-helm/values.yaml
@@ -6,8 +6,9 @@ replicaCount: 1
 # numWorkers: 2
 
 image:
-  # Use "ghcr.io/berriai/litellm-database" for optimized image with database
-  repository: ghcr.io/berriai/litellm-database
+  # Bundles the prisma CLI and engines, which is what lets the migrations job
+  # and the proxy's own schema check run without network access.
+  repository: ghcr.io/berriai/litellm
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   # tag: "latest"
diff --git a/litellm-proxy-extras/litellm_proxy_extras/migrations/20260814000000_add_proxy_worker_heartbeat/migration.sql b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260814000000_add_proxy_worker_heartbeat/migration.sql
new file mode 100644
index 00000000000..0a5d9df8aaf
--- /dev/null
+++ b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260814000000_add_proxy_worker_heartbeat/migration.sql
@@ -0,0 +1,9 @@
+-- CreateTable
+CREATE TABLE "LiteLLM_ProxyWorkerHeartbeat" (
+    "worker_id" TEXT NOT NULL,
+    "hostname" TEXT NOT NULL,
+    "started_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "last_heartbeat_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "LiteLLM_ProxyWorkerHeartbeat_pkey" PRIMARY KEY ("worker_id")
+);
diff --git a/litellm-proxy-extras/litellm_proxy_extras/migrations/20260817000000_shadow_eval_multi_key/migration.sql b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260817000000_shadow_eval_multi_key/migration.sql
new file mode 100644
index 00000000000..18ef5c40662
--- /dev/null
+++ b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260817000000_shadow_eval_multi_key/migration.sql
@@ -0,0 +1,7 @@
+ALTER TABLE "LiteLLM_ShadowEvalJob" ADD COLUMN IF NOT EXISTS "group_id" TEXT;
+
+UPDATE "LiteLLM_ShadowEvalJob" SET "group_id" = "id" WHERE "group_id" IS NULL;
+
+ALTER TABLE "LiteLLM_ShadowEvalJob" ALTER COLUMN "group_id" SET NOT NULL;
+
+CREATE INDEX IF NOT EXISTS "LiteLLM_ShadowEvalJob_group_id_idx" ON "LiteLLM_ShadowEvalJob"("group_id");
diff --git a/litellm-proxy-extras/litellm_proxy_extras/migrations/20260818224500_add_shadow_eval_stopped_by/migration.sql b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260818224500_add_shadow_eval_stopped_by/migration.sql
new file mode 100644
index 00000000000..9efa3fdd052
--- /dev/null
+++ b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260818224500_add_shadow_eval_stopped_by/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "LiteLLM_ShadowEvalJob" ADD COLUMN     "stopped_by" TEXT;
+
+UPDATE "LiteLLM_ShadowEvalJob" SET stopped_by = 'unknown'
+WHERE stopped_at IS NOT NULL AND ends_at > (NOW() AT TIME ZONE 'utc');
diff --git a/litellm-proxy-extras/litellm_proxy_extras/migrations/20260819000000_backfill_spend_log_timestamps/migration.sql b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260819000000_backfill_spend_log_timestamps/migration.sql
new file mode 100644
index 00000000000..10003afa9db
--- /dev/null
+++ b/litellm-proxy-extras/litellm_proxy_extras/migrations/20260819000000_backfill_spend_log_timestamps/migration.sql
@@ -0,0 +1,4 @@
+UPDATE "LiteLLM_SpendLogs"
+SET "created_at" = "endTime",
+    "updated_at" = "endTime"
+WHERE "created_at" > "endTime" + interval '1 hour';
diff --git a/litellm-proxy-extras/litellm_proxy_extras/schema.prisma b/litellm-proxy-extras/litellm_proxy_extras/schema.prisma
index 52fb447157b..60058c777ca 100644
--- a/litellm-proxy-extras/litellm_proxy_extras/schema.prisma
+++ b/litellm-proxy-extras/litellm_proxy_extras/schema.prisma
@@ -947,6 +947,17 @@ model LiteLLM_DailyTagSpend {
 }
 
 
+// One row per live proxy worker process. Workers upsert their row on a fixed
+// heartbeat; counting rows with a recent heartbeat tells how many workers share
+// this database, which lets the Admin UI hide its "no Redis" warning for
+// deployments that are provably a single worker.
+model LiteLLM_ProxyWorkerHeartbeat {
+  worker_id         String   @id
+  hostname          String
+  started_at        DateTime @default(now())
+  last_heartbeat_at DateTime @default(now())
+}
+
 // Track the status of cron jobs running. Only allow one pod to run the job at a time
 model LiteLLM_CronJob {
   cronjob_id            String   @id @default(cuid()) // Unique ID for the record
@@ -1467,28 +1478,38 @@ model LiteLLM_AutoRouterSession {
   @@index([last_turn_at], map: "idx_autorouter_session_last_turn")
 }
 
-// Shadow eval: evaluation of an auto-router against a key's live traffic, in either
-// direction. forward duplicates the requests the key did not route through the router
-// through it, answering whether the key should adopt it; reverse duplicates the requests
-// the router did serve against a fixed baseline model, answering whether a key already on
-// it still benefits. Either way a sampled slice runs in a detached task and an LLM judge
-// compares real vs shadow responses blind. The job row is immutable config plus
-// stopped_at; every count, status, and spend figure is derived from the append-only
-// attempt rows, so nothing can disagree across pods or stop races.
+// Shadow eval: evaluation of an auto-router against one or more keys' live traffic, in
+// either direction. forward duplicates the requests the keys did not route through the
+// router through it, answering whether they should adopt it; reverse duplicates the
+// requests the router did serve against a fixed baseline model, answering whether a key
+// already on it still benefits. Either way a sampled slice runs in a detached task and an
+// LLM judge compares real vs shadow responses blind. Each row is ONE key's leg of a job:
+// immutable config plus that key's own turn budget and stop state, so one key exhausting
+// its budget never ends a sibling's sampling. A job is the set of legs sharing group_id
+// (the id the API reports), written together by one atomic create_many with identical
+// config; single-key jobs predating group_id were backfilled group_id = id. "One active
+// job per (key, direction)" is a partial unique index on (api_key_id, direction) WHERE
+// stopped_at IS NULL, expressed only in the migration because schema.prisma cannot state
+// partial indexes; it is what makes a concurrent start on another pod race-safe rather
+// than read-then-create. Every count, status, and spend figure is derived from the
+// append-only attempt rows, so nothing can disagree across pods or stop races.
 model LiteLLM_ShadowEvalJob {
   id                String   @id @default(cuid())
-  api_key_id        String   // hashed virtual key whose traffic is shadowed
+  group_id          String   // legs of one job share this; the API's job id
+  api_key_id        String   // hashed virtual key whose traffic this leg shadows
   router_name       String   // the auto-router under evaluation, in either direction
   direction         String   @default("forward") // forward | reverse
   baseline_model    String?  // reverse only: the fixed model the router is judged against
   judge_model       String
   shadow_percentage Float
-  max_turns         Int      // sample budget: judge at most this many turns
+  max_turns         Int      // this key's sample budget: judge at most this many turns
   created_at        DateTime @default(now())
   created_by        String?
   ends_at           DateTime
   stopped_at        DateTime?
+  stopped_by        String?  // operator who stopped it early; null when it ended on its own
 
+  @@index([group_id])
   @@index([api_key_id])
   @@index([created_at])
 }
diff --git a/litellm/__init__.py b/litellm/__init__.py
index 1ecb04b6e54..00f67ea0ff5 100644
--- a/litellm/__init__.py
+++ b/litellm/__init__.py
@@ -221,7 +221,7 @@ overwrite_user_with_key_hash: bool = (
 bedrock_request_metadata_fields: Optional[Sequence[str]] = (
     None  # allow-list of `user_api_key_*` fields (+ `spend_logs_metadata`) sent as Bedrock `requestMetadata`
 )
-store_audit_logs = False  # Enterprise feature, allow users to see audit logs
+store_audit_logs: bool | None = None
 skip_system_message_in_guardrail: bool = False
 skip_tool_message_in_guardrail: bool = False
 ### end of callbacks #############
diff --git a/litellm/batches/batch_utils.py b/litellm/batches/batch_utils.py
index c2cbb9604e5..0cf22d82ca6 100644
--- a/litellm/batches/batch_utils.py
+++ b/litellm/batches/batch_utils.py
@@ -1,5 +1,5 @@
 import json
-from collections.abc import Iterable, Iterator
+from collections.abc import Iterable, Iterator, Mapping
 from dataclasses import dataclass
 from typing import Any, Final, Literal
 
@@ -87,7 +87,7 @@ async def _handle_completed_batch(
         return batch_cost, batch_usage, [model_name]
 
     return _aggregate_batch_cost_usage_models(
-        entries=_iter_batch_input_entries(file_content),
+        entries=_iter_batch_output_entries(file_content),
         custom_llm_provider=custom_llm_provider,
         model_name=model_name,
         model_info=model_info,
@@ -111,43 +111,91 @@ def _iter_successful_output_line_stats(
     model_name: str | None,
     model_info: ModelInfo | None,
 ) -> Iterator[_BatchOutputLineStats]:
+    for entry in entries:
+        stats = _safe_output_line_stats(entry, custom_llm_provider, model_name, model_info)
+        if stats is not None:
+            yield stats
+
+
+def _safe_output_line_stats(
+    entry: Mapping[str, Any],
+    custom_llm_provider: Literal["openai", "azure", "vertex_ai", "hosted_vllm", "anthropic", "bedrock"],
+    model_name: str | None,
+    model_info: ModelInfo | None,
+) -> _BatchOutputLineStats | None:
+    """Return the stats for one batch output line, or None for a line that is
+    unsuccessful or cannot be costed, so a single bad line never aborts the
+    whole batch's cost accounting."""
+    custom_id: Final = entry.get("custom_id") if isinstance(entry, dict) else None
+    try:
+        if not _batch_response_was_successful(entry, custom_llm_provider):
+            return None
+        return _compute_output_line_stats(entry, custom_llm_provider, model_name, model_info)
+    except Exception as e:  # noqa: BLE001  # any single line's costing failure must not abort the whole batch
+        verbose_logger.warning(
+            "batch output line could not be costed, so it is billed at $0 and the rest of the batch "
+            "is still billed. custom_id=%s error=%s",
+            custom_id,
+            str(e),
+        )
+        return None
+
+
+def _compute_output_line_stats(
+    entry: Mapping[str, Any],
+    custom_llm_provider: Literal["openai", "azure", "vertex_ai", "hosted_vllm", "anthropic", "bedrock"],
+    model_name: str | None,
+    model_info: ModelInfo | None,
+) -> _BatchOutputLineStats:
+    response_body: Final = _get_response_from_batch_job_output_file(entry, custom_llm_provider)
+    usage: Final = _get_batch_job_usage_from_response_body(response_body, custom_llm_provider)
+    prompt_details: Final = parse_prompt_tokens_details(usage)
+    raw_model: Final = response_body.get("model")
+    response_model: Final = raw_model if isinstance(raw_model, str) and raw_model else None
+    return _BatchOutputLineStats(
+        cost=_output_line_cost(
+            response_body=response_body,
+            usage=usage,
+            custom_llm_provider=custom_llm_provider,
+            model_name=model_name,
+            response_model=response_model,
+            model_info=model_info,
+        ),
+        prompt_tokens=usage.prompt_tokens,
+        completion_tokens=usage.completion_tokens,
+        total_tokens=usage.total_tokens,
+        cache_read_tokens=prompt_details["cache_hit_tokens"],
+        cache_creation_tokens=prompt_details["cache_creation_tokens"],
+        model=response_model,
+    )
+
+
+def _output_line_cost(
+    response_body: Mapping[str, Any],
+    usage: Usage,
+    custom_llm_provider: Literal["openai", "azure", "vertex_ai", "hosted_vllm", "anthropic", "bedrock"],
+    model_name: str | None,
+    response_model: str | None,
+    model_info: ModelInfo | None,
+) -> float:
     from litellm.cost_calculator import batch_cost_calculator
 
-    for entry in entries:
-        if not _batch_response_was_successful(entry, custom_llm_provider):
-            continue
-        response_body = _get_response_from_batch_job_output_file(entry, custom_llm_provider)
-        usage = _get_batch_job_usage_from_response_body(response_body, custom_llm_provider)
-        prompt_details = parse_prompt_tokens_details(usage)
-        raw_model = response_body.get("model")
-        response_model = raw_model if isinstance(raw_model, str) and raw_model else None
-        if model_info is not None or custom_llm_provider in ("anthropic", "bedrock"):
-            if custom_llm_provider == "bedrock" and model_name:
-                cost_model = model_name
-            else:
-                cost_model = response_model or model_name or ""
-            prompt_cost, completion_cost = batch_cost_calculator(
-                usage=usage,
-                model=cost_model,
-                custom_llm_provider=custom_llm_provider,
-                model_info=model_info,
-            )
-            line_cost = prompt_cost + completion_cost
-        else:
-            line_cost = litellm.completion_cost(
-                completion_response=response_body,
-                custom_llm_provider=custom_llm_provider,
-                call_type=CallTypes.aretrieve_batch.value,
-            )
-        yield _BatchOutputLineStats(
-            cost=line_cost,
-            prompt_tokens=usage.prompt_tokens,
-            completion_tokens=usage.completion_tokens,
-            total_tokens=usage.total_tokens,
-            cache_read_tokens=prompt_details["cache_hit_tokens"],
-            cache_creation_tokens=prompt_details["cache_creation_tokens"],
-            model=response_model,
+    if model_info is None and custom_llm_provider not in ("anthropic", "bedrock"):
+        return litellm.completion_cost(
+            completion_response=response_body,
+            custom_llm_provider=custom_llm_provider,
+            call_type=CallTypes.aretrieve_batch.value,
         )
+    cost_model: Final = (
+        model_name if custom_llm_provider == "bedrock" and model_name else response_model or model_name or ""
+    )
+    prompt_cost, completion_cost = batch_cost_calculator(
+        usage=usage,
+        model=cost_model,
+        custom_llm_provider=custom_llm_provider,
+        model_info=model_info,
+    )
+    return prompt_cost + completion_cost
 
 
 def _aggregate_batch_cost_usage_models(
@@ -338,9 +386,10 @@ def _extract_file_access_credentials(litellm_params: dict | None) -> dict:
 
 def _get_file_content_as_dictionary(file_content: bytes) -> list[dict]:
     """
-    Get the file content as a list of dictionaries from JSON Lines format
+    Get the file content as a list of dictionaries from JSON Lines format,
+    skipping malformed lines
     """
-    return list(_iter_batch_input_entries(file_content))
+    return list(_iter_batch_output_entries(file_content))
 
 
 def _iter_batch_input_lines(file_content: bytes) -> Iterator[bytes]:
@@ -361,15 +410,29 @@ def _iter_batch_input_lines(file_content: bytes) -> Iterator[bytes]:
             yield line
 
 
-def _iter_batch_input_entries(file_content: bytes) -> Iterator[dict]:
+def _iter_batch_output_entries(file_content: bytes) -> Iterator[dict]:
     """
-    Yield parsed batch input JSONL entries one at a time without materializing the
-    whole file as a list, so peak memory stays bounded. Raises on a malformed line;
-    callers that must survive bad rows should iterate ``_iter_batch_input_lines``
-    and parse per-row instead.
+    Yield parsed batch output JSONL entries one at a time without materializing
+    the whole file as a list, so peak memory stays bounded. A malformed or
+    non-object line is skipped with a warning so one bad line never aborts the
+    whole batch's cost accounting.
     """
     for line in _iter_batch_input_lines(file_content):
-        yield json.loads(line)
+        entry = _parse_batch_output_line(line)
+        if entry is not None:
+            yield entry
+
+
+def _parse_batch_output_line(line: bytes) -> dict | None:
+    try:
+        parsed: Final = json.loads(line)
+    except ValueError as e:
+        verbose_logger.warning("skipping malformed batch output line: %s", str(e))
+        return None
+    if isinstance(parsed, dict):
+        return parsed
+    verbose_logger.warning("skipping non-object batch output line of type %s", type(parsed).__name__)
+    return None
 
 
 # A batch request's input tokens scale roughly with its serialized size, so this
@@ -440,7 +503,9 @@ def _count_prompt_or_input_tokens(model: str, value: Any) -> int:
     return 0
 
 
-def _get_batch_job_usage_from_response_body(response_body: dict, custom_llm_provider: str = "openai") -> Usage:
+def _get_batch_job_usage_from_response_body(
+    response_body: Mapping[str, Any], custom_llm_provider: str = "openai"
+) -> Usage:
     """
     Get the tokens of a batch job from the response body
     """
@@ -472,7 +537,7 @@ def _get_batch_job_usage_from_response_body(response_body: dict, custom_llm_prov
     return usage
 
 
-def _get_anthropic_result_from_batch_results_line(batch_results_line: dict) -> dict:
+def _get_anthropic_result_from_batch_results_line(batch_results_line: Mapping[str, Any]) -> dict:
     """
     Get the ``result`` object from a line of an Anthropic message batch results JSONL file.
 
@@ -482,7 +547,9 @@ def _get_anthropic_result_from_batch_results_line(batch_results_line: dict) -> d
     return batch_results_line.get("result", None) or {}
 
 
-def _get_response_from_batch_job_output_file(batch_job_output_file: dict, custom_llm_provider: str = "openai") -> Any:
+def _get_response_from_batch_job_output_file(
+    batch_job_output_file: Mapping[str, Any], custom_llm_provider: str = "openai"
+) -> Any:
     """
     Get the response from the batch job output file
     """
@@ -495,7 +562,9 @@ def _get_response_from_batch_job_output_file(batch_job_output_file: dict, custom
     return _response_body
 
 
-def _batch_response_was_successful(batch_job_output_file: dict, custom_llm_provider: str = "openai") -> bool:
+def _batch_response_was_successful(
+    batch_job_output_file: Mapping[str, Any], custom_llm_provider: str = "openai"
+) -> bool:
     """
     Check if the batch job response was successful
 
diff --git a/litellm/cost_calculator.py b/litellm/cost_calculator.py
index 7d7380665d3..8f7cd09d364 100644
--- a/litellm/cost_calculator.py
+++ b/litellm/cost_calculator.py
@@ -327,6 +327,8 @@ def cost_per_token(
     service_tier: str | None = None,  # for OpenAI service tier pricing
     ### DATA RESIDENCY ###
     data_residency: str | None = None,  # for OpenAI regional-processing uplift (e.g. "eu", "us")
+    ### VERTEX LOCATION ###
+    vertex_location: str | None = None,  # for Vertex AI regional-endpoint uplift (e.g. "us-east5", "global")
     response: Any | None = None,
     ### REQUEST MODEL ###
     request_model: str | None = None,  # original request model for router detection
@@ -587,6 +589,7 @@ def cost_per_token(
                 prompt_characters=prompt_characters,
                 completion_characters=completion_characters,
                 usage=usage_block,
+                vertex_location=vertex_location,
             )
         elif cost_router == "cost_per_token":
             return google_cost_per_token(
@@ -594,6 +597,7 @@ def cost_per_token(
                 custom_llm_provider=custom_llm_provider,
                 usage=usage_block,
                 service_tier=service_tier,
+                vertex_location=vertex_location,
             )
     elif custom_llm_provider == "anthropic":
         return anthropic_cost_per_token(model=model, usage=usage_block, service_tier=service_tier)
@@ -1071,6 +1075,7 @@ def _store_cost_breakdown_in_logging_obj(
     reasoning_cost: float | None = None,
     service_tier: str | None = None,
     data_residency: str | None = None,
+    vertex_location: str | None = None,
 ) -> None:
     """
     Helper function to store cost breakdown in the logging object.
@@ -1090,6 +1095,7 @@ def _store_cost_breakdown_in_logging_obj(
         margin_total_amount: Total margin added in USD
         service_tier: Tier the costs above were priced on, already resolved
         data_residency: Region uplift the costs above were priced on, already resolved
+        vertex_location: Vertex AI location the costs above were priced on, already resolved
     """
     if litellm_logging_obj is None:
         return
@@ -1113,6 +1119,7 @@ def _store_cost_breakdown_in_logging_obj(
             reasoning_cost=reasoning_cost,
             service_tier=service_tier,
             data_residency=data_residency,
+            vertex_location=vertex_location,
         )
 
     except Exception as breakdown_error:
@@ -1149,6 +1156,8 @@ def completion_cost(
     service_tier: str | None = None,  # for OpenAI service tier pricing
     ### DATA RESIDENCY ###
     data_residency: str | None = None,  # for OpenAI regional-processing uplift (e.g. "eu", "us")
+    ### VERTEX LOCATION ###
+    vertex_location: str | None = None,  # for Vertex AI regional-endpoint uplift (e.g. "us-east5", "global")
 ) -> float:
     """
     Calculate the cost of a given completion call fot GPT-3.5-turbo, llama2, any litellm supported llm.
@@ -1577,6 +1586,7 @@ def completion_cost(
                     rerank_billed_units=rerank_billed_units,
                     service_tier=service_tier,
                     data_residency=data_residency,
+                    vertex_location=vertex_location,
                     response=completion_response,
                     request_model=request_model_for_cost,
                 )
@@ -1664,6 +1674,7 @@ def completion_cost(
                             usage=cost_per_token_usage_object,
                             service_tier=service_tier,
                             data_residency=data_residency,
+                            vertex_location=vertex_location,
                         )
                         _reasoning_cost = _token_type_breakdown.reasoning_cost
                         _cache_read_cost = _token_type_breakdown.cache_read_cost
@@ -1686,6 +1697,7 @@ def completion_cost(
                         reasoning_cost=_reasoning_cost,
                         service_tier=service_tier,
                         data_residency=data_residency,
+                        vertex_location=vertex_location,
                     )
 
                 return _final_cost
@@ -1765,6 +1777,8 @@ def response_cost_calculator(
     service_tier: str | None = None,  # for OpenAI service tier pricing
     ### DATA RESIDENCY ###
     data_residency: str | None = None,  # for OpenAI regional-processing uplift (e.g. "eu", "us")
+    ### VERTEX LOCATION ###
+    vertex_location: str | None = None,  # for Vertex AI regional-endpoint uplift (e.g. "us-east5", "global")
 ) -> float:
     """
     Returns
@@ -1797,6 +1811,7 @@ def response_cost_calculator(
                 litellm_logging_obj=litellm_logging_obj,
                 service_tier=service_tier,
                 data_residency=data_residency,
+                vertex_location=vertex_location,
             )
         return response_cost
     except Exception as e:
diff --git a/litellm/integrations/opentelemetry.py b/litellm/integrations/opentelemetry.py
index f2bd18cd046..78081837ae3 100644
--- a/litellm/integrations/opentelemetry.py
+++ b/litellm/integrations/opentelemetry.py
@@ -42,6 +42,7 @@ from litellm.types.utils import (
 # OpenTelemetry imports moved to individual functions to avoid import errors when not installed
 
 if TYPE_CHECKING:
+    from opentelemetry.sdk.resources import Resource as _Resource
     from opentelemetry.sdk.trace import TracerProvider as _SDKTracerProvider
     from opentelemetry.sdk.trace.export import SpanExporter as _SpanExporter
     from opentelemetry.trace import Context as _Context
@@ -389,6 +390,7 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
         self._tracer_provider_cache: OrderedDict[str, _CachedTracerProvider] = OrderedDict()
         self._tracer_provider_cache_lock: Final = threading.Lock()
         self._max_dynamic_tracer_providers: Final = max(1, max_dynamic_tracer_providers)
+        self._litellm_resource_memo: _Resource | None = None
         self._init_tracing(tracer_provider)
 
         _debug_otel: Final = str(os.getenv("DEBUG_OTEL", "False")).lower()
@@ -414,7 +416,7 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
         self._init_otel_logger_on_litellm_proxy()
 
     @staticmethod
-    def _get_litellm_resource(config: OpenTelemetryConfig):
+    def _get_litellm_resource(config: OpenTelemetryConfig) -> "_Resource":
         """Create an OpenTelemetry Resource using config-driven defaults."""
         from opentelemetry.sdk.resources import OTELResourceDetector, Resource
 
@@ -429,6 +431,21 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
         env_resource: Final = otel_resource_detector.detect()
         return base_resource.merge(env_resource)
 
+    def _litellm_resource(self) -> "_Resource":
+        """The Resource every provider on this logger is built with, frozen at first use.
+
+        ``Resource.create`` scans every installed distribution's entry points, roughly 3ms and
+        200 file opens, and the dynamic providers reach it from the async logging path. Freezing
+        also keeps them consistent with whatever this logger built at startup. ``cached_property``
+        locks class-wide before 3.12, which this file still supports.
+        """
+        memo: Final = self._litellm_resource_memo
+        if memo is not None:
+            return memo
+        built: Final = self._get_litellm_resource(self.config)
+        self._litellm_resource_memo = built
+        return built
+
     def _init_otel_logger_on_litellm_proxy(self):
         """
         Initializes OpenTelemetry for litellm proxy server
@@ -596,7 +613,7 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
         from opentelemetry.trace import SpanKind
 
         def create_tracer_provider():
-            provider: Final = TracerProvider(resource=self._get_litellm_resource(self.config))
+            provider: Final = TracerProvider(resource=self._litellm_resource())
             provider.add_span_processor(self._get_span_processor())
             return provider
 
@@ -634,7 +651,7 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
             metric_reader: Final = self._get_metric_reader()
             return MeterProvider(
                 metric_readers=[metric_reader],
-                resource=self._get_litellm_resource(self.config),
+                resource=self._litellm_resource(),
             )
 
         meter_provider = self._get_or_create_provider(
@@ -692,7 +709,7 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
         from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
 
         def create_logger_provider():
-            provider: Final = OTLoggerProvider(resource=self._get_litellm_resource(self.config))
+            provider: Final = OTLoggerProvider(resource=self._litellm_resource())
             log_exporter: Final = self._get_log_exporter()
             provider.add_log_record_processor(BatchLogRecordProcessor(log_exporter))
             return provider
@@ -1144,9 +1161,7 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
         owns_exporter: Final = _provider_owns_exporter(dynamic_config.exporter)
 
         def _build() -> "_SDKTracerProvider":
-            provider: Final = TracerProvider(
-                resource=self._get_litellm_resource(self.config), shutdown_on_exit=owns_exporter
-            )
+            provider: Final = TracerProvider(resource=self._litellm_resource(), shutdown_on_exit=owns_exporter)
             provider.add_span_processor(self._get_span_processor(config_override=dynamic_config))
             return provider
 
@@ -1162,9 +1177,7 @@ class OpenTelemetry(OTELGenAISemconvMixin, CustomLogger):
         owns_exporter: Final = _provider_owns_exporter(self.OTEL_EXPORTER)
 
         def _build() -> "_SDKTracerProvider":
-            provider: Final = TracerProvider(
-                resource=self._get_litellm_resource(self.config), shutdown_on_exit=owns_exporter
-            )
+            provider: Final = TracerProvider(resource=self._litellm_resource(), shutdown_on_exit=owns_exporter)
             provider.add_span_processor(self._get_span_processor(dynamic_headers=dynamic_headers))
             return provider
 
diff --git a/litellm/litellm_core_utils/litellm_logging.py b/litellm/litellm_core_utils/litellm_logging.py
index 946110abf9e..91a312b4f45 100644
--- a/litellm/litellm_core_utils/litellm_logging.py
+++ b/litellm/litellm_core_utils/litellm_logging.py
@@ -13,7 +13,7 @@ import traceback
 from collections.abc import Callable, Mapping, Sequence
 from datetime import datetime as dt_object
 from functools import lru_cache
-from types import TracebackType
+from types import MappingProxyType, TracebackType
 from typing import TYPE_CHECKING, Any, Final, Literal, Optional, Union, cast
 
 from httpx import Response
@@ -372,6 +372,35 @@ def _published_pricing(deployment_model: str | None) -> ModelInfo | None:
         return None
 
 
+def _resolve_vertex_location_for_cost(
+    custom_llm_provider: str | None,
+    litellm_params: Mapping[str, object] | None,
+    optional_params: Mapping[str, object] | None,
+    model: str,
+) -> str | None:
+    """
+    The Vertex AI location a request was served from, resolved the same way
+    dispatch resolves it, so regional deployments price with the
+    regional-endpoint uplift. None for non-Vertex providers.
+
+    Chat dispatch reads the location from request kwargs, which reach this
+    logging object through optional_params: on the proxy the logging object is
+    created before the router picks a deployment, so the deployment's location
+    never lands in litellm_params.
+    """
+    if custom_llm_provider is None or not custom_llm_provider.startswith("vertex_ai"):
+        return None
+    from litellm.llms.vertex_ai.vertex_llm_base import VertexBase
+
+    empty: Final[Mapping[str, object]] = MappingProxyType({})
+    configured_location: Final = (
+        VertexBase.explicit_vertex_ai_location(optional_params or empty)
+        or VertexBase.explicit_vertex_ai_location(litellm_params or empty)
+        or VertexBase.safe_get_vertex_ai_location(empty)
+    )
+    return VertexBase.get_vertex_region(configured_location, model)
+
+
 class Logging(LiteLLMLoggingBaseClass):
     global \
         supabaseClient, \
@@ -1432,6 +1461,7 @@ class Logging(LiteLLMLoggingBaseClass):
         reasoning_cost: float | None = None,
         service_tier: str | None = None,
         data_residency: str | None = None,
+        vertex_location: str | None = None,
     ) -> None:
         """
         Helper method to store cost breakdown in the logging object.
@@ -1450,6 +1480,7 @@ class Logging(LiteLLMLoggingBaseClass):
             margin_total_amount: Total margin added in USD
             service_tier: Tier the costs above were priced on, already resolved
             data_residency: Region uplift the costs above were priced on, already resolved
+            vertex_location: Vertex AI location the costs above were priced on, already resolved
         """
 
         self.cost_breakdown = CostBreakdown(
@@ -1459,6 +1490,7 @@ class Logging(LiteLLMLoggingBaseClass):
             tool_usage_cost=cost_for_built_in_tools_cost_usd_dollar,
             service_tier=service_tier,
             data_residency=data_residency,
+            vertex_location=vertex_location,
         )
         if cache_read_cost is not None and cache_read_cost > 0:
             self.cost_breakdown["cache_read_cost"] = cache_read_cost
@@ -1574,6 +1606,12 @@ class Logging(LiteLLMLoggingBaseClass):
                     if hasattr(self, "litellm_params") and self.litellm_params
                     else None
                 ),
+                "vertex_location": _resolve_vertex_location_for_cost(
+                    custom_llm_provider=self.model_call_details.get("custom_llm_provider", None),
+                    litellm_params=(self.litellm_params if hasattr(self, "litellm_params") else None),
+                    optional_params=self.optional_params,
+                    model=litellm_model_name or self.model,
+                ),
             }
         except Exception as e:  # error creating kwargs for cost calculation
             debug_info = StandardLoggingModelCostFailureDebugInformation(
diff --git a/litellm/litellm_core_utils/llm_cost_calc/utils.py b/litellm/litellm_core_utils/llm_cost_calc/utils.py
index f73c4942a1c..0793fe20b21 100644
--- a/litellm/litellm_core_utils/llm_cost_calc/utils.py
+++ b/litellm/litellm_core_utils/llm_cost_calc/utils.py
@@ -757,6 +757,33 @@ def _get_regional_uplift_multiplier(model_info: ModelInfo, data_residency: str |
         return 1.0
 
 
+def get_vertex_regional_endpoint_uplift(model_info: ModelInfo, vertex_location: str | None) -> float:
+    """
+    Resolve the per-model uplift multiplier for Vertex AI non-global (regional and
+    multi-region) endpoints.
+
+    Google prices every non-global endpoint at a flat premium over the global
+    endpoint (e.g. 1.10 = +10%) on all token types for the models that carry
+    regional pricing. The multiplier is stored on the model entry as
+    ``regional_endpoint_uplift_multiplier``.
+
+    Returns 1.0 (no uplift) when ``vertex_location`` is ``None`` or ``"global"``,
+    or when the model has no multiplier configured.
+    """
+    if vertex_location is None or vertex_location.lower() == "global":
+        return 1.0
+    multiplier: Final = model_info.get("regional_endpoint_uplift_multiplier")
+    if multiplier is None:
+        return 1.0
+    try:
+        return float(cast(float, multiplier))
+    except (TypeError, ValueError):
+        verbose_logger.exception(
+            "Invalid regional_endpoint_uplift_multiplier for model; defaulting to 1.0",
+        )
+        return 1.0
+
+
 def get_provider_specific_geo_multiplier(model_info: ModelInfo, usage: Usage) -> float:
     """
     Resolve the provider-specific regional pricing multiplier for the geo the
@@ -798,6 +825,7 @@ def generic_cost_per_token(
     service_tier: str | None = None,
     data_residency: str | None = None,
     model_info: ModelInfo | None = None,
+    vertex_location: str | None = None,
 ) -> tuple[float, float]:
     """
     Calculates the cost per token for a given model, prompt tokens, and completion tokens.
@@ -809,6 +837,9 @@ def generic_cost_per_token(
         - usage: LiteLLM Usage block, containing anthropic caching information
         - data_residency: optional OpenAI data-residency region (e.g. "eu", "us"),
           used to apply the per-model regional-processing uplift multiplier.
+        - vertex_location: optional Vertex AI location the request was served from
+          (e.g. "us-east5", "global"), used to apply the per-model
+          regional-endpoint uplift multiplier when non-global.
 
     Returns:
         Tuple[float, float] - prompt_cost_in_usd, completion_cost_in_usd
@@ -968,6 +999,11 @@ def generic_cost_per_token(
         prompt_cost *= uplift
         completion_cost *= uplift
 
+    vertex_uplift: Final = get_vertex_regional_endpoint_uplift(model_info, vertex_location)
+    if vertex_uplift != 1.0:
+        prompt_cost *= vertex_uplift
+        completion_cost *= vertex_uplift
+
     return prompt_cost, completion_cost
 
 
@@ -988,6 +1024,7 @@ def get_token_type_cost_breakdown(
     usage: Usage,
     service_tier: str | None = None,
     data_residency: str | None = None,
+    vertex_location: str | None = None,
 ) -> TokenTypeCostBreakdown:
     """
     Provider-agnostic cost of reasoning and cache tokens, derived from the usage
@@ -1069,6 +1106,12 @@ def get_token_type_cost_breakdown(
         cache_read_cost *= uplift
         cache_creation_cost *= uplift
 
+    vertex_uplift: Final = get_vertex_regional_endpoint_uplift(model_info, vertex_location)
+    if vertex_uplift != 1.0:
+        reasoning_cost *= vertex_uplift
+        cache_read_cost *= vertex_uplift
+        cache_creation_cost *= vertex_uplift
+
     # Mirror the provider-specific geo uplift (e.g. Anthropic us: 1.1) the totals
     # apply, so cache and reasoning line items stay reconciled with them.
     geo_multiplier: Final = get_provider_specific_geo_multiplier(model_info=model_info, usage=usage)
diff --git a/litellm/litellm_core_utils/ptu_pricing.py b/litellm/litellm_core_utils/ptu_pricing.py
new file mode 100644
index 00000000000..a1f8bb36e27
--- /dev/null
+++ b/litellm/litellm_core_utils/ptu_pricing.py
@@ -0,0 +1,149 @@
+"""Which deployments accrue PTU flat cost, and what that costs them per token.
+
+Reserved provisioned throughput is billed by the hour whether or not requests are sent, so
+a deployment that accrues flat cost must not also bill per token. The two halves live here
+together because they have to agree: a deployment the rollup declines to charge but the
+router prices at zero serves its traffic for free.
+"""
+
+from collections.abc import Mapping
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from types import MappingProxyType
+from typing import Final
+
+from litellm.secret_managers.main import get_secret_bool
+from litellm.types.router import ModelInfo
+from litellm.types.utils import CustomPricingLiteLLMParams, MirroredPricingParams
+
+PTU_COST_ATTRIBUTION_ENV_VAR: Final = "LITELLM_ENABLE_PTU_COST_ATTRIBUTION"
+
+
+def is_ptu_cost_attribution_enabled() -> bool:
+    """Whether PTU flat-cost attribution is turned on for this process."""
+    return get_secret_bool(PTU_COST_ATTRIBUTION_ENV_VAR, False) is True
+
+
+PTU_ZEROED_PRICING_FIELDS: Final = tuple(f for f in MirroredPricingParams.model_fields if f != "tiered_pricing") + (
+    "cache_creation_input_token_cost_above_1hr",
+    "cache_creation_input_token_cost_above_200k_tokens",
+    "cache_read_input_token_cost_above_200k_tokens",
+)
+# tiered_pricing is emptied rather than zeroed: its tiers outrank the zeros written beside
+# them, so a zero here would leave the cost map's tiers billing the traffic the reserved
+# capacity already covers.
+PTU_EMPTIED_PRICING_FIELDS: Final = frozenset(("tiered_pricing",))
+# search_context_cost_per_query holds its rates in a table keyed by context size, and an
+# absent table means the provider's own default rather than free, so it is zeroed in place
+# and written on every PTU deployment rather than only where a table is already stored.
+PTU_ZEROED_TABLE_FIELDS: Final = frozenset(("search_context_cost_per_query",))
+SEARCH_CONTEXT_SIZES: Final = ("search_context_size_low", "search_context_size_medium", "search_context_size_high")
+# Rate fields only. CustomPricingLiteLLMParams also carries settings that are not charges,
+# and zeroing one of those would destroy the deployment's configuration rather than stop a
+# charge.
+CUSTOM_PRICING_FIELDS: Final = frozenset(f for f in CustomPricingLiteLLMParams.model_fields if "cost" in f)
+PTU_ZEROED_PRICING: Final[Mapping[str, float | tuple[()] | Mapping[str, float]]] = MappingProxyType(
+    {
+        **dict.fromkeys(PTU_ZEROED_PRICING_FIELDS, 0.0),
+        **dict.fromkeys(PTU_EMPTIED_PRICING_FIELDS, ()),
+        **dict.fromkeys(PTU_ZEROED_TABLE_FIELDS, MappingProxyType(dict.fromkeys(SEARCH_CONTEXT_SIZES, 0.0))),
+    }
+)
+
+
+@dataclass(frozen=True, slots=True)
+class PTUTerms:
+    """The reservation a deployment declares, once every field has been validated."""
+
+    team_id: str
+    ptu_count: int
+    cost_per_ptu_per_hour: float
+    effective_from: datetime
+    effective_to: datetime | None
+
+
+def _to_utc(parsed: datetime) -> datetime:
+    """``parsed`` as UTC, reading a naive value as UTC rather than local time."""
+    return parsed.replace(tzinfo=timezone.utc) if parsed.tzinfo is None else parsed.astimezone(timezone.utc)
+
+
+def _as_utc(value: object) -> datetime | None:
+    """A model_info datetime as UTC, parsing an ISO string, else None."""
+    if isinstance(value, datetime):
+        return _to_utc(value)
+    if not isinstance(value, str):
+        return None
+    try:
+        return _to_utc(datetime.fromisoformat(value.replace("Z", "+00:00")))
+    except ValueError:
+        return None
+
+
+def ptu_terms(model_info: Mapping[str, object]) -> PTUTerms | None:
+    """The reservation this deployment accrues flat cost for, else None.
+
+    A start is required rather than inferred because flat cost accrues from it, and a
+    present but unparseable bound would read as no bound and widen the window to the whole
+    day, so either one leaves the deployment unpriced until the config is fixed.
+    """
+    ptu_count: Final = model_info.get("ptu_count")
+    cost_per_hour: Final = model_info.get("cost_per_ptu_per_hour")
+    team_id: Final = model_info.get("team_id")
+    if ptu_count is None or cost_per_hour is None or not team_id:
+        return None
+    try:
+        ptu_count_int: Final = int(ptu_count)
+        cost_per_hour_float: Final = float(cost_per_hour)
+    except (TypeError, ValueError, OverflowError):
+        return None
+    if not 0 < ptu_count_int <= ModelInfo.MAX_PTU_COUNT:
+        return None
+    if not 0 <= cost_per_hour_float <= ModelInfo.MAX_COST_PER_PTU_PER_HOUR:
+        return None
+
+    raw_from: Final = model_info.get("ptu_effective_from")
+    raw_to: Final = model_info.get("ptu_effective_to")
+    effective_from: Final = _as_utc(raw_from)
+    effective_to: Final = _as_utc(raw_to)
+    if effective_from is None or (raw_to is not None and effective_to is None):
+        return None
+    if effective_to is not None and effective_to <= effective_from:
+        return None
+    return PTUTerms(
+        team_id=str(team_id),
+        ptu_count=ptu_count_int,
+        cost_per_ptu_per_hour=cost_per_hour_float,
+        effective_from=effective_from,
+        effective_to=effective_to,
+    )
+
+
+def zeroed_ptu_pricing(
+    model_info: Mapping[str, object], declared: Mapping[str, object]
+) -> Mapping[str, float | tuple[()] | Mapping[str, float]] | None:
+    """The pricing a deployment accruing flat cost must carry, else None.
+
+    Both conditions hold or nothing is zeroed. Without the flag no flat cost accrues, so
+    zeroing would leave the deployment serving for free with nothing charged in its place,
+    which is what an SDK user who happens to carry ptu_count would otherwise get. The terms
+    are checked first only because they are a few dict reads, while the flag can resolve
+    through a configured secret manager, and this runs for every deployment registered.
+
+    Any further rate the deployment itself declares is zeroed alongside the standing set,
+    since one left standing bills the traffic the reserved capacity already paid for.
+    """
+    if ptu_terms(model_info) is None:
+        return None
+    if not is_ptu_cost_attribution_enabled():
+        return None
+    return MappingProxyType(
+        {
+            **PTU_ZEROED_PRICING,
+            **dict.fromkeys(
+                CUSTOM_PRICING_FIELDS.intersection(declared)
+                .difference(PTU_ZEROED_TABLE_FIELDS)
+                .difference(PTU_EMPTIED_PRICING_FIELDS),
+                0.0,
+            ),
+        }
+    )
diff --git a/litellm/litellm_core_utils/streaming_chunk_builder_utils.py b/litellm/litellm_core_utils/streaming_chunk_builder_utils.py
index 67287c903be..ee0518c4aec 100644
--- a/litellm/litellm_core_utils/streaming_chunk_builder_utils.py
+++ b/litellm/litellm_core_utils/streaming_chunk_builder_utils.py
@@ -723,7 +723,7 @@ class ChunkProcessor:
         for choice in response.choices:
             if (
                 hasattr(cast(Choices, choice).message, "reasoning_content")
-                and cast(Choices, choice).message.reasoning_content is not None
+                and cast(Choices, choice).message.reasoning_content
             ):
                 if reasoning_tokens is None:
                     reasoning_tokens = 0
@@ -987,7 +987,12 @@ class ChunkProcessor:
                 returned_usage.completion_tokens_details is not None
                 and returned_usage.completion_tokens_details.reasoning_tokens is None
             ):
-                returned_usage.completion_tokens_details.reasoning_tokens = reasoning_tokens
+                capped_reasoning_tokens: Final = min(max(0, reasoning_tokens), returned_usage.completion_tokens)
+                returned_usage.completion_tokens_details.reasoning_tokens = capped_reasoning_tokens
+                if returned_usage.completion_tokens_details.text_tokens is None:
+                    returned_usage.completion_tokens_details.text_tokens = (
+                        returned_usage.completion_tokens - capped_reasoning_tokens
+                    )
         if prompt_tokens_details is not None:
             returned_usage.prompt_tokens_details = prompt_tokens_details
 
diff --git a/litellm/litellm_core_utils/streaming_handler.py b/litellm/litellm_core_utils/streaming_handler.py
index 43bcf892865..485091bccd0 100644
--- a/litellm/litellm_core_utils/streaming_handler.py
+++ b/litellm/litellm_core_utils/streaming_handler.py
@@ -1830,6 +1830,20 @@ class CustomStreamWrapper:
             return
         self.chunks.append(model_response.model_copy(update={"choices": []}))
 
+    @staticmethod
+    def _resolve_provider_reported_cost(usage_cost: object) -> float | None:
+        """
+        Providers report usage.cost either as a number or, for Perplexity, as a
+        breakdown object whose total lives under ``total_cost``.
+        """
+        if isinstance(usage_cost, bool):
+            return None
+        if isinstance(usage_cost, (int, float)):
+            return float(usage_cost)
+        if isinstance(usage_cost, dict):
+            return CustomStreamWrapper._resolve_provider_reported_cost(usage_cost.get("total_cost"))
+        return None
+
     @staticmethod
     def _propagate_usage_cost_to_hidden_params(
         response: "ModelResponse",
@@ -1840,10 +1854,11 @@ class CustomStreamWrapper:
         calculator uses it instead of a token-based estimate.
         """
         _usage: Final[Usage | None] = getattr(response, "usage", None)
-        if _usage is not None and hasattr(_usage, "cost") and _usage.cost is not None:
+        _cost: Final = CustomStreamWrapper._resolve_provider_reported_cost(getattr(_usage, "cost", None))
+        if _cost is not None:
             if "additional_headers" not in response._hidden_params:
                 response._hidden_params["additional_headers"] = {}
-            response._hidden_params["additional_headers"]["llm_provider-x-litellm-response-cost"] = float(_usage.cost)
+            response._hidden_params["additional_headers"]["llm_provider-x-litellm-response-cost"] = _cost
 
     def __next__(self) -> "ModelResponseStream":
         cache_hit = False
diff --git a/litellm/llms/anthropic/chat/transformation.py b/litellm/llms/anthropic/chat/transformation.py
index ef4ad7011c5..414fd23381a 100644
--- a/litellm/llms/anthropic/chat/transformation.py
+++ b/litellm/llms/anthropic/chat/transformation.py
@@ -5,6 +5,7 @@ from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any, Final, NoReturn, cast
 
 import httpx
+from pydantic import ValidationError
 
 import litellm
 from litellm.constants import (
@@ -39,6 +40,7 @@ from litellm.types.llms.anthropic import (
     AnthropicMessagesTool,
     AnthropicMessagesToolChoice,
     AnthropicOutputSchema,
+    AnthropicOutputTokensDetails,
     AnthropicSystemMessageContent,
     AnthropicThinkingParam,
     AnthropicWebSearchTool,
@@ -2104,6 +2106,68 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
             compaction_blocks,
         )
 
+    @staticmethod
+    def _thinking_tokens_from_usage(usage_object: Mapping[str, object]) -> int | None:
+        details: Final = usage_object.get("output_tokens_details")
+        if not isinstance(details, Mapping):
+            return None
+        try:
+            return AnthropicOutputTokensDetails.model_validate(details).thinking_tokens
+        except ValidationError:
+            return None
+
+    @staticmethod
+    def _response_has_thinking_block(completion_response: Mapping[str, object] | None) -> bool:
+        if completion_response is None:
+            return False
+        content: Final = completion_response.get("content")
+        if not isinstance(content, list):
+            return False
+        return any(
+            isinstance(block, Mapping) and block.get("type") in ("thinking", "redacted_thinking") for block in content
+        )
+
+    def _build_completion_token_details(
+        self,
+        usage_object: Mapping[str, object],
+        iterations: Sequence[object] | None,
+        completion_tokens: int,
+        reasoning_content: str | None,
+        completion_response: Mapping[str, object] | None,
+    ) -> CompletionTokensDetailsWrapper:
+        iteration_thinking_tokens: Final = self._sum_iteration_thinking_tokens(iterations) if iterations else None
+        reported_thinking_tokens: Final = (
+            iteration_thinking_tokens
+            if iteration_thinking_tokens is not None
+            else self._thinking_tokens_from_usage(usage_object)
+        )
+        if reported_thinking_tokens is not None:
+            capped_reported: Final = min(max(0, reported_thinking_tokens), completion_tokens)
+            return CompletionTokensDetailsWrapper(
+                reasoning_tokens=capped_reported,
+                text_tokens=completion_tokens - capped_reported,
+            )
+        if reasoning_content:
+            estimated: Final = min(
+                token_counter(text=reasoning_content, count_response_tokens=True),
+                completion_tokens,
+            )
+            return CompletionTokensDetailsWrapper(
+                reasoning_tokens=max(0, estimated),
+                text_tokens=completion_tokens - max(0, estimated),
+            )
+        if self._response_has_thinking_block(completion_response):
+            return CompletionTokensDetailsWrapper(reasoning_tokens=None, text_tokens=None)
+        return CompletionTokensDetailsWrapper(reasoning_tokens=0, text_tokens=completion_tokens)
+
+    def _sum_iteration_thinking_tokens(self, iterations: Sequence[object]) -> int | None:
+        per_iteration: Final = tuple(
+            self._thinking_tokens_from_usage(iteration) if isinstance(iteration, Mapping) else None
+            for iteration in iterations
+        )
+        reported: Final = tuple(tokens for tokens in per_iteration if tokens is not None)
+        return sum(reported) if len(reported) == len(per_iteration) else None
+
     @staticmethod
     def is_anthropic_usage_object(usage_object: dict) -> bool:
         """Anthropic reports prompt cache tokens as top-level ``cache_read_input_tokens`` /
@@ -2222,14 +2286,12 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
             cache_creation_token_details=cache_creation_token_details,
             text_tokens=raw_input_tokens,
         )
-        # Always populate completion_token_details, not just when there's reasoning_content
-        estimated_reasoning_tokens: Final = (
-            token_counter(text=reasoning_content, count_response_tokens=True) if reasoning_content else 0
-        )
-        reasoning_tokens: Final = min(estimated_reasoning_tokens, completion_tokens)
-        completion_token_details: Final = CompletionTokensDetailsWrapper(
-            reasoning_tokens=max(0, reasoning_tokens),
-            text_tokens=(completion_tokens - reasoning_tokens if reasoning_tokens > 0 else completion_tokens),
+        completion_token_details: Final = self._build_completion_token_details(
+            usage_object=_usage,
+            iterations=iterations,
+            completion_tokens=completion_tokens,
+            reasoning_content=reasoning_content,
+            completion_response=completion_response,
         )
         total_tokens: Final = prompt_tokens + completion_tokens
 
diff --git a/litellm/llms/anthropic/experimental_pass_through/messages/streaming_iterator.py b/litellm/llms/anthropic/experimental_pass_through/messages/streaming_iterator.py
index f999eae1be6..922769dbbfd 100644
--- a/litellm/llms/anthropic/experimental_pass_through/messages/streaming_iterator.py
+++ b/litellm/llms/anthropic/experimental_pass_through/messages/streaming_iterator.py
@@ -10,6 +10,7 @@ from typing_extensions import TypedDict
 
 from litellm.litellm_core_utils.core_helpers import process_response_headers
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
+from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER
 from litellm.proxy.pass_through_endpoints.success_handler import (
     PassThroughEndpointLogging,
 )
@@ -134,8 +135,11 @@ class BaseAnthropicMessagesStreamingIterator:
         if self.completion_start_time is not None:
             self.litellm_logging_obj.completion_start_time = self.completion_start_time
             self.litellm_logging_obj.model_call_details["completion_start_time"] = self.completion_start_time
-        asyncio.create_task(
-            PassThroughStreamingHandler._route_streaming_logging_to_handler(
+        # Enqueue on the rooted logging worker rather than asyncio.create_task:
+        # this also runs during generator teardown after a client disconnect,
+        # where an unrooted task could be garbage-collected before it bills.
+        GLOBAL_LOGGING_WORKER.ensure_initialized_and_enqueue(
+            async_coroutine=PassThroughStreamingHandler._route_streaming_logging_to_handler(
                 litellm_logging_obj=self.litellm_logging_obj,
                 passthrough_success_handler_obj=GLOBAL_PASS_THROUGH_SUCCESS_HANDLER_OBJ,
                 url_route="/v1/messages",
@@ -197,13 +201,21 @@ class BaseAnthropicMessagesStreamingIterator:
         collected_chunks: Final = []
         saw_terminal_event = False
 
-        async for chunk in completion_stream:
-            if self.completion_start_time is None:
-                self.completion_start_time = datetime.now()
-            saw_terminal_event = saw_terminal_event or _is_terminal_stream_chunk(chunk)
-            encoded_chunk = self._convert_chunk_to_sse_format(chunk)
-            collected_chunks.append(encoded_chunk)
-            yield encoded_chunk
+        try:
+            async for chunk in completion_stream:
+                if self.completion_start_time is None:
+                    self.completion_start_time = datetime.now()
+                saw_terminal_event = saw_terminal_event or _is_terminal_stream_chunk(chunk)
+                encoded_chunk = self._convert_chunk_to_sse_format(chunk)
+                collected_chunks.append(encoded_chunk)
+                yield encoded_chunk
+        except (GeneratorExit, asyncio.CancelledError):
+            # A client disconnect tears the generator down at the yield, so the
+            # post-loop logging below never runs and the tokens already streamed
+            # (and billed by the provider) would never reach spend tracking. See LIT-5839.
+            if collected_chunks:
+                await self._handle_streaming_logging(collected_chunks)
+            raise
 
         if not saw_terminal_event:
             yield _incomplete_stream_error_sse_event()
diff --git a/litellm/llms/base_llm/search/transformation.py b/litellm/llms/base_llm/search/transformation.py
index dee67e0b100..7668c6132d6 100644
--- a/litellm/llms/base_llm/search/transformation.py
+++ b/litellm/llms/base_llm/search/transformation.py
@@ -183,6 +183,29 @@ class BaseSearchConfig:
         """
         return headers
 
+    def sign_request(
+        self,
+        headers: dict[str, str],  # mutable-ok: matches the request header dict every other hook on this base takes
+        optional_params: dict[str, object],  # mutable-ok: matches every other hook on this base
+        request_data: dict[str, object] | list[dict[str, object]],  # mutable-ok: transform_search_request's body
+        api_base: str,
+        api_key: str | None = None,
+    ) -> tuple[dict[str, str], bytes | None]:  # mutable-ok: the handler passes these headers straight to httpx
+        """
+        OPTIONAL
+
+        Sign the request. Providers like Bedrock AgentCore need to SigV4-sign
+        the request before sending it to the API.
+
+        For all other providers, this is a no-op and we just return the headers.
+
+        Returns:
+            Tuple of (headers, signed_json_body). When signed_json_body is not
+            None, the handler MUST send it verbatim as the request body —
+            re-serializing the payload would invalidate the signature.
+        """
+        return headers, None
+
     def get_complete_url(
         self,
         api_base: str | None,
diff --git a/litellm/llms/bedrock/chat/converse_transformation.py b/litellm/llms/bedrock/chat/converse_transformation.py
index cee89f42c2d..4dd3f802638 100644
--- a/litellm/llms/bedrock/chat/converse_transformation.py
+++ b/litellm/llms/bedrock/chat/converse_transformation.py
@@ -1834,6 +1834,7 @@ class AmazonConverseConfig(BaseConfig):
         self,
         usage: ConverseTokenUsageBlock,
         reasoning_content: str | None = None,
+        thinking_ran: bool = False,
     ) -> Usage:
         input_tokens = usage["inputTokens"]
         output_tokens: Final = usage["outputTokens"]
@@ -1854,10 +1855,19 @@ class AmazonConverseConfig(BaseConfig):
             cache_creation_tokens=cache_creation_input_tokens,
             text_tokens=raw_input_tokens,
         )
-        reasoning_tokens = token_counter(text=reasoning_content, count_response_tokens=True) if reasoning_content else 0
-        completion_tokens_details: Final = CompletionTokensDetailsWrapper(
-            reasoning_tokens=reasoning_tokens,
-            text_tokens=(output_tokens - reasoning_tokens if reasoning_tokens > 0 else output_tokens),
+        reasoning_tokens: Final = (
+            token_counter(text=reasoning_content, count_response_tokens=True) if reasoning_content else 0
+        )
+        completion_tokens_details: Final = (
+            CompletionTokensDetailsWrapper(
+                reasoning_tokens=reasoning_tokens,
+                text_tokens=output_tokens - reasoning_tokens,
+            )
+            if reasoning_tokens > 0
+            else CompletionTokensDetailsWrapper(
+                reasoning_tokens=None if thinking_ran else 0,
+                text_tokens=None if thinking_ran else output_tokens,
+            )
         )
         openai_usage: Final = Usage(
             prompt_tokens=input_tokens,
@@ -2254,6 +2264,7 @@ class AmazonConverseConfig(BaseConfig):
         usage: Final = self.transform_usage(
             completion_response["usage"],
             reasoning_content=chat_completion_message.get("reasoning_content"),
+            thinking_ran=reasoningContentBlocks is not None,
         )
 
         ## HANDLE TOOL CALLS
diff --git a/litellm/llms/bedrock/chat/invoke_handler.py b/litellm/llms/bedrock/chat/invoke_handler.py
index 86f7e9b0d9f..2a125e38a82 100644
--- a/litellm/llms/bedrock/chat/invoke_handler.py
+++ b/litellm/llms/bedrock/chat/invoke_handler.py
@@ -330,6 +330,7 @@ class AWSEventStreamDecoder:
         self.response_id: str | None = None
         self.json_mode = json_mode
         self._current_tool_name: str | None = None
+        self._thinking_ran = False
 
     def check_empty_tool_call_args(self) -> bool:
         """
@@ -559,7 +560,12 @@ class AWSEventStreamDecoder:
             elif "stopReason" in chunk_data:
                 finish_reason = map_finish_reason(chunk_data.get("stopReason", "stop"))
             elif "usage" in chunk_data:
-                usage = converse_config.transform_usage(chunk_data.get("usage", {}))
+                usage = converse_config.transform_usage(
+                    chunk_data.get("usage", {}),
+                    thinking_ran=self._thinking_ran,
+                )
+            if thinking_blocks:
+                self._thinking_ran = True
 
             model_response_provider_specific_fields: Final = {}
             if "trace" in chunk_data:
diff --git a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py
index 0161f4fadc9..f74a290d773 100644
--- a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py
+++ b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py
@@ -842,8 +842,15 @@ class AmazonAnthropicClaudeMessagesConfig(
 
         patched_stream: Final = self._promote_message_stop_usage(completion_stream)
 
-        async for chunk in handler.async_sse_wrapper(patched_stream):
-            yield chunk
+        sse_stream: Final = handler.async_sse_wrapper(patched_stream)
+        try:
+            async for chunk in sse_stream:
+                yield chunk
+        finally:
+            # Close the inner generator deterministically so a client disconnect
+            # (GeneratorExit here) reaches async_sse_wrapper's partial-spend logging
+            # now instead of at garbage collection. See LIT-5839.
+            await sse_stream.aclose()
 
     @staticmethod
     def _merge_message_start_cache_into_delta_usage(
diff --git a/litellm/llms/bedrock/search/__init__.py b/litellm/llms/bedrock/search/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/litellm/llms/bedrock/search/transformation.py b/litellm/llms/bedrock/search/transformation.py
new file mode 100644
index 00000000000..920e566c9dd
--- /dev/null
+++ b/litellm/llms/bedrock/search/transformation.py
@@ -0,0 +1,455 @@
+"""
+Calls an Amazon Bedrock AgentCore Gateway web-search target (MCP protocol) to search the web.
+
+Web Search on Amazon Bedrock AgentCore exposes Amazon's managed web index through
+an AgentCore Gateway MCP endpoint.
+
+AWS docs: https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/gateway-target-connector-web-search-tool.html
+
+Authentication (matches the gateway's inbound authorizer type):
+- AWS_IAM gateway: the request is SigV4-signed. Credentials come from explicit
+  params (aws_access_key_id / aws_secret_access_key / aws_session_token /
+  aws_region_name, also settable in a proxy search_tools entry) or the
+  standard AWS credential chain (env / profile / IRSA / assumed role)
+- CUSTOM_JWT gateway: pass the OAuth2 bearer token (e.g. Cognito
+  client_credentials) as api_key, or set AGENTCORE_GATEWAY_TOKEN
+
+Setup:
+    1. Create an AgentCore Gateway with a web-search connector target
+    2. Set AGENTCORE_GATEWAY_URL (or pass api_base) to the gateway MCP endpoint, e.g.
+       https://<gateway-id>.gateway.bedrock-agentcore.<region>.amazonaws.com/mcp
+    3. AWS_IAM: ensure the credentials allow bedrock-agentcore:InvokeGateway
+       CUSTOM_JWT: set AGENTCORE_GATEWAY_TOKEN (or pass api_key)
+
+Usage:
+    response = litellm.search(
+        query="latest AI developments",
+        search_provider="agentcore",
+        max_results=5,
+        aws_access_key_id="...",       # optional, omit to use the default chain
+        aws_secret_access_key="...",
+    )
+"""
+
+import json
+import re
+from collections.abc import Iterator, Mapping, Sequence
+from typing import Final
+
+import httpx
+
+from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
+from litellm.llms.base_llm.chat.transformation import BaseLLMException
+from litellm.llms.base_llm.search.transformation import (
+    BaseSearchConfig,
+    SearchResponse,
+    SearchResult,
+)
+from litellm.llms.bedrock.base_aws_llm import BaseAWSLLM
+from litellm.llms.bedrock.common_utils import BedrockError
+from litellm.secret_managers.main import get_secret_str
+
+# AgentCore web-search rejects queries longer than 200 characters
+AGENTCORE_MAX_QUERY_LENGTH: Final = 200
+
+# The provider contract documents a default of 10 results, send it explicitly
+# so the gateway can't silently apply a different default.
+AGENTCORE_DEFAULT_MAX_RESULTS: Final = 10
+
+# Default MCP tool name for a gateway web-search connector target:
+# "<target-name>___<tool-name>". Override with AGENTCORE_SEARCH_TOOL_NAME
+# or optional_params["tool_name"] when the target uses a custom name.
+AGENTCORE_DEFAULT_TOOL_NAME: Final = "web-search-tool___WebSearch"
+
+# All web-search connector tools share this suffix; rejecting other names keeps
+# a caller-supplied tool_name from invoking unrelated tools on the same gateway
+# with the proxy's credentials.
+AGENTCORE_TOOL_NAME_SUFFIX: Final = "___WebSearch"
+
+# MCP revision this provider speaks. Sent on every request because the gateway is
+# called statelessly, without an initialize handshake to negotiate a version.
+# AgentCore gateways whose protocolConfiguration leaves supportedVersions unset
+# accept only 2025-03-26 and reject anything newer with a -32600 error, so that
+# is the default; a gateway pinned to another version needs
+# AGENTCORE_MCP_PROTOCOL_VERSION set to match.
+AGENTCORE_DEFAULT_MCP_PROTOCOL_VERSION: Final = "2025-03-26"
+
+# Matched against the URL host so a crafted path or query string can't pass for
+# a gateway hostname.
+_GATEWAY_HOST_PATTERN: Final = re.compile(r"[a-z0-9-]+\.gateway\.bedrock-agentcore\.([a-z0-9-]+)\.amazonaws\.com")
+
+_SSE_EVENT_SEPARATOR: Final = re.compile(r"\r?\n[ \t]*\r?\n")
+
+_SSE_LINE_PREFIXES: Final = ("event:", "data:", ":", "id:", "retry:")
+
+
+def _gateway_host_match(api_base: str) -> re.Match[str] | None:
+    return _GATEWAY_HOST_PATTERN.fullmatch(httpx.URL(api_base).host)
+
+
+_LOOPBACK_HOSTS: Final = frozenset({"localhost", "127.0.0.1", "::1"})
+
+
+def _credential_safe_transport(api_base: str) -> bool:
+    url: Final = httpx.URL(api_base)
+    return url.scheme == "https" or url.host in _LOOPBACK_HOSTS
+
+
+def _string_field(item: Mapping[str, object], *keys: str) -> str | None:
+    return next(
+        (value for key in keys if isinstance(value := item.get(key), str) and value),
+        None,
+    )
+
+
+def _to_search_result(item: Mapping[str, object]) -> SearchResult:
+    return SearchResult(
+        title=_string_field(item, "title") or "",
+        url=_string_field(item, "url") or "",
+        snippet=_string_field(item, "text", "snippet") or "",
+        date=_string_field(item, "publishedDate", "date"),
+        last_updated=None,
+    )
+
+
+def _result_items(parsed: object) -> tuple[Mapping[str, object], ...]:
+    items: Final = parsed.get("results", ()) if isinstance(parsed, Mapping) else parsed
+    if not isinstance(items, Sequence) or isinstance(items, (str, bytes)):
+        return ()
+    return tuple(item for item in items if isinstance(item, Mapping))
+
+
+def _parse_result_items(raw_text: object) -> tuple[Mapping[str, object], ...]:
+    """
+    Parse one MCP text block into the search result objects it carries.
+
+    A block holds either a JSON list of results or a {"results": [...]} object;
+    anything unparseable is skipped rather than failing the whole response.
+    """
+    if not isinstance(raw_text, str):
+        return ()
+    try:
+        parsed: Final = json.loads(raw_text)
+    except json.JSONDecodeError:
+        return ()
+    return _result_items(parsed)
+
+
+def _iter_sse_events(text: str) -> Iterator[Mapping[str, object]]:
+    """
+    Yield the JSON payload of each SSE event in a Streamable HTTP MCP response.
+
+    Per the SSE spec an event's data is the concatenation of all its ``data:``
+    lines (joined with newlines), and a stream may carry several events, e.g.
+    progress notifications before the JSON-RPC response.
+    """
+    for chunk in _SSE_EVENT_SEPARATOR.split(text):
+        payload = "\n".join(line[len("data:") :].lstrip() for line in chunk.splitlines() if line.startswith("data:"))
+        if not payload:
+            continue
+        try:
+            parsed = json.loads(payload)
+        except json.JSONDecodeError:
+            continue
+        if isinstance(parsed, dict):
+            yield parsed
+
+
+class AgentCoreSearchConfig(BaseSearchConfig, BaseAWSLLM):
+    def __init__(self) -> None:
+        BaseSearchConfig.__init__(self)
+        BaseAWSLLM.__init__(self)
+
+    @staticmethod
+    def ui_friendly_name() -> str:
+        return "Web Search on Amazon Bedrock"
+
+    def validate_environment(
+        self,
+        headers: dict,  # mutable-ok: BaseSearchConfig hands providers the mutable request header dict
+        api_key: str | None = None,
+        api_base: str | None = None,
+        **kwargs: object,  # kwargs-ok: BaseSearchConfig.validate_environment forwards provider-specific extras
+    ) -> dict:  # mutable-ok: the handler passes these headers straight to httpx, which wants a dict
+        """
+        Set MCP transport headers. Per the MCP Streamable HTTP transport spec,
+        the client MUST accept both application/json and text/event-stream, and
+        declare its protocol revision with MCP-Protocol-Version.
+
+        Authentication itself happens in sign_request(): bearer token for
+        CUSTOM_JWT gateways, AWS SigV4 for AWS_IAM gateways.
+        """
+        return {  # mutable-ok: httpx request headers are a dict
+            **headers,
+            "Content-Type": "application/json",
+            "Accept": "application/json, text/event-stream",
+            "MCP-Protocol-Version": get_secret_str("AGENTCORE_MCP_PROTOCOL_VERSION")
+            or AGENTCORE_DEFAULT_MCP_PROTOCOL_VERSION,
+        }
+
+    def get_complete_url(
+        self,
+        api_base: str | None,
+        optional_params: dict,  # mutable-ok: BaseSearchConfig passes optional params as a dict
+        data: dict | list[dict] | None = None,  # mutable-ok: BaseSearchConfig request bodies are JSON dicts
+        **kwargs: object,  # kwargs-ok: BaseSearchConfig.get_complete_url forwards provider-specific extras
+    ) -> str:
+        gateway_url: Final = api_base or get_secret_str("AGENTCORE_GATEWAY_URL")
+        if not gateway_url:
+            raise ValueError(
+                "AGENTCORE_GATEWAY_URL is not set. Set it to your AgentCore Gateway MCP "
+                "endpoint (https://<gateway-id>.gateway.bedrock-agentcore.<region>"
+                ".amazonaws.com/mcp) or pass api_base."
+            )
+        return gateway_url
+
+    def transform_search_request(
+        self,
+        query: str | list[str],  # mutable-ok: BaseSearchConfig accepts a list of queries
+        optional_params: dict,  # mutable-ok: BaseSearchConfig passes optional params as a dict
+        **kwargs: object,  # kwargs-ok: BaseSearchConfig.transform_search_request forwards provider-specific extras
+    ) -> dict:  # mutable-ok: the JSON-RPC body is serialized as a JSON object
+        """
+        Transform Search request to an MCP tools/call request.
+
+        Args:
+            query: Search query (string or list of strings). AgentCore only
+                supports single string queries; lists are joined with spaces.
+            optional_params: Optional parameters for the request
+                - max_results: Maximum number of results (1-25), default 10
+                - tool_name: Override the MCP tool name of the gateway target
+
+        Returns:
+            Dict with the JSON-RPC 2.0 request body
+        """
+        joined_query: Final = " ".join(query) if isinstance(query, list) else query
+        tool_name: Final = (
+            optional_params.get("tool_name")
+            or get_secret_str("AGENTCORE_SEARCH_TOOL_NAME")
+            or AGENTCORE_DEFAULT_TOOL_NAME
+        )
+        if not tool_name.endswith(AGENTCORE_TOOL_NAME_SUFFIX):
+            raise ValueError(
+                f"Invalid AgentCore search tool_name '{tool_name}': must end with "
+                f"'{AGENTCORE_TOOL_NAME_SUFFIX}' (a web-search connector tool). "
+                "Other gateway tools cannot be invoked through this provider."
+            )
+
+        return {  # mutable-ok: JSON-RPC request bodies are JSON objects
+            "jsonrpc": "2.0",
+            "id": 1,
+            "method": "tools/call",
+            "params": {  # mutable-ok: JSON-RPC request bodies are JSON objects
+                "name": tool_name,
+                "arguments": {  # mutable-ok: JSON-RPC request bodies are JSON objects
+                    "query": joined_query[:AGENTCORE_MAX_QUERY_LENGTH],
+                    "maxResults": optional_params.get("max_results", AGENTCORE_DEFAULT_MAX_RESULTS),
+                },
+            },
+        }
+
+    def sign_request(
+        self,
+        headers: dict[str, str],  # mutable-ok: BaseSearchConfig hands providers the mutable request header dict
+        optional_params: dict[str, object],  # mutable-ok: BaseSearchConfig passes optional params as a dict
+        request_data: dict[str, object] | list[dict[str, object]],  # mutable-ok: request bodies are JSON dicts
+        api_base: str,
+        api_key: str | None = None,
+    ) -> tuple[dict[str, str], bytes | None]:  # mutable-ok: BaseSearchConfig.sign_request returns httpx headers
+        """
+        Authenticate the MCP request.
+
+        CUSTOM_JWT gateways: attach the caller's OAuth2 bearer token (api_key
+        or AGENTCORE_GATEWAY_TOKEN), no AWS credentials involved.
+
+        AWS_IAM gateways: SigV4-sign with the bedrock-agentcore service name.
+        """
+        if not isinstance(request_data, dict):
+            raise TypeError("AgentCore search expects a single dict request body")
+
+        if not _credential_safe_transport(api_base):
+            raise ValueError(
+                f"Refusing to send AgentCore credentials over plaintext HTTP to '{api_base}': a bearer "
+                "token or SigV4 signature would be readable in transit. Use an https gateway URL "
+                "(plain http is allowed only for localhost)."
+            )
+
+        # Server-managed credentials only go to a trusted host, otherwise an
+        # authenticated caller could point api_base at their own server (e.g. via
+        # /search_tools/test_connection) and collect AGENTCORE_GATEWAY_TOKEN or a
+        # SigV4 signature with the proxy's credential scope and session token.
+        gateway_host_match: Final = _gateway_host_match(api_base)
+        bearer_token: Final = self.resolve_server_api_key(
+            caller_api_key=api_key,
+            caller_api_base=api_base,
+            key_env_vars=("AGENTCORE_GATEWAY_TOKEN",),
+            base_env_var="AGENTCORE_GATEWAY_URL",
+            default_api_base=api_base if gateway_host_match else None,
+        )
+        if bearer_token:
+            bearer_headers: Final = {  # mutable-ok: httpx request headers are a dict
+                **headers,
+                "Authorization": f"Bearer {bearer_token}",
+            }
+            return bearer_headers, json.dumps(request_data).encode()
+
+        if gateway_host_match is None and not self._is_configured_gateway(api_base):
+            raise ValueError(
+                f"Refusing to send SigV4-signed AgentCore requests to '{api_base}': it is neither an "
+                "AgentCore gateway hostname nor the host in AGENTCORE_GATEWAY_URL. Set "
+                "AGENTCORE_GATEWAY_URL to authorize a custom gateway hostname."
+            )
+
+        signing_params: Final = (
+            optional_params
+            if optional_params.get("aws_region_name") is not None
+            else {  # mutable-ok: BaseAWSLLM._sign_request takes optional params as a dict
+                **optional_params,
+                "aws_region_name": self._signing_region(api_base),
+            }
+        )
+
+        # api_key="" (not None, but falsy) disables BaseAWSLLM's fallback to the
+        # AWS_BEARER_TOKEN_BEDROCK env var: that token is a Bedrock Runtime
+        # credential and must not be sent to an AgentCore gateway.
+        return self._sign_request(
+            service_name="bedrock-agentcore",
+            headers=headers,
+            optional_params=signing_params,
+            request_data=request_data,
+            api_base=api_base,
+            api_key="",
+        )
+
+    @staticmethod
+    def _is_configured_gateway(api_base: str) -> bool:
+        configured: Final = get_secret_str("AGENTCORE_GATEWAY_URL")
+        if not configured:
+            return False
+        return httpx.URL(configured).host == httpx.URL(api_base).host
+
+    @staticmethod
+    def _signing_region(api_base: str) -> str:
+        """
+        Resolve the SigV4 signing region, which must match the gateway's region.
+
+        Standard gateway hostnames carry it, so callers don't have to set
+        aws_region_name to a region different from their default. For custom or
+        private hostnames, defer to the AWS configuration chain (env vars and
+        the shared config / profile region), and error out when that yields
+        nothing rather than silently signing for a guessed region the gateway
+        would reject with a confusing auth error.
+        """
+        match: Final = _gateway_host_match(api_base)
+        if match:
+            return match.group(1)
+
+        # boto3's session resolution covers env vars AND the AWS shared config
+        # (profile region), unlike BaseAWSLLM's helper, which silently defaults
+        # to us-west-2 when nothing is configured.
+        import boto3
+
+        configured_region: Final = boto3.Session().region_name
+        if configured_region:
+            return configured_region
+        raise ValueError(
+            f"Cannot derive the SigV4 signing region from api_base '{api_base}' "
+            "or the AWS configuration chain. Set aws_region_name (or AWS_DEFAULT_REGION / "
+            "a profile region) to the gateway's region when using a custom hostname."
+        )
+
+    def transform_search_response(
+        self,
+        raw_response: httpx.Response,
+        logging_obj: LiteLLMLoggingObj,
+        **kwargs: object,  # kwargs-ok: BaseSearchConfig.transform_search_response forwards provider-specific extras
+    ) -> SearchResponse:
+        """
+        Transform an MCP tools/call response to LiteLLM unified SearchResponse.
+
+        The gateway returns JSON-RPC (as plain JSON or a single-message SSE
+        stream) whose result.content[] text blocks contain a JSON list of
+        {title, url, date/publishedDate, text} entries. Web-search connector
+        1.1.0 and later repeat that list in result.structuredContent, which is
+        the only machine-readable copy when the text block holds prose instead.
+        """
+        response_json: Final = self._parse_mcp_body(raw_response)
+
+        error: Final = response_json.get("error")
+        if error is not None:
+            raise BedrockError(
+                status_code=raw_response.status_code if raw_response.status_code >= 400 else 502,
+                message=f"AgentCore gateway MCP error: {error}",
+            )
+
+        # A failed tools/call is reported in-band, as HTTP 200 with result.isError
+        # and the failure text where the results would be.
+        result: Final = response_json.get("result")
+        if isinstance(result, dict) and result.get("isError"):
+            raise BedrockError(
+                status_code=raw_response.status_code if raw_response.status_code >= 400 else 502,
+                message=f"AgentCore web search tool error: {self._tool_error_message(response_json)}",
+            )
+
+        text_items: Final = tuple(
+            item for block in self._text_blocks(response_json) for item in _parse_result_items(block.get("text"))
+        )
+        structured: Final = result.get("structuredContent") if isinstance(result, Mapping) else None
+        items: Final = text_items or _result_items(structured)
+
+        results: Final = [_to_search_result(item) for item in items]  # mutable-ok: pydantic list field
+
+        return SearchResponse(results=results, object="search")
+
+    def _tool_error_message(self, response_json: Mapping[str, object]) -> str:
+        texts: Final = tuple(
+            text for block in self._text_blocks(response_json) if isinstance(text := block.get("text"), str)
+        )
+        return " ".join(texts) if texts else json.dumps(response_json.get("result"))[:500]
+
+    @staticmethod
+    def _text_blocks(response_json: Mapping[str, object]) -> tuple[Mapping[str, object], ...]:
+        result: Final = response_json.get("result")
+        content: Final = result.get("content") if isinstance(result, dict) else None
+        if not isinstance(content, Sequence) or isinstance(content, (str, bytes)):
+            return ()
+        return tuple(block for block in content if isinstance(block, dict) and block.get("type") == "text")
+
+    @staticmethod
+    def _parse_mcp_body(raw_response: httpx.Response) -> Mapping[str, object]:
+        """
+        Parse a JSON or SSE-framed (Streamable HTTP transport) MCP response.
+
+        Return the event whose payload carries the JSON-RPC response, i.e. one
+        containing ``result`` or ``error``, falling back to the last event when
+        the stream carries only notifications.
+        """
+        text: Final = raw_response.text
+        if not text.lstrip().startswith(_SSE_LINE_PREFIXES):
+            return raw_response.json()
+
+        events: Final = tuple(_iter_sse_events(text))
+        response_event: Final = next(
+            (event for event in events if "result" in event or "error" in event),
+            None,
+        )
+        if response_event is not None:
+            return response_event
+        if events:
+            return events[-1]
+        raise BedrockError(
+            status_code=502,
+            message=f"AgentCore gateway returned SSE without a JSON data frame: {text[:200]}",
+        )
+
+    def get_error_class(
+        self,
+        error_message: str,
+        status_code: int,
+        headers: dict,  # mutable-ok: BaseSearchConfig.get_error_class takes the response headers as a dict
+    ) -> Exception:
+        return BaseLLMException(
+            status_code=status_code,
+            message=error_message,
+            headers=headers,
+        )
diff --git a/litellm/llms/custom_httpx/llm_http_handler.py b/litellm/llms/custom_httpx/llm_http_handler.py
index 3ee803646a9..cc522aed1ee 100644
--- a/litellm/llms/custom_httpx/llm_http_handler.py
+++ b/litellm/llms/custom_httpx/llm_http_handler.py
@@ -5,7 +5,7 @@ import ssl
 from collections.abc import AsyncIterator, Coroutine, Iterator, Mapping, Sequence
 from contextlib import asynccontextmanager
 from functools import lru_cache
-from types import ModuleType
+from types import MappingProxyType, ModuleType
 from typing import TYPE_CHECKING, Any, Final, Literal, Optional, TypedDict, TypeVar, Union, cast, get_type_hints
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
@@ -1788,6 +1788,14 @@ class BaseLLMHTTPHandler:
             api_key=api_key,
         )
 
+        signed_headers, signed_json_body = provider_config.sign_request(
+            headers=headers,
+            optional_params=optional_params,
+            request_data=data,
+            api_base=complete_url,
+            api_key=api_key,
+        )
+
         ## LOGGING
         logging_obj.pre_call(
             input=query if isinstance(query, str) else str(query),
@@ -1811,14 +1819,15 @@ class BaseLLMHTTPHandler:
                 # Note: timeout is set on the client itself, not per-request for GET
                 response = client.get(
                     url=complete_url,
-                    headers=headers,
+                    headers=signed_headers,
                 )
             else:
-                # Make POST request with JSON data
+                # A signed body must be sent verbatim, re-serializing it would break the signature
                 response = client.post(
                     url=complete_url,
-                    headers=headers,
-                    json=data,
+                    headers=signed_headers,
+                    data=signed_json_body,
+                    json=data if signed_json_body is None else None,
                     timeout=timeout,
                 )
         except Exception as e:
@@ -1872,6 +1881,14 @@ class BaseLLMHTTPHandler:
             api_key=api_key,
         )
 
+        signed_headers, signed_json_body = provider_config.sign_request(
+            headers=headers,
+            optional_params=optional_params,
+            request_data=data,
+            api_base=complete_url,
+            api_key=api_key,
+        )
+
         ## LOGGING
         logging_obj.pre_call(
             input=query if isinstance(query, str) else str(query),
@@ -1900,14 +1917,15 @@ class BaseLLMHTTPHandler:
                 # Note: timeout is set on the client itself, not per-request for GET
                 response = await async_httpx_client.get(
                     url=complete_url,
-                    headers=headers,
+                    headers=signed_headers,
                 )
             else:
-                # Make async POST request with JSON data
+                # A signed body must be sent verbatim, re-serializing it would break the signature
                 response = await async_httpx_client.post(
                     url=complete_url,
-                    headers=headers,
-                    json=data,
+                    headers=signed_headers,
+                    data=signed_json_body,
+                    json=data if signed_json_body is None else None,
                     timeout=timeout,
                 )
         except Exception as e:
@@ -2069,6 +2087,14 @@ class BaseLLMHTTPHandler:
         if anthropic_messages_provider_config.should_filter_anthropic_beta_headers():
             headers = update_headers_with_filtered_beta(headers=headers, provider=custom_llm_provider)
 
+        from litellm.llms.vertex_ai.vertex_llm_base import VertexBase
+
+        explicit_vertex_location: Final = VertexBase.explicit_vertex_ai_location(MappingProxyType(dict(litellm_params)))
+        vertex_location_params: Final = (
+            MappingProxyType({"vertex_location": explicit_vertex_location})
+            if explicit_vertex_location
+            else MappingProxyType({})
+        )
         logging_obj.update_from_kwargs(
             kwargs=kwargs,
             model=model,
@@ -2077,6 +2103,7 @@ class BaseLLMHTTPHandler:
                 "preset_cache_key": None,
                 "stream_response": {},
                 "model_info": kwargs.get("model_info"),
+                **vertex_location_params,
                 **anthropic_messages_optional_request_params,
             },
             custom_llm_provider=custom_llm_provider,
diff --git a/litellm/llms/vertex_ai/cost_calculator.py b/litellm/llms/vertex_ai/cost_calculator.py
index 86a5bb207ec..23cb1e5b580 100644
--- a/litellm/llms/vertex_ai/cost_calculator.py
+++ b/litellm/llms/vertex_ai/cost_calculator.py
@@ -7,6 +7,7 @@ from litellm import verbose_logger
 from litellm.litellm_core_utils.llm_cost_calc.utils import (
     _is_above_128k,
     generic_cost_per_token,
+    get_vertex_regional_endpoint_uplift,
 )
 from litellm.types.utils import ModelInfo, Usage
 
@@ -63,6 +64,7 @@ def cost_per_character(
     usage: Usage,
     prompt_characters: float | None = None,
     completion_characters: float | None = None,
+    vertex_location: str | None = None,
 ) -> tuple[float, float]:
     """
     Calculates the cost per character for a given VertexAI model, input messages, and response object.
@@ -72,6 +74,8 @@ def cost_per_character(
         - custom_llm_provider: str, "vertex_ai-*"
         - prompt_characters: float, the number of input characters
         - completion_characters: float, the number of output characters
+        - vertex_location: the Vertex AI location serving the request; non-global
+          locations apply the model's regional-endpoint uplift multiplier
 
     Returns:
         Tuple[float, float] - prompt_cost_in_usd, completion_cost_in_usd
@@ -79,8 +83,6 @@ def cost_per_character(
     Raises:
         Exception if model requires >128k pricing, but model cost not mapped
     """
-    model_info = litellm.get_model_info(model=model, custom_llm_provider=custom_llm_provider)
-
     ## GET MODEL INFO
     model_info = litellm.get_model_info(model=model, custom_llm_provider=custom_llm_provider)
 
@@ -162,7 +164,8 @@ def cost_per_character(
                 usage=usage,
             )
 
-    return prompt_cost, completion_cost
+    vertex_uplift: Final = get_vertex_regional_endpoint_uplift(model_info, vertex_location)
+    return prompt_cost * vertex_uplift, completion_cost * vertex_uplift
 
 
 def _handle_128k_pricing(
@@ -196,6 +199,7 @@ def cost_per_token(
     custom_llm_provider: str,
     usage: Usage,
     service_tier: str | None = None,
+    vertex_location: str | None = None,
 ) -> tuple[float, float]:
     """
     Calculates the cost per token for a given model, prompt tokens, and completion tokens.
@@ -207,6 +211,8 @@ def cost_per_token(
         - completion_tokens: float, the number of output tokens
         - service_tier: optional tier derived from Gemini trafficType
           ("priority" for ON_DEMAND_PRIORITY, "flex" for FLEX/batch).
+        - vertex_location: the Vertex AI location serving the request; non-global
+          locations apply the model's regional-endpoint uplift multiplier
 
     Returns:
         Tuple[float, float] - prompt_cost_in_usd, completion_cost_in_usd
@@ -222,14 +228,17 @@ def cost_per_token(
     input_cost_per_token_above_128k_tokens: Final = model_info.get("input_cost_per_token_above_128k_tokens")
     output_cost_per_token_above_128k_tokens: Final = model_info.get("output_cost_per_token_above_128k_tokens")
     if input_cost_per_token_above_128k_tokens is not None or output_cost_per_token_above_128k_tokens is not None:
-        return _handle_128k_pricing(
+        prompt_cost_128k, completion_cost_128k = _handle_128k_pricing(
             model_info=model_info,
             usage=usage,
         )
+        vertex_uplift: Final = get_vertex_regional_endpoint_uplift(model_info, vertex_location)
+        return prompt_cost_128k * vertex_uplift, completion_cost_128k * vertex_uplift
 
     return generic_cost_per_token(
         model=model,
         custom_llm_provider=custom_llm_provider,
         usage=usage,
         service_tier=service_tier,
+        vertex_location=vertex_location,
     )
diff --git a/litellm/llms/vertex_ai/vertex_llm_base.py b/litellm/llms/vertex_ai/vertex_llm_base.py
index 445e34966a9..75098515deb 100644
--- a/litellm/llms/vertex_ai/vertex_llm_base.py
+++ b/litellm/llms/vertex_ai/vertex_llm_base.py
@@ -8,6 +8,7 @@ import asyncio
 import json
 import os
 import threading
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, Final, Literal
 from urllib.parse import urlparse
 
@@ -68,7 +69,8 @@ class VertexBase:
         # re-acquire it without deadlocking the current thread.
         self._sync_refresh_lock = threading.RLock()
 
-    def get_vertex_region(self, vertex_region: str | None, model: str) -> str:
+    @staticmethod
+    def get_vertex_region(vertex_region: str | None, model: str) -> str:
         import litellm
 
         # Try to get supported_regions directly from model_cost
@@ -1191,7 +1193,18 @@ class VertexBase:
         )
 
     @staticmethod
-    def safe_get_vertex_ai_location(litellm_params: dict) -> str | None:
+    def explicit_vertex_ai_location(params: Mapping[str, object]) -> str | None:
+        """
+        The location explicitly configured in the given params, without any
+        module-level or environment fallback. None when not configured.
+        """
+        for configured in (params.get("vertex_location"), params.get("vertex_ai_location")):
+            if isinstance(configured, str) and configured:
+                return configured
+        return None
+
+    @staticmethod
+    def safe_get_vertex_ai_location(litellm_params: Mapping[str, object]) -> str | None:
         """
         Safely get Vertex AI location without mutating the litellm_params dict.
 
@@ -1205,8 +1218,7 @@ class VertexBase:
             Vertex AI location/region or None
         """
         return (
-            litellm_params.get("vertex_location")
-            or litellm_params.get("vertex_ai_location")
+            VertexBase.explicit_vertex_ai_location(litellm_params)
             or litellm.vertex_location
             or get_secret_str("VERTEXAI_LOCATION")
             or get_secret_str("VERTEX_LOCATION")
diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index 07f9027313b..d0eca17272d 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -54,6 +54,7 @@
         "output_cost_per_image": 0.04
     },
     "1024-x-1024/dall-e-2": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 1.9e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -67,6 +68,7 @@
         "output_cost_per_image": 0.08
     },
     "256-x-256/dall-e-2": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 2.4414e-07,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -80,6 +82,7 @@
         "output_cost_per_image": 0.018
     },
     "512-x-512/dall-e-2": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 6.86e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -2887,6 +2890,7 @@
         "supports_function_calling": true
     },
     "azure_ai/claude-haiku-4-5": {
+        "deprecation_date": "2026-10-19",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -2908,6 +2912,7 @@
         "supports_vision": true
     },
     "azure_ai/claude-opus-4-5": {
+        "deprecation_date": "2026-10-19",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -2930,6 +2935,7 @@
         "supports_output_config": true
     },
     "azure_ai/claude-opus-4-6": {
+        "deprecation_date": "2027-02-02",
         "supports_adaptive_thinking": true,
         "input_cost_per_token": 5e-06,
         "output_cost_per_token": 2.5e-05,
@@ -2959,6 +2965,7 @@
         "supports_max_reasoning_effort": true
     },
     "azure_ai/claude-opus-4-7": {
+        "deprecation_date": "2027-04-06",
         "supports_adaptive_thinking": true,
         "input_cost_per_token": 5e-06,
         "output_cost_per_token": 2.5e-05,
@@ -3083,6 +3090,7 @@
         "supports_max_reasoning_effort": true
     },
     "azure_ai/claude-opus-4-1": {
+        "deprecation_date": "2026-08-05",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -3104,6 +3112,7 @@
         "supports_vision": true
     },
     "azure_ai/claude-sonnet-4-5": {
+        "deprecation_date": "2026-10-19",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -3156,6 +3165,7 @@
         "supports_max_reasoning_effort": true
     },
     "azure_ai/claude-sonnet-4-6": {
+        "deprecation_date": "2027-02-10",
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
@@ -3226,6 +3236,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1e-06,
         "cache_read_input_token_cost_priority": 1e-06,
@@ -3318,6 +3329,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 5e-07,
         "cache_read_input_token_cost_priority": 5e-07,
@@ -3364,6 +3376,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-2026-03-05": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 5e-07,
         "cache_read_input_token_cost_priority": 5e-07,
@@ -3410,6 +3423,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-pro": {
+        "deprecation_date": "2027-09-07",
         "cache_read_input_token_cost": 3e-06,
         "cache_read_input_token_cost_above_272k_tokens": 6e-06,
         "cache_read_input_token_cost_priority": 6e-06,
@@ -3455,6 +3469,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-pro-2026-03-05": {
+        "deprecation_date": "2027-09-07",
         "cache_read_input_token_cost": 3e-06,
         "cache_read_input_token_cost_above_272k_tokens": 6e-06,
         "cache_read_input_token_cost_priority": 6e-06,
@@ -3500,6 +3515,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-mini": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_priority": 1.5e-07,
         "input_cost_per_token": 7.5e-07,
@@ -3540,6 +3556,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4-mini-2026-03-17": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_priority": 1.5e-07,
         "input_cost_per_token": 7.5e-07,
@@ -3580,6 +3597,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4-nano": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 2e-08,
         "cache_read_input_token_cost_priority": 4e-08,
         "input_cost_per_token": 2e-07,
@@ -3620,6 +3638,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4-nano-2026-03-17": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 2e-08,
         "cache_read_input_token_cost_priority": 4e-08,
         "input_cost_per_token": 2e-07,
@@ -3849,6 +3868,7 @@
         "supports_vision": true
     },
     "azure/eu/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -3918,6 +3938,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/eu/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -3948,6 +3969,7 @@
         "supports_vision": true
     },
     "azure/eu/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.8e-08,
         "input_cost_per_token": 2.75e-07,
         "litellm_provider": "azure",
@@ -4107,6 +4129,7 @@
         "supports_vision": true
     },
     "azure/global-standard/gpt-4o-mini": {
+        "deprecation_date": "2027-04-14",
         "input_cost_per_token": 1.5e-07,
         "litellm_provider": "azure",
         "max_input_tokens": 128000,
@@ -4155,6 +4178,7 @@
         "supports_vision": true
     },
     "azure/global/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -4224,6 +4248,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/global/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -4254,6 +4279,7 @@
         "supports_vision": true
     },
     "azure/global/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure",
@@ -4492,6 +4518,7 @@
         "supports_vision": true
     },
     "azure/gpt-4.1": {
+        "deprecation_date": "2027-04-14",
         "cache_read_input_token_cost": 5e-07,
         "input_cost_per_token": 2e-06,
         "input_cost_per_token_batches": 1e-06,
@@ -4559,6 +4586,7 @@
         "supports_web_search": false
     },
     "azure/gpt-4.1-mini": {
+        "deprecation_date": "2027-04-14",
         "cache_read_input_token_cost": 1e-07,
         "input_cost_per_token": 4e-07,
         "input_cost_per_token_batches": 2e-07,
@@ -4626,6 +4654,7 @@
         "supports_web_search": false
     },
     "azure/gpt-4.1-nano": {
+        "deprecation_date": "2026-10-14",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 1e-07,
         "input_cost_per_token_batches": 5e-08,
@@ -4902,6 +4931,7 @@
         "supports_vision": false
     },
     "azure/gpt-4o-mini": {
+        "deprecation_date": "2027-04-14",
         "cache_read_input_token_cost": 7.5e-08,
         "input_cost_per_token": 1.65e-07,
         "litellm_provider": "azure",
@@ -5344,6 +5374,7 @@
         "supports_vision": true
     },
     "azure/gpt-5": {
+        "deprecation_date": "2027-02-09",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -5507,6 +5538,7 @@
         "supports_vision": true
     },
     "azure/gpt-5-mini": {
+        "deprecation_date": "2027-02-09",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure",
@@ -5572,6 +5604,7 @@
         "supports_vision": true
     },
     "azure/gpt-5-nano": {
+        "deprecation_date": "2027-02-09",
         "cache_read_input_token_cost": 5e-09,
         "input_cost_per_token": 5e-08,
         "litellm_provider": "azure",
@@ -5667,6 +5700,7 @@
         "supports_vision": true
     },
     "azure/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -5736,6 +5770,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -5797,6 +5832,7 @@
         "supports_vision": true
     },
     "azure/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure",
@@ -5827,6 +5863,7 @@
         "supports_vision": true
     },
     "azure/gpt-5.2": {
+        "deprecation_date": "2027-06-08",
         "cache_read_input_token_cost": 1.75e-07,
         "input_cost_per_token": 1.75e-06,
         "litellm_provider": "azure",
@@ -6136,6 +6173,7 @@
         "supports_web_search": true
     },
     "azure/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 5e-07,
         "cache_read_input_token_cost_priority": 5e-07,
@@ -6180,6 +6218,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure/us/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.8e-07,
         "cache_read_input_token_cost_priority": 5.5e-07,
         "input_cost_per_token": 2.75e-06,
@@ -6218,6 +6257,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure/eu/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.8e-07,
         "cache_read_input_token_cost_priority": 5.5e-07,
         "input_cost_per_token": 2.75e-06,
@@ -6379,6 +6419,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure/gpt-5.4-pro": {
+        "deprecation_date": "2027-09-07",
         "cache_read_input_token_cost": 3e-06,
         "cache_read_input_token_cost_above_272k_tokens": 6e-06,
         "input_cost_per_token": 3e-05,
@@ -7045,6 +7086,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1e-06,
         "cache_read_input_token_cost_priority": 1e-06,
@@ -7095,6 +7137,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure/us/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1.1e-06,
         "cache_read_input_token_cost_priority": 1.38e-06,
@@ -7142,6 +7185,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure/eu/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1.1e-06,
         "cache_read_input_token_cost_priority": 1.38e-06,
@@ -7408,6 +7452,7 @@
         "supports_web_search": true
     },
     "azure/gpt-5.4-mini": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 7.5e-08,
         "input_cost_per_token": 7.5e-07,
         "litellm_provider": "azure",
@@ -7489,6 +7534,7 @@
         "supports_xhigh_reasoning_effort": true
     },
     "azure/gpt-5.4-nano": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 2e-08,
         "input_cost_per_token": 2e-07,
         "litellm_provider": "azure",
@@ -7601,6 +7647,7 @@
         "output_cost_per_token": 0.0
     },
     "azure/high/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.59263611e-07,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7610,6 +7657,7 @@
         ]
     },
     "azure/high/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7619,6 +7667,7 @@
         ]
     },
     "azure/high/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7628,6 +7677,7 @@
         ]
     },
     "azure/low/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.0490417e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7637,6 +7687,7 @@
         ]
     },
     "azure/low/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7646,6 +7697,7 @@
         ]
     },
     "azure/low/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7655,6 +7707,7 @@
         ]
     },
     "azure/medium/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7664,6 +7717,7 @@
         ]
     },
     "azure/medium/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7673,6 +7727,7 @@
         ]
     },
     "azure/medium/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7695,6 +7750,7 @@
         ]
     },
     "azure/gpt-image-1.5": {
+        "deprecation_date": "2027-06-16",
         "cache_read_input_token_cost": 1.25e-06,
         "input_cost_per_token": 5e-06,
         "input_cost_per_image_token": 8e-06,
@@ -7720,6 +7776,7 @@
         ]
     },
     "azure/gpt-image-2": {
+        "deprecation_date": "2027-10-21",
         "cache_read_input_token_cost": 1.25e-06,
         "input_cost_per_token": 5e-06,
         "input_cost_per_image_token": 8e-06,
@@ -7751,6 +7808,7 @@
         "supports_pdf_input": true
     },
     "azure/low/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 2.0751953125e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7760,6 +7818,7 @@
         ]
     },
     "azure/low/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 2.0751953125e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7769,6 +7828,7 @@
         ]
     },
     "azure/low/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 2.0345052083e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7778,6 +7838,7 @@
         ]
     },
     "azure/medium/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 8.056640625e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7787,6 +7848,7 @@
         ]
     },
     "azure/medium/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 8.056640625e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7796,6 +7858,7 @@
         ]
     },
     "azure/medium/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 7.9752604167e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7805,6 +7868,7 @@
         ]
     },
     "azure/high/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 3.173828125e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7814,6 +7878,7 @@
         ]
     },
     "azure/high/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 3.173828125e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7823,6 +7888,7 @@
         ]
     },
     "azure/high/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 3.1575520833e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7850,6 +7916,7 @@
         "supports_function_calling": true
     },
     "azure/o1": {
+        "deprecation_date": "2026-10-21",
         "cache_read_input_token_cost": 7.5e-06,
         "input_cost_per_token": 1.5e-05,
         "litellm_provider": "azure",
@@ -7944,6 +8011,7 @@
         "supports_vision": false
     },
     "azure/o3": {
+        "deprecation_date": "2026-10-21",
         "cache_read_input_token_cost": 5e-07,
         "input_cost_per_token": 2e-06,
         "litellm_provider": "azure",
@@ -8041,6 +8109,7 @@
         "supports_web_search": true
     },
     "azure/o3-mini": {
+        "deprecation_date": "2026-10-01",
         "cache_read_input_token_cost": 5.5e-07,
         "input_cost_per_token": 1.1e-06,
         "litellm_provider": "azure",
@@ -8071,6 +8140,7 @@
         "supports_vision": false
     },
     "azure/o3-pro": {
+        "deprecation_date": "2026-12-17",
         "input_cost_per_token": 2e-05,
         "input_cost_per_token_batches": 1e-05,
         "litellm_provider": "azure",
@@ -8132,6 +8202,7 @@
         "supports_vision": true
     },
     "azure/o4-mini": {
+        "deprecation_date": "2026-10-16",
         "cache_read_input_token_cost": 2.75e-07,
         "input_cost_per_token": 1.1e-06,
         "litellm_provider": "azure",
@@ -8580,6 +8651,7 @@
         "supports_vision": true
     },
     "azure/us/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -8649,6 +8721,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/us/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -8679,6 +8752,7 @@
         "supports_vision": true
     },
     "azure/us/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.8e-08,
         "input_cost_per_token": 2.75e-07,
         "litellm_provider": "azure",
@@ -8876,6 +8950,7 @@
         ]
     },
     "azure_ai/FW-DeepSeek-V3.2": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 3.1e-07,
         "input_cost_per_token": 6.2e-07,
         "litellm_provider": "azure_ai",
@@ -8906,6 +8981,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/FW-GLM-5": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 2.2e-07,
         "input_cost_per_token": 1.1e-06,
         "litellm_provider": "azure_ai",
@@ -8921,6 +8997,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/FW-GLM-5.1": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 2.86e-07,
         "input_cost_per_token": 1.54e-06,
         "litellm_provider": "azure_ai",
@@ -8987,6 +9064,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/FW-Kimi-K2.5": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 1.1e-07,
         "input_cost_per_token": 6.6e-07,
         "litellm_provider": "azure_ai",
@@ -9079,6 +9157,7 @@
         "supports_vision": true
     },
     "azure_ai/FW-MiniMax-M2.5": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 3.3e-08,
         "input_cost_per_token": 3.3e-07,
         "litellm_provider": "azure_ai",
@@ -9164,6 +9243,7 @@
         ]
     },
     "azure_ai/MAI-Image-2e": {
+        "deprecation_date": "2026-08-15",
         "input_cost_per_token": 5e-06,
         "litellm_provider": "azure_ai",
         "mode": "image_generation",
@@ -9175,6 +9255,7 @@
         ]
     },
     "azure_ai/Llama-3.2-11B-Vision-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 3.7e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9188,6 +9269,7 @@
         "supports_vision": true
     },
     "azure_ai/Llama-3.2-90B-Vision-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 2.04e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9249,6 +9331,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/Meta-Llama-3.1-405B-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 5.33e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9271,6 +9354,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/Meta-Llama-3.1-8B-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 3e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9452,6 +9536,7 @@
         "supports_reasoning": true
     },
     "azure_ai/mistral-document-ai-2505": {
+        "deprecation_date": "2026-07-20",
         "litellm_provider": "azure_ai",
         "ocr_cost_per_page": 0.003,
         "mode": "ocr",
@@ -9529,6 +9614,7 @@
         "output_cost_per_token": 0.0
     },
     "azure_ai/cohere-rerank-v3.5": {
+        "deprecation_date": "2026-05-14",
         "input_cost_per_query": 0.002,
         "input_cost_per_token": 0.0,
         "litellm_provider": "azure_ai",
@@ -9591,6 +9677,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-r1": {
+        "deprecation_date": "2026-08-13",
         "input_cost_per_token": 1.35e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9614,6 +9701,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v3-0324": {
+        "deprecation_date": "2026-07-13",
         "input_cost_per_token": 1.14e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9626,6 +9714,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v3.1": {
+        "deprecation_date": "2026-07-13",
         "input_cost_per_token": 1.23e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9639,6 +9728,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v4-pro": {
+        "deprecation_date": "2028-02-20",
         "input_cost_per_token": 1.74e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 1000000,
@@ -9652,6 +9742,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v4-flash": {
+        "deprecation_date": "2028-02-20",
         "input_cost_per_token": 1.9e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 1000000,
@@ -9683,6 +9774,7 @@
         "supports_embedding_image_input": true
     },
     "azure_ai/global/grok-3": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 3e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9697,6 +9789,7 @@
         "supports_web_search": true
     },
     "azure_ai/global/grok-3-mini": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9712,6 +9805,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-3": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 3e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9726,6 +9820,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-3-mini": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9773,6 +9868,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-4-fast-non-reasoning": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2e-07,
         "output_cost_per_token": 5e-07,
         "litellm_provider": "azure_ai",
@@ -9786,6 +9882,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-4-fast-reasoning": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2e-07,
         "output_cost_per_token": 5e-07,
         "litellm_provider": "azure_ai",
@@ -9863,6 +9960,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/kimi-k2.5": {
+        "deprecation_date": "2027-01-26",
         "input_cost_per_token": 6e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 262144,
@@ -9877,6 +9975,7 @@
         "supports_vision": true
     },
     "azure_ai/kimi-k2.6": {
+        "deprecation_date": "2027-04-16",
         "input_cost_per_token": 9.5e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 262144,
@@ -10004,6 +10103,7 @@
         "supports_vision": true
     },
     "babbage-002": {
+        "deprecation_date": "2026-09-28",
         "input_cost_per_token": 4e-07,
         "litellm_provider": "text-completion-openai",
         "max_input_tokens": 16384,
@@ -12014,6 +12114,7 @@
         ]
     },
     "claude-haiku-4-5-20251001": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -12037,6 +12138,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-haiku-4-5": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -12185,6 +12287,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-4-5": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05,
@@ -12218,6 +12321,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-4-5-20250929": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05,
@@ -12252,6 +12356,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-5": {
+        "deprecation_date": "2027-06-30",
         "cache_creation_input_token_cost": 2.5e-06,
         "cache_creation_input_token_cost_above_1hr": 4e-06,
         "cache_read_input_token_cost": 2e-07,
@@ -12288,6 +12393,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-4-6": {
+        "deprecation_date": "2027-02-17",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -12434,6 +12540,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-opus-4-5-20251101": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12463,6 +12570,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-5": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12492,6 +12600,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-6": {
+        "deprecation_date": "2027-02-05",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12528,6 +12637,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-6-20260205": {
+        "deprecation_date": "2027-02-05",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12564,6 +12674,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-7": {
+        "deprecation_date": "2027-04-16",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12602,6 +12713,7 @@
         "prompt_cache_min_tokens": 2048
     },
     "claude-opus-4-7-20260416": {
+        "deprecation_date": "2027-04-16",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12640,6 +12752,7 @@
         "prompt_cache_min_tokens": 2048
     },
     "claude-fable-5": {
+        "deprecation_date": "2027-06-09",
         "cache_creation_input_token_cost": 1.25e-05,
         "cache_creation_input_token_cost_above_1hr": 2e-05,
         "cache_read_input_token_cost": 1e-06,
@@ -12675,6 +12788,7 @@
         "prompt_cache_min_tokens": 512
     },
     "claude-opus-5": {
+        "deprecation_date": "2027-07-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12713,6 +12827,7 @@
         "prompt_cache_min_tokens": 512
     },
     "claude-opus-4-8": {
+        "deprecation_date": "2027-05-28",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -15042,6 +15157,7 @@
         "mode": "search"
     },
     "davinci-002": {
+        "deprecation_date": "2026-09-28",
         "input_cost_per_token": 2e-06,
         "litellm_provider": "text-completion-openai",
         "max_input_tokens": 16384,
@@ -16676,6 +16792,14 @@
             "notes": "APISerpent deep search (/api/search), multi-engine (Google, Bing, Yahoo, DuckDuckGo). Pricing: $0.60/1k searches."
         }
     },
+    "agentcore/search": {
+        "input_cost_per_query": 0.0,
+        "litellm_provider": "agentcore",
+        "mode": "search",
+        "metadata": {
+            "notes": "Web Search on Amazon Bedrock AgentCore, billed by AWS on the gateway"
+        }
+    },
     "tinyfish/search": {
         "input_cost_per_query": 0.0,
         "litellm_provider": "tinyfish",
@@ -18594,6 +18718,7 @@
         }
     },
     "gemini-2.5-flash": {
+        "deprecation_date": "2026-10-20",
         "cache_read_input_token_cost": 3e-08,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 3e-07,
@@ -18639,6 +18764,7 @@
         "supports_image_size": false
     },
     "gemini-2.5-flash-image": {
+        "deprecation_date": "2026-10-02",
         "cache_read_input_token_cost": 3e-08,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 3e-07,
@@ -18683,6 +18809,7 @@
         "supports_image_size": false
     },
     "gemini-3-pro-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.0011,
         "input_cost_per_token": 2e-06,
         "input_cost_per_token_batches": 1e-06,
@@ -18763,6 +18890,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-flash-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.00056,
         "input_cost_per_token": 5e-07,
         "litellm_provider": "vertex_ai-language-models",
@@ -18887,6 +19015,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-flash-lite": {
+        "deprecation_date": "2027-05-07",
         "cache_read_input_token_cost": 2.5e-08,
         "cache_read_input_token_cost_flex": 1.25e-08,
         "cache_read_input_token_cost_priority": 4.5e-08,
@@ -18943,6 +19072,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.5-flash-lite": {
+        "deprecation_date": "2027-07-21",
         "cache_read_input_token_cost": 3e-08,
         "cache_read_input_token_cost_flex": 2e-08,
         "cache_read_input_token_cost_priority": 5e-08,
@@ -19032,6 +19162,7 @@
         "supports_web_search": true
     },
     "gemini-2.5-flash-lite": {
+        "deprecation_date": "2026-10-20",
         "cache_read_input_token_cost": 1e-08,
         "input_cost_per_audio_token": 3e-07,
         "input_cost_per_token": 1e-07,
@@ -19303,6 +19434,7 @@
         "supports_image_size": false
     },
     "gemini-2.5-pro": {
+        "deprecation_date": "2026-10-20",
         "cache_read_input_token_cost": 1.25e-07,
         "cache_read_input_token_cost_above_200k_tokens": 2.5e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19403,6 +19535,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-pro-preview": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19460,6 +19593,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-pro-preview-customtools": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19614,6 +19748,8 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.5-flash": {
+        "prompt_cache_min_tokens": 4096,
+        "deprecation_date": "2027-05-19",
         "cache_read_input_token_cost": 1.5e-07,
         "input_cost_per_token": 1.5e-06,
         "input_cost_per_audio_token": 1e-06,
@@ -19624,6 +19760,7 @@
         "mode": "chat",
         "output_cost_per_reasoning_token": 9e-06,
         "output_cost_per_token": 9e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -19665,6 +19802,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.6-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -19679,6 +19817,7 @@
         "output_cost_per_token": 3.75e-06,
         "output_cost_per_token_batches": 1.875e-06,
         "output_cost_per_token_flex": 1.875e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -19719,6 +19858,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.7-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -19733,6 +19873,7 @@
         "output_cost_per_token": 3.75e-06,
         "output_cost_per_token_batches": 1.875e-06,
         "output_cost_per_token_flex": 1.875e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -19773,6 +19914,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.1-pro-preview": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19830,6 +19972,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.1-pro-preview-customtools": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -20050,6 +20193,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-robotics-er-1.6-preview": {
+        "deprecation_date": "2026-08-31",
         "input_cost_per_audio_token": 2e-06,
         "input_cost_per_token": 1e-06,
         "litellm_provider": "gemini",
@@ -20120,6 +20264,7 @@
         "supports_vision": true
     },
     "gemini-embedding-001": {
+        "deprecation_date": "2028-05-20",
         "input_cost_per_token": 1.5e-07,
         "litellm_provider": "vertex_ai-embedding-models",
         "max_input_tokens": 2048,
@@ -20562,8 +20707,8 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.1-flash-image": {
-        "input_cost_per_token": 2.5e-07,
-        "input_cost_per_token_batches": 1.25e-07,
+        "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "litellm_provider": "gemini",
         "max_input_tokens": 65536,
         "max_output_tokens": 32768,
@@ -20571,8 +20716,8 @@
         "mode": "image_generation",
         "output_cost_per_image": 0.045,
         "output_cost_per_image_token": 6e-05,
-        "output_cost_per_token": 1.5e-06,
-        "output_cost_per_token_batches": 7.5e-07,
+        "output_cost_per_token": 3e-06,
+        "output_cost_per_token_batches": 1.5e-06,
         "rpm": 1000,
         "tpm": 4000000,
         "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-3.1-flash-image",
@@ -20605,8 +20750,8 @@
     },
     "gemini/gemini-3.1-flash-image-preview": {
         "deprecation_date": "2026-06-25",
-        "input_cost_per_token": 2.5e-07,
-        "input_cost_per_token_batches": 1.25e-07,
+        "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "litellm_provider": "gemini",
         "max_input_tokens": 65536,
         "max_output_tokens": 32768,
@@ -20614,8 +20759,8 @@
         "mode": "image_generation",
         "output_cost_per_image": 0.045,
         "output_cost_per_image_token": 6e-05,
-        "output_cost_per_token": 1.5e-06,
-        "output_cost_per_token_batches": 7.5e-07,
+        "output_cost_per_token": 3e-06,
+        "output_cost_per_token_batches": 1.5e-06,
         "rpm": 1000,
         "tpm": 4000000,
         "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-3.1-flash-image-preview",
@@ -21337,6 +21482,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.5-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 1.5e-07,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 1.5e-06,
@@ -21391,6 +21537,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.6-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -21448,6 +21595,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.7-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -21538,6 +21686,7 @@
         "tpm": 800000
     },
     "gemini/gemini-3.1-pro-preview": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "input_cost_per_token": 2e-06,
@@ -21595,6 +21744,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.1-pro-preview-customtools": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "input_cost_per_token": 2e-06,
@@ -21733,6 +21883,8 @@
         "supports_vision": true
     },
     "gemini-3.5-flash": {
+        "prompt_cache_min_tokens": 4096,
+        "deprecation_date": "2027-05-19",
         "cache_read_input_token_cost": 1.5e-07,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 1.5e-06,
@@ -21785,6 +21937,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.6-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -21840,6 +21993,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.7-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -23245,6 +23399,7 @@
         "supports_tool_choice": true
     },
     "gpt-3.5-turbo-instruct": {
+        "deprecation_date": "2026-09-28",
         "input_cost_per_token": 1.5e-06,
         "litellm_provider": "text-completion-openai",
         "max_input_tokens": 8192,
@@ -24376,6 +24531,7 @@
         "supports_pdf_input": true
     },
     "low/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.009,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24387,6 +24543,7 @@
         "supports_pdf_input": true
     },
     "low/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24398,6 +24555,7 @@
         "supports_pdf_input": true
     },
     "low/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24409,6 +24567,7 @@
         "supports_pdf_input": true
     },
     "medium/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.034,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24420,6 +24579,7 @@
         "supports_pdf_input": true
     },
     "medium/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.05,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24431,6 +24591,7 @@
         "supports_pdf_input": true
     },
     "medium/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.05,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24442,6 +24603,7 @@
         "supports_pdf_input": true
     },
     "high/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.133,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24453,6 +24615,7 @@
         "supports_pdf_input": true
     },
     "high/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.2,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24464,6 +24627,7 @@
         "supports_pdf_input": true
     },
     "high/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.2,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24475,6 +24639,7 @@
         "supports_pdf_input": true
     },
     "standard/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.009,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24486,6 +24651,7 @@
         "supports_pdf_input": true
     },
     "standard/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24497,6 +24663,7 @@
         "supports_pdf_input": true
     },
     "standard/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24508,6 +24675,7 @@
         "supports_pdf_input": true
     },
     "1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.009,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24519,6 +24687,7 @@
         "supports_pdf_input": true
     },
     "1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24530,6 +24699,7 @@
         "supports_pdf_input": true
     },
     "1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -27443,18 +27613,21 @@
         "output_cost_per_second": 0.0
     },
     "hd/1024-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 7.629e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "hd/1024-x-1792/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 6.539e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "hd/1792-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 6.539e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -27501,6 +27674,7 @@
         "max_output_tokens": 8192
     },
     "high/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.167,
         "input_cost_per_pixel": 1.59263611e-07,
         "litellm_provider": "openai",
@@ -27511,6 +27685,7 @@
         ]
     },
     "high/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.25,
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "openai",
@@ -27521,6 +27696,7 @@
         ]
     },
     "high/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.25,
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "openai",
@@ -28308,6 +28484,7 @@
         "supports_tool_choice": true
     },
     "low/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.011,
         "input_cost_per_pixel": 1.0490417e-08,
         "litellm_provider": "openai",
@@ -28318,6 +28495,7 @@
         ]
     },
     "low/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.016,
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "openai",
@@ -28328,6 +28506,7 @@
         ]
     },
     "low/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.016,
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "openai",
@@ -28352,6 +28531,7 @@
         "output_cost_per_image": 0.072
     },
     "medium/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.042,
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "openai",
@@ -28362,6 +28542,7 @@
         ]
     },
     "medium/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.063,
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "openai",
@@ -28372,6 +28553,7 @@
         ]
     },
     "medium/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.063,
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "openai",
@@ -28382,6 +28564,7 @@
         ]
     },
     "low/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.005,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28390,6 +28573,7 @@
         ]
     },
     "low/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.006,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28398,6 +28582,7 @@
         ]
     },
     "low/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.006,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28406,6 +28591,7 @@
         ]
     },
     "medium/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.011,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28414,6 +28600,7 @@
         ]
     },
     "medium/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.015,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28422,6 +28609,7 @@
         ]
     },
     "medium/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.015,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -30315,6 +30503,7 @@
         ]
     },
     "multimodalembedding@001": {
+        "deprecation_date": "2027-04-01",
         "input_cost_per_character": 2e-07,
         "input_cost_per_image": 0.0001,
         "input_cost_per_token": 8e-07,
@@ -36013,18 +36202,21 @@
         "output_cost_per_image": 0.14
     },
     "standard/1024-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 3.81469e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "standard/1024-x-1792/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 4.359e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "standard/1792-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 4.359e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -36088,6 +36280,7 @@
         "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/learn/models"
     },
     "text-embedding-005": {
+        "deprecation_date": "2027-04-01",
         "input_cost_per_character": 2.5e-08,
         "input_cost_per_token": 1e-07,
         "litellm_provider": "vertex_ai-embedding-models",
@@ -36161,6 +36354,7 @@
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing"
     },
     "text-moderation-007": {
+        "deprecation_date": "2025-10-27",
         "input_cost_per_token": 0.0,
         "litellm_provider": "openai",
         "max_input_tokens": 32768,
@@ -36170,6 +36364,7 @@
         "output_cost_per_token": 0.0
     },
     "text-moderation-latest": {
+        "deprecation_date": "2025-10-27",
         "input_cost_per_token": 0.0,
         "litellm_provider": "openai",
         "max_input_tokens": 32768,
@@ -36179,6 +36374,7 @@
         "output_cost_per_token": 0.0
     },
     "text-moderation-stable": {
+        "deprecation_date": "2025-10-27",
         "input_cost_per_token": 0.0,
         "litellm_provider": "openai",
         "max_input_tokens": 32768,
@@ -36188,6 +36384,7 @@
         "output_cost_per_token": 0.0
     },
     "text-multilingual-embedding-002": {
+        "deprecation_date": "2027-04-01",
         "input_cost_per_character": 2.5e-08,
         "input_cost_per_token": 1e-07,
         "litellm_provider": "vertex_ai-embedding-models",
@@ -38675,6 +38872,7 @@
         "supports_tool_choice": true
     },
     "vertex_ai/claude-haiku-4-5": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -38685,6 +38883,7 @@
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5",
         "supports_assistant_prefill": true,
         "supports_function_calling": true,
@@ -38698,6 +38897,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-haiku-4-5@20251001": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -38708,6 +38908,7 @@
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5",
         "supports_assistant_prefill": true,
         "supports_function_calling": true,
@@ -38850,6 +39051,7 @@
         "supports_vision": true
     },
     "vertex_ai/claude-opus-4": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -38877,6 +39079,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-opus-4-1": {
+        "deprecation_date": "2026-08-05",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -38895,6 +39098,7 @@
         "supports_vision": true
     },
     "vertex_ai/claude-opus-4-1@20250805": {
+        "deprecation_date": "2026-08-05",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -38913,6 +39117,7 @@
         "supports_vision": true
     },
     "vertex_ai/claude-opus-4-5": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -38923,6 +39128,7 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "search_context_cost_per_query": {
             "search_context_size_high": 0.01,
             "search_context_size_low": 0.01,
@@ -38941,6 +39147,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-5@20251101": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -38951,6 +39158,7 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "search_context_cost_per_query": {
             "search_context_size_high": 0.01,
             "search_context_size_low": 0.01,
@@ -38970,6 +39178,8 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-6": {
+        "deprecation_date": "2027-02-05",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39000,6 +39210,8 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-6@default": {
+        "deprecation_date": "2027-02-05",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39030,6 +39242,8 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-7": {
+        "deprecation_date": "2027-04-16",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39061,6 +39275,8 @@
         "prompt_cache_min_tokens": 2048
     },
     "vertex_ai/claude-opus-4-7@default": {
+        "deprecation_date": "2027-04-16",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39092,6 +39308,8 @@
         "prompt_cache_min_tokens": 2048
     },
     "vertex_ai/claude-fable-5": {
+        "deprecation_date": "2027-06-08",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 1.25e-05,
         "cache_creation_input_token_cost_above_1hr": 2e-05,
@@ -39123,6 +39341,8 @@
         "supports_max_reasoning_effort": true
     },
     "vertex_ai/claude-fable-5@default": {
+        "deprecation_date": "2027-06-08",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 1.25e-05,
         "cache_creation_input_token_cost_above_1hr": 2e-05,
@@ -39154,6 +39374,8 @@
         "supports_max_reasoning_effort": true
     },
     "vertex_ai/claude-opus-5": {
+        "deprecation_date": "2027-01-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39186,6 +39408,8 @@
         "prompt_cache_min_tokens": 512
     },
     "vertex_ai/claude-opus-5@default": {
+        "deprecation_date": "2027-01-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39218,6 +39442,8 @@
         "prompt_cache_min_tokens": 512
     },
     "vertex_ai/claude-opus-4-8": {
+        "deprecation_date": "2027-05-28",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39250,6 +39476,8 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-opus-4-8@default": {
+        "deprecation_date": "2027-05-28",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39282,6 +39510,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-5": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39298,6 +39527,7 @@
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
         "output_cost_per_token_batches": 7.5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -39310,6 +39540,8 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-5": {
+        "deprecation_date": "2026-12-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 2.5e-06,
         "cache_creation_input_token_cost_above_1hr": 4e-06,
@@ -39342,6 +39574,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-6": {
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
@@ -39372,6 +39605,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-5@20250929": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39388,6 +39622,7 @@
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
         "output_cost_per_token_batches": 7.5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -39401,6 +39636,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-opus-4@20250514": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -39428,6 +39664,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39459,6 +39696,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4@20250514": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39623,6 +39861,7 @@
         "supports_tool_choice": true
     },
     "vertex_ai/gemini-2.5-flash-image": {
+        "deprecation_date": "2026-10-02",
         "cache_read_input_token_cost": 3e-08,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 3e-07,
@@ -39668,6 +39907,7 @@
         "supports_image_size": false
     },
     "vertex_ai/gemini-3-pro-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.0011,
         "input_cost_per_token": 2e-06,
         "input_cost_per_token_batches": 1e-06,
@@ -39700,6 +39940,7 @@
         "source": "https://docs.cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/3-pro-image"
     },
     "vertex_ai/gemini-3.1-flash-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.00056,
         "input_cost_per_token": 5e-07,
         "litellm_provider": "vertex_ai-language-models",
@@ -39776,6 +40017,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.1-flash-lite": {
+        "deprecation_date": "2027-05-07",
         "cache_read_input_token_cost": 2.5e-08,
         "cache_read_input_token_cost_flex": 1.25e-08,
         "cache_read_input_token_cost_priority": 4.5e-08,
@@ -39794,6 +40036,7 @@
         "output_cost_per_token_batches": 7.5e-07,
         "output_cost_per_token_flex": 7.5e-07,
         "output_cost_per_token_priority": 2.7e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#gemini-models",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -39832,6 +40075,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.5-flash-lite": {
+        "deprecation_date": "2027-07-21",
         "cache_read_input_token_cost": 3e-08,
         "cache_read_input_token_cost_flex": 2e-08,
         "cache_read_input_token_cost_priority": 5e-08,
@@ -39849,6 +40093,7 @@
         "output_cost_per_token_batches": 1.25e-06,
         "output_cost_per_token_flex": 1.25e-06,
         "output_cost_per_token_priority": 4.5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#gemini-models",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -40549,6 +40794,7 @@
         "supports_tool_choice": true
     },
     "vertex_ai/veo-2.0-generate-001": {
+        "deprecation_date": "2026-06-30",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40563,6 +40809,7 @@
         ]
     },
     "vertex_ai/veo-3.0-fast-generate-001": {
+        "deprecation_date": "2026-06-30",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40577,6 +40824,7 @@
         ]
     },
     "vertex_ai/veo-3.0-generate-001": {
+        "deprecation_date": "2026-06-30",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40619,6 +40867,7 @@
         ]
     },
     "vertex_ai/veo-3.1-generate-001": {
+        "deprecation_date": "2026-11-17",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40633,6 +40882,7 @@
         ]
     },
     "vertex_ai/veo-3.1-fast-generate-001": {
+        "deprecation_date": "2026-11-17",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -47014,6 +47264,8 @@
         }
     },
     "vertex_ai/claude-sonnet-5@default": {
+        "deprecation_date": "2026-12-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 2.5e-06,
         "cache_creation_input_token_cost_above_1hr": 4e-06,
@@ -47046,6 +47298,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-6@default": {
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
@@ -47975,15 +48228,15 @@
     },
     "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,
+        "cache_read_input_token_cost": 1.4e-08,
+        "input_cost_per_token": 4.4e-07,
+        "input_cost_per_token_cache_hit": 1.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 2.8e-07,
+        "output_cost_per_token": 1.32e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
@@ -48001,15 +48254,15 @@
     },
     "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,
+        "cache_read_input_token_cost": 4.4e-08,
+        "input_cost_per_token": 1.32e-06,
+        "input_cost_per_token_cache_hit": 4.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 8.7e-07,
+        "output_cost_per_token": 3.96e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
@@ -48027,15 +48280,15 @@
     },
     "deepseek/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,
+        "cache_read_input_token_cost": 1.4e-08,
+        "input_cost_per_token": 4.4e-07,
+        "input_cost_per_token_cache_hit": 1.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 2.8e-07,
+        "output_cost_per_token": 1.32e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
@@ -48053,15 +48306,15 @@
     },
     "deepseek/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,
+        "cache_read_input_token_cost": 4.4e-08,
+        "input_cost_per_token": 1.32e-06,
+        "input_cost_per_token_cache_hit": 4.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 8.7e-07,
+        "output_cost_per_token": 3.96e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
diff --git a/litellm/proxy/_experimental/mcp_server/exceptions.py b/litellm/proxy/_experimental/mcp_server/exceptions.py
index 8c704c0fe93..a1b3b167a4a 100644
--- a/litellm/proxy/_experimental/mcp_server/exceptions.py
+++ b/litellm/proxy/_experimental/mcp_server/exceptions.py
@@ -75,6 +75,24 @@ class MCPUpstreamAuthError(Exception):
         )
 
 
+class MCPOpenApiUpstreamError(Exception):
+    """An OpenAPI-backed MCP tool's upstream answered with a non-2xx that is not a 401.
+
+    Carries the status only. The upstream's response body is deliberately dropped rather than served
+    as tool content: it crosses a trust boundary and may hold prose, urls, or an error document that
+    reads as data, which is how these failures came to be reported as successful tool output. This
+    matches ``outcome_wire_value``'s contract for listing faults, category and status and nothing
+    else. A 401 is raised as ``MCPUpstreamAuthError`` instead, so the caller learns to
+    re-authenticate; every other status stays here, mirroring the regular MCP path where a 403
+    deliberately does not produce a challenge.
+    """
+
+    def __init__(self, status_code: int, server_name: str) -> None:
+        self.status_code = status_code
+        self.server_name = server_name
+        super().__init__(f"upstream returned HTTP {status_code}")
+
+
 class MCPToolResultError(Exception):
     """An MCP tool call completed with ``isError=True`` in its result.
 
diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index 65855df89f6..26a6f8d1251 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -2330,7 +2330,15 @@ class MCPServerManager:
                     input_schema = build_input_schema(resolved_operation)
 
                     # Create tool function with headers using imported function
-                    tool_func = create_tool_function(path, method, resolved_operation, base_url, headers=headers)
+                    tool_func = create_tool_function(
+                        path,
+                        method,
+                        resolved_operation,
+                        base_url,
+                        headers=headers,
+                        server_label=server.name or server.server_name or server.alias or server.server_id,
+                        relays_upstream_auth=server.is_client_forwarded_token,
+                    )
                     tool_func.__name__ = prefixed_tool_name
                     tool_func.__doc__ = description
 
@@ -4979,6 +4987,12 @@ class MCPServerManager:
 
             return result
 
+        except MCPUpstreamAuthError:
+            # The caller must re-authenticate upstream, so this keeps its type all the way to the
+            # renderers: the streamable path turns it into an isError result naming the status, and
+            # the REST path relays a real 401 with the upstream's WWW-Authenticate. Flattening it
+            # into the generic message below would lose both.
+            raise
         except Exception as e:
             error_msg = f"Error calling OpenAPI tool {tool_name}: {e}"
             verbose_logger.error(error_msg)
diff --git a/litellm/proxy/_experimental/mcp_server/openapi_to_mcp_generator.py b/litellm/proxy/_experimental/mcp_server/openapi_to_mcp_generator.py
index eb78aaeca0b..083a98cdd36 100644
--- a/litellm/proxy/_experimental/mcp_server/openapi_to_mcp_generator.py
+++ b/litellm/proxy/_experimental/mcp_server/openapi_to_mcp_generator.py
@@ -15,6 +15,12 @@ from urllib.parse import quote
 import httpx
 from typing_extensions import ReadOnly, Required
 
+from litellm.llms.custom_httpx.http_handler import MaskedHTTPStatusError
+from litellm.proxy._experimental.mcp_server.exceptions import (
+    MCPOpenApiUpstreamError,
+    MCPUpstreamAuthError,
+)
+
 # Tool names emitted from OpenAPI specs must work across all major LLM providers.
 # OpenAI/Anthropic/Bedrock all enforce a character class roughly equivalent to
 # ^[a-zA-Z0-9_-]+$ on tool names. Many specs (notably GitHub's REST API) use
@@ -392,12 +398,40 @@ def _merge_openapi_tool_request_headers(
     return effective_headers
 
 
+def _raise_for_upstream_failure(
+    response: httpx.Response,
+    upstream: str,
+    relays_upstream_auth: bool,
+) -> None:
+    """Turn a non-2xx upstream response into the right typed failure, or return for a 2xx.
+
+    Both call sites feed this: ``get`` hands back the response for a 4xx, while post/put/patch/delete
+    raise ``MaskedHTTPStatusError`` from inside the HTTP handler, so without one classifier the
+    non-GET tools would keep serving an error body as tool output.
+
+    Only the client-forwarded modes carry the caller's own upstream token, so only they can act on a
+    401 by re-authenticating; ``_call_regular_mcp_tool`` gates its re-auth signal the same way. Every
+    other status carries the code alone, never the upstream's body, which crosses a trust boundary.
+    """
+    if response.status_code < 400:
+        return
+    if response.status_code == 401 and relays_upstream_auth:
+        raise MCPUpstreamAuthError(
+            status_code=response.status_code,
+            www_authenticate=response.headers.get("www-authenticate"),
+            server_name=upstream,
+        )
+    raise MCPOpenApiUpstreamError(response.status_code, upstream)
+
+
 def create_tool_function(
     path: str,
     method: str,
     operation: _OpenAPIOperation,
     base_url: str,
     headers: dict[str, str] | None = None,
+    server_label: str | None = None,
+    relays_upstream_auth: bool = False,
 ):
     """Create a tool function for an OpenAPI operation.
 
@@ -477,20 +511,26 @@ def create_tool_function(
                     json_body = {"data": body_value}
 
         client: Final = get_async_httpx_client(llm_provider=httpxSpecialProvider.MCP)
+        upstream: Final = server_label or f"{original_method.upper()} {path}"
 
-        if original_method == "get":
-            response = await client.get(url, params=params, headers=effective_headers)
-        elif original_method == "post":
-            response = await client.post(url, params=params, json=json_body, headers=effective_headers)
-        elif original_method == "put":
-            response = await client.put(url, params=params, json=json_body, headers=effective_headers)
-        elif original_method == "delete":
-            response = await client.delete(url, params=params, headers=effective_headers)
-        elif original_method == "patch":
-            response = await client.patch(url, params=params, json=json_body, headers=effective_headers)
-        else:
-            return f"Unsupported HTTP method: {original_method}"
+        try:
+            if original_method == "get":
+                response = await client.get(url, params=params, headers=effective_headers)
+            elif original_method == "post":
+                response = await client.post(url, params=params, json=json_body, headers=effective_headers)
+            elif original_method == "put":
+                response = await client.put(url, params=params, json=json_body, headers=effective_headers)
+            elif original_method == "delete":
+                response = await client.delete(url, params=params, headers=effective_headers)
+            elif original_method == "patch":
+                response = await client.patch(url, params=params, json=json_body, headers=effective_headers)
+            else:
+                return f"Unsupported HTTP method: {original_method}"
+        except MaskedHTTPStatusError as e:
+            _raise_for_upstream_failure(e.response, upstream, relays_upstream_auth)
+            raise
 
+        _raise_for_upstream_failure(response, upstream, relays_upstream_auth)
         return response.text
 
     return tool_function
diff --git a/litellm/proxy/_experimental/mcp_server/server.py b/litellm/proxy/_experimental/mcp_server/server.py
index 8d69d84e492..0dc85c0318c 100644
--- a/litellm/proxy/_experimental/mcp_server/server.py
+++ b/litellm/proxy/_experimental/mcp_server/server.py
@@ -407,8 +407,6 @@ if MCP_AVAILABLE:
         StreamableHTTPSessionManager = None
     from mcp.types import (
         CallToolResult,
-        EmbeddedResource,
-        ImageContent,
         ListToolsResult,
         Prompt,
         TextContent,
@@ -2861,12 +2859,11 @@ if MCP_AVAILABLE:
             _extra_token: Final = _request_extra_headers.set(forwarded_headers)
             _resolved_token: Final = _request_resolved_auth_headers.set(resolved_auth_headers)
             try:
-                local_content = await _handle_local_mcp_tool(name, arguments)
+                response = await _handle_local_mcp_tool(name, arguments)
             finally:
                 _request_auth_header.reset(_auth_token)
                 _request_extra_headers.reset(_extra_token)
                 _request_resolved_auth_headers.reset(_resolved_token)
-            response = CallToolResult(content=local_content, isError=False)
 
         # Try managed MCP server tool (the name is bare; the prefix boundary was
         # already resolved above against this server's registered prefixes)
@@ -2940,8 +2937,7 @@ if MCP_AVAILABLE:
                 if "arguments" in hook_result:
                     arguments = hook_result["arguments"]  # pyright: ignore[reportAny]  # hook returns untyped args
 
-            local_content = await _handle_local_mcp_tool(original_tool_name, arguments)
-            response = CallToolResult(content=local_content, isError=False)
+            response = await _handle_local_mcp_tool(original_tool_name, arguments)
 
         return await _run_post_mcp_call_guardrails(
             result=response,
@@ -3319,11 +3315,18 @@ if MCP_AVAILABLE:
         verbose_logger.debug("CALL TOOL RESULT: %s", call_tool_result)
         return call_tool_result
 
-    async def _handle_local_mcp_tool(
-        name: str, arguments: dict[str, object]
-    ) -> list[TextContent | ImageContent | EmbeddedResource]:
-        """
-        Handle tool execution for local registry tools
+    async def _handle_local_mcp_tool(name: str, arguments: dict[str, object]) -> CallToolResult:
+        """Execute a local-registry tool and report whether it succeeded.
+
+        Returns the result rather than bare content because the verdict is part of it: the content
+        alone cannot say whether the handler failed, so callers used to stamp isError=False on every
+        outcome and an upstream rejection was served as tool output.
+
+        A failure is reported as ``isError=True`` here rather than raised, because the REST surface
+        turns an unrecognized exception into a 500 and an upstream 403 or 429 is not a gateway crash.
+        ``MCPUpstreamAuthError`` is the exception: it propagates so the caller is told to
+        re-authenticate, which both renderers already know how to say.
+
         Note: Local tools don't use prefixes, so we use the original name
         """
         import inspect
@@ -3333,15 +3336,16 @@ if MCP_AVAILABLE:
             raise HTTPException(status_code=404, detail=f"Tool '{name}' not found")
 
         try:
-            # Check if handler is async or sync
             if inspect.iscoroutinefunction(tool.handler):
                 result = await tool.handler(**arguments)
             else:
                 result = tool.handler(**arguments)
-            return [TextContent(text=str(result), type="text")]
+        except MCPUpstreamAuthError:
+            raise
         except Exception as e:
             verbose_logger.exception("Error executing local tool %s: %s", name, e)
-            return [TextContent(text=f"Error: {e}", type="text")]
+            return CallToolResult(content=[TextContent(text=f"Error: {e}", type="text")], isError=True)
+        return CallToolResult(content=[TextContent(text=str(result), type="text")], isError=False)
 
     def _get_mcp_servers_in_path(path: str) -> list[str] | None:
         """
diff --git a/litellm/proxy/_types.py b/litellm/proxy/_types.py
index 8e57327b31b..6f352b73290 100644
--- a/litellm/proxy/_types.py
+++ b/litellm/proxy/_types.py
@@ -2439,6 +2439,10 @@ class ConfigGeneralSettings(LiteLLMPydanticObjectBase):
         None,
         description="max request size in MB, if a request is larger than this size it will be rejected",
     )
+    max_batch_file_size_mb: int | None = Field(
+        None,
+        description="max batch input file size in MB for /v1/files uploads with purpose=batch, if a file is larger than this size it will be rejected before being forwarded to the provider",
+    )
     max_response_size_mb: int | None = Field(
         None,
         description="max response size in MB, if a response is larger than this size it will be rejected",
diff --git a/litellm/proxy/client/cli/README.md b/litellm/proxy/client/cli/README.md
index 72ed67728d8..9fe52b7a27d 100644
--- a/litellm/proxy/client/cli/README.md
+++ b/litellm/proxy/client/cli/README.md
@@ -521,6 +521,20 @@ This is a one-time file patch and restore, not a live traffic interceptor. A Cla
 
 Cursor is not supported: it has no equivalent file-based config to hot-patch this way, since its model routing lives in its own app storage and is configured through its GUI.
 
+#### Making It Permanent at Login
+
+`lite up` holds the patch only for as long as it runs. To wire Claude Code up once and leave it that way, pass `--config-claude` to `lite login`:
+
+```bash
+lite --base-url https://your-proxy.example.com login --config-claude
+```
+
+It writes the same two settings `lite up` does, `env.ANTHROPIC_BASE_URL` and `apiKeyHelper`, but persistently: there is no backup, nothing to restore, and no foreground process to keep alive. Every other key in `~/.claude/settings.json` is preserved, the file is created if it does not exist, and it is written atomically with owner-only permissions. Plain `lite login` is unchanged; nothing happens to your Claude Code config unless you pass the flag.
+
+Because the credential is reached through `apiKeyHelper` rather than copied into the file, a later `lite login` refreshes it with no further action: Claude Code re-runs the helper on every request and picks up whatever token the most recent login stored. Nothing secret is written to `settings.json`.
+
+Run it again to point Claude Code at a different proxy; the base URL and the helper are both rewritten. `lite up` and `--config-claude` manage the same file, so the flag refuses to run while a `lite up` session holds a backup, and tells you to run `lite down` first, rather than writing settings that `lite up` would silently revert when it stops.
+
 ### QA Complexity-Based Auto-Routing Against Your Real Proxy
 
 `lite autoroute` lets you try LiteLLM's complexity-based auto-routing -- picking a cheaper or more expensive model depending on how complex a prompt looks -- against models your key already has access to on your real, running proxy, without editing that proxy's `config.yaml` and without any real request ever bypassing it. It builds a second, throwaway proxy locally that forwards every request back to your real proxy, and points Claude Code at that local proxy for the duration of the session.
diff --git a/litellm/proxy/client/cli/commands/auth.py b/litellm/proxy/client/cli/commands/auth.py
index 1cac515f9f2..0a0bcf80ee5 100644
--- a/litellm/proxy/client/cli/commands/auth.py
+++ b/litellm/proxy/client/cli/commands/auth.py
@@ -16,6 +16,12 @@ from typing_extensions import NotRequired, TypedDict
 from litellm.constants import CLI_JWT_EXPIRATION_HOURS
 from litellm.litellm_core_utils.cli_token_utils import is_cli_token_fresh
 
+from .claude_settings import (
+    CLAUDE_SETTINGS_PATH,
+    SETTINGS_FILE_OWNERS,
+    ClaudeSettingsError,
+    write_claude_settings,
+)
 from .private_json import write_private_json
 
 
@@ -629,9 +635,28 @@ def _render_and_prompt_for_team_selection(teams: list[CliTeam]) -> str | None:
             return None
 
 
+def _configure_claude_code(base_url: str) -> None:
+    """Point Claude Code at base_url by patching ~/.claude/settings.json."""
+    try:
+        write_claude_settings(base_url, CLAUDE_SETTINGS_PATH, SETTINGS_FILE_OWNERS)
+    except ClaudeSettingsError as e:
+        raise click.ClickException(f"Logged in, but could not configure Claude Code: {e}")
+    click.echo(f"\nConfigured Claude Code: {CLAUDE_SETTINGS_PATH} now routes through {base_url.rstrip('/')}.")
+    click.echo("Your other Claude Code settings were left untouched. Restart Claude Code to pick this up.")
+
+
 @click.command(name="login")
+@click.option(
+    "--config-claude",
+    is_flag=True,
+    default=False,
+    help=(
+        "After logging in, update ~/.claude/settings.json so Claude Code routes through this proxy. "
+        "Unrelated settings are preserved."
+    ),
+)
 @click.pass_context
-def login(ctx: click.Context):
+def login(ctx: click.Context, config_claude: bool):
     """Login to LiteLLM proxy using SSO authentication"""
     from litellm.constants import LITELLM_CLI_SOURCE_IDENTIFIER
     from litellm.proxy.client.cli.interface import show_commands
@@ -683,6 +708,9 @@ def login(ctx: click.Context):
             click.echo(f"JWT Token: {api_key[:20]}...")
             click.echo("You can now use the CLI without specifying --api-key")
 
+            if config_claude:
+                _configure_claude_code(base_url)
+
             # Show available commands after successful login
             click.echo("\n" + "=" * 60)
             show_commands()
@@ -698,6 +726,10 @@ def login(ctx: click.Context):
     except KeyboardInterrupt:
         click.echo("\nAuthentication cancelled by user.")
         return
+    except click.ClickException:
+        # Login itself already succeeded; only the post-login step failed, so this
+        # must not be relabelled as an authentication failure by the handler below.
+        raise
     except Exception as e:
         click.echo(f"Authentication failed: {e}")
         return
diff --git a/litellm/proxy/client/cli/commands/autoroute/commands.py b/litellm/proxy/client/cli/commands/autoroute/commands.py
index 09e5a53b92f..26d45138a27 100644
--- a/litellm/proxy/client/cli/commands/autoroute/commands.py
+++ b/litellm/proxy/client/cli/commands/autoroute/commands.py
@@ -10,11 +10,16 @@ import click
 import yaml
 from pydantic import JsonValue, TypeAdapter, ValidationError
 
-from ..up import CLAUDE_SETTINGS_PATH, UpError, load_json_or_empty, restore_claude_settings, write_backup
+from ..claude_settings import (
+    AUTOROUTE_BACKUP_PATH,
+    CLAUDE_SETTINGS_PATH,
+    ClaudeSettingsError,
+    load_json_or_empty,
+)
 from ..up import BackupRecord as ClaudeBackupRecord
+from ..up import restore_claude_settings, write_backup
 from .config import master_key_from_config
 from .process import (
-    AUTOROUTE_DIR,
     CONFIG_PATH,
     DEFAULT_AUTOROUTE_PORT,
     LOG_PATH,
@@ -35,8 +40,6 @@ from .process import (
 from .settings import merge_claude_settings_static_token
 from .wizard import run_configure_wizard
 
-AUTOROUTE_BACKUP_PATH: Final = AUTOROUTE_DIR / "claude_settings_backup.json"
-
 _GENERATED_CONFIG_ADAPTER: Final = TypeAdapter(dict[str, JsonValue])
 
 
@@ -108,7 +111,7 @@ def up(port: int) -> None:
 
     try:
         existing_pid: Final = read_pid_record()
-    except UpError as e:
+    except ClaudeSettingsError as e:
         raise click.ClickException(str(e))
     if existing_pid is not None and is_running(existing_pid.pid):
         raise click.ClickException(
@@ -157,7 +160,7 @@ def up(port: int) -> None:
         CLAUDE_SETTINGS_PATH.parent.mkdir(parents=True, exist_ok=True)
         with secure_create(CLAUDE_SETTINGS_PATH) as f:
             json.dump(merged, f, indent=2)
-    except UpError as e:
+    except ClaudeSettingsError as e:
         terminate(process.pid)
         clear_pid_record()
         raise click.ClickException(str(e))
@@ -175,7 +178,7 @@ def up(port: int) -> None:
         clear_pid_record()
         try:
             restore_claude_settings(CLAUDE_SETTINGS_PATH, AUTOROUTE_BACKUP_PATH)
-        except UpError as e:
+        except ClaudeSettingsError as e:
             # Runs from atexit/a signal handler too, outside Click's own exception
             # handling -- raising here would only produce an unhandled-exception
             # warning on stderr, not a clean message.
@@ -207,7 +210,7 @@ def down() -> None:
     """Restore Claude Code settings and stop a leftover ephemeral proxy, if any"""
     try:
         record: PidRecord | None = read_pid_record()
-    except UpError as e:
+    except ClaudeSettingsError as e:
         # down is the crash-recovery path -- a corrupt pid record must not block it; clear the
         # unusable record and keep going rather than leaving the user with no way to clean up.
         click.echo(f"{e} Clearing it and continuing cleanup.", err=True)
@@ -219,7 +222,7 @@ def down() -> None:
 
     try:
         restored: Final = restore_claude_settings(CLAUDE_SETTINGS_PATH, AUTOROUTE_BACKUP_PATH)
-    except UpError as e:
+    except ClaudeSettingsError as e:
         raise click.ClickException(str(e))
     if restored is None:
         click.echo("Nothing to restore.")
diff --git a/litellm/proxy/client/cli/commands/claude_settings.py b/litellm/proxy/client/cli/commands/claude_settings.py
new file mode 100644
index 00000000000..e9a6a25a064
--- /dev/null
+++ b/litellm/proxy/client/cli/commands/claude_settings.py
@@ -0,0 +1,155 @@
+"""Shared handling of Claude Code's ~/.claude/settings.json.
+
+`lite up` patches this file temporarily and restores it on exit; `lite login
+--config-claude` patches it persistently. Both need the same merge and the same
+apiKeyHelper command, and `up` already imports from `auth`, so the shared parts
+live here rather than in either command module.
+"""
+
+import shlex
+import shutil
+from collections.abc import Mapping, Sequence
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Final
+
+from pydantic import JsonValue, TypeAdapter, ValidationError
+
+from .private_json import write_private_json
+
+ENV_KEY: Final = "env"
+API_KEY_HELPER_KEY: Final = "apiKeyHelper"
+ANTHROPIC_BASE_URL_KEY: Final = "ANTHROPIC_BASE_URL"
+ANTHROPIC_API_KEY_KEY: Final = "ANTHROPIC_API_KEY"
+
+CLAUDE_SETTINGS_PATH: Final = Path.home() / ".claude" / "settings.json"
+BACKUP_PATH: Final = Path.home() / ".litellm" / "claude_settings_backup.json"
+AUTOROUTE_BACKUP_PATH: Final = Path.home() / ".litellm" / "autorouter" / "claude_settings_backup.json"
+
+
+@dataclass(frozen=True, slots=True)
+class SettingsFileOwner:
+    """A command that takes temporary ownership of CLAUDE_SETTINGS_PATH and restores it later."""
+
+    backup_path: Path
+    start_command: str
+    stop_command: str
+
+
+SETTINGS_FILE_OWNERS: Final = (
+    SettingsFileOwner(BACKUP_PATH, "lite up", "lite down"),
+    SettingsFileOwner(AUTOROUTE_BACKUP_PATH, "lite autoroute up", "lite autoroute down"),
+)
+
+_SETTINGS_ADAPTER: Final = TypeAdapter(dict[str, JsonValue])
+
+
+class ClaudeSettingsError(Exception):
+    """Raised for any user-actionable failure while reading or writing Claude Code settings."""
+
+
+def load_json_or_empty(path: Path) -> dict[str, JsonValue]:
+    try:
+        content: Final = path.read_bytes() if path.exists() else b""
+    except OSError as e:
+        raise ClaudeSettingsError(f"Could not read {path}: {e}") from e
+    if not content.strip():
+        return {}
+    try:
+        return _SETTINGS_ADAPTER.validate_json(content)
+    except ValidationError:
+        raise ClaudeSettingsError(
+            f"{path} contains invalid JSON (or its root is not an object); cannot proceed safely."
+        )
+
+
+def merge_claude_settings(
+    settings: Mapping[str, JsonValue], base_url: str, api_key_helper: str
+) -> dict[str, JsonValue]:
+    """Return a new settings dict wired to route Claude Code through the proxy.
+
+    Only env.ANTHROPIC_BASE_URL and the top-level apiKeyHelper are overridden; a
+    stray env.ANTHROPIC_API_KEY is dropped so it cannot outrank the helper-issued
+    token (same reasoning as build_agent_env in agents.py). Every other key is
+    preserved untouched.
+    """
+    raw_env: Final = settings.get(ENV_KEY, {})
+    base_env: Final = raw_env if isinstance(raw_env, dict) else {}
+    env: Final = {
+        **{key: value for key, value in base_env.items() if key != ANTHROPIC_API_KEY_KEY},
+        ANTHROPIC_BASE_URL_KEY: base_url.rstrip("/"),
+    }
+    return {**settings, ENV_KEY: env, API_KEY_HELPER_KEY: api_key_helper}
+
+
+def resolve_api_key_helper(base_url: str) -> str:
+    """Build the shell command Claude Code should run for its apiKeyHelper.
+
+    Resolves `lite` to an absolute path so the helper works regardless of the
+    PATH visible to whatever subprocess Claude Code spawns it from. Passing
+    --base-url explicitly (rather than relying on the bare invocation Claude
+    Code would otherwise use) makes `print-token` enforce that the cached
+    token was actually issued for this proxy -- without it, a token minted
+    for a different, previously-logged-into proxy would be handed to
+    whichever server the settings currently point at.
+
+    --base-url belongs to the top-level `lite` group, so it has to precede the
+    subcommand; click rejects it outright after `print-token`.
+    """
+    lite_path: Final = shutil.which("lite")
+    if lite_path is None:
+        raise ClaudeSettingsError(
+            "Could not find `lite` on your PATH. Claude Code's apiKeyHelper needs an absolute path to it."
+        )
+    return f"{shlex.quote(lite_path)} --base-url {shlex.quote(base_url)} auth print-token"
+
+
+def write_claude_settings(base_url: str, settings_path: Path, owners: Sequence[SettingsFileOwner]) -> None:
+    """Persistently point Claude Code at base_url, preserving every unrelated setting.
+
+    Refuses while any owner holds a backup: each restores its backup when it
+    stops, which would silently undo this write.
+    """
+    for owner in owners:
+        if owner.backup_path.exists():
+            raise ClaudeSettingsError(
+                f"`{owner.start_command}` is currently managing {settings_path} (backup at "
+                f"{owner.backup_path}) and will restore it when it stops. "
+                f"Run `{owner.stop_command}` first, then retry."
+            )
+    normalized_base_url: Final = base_url.rstrip("/")
+    api_key_helper: Final = resolve_api_key_helper(normalized_base_url)
+    existing: Final = load_json_or_empty(settings_path)
+    raw_env: Final = existing.get(ENV_KEY)
+    if raw_env is not None and not isinstance(raw_env, dict):
+        raise ClaudeSettingsError(
+            f'{settings_path} has a non-object "{ENV_KEY}" value, which this would discard. '
+            "Fix or remove it, then retry."
+        )
+    merged: Final = merge_claude_settings(existing, normalized_base_url, api_key_helper)
+    # os.replace() swaps the symlink itself for a regular file, silently detaching a
+    # settings.json that is symlinked into a dotfiles repo. There is no backup to undo
+    # that here, unlike `lite up`, so write through to the link's target instead.
+    target: Final = settings_path.resolve() if settings_path.is_symlink() else settings_path
+    try:
+        write_private_json(str(target), merged)
+    except OSError as e:
+        raise ClaudeSettingsError(f"Could not write {target}: {e}") from e
+
+
+__all__ = (
+    "ANTHROPIC_API_KEY_KEY",
+    "ANTHROPIC_BASE_URL_KEY",
+    "API_KEY_HELPER_KEY",
+    "AUTOROUTE_BACKUP_PATH",
+    "BACKUP_PATH",
+    "CLAUDE_SETTINGS_PATH",
+    "ENV_KEY",
+    "SETTINGS_FILE_OWNERS",
+    "ClaudeSettingsError",
+    "SettingsFileOwner",
+    "load_json_or_empty",
+    "merge_claude_settings",
+    "resolve_api_key_helper",
+    "write_claude_settings",
+)
diff --git a/litellm/proxy/client/cli/commands/up.py b/litellm/proxy/client/cli/commands/up.py
index 7023241cf06..dd266b4afa1 100644
--- a/litellm/proxy/client/cli/commands/up.py
+++ b/litellm/proxy/client/cli/commands/up.py
@@ -2,12 +2,10 @@ import atexit
 import contextlib
 import json
 import os
-import shlex
-import shutil
 import signal
 import sys
 import threading
-from collections.abc import Iterator, Mapping
+from collections.abc import Iterator
 from dataclasses import dataclass
 from pathlib import Path
 from types import FrameType
@@ -20,17 +18,17 @@ from litellm.litellm_core_utils.cli_token_utils import is_cli_token_fresh
 
 from .agents import AgentRunError, resolve_api_key, verify_proxy_key
 from .auth import load_token, login
-
-ENV_KEY: Final = "env"
-API_KEY_HELPER_KEY: Final = "apiKeyHelper"
-ANTHROPIC_BASE_URL_KEY: Final = "ANTHROPIC_BASE_URL"
-ANTHROPIC_API_KEY_KEY: Final = "ANTHROPIC_API_KEY"
-
-CLAUDE_SETTINGS_PATH: Final = Path.home() / ".claude" / "settings.json"
-BACKUP_PATH: Final = Path.home() / ".litellm" / "claude_settings_backup.json"
+from .claude_settings import (
+    BACKUP_PATH,
+    CLAUDE_SETTINGS_PATH,
+    ClaudeSettingsError,
+    load_json_or_empty,
+    merge_claude_settings,
+    resolve_api_key_helper,
+)
 
 
-class UpError(Exception):
+class UpError(ClaudeSettingsError):
     """Raised for any user-actionable failure while starting/stopping interception."""
 
 
@@ -42,40 +40,9 @@ class BackupRecord:
     content: dict[str, JsonValue] | None
 
 
-_SETTINGS_ADAPTER: Final = TypeAdapter(dict[str, JsonValue])
 _BACKUP_RECORD_ADAPTER: Final = TypeAdapter(BackupRecord)
 
 
-def load_json_or_empty(path: Path) -> dict[str, JsonValue]:
-    if not path.exists():
-        return {}
-    with open(path, "r") as f:
-        content: Final = f.read()
-    if not content.strip():
-        return {}
-    try:
-        return _SETTINGS_ADAPTER.validate_json(content)
-    except ValidationError:
-        raise UpError(f"{path} contains invalid JSON (or its root is not an object); cannot proceed safely.")
-
-
-def merge_claude_settings(
-    settings: Mapping[str, JsonValue], base_url: str, api_key_helper: str
-) -> dict[str, JsonValue]:
-    """Return a new settings dict wired to route Claude Code through the proxy.
-
-    Only env.ANTHROPIC_BASE_URL and the top-level apiKeyHelper are overridden; a
-    stray env.ANTHROPIC_API_KEY is dropped so it cannot outrank the helper-issued
-    token (same reasoning as build_agent_env in agents.py). Every other key is
-    preserved untouched.
-    """
-    raw_env: Final = settings.get(ENV_KEY, {})
-    base_env: Final = raw_env if isinstance(raw_env, dict) else {}
-    env: Final = {**base_env, ANTHROPIC_BASE_URL_KEY: base_url.rstrip("/")}
-    env.pop(ANTHROPIC_API_KEY_KEY, None)
-    return {**settings, ENV_KEY: env, API_KEY_HELPER_KEY: api_key_helper}
-
-
 @contextlib.contextmanager
 def secure_create(path: Path) -> Iterator[IO[str]]:
     """Open path for writing with mode 0600 fixed up before any content is written.
@@ -136,26 +103,6 @@ def restore_claude_settings(settings_path: Path | None = None, backup_path: Path
     return record
 
 
-def resolve_api_key_helper(base_url: str) -> str:
-    """Build the shell command Claude Code should run for its apiKeyHelper.
-
-    Resolves `lite` to an absolute path so the helper works regardless of the
-    PATH visible to whatever subprocess Claude Code spawns it from. Passing
-    --base-url explicitly (rather than relying on the bare invocation Claude
-    Code would otherwise use) makes `print-token` enforce that the cached
-    token was actually issued for this proxy -- without it, a token minted
-    for a different, previously-logged-into proxy would be handed to
-    whichever server `up` currently points at.
-    """
-    lite_path: Final = shutil.which("lite")
-    if lite_path is None:
-        raise UpError(
-            "Could not find `lite` on your PATH. Claude Code's apiKeyHelper needs "
-            "an absolute path to it, so `lite up` cannot continue."
-        )
-    return f"{shlex.quote(lite_path)} auth print-token --base-url {shlex.quote(base_url)}"
-
-
 def _ensure_fresh_login(ctx: click.Context) -> None:
     base_url: Final = ctx.obj["base_url"].rstrip("/")
     token_data = load_token()
@@ -224,7 +171,7 @@ def up(ctx: click.Context) -> None:
         merged: Final = merge_claude_settings(original_settings, base_url, api_key_helper)
         with open(CLAUDE_SETTINGS_PATH, "w") as f:
             json.dump(merged, f, indent=2)
-    except (AgentRunError, UpError) as e:
+    except (AgentRunError, ClaudeSettingsError) as e:
         raise click.ClickException(str(e))
 
     click.echo(f"litellm: routing Claude Code through proxy at {base_url.rstrip('/')}")
@@ -241,7 +188,7 @@ def up(ctx: click.Context) -> None:
             return
         try:
             _restore_and_report()
-        except UpError as e:
+        except ClaudeSettingsError as e:
             # Runs from atexit/a signal handler, outside Click's own exception
             # handling -- raising here would only produce an unhandled-exception
             # warning on stderr, not a clean message.
@@ -264,7 +211,7 @@ def down() -> None:
     """
     try:
         _restore_and_report()
-    except UpError as e:
+    except ClaudeSettingsError as e:
         raise click.ClickException(str(e))
 
 
@@ -272,6 +219,7 @@ __all__ = [
     "BACKUP_PATH",
     "CLAUDE_SETTINGS_PATH",
     "BackupRecord",
+    "ClaudeSettingsError",
     "UpError",
     "down",
     "load_json_or_empty",
diff --git a/litellm/proxy/db/db_spend_update_writer.py b/litellm/proxy/db/db_spend_update_writer.py
index b6dddbb029d..65a271d4029 100644
--- a/litellm/proxy/db/db_spend_update_writer.py
+++ b/litellm/proxy/db/db_spend_update_writer.py
@@ -1204,6 +1204,29 @@ class DBSpendUpdateWriter:
         except Exception as e:
             verbose_proxy_logger.debug("_flush_tool_discovery_queue error (non-blocking): %s", e)
 
+    @staticmethod
+    async def _handle_spend_update_failure(
+        e: Exception,
+        attempt: int,
+        n_retry_times: int,
+        start_time: float,
+        proxy_logging_obj: ProxyLogging,
+    ) -> None:
+        """Retry a failed spend-update transaction on connection errors or deadlocks, else re-raise."""
+        from litellm.proxy.db.exception_handler import PrismaDBExceptionHandler
+        from litellm.proxy.utils import _raise_failed_update_spend_exception
+
+        is_retryable = isinstance(e, DB_RETRY_SAFE_ERROR_TYPES) or PrismaDBExceptionHandler.is_deadlock_error(e)
+        if not is_retryable or attempt >= n_retry_times:
+            _raise_failed_update_spend_exception(e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj)
+        verbose_proxy_logger.warning(
+            "Retrying spend update after retryable DB error (attempt %s/%s): %s",
+            attempt + 1,
+            n_retry_times,
+            e,
+        )
+        await asyncio.sleep(random.uniform(2**attempt, 2 ** (attempt + 1)))
+
     async def _commit_spend_updates_to_db(
         self,
         prisma_client: PrismaClient,
@@ -1215,10 +1238,7 @@ class DBSpendUpdateWriter:
         Commits all the spend `UPDATE` transactions to the Database
 
         """
-        from litellm.proxy.utils import (
-            ProxyUpdateSpend,
-            _raise_failed_update_spend_exception,
-        )
+        from litellm.proxy.utils import ProxyUpdateSpend
 
         ### UPDATE USER TABLE ###
         user_list_transactions: Final = db_spend_update_transactions["user_list_transactions"]
@@ -1238,18 +1258,13 @@ class DBSpendUpdateWriter:
                                     data={"spend": {"increment": response_cost}},
                                 )
                     break
-                except DB_RETRY_SAFE_ERROR_TYPES as e:
-                    if i >= n_retry_times:  # If we've reached the maximum number of retries
-                        _raise_failed_update_spend_exception(
-                            e=e,
-                            start_time=start_time,
-                            proxy_logging_obj=proxy_logging_obj,
-                        )
-                    # Optionally, sleep for a bit before retrying
-                    await asyncio.sleep(2**i)  # Exponential backoff
                 except Exception as e:
-                    _raise_failed_update_spend_exception(
-                        e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
+                    await self._handle_spend_update_failure(
+                        e=e,
+                        attempt=i,
+                        n_retry_times=n_retry_times,
+                        start_time=start_time,
+                        proxy_logging_obj=proxy_logging_obj,
                     )
 
         ### UPDATE END-USER TABLE ###
@@ -1281,18 +1296,13 @@ class DBSpendUpdateWriter:
                                     },
                                 )
                     break
-                except DB_RETRY_SAFE_ERROR_TYPES as e:
-                    if i >= n_retry_times:  # If we've reached the maximum number of retries
-                        _raise_failed_update_spend_exception(
-                            e=e,
-                            start_time=start_time,
-                            proxy_logging_obj=proxy_logging_obj,
-                        )
-                    # Optionally, sleep for a bit before retrying
-                    await asyncio.sleep(2**i)  # Exponential backoff
                 except Exception as e:
-                    _raise_failed_update_spend_exception(
-                        e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
+                    await self._handle_spend_update_failure(
+                        e=e,
+                        attempt=i,
+                        n_retry_times=n_retry_times,
+                        start_time=start_time,
+                        proxy_logging_obj=proxy_logging_obj,
                     )
 
         ### UPDATE TEAM TABLE ###
@@ -1314,18 +1324,13 @@ class DBSpendUpdateWriter:
                                     data={"spend": {"increment": response_cost}},
                                 )
                     break
-                except DB_RETRY_SAFE_ERROR_TYPES as e:
-                    if i >= n_retry_times:  # If we've reached the maximum number of retries
-                        _raise_failed_update_spend_exception(
-                            e=e,
-                            start_time=start_time,
-                            proxy_logging_obj=proxy_logging_obj,
-                        )
-                    # Optionally, sleep for a bit before retrying
-                    await asyncio.sleep(2**i)  # Exponential backoff
                 except Exception as e:
-                    _raise_failed_update_spend_exception(
-                        e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
+                    await self._handle_spend_update_failure(
+                        e=e,
+                        attempt=i,
+                        n_retry_times=n_retry_times,
+                        start_time=start_time,
+                        proxy_logging_obj=proxy_logging_obj,
                     )
 
         ### UPDATE TEAM Membership TABLE with spend ###
@@ -1361,18 +1366,13 @@ class DBSpendUpdateWriter:
                                 )
                     # Transaction succeeded, break out of retry loop
                     break
-                except DB_RETRY_SAFE_ERROR_TYPES as e:
-                    if i >= n_retry_times:  # If we've reached the maximum number of retries
-                        _raise_failed_update_spend_exception(
-                            e=e,
-                            start_time=start_time,
-                            proxy_logging_obj=proxy_logging_obj,
-                        )
-                    # Optionally, sleep for a bit before retrying
-                    await asyncio.sleep(2**i)  # Exponential backoff
                 except Exception as e:
-                    _raise_failed_update_spend_exception(
-                        e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
+                    await self._handle_spend_update_failure(
+                        e=e,
+                        attempt=i,
+                        n_retry_times=n_retry_times,
+                        start_time=start_time,
+                        proxy_logging_obj=proxy_logging_obj,
                     )
 
             # Invalidate cache for updated team memberships
@@ -1403,25 +1403,13 @@ class DBSpendUpdateWriter:
                                     data={"spend": {"increment": response_cost}},
                                 )
                     break
-                except DB_RETRY_SAFE_ERROR_TYPES as e:
-                    if i >= n_retry_times:  # If we've reached the maximum number of retries
-                        _raise_failed_update_spend_exception(
-                            e=e,
-                            start_time=start_time,
-                            proxy_logging_obj=proxy_logging_obj,
-                        )
-                    # Optionally, sleep for a bit before retrying
-                    await asyncio.sleep(
-                        # Sleep a random amount to avoid retrying and deadlocking again: when two transactions deadlock they are
-                        # cancelled basically at the same time, so if they wait the same time they will also retry at the same time
-                        # and thus they are more likely to deadlock again.
-                        # Instead, we sleep a random amount so that they retry at slightly different times, lowering the chance of
-                        # repeated deadlocks, and therefore of exceeding the retry limit.
-                        random.uniform(2**i, 2 ** (i + 1))
-                    )
                 except Exception as e:
-                    _raise_failed_update_spend_exception(
-                        e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
+                    await self._handle_spend_update_failure(
+                        e=e,
+                        attempt=i,
+                        n_retry_times=n_retry_times,
+                        start_time=start_time,
+                        proxy_logging_obj=proxy_logging_obj,
                     )
 
         ### UPDATE TAG TABLE ###
@@ -1470,8 +1458,6 @@ class DBSpendUpdateWriter:
             prisma_client: Prisma client instance
             proxy_logging_obj: Proxy logging object
         """
-        from litellm.proxy.utils import _raise_failed_update_spend_exception
-
         verbose_proxy_logger.debug("%s Spend transactions: %s", entity_name, transactions)
         if transactions is not None and len(transactions.keys()) > 0:
             for i in range(n_retry_times + 1):
@@ -1493,17 +1479,13 @@ class DBSpendUpdateWriter:
                                     data={"spend": {"increment": response_cost}},
                                 )
                     break
-                except DB_RETRY_SAFE_ERROR_TYPES as e:
-                    if i >= n_retry_times:
-                        _raise_failed_update_spend_exception(
-                            e=e,
-                            start_time=start_time,
-                            proxy_logging_obj=proxy_logging_obj,
-                        )
-                    await asyncio.sleep(2**i)  # Exponential backoff
                 except Exception as e:
-                    _raise_failed_update_spend_exception(
-                        e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
+                    await DBSpendUpdateWriter._handle_spend_update_failure(
+                        e=e,
+                        attempt=i,
+                        n_retry_times=n_retry_times,
+                        start_time=start_time,
+                        proxy_logging_obj=proxy_logging_obj,
                     )
 
     # fmt: off
@@ -1672,7 +1654,16 @@ class DBSpendUpdateWriter:
 
                         break
 
-                    except DB_RETRY_SAFE_ERROR_TYPES as e:
+                    except Exception as e:
+                        from litellm.proxy.db.exception_handler import (
+                            PrismaDBExceptionHandler,
+                        )
+
+                        is_retryable = isinstance(
+                            e, DB_RETRY_SAFE_ERROR_TYPES
+                        ) or PrismaDBExceptionHandler.is_deadlock_error(e)
+                        if not is_retryable:
+                            raise
                         if i >= n_retry_times:
                             _raise_failed_update_spend_exception(
                                 e=e,
diff --git a/litellm/proxy/db/exception_handler.py b/litellm/proxy/db/exception_handler.py
index e0a21ceed26..f7a39aaa50f 100644
--- a/litellm/proxy/db/exception_handler.py
+++ b/litellm/proxy/db/exception_handler.py
@@ -166,6 +166,22 @@ class PrismaDBExceptionHandler:
             return True
         return False
 
+    @staticmethod
+    def is_deadlock_error(e: Exception) -> bool:
+        """True iff ``e`` is a Postgres deadlock (P2034 / 40P01) surfaced through prisma."""
+        import prisma
+
+        if not isinstance(e, prisma.errors.PrismaError):
+            return False
+        if getattr(e, "code", None) == "P2034":
+            return True
+        error_message = str(e).lower()
+        return (
+            "deadlock detected" in error_message
+            or "40p01" in error_message
+            or "write conflict or a deadlock" in error_message
+        )
+
     @staticmethod
     def is_prisma_engine_internal_error(e: Exception) -> bool:
         """True iff ``e`` is a non-``PrismaError`` exception raised from inside
diff --git a/litellm/proxy/db/proxy_worker_heartbeat.py b/litellm/proxy/db/proxy_worker_heartbeat.py
new file mode 100644
index 00000000000..990ff48eb18
--- /dev/null
+++ b/litellm/proxy/db/proxy_worker_heartbeat.py
@@ -0,0 +1,93 @@
+"""
+Live proxy worker census, one row per worker process.
+
+Every uvicorn worker upserts its own row on a fixed heartbeat, so counting
+rows with a recent heartbeat answers "how many workers share this database?"
+without any coordination. The Admin UI's "no Redis" banner uses that count to
+hide itself for deployments that are provably a single worker, where per-worker
+rate limits, budgets, and router state are already global. All timestamps are
+written and compared with the database's own clock, so pods with skewed clocks
+still agree.
+"""
+
+from __future__ import annotations
+
+import socket
+from typing import TYPE_CHECKING, Final
+
+from pydantic import TypeAdapter
+from typing_extensions import ReadOnly, TypedDict
+
+from litellm._logging import verbose_proxy_logger
+from litellm._uuid import uuid
+from litellm.proxy.db.routing_prisma_wrapper import RoutingPrismaWrapper
+
+if TYPE_CHECKING:
+    from litellm.proxy.utils import PrismaClient
+
+PROXY_WORKER_HEARTBEAT_INTERVAL_SECONDS: Final = 60
+PROXY_WORKER_LIVENESS_WINDOW_SECONDS: Final = 3 * PROXY_WORKER_HEARTBEAT_INTERVAL_SECONDS
+STALE_ROW_RETENTION_SECONDS: Final = 3600
+
+BEAT_SQL: Final = """
+INSERT INTO "LiteLLM_ProxyWorkerHeartbeat" (worker_id, hostname, last_heartbeat_at)
+VALUES ($1, $2, NOW())
+ON CONFLICT (worker_id) DO UPDATE SET last_heartbeat_at = NOW()
+"""
+
+PRUNE_SQL: Final = """
+DELETE FROM "LiteLLM_ProxyWorkerHeartbeat"
+WHERE last_heartbeat_at < NOW() - make_interval(secs => $1)
+"""
+
+COUNT_SQL: Final = """
+SELECT COUNT(*)::int AS live_workers FROM "LiteLLM_ProxyWorkerHeartbeat"
+WHERE last_heartbeat_at > NOW() - make_interval(secs => $1)
+"""
+
+DEREGISTER_SQL: Final = """
+DELETE FROM "LiteLLM_ProxyWorkerHeartbeat" WHERE worker_id = $1
+"""
+
+
+class _LiveWorkerCountRow(TypedDict):
+    live_workers: ReadOnly[int]
+
+
+_COUNT_ROWS_ADAPTER: Final = TypeAdapter(tuple[_LiveWorkerCountRow, ...])
+
+
+class ProxyWorkerHeartbeat:
+    def __init__(self, prisma_client: PrismaClient, worker_id: str | None = None) -> None:
+        self.prisma_client: Final = prisma_client
+        self.worker_id: Final[str] = worker_id or str(uuid.uuid4())
+        self.hostname: Final = socket.gethostname()
+
+    async def beat(self) -> None:
+        try:
+            await self.prisma_client.db.execute_raw(BEAT_SQL, self.worker_id, self.hostname)
+            await self.prisma_client.db.execute_raw(PRUNE_SQL, STALE_ROW_RETENTION_SECONDS)
+        except Exception as beat_err:  # noqa: BLE001  # a missed heartbeat must never take down the worker
+            verbose_proxy_logger.debug("Proxy worker heartbeat write failed: %s", beat_err)
+
+    async def deregister(self) -> None:
+        try:
+            await self.prisma_client.db.execute_raw(DEREGISTER_SQL, self.worker_id)
+        except Exception as deregister_err:  # noqa: BLE001  # best-effort cleanup; the liveness window ages the row out anyway
+            verbose_proxy_logger.debug("Proxy worker heartbeat deregister failed: %s", deregister_err)
+
+
+async def count_live_proxy_workers(prisma_client: PrismaClient) -> int | None:
+    """
+    The number of workers with a recent heartbeat, or None when the database
+    cannot answer. Callers must treat None as "unknown", not as zero. Always
+    counts on the primary: a lagging read replica must never undercount.
+    """
+    try:
+        db: Final = prisma_client.db
+        primary_db: Final = db.writer if isinstance(db, RoutingPrismaWrapper) else db
+        rows: Final = await primary_db.query_raw(COUNT_SQL, PROXY_WORKER_LIVENESS_WINDOW_SECONDS)
+        return _COUNT_ROWS_ADAPTER.validate_python(rows)[0]["live_workers"]
+    except Exception as count_err:  # noqa: BLE001  # an unknown count must degrade to "warn", never to a 503
+        verbose_proxy_logger.debug("Live proxy worker count unavailable: %s", count_err)
+        return None
diff --git a/litellm/proxy/example_config_yaml/agentcore_websearch_config.yaml b/litellm/proxy/example_config_yaml/agentcore_websearch_config.yaml
new file mode 100644
index 00000000000..12402095c4d
--- /dev/null
+++ b/litellm/proxy/example_config_yaml/agentcore_websearch_config.yaml
@@ -0,0 +1,40 @@
+# Claude Code / Anthropic-native web search on Bedrock, backed by
+# Amazon Bedrock AgentCore Web Search (AWS-managed web index, no third-party
+# search API). See litellm/llms/bedrock/search/transformation.py for details.
+
+model_list:
+  - model_name: claude-sonnet
+    litellm_params:
+      model: bedrock/us.anthropic.claude-sonnet-5
+      aws_region_name: us-east-1
+
+search_tools:
+  - search_tool_name: agentcore-search
+    litellm_params:
+      search_provider: agentcore
+      # Your AgentCore Gateway MCP endpoint (gateway must have a `web-search`
+      # connector target). Alternatively set the AGENTCORE_GATEWAY_URL env var.
+      api_base: https://<gateway-id>.gateway.bedrock-agentcore.us-east-1.amazonaws.com/mcp
+
+      # The gateway exposes the connector as "<target-name>___WebSearch".
+      # Default is "web-search-tool___WebSearch", matching the target name used
+      # in the AWS docs' boto3/CLI setup examples. If your target was created
+      # with a different name (misconfiguration surfaces as an MCP "tool not
+      # found" error), set the AGENTCORE_SEARCH_TOOL_NAME env var or pass
+      # tool_name in the request body. The search router forwards only
+      # search_provider / api_key / api_base from this litellm_params block,
+      # so a tool_name set here would be silently ignored.
+
+      # AWS_IAM gateway (default): SigV4-signed using the standard AWS
+      # credential chain (env / profile / IRSA / instance role). Explicit
+      # aws_access_key_id / aws_secret_access_key set here would be silently
+      # ignored for the same reason; pass them per request instead.
+
+      # CUSTOM_JWT gateway alternative — OAuth2 bearer token instead of SigV4:
+      # api_key: os.environ/AGENTCORE_GATEWAY_TOKEN
+
+litellm_settings:
+  callbacks: ["websearch_interception"]
+  websearch_interception_params:
+    enabled_providers: ["bedrock"]
+    search_tool_name: agentcore-search
diff --git a/litellm/proxy/health_endpoints/_health_endpoints.py b/litellm/proxy/health_endpoints/_health_endpoints.py
index e814ec42d26..33894777bc3 100644
--- a/litellm/proxy/health_endpoints/_health_endpoints.py
+++ b/litellm/proxy/health_endpoints/_health_endpoints.py
@@ -34,6 +34,7 @@ from litellm.proxy.auth.auth_utils import (
 )
 from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
 from litellm.proxy.db.exception_handler import PrismaDBExceptionHandler
+from litellm.proxy.db.proxy_worker_heartbeat import count_live_proxy_workers
 from litellm.proxy.health_check import (
     ADMIN_ONLY_HEALTH_DISPLAY_PARAMS,
     _clean_endpoint_data,
@@ -1451,7 +1452,7 @@ def callback_name(callback):
 DISABLE_NO_REDIS_WARNING_ENV_VAR: Final = "LITELLM_DISABLE_NO_REDIS_WARNING"
 
 
-def _show_no_redis_warning() -> bool:
+async def _show_no_redis_warning() -> bool:
     """
     Whether the UI should warn that no Redis is configured.
 
@@ -1461,16 +1462,22 @@ def _show_no_redis_warning() -> bool:
     coordination cache (from a Redis response cache, general_settings.
     coordination_redis, or the REDIS_* env fallback) and the router's own
     Redis (router_settings.redis_host), which backs cooldowns and usage-based
-    routing on its own. Operators who know they run one worker can silence the
-    warning with LITELLM_DISABLE_NO_REDIS_WARNING=true.
+    routing on its own. A deployment whose worker-heartbeat census proves it
+    is exactly one worker needs no cross-worker coordination, so it never
+    warns; when the census is unavailable or shows more than one worker, the
+    warning stands unless LITELLM_DISABLE_NO_REDIS_WARNING=true silences it.
     """
-    from litellm.proxy.proxy_server import llm_router, redis_usage_cache
+    from litellm.proxy.proxy_server import llm_router, prisma_client, redis_usage_cache
 
     if redis_usage_cache is not None:
         return False
     if llm_router is not None and llm_router.cache.redis_cache is not None:
         return False
-    return get_secret_bool(DISABLE_NO_REDIS_WARNING_ENV_VAR, False) is not True
+    if get_secret_bool(DISABLE_NO_REDIS_WARNING_ENV_VAR, False) is True:
+        return False
+    if prisma_client is None:
+        return True
+    return await count_live_proxy_workers(prisma_client) != 1
 
 
 async def _get_health_readiness_details(
@@ -1513,7 +1520,7 @@ async def _get_health_readiness_details(
         # check log level
         log_level_name: Final = logging.getLevelName(verbose_logger.getEffectiveLevel())
         is_detailed_debug: Final = verbose_logger.isEnabledFor(logging.DEBUG)
-        show_no_redis_warning: Final = _show_no_redis_warning()
+        show_no_redis_warning: Final = await _show_no_redis_warning()
 
         # check DB
         if prisma_client is not None:  # if db passed in, check if it's connected
diff --git a/litellm/proxy/hooks/key_management_event_hooks.py b/litellm/proxy/hooks/key_management_event_hooks.py
index 6231563450b..88803d6442d 100644
--- a/litellm/proxy/hooks/key_management_event_hooks.py
+++ b/litellm/proxy/hooks/key_management_event_hooks.py
@@ -43,6 +43,7 @@ class KeyManagementEventHooks:
         from litellm.proxy.management_helpers.audit_logs import (
             create_audit_log_for_update,
             get_audit_log_changed_by,
+            is_audit_logging_enabled,
         )
         from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
@@ -53,8 +54,7 @@ class KeyManagementEventHooks:
             except Exception as e:
                 verbose_proxy_logger.warning("Failed to send key created email: %s", e)
 
-        # Enterprise Feature - Audit Logging. Enable with litellm.store_audit_logs = True
-        if litellm.store_audit_logs is True:
+        if is_audit_logging_enabled():
             _updated_values: Final = response.model_dump_json(exclude_none=True)
             asyncio.create_task(
                 create_audit_log_for_update(
@@ -103,11 +103,11 @@ class KeyManagementEventHooks:
         from litellm.proxy.management_helpers.audit_logs import (
             create_audit_log_for_update,
             get_audit_log_changed_by,
+            is_audit_logging_enabled,
         )
         from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
-        # Enterprise Feature - Audit Logging. Enable with litellm.store_audit_logs = True
-        if litellm.store_audit_logs is True:
+        if is_audit_logging_enabled():
             _updated_values: Final = json.dumps(data.json(exclude_none=True), default=str)
 
             _before_value = existing_key_row.json(exclude_none=True)
@@ -144,6 +144,7 @@ class KeyManagementEventHooks:
         from litellm.proxy.management_helpers.audit_logs import (
             create_audit_log_for_update,
             get_audit_log_changed_by,
+            is_audit_logging_enabled,
         )
         from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
@@ -180,7 +181,7 @@ class KeyManagementEventHooks:
             verbose_proxy_logger.warning("Failed to send key rotated email: %s", e)
 
         # store the audit log
-        if litellm.store_audit_logs is True and existing_key_row.token is not None:
+        if is_audit_logging_enabled() and existing_key_row.token is not None:
             asyncio.create_task(
                 create_audit_log_for_update(
                     request_data=LiteLLM_AuditLogs(
@@ -218,12 +219,12 @@ class KeyManagementEventHooks:
         from litellm.proxy.management_helpers.audit_logs import (
             create_audit_log_for_update,
             get_audit_log_changed_by,
+            is_audit_logging_enabled,
         )
         from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
-        # Enterprise Feature - Audit Logging. Enable with litellm.store_audit_logs = True
         # we do this after the first for loop, since first for loop is for validation. we only want this inserted after validation passes
-        if litellm.store_audit_logs is True and data.keys is not None:
+        if is_audit_logging_enabled() and data.keys is not None:
             # make an audit log for each key deleted
             for key in keys_being_deleted:
                 if key.token is None:
diff --git a/litellm/proxy/hooks/user_management_event_hooks.py b/litellm/proxy/hooks/user_management_event_hooks.py
index 929df2a778c..6d978929c05 100644
--- a/litellm/proxy/hooks/user_management_event_hooks.py
+++ b/litellm/proxy/hooks/user_management_event_hooks.py
@@ -20,7 +20,10 @@ from litellm.proxy._types import (
     UserAPIKeyAuth,
     WebhookEvent,
 )
-from litellm.proxy.management_helpers.audit_logs import create_audit_log_for_update
+from litellm.proxy.management_helpers.audit_logs import (
+    create_audit_log_for_update,
+    is_audit_logging_enabled,
+)
 from litellm.repositories.user_repository import UserRepository
 
 
@@ -203,7 +206,7 @@ class UserManagementEventHooks:
         - user_api_key_dict: UserAPIKeyAuth - The user api key dictionary.
         - litellm_proxy_admin_name: Optional[str] - The name of the proxy admin.
         """
-        if not litellm.store_audit_logs:
+        if not is_audit_logging_enabled():
             return
 
         from litellm.proxy.management_helpers.audit_logs import (
diff --git a/litellm/proxy/management_endpoints/auto_router_endpoints.py b/litellm/proxy/management_endpoints/auto_router_endpoints.py
index d8b7414f32c..0112ad1f6ed 100644
--- a/litellm/proxy/management_endpoints/auto_router_endpoints.py
+++ b/litellm/proxy/management_endpoints/auto_router_endpoints.py
@@ -6,10 +6,13 @@ POST /auto_router/test_routing - Route one prompt through an unsaved complexity-
 
 from collections.abc import Mapping, Sequence
 from datetime import datetime, timedelta, timezone
+from itertools import groupby
+from operator import attrgetter
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Annotated, Final, Protocol
+from uuid import uuid4
 
-from pydantic import BaseModel, TypeAdapter
+from pydantic import BaseModel, ConfigDict, TypeAdapter, field_validator
 
 from litellm._logging import verbose_proxy_logger
 from litellm.exceptions import BudgetExceededError
@@ -41,6 +44,8 @@ from litellm.types.management_endpoints.auto_router_endpoints import (
     AutoRouterRoutingTestRequest,
     AutoRouterRoutingTestResponse,
     RequestComplexityRouterConfig,
+    ShadowEvalDirection,
+    ShadowEvalJobKeyResponse,
     ShadowEvalJobResponse,
     ShadowEvalResult,
     ShadowEvalSlice,
@@ -89,17 +94,9 @@ class _ShadowEvalJobRow(Protocol):
 
 
 class _ShadowEvalJobTable(Protocol):
-    async def find_unique(self, *, where: Mapping[str, object]) -> _ShadowEvalJobRow | None: ...
+    async def find_many(self, *, where: Mapping[str, object]) -> Sequence[_ShadowEvalJobRow]: ...
 
-    async def find_first(self, *, where: Mapping[str, object]) -> _ShadowEvalJobRow | None: ...
-
-    async def find_many(
-        self, *, where: Mapping[str, object], order: Mapping[str, str], take: int
-    ) -> Sequence[_ShadowEvalJobRow]: ...
-
-    async def create(self, data: Mapping[str, object]) -> _ShadowEvalJobRow: ...
-
-    async def update(self, *, where: Mapping[str, object], data: Mapping[str, object]) -> _ShadowEvalJobRow | None: ...
+    async def create_many(self, data: Sequence[Mapping[str, object]]) -> int: ...
 
 
 class _ShadowEvalAttemptRow(Protocol):
@@ -606,18 +603,19 @@ _ATTEMPT_AGG_SELECT: Final = """
     COUNT(*) FILTER (WHERE outcome = 'tie')::int AS ties,
     AVG(confidence)::float AS avg_confidence
 FROM "LiteLLM_ShadowEvalAttempt"
-WHERE job_id = $1 AND outcome != 'error'
+WHERE job_id = ANY($1::text[]) AND outcome != 'error'
 GROUP BY 1
 """
 
 _ATTEMPT_AGG_BY_TIER_SQL: Final = "SELECT COALESCE(tier, 'UNCLASSIFIED') AS grp," + _ATTEMPT_AGG_SELECT
 _ATTEMPT_AGG_BY_MODEL_SQL: Final = "SELECT COALESCE(real_model, 'unknown') AS grp," + _ATTEMPT_AGG_SELECT
+_ATTEMPT_AGG_BY_LEG_SQL: Final = "SELECT job_id AS grp," + _ATTEMPT_AGG_SELECT
 
 _SWEEP_FINISHED_JOBS_SQL: Final = """
-UPDATE "LiteLLM_ShadowEvalJob" j SET stopped_at = NOW()
-WHERE j.api_key_id = $1 AND j.stopped_at IS NULL
+UPDATE "LiteLLM_ShadowEvalJob" j SET stopped_at = (NOW() AT TIME ZONE 'utc')
+WHERE j.api_key_id = ANY($1::text[]) AND j.stopped_at IS NULL
   AND (
-    j.ends_at <= NOW()
+    j.ends_at <= (NOW() AT TIME ZONE 'utc')
     OR (SELECT COUNT(*) FROM "LiteLLM_ShadowEvalAttempt" a WHERE a.job_id = j.id) >= j.max_turns
   )
 """
@@ -628,7 +626,52 @@ SELECT
     COUNT(*) FILTER (WHERE outcome = 'error')::int AS error_count,
     COALESCE(SUM(judge_cost), 0)::float AS judge_spend
 FROM "LiteLLM_ShadowEvalAttempt"
-WHERE job_id = $1
+WHERE job_id = ANY($1::text[])
+"""
+
+_ATTEMPT_COUNTS_SQL: Final = """
+SELECT a.job_id, COUNT(*)::int AS attempt_count
+FROM "LiteLLM_ShadowEvalAttempt" a
+JOIN "LiteLLM_ShadowEvalJob" j ON j.id = a.job_id
+WHERE a.job_id = ANY($1::text[]) AND (j.stopped_at IS NULL OR a.created_at <= j.stopped_at)
+GROUP BY a.job_id
+"""
+
+_STOP_JOB_SQL: Final = """
+UPDATE "LiteLLM_ShadowEvalJob"
+SET stopped_by = $2, stopped_at = COALESCE(stopped_at, $3::timestamp)
+WHERE group_id = $1 AND stopped_by IS NULL
+  AND ends_at > (NOW() AT TIME ZONE 'utc')
+  AND EXISTS (
+    SELECT 1 FROM "LiteLLM_ShadowEvalJob" k
+    WHERE k.group_id = $1 AND k.stopped_at IS NULL
+      AND (SELECT COUNT(*) FROM "LiteLLM_ShadowEvalAttempt" a WHERE a.job_id = k.id) < k.max_turns
+  )
+"""
+
+
+class _AttemptCountRow(BaseModel):
+    job_id: str
+    attempt_count: int
+
+
+_ATTEMPT_COUNT_ROWS: Final = TypeAdapter(list[_AttemptCountRow])
+
+
+_LIST_LEGS_SQL: Final = """
+SELECT * FROM "LiteLLM_ShadowEvalJob"
+WHERE group_id IN (
+    SELECT group_id FROM "LiteLLM_ShadowEvalJob"
+    GROUP BY group_id ORDER BY MAX(created_at) DESC LIMIT $1::int
+)
+"""
+
+_LIST_LEGS_BY_KEY_SQL: Final = """
+SELECT * FROM "LiteLLM_ShadowEvalJob"
+WHERE group_id IN (
+    SELECT group_id FROM "LiteLLM_ShadowEvalJob" WHERE api_key_id = $2
+    GROUP BY group_id ORDER BY MAX(created_at) DESC LIMIT $1::int
+)
 """
 
 
@@ -659,18 +702,98 @@ def _slices(rows: Sequence[_AttemptAggRow]) -> tuple[ShadowEvalSlice, ...]:
     )
 
 
+class _LegRow(BaseModel):
+    """One LiteLLM_ShadowEvalJob row, validated off the untyped prisma record. A row is
+    one key's leg of a job; the legs of a job share group_id and identical config, written
+    together by one create_many. The API's job id is the group id, so leg ids never leave
+    the server (attempts reference them internally)."""
+
+    model_config = ConfigDict(from_attributes=True)
+
+    id: str
+    group_id: str
+    api_key_id: str
+    router_name: str
+    direction: ShadowEvalDirection
+    baseline_model: str | None = None
+    judge_model: str
+    shadow_percentage: float
+    max_turns: int
+    created_at: datetime
+    ends_at: datetime
+    stopped_at: datetime | None = None
+    stopped_by: str | None = None
+
+    @field_validator("created_at", "ends_at", "stopped_at")
+    @classmethod
+    def _as_aware_utc(cls, value: datetime | None) -> datetime | None:
+        """The columns store naive UTC wall time (prisma's convention); prisma reads hand
+        back aware datetimes while raw SQL reads hand back naive ones, so this boundary
+        makes every read aware UTC before anything compares or serializes them."""
+        if value is None or value.tzinfo is not None:
+            return value
+        return value.replace(tzinfo=timezone.utc)
+
+
+_LEG_ROWS: Final = TypeAdapter(list[_LegRow])
+
+
+async def _leg_attempt_counts(prisma_client: "PrismaClient", legs: Sequence[_LegRow]) -> Mapping[str, int]:
+    """Each leg's attempt count by leg id, judged and errored alike, in one grouped read.
+    It is the same count the sampler budgets against max_turns, so the derived status
+    flips to completed exactly when sampling actually ends. A stamped leg's count freezes
+    at its stopped_at: in-flight attempts that land after the stamp are excluded, so they
+    can never reclassify a leg that was stopped under budget as budget-spent."""
+    if not legs:
+        return MappingProxyType({})
+    rows: Final = _ATTEMPT_COUNT_ROWS.validate_python(
+        await _query_raw(prisma_client, _ATTEMPT_COUNTS_SQL, [leg.id for leg in legs])  # mutable-ok: query param
+        or ()
+    )
+    return MappingProxyType({row.job_id: row.attempt_count for row in rows})
+
+
+def _group_response(group_id: str, legs: Sequence[_LegRow], attempt_counts: Mapping[str, int]) -> ShadowEvalJobResponse:
+    """The one constructor of a job response: the caller names the group and passes that
+    group's legs. Config is read off the first leg because every leg carries the same copy,
+    written by one create_many. No caller may serialize a raw row (that would leak a leg id
+    as the job id)."""
+    first: Final = legs[0]
+    return ShadowEvalJobResponse(
+        job_id=group_id,
+        keys=tuple(
+            ShadowEvalJobKeyResponse(
+                api_key_id=leg.api_key_id,
+                max_turns=leg.max_turns,
+                stopped_at=leg.stopped_at,
+                attempt_count=attempt_counts.get(leg.id, 0),
+            )
+            for leg in sorted(legs, key=lambda leg: leg.api_key_id)
+        ),
+        router_name=first.router_name,
+        direction=first.direction,
+        baseline_model=first.baseline_model,
+        judge_model=first.judge_model,
+        shadow_percentage=first.shadow_percentage,
+        created_at=first.created_at,
+        ends_at=first.ends_at,
+        stopped_by=next((leg.stopped_by for leg in legs if leg.stopped_by is not None), None),
+    )
+
+
 _NO_KEY_LABELS: Final[tuple[str | None, str | None]] = (None, None)
 
 
 async def _with_key_labels(
     prisma_client: "PrismaClient", responses: Sequence[ShadowEvalJobResponse]
 ) -> tuple[ShadowEvalJobResponse, ...]:
-    """Resolve each job's key hash to the key's alias and masked name in one batched read,
+    """Resolve every scoped key's hash to its alias and masked name in one batched read,
     so the UI can say whose traffic a job shadows. Deleted keys resolve to None."""
     if not responses:
         return ()
+    tokens: Final = sorted(frozenset(key.api_key_id for response in responses for key in response.keys))
     key_rows: Final = await _verification_tokens(prisma_client).find_many(
-        where={"token": {"in": sorted({response.api_key_id for response in responses})}}  # mutable-ok: Prisma filter
+        where={"token": {"in": tokens}}  # mutable-ok: Prisma filter
     )
     labels: Final[Mapping[str, tuple[str | None, str | None]]] = {
         row.token: (row.key_alias, row.key_name) for row in key_rows or ()
@@ -678,32 +801,50 @@ async def _with_key_labels(
     return tuple(
         response.model_copy(
             update={  # mutable-ok: pydantic update payload
-                "key_alias": labels.get(response.api_key_id, _NO_KEY_LABELS)[0],
-                "key_name": labels.get(response.api_key_id, _NO_KEY_LABELS)[1],
+                "keys": tuple(
+                    key.model_copy(
+                        update={  # mutable-ok: pydantic update payload
+                            "key_alias": labels.get(key.api_key_id, _NO_KEY_LABELS)[0],
+                            "key_name": labels.get(key.api_key_id, _NO_KEY_LABELS)[1],
+                        }
+                    )
+                    for key in response.keys
+                )
             }
         )
         for response in responses
     )
 
 
-async def _shadow_eval_results(prisma_client: "PrismaClient", job_id: str) -> ShadowEvalResult | None:
-    """Both stratifications of one job's verdicts. Tier answers "where does the router do
-    well"; the model stratification groups by whichever model served the real arm, so it
-    answers "which of the models this key uses today would the router beat" forward, and
-    "for the turns the router sent to X, did X beat the baseline" in reverse. Reads are
-    bounded by the job's own attempts (<= max_turns) via the job_id index."""
+async def _shadow_eval_results(prisma_client: "PrismaClient", legs: Sequence[_LegRow]) -> ShadowEvalResult | None:
+    """All three stratifications of one job's verdicts. Tier answers "where does the router
+    do well"; the model stratification groups by whichever model served the real arm, so it
+    answers "which of the models these keys use today would the router beat" forward, and
+    "for the turns the router sent to X, did X beat the baseline" in reverse; key answers
+    "which key's traffic does the router suit". Reads are bounded by the job's own attempts
+    (<= the sum of its keys' max_turns) via the job_id index."""
+    leg_ids: Final = [leg.id for leg in legs]  # mutable-ok: query param
     by_tier: Final = _ATTEMPT_AGG_ROWS.validate_python(
-        await _query_raw(prisma_client, _ATTEMPT_AGG_BY_TIER_SQL, job_id) or ()
+        await _query_raw(prisma_client, _ATTEMPT_AGG_BY_TIER_SQL, leg_ids) or ()
     )
     if not by_tier:
         return None
     by_model: Final = _ATTEMPT_AGG_ROWS.validate_python(
-        await _query_raw(prisma_client, _ATTEMPT_AGG_BY_MODEL_SQL, job_id) or ()
+        await _query_raw(prisma_client, _ATTEMPT_AGG_BY_MODEL_SQL, leg_ids) or ()
+    )
+    key_by_leg: Final = MappingProxyType({leg.id: leg.api_key_id for leg in legs})
+    by_leg: Final = _ATTEMPT_AGG_ROWS.validate_python(
+        await _query_raw(prisma_client, _ATTEMPT_AGG_BY_LEG_SQL, leg_ids) or ()
+    )
+    by_key: Final = tuple(
+        row.model_copy(update={"grp": key_by_leg[row.grp]})  # mutable-ok: pydantic update payload
+        for row in by_leg
     )
     total_turns: Final = sum(r.turn_count for r in by_tier)
     return ShadowEvalResult(
         by_tier=_slices(by_tier),
         by_current_model=_slices(by_model),
+        by_key=_slices(by_key),
         overall_shadow_win_rate_pct=_pct_of(sum(r.shadow_wins for r in by_tier), total_turns),
         overall_tie_rate_pct=_pct_of(sum(r.ties for r in by_tier), total_turns),
     )
@@ -721,20 +862,21 @@ async def start_shadow_eval(
     user_api_key_dict: Annotated[UserAPIKeyAuth, Depends(user_api_key_auth)],
 ) -> ShadowEvalJobResponse:
     """
-    Start a shadow eval: duplicate a sampled slice of a key's live traffic against a second
-    arm, judge the two responses blind, and stratify win rates by tier and by the model that
-    served the real arm.
+    Start a shadow eval: duplicate a sampled slice of one or more keys' live traffic against
+    a second arm, judge the two responses blind, and stratify win rates by tier, by the model
+    that served the real arm, and by key.
 
-    A forward job answers whether the key should adopt router_name: it samples the requests
+    A forward job answers whether the keys should adopt router_name: it samples the requests
     the router did not serve and duplicates them through it. A reverse job answers whether a
     key already on the router still gains from it: it samples the requests the router did
     serve and duplicates them against baseline_model. A key can hold one active job per
     direction, so both questions can run at once.
 
-    Shadow responses are never served to users. The job samples until it has judged
-    max_turns turns, reaches the end of its window, or is stopped; sampling changes
-    propagate to pods within about 10 seconds. Shadow and judge calls bill to the
-    shadowed key but are excluded from request counts and auto-router adoption metrics.
+    Shadow responses are never served to users. Each key samples until it has judged
+    max_turns turns of its own traffic, the job's window ends, or the job is stopped, so one
+    key running out of budget does not end sampling for the others; sampling changes
+    propagate to pods within about 10 seconds. Shadow and judge calls bill to the shadowed
+    key but are excluded from request counts and auto-router adoption metrics.
     """
     from litellm.proxy.proxy_server import llm_router, prisma_client
 
@@ -746,48 +888,58 @@ async def start_shadow_eval(
     _validate_plain_model(llm_router, data.judge_model, "judge_model")
     if data.baseline_model is not None:
         _validate_plain_model(llm_router, data.baseline_model, "baseline_model")
-    key_row: Final = await _verification_tokens(prisma_client).find_unique(
-        where={"token": data.api_key_id}  # mutable-ok: Prisma filter
+    token_rows: Final = await _verification_tokens(prisma_client).find_many(
+        where={"token": {"in": list(data.api_key_ids)}}  # mutable-ok: Prisma filter
     )
-    if key_row is None:
+    unknown: Final = tuple(sorted(frozenset(data.api_key_ids) - frozenset(row.token for row in token_rows or ())))
+    if unknown:
         raise HTTPException(
             status_code=400,
             detail=(
-                f"api_key_id '{data.api_key_id}' is not a key on this proxy; pass the key's token hash, "
+                f"api_key_ids not on this proxy: {', '.join(unknown)}; pass each key's token hash, "
                 "the value the key list and key info endpoints report"
             ),
         )
 
-    # A job that expired or exhausted its turn budget stopped sampling on its own, but
-    # still holds its slot in the per-key, per-direction partial unique index until
-    # stamped; free it so a new eval can start. Sweeping both directions is deliberate.
-    await prisma_client.db.execute_raw(_SWEEP_FINISHED_JOBS_SQL, data.api_key_id)
-    active: Final = await _shadow_eval_jobs(prisma_client).find_first(
+    # A job whose window passed or whose turn budget ran out stopped sampling on its own,
+    # but its legs still hold their slots in the per-key, per-direction partial unique index
+    # until stamped; free them so a new eval can start. Sweeping both directions is deliberate.
+    requested: Final = list(data.api_key_ids)  # mutable-ok: query param
+    await prisma_client.db.execute_raw(_SWEEP_FINISHED_JOBS_SQL, requested)
+    claimed: Final = await _shadow_eval_jobs(prisma_client).find_many(
         where={  # mutable-ok: Prisma filter
-            "api_key_id": data.api_key_id,
+            "api_key_id": {"in": requested},  # mutable-ok: Prisma filter
             "direction": data.direction,
             "stopped_at": None,
         },
     )
-    if active is not None:
+    if claimed:
         raise HTTPException(
             status_code=409,
-            detail=f"Key already has an active {data.direction} shadow eval job ({active.id}). Stop it first.",
+            detail=(
+                f"Already in an active {data.direction} shadow eval job: "
+                + ", ".join(sorted(f"{row.api_key_id} (job {row.group_id})" for row in claimed))
+                + ". Stop it first."
+            ),
         )
     now: Final = datetime.now(timezone.utc)
+    group_id: Final = str(uuid4())
+    ends_at: Final = now + timedelta(days=data.duration_days)
+    shared_config: Final = {  # mutable-ok: Prisma payload
+        "group_id": group_id,
+        "router_name": data.router_name,
+        "direction": data.direction,
+        "baseline_model": data.baseline_model,
+        "judge_model": data.judge_model,
+        "shadow_percentage": data.shadow_percentage,
+        "max_turns": data.max_turns,
+        "created_by": user_api_key_dict.user_id,
+        "created_at": now,
+        "ends_at": ends_at,
+    }
     try:
-        job: Final = await _shadow_eval_jobs(prisma_client).create(
-            data={  # mutable-ok: Prisma payload
-                "api_key_id": data.api_key_id,
-                "router_name": data.router_name,
-                "direction": data.direction,
-                "baseline_model": data.baseline_model,
-                "judge_model": data.judge_model,
-                "shadow_percentage": data.shadow_percentage,
-                "max_turns": data.max_turns,
-                "created_by": user_api_key_dict.user_id,
-                "ends_at": now + timedelta(days=data.duration_days),
-            }
+        await _shadow_eval_jobs(prisma_client).create_many(
+            data=[{**shared_config, "api_key_id": key} for key in data.api_key_ids]  # mutable-ok: Prisma payload
         )
     except Exception as e:
         if not _is_unique_violation(e):
@@ -795,11 +947,28 @@ async def start_shadow_eval(
         raise HTTPException(
             status_code=409,
             detail=(
-                f"Key already has an active {data.direction} shadow eval job (started concurrently). Stop it first."
+                f"A requested key was claimed by another {data.direction} shadow eval job concurrently. Stop it first."
             ),
         ) from e
-    return ShadowEvalJobResponse.model_validate(job, from_attributes=True).model_copy(
-        update={"key_alias": key_row.key_alias, "key_name": key_row.key_name}  # mutable-ok: pydantic update payload
+    labels: Final = MappingProxyType({row.token: row for row in token_rows})
+    return ShadowEvalJobResponse(
+        job_id=group_id,
+        keys=tuple(
+            ShadowEvalJobKeyResponse(
+                api_key_id=api_key_id,
+                max_turns=data.max_turns,
+                key_alias=labels[api_key_id].key_alias,
+                key_name=labels[api_key_id].key_name,
+            )
+            for api_key_id in sorted(data.api_key_ids)
+        ),
+        router_name=data.router_name,
+        direction=data.direction,
+        baseline_model=data.baseline_model,
+        judge_model=data.judge_model,
+        shadow_percentage=data.shadow_percentage,
+        created_at=now,
+        ends_at=ends_at,
     )
 
 
@@ -811,23 +980,38 @@ async def start_shadow_eval(
 )
 async def list_shadow_eval_jobs(
     user_api_key_dict: Annotated[UserAPIKeyAuth, Depends(user_api_key_auth)],
-    api_key_id: Annotated[str | None, Query(description="Filter to jobs shadowing this key")] = None,
+    api_key_id: Annotated[
+        str | None, Query(description="Filter to jobs that shadow this key, alone or alongside others")
+    ] = None,
     limit: Annotated[int, Query(ge=1, le=200, description="Newest jobs to return")] = 50,
 ) -> tuple[ShadowEvalJobResponse, ...]:
-    """List shadow eval jobs, newest first. Counts and results ride the detail endpoint only."""
+    """List shadow eval jobs, newest first, each key with its attempt count so status is
+    accurate. Judged counts, spend, and results ride the detail endpoint only."""
     from litellm.proxy.proxy_server import prisma_client
 
     _require_admin_viewer(user_api_key_dict, "view shadow evals")
     if prisma_client is None:
         raise HTTPException(status_code=500, detail=CommonProxyErrors.db_not_connected_error.value)
-    records: Final = await _shadow_eval_jobs(prisma_client).find_many(
-        where={"api_key_id": api_key_id} if api_key_id else {},  # mutable-ok: Prisma filter
-        order={"created_at": "desc"},  # mutable-ok: Prisma order
-        take=limit,
+    legs: Final = _LEG_ROWS.validate_python(
+        (
+            await _query_raw(prisma_client, _LIST_LEGS_BY_KEY_SQL, limit, api_key_id)
+            if api_key_id
+            else await _query_raw(prisma_client, _LIST_LEGS_SQL, limit)
+        )
+        or ()
     )
+    by_group: Final[Mapping[str, tuple[_LegRow, ...]]] = MappingProxyType(
+        {
+            group_id: tuple(group)
+            for group_id, group in groupby(sorted(legs, key=attrgetter("group_id")), key=attrgetter("group_id"))
+        }
+    )
+    newest_first: Final = sorted(
+        by_group, key=lambda group_id: max(leg.created_at for leg in by_group[group_id]), reverse=True
+    )
+    counts: Final = await _leg_attempt_counts(prisma_client, legs)
     return await _with_key_labels(
-        prisma_client,
-        tuple(ShadowEvalJobResponse.model_validate(record, from_attributes=True) for record in records or ()),
+        prisma_client, tuple(_group_response(group_id, by_group[group_id], counts) for group_id in newest_first)
     )
 
 
@@ -847,20 +1031,24 @@ async def get_shadow_eval_job(
     _require_admin_viewer(user_api_key_dict, "view shadow evals")
     if prisma_client is None:
         raise HTTPException(status_code=500, detail=CommonProxyErrors.db_not_connected_error.value)
-    record: Final = await _shadow_eval_jobs(prisma_client).find_unique(
-        where={"id": job_id}  # mutable-ok: Prisma filter
+    legs: Final = _LEG_ROWS.validate_python(
+        await _shadow_eval_jobs(prisma_client).find_many(
+            where={"group_id": job_id}  # mutable-ok: Prisma filter
+        )
+        or ()
     )
-    if record is None:
+    if not legs:
         raise HTTPException(status_code=404, detail=f"No shadow eval job {job_id}")
+    leg_ids: Final = [leg.id for leg in legs]  # mutable-ok: query param
     totals: Final = _ATTEMPT_TOTALS_ROWS.validate_python(
-        await _query_raw(prisma_client, _ATTEMPT_TOTALS_SQL, job_id) or ()
+        await _query_raw(prisma_client, _ATTEMPT_TOTALS_SQL, leg_ids) or ()
     )
     latest_error: Final = await _shadow_eval_attempts(prisma_client).find_first(
-        where={"job_id": job_id, "outcome": "error"},  # mutable-ok: Prisma filter
+        where={"job_id": {"in": leg_ids}, "outcome": "error"},  # mutable-ok: Prisma filter
         order={"created_at": "desc"},  # mutable-ok: Prisma order
     )
     labeled: Final = await _with_key_labels(
-        prisma_client, (ShadowEvalJobResponse.model_validate(record, from_attributes=True),)
+        prisma_client, (_group_response(job_id, legs, await _leg_attempt_counts(prisma_client, legs)),)
     )
     return labeled[0].model_copy(
         update={  # mutable-ok: pydantic update payload
@@ -868,7 +1056,7 @@ async def get_shadow_eval_job(
             "error_count": totals[0].error_count if totals else 0,
             "judge_spend": round(totals[0].judge_spend, 6) if totals else 0.0,
             "last_error": latest_error.error if latest_error else None,
-            "results": await _shadow_eval_results(prisma_client, job_id),
+            "results": await _shadow_eval_results(prisma_client, legs),
         }
     )
 
@@ -883,25 +1071,33 @@ async def stop_shadow_eval_job(
     job_id: str,
     user_api_key_dict: Annotated[UserAPIKeyAuth, Depends(user_api_key_auth)],
 ) -> ShadowEvalJobResponse:
-    """Stop an active shadow eval job. Attempts are kept; sampling halts within ~10s."""
+    """Stop an active shadow eval job, every key it scopes at once. Attempts are kept;
+    sampling halts within ~10s. Keys that already stopped on their own budget keep the
+    stopped_at they earned. The statement is the whole state machine: it claims the job
+    only while a leg still samples inside the window with no stop recorded, so a racing
+    operator, a same-instant budget spend, and a repeat stop all read the same 400 with
+    the status the job actually holds."""
     from litellm.proxy.proxy_server import prisma_client
 
     _require_admin_writer(user_api_key_dict, "stop a shadow eval")
     if prisma_client is None:
         raise HTTPException(status_code=500, detail=CommonProxyErrors.db_not_connected_error.value)
-    record: Final = await _shadow_eval_jobs(prisma_client).find_unique(
-        where={"id": job_id}  # mutable-ok: Prisma filter
+    stamp: Final = datetime.now(timezone.utc)
+    operator: Final = user_api_key_dict.user_id or "operator"
+    claimed: Final = await prisma_client.db.execute_raw(
+        _STOP_JOB_SQL, job_id, operator, stamp.replace(tzinfo=None).isoformat()
     )
-    if record is None:
+    legs: Final = _LEG_ROWS.validate_python(
+        await _shadow_eval_jobs(prisma_client).find_many(
+            where={"group_id": job_id}  # mutable-ok: Prisma filter
+        )
+        or ()
+    )
+    if not legs:
         raise HTTPException(status_code=404, detail=f"No shadow eval job {job_id}")
-    current: Final = ShadowEvalJobResponse.model_validate(record, from_attributes=True)
-    if current.status != "running":
+    counts: Final = await _leg_attempt_counts(prisma_client, legs)
+    current: Final = _group_response(job_id, legs, counts)
+    if claimed == 0:
         raise HTTPException(status_code=400, detail=f"Job {job_id} is already {current.status}")
-    updated: Final = await _shadow_eval_jobs(prisma_client).update(
-        where={"id": job_id},  # mutable-ok: Prisma filter
-        data={"stopped_at": datetime.now(timezone.utc)},  # mutable-ok: Prisma payload
-    )
-    labeled: Final = await _with_key_labels(
-        prisma_client, (ShadowEvalJobResponse.model_validate(updated, from_attributes=True),)
-    )
+    labeled: Final = await _with_key_labels(prisma_client, (current,))
     return labeled[0]
diff --git a/litellm/proxy/management_endpoints/cache_settings_endpoints.py b/litellm/proxy/management_endpoints/cache_settings_endpoints.py
index 53d03bc7ba6..385073edc90 100644
--- a/litellm/proxy/management_endpoints/cache_settings_endpoints.py
+++ b/litellm/proxy/management_endpoints/cache_settings_endpoints.py
@@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Final, Protocol
 from fastapi import APIRouter, Depends, Header, HTTPException
 from pydantic import BaseModel, Field
 
-import litellm
 from litellm._logging import verbose_proxy_logger
 from litellm._redis import _redis_kwargs_from_environment
 from litellm._uuid import uuid
@@ -299,14 +298,15 @@ async def _emit_cache_settings_audit_log(
     exception.  Captured under ``LiteLLM_CacheConfig`` so the row
     co-locates with the table it mutates.
     """
-    if litellm.store_audit_logs is not True:
-        return
-
     from litellm.proxy.management_helpers.audit_logs import (
         create_audit_log_for_update,
+        is_audit_logging_enabled,
     )
     from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
+    if not is_audit_logging_enabled():
+        return
+
     task: Final = asyncio.create_task(
         create_audit_log_for_update(
             request_data=LiteLLM_AuditLogs(
diff --git a/litellm/proxy/management_endpoints/config_override_endpoints.py b/litellm/proxy/management_endpoints/config_override_endpoints.py
index 12c99477d3c..dde0751d98d 100644
--- a/litellm/proxy/management_endpoints/config_override_endpoints.py
+++ b/litellm/proxy/management_endpoints/config_override_endpoints.py
@@ -100,16 +100,15 @@ async def _emit_hashicorp_vault_audit_log(
     ``LiteLLM_ConfigOverrides`` so the row co-locates with the table it
     mutates.
     """
-    import litellm
-
-    if litellm.store_audit_logs is not True:
-        return
-
     from litellm.proxy.management_helpers.audit_logs import (
         create_audit_log_for_update,
+        is_audit_logging_enabled,
     )
     from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
+    if not is_audit_logging_enabled():
+        return
+
     task: Final = asyncio.create_task(
         create_audit_log_for_update(
             request_data=LiteLLM_AuditLogs(
diff --git a/litellm/proxy/management_endpoints/coordination_redis_endpoints.py b/litellm/proxy/management_endpoints/coordination_redis_endpoints.py
index fe9a613656d..86ce336c7a3 100644
--- a/litellm/proxy/management_endpoints/coordination_redis_endpoints.py
+++ b/litellm/proxy/management_endpoints/coordination_redis_endpoints.py
@@ -243,12 +243,15 @@ async def _emit_coordination_redis_audit_log(
     litellm_changed_by: str | None,
 ) -> None:
     """Emit an audit-log row for a /coordination_redis/settings mutation."""
-    if litellm.store_audit_logs is not True:
-        return
-
-    from litellm.proxy.management_helpers.audit_logs import create_audit_log_for_update
+    from litellm.proxy.management_helpers.audit_logs import (
+        create_audit_log_for_update,
+        is_audit_logging_enabled,
+    )
     from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
+    if not is_audit_logging_enabled():
+        return
+
     task: Final = asyncio.create_task(
         create_audit_log_for_update(
             request_data=LiteLLM_AuditLogs(
diff --git a/litellm/proxy/management_endpoints/internal_user_endpoints.py b/litellm/proxy/management_endpoints/internal_user_endpoints.py
index 2b88658e1b4..99a85e02b52 100644
--- a/litellm/proxy/management_endpoints/internal_user_endpoints.py
+++ b/litellm/proxy/management_endpoints/internal_user_endpoints.py
@@ -2220,6 +2220,7 @@ async def delete_user(
     )
     from litellm.proxy.management_helpers.audit_logs import (
         get_audit_log_changed_by,
+        is_audit_logging_enabled,
     )
     from litellm.proxy.proxy_server import (
         create_audit_log_for_update,
@@ -2298,9 +2299,8 @@ async def delete_user(
                     },
                 )
 
-        # Enterprise Feature - Audit Logging. Enable with litellm.store_audit_logs = True
         # we do this after the first for loop, since first for loop is for validation. we only want this inserted after validation passes
-        if litellm.store_audit_logs is True:
+        if is_audit_logging_enabled():
             # make an audit log for each team deleted
             _user_row = user_row.json(exclude_none=True)
 
diff --git a/litellm/proxy/management_endpoints/key_management_endpoints.py b/litellm/proxy/management_endpoints/key_management_endpoints.py
index ade568ad07f..71218d6114b 100644
--- a/litellm/proxy/management_endpoints/key_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/key_management_endpoints.py
@@ -1423,6 +1423,11 @@ async def _check_team_key_limits(
     )
 
 
+_INHERITED_MODEL_SENTINELS: Final = frozenset(
+    {SpecialModelNames.all_team_models.value, SpecialModelNames.all_proxy_models.value}
+)
+
+
 async def _check_project_key_limits(
     project_id: str,
     data: GenerateKeyRequest | UpdateKeyRequest,
@@ -1432,7 +1437,8 @@ async def _check_project_key_limits(
     """
     Validate that key's models and budget respect its project's limits.
 
-    - Key models must be a subset of project models
+    - Key models must be a subset of project models, except the all-team-models / all-proxy-models
+      sentinels, which inherit a parent scope and are narrowed by the project at request time
     - Key max_budget must be <= project max_budget
     """
     project_obj: Final = await get_project_object(
@@ -1450,7 +1456,7 @@ async def _check_project_key_limits(
     # Validate key models are a subset of project models
     if data.models and len(project_obj.models) > 0:
         for m in data.models:
-            if m not in project_obj.models:
+            if m not in project_obj.models and m not in _INHERITED_MODEL_SENTINELS:
                 raise HTTPException(
                     status_code=400,
                     detail={
@@ -6266,6 +6272,7 @@ async def block_key(
     """
     from litellm.proxy.management_helpers.audit_logs import (
         get_audit_log_changed_by,
+        is_audit_logging_enabled,
     )
     from litellm.proxy.proxy_server import (
         create_audit_log_for_update,
@@ -6312,7 +6319,7 @@ async def block_key(
             code=status.HTTP_404_NOT_FOUND,
         )
 
-    if litellm.store_audit_logs is True:
+    if is_audit_logging_enabled():
         asyncio.create_task(
             create_audit_log_for_update(
                 request_data=LiteLLM_AuditLogs(
@@ -6379,6 +6386,7 @@ async def unblock_key(
     """
     from litellm.proxy.management_helpers.audit_logs import (
         get_audit_log_changed_by,
+        is_audit_logging_enabled,
     )
     from litellm.proxy.proxy_server import (
         create_audit_log_for_update,
@@ -6425,7 +6433,7 @@ async def unblock_key(
             code=status.HTTP_404_NOT_FOUND,
         )
 
-    if litellm.store_audit_logs is True:
+    if is_audit_logging_enabled():
         asyncio.create_task(
             create_audit_log_for_update(
                 request_data=LiteLLM_AuditLogs(
diff --git a/litellm/proxy/management_endpoints/mcp_management_endpoints.py b/litellm/proxy/management_endpoints/mcp_management_endpoints.py
index 06c32af2dc2..54a591a5e1a 100644
--- a/litellm/proxy/management_endpoints/mcp_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/mcp_management_endpoints.py
@@ -64,7 +64,10 @@ from litellm.proxy.common_utils.encrypt_decrypt_utils import (
     decrypt_value_helper,
     encrypt_value_helper,
 )
-from litellm.proxy.management_helpers.audit_logs import get_audit_log_changed_by
+from litellm.proxy.management_helpers.audit_logs import (
+    get_audit_log_changed_by,
+    is_audit_logging_enabled,
+)
 from litellm.repositories.table_repositories import (
     MCPServerRepository,
     MCPUserCredentialsRepository,
@@ -2018,7 +2021,7 @@ if MCP_AVAILABLE:
         await global_mcp_server_manager.reload_servers_from_database()
 
         # TODO: Enterprise: Finish audit log trail
-        if litellm.store_audit_logs:
+        if is_audit_logging_enabled():
             pass
 
         # TODO: Delete from virtual keys
@@ -2613,7 +2616,7 @@ if MCP_AVAILABLE:
                 )
 
         # TODO: Enterprise: Finish audit log trail
-        if litellm.store_audit_logs:
+        if is_audit_logging_enabled():
             pass
 
         return _redact_mcp_credentials(mcp_server_record_updated)
diff --git a/litellm/proxy/management_endpoints/model_management_endpoints.py b/litellm/proxy/management_endpoints/model_management_endpoints.py
index ade24d194d2..1b49e2455e4 100644
--- a/litellm/proxy/management_endpoints/model_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/model_management_endpoints.py
@@ -24,6 +24,13 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationError
 from litellm._logging import verbose_proxy_logger
 from litellm._uuid import uuid
 from litellm.constants import LITELLM_PROXY_ADMIN_NAME
+from litellm.litellm_core_utils.ptu_pricing import (
+    CUSTOM_PRICING_FIELDS,
+    PTU_EMPTIED_PRICING_FIELDS,
+    PTU_ZEROED_PRICING_FIELDS,
+    PTU_ZEROED_TABLE_FIELDS,
+    SEARCH_CONTEXT_SIZES,
+)
 from litellm.proxy._types import (
     BlockModelRequest,
     CommonProxyErrors,
@@ -89,7 +96,6 @@ from litellm.types.router import (
     ModelInfo,
     updateDeployment,
 )
-from litellm.types.utils import CustomPricingLiteLLMParams
 from litellm.utils import get_utc_datetime
 
 router: Final = APIRouter()
@@ -346,12 +352,8 @@ def _validate_ptu_model_info(model_info: Mapping[str, object]) -> None:
 # tiered_pricing is the one mirrored field that is a table of ranges, not a rate, so it is stored
 # empty (see _PTU_EMPTIED_PRICING_FIELDS): its tiers outrank the zeros written beside them, so
 # dropping it would leave the cost map's tiers billing the traffic the reserved capacity covers.
-_PTU_ZEROED_PRICING_FIELDS: Final = tuple(f for f in SPECIAL_MODEL_INFO_PARAMS if f != "tiered_pricing") + (
-    "cache_creation_input_token_cost_above_1hr",
-    "cache_creation_input_token_cost_above_200k_tokens",
-    "cache_read_input_token_cost_above_200k_tokens",
-)
-_PTU_EMPTIED_PRICING_FIELDS: Final = frozenset({"tiered_pricing"})
+_PTU_ZEROED_PRICING_FIELDS: Final = PTU_ZEROED_PRICING_FIELDS
+_PTU_EMPTIED_PRICING_FIELDS: Final = PTU_EMPTIED_PRICING_FIELDS
 _PTU_ZEROED_PRICING: Final[Mapping[str, float | tuple[()]]] = MappingProxyType(
     {
         **dict.fromkeys(_PTU_ZEROED_PRICING_FIELDS, 0.0),
@@ -363,13 +365,13 @@ _EMPTY_MODEL_INFO: Final[Mapping[str, object]] = _NO_PRICING_OVERRIDE
 # Rate fields only. CustomPricingLiteLLMParams also carries settings that are not charges
 # (an embedding's output_vector_size, the regional uplift multipliers), and zeroing one of
 # those would destroy the deployment's configuration rather than stop a charge.
-_CUSTOM_PRICING_FIELDS: Final = frozenset(f for f in CustomPricingLiteLLMParams.model_fields if "cost" in f)
+_CUSTOM_PRICING_FIELDS: Final = CUSTOM_PRICING_FIELDS
 # search_context_cost_per_query holds its rates in a table keyed by context size, and an absent
 # table means the provider's own default rate rather than free (litellm/llms/gemini/cost_calculator
 # falls back to $0.035), so it is zeroed in place rather than emptied like tiered_pricing, and
 # written on every PTU deployment rather than only where a table is already stored.
-_PTU_ZEROED_TABLE_FIELDS: Final = frozenset({"search_context_cost_per_query"})
-_SEARCH_CONTEXT_SIZES: Final = ("search_context_size_low", "search_context_size_medium", "search_context_size_high")
+_PTU_ZEROED_TABLE_FIELDS: Final = PTU_ZEROED_TABLE_FIELDS
+_SEARCH_CONTEXT_SIZES: Final = SEARCH_CONTEXT_SIZES
 
 
 def _is_nonzero_rate(value: object) -> bool:
diff --git a/litellm/proxy/management_endpoints/team_callback_endpoints.py b/litellm/proxy/management_endpoints/team_callback_endpoints.py
index 472e25bbc28..0e8c4e1825d 100644
--- a/litellm/proxy/management_endpoints/team_callback_endpoints.py
+++ b/litellm/proxy/management_endpoints/team_callback_endpoints.py
@@ -13,7 +13,6 @@ from typing import Annotated, Any, Final
 
 from fastapi import APIRouter, Depends, Header, HTTPException, Request, status
 
-import litellm
 from litellm._logging import verbose_proxy_logger
 from litellm._uuid import uuid
 from litellm.proxy._types import (
@@ -182,14 +181,15 @@ async def _emit_team_callback_audit_log(
     Callback secrets are redacted before serialization so the audit table
     cannot itself become a credential-harvest sink.
     """
-    if litellm.store_audit_logs is not True:
-        return
-
     from litellm.proxy.management_helpers.audit_logs import (
         create_audit_log_for_update,
+        is_audit_logging_enabled,
     )
     from litellm.proxy.proxy_server import litellm_proxy_admin_name
 
+    if not is_audit_logging_enabled():
+        return
+
     redacted_before: Final = _redact_callback_secrets(before_metadata)
     redacted_after: Final = _redact_callback_secrets(after_metadata)
 
diff --git a/litellm/proxy/management_endpoints/team_endpoints.py b/litellm/proxy/management_endpoints/team_endpoints.py
index 31006958ba1..82e22bb5bbf 100644
--- a/litellm/proxy/management_endpoints/team_endpoints.py
+++ b/litellm/proxy/management_endpoints/team_endpoints.py
@@ -1252,6 +1252,7 @@ async def new_team(
     try:
         from litellm.proxy.management_helpers.audit_logs import (
             get_audit_log_changed_by,
+            is_audit_logging_enabled,
         )
         from litellm.proxy.proxy_server import (
             _license_check,
@@ -1560,8 +1561,7 @@ async def new_team(
             litellm_proxy_admin_name=litellm_proxy_admin_name,
         )
 
-        # Enterprise Feature - Audit Logging. Enable with litellm.store_audit_logs = True
-        if litellm.store_audit_logs is True:
+        if is_audit_logging_enabled():
             _updated_values = complete_team_data.json(exclude_none=True)
 
             _updated_values = json.dumps(_updated_values, default=str)
@@ -1953,6 +1953,7 @@ async def update_team(
     ```
     """
     try:
+        from litellm.proxy.management_helpers.audit_logs import is_audit_logging_enabled
         from litellm.proxy.proxy_server import (
             litellm_proxy_admin_name,
             llm_router,
@@ -2261,8 +2262,7 @@ async def update_team(
             proxy_logging_obj=proxy_logging_obj,
         )
 
-        # Enterprise Feature - Audit Logging. Enable with litellm.store_audit_logs = True
-        if litellm.store_audit_logs is True:
+        if is_audit_logging_enabled():
             await _create_team_update_audit_log(
                 existing_team_row=existing_team_row,
                 updated_kv=updated_kv,
@@ -3727,6 +3727,7 @@ async def delete_team(
     """
     from litellm.proxy.management_helpers.audit_logs import (
         get_audit_log_changed_by,
+        is_audit_logging_enabled,
     )
     from litellm.proxy.proxy_server import (
         create_audit_log_for_update,
@@ -3771,9 +3772,8 @@ async def delete_team(
         litellm_changed_by=litellm_changed_by,
     )
 
-    # Enterprise Feature - Audit Logging. Enable with litellm.store_audit_logs = True
     # we do this after the first for loop, since first for loop is for validation. we only want this inserted after validation passes
-    if litellm.store_audit_logs is True:
+    if is_audit_logging_enabled():
         # make an audit log for each team deleted
         for team_id in data.team_ids:
             team_row: LiteLLM_TeamTable | None = await prisma_client.get_data(
diff --git a/litellm/proxy/management_helpers/audit_logs.py b/litellm/proxy/management_helpers/audit_logs.py
index 2b714f06413..ecd6abea3c3 100644
--- a/litellm/proxy/management_helpers/audit_logs.py
+++ b/litellm/proxy/management_helpers/audit_logs.py
@@ -24,6 +24,22 @@ _audit_log_callback_cache: Final[dict[str, CustomLogger]] = {}
 ALLOW_LITELLM_CHANGED_BY_HEADER_METADATA_KEY: Final = "allow_litellm_changed_by_header"
 
 
+def is_audit_logging_enabled(store_audit_logs: bool | None = None) -> bool:
+    from litellm.secret_managers.main import get_secret_bool
+
+    configured_value: Final[bool | None] = litellm.store_audit_logs if store_audit_logs is None else store_audit_logs
+    if configured_value is not None:
+        return configured_value
+
+    environment_value: Final[bool | None] = get_secret_bool("LITELLM_STORE_AUDIT_LOGS")
+    if environment_value is not None:
+        return environment_value
+
+    from litellm.proxy.proxy_server import premium_user
+
+    return premium_user is True
+
+
 def _allows_litellm_changed_by_header(user_api_key_dict: UserAPIKeyAuth) -> bool:
     for admin_metadata in (user_api_key_dict.metadata, user_api_key_dict.team_metadata):
         if (
@@ -164,11 +180,7 @@ async def create_object_audit_log(
     - user_api_key_dict: UserAPIKeyAuth - The user api key dictionary.
     - litellm_proxy_admin_name: Optional[str] - The name of the proxy admin.
     """
-    from litellm.secret_managers.main import get_secret_bool
-
-    _store_audit_logs: Final[bool | None] = litellm.store_audit_logs or get_secret_bool("LITELLM_STORE_AUDIT_LOGS")
-
-    if _store_audit_logs is not True:
+    if not is_audit_logging_enabled():
         return
 
     _changed_by: Final = get_audit_log_changed_by(
@@ -196,10 +208,7 @@ async def create_audit_log_for_update(request_data: LiteLLM_AuditLogs):
     """
     Create an audit log for an object.
     """
-    from litellm.secret_managers.main import get_secret_bool
-
-    _store_audit_logs: Final[bool | None] = litellm.store_audit_logs or get_secret_bool("LITELLM_STORE_AUDIT_LOGS")
-    if _store_audit_logs is not True:
+    if not is_audit_logging_enabled():
         return
 
     from litellm.proxy.proxy_server import premium_user, prisma_client
diff --git a/litellm/proxy/openai_files_endpoints/batch_file_validation.py b/litellm/proxy/openai_files_endpoints/batch_file_validation.py
new file mode 100644
index 00000000000..0aee5e8cc54
--- /dev/null
+++ b/litellm/proxy/openai_files_endpoints/batch_file_validation.py
@@ -0,0 +1,182 @@
+import json
+from collections.abc import Iterator
+from dataclasses import dataclass
+from itertools import chain
+from typing import BinaryIO, Final, NoReturn, assert_never
+
+from litellm.proxy._types import ProxyException
+
+BATCH_LINE_REQUIRED_KEYS: Final = ("custom_id", "method", "url", "body")
+_MB: Final = 1024 * 1024
+
+
+@dataclass(frozen=True, slots=True)
+class BatchFileTooLarge:
+    size_bytes: int
+    limit_mb: int
+
+
+@dataclass(frozen=True, slots=True)
+class BatchFileWrongExtension:
+    filename: str
+
+
+@dataclass(frozen=True, slots=True)
+class BatchFileEmpty:
+    pass
+
+
+@dataclass(frozen=True, slots=True)
+class BatchFileInvalidJsonLine:
+    line_number: int
+
+
+@dataclass(frozen=True, slots=True)
+class BatchFileLineNotObject:
+    line_number: int
+
+
+@dataclass(frozen=True, slots=True)
+class BatchFileMissingLineKey:
+    line_number: int
+    key: str
+
+
+BatchFileValidationFailure = (
+    BatchFileTooLarge
+    | BatchFileWrongExtension
+    | BatchFileEmpty
+    | BatchFileInvalidJsonLine
+    | BatchFileLineNotObject
+    | BatchFileMissingLineKey
+)
+
+
+def _file_size_bytes(file_source: bytes | BinaryIO) -> int:
+    if isinstance(file_source, bytes):
+        return len(file_source)
+    file_source.seek(0, 2)
+    size: Final = file_source.tell()
+    file_source.seek(0)
+    return size
+
+
+def _iter_lines(file_source: bytes | BinaryIO) -> Iterator[bytes]:
+    if isinstance(file_source, bytes):
+        return iter(file_source.splitlines())
+    file_source.seek(0)
+    return iter(file_source)
+
+
+def _check_line(line_number: int, raw_line: bytes) -> BatchFileValidationFailure | None:
+    try:
+        parsed: Final = json.loads(raw_line)
+    except (json.JSONDecodeError, UnicodeDecodeError):
+        return BatchFileInvalidJsonLine(line_number=line_number)
+    if not isinstance(parsed, dict):
+        return BatchFileLineNotObject(line_number=line_number)
+    missing: Final = next((key for key in BATCH_LINE_REQUIRED_KEYS if key not in parsed), None)
+    if missing is None:
+        return None
+    return BatchFileMissingLineKey(line_number=line_number, key=missing)
+
+
+def _scan_lines(file_source: bytes | BinaryIO) -> BatchFileValidationFailure | None:
+    content_lines: Final = (
+        (line_number, raw_line)
+        for line_number, raw_line in enumerate(_iter_lines(file_source), start=1)
+        if raw_line.strip()
+    )
+    first_line: Final = next(content_lines, None)
+    if first_line is None:
+        return BatchFileEmpty()
+    return next(
+        (
+            failure
+            for line_number, raw_line in chain((first_line,), content_lines)
+            for failure in (_check_line(line_number, raw_line),)
+            if failure is not None
+        ),
+        None,
+    )
+
+
+def check_batch_file_upload(
+    filename: str | None,
+    file_source: bytes | BinaryIO,
+    max_batch_file_size_mb: int | None,
+) -> BatchFileValidationFailure | None:
+    if filename is None or not filename.lower().endswith(".jsonl"):
+        return BatchFileWrongExtension(filename=filename or "")
+    if max_batch_file_size_mb is not None and max_batch_file_size_mb > 0:
+        size_bytes: Final = _file_size_bytes(file_source)
+        if size_bytes > max_batch_file_size_mb * _MB:
+            return BatchFileTooLarge(size_bytes=size_bytes, limit_mb=max_batch_file_size_mb)
+    scan_failure: Final = _scan_lines(file_source)
+    if not isinstance(file_source, bytes):
+        file_source.seek(0)
+    return scan_failure
+
+
+def raise_batch_file_validation_failure(failure: BatchFileValidationFailure) -> NoReturn:
+    match failure:
+        case BatchFileTooLarge(size_bytes=size_bytes, limit_mb=limit_mb):
+            raise ProxyException(
+                message=(
+                    f"Batch input file is {size_bytes / _MB:.1f} MB, which exceeds the configured "
+                    f"max_batch_file_size_mb of {limit_mb} MB. The file was not forwarded to the provider."
+                ),
+                type="invalid_request_error",
+                param="file",
+                code=413,
+            )
+        case BatchFileWrongExtension(filename=filename):
+            raise ProxyException(
+                message=(
+                    f"Invalid file format for Batch API: '{filename}'. "
+                    "Batch input files must be .jsonl files. The file was not forwarded to the provider."
+                ),
+                type="invalid_request_error",
+                param="file",
+                code=400,
+            )
+        case BatchFileEmpty():
+            raise ProxyException(
+                message="Batch input file has no request lines. The file was not forwarded to the provider.",
+                type="invalid_request_error",
+                param="file",
+                code=400,
+            )
+        case BatchFileInvalidJsonLine(line_number=line_number):
+            raise ProxyException(
+                message=(
+                    f"Batch input file line {line_number} is not valid JSON. "
+                    "The file was not forwarded to the provider."
+                ),
+                type="invalid_request_error",
+                param="file",
+                code=400,
+            )
+        case BatchFileLineNotObject(line_number=line_number):
+            raise ProxyException(
+                message=(
+                    f"Batch input file line {line_number} must be a JSON object. "
+                    "The file was not forwarded to the provider."
+                ),
+                type="invalid_request_error",
+                param="file",
+                code=400,
+            )
+        case BatchFileMissingLineKey(line_number=line_number, key=key):
+            raise ProxyException(
+                message=(
+                    f"Missing required parameter: '{key}' (batch input file line {line_number}). "
+                    f"Each line must be a JSON object with keys {', '.join(BATCH_LINE_REQUIRED_KEYS)}. "
+                    "The file was not forwarded to the provider."
+                ),
+                type="invalid_request_error",
+                param=key,
+                code=400,
+            )
+        case _:
+            assert_never(failure)
diff --git a/litellm/proxy/openai_files_endpoints/files_endpoints.py b/litellm/proxy/openai_files_endpoints/files_endpoints.py
index 361b5b920e2..b7200de8fb6 100644
--- a/litellm/proxy/openai_files_endpoints/files_endpoints.py
+++ b/litellm/proxy/openai_files_endpoints/files_endpoints.py
@@ -21,6 +21,7 @@ from fastapi import (
     UploadFile,
     status,
 )
+from pydantic import TypeAdapter
 
 import litellm
 from litellm import CreateFileRequest, get_secret_str
@@ -41,6 +42,10 @@ from litellm.proxy.common_utils.openai_endpoint_utils import (
     get_custom_llm_provider_from_request_headers,
     get_custom_llm_provider_from_request_query,
 )
+from litellm.proxy.openai_files_endpoints.batch_file_validation import (
+    check_batch_file_upload,
+    raise_batch_file_validation_failure,
+)
 from litellm.proxy.openai_files_endpoints.common_utils import (
     _is_base64_encoded_unified_file_id,
     add_internal_model_credentials,
@@ -65,6 +70,8 @@ from litellm.types.llms.openai import (
 
 router: Final = APIRouter()
 
+_MAX_BATCH_FILE_SIZE_MB_ADAPTER: Final = TypeAdapter(int | None)
+
 files_config = None
 
 
@@ -361,18 +368,27 @@ async def create_file(
 
         # Prepare the data for forwarding
 
-        # Replace with:
         valid_purposes: Final = get_args(OpenAIFilesPurpose)
         if purpose not in valid_purposes:
-            raise HTTPException(
-                status_code=400,
-                detail={
-                    "error": f"Invalid purpose: {purpose}. Must be one of: {valid_purposes}",
-                },
+            raise ProxyException(
+                message=f"Invalid purpose: {purpose}. Must be one of: {valid_purposes}",
+                type="invalid_request_error",
+                param="purpose",
+                code=400,
             )
         # Cast purpose to OpenAIFilesPurpose type
         purpose = cast(OpenAIFilesPurpose, purpose)
 
+        if purpose == "batch":
+            batch_file_failure: Final = await asyncio.to_thread(
+                check_batch_file_upload,
+                file.filename,
+                file_source,
+                _MAX_BATCH_FILE_SIZE_MB_ADAPTER.validate_python(general_settings.get("max_batch_file_size_mb")),
+            )
+            if batch_file_failure is not None:
+                raise_batch_file_validation_failure(batch_file_failure)
+
         data = {}
 
         # Parse expires_after if provided
@@ -552,6 +568,8 @@ async def create_file(
             user_api_key_dict=user_api_key_dict, original_exception=e, request_data=data
         )
         verbose_proxy_logger.exception("litellm.proxy.proxy_server.create_file(): Exception occured - %s", e)
+        if isinstance(e, ProxyException):
+            raise e
         if isinstance(e, HTTPException):
             raise ProxyException(
                 message=getattr(e, "message", str(e.detail)),
diff --git a/litellm/proxy/pass_through_endpoints/llm_provider_handlers/vertex_passthrough_logging_handler.py b/litellm/proxy/pass_through_endpoints/llm_provider_handlers/vertex_passthrough_logging_handler.py
index 621b3ff9c83..ddcca1d372b 100644
--- a/litellm/proxy/pass_through_endpoints/llm_provider_handlers/vertex_passthrough_logging_handler.py
+++ b/litellm/proxy/pass_through_endpoints/llm_provider_handlers/vertex_passthrough_logging_handler.py
@@ -10,6 +10,7 @@ import litellm
 from litellm._logging import verbose_proxy_logger
 from litellm.constants import VERTEX_BATCH_PREDICTION_JOBS_ROUTE
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
+from litellm.llms.vertex_ai.common_utils import get_vertex_location_from_url
 from litellm.llms.vertex_ai.gemini.vertex_and_google_ai_studio_gemini import (
     ModelResponseIterator as VertexModelResponseIterator,
 )
@@ -60,6 +61,9 @@ class VertexPassthroughLoggingHandler:
         request_body: dict | None = None,
         **kwargs,
     ) -> PassThroughEndpointLoggingTypedDict:
+        vertex_location: Final = get_vertex_location_from_url(url_route)
+        if vertex_location is not None:
+            logging_obj.optional_params["vertex_location"] = vertex_location
         if "predictLongRunning" in url_route:
             model = VertexPassthroughLoggingHandler.extract_model_from_url(url_route)
 
@@ -82,6 +86,7 @@ class VertexPassthroughLoggingHandler:
                 model=model,
                 custom_llm_provider="vertex_ai",
                 call_type="create_video",
+                vertex_location=vertex_location,
             )
 
             # Set response_cost in _hidden_params to prevent recalculation
@@ -123,6 +128,7 @@ class VertexPassthroughLoggingHandler:
                 end_time=end_time,
                 logging_obj=logging_obj,
                 custom_llm_provider=VertexPassthroughLoggingHandler._get_custom_llm_provider_from_url(url_route),
+                vertex_location=vertex_location,
             )
 
             return {
@@ -190,6 +196,7 @@ class VertexPassthroughLoggingHandler:
                 end_time=end_time,
                 logging_obj=logging_obj,
                 custom_llm_provider="vertex_ai",
+                vertex_location=vertex_location,
             )
 
             return {
@@ -206,6 +213,7 @@ class VertexPassthroughLoggingHandler:
                 model="vertex_ai/search_api",
                 custom_llm_provider="vertex_ai",
                 call_type="vector_store_search",
+                vertex_location=vertex_location,
             )
 
             standard_pass_through_response_object: Final[StandardPassThroughResponseObject] = {
@@ -302,6 +310,7 @@ class VertexPassthroughLoggingHandler:
             completion_response=litellm_prediction_response,
             model=model,
             custom_llm_provider="vertex_ai",
+            vertex_location=get_vertex_location_from_url(url_route),
         )
 
         kwargs["response_cost"] = response_cost
@@ -381,6 +390,7 @@ class VertexPassthroughLoggingHandler:
             completion_response=litellm_embedding_response,
             model=model,
             custom_llm_provider=custom_llm_provider,
+            vertex_location=get_vertex_location_from_url(url_route),
         )
 
         kwargs["response_cost"] = response_cost
@@ -413,6 +423,9 @@ class VertexPassthroughLoggingHandler:
         - Logs in litellm callbacks
         """
         kwargs: dict[str, Any] = {}
+        vertex_location: Final = get_vertex_location_from_url(url_route)
+        if vertex_location is not None:
+            litellm_logging_obj.optional_params["vertex_location"] = vertex_location
         model = model or VertexPassthroughLoggingHandler.extract_model_from_url(url_route)
         complete_streaming_response: Final = VertexPassthroughLoggingHandler._build_complete_streaming_response(
             all_chunks=all_chunks,
@@ -438,6 +451,7 @@ class VertexPassthroughLoggingHandler:
             end_time=end_time,
             logging_obj=litellm_logging_obj,
             custom_llm_provider=VertexPassthroughLoggingHandler._get_custom_llm_provider_from_url(url_route),
+            vertex_location=vertex_location,
         )
 
         return {
@@ -591,6 +605,7 @@ class VertexPassthroughLoggingHandler:
         end_time: datetime,
         logging_obj: LiteLLMLoggingObj,
         custom_llm_provider: str,
+        vertex_location: str | None,
     ) -> dict:
         """
         Create the standard logging object for Vertex passthrough generateContent (streaming and non-streaming)
@@ -601,6 +616,7 @@ class VertexPassthroughLoggingHandler:
             completion_response=litellm_model_response,
             model=model,
             custom_llm_provider="vertex_ai",
+            vertex_location=vertex_location,
         )
 
         kwargs["response_cost"] = response_cost
diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index cae735be988..af082f04706 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -384,6 +384,10 @@ from litellm.proxy.db.gateway_request_tracking import (
     GatewayRequestAccumulator,
     flush_gateway_requests,
 )
+from litellm.proxy.db.proxy_worker_heartbeat import (
+    PROXY_WORKER_HEARTBEAT_INTERVAL_SECONDS,
+    ProxyWorkerHeartbeat,
+)
 from litellm.proxy.db.spend_counter_reseed import SpendCounterReseed
 from litellm.proxy.discovery_endpoints import ui_discovery_endpoints_router
 from litellm.proxy.fine_tuning_endpoints.endpoints import router as fine_tuning_router
@@ -635,6 +639,7 @@ from litellm.secret_managers.main import (
     get_secret_bool,
     get_secret_str,
     normalize_nonempty_secret_str,
+    secret_manager_would_be_consulted,
     str_to_bool,
 )
 from litellm.types.integrations.slack_alerting import AlertType, SlackAlertingArgs
@@ -874,9 +879,11 @@ async def _flush_spend_logs_queue_on_shutdown() -> None:
         verbose_proxy_logger.exception("Error flushing spend logs queue on shutdown: %s", e)
 
 
-async def proxy_shutdown_event() -> None:
+async def proxy_shutdown_event(worker_heartbeat: ProxyWorkerHeartbeat | None = None) -> None:
     global prisma_client, master_key, user_custom_auth, user_custom_key_generate, user_custom_key_update
     verbose_proxy_logger.info("Shutting down LiteLLM Proxy Server")
+    if worker_heartbeat is not None and prisma_client:
+        await worker_heartbeat.deregister()
     if prisma_client:
         # Drain the SGR fold first: it lives in memory, so an un-drained interval
         # is lost, and a write attempted after disconnect raises
@@ -1210,7 +1217,7 @@ async def proxy_startup_event(app: FastAPI) -> AsyncGenerator[None, None]:
     )
 
     ### START BATCH WRITING DB + CHECKING NEW MODELS###
-    if prisma_client is not None:
+    worker_heartbeat: Final = (
         await ProxyStartupEvent.initialize_scheduled_background_jobs(
             general_settings=general_settings,
             prisma_client=prisma_client,
@@ -1219,7 +1226,10 @@ async def proxy_startup_event(app: FastAPI) -> AsyncGenerator[None, None]:
             proxy_batch_write_at=proxy_batch_write_at,
             proxy_logging_obj=proxy_logging_obj,
         )
-
+        if prisma_client is not None
+        else None
+    )
+    if prisma_client is not None:
         await ProxyStartupEvent._update_default_team_member_budget()
 
         ## SYNC UI SETTINGS ##
@@ -1290,7 +1300,7 @@ async def proxy_startup_event(app: FastAPI) -> AsyncGenerator[None, None]:
 
     await proxy_config.stop_auth_cache_invalidation_subscriber()
 
-    await proxy_shutdown_event()
+    await proxy_shutdown_event(worker_heartbeat=worker_heartbeat)
 
 
 def _generate_stable_operation_id(route: "APIRoute") -> str:
@@ -4371,9 +4381,55 @@ class ProxyConfig:
                         item = self._check_for_os_environ_vars(config=item, depth=depth + 1, max_depth=max_depth)
             # if the value is a string and starts with "os.environ/" - then it's an environment variable
             elif isinstance(value, str) and value.startswith("os.environ/"):
-                config[key] = get_secret(value)
+                resolved = get_secret(value)
+                if resolved is None and secret_manager_would_be_consulted(value):
+                    verbose_proxy_logger.warning("%s is absent from the configured secret manager", value)
+                config[key] = resolved
         return config
 
+    def _initialize_secret_manager_from_raw_config(
+        self, config: Mapping[str, object], config_file_path: str | None
+    ) -> None:
+        """
+        Bring the secret manager up before `os.environ/<KEY>` references are resolved.
+
+        `_check_for_os_environ_vars` writes whatever it resolves back into the config, so a key
+        held only by the secret manager would otherwise become a permanent `None` that the later
+        fallbacks in `load_config` can no longer recover from.
+
+        `get_config` also runs on management-endpoint request paths, so this returns early once a
+        manager exists rather than rebuilding the client on every request.
+
+        The manager's own settings can only come from real environment variables, so they are
+        resolved against a throwaway copy and the config is left untouched for the main pass.
+        """
+        if litellm.secret_manager_client is not None:
+            return
+
+        general_settings: Final = config.get("general_settings")
+        if not isinstance(general_settings, dict):
+            return
+
+        raw_system: Final = general_settings.get("key_management_system")
+        key_management_system: Final = (
+            get_secret(raw_system)
+            if isinstance(raw_system, str) and raw_system.startswith("os.environ/")
+            else raw_system
+        )
+        if not isinstance(key_management_system, str):
+            return
+
+        raw_settings: Final = general_settings.get("key_management_settings")
+        if isinstance(raw_settings, dict):
+            litellm._key_management_settings = KeyManagementSettings(
+                **self._check_for_os_environ_vars(config=copy.deepcopy(raw_settings))
+            )
+
+        self.initialize_secret_manager(
+            key_management_system=key_management_system,
+            config_file_path=config_file_path,
+        )
+
     def _get_team_config(self, team_id: str, all_teams_config: list[dict]) -> dict:
         team_config: dict = {}
         for team in all_teams_config:
@@ -4544,6 +4600,8 @@ class ProxyConfig:
         printed_yaml: Final = copy.deepcopy(config)
         printed_yaml.pop("environment_variables", None)
 
+        self._initialize_secret_manager_from_raw_config(config=config, config_file_path=config_file_path)
+
         config = self._check_for_os_environ_vars(config=config)
 
         self.update_config_state(config=config)
@@ -4977,6 +5035,7 @@ class ProxyConfig:
                     )
                 elif key == "audit_log_callbacks":
                     from litellm.proxy.management_helpers.audit_logs import (
+                        is_audit_logging_enabled,
                         reset_audit_log_callback_cache,
                     )
 
@@ -4995,14 +5054,14 @@ class ProxyConfig:
                             litellm.audit_log_callbacks.append(callback)
 
                     _store_audit_logs = litellm_settings.get("store_audit_logs", litellm.store_audit_logs)
-                    if _store_audit_logs:
+                    if is_audit_logging_enabled(store_audit_logs=_store_audit_logs):
                         print(  # noqa: T201
                             f"{blue_color_code} Initialized Audit Log Callbacks - {litellm.audit_log_callbacks} {reset_color_code}"
                         )
                     else:
                         verbose_proxy_logger.warning(
-                            "'audit_log_callbacks' is configured but 'store_audit_logs' is not enabled. "
-                            "Audit log callbacks will not fire until 'store_audit_logs: true' is added to litellm_settings."
+                            "'audit_log_callbacks' is configured but audit logging is not enabled. "
+                            "Audit log callbacks will not fire."
                         )
                 elif key == "cache_params":
                     # this is set in the cache branch
@@ -5114,17 +5173,14 @@ class ProxyConfig:
                 key: general_settings[key] for key in SPEND_LOG_CLEANUP_BOUND_SETTINGS if key in general_settings
             }
 
-            ### LOAD KEY MANAGEMENT SETTINGS FIRST (needed for custom secret manager) ###
+            ### LOAD KEY MANAGEMENT SETTINGS ###
+            # The secret manager itself is brought up by get_config(), which runs before the
+            # `os.environ/` references in this config were resolved. Re-reading the settings here
+            # picks up any of them that were themselves secret-manager backed.
             key_management_settings: Final = general_settings.get("key_management_settings", None)
             if key_management_settings is not None:
                 litellm._key_management_settings = KeyManagementSettings(**key_management_settings)
 
-            ### LOAD SECRET MANAGER ###
-            key_management_system: Final = general_settings.get("key_management_system", None)
-            self.initialize_secret_manager(
-                key_management_system=key_management_system,
-                config_file_path=config_file_path,
-            )
             ### [DEPRECATED] LOAD FROM GOOGLE KMS ### old way of loading from google kms
             use_google_kms: Final = general_settings.get("use_google_kms", False)
             load_google_kms(use_google_kms=use_google_kms)
@@ -6316,6 +6372,9 @@ class ProxyConfig:
         if "global_max_parallel_requests" in _general_settings:
             general_settings["global_max_parallel_requests"] = _general_settings["global_max_parallel_requests"]
 
+        if "max_batch_file_size_mb" not in self._yaml_general_settings_keys:
+            general_settings["max_batch_file_size_mb"] = _general_settings.get("max_batch_file_size_mb")
+
         ## ALERTING ARGS ##
         if "alerting_args" in _general_settings:
             general_settings["alerting_args"] = _general_settings["alerting_args"]
@@ -8733,7 +8792,7 @@ class ProxyStartupEvent:
         proxy_budget_rescheduler_max_time: int,
         proxy_batch_write_at: int,
         proxy_logging_obj: ProxyLogging,
-    ):
+    ) -> ProxyWorkerHeartbeat:
         """Initializes scheduled background jobs"""
         global store_model_in_db, scheduler
 
@@ -8778,6 +8837,18 @@ class ProxyStartupEvent:
         # Ensure minimum interval of 30 seconds for batch writing to prevent memory issues
         batch_writing_interval: Final = proxy_batch_write_at + random.randint(0, 5)
 
+        ### PROXY WORKER HEARTBEAT ###
+        worker_heartbeat: Final = ProxyWorkerHeartbeat(prisma_client=prisma_client)
+        await worker_heartbeat.beat()
+        scheduler.add_job(
+            worker_heartbeat.beat,
+            "interval",
+            seconds=PROXY_WORKER_HEARTBEAT_INTERVAL_SECONDS,
+            id="proxy_worker_heartbeat_job",
+            replace_existing=True,
+            misfire_grace_time=APSCHEDULER_MISFIRE_GRACE_TIME,
+        )
+
         ### RESET BUDGET ###
         if general_settings.get("disable_reset_budget", False) is False:
             budget_reset_job: Final = ResetBudgetJob(
@@ -9117,6 +9188,7 @@ class ProxyStartupEvent:
             "APScheduler started with memory leak prevention settings: removed jitter, increased intervals, misfire_grace_time=%s",
             APSCHEDULER_MISFIRE_GRACE_TIME,
         )
+        return worker_heartbeat
 
     @classmethod
     async def _initialize_spend_tracking_background_jobs(cls, scheduler: AsyncIOScheduler):
@@ -15689,6 +15761,7 @@ _GENERAL_SETTINGS_CONFIG_LIST_FIELD_TYPES: Final[Mapping[str, str]] = MappingPro
         "max_parallel_requests": "Integer",
         "global_max_parallel_requests": "Integer",
         "max_request_size_mb": "Integer",
+        "max_batch_file_size_mb": "Integer",
         "max_response_size_mb": "Integer",
         "proxy_config_reload_interval_seconds": "Integer",
         "pass_through_endpoints": "PydanticModel",
diff --git a/litellm/proxy/read_model_list.py b/litellm/proxy/read_model_list.py
index cdd6680aa40..a1830e7f2bc 100644
--- a/litellm/proxy/read_model_list.py
+++ b/litellm/proxy/read_model_list.py
@@ -9,7 +9,8 @@ effects.
 Instead we reuse ``ProxyConfig.get_config`` — the actual config reader — so the
 gateway inherits the same heavy lifting the proxy does: ``include:`` merging,
 ``os.environ/`` + secret-manager resolution, and DB-stored models (when a DB is
-configured). It has no proxy-setup side effects. Returns the resolved
+configured). Its only proxy-setup side effect is bringing up the configured
+secret manager, which is what makes that resolution work. Returns the resolved
 ``model_list``; the Rust side deserializes each entry into its ``Deployment``.
 """
 
diff --git a/litellm/proxy/schema.prisma b/litellm/proxy/schema.prisma
index 52fb447157b..60058c777ca 100644
--- a/litellm/proxy/schema.prisma
+++ b/litellm/proxy/schema.prisma
@@ -947,6 +947,17 @@ model LiteLLM_DailyTagSpend {
 }
 
 
+// One row per live proxy worker process. Workers upsert their row on a fixed
+// heartbeat; counting rows with a recent heartbeat tells how many workers share
+// this database, which lets the Admin UI hide its "no Redis" warning for
+// deployments that are provably a single worker.
+model LiteLLM_ProxyWorkerHeartbeat {
+  worker_id         String   @id
+  hostname          String
+  started_at        DateTime @default(now())
+  last_heartbeat_at DateTime @default(now())
+}
+
 // Track the status of cron jobs running. Only allow one pod to run the job at a time
 model LiteLLM_CronJob {
   cronjob_id            String   @id @default(cuid()) // Unique ID for the record
@@ -1467,28 +1478,38 @@ model LiteLLM_AutoRouterSession {
   @@index([last_turn_at], map: "idx_autorouter_session_last_turn")
 }
 
-// Shadow eval: evaluation of an auto-router against a key's live traffic, in either
-// direction. forward duplicates the requests the key did not route through the router
-// through it, answering whether the key should adopt it; reverse duplicates the requests
-// the router did serve against a fixed baseline model, answering whether a key already on
-// it still benefits. Either way a sampled slice runs in a detached task and an LLM judge
-// compares real vs shadow responses blind. The job row is immutable config plus
-// stopped_at; every count, status, and spend figure is derived from the append-only
-// attempt rows, so nothing can disagree across pods or stop races.
+// Shadow eval: evaluation of an auto-router against one or more keys' live traffic, in
+// either direction. forward duplicates the requests the keys did not route through the
+// router through it, answering whether they should adopt it; reverse duplicates the
+// requests the router did serve against a fixed baseline model, answering whether a key
+// already on it still benefits. Either way a sampled slice runs in a detached task and an
+// LLM judge compares real vs shadow responses blind. Each row is ONE key's leg of a job:
+// immutable config plus that key's own turn budget and stop state, so one key exhausting
+// its budget never ends a sibling's sampling. A job is the set of legs sharing group_id
+// (the id the API reports), written together by one atomic create_many with identical
+// config; single-key jobs predating group_id were backfilled group_id = id. "One active
+// job per (key, direction)" is a partial unique index on (api_key_id, direction) WHERE
+// stopped_at IS NULL, expressed only in the migration because schema.prisma cannot state
+// partial indexes; it is what makes a concurrent start on another pod race-safe rather
+// than read-then-create. Every count, status, and spend figure is derived from the
+// append-only attempt rows, so nothing can disagree across pods or stop races.
 model LiteLLM_ShadowEvalJob {
   id                String   @id @default(cuid())
-  api_key_id        String   // hashed virtual key whose traffic is shadowed
+  group_id          String   // legs of one job share this; the API's job id
+  api_key_id        String   // hashed virtual key whose traffic this leg shadows
   router_name       String   // the auto-router under evaluation, in either direction
   direction         String   @default("forward") // forward | reverse
   baseline_model    String?  // reverse only: the fixed model the router is judged against
   judge_model       String
   shadow_percentage Float
-  max_turns         Int      // sample budget: judge at most this many turns
+  max_turns         Int      // this key's sample budget: judge at most this many turns
   created_at        DateTime @default(now())
   created_by        String?
   ends_at           DateTime
   stopped_at        DateTime?
+  stopped_by        String?  // operator who stopped it early; null when it ended on its own
 
+  @@index([group_id])
   @@index([api_key_id])
   @@index([created_at])
 }
diff --git a/litellm/proxy/spend_tracking/ptu_feature_flag.py b/litellm/proxy/spend_tracking/ptu_feature_flag.py
index 9078079b676..7f52dfa155d 100644
--- a/litellm/proxy/spend_tracking/ptu_feature_flag.py
+++ b/litellm/proxy/spend_tracking/ptu_feature_flag.py
@@ -1,18 +1,12 @@
-"""Opt-in flag for PTU (provisioned throughput unit) flat-cost attribution.
+"""Re-exported from ``litellm.litellm_core_utils.ptu_pricing``.
 
-The whole feature is inert unless an operator sets
-``LITELLM_ENABLE_PTU_COST_ATTRIBUTION``: the daily rollup is not scheduled, the
-model endpoints reject PTU config, the daily activity read path reports zero flat
-cost, and the model form hides the PTU inputs.
+The flag lives in core because the router reads it while registering a deployment, and
+router code cannot import from the proxy.
 """
 
-from typing import Final
+from litellm.litellm_core_utils.ptu_pricing import (
+    PTU_COST_ATTRIBUTION_ENV_VAR,
+    is_ptu_cost_attribution_enabled,
+)
 
-from litellm.secret_managers.main import get_secret_bool
-
-PTU_COST_ATTRIBUTION_ENV_VAR: Final = "LITELLM_ENABLE_PTU_COST_ATTRIBUTION"
-
-
-def is_ptu_cost_attribution_enabled() -> bool:
-    """Report whether this deployment opted into PTU flat-cost attribution."""
-    return get_secret_bool(PTU_COST_ATTRIBUTION_ENV_VAR, False) is True
+__all__ = ("PTU_COST_ATTRIBUTION_ENV_VAR", "is_ptu_cost_attribution_enabled")
diff --git a/litellm/proxy/spend_tracking/ptu_flat_cost_rollup.py b/litellm/proxy/spend_tracking/ptu_flat_cost_rollup.py
index 25de9f6d065..381641be96d 100644
--- a/litellm/proxy/spend_tracking/ptu_flat_cost_rollup.py
+++ b/litellm/proxy/spend_tracking/ptu_flat_cost_rollup.py
@@ -14,6 +14,7 @@ and share the existing unique constraint.
 
 import asyncio
 import json
+import sys
 from collections.abc import Awaitable, Callable, Mapping
 from dataclasses import dataclass
 from datetime import date, datetime, time, timedelta, timezone
@@ -29,14 +30,15 @@ from litellm.constants import (
     PTU_ROLLUP_MAX_BACKFILL_DAYS,
     PTU_SENTINEL_API_KEY,
 )
+from litellm.litellm_core_utils.ptu_pricing import ptu_terms
 from litellm.proxy.spend_tracking.ptu_feature_flag import is_ptu_cost_attribution_enabled
-from litellm.types.router import ModelInfo
 
 if TYPE_CHECKING:
     from litellm.proxy.db.db_transaction_queue.pod_lock_manager import PodLockManager
     from litellm.proxy.utils import PrismaClient
 
 _HOURS_PER_DAY: Final = 24
+_PRUNE_ID_CHUNK_SIZE: Final = 5_000
 _UPSERT_ATTEMPTS: Final = 3
 _UPSERT_RETRY_BACKOFF_SECONDS: Final = 0.5
 
@@ -72,28 +74,6 @@ class PTUModel:
     effective_to: datetime | None = None
 
 
-def _parse_utc_datetime(value: object) -> datetime | None:
-    """Parse a model_info datetime (ISO string or datetime) into a UTC-aware datetime, else None."""
-    parsed: Final = _coerce_datetime(value)
-    if parsed is None:
-        return None
-    if parsed.tzinfo is None:
-        return parsed.replace(tzinfo=timezone.utc)
-    return parsed.astimezone(timezone.utc)
-
-
-def _coerce_datetime(value: object) -> datetime | None:
-    """``value`` as a datetime, parsing an ISO string, else None."""
-    if isinstance(value, datetime):
-        return value
-    if not isinstance(value, str):
-        return None
-    try:
-        return datetime.fromisoformat(value.replace("Z", "+00:00"))
-    except ValueError:
-        return None
-
-
 def _public_model_name(row: object, model_info: Mapping[str, object]) -> str:
     """The name an operator recognises for this deployment.
 
@@ -167,46 +147,20 @@ def _parse_ptu_model(row: object) -> PTUModel | None:
     Valid means model_info has a positive ptu_count, a non-negative
     cost_per_ptu_per_hour, and a team_id (1 model -> 1 team).
     """
-    raw_model_info: Final = getattr(row, "model_info", None)
-    model_info: Final = _decode_model_info(raw_model_info)
+    model_info: Final = _decode_model_info(getattr(row, "model_info", None))
     if model_info is None:
         return None
-    ptu_count: Final = model_info.get("ptu_count")
-    cost_per_hour: Final = model_info.get("cost_per_ptu_per_hour")
-    team_id: Final = model_info.get("team_id")
-    if ptu_count is None or cost_per_hour is None or not team_id:
-        return None
-    try:
-        ptu_count_int: Final = int(ptu_count)
-        cost_per_hour_float: Final = float(cost_per_hour)
-    except (TypeError, ValueError, OverflowError):
-        return None
-    if not 0 < ptu_count_int <= ModelInfo.MAX_PTU_COUNT:
-        return None
-    if not 0 <= cost_per_hour_float <= ModelInfo.MAX_COST_PER_PTU_PER_HOUR:
-        return None
-    if model_info.get("ptu_effective_from") is None:
-        # The endpoints require a start; a row without one predates that rule or was
-        # written around them, and inferring one would bill days the deployment did not exist
-        return None
-    raw_from: Final = model_info.get("ptu_effective_from")
-    raw_to: Final = model_info.get("ptu_effective_to")
-    effective_from: Final = _parse_utc_datetime(raw_from)
-    effective_to: Final = _parse_utc_datetime(raw_to)
-    # A present-but-unparseable bound would read as "no bound" and silently widen the
-    # window to the whole day, so the deployment is skipped until the config is fixed
-    if (raw_from is not None and effective_from is None) or (raw_to is not None and effective_to is None):
-        return None
-    if effective_from is not None and effective_to is not None and effective_to <= effective_from:
+    terms: Final = ptu_terms(model_info)
+    if terms is None:
         return None
     return PTUModel(
         model_id=str(getattr(row, "model_id", "") or ""),
         model_name=_public_model_name(row, model_info),
-        team_id=str(team_id),
-        ptu_count=ptu_count_int,
-        cost_per_ptu_per_hour=cost_per_hour_float,
-        effective_from=effective_from,
-        effective_to=effective_to,
+        team_id=terms.team_id,
+        ptu_count=terms.ptu_count,
+        cost_per_ptu_per_hour=terms.cost_per_ptu_per_hour,
+        effective_from=terms.effective_from,
+        effective_to=terms.effective_to,
     )
 
 
@@ -358,10 +312,70 @@ async def _upsert_charge_with_retry(
     return False
 
 
-async def _load_ptu_models(prisma_client: "PrismaClient") -> tuple[PTUModel, ...]:
-    """Every model deployment currently carrying valid manual PTU config."""
+@dataclass(frozen=True, slots=True)
+class _LoadedDeployments:
+    """The deployments a run will price, and every deployment id it looked at.
+
+    The id set is deliberately wider than the priced set. A deployment whose PTU config
+    was removed produces no charge and still has to be prunable, so bounding the prune on
+    what priced would strand its old rows forever. It is also a guaranteed superset of the
+    priced set, or a run could write a charge that falls outside its own delete filter.
+    """
+
+    models: tuple[PTUModel, ...]
+    scanned_ids: frozenset[str]
+    config_sourced: bool
+
+
+def _running_router() -> object | None:
+    """The proxy's router, or None outside a running proxy.
+
+    Read out of ``sys.modules`` rather than imported, so a rollup driven from a test or a
+    script does not pull the whole proxy server in behind it.
+    """
+    proxy_server: Final = sys.modules.get("litellm.proxy.proxy_server")
+    return getattr(proxy_server, "llm_router", None) if proxy_server is not None else None
+
+
+def _config_deployments(router: object | None, *, owned_by_db: frozenset[str]) -> tuple[_PTUDeployment, ...]:
+    """Deployments the router holds that no ``LiteLLM_ProxyModelTable`` row owns.
+
+    ``db_model`` is forced True on every deployment loaded from that table and defaults to
+    False on ModelInfo, so the complement is what config.yaml declared. A per-request
+    credential clone carries ``original_model_id`` and reuses its source's PTU config under
+    a fresh id, so pricing it would bill one reservation once per distinct client key.
+    """
+    entries: Final = tuple(getattr(router, "model_list", None) or ())
+    records: Final = tuple(_router_deployment(entry) for entry in entries)
+    return tuple(
+        record
+        for record in records
+        if record is not None
+        and record.model_info.get("db_model") is not True
+        and record.model_info.get("original_model_id") is None
+        and record.model_id not in owned_by_db
+    )
+
+
+async def _load_ptu_models(prisma_client: "PrismaClient") -> _LoadedDeployments:
+    """Every deployment carrying valid manual PTU config, and every id the scan saw.
+
+    Reserved capacity is billed by the provider whichever file declared it, so a
+    deployment the proxy only knows from config.yaml accrues alongside the stored ones.
+    """
     rows: Final = await prisma_client.db.litellm_proxymodeltable.find_many()
-    return tuple(parsed for parsed in (_parse_ptu_model(row) for row in rows) if parsed is not None)
+    db_ids: Final = frozenset(model_id for row in rows if (model_id := str(getattr(row, "model_id", "") or "")))
+    config_records: Final = _config_deployments(_running_router(), owned_by_db=db_ids)
+    models: Final = tuple(
+        parsed for parsed in (_parse_ptu_model(row) for row in (*rows, *config_records)) if parsed is not None
+    )
+    return _LoadedDeployments(
+        models=models,
+        config_sourced=bool(config_records),
+        scanned_ids=db_ids
+        | frozenset(record.model_id for record in config_records)
+        | frozenset(model.model_id for model in models),
+    )
 
 
 async def run_ptu_flat_cost_rollup(
@@ -378,8 +392,10 @@ async def run_ptu_flat_cost_rollup(
     The prune predicate is ``updated_at < run_started`` rather than "not in the charge
     set I computed", which matters under concurrency: whether a row is garbage becomes a
     property of the row instead of one run's in-memory config snapshot, so a run can
-    never delete a row a concurrent run just wrote. It is still skipped when any charge
-    failed to write, since a row whose replacement never landed would look unrefreshed.
+    never delete a row a concurrent run just wrote. It is bounded to the deployments this
+    run looked at, so a row it cannot account for is out of reach either way. It is still
+    skipped when any charge failed to write, since a row whose replacement never landed
+    would look unrefreshed.
     """
     day: Final = target_date or (datetime.now(timezone.utc).date() - timedelta(days=1))
 
@@ -390,7 +406,8 @@ async def run_ptu_flat_cost_rollup(
     date_str: Final = day.isoformat()
     run_started: Final = datetime.now(timezone.utc)
 
-    ptu_models: Final = await _load_ptu_models(prisma_client)
+    loaded: Final = await _load_ptu_models(prisma_client)
+    ptu_models: Final = loaded.models
     charges: Final = _aggregate_charges(ptu_models, day)
 
     landed: Final = tuple(
@@ -415,7 +432,12 @@ async def run_ptu_flat_cost_rollup(
             date_str,
         )
     else:
-        await _prune_unrefreshed_sentinel_rows(prisma_client, date_str=date_str, run_started=run_started)
+        await _prune_unrefreshed_sentinel_rows(
+            prisma_client,
+            date_str=date_str,
+            run_started=run_started,
+            scanned_ids=loaded.scanned_ids if loaded.config_sourced else None,
+        )
 
     verbose_proxy_logger.info(
         "PTU rollup for %s: %d PTU models processed, %d rows written, %d rows failed",
@@ -524,7 +546,7 @@ async def run_ptu_flat_cost_backfill(
         verbose_proxy_logger.warning("PTU backfill: prisma_client is None, skipping")
         return BackfillResult(start=end, end=end, days_scanned=0, rows_written=0)
 
-    ptu_models: Final = await _load_ptu_models(prisma_client)
+    ptu_models: Final = (await _load_ptu_models(prisma_client)).models
     days: Final = _backfill_window(ptu_models, end)
 
     if not days:
@@ -707,26 +729,61 @@ async def _prune_unrefreshed_sentinel_rows(
     *,
     date_str: str,
     run_started: datetime,
+    scanned_ids: frozenset[str] | None,
 ) -> None:
-    """Delete the day's PTU sentinel rows this run did not refresh.
+    """Delete the day's PTU sentinel rows this run looked at and did not refresh.
 
-    Every charge the run wrote bumps ``updated_at`` past ``run_started``, so anything
-    left below that mark is a (team, model) the current config no longer prices. The mark
-    is pulled back by ``PTU_PRUNE_SKEW_GRACE_SECONDS`` because the two timestamps come
-    from different hosts: a stale row is hours old, a concurrently written one is seconds
-    old, and the grace separates them without waiting on clocks agreeing. The
-    predicate reads only the row, never the caller's config snapshot, which is what
-    makes it safe to run twice, out of order, or beside another pod: a row written
-    after this run began is out of reach of its delete. Mirrors the retention predicate
-    ``SpendLogCleanup`` deletes by."""
+    Two conditions, and a row survives unless it meets both. It must be stale: every
+    charge the run wrote bumps ``updated_at`` past ``run_started``, so anything left below
+    that mark is a (team, model) the current config no longer prices. The mark is pulled
+    back by ``PTU_PRUNE_SKEW_GRACE_SECONDS`` because the two timestamps come from
+    different hosts, and the grace separates a row that is hours old from one written
+    seconds ago without waiting on clocks agreeing.
+
+    A run that priced a deployment only its own host declares must also name the
+    deployments it scanned. Staleness alone is sufficient while every run derives its
+    charges from the same table, because then any two runs compute the same set, so a
+    database-only run still sweeps by timestamp exactly as it always has. Once one host's
+    charges come from a file the others cannot read, a row it never considered is not
+    evidence of anything, and deleting it drops a charge that host is responsible for.
+
+    Where the bound applies the ids go out in chunks, because each is one bind variable and
+    the server rejects a statement carrying more than 32767 of them, which a proxy holding
+    that many deployments would otherwise hit every night with no handler above here.
+    """
     cutoff: Final = run_started - timedelta(seconds=PTU_PRUNE_SKEW_GRACE_SECONDS)
-    await prisma_client.db.litellm_dailyteamspend.delete_many(
-        where={  # mutable-ok: prisma delete filter
-            "date": date_str,
-            "api_key": PTU_SENTINEL_API_KEY,
-            "updated_at": {"lt": cutoff},  # mutable-ok: prisma comparison filter
-        }
+    unbounded: Final = {  # mutable-ok: prisma delete filter
+        "date": date_str,
+        "api_key": PTU_SENTINEL_API_KEY,
+        "updated_at": {"lt": cutoff},  # mutable-ok: prisma comparison filter
+    }
+    ordered: Final = () if scanned_ids is None else tuple(sorted(scanned_ids))
+    filters: Final = (
+        (unbounded,)
+        if scanned_ids is None
+        else tuple(
+            MappingProxyType(
+                {
+                    **unbounded,
+                    "model": {  # mutable-ok: prisma membership filter
+                        "in": ordered[start : start + _PRUNE_ID_CHUNK_SIZE]
+                    },
+                }
+            )
+            for start in range(0, len(ordered), _PRUNE_ID_CHUNK_SIZE)
+        )
     )
+    deletions: Final = tuple(
+        [await prisma_client.db.litellm_dailyteamspend.delete_many(where=where) for where in filters]
+    )
+    deleted: Final = sum(deletions)
+    if deleted:
+        verbose_proxy_logger.info(
+            "PTU rollup for %s: pruned %s stale sentinel row(s) across %s deployment(s)",
+            date_str,
+            deleted,
+            "every" if scanned_ids is None else len(scanned_ids),
+        )
 
 
 __all__ = (
diff --git a/litellm/proxy/spend_tracking/savings.py b/litellm/proxy/spend_tracking/savings.py
index 448723ab3bc..997180efdde 100644
--- a/litellm/proxy/spend_tracking/savings.py
+++ b/litellm/proxy/spend_tracking/savings.py
@@ -130,6 +130,7 @@ class PricingBasis(NamedTuple):
 
     service_tier: str | None = None
     data_residency: str | None = None
+    vertex_location: str | None = None
 
 
 _STANDARD_RATES: Final = PricingBasis()
@@ -141,8 +142,8 @@ def _pricing_basis(cost_breakdown: Mapping[str, object] | None) -> PricingBasis:
     Rows written before this field shipped carry neither key, and there is no backfill:
     they price at standard rates, which is what they already did.
 
-    Both values survive a JSON round trip on the way here, so neither is guaranteed to be
-    a string. `generic_cost_per_token` calls `.lower()` on both without a type check, and
+    These values survive a JSON round trip on the way here, so none is guaranteed to be
+    a string. `generic_cost_per_token` calls `.lower()` on them without a type check, and
     the resulting `AttributeError` would be swallowed into a silent zero by the caller's
     `except`, so anything that is not a string is dropped here instead.
     """
@@ -150,9 +151,11 @@ def _pricing_basis(cost_breakdown: Mapping[str, object] | None) -> PricingBasis:
         return _STANDARD_RATES
     service_tier: Final = cost_breakdown.get("service_tier")
     data_residency: Final = cost_breakdown.get("data_residency")
+    vertex_location: Final = cost_breakdown.get("vertex_location")
     return PricingBasis(
         service_tier=service_tier if isinstance(service_tier, str) else None,
         data_residency=data_residency if isinstance(data_residency, str) else None,
+        vertex_location=vertex_location if isinstance(vertex_location, str) else None,
     )
 
 
@@ -193,6 +196,7 @@ def _cost_of_usage(
             service_tier=basis.service_tier,
             data_residency=basis.data_residency,
             model_info=model_info,
+            vertex_location=basis.vertex_location,
         )
     except Exception as e:  # noqa: BLE001  # get_model_info raises bare Exception for unmapped models; degrade to zero savings
         verbose_proxy_logger.debug(
diff --git a/litellm/proxy/spend_tracking/spend_tracking_utils.py b/litellm/proxy/spend_tracking/spend_tracking_utils.py
index 3146d8bccfb..0b56f0d8246 100644
--- a/litellm/proxy/spend_tracking/spend_tracking_utils.py
+++ b/litellm/proxy/spend_tracking/spend_tracking_utils.py
@@ -216,6 +216,15 @@ def _extract_usage_for_ocr_call(response_obj: Any, response_obj_dict: dict) -> d
         return {}
 
 
+def _sl_attribution_fallback(
+    standard_logging_payload: StandardLoggingPayload | None,
+    field: Literal["model_id", "model_group", "api_base", "custom_llm_provider"],
+) -> str:
+    if standard_logging_payload is None:
+        return ""
+    return standard_logging_payload.get(field) or ""
+
+
 def get_logging_payload(kwargs, response_obj, start_time, end_time) -> SpendLogsPayload:
     if kwargs is None:
         kwargs = {}
@@ -288,8 +297,15 @@ def get_logging_payload(kwargs, response_obj, start_time, end_time) -> SpendLogs
     ):  # use 'tags' from standard logging payload instead
         request_tags = safe_dumps(standard_logging_payload["request_tags"])
 
-    _model_id: Final = metadata.get("model_info", {}).get("id", "")
-    _model_group: Final = metadata.get("model_group", "")
+    _model_id: Final = metadata.get("model_info", {}).get("id", "") or _sl_attribution_fallback(
+        standard_logging_payload, "model_id"
+    )
+    _model_group: Final = metadata.get("model_group", "") or _sl_attribution_fallback(
+        standard_logging_payload, "model_group"
+    )
+    _api_base: Final = litellm_params.get("api_base", "") or _sl_attribution_fallback(
+        standard_logging_payload, "api_base"
+    )
 
     # Extract overhead from hidden_params if available
     litellm_overhead_time_ms = None
@@ -389,7 +405,11 @@ def get_logging_payload(kwargs, response_obj, start_time, end_time) -> SpendLogs
 
     # Extract agent_id for A2A requests (set directly on model_call_details)
     agent_id: Final[str | None] = kwargs.get("agent_id") or metadata.get("agent_id")
-    custom_llm_provider: Final = kwargs.get("custom_llm_provider")
+    custom_llm_provider: Final = (
+        kwargs.get("custom_llm_provider")
+        or _sl_attribution_fallback(standard_logging_payload, "custom_llm_provider")
+        or None
+    )
     raw_model: Final = cast(str, kwargs.get("model") or "")
     model_name: Final = reconstruct_model_name(raw_model, custom_llm_provider, metadata or {})
 
@@ -414,13 +434,13 @@ def get_logging_payload(kwargs, response_obj, start_time, end_time) -> SpendLogs
             completion_tokens=usage.get("completion_tokens", standard_logging_completion_tokens),
             request_tags=request_tags,
             end_user=end_user_id or "",
-            api_base=litellm_params.get("api_base", ""),
+            api_base=_api_base,
             model_group=_model_group,
             model_id=_model_id,
             mcp_namespaced_tool_name=mcp_namespaced_tool_name,
             agent_id=agent_id,
             requester_ip_address=clean_metadata.get("requester_ip_address", None),
-            custom_llm_provider=kwargs.get("custom_llm_provider", ""),
+            custom_llm_provider=custom_llm_provider or "",
             messages=_get_messages_for_spend_logs_payload(
                 standard_logging_payload=standard_logging_payload, metadata=metadata
             ),
diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py
index a743526e975..1d042e2521b 100644
--- a/litellm/proxy/utils.py
+++ b/litellm/proxy/utils.py
@@ -30,7 +30,6 @@ from litellm.constants import (
     SPEND_LOG_WRITE_BATCH_MAX_BYTES,
 )
 from litellm.proxy._types import (
-    DB_RETRY_SAFE_ERROR_TYPES,
     CommonProxyErrors,
     ProxyErrorTypes,
     ProxyException,
@@ -517,6 +516,34 @@ def _failure_usage_to_lift(
     return estimated_usage, 0.0
 
 
+_EMPTY_LIFT: Final = MappingProxyType({})
+
+
+def _failure_fields_to_lift(request_data: Mapping[str, object]) -> Mapping[str, object]:
+    """Failure-path callbacks run after ``litellm_logging_obj`` is popped from
+    request_data (it is not serialisable), so the caller merges these fields
+    onto request_data first: the first-handoff instant for preprocessing
+    latency, recovered or estimated usage for token counts, and the standard
+    logging object for deployment attribution on failed-request spend logs."""
+    _logging_obj: Final = request_data.get("litellm_logging_obj")
+    if _logging_obj is None:
+        return _EMPTY_LIFT
+    _model_call_details: Final = getattr(_logging_obj, "model_call_details", {})
+    _first_handoff: Final = _model_call_details.get("first_api_call_start_time")
+    _usage_to_lift: Final = _failure_usage_to_lift(
+        model_call_details=_model_call_details,
+        request_body=request_data,
+        dispatched=_first_handoff is not None,
+    )
+    _entries: Final = (
+        ("first_api_call_start_time", _first_handoff),
+        ("combined_usage_object", None if _usage_to_lift is None else _usage_to_lift[0]),
+        ("response_cost", None if _usage_to_lift is None else (_usage_to_lift[1] or 0.0)),
+        ("standard_logging_object", _model_call_details.get("standard_logging_object")),
+    )
+    return MappingProxyType({key: value for key, value in _entries if value is not None})
+
+
 @dataclass(frozen=True)
 class _CallbackCapabilities:
     """Cached per-hook capability flags derived from ``litellm.callbacks``.
@@ -2281,6 +2308,11 @@ class ProxyLogging:
                 )
             )
 
+        # Auth and pass-through failure bodies are unstripped client input, and
+        # the logging handler below flattens body keys into model_call_details,
+        # so drop the key before it can masquerade as the built payload.
+        request_data.pop("standard_logging_object", None)
+
         ### LOGGING ###
         if self._is_proxy_only_llm_api_error(
             original_exception=original_exception,
@@ -2294,29 +2326,7 @@ class ProxyLogging:
                 original_exception=original_exception,
             )
 
-        # Lift the first-handoff instant onto request_data (top-level
-        # internal key, not metadata) so failure-path callbacks can still
-        # compute preprocessing latency after the logging object is popped.
-        _logging_obj: Final = request_data.get("litellm_logging_obj")
-        if _logging_obj is not None:
-            _model_call_details: Final = getattr(_logging_obj, "model_call_details", {})
-            _first_handoff: Final = _model_call_details.get("first_api_call_start_time")
-            if _first_handoff is not None:
-                request_data["first_api_call_start_time"] = _first_handoff
-
-            # Lift recovered partial-stream usage, or an estimated input-side
-            # usage for a dispatched failure, onto request_data so the
-            # failure-path spend callbacks (which run after the logging object
-            # is popped) record real token counts instead of zero.
-            _usage_to_lift: Final = _failure_usage_to_lift(
-                model_call_details=_model_call_details,
-                request_body=request_data,
-                dispatched=_first_handoff is not None,
-            )
-            if _usage_to_lift is not None:
-                _lifted_usage, _lifted_cost = _usage_to_lift
-                request_data["combined_usage_object"] = _lifted_usage
-                request_data["response_cost"] = _lifted_cost
+        request_data.update(_failure_fields_to_lift(request_data))
 
         # Remove before callbacks iterate — not serialisable
         request_data.pop("litellm_logging_obj", None)
@@ -5960,15 +5970,14 @@ class ProxyUpdateSpend:
                             )
 
                 break
-            except DB_RETRY_SAFE_ERROR_TYPES as e:
-                if i >= n_retry_times:  # If we've reached the maximum number of retries
-                    _raise_failed_update_spend_exception(
-                        e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
-                    )
-                # Optionally, sleep for a bit before retrying
-                await asyncio.sleep(2**i)  # Exponential backoff
             except Exception as e:
-                _raise_failed_update_spend_exception(e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj)
+                await DBSpendUpdateWriter._handle_spend_update_failure(
+                    e=e,
+                    attempt=i,
+                    n_retry_times=n_retry_times,
+                    start_time=start_time,
+                    proxy_logging_obj=proxy_logging_obj,
+                )
 
     @staticmethod
     async def update_spend_logs(
diff --git a/litellm/responses/litellm_completion_transformation/transformation.py b/litellm/responses/litellm_completion_transformation/transformation.py
index 4892e3b348c..64084bfb063 100644
--- a/litellm/responses/litellm_completion_transformation/transformation.py
+++ b/litellm/responses/litellm_completion_transformation/transformation.py
@@ -1996,6 +1996,12 @@ class LiteLLMCompletionResponsesConfig:
                         output_items.append(item)
         return output_items
 
+    @staticmethod
+    def _encode_thinking_blocks(message: Message) -> str | None:
+        thinking_blocks: Final[Sequence[Mapping[str, object]]] = getattr(message, "thinking_blocks", None) or ()
+        preserved: Final = tuple(block for block in thinking_blocks if block.get("signature") or block.get("data"))
+        return json.dumps(preserved, separators=(",", ":")) if preserved else None
+
     @staticmethod
     def _extract_reasoning_output_items(
         chat_completion_response: ModelResponse,
@@ -2004,12 +2010,14 @@ class LiteLLMCompletionResponsesConfig:
         for choice in choices:
             if hasattr(choice, "message") and choice.message:
                 message = choice.message
-                if hasattr(message, "reasoning_content") and message.reasoning_content:
+                reasoning_content = getattr(message, "reasoning_content", None) or ""
+                encrypted_content = LiteLLMCompletionResponsesConfig._encode_thinking_blocks(message)
+                if reasoning_content or encrypted_content:
                     # Only check the first choice for reasoning content
                     return [
                         GenericResponseOutputItem(
                             type="reasoning",
-                            id=f"rs_{hash(str(message.reasoning_content))}",
+                            id=f"rs_{hash(reasoning_content or encrypted_content)}",
                             status=LiteLLMCompletionResponsesConfig._map_chat_completion_finish_reason_to_responses_status(
                                 choice.finish_reason
                             ),
@@ -2017,10 +2025,13 @@ class LiteLLMCompletionResponsesConfig:
                             content=[
                                 OutputText(
                                     type="output_text",
-                                    text=message.reasoning_content,
+                                    text=text,
                                     annotations=[],
                                 )
+                                for text in (reasoning_content,)
+                                if text
                             ],
+                            encrypted_content=encrypted_content,
                         )
                     ]
         return []
@@ -2292,18 +2303,19 @@ class LiteLLMCompletionResponsesConfig:
         # Translate completion_tokens_details to output_tokens_details
         if hasattr(usage, "completion_tokens_details") and usage.completion_tokens_details is not None:
             completion_details: Final = usage.completion_tokens_details
-            output_details_dict: Final[dict[str, int]] = {}
-            if hasattr(completion_details, "reasoning_tokens") and completion_details.reasoning_tokens is not None:
-                output_details_dict["reasoning_tokens"] = completion_details.reasoning_tokens
-
-            if hasattr(completion_details, "text_tokens") and completion_details.text_tokens is not None:
-                output_details_dict["text_tokens"] = completion_details.text_tokens
-
-            if hasattr(completion_details, "image_tokens") and completion_details.image_tokens is not None:
-                output_details_dict["image_tokens"] = completion_details.image_tokens
-
-            if output_details_dict:
-                response_usage.output_tokens_details = OutputTokensDetails(**output_details_dict)
+            reasoning_token_count: Final = getattr(completion_details, "reasoning_tokens", None)
+            optional_output_details: Final[dict[str, int]] = {
+                field: value
+                for field, value in (
+                    ("text_tokens", getattr(completion_details, "text_tokens", None)),
+                    ("image_tokens", getattr(completion_details, "image_tokens", None)),
+                )
+                if value is not None
+            }
+            response_usage.output_tokens_details = OutputTokensDetails(
+                reasoning_tokens=reasoning_token_count if reasoning_token_count is not None else 0,
+                **optional_output_details,
+            )
 
         return response_usage
 
diff --git a/litellm/router.py b/litellm/router.py
index 00c6c4c8b6f..26158ae0a56 100644
--- a/litellm/router.py
+++ b/litellm/router.py
@@ -64,6 +64,7 @@ from litellm.litellm_core_utils.coroutine_checker import coroutine_checker
 from litellm.litellm_core_utils.credential_accessor import CredentialAccessor
 from litellm.litellm_core_utils.dd_tracing import tracer
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLogging
+from litellm.litellm_core_utils.ptu_pricing import zeroed_ptu_pricing
 from litellm.litellm_core_utils.request_timeout_resolver import (
     get_configured_request_timeout,
 )
@@ -7695,7 +7696,16 @@ class Router:
         - None: If the deployment is not active for the current environment (if 'supported_environments' is set in litellm_params)
         """
         try:
-            litellm_params: Final[LiteLLM_Params] = LiteLLM_Params(**_litellm_params)
+            zeroed_pricing: Final = (
+                zeroed_ptu_pricing(_model_info, _litellm_params) if _model_info.get("db_model") is not True else None
+            )
+            litellm_params: Final[LiteLLM_Params] = LiteLLM_Params(
+                **(
+                    _litellm_params
+                    if zeroed_pricing is None
+                    else MappingProxyType({**_litellm_params, **zeroed_pricing})
+                )
+            )
             warn_on_provider_credential_mismatch(model_name=_model_name, litellm_params=_litellm_params)
             deployment = Deployment(
                 **deployment_info,
@@ -10253,11 +10263,13 @@ class Router:
         returned_models.extend(self.get_model_list_from_routing_groups(model_name=model_name))
 
         if len(returned_models) == 0:  # check if wildcard route
-            potential_wildcard_models: Final = self.pattern_router.route(model_name) or []
+            potential_wildcard_models: Final = self.pattern_router.get_deployments_by_pattern(model=model_name or "")
 
             ## check for team-specific wildcard models
             if team_id is not None and team_id in self.team_pattern_routers:
-                potential_team_only_wildcard_models: Final = self.team_pattern_routers[team_id].route(model_name) or []
+                potential_team_only_wildcard_models: Final = self.team_pattern_routers[
+                    team_id
+                ].get_deployments_by_pattern(model=model_name or "")
                 potential_wildcard_models.extend(potential_team_only_wildcard_models)
 
             if model_name is not None and potential_wildcard_models is not None:
@@ -11189,6 +11201,8 @@ class Router:
             if pre_routing_hook_response is not None:
                 model = pre_routing_hook_response.model
                 messages = pre_routing_hook_response.messages
+                if pre_routing_hook_response.litellm_params:
+                    request_kwargs.update(pre_routing_hook_response.litellm_params)
             #########################################################
 
             # Resolve the strategy and logger AFTER the pre-routing hook, since
@@ -11298,6 +11312,8 @@ class Router:
             if pre_routing_hook_response is not None:
                 model = pre_routing_hook_response.model
                 messages = pre_routing_hook_response.messages
+                if pre_routing_hook_response.litellm_params:
+                    request_kwargs.update(pre_routing_hook_response.litellm_params)
 
             # 2. Get healthy deployments
             healthy_deployments: Final = await self.async_get_healthy_deployments(
diff --git a/litellm/router_strategy/complexity_router/README.md b/litellm/router_strategy/complexity_router/README.md
index 259933dbb9e..cf7bde93360 100644
--- a/litellm/router_strategy/complexity_router/README.md
+++ b/litellm/router_strategy/complexity_router/README.md
@@ -53,6 +53,21 @@ model_list:
           REASONING: o1-preview
 ```
 
+Each tier can also use a model entry with request parameter overrides. A tier value may be
+a model string, a single object, or a list mixing strings and objects. Object entries must
+contain a model name and may contain any LiteLLM request parameters. The model name must
+still resolve to a deployment in `model_list`; this configuration does not create one
+
+```yaml
+        tiers:
+          COMPLEX: opus
+          REASONING:
+            - model_name: opus
+              litellm_params:
+                reasoning_effort: xhigh
+            - abc
+```
+
 ### Renaming the tiers
 
 `tier_labels` puts your own vocabulary on the four tiers:
@@ -165,7 +180,7 @@ response = litellm.completion(
 
 ### Reasoning Override
 
-If 2+ reasoning markers are detected in the user message, the request is automatically routed to the REASONING tier regardless of the weighted score. This ensures complex reasoning tasks get the appropriate model.
+If 2+ reasoning markers are detected in the user message, the request is promoted to the REASONING tier even when the weighted score maps lower, so complex reasoning tasks get the appropriate model. The promotion requires the score to reach `reasoning_override_min_score`, which tracks `tier_boundaries.simple_medium` unless set, so stock phrases on an otherwise trivial prompt cannot buy the top tier. Set it to `0` to promote on the markers alone.
 
 ### System Prompt Handling
 
diff --git a/litellm/router_strategy/complexity_router/complexity_router.py b/litellm/router_strategy/complexity_router/complexity_router.py
index d16063b9bd4..0cb50cf3a3d 100644
--- a/litellm/router_strategy/complexity_router/complexity_router.py
+++ b/litellm/router_strategy/complexity_router/complexity_router.py
@@ -30,6 +30,7 @@ from litellm.constants import EMPTY_MAPPING, RETURN_RAW_MODEL_NAME_METADATA_KEY
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.litellm_core_utils.core_helpers import get_metadata_variable_name_from_kwargs
 from litellm.litellm_core_utils.internal_call_metadata import forwarded_internal_call_metadata
+from litellm.litellm_core_utils.sensitive_data_masker import mask_credentials_in_payload
 from litellm.llms.base_llm.base_utils import type_to_response_format_param
 from litellm.types.utils import (
     AUTOROUTER_CLASSIFIER_CALL_ORIGIN,
@@ -663,6 +664,35 @@ class ClassificationOutcome(NamedTuple):
     classifier_cost: float | None = None
 
 
+class _SessionAffinityPin(NamedTuple):
+    model: str
+    tier: ComplexityTier | None
+
+
+def _parse_session_affinity_pin(value: object) -> _SessionAffinityPin | None:
+    if isinstance(value, str):
+        return _SessionAffinityPin(model=value, tier=None)
+    parts: Final[tuple[object, object] | None] = (
+        (value.get("model"), value.get("tier"))
+        if isinstance(value, Mapping)
+        else (value[0], value[1])
+        if isinstance(value, (list, tuple)) and len(value) == 2
+        else None
+    )
+    if parts is None:
+        return None
+    model, tier_value = parts
+    if not isinstance(model, str):
+        return None
+    tier: Final = ComplexityTier(tier_value) if isinstance(tier_value, str) else None
+    return _SessionAffinityPin(model=model, tier=tier)
+
+
+def _session_affinity_cache_value(model: str, tier: ComplexityTier | str | None) -> Mapping[str, str | None]:
+    tier_value: Final = _tier_name(tier) if tier is not None else None
+    return {"model": model, "tier": tier_value}  # mutable-ok: cache requires JSON mapping
+
+
 class ComplexityRouter(CustomLogger):
     """
     Complexity router that classifies requests and routes to appropriate models.
@@ -1020,13 +1050,14 @@ class ComplexityRouter(CustomLogger):
         weights: Final = self.config.dimension_weights
         weighted_score: Final = sum(d.score * weights.get(d.name, 0) for d in dimensions)
 
-        # Check for reasoning override (2+ reasoning markers)
+        boundaries: Final = self._effective_tier_boundaries()
+        clears_override_floor: Final = weighted_score >= self._effective_reasoning_override_min_score()
+
         # Reuse match count from _score_keyword_match to avoid scanning twice
-        if reasoning_match_count >= 2:
+        if reasoning_match_count >= 2 and clears_override_floor:
             return ComplexityTier.REASONING, weighted_score, tuple(signals), "reasoning_override"
 
         # Map score to tier
-        boundaries: Final = self._effective_tier_boundaries()
         if weighted_score < boundaries["simple_medium"]:
             tier = ComplexityTier.SIMPLE
         elif weighted_score < boundaries["medium_complex"]:
@@ -1038,6 +1069,18 @@ class ComplexityRouter(CustomLogger):
 
         return tier, weighted_score, tuple(signals), "heuristic_scorer"
 
+    def _effective_reasoning_override_min_score(self) -> float:
+        """The score a request must reach before the reasoning-marker override may promote it.
+
+        Unset tracks the SIMPLE/MEDIUM boundary, so moving that boundary moves this floor with it
+        and the override still cannot rescue a request the mapping would call SIMPLE. An explicit
+        0 is a real floor, not an absent one, so the comparison is against None.
+        """
+        configured: Final = self.config.reasoning_override_min_score
+        if configured is None:
+            return self._effective_tier_boundaries()["simple_medium"]
+        return configured
+
     def _effective_tier_boundaries(self) -> StandardLoggingRoutingDecisionTierBoundaries:
         """The tier boundaries in effect, with the documented defaults filled in.
 
@@ -1065,6 +1108,7 @@ class ComplexityRouter(CustomLogger):
         classifier_model: str | None = None,
         classifier_cost: float | None = None,
         conversation_continuing: bool = True,
+        tier_litellm_params: Mapping[str, object] | None = None,
     ) -> StandardLoggingRoutingDecision:
         """Assemble the per-request provenance record for this router's decision.
 
@@ -1094,6 +1138,7 @@ class ComplexityRouter(CustomLogger):
         if score is not None:
             decision["score"] = score
             decision["tier_boundaries"] = self._effective_tier_boundaries()
+            decision["reasoning_override_min_score"] = self._effective_reasoning_override_min_score()
         if signals:
             # Stored as a list because this record is serialized to JSON for the spend
             # log and read back as an array by the dashboard; a sequence type that only
@@ -1113,6 +1158,10 @@ class ComplexityRouter(CustomLogger):
             decision["classifier_model"] = classifier_model
         if classifier_cost is not None:
             decision["classifier_cost"] = classifier_cost
+        if tier_litellm_params:
+            masked_tier_litellm_params: Final = mask_credentials_in_payload(tier_litellm_params)
+            if isinstance(masked_tier_litellm_params, Mapping):
+                decision["tier_litellm_params"] = masked_tier_litellm_params
         return decision
 
     async def aclassify(
@@ -1443,6 +1492,13 @@ class ComplexityRouter(CustomLogger):
 
         raise ValueError(f"No model configured for tier {tier_key} and no default_model set")
 
+    def _litellm_params_for_model(self, tier: ComplexityTier | str | None, model: str) -> Mapping[str, object]:
+        if tier is None:
+            return MappingProxyType({})
+        entries: Final = self.config.tier_model_configs.get(_tier_name(tier), ())
+        entry: Final = next((candidate for candidate in entries if candidate.model_name == model), None)
+        return entry.litellm_params if entry is not None else MappingProxyType({})
+
     @staticmethod
     def _pick_from_tier_value(model: str | list[str], tier_key: str) -> str:
         if isinstance(model, str):
@@ -2054,9 +2110,10 @@ class ComplexityRouter(CustomLogger):
         cache_key = self._get_session_affinity_cache_key(session_id, request_kwargs) if session_id is not None else None
 
         if cache_key is not None:
-            pinned_model: Final = await self.litellm_router_instance.cache.async_get_cache(key=cache_key)
-            if isinstance(pinned_model, str):
-                routed_model: str | None = pinned_model
+            pinned_value: Final = await self.litellm_router_instance.cache.async_get_cache(key=cache_key)
+            pinned_pin: Final = _parse_session_affinity_pin(pinned_value)
+            if pinned_pin is not None:
+                routed_model: str | None = pinned_pin.model
                 pin_escalation_keyword: str | None = None
                 if self.escalation_keywords:
                     user_message: Final = (
@@ -2065,16 +2122,21 @@ class ComplexityRouter(CustomLogger):
                     if user_message is not None:
                         pin_escalation_keyword = self._matched_escalation_keyword(user_message)
                     if pin_escalation_keyword is not None:
-                        routed_model = self._escalated_pin(pinned_model)
+                        routed_model = self._escalated_pin(pinned_pin.model)
                 if routed_model is not None:
-                    escalated: Final = routed_model != pinned_model
+                    escalated: Final = routed_model != pinned_pin.model
+                    resolved_pin_tier: Final = (
+                        pinned_pin.tier
+                        if not escalated and pinned_pin.tier is not None
+                        else self._tier_for_model(routed_model)
+                    )
                     # The floor outranks the pin because plan mode is a transient state of the
                     # session, not a request to move it: the turns carrying the sentinel route at
                     # the floor, and the stored pin deliberately keeps the session's own model so
                     # the first turn after plan mode exits auto-routes exactly as it would have.
                     # Escalation is the opposite on purpose -- an explicit ask to re-pin higher.
                     pin_plan_sentinel: Final = self._matched_plan_mode_signal(request_kwargs, resolved_messages)
-                    pinned_tier: Final = self._tier_for_model(routed_model) if pin_plan_sentinel is not None else None
+                    pinned_tier: Final = resolved_pin_tier if pin_plan_sentinel is not None else None
                     plan_floored: Final = (
                         pinned_tier is not None and self._apply_plan_mode_floor(pinned_tier) != pinned_tier
                     )
@@ -2085,7 +2147,7 @@ class ComplexityRouter(CustomLogger):
                     # pin mid-conversation just because it outlives the original write.
                     await self.litellm_router_instance.cache.async_set_cache(
                         key=cache_key,
-                        value=session_model,
+                        value=_session_affinity_cache_value(session_model, resolved_pin_tier),
                         ttl=self.config.session_affinity_ttl_seconds,
                     )
                     if self.config.adaptive:
@@ -2104,19 +2166,23 @@ class ComplexityRouter(CustomLogger):
                     verbose_router_logger.info(
                         "ComplexityRouter: routing decision cause=%s, routed_model=%s", cause, routed_model
                     )
+                    routed_pin_tier: Final = self._tier_for_model(routed_model) if plan_floored else resolved_pin_tier
+                    session_tier_litellm_params: Final = self._litellm_params_for_model(routed_pin_tier, routed_model)
                     has_original_messages: Final = messages is not None and len(messages) > 0
                     return self._with_session_deployment_affinity(
                         PreRoutingHookResponse(
                             model=routed_model,
                             messages=messages if has_original_messages else None,
+                            litellm_params=session_tier_litellm_params,
                             routing_decision=self._build_routing_decision(
                                 routed_model=routed_model,
                                 cause=cause,
-                                tier=self._tier_for_model(routed_model),
+                                tier=routed_pin_tier,
                                 matched_keyword=pin_plan_sentinel if plan_floored else None,
                                 escalation_keyword=pin_escalation_keyword,
                                 escalated=escalated,
                                 conversation_continuing=conversation_continuing,
+                                tier_litellm_params=session_tier_litellm_params,
                             ),
                         )
                     )
@@ -2143,7 +2209,10 @@ class ComplexityRouter(CustomLogger):
         if pinnable and cache_key is not None and response is not None:
             await self.litellm_router_instance.cache.async_set_cache(
                 key=cache_key,
-                value=response.model,
+                value=_session_affinity_cache_value(
+                    response.model,
+                    response.routing_decision.get("tier") if response.routing_decision is not None else None,
+                ),
                 ttl=self.config.session_affinity_ttl_seconds,
             )
         return self._with_session_deployment_affinity(response)
@@ -2257,6 +2326,7 @@ class ComplexityRouter(CustomLogger):
             )
             keyword_plan_floored: Final = routed_tier != escalated_tier
             routed_model = await self._pick_model_for_tier(routed_tier, messages, resolved_messages, request_kwargs)
+            keyword_tier_litellm_params: Final = self._litellm_params_for_model(routed_tier, routed_model)
             keyword_cause: Final[RoutingDecisionCause] = (
                 "plan_mode"
                 if keyword_plan_floored
@@ -2272,6 +2342,7 @@ class ComplexityRouter(CustomLogger):
             return PreRoutingHookResponse(
                 model=routed_model,
                 messages=messages if has_original_messages else None,
+                litellm_params=keyword_tier_litellm_params,
                 routing_decision=self._build_routing_decision(
                     routed_model=routed_model,
                     conversation_continuing=conversation_continuing,
@@ -2280,6 +2351,7 @@ class ComplexityRouter(CustomLogger):
                     matched_keyword=plan_mode_sentinel if keyword_plan_floored else override.matched_keyword,
                     escalation_keyword=escalation_keyword,
                     escalated=keyword_escalated,
+                    tier_litellm_params=keyword_tier_litellm_params,
                 ),
             )
 
@@ -2366,6 +2438,7 @@ class ComplexityRouter(CustomLogger):
                 routed_model,
             )
 
+        tier_litellm_params: Final = self._litellm_params_for_model(tier, routed_model)
         classifier_model: Final = (
             self.config.classifier_llm_config.model
             if outcome.cause == "llm_classifier" and self.config.classifier_llm_config is not None
@@ -2391,6 +2464,7 @@ class ComplexityRouter(CustomLogger):
         return PreRoutingHookResponse(
             model=routed_model,
             messages=messages if has_original_messages else None,
+            litellm_params=tier_litellm_params,
             routing_decision=self._build_routing_decision(
                 routed_model=routed_model,
                 conversation_continuing=conversation_continuing,
@@ -2403,5 +2477,6 @@ class ComplexityRouter(CustomLogger):
                 escalated=escalated,
                 classifier_model=classifier_model,
                 classifier_cost=outcome.classifier_cost,
+                tier_litellm_params=tier_litellm_params,
             ),
         )
diff --git a/litellm/router_strategy/complexity_router/config.py b/litellm/router_strategy/complexity_router/config.py
index 6d43199c948..73f1378e5f7 100644
--- a/litellm/router_strategy/complexity_router/config.py
+++ b/litellm/router_strategy/complexity_router/config.py
@@ -5,10 +5,12 @@ Contains default keyword lists, weights, tier boundaries, and configuration clas
 All values are configurable via proxy config.yaml.
 """
 
+from collections.abc import Mapping
 from enum import Enum
-from typing import Final, Literal
+from types import MappingProxyType
+from typing import Annotated, Final, Literal
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field, SkipValidation, field_serializer, field_validator, model_validator
 
 from litellm.types.router import AdaptiveRouterWeights, ClassifierPlugin, RoutingPlugin
 
@@ -159,6 +161,44 @@ class ReminderMarkerPair(BaseModel):
         return self
 
 
+class ComplexityTierModel(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
+    model_name: str
+    litellm_params: Annotated[Mapping[str, object], SkipValidation()] = Field(
+        default_factory=lambda: MappingProxyType({})
+    )
+
+    @field_validator("litellm_params", mode="before")
+    @classmethod
+    def _freeze_litellm_params(cls, value: Mapping[str, object]) -> Mapping[str, object]:
+        return MappingProxyType(dict(value))
+
+    @field_serializer("litellm_params")
+    def _serialize_litellm_params(self, value: Mapping[str, object]) -> Mapping[str, object]:
+        return dict(value)  # mutable-ok: Pydantic JSON serialization requires a concrete mapping
+
+
+def _normalize_tier_entries(
+    raw_value: object,
+    tier: str,
+) -> tuple[str | list[str], tuple[ComplexityTierModel, ...]]:
+    raw_entries: Final = raw_value if isinstance(raw_value, (list, tuple)) else (raw_value,)
+    entries: Final = tuple(
+        ComplexityTierModel(model_name=entry) if isinstance(entry, str) else ComplexityTierModel.model_validate(entry)
+        for entry in raw_entries
+    )
+    model_names: Final = tuple(entry.model_name for entry in entries)
+    if len(model_names) != len(frozenset(model_names)):
+        raise ValueError(f"tier {tier} contains duplicate model_name values; each pool entry needs distinct parameters")
+    normalized: Final = (
+        entries[0].model_name
+        if not isinstance(raw_value, (list, tuple))
+        else list(model_names)  # mutable-ok: config.tiers must preserve its existing list contract
+    )
+    return normalized, entries
+
+
 # ─── Default Keyword Lists ───
 # Note: Keywords should be full words/phrases to avoid substring false positives.
 # The matching logic uses word boundary detection for single-word keywords.
@@ -425,6 +465,9 @@ class ComplexityRouterConfig(BaseModel):
             "A list is randomly picked from when adaptive=False, and used as a soft-floor home pool when adaptive=True"
         ),
     )
+    tier_model_configs: Mapping[str, tuple[ComplexityTierModel, ...]] = Field(
+        default_factory=dict,
+    )
 
     tier_definitions: tuple[TierDefinition, ...] | None = Field(
         default=None,
@@ -481,6 +524,15 @@ class ComplexityRouterConfig(BaseModel):
         ),
     )
 
+    reasoning_override_min_score: float | None = Field(
+        default=None,
+        description=(
+            "Minimum weighted score a request must reach before 2+ reasoning markers may promote it to the "
+            "reasoning tier. Unset tracks tier_boundaries.simple_medium, so the override never rescues a "
+            "request the scorer placed in the cheapest tier; 0 restores the unconditional override"
+        ),
+    )
+
     # Token count thresholds
     token_thresholds: dict[str, int] = Field(
         default_factory=lambda: DEFAULT_TOKEN_THRESHOLDS.copy(),
@@ -768,6 +820,55 @@ class ComplexityRouterConfig(BaseModel):
                 coerced[key] = item
         return coerced
 
+    @model_validator(mode="before")
+    @classmethod
+    def _normalize_tier_model_configs(cls, value: object) -> object:
+        if not isinstance(value, dict):
+            return value
+        raw_tiers: Final = value.get("tiers")
+        if not isinstance(raw_tiers, dict):
+            return value
+        existing_configs: Final = value.get("tier_model_configs")
+        normalized_entries: Final = MappingProxyType(
+            {tier: _normalize_tier_entries(raw_value, tier) for tier, raw_value in raw_tiers.items()}
+        )
+        normalized_tiers: Final = MappingProxyType(
+            {tier: normalized for tier, (normalized, _) in normalized_entries.items()}
+        )
+        incoming_params: Final = (
+            MappingProxyType(
+                {
+                    (tier, entry.model_name): entry.litellm_params
+                    for tier, entries in existing_configs.items()
+                    for entry in (ComplexityTierModel.model_validate(item) for item in entries)
+                }
+            )
+            if isinstance(existing_configs, dict)
+            else MappingProxyType({})
+        )
+        tier_model_configs: Final = MappingProxyType(
+            {
+                tier: tuple(
+                    entry.model_copy(
+                        update=MappingProxyType(
+                            {
+                                "litellm_params": incoming_params.get((tier, entry.model_name), entry.litellm_params),
+                            }
+                        )
+                    )
+                    for entry in entries
+                )
+                for tier, (_, entries) in normalized_entries.items()
+                if any(entry.litellm_params for entry in entries)
+                or (isinstance(existing_configs, dict) and tier in existing_configs)
+            }
+        )
+        return {  # mutable-ok: Pydantic before-validator requires a concrete mapping
+            **value,
+            "tiers": normalized_tiers,
+            "tier_model_configs": tier_model_configs,
+        }
+
     @field_validator("escalation_keywords")
     @classmethod
     def _normalize_escalation_keywords(cls, value: list[str] | None) -> list[str] | None:
diff --git a/litellm/secret_managers/main.py b/litellm/secret_managers/main.py
index d1e4b3bb2ce..e89fbbdab65 100644
--- a/litellm/secret_managers/main.py
+++ b/litellm/secret_managers/main.py
@@ -365,6 +365,22 @@ def get_secret(
             raise e
 
 
+def secret_manager_would_be_consulted(secret_name: str) -> bool:
+    """
+    Returns True if a `get_secret` read for `secret_name` would actually reach the hosted manager.
+
+    Mirrors the gating `get_secret` applies below: the manager has to be up and readable, and
+    `hosted_keys`, when set, is an allowlist of the names it is consulted for. Callers use this to
+    tell "the manager does not have this key" apart from "the manager was never asked".
+    """
+    if not _should_read_secret_from_secret_manager():
+        return False
+    key_management_settings: Final = litellm._key_management_settings
+    if key_management_settings is None or key_management_settings.hosted_keys is None:
+        return True
+    return secret_name.removeprefix("os.environ/") in key_management_settings.hosted_keys
+
+
 def _should_read_secret_from_secret_manager() -> bool:
     """
     Returns True if the secret manager should be used to read the secret, False otherwise
@@ -373,11 +389,7 @@ def _should_read_secret_from_secret_manager() -> bool:
     - If the `_key_management_settings` access mode is "read_only" or "read_and_write", return True
     - Otherwise, return False
     """
-    if litellm.secret_manager_client is not None:
-        if litellm._key_management_settings is not None:
-            if (
-                litellm._key_management_settings.access_mode == "read_only"
-                or litellm._key_management_settings.access_mode == "read_and_write"
-            ):
-                return True
-    return False
+    key_management_settings: Final = litellm._key_management_settings
+    if litellm.secret_manager_client is None or key_management_settings is None:
+        return False
+    return key_management_settings.access_mode in ("read_only", "read_and_write")
diff --git a/litellm/types/llms/anthropic.py b/litellm/types/llms/anthropic.py
index 17ba78b0190..5179210f942 100644
--- a/litellm/types/llms/anthropic.py
+++ b/litellm/types/llms/anthropic.py
@@ -620,6 +620,12 @@ class AnthropicResponseUsageBlock(BaseModel):
     output_tokens: int
 
 
+class AnthropicOutputTokensDetails(BaseModel):
+    model_config = ConfigDict(extra="allow")
+
+    thinking_tokens: int | None = None
+
+
 AnthropicFinishReason = Literal["end_turn", "max_tokens", "stop_sequence", "tool_use"]
 
 
diff --git a/litellm/types/management_endpoints/auto_router_endpoints.py b/litellm/types/management_endpoints/auto_router_endpoints.py
index 9461297feca..63c93e0f268 100644
--- a/litellm/types/management_endpoints/auto_router_endpoints.py
+++ b/litellm/types/management_endpoints/auto_router_endpoints.py
@@ -6,7 +6,7 @@ from collections.abc import Mapping
 from datetime import datetime, timezone
 from typing import Final, Literal, TypeAlias
 
-from pydantic import AliasChoices, BaseModel, ConfigDict, Field, computed_field, field_validator, model_validator
+from pydantic import BaseModel, Field, computed_field, field_validator, model_validator
 
 from litellm.router_strategy.complexity_router.config import ComplexityRouterConfig
 from litellm.types.utils import StandardLoggingRoutingDecision
@@ -155,13 +155,17 @@ DEFAULT_SHADOW_EVAL_JUDGE_MODEL: Final[str] = "anthropic/claude-sonnet-5"
 
 
 class StartShadowEvalRequest(BaseModel):
-    """Start duplicating a key's traffic for blind comparison against an auto-router."""
+    """Start duplicating one or more keys' traffic for blind comparison against an auto-router."""
 
-    api_key_id: str = Field(
+    api_key_ids: tuple[str, ...] = Field(
+        min_length=1,
+        max_length=100,
         description=(
-            "The hashed virtual key whose traffic will be shadowed. Shadow evaluation runs ONLY on this "
-            "key's traffic; requests made with any other key are not sampled."
-        )
+            "The hashed virtual keys whose traffic will be shadowed. Shadow evaluation runs ONLY on these "
+            "keys' traffic; requests made with any other key are not sampled. Each key carries its own "
+            "max_turns budget, so one key exhausting its budget leaves the others sampling. At most 100 "
+            "keys per job, which also bounds every read the job's endpoints make."
+        ),
     )
     router_name: str = Field(description="The auto-router under evaluation, in either direction")
     direction: ShadowEvalDirection = Field(
@@ -204,8 +208,9 @@ class StartShadowEvalRequest(BaseModel):
         ge=1,
         le=2000,
         description=(
-            "Sample budget: the job judges at most this many turns, then completes. This is also the spend "
-            "bound; expected judge cost is roughly max_turns times one judge call"
+            "Per-key sample budget: the job judges at most this many turns of EACH scoped key's traffic, "
+            "so a job over N keys judges at most N times max_turns turns. This is also the spend bound; "
+            "expected judge cost is roughly that turn ceiling times one judge call"
         ),
     )
 
@@ -214,6 +219,12 @@ class StartShadowEvalRequest(BaseModel):
     def _round_percentage(cls, value: float) -> float:
         return round(value, 2)
 
+    @field_validator("api_key_ids")
+    @classmethod
+    def _dedupe_keys(cls, value: tuple[str, ...]) -> tuple[str, ...]:
+        """A key named twice would collide with itself on the one-active-per-(key, direction) index."""
+        return tuple(dict.fromkeys(value))
+
     @model_validator(mode="after")
     def _baseline_model_matches_direction(self) -> "StartShadowEvalRequest":
         if self.direction == "reverse" and self.baseline_model is None:
@@ -251,24 +262,46 @@ class ShadowEvalResult(BaseModel):
     by_tier: tuple[ShadowEvalSlice, ...]
     by_current_model: tuple[ShadowEvalSlice, ...] = Field(
         description=(
-            "Sliced by the model that served the real arm: the key's incumbent models in forward mode, "
+            "Sliced by the model that served the real arm: the keys' incumbent models in forward mode, "
             "and in reverse the models the router itself picked"
         )
     )
+    by_key: tuple[ShadowEvalSlice, ...] = Field(
+        description=(
+            "One slice per scoped key that has judged verdicts, grouped on the raw key hash. Keys the job "
+            "scopes but has not judged a turn for yet are absent rather than reported as zero"
+        ),
+    )
     overall_shadow_win_rate_pct: float
     overall_tie_rate_pct: float
 
 
-class ShadowEvalJobResponse(BaseModel):
-    """A shadow-eval job. Validates directly from the prisma record (job_id reads the
-    row's id); status is derived from stopped_at and ends_at, never stored, so no writer
-    anywhere can produce an inconsistent one. Aggregate fields are populated by the
-    detail endpoint only and stay None on list responses."""
+class ShadowEvalJobKeyResponse(BaseModel):
+    """One key a job shadows, with its own budget and stop state."""
 
-    model_config = ConfigDict(from_attributes=True, populate_by_name=True)
+    api_key_id: str = Field(description="The hashed virtual key whose traffic this entry scopes")
+    max_turns: int = Field(description="This key's own sample budget, independent of its siblings'")
+    stopped_at: datetime | None = Field(
+        default=None,
+        description=(
+            "When this key's slot was stamped free, whether its own budget ran out, the window closed, "
+            "or an operator stopped the job; status is derived, so a spent budget reads completed even "
+            "while this is still unset"
+        ),
+    )
+    attempt_count: int | None = Field(
+        default=None,
+        description=(
+            "This key's sampled attempts so far, judged and errored alike, the same count the sampler "
+            "budgets against max_turns; populated on list and detail responses. Frozen at stopped_at "
+            "once the key is stamped, so in-flight attempts landing after a stop never reclassify it"
+        ),
+    )
+
+    @property
+    def budget_spent(self) -> bool:
+        return self.attempt_count is not None and self.attempt_count >= self.max_turns
 
-    job_id: str = Field(validation_alias=AliasChoices("id", "job_id"))
-    api_key_id: str = Field(description="The hashed virtual key whose traffic this job evaluates, and only that key's")
     key_alias: str | None = Field(
         default=None,
         description="Alias of the shadowed key, resolved from the key row at read time; None when unset or deleted",
@@ -277,15 +310,34 @@ class ShadowEvalJobResponse(BaseModel):
         default=None,
         description="Masked display name (sk-...) of the shadowed key, resolved at read time like key_alias",
     )
+
+
+class ShadowEvalJobResponse(BaseModel):
+    """A shadow-eval job over one or more keys, each with its own budget and stop state;
+    status is derived from stopped_by, the keys' stop and budget state, and ends_at,
+    never stored, so no writer anywhere can produce an inconsistent one. Aggregate
+    fields are populated by the detail endpoint only and stay None on list responses."""
+
+    job_id: str
+    keys: tuple[ShadowEvalJobKeyResponse, ...] = Field(
+        min_length=1,
+        description="The keys whose traffic this job evaluates, and only those keys', each with its own budget",
+    )
     router_name: str
     direction: ShadowEvalDirection = "forward"
     baseline_model: str | None = None
     judge_model: str
     shadow_percentage: float
-    max_turns: int
     created_at: datetime
     ends_at: datetime
-    stopped_at: datetime | None = None
+    stopped_by: str | None = Field(
+        default=None,
+        description=(
+            "The operator who stopped the job early, recorded by the stop endpoint; 'unknown' backfilled "
+            "by migration for jobs that displayed stopped when the column arrived; None when the job "
+            "ended on its own. Its presence is what makes a job read stopped rather than completed"
+        ),
+    )
 
     judged_count: int | None = Field(default=None, description="Verdicts recorded; detail endpoint only")
     error_count: int | None = Field(default=None, description="Sampled attempts that errored; detail endpoint only")
@@ -296,12 +348,19 @@ class ShadowEvalJobResponse(BaseModel):
     @computed_field
     @property
     def status(self) -> ShadowEvalStatus:
-        """A job whose window has passed reads completed even if a later sweep stamped
-        stopped_at; stopped means sampling ended before the window did."""
+        """Three recorded facts, no history-guessing: a stop is stopped_by (the migration
+        backfills it for every job that displayed stopped when the column arrived, so the
+        pre-column population is closed), completion is the window passing or every key
+        spending its budget, and anything else is running. The all-keys-stamped fallback
+        covers only stops written by pre-column pods during a rolling deploy."""
+        if self.stopped_by is not None:
+            return "stopped"
         if datetime.now(timezone.utc) >= (
             self.ends_at if self.ends_at.tzinfo else self.ends_at.replace(tzinfo=timezone.utc)
         ):
             return "completed"
-        if self.stopped_at is not None:
+        if all(key.budget_spent for key in self.keys):
+            return "completed"
+        if all(key.stopped_at is not None for key in self.keys):
             return "stopped"
         return "running"
diff --git a/litellm/types/router.py b/litellm/types/router.py
index 7d1dd1358d5..99a4603ae49 100644
--- a/litellm/types/router.py
+++ b/litellm/types/router.py
@@ -4,6 +4,7 @@ litellm.Router Types - includes RouterConfig, UpdateRouterConfig, ModelInfo etc
 
 import datetime
 import enum
+from collections.abc import Mapping
 from dataclasses import dataclass
 from typing import Any, ClassVar, Final, Generic, Literal, TypeVar, get_type_hints
 
@@ -897,6 +898,7 @@ class PreRoutingHookResponse(BaseModel):
     messages: list[dict[str, Any]] | None
     routing_decision: StandardLoggingRoutingDecision | None = None
     session_affinity_ttl_seconds: int | None = None
+    litellm_params: Mapping[str, object] | None = None
 
 
 _PreRoutingStrategyT_co = TypeVar("_PreRoutingStrategyT_co", covariant=True)
diff --git a/litellm/types/utils.py b/litellm/types/utils.py
index 07005d7f9ad..96b9343353d 100644
--- a/litellm/types/utils.py
+++ b/litellm/types/utils.py
@@ -248,6 +248,9 @@ class ModelInfoBase(ProviderSpecificModelInfo, total=False):
     regional_processing_uplift_multiplier_us: (
         float | None
     )  # OpenAI US data-residency uplift multiplier applied to all token costs (e.g. 1.10 = +10%)
+    regional_endpoint_uplift_multiplier: ReadOnly[
+        float | None
+    ]  # Vertex AI non-global (regional) endpoint uplift multiplier applied to all token costs (e.g. 1.10 = +10%)
     output_cost_per_character: float | None  # only for vertex ai models
     output_cost_per_audio_token: float | None
     output_cost_per_token_above_128k_tokens: float | None  # only for vertex ai models
@@ -2836,9 +2839,11 @@ class StandardLoggingRoutingDecision(TypedDict, total=False):
     classifier_cost: float
     escalated: bool
     tier_boundaries: StandardLoggingRoutingDecisionTierBoundaries
+    reasoning_override_min_score: ReadOnly[float]
     conversation_continuing: bool
     savings_baseline_model: str
     savings_baseline_deployment_id: str
+    tier_litellm_params: Mapping[str, object]  # writable-ok: Pydantic warns on ReadOnly TypedDict fields
 
 
 # Fields whose values quote the caller's prompt. Dropped when an operator turns message
@@ -2860,9 +2865,11 @@ DERIVED_ROUTING_DECISION_FIELDS: Final[frozenset[str]] = frozenset(
         "classifier_cost",
         "escalated",
         "tier_boundaries",
+        "reasoning_override_min_score",
         "conversation_continuing",
         "savings_baseline_model",
         "savings_baseline_deployment_id",
+        "tier_litellm_params",
     }
 )
 
@@ -3113,16 +3120,17 @@ class CostBreakdown(TypedDict, total=False):
     """
     Detailed cost breakdown for a request.
 
-    ``service_tier`` and ``data_residency`` record the pricing basis the cost was
-    computed on, not what the caller asked for. A consumer that has to price a
-    counterfactual against this request (what another model would have charged for
-    it) needs the same basis to compare like with like, and re-deriving it from the
-    request is not possible after the fact: the tier the biller used comes from
-    ``optional_params``, which no log record carries.
+    ``service_tier``, ``data_residency``, and ``vertex_location`` record the pricing
+    basis the cost was computed on, not what the caller asked for. A consumer that has
+    to price a counterfactual against this request (what another model would have
+    charged for it) needs the same basis to compare like with like, and re-deriving it
+    from the request is not possible after the fact: the tier the biller used comes
+    from ``optional_params``, which no log record carries.
     """
 
     service_tier: str | None
     data_residency: str | None
+    vertex_location: ReadOnly[str | None]
     input_cost: float  # Cost of raw (non-cached) input tokens only
     cache_read_cost: float  # Cost of cache-read tokens (discounted rate)
     cache_creation_cost: float  # Cost of cache-write tokens (premium rate)
@@ -3388,6 +3396,7 @@ class CustomPricingLiteLLMParams(MirroredPricingParams):
     annotation_cost_per_page: float | None = None
     regional_processing_uplift_multiplier_eu: float | None = None
     regional_processing_uplift_multiplier_us: float | None = None
+    regional_endpoint_uplift_multiplier: float | None = None
 
     @classmethod
     def strip_custom_pricing_fields(cls, model_info: dict[str, Any]) -> dict[str, Any]:
@@ -3818,6 +3827,7 @@ class SearchProviders(str, Enum):
     YOU_COM = "you_com"
     APISERPENT = "apiserpent"
     TINYFISH = "tinyfish"
+    AGENTCORE = "agentcore"
     NIMBLE = "nimble"
 
 
diff --git a/litellm/utils.py b/litellm/utils.py
index a7b70c4129a..d1b0cb882ac 100644
--- a/litellm/utils.py
+++ b/litellm/utils.py
@@ -5662,6 +5662,7 @@ def _get_model_info_helper(
                 regional_processing_uplift_multiplier_us=_model_info.get(
                     "regional_processing_uplift_multiplier_us", None
                 ),
+                regional_endpoint_uplift_multiplier=_model_info.get("regional_endpoint_uplift_multiplier", None),
                 output_cost_per_audio_token=_model_info.get("output_cost_per_audio_token", None),
                 output_cost_per_character=_model_info.get("output_cost_per_character", None),
                 output_cost_per_reasoning_token=_model_info.get("output_cost_per_reasoning_token", None),
@@ -9077,6 +9078,7 @@ class ProviderConfigManager:
         from litellm.llms.apiserpent.search.transformation import (
             APISerpentSearchConfig,
         )
+        from litellm.llms.bedrock.search.transformation import AgentCoreSearchConfig
         from litellm.llms.brave.search.transformation import BraveSearchConfig
         from litellm.llms.dataforseo.search.transformation import DataForSEOSearchConfig
         from litellm.llms.duckduckgo.search.transformation import DuckDuckGoSearchConfig
@@ -9115,6 +9117,7 @@ class ProviderConfigManager:
             SearchProviders.YOU_COM: YouComSearchConfig,
             SearchProviders.APISERPENT: APISerpentSearchConfig,
             SearchProviders.TINYFISH: TinyfishSearchConfig,
+            SearchProviders.AGENTCORE: AgentCoreSearchConfig,
             SearchProviders.NIMBLE: NimbleSearchConfig,
         }
         config_class: Final = PROVIDER_TO_CONFIG_MAP.get(provider, None)
diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index 07f9027313b..d0eca17272d 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -54,6 +54,7 @@
         "output_cost_per_image": 0.04
     },
     "1024-x-1024/dall-e-2": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 1.9e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -67,6 +68,7 @@
         "output_cost_per_image": 0.08
     },
     "256-x-256/dall-e-2": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 2.4414e-07,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -80,6 +82,7 @@
         "output_cost_per_image": 0.018
     },
     "512-x-512/dall-e-2": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 6.86e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -2887,6 +2890,7 @@
         "supports_function_calling": true
     },
     "azure_ai/claude-haiku-4-5": {
+        "deprecation_date": "2026-10-19",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -2908,6 +2912,7 @@
         "supports_vision": true
     },
     "azure_ai/claude-opus-4-5": {
+        "deprecation_date": "2026-10-19",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -2930,6 +2935,7 @@
         "supports_output_config": true
     },
     "azure_ai/claude-opus-4-6": {
+        "deprecation_date": "2027-02-02",
         "supports_adaptive_thinking": true,
         "input_cost_per_token": 5e-06,
         "output_cost_per_token": 2.5e-05,
@@ -2959,6 +2965,7 @@
         "supports_max_reasoning_effort": true
     },
     "azure_ai/claude-opus-4-7": {
+        "deprecation_date": "2027-04-06",
         "supports_adaptive_thinking": true,
         "input_cost_per_token": 5e-06,
         "output_cost_per_token": 2.5e-05,
@@ -3083,6 +3090,7 @@
         "supports_max_reasoning_effort": true
     },
     "azure_ai/claude-opus-4-1": {
+        "deprecation_date": "2026-08-05",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -3104,6 +3112,7 @@
         "supports_vision": true
     },
     "azure_ai/claude-sonnet-4-5": {
+        "deprecation_date": "2026-10-19",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -3156,6 +3165,7 @@
         "supports_max_reasoning_effort": true
     },
     "azure_ai/claude-sonnet-4-6": {
+        "deprecation_date": "2027-02-10",
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
@@ -3226,6 +3236,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1e-06,
         "cache_read_input_token_cost_priority": 1e-06,
@@ -3318,6 +3329,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 5e-07,
         "cache_read_input_token_cost_priority": 5e-07,
@@ -3364,6 +3376,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-2026-03-05": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 5e-07,
         "cache_read_input_token_cost_priority": 5e-07,
@@ -3410,6 +3423,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-pro": {
+        "deprecation_date": "2027-09-07",
         "cache_read_input_token_cost": 3e-06,
         "cache_read_input_token_cost_above_272k_tokens": 6e-06,
         "cache_read_input_token_cost_priority": 6e-06,
@@ -3455,6 +3469,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-pro-2026-03-05": {
+        "deprecation_date": "2027-09-07",
         "cache_read_input_token_cost": 3e-06,
         "cache_read_input_token_cost_above_272k_tokens": 6e-06,
         "cache_read_input_token_cost_priority": 6e-06,
@@ -3500,6 +3515,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure_ai/gpt-5.4-mini": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_priority": 1.5e-07,
         "input_cost_per_token": 7.5e-07,
@@ -3540,6 +3556,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4-mini-2026-03-17": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_priority": 1.5e-07,
         "input_cost_per_token": 7.5e-07,
@@ -3580,6 +3597,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4-nano": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 2e-08,
         "cache_read_input_token_cost_priority": 4e-08,
         "input_cost_per_token": 2e-07,
@@ -3620,6 +3638,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure_ai/gpt-5.4-nano-2026-03-17": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 2e-08,
         "cache_read_input_token_cost_priority": 4e-08,
         "input_cost_per_token": 2e-07,
@@ -3849,6 +3868,7 @@
         "supports_vision": true
     },
     "azure/eu/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -3918,6 +3938,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/eu/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -3948,6 +3969,7 @@
         "supports_vision": true
     },
     "azure/eu/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.8e-08,
         "input_cost_per_token": 2.75e-07,
         "litellm_provider": "azure",
@@ -4107,6 +4129,7 @@
         "supports_vision": true
     },
     "azure/global-standard/gpt-4o-mini": {
+        "deprecation_date": "2027-04-14",
         "input_cost_per_token": 1.5e-07,
         "litellm_provider": "azure",
         "max_input_tokens": 128000,
@@ -4155,6 +4178,7 @@
         "supports_vision": true
     },
     "azure/global/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -4224,6 +4248,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/global/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -4254,6 +4279,7 @@
         "supports_vision": true
     },
     "azure/global/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure",
@@ -4492,6 +4518,7 @@
         "supports_vision": true
     },
     "azure/gpt-4.1": {
+        "deprecation_date": "2027-04-14",
         "cache_read_input_token_cost": 5e-07,
         "input_cost_per_token": 2e-06,
         "input_cost_per_token_batches": 1e-06,
@@ -4559,6 +4586,7 @@
         "supports_web_search": false
     },
     "azure/gpt-4.1-mini": {
+        "deprecation_date": "2027-04-14",
         "cache_read_input_token_cost": 1e-07,
         "input_cost_per_token": 4e-07,
         "input_cost_per_token_batches": 2e-07,
@@ -4626,6 +4654,7 @@
         "supports_web_search": false
     },
     "azure/gpt-4.1-nano": {
+        "deprecation_date": "2026-10-14",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 1e-07,
         "input_cost_per_token_batches": 5e-08,
@@ -4902,6 +4931,7 @@
         "supports_vision": false
     },
     "azure/gpt-4o-mini": {
+        "deprecation_date": "2027-04-14",
         "cache_read_input_token_cost": 7.5e-08,
         "input_cost_per_token": 1.65e-07,
         "litellm_provider": "azure",
@@ -5344,6 +5374,7 @@
         "supports_vision": true
     },
     "azure/gpt-5": {
+        "deprecation_date": "2027-02-09",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -5507,6 +5538,7 @@
         "supports_vision": true
     },
     "azure/gpt-5-mini": {
+        "deprecation_date": "2027-02-09",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure",
@@ -5572,6 +5604,7 @@
         "supports_vision": true
     },
     "azure/gpt-5-nano": {
+        "deprecation_date": "2027-02-09",
         "cache_read_input_token_cost": 5e-09,
         "input_cost_per_token": 5e-08,
         "litellm_provider": "azure",
@@ -5667,6 +5700,7 @@
         "supports_vision": true
     },
     "azure/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -5736,6 +5770,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.25e-07,
         "input_cost_per_token": 1.25e-06,
         "litellm_provider": "azure",
@@ -5797,6 +5832,7 @@
         "supports_vision": true
     },
     "azure/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.5e-08,
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure",
@@ -5827,6 +5863,7 @@
         "supports_vision": true
     },
     "azure/gpt-5.2": {
+        "deprecation_date": "2027-06-08",
         "cache_read_input_token_cost": 1.75e-07,
         "input_cost_per_token": 1.75e-06,
         "litellm_provider": "azure",
@@ -6136,6 +6173,7 @@
         "supports_web_search": true
     },
     "azure/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 5e-07,
         "cache_read_input_token_cost_priority": 5e-07,
@@ -6180,6 +6218,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure/us/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.8e-07,
         "cache_read_input_token_cost_priority": 5.5e-07,
         "input_cost_per_token": 2.75e-06,
@@ -6218,6 +6257,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure/eu/gpt-5.4": {
+        "deprecation_date": "2027-09-02",
         "cache_read_input_token_cost": 2.8e-07,
         "cache_read_input_token_cost_priority": 5.5e-07,
         "input_cost_per_token": 2.75e-06,
@@ -6379,6 +6419,7 @@
         "supports_minimal_reasoning_effort": true
     },
     "azure/gpt-5.4-pro": {
+        "deprecation_date": "2027-09-07",
         "cache_read_input_token_cost": 3e-06,
         "cache_read_input_token_cost_above_272k_tokens": 6e-06,
         "input_cost_per_token": 3e-05,
@@ -7045,6 +7086,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1e-06,
         "cache_read_input_token_cost_priority": 1e-06,
@@ -7095,6 +7137,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure/us/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1.1e-06,
         "cache_read_input_token_cost_priority": 1.38e-06,
@@ -7142,6 +7185,7 @@
         "supports_minimal_reasoning_effort": false
     },
     "azure/eu/gpt-5.5": {
+        "deprecation_date": "2027-10-26",
         "cache_read_input_token_cost": 5.5e-07,
         "cache_read_input_token_cost_above_272k_tokens": 1.1e-06,
         "cache_read_input_token_cost_priority": 1.38e-06,
@@ -7408,6 +7452,7 @@
         "supports_web_search": true
     },
     "azure/gpt-5.4-mini": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 7.5e-08,
         "input_cost_per_token": 7.5e-07,
         "litellm_provider": "azure",
@@ -7489,6 +7534,7 @@
         "supports_xhigh_reasoning_effort": true
     },
     "azure/gpt-5.4-nano": {
+        "deprecation_date": "2027-09-21",
         "cache_read_input_token_cost": 2e-08,
         "input_cost_per_token": 2e-07,
         "litellm_provider": "azure",
@@ -7601,6 +7647,7 @@
         "output_cost_per_token": 0.0
     },
     "azure/high/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.59263611e-07,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7610,6 +7657,7 @@
         ]
     },
     "azure/high/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7619,6 +7667,7 @@
         ]
     },
     "azure/high/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7628,6 +7677,7 @@
         ]
     },
     "azure/low/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.0490417e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7637,6 +7687,7 @@
         ]
     },
     "azure/low/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7646,6 +7697,7 @@
         ]
     },
     "azure/low/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7655,6 +7707,7 @@
         ]
     },
     "azure/medium/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7664,6 +7717,7 @@
         ]
     },
     "azure/medium/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7673,6 +7727,7 @@
         ]
     },
     "azure/medium/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7695,6 +7750,7 @@
         ]
     },
     "azure/gpt-image-1.5": {
+        "deprecation_date": "2027-06-16",
         "cache_read_input_token_cost": 1.25e-06,
         "input_cost_per_token": 5e-06,
         "input_cost_per_image_token": 8e-06,
@@ -7720,6 +7776,7 @@
         ]
     },
     "azure/gpt-image-2": {
+        "deprecation_date": "2027-10-21",
         "cache_read_input_token_cost": 1.25e-06,
         "input_cost_per_token": 5e-06,
         "input_cost_per_image_token": 8e-06,
@@ -7751,6 +7808,7 @@
         "supports_pdf_input": true
     },
     "azure/low/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 2.0751953125e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7760,6 +7818,7 @@
         ]
     },
     "azure/low/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 2.0751953125e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7769,6 +7828,7 @@
         ]
     },
     "azure/low/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 2.0345052083e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7778,6 +7838,7 @@
         ]
     },
     "azure/medium/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 8.056640625e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7787,6 +7848,7 @@
         ]
     },
     "azure/medium/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 8.056640625e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7796,6 +7858,7 @@
         ]
     },
     "azure/medium/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 7.9752604167e-09,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7805,6 +7868,7 @@
         ]
     },
     "azure/high/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 3.173828125e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7814,6 +7878,7 @@
         ]
     },
     "azure/high/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 3.173828125e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7823,6 +7888,7 @@
         ]
     },
     "azure/high/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2027-04-07",
         "input_cost_per_pixel": 3.1575520833e-08,
         "litellm_provider": "azure",
         "mode": "image_generation",
@@ -7850,6 +7916,7 @@
         "supports_function_calling": true
     },
     "azure/o1": {
+        "deprecation_date": "2026-10-21",
         "cache_read_input_token_cost": 7.5e-06,
         "input_cost_per_token": 1.5e-05,
         "litellm_provider": "azure",
@@ -7944,6 +8011,7 @@
         "supports_vision": false
     },
     "azure/o3": {
+        "deprecation_date": "2026-10-21",
         "cache_read_input_token_cost": 5e-07,
         "input_cost_per_token": 2e-06,
         "litellm_provider": "azure",
@@ -8041,6 +8109,7 @@
         "supports_web_search": true
     },
     "azure/o3-mini": {
+        "deprecation_date": "2026-10-01",
         "cache_read_input_token_cost": 5.5e-07,
         "input_cost_per_token": 1.1e-06,
         "litellm_provider": "azure",
@@ -8071,6 +8140,7 @@
         "supports_vision": false
     },
     "azure/o3-pro": {
+        "deprecation_date": "2026-12-17",
         "input_cost_per_token": 2e-05,
         "input_cost_per_token_batches": 1e-05,
         "litellm_provider": "azure",
@@ -8132,6 +8202,7 @@
         "supports_vision": true
     },
     "azure/o4-mini": {
+        "deprecation_date": "2026-10-16",
         "cache_read_input_token_cost": 2.75e-07,
         "input_cost_per_token": 1.1e-06,
         "litellm_provider": "azure",
@@ -8580,6 +8651,7 @@
         "supports_vision": true
     },
     "azure/us/gpt-5.1": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -8649,6 +8721,7 @@
         "supports_none_reasoning_effort": true
     },
     "azure/us/gpt-5.1-codex": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 1.4e-07,
         "input_cost_per_token": 1.38e-06,
         "litellm_provider": "azure",
@@ -8679,6 +8752,7 @@
         "supports_vision": true
     },
     "azure/us/gpt-5.1-codex-mini": {
+        "deprecation_date": "2027-05-15",
         "cache_read_input_token_cost": 2.8e-08,
         "input_cost_per_token": 2.75e-07,
         "litellm_provider": "azure",
@@ -8876,6 +8950,7 @@
         ]
     },
     "azure_ai/FW-DeepSeek-V3.2": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 3.1e-07,
         "input_cost_per_token": 6.2e-07,
         "litellm_provider": "azure_ai",
@@ -8906,6 +8981,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/FW-GLM-5": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 2.2e-07,
         "input_cost_per_token": 1.1e-06,
         "litellm_provider": "azure_ai",
@@ -8921,6 +8997,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/FW-GLM-5.1": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 2.86e-07,
         "input_cost_per_token": 1.54e-06,
         "litellm_provider": "azure_ai",
@@ -8987,6 +9064,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/FW-Kimi-K2.5": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 1.1e-07,
         "input_cost_per_token": 6.6e-07,
         "litellm_provider": "azure_ai",
@@ -9079,6 +9157,7 @@
         "supports_vision": true
     },
     "azure_ai/FW-MiniMax-M2.5": {
+        "deprecation_date": "2027-07-01",
         "cache_read_input_token_cost": 3.3e-08,
         "input_cost_per_token": 3.3e-07,
         "litellm_provider": "azure_ai",
@@ -9164,6 +9243,7 @@
         ]
     },
     "azure_ai/MAI-Image-2e": {
+        "deprecation_date": "2026-08-15",
         "input_cost_per_token": 5e-06,
         "litellm_provider": "azure_ai",
         "mode": "image_generation",
@@ -9175,6 +9255,7 @@
         ]
     },
     "azure_ai/Llama-3.2-11B-Vision-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 3.7e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9188,6 +9269,7 @@
         "supports_vision": true
     },
     "azure_ai/Llama-3.2-90B-Vision-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 2.04e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9249,6 +9331,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/Meta-Llama-3.1-405B-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 5.33e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9271,6 +9354,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/Meta-Llama-3.1-8B-Instruct": {
+        "deprecation_date": "2026-06-13",
         "input_cost_per_token": 3e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9452,6 +9536,7 @@
         "supports_reasoning": true
     },
     "azure_ai/mistral-document-ai-2505": {
+        "deprecation_date": "2026-07-20",
         "litellm_provider": "azure_ai",
         "ocr_cost_per_page": 0.003,
         "mode": "ocr",
@@ -9529,6 +9614,7 @@
         "output_cost_per_token": 0.0
     },
     "azure_ai/cohere-rerank-v3.5": {
+        "deprecation_date": "2026-05-14",
         "input_cost_per_query": 0.002,
         "input_cost_per_token": 0.0,
         "litellm_provider": "azure_ai",
@@ -9591,6 +9677,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-r1": {
+        "deprecation_date": "2026-08-13",
         "input_cost_per_token": 1.35e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9614,6 +9701,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v3-0324": {
+        "deprecation_date": "2026-07-13",
         "input_cost_per_token": 1.14e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 128000,
@@ -9626,6 +9714,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v3.1": {
+        "deprecation_date": "2026-07-13",
         "input_cost_per_token": 1.23e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9639,6 +9728,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v4-pro": {
+        "deprecation_date": "2028-02-20",
         "input_cost_per_token": 1.74e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 1000000,
@@ -9652,6 +9742,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/deepseek-v4-flash": {
+        "deprecation_date": "2028-02-20",
         "input_cost_per_token": 1.9e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 1000000,
@@ -9683,6 +9774,7 @@
         "supports_embedding_image_input": true
     },
     "azure_ai/global/grok-3": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 3e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9697,6 +9789,7 @@
         "supports_web_search": true
     },
     "azure_ai/global/grok-3-mini": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9712,6 +9805,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-3": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 3e-06,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9726,6 +9820,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-3-mini": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2.5e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 131072,
@@ -9773,6 +9868,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-4-fast-non-reasoning": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2e-07,
         "output_cost_per_token": 5e-07,
         "litellm_provider": "azure_ai",
@@ -9786,6 +9882,7 @@
         "supports_web_search": true
     },
     "azure_ai/grok-4-fast-reasoning": {
+        "deprecation_date": "2026-05-01",
         "input_cost_per_token": 2e-07,
         "output_cost_per_token": 5e-07,
         "litellm_provider": "azure_ai",
@@ -9863,6 +9960,7 @@
         "supports_tool_choice": true
     },
     "azure_ai/kimi-k2.5": {
+        "deprecation_date": "2027-01-26",
         "input_cost_per_token": 6e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 262144,
@@ -9877,6 +9975,7 @@
         "supports_vision": true
     },
     "azure_ai/kimi-k2.6": {
+        "deprecation_date": "2027-04-16",
         "input_cost_per_token": 9.5e-07,
         "litellm_provider": "azure_ai",
         "max_input_tokens": 262144,
@@ -10004,6 +10103,7 @@
         "supports_vision": true
     },
     "babbage-002": {
+        "deprecation_date": "2026-09-28",
         "input_cost_per_token": 4e-07,
         "litellm_provider": "text-completion-openai",
         "max_input_tokens": 16384,
@@ -12014,6 +12114,7 @@
         ]
     },
     "claude-haiku-4-5-20251001": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -12037,6 +12138,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-haiku-4-5": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -12185,6 +12287,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-4-5": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05,
@@ -12218,6 +12321,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-4-5-20250929": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_creation_input_token_cost_above_1hr_above_200k_tokens": 1.2e-05,
@@ -12252,6 +12356,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-5": {
+        "deprecation_date": "2027-06-30",
         "cache_creation_input_token_cost": 2.5e-06,
         "cache_creation_input_token_cost_above_1hr": 4e-06,
         "cache_read_input_token_cost": 2e-07,
@@ -12288,6 +12393,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-sonnet-4-6": {
+        "deprecation_date": "2027-02-17",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -12434,6 +12540,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "claude-opus-4-5-20251101": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12463,6 +12570,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-5": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12492,6 +12600,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-6": {
+        "deprecation_date": "2027-02-05",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12528,6 +12637,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-6-20260205": {
+        "deprecation_date": "2027-02-05",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12564,6 +12674,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "claude-opus-4-7": {
+        "deprecation_date": "2027-04-16",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12602,6 +12713,7 @@
         "prompt_cache_min_tokens": 2048
     },
     "claude-opus-4-7-20260416": {
+        "deprecation_date": "2027-04-16",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12640,6 +12752,7 @@
         "prompt_cache_min_tokens": 2048
     },
     "claude-fable-5": {
+        "deprecation_date": "2027-06-09",
         "cache_creation_input_token_cost": 1.25e-05,
         "cache_creation_input_token_cost_above_1hr": 2e-05,
         "cache_read_input_token_cost": 1e-06,
@@ -12675,6 +12788,7 @@
         "prompt_cache_min_tokens": 512
     },
     "claude-opus-5": {
+        "deprecation_date": "2027-07-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -12713,6 +12827,7 @@
         "prompt_cache_min_tokens": 512
     },
     "claude-opus-4-8": {
+        "deprecation_date": "2027-05-28",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -15042,6 +15157,7 @@
         "mode": "search"
     },
     "davinci-002": {
+        "deprecation_date": "2026-09-28",
         "input_cost_per_token": 2e-06,
         "litellm_provider": "text-completion-openai",
         "max_input_tokens": 16384,
@@ -16676,6 +16792,14 @@
             "notes": "APISerpent deep search (/api/search), multi-engine (Google, Bing, Yahoo, DuckDuckGo). Pricing: $0.60/1k searches."
         }
     },
+    "agentcore/search": {
+        "input_cost_per_query": 0.0,
+        "litellm_provider": "agentcore",
+        "mode": "search",
+        "metadata": {
+            "notes": "Web Search on Amazon Bedrock AgentCore, billed by AWS on the gateway"
+        }
+    },
     "tinyfish/search": {
         "input_cost_per_query": 0.0,
         "litellm_provider": "tinyfish",
@@ -18594,6 +18718,7 @@
         }
     },
     "gemini-2.5-flash": {
+        "deprecation_date": "2026-10-20",
         "cache_read_input_token_cost": 3e-08,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 3e-07,
@@ -18639,6 +18764,7 @@
         "supports_image_size": false
     },
     "gemini-2.5-flash-image": {
+        "deprecation_date": "2026-10-02",
         "cache_read_input_token_cost": 3e-08,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 3e-07,
@@ -18683,6 +18809,7 @@
         "supports_image_size": false
     },
     "gemini-3-pro-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.0011,
         "input_cost_per_token": 2e-06,
         "input_cost_per_token_batches": 1e-06,
@@ -18763,6 +18890,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-flash-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.00056,
         "input_cost_per_token": 5e-07,
         "litellm_provider": "vertex_ai-language-models",
@@ -18887,6 +19015,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-flash-lite": {
+        "deprecation_date": "2027-05-07",
         "cache_read_input_token_cost": 2.5e-08,
         "cache_read_input_token_cost_flex": 1.25e-08,
         "cache_read_input_token_cost_priority": 4.5e-08,
@@ -18943,6 +19072,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.5-flash-lite": {
+        "deprecation_date": "2027-07-21",
         "cache_read_input_token_cost": 3e-08,
         "cache_read_input_token_cost_flex": 2e-08,
         "cache_read_input_token_cost_priority": 5e-08,
@@ -19032,6 +19162,7 @@
         "supports_web_search": true
     },
     "gemini-2.5-flash-lite": {
+        "deprecation_date": "2026-10-20",
         "cache_read_input_token_cost": 1e-08,
         "input_cost_per_audio_token": 3e-07,
         "input_cost_per_token": 1e-07,
@@ -19303,6 +19434,7 @@
         "supports_image_size": false
     },
     "gemini-2.5-pro": {
+        "deprecation_date": "2026-10-20",
         "cache_read_input_token_cost": 1.25e-07,
         "cache_read_input_token_cost_above_200k_tokens": 2.5e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19403,6 +19535,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-pro-preview": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19460,6 +19593,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.1-pro-preview-customtools": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19614,6 +19748,8 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.5-flash": {
+        "prompt_cache_min_tokens": 4096,
+        "deprecation_date": "2027-05-19",
         "cache_read_input_token_cost": 1.5e-07,
         "input_cost_per_token": 1.5e-06,
         "input_cost_per_audio_token": 1e-06,
@@ -19624,6 +19760,7 @@
         "mode": "chat",
         "output_cost_per_reasoning_token": 9e-06,
         "output_cost_per_token": 9e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -19665,6 +19802,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.6-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -19679,6 +19817,7 @@
         "output_cost_per_token": 3.75e-06,
         "output_cost_per_token_batches": 1.875e-06,
         "output_cost_per_token_flex": 1.875e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -19719,6 +19858,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.7-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -19733,6 +19873,7 @@
         "output_cost_per_token": 3.75e-06,
         "output_cost_per_token_batches": 1.875e-06,
         "output_cost_per_token_flex": 1.875e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -19773,6 +19914,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.1-pro-preview": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -19830,6 +19972,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.1-pro-preview-customtools": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "cache_creation_input_token_cost_above_200k_tokens": 2.5e-07,
@@ -20050,6 +20193,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-robotics-er-1.6-preview": {
+        "deprecation_date": "2026-08-31",
         "input_cost_per_audio_token": 2e-06,
         "input_cost_per_token": 1e-06,
         "litellm_provider": "gemini",
@@ -20120,6 +20264,7 @@
         "supports_vision": true
     },
     "gemini-embedding-001": {
+        "deprecation_date": "2028-05-20",
         "input_cost_per_token": 1.5e-07,
         "litellm_provider": "vertex_ai-embedding-models",
         "max_input_tokens": 2048,
@@ -20562,8 +20707,8 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.1-flash-image": {
-        "input_cost_per_token": 2.5e-07,
-        "input_cost_per_token_batches": 1.25e-07,
+        "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "litellm_provider": "gemini",
         "max_input_tokens": 65536,
         "max_output_tokens": 32768,
@@ -20571,8 +20716,8 @@
         "mode": "image_generation",
         "output_cost_per_image": 0.045,
         "output_cost_per_image_token": 6e-05,
-        "output_cost_per_token": 1.5e-06,
-        "output_cost_per_token_batches": 7.5e-07,
+        "output_cost_per_token": 3e-06,
+        "output_cost_per_token_batches": 1.5e-06,
         "rpm": 1000,
         "tpm": 4000000,
         "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-3.1-flash-image",
@@ -20605,8 +20750,8 @@
     },
     "gemini/gemini-3.1-flash-image-preview": {
         "deprecation_date": "2026-06-25",
-        "input_cost_per_token": 2.5e-07,
-        "input_cost_per_token_batches": 1.25e-07,
+        "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "litellm_provider": "gemini",
         "max_input_tokens": 65536,
         "max_output_tokens": 32768,
@@ -20614,8 +20759,8 @@
         "mode": "image_generation",
         "output_cost_per_image": 0.045,
         "output_cost_per_image_token": 6e-05,
-        "output_cost_per_token": 1.5e-06,
-        "output_cost_per_token_batches": 7.5e-07,
+        "output_cost_per_token": 3e-06,
+        "output_cost_per_token_batches": 1.5e-06,
         "rpm": 1000,
         "tpm": 4000000,
         "source": "https://ai.google.dev/gemini-api/docs/pricing#gemini-3.1-flash-image-preview",
@@ -21337,6 +21482,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.5-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 1.5e-07,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 1.5e-06,
@@ -21391,6 +21537,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.6-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -21448,6 +21595,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.7-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -21538,6 +21686,7 @@
         "tpm": 800000
     },
     "gemini/gemini-3.1-pro-preview": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "input_cost_per_token": 2e-06,
@@ -21595,6 +21744,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini/gemini-3.1-pro-preview-customtools": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4e-07,
         "input_cost_per_token": 2e-06,
@@ -21733,6 +21883,8 @@
         "supports_vision": true
     },
     "gemini-3.5-flash": {
+        "prompt_cache_min_tokens": 4096,
+        "deprecation_date": "2027-05-19",
         "cache_read_input_token_cost": 1.5e-07,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 1.5e-06,
@@ -21785,6 +21937,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.6-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -21840,6 +21993,7 @@
         "web_search_billing_unit": "per_query"
     },
     "gemini-3.7-flash": {
+        "prompt_cache_min_tokens": 4096,
         "cache_read_input_token_cost": 7.5e-08,
         "cache_read_input_token_cost_flex": 3.75e-08,
         "input_cost_per_token": 7.5e-07,
@@ -23245,6 +23399,7 @@
         "supports_tool_choice": true
     },
     "gpt-3.5-turbo-instruct": {
+        "deprecation_date": "2026-09-28",
         "input_cost_per_token": 1.5e-06,
         "litellm_provider": "text-completion-openai",
         "max_input_tokens": 8192,
@@ -24376,6 +24531,7 @@
         "supports_pdf_input": true
     },
     "low/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.009,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24387,6 +24543,7 @@
         "supports_pdf_input": true
     },
     "low/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24398,6 +24555,7 @@
         "supports_pdf_input": true
     },
     "low/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24409,6 +24567,7 @@
         "supports_pdf_input": true
     },
     "medium/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.034,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24420,6 +24579,7 @@
         "supports_pdf_input": true
     },
     "medium/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.05,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24431,6 +24591,7 @@
         "supports_pdf_input": true
     },
     "medium/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.05,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24442,6 +24603,7 @@
         "supports_pdf_input": true
     },
     "high/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.133,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24453,6 +24615,7 @@
         "supports_pdf_input": true
     },
     "high/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.2,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24464,6 +24627,7 @@
         "supports_pdf_input": true
     },
     "high/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.2,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24475,6 +24639,7 @@
         "supports_pdf_input": true
     },
     "standard/1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.009,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24486,6 +24651,7 @@
         "supports_pdf_input": true
     },
     "standard/1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24497,6 +24663,7 @@
         "supports_pdf_input": true
     },
     "standard/1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24508,6 +24675,7 @@
         "supports_pdf_input": true
     },
     "1024-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.009,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24519,6 +24687,7 @@
         "supports_pdf_input": true
     },
     "1024-x-1536/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -24530,6 +24699,7 @@
         "supports_pdf_input": true
     },
     "1536-x-1024/gpt-image-1.5": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.013,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -27443,18 +27613,21 @@
         "output_cost_per_second": 0.0
     },
     "hd/1024-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 7.629e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "hd/1024-x-1792/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 6.539e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "hd/1792-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 6.539e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -27501,6 +27674,7 @@
         "max_output_tokens": 8192
     },
     "high/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.167,
         "input_cost_per_pixel": 1.59263611e-07,
         "litellm_provider": "openai",
@@ -27511,6 +27685,7 @@
         ]
     },
     "high/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.25,
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "openai",
@@ -27521,6 +27696,7 @@
         ]
     },
     "high/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.25,
         "input_cost_per_pixel": 1.58945719e-07,
         "litellm_provider": "openai",
@@ -28308,6 +28484,7 @@
         "supports_tool_choice": true
     },
     "low/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.011,
         "input_cost_per_pixel": 1.0490417e-08,
         "litellm_provider": "openai",
@@ -28318,6 +28495,7 @@
         ]
     },
     "low/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.016,
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "openai",
@@ -28328,6 +28506,7 @@
         ]
     },
     "low/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.016,
         "input_cost_per_pixel": 1.0172526e-08,
         "litellm_provider": "openai",
@@ -28352,6 +28531,7 @@
         "output_cost_per_image": 0.072
     },
     "medium/1024-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.042,
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "openai",
@@ -28362,6 +28542,7 @@
         ]
     },
     "medium/1024-x-1536/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.063,
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "openai",
@@ -28372,6 +28553,7 @@
         ]
     },
     "medium/1536-x-1024/gpt-image-1": {
+        "deprecation_date": "2026-10-23",
         "input_cost_per_image": 0.063,
         "input_cost_per_pixel": 4.0054321e-08,
         "litellm_provider": "openai",
@@ -28382,6 +28564,7 @@
         ]
     },
     "low/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.005,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28390,6 +28573,7 @@
         ]
     },
     "low/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.006,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28398,6 +28582,7 @@
         ]
     },
     "low/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.006,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28406,6 +28591,7 @@
         ]
     },
     "medium/1024-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.011,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28414,6 +28600,7 @@
         ]
     },
     "medium/1024-x-1536/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.015,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -28422,6 +28609,7 @@
         ]
     },
     "medium/1536-x-1024/gpt-image-1-mini": {
+        "deprecation_date": "2026-12-01",
         "input_cost_per_image": 0.015,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -30315,6 +30503,7 @@
         ]
     },
     "multimodalembedding@001": {
+        "deprecation_date": "2027-04-01",
         "input_cost_per_character": 2e-07,
         "input_cost_per_image": 0.0001,
         "input_cost_per_token": 8e-07,
@@ -36013,18 +36202,21 @@
         "output_cost_per_image": 0.14
     },
     "standard/1024-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 3.81469e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "standard/1024-x-1792/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 4.359e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
         "output_cost_per_pixel": 0.0
     },
     "standard/1792-x-1024/dall-e-3": {
+        "deprecation_date": "2026-05-12",
         "input_cost_per_pixel": 4.359e-08,
         "litellm_provider": "openai",
         "mode": "image_generation",
@@ -36088,6 +36280,7 @@
         "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/learn/models"
     },
     "text-embedding-005": {
+        "deprecation_date": "2027-04-01",
         "input_cost_per_character": 2.5e-08,
         "input_cost_per_token": 1e-07,
         "litellm_provider": "vertex_ai-embedding-models",
@@ -36161,6 +36354,7 @@
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing"
     },
     "text-moderation-007": {
+        "deprecation_date": "2025-10-27",
         "input_cost_per_token": 0.0,
         "litellm_provider": "openai",
         "max_input_tokens": 32768,
@@ -36170,6 +36364,7 @@
         "output_cost_per_token": 0.0
     },
     "text-moderation-latest": {
+        "deprecation_date": "2025-10-27",
         "input_cost_per_token": 0.0,
         "litellm_provider": "openai",
         "max_input_tokens": 32768,
@@ -36179,6 +36374,7 @@
         "output_cost_per_token": 0.0
     },
     "text-moderation-stable": {
+        "deprecation_date": "2025-10-27",
         "input_cost_per_token": 0.0,
         "litellm_provider": "openai",
         "max_input_tokens": 32768,
@@ -36188,6 +36384,7 @@
         "output_cost_per_token": 0.0
     },
     "text-multilingual-embedding-002": {
+        "deprecation_date": "2027-04-01",
         "input_cost_per_character": 2.5e-08,
         "input_cost_per_token": 1e-07,
         "litellm_provider": "vertex_ai-embedding-models",
@@ -38675,6 +38872,7 @@
         "supports_tool_choice": true
     },
     "vertex_ai/claude-haiku-4-5": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -38685,6 +38883,7 @@
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5",
         "supports_assistant_prefill": true,
         "supports_function_calling": true,
@@ -38698,6 +38897,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-haiku-4-5@20251001": {
+        "deprecation_date": "2026-10-15",
         "cache_creation_input_token_cost": 1.25e-06,
         "cache_creation_input_token_cost_above_1hr": 2e-06,
         "cache_read_input_token_cost": 1e-07,
@@ -38708,6 +38908,7 @@
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/claude/haiku-4-5",
         "supports_assistant_prefill": true,
         "supports_function_calling": true,
@@ -38850,6 +39051,7 @@
         "supports_vision": true
     },
     "vertex_ai/claude-opus-4": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -38877,6 +39079,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-opus-4-1": {
+        "deprecation_date": "2026-08-05",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -38895,6 +39098,7 @@
         "supports_vision": true
     },
     "vertex_ai/claude-opus-4-1@20250805": {
+        "deprecation_date": "2026-08-05",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -38913,6 +39117,7 @@
         "supports_vision": true
     },
     "vertex_ai/claude-opus-4-5": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -38923,6 +39128,7 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "search_context_cost_per_query": {
             "search_context_size_high": 0.01,
             "search_context_size_low": 0.01,
@@ -38941,6 +39147,7 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-5@20251101": {
+        "deprecation_date": "2026-11-24",
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
         "cache_read_input_token_cost": 5e-07,
@@ -38951,6 +39158,7 @@
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-05,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "search_context_cost_per_query": {
             "search_context_size_high": 0.01,
             "search_context_size_low": 0.01,
@@ -38970,6 +39178,8 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-6": {
+        "deprecation_date": "2027-02-05",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39000,6 +39210,8 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-6@default": {
+        "deprecation_date": "2027-02-05",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39030,6 +39242,8 @@
         "prompt_cache_min_tokens": 4096
     },
     "vertex_ai/claude-opus-4-7": {
+        "deprecation_date": "2027-04-16",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39061,6 +39275,8 @@
         "prompt_cache_min_tokens": 2048
     },
     "vertex_ai/claude-opus-4-7@default": {
+        "deprecation_date": "2027-04-16",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
         "cache_creation_input_token_cost_above_1hr": 1e-05,
@@ -39092,6 +39308,8 @@
         "prompt_cache_min_tokens": 2048
     },
     "vertex_ai/claude-fable-5": {
+        "deprecation_date": "2027-06-08",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 1.25e-05,
         "cache_creation_input_token_cost_above_1hr": 2e-05,
@@ -39123,6 +39341,8 @@
         "supports_max_reasoning_effort": true
     },
     "vertex_ai/claude-fable-5@default": {
+        "deprecation_date": "2027-06-08",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 1.25e-05,
         "cache_creation_input_token_cost_above_1hr": 2e-05,
@@ -39154,6 +39374,8 @@
         "supports_max_reasoning_effort": true
     },
     "vertex_ai/claude-opus-5": {
+        "deprecation_date": "2027-01-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39186,6 +39408,8 @@
         "prompt_cache_min_tokens": 512
     },
     "vertex_ai/claude-opus-5@default": {
+        "deprecation_date": "2027-01-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39218,6 +39442,8 @@
         "prompt_cache_min_tokens": 512
     },
     "vertex_ai/claude-opus-4-8": {
+        "deprecation_date": "2027-05-28",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39250,6 +39476,8 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-opus-4-8@default": {
+        "deprecation_date": "2027-05-28",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 6.25e-06,
@@ -39282,6 +39510,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-5": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39298,6 +39527,7 @@
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
         "output_cost_per_token_batches": 7.5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -39310,6 +39540,8 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-5": {
+        "deprecation_date": "2026-12-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 2.5e-06,
         "cache_creation_input_token_cost_above_1hr": 4e-06,
@@ -39342,6 +39574,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-6": {
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
@@ -39372,6 +39605,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-5@20250929": {
+        "deprecation_date": "2026-09-29",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39388,6 +39622,7 @@
         "mode": "chat",
         "output_cost_per_token": 1.5e-05,
         "output_cost_per_token_batches": 7.5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_assistant_prefill": true,
         "supports_computer_use": true,
         "supports_function_calling": true,
@@ -39401,6 +39636,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-opus-4@20250514": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 1.875e-05,
         "cache_creation_input_token_cost_above_1hr": 3e-05,
         "cache_read_input_token_cost": 1.5e-06,
@@ -39428,6 +39664,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39459,6 +39696,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4@20250514": {
+        "deprecation_date": "2026-05-14",
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
         "cache_read_input_token_cost": 3e-07,
@@ -39623,6 +39861,7 @@
         "supports_tool_choice": true
     },
     "vertex_ai/gemini-2.5-flash-image": {
+        "deprecation_date": "2026-10-02",
         "cache_read_input_token_cost": 3e-08,
         "input_cost_per_audio_token": 1e-06,
         "input_cost_per_token": 3e-07,
@@ -39668,6 +39907,7 @@
         "supports_image_size": false
     },
     "vertex_ai/gemini-3-pro-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.0011,
         "input_cost_per_token": 2e-06,
         "input_cost_per_token_batches": 1e-06,
@@ -39700,6 +39940,7 @@
         "source": "https://docs.cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/3-pro-image"
     },
     "vertex_ai/gemini-3.1-flash-image": {
+        "deprecation_date": "2027-05-28",
         "input_cost_per_image": 0.00056,
         "input_cost_per_token": 5e-07,
         "litellm_provider": "vertex_ai-language-models",
@@ -39776,6 +40017,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.1-flash-lite": {
+        "deprecation_date": "2027-05-07",
         "cache_read_input_token_cost": 2.5e-08,
         "cache_read_input_token_cost_flex": 1.25e-08,
         "cache_read_input_token_cost_priority": 4.5e-08,
@@ -39794,6 +40036,7 @@
         "output_cost_per_token_batches": 7.5e-07,
         "output_cost_per_token_flex": 7.5e-07,
         "output_cost_per_token_priority": 2.7e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#gemini-models",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -39832,6 +40075,7 @@
         "web_search_billing_unit": "per_query"
     },
     "vertex_ai/gemini-3.5-flash-lite": {
+        "deprecation_date": "2027-07-21",
         "cache_read_input_token_cost": 3e-08,
         "cache_read_input_token_cost_flex": 2e-08,
         "cache_read_input_token_cost_priority": 5e-08,
@@ -39849,6 +40093,7 @@
         "output_cost_per_token_batches": 1.25e-06,
         "output_cost_per_token_flex": 1.25e-06,
         "output_cost_per_token_priority": 4.5e-06,
+        "regional_endpoint_uplift_multiplier": 1.1,
         "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing#gemini-models",
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -40549,6 +40794,7 @@
         "supports_tool_choice": true
     },
     "vertex_ai/veo-2.0-generate-001": {
+        "deprecation_date": "2026-06-30",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40563,6 +40809,7 @@
         ]
     },
     "vertex_ai/veo-3.0-fast-generate-001": {
+        "deprecation_date": "2026-06-30",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40577,6 +40824,7 @@
         ]
     },
     "vertex_ai/veo-3.0-generate-001": {
+        "deprecation_date": "2026-06-30",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40619,6 +40867,7 @@
         ]
     },
     "vertex_ai/veo-3.1-generate-001": {
+        "deprecation_date": "2026-11-17",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -40633,6 +40882,7 @@
         ]
     },
     "vertex_ai/veo-3.1-fast-generate-001": {
+        "deprecation_date": "2026-11-17",
         "litellm_provider": "vertex_ai-video-models",
         "max_input_tokens": 1024,
         "max_tokens": 1024,
@@ -47014,6 +47264,8 @@
         }
     },
     "vertex_ai/claude-sonnet-5@default": {
+        "deprecation_date": "2026-12-24",
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_mid_conversation_system": true,
         "cache_creation_input_token_cost": 2.5e-06,
         "cache_creation_input_token_cost_above_1hr": 4e-06,
@@ -47046,6 +47298,7 @@
         "prompt_cache_min_tokens": 1024
     },
     "vertex_ai/claude-sonnet-4-6@default": {
+        "regional_endpoint_uplift_multiplier": 1.1,
         "supports_adaptive_thinking": true,
         "cache_creation_input_token_cost": 3.75e-06,
         "cache_creation_input_token_cost_above_1hr": 6e-06,
@@ -47975,15 +48228,15 @@
     },
     "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,
+        "cache_read_input_token_cost": 1.4e-08,
+        "input_cost_per_token": 4.4e-07,
+        "input_cost_per_token_cache_hit": 1.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 2.8e-07,
+        "output_cost_per_token": 1.32e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
@@ -48001,15 +48254,15 @@
     },
     "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,
+        "cache_read_input_token_cost": 4.4e-08,
+        "input_cost_per_token": 1.32e-06,
+        "input_cost_per_token_cache_hit": 4.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 8.7e-07,
+        "output_cost_per_token": 3.96e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
@@ -48027,15 +48280,15 @@
     },
     "deepseek/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,
+        "cache_read_input_token_cost": 1.4e-08,
+        "input_cost_per_token": 4.4e-07,
+        "input_cost_per_token_cache_hit": 1.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 2.8e-07,
+        "output_cost_per_token": 1.32e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
@@ -48053,15 +48306,15 @@
     },
     "deepseek/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,
+        "cache_read_input_token_cost": 4.4e-08,
+        "input_cost_per_token": 1.32e-06,
+        "input_cost_per_token_cache_hit": 4.4e-08,
         "litellm_provider": "deepseek",
         "max_input_tokens": 1000000,
         "max_output_tokens": 393216,
         "max_tokens": 393216,
         "mode": "chat",
-        "output_cost_per_token": 8.7e-07,
+        "output_cost_per_token": 3.96e-06,
         "source": "https://api-docs.deepseek.com/quick_start/pricing",
         "supported_endpoints": [
             "/v1/chat/completions"
diff --git a/model_prices_and_context_window.schema.json b/model_prices_and_context_window.schema.json
index cd02fde595f..82854a3b717 100644
--- a/model_prices_and_context_window.schema.json
+++ b/model_prices_and_context_window.schema.json
@@ -514,6 +514,11 @@
           "type": "object",
           "description": "Provider-internal routing hints (e.g. bedrock_invocation_schema)."
         },
+        "regional_endpoint_uplift_multiplier": {
+          "type": "number",
+          "minimum": 1,
+          "description": "Multiplier applied to all token costs when served from a non-global Vertex AI endpoint (e.g. 1.10 = +10%)."
+        },
         "regional_processing_uplift_multiplier_eu": {
           "type": "number",
           "minimum": 1,
diff --git a/ruff-strict-budget.json b/ruff-strict-budget.json
index dadbf33cbfe..5c312dcf1c8 100644
--- a/ruff-strict-budget.json
+++ b/ruff-strict-budget.json
@@ -18,7 +18,7 @@
     "limit": 711
   },
   "ANN205": {
-    "limit": 113
+    "limit": 112
   },
   "ANN206": {
     "limit": 133
diff --git a/schema.prisma b/schema.prisma
index 52fb447157b..60058c777ca 100644
--- a/schema.prisma
+++ b/schema.prisma
@@ -947,6 +947,17 @@ model LiteLLM_DailyTagSpend {
 }
 
 
+// One row per live proxy worker process. Workers upsert their row on a fixed
+// heartbeat; counting rows with a recent heartbeat tells how many workers share
+// this database, which lets the Admin UI hide its "no Redis" warning for
+// deployments that are provably a single worker.
+model LiteLLM_ProxyWorkerHeartbeat {
+  worker_id         String   @id
+  hostname          String
+  started_at        DateTime @default(now())
+  last_heartbeat_at DateTime @default(now())
+}
+
 // Track the status of cron jobs running. Only allow one pod to run the job at a time
 model LiteLLM_CronJob {
   cronjob_id            String   @id @default(cuid()) // Unique ID for the record
@@ -1467,28 +1478,38 @@ model LiteLLM_AutoRouterSession {
   @@index([last_turn_at], map: "idx_autorouter_session_last_turn")
 }
 
-// Shadow eval: evaluation of an auto-router against a key's live traffic, in either
-// direction. forward duplicates the requests the key did not route through the router
-// through it, answering whether the key should adopt it; reverse duplicates the requests
-// the router did serve against a fixed baseline model, answering whether a key already on
-// it still benefits. Either way a sampled slice runs in a detached task and an LLM judge
-// compares real vs shadow responses blind. The job row is immutable config plus
-// stopped_at; every count, status, and spend figure is derived from the append-only
-// attempt rows, so nothing can disagree across pods or stop races.
+// Shadow eval: evaluation of an auto-router against one or more keys' live traffic, in
+// either direction. forward duplicates the requests the keys did not route through the
+// router through it, answering whether they should adopt it; reverse duplicates the
+// requests the router did serve against a fixed baseline model, answering whether a key
+// already on it still benefits. Either way a sampled slice runs in a detached task and an
+// LLM judge compares real vs shadow responses blind. Each row is ONE key's leg of a job:
+// immutable config plus that key's own turn budget and stop state, so one key exhausting
+// its budget never ends a sibling's sampling. A job is the set of legs sharing group_id
+// (the id the API reports), written together by one atomic create_many with identical
+// config; single-key jobs predating group_id were backfilled group_id = id. "One active
+// job per (key, direction)" is a partial unique index on (api_key_id, direction) WHERE
+// stopped_at IS NULL, expressed only in the migration because schema.prisma cannot state
+// partial indexes; it is what makes a concurrent start on another pod race-safe rather
+// than read-then-create. Every count, status, and spend figure is derived from the
+// append-only attempt rows, so nothing can disagree across pods or stop races.
 model LiteLLM_ShadowEvalJob {
   id                String   @id @default(cuid())
-  api_key_id        String   // hashed virtual key whose traffic is shadowed
+  group_id          String   // legs of one job share this; the API's job id
+  api_key_id        String   // hashed virtual key whose traffic this leg shadows
   router_name       String   // the auto-router under evaluation, in either direction
   direction         String   @default("forward") // forward | reverse
   baseline_model    String?  // reverse only: the fixed model the router is judged against
   judge_model       String
   shadow_percentage Float
-  max_turns         Int      // sample budget: judge at most this many turns
+  max_turns         Int      // this key's sample budget: judge at most this many turns
   created_at        DateTime @default(now())
   created_by        String?
   ends_at           DateTime
   stopped_at        DateTime?
+  stopped_by        String?  // operator who stopped it early; null when it ended on its own
 
+  @@index([group_id])
   @@index([api_key_id])
   @@index([created_at])
 }
diff --git a/tests/e2e/CLAUDE.md b/tests/e2e/CLAUDE.md
index 680e0dff67b..d7334552d0c 100644
--- a/tests/e2e/CLAUDE.md
+++ b/tests/e2e/CLAUDE.md
@@ -71,6 +71,16 @@ Request and response bodies are typed pydantic models in `models.py`; only the f
 
 Mark live tests with `@pytest.mark.e2e` (on the class or the module). Pure coverage of the harness itself carries no marker and runs regardless. Use `scoped_key` for a fresh all-models key that auto-deletes, `resources` when you need to create and tear down more than a key, and `unique_marker()` from `e2e_config` to keep prompts, tags, and customer ids from colliding across concurrent runs and the shared response cache
 
+## Record and replay fixtures
+
+`E2E_FIXTURE_MODE` selects the transport every client is built on: `live` (the default, and what an unset variable means: nothing changes), `record` (run against the live proxy and write every interaction to a fixture bundle), or `replay` (serve every interaction back from the bundle with no HTTP at all, so a replay run needs no proxy and cannot bill a provider). The seam is `select_transport` in `fixture_transport.py`, applied inside `build_proxy_client`; both transports fulfil the same `Transport` protocol, so no test or client changes shape in any mode
+
+A bundle (default `tests/e2e/.fixtures`, override with `E2E_FIXTURE_DIR`) is a directory: `manifest.json` carries the record timestamp, harness git version, and format version, and each test gets a subdirectory holding one JSON file per transport call in call order (`0000-post-chat-completions.json`). Auth header values and credential request fields (`api_key`, `*_secret_key`, `static_headers`, and the like; the list is `fixture_canonical.py`'s) are redacted on write, and file uploads store a sha256 digest instead of the bytes; response bodies are stored verbatim (a /key/generate response keeps the ephemeral virtual key it minted), which is part of why bundles are gitignored. `fixture_bundle.py` owns the format
+
+Replay matches calls per test by canonical key: `fixture_canonical.py` canonicalizes the recorded request (volatile headers and credential fields out, unique markers, generated ids, uuids, and timestamps replaced with fixed placeholders, object keys sorted) and the key is the method, path, and a content hash, so identity survives re-records and machine changes while any real content drift is a `ReplayMiss` that names the computed key, the closest recorded key with its file, and a content diff, and never falls through to a live call. Matching is order-independent across distinct keys (concurrent calls may interleave) and FIFO within one key (a poll loop replays its responses in recorded order); a passed test must also consume its whole recording, or teardown fails it naming a leftover key. Either way the fix is always to re-record with `E2E_FIXTURE_MODE=record`. Every rewrite rule lives in `fixture_canonical.py`, so a new volatile header, credential field name, or generated-id shape is one edit there. Record starts fresh every time: it wipes the previous bundle (refusing to wipe a directory that is not a bundle) and never reads it. A replay bundle whose manifest is older than seven days hard-fails at collection time naming the bundle's age, so replay can never certify against fixtures that have drifted more than a week from the live proxy
+
+Deliberately not here yet: streaming chunk fidelity (LIT-5742) and scoping record/replay to provider-bound traffic (LIT-5745)
+
 ## Typing
 
 The harness is fully typed with no error budget: `make lint-e2e-basedpyright` must report zero basedpyright errors, and CI enforces that on any PR touching `tests/e2e/**/*.py`. When a response field is untyped, model it in `models.py` (just the fields you read) and let pydantic validate it, rather than threading a `dict` or `Any` through the test
diff --git a/tests/e2e/CONTRIBUTING.md b/tests/e2e/CONTRIBUTING.md
index dc69bd42171..67da1be9562 100644
--- a/tests/e2e/CONTRIBUTING.md
+++ b/tests/e2e/CONTRIBUTING.md
@@ -52,6 +52,17 @@ The suites run against a live proxy, so bring one up first by running the litell
 
 Some suites need extra services the bare proxy does not start. The `logging/` OTEL trace-completeness tests read spans back from a jaeger query API at `http://localhost:16686` (override with `E2E_OTEL_QUERY_URL`); run a `jaegertracing/all-in-one` and point `PHOENIX_COLLECTOR_HTTP_ENDPOINT` at its OTLP ingest. The `mcp/` suite needs the deterministic upstream MCP server in `mcp_tests/mcp_e2e_upstream_server.py` reachable by the proxy
 
+### Record and replay
+
+`E2E_FIXTURE_MODE=record` runs a suite against the live proxy as usual while writing every request/response pair to a fixture bundle (default `tests/e2e/.fixtures`, override with `E2E_FIXTURE_DIR`); `E2E_FIXTURE_MODE=replay` then runs the same suite entirely from that bundle, with no proxy traffic and no provider spend; the proxy liveness gate is skipped, so replay runs with no proxy up at all. Unset (or `live`) behaves exactly as before the knob existed
+
+```bash
+E2E_FIXTURE_MODE=record uv run pytest tests/e2e/llm_translation/ -v
+E2E_FIXTURE_MODE=replay uv run pytest tests/e2e/llm_translation/ -v
+```
+
+Replay fails hard (`ReplayMiss`) when the tests drift from the recording, and a bundle older than seven days fails at collection time naming its age; either way the fix is to re-record. See `CLAUDE.md` in this directory for the bundle format and the transport seam
+
 Tests marked `@pytest.mark.e2e` hard-fail when no proxy answers `/health/liveliness`, so a run that goes red with `No live proxy` at setup means the proxy isn't up; they never skip for a missing proxy, so an absent proxy can't be mistaken for a pass
 
 ## What a complete test looks like
diff --git a/tests/e2e/access_control/access_control_client.py b/tests/e2e/access_control/access_control_client.py
index 7ace036f433..634a96bb0bd 100644
--- a/tests/e2e/access_control/access_control_client.py
+++ b/tests/e2e/access_control/access_control_client.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
+import time
 from dataclasses import dataclass
 
 from pydantic import BaseModel, ValidationError
 
 from proxy_client import ProxyClient
-from e2e_http import StreamingResponse
+from e2e_http import NoBody, StreamingResponse, is_ok, unwrap
 from models import (
     ChatBody,
     ChatMessage,
@@ -15,9 +16,16 @@ from models import (
     LiteLLMParamsBody,
     ModelInfoBody,
     ModelNewBody,
+    TeamDeleteBody,
+    TeamInfoParams,
+    TeamInfoResponse,
+    TeamNewBody,
+    TeamNewResponse,
+    TeamUpdateBody,
 )
 
 MODEL_ACCESS_DENIED_MARKER = "key_model_access_denied"
+TEAM_MODEL_ACCESS_DENIED_MARKER = "team_model_access_denied"
 ROUTE_NOT_ALLOWED_MARKER = "not allowed to call this route"
 
 
@@ -31,6 +39,14 @@ class ApiErrorEnvelope(BaseModel):
     error: ApiErrorDetail
 
 
+class AccessGroupInfoResponse(BaseModel):
+    """GET /access_group/{name}/info: the deployments a model access group grants."""
+
+    access_group: str
+    model_names: list[str]
+    deployment_count: int
+
+
 def error_envelope(body: str) -> ApiErrorEnvelope | None:
     """The OpenAI-shaped `{"error": {...}}` a client parses, or None if absent."""
     try:
@@ -51,15 +67,75 @@ class AccessControlClient:
     def delete_key(self, key: str) -> None:
         self.proxy.delete_key(key)
 
-    def chat_status(self, key: str, model: str, content: str) -> StreamingResponse:
+    def chat_status(
+        self, key: str, model: str, content: str, max_completion_tokens: int | None = None
+    ) -> StreamingResponse:
         return self.proxy.transport.send(
             "/chat/completions",
             headers=self.proxy.transport.bearer(key),
             json=ChatBody(
-                model=model, messages=[ChatMessage(role="user", content=content)]
+                model=model,
+                messages=[ChatMessage(role="user", content=content)],
+                max_completion_tokens=max_completion_tokens,
             ),
         )
 
+    def create_team(self, team_alias: str, models: list[str]) -> str:
+        team_id = unwrap(
+            self.proxy.transport.post(
+                "/team/new",
+                headers=self.proxy.transport.master,
+                json=TeamNewBody(team_alias=team_alias, models=models),
+                response_type=TeamNewResponse,
+            )
+        ).team_id
+        self._await_team(team_id)
+        return team_id
+
+    def set_team_models(self, team_id: str, team_alias: str, models: list[str]) -> None:
+        """Replace the team's allow-list. /model/new appends a team-scoped deployment's
+        public name to it, so a test that means to grant only an access group has to
+        put the allow-list back afterwards."""
+        _ = unwrap(
+            self.proxy.transport.post(
+                "/team/update",
+                headers=self.proxy.transport.master,
+                json=TeamUpdateBody(team_id=team_id, team_alias=team_alias, models=models),
+                response_type=NoBody,
+            )
+        )
+
+    def delete_team(self, team_id: str) -> None:
+        _ = self.proxy.transport.post(
+            "/team/delete",
+            headers=self.proxy.transport.master,
+            json=TeamDeleteBody(team_ids=[team_id]),
+            response_type=NoBody,
+        )
+
+    def access_group_info(self, access_group: str) -> AccessGroupInfoResponse | None:
+        result = self.proxy.transport.get(
+            f"/access_group/{access_group}/info",
+            headers=self.proxy.transport.master,
+            params=NoBody(),
+            response_type=AccessGroupInfoResponse,
+        )
+        return unwrap(result) if is_ok(result) else None
+
+    def _await_team(self, team_id: str) -> None:
+        deadline = time.monotonic() + self.proxy.poll_timeout
+        while time.monotonic() < deadline:
+            result = self.proxy.transport.get(
+                "/team/info",
+                headers=self.proxy.transport.master,
+                params=TeamInfoParams(team_id=team_id),
+                response_type=TeamInfoResponse,
+            )
+            if is_ok(result):
+                return
+            time.sleep(self.proxy.poll_interval)
+        raise AssertionError(f"/team/info never resolved team {team_id!r} created by /team/new")
+
     def create_model_status(self, key: str, model_name: str) -> StreamingResponse:
         return self.proxy.transport.send(
             "/model/new",
diff --git a/tests/e2e/access_control/test_model_access_group_e2e.py b/tests/e2e/access_control/test_model_access_group_e2e.py
new file mode 100644
index 00000000000..5cc062ea096
--- /dev/null
+++ b/tests/e2e/access_control/test_model_access_group_e2e.py
@@ -0,0 +1,277 @@
+"""Live e2e: a model access group as the grant on a key and on a team.
+
+Whoever holds the group can call every deployment in it and nothing else, whether
+the request names a deployment exactly, names a model that a wildcard deployment
+in the group covers, or spells that model with its provider prefix. The bare-name
+spelling is the LIT-5813 regression: the group-membership lookup skipped the
+provider-prefix retry every other model-resolution path performs, so a group
+holding `openai/gpt-5.4*` denied `gpt-5.4-nano` while allowing `openai/gpt-5.4-nano`.
+"""
+
+from __future__ import annotations
+
+import os
+import time
+from collections.abc import Callable, Iterator
+from dataclasses import dataclass
+from typing import Final
+
+import pytest
+
+from access_control_client import (
+    AccessControlClient,
+    MODEL_ACCESS_DENIED_MARKER,
+    TEAM_MODEL_ACCESS_DENIED_MARKER,
+)
+from e2e_config import unique_marker
+from lifecycle import ResourceManager
+from models import (
+    ChatResponse,
+    KeyGenerateBody,
+    LiteLLMParamsBody,
+    ModelInfoBody,
+    ModelNewBody,
+)
+
+pytestmark = pytest.mark.e2e
+
+WILDCARD_PATTERN: Final = "openai/gpt-5.4*"
+WILDCARD_BARE_MODEL: Final = "gpt-5.4-nano"
+WILDCARD_PREFIXED_MODEL: Final = "openai/gpt-5.4-nano"
+GROUP_BACKEND: Final = "openai/gpt-5.4-nano"
+UNCOVERED_OPENAI_MODEL: Final = "gpt-5.2"
+
+TEAM_WILDCARD_PATTERN: Final = "openai/gpt-5.6*"
+TEAM_WILDCARD_BARE_MODEL: Final = "gpt-5.6-luna"
+
+MAX_COMPLETION_TOKENS: Final = 16
+PROMPT: Final = "Reply with exactly: OK"
+
+
+@dataclass(frozen=True, slots=True)
+class GroupedDeployments:
+    """A wildcard deployment and an exactly-named one inside `access_group`, plus a
+    deployment left out of it."""
+
+    access_group: str
+    member_model: str
+    outsider_model: str
+
+
+@dataclass(frozen=True, slots=True)
+class TeamGrant:
+    """A team whose whole allow-list is `access_group`, holding one team-scoped
+    wildcard deployment, and a key that belongs to it."""
+
+    access_group: str
+    team_id: str
+    key: str
+
+
+ModelSelector = Callable[[GroupedDeployments], str]
+
+ALLOWED: Final[tuple[tuple[str, ModelSelector], ...]] = (
+    ("bare name the group's wildcard covers", lambda grouped: WILDCARD_BARE_MODEL),
+    ("provider-prefixed name the group's wildcard covers", lambda grouped: WILDCARD_PREFIXED_MODEL),
+    ("exactly-named deployment in the group", lambda grouped: grouped.member_model),
+)
+
+DENIED: Final[tuple[tuple[str, ModelSelector], ...]] = (
+    ("deployment outside the group", lambda grouped: grouped.outsider_model),
+    ("provider model outside the group's wildcard", lambda grouped: UNCOVERED_OPENAI_MODEL),
+    ("name no provider claims", lambda grouped: f"e2e-ag-unknown-{unique_marker()}"),
+)
+
+
+def _provider_key(env_var: str) -> str:
+    return os.environ.get(env_var) or f"os.environ/{env_var}"
+
+
+def _grouped_model(model_name: str, backend: str, access_groups: list[str] | None) -> ModelNewBody:
+    return ModelNewBody(
+        model_name=model_name,
+        litellm_params=LiteLLMParamsBody(model=backend, api_key=_provider_key("OPENAI_API_KEY")),
+        model_info=ModelInfoBody(access_groups=access_groups),
+    )
+
+
+def _await_group_members(client: AccessControlClient, access_group: str, expected: frozenset[str]) -> None:
+    """The grant under test is the group's membership, so prove the proxy recorded it
+    before asserting on what the group lets through."""
+    deadline = time.monotonic() + client.proxy.poll_timeout
+    listed: list[str] = []
+    while time.monotonic() < deadline:
+        info = client.access_group_info(access_group)
+        listed = info.model_names if info is not None else []
+        if expected.issubset(listed):
+            return
+        time.sleep(client.proxy.poll_interval)
+    pytest.fail(
+        f"/access_group/{access_group}/info never listed {sorted(expected)} as members; last read {listed}"
+    )
+
+
+def _await_team_allowlist(client: AccessControlClient, grant_key: str, access_group: str) -> None:
+    """Registering a team-scoped deployment appends its public name to the team's
+    allow-list, and a wildcard sitting there directly would grant the model under test
+    on its own. Poll a denial until the message enumerates the allow-list the test
+    means to exercise: the group, and nothing else."""
+    allowlist: Final = f"models=['{access_group}']"
+    deadline = time.monotonic() + client.proxy.poll_timeout
+    body = ""
+    while time.monotonic() < deadline:
+        body = client.chat_status(
+            grant_key, UNCOVERED_OPENAI_MODEL, f"{PROMPT} {unique_marker()}", MAX_COMPLETION_TOKENS
+        ).body
+        if allowlist in body:
+            return
+        time.sleep(client.proxy.poll_interval)
+    pytest.fail(f"the team's allow-list never settled to {allowlist}; last denial read {body[:300]}")
+
+
+@pytest.fixture(scope="module")
+def grouped(client: AccessControlClient) -> Iterator[GroupedDeployments]:
+    marker: Final = unique_marker()
+    deployments: Final = GroupedDeployments(
+        access_group=f"e2e-ag-{marker}",
+        member_model=f"e2e-ag-member-{marker}",
+        outsider_model=f"e2e-ag-outsider-{marker}",
+    )
+    registrations: Final = (
+        _grouped_model(WILDCARD_PATTERN, WILDCARD_PATTERN, [deployments.access_group]),
+        _grouped_model(deployments.member_model, GROUP_BACKEND, [deployments.access_group]),
+        _grouped_model(deployments.outsider_model, GROUP_BACKEND, None),
+    )
+    created: Final = tuple(client.proxy.register_model(body) for body in registrations)
+    try:
+        _await_group_members(
+            client,
+            deployments.access_group,
+            frozenset({WILDCARD_PATTERN, deployments.member_model}),
+        )
+        yield deployments
+    finally:
+        for model_id in created:
+            client.proxy.delete_model(model_id)
+
+
+@pytest.fixture(scope="module")
+def team_grant(client: AccessControlClient) -> Iterator[TeamGrant]:
+    marker: Final = unique_marker()
+    access_group: Final = f"e2e-agt-{marker}"
+    team_alias: Final = f"e2e-ag-team-{marker}"
+    team_id: Final = client.create_team(team_alias, [access_group])
+    key: Final = client.proxy.generate_key(KeyGenerateBody(models=[], team_id=team_id))
+    model_id: Final = client.proxy.register_model(
+        ModelNewBody(
+            model_name=TEAM_WILDCARD_PATTERN,
+            litellm_params=LiteLLMParamsBody(
+                model=TEAM_WILDCARD_PATTERN, api_key=_provider_key("OPENAI_API_KEY")
+            ),
+            model_info=ModelInfoBody(team_id=team_id, access_groups=[access_group]),
+        ),
+        listed_for=key,
+    )
+    client.set_team_models(team_id, team_alias, [access_group])
+    try:
+        _await_team_allowlist(client, key, access_group)
+        yield TeamGrant(access_group=access_group, team_id=team_id, key=key)
+    finally:
+        client.proxy.delete_model(model_id)
+        client.proxy.delete_key(key)
+        client.delete_team(team_id)
+
+
+class TestKeyScopedToAccessGroup:
+    @pytest.mark.covers(
+        "other.auth.model_access_group.wildcard_bare_name_allowed",
+        "other.auth.model_access_group.member_allowed",
+    )
+    @pytest.mark.parametrize(("case", "select_model"), ALLOWED)
+    def test_group_grants_every_deployment_in_it(
+        self,
+        case: str,
+        select_model: ModelSelector,
+        client: AccessControlClient,
+        resources: ResourceManager,
+        grouped: GroupedDeployments,
+    ) -> None:
+        key = resources.key(models=[grouped.access_group])
+        model = select_model(grouped)
+
+        result = client.chat_status(
+            key, model, f"{PROMPT} {unique_marker()}", MAX_COMPLETION_TOKENS
+        )
+
+        assert result.status_code == 200, (
+            f"a key holding access group {grouped.access_group!r} must be able to call "
+            f"{model!r} ({case}), got {result.status_code}: {result.body[:300]}"
+        )
+        assert ChatResponse.model_validate_json(result.body).choices, (
+            f"200 must carry a real completion, not an error envelope: {result.body[:300]}"
+        )
+
+    @pytest.mark.covers("other.auth.model_access_group.non_member_denied")
+    @pytest.mark.parametrize(("case", "select_model"), DENIED)
+    def test_group_grants_nothing_outside_it(
+        self,
+        case: str,
+        select_model: ModelSelector,
+        client: AccessControlClient,
+        resources: ResourceManager,
+        grouped: GroupedDeployments,
+    ) -> None:
+        key = resources.key(models=[grouped.access_group])
+        model = select_model(grouped)
+
+        result = client.chat_status(
+            key, model, f"{PROMPT} {unique_marker()}", MAX_COMPLETION_TOKENS
+        )
+
+        assert result.status_code == 403, (
+            f"a key holding only access group {grouped.access_group!r} must be denied 403 on "
+            f"{model!r} ({case}), got {result.status_code}: {result.body[:300]}"
+        )
+        assert MODEL_ACCESS_DENIED_MARKER in result.body, (
+            f"403 body must be a key model-access denial, got: {result.body[:300]}"
+        )
+
+
+class TestTeamScopedToAccessGroup:
+    @pytest.mark.covers("other.auth.model_access_group.team_wildcard_bare_name_allowed")
+    def test_group_grants_the_teams_own_wildcard(
+        self, client: AccessControlClient, team_grant: TeamGrant
+    ) -> None:
+        result = client.chat_status(
+            team_grant.key,
+            TEAM_WILDCARD_BARE_MODEL,
+            f"{PROMPT} {unique_marker()}",
+            MAX_COMPLETION_TOKENS,
+        )
+
+        assert result.status_code == 200, (
+            f"a team whose allow-list is access group {team_grant.access_group!r} must be able to "
+            f"call {TEAM_WILDCARD_BARE_MODEL!r} through its team-scoped {TEAM_WILDCARD_PATTERN!r} "
+            f"deployment, got {result.status_code}: {result.body[:300]}"
+        )
+        assert ChatResponse.model_validate_json(result.body).choices, (
+            f"200 must carry a real completion, not an error envelope: {result.body[:300]}"
+        )
+
+    @pytest.mark.covers("other.auth.model_access_group.team_non_member_denied")
+    def test_group_grants_the_team_nothing_outside_it(
+        self, client: AccessControlClient, team_grant: TeamGrant
+    ) -> None:
+        model = f"e2e-ag-unknown-{unique_marker()}"
+
+        result = client.chat_status(
+            team_grant.key, model, f"{PROMPT} {unique_marker()}", MAX_COMPLETION_TOKENS
+        )
+
+        assert result.status_code == 403, (
+            f"a team holding only access group {team_grant.access_group!r} must be denied 403 on "
+            f"{model!r}, got {result.status_code}: {result.body[:300]}"
+        )
+        assert TEAM_MODEL_ACCESS_DENIED_MARKER in result.body, (
+            f"403 body must be a team model-access denial, got: {result.body[:300]}"
+        )
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
index eff3b4ddf58..da2a7da0bfa 100644
--- a/tests/e2e/conftest.py
+++ b/tests/e2e/conftest.py
@@ -15,19 +15,27 @@ shared fixtures build on it.
 
 import functools
 import os
-from collections.abc import Iterator
+from collections.abc import Generator, Iterator
+from datetime import datetime, timezone
 
 import pytest
 import requests
 
-from e2e_config import CONTROL_PLANE_BASE_URL, PROXY_BASE_URL
+from e2e_config import CONTROL_PLANE_BASE_URL, FIXTURE_DIR, FIXTURE_MODE_RAW, PROXY_BASE_URL
 from e2e_db import RESET_OPT_IN_ENV, reset_spend_logs, run_spend_log_cleanup
+from fixture_transport import (
+    fixture_mode_collection_error,
+    fixture_report_lines,
+    parse_fixture_mode,
+    replay_leftover_error,
+)
 from junit_properties import attach_result_properties
 from lifecycle import ProxyClientProvider, ResourceManager
 from proxy_client import ProxyClient, build_proxy_client
 
 
 _E2E_TEST_RAN = pytest.StashKey[bool]()
+_CALL_PASSED = pytest.StashKey[bool]()
 
 
 def pytest_configure(config: pytest.Config) -> None:
@@ -49,6 +57,21 @@ def pytest_configure(config: pytest.Config) -> None:
     )
 
 
+def pytest_sessionstart(session: pytest.Session) -> None:
+    """Abort before collection when E2E_FIXTURE_MODE can never work: an unknown
+    mode value, or replay against a missing, unreadable, or stale bundle (the
+    stale message names the bundle's age). Live and record modes pass through."""
+    reason = fixture_mode_collection_error(
+        FIXTURE_MODE_RAW, FIXTURE_DIR, now=datetime.now(timezone.utc)
+    )
+    if reason is not None:
+        raise pytest.UsageError(reason)
+
+
+def pytest_report_header(config: pytest.Config) -> list[str]:
+    return fixture_report_lines(FIXTURE_MODE_RAW, FIXTURE_DIR, now=datetime.now(timezone.utc))
+
+
 def pytest_collection_modifyitems(items: list[pytest.Item]) -> None:
     """Attach the two custom signals (suite package and covered cell ids) to every
     test's user_properties so the standard JUnit report (`--junitxml`) records them
@@ -91,9 +114,12 @@ def _proxy_fail_reason() -> str | None:
 def pytest_runtest_setup(item: pytest.Item) -> None:
     """Hard-fail `e2e`-marked tests unless a proxy answers its liveness probe.
     Unmarked tests (unit coverage of the harness) don't touch the proxy, so they
-    run even when none is up. Never skip for a missing proxy."""
+    run even when none is up. Never skip for a missing proxy. Replay mode serves
+    every call from the fixture bundle, so it needs no live proxy either."""
     if item.get_closest_marker("e2e") is None:
         return
+    if parse_fixture_mode(FIXTURE_MODE_RAW) == "replay":
+        return
     reason = _proxy_fail_reason()
     if reason is not None:
         pytest.fail(reason)
@@ -110,6 +136,36 @@ def pytest_runtest_call(item: pytest.Item) -> None:
     item.session.stash[_E2E_TEST_RAN] = True
 
 
+@pytest.hookimpl(wrapper=True)
+def pytest_runtest_makereport(
+    item: pytest.Item, call: pytest.CallInfo[None]
+) -> Generator[None, pytest.TestReport, pytest.TestReport]:
+    """Stash the call-phase outcome so teardown can tell a passed test from a
+    failed one without re-deriving it."""
+    report = yield
+    if report.when == "call":
+        item.stash[_CALL_PASSED] = report.passed
+    return report
+
+
+@pytest.hookimpl(wrapper=True)
+def pytest_runtest_teardown(item: pytest.Item) -> Generator[None, None, None]:
+    """In replay mode a passing test must consume its whole recording: leftover
+    interactions mean the test now makes fewer calls than it did at record time,
+    so the replay proved less than the bundle claims. The check runs after the
+    yield so fixture finalizers replay their recorded calls first. Failed tests
+    are left alone - their own failure already explains any unconsumed tail."""
+    result = yield
+    if not item.stash.get(_CALL_PASSED, False):
+        return result
+    reason = replay_leftover_error(
+        mode_raw=FIXTURE_MODE_RAW, bundle_dir=FIXTURE_DIR, test_key=item.nodeid
+    )
+    if reason is not None:
+        pytest.fail(reason)
+    return result
+
+
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
     """Once the whole e2e session is done (all suites), optionally truncate the
     spend logs so the DB doesn't accumulate test rows. The truncate is destructive
diff --git a/tests/e2e/coverage_registry/other.yaml b/tests/e2e/coverage_registry/other.yaml
index c7140a4503b..814ebae2e0b 100644
--- a/tests/e2e/coverage_registry/other.yaml
+++ b/tests/e2e/coverage_registry/other.yaml
@@ -12,6 +12,11 @@
 - {id: other.auth.jwt.valid_token_allows, module: other, tier: P0, area: auth, assertions: [valid_token_allows], source: "handle_jwt.py:77-150", rationale: "Valid JWT with correct issuer + claims grants access"}
 - {id: other.auth.jwt.expired_denied, module: other, tier: P0, area: auth, assertions: [expired_denied], source: "handle_jwt.py:125-135", rationale: "Expired JWT rejected even with valid signature"}
 - {id: other.auth.jwt.invalid_signature_denied, module: other, tier: P0, area: auth, assertions: [invalid_signature_denied], source: "handle_jwt.py:145-150", rationale: "Bad/missing signature fails verification"}
+- {id: other.auth.model_access_group.wildcard_bare_name_allowed, module: other, tier: P0, area: auth, assertions: [wildcard_bare_name_allowed], source: "auth_checks.py:3232 / LIT-5813", fail_before_fix: proven, rationale: "A grant of a group holding a wildcard deployment covers the bare model names callers actually send, not only the provider-prefixed spelling"}
+- {id: other.auth.model_access_group.member_allowed, module: other, tier: P0, area: auth, assertions: [member_allowed], source: "auth_checks.py:3232", rationale: "A key whose allow-list is a model access group can call the deployments in that group"}
+- {id: other.auth.model_access_group.non_member_denied, module: other, tier: P0, area: auth, assertions: [non_member_denied], source: "auth_checks.py:3232", rationale: "That same grant reaches nothing outside the group, including provider models the group's wildcard does not cover"}
+- {id: other.auth.model_access_group.team_wildcard_bare_name_allowed, module: other, tier: P1, area: auth, assertions: [team_wildcard_bare_name_allowed], source: "auth_checks.py:3232 / LIT-5813", fail_before_fix: proven, rationale: "The same bare-name grant holds when the wildcard deployment is team-scoped and the team's allow-list is the group"}
+- {id: other.auth.model_access_group.team_non_member_denied, module: other, tier: P1, area: auth, assertions: [team_non_member_denied], source: "auth_checks.py:3232", rationale: "A team-level group grant reaches nothing outside the group"}
 - {id: other.auth.virtual_key.route_permission_enforced, module: other, tier: P0, area: auth, assertions: [route_permission_enforced], source: "route_checks.py:89-151", rationale: "allowed_routes whitelist denies disallowed routes"}
 - {id: other.auth.virtual_key.route_group_allowed, module: other, tier: P1, area: auth, assertions: [route_group_allowed], source: "route_checks.py:106-128", rationale: "allowed_routes=[llm_api_routes] grants all LLM endpoints"}
 - {id: other.auth.passthrough.model_allowlist_enforced, module: other, tier: P1, area: auth, assertions: [model_allowlist_enforced], source: "route_checks.py:135-151", rationale: "Passthrough enforces per-key model allow-lists"}
diff --git a/tests/e2e/e2e_config.py b/tests/e2e/e2e_config.py
index 277478eebaf..a5c3729f4be 100644
--- a/tests/e2e/e2e_config.py
+++ b/tests/e2e/e2e_config.py
@@ -13,6 +13,8 @@ from pathlib import Path
 
 from dotenv import load_dotenv
 
+from fixture_transport import deterministic_marker, parse_fixture_mode
+
 # Local runs keep provider / DataDog keys in tests/e2e/.env (see CONTRIBUTING.md).
 # Compose injects them into the proxy container, but pytest on the host does not
 # inherit that file unless we load it. override=False so a real shell export wins.
@@ -90,6 +92,15 @@ PROPAGATION_TIMEOUT = float(os.environ.get("E2E_PROPAGATION_TIMEOUT", "15"))
 
 EXPECT_RUST = os.environ.get("E2E_EXPECT_RUST", "").strip().lower() in ("1", "true", "yes")
 
+# Record/replay fixture selection (see fixture_transport.py). The raw mode value
+# is parsed and validated there; "live" (the default, also for empty values)
+# means the harness behaves exactly as before this knob existed.
+FIXTURE_MODE_RAW = os.environ.get("E2E_FIXTURE_MODE", "live")
+FIXTURE_DIR = Path(
+    os.environ.get("E2E_FIXTURE_DIR", "").strip()
+    or str(Path(__file__).resolve().parent / ".fixtures")
+)
+
 # Deliberately modest concurrency. The suite shares its proxy with every other
 # suite in the run, and 750 users at spawn rate 50 saturated the request path hard
 # enough to distort latency-sensitive neighbours (and to spend real provider money
@@ -148,7 +159,11 @@ def datadog_mcp_url(*, toolsets: str = "core") -> str:
 
 def unique_marker() -> str:
     """A short unique token per call/run, so concurrent runs and the shared
-    response cache never collide on prompts, tags, or customer ids."""
+    response cache never collide on prompts, tags, or customer ids. In record
+    and replay modes the token is deterministic per test instead, so a replay
+    run regenerates the exact requests the record run sent."""
+    if parse_fixture_mode(FIXTURE_MODE_RAW) in ("record", "replay"):
+        return deterministic_marker()
     return uuid.uuid4().hex[:12]
 
 
diff --git a/tests/e2e/fixture_bundle.py b/tests/e2e/fixture_bundle.py
new file mode 100644
index 00000000000..615ae8df1a4
--- /dev/null
+++ b/tests/e2e/fixture_bundle.py
@@ -0,0 +1,315 @@
+"""On-disk fixture bundle format for record/replay e2e runs (LIT-5729).
+
+A bundle is a directory: one ``manifest.json`` (record timestamp + harness
+version + format version) plus one subdirectory per test, holding one JSON file
+per transport interaction in call order. Bundles older than
+``MAX_BUNDLE_AGE`` hard-fail replay at collection time (see conftest), so a
+green replay run can never certify against fixtures that have drifted more than
+a week from the live proxy.
+
+This module owns the format only. The transports that produce and consume it
+live in fixture_transport.py and the canonical match keys they compute live in
+fixture_canonical.py (LIT-5741); streaming chunk fidelity and provider-scoping
+are follow-ups (LIT-5742/5745). Every interaction file stores the full redacted
+request because replay matches on its canonicalized content.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import re
+import shutil
+import subprocess
+from dataclasses import dataclass, field
+from datetime import datetime, timedelta, timezone
+from pathlib import Path
+from typing import Annotated, Final, Literal
+
+from pydantic import BaseModel, Field, JsonValue, TypeAdapter
+
+from e2e_http import (
+    BinaryStream,
+    NetworkError,
+    ProbeResult,
+    RateLimitedError,
+    Result,
+    StreamingResponse,
+    Success,
+    UnauthorizedError,
+    UnknownApiError,
+    ValidationError,
+)
+
+BUNDLE_FORMAT_VERSION: Final = 1
+MAX_BUNDLE_AGE: Final = timedelta(days=7)
+MANIFEST_FILENAME: Final = "manifest.json"
+
+_JSON: Final[TypeAdapter[JsonValue]] = TypeAdapter(JsonValue)
+
+
+class Manifest(BaseModel):
+    format_version: int
+    recorded_at: datetime
+    harness_version: str
+
+
+class RecordedRequest(BaseModel):
+    """The request as the transport saw it, auth header values and credential
+    body/form fields redacted.
+
+    Replay matches on the canonical content key fixture_canonical.py computes
+    over ``method`` (the transport verb, not the HTTP verb), ``path``, and the
+    canonicalized headers, params, body, form, and file identity. File uploads
+    store a content digest instead of the bytes."""
+
+    method: str
+    path: str
+    headers: dict[str, str]
+    params: dict[str, str] = {}
+    body: JsonValue | None = None
+    form: dict[str, str] | None = None
+    file_name: str | None = None
+    file_sha256: str | None = None
+    file_bytes: int | None = None
+
+
+class RecordedResult(BaseModel):
+    """A ``Result[R]`` flattened for disk. ``data`` holds the success payload as
+    raw JSON; replay re-validates it against the ``response_type`` the caller
+    passes, exactly like a live response body."""
+
+    shape: Literal["result"] = "result"
+    kind: Literal["success", "network", "unauthorized", "rate_limited", "validation", "unknown"]
+    status_code: int | None = None
+    data: JsonValue | None = None
+    message: str | None = None
+    body: str | None = None
+    retry_after_seconds: int | None = None
+
+
+class RecordedStreaming(BaseModel):
+    shape: Literal["streaming"] = "streaming"
+    payload: StreamingResponse
+
+
+class RecordedBinary(BaseModel):
+    shape: Literal["binary"] = "binary"
+    payload: BinaryStream
+
+
+class RecordedProbe(BaseModel):
+    shape: Literal["probe"] = "probe"
+    payload: ProbeResult
+
+
+type RecordedResponse = RecordedResult | RecordedStreaming | RecordedBinary | RecordedProbe
+
+
+class Interaction(BaseModel):
+    request: RecordedRequest
+    response: Annotated[
+        RecordedResult | RecordedStreaming | RecordedBinary | RecordedProbe,
+        Field(discriminator="shape"),
+    ]
+
+
+def to_json_value(model: BaseModel) -> JsonValue:
+    return _JSON.validate_json(model.model_dump_json(by_alias=True))
+
+
+def from_result[R: BaseModel](result: Result[R]) -> RecordedResult:
+    match result:
+        case Success(status_code=status_code, data=data):
+            return RecordedResult(kind="success", status_code=status_code, data=to_json_value(data))
+        case NetworkError(message=message):
+            return RecordedResult(kind="network", message=message)
+        case UnauthorizedError():
+            return RecordedResult(kind="unauthorized")
+        case RateLimitedError(retry_after_seconds=retry_after_seconds, body=body):
+            return RecordedResult(kind="rate_limited", retry_after_seconds=retry_after_seconds, body=body)
+        case ValidationError(message=message):
+            return RecordedResult(kind="validation", message=message)
+        case UnknownApiError(status_code=status_code, body=body):
+            return RecordedResult(kind="unknown", status_code=status_code, body=body)
+
+
+def to_result[R: BaseModel](recorded: RecordedResult, response_type: type[R]) -> Result[R]:
+    match recorded.kind:
+        case "success":
+            return Success(
+                status_code=recorded.status_code or 200,
+                data=response_type.model_validate(recorded.data),
+            )
+        case "network":
+            return NetworkError(message=recorded.message or "")
+        case "unauthorized":
+            return UnauthorizedError()
+        case "rate_limited":
+            return RateLimitedError(
+                retry_after_seconds=recorded.retry_after_seconds, body=recorded.body or ""
+            )
+        case "validation":
+            return ValidationError(message=recorded.message or "")
+        case "unknown":
+            return UnknownApiError(status_code=recorded.status_code or 0, body=recorded.body or "")
+
+
+def slugify(raw: str, *, limit: int = 60) -> str:
+    clean = re.sub(r"[^A-Za-z0-9_.-]+", "-", raw).strip("-")
+    return clean[:limit].rstrip("-")
+
+
+def slug_for_test(test_key: str) -> str:
+    """Directory name for one test's interactions: a readable tail plus a short
+    digest of the full node id, so same-named methods in different classes or
+    files never collide."""
+    digest = hashlib.sha1(test_key.encode()).hexdigest()[:8]
+    tail = slugify(test_key.rsplit("::", 1)[-1])
+    return f"{tail}-{digest}" if tail else digest
+
+
+def interaction_filename(ordinal: int, request: RecordedRequest) -> str:
+    path_part = slugify(request.path, limit=40) or "root"
+    return f"{ordinal:04d}-{request.method}-{path_part}.json"
+
+
+def harness_version() -> str:
+    try:
+        proc = subprocess.run(
+            ("git", "rev-parse", "--short", "HEAD"),
+            cwd=Path(__file__).resolve().parent,
+            capture_output=True,
+            text=True,
+            timeout=10,
+            check=False,
+        )
+    except (OSError, subprocess.SubprocessError):
+        return "unknown"
+    return proc.stdout.strip() or "unknown"
+
+
+@dataclass(slots=True)
+class BundleRecorder:
+    """Appends interaction files under ``root``, one subdirectory per test, with
+    a per-test ordinal that fixes replay order. ``prepare_bundle`` is the only
+    constructor: it guarantees the directory started empty with a fresh
+    manifest, so record mode never reads (or merges into) an existing bundle."""
+
+    root: Path
+    _ordinals: dict[str, int] = field(default_factory=dict)
+
+    def record(self, *, test_key: str, request: RecordedRequest, response: RecordedResponse) -> None:
+        slug = slug_for_test(test_key)
+        ordinal = self._ordinals.get(slug, 0)
+        self._ordinals[slug] = ordinal + 1
+        directory = self.root / slug
+        directory.mkdir(parents=True, exist_ok=True)
+        interaction = Interaction(request=request, response=response)
+        target = directory / interaction_filename(ordinal, request)
+        target.write_text(interaction.model_dump_json(indent=2), encoding="utf-8")
+
+
+@dataclass(frozen=True, slots=True)
+class UnsafeBundleDir:
+    path: Path
+    reason: str
+
+
+def prepare_bundle(root: Path) -> BundleRecorder | UnsafeBundleDir:
+    """Start a fresh bundle at ``root`` for record mode: wipe whatever bundle is
+    there and write a new manifest. Refuses to wipe a directory that is neither
+    empty nor a bundle (no manifest.json), so a mistyped E2E_FIXTURE_DIR can
+    never delete unrelated files."""
+    if root.exists():
+        if not root.is_dir():
+            return UnsafeBundleDir(path=root, reason="exists and is not a directory")
+        entries = tuple(root.iterdir())
+        if entries and not (root / MANIFEST_FILENAME).is_file():
+            return UnsafeBundleDir(
+                path=root,
+                reason=f"is not empty and has no {MANIFEST_FILENAME}; refusing to wipe a non-bundle directory",
+            )
+        shutil.rmtree(root)
+    root.mkdir(parents=True)
+    manifest = Manifest(
+        format_version=BUNDLE_FORMAT_VERSION,
+        recorded_at=datetime.now(timezone.utc),
+        harness_version=harness_version(),
+    )
+    (root / MANIFEST_FILENAME).write_text(manifest.model_dump_json(indent=2), encoding="utf-8")
+    return BundleRecorder(root=root)
+
+
+@dataclass(frozen=True, slots=True)
+class FreshBundle:
+    manifest: Manifest
+
+
+@dataclass(frozen=True, slots=True)
+class StaleBundle:
+    recorded_at: datetime
+    age: timedelta
+    limit: timedelta
+
+
+@dataclass(frozen=True, slots=True)
+class UnreadableBundle:
+    reason: str
+
+
+type BundleFreshness = FreshBundle | StaleBundle | UnreadableBundle
+
+
+def _read_manifest(root: Path) -> Manifest | UnreadableBundle:
+    manifest_path = root / MANIFEST_FILENAME
+    if not manifest_path.is_file():
+        return UnreadableBundle(reason=f"no {MANIFEST_FILENAME} found (record one with E2E_FIXTURE_MODE=record)")
+    try:
+        return Manifest.model_validate_json(manifest_path.read_text(encoding="utf-8"))
+    except ValueError as exc:
+        return UnreadableBundle(reason=f"{MANIFEST_FILENAME} is invalid: {exc}")
+
+
+def check_freshness(root: Path, *, now: datetime) -> BundleFreshness:
+    manifest = _read_manifest(root)
+    if isinstance(manifest, UnreadableBundle):
+        return manifest
+    if manifest.format_version != BUNDLE_FORMAT_VERSION:
+        return UnreadableBundle(
+            reason=f"format_version {manifest.format_version} != supported {BUNDLE_FORMAT_VERSION}"
+        )
+    recorded_at = (
+        manifest.recorded_at
+        if manifest.recorded_at.tzinfo is not None
+        else manifest.recorded_at.replace(tzinfo=timezone.utc)
+    )
+    age = now - recorded_at
+    if age > MAX_BUNDLE_AGE:
+        return StaleBundle(recorded_at=recorded_at, age=age, limit=MAX_BUNDLE_AGE)
+    return FreshBundle(manifest=manifest)
+
+
+def format_age(age: timedelta) -> str:
+    total_hours = int(age.total_seconds()) // 3600
+    return f"{total_hours // 24}d{total_hours % 24}h"
+
+
+@dataclass(frozen=True, slots=True)
+class LoadedBundle:
+    manifest: Manifest
+    interactions: dict[str, tuple[Interaction, ...]]
+
+
+def load_bundle(root: Path) -> LoadedBundle | UnreadableBundle:
+    manifest = _read_manifest(root)
+    if isinstance(manifest, UnreadableBundle):
+        return manifest
+    interactions = {
+        directory.name: tuple(
+            Interaction.model_validate_json(file.read_text(encoding="utf-8"))
+            for file in sorted(directory.glob("*.json"))
+        )
+        for directory in sorted(root.iterdir())
+        if directory.is_dir()
+    }
+    return LoadedBundle(manifest=manifest, interactions=interactions)
diff --git a/tests/e2e/fixture_canonical.py b/tests/e2e/fixture_canonical.py
new file mode 100644
index 00000000000..427f06bf8fb
--- /dev/null
+++ b/tests/e2e/fixture_canonical.py
@@ -0,0 +1,150 @@
+"""Canonical request identity for replay matching (LIT-5741).
+
+Matching a replayed call against the raw recorded request never hits: unique
+markers salt prompts, model names, and tags; every run mints fresh virtual
+keys; request ids and timestamps differ on every call. Matching on transport
+verb + path alone collides: two different requests to the same route silently
+swap responses, which passes when it should miss. The canonicalizer strips
+exactly the volatile material (volatile headers, credential fields, markers,
+generated ids, timestamps) and hashes what remains with sorted object keys, so
+identity is content-based and stable across runs and machines.
+
+Every rewrite rule lives in this module, next to the transports that apply it:
+a new volatile header, credential field name, or generated-id shape is one
+edit here, never a per-suite change.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import json
+import re
+from dataclasses import dataclass
+from functools import reduce
+from typing import Final
+
+from pydantic import JsonValue
+
+from fixture_bundle import RecordedRequest
+
+VOLATILE_HEADER_NAMES: Final[frozenset[str]] = frozenset(
+    {
+        "authorization",
+        "x-litellm-api-key",
+        "x-api-key",
+        "x-goog-api-key",
+        "x-request-id",
+        "traceparent",
+        "tracestate",
+    }
+)
+
+SECRET_FIELD_NAMES: Final[frozenset[str]] = frozenset(
+    {"api_key", "aws_access_key_id", "static_headers", "vertex_credentials"}
+)
+SECRET_FIELD_SUFFIXES: Final[tuple[str, ...]] = (
+    "_api_key",
+    "_secret_key",
+    "_secret_access_key",
+    "_session_token",
+    "_credentials",
+    "_password",
+)
+SECRET_PLACEHOLDER: Final = "<secret>"
+
+PLACEHOLDER_RULES: Final[tuple[tuple[re.Pattern[str], str], ...]] = (
+    (re.compile(r"(?<![0-9a-fA-F])[0-9a-f]{64}(?![0-9a-fA-F])"), "<sha256>"),
+    (
+        re.compile(r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"),
+        "<uuid>",
+    ),
+    (re.compile(r"sk-[A-Za-z0-9_-]{16,}"), "<key>"),
+    (
+        re.compile(r"\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?"),
+        "<timestamp>",
+    ),
+    (re.compile(r"(?<!\d)\d{4}-\d{2}-\d{2}(?!\d)"), "<date>"),
+    (
+        re.compile(r"\b(?:chatcmpl|msgbatch|msg|resp|batch|call|req|ftjob|gen|file)[-_][A-Za-z0-9]{8,}\b"),
+        "<id>",
+    ),
+    (re.compile(r"(?<![0-9a-fA-F])[0-9a-f]{12}(?![0-9a-fA-F])"), "<marker>"),
+)
+
+
+def is_secret_field(name: str) -> bool:
+    lowered: Final = name.lower()
+    return lowered in SECRET_FIELD_NAMES or lowered.endswith(SECRET_FIELD_SUFFIXES)
+
+
+def canonical_string(value: str) -> str:
+    return reduce(lambda acc, rule: rule[0].sub(rule[1], acc), PLACEHOLDER_RULES, value)
+
+
+def _canonical_flat(fields: dict[str, str]) -> dict[str, JsonValue]:
+    return {
+        key: SECRET_PLACEHOLDER if is_secret_field(key) else canonical_string(value)
+        for key, value in fields.items()
+    }
+
+
+def _canonical_value(value: JsonValue) -> JsonValue:
+    match value:
+        case str():
+            return canonical_string(value)
+        case dict():
+            return {
+                key: SECRET_PLACEHOLDER
+                if is_secret_field(key) and item is not None
+                else _canonical_value(item)
+                for key, item in value.items()
+            }
+        case list():
+            return [_canonical_value(item) for item in value]
+        case _:
+            return value
+
+
+@dataclass(frozen=True, slots=True)
+class CanonicalRequest:
+    method: str
+    path: str
+    content: str
+
+    @property
+    def key(self) -> str:
+        digest: Final = hashlib.sha256(
+            f"{self.method} {self.path}\n{self.content}".encode()
+        ).hexdigest()[:16]
+        return f"{self.method} {self.path} #{digest}"
+
+    def pretty_content(self) -> str:
+        return json.dumps(json.loads(self.content), indent=2, sort_keys=True)
+
+
+def canonicalize(request: RecordedRequest) -> CanonicalRequest:
+    file_identity: Final[JsonValue | None] = (
+        None
+        if request.file_name is None and request.file_sha256 is None
+        else {
+            "name": None if request.file_name is None else canonical_string(request.file_name),
+            "sha256": request.file_sha256,
+            "bytes": request.file_bytes,
+        }
+    )
+    content: Final[dict[str, JsonValue]] = {
+        "headers": {
+            name.lower(): canonical_string(value)
+            for name, value in request.headers.items()
+            if name.lower() not in VOLATILE_HEADER_NAMES
+        },
+        "params": _canonical_flat(request.params),
+        "body": _canonical_value(request.body),
+        "form": None if request.form is None else _canonical_flat(request.form),
+        "file": file_identity,
+    }
+    return CanonicalRequest(
+        method=request.method,
+        path=canonical_string(request.path),
+        content=json.dumps(content, sort_keys=True, separators=(",", ":")),
+    )
diff --git a/tests/e2e/fixture_transport.py b/tests/e2e/fixture_transport.py
new file mode 100644
index 00000000000..ce4eec701ca
--- /dev/null
+++ b/tests/e2e/fixture_transport.py
@@ -0,0 +1,724 @@
+"""Record/replay transports behind the same ``Transport`` protocol (LIT-5729).
+
+``RecordingTransport`` decorates the live transport: every call passes through
+unchanged and its request/response pair is appended to the fixture bundle.
+``ReplayTransport`` implements the protocol from a recorded bundle alone: no
+HTTP, no proxy, no provider spend. Because both fulfil ``Transport``, no test
+or client changes shape; ``build_proxy_client`` picks the transport from
+``E2E_FIXTURE_MODE`` (live | record | replay, default live).
+
+Replay matches each call by test node id and canonical content key
+(fixture_canonical.py, LIT-5741): volatile headers, credential fields, unique
+markers, generated ids, and timestamps are canonicalized out before hashing, so
+matching is order-independent across distinct keys, FIFO within a key, and a
+miss fails hard (``ReplayMiss``) printing the computed key and the closest
+recorded key without ever falling through to a live call. Streaming chunk
+fidelity is LIT-5742; scoping record/replay to provider-bound traffic is
+LIT-5745.
+"""
+
+from __future__ import annotations
+
+import difflib
+import functools
+import hashlib
+import os
+from collections import deque
+from dataclasses import dataclass, field
+from datetime import datetime
+from itertools import islice
+from pathlib import Path
+from typing import Final, Literal, assert_never
+
+from pydantic import BaseModel, JsonValue
+
+from e2e_http import AuthHeaders, BinaryStream, ProbeResult, Result, StreamingResponse
+from fixture_bundle import (
+    BundleRecorder,
+    FreshBundle,
+    Interaction,
+    LoadedBundle,
+    RecordedBinary,
+    RecordedProbe,
+    RecordedRequest,
+    RecordedResponse,
+    RecordedResult,
+    RecordedStreaming,
+    StaleBundle,
+    UnreadableBundle,
+    UnsafeBundleDir,
+    check_freshness,
+    format_age,
+    from_result,
+    interaction_filename,
+    load_bundle,
+    prepare_bundle,
+    slug_for_test,
+    to_json_value,
+    to_result,
+)
+from fixture_canonical import CanonicalRequest, canonicalize, is_secret_field
+from transport import Transport
+
+type FixtureMode = Literal["live", "record", "replay"]
+
+FIXTURE_MODES: Final[tuple[FixtureMode, ...]] = ("live", "record", "replay")
+
+SESSION_TEST_KEY: Final = "session"
+
+REDACTED_HEADER_NAMES: Final[frozenset[str]] = frozenset({"authorization", "x-litellm-api-key"})
+REDACTED_VALUE: Final = "<redacted>"
+
+
+@dataclass(frozen=True, slots=True)
+class InvalidFixtureMode:
+    value: str
+
+
+def parse_fixture_mode(raw: str) -> FixtureMode | InvalidFixtureMode:
+    normalized = raw.strip().lower() or "live"
+    match normalized:
+        case "live" | "record" | "replay":
+            return normalized
+        case _:
+            return InvalidFixtureMode(value=raw)
+
+
+def current_test_key() -> str:
+    """The pytest node id of the running test, from the PYTEST_CURRENT_TEST env
+    var pytest maintains (``<nodeid> (setup|call|teardown)``); ``session`` for
+    calls outside any test (e.g. session-finish cleanup)."""
+    raw = os.environ.get("PYTEST_CURRENT_TEST", "")
+    if not raw:
+        return SESSION_TEST_KEY
+    return raw.rsplit(" (", 1)[0]
+
+
+class ReplayMiss(AssertionError):
+    """Replay had no recorded interaction for a call the suite made. The test
+    drifted from the bundle (or the bundle from the suite): re-record."""
+
+
+_marker_ordinals: Final[dict[str, int]] = {}
+
+
+def deterministic_marker() -> str:
+    """Stable stand-in for uuid-based unique markers in record and replay modes:
+    the Nth marker of a test is a pure function of the test's node id and N, so a
+    replay run regenerates exactly the model names, prompts, and tags the record
+    run sent and every recorded poll response still satisfies its predicate."""
+    test_key = current_test_key()
+    ordinal = _marker_ordinals.get(test_key, 0)
+    _marker_ordinals[test_key] = ordinal + 1
+    return hashlib.sha1(f"{test_key}#{ordinal}".encode()).hexdigest()[:12]
+
+
+def _dump_flat(model: BaseModel | None) -> dict[str, str]:
+    if model is None:
+        return {}
+    dumped: dict[str, object] = model.model_dump(by_alias=True, exclude_none=True)
+    return {key: str(value) for key, value in dumped.items()}
+
+
+def _redact(headers: dict[str, str]) -> dict[str, str]:
+    return {
+        name: REDACTED_VALUE if name.lower() in REDACTED_HEADER_NAMES else value
+        for name, value in headers.items()
+    }
+
+
+def _redact_secret_fields(value: JsonValue) -> JsonValue:
+    match value:
+        case dict():
+            return {
+                key: REDACTED_VALUE
+                if is_secret_field(key) and item is not None
+                else _redact_secret_fields(item)
+                for key, item in value.items()
+            }
+        case list():
+            return [_redact_secret_fields(item) for item in value]
+        case _:
+            return value
+
+
+def _redact_flat(fields: dict[str, str]) -> dict[str, str]:
+    return {
+        key: REDACTED_VALUE if is_secret_field(key) else value for key, value in fields.items()
+    }
+
+
+def recorded_request(
+    method: str,
+    path: str,
+    *,
+    headers: BaseModel,
+    body: BaseModel | None = None,
+    params: BaseModel | None = None,
+    form: BaseModel | None = None,
+    file_name: str | None = None,
+    file_content: bytes | None = None,
+) -> RecordedRequest:
+    return RecordedRequest(
+        method=method,
+        path=path,
+        headers=_redact(_dump_flat(headers)),
+        params=_redact_flat(_dump_flat(params)),
+        body=None if body is None else _redact_secret_fields(to_json_value(body)),
+        form=None if form is None else _redact_flat(_dump_flat(form)),
+        file_name=file_name,
+        file_sha256=None if file_content is None else hashlib.sha256(file_content).hexdigest(),
+        file_bytes=None if file_content is None else len(file_content),
+    )
+
+
+@dataclass(frozen=True, slots=True)
+class RecordingTransport:
+    """Decorator over the live transport: forwards every call and appends the
+    interaction to the bundle, so a green live run leaves behind exactly the
+    traffic replay needs."""
+
+    inner: Transport
+    recorder: BundleRecorder
+
+    def _record(self, request: RecordedRequest, response: RecordedResponse) -> None:
+        self.recorder.record(test_key=current_test_key(), request=request, response=response)
+
+    def bearer(self, key: str) -> AuthHeaders:
+        return self.inner.bearer(key)
+
+    @property
+    def master(self) -> AuthHeaders:
+        return self.inner.master
+
+    def post[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        result = self.inner.post(path, headers=headers, json=json, response_type=response_type)
+        self._record(recorded_request("post", path, headers=headers, body=json), from_result(result))
+        return result
+
+    def get[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        params: BaseModel,
+        response_type: type[R],
+        timeout: float | None = None,
+    ) -> Result[R]:
+        result = self.inner.get(
+            path, headers=headers, params=params, response_type=response_type, timeout=timeout
+        )
+        self._record(recorded_request("get", path, headers=headers, params=params), from_result(result))
+        return result
+
+    def delete[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        json: BaseModel,
+        response_type: type[R],
+        params: BaseModel | None = None,
+    ) -> Result[R]:
+        result = self.inner.delete(
+            path, headers=headers, json=json, response_type=response_type, params=params
+        )
+        self._record(
+            recorded_request("delete", path, headers=headers, body=json, params=params),
+            from_result(result),
+        )
+        return result
+
+    def patch[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        result = self.inner.patch(path, headers=headers, json=json, response_type=response_type)
+        self._record(recorded_request("patch", path, headers=headers, body=json), from_result(result))
+        return result
+
+    def put[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        result = self.inner.put(path, headers=headers, json=json, response_type=response_type)
+        self._record(recorded_request("put", path, headers=headers, body=json), from_result(result))
+        return result
+
+    def stream(self, path: str, *, headers: BaseModel, json: BaseModel) -> StreamingResponse:
+        response = self.inner.stream(path, headers=headers, json=json)
+        self._record(
+            recorded_request("stream", path, headers=headers, body=json),
+            RecordedStreaming(payload=response),
+        )
+        return response
+
+    def stream_binary(
+        self, path: str, *, headers: BaseModel, json: BaseModel, chunk_size: int = 8192
+    ) -> BinaryStream:
+        response = self.inner.stream_binary(path, headers=headers, json=json, chunk_size=chunk_size)
+        self._record(
+            recorded_request("stream_binary", path, headers=headers, body=json),
+            RecordedBinary(payload=response),
+        )
+        return response
+
+    def send(
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        json: BaseModel,
+        params: BaseModel | None = None,
+        stream: bool = False,
+    ) -> StreamingResponse:
+        response = self.inner.send(path, headers=headers, json=json, params=params, stream=stream)
+        self._record(
+            recorded_request("send", path, headers=headers, body=json, params=params),
+            RecordedStreaming(payload=response),
+        )
+        return response
+
+    def probe(self, path: str, *, params: BaseModel) -> ProbeResult:
+        response = self.inner.probe(path, params=params)
+        self._record(
+            recorded_request("probe", path, headers=self.master, params=params),
+            RecordedProbe(payload=response),
+        )
+        return response
+
+    def upload[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        form: BaseModel,
+        filename: str,
+        content: bytes,
+        file_content_type: str = "application/jsonl",
+        file_field: str = "file",
+        params: BaseModel | None = None,
+        response_type: type[R],
+    ) -> Result[R]:
+        result = self.inner.upload(
+            path,
+            headers=headers,
+            form=form,
+            filename=filename,
+            content=content,
+            file_content_type=file_content_type,
+            file_field=file_field,
+            params=params,
+            response_type=response_type,
+        )
+        self._record(
+            recorded_request(
+                "upload",
+                path,
+                headers=headers,
+                params=params,
+                form=form,
+                file_name=filename,
+                file_content=content,
+            ),
+            from_result(result),
+        )
+        return result
+
+    def download(self, path: str, *, headers: BaseModel) -> StreamingResponse:
+        response = self.inner.download(path, headers=headers)
+        self._record(
+            recorded_request("download", path, headers=headers),
+            RecordedStreaming(payload=response),
+        )
+        return response
+
+
+def _build_pool(recorded: tuple[Interaction, ...]) -> dict[str, deque[Interaction]]:
+    keys: Final = tuple(canonicalize(interaction.request).key for interaction in recorded)
+    return {
+        key: deque(
+            interaction
+            for candidate_key, interaction in zip(keys, recorded, strict=True)
+            if candidate_key == key
+        )
+        for key in dict.fromkeys(keys)
+    }
+
+
+def _closest_recorded(
+    canonical: CanonicalRequest, recorded: tuple[Interaction, ...]
+) -> tuple[CanonicalRequest, str]:
+    candidates: Final = tuple(canonicalize(interaction.request) for interaction in recorded)
+    ratios: Final = tuple(
+        difflib.SequenceMatcher(
+            None, f"{canonical.method} {canonical.path}\n{canonical.content}",
+            f"{candidate.method} {candidate.path}\n{candidate.content}",
+        ).ratio()
+        for candidate in candidates
+    )
+    best: Final = max(range(len(candidates)), key=lambda index: ratios[index])
+    return candidates[best], interaction_filename(best, recorded[best].request)
+
+
+def _miss_message(test_key: str, slug: str, canonical: CanonicalRequest, bundle: LoadedBundle) -> str:
+    recorded: Final = bundle.interactions.get(slug, ())
+    if not recorded:
+        return (
+            f"replay miss for {test_key}: computed key {canonical.key} but nothing is recorded "
+            f"under {slug}; re-record with E2E_FIXTURE_MODE=record"
+        )
+    closest, closest_file = _closest_recorded(canonical, recorded)
+    diff: Final = "\n".join(
+        islice(
+            difflib.unified_diff(
+                closest.pretty_content().splitlines(),
+                canonical.pretty_content().splitlines(),
+                fromfile=f"closest recorded ({closest_file})",
+                tofile="test made",
+                lineterm="",
+            ),
+            60,
+        )
+    )
+    return (
+        f"replay miss for {test_key}: no recorded interaction matches key {canonical.key}; "
+        f"closest recorded key is {closest.key} ({closest_file})\n{diff}\n"
+        "re-record with E2E_FIXTURE_MODE=record"
+    )
+
+
+@dataclass(slots=True)
+class ReplaySource:
+    """One shared pool per test over a loaded bundle, so every client built in
+    the session consumes the same recorded interactions. Every pool is built
+    once at construction and per-key consumption is a single atomic deque pop,
+    so concurrent replay calls never race. Calls match by canonical content
+    key: order-independent across distinct keys (concurrent tests interleave
+    calls nondeterministically), FIFO within one key (a poll loop replays its
+    recorded responses in recorded order)."""
+
+    bundle: LoadedBundle
+    _pools: dict[str, dict[str, deque[Interaction]]] = field(init=False)
+
+    def __post_init__(self) -> None:
+        self._pools = {
+            slug: _build_pool(recorded) for slug, recorded in self.bundle.interactions.items()
+        }
+
+    def _pool(self, slug: str) -> dict[str, deque[Interaction]]:
+        return self._pools.get(slug, {})
+
+    def next_interaction(self, request: RecordedRequest) -> Interaction:
+        test_key: Final = current_test_key()
+        slug: Final = slug_for_test(test_key)
+        pool: Final = self._pool(slug)
+        canonical: Final = canonicalize(request)
+        queue: Final = pool.get(canonical.key)
+        if queue is None:
+            raise ReplayMiss(_miss_message(test_key, slug, canonical, self.bundle))
+        try:
+            return queue.popleft()
+        except IndexError:
+            raise ReplayMiss(
+                f"replay exhausted for {test_key}: every recorded interaction for key "
+                f"{canonical.key} is already consumed; re-record with E2E_FIXTURE_MODE=record"
+            ) from None
+
+    def leftover_error(self, test_key: str) -> str | None:
+        """Non-None when the test consumed fewer interactions than were recorded,
+        meaning a passing replay proved less than the bundle claims."""
+        slug: Final = slug_for_test(test_key)
+        recorded: Final = self.bundle.interactions.get(slug, ())
+        if not recorded:
+            return None
+        leftover: Final = tuple(
+            interaction for queue in self._pool(slug).values() for interaction in queue
+        )
+        if not leftover:
+            return None
+        return (
+            f"replay incomplete for {test_key}: {len(leftover)} of {len(recorded)} recorded "
+            f"interactions never consumed, e.g. {canonicalize(leftover[0].request).key}; "
+            "re-record with E2E_FIXTURE_MODE=record"
+        )
+
+
+def _expect_result(interaction: Interaction) -> RecordedResult:
+    match interaction.response:
+        case RecordedResult() as recorded:
+            return recorded
+        case RecordedStreaming() | RecordedBinary() | RecordedProbe():
+            raise ReplayMiss(
+                f"recorded {interaction.request.method} {interaction.request.path} is not a typed result"
+            )
+
+
+def _expect_streaming(interaction: Interaction) -> StreamingResponse:
+    match interaction.response:
+        case RecordedStreaming(payload=payload):
+            return payload
+        case RecordedResult() | RecordedBinary() | RecordedProbe():
+            raise ReplayMiss(
+                f"recorded {interaction.request.method} {interaction.request.path} is not a streaming response"
+            )
+
+
+@dataclass(frozen=True, slots=True)
+class ReplayTransport:
+    """A ``Transport`` served entirely from a recorded bundle: never opens a
+    connection, so a replay run cannot bill a provider."""
+
+    source: ReplaySource
+    master_key: str
+
+    def bearer(self, key: str) -> AuthHeaders:
+        return AuthHeaders(authorization=f"Bearer {key}")
+
+    @property
+    def master(self) -> AuthHeaders:
+        return self.bearer(self.master_key)
+
+    def post[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        return to_result(
+            _expect_result(
+                self.source.next_interaction(recorded_request("post", path, headers=headers, body=json))
+            ),
+            response_type,
+        )
+
+    def get[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        params: BaseModel,
+        response_type: type[R],
+        timeout: float | None = None,
+    ) -> Result[R]:
+        return to_result(
+            _expect_result(
+                self.source.next_interaction(recorded_request("get", path, headers=headers, params=params))
+            ),
+            response_type,
+        )
+
+    def delete[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        json: BaseModel,
+        response_type: type[R],
+        params: BaseModel | None = None,
+    ) -> Result[R]:
+        return to_result(
+            _expect_result(
+                self.source.next_interaction(
+                    recorded_request("delete", path, headers=headers, body=json, params=params)
+                )
+            ),
+            response_type,
+        )
+
+    def patch[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        return to_result(
+            _expect_result(
+                self.source.next_interaction(recorded_request("patch", path, headers=headers, body=json))
+            ),
+            response_type,
+        )
+
+    def put[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        return to_result(
+            _expect_result(
+                self.source.next_interaction(recorded_request("put", path, headers=headers, body=json))
+            ),
+            response_type,
+        )
+
+    def stream(self, path: str, *, headers: BaseModel, json: BaseModel) -> StreamingResponse:
+        return _expect_streaming(
+            self.source.next_interaction(recorded_request("stream", path, headers=headers, body=json))
+        )
+
+    def stream_binary(
+        self, path: str, *, headers: BaseModel, json: BaseModel, chunk_size: int = 8192
+    ) -> BinaryStream:
+        interaction = self.source.next_interaction(
+            recorded_request("stream_binary", path, headers=headers, body=json)
+        )
+        match interaction.response:
+            case RecordedBinary(payload=payload):
+                return payload
+            case RecordedResult() | RecordedStreaming() | RecordedProbe():
+                raise ReplayMiss(
+                    f"recorded stream_binary {interaction.request.path} is not a binary stream"
+                )
+
+    def send(
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        json: BaseModel,
+        params: BaseModel | None = None,
+        stream: bool = False,
+    ) -> StreamingResponse:
+        return _expect_streaming(
+            self.source.next_interaction(
+                recorded_request("send", path, headers=headers, body=json, params=params)
+            )
+        )
+
+    def probe(self, path: str, *, params: BaseModel) -> ProbeResult:
+        interaction = self.source.next_interaction(
+            recorded_request("probe", path, headers=self.master, params=params)
+        )
+        match interaction.response:
+            case RecordedProbe(payload=payload):
+                return payload
+            case RecordedResult() | RecordedStreaming() | RecordedBinary():
+                raise ReplayMiss(f"recorded probe {interaction.request.path} is not a probe result")
+
+    def upload[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        form: BaseModel,
+        filename: str,
+        content: bytes,
+        file_content_type: str = "application/jsonl",
+        file_field: str = "file",
+        params: BaseModel | None = None,
+        response_type: type[R],
+    ) -> Result[R]:
+        return to_result(
+            _expect_result(
+                self.source.next_interaction(
+                    recorded_request(
+                        "upload",
+                        path,
+                        headers=headers,
+                        params=params,
+                        form=form,
+                        file_name=filename,
+                        file_content=content,
+                    )
+                )
+            ),
+            response_type,
+        )
+
+    def download(self, path: str, *, headers: BaseModel) -> StreamingResponse:
+        return _expect_streaming(
+            self.source.next_interaction(recorded_request("download", path, headers=headers))
+        )
+
+
+@functools.lru_cache(maxsize=8)
+def _shared_recorder(root: Path) -> BundleRecorder:
+    prepared = prepare_bundle(root)
+    if isinstance(prepared, UnsafeBundleDir):
+        raise ValueError(f"E2E_FIXTURE_DIR {prepared.path} {prepared.reason}")
+    return prepared
+
+
+@functools.lru_cache(maxsize=8)
+def _shared_replay_source(root: Path) -> ReplaySource:
+    loaded = load_bundle(root)
+    if isinstance(loaded, UnreadableBundle):
+        raise ValueError(f"cannot replay from {root}: {loaded.reason}")
+    return ReplaySource(bundle=loaded)
+
+
+def replay_leftover_error(*, mode_raw: str, bundle_dir: Path, test_key: str) -> str | None:
+    """Teardown-time completeness check: in replay mode a passed test with
+    unconsumed recorded interactions must fail instead of passing against a
+    recording it no longer matches. Inert in every other mode."""
+    if parse_fixture_mode(mode_raw) != "replay":
+        return None
+    return _shared_replay_source(bundle_dir).leftover_error(test_key)
+
+
+def select_transport(
+    live: Transport, *, mode_raw: str, bundle_dir: Path, master_key: str
+) -> Transport:
+    """The one seam every client build goes through: wraps (record), replaces
+    (replay), or passes through (live) the transport per E2E_FIXTURE_MODE. The
+    recorder and replay cursors are process-wide singletons per bundle dir, so
+    every client in a session shares one bundle and one recorded sequence."""
+    mode = parse_fixture_mode(mode_raw)
+    match mode:
+        case InvalidFixtureMode(value=value):
+            raise ValueError(f"E2E_FIXTURE_MODE={value!r} is not one of {', '.join(FIXTURE_MODES)}")
+        case "live":
+            return live
+        case "record":
+            return RecordingTransport(inner=live, recorder=_shared_recorder(bundle_dir))
+        case "replay":
+            return ReplayTransport(source=_shared_replay_source(bundle_dir), master_key=master_key)
+        case _:
+            assert_never(mode)
+
+
+def fixture_mode_collection_error(mode_raw: str, bundle_dir: Path, *, now: datetime) -> str | None:
+    """Session-abort reason for a fixture-mode setup that can never work, or None.
+    Called at collection time (conftest pytest_sessionstart) so a stale or missing
+    bundle fails the whole run up front, naming the bundle age, instead of failing
+    every test individually."""
+    mode = parse_fixture_mode(mode_raw)
+    match mode:
+        case InvalidFixtureMode(value=value):
+            return f"E2E_FIXTURE_MODE={value!r} is not one of {', '.join(FIXTURE_MODES)}"
+        case "live" | "record":
+            return None
+        case "replay":
+            freshness = check_freshness(bundle_dir, now=now)
+            match freshness:
+                case FreshBundle():
+                    return None
+                case StaleBundle(recorded_at=recorded_at, age=age, limit=limit):
+                    return (
+                        f"fixture bundle at {bundle_dir} is stale: recorded {recorded_at.isoformat()}, "
+                        f"age {format_age(age)} exceeds the {limit.days}-day limit; "
+                        "re-record with E2E_FIXTURE_MODE=record"
+                    )
+                case UnreadableBundle(reason=reason):
+                    return f"E2E_FIXTURE_MODE=replay cannot use bundle at {bundle_dir}: {reason}"
+                case _:
+                    assert_never(freshness)
+        case _:
+            assert_never(mode)
+
+
+def fixture_report_lines(mode_raw: str, bundle_dir: Path, *, now: datetime) -> list[str]:
+    """pytest report-header lines; empty in live mode so an unset
+    E2E_FIXTURE_MODE keeps today's output byte-identical."""
+    mode = parse_fixture_mode(mode_raw)
+    match mode:
+        case InvalidFixtureMode() | "live":
+            return []
+        case "record":
+            return [f"e2e fixture mode: record -> {bundle_dir}"]
+        case "replay":
+            freshness = check_freshness(bundle_dir, now=now)
+            match freshness:
+                case FreshBundle(manifest=manifest):
+                    return [
+                        f"e2e fixture mode: replay <- {bundle_dir} "
+                        f"(recorded {manifest.recorded_at.isoformat()}, harness {manifest.harness_version})"
+                    ]
+                case StaleBundle() | UnreadableBundle():
+                    return [f"e2e fixture mode: replay <- {bundle_dir}"]
+                case _:
+                    assert_never(freshness)
+        case _:
+            assert_never(mode)
diff --git a/tests/e2e/models.py b/tests/e2e/models.py
index 150be8966ee..ac41971a2c8 100644
--- a/tests/e2e/models.py
+++ b/tests/e2e/models.py
@@ -767,6 +767,8 @@ class ModelInfoBody(BaseModel):
     # constraint when a prior run's teardown had not removed the row.
     id: str | None = None
     mode: ModelMode | None = None
+    access_groups: list[str] | None = None
+    team_id: str | None = None
 
 
 class ModelNewBody(BaseModel):
@@ -862,6 +864,7 @@ class TeamNewResponse(BaseModel):
 class TeamUpdateBody(BaseModel):
     team_id: str
     team_alias: str
+    models: list[str] | None = None
 
 
 class TeamInfoParams(BaseModel):
diff --git a/tests/e2e/proxy_client.py b/tests/e2e/proxy_client.py
index 5050b6fce68..3cae337a5ff 100644
--- a/tests/e2e/proxy_client.py
+++ b/tests/e2e/proxy_client.py
@@ -65,6 +65,8 @@ from models import (
 )
 from e2e_config import (
     CONTROL_PLANE_BASE_URL,
+    FIXTURE_DIR,
+    FIXTURE_MODE_RAW,
     MASTER_KEY,
     POLL_INTERVAL,
     POLL_TIMEOUT,
@@ -72,6 +74,7 @@ from e2e_config import (
     REQUEST_TIMEOUT,
     settle_propagation,
 )
+from fixture_transport import select_transport
 from transport import HttpTransport, SplitTransport, Transport
 
 RowsPredicate = Callable[[list[SpendLogRow]], bool]
@@ -275,7 +278,21 @@ class ProxyClient:
         mode: ModelMode | None = None,
     ) -> str:
         """Register a deployment under `model_name` and return its proxy-assigned
-        model_id, once the model is actually servable on the data plane.
+        model_id, once the model is actually servable on the data plane."""
+        return self.register_model(
+            ModelNewBody(
+                model_name=model_name,
+                litellm_params=litellm_params,
+                model_info=ModelInfoBody(mode=mode),
+            )
+        )
+
+    def register_model(self, body: ModelNewBody, listed_for: str | None = None) -> str:
+        """`create_model` for deployments that carry more than a mode: access groups,
+        team scoping, a pinned id. `listed_for` is the virtual key whose /v1/models
+        view must list the deployment before it counts as servable, because a
+        team-scoped deployment is listed to its own team and to nobody else, master
+        key included; leave it unset for a proxy-wide model.
 
         /model/new is a control-plane route; the data plane (which serves /chat,
         /ocr, ...) only picks the new model up on its next DB reload, so a call
@@ -293,25 +310,22 @@ class ProxyClient:
             self.transport.post(
                 "/model/new",
                 headers=self.transport.master,
-                json=ModelNewBody(
-                    model_name=model_name,
-                    litellm_params=litellm_params,
-                    model_info=ModelInfoBody(mode=mode),
-                ),
+                json=body,
                 response_type=ModelNewResponse,
             )
         ).model_id
         written_at = time.monotonic()
-        self._await_model_servable(model_name)
+        self._await_model_servable(body.model_name, listed_for)
         settle_propagation(written_at)
         return model_id
 
-    def _await_model_servable(self, model_name: str) -> None:
+    def _await_model_servable(self, model_name: str, listed_for: str | None = None) -> None:
         """Block until the data plane lists `model_name`, or fail at model_servable_timeout."""
+        headers = self.transport.master if listed_for is None else self.transport.bearer(listed_for)
         outcome = await_servable(
             lambda poll_timeout: self.transport.get(
                 "/v1/models",
-                headers=self.transport.master,
+                headers=headers,
                 params=NoBody(),
                 response_type=ModelsListResponse,
                 timeout=poll_timeout,
@@ -531,19 +545,29 @@ def build_proxy_client(
     The endpoints are injectable for callers that resolve the proxy some other
     way than ``e2e_config``'s env names (see ``claude_code/_env.py``); they must
     pass all three together, since a caller that overrides only the data plane
-    would leave management calls pointed at the env default."""
+    would leave management calls pointed at the env default.
+
+    E2E_FIXTURE_MODE wraps (record) or replaces (replay) the transport here, so
+    every client built from this seam records or replays without changing shape;
+    unset it stays the plain SplitTransport (see fixture_transport.py)."""
+    split = SplitTransport(
+        data=HttpTransport(
+            base_url=base_url,
+            master_key=master_key,
+            request_timeout=REQUEST_TIMEOUT,
+        ),
+        control=HttpTransport(
+            base_url=control_plane_base_url,
+            master_key=master_key,
+            request_timeout=REQUEST_TIMEOUT,
+        ),
+    )
     return ProxyClient(
-        transport=SplitTransport(
-            data=HttpTransport(
-                base_url=base_url,
-                master_key=master_key,
-                request_timeout=REQUEST_TIMEOUT,
-            ),
-            control=HttpTransport(
-                base_url=control_plane_base_url,
-                master_key=master_key,
-                request_timeout=REQUEST_TIMEOUT,
-            ),
+        transport=select_transport(
+            split,
+            mode_raw=FIXTURE_MODE_RAW,
+            bundle_dir=FIXTURE_DIR,
+            master_key=master_key,
         ),
         poll_timeout=POLL_TIMEOUT,
         poll_interval=POLL_INTERVAL,
diff --git a/tests/e2e/test_fixture_bundle.py b/tests/e2e/test_fixture_bundle.py
new file mode 100644
index 00000000000..fd4cca6451f
--- /dev/null
+++ b/tests/e2e/test_fixture_bundle.py
@@ -0,0 +1,218 @@
+"""Harness coverage for the on-disk fixture bundle format (LIT-5729).
+
+No proxy and no ``e2e`` marker: these pin the bundle CONTRACT - the seven-day
+freshness gate that names the bundle's age, record mode's wipe safety (never
+delete a directory that is not a bundle), collision-free per-test slugs, and
+lossless Result round-trips - so replay can never silently drift from what
+record wrote.
+"""
+
+from __future__ import annotations
+
+from datetime import datetime, timedelta, timezone
+from pathlib import Path
+
+import pytest
+from pydantic import BaseModel
+
+from e2e_http import (
+    NetworkError,
+    RateLimitedError,
+    Result,
+    Success,
+    UnauthorizedError,
+    UnknownApiError,
+    ValidationError,
+)
+from fixture_bundle import (
+    BUNDLE_FORMAT_VERSION,
+    MANIFEST_FILENAME,
+    MAX_BUNDLE_AGE,
+    BundleRecorder,
+    FreshBundle,
+    LoadedBundle,
+    Manifest,
+    RecordedRequest,
+    RecordedResult,
+    StaleBundle,
+    UnreadableBundle,
+    UnsafeBundleDir,
+    check_freshness,
+    format_age,
+    from_result,
+    interaction_filename,
+    load_bundle,
+    prepare_bundle,
+    slug_for_test,
+    to_result,
+)
+
+NOW = datetime(2026, 8, 18, 12, 0, 0, tzinfo=timezone.utc)
+
+
+class Payload(BaseModel):
+    value: str
+
+
+def write_manifest(
+    root: Path, recorded_at: datetime, *, format_version: int = BUNDLE_FORMAT_VERSION
+) -> None:
+    root.mkdir(parents=True, exist_ok=True)
+    manifest = Manifest(
+        format_version=format_version, recorded_at=recorded_at, harness_version="abc1234"
+    )
+    (root / MANIFEST_FILENAME).write_text(manifest.model_dump_json(), encoding="utf-8")
+
+
+def prepared(root: Path) -> BundleRecorder:
+    recorder = prepare_bundle(root)
+    assert isinstance(recorder, BundleRecorder)
+    return recorder
+
+
+def plain_request(path: str) -> RecordedRequest:
+    return RecordedRequest(method="post", path=path, headers={})
+
+
+class TestResultRoundTrip:
+    @pytest.mark.parametrize(
+        "result",
+        [
+            Success(status_code=201, data=Payload(value="ok")),
+            NetworkError(message="connection refused"),
+            UnauthorizedError(),
+            RateLimitedError(retry_after_seconds=7, body="slow down"),
+            ValidationError(message="bad shape"),
+            UnknownApiError(status_code=502, body="upstream exploded"),
+        ],
+    )
+    def test_every_result_kind_survives_disk_and_back(self, result: Result[Payload]) -> None:
+        assert to_result(from_result(result), Payload) == result
+
+
+class TestFreshness:
+    def test_bundle_at_the_limit_is_still_fresh(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        write_manifest(root, NOW - MAX_BUNDLE_AGE)
+        assert isinstance(check_freshness(root, now=NOW), FreshBundle)
+
+    def test_stale_bundle_reports_age_and_limit(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        write_manifest(root, NOW - timedelta(days=8, hours=3))
+        freshness = check_freshness(root, now=NOW)
+        assert isinstance(freshness, StaleBundle)
+        assert freshness.age == timedelta(days=8, hours=3)
+        assert format_age(freshness.age) == "8d3h"
+        assert freshness.limit == MAX_BUNDLE_AGE
+
+    def test_naive_recorded_at_is_read_as_utc(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        write_manifest(root, (NOW - timedelta(days=1)).replace(tzinfo=None))
+        assert isinstance(check_freshness(root, now=NOW), FreshBundle)
+
+    def test_missing_manifest_is_unreadable_with_recording_hint(self, tmp_path: Path) -> None:
+        freshness = check_freshness(tmp_path / "absent", now=NOW)
+        assert isinstance(freshness, UnreadableBundle)
+        assert MANIFEST_FILENAME in freshness.reason
+        assert "E2E_FIXTURE_MODE=record" in freshness.reason
+
+    def test_corrupt_manifest_is_unreadable(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        root.mkdir()
+        (root / MANIFEST_FILENAME).write_text("{not json", encoding="utf-8")
+        assert isinstance(check_freshness(root, now=NOW), UnreadableBundle)
+
+    def test_unknown_format_version_is_unreadable(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        write_manifest(root, NOW, format_version=BUNDLE_FORMAT_VERSION + 1)
+        freshness = check_freshness(root, now=NOW)
+        assert isinstance(freshness, UnreadableBundle)
+        assert f"format_version {BUNDLE_FORMAT_VERSION + 1}" in freshness.reason
+
+
+class TestPrepareBundle:
+    def test_fresh_directory_gets_a_fresh_manifest(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        prepared(root)
+        freshness = check_freshness(root, now=datetime.now(timezone.utc))
+        assert isinstance(freshness, FreshBundle)
+        assert freshness.manifest.format_version == BUNDLE_FORMAT_VERSION
+        assert freshness.manifest.harness_version
+
+    def test_record_wipes_the_previous_bundle_instead_of_reading_it(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        prepared(root).record(
+            test_key="old.py::test_old",
+            request=plain_request("/stale"),
+            response=RecordedResult(kind="unauthorized"),
+        )
+        assert any(entry.is_dir() for entry in root.iterdir())
+        prepared(root)
+        assert {entry.name for entry in root.iterdir()} == {MANIFEST_FILENAME}
+
+    def test_refuses_to_wipe_a_directory_that_is_not_a_bundle(self, tmp_path: Path) -> None:
+        root = tmp_path / "precious"
+        root.mkdir()
+        (root / "notes.txt").write_text("keep me", encoding="utf-8")
+        outcome = prepare_bundle(root)
+        assert isinstance(outcome, UnsafeBundleDir)
+        assert MANIFEST_FILENAME in outcome.reason
+        assert (root / "notes.txt").read_text(encoding="utf-8") == "keep me"
+
+    def test_refuses_a_path_that_is_a_file(self, tmp_path: Path) -> None:
+        target = tmp_path / "not-a-dir"
+        target.write_text("x", encoding="utf-8")
+        outcome = prepare_bundle(target)
+        assert isinstance(outcome, UnsafeBundleDir)
+        assert "not a directory" in outcome.reason
+
+
+class TestSlugs:
+    def test_slug_for_test_is_deterministic(self) -> None:
+        key = "tests/e2e/suite/test_mod.py::TestX::test_case"
+        assert slug_for_test(key) == slug_for_test(key)
+
+    def test_same_tail_in_different_files_never_collides(self) -> None:
+        first = slug_for_test("tests/e2e/a/test_a.py::test_case")
+        second = slug_for_test("tests/e2e/b/test_b.py::test_case")
+        assert first != second
+        assert first.startswith("test_case-")
+        assert second.startswith("test_case-")
+
+    def test_interaction_filename_orders_and_slugs(self) -> None:
+        request = RecordedRequest(method="post", path="/chat/completions", headers={})
+        assert interaction_filename(3, request) == "0003-post-chat-completions.json"
+
+
+class TestRecordAndLoad:
+    def test_load_returns_interactions_in_recorded_order(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        recorder = prepared(root)
+        key = "suite/test_mod.py::test_ordered"
+        for path in ("/first", "/second", "/third"):
+            recorder.record(
+                test_key=key,
+                request=plain_request(path),
+                response=RecordedResult(kind="unauthorized"),
+            )
+        loaded = load_bundle(root)
+        assert isinstance(loaded, LoadedBundle)
+        assert [
+            interaction.request.path for interaction in loaded.interactions[slug_for_test(key)]
+        ] == ["/first", "/second", "/third"]
+
+    def test_interactions_group_per_test(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        recorder = prepared(root)
+        for key in ("suite/test_a.py::test_one", "suite/test_b.py::test_two"):
+            recorder.record(
+                test_key=key,
+                request=plain_request(f"/{key[-3:]}"),
+                response=RecordedResult(kind="unauthorized"),
+            )
+        loaded = load_bundle(root)
+        assert isinstance(loaded, LoadedBundle)
+        assert set(loaded.interactions) == {
+            slug_for_test("suite/test_a.py::test_one"),
+            slug_for_test("suite/test_b.py::test_two"),
+        }
diff --git a/tests/e2e/test_fixture_canonical.py b/tests/e2e/test_fixture_canonical.py
new file mode 100644
index 00000000000..30c57dc3ac6
--- /dev/null
+++ b/tests/e2e/test_fixture_canonical.py
@@ -0,0 +1,163 @@
+"""Harness coverage for canonical request identity (LIT-5741).
+
+No proxy and no ``e2e`` marker: pure functions over ``RecordedRequest``. Pins
+the two failure modes match keys must avoid: keying on volatile material so
+nothing ever matches (markers, virtual keys, ids, timestamps, volatile
+headers), and keying on too little so different requests collide and a test
+silently asserts against another request's response.
+"""
+
+from __future__ import annotations
+
+import pytest
+from pydantic import JsonValue
+
+from fixture_bundle import RecordedRequest
+from fixture_canonical import CanonicalRequest, canonical_string, canonicalize, is_secret_field
+
+
+def request(
+    method: str = "post",
+    path: str = "/chat/completions",
+    *,
+    headers: dict[str, str] | None = None,
+    params: dict[str, str] | None = None,
+    body: JsonValue | None = None,
+    form: dict[str, str] | None = None,
+    file_name: str | None = None,
+    file_sha256: str | None = None,
+    file_bytes: int | None = None,
+) -> RecordedRequest:
+    return RecordedRequest(
+        method=method,
+        path=path,
+        headers=headers or {},
+        params=params or {},
+        body=body,
+        form=form,
+        file_name=file_name,
+        file_sha256=file_sha256,
+        file_bytes=file_bytes,
+    )
+
+
+class TestPlaceholders:
+    @pytest.mark.parametrize(
+        ("raw", "expected"),
+        [
+            ("Reply ok. 4d5152a995b7", "Reply ok. <marker>"),
+            ("e2e-chat-stream-4d5152a995b7", "e2e-chat-stream-<marker>"),
+            ("sk-3mCXCTGmYuEEIU2i2qmVE3Xq6tSK1O0X6ZIRP1Lpw8ZlbNjt", "<key>"),
+            ("9f1c8a2e-4b3d-4f6a-8f2f-0a1b2c3d4e5f", "<uuid>"),
+            ("z" * 64, "z" * 64),
+            ("0123456789abcdef" * 4, "<sha256>"),
+            ("2026-08-19T20:57:13.363499+00:00", "<timestamp>"),
+            ("2026-08-19", "<date>"),
+            ("chatcmpl-C0LO6rRkfJlpJ2mqW9BHYo4Sm8FWl", "<id>"),
+            ("batch_688a8b7f9a08819096e0f7c88fcd07c5", "<id>"),
+            ("file-XyZ12345abc", "<id>"),
+            ("gpt-4o-mini", "gpt-4o-mini"),
+            ("max_tokens", "max_tokens"),
+            ("sk-1234", "sk-1234"),
+        ],
+    )
+    def test_rewrites_exactly_the_volatile_shapes(self, raw: str, expected: str) -> None:
+        assert canonical_string(raw) == expected
+
+
+class TestSecretFields:
+    @pytest.mark.parametrize(
+        ("name", "secret"),
+        [
+            ("api_key", True),
+            ("openai_api_key", True),
+            ("aws_secret_access_key", True),
+            ("aws_session_token", True),
+            ("vertex_credentials", True),
+            ("static_headers", True),
+            ("langfuse_secret_key", True),
+            ("model", False),
+            ("max_completion_tokens", False),
+            ("api_base", False),
+        ],
+    )
+    def test_names_that_carry_credentials(self, name: str, secret: bool) -> None:
+        assert is_secret_field(name) is secret
+
+
+class TestKeyStability:
+    def test_volatile_material_does_not_change_the_key(self) -> None:
+        """Acceptance: a suite recorded on one machine (fresh keys, that day's
+        dates, that run's markers) replays on another with no misses."""
+        first = request(
+            headers={"authorization": "Bearer sk-run-one-aaaaaaaaaaaaaaaa", "x-request-id": "req-1"},
+            params={"start_date": "2026-08-18"},
+            body={
+                "model": "e2e-chat-4d5152a995b7",
+                "messages": [{"role": "user", "content": "Reply ok. 4d5152a995b7"}],
+                "api_key": "sk-live-one-aaaaaaaaaaaaaaaa",
+            },
+        )
+        second = request(
+            headers={"authorization": "Bearer sk-run-two-bbbbbbbbbbbbbbbb", "x-request-id": "req-2"},
+            params={"start_date": "2026-08-19"},
+            body={
+                "model": "e2e-chat-1a2b3c4d5e6f",
+                "messages": [{"role": "user", "content": "Reply ok. 1a2b3c4d5e6f"}],
+                "api_key": "os.environ/OPENAI_API_KEY",
+            },
+        )
+        assert canonicalize(first).key == canonicalize(second).key
+
+    def test_serialization_order_is_not_identity(self) -> None:
+        ordered = request(body={"model": "m", "stream": True})
+        reversed_order = request(body={"stream": True, "model": "m"})
+        assert canonicalize(ordered).key == canonicalize(reversed_order).key
+
+    def test_generated_ids_in_the_path_do_not_change_the_key(self) -> None:
+        first = request("get", "/v1/batches/batch_688a8b7f9a08819096e0f7c88fcd07c5")
+        second = request("get", "/v1/batches/batch_770b9c8f0b19920107f1f8d99fde18d6")
+        assert canonicalize(first).key == canonicalize(second).key
+
+
+class TestKeyDistinctness:
+    def test_requests_differing_only_inside_canonicalized_fields_stay_distinct(self) -> None:
+        """Acceptance: a naive verb+path hash collides these; the content key
+        must not, or one test silently asserts against the other's response."""
+        first = request(body={"messages": [{"content": "Reply ok. 4d5152a995b7"}]})
+        second = request(body={"messages": [{"content": "Count to three. 4d5152a995b7"}]})
+        naive = (first.method, first.path)
+        assert naive == (second.method, second.path)
+        assert canonicalize(first).key != canonicalize(second).key
+
+    def test_a_kept_header_is_identity(self) -> None:
+        first = request(headers={"x-litellm-tags": "prod"})
+        second = request(headers={"x-litellm-tags": "shadow"})
+        assert canonicalize(first).key != canonicalize(second).key
+
+    def test_a_volatile_header_is_not_identity(self) -> None:
+        first = request(headers={"traceparent": "00-aa-bb-01", "x-api-key": "one"})
+        second = request(headers={"traceparent": "00-cc-dd-01", "x-api-key": "two"})
+        assert canonicalize(first).key == canonicalize(second).key
+
+    def test_secret_set_versus_unset_stays_distinct(self) -> None:
+        with_key = request(body={"api_key": "sk-live-aaaaaaaaaaaaaaaa"})
+        without_key = request(body={"api_key": None})
+        assert canonicalize(with_key).key != canonicalize(without_key).key
+
+    def test_file_content_is_identity(self) -> None:
+        first = request(
+            "upload", "/v1/files", file_name="batch.jsonl", file_sha256="a" * 64, file_bytes=10
+        )
+        second = request(
+            "upload", "/v1/files", file_name="batch.jsonl", file_sha256="b" * 64, file_bytes=10
+        )
+        assert canonicalize(first).key != canonicalize(second).key
+
+
+class TestKeyShape:
+    def test_key_names_method_path_and_digest(self) -> None:
+        canonical = canonicalize(request("post", "/model/new", body={"model_name": "m"}))
+        assert isinstance(canonical, CanonicalRequest)
+        assert canonical.key.startswith("post /model/new #")
+        assert len(canonical.key.rsplit("#", 1)[1]) == 16
diff --git a/tests/e2e/test_fixture_transport.py b/tests/e2e/test_fixture_transport.py
new file mode 100644
index 00000000000..e61088d841c
--- /dev/null
+++ b/tests/e2e/test_fixture_transport.py
@@ -0,0 +1,676 @@
+"""Harness coverage for the record/replay transports (LIT-5729).
+
+No proxy and no ``e2e`` marker. A fake in-memory ``Transport`` stands in for
+the live one (dependency injection, no monkeypatching): recording must pass
+every value through unchanged while writing one redacted interaction file per
+call, and replay must serve identical values from the bundle alone - the
+fake's call log proves nothing reaches the inner transport - failing hard
+(``ReplayMiss``) on any content drift, printing the computed canonical key and
+the closest recorded key (LIT-5741; the pure canonicalizer is pinned in
+test_fixture_canonical.py). The collection-time gate and report header are
+pinned here too, including the stale message that names the bundle's age.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import sys
+import threading
+from concurrent.futures import ThreadPoolExecutor
+from dataclasses import dataclass, field
+from datetime import datetime, timedelta, timezone
+from pathlib import Path
+from uuid import uuid4
+
+import pytest
+from pydantic import BaseModel
+
+from e2e_http import (
+    AuthHeaders,
+    BinaryStream,
+    ProbeResult,
+    Result,
+    StreamingResponse,
+    Success,
+)
+from fixture_bundle import (
+    BUNDLE_FORMAT_VERSION,
+    MANIFEST_FILENAME,
+    BundleRecorder,
+    Interaction,
+    LoadedBundle,
+    Manifest,
+    RecordedResult,
+    load_bundle,
+    prepare_bundle,
+    slug_for_test,
+)
+from fixture_canonical import canonicalize
+from fixture_transport import (
+    InvalidFixtureMode,
+    RecordingTransport,
+    ReplayMiss,
+    ReplaySource,
+    ReplayTransport,
+    current_test_key,
+    deterministic_marker,
+    fixture_mode_collection_error,
+    fixture_report_lines,
+    parse_fixture_mode,
+    recorded_request,
+    replay_leftover_error,
+    select_transport,
+)
+from transport import Transport
+
+NOW = datetime(2026, 8, 18, 12, 0, 0, tzinfo=timezone.utc)
+
+
+class Payload(BaseModel):
+    value: str
+
+
+class Body(BaseModel):
+    prompt: str
+
+
+class Query(BaseModel):
+    q: str
+
+
+class DeployParams(BaseModel):
+    model: str
+    api_key: str | None = None
+    aws_secret_access_key: str | None = None
+
+
+class DeployBody(BaseModel):
+    model_name: str
+    litellm_params: DeployParams
+
+
+STREAMING = StreamingResponse(
+    status_code=200,
+    body="",
+    content_type="text/event-stream",
+    chunks=2,
+    stream_events=["one", "two"],
+    stream_done=True,
+)
+BINARY = BinaryStream(status_code=200, content_type="audio/mpeg", chunk_count=3, total_bytes=42)
+PROBE = ProbeResult(status_code=200, body="alive")
+
+
+@dataclass
+class FakeTransport:
+    calls: list[str] = field(default_factory=list)
+
+    def bearer(self, key: str) -> AuthHeaders:
+        return AuthHeaders(authorization=f"Bearer {key}")
+
+    @property
+    def master(self) -> AuthHeaders:
+        return self.bearer("sk-fake-master")
+
+    def _success[R: BaseModel](self, response_type: type[R]) -> Result[R]:
+        return Success(status_code=200, data=response_type.model_validate({"value": "live"}))
+
+    def post[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        self.calls.append(f"post {path}")
+        return self._success(response_type)
+
+    def get[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        params: BaseModel,
+        response_type: type[R],
+        timeout: float | None = None,
+    ) -> Result[R]:
+        self.calls.append(f"get {path}")
+        return self._success(response_type)
+
+    def delete[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        json: BaseModel,
+        response_type: type[R],
+        params: BaseModel | None = None,
+    ) -> Result[R]:
+        self.calls.append(f"delete {path}")
+        return self._success(response_type)
+
+    def patch[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        self.calls.append(f"patch {path}")
+        return self._success(response_type)
+
+    def put[R: BaseModel](
+        self, path: str, *, headers: BaseModel, json: BaseModel, response_type: type[R]
+    ) -> Result[R]:
+        self.calls.append(f"put {path}")
+        return self._success(response_type)
+
+    def stream(self, path: str, *, headers: BaseModel, json: BaseModel) -> StreamingResponse:
+        self.calls.append(f"stream {path}")
+        return STREAMING
+
+    def stream_binary(
+        self, path: str, *, headers: BaseModel, json: BaseModel, chunk_size: int = 8192
+    ) -> BinaryStream:
+        self.calls.append(f"stream_binary {path}")
+        return BINARY
+
+    def send(
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        json: BaseModel,
+        params: BaseModel | None = None,
+        stream: bool = False,
+    ) -> StreamingResponse:
+        self.calls.append(f"send {path}")
+        return STREAMING
+
+    def probe(self, path: str, *, params: BaseModel) -> ProbeResult:
+        self.calls.append(f"probe {path}")
+        return PROBE
+
+    def upload[R: BaseModel](
+        self,
+        path: str,
+        *,
+        headers: BaseModel,
+        form: BaseModel,
+        filename: str,
+        content: bytes,
+        file_content_type: str = "application/jsonl",
+        file_field: str = "file",
+        params: BaseModel | None = None,
+        response_type: type[R],
+    ) -> Result[R]:
+        self.calls.append(f"upload {path}")
+        return self._success(response_type)
+
+    def download(self, path: str, *, headers: BaseModel) -> StreamingResponse:
+        self.calls.append(f"download {path}")
+        return STREAMING
+
+
+def make_recorder(root: Path) -> BundleRecorder:
+    recorder = prepare_bundle(root)
+    assert isinstance(recorder, BundleRecorder)
+    return recorder
+
+
+def replay_source(root: Path) -> ReplaySource:
+    loaded = load_bundle(root)
+    assert isinstance(loaded, LoadedBundle)
+    return ReplaySource(bundle=loaded)
+
+
+def this_tests_files(root: Path) -> list[Path]:
+    slug_dir = root / slug_for_test(current_test_key())
+    return sorted(slug_dir.glob("*.json")) if slug_dir.is_dir() else []
+
+
+def write_manifest(root: Path, recorded_at: datetime) -> None:
+    root.mkdir(parents=True, exist_ok=True)
+    manifest = Manifest(
+        format_version=BUNDLE_FORMAT_VERSION, recorded_at=recorded_at, harness_version="abc1234"
+    )
+    (root / MANIFEST_FILENAME).write_text(manifest.model_dump_json(), encoding="utf-8")
+
+
+class TestParseFixtureMode:
+    @pytest.mark.parametrize(
+        ("raw", "expected"),
+        [("live", "live"), ("record", "record"), ("replay", "replay"), ("", "live"), ("  REPLAY  ", "replay")],
+    )
+    def test_known_values_normalize(self, raw: str, expected: str) -> None:
+        assert parse_fixture_mode(raw) == expected
+
+    def test_unknown_value_is_invalid_with_the_original_spelling(self) -> None:
+        assert parse_fixture_mode("cached") == InvalidFixtureMode(value="cached")
+
+
+class TestDeterministicMarker:
+    def test_sequence_is_a_pure_function_of_test_and_ordinal(self) -> None:
+        """A replay process must regenerate exactly the markers the record
+        process generated, so the Nth marker of a test is pinned to a pure
+        function of the node id and N."""
+        key = current_test_key()
+        assert deterministic_marker() == hashlib.sha1(f"{key}#0".encode()).hexdigest()[:12]
+        assert deterministic_marker() == hashlib.sha1(f"{key}#1".encode()).hexdigest()[:12]
+
+
+class TestCurrentTestKey:
+    def test_names_this_test_and_strips_the_phase(self) -> None:
+        key = current_test_key()
+        assert key.endswith("TestCurrentTestKey::test_names_this_test_and_strips_the_phase")
+        assert "(call)" not in key
+
+
+class TestRecordingTransport:
+    def test_passes_the_result_through_and_writes_one_file_per_call(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        result = recording.post(
+            "/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload
+        )
+        assert result == Success(status_code=200, data=Payload(value="live"))
+        assert fake.calls == ["post /model/new"]
+        files = this_tests_files(root)
+        assert [file.name for file in files] == ["0000-post-model-new.json"]
+        interaction = Interaction.model_validate_json(files[0].read_text(encoding="utf-8"))
+        assert interaction.request.method == "post"
+        assert interaction.request.path == "/model/new"
+
+    def test_redacts_auth_header_values_in_the_recorded_request(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        headers = AuthHeaders.model_validate(
+            {"authorization": "Bearer sk-secret", "x-litellm-api-key": "sk-other"}
+        )
+        recording.post("/key/generate", headers=headers, json=Body(prompt="x"), response_type=Payload)
+        interaction = Interaction.model_validate_json(
+            this_tests_files(root)[0].read_text(encoding="utf-8")
+        )
+        assert interaction.request.headers == {
+            "authorization": "<redacted>",
+            "x-litellm-api-key": "<redacted>",
+        }
+        assert "sk-secret" not in this_tests_files(root)[0].read_text(encoding="utf-8")
+
+    def test_redacts_credential_body_fields_in_the_recorded_request(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post(
+            "/model/new",
+            headers=fake.master,
+            json=DeployBody(
+                model_name="m",
+                litellm_params=DeployParams(model="openai/gpt", api_key="sk-live-provider-secret-123456"),
+            ),
+            response_type=Payload,
+        )
+        raw = this_tests_files(root)[0].read_text(encoding="utf-8")
+        interaction = Interaction.model_validate_json(raw)
+        assert "sk-live-provider-secret-123456" not in raw
+        assert isinstance(interaction.request.body, dict)
+        params = interaction.request.body["litellm_params"]
+        assert isinstance(params, dict)
+        assert params["api_key"] == "<redacted>"
+        assert params["aws_secret_access_key"] is None
+
+    def test_upload_records_a_content_digest_not_the_bytes(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.upload(
+            "/v1/files",
+            headers=fake.master,
+            form=Query(q="batch"),
+            filename="batch.jsonl",
+            content=b'{"custom_id": "1"}',
+            response_type=Payload,
+        )
+        interaction = Interaction.model_validate_json(
+            this_tests_files(root)[0].read_text(encoding="utf-8")
+        )
+        assert interaction.request.file_name == "batch.jsonl"
+        assert interaction.request.file_bytes == len(b'{"custom_id": "1"}')
+        assert interaction.request.file_sha256 is not None
+        assert "custom_id" not in interaction.request.model_dump_json()
+
+
+class TestReplayTransport:
+    def test_serves_recorded_values_without_touching_the_inner_transport(
+        self, tmp_path: Path
+    ) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recorded_post = recording.post(
+            "/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload
+        )
+        recorded_get = recording.get(
+            "/v1/models", headers=fake.master, params=Query(q="all"), response_type=Payload
+        )
+        recorded_stream = recording.stream(
+            "/chat/completions", headers=fake.master, json=Body(prompt="hi")
+        )
+        recorded_probe = recording.probe("/health/liveliness", params=Query(q="1"))
+        recorded_binary = recording.stream_binary(
+            "/v1/audio/speech", headers=fake.master, json=Body(prompt="say")
+        )
+        calls_after_record = list(fake.calls)
+
+        replay: Transport = ReplayTransport(source=replay_source(root), master_key="sk-1234")
+        assert (
+            replay.post("/model/new", headers=replay.master, json=Body(prompt="x"), response_type=Payload)
+            == recorded_post
+        )
+        assert (
+            replay.get("/v1/models", headers=replay.master, params=Query(q="all"), response_type=Payload)
+            == recorded_get
+        )
+        assert (
+            replay.stream("/chat/completions", headers=replay.master, json=Body(prompt="hi"))
+            == recorded_stream
+        )
+        assert replay.probe("/health/liveliness", params=Query(q="1")) == recorded_probe
+        assert (
+            replay.stream_binary("/v1/audio/speech", headers=replay.master, json=Body(prompt="say"))
+            == recorded_binary
+        )
+        assert fake.calls == calls_after_record
+
+    def test_miss_names_the_computed_key_and_the_closest_recorded_key(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post("/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload)
+        replay: Transport = ReplayTransport(source=replay_source(root), master_key="sk-1234")
+        with pytest.raises(ReplayMiss) as excinfo:
+            replay.get("/v1/models", headers=replay.master, params=Query(q="all"), response_type=Payload)
+        message = str(excinfo.value)
+        assert "no recorded interaction matches key get /v1/models #" in message
+        assert "closest recorded key is post /model/new #" in message
+        assert "0000-post-model-new.json" in message
+        assert "re-record with E2E_FIXTURE_MODE=record" in message
+
+    def test_content_drift_on_the_same_route_misses_with_no_live_call(self, tmp_path: Path) -> None:
+        """The naive verb+path match replayed a stale response for a request
+        whose content had changed, silently passing; a content key must miss,
+        print both canonical forms' diff, and never reach the inner transport."""
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post("/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload)
+        calls_after_record = list(fake.calls)
+        replay: Transport = ReplayTransport(source=replay_source(root), master_key="sk-1234")
+        with pytest.raises(ReplayMiss) as excinfo:
+            replay.post("/model/new", headers=replay.master, json=Body(prompt="y"), response_type=Payload)
+        message = str(excinfo.value)
+        assert "no recorded interaction matches key post /model/new #" in message
+        assert "closest recorded key is post /model/new #" in message
+        assert '-    "prompt": "x"' in message
+        assert '+    "prompt": "y"' in message
+        assert fake.calls == calls_after_record
+
+    def test_exhausted_key_names_the_key(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post("/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload)
+        replay: Transport = ReplayTransport(source=replay_source(root), master_key="sk-1234")
+        replay.post("/model/new", headers=replay.master, json=Body(prompt="x"), response_type=Payload)
+        with pytest.raises(
+            ReplayMiss, match=r"every recorded interaction for key post /model/new #\w{16} is already consumed"
+        ):
+            replay.post("/model/new", headers=replay.master, json=Body(prompt="x"), response_type=Payload)
+
+    def test_replays_out_of_recorded_order_across_distinct_keys(self, tmp_path: Path) -> None:
+        """Concurrent tests interleave independent calls nondeterministically
+        (e.g. a burst of parallel chat calls), so replay matches by content,
+        never by recorded position."""
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post("/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload)
+        recording.post("/key/generate", headers=fake.master, json=Body(prompt="k"), response_type=Payload)
+        source = replay_source(root)
+        replay: Transport = ReplayTransport(source=source, master_key="sk-1234")
+        replay.post("/key/generate", headers=replay.master, json=Body(prompt="k"), response_type=Payload)
+        replay.post("/model/new", headers=replay.master, json=Body(prompt="x"), response_type=Payload)
+        assert source.leftover_error(current_test_key()) is None
+
+    def test_identical_requests_replay_their_responses_in_recorded_order(self, tmp_path: Path) -> None:
+        """A poll loop makes the same request repeatedly and asserts on the
+        progression, so duplicates under one key stay FIFO."""
+        root = tmp_path / "bundle"
+        recorder = make_recorder(root)
+        recorder.record(
+            test_key=current_test_key(),
+            request=recorded_request(
+                "get", "/v1/models", headers=AuthHeaders(authorization="Bearer sk-x"), params=Query(q="all")
+            ),
+            response=RecordedResult(kind="success", status_code=200, data={"value": "first"}),
+        )
+        recorder.record(
+            test_key=current_test_key(),
+            request=recorded_request(
+                "get", "/v1/models", headers=AuthHeaders(authorization="Bearer sk-x"), params=Query(q="all")
+            ),
+            response=RecordedResult(kind="success", status_code=200, data={"value": "second"}),
+        )
+        replay: Transport = ReplayTransport(source=replay_source(root), master_key="sk-1234")
+        first = replay.get("/v1/models", headers=replay.master, params=Query(q="all"), response_type=Payload)
+        second = replay.get("/v1/models", headers=replay.master, params=Query(q="all"), response_type=Payload)
+        assert first == Success(status_code=200, data=Payload(value="first"))
+        assert second == Success(status_code=200, data=Payload(value="second"))
+
+    def test_concurrent_replays_of_one_key_serve_each_recording_exactly_once(self, tmp_path: Path) -> None:
+        """A burst of parallel identical calls consumes one shared pool: no
+        response duplicated, none forgotten, nothing left over at teardown.
+        The tiny switch interval forces thread preemption inside pool setup
+        and consumption, so a non-atomic pool build or pop fails this test."""
+        root = tmp_path / "bundle"
+        recorder = make_recorder(root)
+        for ordinal in range(32):
+            recorder.record(
+                test_key=current_test_key(),
+                request=recorded_request(
+                    "get", "/v1/models", headers=AuthHeaders(authorization="Bearer sk-x"), params=Query(q="all")
+                ),
+                response=RecordedResult(kind="success", status_code=200, data={"value": f"v{ordinal:02d}"}),
+            )
+        source = replay_source(root)
+        replay: Transport = ReplayTransport(source=source, master_key="sk-1234")
+        barrier = threading.Barrier(8)
+
+        def consume_one() -> str:
+            result = replay.get(
+                "/v1/models", headers=replay.master, params=Query(q="all"), response_type=Payload
+            )
+            assert isinstance(result, Success)
+            return result.data.value
+
+        def consume(_: int) -> tuple[str, ...]:
+            barrier.wait()
+            return tuple(consume_one() for _call in range(4))
+
+        previous_interval = sys.getswitchinterval()
+        sys.setswitchinterval(1e-6)
+        try:
+            with ThreadPoolExecutor(max_workers=8) as executor:
+                served = sorted(value for values in executor.map(consume, range(8)) for value in values)
+        finally:
+            sys.setswitchinterval(previous_interval)
+        assert served == [f"v{ordinal:02d}" for ordinal in range(32)]
+        assert source.leftover_error(current_test_key()) is None
+
+
+class TestRecordedKeySets:
+    def test_two_separate_recordings_of_one_flow_produce_identical_key_sets(
+        self, tmp_path: Path
+    ) -> None:
+        """Everything a run randomizes (markers, virtual keys, dates) must
+        canonicalize out, so separately recorded runs of the same suite agree
+        on every match key and a bundle recorded elsewhere replays here."""
+
+        def record_flow(root: Path, run_date: str) -> list[str]:
+            fake = FakeTransport()
+            recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+            marker = deterministic_marker()
+            recording.post(
+                "/model/new",
+                headers=fake.master,
+                json=DeployBody(
+                    model_name=f"e2e-chat-{marker}",
+                    litellm_params=DeployParams(model="openai/gpt", api_key=f"sk-live-{uuid4().hex}"),
+                ),
+                response_type=Payload,
+            )
+            recording.post(
+                "/chat/completions",
+                headers=recording.bearer(f"sk-{uuid4().hex}"),
+                json=Body(prompt=f"Reply with the single word ok. {marker}"),
+                response_type=Payload,
+            )
+            recording.get(
+                "/spend/logs", headers=fake.master, params=Query(q=run_date), response_type=Payload
+            )
+            loaded = load_bundle(root)
+            assert isinstance(loaded, LoadedBundle)
+            return sorted(
+                canonicalize(interaction.request).key
+                for interactions in loaded.interactions.values()
+                for interaction in interactions
+            )
+
+        first_keys = record_flow(tmp_path / "one", "2026-08-18")
+        second_keys = record_flow(tmp_path / "two", "2026-08-19")
+        assert first_keys == second_keys
+        assert len(first_keys) == 3
+
+
+class TestReplayLeftover:
+    def test_fully_consumed_recording_leaves_nothing(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post("/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload)
+        source = replay_source(root)
+        replay: Transport = ReplayTransport(source=source, master_key="sk-1234")
+        replay.post("/model/new", headers=replay.master, json=Body(prompt="x"), response_type=Payload)
+        assert source.leftover_error(current_test_key()) is None
+
+    def test_unconsumed_trailing_interactions_name_the_next_call(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post("/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload)
+        recording.probe("/health/liveliness", params=Query(q="1"))
+        source = replay_source(root)
+        replay: Transport = ReplayTransport(source=source, master_key="sk-1234")
+        replay.post("/model/new", headers=replay.master, json=Body(prompt="x"), response_type=Payload)
+        error = source.leftover_error(current_test_key())
+        assert error is not None
+        assert "1 of 2 recorded interactions never consumed" in error
+        assert "e.g. probe /health/liveliness #" in error
+        assert "re-record with E2E_FIXTURE_MODE=record" in error
+
+    def test_test_without_recordings_has_no_leftover(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        make_recorder(root)
+        assert replay_source(root).leftover_error("suite.py::test_never_recorded") is None
+
+    def test_inert_outside_replay_mode(self, tmp_path: Path) -> None:
+        missing = tmp_path / "missing"
+        assert replay_leftover_error(mode_raw="", bundle_dir=missing, test_key="k") is None
+        assert replay_leftover_error(mode_raw="record", bundle_dir=missing, test_key="k") is None
+
+    def test_replay_mode_reads_the_shared_bundle(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        recording: Transport = RecordingTransport(inner=fake, recorder=make_recorder(root))
+        recording.post("/model/new", headers=fake.master, json=Body(prompt="x"), response_type=Payload)
+        error = replay_leftover_error(mode_raw="replay", bundle_dir=root, test_key=current_test_key())
+        assert error is not None
+        assert "1 of 1 recorded interactions never consumed" in error
+
+
+class TestSelectTransport:
+    def test_live_returns_the_live_transport_untouched(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        for mode_raw in ("live", ""):
+            assert (
+                select_transport(fake, mode_raw=mode_raw, bundle_dir=tmp_path / "b", master_key="sk")
+                is fake
+            )
+
+    def test_record_wraps_live_and_starts_a_fresh_bundle(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        write_manifest(root, NOW - timedelta(days=30))
+        (root / "old-test-slug").mkdir()
+        (root / "old-test-slug" / "0000-post-old.json").write_text("{}", encoding="utf-8")
+        selected = select_transport(fake, mode_raw="record", bundle_dir=root, master_key="sk")
+        assert isinstance(selected, RecordingTransport)
+        assert selected.inner is fake
+        assert {entry.name for entry in root.iterdir()} == {MANIFEST_FILENAME}
+
+    def test_replay_builds_a_transport_from_the_bundle_alone(self, tmp_path: Path) -> None:
+        fake = FakeTransport()
+        root = tmp_path / "bundle"
+        make_recorder(root)
+        selected = select_transport(fake, mode_raw="replay", bundle_dir=root, master_key="sk-master")
+        assert isinstance(selected, ReplayTransport)
+        assert selected.master == AuthHeaders(authorization="Bearer sk-master")
+
+    def test_invalid_mode_raises_naming_the_value(self, tmp_path: Path) -> None:
+        with pytest.raises(ValueError, match="cached"):
+            select_transport(
+                FakeTransport(), mode_raw="cached", bundle_dir=tmp_path / "b", master_key="sk"
+            )
+
+
+class TestCollectionGate:
+    def test_invalid_mode_names_the_value_and_the_choices(self, tmp_path: Path) -> None:
+        assert (
+            fixture_mode_collection_error("cached", tmp_path, now=NOW)
+            == "E2E_FIXTURE_MODE='cached' is not one of live, record, replay"
+        )
+
+    @pytest.mark.parametrize("mode_raw", ["live", "", "record"])
+    def test_live_and_record_never_block_collection(self, mode_raw: str, tmp_path: Path) -> None:
+        assert fixture_mode_collection_error(mode_raw, tmp_path / "missing", now=NOW) is None
+
+    def test_replay_with_no_bundle_says_how_to_record_one(self, tmp_path: Path) -> None:
+        reason = fixture_mode_collection_error("replay", tmp_path / "missing", now=NOW)
+        assert reason is not None
+        assert f"no {MANIFEST_FILENAME}" in reason
+        assert "E2E_FIXTURE_MODE=record" in reason
+
+    def test_stale_replay_bundle_fails_naming_its_age(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        write_manifest(root, NOW - timedelta(days=9, hours=5))
+        reason = fixture_mode_collection_error("replay", root, now=NOW)
+        assert reason is not None
+        assert "age 9d5h exceeds the 7-day limit" in reason
+        assert "re-record with E2E_FIXTURE_MODE=record" in reason
+
+    def test_fresh_replay_bundle_collects(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        write_manifest(root, NOW - timedelta(days=2))
+        assert fixture_mode_collection_error("replay", root, now=NOW) is None
+
+
+class TestReportHeader:
+    def test_live_mode_prints_nothing(self, tmp_path: Path) -> None:
+        assert fixture_report_lines("live", tmp_path, now=NOW) == []
+        assert fixture_report_lines("", tmp_path, now=NOW) == []
+
+    def test_record_and_replay_name_the_bundle(self, tmp_path: Path) -> None:
+        root = tmp_path / "bundle"
+        recorded_at = NOW - timedelta(days=1)
+        write_manifest(root, recorded_at)
+        assert fixture_report_lines("record", root, now=NOW) == [
+            f"e2e fixture mode: record -> {root}"
+        ]
+        replay_lines = fixture_report_lines("replay", root, now=NOW)
+        assert len(replay_lines) == 1
+        assert "replay" in replay_lines[0]
+        assert recorded_at.isoformat() in replay_lines[0]
diff --git a/tests/test_litellm/batches/test_batch_utils.py b/tests/test_litellm/batches/test_batch_utils.py
index 50f1380a4f8..ebe093c591c 100644
--- a/tests/test_litellm/batches/test_batch_utils.py
+++ b/tests/test_litellm/batches/test_batch_utils.py
@@ -150,13 +150,13 @@ def test_parse_jsonl_empty_content_is_empty_list():
     assert bu._get_file_content_as_dictionary(b"") == []
 
 
-def test_parse_jsonl_malformed_raises():
-    with pytest.raises(Exception):
-        bu._get_file_content_as_dictionary(b"not valid json")
+def test_parse_jsonl_malformed_lines_skipped():
+    content = b'{"a": 1}\nnot valid json\n{"b": 2}\n'
+    assert bu._get_file_content_as_dictionary(content) == [{"a": 1}, {"b": 2}]
 
 
 # =========================================================================== #
-# _iter_batch_input_lines / _iter_batch_input_entries  (JSONL parsing)
+# _iter_batch_input_lines / _iter_batch_output_entries  (JSONL parsing)
 # =========================================================================== #
 
 
@@ -173,19 +173,22 @@ def test_iter_input_lines_empty():
     assert list(bu._iter_batch_input_lines(b"")) == []
 
 
-def test_iter_input_entries_parses_each_row():
+def test_iter_output_entries_parses_each_row():
     content = b'{"body": {"model": "gpt-4o"}}\n{"body": {"model": "claude-3"}}\n'
-    assert list(bu._iter_batch_input_entries(content)) == [
+    assert list(bu._iter_batch_output_entries(content)) == [
         {"body": {"model": "gpt-4o"}},
         {"body": {"model": "claude-3"}},
     ]
 
 
-def test_iter_input_entries_raises_on_malformed_line():
-    # _iter_batch_input_entries raises on a bad row; callers that must survive
-    # bad rows iterate _iter_batch_input_lines and parse per-row instead.
-    with pytest.raises(Exception):
-        list(bu._iter_batch_input_entries(b'{"ok":1}\nnot-json\n'))
+def test_iter_output_entries_skips_malformed_and_non_object_lines():
+    content = b'{"ok": 1}\nnot-json\n[1, 2]\n{"ok": 2}\n'
+    assert list(bu._iter_batch_output_entries(content)) == [{"ok": 1}, {"ok": 2}]
+
+
+def test_iter_output_entries_skips_undecodable_line():
+    content = b'{"ok": 1}\n{"note": "\xff-bad"}\n{"ok": 2}\n'
+    assert list(bu._iter_batch_output_entries(content)) == [{"ok": 1}, {"ok": 2}]
 
 
 # =========================================================================== #
@@ -471,6 +474,25 @@ def test_cost_from_content_completion_cost_path(monkeypatch):
     assert len(calls) == 2  # failed row not costed
 
 
+def test_empty_body_line_does_not_zero_whole_batch():
+    """A status-200 row with an empty body makes litellm.completion_cost raise;
+    that line must be skipped instead of zeroing the whole batch."""
+    rows = [
+        _success_row(usage=_usage(10, 5)),
+        {
+            "custom_id": "request-poison-empty",
+            "response": {"status_code": 200, "request_id": "inject-empty-body", "body": {}},
+        },
+        _success_row(usage=_usage(20, 10)),
+    ]
+
+    cost, usage, models = bu._aggregate_batch_cost_usage_models(entries=rows, custom_llm_provider="openai")
+
+    assert cost > 0.0
+    assert (usage.prompt_tokens, usage.completion_tokens, usage.total_tokens) == (30, 15, 45)
+    assert models == ["gpt-4o", "gpt-4o"]
+
+
 def test_cost_from_content_model_info_path(monkeypatch):
     # model_info set -> batch_cost_calculator(prompt_cost, completion_cost).
     import litellm.cost_calculator as cc
diff --git a/tests/test_litellm/integrations/test_opentelemetry.py b/tests/test_litellm/integrations/test_opentelemetry.py
index 28d2cb22e7c..a5ad3d771e3 100644
--- a/tests/test_litellm/integrations/test_opentelemetry.py
+++ b/tests/test_litellm/integrations/test_opentelemetry.py
@@ -6213,6 +6213,32 @@ class TestDynamicTracerProviderCache(unittest.TestCase):
 
         self.assertTrue(entry.owns_exporter)
         self.assertIsNotNone(entry.provider._atexit_handler)
+
+    def test_dynamic_providers_share_one_resource(self):
+        """Building the Resource scans every installed distribution's entry points, and the
+        dynamic providers reach it from the async logging path, so one logger builds it once."""
+        logger = self._logger(cap=8)
+
+        for i in range(4):
+            logger._get_tracer_with_dynamic_headers({"authorization": f"Basic tenant-{i}"})
+
+        entries = list(logger._tracer_provider_cache.values())
+        self.assertEqual(len(entries), 4)
+        self.assertEqual(len({id(entry.provider.resource) for entry in entries}), 1)
+        self.assertIs(entries[0].provider.resource, logger._litellm_resource())
+
+    def test_resource_is_memoized_per_logger_not_shared(self):
+        """Two loggers must not share a Resource; the second's service.name would be wrong."""
+        first = self._logger()
+        second = OpenTelemetry(
+            config=OpenTelemetryConfig(exporter="console", skip_set_global=True, service_name="svc-second")
+        )
+        self.addCleanup(second._tracer_provider.shutdown)
+
+        self.assertIsNot(first._litellm_resource(), second._litellm_resource())
+        self.assertEqual(second._litellm_resource().attributes.get("service.name"), "svc-second")
+
+
 class TestOpenTelemetryDatabaseSemconvAttributes(unittest.TestCase):
     """A Postgres service span must name the PostgreSQL server it reached.
 
diff --git a/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py b/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py
index 1826f56d667..06be96fefdf 100644
--- a/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py
+++ b/tests/test_litellm/litellm_core_utils/llm_cost_calc/test_llm_cost_calc_utils.py
@@ -2324,6 +2324,87 @@ def test_data_residency_composes_with_service_tier(_local_model_cost_map):
     assert priority_eu_total == pytest.approx(priority_base_total * 1.10, rel=1e-9)
 
 
+@pytest.mark.parametrize("model", ["gemini-3.5-flash", "claude-haiku-4-5@20251001"])
+@pytest.mark.parametrize("vertex_location", ["us-central1", "us-east5", "europe-west1", "asia-southeast1"])
+def test_vertex_regional_location_applies_uplift(vertex_location, model, _local_model_cost_map):
+    """Google bills every non-global Vertex endpoint at 1.1x the global rate for GA
+    Gemini 3+ and regional-pricing Claude models, so a request served from a regional
+    location must cost 1.1x what the same usage costs on the global endpoint."""
+    from litellm.types.utils import Usage
+
+    usage = Usage(prompt_tokens=1000, completion_tokens=500, total_tokens=1500)
+
+    base = generic_cost_per_token(model=model, usage=usage, custom_llm_provider="vertex_ai")
+    regional = generic_cost_per_token(
+        model=model,
+        usage=usage,
+        custom_llm_provider="vertex_ai",
+        vertex_location=vertex_location,
+    )
+
+    base_total = base[0] + base[1]
+    regional_total = regional[0] + regional[1]
+
+    assert base_total > 0
+    assert regional_total == pytest.approx(base_total * 1.10, rel=1e-9)
+    assert regional[0] == pytest.approx(base[0] * 1.10, rel=1e-9)
+    assert regional[1] == pytest.approx(base[1] * 1.10, rel=1e-9)
+
+
+@pytest.mark.parametrize("vertex_location", [None, "global", "GLOBAL"])
+def test_vertex_global_or_absent_location_no_uplift(vertex_location, _local_model_cost_map):
+    """The global endpoint prices at the base rate, whatever the casing, and an
+    unresolved location must never uplift."""
+    from litellm.types.utils import Usage
+
+    usage = Usage(prompt_tokens=1000, completion_tokens=500, total_tokens=1500)
+
+    base = generic_cost_per_token(
+        model="claude-haiku-4-5@20251001", usage=usage, custom_llm_provider="vertex_ai"
+    )
+    located = generic_cost_per_token(
+        model="claude-haiku-4-5@20251001",
+        usage=usage,
+        custom_llm_provider="vertex_ai",
+        vertex_location=vertex_location,
+    )
+
+    assert base == located
+
+
+@pytest.mark.parametrize("model", ["claude-opus-4-1", "gemini-2.0-flash-001"])
+def test_vertex_location_no_uplift_for_uniformly_priced_model(model, _local_model_cost_map):
+    """Models Google prices uniformly across endpoints (Gemini 2.x, Claude Opus 4.1
+    and older) carry no multiplier and must not move with the location."""
+    from litellm.types.utils import Usage
+
+    usage = Usage(prompt_tokens=1000, completion_tokens=500, total_tokens=1500)
+
+    base = generic_cost_per_token(model=model, usage=usage, custom_llm_provider="vertex_ai")
+    regional = generic_cost_per_token(
+        model=model,
+        usage=usage,
+        custom_llm_provider="vertex_ai",
+        vertex_location="us-east5",
+    )
+
+    assert base == regional, f"{model} should not have a regional-endpoint uplift"
+
+
+def test_vertex_uplift_invalid_multiplier_defaults_to_one():
+    """A malformed multiplier in the cost map degrades to base pricing, never raises."""
+    from litellm.litellm_core_utils.llm_cost_calc.utils import (
+        get_vertex_regional_endpoint_uplift,
+    )
+
+    assert (
+        get_vertex_regional_endpoint_uplift(
+            {"regional_endpoint_uplift_multiplier": "not-a-number"}, "us-east5"
+        )
+        == 1.0
+    )
+
+
 def test_priority_service_tier_above_threshold_uses_priority_tier_rates_for_cached_tokens(
     _local_model_cost_map,
 ):
@@ -2877,6 +2958,57 @@ def test_token_type_cost_breakdown_applies_regional_uplift():
     assert text_input_cost + eu.cache_read_cost == pytest.approx(prompt_cost)
 
 
+def test_token_type_cost_breakdown_applies_vertex_regional_uplift():
+    """
+    Non-global Vertex endpoints apply a flat 1.1x uplift to every token cost. The
+    per-type breakdown must apply the same uplift via vertex_location so it stays
+    reconciled with the uplifted input_cost/output_cost totals, instead of being
+    logged at the global rate.
+    """
+    os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
+    litellm.model_cost = litellm.get_model_cost_map(url="")
+
+    model = "claude-haiku-4-5@20251001"
+    custom_llm_provider = "vertex_ai"
+    usage = Usage(
+        prompt_tokens=1000,
+        completion_tokens=500,
+        total_tokens=1500,
+        prompt_tokens_details=PromptTokensDetailsWrapper(
+            cached_tokens=400, text_tokens=600
+        ),
+    )
+
+    model_info = litellm.get_model_info(
+        model=model, custom_llm_provider=custom_llm_provider
+    )
+    uplift = model_info["regional_endpoint_uplift_multiplier"]
+    assert uplift > 1.0
+
+    base = get_token_type_cost_breakdown(
+        model=model, custom_llm_provider=custom_llm_provider, usage=usage
+    )
+    regional = get_token_type_cost_breakdown(
+        model=model,
+        custom_llm_provider=custom_llm_provider,
+        usage=usage,
+        vertex_location="us-east5",
+    )
+
+    assert base.cache_read_cost > 0
+    assert regional.cache_read_cost == pytest.approx(base.cache_read_cost * uplift)
+
+    # The uplifted breakdown must still reconcile with the uplifted totals.
+    prompt_cost, _completion_cost = generic_cost_per_token(
+        model=model,
+        usage=usage,
+        custom_llm_provider=custom_llm_provider,
+        vertex_location="us-east5",
+    )
+    text_input_cost = 600 * model_info["input_cost_per_token"] * uplift
+    assert text_input_cost + regional.cache_read_cost == pytest.approx(prompt_cost)
+
+
 def test_token_type_cost_breakdown_applies_anthropic_geo_multiplier(monkeypatch):
     """
     Anthropic's regional (geo) uplift lives in provider_specific_entry and is
diff --git a/tests/test_litellm/litellm_core_utils/test_litellm_logging.py b/tests/test_litellm/litellm_core_utils/test_litellm_logging.py
index 54016470f8b..c2d73ea467d 100644
--- a/tests/test_litellm/litellm_core_utils/test_litellm_logging.py
+++ b/tests/test_litellm/litellm_core_utils/test_litellm_logging.py
@@ -4958,3 +4958,150 @@ def test_pre_call_redacts_and_masks_raw_request(logging_obj):
     raw_api_base = logging_obj.model_call_details["raw_request_typed_dict"]["raw_request_api_base"]
     assert _GEMINI_KEY not in raw_api_base
     assert "key=*****" in raw_api_base
+
+
+def _resolve(custom_llm_provider, litellm_params, optional_params, model):
+    from litellm.litellm_core_utils.litellm_logging import (
+        _resolve_vertex_location_for_cost,
+    )
+
+    return _resolve_vertex_location_for_cost(
+        custom_llm_provider=custom_llm_provider,
+        litellm_params=litellm_params,
+        optional_params=optional_params,
+        model=model,
+    )
+
+
+def test_resolve_vertex_location_for_cost():
+    """Vertex requests resolve the serving location the way dispatch does; other providers get None."""
+    assert _resolve("openai", {"vertex_location": "us-east5"}, None, "gpt-4o") is None
+    assert _resolve(None, {}, None, "gemini-3.5-flash") is None
+    assert _resolve("vertex_ai", {"vertex_location": "us-east5"}, None, "gemini-3.5-flash") == "us-east5"
+    assert _resolve("vertex_ai", {"vertex_location": "global"}, None, "gemini-3.5-flash") == "global"
+    assert (
+        _resolve("vertex_ai_beta", {"vertex_ai_location": "europe-west1"}, None, "claude-haiku-4-5@20251001")
+        == "europe-west1"
+    )
+
+
+def test_resolve_vertex_location_for_cost_reads_optional_params(monkeypatch):
+    """
+    On the proxy the logging object predates deployment selection, so the deployment's
+    configured location only reaches it through optional_params. A configured global
+    location must beat the environment fallback, or every proxy call gets the regional uplift.
+    """
+    monkeypatch.setenv("VERTEXAI_LOCATION", "us-east5")
+    monkeypatch.setattr(litellm, "vertex_location", None)
+
+    assert _resolve("vertex_ai", {}, {"vertex_location": "global"}, "gemini-3.5-flash") == "global"
+    assert _resolve("vertex_ai", None, {"vertex_location": "europe-west1"}, "gemini-3.5-flash") == "europe-west1"
+    assert (
+        _resolve(
+            "vertex_ai",
+            {"vertex_location": "us-east5"},
+            {"vertex_location": "global"},
+            "gemini-3.5-flash",
+        )
+        == "global"
+    )
+    assert _resolve("vertex_ai", {"vertex_location": "global"}, {}, "gemini-3.5-flash") == "global"
+    assert _resolve("vertex_ai", {}, {}, "gemini-3.5-flash") == "us-east5"
+
+
+def test_resolve_vertex_location_for_cost_default_region(monkeypatch):
+    """With no location configured anywhere, resolution lands on the dispatch default us-central1."""
+    monkeypatch.delenv("VERTEXAI_LOCATION", raising=False)
+    monkeypatch.delenv("VERTEX_LOCATION", raising=False)
+    monkeypatch.setattr(litellm, "vertex_location", None)
+
+    assert _resolve("vertex_ai", {}, None, "gemini-3.5-flash") == "us-central1"
+    assert _resolve("vertex_ai", None, None, "gemini-3.5-flash") == "us-central1"
+
+
+def test_response_cost_calculator_prices_proxy_vertex_calls_on_the_configured_location(monkeypatch):
+    """
+    Proxy-shaped logging objects (created before the router picks a deployment) carry the
+    deployment's vertex_location only in optional_params. A global deployment must price at
+    base rates even when the environment points at a regional location, and a regional one
+    must price with the uplift.
+    """
+    from datetime import datetime
+
+    from litellm.litellm_core_utils.get_model_cost_map import get_model_cost_map
+
+    monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
+    monkeypatch.setattr(litellm, "model_cost", get_model_cost_map(url=""))
+    monkeypatch.setenv("VERTEXAI_LOCATION", "us-east5")
+    monkeypatch.setattr(litellm, "vertex_location", None)
+
+    def cost_at(location):
+        logging_obj = LitellmLogging(
+            model="gemini-3.5-flash",
+            messages=[{"role": "user", "content": "hi"}],
+            stream=False,
+            call_type="completion",
+            start_time=datetime.now(),
+            litellm_call_id=f"vertex-loc-{location}",
+            function_id="f",
+        )
+        logging_obj.update_environment_variables(
+            model="gemini-3.5-flash",
+            user="",
+            optional_params={"vertex_location": location},
+            litellm_params={"api_base": ""},
+            custom_llm_provider="vertex_ai",
+        )
+        response = ModelResponse(
+            id="resp-1",
+            model="gemini-3.5-flash",
+            choices=[{"message": {"role": "assistant", "content": "hello"}, "index": 0, "finish_reason": "stop"}],
+            usage={"prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15},
+        )
+        return logging_obj._response_cost_calculator(result=response)
+
+    info = litellm.model_cost["vertex_ai/gemini-3.5-flash"]
+    expected_global = 10 * info["input_cost_per_token"] + 5 * info["output_cost_per_token"]
+
+    assert cost_at("global") == pytest.approx(expected_global)
+    assert cost_at("us-east5") == pytest.approx(info["regional_endpoint_uplift_multiplier"] * expected_global)
+
+
+def test_set_cost_breakdown_stores_vertex_location():
+    """vertex_location is recorded in the pricing basis, None for non-vertex requests."""
+    from datetime import datetime
+
+    logging_obj = LitellmLogging(
+        model="vertex_ai/claude-haiku-4-5@20251001",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=False,
+        call_type="completion",
+        start_time=datetime.now(),
+        litellm_call_id="vertex-location-set",
+        function_id="f",
+    )
+    logging_obj.set_cost_breakdown(
+        input_cost=0.001,
+        output_cost=0.002,
+        total_cost=0.003,
+        cost_for_built_in_tools_cost_usd_dollar=0.0,
+        vertex_location="us-east5",
+    )
+    assert logging_obj.cost_breakdown["vertex_location"] == "us-east5"
+
+    no_location = LitellmLogging(
+        model="gpt-4o",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=False,
+        call_type="completion",
+        start_time=datetime.now(),
+        litellm_call_id="vertex-location-absent",
+        function_id="f",
+    )
+    no_location.set_cost_breakdown(
+        input_cost=0.001,
+        output_cost=0.002,
+        total_cost=0.003,
+        cost_for_built_in_tools_cost_usd_dollar=0.0,
+    )
+    assert no_location.cost_breakdown.get("vertex_location") is None
diff --git a/tests/test_litellm/litellm_core_utils/test_ptu_pricing.py b/tests/test_litellm/litellm_core_utils/test_ptu_pricing.py
new file mode 100644
index 00000000000..270c59f595f
--- /dev/null
+++ b/tests/test_litellm/litellm_core_utils/test_ptu_pricing.py
@@ -0,0 +1,163 @@
+"""Tests for the shared PTU rules: which deployments accrue flat cost, and what that zeroes."""
+
+import os
+from datetime import datetime, timezone
+from unittest.mock import patch
+
+import pytest
+
+from litellm.litellm_core_utils.ptu_pricing import (
+    CUSTOM_PRICING_FIELDS,
+    PTU_EMPTIED_PRICING_FIELDS,
+    PTU_ZEROED_PRICING_FIELDS,
+    PTU_ZEROED_TABLE_FIELDS,
+    SEARCH_CONTEXT_SIZES,
+    ptu_terms,
+    zeroed_ptu_pricing,
+)
+from litellm.types.router import ModelInfo
+
+_VALID = {
+    "team_id": "team-alpha",
+    "ptu_count": 100,
+    "cost_per_ptu_per_hour": 0.02,
+    "ptu_effective_from": "2026-01-01T00:00:00Z",
+}
+
+
+def _with_flag(model_info, declared=None, enabled=True):
+    with patch.dict(os.environ, {"LITELLM_ENABLE_PTU_COST_ATTRIBUTION": "True" if enabled else ""}, clear=False):
+        return zeroed_ptu_pricing(model_info, declared or {})
+
+
+def test_a_complete_reservation_is_accepted():
+    terms = ptu_terms(_VALID)
+
+    assert terms is not None
+    assert terms.team_id == "team-alpha"
+    assert terms.ptu_count == 100
+    assert terms.effective_from == datetime(2026, 1, 1, tzinfo=timezone.utc)
+    assert terms.effective_to is None
+
+
+@pytest.mark.parametrize(
+    "override",
+    [
+        {"team_id": None},
+        {"team_id": ""},
+        {"ptu_count": None},
+        {"cost_per_ptu_per_hour": None},
+        {"ptu_count": 0},
+        {"ptu_count": -1},
+        {"ptu_count": ModelInfo.MAX_PTU_COUNT + 1},
+        {"cost_per_ptu_per_hour": -0.01},
+        {"cost_per_ptu_per_hour": ModelInfo.MAX_COST_PER_PTU_PER_HOUR + 1},
+        {"ptu_count": "not-a-number"},
+        {"ptu_effective_from": None},
+        {"ptu_effective_from": "not-a-date"},
+        {"ptu_effective_to": "not-a-date"},
+        {"ptu_effective_to": "2025-01-01T00:00:00Z"},
+        {"ptu_effective_to": "2026-01-01T00:00:00Z"},
+    ],
+    ids=[
+        "no team",
+        "blank team",
+        "no count",
+        "no rate",
+        "zero count",
+        "negative count",
+        "count over the cap",
+        "negative rate",
+        "rate over the cap",
+        "count not a number",
+        "no start",
+        "unparseable start",
+        "unparseable end",
+        "end before start",
+        "end equal to start",
+    ],
+)
+def test_an_incomplete_reservation_accrues_nothing(override):
+    """Anything the rollup declines to charge must also decline to be zeroed, or the
+    deployment serves its traffic for free with nothing charged in its place."""
+    assert ptu_terms({**_VALID, **override}) is None
+    assert _with_flag({**_VALID, **override}) is None
+
+
+def test_a_naive_start_is_read_as_utc():
+    """config.yaml is hand-typed, and pydantic hands back a naive datetime for a date with
+    no offset."""
+    terms = ptu_terms({**_VALID, "ptu_effective_from": datetime(2026, 5, 1, 12, 0)})
+
+    assert terms is not None
+    assert terms.effective_from == datetime(2026, 5, 1, 12, 0, tzinfo=timezone.utc)
+
+
+def test_an_offset_start_is_converted_rather_than_relabelled():
+    terms = ptu_terms({**_VALID, "ptu_effective_from": "2026-05-01T12:00:00-05:00"})
+
+    assert terms is not None
+    assert terms.effective_from == datetime(2026, 5, 1, 17, 0, tzinfo=timezone.utc)
+
+
+def test_nothing_is_zeroed_while_the_feature_is_off():
+    """No flat cost accrues with the flag off, so zeroing would serve the traffic free."""
+    assert _with_flag(_VALID, enabled=False) is None
+
+
+def test_the_standing_rates_are_all_zeroed():
+    override = _with_flag(_VALID)
+
+    assert override is not None
+    assert [field for field in PTU_ZEROED_PRICING_FIELDS if override[field] != 0.0] == []
+
+
+def test_tiered_pricing_is_emptied_rather_than_zeroed():
+    """A tier outranks the flat rates written beside it, so a zero there would leave the
+    cost map's tiers billing the traffic the reserved capacity already covers."""
+    override = _with_flag(_VALID, declared={"tiered_pricing": [{"range": [0, 1000], "input_cost_per_token": 0.003}]})
+
+    assert override is not None
+    for field in PTU_EMPTIED_PRICING_FIELDS:
+        assert override[field] == ()
+
+
+def test_the_search_context_table_is_zeroed_in_place_on_every_deployment():
+    """An absent table means the provider's own default rather than free, so it is written
+    even when the deployment never declared one."""
+    override = _with_flag(_VALID)
+
+    assert override is not None
+    for field in PTU_ZEROED_TABLE_FIELDS:
+        assert dict(override[field]) == dict.fromkeys(SEARCH_CONTEXT_SIZES, 0.0)
+
+
+def test_a_declared_table_does_not_become_a_scalar():
+    """Zeroing it as a plain 0.0 would leave the provider's reader without a table to
+    consult, which is the same as absent."""
+    override = _with_flag(_VALID, declared={"search_context_cost_per_query": {"search_context_size_medium": 0.05}})
+
+    assert override is not None
+    assert dict(override["search_context_cost_per_query"]) == dict.fromkeys(SEARCH_CONTEXT_SIZES, 0.0)
+
+
+def test_a_rate_the_deployment_declares_itself_is_zeroed_too():
+    """The standing set covers the mirrored rates. Anything else the operator wrote would
+    otherwise survive and bill the traffic the hourly charge already paid for."""
+    extra = "input_cost_per_token_above_200k_tokens"
+    assert extra in CUSTOM_PRICING_FIELDS
+    assert extra not in PTU_ZEROED_PRICING_FIELDS
+
+    override = _with_flag(_VALID, declared={extra: 9e-06})
+
+    assert override is not None
+    assert override[extra] == 0.0
+
+
+def test_a_setting_that_is_not_a_charge_is_left_alone():
+    """CustomPricingLiteLLMParams also carries configuration, and zeroing one of those
+    would break the deployment rather than stop a charge."""
+    override = _with_flag(_VALID, declared={"output_vector_size": 1536})
+
+    assert override is not None
+    assert "output_vector_size" not in override
diff --git a/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py b/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py
index 10bd22689d0..0f21cce476b 100644
--- a/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py
+++ b/tests/test_litellm/litellm_core_utils/test_streaming_chunk_builder_utils.py
@@ -1262,3 +1262,83 @@ def test_get_combined_tool_content_joins_many_custom_tool_input_fragments_in_ord
     assert isinstance(combined[1], ChatCompletionMessageCustomToolCall)
     assert combined[1].custom.name == "run_script"
     assert combined[1].custom.input == "".join(object_fragments)
+
+
+def _reasoning_stream_chunk() -> ModelResponseStream:
+    return ModelResponseStream(
+        id="chatcmpl-reasoning",
+        model="claude-opus-4-8",
+        choices=[StreamingChoices(finish_reason=None, index=0, delta=Delta(content="10", role="assistant"))],
+    )
+
+
+def test_count_reasoning_tokens_returns_none_for_signature_only_thinking():
+    from litellm.types.utils import Choices, Message, ModelResponse
+
+    processor = ChunkProcessor(chunks=[_reasoning_stream_chunk()])
+    response = ModelResponse(
+        choices=[
+            Choices(
+                finish_reason="stop",
+                index=0,
+                message=Message(content="10", role="assistant", reasoning_content=""),
+            )
+        ]
+    )
+
+    assert processor.count_reasoning_tokens(response) is None
+
+
+def test_count_reasoning_tokens_counts_visible_reasoning():
+    from litellm.types.utils import Choices, Message, ModelResponse
+
+    processor = ChunkProcessor(chunks=[_reasoning_stream_chunk()])
+    response = ModelResponse(
+        choices=[
+            Choices(
+                finish_reason="stop",
+                index=0,
+                message=Message(
+                    content="10",
+                    role="assistant",
+                    reasoning_content="let me count the primes under thirty",
+                ),
+            )
+        ]
+    )
+
+    assert processor.count_reasoning_tokens(response) > 0
+
+
+@pytest.mark.parametrize(
+    "estimated_reasoning_tokens, expected_reasoning_tokens, expected_text_tokens",
+    [(40, 40, 60), (250, 100, 0)],
+)
+def test_calculate_usage_fills_unknown_split_from_reasoning_estimate(
+    estimated_reasoning_tokens, expected_reasoning_tokens, expected_text_tokens
+):
+    from litellm.types.utils import CompletionTokensDetailsWrapper
+
+    chunk = ModelResponseStream(
+        id="chatcmpl-unknown-split",
+        model="claude-opus-4-8",
+        choices=[StreamingChoices(finish_reason="stop", index=0, delta=Delta(content=None, role=None))],
+        usage=Usage(
+            prompt_tokens=50,
+            completion_tokens=100,
+            total_tokens=150,
+            completion_tokens_details=CompletionTokensDetailsWrapper(reasoning_tokens=None, text_tokens=None),
+        ),
+    )
+    processor = ChunkProcessor(chunks=[chunk])
+
+    usage = processor.calculate_usage(
+        chunks=[chunk],
+        model="claude-opus-4-8",
+        completion_output="10",
+        reasoning_tokens=estimated_reasoning_tokens,
+    )
+
+    assert usage.completion_tokens == 100
+    assert usage.completion_tokens_details.reasoning_tokens == expected_reasoning_tokens
+    assert usage.completion_tokens_details.text_tokens == expected_text_tokens
diff --git a/tests/test_litellm/litellm_core_utils/test_streaming_handler.py b/tests/test_litellm/litellm_core_utils/test_streaming_handler.py
index c1612aff3d3..05b44fffbc5 100644
--- a/tests/test_litellm/litellm_core_utils/test_streaming_handler.py
+++ b/tests/test_litellm/litellm_core_utils/test_streaming_handler.py
@@ -1774,6 +1774,80 @@ def test_openrouter_streaming_cost_propagates_to_hidden_params():
     assert provider_cost == 0.00025
 
 
+def test_perplexity_streaming_dict_cost_propagates_to_hidden_params():
+    """
+    Regression: Perplexity reports usage.cost as a breakdown object, which used to
+    blow up the end of the stream with
+    `float() argument must be a string or a real number, not 'dict'`.
+    """
+    import litellm
+    from litellm.cost_calculator import get_response_cost_from_hidden_params
+
+    chunks = [
+        ModelResponseStream(
+            id="chatcmpl-pplx",
+            created=1742056047,
+            model="perplexity/sonar",
+            choices=[
+                StreamingChoices(
+                    finish_reason=None,
+                    index=0,
+                    delta=Delta(content="Hi", role="assistant"),
+                )
+            ],
+            usage=None,
+        ),
+        ModelResponseStream(
+            id="chatcmpl-pplx",
+            created=1742056048,
+            model="perplexity/sonar",
+            choices=[
+                StreamingChoices(finish_reason="stop", index=0, delta=Delta(content=""))
+            ],
+            usage=None,
+        ),
+        ModelResponseStream(
+            id="chatcmpl-pplx",
+            created=1742056049,
+            model="perplexity/sonar",
+            choices=[
+                StreamingChoices(finish_reason=None, index=0, delta=Delta(content=""))
+            ],
+            usage=Usage(
+                completion_tokens=18,
+                prompt_tokens=12,
+                total_tokens=30,
+                cost={
+                    "input_tokens_cost": 0.000012,
+                    "output_tokens_cost": 0.000018,
+                    "request_cost": 0.005,
+                    "total_cost": 0.00503,
+                },
+            ),
+        ),
+    ]
+
+    complete_response = litellm.stream_chunk_builder(
+        chunks=chunks, messages=[{"role": "user", "content": "test"}]
+    )
+
+    assert complete_response is not None
+
+    CustomStreamWrapper._propagate_usage_cost_to_hidden_params(complete_response)
+
+    assert (
+        get_response_cost_from_hidden_params(complete_response._hidden_params)
+        == 0.00503
+    )
+
+
+def test_provider_reported_cost_ignores_unusable_shapes():
+    assert CustomStreamWrapper._resolve_provider_reported_cost(None) is None
+    assert CustomStreamWrapper._resolve_provider_reported_cost({}) is None
+    assert CustomStreamWrapper._resolve_provider_reported_cost({"total_cost": None}) is None
+    assert CustomStreamWrapper._resolve_provider_reported_cost(0.5) == 0.5
+
+
 def test_handle_special_delta_attributes(
     initialized_custom_stream_wrapper: CustomStreamWrapper,
 ):
diff --git a/tests/test_litellm/llms/anthropic/chat/test_anthropic_chat_transformation.py b/tests/test_litellm/llms/anthropic/chat/test_anthropic_chat_transformation.py
index 867b148bfc3..391bd8566a2 100644
--- a/tests/test_litellm/llms/anthropic/chat/test_anthropic_chat_transformation.py
+++ b/tests/test_litellm/llms/anthropic/chat/test_anthropic_chat_transformation.py
@@ -221,6 +221,162 @@ def test_calculate_usage_clamps_text_tokens_when_reasoning_estimate_exceeds_outp
     assert usage.completion_tokens_details.text_tokens == 0
 
 
+def test_calculate_usage_prefers_provider_reported_thinking_tokens():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={
+            "input_tokens": 32,
+            "output_tokens": 421,
+            "output_tokens_details": {"thinking_tokens": 372},
+        },
+        reasoning_content="",
+        completion_response={
+            "content": [
+                {"type": "thinking", "thinking": "", "signature": "sig"},
+                {"type": "text", "text": "10"},
+            ]
+        },
+    )
+
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens == 372
+    assert usage.completion_tokens_details.text_tokens == 49
+
+
+def test_calculate_usage_provider_thinking_tokens_win_over_visible_reasoning_estimate():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={
+            "input_tokens": 50,
+            "output_tokens": 811,
+            "output_tokens_details": {"thinking_tokens": 747},
+        },
+        reasoning_content="short visible reasoning that tokenizes to far fewer than 747 tokens",
+    )
+
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens == 747
+    assert usage.completion_tokens_details.text_tokens == 64
+
+
+def test_calculate_usage_sums_provider_thinking_tokens_across_iterations():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={
+            "input_tokens": 10,
+            "output_tokens": 300,
+            "iterations": [
+                {"input_tokens": 5, "output_tokens": 100, "output_tokens_details": {"thinking_tokens": 60}},
+                {"input_tokens": 5, "output_tokens": 200, "output_tokens_details": {"thinking_tokens": 90}},
+            ],
+        },
+        reasoning_content=None,
+    )
+
+    assert usage.completion_tokens == 300
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens == 150
+    assert usage.completion_tokens_details.text_tokens == 150
+
+
+def test_calculate_usage_falls_back_when_only_some_iterations_report_thinking_tokens():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={
+            "input_tokens": 10,
+            "output_tokens": 300,
+            "output_tokens_details": {"thinking_tokens": 240},
+            "iterations": [
+                {"input_tokens": 5, "output_tokens": 100, "output_tokens_details": {"thinking_tokens": 60}},
+                {"input_tokens": 5, "output_tokens": 200},
+            ],
+        },
+        reasoning_content=None,
+    )
+
+    assert usage.completion_tokens == 300
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens == 240
+    assert usage.completion_tokens_details.text_tokens == 60
+
+
+def test_calculate_usage_reports_unknown_split_when_only_some_iterations_report_thinking_tokens():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={
+            "input_tokens": 10,
+            "output_tokens": 300,
+            "iterations": [
+                {"input_tokens": 5, "output_tokens": 100, "output_tokens_details": {"thinking_tokens": 60}},
+                {"input_tokens": 5, "output_tokens": 200},
+            ],
+        },
+        reasoning_content="",
+        completion_response={"content": [{"type": "thinking", "thinking": "", "signature": "sig"}]},
+    )
+
+    assert usage.completion_tokens == 300
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens is None
+    assert usage.completion_tokens_details.text_tokens is None
+
+
+def test_calculate_usage_reports_unknown_split_when_thinking_ran_without_a_count():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={"input_tokens": 32, "output_tokens": 580},
+        reasoning_content="",
+        completion_response={
+            "content": [
+                {"type": "redacted_thinking", "data": "encrypted"},
+                {"type": "text", "text": "10"},
+            ]
+        },
+    )
+
+    assert usage.completion_tokens == 580
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens is None
+    assert usage.completion_tokens_details.text_tokens is None
+
+
+def test_calculate_usage_without_thinking_reports_all_output_as_text():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={"input_tokens": 32, "output_tokens": 171},
+        reasoning_content=None,
+        completion_response={"content": [{"type": "text", "text": "10"}]},
+    )
+
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens == 0
+    assert usage.completion_tokens_details.text_tokens == 171
+
+
+def test_calculate_usage_ignores_malformed_provider_thinking_tokens():
+    config = AnthropicConfig()
+
+    usage = config.calculate_usage(
+        usage_object={
+            "input_tokens": 32,
+            "output_tokens": 100,
+            "output_tokens_details": {"thinking_tokens": "not-a-number"},
+        },
+        reasoning_content=None,
+    )
+
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens == 0
+    assert usage.completion_tokens_details.text_tokens == 100
+
+
 def test_calculate_usage_handles_mocked_output_tokens_with_reasoning_content():
     config = AnthropicConfig()
 
diff --git a/tests/test_litellm/llms/anthropic/experimental_pass_through/messages/test_streaming_iterator.py b/tests/test_litellm/llms/anthropic/experimental_pass_through/messages/test_streaming_iterator.py
index 6ea9098c228..5c1cd88835f 100644
--- a/tests/test_litellm/llms/anthropic/experimental_pass_through/messages/test_streaming_iterator.py
+++ b/tests/test_litellm/llms/anthropic/experimental_pass_through/messages/test_streaming_iterator.py
@@ -1,3 +1,4 @@
+import asyncio
 import json
 import os
 import sys
@@ -20,9 +21,11 @@ class _RecordingLoggingIterator(BaseAnthropicMessagesStreamingIterator):
     def __init__(self, litellm_logging_obj: LiteLLMLoggingObj, request_body: dict):
         super().__init__(litellm_logging_obj=litellm_logging_obj, request_body=request_body)
         self.logged_chunks: list = []
+        self.logging_call_count: int = 0
 
     async def _handle_streaming_logging(self, collected_chunks):
         self.logged_chunks = list(collected_chunks)
+        self.logging_call_count += 1
 
 
 def _make_logging_obj(test_name: str) -> LiteLLMLoggingObj:
@@ -233,6 +236,70 @@ async def test_async_sse_wrapper_excludes_synthetic_error_event_from_logged_chun
     assert not any(chunk.startswith(b"event: error\n") for chunk in iterator.logged_chunks)
 
 
+async def _events_then_hang(events):
+    for event in events:
+        yield event
+    await asyncio.Event().wait()
+
+
+@pytest.mark.asyncio
+async def test_async_sse_wrapper_logs_partial_chunks_on_client_disconnect():
+    """
+    Regression test for LIT-5839: a client disconnect tears the generator
+    down with GeneratorExit at the yield, which used to skip the post-loop
+    logging dispatch entirely, so the partial output tokens the provider
+    already generated (and billed) never reached spend tracking.
+    """
+    iterator = _RecordingLoggingIterator(
+        litellm_logging_obj=_make_logging_obj("test_disconnect_logs_partial_chunks"),
+        request_body={},
+    )
+    wrapped = iterator.async_sse_wrapper(_events_then_hang(TRUNCATED_TOOL_USE_EVENTS))
+    streamed = [await wrapped.__anext__() for _ in range(len(TRUNCATED_TOOL_USE_EVENTS))]
+    assert iterator.logging_call_count == 0
+
+    await wrapped.aclose()
+
+    assert iterator.logging_call_count == 1
+    assert iterator.logged_chunks == streamed
+
+
+@pytest.mark.asyncio
+async def test_async_sse_wrapper_logs_partial_chunks_on_cancellation():
+    iterator = _RecordingLoggingIterator(
+        litellm_logging_obj=_make_logging_obj("test_cancellation_logs_partial_chunks"),
+        request_body={},
+    )
+    wrapped = iterator.async_sse_wrapper(_events_then_hang(TRUNCATED_TOOL_USE_EVENTS))
+    streamed = [await wrapped.__anext__() for _ in range(len(TRUNCATED_TOOL_USE_EVENTS))]
+
+    consume_task = asyncio.ensure_future(wrapped.__anext__())
+    await asyncio.sleep(0.01)
+    consume_task.cancel()
+    with pytest.raises(asyncio.CancelledError):
+        await consume_task
+
+    assert iterator.logging_call_count == 1
+    assert iterator.logged_chunks == streamed
+
+
+@pytest.mark.asyncio
+async def test_async_sse_wrapper_skips_logging_on_disconnect_before_first_chunk():
+    iterator = _RecordingLoggingIterator(
+        litellm_logging_obj=_make_logging_obj("test_disconnect_before_first_chunk"),
+        request_body={},
+    )
+    wrapped = iterator.async_sse_wrapper(_events_then_hang(()))
+
+    consume_task = asyncio.ensure_future(wrapped.__anext__())
+    await asyncio.sleep(0.01)
+    consume_task.cancel()
+    with pytest.raises(asyncio.CancelledError):
+        await consume_task
+
+    assert iterator.logging_call_count == 0
+
+
 def test_incomplete_stream_error_sse_event_is_valid_anthropic_error():
     event = _incomplete_stream_error_sse_event().decode()
     lines = event.split("\n")
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 298360789eb..a3be3ebcfc7 100644
--- a/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py
+++ b/tests/test_litellm/llms/bedrock/chat/test_converse_transformation.py
@@ -6005,6 +6005,87 @@ def test_adaptive_thinking_dropped_when_max_tokens_too_small_converse():
     assert "thinking" not in optional_params
 
 
+def test_converse_usage_reports_unknown_split_for_signature_only_thinking():
+    config = AmazonConverseConfig()
+
+    usage = config.transform_usage(
+        ConverseTokenUsageBlock(inputTokens=32, outputTokens=581, totalTokens=613),
+        reasoning_content="",
+        thinking_ran=True,
+    )
+
+    assert usage.completion_tokens == 581
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens is None
+    assert usage.completion_tokens_details.text_tokens is None
+
+
+def test_converse_usage_estimates_split_for_visible_thinking():
+    config = AmazonConverseConfig()
+
+    usage = config.transform_usage(
+        ConverseTokenUsageBlock(inputTokens=32, outputTokens=581, totalTokens=613),
+        reasoning_content="Let me think about how many primes there are under thirty.",
+        thinking_ran=True,
+    )
+
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens > 0
+    assert (
+        usage.completion_tokens_details.reasoning_tokens + usage.completion_tokens_details.text_tokens
+        == usage.completion_tokens
+    )
+
+
+def test_converse_usage_without_thinking_reports_all_output_as_text():
+    config = AmazonConverseConfig()
+
+    usage = config.transform_usage(ConverseTokenUsageBlock(inputTokens=32, outputTokens=171, totalTokens=203))
+
+    assert usage.completion_tokens_details is not None
+    assert usage.completion_tokens_details.reasoning_tokens == 0
+    assert usage.completion_tokens_details.text_tokens == 171
+
+
+def test_converse_transform_response_signature_only_thinking_reports_unknown_split():
+    config = AmazonConverseConfig()
+    raw_response = MagicMock(status_code=200)
+    raw_response.text = json.dumps(
+        {
+            "output": {
+                "message": {
+                    "role": "assistant",
+                    "content": [
+                        {"reasoningContent": {"reasoningText": {"text": "", "signature": "sig"}}},
+                        {"text": "10"},
+                    ],
+                }
+            },
+            "stopReason": "end_turn",
+            "usage": {"inputTokens": 32, "outputTokens": 581, "totalTokens": 613},
+        }
+    )
+    raw_response.json.return_value = json.loads(raw_response.text)
+
+    response = config._transform_response(
+        model="bedrock/global.anthropic.claude-opus-4-8",
+        response=raw_response,
+        model_response=ModelResponse(),
+        stream=False,
+        logging_obj=None,
+        optional_params={},
+        api_key=None,
+        data={},
+        messages=[],
+        encoding=None,
+    )
+
+    assert response.choices[0].message.reasoning_content == ""
+
+    assert response.usage.completion_tokens_details.reasoning_tokens is None
+    assert response.usage.completion_tokens_details.text_tokens is None
+
+
 def test_is_converse_usage_shape_distinguishes_camel_case_from_anthropic():
     config = AmazonConverseConfig()
     assert config.is_converse_usage_shape({"inputTokens": 1, "outputTokens": 2}) is True
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 ce81edf3101..1a3fdb9f652 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
@@ -2948,3 +2948,38 @@ def test_bedrock_invoke_messages_allows_converted_websearch_function_tool():
         headers={},
     )
     assert result["tools"][0]["name"] == "litellm_web_search"
+
+
+@pytest.mark.asyncio
+async def test_bedrock_sse_wrapper_dispatches_logging_on_client_disconnect():
+    """
+    Regression test for LIT-5839: closing the outer bedrock_sse_wrapper
+    mid-stream (what the proxy does on a client disconnect) must close the
+    inner async_sse_wrapper deterministically so the partial-stream logging
+    fires. `completion_start_time` is only stamped on the logging object by
+    that dispatch, so it observing a value proves the whole chain ran.
+    """
+    cfg = AmazonAnthropicClaudeMessagesConfig()
+
+    async def _hanging_stream():
+        yield {"type": "message_start", "message": {"id": "msg_1", "usage": {"input_tokens": 25, "output_tokens": 1}}}
+        yield {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "partial"}}
+        await asyncio.Event().wait()
+
+    logging_obj = LiteLLMLoggingObj(
+        model="bedrock/invoke/anthropic.claude-3-sonnet-20240229-v1:0",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="chat",
+        start_time=datetime.now(),
+        litellm_call_id="test_bedrock_sse_wrapper_disconnect_logging",
+        function_id="test_bedrock_sse_wrapper_disconnect_logging",
+    )
+    wrapped = cfg.bedrock_sse_wrapper(_hanging_stream(), litellm_logging_obj=logging_obj, request_body={})
+    await wrapped.__anext__()
+    await wrapped.__anext__()
+    assert logging_obj.completion_start_time is None
+
+    await wrapped.aclose()
+
+    assert logging_obj.completion_start_time is not None
diff --git a/tests/test_litellm/llms/bedrock/search/test_agentcore_search_transformation.py b/tests/test_litellm/llms/bedrock/search/test_agentcore_search_transformation.py
new file mode 100644
index 00000000000..950336c7ad0
--- /dev/null
+++ b/tests/test_litellm/llms/bedrock/search/test_agentcore_search_transformation.py
@@ -0,0 +1,637 @@
+"""
+Tests for Amazon Bedrock AgentCore Web Search integration.
+
+Mirror of tests/search_tests/test_agentcore_search.py placed in the
+test_litellm tree so the AgentCoreSearchConfig transformation is exercised by
+the sharded CI (coverage collection runs against this tree).
+"""
+
+import json
+import os
+
+import pytest
+from unittest.mock import AsyncMock, patch, MagicMock
+
+import litellm
+from litellm.llms.bedrock.search.transformation import (
+    AGENTCORE_DEFAULT_MCP_PROTOCOL_VERSION,
+    AgentCoreSearchConfig,
+)
+
+GATEWAY_URL = "https://testgateway-abc123.gateway.bedrock-agentcore.us-east-1.amazonaws.com/mcp"
+
+MCP_RESULTS = [
+    {
+        "title": "Test Result 1",
+        "url": "https://example.com/1",
+        "text": "Snippet for result 1",
+        "publishedDate": "2026-06-16",
+    },
+    {
+        "title": "Test Result 2",
+        "url": "https://example.com/2",
+        "text": "Snippet for result 2",
+    },
+]
+
+
+def _mcp_response_body() -> dict:
+    return {
+        "jsonrpc": "2.0",
+        "id": 1,
+        "result": {"content": [{"type": "text", "text": json.dumps(MCP_RESULTS)}]},
+    }
+
+
+def _make_mock_response(json_body: dict = None, text: str = None) -> MagicMock:
+    mock_response = MagicMock()
+    mock_response.status_code = 200
+    if text is not None:
+        mock_response.text = text
+    else:
+        mock_response.text = json.dumps(json_body)
+        mock_response.json.return_value = json_body
+    return mock_response
+
+
+class TestAgentCoreSearch:
+    """
+    Tests for AgentCore Web Search functionality with mocked network/signing.
+    """
+
+    @pytest.mark.asyncio
+    async def test_agentcore_search_request_payload(self):
+        """Validates the MCP tools/call payload and SigV4 signing without real AWS calls."""
+        os.environ["AGENTCORE_GATEWAY_URL"] = GATEWAY_URL
+
+        mock_response = _make_mock_response(_mcp_response_body())
+
+        with (
+            patch(
+                "litellm.llms.custom_httpx.http_handler.AsyncHTTPHandler.post",
+                new_callable=AsyncMock,
+            ) as mock_post,
+            patch.object(
+                AgentCoreSearchConfig,
+                "_sign_request",
+                return_value=(
+                    {"Authorization": "AWS4-HMAC-SHA256 test", "Content-Type": "application/json"},
+                    json.dumps({"signed": True}).encode(),
+                ),
+            ) as mock_sign,
+        ):
+            mock_post.return_value = mock_response
+
+            response = await litellm.asearch(
+                query="latest developments in AI",
+                search_provider="agentcore",
+                max_results=5,
+            )
+
+            mock_post.assert_called_once()
+            call_kwargs = mock_post.call_args.kwargs
+            assert call_kwargs["url"] == GATEWAY_URL
+            # Signed body must be sent verbatim
+            assert call_kwargs["data"] == json.dumps({"signed": True}).encode()
+            assert call_kwargs["json"] is None
+
+            # Signing was invoked with the MCP request
+            mock_sign.assert_called_once()
+            sign_kwargs = mock_sign.call_args.kwargs
+            request_data = sign_kwargs["request_data"]
+            assert request_data["method"] == "tools/call"
+            assert request_data["params"]["name"] == "web-search-tool___WebSearch"
+            assert request_data["params"]["arguments"]["query"] == "latest developments in AI"
+            assert request_data["params"]["arguments"]["maxResults"] == 5
+            assert sign_kwargs["service_name"] == "bedrock-agentcore"
+
+            assert len(response.results) == 2
+            assert response.results[0].title == "Test Result 1"
+            assert response.results[0].url == "https://example.com/1"
+            assert response.results[0].snippet == "Snippet for result 1"
+            assert response.results[0].date == "2026-06-16"
+
+    def test_transform_search_request_query_truncation(self):
+        """AgentCore rejects queries > 200 chars; the request must truncate."""
+        config = AgentCoreSearchConfig()
+        long_query = "a" * 300
+        data = config.transform_search_request(query=long_query, optional_params={})
+        assert len(data["params"]["arguments"]["query"]) == 200
+
+    def test_transform_search_request_joins_list_queries(self):
+        config = AgentCoreSearchConfig()
+        data = config.transform_search_request(query=["foo", "bar"], optional_params={})
+        assert data["params"]["arguments"]["query"] == "foo bar"
+
+    def test_transform_search_request_custom_tool_name(self):
+        config = AgentCoreSearchConfig()
+        data = config.transform_search_request(query="q", optional_params={"tool_name": "my-target___WebSearch"})
+        assert data["params"]["name"] == "my-target___WebSearch"
+
+    def test_transform_search_request_rejects_non_websearch_tool_name(self):
+        """A caller-supplied tool_name must not reach other tools on the gateway."""
+        config = AgentCoreSearchConfig()
+        with pytest.raises(ValueError, match="must end with"):
+            config.transform_search_request(query="q", optional_params={"tool_name": "admin-target___DeleteUser"})
+
+    def test_transform_search_request_sends_documented_default_max_results(self):
+        """The documented default of 10 is sent explicitly, not left to the gateway."""
+        config = AgentCoreSearchConfig()
+        data = config.transform_search_request(query="q", optional_params={})
+        assert data["params"]["arguments"]["maxResults"] == 10
+
+    def test_get_complete_url_requires_gateway_url(self):
+        config = AgentCoreSearchConfig()
+        os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+        with pytest.raises(ValueError, match="AGENTCORE_GATEWAY_URL"):
+            config.get_complete_url(api_base=None, optional_params={})
+
+    def test_get_complete_url_prefers_api_base(self):
+        config = AgentCoreSearchConfig()
+        assert config.get_complete_url(api_base=GATEWAY_URL, optional_params={}) == GATEWAY_URL
+
+    def test_validate_environment_sets_mcp_headers(self):
+        """MCP Streamable HTTP requires accepting both JSON and SSE, and declaring
+        the protocol revision the client speaks."""
+        config = AgentCoreSearchConfig()
+        headers = config.validate_environment(headers={})
+        assert headers["Accept"] == "application/json, text/event-stream"
+        assert headers["Content-Type"] == "application/json"
+        assert headers["MCP-Protocol-Version"] == AGENTCORE_DEFAULT_MCP_PROTOCOL_VERSION
+
+    def test_default_protocol_version_is_the_agentcore_gateway_default(self):
+        """A default AgentCore gateway supports only 2025-03-26 and answers
+        -32600 to anything newer, so that exact revision must be the default."""
+        assert AGENTCORE_DEFAULT_MCP_PROTOCOL_VERSION == "2025-03-26"
+
+    def test_protocol_version_env_override_wins(self):
+        """A gateway pinned to a newer supportedVersions list needs the header
+        to match, so AGENTCORE_MCP_PROTOCOL_VERSION must override the default."""
+        config = AgentCoreSearchConfig()
+        with patch.dict(os.environ, {"AGENTCORE_MCP_PROTOCOL_VERSION": "2025-06-18"}):
+            headers = config.validate_environment(headers={})
+        assert headers["MCP-Protocol-Version"] == "2025-06-18"
+
+    def test_protocol_version_header_survives_signing(self):
+        """Both auth paths must keep the MCP-Protocol-Version header on the wire."""
+        config = AgentCoreSearchConfig()
+        headers = config.validate_environment(headers={})
+
+        bearer_headers, _ = config.sign_request(
+            headers=headers,
+            optional_params={},
+            request_data={"jsonrpc": "2.0"},
+            api_base=GATEWAY_URL,
+            api_key="test-jwt-token",
+        )
+        assert bearer_headers["MCP-Protocol-Version"] == AGENTCORE_DEFAULT_MCP_PROTOCOL_VERSION
+
+        with patch.dict(
+            os.environ,
+            {
+                "AWS_ACCESS_KEY_ID": "AKIAIOSFODNN7EXAMPLE",
+                "AWS_SECRET_ACCESS_KEY": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+            },
+        ):
+            signed_headers, _ = config.sign_request(
+                headers=headers,
+                optional_params={"aws_region_name": "us-east-1"},
+                request_data={"jsonrpc": "2.0"},
+                api_base=GATEWAY_URL,
+            )
+        assert signed_headers["Authorization"].startswith("AWS4-HMAC-SHA256")
+        assert signed_headers["MCP-Protocol-Version"] == AGENTCORE_DEFAULT_MCP_PROTOCOL_VERSION
+
+    def test_transform_search_response_parses_sse_frame(self):
+        """Gateway may answer with an SSE-framed JSON-RPC message."""
+        config = AgentCoreSearchConfig()
+        body = _mcp_response_body()
+        sse_text = f"event: message\ndata: {json.dumps(body)}\n\n"
+        mock_response = _make_mock_response(text=sse_text)
+
+        response = config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+        assert len(response.results) == 2
+        assert response.results[1].url == "https://example.com/2"
+
+    def test_transform_search_response_parses_multiline_sse_data(self):
+        """SSE data may be split across several data: lines (joined per spec)."""
+        config = AgentCoreSearchConfig()
+        pretty = json.dumps(_mcp_response_body(), indent=2)
+        sse_text = "event: message\n" + "\n".join(f"data: {line}" for line in pretty.splitlines()) + "\n\n"
+        mock_response = _make_mock_response(text=sse_text)
+
+        response = config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+        assert len(response.results) == 2
+
+    def test_transform_search_response_skips_progress_events(self):
+        """A progress notification before the JSON-RPC result must not shadow it."""
+        config = AgentCoreSearchConfig()
+        progress = {"jsonrpc": "2.0", "method": "notifications/progress", "params": {"progress": 1}}
+        sse_text = (
+            f"event: message\ndata: {json.dumps(progress)}\n\n"
+            f"event: message\ndata: {json.dumps(_mcp_response_body())}\n\n"
+        )
+        mock_response = _make_mock_response(text=sse_text)
+
+        response = config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+        assert len(response.results) == 2
+
+    def test_transform_search_response_raises_on_mcp_error(self):
+        config = AgentCoreSearchConfig()
+        mock_response = _make_mock_response(
+            {"jsonrpc": "2.0", "id": 1, "error": {"code": -32601, "message": "tool not found"}}
+        )
+        with pytest.raises(Exception, match="tool not found"):
+            config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+
+    def test_transform_search_response_raises_on_tool_error(self):
+        """A failed tools/call comes back as HTTP 200 with result.isError; it must not be
+        reported to the caller as a successful search with zero results."""
+        config = AgentCoreSearchConfig()
+        mock_response = _make_mock_response(
+            {
+                "jsonrpc": "2.0",
+                "id": 1,
+                "result": {
+                    "isError": True,
+                    "content": [{"type": "text", "text": "AccessDeniedException: not authorized"}],
+                },
+            }
+        )
+        with pytest.raises(Exception, match="AccessDeniedException"):
+            config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+
+    def test_transform_search_response_reads_structured_content(self):
+        """Connector 1.1.0+ puts the machine-readable results in structuredContent and may
+        leave the text block as prose, which must not come back as an empty result list."""
+        config = AgentCoreSearchConfig()
+        mock_response = _make_mock_response(
+            {
+                "jsonrpc": "2.0",
+                "id": 1,
+                "result": {
+                    "content": [{"type": "text", "text": "Here is a prose summary of what I found."}],
+                    "structuredContent": {"id": "824f89d0", "results": MCP_RESULTS},
+                },
+            }
+        )
+
+        response = config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+        assert [result.title for result in response.results] == ["Test Result 1", "Test Result 2"]
+        assert response.results[0].url == "https://example.com/1"
+        assert response.results[0].snippet == "Snippet for result 1"
+        assert response.results[0].date == "2026-06-16"
+
+    def test_transform_search_response_does_not_duplicate_structured_content(self):
+        """1.1.0+ repeats the same results in both places, so parsing both would double them."""
+        config = AgentCoreSearchConfig()
+        body = _mcp_response_body()
+        body["result"]["structuredContent"] = {"results": MCP_RESULTS}
+        mock_response = _make_mock_response(body)
+
+        response = config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+        assert len(response.results) == 2
+
+    def test_transform_search_response_parses_crlf_framed_sse(self):
+        """SSE streams may be CRLF framed; events must still split into separate events."""
+        config = AgentCoreSearchConfig()
+        progress = {"jsonrpc": "2.0", "method": "notifications/progress", "params": {"progress": 1}}
+        sse_text = (
+            f"event: message\r\ndata: {json.dumps(progress)}\r\n\r\n"
+            f"event: message\r\ndata: {json.dumps(_mcp_response_body())}\r\n\r\n"
+        )
+        mock_response = _make_mock_response(text=sse_text)
+
+        response = config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+        assert len(response.results) == 2
+        assert response.results[0].title == "Test Result 1"
+
+    def test_sign_request_uses_bearer_token_when_api_key_set(self):
+        """CUSTOM_JWT gateways: api_key is sent as a bearer token, no SigV4."""
+        config = AgentCoreSearchConfig()
+        request_data = {"jsonrpc": "2.0", "id": 1}
+
+        headers, signed_body = config.sign_request(
+            headers={"Content-Type": "application/json"},
+            optional_params={},
+            request_data=request_data,
+            api_base=GATEWAY_URL,
+            api_key="test-jwt-token",
+        )
+        assert headers["Authorization"] == "Bearer test-jwt-token"
+        assert signed_body == json.dumps(request_data).encode()
+
+    def test_sign_request_uses_bearer_token_from_env(self):
+        """Server token is attached when the request targets the configured gateway host."""
+        config = AgentCoreSearchConfig()
+        os.environ["AGENTCORE_GATEWAY_TOKEN"] = "env-jwt-token"
+        os.environ["AGENTCORE_GATEWAY_URL"] = GATEWAY_URL
+        try:
+            headers, _ = config.sign_request(
+                headers={},
+                optional_params={},
+                request_data={"jsonrpc": "2.0"},
+                api_base=GATEWAY_URL,
+            )
+            assert headers["Authorization"] == "Bearer env-jwt-token"
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_TOKEN", None)
+            os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+
+    def test_sign_request_refuses_server_token_to_untrusted_host(self):
+        """Server-managed token must not be sent to a caller-chosen api_base."""
+        config = AgentCoreSearchConfig()
+        os.environ["AGENTCORE_GATEWAY_TOKEN"] = "env-jwt-token"
+        os.environ["AGENTCORE_GATEWAY_URL"] = GATEWAY_URL
+        try:
+            with pytest.raises(ValueError, match="Refusing to send"):
+                config.sign_request(
+                    headers={},
+                    optional_params={},
+                    request_data={"jsonrpc": "2.0"},
+                    api_base="https://attacker.example.com/mcp",
+                )
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_TOKEN", None)
+            os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+
+    def test_sign_request_uses_env_token_for_gateway_api_base_without_gateway_url(self):
+        """api_base pointing at a real gateway is a trusted destination for the env token,
+        so operators configuring api_base in yaml don't also need AGENTCORE_GATEWAY_URL."""
+        config = AgentCoreSearchConfig()
+        os.environ["AGENTCORE_GATEWAY_TOKEN"] = "env-jwt-token"
+        os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+        try:
+            headers, _ = config.sign_request(
+                headers={},
+                optional_params={},
+                request_data={"jsonrpc": "2.0"},
+                api_base=GATEWAY_URL,
+            )
+            assert headers["Authorization"] == "Bearer env-jwt-token"
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_TOKEN", None)
+
+    @pytest.mark.parametrize(
+        "untrusted_api_base",
+        [
+            "https://attacker.example.com/mcp",
+            # gateway hostname in the path/query must not pass for the host
+            "https://attacker.example.com/gw.gateway.bedrock-agentcore.us-east-1.amazonaws.com/mcp",
+        ],
+    )
+    def test_sign_request_refuses_sigv4_to_untrusted_host(self, untrusted_api_base):
+        """A SigV4 signature carries the proxy's credential scope and session token, so it
+        must never be sent to a host that is not the operator's gateway."""
+        config = AgentCoreSearchConfig()
+        os.environ.pop("AGENTCORE_GATEWAY_TOKEN", None)
+        os.environ["AGENTCORE_GATEWAY_URL"] = GATEWAY_URL
+        try:
+            with patch.object(
+                AgentCoreSearchConfig.__mro__[2],  # BaseAWSLLM
+                "_sign_request",
+                return_value=({}, b"{}"),
+            ) as mock_base_sign:
+                with pytest.raises(ValueError, match="Refusing to send"):
+                    config.sign_request(
+                        headers={},
+                        optional_params={"aws_region_name": "us-east-1"},
+                        request_data={"jsonrpc": "2.0"},
+                        api_base=untrusted_api_base,
+                    )
+                mock_base_sign.assert_not_called()
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+
+    @pytest.mark.parametrize(
+        "plaintext_api_base",
+        [
+            "http://gw.gateway.bedrock-agentcore.us-east-1.amazonaws.com/mcp",
+            "http://internal-gateway.corp/mcp",
+        ],
+    )
+    def test_sign_request_refuses_server_token_over_plaintext_http(self, plaintext_api_base):
+        """A trusted hostname over plain http would expose the bearer token to
+        network observers, so credentials only ride https (or localhost)."""
+        config = AgentCoreSearchConfig()
+        os.environ["AGENTCORE_GATEWAY_TOKEN"] = "env-jwt-token"
+        os.environ["AGENTCORE_GATEWAY_URL"] = plaintext_api_base
+        try:
+            with pytest.raises(ValueError, match="plaintext"):
+                config.sign_request(
+                    headers={},
+                    optional_params={},
+                    request_data={"jsonrpc": "2.0"},
+                    api_base=plaintext_api_base,
+                )
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_TOKEN", None)
+            os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+
+    def test_sign_request_refuses_sigv4_over_plaintext_http(self):
+        """Same for SigV4: a signature over plain http is replayable by observers."""
+        config = AgentCoreSearchConfig()
+        os.environ.pop("AGENTCORE_GATEWAY_TOKEN", None)
+        with patch.object(
+            AgentCoreSearchConfig.__mro__[2],  # BaseAWSLLM
+            "_sign_request",
+            return_value=({}, b"{}"),
+        ) as mock_base_sign:
+            with pytest.raises(ValueError, match="plaintext"):
+                config.sign_request(
+                    headers={},
+                    optional_params={"aws_region_name": "us-east-1"},
+                    request_data={"jsonrpc": "2.0"},
+                    api_base="http://gw.gateway.bedrock-agentcore.us-east-1.amazonaws.com/mcp",
+                )
+            mock_base_sign.assert_not_called()
+
+    def test_sign_request_allows_plain_http_for_localhost(self):
+        """Local development against an MCP stub on 127.0.0.1 keeps working."""
+        config = AgentCoreSearchConfig()
+        os.environ["AGENTCORE_GATEWAY_TOKEN"] = "env-jwt-token"
+        os.environ["AGENTCORE_GATEWAY_URL"] = "http://127.0.0.1:8931/mcp"
+        try:
+            headers, _ = config.sign_request(
+                headers={},
+                optional_params={},
+                request_data={"jsonrpc": "2.0"},
+                api_base="http://127.0.0.1:8931/mcp",
+            )
+            assert headers["Authorization"] == "Bearer env-jwt-token"
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_TOKEN", None)
+            os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+
+    def test_sign_request_does_not_leak_bedrock_bearer_token(self):
+        """AWS_BEARER_TOKEN_BEDROCK is a Bedrock Runtime credential — it must not
+        replace SigV4 on requests to an AgentCore gateway."""
+        config = AgentCoreSearchConfig()
+
+        with patch.object(
+            AgentCoreSearchConfig.__mro__[2],  # BaseAWSLLM
+            "_sign_request",
+            return_value=({}, b"{}"),
+        ) as mock_base_sign:
+            config.sign_request(
+                headers={},
+                optional_params={},
+                request_data={"jsonrpc": "2.0"},
+                api_base=GATEWAY_URL,
+            )
+            # api_key="" (falsy, not None) disables the base class's
+            # AWS_BEARER_TOKEN_BEDROCK env fallback.
+            assert mock_base_sign.call_args.kwargs["api_key"] == ""
+
+    def test_sign_request_custom_hostname_requires_region(self):
+        """Custom hostname + empty AWS config chain → clear error, no guessed region."""
+        config = AgentCoreSearchConfig()
+        custom_url = "https://gateway.internal.example.com/mcp"
+        os.environ["AGENTCORE_GATEWAY_URL"] = custom_url
+
+        mock_session = MagicMock()
+        mock_session.region_name = None  # nothing configured anywhere
+        try:
+            with patch("boto3.Session", return_value=mock_session):
+                with pytest.raises(ValueError, match="signing region"):
+                    config.sign_request(
+                        headers={},
+                        optional_params={},
+                        request_data={"jsonrpc": "2.0"},
+                        api_base=custom_url,
+                    )
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+
+    def test_sign_request_custom_hostname_uses_shared_config_region(self):
+        """Custom hostname + region from AWS shared config (profile) must be honored."""
+        config = AgentCoreSearchConfig()
+        custom_url = "https://gateway.internal.example.com/mcp"
+        os.environ["AGENTCORE_GATEWAY_URL"] = custom_url
+
+        mock_session = MagicMock()
+        mock_session.region_name = "eu-west-1"  # e.g. from ~/.aws/config profile
+        try:
+            with (
+                patch("boto3.Session", return_value=mock_session),
+                patch.object(
+                    AgentCoreSearchConfig.__mro__[2],  # BaseAWSLLM
+                    "_sign_request",
+                    return_value=({}, b"{}"),
+                ) as mock_base_sign,
+            ):
+                config.sign_request(
+                    headers={},
+                    optional_params={},
+                    request_data={"jsonrpc": "2.0"},
+                    api_base=custom_url,
+                )
+                assert mock_base_sign.call_args.kwargs["optional_params"]["aws_region_name"] == "eu-west-1"
+        finally:
+            os.environ.pop("AGENTCORE_GATEWAY_URL", None)
+
+    def test_sign_request_passes_explicit_aws_credentials(self):
+        """Explicit aws_* params (e.g. from a proxy search_tools entry) reach the signer."""
+        config = AgentCoreSearchConfig()
+
+        with patch.object(
+            AgentCoreSearchConfig.__mro__[2],  # BaseAWSLLM
+            "_sign_request",
+            return_value=({}, b"{}"),
+        ) as mock_base_sign:
+            config.sign_request(
+                headers={},
+                optional_params={
+                    "aws_access_key_id": "AKIATEST",
+                    "aws_secret_access_key": "secret",
+                    "aws_session_token": "token",
+                },
+                request_data={"jsonrpc": "2.0"},
+                api_base=GATEWAY_URL,
+            )
+            passed = mock_base_sign.call_args.kwargs["optional_params"]
+            assert passed["aws_access_key_id"] == "AKIATEST"
+            assert passed["aws_secret_access_key"] == "secret"
+            assert passed["aws_session_token"] == "token"
+
+    def test_sign_request_derives_region_from_gateway_url(self):
+        """Signing region must come from the gateway URL, not the caller's default region."""
+        config = AgentCoreSearchConfig()
+        eu_url = "https://gw-x.gateway.bedrock-agentcore.eu-central-1.amazonaws.com/mcp"
+
+        with patch.object(
+            AgentCoreSearchConfig.__mro__[2],  # BaseAWSLLM
+            "_sign_request",
+            return_value=({}, b"{}"),
+        ) as mock_base_sign:
+            config.sign_request(
+                headers={},
+                optional_params={},
+                request_data={"jsonrpc": "2.0"},
+                api_base=eu_url,
+            )
+            assert mock_base_sign.call_args.kwargs["optional_params"]["aws_region_name"] == "eu-central-1"
+
+
+class TestAgentCoreSearchEdgeCases:
+    """Branch coverage for response parsing and error mapping."""
+
+    def test_transform_search_response_skips_non_text_and_bad_json_blocks(self):
+        """Non-text blocks and unparseable text blocks are skipped, not fatal."""
+        config = AgentCoreSearchConfig()
+        body = {
+            "jsonrpc": "2.0",
+            "id": 1,
+            "result": {
+                "content": [
+                    {"type": "image", "data": "..."},
+                    {"type": "text", "text": "not-json"},
+                    {"type": "text", "text": json.dumps(["scalar", {"title": "T", "url": "u", "text": "s"}])},
+                ]
+            },
+        }
+        mock_response = _make_mock_response(body)
+
+        response = config.transform_search_response(raw_response=mock_response, logging_obj=MagicMock())
+        # only the one dict item survives; non-dict list entries are skipped
+        assert len(response.results) == 1
+        assert response.results[0].title == "T"
+
+    def test_parse_mcp_body_sse_without_json_frame_raises(self):
+        """An SSE stream carrying no parseable JSON object is a 502."""
+        config = AgentCoreSearchConfig()
+        mock_response = _make_mock_response(text="event: ping\ndata: not-json\n\n")
+        with pytest.raises(Exception, match="SSE without a JSON data frame"):
+            config._parse_mcp_body(mock_response)
+
+    def test_parse_mcp_body_returns_last_event_when_no_result_frame(self):
+        """A stream of only notifications returns the last parsed event."""
+        config = AgentCoreSearchConfig()
+        note = {"jsonrpc": "2.0", "method": "notifications/progress"}
+        mock_response = _make_mock_response(text=f"data: {json.dumps(note)}\n\n")
+        assert config._parse_mcp_body(mock_response) == note
+
+    def test_sign_request_rejects_list_request_body(self):
+        config = AgentCoreSearchConfig()
+        with pytest.raises(TypeError, match="single dict"):
+            config.sign_request(
+                headers={},
+                optional_params={},
+                request_data=[{"jsonrpc": "2.0"}],
+                api_base=GATEWAY_URL,
+            )
+
+    def test_get_error_class_maps_status_and_message(self):
+        config = AgentCoreSearchConfig()
+        err = config.get_error_class(error_message="boom", status_code=503, headers={})
+        assert getattr(err, "status_code", None) == 503
+        assert "boom" in str(err)
+
+    def test_search_cost_lookup_is_mapped(self, monkeypatch):
+        """Assert against the map in this checkout: the remote cost map litellm loads by
+        default only carries providers already released."""
+        from litellm.litellm_core_utils.get_model_cost_map import GetModelCostMap
+        from litellm.search.cost_calculator import search_provider_cost_per_query
+
+        monkeypatch.setattr(litellm, "model_cost", GetModelCostMap.load_local_model_cost_map())
+        assert search_provider_cost_per_query(model="agentcore/search", custom_llm_provider="agentcore") == (0.0, 0.0)
diff --git a/tests/test_litellm/llms/custom_httpx/test_llm_http_handler.py b/tests/test_litellm/llms/custom_httpx/test_llm_http_handler.py
index 69f2312f203..9e9242137e6 100644
--- a/tests/test_litellm/llms/custom_httpx/test_llm_http_handler.py
+++ b/tests/test_litellm/llms/custom_httpx/test_llm_http_handler.py
@@ -2226,3 +2226,78 @@ def test_direct_vector_store_search_debug_log_omits_stored_credentials(caplog, i
     logged = "\n".join(record.getMessage() for record in caplog.records)
     assert "sup3r-s3cret-valkey-pw" not in logged
     assert "sk-embedding-s3cret" not in logged
+
+
+@pytest.mark.asyncio
+async def test_async_anthropic_messages_handler_carries_deployment_vertex_location_for_pricing(monkeypatch):
+    """
+    The proxy pre-creates the logging object before the router picks a deployment, so the
+    native /v1/messages path must copy the deployment's vertex_location into the logging
+    params it updates; otherwise cost resolution falls back to the environment and every
+    call on this surface prices with the regional uplift (#34393).
+    """
+    import contextlib
+    from datetime import datetime
+
+    from litellm.litellm_core_utils.litellm_logging import (
+        Logging,
+        _resolve_vertex_location_for_cost,
+    )
+
+    monkeypatch.setenv("VERTEXAI_LOCATION", "us-east5")
+    monkeypatch.setattr(litellm, "vertex_location", None)
+
+    handler = BaseLLMHTTPHandler()
+
+    async def logging_obj_after_handler(generic_params):
+        logging_obj = Logging(
+            model="vertex_ai/claude-haiku-4-5@20251001",
+            messages=[{"role": "user", "content": "hi"}],
+            stream=False,
+            call_type="anthropic_messages",
+            start_time=datetime.now(),
+            litellm_call_id="vertex-messages-location",
+            function_id="f",
+        )
+        logging_obj.update_environment_variables(
+            model="vertex_ai/claude-haiku-4-5@20251001",
+            user="",
+            optional_params={},
+            litellm_params={"api_base": ""},
+            custom_llm_provider="vertex_ai",
+        )
+        mock_config = Mock()
+        mock_config.validate_anthropic_messages_environment = Mock(
+            return_value=({"authorization": "Bearer t"}, "https://us-east5-aiplatform.googleapis.com")
+        )
+        mock_config.transform_anthropic_messages_request = Mock(
+            return_value={"model": "claude-haiku-4-5@20251001", "messages": []}
+        )
+        with contextlib.suppress(Exception):
+            await handler.async_anthropic_messages_handler(
+                model="claude-haiku-4-5@20251001",
+                messages=[{"role": "user", "content": "hi"}],
+                anthropic_messages_provider_config=mock_config,
+                anthropic_messages_optional_request_params={"max_tokens": 10},
+                custom_llm_provider="vertex_ai",
+                litellm_params=generic_params,
+                logging_obj=logging_obj,
+                client=AsyncMock(),
+                kwargs={},
+            )
+        return logging_obj
+
+    global_deployment = await logging_obj_after_handler(GenericLiteLLMParams(vertex_location="global"))
+    assert global_deployment.litellm_params["vertex_location"] == "global"
+    assert (
+        _resolve_vertex_location_for_cost(
+            custom_llm_provider="vertex_ai",
+            litellm_params=global_deployment.litellm_params,
+            optional_params=global_deployment.optional_params,
+            model="claude-haiku-4-5@20251001",
+        )
+        == "global"
+    )
+
+    unconfigured_deployment = await logging_obj_after_handler(GenericLiteLLMParams())
+    assert "vertex_location" not in unconfigured_deployment.litellm_params
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 9064312fd6d..5ee8143fb8e 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
@@ -4395,8 +4395,12 @@ class TestMCPServerManager:
 
         captured: dict = {}
 
-        def fake_create_tool_function(path, method, operation, base_url, headers=None):
+        def fake_create_tool_function(
+            path, method, operation, base_url, headers=None, server_label=None, relays_upstream_auth=False
+        ):
             captured["headers"] = headers
+            captured["server_label"] = server_label
+            captured["relays_upstream_auth"] = relays_upstream_auth
 
             async def tool_func(**kwargs):
                 return "ok"
@@ -4425,6 +4429,11 @@ class TestMCPServerManager:
 
         assert captured["headers"] is not None
         assert captured["headers"]["Authorization"] == "STATIC token"
+        # The label names the server in an upstream-failure error, so registration must thread it;
+        # without this the fake would simply tolerate the argument and prove nothing about it.
+        assert captured["server_label"] == "openapi-server"
+        # auth_type is none here, so a 401 from this upstream must not be dressed up as a re-auth signal
+        assert captured["relays_upstream_auth"] is False
 
     @pytest.mark.asyncio
     async def test_pre_call_tool_check_allowed_tools_list_allows_tool(self):
@@ -10765,3 +10774,61 @@ class TestResolveOpenapiToolAuth:
         )
 
         assert "Authorization" not in (forwarded or {})
+
+
+class TestOpenApiHandlerRelaysUpstreamAuth:
+    """`_call_openapi_tool_handler` must not flatten a re-auth signal into a generic message.
+
+    Its catch-all turned every exception into "Error calling OpenAPI tool ...", which is an isError
+    result but loses the status, so the REST surface could no longer relay a 401 with the upstream's
+    WWW-Authenticate and the streamable surface could not name the status the caller must act on.
+    """
+
+    @staticmethod
+    def _server() -> MCPServer:
+        return MCPServer(
+            server_id="srv-openapi",
+            name="report_api",
+            server_name="report_api",
+            url="https://api.example.com",
+            transport=MCPTransport.http,
+            auth_type=MCPAuth.oauth_delegate,
+            spec_path="https://api.example.com/openapi.json",
+        )
+
+    @pytest.mark.asyncio
+    async def test_upstream_auth_error_keeps_its_type(self):
+        from litellm.proxy._experimental.mcp_server.exceptions import MCPUpstreamAuthError
+        from litellm.proxy._experimental.mcp_server.tool_registry import global_mcp_tool_registry
+
+        manager = MCPServerManager()
+        server = self._server()
+
+        async def raising_handler(**_kwargs):
+            raise MCPUpstreamAuthError(status_code=401, www_authenticate="Bearer realm=x", server_name="report_api")
+
+        tool = MagicMock()
+        tool.handler = raising_handler
+        with patch.object(global_mcp_tool_registry, "get_tool", return_value=tool):
+            with pytest.raises(MCPUpstreamAuthError) as exc:
+                await manager._call_openapi_tool_handler(server, "list_reports", {})
+
+        assert exc.value.status_code == 401
+        assert exc.value.www_authenticate == "Bearer realm=x"
+
+    @pytest.mark.asyncio
+    async def test_other_failures_still_become_an_error_result(self):
+        from litellm.proxy._experimental.mcp_server.tool_registry import global_mcp_tool_registry
+
+        manager = MCPServerManager()
+
+        async def raising_handler(**_kwargs):
+            raise RuntimeError("upstream returned HTTP 503")
+
+        tool = MagicMock()
+        tool.handler = raising_handler
+        with patch.object(global_mcp_tool_registry, "get_tool", return_value=tool):
+            result = await manager._call_openapi_tool_handler(self._server(), "list_reports", {})
+
+        assert result.isError is True
+        assert "upstream returned HTTP 503" in result.content[0].text
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py
index 1f9316ee9c8..e59616e53c1 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_to_mcp_generator.py
@@ -27,12 +27,21 @@ from litellm.proxy._experimental.mcp_server.openapi_to_mcp_generator import (
     resolve_operation_params,
 )
 
+from litellm.proxy._experimental.mcp_server.exceptions import (
+    MCPOpenApiUpstreamError,
+    MCPUpstreamAuthError,
+)
+
 GET_ASYNC_CLIENT_TARGET = "litellm.proxy._experimental.mcp_server.openapi_to_mcp_generator.get_async_httpx_client"
 
 
-def _create_mock_client(method: str, response_text: str) -> AsyncMock:
-    """Utility to create a mocked async httpx client for the given method."""
-    response = SimpleNamespace(text=response_text)
+def _create_mock_client(method: str, response_text: str, status_code: int = 200) -> AsyncMock:
+    """Utility to create a mocked async httpx client for the given method.
+
+    ``status_code`` and ``headers`` are part of the real response the tool function reads, so the
+    fake carries them too; a fake that omits them cannot observe whether the status is checked.
+    """
+    response = SimpleNamespace(text=response_text, status_code=status_code, headers={})
     client = AsyncMock()
     setattr(client, method, AsyncMock(return_value=response))
     return client
@@ -1259,3 +1268,113 @@ class TestRequestExtraHeaders:
 
             headers_sent = async_client.get.call_args[1]["headers"]
             assert "Authorization" not in headers_sent
+
+
+class TestUpstreamStatusIsClassified:
+    """A non-2xx upstream must never be returned as tool output.
+
+    The body used to be returned verbatim whatever the status, so an upstream rejection arrived as a
+    successful tool result and the request logged as a success. 401 is singled out because it is the
+    only status the caller can act on by re-authenticating, matching `_call_regular_mcp_tool` where a
+    403 deliberately does not produce a challenge.
+    """
+
+    @staticmethod
+    def _tool(status_code: int, text: str = "body", headers: dict | None = None, relays_upstream_auth: bool = True):
+        response = SimpleNamespace(text=text, status_code=status_code, headers=headers or {})
+        client = AsyncMock()
+        client.get = AsyncMock(return_value=response)
+        return create_tool_function(
+            "/reports",
+            "get",
+            {"operationId": "list_reports"},
+            "https://api.example.com",
+            server_label="report_api",
+            relays_upstream_auth=relays_upstream_auth,
+        ), client
+
+    @pytest.mark.asyncio
+    async def test_success_still_returns_the_body(self):
+        tool, client = self._tool(200, text='{"reports": []}')
+        with patch(GET_ASYNC_CLIENT_TARGET, return_value=client):
+            assert await tool() == '{"reports": []}'
+
+    @pytest.mark.asyncio
+    async def test_401_raises_the_reauth_signal_carrying_the_challenge(self):
+        tool, client = self._tool(401, text='{"error":"invalid_token"}', headers={"www-authenticate": 'Bearer realm="x"'})
+        with patch(GET_ASYNC_CLIENT_TARGET, return_value=client):
+            with pytest.raises(MCPUpstreamAuthError) as exc:
+                await tool()
+
+        assert exc.value.status_code == 401
+        assert exc.value.www_authenticate == 'Bearer realm="x"'
+        assert exc.value.server_name == "report_api"
+
+    @pytest.mark.asyncio
+    async def test_401_on_a_non_forwarding_server_is_not_a_reauth_signal(self):
+        """Only the client-forwarded modes carry the caller's own upstream token, so only they can act
+        on a 401. `_call_regular_mcp_tool` gates its signal the same way, and without the gate an
+        api_key server rejecting a token would push clients into an OAuth flow that does not apply."""
+        tool, client = self._tool(401, text='{"error":"bad key"}', relays_upstream_auth=False)
+        with patch(GET_ASYNC_CLIENT_TARGET, return_value=client):
+            with pytest.raises(MCPOpenApiUpstreamError) as exc:
+                await tool()
+
+        assert exc.value.status_code == 401
+
+    @pytest.mark.parametrize("method", ["post", "put", "patch", "delete"])
+    @pytest.mark.parametrize("status_code, expected", [(401, "auth"), (500, "other")])
+    @pytest.mark.asyncio
+    async def test_non_get_methods_are_classified_too(self, method: str, status_code: int, expected: str):
+        """post/put/patch/delete call raise_for_status inside the HTTP handler.
+
+        Only `get` hands a 4xx back to the caller; the others raise `MaskedHTTPStatusError` before any
+        status check the tool function could do, so classifying the returned response alone would
+        leave every non-GET tool still serving an upstream error body as successful tool output. A
+        fake client that simply returns a response cannot observe this, which is why this test builds
+        the error the real handler raises.
+        """
+        import httpx
+
+        from litellm.llms.custom_httpx.http_handler import MaskedHTTPStatusError
+
+        request = httpx.Request(method.upper(), "https://api.example.com/reports")
+        raw = httpx.Response(
+            status_code,
+            headers={"www-authenticate": 'Bearer realm="x"'},
+            text="internal hostname db-prod-7.corp.example.com",
+            request=request,
+        )
+        masked = MaskedHTTPStatusError(httpx.HTTPStatusError("boom", request=request, response=raw))
+
+        client = AsyncMock()
+        setattr(client, method, AsyncMock(side_effect=masked))
+        tool = create_tool_function(
+            "/reports",
+            method,
+            {"operationId": "list_reports"},
+            "https://api.example.com",
+            server_label="report_api",
+            relays_upstream_auth=True,
+        )
+
+        expected_type = MCPUpstreamAuthError if expected == "auth" else MCPOpenApiUpstreamError
+        with patch(GET_ASYNC_CLIENT_TARGET, return_value=client):
+            with pytest.raises(expected_type) as exc:
+                await tool()
+
+        assert exc.value.status_code == status_code
+        assert "db-prod-7" not in str(exc.value)
+
+    @pytest.mark.parametrize("status_code", [403, 404, 429, 500, 503])
+    @pytest.mark.asyncio
+    async def test_other_failures_raise_without_leaking_the_upstream_body(self, status_code: int):
+        secret_body = "internal hostname db-prod-7.corp.example.com and a stack trace"
+        tool, client = self._tool(status_code, text=secret_body)
+        with patch(GET_ASYNC_CLIENT_TARGET, return_value=client):
+            with pytest.raises(MCPOpenApiUpstreamError) as exc:
+                await tool()
+
+        assert exc.value.status_code == status_code
+        assert secret_body not in str(exc.value)
+        assert str(exc.value) == f"upstream returned HTTP {status_code}"
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_tool_auth.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_tool_auth.py
index 7bd846aeda4..bd953dc55f3 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_tool_auth.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_openapi_tool_auth.py
@@ -652,3 +652,80 @@ async def test_per_server_auth_header_reaches_both_openapi_dispatch_arms(dispatc
     assert captured["resolver_credential"] == {"Authorization": OPENAPI_PER_SERVER_TOKEN}
     assert captured["injected"] == OPENAPI_PER_SERVER_TOKEN
     assert _request_auth_header.get() is None
+
+
+@pytest.mark.parametrize("failure", ["auth", "other"])
+@pytest.mark.asyncio
+async def test_local_dispatch_reports_the_outcome_instead_of_success(failure: str):
+    """A failing local handler must never be reported as a successful tool result, and only an auth
+    failure may propagate.
+
+    `_handle_local_mcp_tool` used to catch every exception and return it as TextContent, and both of
+    its callers then stamped `isError=False`, so an upstream rejection was served as tool output and
+    `extract_mcp_tool_result_error_message` logged the request as a success.
+
+    The two kinds are split by consequence. `MCPUpstreamAuthError` propagates because both renderers
+    know it: the streamable path names the status and the REST path relays a real 401 with the
+    upstream's WWW-Authenticate. Anything else is reported as `isError=True` right here, because
+    `call_tool_rest_api` turns an unrecognized exception into HTTP 500 and an upstream 403 or 429 is
+    not a gateway crash.
+    """
+    from litellm.proxy._experimental.mcp_server import server as mcp_module
+    from litellm.proxy._experimental.mcp_server.exceptions import (
+        MCPOpenApiUpstreamError,
+        MCPUpstreamAuthError,
+    )
+
+    error = (
+        MCPUpstreamAuthError(status_code=401, www_authenticate=None, server_name="report_api")
+        if failure == "auth"
+        else MCPOpenApiUpstreamError(429, "report_api")
+    )
+
+    async def raising_handler(**_kwargs):
+        raise error
+
+    fake_tool = MagicMock()
+    fake_tool.name = "list_reports"
+    fake_tool.handler = raising_handler
+    server = MCPServer(
+        server_id="srv-openapi",
+        name="report_api",
+        server_name="report_api",
+        url="https://api.example.com",
+        transport=MCPTransport.http,
+        auth_type=MCPAuth.oauth_delegate,
+        spec_path="https://api.example.com/openapi.json",
+    )
+    user = UserAPIKeyAuth(api_key="sk-user", user_id="alice", user_role=LitellmUserRoles.INTERNAL_USER.value)
+
+    with (
+        patch.object(mcp_module.global_mcp_server_manager, "_get_mcp_server_from_tool_name", return_value=server),
+        patch.object(mcp_module.global_mcp_server_manager, "pre_call_tool_check", new=AsyncMock(return_value={})),
+        patch.object(mcp_module.global_mcp_tool_registry, "get_tool", return_value=fake_tool),
+        patch.object(
+            mcp_module.global_mcp_server_manager,
+            "resolve_openapi_upstream_auth",
+            new=AsyncMock(return_value=(None, None)),
+        ),
+        patch(
+            "litellm.proxy._experimental.mcp_server.server.MCPRequestHandler.is_tool_allowed",
+            return_value=True,
+        ),
+    ):
+        call = mcp_module.execute_mcp_tool(
+            name="list_reports",
+            arguments={},
+            allowed_mcp_servers=[server],
+            start_time=datetime.now(timezone.utc),
+            user_api_key_auth=user,
+        )
+        if failure == "auth":
+            with pytest.raises(MCPUpstreamAuthError):
+                await call
+            return
+        result = await call
+
+    # A non-auth upstream failure stays a 200 with isError, so REST does not report it as a gateway 500
+    assert result.isError is True
+    assert "upstream returned HTTP 429" in result.content[0].text
diff --git a/tests/test_litellm/proxy/auth/test_auth_checks.py b/tests/test_litellm/proxy/auth/test_auth_checks.py
index 270f3eca0f9..1d1bd9ebf8a 100644
--- a/tests/test_litellm/proxy/auth/test_auth_checks.py
+++ b/tests/test_litellm/proxy/auth/test_auth_checks.py
@@ -6392,3 +6392,168 @@ def test_is_user_proxy_admin_rejects_view_only_admin():
     assert _is_user_proxy_admin(user_obj=viewer) is False
     assert _is_user_proxy_admin(user_obj=admin) is True
     assert _is_user_proxy_admin(user_obj=None) is False
+
+
+def _make_wildcard_access_group_router():
+    """
+    `openai/*` tagged into an access group, plus an untagged `azure/*`, mirroring a
+    proxy that fronts a whole provider behind one wildcard deployment.
+    """
+    from litellm import Router
+
+    return Router(
+        model_list=[
+            {
+                "model_name": "openai/*",
+                "litellm_params": {"model": "openai/*", "api_key": "fake"},
+                "model_info": {
+                    "id": "wildcard-openai",
+                    "access_groups": ["default-models"],
+                },
+            },
+            {
+                "model_name": "azure/*",
+                "litellm_params": {"model": "azure/*", "api_key": "fake"},
+                "model_info": {"id": "wildcard-azure"},
+            },
+        ]
+    )
+
+
+def test_can_object_call_model_access_group_wildcard_accepts_bare_model_name():
+    """
+    Regression: a key holding only the access group name was denied for `gpt-4o`
+    while `openai/gpt-4o` was allowed, because group membership resolved through the
+    pattern router's raw regex and skipped the `{provider}/{model}` retry that both
+    routing and the direct-wildcard grant already perform.
+    """
+    from litellm.proxy.auth.auth_checks import _can_object_call_model
+
+    router = _make_wildcard_access_group_router()
+
+    assert (
+        _can_object_call_model(
+            model="gpt-4o",
+            llm_router=router,
+            models=["default-models"],
+            object_type="key",
+        )
+        is True
+    )
+
+
+def test_can_object_call_model_access_group_wildcard_accepts_prefixed_model_name():
+    from litellm.proxy.auth.auth_checks import _can_object_call_model
+
+    router = _make_wildcard_access_group_router()
+
+    assert (
+        _can_object_call_model(
+            model="openai/gpt-4o",
+            llm_router=router,
+            models=["default-models"],
+            object_type="key",
+        )
+        is True
+    )
+
+
+@pytest.mark.parametrize(
+    "model",
+    [
+        "totally-made-up-model-zzz",  # no provider can be inferred
+        "azure/some-deployment",  # wildcard exists but carries no access group
+    ],
+)
+def test_can_object_call_model_access_group_wildcard_does_not_over_grant(model):
+    """The bare-name retry must not turn an access group into a blanket grant."""
+    from litellm.proxy._types import ProxyException
+    from litellm.proxy.auth.auth_checks import _can_object_call_model
+
+    router = _make_wildcard_access_group_router()
+
+    with pytest.raises(ProxyException):
+        _can_object_call_model(
+            model=model,
+            llm_router=router,
+            models=["default-models"],
+            object_type="key",
+        )
+
+
+def test_can_object_call_model_access_group_rejects_unconsumed_namespace():
+    """
+    `bedrockz/...` infers provider `bedrock` from a fragment of the name, so
+    re-prefixing would smuggle an unrecognized namespace through a `bedrock/*` group.
+    """
+    from litellm import Router
+    from litellm.proxy._types import ProxyException
+    from litellm.proxy.auth.auth_checks import _can_object_call_model
+
+    router = Router(
+        model_list=[
+            {
+                "model_name": "bedrock/*",
+                "litellm_params": {"model": "bedrock/*"},
+                "model_info": {
+                    "id": "wildcard-bedrock",
+                    "access_groups": ["bedrock-models"],
+                },
+            }
+        ]
+    )
+
+    assert (
+        _can_object_call_model(
+            model="anthropic.claude-3-5-sonnet-20240620-v1:0",
+            llm_router=router,
+            models=["bedrock-models"],
+            object_type="key",
+        )
+        is True
+    )
+
+    with pytest.raises(ProxyException):
+        _can_object_call_model(
+            model="bedrockz/anthropic.claude-3-5-sonnet-20240620-v1:0",
+            llm_router=router,
+            models=["bedrock-models"],
+            object_type="key",
+        )
+
+
+def test_can_object_call_model_team_scoped_wildcard_accepts_bare_model_name():
+    """
+    Same regression as the proxy-wide wildcard, but for a team-scoped deployment
+    whose public name is a wildcard: those live in a separate per-team pattern
+    index that needed the same `{provider}/{model}` retry.
+    """
+    from litellm import Router
+    from litellm.proxy.auth.auth_checks import _can_object_call_model
+
+    router = Router(
+        model_list=[
+            {
+                "model_name": "openai/*_team-a_abc",
+                "litellm_params": {"model": "openai/*", "api_key": "fake"},
+                "model_info": {
+                    "id": "team-byok-wildcard",
+                    "team_id": "team-a",
+                    "team_public_model_name": "openai/*",
+                    "access_groups": ["team-models"],
+                },
+            }
+        ]
+    )
+
+    for model in ("gpt-4o", "openai/gpt-4o"):
+        assert (
+            _can_object_call_model(
+                model=model,
+                llm_router=router,
+                models=["team-models"],
+                object_type="team",
+                team_id="team-a",
+            )
+            is True
+        )
diff --git a/tests/test_litellm/proxy/client/cli/test_auth_commands.py b/tests/test_litellm/proxy/client/cli/test_auth_commands.py
index f0aa49ff123..59048067674 100644
--- a/tests/test_litellm/proxy/client/cli/test_auth_commands.py
+++ b/tests/test_litellm/proxy/client/cli/test_auth_commands.py
@@ -25,6 +25,7 @@ from litellm.proxy.client.cli.commands.auth import (
     save_token,
     whoami,
 )
+from litellm.proxy.client.cli.commands.claude_settings import SettingsFileOwner
 
 
 def _mock_cli_sso_start_response(
@@ -267,7 +268,7 @@ class TestTokenUtilities:
     def test_load_token_io_error(self):
         """Test loading token with IO error"""
         with (
-            patch("builtins.open", side_effect=IOError("Permission denied")),
+            patch("builtins.open", side_effect=OSError("Permission denied")),
             patch("litellm.proxy.client.cli.commands.auth.get_token_file_path") as mock_path,
             patch("os.path.exists", return_value=True),
         ):
@@ -1029,3 +1030,83 @@ class TestSaveTokenPrivateWrite:
 
         assert json.loads(token_file.read_text()) == {"key": "sk-original", "timestamp": 1234567890}
         assert list(token_file.parent.glob(".tmp-*")) == []
+
+
+class TestLoginConfigClaude:
+    """`lite login --config-claude` wiring into ~/.claude/settings.json"""
+
+    def setup_method(self):
+        self.runner = CliRunner()
+
+    def _run_login(self, tmp_path, args, base_url="https://test.example.com"):
+        settings_path = tmp_path / "claude" / "settings.json"
+        backup_path = tmp_path / "claude_settings_backup.json"
+        poll_response = Mock()
+        poll_response.status_code = 200
+        poll_response.json.return_value = {
+            "status": "ready",
+            "key": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.jwt",
+            "user_id": "test-user-123",
+            "team_id": "team-1",
+            "teams": ["team-1"],
+        }
+        with (
+            patch("webbrowser.open"),
+            patch("requests.post", return_value=_mock_cli_sso_start_response()),
+            patch("requests.get", return_value=poll_response),
+            patch("litellm.proxy.client.cli.commands.auth.save_token"),
+            patch("litellm.proxy.client.cli.interface.show_commands"),
+            patch("litellm.proxy.client.cli.commands.auth.CLAUDE_SETTINGS_PATH", settings_path),
+            patch(
+                "litellm.proxy.client.cli.commands.auth.SETTINGS_FILE_OWNERS",
+                (SettingsFileOwner(backup_path, "lite up", "lite down"),),
+            ),
+            patch(
+                "litellm.proxy.client.cli.commands.claude_settings.shutil.which",
+                return_value="/usr/local/bin/lite",
+            ),
+        ):
+            result = self.runner.invoke(login, args, obj={"base_url": base_url})
+        return result, settings_path, backup_path
+
+    def test_default_login_does_not_touch_claude_settings(self, tmp_path):
+        result, settings_path, _backup_path = self._run_login(tmp_path, [])
+
+        assert result.exit_code == 0
+        assert "Login successful!" in result.output
+        assert not settings_path.exists()
+        assert "Configured Claude Code" not in result.output
+
+    def test_flag_writes_the_settings_file_and_reports_success(self, tmp_path):
+        result, settings_path, _backup_path = self._run_login(tmp_path, ["--config-claude"])
+
+        assert result.exit_code == 0
+        written = json.loads(settings_path.read_text())
+        assert written["env"]["ANTHROPIC_BASE_URL"] == "https://test.example.com"
+        assert written["apiKeyHelper"] == "/usr/local/bin/lite --base-url https://test.example.com auth print-token"
+        assert "Configured Claude Code" in result.output
+
+    def test_flag_preserves_unrelated_settings_on_an_existing_file(self, tmp_path):
+        settings_path = tmp_path / "claude" / "settings.json"
+        settings_path.parent.mkdir(parents=True)
+        settings_path.write_text(json.dumps({"theme": "dark", "env": {"KEEP": "me"}}))
+
+        result, _settings_path, _backup_path = self._run_login(tmp_path, ["--config-claude"])
+
+        assert result.exit_code == 0
+        written = json.loads(settings_path.read_text())
+        assert written["theme"] == "dark"
+        assert written["env"]["KEEP"] == "me"
+
+    def test_settings_failure_is_reported_without_claiming_login_failed(self, tmp_path):
+        settings_path = tmp_path / "claude" / "settings.json"
+        settings_path.parent.mkdir(parents=True)
+        settings_path.write_text("not json at all {{{")
+
+        result, _settings_path, _backup_path = self._run_login(tmp_path, ["--config-claude"])
+
+        assert result.exit_code != 0
+        assert "Login successful!" in result.output
+        assert "could not configure Claude Code" in result.output
+        assert "invalid JSON" in result.output
+        assert "Authentication failed" not in result.output
diff --git a/tests/test_litellm/proxy/client/cli/test_claude_settings.py b/tests/test_litellm/proxy/client/cli/test_claude_settings.py
new file mode 100644
index 00000000000..bc9744eb410
--- /dev/null
+++ b/tests/test_litellm/proxy/client/cli/test_claude_settings.py
@@ -0,0 +1,269 @@
+import json
+import shlex
+import stat
+import time
+from unittest.mock import patch
+
+import pytest
+from click.testing import CliRunner
+
+from litellm.proxy.client.cli import cli
+from litellm.proxy.client.cli.commands.claude_settings import (
+    AUTOROUTE_BACKUP_PATH,
+    BACKUP_PATH,
+    SETTINGS_FILE_OWNERS,
+    ClaudeSettingsError,
+    SettingsFileOwner,
+    resolve_api_key_helper,
+    write_claude_settings,
+)
+
+
+def _owners(*backup_paths):
+    """Stand-in owners for the real `lite up` / `lite autoroute up` registry."""
+    return tuple(SettingsFileOwner(path, "lite up", "lite down") for path in backup_paths)
+
+CLAUDE_SETTINGS_MODULE = "litellm.proxy.client.cli.commands.claude_settings"
+AUTH_MODULE = "litellm.proxy.client.cli.commands.auth"
+
+
+@pytest.fixture
+def paths(tmp_path):
+    return tmp_path / "claude" / "settings.json", tmp_path / "backup.json"
+
+
+@pytest.fixture
+def lite_on_path():
+    with patch(f"{CLAUDE_SETTINGS_MODULE}.shutil.which", return_value="/usr/local/bin/lite"):
+        yield
+
+
+class TestWriteClaudeSettings:
+    def test_creates_the_file_and_its_parent_when_missing(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+        assert not settings_path.parent.exists()
+
+        write_claude_settings("https://proxy.example.com/", settings_path, _owners(backup_path))
+
+        written = json.loads(settings_path.read_text())
+        assert written["env"]["ANTHROPIC_BASE_URL"] == "https://proxy.example.com"
+        assert written["apiKeyHelper"] == "/usr/local/bin/lite --base-url https://proxy.example.com auth print-token"
+
+    def test_updates_an_existing_file_preserving_unrelated_settings(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+        settings_path.parent.mkdir(parents=True)
+        settings_path.write_text(
+            json.dumps(
+                {
+                    "theme": "dark",
+                    "permissions": {"allow": ["Bash"]},
+                    "env": {"SOME_OTHER_VAR": "keep-me", "ANTHROPIC_BASE_URL": "https://old.example.com"},
+                    "apiKeyHelper": "old-helper",
+                }
+            )
+        )
+
+        write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+        written = json.loads(settings_path.read_text())
+        assert written["theme"] == "dark"
+        assert written["permissions"] == {"allow": ["Bash"]}
+        assert written["env"]["SOME_OTHER_VAR"] == "keep-me"
+        assert written["env"]["ANTHROPIC_BASE_URL"] == "https://proxy.example.com"
+        assert written["apiKeyHelper"] != "old-helper"
+
+    def test_rerunning_against_a_new_proxy_refreshes_both_base_url_and_helper(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+
+        write_claude_settings("https://first.example.com", settings_path, _owners(backup_path))
+        write_claude_settings("https://second.example.com", settings_path, _owners(backup_path))
+
+        written = json.loads(settings_path.read_text())
+        assert written["env"]["ANTHROPIC_BASE_URL"] == "https://second.example.com"
+        assert "second.example.com" in written["apiKeyHelper"]
+        assert "first.example.com" not in written["apiKeyHelper"]
+
+    def test_drops_a_stray_static_api_key_so_the_helper_token_wins(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+        settings_path.parent.mkdir(parents=True)
+        settings_path.write_text(json.dumps({"env": {"ANTHROPIC_API_KEY": "sk-leaked"}}))
+
+        write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+        assert "ANTHROPIC_API_KEY" not in json.loads(settings_path.read_text())["env"]
+
+    def test_written_file_is_owner_only(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+        write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+        assert stat.S_IMODE(settings_path.stat().st_mode) == 0o600
+
+    def test_refuses_while_lite_up_holds_a_backup(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+        backup_path.write_text("{}")
+
+        with pytest.raises(ClaudeSettingsError, match="lite down"):
+            write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+        assert not settings_path.exists()
+
+    def test_refuses_on_corrupt_existing_settings_without_touching_the_file(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+        settings_path.parent.mkdir(parents=True)
+        settings_path.write_text("not json at all {{{")
+
+        with pytest.raises(ClaudeSettingsError, match="invalid JSON"):
+            write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+        assert settings_path.read_text() == "not json at all {{{"
+
+    def test_reports_an_actionable_error_when_lite_is_not_on_path(self, paths):
+        settings_path, backup_path = paths
+        with patch(f"{CLAUDE_SETTINGS_MODULE}.shutil.which", return_value=None):
+            with pytest.raises(ClaudeSettingsError, match="Could not find `lite`"):
+                write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+        assert not settings_path.exists()
+
+    def test_reports_an_actionable_error_on_a_non_utf8_file(self, paths, lite_on_path):
+        """Bytes that are not valid UTF-8 must not escape as UnicodeDecodeError.
+
+        UnicodeDecodeError is a ValueError, not an OSError, so a decode-side catch
+        is easy to miss; login's broad `except Exception` would then relabel it as
+        an authentication failure and exit 0.
+        """
+        settings_path, backup_path = paths
+        settings_path.parent.mkdir(parents=True)
+        settings_path.write_bytes(b'{"theme": "\xff\xfe"}')
+
+        with pytest.raises(ClaudeSettingsError, match="invalid JSON"):
+            write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+    def test_reports_an_actionable_error_when_the_file_cannot_be_read(self, paths, lite_on_path):
+        """An unreadable settings file must not surface as "Authentication failed".
+
+        login wraps the whole flow in a broad `except Exception`, so any OSError
+        escaping this function gets relabelled as an auth failure and sends the
+        user looking at their SSO config instead of at file permissions.
+        """
+        settings_path, backup_path = paths
+        settings_path.parent.mkdir(parents=True)
+        settings_path.mkdir()
+
+        with pytest.raises(ClaudeSettingsError, match="Could not read"):
+            write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+    def test_reports_an_actionable_error_when_the_file_cannot_be_written(self, paths, lite_on_path):
+        settings_path, backup_path = paths
+        with patch(
+            f"{CLAUDE_SETTINGS_MODULE}.write_private_json",
+            side_effect=OSError("Read-only file system"),
+        ):
+            with pytest.raises(ClaudeSettingsError, match="Read-only file system"):
+                write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+
+class TestApiKeyHelperIsActuallyInvocable:
+    """The helper string is executed verbatim by Claude Code, so it has to parse.
+
+    Asserting only on its text is what let a malformed command (`--base-url`, a
+    top-level group option, placed after the `print-token` subcommand) ship: click
+    rejects it with "No such option" and every Claude Code request loses its token.
+    """
+
+    def _helper_args(self, base_url):
+        with patch(f"{CLAUDE_SETTINGS_MODULE}.shutil.which", return_value="/usr/local/bin/lite"):
+            return shlex.split(resolve_api_key_helper(base_url))[1:]
+
+    def test_the_generated_command_parses(self):
+        result = CliRunner().invoke(cli, self._helper_args("http://localhost:4000"))
+
+        assert "No such option" not in result.output
+        assert result.exit_code != 2
+
+    def test_the_generated_command_reaches_print_token(self):
+        with patch(f"{AUTH_MODULE}.load_token", return_value=None):
+            result = CliRunner().invoke(cli, self._helper_args("http://localhost:4000"))
+
+        assert "Not authenticated" in result.output
+
+    def test_the_generated_command_carries_the_base_url_through(self):
+        stale = {
+            "base_url": "http://other-proxy.example.com",
+            "key": "sk-stale",
+            "timestamp": time.time(),
+        }
+        with patch(f"{AUTH_MODULE}.load_token", return_value=stale):
+            result = CliRunner().invoke(cli, self._helper_args("http://localhost:4000"))
+
+        assert "Not authenticated for this server" in result.output
+
+
+class TestConflictingOwnersOfTheSettingsFile:
+    """Both `lite up` and `lite autoroute up` restore a backup when they stop.
+
+    Guarding only one of them leaves the other free to silently revert this
+    write, which is the exact hazard the guard exists to prevent.
+    """
+
+    def test_any_owner_holding_a_backup_blocks_the_write(self, tmp_path, lite_on_path):
+        settings_path = tmp_path / "claude" / "settings.json"
+
+        for index, owner in enumerate(SETTINGS_FILE_OWNERS):
+            backup = tmp_path / f"backup-{index}.json"
+            backup.write_text("{}")
+            stand_in = SettingsFileOwner(backup, owner.start_command, owner.stop_command)
+            with pytest.raises(ClaudeSettingsError, match="currently managing"):
+                write_claude_settings("https://proxy.example.com", settings_path, (stand_in,))
+            backup.unlink()
+            assert not settings_path.exists()
+
+    def test_the_error_names_the_owner_that_actually_holds_the_file(self, tmp_path, lite_on_path):
+        settings_path = tmp_path / "claude" / "settings.json"
+        backup = tmp_path / "auto.json"
+        backup.write_text("{}")
+        autoroute = SettingsFileOwner(backup, "lite autoroute up", "lite autoroute down")
+
+        with pytest.raises(ClaudeSettingsError, match="`lite autoroute up` is currently managing"):
+            write_claude_settings("https://proxy.example.com", settings_path, (autoroute,))
+        with pytest.raises(ClaudeSettingsError, match="Run `lite autoroute down` first"):
+            write_claude_settings("https://proxy.example.com", settings_path, (autoroute,))
+
+    def test_the_registry_matches_the_paths_the_commands_actually_use(self):
+        """A second definition of the autoroute dir must not drift from this one."""
+        from litellm.proxy.client.cli.commands.autoroute.process import AUTOROUTE_DIR
+
+        assert AUTOROUTE_BACKUP_PATH == AUTOROUTE_DIR / "claude_settings_backup.json"
+        assert {o.backup_path for o in SETTINGS_FILE_OWNERS} == {BACKUP_PATH, AUTOROUTE_BACKUP_PATH}
+        assert {o.stop_command for o in SETTINGS_FILE_OWNERS} == {"lite down", "lite autoroute down"}
+
+
+class TestDoesNotDestroyUserOwnedStructure:
+    def test_writes_through_a_symlinked_settings_file(self, tmp_path, lite_on_path):
+        """os.replace() swaps the symlink for a regular file, detaching a dotfiles repo.
+
+        There is no backup here to undo that, so the link must survive and its
+        target must be the thing that gets updated.
+        """
+        real = tmp_path / "dotfiles" / "settings.json"
+        real.parent.mkdir()
+        real.write_text(json.dumps({"theme": "dark"}))
+        link = tmp_path / "claude" / "settings.json"
+        link.parent.mkdir()
+        link.symlink_to(real)
+
+        write_claude_settings("https://proxy.example.com", link, ())
+
+        assert link.is_symlink()
+        assert json.loads(real.read_text())["env"]["ANTHROPIC_BASE_URL"] == "https://proxy.example.com"
+        assert json.loads(real.read_text())["theme"] == "dark"
+
+    def test_refuses_rather_than_discarding_a_non_object_env(self, paths, lite_on_path):
+        """merge coerces a non-dict env to {}; that is silent data loss on a persistent write."""
+        settings_path, backup_path = paths
+        settings_path.parent.mkdir(parents=True)
+        settings_path.write_text(json.dumps({"theme": "dark", "env": "not-an-object"}))
+
+        with pytest.raises(ClaudeSettingsError, match="non-object"):
+            write_claude_settings("https://proxy.example.com", settings_path, _owners(backup_path))
+
+        assert json.loads(settings_path.read_text())["env"] == "not-an-object"
diff --git a/tests/test_litellm/proxy/client/cli/test_up_commands.py b/tests/test_litellm/proxy/client/cli/test_up_commands.py
index 1b182553644..51de0dcf11d 100644
--- a/tests/test_litellm/proxy/client/cli/test_up_commands.py
+++ b/tests/test_litellm/proxy/client/cli/test_up_commands.py
@@ -10,6 +10,7 @@ from click.testing import CliRunner
 
 from litellm.proxy.client.cli.commands import up as up_module
 from litellm.proxy.client.cli.commands.agents import AgentRunError
+from litellm.proxy.client.cli.commands.claude_settings import ClaudeSettingsError
 from litellm.proxy.client.cli.commands.up import (
     BackupRecord,
     UpError,
@@ -25,6 +26,7 @@ from litellm.proxy.client.cli.commands.up import (
 )
 
 UP_MODULE = "litellm.proxy.client.cli.commands.up"
+AUTH_MODULE = "litellm.proxy.client.cli.commands.auth"
 
 
 def _patch_paths(monkeypatch, tmp_path):
@@ -92,13 +94,13 @@ class TestLoadJsonOrEmpty:
     def test_raises_clean_error_on_invalid_json(self, tmp_path):
         path = tmp_path / "settings.json"
         path.write_text("not json at all {{{")
-        with pytest.raises(UpError, match="invalid JSON"):
+        with pytest.raises(ClaudeSettingsError, match="invalid JSON"):
             load_json_or_empty(path)
 
     def test_raises_clean_error_on_non_object_root(self, tmp_path):
         path = tmp_path / "settings.json"
         path.write_text(json.dumps([1, 2, 3]))
-        with pytest.raises(UpError, match="invalid JSON"):
+        with pytest.raises(ClaudeSettingsError, match="invalid JSON"):
             load_json_or_empty(path)
 
 
@@ -201,16 +203,16 @@ class TestResolveApiKeyHelper:
     def test_returns_helper_command_bound_to_the_selected_proxy(self, monkeypatch):
         monkeypatch.setattr(shutil, "which", lambda name: "/usr/local/bin/lite")
         helper = resolve_api_key_helper("http://localhost:4000")
-        assert helper == "/usr/local/bin/lite auth print-token --base-url http://localhost:4000"
+        assert helper == "/usr/local/bin/lite --base-url http://localhost:4000 auth print-token"
 
     def test_quotes_a_base_url_containing_shell_metacharacters(self, monkeypatch):
         monkeypatch.setattr(shutil, "which", lambda name: "/usr/local/bin/lite")
         helper = resolve_api_key_helper("http://example.com/path; rm -rf /")
-        assert helper == "/usr/local/bin/lite auth print-token --base-url 'http://example.com/path; rm -rf /'"
+        assert helper == "/usr/local/bin/lite --base-url 'http://example.com/path; rm -rf /' auth print-token"
 
     def test_raises_when_lite_not_on_path(self, monkeypatch):
         monkeypatch.setattr(shutil, "which", lambda name: None)
-        with pytest.raises(UpError, match="Could not find `lite`"):
+        with pytest.raises(ClaudeSettingsError, match="Could not find `lite`"):
             resolve_api_key_helper("http://localhost:4000")
 
 
@@ -396,3 +398,50 @@ class TestDownCommand:
         assert result.exit_code != 0
         assert result.exception is None or isinstance(result.exception, SystemExit)
         assert "invalid or unexpected JSON" in result.output
+
+
+class TestUpCanInvokeTheRealLoginCommand:
+    """`lite up` calls ctx.invoke(login) on the real command object.
+
+    Every other test in this file monkeypatches `up_module.login` with a fake, so
+    none of them would notice a login parameter that ctx.invoke cannot supply.
+    """
+
+    def test_ctx_invoke_supplies_every_login_parameter(self):
+        from litellm.proxy.client.cli.commands.auth import login as real_login
+
+        reached = []
+
+        @click.command()
+        @click.pass_context
+        def driver(ctx):
+            ctx.obj = {"base_url": "http://127.0.0.1:9"}
+            ctx.invoke(real_login)
+
+        with patch(
+            f"{AUTH_MODULE}._start_cli_sso_flow",
+            side_effect=lambda base_url: reached.append(base_url) or RuntimeError("stop"),
+        ):
+            result = CliRunner().invoke(driver, [], standalone_mode=False)
+
+        assert not isinstance(result.exception, TypeError), result.exception
+        assert reached == ["http://127.0.0.1:9"]
+
+    def test_ctx_invoke_leaves_claude_settings_alone(self, tmp_path):
+        from litellm.proxy.client.cli.commands.auth import login as real_login
+
+        settings_path = tmp_path / "settings.json"
+
+        @click.command()
+        @click.pass_context
+        def driver(ctx):
+            ctx.obj = {"base_url": "http://127.0.0.1:9"}
+            ctx.invoke(real_login)
+
+        with (
+            patch(f"{AUTH_MODULE}.CLAUDE_SETTINGS_PATH", settings_path),
+            patch(f"{AUTH_MODULE}._start_cli_sso_flow", side_effect=RuntimeError("stop")),
+        ):
+            CliRunner().invoke(driver, [], standalone_mode=False)
+
+        assert not settings_path.exists()
diff --git a/tests/test_litellm/proxy/common_utils/test_key_rotation_integration.py b/tests/test_litellm/proxy/common_utils/test_key_rotation_integration.py
index bdea37f1358..3bc62d549b0 100644
--- a/tests/test_litellm/proxy/common_utils/test_key_rotation_integration.py
+++ b/tests/test_litellm/proxy/common_utils/test_key_rotation_integration.py
@@ -25,6 +25,11 @@ from litellm.proxy._types import (
 from litellm.proxy.common_utils.key_rotation_manager import KeyRotationManager
 
 
+@pytest.fixture
+def disable_audit_logging_for_mocked_key(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setattr("litellm.store_audit_logs", False)
+
+
 class TestKeyRotationManagerPassesKeyAlias:
     """
     Regression tests to ensure KeyRotationManager passes key_alias
@@ -155,7 +160,10 @@ class TestKeyRotationSecretNamingStability:
     """
 
     @pytest.mark.asyncio
-    async def test_rotation_hook_uses_initial_secret_name_fallback(self):
+    async def test_rotation_hook_uses_initial_secret_name_fallback(
+        self,
+        disable_audit_logging_for_mocked_key,
+    ):
         """
         GIVEN: A key WITHOUT an alias (has an initial_secret_name based on token ID)
         WHEN: The key is rotated
@@ -206,7 +214,10 @@ class TestKeyRotationSecretNamingStability:
             ), f"Secret name drift! Expected {initial_secret_name}, got {call_kwargs['new_secret_name']}. This causes secret sprawl."
 
     @pytest.mark.asyncio
-    async def test_rotation_hook_pre_rotation_alias_consistency(self):
+    async def test_rotation_hook_pre_rotation_alias_consistency(
+        self,
+        disable_audit_logging_for_mocked_key,
+    ):
         """
         GIVEN: A key WITH an alias
         WHEN: The key is rotated
diff --git a/tests/test_litellm/proxy/db/test_db_spend_update_writer.py b/tests/test_litellm/proxy/db/test_db_spend_update_writer.py
index 6cf41497404..f3c2ca65d02 100644
--- a/tests/test_litellm/proxy/db/test_db_spend_update_writer.py
+++ b/tests/test_litellm/proxy/db/test_db_spend_update_writer.py
@@ -2533,3 +2533,187 @@ async def test_daily_transaction_internal_call_keeps_spend_but_not_request_count
     assert internal["autorouter_savings_spend"] == 0.0
     assert user_sent["api_requests"] == 1
     assert user_sent["successful_requests"] == 1
+
+
+def _deadlock_error():
+    from prisma.errors import RawQueryError
+
+    return RawQueryError(
+        data={"user_facing_error": {"error_code": "P2034", "meta": {"table": "LiteLLM_VerificationToken"}}}
+    )
+
+
+def _empty_spend_transactions(**overrides):
+    base = {
+        "user_list_transactions": {},
+        "end_user_list_transactions": {},
+        "key_list_transactions": {},
+        "team_list_transactions": {},
+        "team_member_list_transactions": {},
+        "org_list_transactions": {},
+        "tag_list_transactions": {},
+        "agent_list_transactions": {},
+    }
+    return {**base, **overrides}
+
+
+def _good_tx(mock_batcher):
+    tx = AsyncMock()
+    tx.__aenter__ = AsyncMock(return_value=tx)
+    tx.__aexit__ = AsyncMock(return_value=False)
+    tx.batch_ = MagicMock(
+        return_value=AsyncMock(
+            __aenter__=AsyncMock(return_value=mock_batcher),
+            __aexit__=AsyncMock(return_value=False),
+        )
+    )
+    return tx
+
+
+def _failing_tx(error):
+    tx = MagicMock()
+    tx.__aenter__ = AsyncMock(side_effect=error)
+    tx.__aexit__ = AsyncMock(return_value=False)
+    return tx
+
+
+@pytest.mark.asyncio
+async def test_commit_spend_updates_retries_deadlock_then_commits(monkeypatch):
+    """Regression: a deadlock on the key-spend UPDATE is retried and commits the increment exactly once."""
+    slept = []
+    monkeypatch.setattr(
+        "litellm.proxy.db.db_spend_update_writer.asyncio.sleep",
+        AsyncMock(side_effect=lambda s: slept.append(s)),
+    )
+
+    mock_batcher = MagicMock()
+    mock_prisma_client = MagicMock()
+    mock_prisma_client.db.tx = MagicMock(side_effect=[_failing_tx(_deadlock_error()), _good_tx(mock_batcher)])
+
+    proxy_logging = MagicMock()
+    proxy_logging.failure_handler = AsyncMock()
+
+    await DBSpendUpdateWriter()._commit_spend_updates_to_db(
+        prisma_client=mock_prisma_client,
+        n_retry_times=3,
+        proxy_logging_obj=proxy_logging,
+        db_spend_update_transactions=_empty_spend_transactions(key_list_transactions={"sk-abc": 0.5}),
+    )
+
+    assert mock_prisma_client.db.tx.call_count == 2
+    mock_batcher.litellm_verificationtoken.update_many.assert_called_once()
+    call_kwargs = mock_batcher.litellm_verificationtoken.update_many.call_args[1]
+    assert call_kwargs["where"] == {"token": "sk-abc"}
+    assert call_kwargs["data"]["spend"] == {"increment": 0.5}
+    assert len(slept) == 1
+    proxy_logging.failure_handler.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_commit_spend_updates_raises_after_exhausting_deadlock_retries(monkeypatch):
+    """A deadlock that never clears must surface after the retry budget is spent, not loop or swallow."""
+    monkeypatch.setattr("litellm.proxy.db.db_spend_update_writer.asyncio.sleep", AsyncMock(return_value=None))
+
+    mock_prisma_client = MagicMock()
+    mock_prisma_client.db.tx = MagicMock(side_effect=lambda *a, **k: _failing_tx(_deadlock_error()))
+
+    proxy_logging = MagicMock()
+    proxy_logging.failure_handler = AsyncMock()
+
+    from prisma.errors import RawQueryError
+
+    with pytest.raises(RawQueryError):
+        await DBSpendUpdateWriter()._commit_spend_updates_to_db(
+            prisma_client=mock_prisma_client,
+            n_retry_times=2,
+            proxy_logging_obj=proxy_logging,
+            db_spend_update_transactions=_empty_spend_transactions(key_list_transactions={"sk-abc": 0.5}),
+        )
+
+    assert mock_prisma_client.db.tx.call_count == 3
+
+
+@pytest.mark.asyncio
+async def test_commit_spend_updates_does_not_retry_non_deadlock_data_error(monkeypatch):
+    """A non-retryable data-layer error raises on the first attempt, never retried against the increment."""
+    monkeypatch.setattr("litellm.proxy.db.db_spend_update_writer.asyncio.sleep", AsyncMock(return_value=None))
+
+    from prisma.errors import UniqueViolationError
+
+    non_deadlock = UniqueViolationError(
+        data={"user_facing_error": {"error_code": "P2002", "meta": {"table": "LiteLLM_VerificationToken"}}}
+    )
+    mock_prisma_client = MagicMock()
+    mock_prisma_client.db.tx = MagicMock(side_effect=lambda *a, **k: _failing_tx(non_deadlock))
+
+    proxy_logging = MagicMock()
+    proxy_logging.failure_handler = AsyncMock()
+
+    with pytest.raises(UniqueViolationError):
+        await DBSpendUpdateWriter()._commit_spend_updates_to_db(
+            prisma_client=mock_prisma_client,
+            n_retry_times=3,
+            proxy_logging_obj=proxy_logging,
+            db_spend_update_transactions=_empty_spend_transactions(key_list_transactions={"sk-abc": 0.5}),
+        )
+
+    mock_prisma_client.db.tx.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_update_daily_spend_retries_deadlock(monkeypatch):
+    """The daily-spend upsert path retries a deadlock on the bulk upsert and then drains successfully."""
+    mock_prisma_client = MagicMock()
+    mock_prisma_client.db.execute_raw = AsyncMock(side_effect=[_deadlock_error(), None])
+    proxy_logging = MagicMock()
+    proxy_logging.failure_handler = AsyncMock()
+
+    monkeypatch.setattr("litellm.proxy.db.db_spend_update_writer.asyncio.sleep", AsyncMock(return_value=None))
+    daily_spend_transactions = {"k1": _daily_txn()}
+    await DBSpendUpdateWriter._update_daily_spend(
+        n_retry_times=3,
+        prisma_client=mock_prisma_client,
+        proxy_logging_obj=proxy_logging,
+        daily_spend_transactions=daily_spend_transactions,
+        entity_type="user",
+        entity_id_field="user_id",
+    )
+
+    assert mock_prisma_client.db.execute_raw.call_count == 2
+    assert daily_spend_transactions == {}
+    proxy_logging.failure_handler.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    "transactions_key, sample_key",
+    [
+        ("user_list_transactions", "user-1"),
+        ("team_list_transactions", "team-1"),
+        ("team_member_list_transactions", "team_id::team-1::user_id::user-1"),
+        ("org_list_transactions", "org-1"),
+        ("tag_list_transactions", "tag-1"),
+        ("agent_list_transactions", "agent-1"),
+    ],
+)
+@pytest.mark.asyncio
+async def test_commit_spend_updates_retries_deadlock_on_every_entity_path(monkeypatch, transactions_key, sample_key):
+    """Every per-entity spend path, not just keys, retries a deadlock instead of dropping the increment."""
+    monkeypatch.setattr("litellm.proxy.db.db_spend_update_writer.asyncio.sleep", AsyncMock(return_value=None))
+
+    mock_batcher = MagicMock()
+    mock_prisma_client = MagicMock()
+    mock_prisma_client.db.tx = MagicMock(side_effect=[_failing_tx(_deadlock_error()), _good_tx(mock_batcher)])
+
+    proxy_logging = MagicMock()
+    proxy_logging.failure_handler = AsyncMock()
+    proxy_logging.call_details = {}
+
+    await DBSpendUpdateWriter()._commit_spend_updates_to_db(
+        prisma_client=mock_prisma_client,
+        n_retry_times=3,
+        proxy_logging_obj=proxy_logging,
+        db_spend_update_transactions=_empty_spend_transactions(**{transactions_key: {sample_key: 0.5}}),
+    )
+
+    assert mock_prisma_client.db.tx.call_count == 2
+    proxy_logging.failure_handler.assert_not_called()
diff --git a/tests/test_litellm/proxy/db/test_exception_handler.py b/tests/test_litellm/proxy/db/test_exception_handler.py
index a188289bfce..474e571e592 100644
--- a/tests/test_litellm/proxy/db/test_exception_handler.py
+++ b/tests/test_litellm/proxy/db/test_exception_handler.py
@@ -549,3 +549,36 @@ def test_handle_db_exception_surfaces_a_permanent_fault_even_when_degraded_mode_
 
     with pytest.raises(BinaryNotFoundError):
         PrismaDBExceptionHandler.handle_db_exception(BinaryNotFoundError("query engine binary not found"))
+
+
+@pytest.mark.parametrize(
+    "error",
+    [
+        RawQueryError(data={"user_facing_error": {"error_code": "P2034", "meta": {"table": "t"}}}),
+        PrismaError("Transaction failed due to a write conflict or a deadlock. Please retry your transaction"),
+        RawQueryError(data={"user_facing_error": {"message": "deadlock detected", "meta": {"table": "t"}}}),
+        RawQueryError(
+            data={"user_facing_error": {"message": "ERROR: 40P01: deadlock detected", "meta": {"table": "t"}}}
+        ),
+    ],
+)
+def test_is_deadlock_error_matches_postgres_deadlock(error):
+    """A Postgres deadlock surfaced through prisma (P2034 or 40P01 / "deadlock detected" text) is recognized."""
+    assert PrismaDBExceptionHandler.is_deadlock_error(error) is True
+
+
+@pytest.mark.parametrize(
+    "error",
+    [
+        UniqueViolationError(data={"user_facing_error": {"error_code": "P2002", "meta": {"table": "t"}}}),
+        RecordNotFoundError(data={"user_facing_error": {"meta": {"table": "t"}}}),
+        PrismaError("validation failed on query"),
+        PrismaError("can't reach database server"),
+        httpx.ConnectError("connection refused"),
+        RuntimeError("deadlock detected"),
+        ValueError("40P01"),
+    ],
+)
+def test_is_deadlock_error_excludes_non_deadlocks(error):
+    """Non-deadlock prisma errors, connectivity failures, and non-prisma exceptions are not treated as deadlocks."""
+    assert PrismaDBExceptionHandler.is_deadlock_error(error) is False
diff --git a/tests/test_litellm/proxy/db/test_proxy_worker_heartbeat.py b/tests/test_litellm/proxy/db/test_proxy_worker_heartbeat.py
new file mode 100644
index 00000000000..33ae6190411
--- /dev/null
+++ b/tests/test_litellm/proxy/db/test_proxy_worker_heartbeat.py
@@ -0,0 +1,94 @@
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+
+from litellm.proxy.db.proxy_worker_heartbeat import (
+    BEAT_SQL,
+    COUNT_SQL,
+    DEREGISTER_SQL,
+    PROXY_WORKER_LIVENESS_WINDOW_SECONDS,
+    PRUNE_SQL,
+    STALE_ROW_RETENTION_SECONDS,
+    ProxyWorkerHeartbeat,
+    count_live_proxy_workers,
+)
+from litellm.proxy.db.routing_prisma_wrapper import RoutingPrismaWrapper
+
+
+def _prisma():
+    prisma = MagicMock()
+    prisma.db.execute_raw = AsyncMock()
+    prisma.db.query_raw = AsyncMock()
+    return prisma
+
+
+@pytest.mark.asyncio
+async def test_beat_upserts_own_row_then_prunes_stale_rows():
+    prisma = _prisma()
+    heartbeat = ProxyWorkerHeartbeat(prisma_client=prisma, worker_id="worker-1")
+    await heartbeat.beat()
+    calls = prisma.db.execute_raw.call_args_list
+    assert calls[0].args == (BEAT_SQL, "worker-1", heartbeat.hostname)
+    assert calls[1].args == (PRUNE_SQL, STALE_ROW_RETENTION_SECONDS)
+
+
+@pytest.mark.asyncio
+async def test_beat_survives_a_database_error():
+    prisma = _prisma()
+    prisma.db.execute_raw = AsyncMock(side_effect=RuntimeError("db down"))
+    await ProxyWorkerHeartbeat(prisma_client=prisma).beat()
+
+
+def test_each_worker_process_gets_its_own_id():
+    prisma = _prisma()
+    first = ProxyWorkerHeartbeat(prisma_client=prisma)
+    second = ProxyWorkerHeartbeat(prisma_client=prisma)
+    assert first.worker_id != second.worker_id
+
+
+@pytest.mark.asyncio
+async def test_deregister_deletes_only_its_own_row():
+    prisma = _prisma()
+    await ProxyWorkerHeartbeat(prisma_client=prisma, worker_id="worker-1").deregister()
+    assert prisma.db.execute_raw.call_args.args == (DEREGISTER_SQL, "worker-1")
+
+
+@pytest.mark.asyncio
+async def test_deregister_survives_a_database_error():
+    prisma = _prisma()
+    prisma.db.execute_raw = AsyncMock(side_effect=RuntimeError("db down"))
+    await ProxyWorkerHeartbeat(prisma_client=prisma, worker_id="worker-1").deregister()
+
+
+@pytest.mark.asyncio
+async def test_count_reads_workers_within_the_liveness_window():
+    prisma = _prisma()
+    prisma.db.query_raw.return_value = [{"live_workers": 3}]
+    assert await count_live_proxy_workers(prisma) == 3
+    assert prisma.db.query_raw.call_args.args == (COUNT_SQL, PROXY_WORKER_LIVENESS_WINDOW_SECONDS)
+
+
+@pytest.mark.asyncio
+async def test_count_reads_from_the_primary_when_reads_route_to_a_replica():
+    writer = MagicMock()
+    writer.query_raw = AsyncMock(return_value=[{"live_workers": 2}])
+    reader = MagicMock()
+    reader.query_raw = AsyncMock(return_value=[{"live_workers": 1}])
+    prisma = MagicMock()
+    prisma.db = RoutingPrismaWrapper(writer=writer, reader=reader)
+    assert await count_live_proxy_workers(prisma) == 2
+    reader.query_raw.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_count_returns_unknown_when_the_query_fails():
+    prisma = _prisma()
+    prisma.db.query_raw.side_effect = RuntimeError("db down")
+    assert await count_live_proxy_workers(prisma) is None
+
+
+@pytest.mark.asyncio
+async def test_count_returns_unknown_for_a_malformed_row():
+    prisma = _prisma()
+    prisma.db.query_raw.return_value = [{"unexpected": "shape"}]
+    assert await count_live_proxy_workers(prisma) is None
diff --git a/tests/test_litellm/proxy/health_endpoints/test_health_endpoints.py b/tests/test_litellm/proxy/health_endpoints/test_health_endpoints.py
index e2705bd5fec..831f659051c 100644
--- a/tests/test_litellm/proxy/health_endpoints/test_health_endpoints.py
+++ b/tests/test_litellm/proxy/health_endpoints/test_health_endpoints.py
@@ -2467,61 +2467,140 @@ class TestNoRedisWarning:
     def _router(redis_cache):
         return SimpleNamespace(cache=SimpleNamespace(redis_cache=redis_cache))
 
-    def test_warns_when_no_redis_is_configured(self, monkeypatch):
+    @staticmethod
+    def _prisma_with_workers(live_workers=None, error=None):
+        prisma = MagicMock()
+        if error is not None:
+            prisma.db.query_raw = AsyncMock(side_effect=error)
+        else:
+            prisma.db.query_raw = AsyncMock(return_value=[{"live_workers": live_workers}])
+        return prisma
+
+    @pytest.mark.asyncio
+    async def test_warns_when_no_redis_and_no_db_to_count_workers(self, monkeypatch):
         monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
         with (
             patch("litellm.proxy.proxy_server.redis_usage_cache", None),
             patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", None),
         ):
-            assert _show_no_redis_warning() is True
+            assert await _show_no_redis_warning() is True
 
-    def test_warns_when_there_is_no_router_at_all(self, monkeypatch):
+    @pytest.mark.asyncio
+    async def test_warns_when_there_is_no_router_at_all(self, monkeypatch):
         monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
         with (
             patch("litellm.proxy.proxy_server.redis_usage_cache", None),
             patch("litellm.proxy.proxy_server.llm_router", None),
+            patch("litellm.proxy.proxy_server.prisma_client", None),
         ):
-            assert _show_no_redis_warning() is True
+            assert await _show_no_redis_warning() is True
 
-    def test_stays_quiet_when_a_coordination_redis_is_configured(self, monkeypatch):
+    @pytest.mark.asyncio
+    async def test_stays_quiet_for_a_confirmed_single_worker(self, monkeypatch):
+        """One live worker needs no cross-worker coordination, so no env var is needed."""
         monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
+        with (
+            patch("litellm.proxy.proxy_server.redis_usage_cache", None),
+            patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", self._prisma_with_workers(1)),
+        ):
+            assert await _show_no_redis_warning() is False
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("live_workers", [2, 5])
+    async def test_warns_when_multiple_workers_share_the_db(self, monkeypatch, live_workers):
+        monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
+        with (
+            patch("litellm.proxy.proxy_server.redis_usage_cache", None),
+            patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", self._prisma_with_workers(live_workers)),
+        ):
+            assert await _show_no_redis_warning() is True
+
+    @pytest.mark.asyncio
+    async def test_warns_when_the_worker_census_is_empty(self, monkeypatch):
+        """Zero rows means the census cannot CONFIRM a single worker, so warn."""
+        monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
+        with (
+            patch("litellm.proxy.proxy_server.redis_usage_cache", None),
+            patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", self._prisma_with_workers(0)),
+        ):
+            assert await _show_no_redis_warning() is True
+
+    @pytest.mark.asyncio
+    async def test_warns_when_the_worker_census_query_fails(self, monkeypatch):
+        monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
+        with (
+            patch("litellm.proxy.proxy_server.redis_usage_cache", None),
+            patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch(
+                "litellm.proxy.proxy_server.prisma_client",
+                self._prisma_with_workers(error=RuntimeError("db down")),
+            ),
+        ):
+            assert await _show_no_redis_warning() is True
+
+    @pytest.mark.asyncio
+    async def test_stays_quiet_when_a_coordination_redis_is_configured(self, monkeypatch):
+        monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
+        prisma = self._prisma_with_workers(5)
         with (
             patch("litellm.proxy.proxy_server.redis_usage_cache", MagicMock()),
             patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", prisma),
         ):
-            assert _show_no_redis_warning() is False
+            assert await _show_no_redis_warning() is False
+        prisma.db.query_raw.assert_not_called()
 
-    def test_stays_quiet_when_only_the_router_has_redis(self, monkeypatch):
+    @pytest.mark.asyncio
+    async def test_stays_quiet_when_only_the_router_has_redis(self, monkeypatch):
         """router_settings.redis_host alone backs cooldowns and usage-based routing."""
         monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
         with (
             patch("litellm.proxy.proxy_server.redis_usage_cache", None),
             patch("litellm.proxy.proxy_server.llm_router", self._router(MagicMock())),
+            patch("litellm.proxy.proxy_server.prisma_client", self._prisma_with_workers(5)),
         ):
-            assert _show_no_redis_warning() is False
+            assert await _show_no_redis_warning() is False
 
+    @pytest.mark.asyncio
     @pytest.mark.parametrize("value", ["true", "True"])
-    def test_env_var_suppresses_the_warning(self, monkeypatch, value):
+    async def test_env_var_suppresses_the_warning_despite_multiple_workers(self, monkeypatch, value):
         monkeypatch.setenv("LITELLM_DISABLE_NO_REDIS_WARNING", value)
         with (
             patch("litellm.proxy.proxy_server.redis_usage_cache", None),
             patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", self._prisma_with_workers(5)),
         ):
-            assert _show_no_redis_warning() is False
+            assert await _show_no_redis_warning() is False
 
-    def test_env_var_set_false_keeps_the_warning(self, monkeypatch):
+    @pytest.mark.asyncio
+    async def test_env_var_set_false_keeps_the_warning_for_multiple_workers(self, monkeypatch):
         monkeypatch.setenv("LITELLM_DISABLE_NO_REDIS_WARNING", "false")
         with (
             patch("litellm.proxy.proxy_server.redis_usage_cache", None),
             patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", self._prisma_with_workers(2)),
         ):
-            assert _show_no_redis_warning() is True
+            assert await _show_no_redis_warning() is True
+
+    @pytest.mark.asyncio
+    async def test_env_var_set_false_does_not_force_the_warning_for_a_single_worker(self, monkeypatch):
+        monkeypatch.setenv("LITELLM_DISABLE_NO_REDIS_WARNING", "false")
+        with (
+            patch("litellm.proxy.proxy_server.redis_usage_cache", None),
+            patch("litellm.proxy.proxy_server.llm_router", self._router(None)),
+            patch("litellm.proxy.proxy_server.prisma_client", self._prisma_with_workers(1)),
+        ):
+            assert await _show_no_redis_warning() is False
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize("has_prisma_client", [True, False])
     async def test_readiness_details_carries_the_flag(self, monkeypatch, has_prisma_client):
         monkeypatch.delenv("LITELLM_DISABLE_NO_REDIS_WARNING", raising=False)
-        prisma_client = MagicMock() if has_prisma_client else None
+        prisma_client = self._prisma_with_workers(2) if has_prisma_client else None
         with (
             patch("litellm.proxy.proxy_server.prisma_client", prisma_client),
             patch("litellm.proxy.proxy_server.redis_usage_cache", None),
diff --git a/tests/test_litellm/proxy/hooks/test_batch_file_validation.py b/tests/test_litellm/proxy/hooks/test_batch_file_validation.py
index 8698ee8ba12..4ef94f0965b 100644
--- a/tests/test_litellm/proxy/hooks/test_batch_file_validation.py
+++ b/tests/test_litellm/proxy/hooks/test_batch_file_validation.py
@@ -1739,18 +1739,18 @@ def _make_batch_input_bytes(n_rows: int, padding: int = 200) -> bytes:
     return ("\n".join(rows)).encode("utf-8")
 
 
-def test_iter_batch_input_entries_matches_dict_list():
+def test_iter_batch_output_entries_matches_dict_list():
     from litellm.batches.batch_utils import (
         _get_file_content_as_dictionary,
-        _iter_batch_input_entries,
+        _iter_batch_output_entries,
     )
 
     raw = _make_batch_input_bytes(50)
-    streamed = list(_iter_batch_input_entries(raw))
+    streamed = list(_iter_batch_output_entries(raw))
     assert streamed == _get_file_content_as_dictionary(raw)
     assert streamed[0]["custom_id"] == "request-0"
     # tolerant of blank lines and a missing trailing newline
-    assert list(_iter_batch_input_entries(raw + b"\n\n")) == streamed
+    assert list(_iter_batch_output_entries(raw + b"\n\n")) == streamed
 
 
 def test_streaming_count_peak_below_dict_list():
@@ -1759,7 +1759,7 @@ def test_streaming_count_peak_below_dict_list():
 
     from litellm.batches.batch_utils import (
         _get_file_content_as_dictionary,
-        _iter_batch_input_entries,
+        _iter_batch_output_entries,
     )
 
     raw = _make_batch_input_bytes(8000)
@@ -1777,7 +1777,7 @@ def test_streaming_count_peak_below_dict_list():
     def _stream():
         count = 0
         models: set = set()
-        for entry in _iter_batch_input_entries(raw):
+        for entry in _iter_batch_output_entries(raw):
             count += 1
             model = (entry.get("body") or {}).get("model")
             if model:
diff --git a/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py b/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py
index 787e5776897..fa7320b2bc6 100644
--- a/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py
+++ b/tests/test_litellm/proxy/hooks/test_key_management_event_hooks.py
@@ -4,6 +4,7 @@ Tests for KeyManagementEventHooks.
 Validates that email and secret manager operations are independent and non-blocking.
 """
 
+import asyncio
 import os
 import sys
 from unittest.mock import AsyncMock, MagicMock, patch
@@ -155,6 +156,44 @@ class TestKeyManagementEventHooksIndependentOperations:
         assert email_called["called"] is True
 
 
+@pytest.mark.parametrize(
+    ("premium_user", "expected_audit_log_calls"),
+    ((True, 1), (False, 0)),
+)
+@pytest.mark.asyncio
+async def test_key_generated_audit_log_uses_license_default(
+    monkeypatch: pytest.MonkeyPatch,
+    premium_user: bool,
+    expected_audit_log_calls: int,
+):
+    from litellm.proxy._types import GenerateKeyRequest, GenerateKeyResponse, UserAPIKeyAuth
+
+    monkeypatch.setattr("litellm.store_audit_logs", None)
+    monkeypatch.setattr("litellm.proxy.proxy_server.premium_user", premium_user)
+    monkeypatch.delenv("LITELLM_STORE_AUDIT_LOGS", raising=False)
+
+    response = GenerateKeyResponse(key="sk-test-key", token_id="token-123")
+    with (
+        patch(
+            "litellm.proxy.management_helpers.audit_logs.create_audit_log_for_update",
+            new_callable=AsyncMock,
+        ) as mock_create_audit_log,
+        patch.object(
+            KeyManagementEventHooks,
+            "_store_virtual_key_in_secret_manager",
+            new_callable=AsyncMock,
+        ),
+    ):
+        await KeyManagementEventHooks.async_key_generated_hook(
+            data=GenerateKeyRequest(),
+            response=response,
+            user_api_key_dict=UserAPIKeyAuth(api_key="sk-admin-key", user_id="admin"),
+        )
+        await asyncio.sleep(0.01)
+
+    assert mock_create_audit_log.await_count == expected_audit_log_calls
+
+
 class TestRotateVirtualKeyInSecretManager:
     """Tests for _rotate_virtual_key_in_secret_manager with team_id support."""
 
diff --git a/tests/test_litellm/proxy/hooks/test_send_invite_email.py b/tests/test_litellm/proxy/hooks/test_send_invite_email.py
index c916af5c128..83fb1f5faba 100644
--- a/tests/test_litellm/proxy/hooks/test_send_invite_email.py
+++ b/tests/test_litellm/proxy/hooks/test_send_invite_email.py
@@ -212,8 +212,9 @@ async def test_v1_key_generation_sends_email_when_send_invite_email_true():
     mock_proxy_logging_obj = MagicMock()
     mock_proxy_logging_obj.slack_alerting_instance = mock_slack_alerting
 
-    with patch.object(
-        KeyManagementEventHooks, "_send_key_created_email", mock_send_key_created_email
+    with (
+        patch("litellm.store_audit_logs", False),
+        patch.object(KeyManagementEventHooks, "_send_key_created_email", mock_send_key_created_email),
     ):
         with patch(
             "litellm.logging_callback_manager.get_custom_loggers_for_type",
@@ -257,8 +258,9 @@ async def test_v1_key_generation_no_email_when_send_invite_email_false():
     mock_proxy_logging_obj = MagicMock()
     mock_proxy_logging_obj.slack_alerting_instance = mock_slack_alerting
 
-    with patch.object(
-        KeyManagementEventHooks, "_send_key_created_email", mock_send_key_created_email
+    with (
+        patch("litellm.store_audit_logs", False),
+        patch.object(KeyManagementEventHooks, "_send_key_created_email", mock_send_key_created_email),
     ):
         with patch(
             "litellm.logging_callback_manager.get_custom_loggers_for_type",
diff --git a/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py
index 77149457e82..3fd023552f5 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_auto_router_endpoints.py
@@ -4,6 +4,7 @@ Unit tests for auto router management endpoints
 
 import os
 import sys
+from pathlib import Path
 
 import pytest
 from fastapi import HTTPException
@@ -325,9 +326,7 @@ class TestAutoRouterBenchmarks:
         from litellm.proxy.management_endpoints.auto_router_endpoints import _benchmark_totals
 
         totals = _benchmark_totals(self.ROW)
-        bucket_hits = (
-            totals.cache.same_model.hits + totals.cache.first_visit.hits + totals.cache.return_to_tier.hits
-        )
+        bucket_hits = totals.cache.same_model.hits + totals.cache.first_visit.hits + totals.cache.return_to_tier.hits
         assert bucket_hits == 27
         assert totals.cache.hit_rate_pct == pytest.approx(100.0 * 28 / 38, abs=0.1)
 
@@ -490,7 +489,7 @@ from litellm.proxy.management_endpoints.auto_router_endpoints import (
     start_shadow_eval,
     stop_shadow_eval_job,
 )
-from litellm.types.management_endpoints.auto_router_endpoints import ShadowEvalJobResponse, StartShadowEvalRequest
+from litellm.types.management_endpoints.auto_router_endpoints import StartShadowEvalRequest
 
 VIEWER = UserAPIKeyAuth(user_role=LitellmUserRoles.PROXY_ADMIN_VIEW_ONLY, api_key="sk-view", user_id="viewer")
 NON_ADMIN = UserAPIKeyAuth(user_role=LitellmUserRoles.INTERNAL_USER, api_key="sk-user", user_id="user")
@@ -507,19 +506,23 @@ def _shadow_router() -> MagicMock:
     return router
 
 
-def _job_record(**overrides: object) -> MagicMock:
-    """Spec'd like a real prisma row: only the table's columns exist as attributes, so
-    from_attributes validation falls back to model defaults for everything else."""
+def _leg_record(**overrides: object) -> MagicMock:
+    """Spec'd like a real prisma row: only the table's columns exist as attributes. One
+    row is one key's leg of a job; legs sharing group_id are one job."""
     defaults = {
-        "id": "job-1",
+        "id": "leg-1",
+        "group_id": "job-1",
         "api_key_id": "key-hash",
         "router_name": "my-router",
+        "direction": "forward",
+        "baseline_model": None,
         "judge_model": "anthropic/claude-sonnet-5",
         "shadow_percentage": 10.0,
         "max_turns": 200,
         "created_at": datetime(2026, 8, 11, tzinfo=timezone.utc),
         "ends_at": datetime.now(timezone.utc) + timedelta(days=7),
         "stopped_at": None,
+        "stopped_by": None,
     }
     fields = {**defaults, **overrides}
     record = MagicMock(spec=list(fields))
@@ -538,23 +541,90 @@ def _key_record(
     return record
 
 
-def _shadow_prisma(active_job=None, agg_rows=None) -> MagicMock:
+def _shadow_prisma(legs=(), agg_rows=None, by_leg_rows=None, known_keys=("key-hash", "key-hash-2")) -> MagicMock:
+    """The job-table fake honours the filters it is handed, so a read that forgets
+    stopped_at sees rows the partial index would have released, one that forgets
+    direction sees the opposite-direction legs a key may hold at the same time, and a
+    group read that matched on a leg id would come back empty."""
     prisma = MagicMock()
-    prisma.db.litellm_verificationtoken.find_unique = AsyncMock(return_value=_key_record())
-    prisma.db.litellm_verificationtoken.find_many = AsyncMock(return_value=[_key_record()])
-    prisma.db.execute_raw = AsyncMock(return_value=0)
-    prisma.db.litellm_shadowevaljob.find_first = AsyncMock(return_value=active_job)
-    prisma.db.litellm_shadowevaljob.find_unique = AsyncMock(return_value=None)
-    prisma.db.litellm_shadowevaljob.find_many = AsyncMock(return_value=[])
-    prisma.db.litellm_shadowevaljob.create = AsyncMock(return_value=_job_record())
-    prisma.db.litellm_shadowevaljob.update = AsyncMock(
-        return_value=_job_record(stopped_at=datetime.now(timezone.utc))
-    )
+    prisma.db.litellm_verificationtoken.find_many = AsyncMock(return_value=[_key_record(token) for token in known_keys])
+    async def execute_raw(sql: str, *params: object):
+        if "SET stopped_by" in sql:
+            group = [row for row in stored if row.group_id == params[0]]
+            counts = {row["job_id"]: row["attempt_count"] for row in prisma.attempt_rows}
+            sampling = any(row.stopped_at is None and counts.get(row.id, 0) < row.max_turns for row in group)
+            window_open = bool(group) and group[0].ends_at > datetime.now(timezone.utc)
+            claimable = [row for row in group if row.stopped_by is None]
+            if not (claimable and sampling and window_open):
+                return 0
+            for row in claimable:
+                row.stopped_by = params[1]
+                if row.stopped_at is None:
+                    row.stopped_at = datetime.fromisoformat(str(params[2])).replace(tzinfo=timezone.utc)
+            return len(claimable)
+        return 0
+
+    prisma.db.execute_raw = AsyncMock(side_effect=execute_raw)
+    stored = legs if isinstance(legs, list) else list(legs)
+
+    async def find_many_legs(where=None, **_: object):
+        current = list(stored)
+        w = dict(where or {})
+        if "api_key_id" in w:
+            wanted = w["api_key_id"]["in"] if isinstance(w["api_key_id"], dict) else [w["api_key_id"]]
+            current = [row for row in current if row.api_key_id in wanted]
+        if "direction" in w:
+            current = [row for row in current if row.direction == w["direction"]]
+        if "stopped_at" in w:
+            current = [row for row in current if row.stopped_at is w["stopped_at"]]
+        if "group_id" in w:
+            wanted = w["group_id"]["in"] if isinstance(w["group_id"], dict) else [w["group_id"]]
+            current = [row for row in current if row.group_id in wanted]
+        return current
+
+    def newest_groups(rows, limit):
+        latest: dict = {}
+        for row in rows:
+            if row.group_id not in latest or row.created_at > latest[row.group_id]:
+                latest[row.group_id] = row.created_at
+        ordered = sorted(latest, key=lambda group_id: latest[group_id], reverse=True)
+        return ordered[: int(limit)]
+
+    def leg_dict(row):
+        fields = (
+            "id",
+            "group_id",
+            "api_key_id",
+            "router_name",
+            "direction",
+            "baseline_model",
+            "judge_model",
+            "shadow_percentage",
+            "max_turns",
+            "created_at",
+            "ends_at",
+            "stopped_at",
+            "stopped_by",
+        )
+        return {field: getattr(row, field) for field in fields}
+
+    prisma.db.litellm_shadowevaljob.find_many = AsyncMock(side_effect=find_many_legs)
+    prisma.db.litellm_shadowevaljob.create_many = AsyncMock(return_value=1)
+    prisma.db.litellm_shadowevaljob.update_many = AsyncMock(return_value=1)
     prisma.db.litellm_shadowevalattempt.find_first = AsyncMock(return_value=None)
+    prisma.attempt_rows = []
 
     async def query_raw(sql: str, *params: object):
+        if "AS attempt_count" in sql:
+            return prisma.attempt_rows
+        if "GROUP BY group_id" in sql:
+            scoped = [row for row in stored if "api_key_id = $2" not in sql or row.api_key_id == params[1]]
+            keep = set(newest_groups(scoped, params[0]))
+            return [leg_dict(row) for row in stored if row.group_id in keep]
         if "FILTER (WHERE outcome != 'error')::int AS judged_count" in sql:
             return [{"judged_count": 10, "error_count": 2, "judge_spend": 0.031}]
+        if "SELECT job_id AS grp" in sql:
+            return by_leg_rows if by_leg_rows is not None else []
         return agg_rows if agg_rows is not None else []
 
     prisma.db.query_raw = AsyncMock(side_effect=query_raw)
@@ -563,7 +633,7 @@ def _shadow_prisma(active_job=None, agg_rows=None) -> MagicMock:
 
 def _start_request(**overrides: object) -> StartShadowEvalRequest:
     payload = {
-        "api_key_id": "key-hash",
+        "api_key_ids": ("key-hash",),
         "router_name": "my-router",
         "shadow_percentage": 10.0,
         "judge_model": "anthropic/claude-sonnet-5",
@@ -575,44 +645,55 @@ def _start_request(**overrides: object) -> StartShadowEvalRequest:
 
 
 @pytest.mark.asyncio
-async def test_start_shadow_eval_creates_job_and_frees_expired_or_exhausted_ones(monkeypatch: pytest.MonkeyPatch):
-    """Expiry and turn-budget exhaustion both end sampling on their own; either must
-    release the key's slot in the active-job index so a new eval can start."""
+async def test_start_shadow_eval_writes_one_leg_per_key_in_one_statement(monkeypatch: pytest.MonkeyPatch):
+    """N keys become N sibling rows sharing group_id and identical config, written by a
+    single create_many so a unique-index loser rolls back the whole claim, and expiry or
+    budget exhaustion frees every requested key's slot first."""
     import litellm.proxy.proxy_server as proxy_server
 
     prisma = _shadow_prisma()
     monkeypatch.setattr(proxy_server, "prisma_client", prisma)
     monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
 
-    response = await start_shadow_eval(_start_request(), ADMIN)
+    response = await start_shadow_eval(_start_request(api_key_ids=("key-hash", "key-hash-2")), ADMIN)
 
-    assert response.status == "running"
-    assert response.max_turns == 200
-    assert response.judged_count is None
-    sweep_sql, sweep_key = prisma.db.execute_raw.call_args.args
+    sweep_sql, sweep_keys = prisma.db.execute_raw.call_args.args
     assert "stopped_at IS NULL" in sweep_sql
-    assert "ends_at <= NOW()" in sweep_sql
+    assert "j.ends_at <= (NOW() AT TIME ZONE 'utc')" in sweep_sql
+    assert "SET stopped_at = (NOW() AT TIME ZONE 'utc')" in sweep_sql
     assert ">= j.max_turns" in sweep_sql
-    assert sweep_key == "key-hash"
-    create_data = prisma.db.litellm_shadowevaljob.create.call_args.kwargs["data"]
-    assert create_data["api_key_id"] == "key-hash"
-    assert create_data["created_by"] == "admin"
-    assert "status" not in create_data
+    assert "j.api_key_id = ANY($1::text[])" in sweep_sql
+    assert sweep_keys == ["key-hash", "key-hash-2"]
+    prisma.db.litellm_shadowevaljob.create_many.assert_awaited_once()
+    rows = prisma.db.litellm_shadowevaljob.create_many.call_args.kwargs["data"]
+    assert [row["api_key_id"] for row in rows] == ["key-hash", "key-hash-2"]
+    assert len({frozenset((k, v) for k, v in row.items() if k != "api_key_id") for row in rows}) == 1
+    assert len({row["group_id"] for row in rows}) == 1
+    assert all(row["max_turns"] == 200 and row["created_by"] == "admin" for row in rows)
+    assert all("status" not in row and "id" not in row for row in rows)
+    assert response.job_id == rows[0]["group_id"]
+    assert response.status == "running"
+    assert response.judged_count is None
+    assert [(key.api_key_id, key.max_turns, key.key_alias) for key in response.keys] == [
+        ("key-hash", 200, "prod-alpha"),
+        ("key-hash-2", 200, "prod-alpha"),
+    ]
 
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "caller,request_overrides,active,expected_status",
+    "caller,request_overrides,claimed,expected_status",
     [
-        (NON_ADMIN, {}, None, 403),
-        (VIEWER, {}, None, 403),
-        (ADMIN, {"router_name": "not-a-router"}, None, 400),
-        (ADMIN, {"judge_model": "not/a real model!"}, None, 400),
-        (ADMIN, {"judge_model": "my-router"}, None, 400),
-        (ADMIN, {}, "active", 409),
-        (ADMIN, {"direction": "reverse", "baseline_model": "my-router"}, None, 400),
-        (ADMIN, {"direction": "reverse", "baseline_model": "not/a real model!"}, None, 400),
-        (ADMIN, {"direction": "reverse", "baseline_model": "openai/gpt-4o", "router_name": "not-a-router"}, None, 400),
+        (NON_ADMIN, {}, (), 403),
+        (VIEWER, {}, (), 403),
+        (ADMIN, {"router_name": "not-a-router"}, (), 400),
+        (ADMIN, {"judge_model": "not/a real model!"}, (), 400),
+        (ADMIN, {"judge_model": "my-router"}, (), 400),
+        (ADMIN, {}, ("key-hash",), 409),
+        (ADMIN, {"api_key_ids": ("key-hash", "key-hash-2")}, ("key-hash-2",), 409),
+        (ADMIN, {"direction": "reverse", "baseline_model": "my-router"}, (), 400),
+        (ADMIN, {"direction": "reverse", "baseline_model": "not/a real model!"}, (), 400),
+        (ADMIN, {"direction": "reverse", "baseline_model": "openai/gpt-4o", "router_name": "not-a-router"}, (), 400),
     ],
     ids=[
         "non-admin",
@@ -621,23 +702,143 @@ async def test_start_shadow_eval_creates_job_and_frees_expired_or_exhausted_ones
         "unresolvable-judge",
         "router-as-judge",
         "already-active",
+        "one-of-several-keys-already-active",
         "router-as-baseline",
         "unresolvable-baseline",
         "reverse-still-needs-an-auto-router",
     ],
 )
 async def test_start_shadow_eval_rejections(
-    monkeypatch: pytest.MonkeyPatch, caller, request_overrides, active, expected_status
+    monkeypatch: pytest.MonkeyPatch, caller, request_overrides, claimed, expected_status
 ):
     import litellm.proxy.proxy_server as proxy_server
 
-    prisma = _shadow_prisma(active_job=_job_record() if active else None)
+    prisma = _shadow_prisma(legs=[_leg_record(id=f"leg-{key}", group_id="job-7", api_key_id=key) for key in claimed])
     monkeypatch.setattr(proxy_server, "prisma_client", prisma)
     monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
 
     with pytest.raises(HTTPException) as exc:
         await start_shadow_eval(_start_request(**request_overrides), caller)
     assert exc.value.status_code == expected_status
+    prisma.db.litellm_shadowevaljob.create_many.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_start_shadow_eval_names_the_busy_key_and_its_job(monkeypatch: pytest.MonkeyPatch):
+    """A key busy elsewhere blocks the whole start rather than being silently dropped from
+    it, and the 409 names which key and which job so the caller can stop or drop it."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(legs=[_leg_record(id="leg-b", group_id="job-7", api_key_id="key-hash-2")])
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
+
+    with pytest.raises(HTTPException) as exc:
+        await start_shadow_eval(_start_request(api_key_ids=("key-hash", "key-hash-2")), ADMIN)
+    assert exc.value.status_code == 409
+    assert "key-hash-2 (job job-7)" in exc.value.detail
+
+
+@pytest.mark.asyncio
+async def test_start_shadow_eval_reuses_a_key_whose_previous_job_already_stopped(monkeypatch: pytest.MonkeyPatch):
+    """The claim is held by unstopped legs only, matching the partial unique index. A read
+    that forgets that would strand every key that has ever finished a job."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(legs=[_leg_record(group_id="job-7", stopped_at=datetime.now(timezone.utc))])
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
+
+    job = await start_shadow_eval(_start_request(), ADMIN)
+
+    assert job.status == "running"
+    prisma.db.litellm_shadowevaljob.create_many.assert_awaited_once()
+
+
+@pytest.mark.asyncio
+async def test_start_shadow_eval_reverse_records_its_arms_and_holds_its_own_slot(monkeypatch: pytest.MonkeyPatch):
+    """The two directions ask opposite questions of the same key, so a forward job holding
+    the slot must not block a reverse one. The second reverse start still 409s."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    legs = [_leg_record(group_id="job-fwd")]
+    prisma = _shadow_prisma(legs=legs)
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
+
+    reverse = _start_request(direction="reverse", baseline_model="openai/gpt-4o")
+    response = await start_shadow_eval(reverse, ADMIN)
+
+    assert (response.direction, response.baseline_model) == ("reverse", "openai/gpt-4o")
+    rows = prisma.db.litellm_shadowevaljob.create_many.call_args.kwargs["data"]
+    assert rows[0]["direction"] == "reverse"
+    assert rows[0]["baseline_model"] == "openai/gpt-4o"
+
+    legs.append(_leg_record(id="leg-2", group_id="job-rev", direction="reverse"))
+    with pytest.raises(HTTPException) as exc:
+        await start_shadow_eval(reverse, ADMIN)
+    assert exc.value.status_code == 409
+
+
+@pytest.mark.asyncio
+async def test_start_shadow_eval_forward_leaves_the_baseline_column_empty(monkeypatch: pytest.MonkeyPatch):
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma()
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
+
+    await start_shadow_eval(_start_request(), ADMIN)
+
+    rows = prisma.db.litellm_shadowevaljob.create_many.call_args.kwargs["data"]
+    assert rows[0]["direction"] == "forward"
+    assert rows[0]["baseline_model"] is None
+
+
+@pytest.mark.asyncio
+async def test_start_shadow_eval_rejects_keys_this_proxy_does_not_know(monkeypatch: pytest.MonkeyPatch):
+    """A typo'd api_key_id would otherwise create a leg no traffic can ever match. Every
+    unknown key is named at once, so a caller passing several fixes them in one round."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(known_keys=("key-hash",))
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
+
+    with pytest.raises(HTTPException) as exc:
+        await start_shadow_eval(_start_request(api_key_ids=("key-hash", "typo-a", "typo-b")), ADMIN)
+    assert exc.value.status_code == 400
+    assert "typo-a, typo-b" in exc.value.detail
+    assert "key-hash," not in exc.value.detail
+    prisma.db.litellm_shadowevaljob.create_many.assert_not_called()
+
+
+def test_start_shadow_eval_request_dedupes_and_bounds_the_key_set():
+    """A key named twice would collide with itself on the one-active-per-key index, a job
+    scoping no key samples nothing, and the key-count cap bounds every downstream read."""
+    assert _start_request(api_key_ids=("a", "b", "a")).api_key_ids == ("a", "b")
+    assert len(_start_request(api_key_ids=tuple(f"k{i}" for i in range(100))).api_key_ids) == 100
+    with pytest.raises(ValidationError):
+        _start_request(api_key_ids=())
+    with pytest.raises(ValidationError):
+        _start_request(api_key_ids=tuple(f"k{i}" for i in range(101)))
+
+
+@pytest.mark.asyncio
+async def test_start_shadow_eval_concurrent_unique_violation_is_a_409(monkeypatch: pytest.MonkeyPatch):
+    import litellm.proxy.proxy_server as proxy_server
+    from prisma.errors import UniqueViolationError
+
+    prisma = _shadow_prisma()
+    prisma.db.litellm_shadowevaljob.create_many = AsyncMock(
+        side_effect=UniqueViolationError(MagicMock(message="unique constraint"))
+    )
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
+
+    with pytest.raises(HTTPException) as exc:
+        await start_shadow_eval(_start_request(), ADMIN)
+    assert exc.value.status_code == 409
 
 
 @pytest.mark.parametrize(
@@ -657,97 +858,25 @@ def test_start_request_pins_baseline_model_to_reverse(overrides):
 
 
 @pytest.mark.asyncio
-async def test_start_shadow_eval_reverse_records_its_arms_and_holds_its_own_slot(monkeypatch: pytest.MonkeyPatch):
-    """The two directions ask opposite questions of the same key, so a forward job holding
-    the slot must not block a reverse one. The second reverse start still 409s."""
-    import litellm.proxy.proxy_server as proxy_server
-
-    prisma = _shadow_prisma()
-    active = {"forward": _job_record()}
-    prisma.db.litellm_shadowevaljob.find_first = AsyncMock(
-        side_effect=lambda where, **_: active.get(str(where.get("direction")))
-    )
-    prisma.db.litellm_shadowevaljob.create = AsyncMock(
-        return_value=_job_record(direction="reverse", baseline_model="openai/gpt-4o")
-    )
-    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
-    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
-
-    reverse = _start_request(direction="reverse", baseline_model="openai/gpt-4o")
-    response = await start_shadow_eval(reverse, ADMIN)
-
-    assert (response.direction, response.baseline_model) == ("reverse", "openai/gpt-4o")
-    create_data = prisma.db.litellm_shadowevaljob.create.call_args.kwargs["data"]
-    assert create_data["direction"] == "reverse"
-    assert create_data["baseline_model"] == "openai/gpt-4o"
-
-    active["reverse"] = _job_record(id="job-2", direction="reverse")
-    with pytest.raises(HTTPException) as exc:
-        await start_shadow_eval(reverse, ADMIN)
-    assert exc.value.status_code == 409
-
-
-@pytest.mark.asyncio
-async def test_start_shadow_eval_forward_leaves_the_baseline_column_empty(monkeypatch: pytest.MonkeyPatch):
-    import litellm.proxy.proxy_server as proxy_server
-
-    prisma = _shadow_prisma()
-    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
-    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
-
-    await start_shadow_eval(_start_request(), ADMIN)
-
-    create_data = prisma.db.litellm_shadowevaljob.create.call_args.kwargs["data"]
-    assert create_data["direction"] == "forward"
-    assert create_data["baseline_model"] is None
-
-
-@pytest.mark.asyncio
-async def test_start_shadow_eval_rejects_a_key_this_proxy_does_not_know(monkeypatch: pytest.MonkeyPatch):
-    """A typo'd api_key_id would otherwise create a job no traffic can ever match."""
-    import litellm.proxy.proxy_server as proxy_server
-
-    prisma = _shadow_prisma()
-    prisma.db.litellm_verificationtoken.find_unique = AsyncMock(return_value=None)
-    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
-    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
-
-    with pytest.raises(HTTPException) as exc:
-        await start_shadow_eval(_start_request(), ADMIN)
-    assert exc.value.status_code == 400
-    assert "not a key on this proxy" in exc.value.detail
-
-
-@pytest.mark.asyncio
-async def test_start_shadow_eval_concurrent_unique_violation_is_a_409(monkeypatch: pytest.MonkeyPatch):
-    import litellm.proxy.proxy_server as proxy_server
-    from prisma.errors import UniqueViolationError
-
-    prisma = _shadow_prisma()
-    prisma.db.litellm_shadowevaljob.create = AsyncMock(
-        side_effect=UniqueViolationError(MagicMock(message="unique constraint"))
-    )
-    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
-    monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
-
-    with pytest.raises(HTTPException) as exc:
-        await start_shadow_eval(_start_request(), ADMIN)
-    assert exc.value.status_code == 409
-
-
-@pytest.mark.asyncio
-async def test_get_shadow_eval_job_derives_counts_spend_and_stratified_results(monkeypatch: pytest.MonkeyPatch):
+async def test_get_shadow_eval_job_pools_counts_and_slices_results_per_key(monkeypatch: pytest.MonkeyPatch):
+    """One read answers for every leg: totals and stratifications aggregate over the
+    group's leg ids, and the by-key slice maps each leg id back to its key hash."""
     import litellm.proxy.proxy_server as proxy_server
 
     tier_rows = [
         {"grp": "SIMPLE", "turn_count": 8, "real_wins": 2, "shadow_wins": 4, "ties": 2, "avg_confidence": 0.8},
         {"grp": "REASONING", "turn_count": 2, "real_wins": 2, "shadow_wins": 0, "ties": 0, "avg_confidence": 0.9},
     ]
-    prisma = _shadow_prisma(agg_rows=tier_rows)
-    prisma.db.litellm_shadowevaljob.find_unique = AsyncMock(return_value=_job_record())
-    prisma.db.litellm_shadowevalattempt.find_first = AsyncMock(
-        return_value=MagicMock(error="judge call failed: boom")
+    leg_rows = [
+        {"grp": "leg-1", "turn_count": 6, "real_wins": 1, "shadow_wins": 4, "ties": 1, "avg_confidence": 0.7},
+        {"grp": "leg-2", "turn_count": 4, "real_wins": 3, "shadow_wins": 0, "ties": 1, "avg_confidence": 0.6},
+    ]
+    prisma = _shadow_prisma(
+        legs=[_leg_record(), _leg_record(id="leg-2", api_key_id="key-hash-2", max_turns=50)],
+        agg_rows=tier_rows,
+        by_leg_rows=leg_rows,
     )
+    prisma.db.litellm_shadowevalattempt.find_first = AsyncMock(return_value=MagicMock(error="judge call failed: boom"))
     monkeypatch.setattr(proxy_server, "prisma_client", prisma)
 
     response = await get_shadow_eval_job("job-1", VIEWER)
@@ -762,6 +891,13 @@ async def test_get_shadow_eval_job_derives_counts_spend_and_stratified_results(m
     assert response.results.by_tier[0].shadow_win_rate_pct == 50.0
     assert response.results.overall_shadow_win_rate_pct == 40.0
     assert response.results.overall_tie_rate_pct == 20.0
+    assert [(s.group, s.turn_count) for s in response.results.by_key] == [("key-hash", 6), ("key-hash-2", 4)]
+    assert response.results.by_key[0].shadow_win_rate_pct == 66.7
+    assert [(key.api_key_id, key.max_turns) for key in response.keys] == [("key-hash", 200), ("key-hash-2", 50)]
+    totals_args = [call.args for call in prisma.db.query_raw.await_args_list if "judged_count" in call.args[0]]
+    assert totals_args == [(totals_args[0][0], ["leg-1", "leg-2"])]
+    error_where = prisma.db.litellm_shadowevalattempt.find_first.call_args.kwargs["where"]
+    assert error_where == {"job_id": {"in": ["leg-1", "leg-2"]}, "outcome": "error"}
 
 
 @pytest.mark.asyncio
@@ -780,79 +916,326 @@ async def test_get_shadow_eval_job_404s_and_gates_on_role(monkeypatch: pytest.Mo
 
 
 @pytest.mark.asyncio
-async def test_list_shadow_eval_jobs_returns_derived_status_without_aggregates(monkeypatch: pytest.MonkeyPatch):
+async def test_list_shadow_eval_jobs_collapses_legs_into_jobs_newest_first(monkeypatch: pytest.MonkeyPatch):
+    """A job over two keys is one list entry with both keys, not two entries, and a job
+    whose keys all stopped reads stopped while a half-stopped one still runs."""
     import litellm.proxy.proxy_server as proxy_server
 
-    prisma = _shadow_prisma()
-    prisma.db.litellm_shadowevaljob.find_many = AsyncMock(
-        return_value=[
-            _job_record(),
-            _job_record(id="job-2", ends_at=datetime.now(timezone.utc) - timedelta(days=1)),
-            _job_record(id="job-3", stopped_at=datetime.now(timezone.utc)),
+    stamp = datetime.now(timezone.utc)
+    prisma = _shadow_prisma(
+        legs=[
+            _leg_record(created_at=datetime(2026, 8, 13, tzinfo=timezone.utc)),
+            _leg_record(
+                id="leg-2",
+                api_key_id="key-hash-2",
+                stopped_at=stamp,
+                created_at=datetime(2026, 8, 13, tzinfo=timezone.utc),
+            ),
+            _leg_record(
+                id="leg-3",
+                group_id="job-2",
+                stopped_at=stamp,
+                created_at=datetime(2026, 8, 12, tzinfo=timezone.utc),
+            ),
+            _leg_record(
+                id="leg-4",
+                group_id="job-3",
+                ends_at=datetime.now(timezone.utc) - timedelta(days=1),
+                created_at=datetime(2026, 8, 11, tzinfo=timezone.utc),
+            ),
         ]
     )
     monkeypatch.setattr(proxy_server, "prisma_client", prisma)
 
     jobs = await list_shadow_eval_jobs(VIEWER, api_key_id=None, limit=50)
 
-    assert [job.status for job in jobs] == ["running", "completed", "stopped"]
-    swept = ShadowEvalJobResponse.model_validate(
-        _job_record(
-            id="job-4",
-            ends_at=datetime.now(timezone.utc) - timedelta(days=1),
-            stopped_at=datetime.now(timezone.utc),
-        ),
-        from_attributes=True,
-    )
-    assert swept.status == "completed"
+    assert [(job.job_id, job.status) for job in jobs] == [
+        ("job-1", "running"),
+        ("job-2", "stopped"),
+        ("job-3", "completed"),
+    ]
+    assert [key.api_key_id for key in jobs[0].keys] == ["key-hash", "key-hash-2"]
     assert all(job.judged_count is None and job.results is None for job in jobs)
-    assert prisma.db.query_raw.await_count == 0
+    legs_sql, legs_limit = prisma.db.query_raw.await_args_list[0].args
+    assert "GROUP BY group_id ORDER BY MAX(created_at) DESC LIMIT $1::int" in legs_sql
+    assert legs_limit == 50
+    counts_sql, _ = prisma.db.query_raw.await_args_list[1].args
+    assert "AS attempt_count" in counts_sql
+    assert "j.stopped_at IS NULL OR a.created_at <= j.stopped_at" in counts_sql
+    assert prisma.db.query_raw.await_count == 2
+    prisma.db.litellm_shadowevaljob.find_many.assert_not_called()
 
 
 @pytest.mark.asyncio
-async def test_shadow_eval_responses_name_the_shadowed_key(monkeypatch: pytest.MonkeyPatch):
+async def test_list_shadow_eval_jobs_filters_to_jobs_containing_the_key(monkeypatch: pytest.MonkeyPatch):
+    """The filter matches a key anywhere in a job's key set and still returns the whole
+    job, sibling keys included."""
     import litellm.proxy.proxy_server as proxy_server
 
-    prisma = _shadow_prisma()
-    prisma.db.litellm_shadowevaljob.find_many = AsyncMock(
-        return_value=[_job_record(), _job_record(id="job-2", api_key_id="deleted-key-hash")]
+    prisma = _shadow_prisma(
+        legs=[
+            _leg_record(),
+            _leg_record(id="leg-2", api_key_id="key-hash-2"),
+            _leg_record(id="leg-3", group_id="job-2", api_key_id="key-hash-2"),
+            _leg_record(id="leg-4", group_id="job-3"),
+        ]
+    )
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    jobs = await list_shadow_eval_jobs(VIEWER, api_key_id="key-hash-2", limit=50)
+
+    assert [job.job_id for job in jobs] == ["job-1", "job-2"]
+    assert [key.api_key_id for key in jobs[0].keys] == ["key-hash", "key-hash-2"]
+
+
+@pytest.mark.parametrize(
+    ("stopped_flags", "days_left", "expected"),
+    [
+        ((False, False), 7, "running"),
+        ((True, False), 7, "running"),
+        ((True, True), 7, "stopped"),
+        ((True, True), -1, "completed"),
+        ((False, False), -1, "completed"),
+    ],
+)
+@pytest.mark.asyncio
+async def test_job_status_runs_until_every_key_stops_and_completed_outranks_stopped(
+    monkeypatch: pytest.MonkeyPatch, stopped_flags: tuple[bool, ...], days_left: int, expected: str
+):
+    import litellm.proxy.proxy_server as proxy_server
+
+    stamp = datetime.now(timezone.utc)
+    prisma = _shadow_prisma(
+        legs=[
+            _leg_record(
+                id=f"leg-{index}",
+                api_key_id=f"key-{index}",
+                stopped_at=stamp if stopped else None,
+                ends_at=datetime.now(timezone.utc) + timedelta(days=days_left),
+            )
+            for index, stopped in enumerate(stopped_flags)
+        ]
+    )
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    jobs = await list_shadow_eval_jobs(VIEWER, api_key_id=None, limit=50)
+
+    assert [job.status for job in jobs] == [expected]
+
+
+@pytest.mark.asyncio
+async def test_list_reads_completed_once_every_key_spends_its_budget(monkeypatch: pytest.MonkeyPatch):
+    """A job whose keys all exhausted their turn budgets stopped sampling on its own, so
+    it must read completed on the very next list, before any sweep stamps its legs; one
+    key under budget keeps the whole job running. An operator starting an unrelated eval
+    must never look like it terminated a finished one."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(
+        legs=[
+            _leg_record(max_turns=5),
+            _leg_record(id="leg-2", api_key_id="key-hash-2", max_turns=5),
+            _leg_record(id="leg-3", group_id="job-2", api_key_id="key-hash", max_turns=5),
+            _leg_record(id="leg-4", group_id="job-2", api_key_id="key-hash-2", max_turns=5),
+        ]
+    )
+    prisma.attempt_rows = [
+        {"job_id": "leg-1", "attempt_count": 5},
+        {"job_id": "leg-2", "attempt_count": 6},
+        {"job_id": "leg-3", "attempt_count": 5},
+        {"job_id": "leg-4", "attempt_count": 3},
+    ]
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    jobs = await list_shadow_eval_jobs(VIEWER, api_key_id=None, limit=50)
+
+    by_id = {job.job_id: job for job in jobs}
+    assert by_id["job-1"].status == "completed"
+    assert all(key.stopped_at is None for key in by_id["job-1"].keys)
+    assert by_id["job-2"].status == "running"
+    assert {key.api_key_id: key.attempt_count for key in by_id["job-2"].keys} == {"key-hash": 5, "key-hash-2": 3}
+
+
+@pytest.mark.asyncio
+async def test_recorded_operator_stop_outranks_budget_arithmetic(monkeypatch: pytest.MonkeyPatch):
+    """A detached attempt can land around the stop and push the raw count past the
+    budget; the recorded stopped_by must keep the job reading stopped regardless."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    stamp = datetime.now(timezone.utc)
+    prisma = _shadow_prisma(legs=[_leg_record(max_turns=5, stopped_at=stamp, stopped_by="admin")])
+    prisma.attempt_rows = [{"job_id": "leg-1", "attempt_count": 6}]
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    jobs = await list_shadow_eval_jobs(VIEWER, api_key_id=None, limit=50)
+    assert jobs[0].status == "stopped"
+    assert jobs[0].stopped_by == "admin"
+
+    detail = await get_shadow_eval_job("job-1", VIEWER)
+    assert detail.status == "stopped"
+
+
+@pytest.mark.asyncio
+async def test_backfilled_legacy_stop_never_reads_as_completion(monkeypatch: pytest.MonkeyPatch):
+    """Jobs stopped before stopped_by existed are backfilled with 'unknown' by the
+    migration, so even one whose stray attempts crossed the budget stays stopped."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(
+        legs=[_leg_record(max_turns=5, stopped_at=datetime.now(timezone.utc), stopped_by="unknown")]
+    )
+    prisma.attempt_rows = [{"job_id": "leg-1", "attempt_count": 6}]
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    jobs = await list_shadow_eval_jobs(VIEWER, api_key_id=None, limit=50)
+    assert jobs[0].status == "stopped"
+
+
+def test_stopped_by_migration_backfills_every_job_that_displayed_stopped():
+    """The migration must close the pre-column population: without the backfill, a
+    legacy stop whose stray attempts crossed the budget would read completed."""
+    import litellm_proxy_extras
+
+    sql = (
+        Path(litellm_proxy_extras.__file__).parent
+        / "migrations"
+        / "20260818224500_add_shadow_eval_stopped_by"
+        / "migration.sql"
+    ).read_text()
+    assert 'ADD COLUMN     "stopped_by" TEXT' in sql
+    assert "SET stopped_by = 'unknown'" in sql
+    assert "WHERE stopped_at IS NOT NULL AND ends_at > (NOW() AT TIME ZONE 'utc')" in sql
+
+
+@pytest.mark.asyncio
+async def test_stop_rejects_a_job_that_already_spent_its_budget(monkeypatch: pytest.MonkeyPatch):
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(legs=[_leg_record(max_turns=3)])
+    prisma.attempt_rows = [{"job_id": "leg-1", "attempt_count": 3}]
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    with pytest.raises(HTTPException) as exhausted:
+        await stop_shadow_eval_job("job-1", ADMIN)
+    assert exhausted.value.status_code == 400
+    assert "completed" in exhausted.value.detail
+    prisma.db.litellm_shadowevaljob.update_many.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_shadow_eval_responses_name_every_shadowed_key(monkeypatch: pytest.MonkeyPatch):
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(
+        legs=[_leg_record(), _leg_record(id="leg-2", api_key_id="deleted-key-hash")],
+        known_keys=("key-hash", "key-hash-2"),
     )
     monkeypatch.setattr(proxy_server, "llm_router", _shadow_router())
     monkeypatch.setattr(proxy_server, "prisma_client", prisma)
 
-    started = await start_shadow_eval(_start_request(), ADMIN)
-    assert (started.key_alias, started.key_name) == ("prod-alpha", "sk-...lpha")
-
     jobs = await list_shadow_eval_jobs(VIEWER, api_key_id=None, limit=50)
-    assert [(job.key_alias, job.key_name) for job in jobs] == [("prod-alpha", "sk-...lpha"), (None, None)]
+    assert [(key.key_alias, key.key_name) for key in jobs[0].keys] == [
+        (None, None),
+        ("prod-alpha", "sk-...lpha"),
+    ]
     batched_where = prisma.db.litellm_verificationtoken.find_many.call_args.kwargs["where"]
     assert batched_where == {"token": {"in": ["deleted-key-hash", "key-hash"]}}
 
-    prisma.db.litellm_shadowevaljob.find_unique = AsyncMock(return_value=_job_record())
     detail = await get_shadow_eval_job("job-1", VIEWER)
-    assert detail.key_alias == "prod-alpha"
+    assert [key.key_alias for key in detail.keys] == [None, "prod-alpha"]
 
 
 @pytest.mark.asyncio
-async def test_stop_shadow_eval_sets_stopped_at_and_rejects_non_running(monkeypatch: pytest.MonkeyPatch):
+async def test_stop_shadow_eval_stops_every_unstopped_leg_and_rejects_non_running(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    """One stop ends sampling for the whole job, while a leg that already stopped on its
+    own budget keeps the stopped_at it earned."""
     import litellm.proxy.proxy_server as proxy_server
 
-    prisma = _shadow_prisma()
-    prisma.db.litellm_shadowevaljob.find_unique = AsyncMock(return_value=_job_record())
+    earned = datetime.now(timezone.utc) - timedelta(hours=1)
+    prisma = _shadow_prisma(legs=[_leg_record(), _leg_record(id="leg-2", api_key_id="key-hash-2", stopped_at=earned)])
     monkeypatch.setattr(proxy_server, "prisma_client", prisma)
 
     stopped = await stop_shadow_eval_job("job-1", ADMIN)
-    assert stopped.status == "stopped"
-    update = prisma.db.litellm_shadowevaljob.update.call_args.kwargs
-    assert set(update["data"]) == {"stopped_at"}
 
-    prisma.db.litellm_shadowevaljob.find_unique = AsyncMock(
-        return_value=_job_record(ends_at=datetime.now(timezone.utc) - timedelta(days=1))
-    )
+    assert stopped.status == "stopped"
+    assert stopped.stopped_by == "admin"
+    stop_sql, stop_group, stop_operator, stop_stamp = prisma.db.execute_raw.call_args.args
+    assert "SET stopped_by = $2, stopped_at = COALESCE(stopped_at, $3::timestamp)" in stop_sql
+    assert "WHERE group_id = $1 AND stopped_by IS NULL" in stop_sql
+    assert "ends_at > (NOW() AT TIME ZONE 'utc')" in stop_sql
+    assert ") < k.max_turns" in stop_sql
+    assert (stop_group, stop_operator) == ("job-1", "admin")
+    assert datetime.fromisoformat(stop_stamp).tzinfo is None
+    assert prisma.db.execute_raw.await_count == 1
+    prisma.db.litellm_shadowevaljob.update_many.assert_not_called()
+    by_key = {key.api_key_id: key.stopped_at for key in stopped.keys}
+    assert by_key["key-hash-2"] == earned
+    assert by_key["key-hash"] is not None and by_key["key-hash"] != earned
+
+    done_leg = _leg_record(ends_at=datetime.now(timezone.utc) - timedelta(days=1))
+    prisma_done = _shadow_prisma(legs=[done_leg])
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma_done)
     with pytest.raises(HTTPException) as exc:
         await stop_shadow_eval_job("job-1", ADMIN)
     assert exc.value.status_code == 400
+    assert "already completed" in exc.value.detail
+    assert done_leg.stopped_by is None
 
     with pytest.raises(HTTPException) as forbidden:
         await stop_shadow_eval_job("job-1", VIEWER)
     assert forbidden.value.status_code == 403
+
+
+def test_every_shadow_eval_sql_constant_speaks_naive_utc():
+    """The tables store naive UTC wall time (prisma's convention), so SQL-side time must be
+    NOW() AT TIME ZONE 'utc' and python-side params must cast ::timestamp; a bare NOW() or a
+    timestamptz cast writes session-local wall time into the naive column and skews every
+    comparison against prisma-written stamps."""
+    import litellm.proxy.management_endpoints.auto_router_endpoints as module
+
+    sql_constants = {name: value for name, value in vars(module).items() if name.endswith("_SQL")}
+    assert sql_constants
+    for name, sql in sql_constants.items():
+        assert "::timestamptz" not in sql, name
+        for occurrence in sql.split("NOW()")[1:]:
+            assert occurrence.startswith(" AT TIME ZONE 'utc'"), name
+
+
+@pytest.mark.asyncio
+async def test_a_stop_racing_the_last_budgeted_attempt_reports_completed_not_stopped(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    """The statement claims the job only while a leg still samples, so a stop landing in
+    the same instant the budget spends records nothing and the job keeps reading
+    completed; stamping it would misreport a self-ended job as operator-stopped forever."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(legs=[_leg_record(max_turns=2)])
+    prisma.attempt_rows = [{"job_id": "leg-1", "attempt_count": 2}]
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    with pytest.raises(HTTPException) as exc:
+        await stop_shadow_eval_job("job-1", ADMIN)
+    assert exc.value.status_code == 400
+    assert "already completed" in exc.value.detail
+    assert prisma.db.litellm_shadowevaljob.find_many.await_args.kwargs["where"] == {"group_id": "job-1"}
+
+
+@pytest.mark.asyncio
+async def test_two_racing_stops_produce_exactly_one_winner(monkeypatch: pytest.MonkeyPatch):
+    """The statement's stopped_by IS NULL predicate lets only one racer claim rows; the
+    loser reads the stamped state and gets the same answer a late caller gets."""
+    import litellm.proxy.proxy_server as proxy_server
+
+    prisma = _shadow_prisma(legs=[_leg_record()])
+    monkeypatch.setattr(proxy_server, "prisma_client", prisma)
+
+    first = await stop_shadow_eval_job("job-1", ADMIN)
+    assert first.status == "stopped"
+
+    with pytest.raises(HTTPException) as exc:
+        await stop_shadow_eval_job("job-1", ADMIN)
+    assert exc.value.status_code == 400
+    assert "already stopped" in exc.value.detail
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 93a4788caf8..8e661af8daa 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
@@ -22,6 +22,7 @@ from litellm.proxy._types import (
     NewUserRequest,
     LiteLLM_BudgetTable,
     LiteLLM_OrganizationTable,
+    LiteLLM_ProjectTableCachedObj,
     LiteLLM_TeamTableCachedObj,
     LiteLLM_UserTable,
     LiteLLM_VerificationToken,
@@ -31,9 +32,12 @@ from litellm.proxy._types import (
     ResetSpendRequest,
     UpdateKeyRequest,
 )
+from litellm.proxy.auth.auth_checks import _project_cache_key
 from litellm.proxy.auth.user_api_key_auth import UserAPIKeyAuth
+from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
 from litellm.proxy.management_endpoints.key_management_endpoints import (
     _check_org_key_limits,
+    _check_project_key_limits,
     _check_team_key_limits,
     _common_key_generation_helper,
     _enforce_upperbound_key_params,
@@ -16645,3 +16649,49 @@ async def test_regenerate_key_repoints_live_membership_not_the_key_row_it_read(
     assert await _authorized_models_for_key(
         access_groups, new_token_hash, ["ag-revoked-since", "ag-attached-since"]
     ) == ["attached-model"]
+
+
+async def _cache_with_project(project_id: str, project_models: list[str]) -> UserApiKeyCache:
+    user_api_key_cache = UserApiKeyCache()
+    await user_api_key_cache.async_set_cache(
+        key=_project_cache_key(project_id),
+        value=LiteLLM_ProjectTableCachedObj(project_id=project_id, team_id="team-lit-5823", models=project_models),
+        model_type=LiteLLM_ProjectTableCachedObj,
+    )
+    return user_api_key_cache
+
+
+@pytest.mark.parametrize("request_cls", [GenerateKeyRequest, UpdateKeyRequest])
+@pytest.mark.parametrize("sentinel", ["all-team-models", "all-proxy-models"])
+@pytest.mark.asyncio
+async def test_check_project_key_limits_accepts_inherited_model_sentinels(request_cls, sentinel):
+    """LIT-5823: the sentinels inherit a parent scope, so a project allowlist must not treat them as model names."""
+    user_api_key_cache = await _cache_with_project("proj-lit-5823", ["gpt-5.4-nano"])
+
+    await _check_project_key_limits(
+        project_id="proj-lit-5823",
+        data=request_cls(key="sk-lit-5823", models=[sentinel]),
+        prisma_client=MagicMock(),
+        user_api_key_cache=user_api_key_cache,
+    )
+
+
+@pytest.mark.parametrize("request_cls", [GenerateKeyRequest, UpdateKeyRequest])
+@pytest.mark.parametrize(
+    "key_models",
+    [["gpt-5.4-mini"], ["all-team-models", "gpt-5.4-mini"], ["gpt-5.4-nano", "all-proxy-models", "gpt-5.4-mini"]],
+)
+@pytest.mark.asyncio
+async def test_check_project_key_limits_still_rejects_real_model_outside_project(request_cls, key_models):
+    user_api_key_cache = await _cache_with_project("proj-lit-5823", ["gpt-5.4-nano"])
+
+    with pytest.raises(HTTPException) as exc_info:
+        await _check_project_key_limits(
+            project_id="proj-lit-5823",
+            data=request_cls(key="sk-lit-5823", models=key_models),
+            prisma_client=MagicMock(),
+            user_api_key_cache=user_api_key_cache,
+        )
+
+    assert exc_info.value.status_code == 400
+    assert "Model 'gpt-5.4-mini' not in project's allowed models" in exc_info.value.detail["error"]
diff --git a/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py
index 05072a0a6d7..2d54a391cf0 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_team_endpoints.py
@@ -91,6 +91,8 @@ mock_prisma_client = MagicMock()
 mock_prisma_client.db = MagicMock()
 mock_prisma_client.db.litellm_teamtable = MagicMock()
 mock_prisma_client.db.litellm_teamtable.update = AsyncMock()
+mock_prisma_client.db.litellm_auditlog = MagicMock()
+mock_prisma_client.db.litellm_auditlog.create = AsyncMock()
 
 
 # Fixture to provide the mock prisma client
@@ -103,6 +105,11 @@ def mock_db_client():
     mock_prisma_client.reset_mock()
 
 
+@pytest.fixture
+def disable_audit_logging_for_mocked_team(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setattr("litellm.store_audit_logs", False)
+
+
 # Fixture to provide a mock admin user auth object
 @pytest.fixture
 def mock_admin_auth():
@@ -2060,7 +2067,9 @@ async def test_team_model_add_delete_refresh_team_cache(endpoint_name):
 
 
 @pytest.mark.asyncio
-async def test_update_team_team_member_budget_not_passed_to_db():
+async def test_update_team_team_member_budget_not_passed_to_db(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that 'team_member_budget' is never passed to prisma_client.db.litellm_teamtable.update
     regardless of whether the value is set or None.
@@ -2498,7 +2507,9 @@ async def test_upsert_team_member_budget_table_no_existing_budget():
 
 
 @pytest.mark.asyncio
-async def test_update_team_with_team_member_budget_duration():
+async def test_update_team_with_team_member_budget_duration(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that team/update endpoint properly handles team_member_budget_duration.
     """
@@ -5171,7 +5182,9 @@ async def test_update_team_standalone_budget_raise_blocked_for_team_admin():
 
 
 @pytest.mark.asyncio
-async def test_update_team_standalone_budget_raise_allowed_for_proxy_admin():
+async def test_update_team_standalone_budget_raise_allowed_for_proxy_admin(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that a proxy admin CAN raise a standalone team's budget on /team/update.
 
@@ -5325,7 +5338,9 @@ async def test_update_team_standalone_budget_removal_blocked_for_team_admin():
 
 
 @pytest.mark.asyncio
-async def test_update_team_standalone_uncapped_team_admin_sets_finite_allowed():
+async def test_update_team_standalone_uncapped_team_admin_sets_finite_allowed(
+    disable_audit_logging_for_mocked_team,
+):
     """
     When a team currently has NO cap (max_budget=None / unlimited), a team admin
     setting a finite max_budget is a RESTRICTION, not a raise, and is
@@ -5407,7 +5422,9 @@ async def test_update_team_standalone_uncapped_team_admin_sets_finite_allowed():
 
 
 @pytest.mark.asyncio
-async def test_update_team_standalone_unchanged_budget_allowed():
+async def test_update_team_standalone_unchanged_budget_allowed(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update for a standalone team does NOT compare against the
     caller's personal max_budget when the budget is unchanged.
@@ -5508,7 +5525,9 @@ async def test_update_team_standalone_unchanged_budget_allowed():
 
 
 @pytest.mark.asyncio
-async def test_update_team_standalone_lower_budget_allowed():
+async def test_update_team_standalone_lower_budget_allowed(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update for a standalone team allows lowering the budget
     below the team's current value even when the new value still exceeds the
@@ -5691,7 +5710,9 @@ async def test_update_team_org_scoped_budget_exceeds_org_limit():
 
 
 @pytest.mark.asyncio
-async def test_update_team_standalone_models_not_gated_by_user_limit():
+async def test_update_team_standalone_models_not_gated_by_user_limit(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update for a standalone team does NOT gate the team's models
     by the caller's personal allowed models.
@@ -5775,7 +5796,9 @@ async def test_update_team_standalone_models_not_gated_by_user_limit():
 
 
 @pytest.mark.asyncio
-async def test_update_team_org_scoped_budget_bypasses_user_limit():
+async def test_update_team_org_scoped_budget_bypasses_user_limit(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update for an org-scoped team does NOT validate budget against user's personal max_budget.
 
@@ -5890,7 +5913,9 @@ async def test_update_team_org_scoped_budget_bypasses_user_limit():
 
 
 @pytest.mark.asyncio
-async def test_update_team_org_scoped_models_bypasses_user_limit():
+async def test_update_team_org_scoped_models_bypasses_user_limit(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update for an org-scoped team does NOT validate models against user's personal models.
 
@@ -6080,7 +6105,9 @@ async def test_update_team_org_scoped_models_not_in_org_models():
 
 
 @pytest.mark.asyncio
-async def test_update_team_org_scoped_models_with_all_proxy_models():
+async def test_update_team_org_scoped_models_with_all_proxy_models(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update for an org-scoped team succeeds when organization has 'all-proxy-models'.
 
@@ -6196,7 +6223,9 @@ async def test_update_team_org_scoped_models_with_all_proxy_models():
 
 
 @pytest.mark.asyncio
-async def test_update_team_tpm_limit_not_gated_by_user_limit():
+async def test_update_team_tpm_limit_not_gated_by_user_limit(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update does NOT gate the team's tpm_limit by the caller's
     personal tpm_limit.
@@ -6279,7 +6308,9 @@ async def test_update_team_tpm_limit_not_gated_by_user_limit():
 
 
 @pytest.mark.asyncio
-async def test_update_team_rpm_limit_not_gated_by_user_limit():
+async def test_update_team_rpm_limit_not_gated_by_user_limit(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update does NOT gate the team's rpm_limit by the caller's
     personal rpm_limit.
@@ -6795,7 +6826,9 @@ async def test_update_team_org_scoped_rpm_exceeds_org_limit():
 
 
 @pytest.mark.asyncio
-async def test_update_team_org_scoped_tpm_rpm_bypasses_user_limit():
+async def test_update_team_org_scoped_tpm_rpm_bypasses_user_limit(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update for an org-scoped team bypasses user's TPM/RPM limits.
 
@@ -6905,7 +6938,9 @@ async def test_update_team_org_scoped_tpm_rpm_bypasses_user_limit():
 
 
 @pytest.mark.asyncio
-async def test_update_team_guardrails_with_org_id():
+async def test_update_team_guardrails_with_org_id(
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that updating team guardrails works when team has an organization_id.
     The fix ensures 'teams' field is included when fetching organization data.
@@ -7242,7 +7277,10 @@ async def test_persist_deleted_team_records():
 
 
 @pytest.mark.asyncio
-async def test_delete_team_persists_deleted_teams(monkeypatch):
+async def test_delete_team_persists_deleted_teams(
+    monkeypatch,
+    disable_audit_logging_for_mocked_team,
+):
     from litellm.proxy._types import DeleteTeamRequest
 
     mock_prisma_client = AsyncMock()
@@ -7325,7 +7363,10 @@ async def test_delete_team_persists_deleted_teams(monkeypatch):
 
 
 @pytest.mark.asyncio
-async def test_delete_team_sweeps_references_outside_members_with_roles(monkeypatch):
+async def test_delete_team_sweeps_references_outside_members_with_roles(
+    monkeypatch,
+    disable_audit_logging_for_mocked_team,
+):
     """
     Regression pin for LIT-5511: a deleted team stayed visible on user records.
 
@@ -7431,7 +7472,10 @@ async def test_delete_team_sweeps_references_outside_members_with_roles(monkeypa
 
 
 @pytest.mark.asyncio
-async def test_delete_team_evicts_the_auth_cache_of_the_keys_it_deletes(monkeypatch):
+async def test_delete_team_evicts_the_auth_cache_of_the_keys_it_deletes(
+    monkeypatch,
+    disable_audit_logging_for_mocked_team,
+):
     """
     A virtual key scoped to the team is deleted from the db with the team, but auth resolves a
     cached key object without re-reading the team, so leaving the cache entry behind lets that key
@@ -7493,7 +7537,10 @@ async def test_delete_team_evicts_the_auth_cache_of_the_keys_it_deletes(monkeypa
 
 
 @pytest.mark.asyncio
-async def test_delete_team_failing_reconcile_sweep_cannot_strand_the_team_in_cache(monkeypatch):
+async def test_delete_team_failing_reconcile_sweep_cannot_strand_the_team_in_cache(
+    monkeypatch,
+    disable_audit_logging_for_mocked_team,
+):
     """
     The reconcile sweep runs after the team row is committed deleted. If it ran before cache
     eviction, a sweep failure would return an error with the team gone from the db but still
@@ -7555,7 +7602,10 @@ async def test_delete_team_failing_reconcile_sweep_cannot_strand_the_team_in_cac
 
 
 @pytest.mark.asyncio
-async def test_delete_team_broadcasts_cache_invalidation_to_other_workers(monkeypatch):
+async def test_delete_team_broadcasts_cache_invalidation_to_other_workers(
+    monkeypatch,
+    disable_audit_logging_for_mocked_team,
+):
     """
     Evicting locally only reaches the worker that handled the delete. Without the broadcast, every
     other worker keeps serving the deleted team, and the deleted team's keys, out of its own
@@ -7619,7 +7669,10 @@ async def test_delete_team_broadcasts_cache_invalidation_to_other_workers(monkey
 
 
 @pytest.mark.asyncio
-async def test_delete_team_survives_a_failing_cache_backend(monkeypatch):
+async def test_delete_team_survives_a_failing_cache_backend(
+    monkeypatch,
+    disable_audit_logging_for_mocked_team,
+):
     """
     Cache eviction runs after the reference sweep has already committed, so a cache backend that
     is unreachable must not abort the delete. If it did, `/team/delete` would fail with the team
@@ -8088,6 +8141,7 @@ async def test_update_team_soft_budget_validation(
     expected_soft_budget,
     expected_max_budget,
     error_message,
+    disable_audit_logging_for_mocked_team,
 ):
     """
     Test soft_budget validation in /team/update endpoint.
@@ -8498,7 +8552,11 @@ async def test_get_team_daily_activity_member_without_permission_filters_by_keys
 
 
 @pytest.mark.asyncio
-async def test_update_team_with_router_settings(mock_db_client, mock_admin_auth):
+async def test_update_team_with_router_settings(
+    mock_db_client,
+    mock_admin_auth,
+    disable_audit_logging_for_mocked_team,
+):
     """
     Test that /team/update correctly handles router_settings by:
     1. Accepting router_settings as a dict parameter
@@ -11594,7 +11652,9 @@ async def test_update_team_output_token_estimate_lowered_rejected_for_team_admin
 
 
 @pytest.mark.asyncio
-async def test_update_team_output_token_estimate_unchanged_allows_team_admin_edit():
+async def test_update_team_output_token_estimate_unchanged_allows_team_admin_edit(
+    disable_audit_logging_for_mocked_team,
+):
     """The team settings form resends every field it renders, so gating on
     presence would break a team admin editing an unrelated setting."""
     import contextlib
@@ -12014,7 +12074,9 @@ class _FakeMirrorDb:
 
 
 @pytest.mark.asyncio
-async def test_update_team_syncs_access_group_assigned_team_ids_in_both_directions():
+async def test_update_team_syncs_access_group_assigned_team_ids_in_both_directions(
+    disable_audit_logging_for_mocked_team,
+):
     """
     A team-side edit of `access_group_ids` must be mirrored onto every affected access
     group's `assigned_team_ids`, in one transaction, in both directions.
@@ -12170,7 +12232,9 @@ async def test_sync_reads_the_committed_team_row_rather_than_the_callers_snapsho
 
 
 @pytest.mark.asyncio
-async def test_new_team_and_delete_team_both_drive_the_mirror():
+async def test_new_team_and_delete_team_both_drive_the_mirror(
+    disable_audit_logging_for_mocked_team,
+):
     """Every writer of `team.access_group_ids` has to reach the mirror, not just update.
     These pin the wiring on the other two paths; the mirror's own behavior is covered above.
 
diff --git a/tests/test_litellm/proxy/management_helpers/test_audit_log_callbacks.py b/tests/test_litellm/proxy/management_helpers/test_audit_log_callbacks.py
index 48e4353966b..2d54d249713 100644
--- a/tests/test_litellm/proxy/management_helpers/test_audit_log_callbacks.py
+++ b/tests/test_litellm/proxy/management_helpers/test_audit_log_callbacks.py
@@ -19,6 +19,7 @@ from litellm.proxy.management_helpers.audit_logs import (
     _build_audit_log_payload,
     _dispatch_audit_log_to_callbacks,
     create_audit_log_for_update,
+    is_audit_logging_enabled,
 )
 from litellm.types.utils import StandardAuditLogPayload
 
@@ -49,6 +50,34 @@ def _make_audit_log(
     )
 
 
+@pytest.mark.parametrize(
+    ("premium_user", "configured_value", "environment_value", "expected"),
+    (
+        (True, None, None, True),
+        (True, False, None, False),
+        (True, None, "false", False),
+        (False, None, None, False),
+        (False, True, None, True),
+        (True, True, "false", True),
+    ),
+)
+def test_is_audit_logging_enabled_precedence(
+    monkeypatch: pytest.MonkeyPatch,
+    premium_user: bool,
+    configured_value: bool | None,
+    environment_value: str | None,
+    expected: bool,
+):
+    monkeypatch.setattr(litellm, "store_audit_logs", configured_value)
+    monkeypatch.setattr("litellm.proxy.proxy_server.premium_user", premium_user)
+    if environment_value is None:
+        monkeypatch.delenv("LITELLM_STORE_AUDIT_LOGS", raising=False)
+    else:
+        monkeypatch.setenv("LITELLM_STORE_AUDIT_LOGS", environment_value)
+
+    assert is_audit_logging_enabled() is expected
+
+
 class TestBuildAuditLogPayload:
     def test_builds_correct_payload(self):
         audit_log = _make_audit_log()
@@ -185,12 +214,14 @@ class TestCreateAuditLogForUpdateWithCallbacks:
         with (
             patch("litellm.proxy.proxy_server.premium_user", False),
             patch("litellm.store_audit_logs", True),
+            patch("litellm.proxy.proxy_server.prisma_client") as mock_prisma,
         ):
             audit_log = _make_audit_log()
             await create_audit_log_for_update(audit_log)
             await asyncio.sleep(0.1)
 
             mock_logger.async_log_audit_log_event.assert_not_called()
+            mock_prisma.db.litellm_auditlog.create.assert_not_called()
 
     @pytest.mark.asyncio
     async def test_no_dispatch_when_store_audit_logs_false(self):
diff --git a/tests/test_litellm/proxy/openai_files_endpoint/test_files_batch_file_validation.py b/tests/test_litellm/proxy/openai_files_endpoint/test_files_batch_file_validation.py
new file mode 100644
index 00000000000..f5542fc0446
--- /dev/null
+++ b/tests/test_litellm/proxy/openai_files_endpoint/test_files_batch_file_validation.py
@@ -0,0 +1,176 @@
+import io
+
+import pytest
+
+from litellm.proxy._types import ProxyException
+from litellm.proxy.openai_files_endpoints.batch_file_validation import (
+    BATCH_LINE_REQUIRED_KEYS,
+    BatchFileEmpty,
+    BatchFileInvalidJsonLine,
+    BatchFileLineNotObject,
+    BatchFileMissingLineKey,
+    BatchFileTooLarge,
+    BatchFileWrongExtension,
+    check_batch_file_upload,
+    raise_batch_file_validation_failure,
+)
+
+VALID_LINE = (
+    b'{"custom_id": "req-1", "method": "POST", "url": "/v1/chat/completions",'
+    b' "body": {"model": "gpt-4.1-nano", "messages": [{"role": "user", "content": "hi"}]}}'
+)
+
+
+def test_valid_bytes_pass():
+    assert check_batch_file_upload("batch.jsonl", VALID_LINE + b"\n" + VALID_LINE + b"\n", 10) is None
+
+
+def test_valid_binaryio_passes_and_resets_position():
+    handle = io.BytesIO(VALID_LINE + b"\n" + VALID_LINE + b"\n")
+    handle.seek(17)
+    assert check_batch_file_upload("batch.jsonl", handle, 10) is None
+    assert handle.tell() == 0
+
+
+def test_uppercase_extension_accepted():
+    assert check_batch_file_upload("BATCH.JSONL", VALID_LINE, None) is None
+
+
+@pytest.mark.parametrize("filename", ["batch.csv", "batch.json", "batch", None])
+def test_wrong_extension_rejected(filename):
+    assert check_batch_file_upload(filename, VALID_LINE, None) == BatchFileWrongExtension(filename=filename or "")
+
+
+def test_size_over_cap_rejected_for_bytes():
+    content = b"x" * (2 * 1024 * 1024)
+    assert check_batch_file_upload("batch.jsonl", content, 1) == BatchFileTooLarge(
+        size_bytes=len(content), limit_mb=1
+    )
+
+
+def test_size_over_cap_rejected_for_binaryio():
+    content = b"x" * (2 * 1024 * 1024)
+    assert check_batch_file_upload("batch.jsonl", io.BytesIO(content), 1) == BatchFileTooLarge(
+        size_bytes=len(content), limit_mb=1
+    )
+
+
+def test_size_exactly_at_cap_allowed():
+    line = VALID_LINE + b"\n"
+    padding_key = b'{"custom_id": "pad", "method": "POST", "url": "/v1/chat/completions", "body": {"note": "'
+    pad_line = padding_key + b"a" * (1024 * 1024 - len(line) - len(padding_key) - len(b'"}}\n')) + b'"}}\n'
+    content = line + pad_line
+    assert len(content) == 1024 * 1024
+    assert check_batch_file_upload("batch.jsonl", content, 1) is None
+
+
+def test_no_cap_skips_size_check():
+    content = (VALID_LINE + b"\n") * 5000
+    assert check_batch_file_upload("batch.jsonl", content, None) is None
+
+
+@pytest.mark.parametrize("cap", [0, -3])
+def test_nonpositive_cap_disables_size_check(cap):
+    content = (VALID_LINE + b"\n") * 5000
+    assert check_batch_file_upload("batch.jsonl", content, cap) is None
+
+
+@pytest.mark.parametrize("content", [b"", b"\n\n", b"  \n\t\n"])
+def test_empty_file_rejected(content):
+    assert check_batch_file_upload("batch.jsonl", content, None) == BatchFileEmpty()
+
+
+def test_invalid_json_line_rejected_with_line_number():
+    content = VALID_LINE + b"\n" + b"not json at all\n" + VALID_LINE + b"\n"
+    assert check_batch_file_upload("batch.jsonl", content, None) == BatchFileInvalidJsonLine(line_number=2)
+
+
+def test_non_utf8_line_rejected_as_invalid_json():
+    assert check_batch_file_upload("batch.jsonl", b"\xff\xfe\x00\x01\n", None) == BatchFileInvalidJsonLine(
+        line_number=1
+    )
+
+
+def test_non_object_line_rejected():
+    content = VALID_LINE + b"\n" + b'["custom_id", "method"]\n'
+    assert check_batch_file_upload("batch.jsonl", content, None) == BatchFileLineNotObject(line_number=2)
+
+
+@pytest.mark.parametrize("missing_key", BATCH_LINE_REQUIRED_KEYS)
+def test_missing_required_key_rejected(missing_key):
+    import json
+
+    line_dict = {
+        "custom_id": "req-1",
+        "method": "POST",
+        "url": "/v1/chat/completions",
+        "body": {"model": "gpt-4.1-nano"},
+    }
+    del line_dict[missing_key]
+    content = VALID_LINE + b"\n" + json.dumps(line_dict).encode() + b"\n"
+    assert check_batch_file_upload("batch.jsonl", content, None) == BatchFileMissingLineKey(
+        line_number=2, key=missing_key
+    )
+
+
+def test_blank_lines_do_not_shift_line_numbers():
+    content = b"\n" + VALID_LINE + b"\n\n" + b"broken\n"
+    assert check_batch_file_upload("batch.jsonl", content, None) == BatchFileInvalidJsonLine(line_number=4)
+
+
+def test_failed_scan_leaves_handle_open_and_reset():
+    handle = io.BytesIO(b"not json\n" + VALID_LINE + b"\n")
+    assert check_batch_file_upload("batch.jsonl", handle, None) == BatchFileInvalidJsonLine(line_number=1)
+    assert not handle.closed
+    assert handle.tell() == 0
+
+
+def test_scan_stops_at_first_failure():
+    class ExplodingLines(io.BytesIO):
+        def __init__(self):
+            super().__init__(b"not json\n" + VALID_LINE + b"\n")
+            self.lines_read = 0
+
+        def __next__(self):
+            self.lines_read += 1
+            return super().__next__()
+
+    handle = ExplodingLines()
+    assert check_batch_file_upload("batch.jsonl", handle, None) == BatchFileInvalidJsonLine(line_number=1)
+    assert handle.lines_read == 1
+
+
+@pytest.mark.parametrize(
+    "failure, expected_code, expected_param, expected_fragments",
+    [
+        (
+            BatchFileTooLarge(size_bytes=220200960, limit_mb=10),
+            "413",
+            "file",
+            ("210.0 MB", "max_batch_file_size_mb", "10 MB", "not forwarded"),
+        ),
+        (
+            BatchFileWrongExtension(filename="batch.csv"),
+            "400",
+            "file",
+            ("batch.csv", ".jsonl", "not forwarded"),
+        ),
+        (BatchFileEmpty(), "400", "file", ("no request lines", "not forwarded")),
+        (BatchFileInvalidJsonLine(line_number=3), "400", "file", ("line 3", "not valid JSON")),
+        (BatchFileLineNotObject(line_number=2), "400", "file", ("line 2", "JSON object")),
+        (
+            BatchFileMissingLineKey(line_number=5, key="method"),
+            "400",
+            "method",
+            ("'method'", "line 5", "custom_id, method, url, body"),
+        ),
+    ],
+)
+def test_failures_map_to_openai_shaped_proxy_exceptions(failure, expected_code, expected_param, expected_fragments):
+    with pytest.raises(ProxyException) as exc_info:
+        raise_batch_file_validation_failure(failure)
+    assert exc_info.value.code == expected_code
+    assert exc_info.value.type == "invalid_request_error"
+    assert exc_info.value.param == expected_param
+    for fragment in expected_fragments:
+        assert fragment in exc_info.value.message
diff --git a/tests/test_litellm/proxy/openai_files_endpoint/test_files_endpoint.py b/tests/test_litellm/proxy/openai_files_endpoint/test_files_endpoint.py
index e363a266688..99fb19f0d60 100644
--- a/tests/test_litellm/proxy/openai_files_endpoint/test_files_endpoint.py
+++ b/tests/test_litellm/proxy/openai_files_endpoint/test_files_endpoint.py
@@ -31,6 +31,11 @@ from litellm.caching.caching import DualCache
 from litellm.proxy.proxy_server import hash_token
 from litellm.proxy.utils import ProxyLogging
 
+VALID_BATCH_LINE = (
+    b'{"custom_id": "req-1", "method": "POST", "url": "/v1/chat/completions",'
+    b' "body": {"model": "gpt-3.5-turbo", "messages": [{"role": "user", "content": "hi"}]}}\n'
+)
+
 
 @pytest.fixture
 def llm_router() -> Router:
@@ -225,7 +230,10 @@ def test_invalid_purpose(mocker: MockerFixture, monkeypatch, llm_router: Router)
 
     assert response.status_code == 400
     print(f"response: {response.json()}")
-    assert "Invalid purpose: my-bad-purpose" in response.json()["error"]["message"]
+    error = response.json()["error"]
+    assert "Invalid purpose: my-bad-purpose" in error["message"]
+    assert error["type"] == "invalid_request_error"
+    assert error["param"] == "purpose"
 
 
 def test_get_file_content_rejects_raw_cloud_storage_uri(llm_router: Router):
@@ -1599,7 +1607,7 @@ def _post_file_with_team_metadata(
     user_key = UserAPIKeyAuth(api_key="test-key", team_metadata=team_metadata)
     app.dependency_overrides[user_api_key_auth] = lambda: user_key
 
-    test_file = ("mydata.jsonl", b'{"prompt": "Hello"}', "application/json")
+    test_file = ("mydata.jsonl", VALID_BATCH_LINE, "application/jsonl")
     try:
         response = client.post(
             "/v1/files",
@@ -1703,7 +1711,7 @@ def _post_file_raw(
     user_key = UserAPIKeyAuth(api_key="test-key", team_metadata=team_metadata)
     app.dependency_overrides[user_api_key_auth] = lambda: user_key
 
-    test_file = ("mydata.jsonl", b'{"prompt": "Hello"}', "application/json")
+    test_file = ("mydata.jsonl", VALID_BATCH_LINE, "application/jsonl")
     try:
         response = client.post(
             "/v1/files",
@@ -2749,7 +2757,7 @@ def test_create_file_provider_only_resolves_named_vertex_credentials(
     try:
         response = client.post(
             "/v1/files",
-            files={"file": ("batch.jsonl", b"{}", "application/jsonl")},
+            files={"file": ("batch.jsonl", VALID_BATCH_LINE, "application/jsonl")},
             data={"purpose": "batch"},
             headers={
                 "Authorization": "Bearer test-key",
@@ -2991,7 +2999,7 @@ def test_create_file_provider_only_skips_other_team_vertex_deployment(
     try:
         response = client.post(
             "/v1/files",
-            files={"file": ("batch.jsonl", b"{}", "application/jsonl")},
+            files={"file": ("batch.jsonl", VALID_BATCH_LINE, "application/jsonl")},
             data={"purpose": "batch"},
             headers={
                 "Authorization": "Bearer test-key",
@@ -3341,3 +3349,170 @@ def test_raw_provider_file_id_retrieve_allowed_when_managed_files_not_required(
 
     assert response.status_code == 200, response.text
     mock_retrieve.assert_called_once()
+
+
+def _setup_batch_upload_endpoint(monkeypatch, llm_router: Router) -> list:
+    import litellm.proxy.proxy_server as ps
+    from litellm.proxy._types import LitellmUserRoles
+    from litellm.proxy.openai_files_endpoints import files_endpoints as fe
+
+    monkeypatch.setattr("litellm.proxy.proxy_server.master_key", None)
+    monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", None)
+    monkeypatch.setattr("litellm.proxy.proxy_server.llm_router", llm_router)
+    setup_proxy_logging_object(monkeypatch, llm_router)
+
+    forwarded_calls: list = []
+
+    async def fake_route_create_file(**kwargs):
+        forwarded_calls.append(kwargs)
+        return OpenAIFileObject(
+            id="dummy-id",
+            object="file",
+            bytes=0,
+            created_at=1234567890,
+            filename="batch.jsonl",
+            purpose="batch",
+            status="uploaded",
+        )
+
+    monkeypatch.setattr(fe, "route_create_file", fake_route_create_file)
+    app.dependency_overrides[ps.user_api_key_auth] = lambda: UserAPIKeyAuth(
+        user_role=LitellmUserRoles.PROXY_ADMIN, user_id="test-user"
+    )
+    return forwarded_calls
+
+
+def _teardown_batch_upload_endpoint():
+    import litellm.proxy.proxy_server as ps
+
+    app.dependency_overrides.pop(ps.user_api_key_auth, None)
+
+
+def test_create_file_batch_over_max_batch_file_size_mb_rejected_before_forwarding(
+    monkeypatch, llm_router: Router
+):
+    import litellm.proxy.proxy_server as ps
+
+    forwarded_calls = _setup_batch_upload_endpoint(monkeypatch, llm_router)
+    monkeypatch.setitem(ps.general_settings, "max_batch_file_size_mb", 1)
+
+    oversized = VALID_BATCH_LINE * (2 * 1024 * 1024 // len(VALID_BATCH_LINE) + 1)
+    try:
+        response = client.post(
+            "/v1/files",
+            files={"file": ("batch.jsonl", oversized, "application/jsonl")},
+            data={"purpose": "batch"},
+            headers={"Authorization": "Bearer test-key"},
+        )
+    finally:
+        _teardown_batch_upload_endpoint()
+
+    assert response.status_code == 413, response.text
+    error = response.json()["error"]
+    assert error["type"] == "invalid_request_error"
+    assert error["param"] == "file"
+    assert "max_batch_file_size_mb" in error["message"]
+    assert "1 MB" in error["message"]
+    assert forwarded_calls == []
+
+
+def test_create_file_batch_under_max_batch_file_size_mb_forwards(monkeypatch, llm_router: Router):
+    import litellm.proxy.proxy_server as ps
+
+    forwarded_calls = _setup_batch_upload_endpoint(monkeypatch, llm_router)
+    monkeypatch.setitem(ps.general_settings, "max_batch_file_size_mb", 1)
+
+    try:
+        response = client.post(
+            "/v1/files",
+            files={"file": ("batch.jsonl", VALID_BATCH_LINE, "application/jsonl")},
+            data={"purpose": "batch"},
+            headers={"Authorization": "Bearer test-key"},
+        )
+    finally:
+        _teardown_batch_upload_endpoint()
+
+    assert response.status_code == 200, response.text
+    assert len(forwarded_calls) == 1
+
+
+def test_create_file_batch_wrong_extension_rejected_before_forwarding(monkeypatch, llm_router: Router):
+    forwarded_calls = _setup_batch_upload_endpoint(monkeypatch, llm_router)
+
+    try:
+        response = client.post(
+            "/v1/files",
+            files={"file": ("batch.csv", VALID_BATCH_LINE, "text/csv")},
+            data={"purpose": "batch"},
+            headers={"Authorization": "Bearer test-key"},
+        )
+    finally:
+        _teardown_batch_upload_endpoint()
+
+    assert response.status_code == 400, response.text
+    error = response.json()["error"]
+    assert error["type"] == "invalid_request_error"
+    assert error["param"] == "file"
+    assert "batch.csv" in error["message"]
+    assert ".jsonl" in error["message"]
+    assert forwarded_calls == []
+
+
+def test_create_file_batch_missing_line_key_rejected_before_forwarding(monkeypatch, llm_router: Router):
+    forwarded_calls = _setup_batch_upload_endpoint(monkeypatch, llm_router)
+
+    bad_line = b'{"custom_id": "req-1", "url": "/v1/chat/completions", "body": {"model": "gpt-3.5-turbo"}}\n'
+    try:
+        response = client.post(
+            "/v1/files",
+            files={"file": ("batch.jsonl", VALID_BATCH_LINE + bad_line, "application/jsonl")},
+            data={"purpose": "batch"},
+            headers={"Authorization": "Bearer test-key"},
+        )
+    finally:
+        _teardown_batch_upload_endpoint()
+
+    assert response.status_code == 400, response.text
+    error = response.json()["error"]
+    assert error["type"] == "invalid_request_error"
+    assert error["param"] == "method"
+    assert "line 2" in error["message"]
+    assert forwarded_calls == []
+
+
+def test_create_file_batch_invalid_json_line_rejected_before_forwarding(monkeypatch, llm_router: Router):
+    forwarded_calls = _setup_batch_upload_endpoint(monkeypatch, llm_router)
+
+    try:
+        response = client.post(
+            "/v1/files",
+            files={"file": ("batch.jsonl", b"this is not jsonl\n", "application/jsonl")},
+            data={"purpose": "batch"},
+            headers={"Authorization": "Bearer test-key"},
+        )
+    finally:
+        _teardown_batch_upload_endpoint()
+
+    assert response.status_code == 400, response.text
+    error = response.json()["error"]
+    assert error["param"] == "file"
+    assert "line 1" in error["message"]
+    assert "not valid JSON" in error["message"]
+    assert forwarded_calls == []
+
+
+def test_create_file_non_batch_purpose_skips_batch_validation(monkeypatch, llm_router: Router):
+    forwarded_calls = _setup_batch_upload_endpoint(monkeypatch, llm_router)
+
+    try:
+        response = client.post(
+            "/v1/files",
+            files={"file": ("notes.txt", b"plain text, not jsonl", "text/plain")},
+            data={"purpose": "user_data"},
+            headers={"Authorization": "Bearer test-key"},
+        )
+    finally:
+        _teardown_batch_upload_endpoint()
+
+    assert response.status_code == 200, response.text
+    assert len(forwarded_calls) == 1
diff --git a/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py b/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py
index b56a8da7c66..a9454854948 100644
--- a/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py
+++ b/tests/test_litellm/proxy/pass_through_endpoints/test_llm_pass_through_endpoints.py
@@ -719,6 +719,7 @@ class TestVertexAIPassThroughHandler:
 
         # Create mock logging object
         mock_logging_obj = Mock(spec=LiteLLMLoggingObj)
+        mock_logging_obj.optional_params = {}
         mock_logging_obj.litellm_call_id = "test-call-id-123"
         mock_logging_obj.model_call_details = {}
 
@@ -895,6 +896,7 @@ class TestVertexAIPassThroughHandler:
 
         # Create mock logging object
         mock_logging_obj = Mock(spec=LiteLLMLoggingObj)
+        mock_logging_obj.optional_params = {}
         mock_logging_obj.litellm_call_id = "test-call-id-123"
         mock_logging_obj.model_call_details = {}
 
@@ -965,6 +967,7 @@ class TestVertexAIPassThroughHandler:
         mock_httpx_response.status_code = 200
 
         mock_logging_obj = Mock(spec=LiteLLMLoggingObj)
+        mock_logging_obj.optional_params = {}
         mock_logging_obj.litellm_call_id = "test-call-id-embed"
         mock_logging_obj.model_call_details = {}
 
@@ -1023,6 +1026,7 @@ class TestVertexAIPassThroughHandler:
         mock_httpx_response.status_code = 200
 
         mock_logging_obj = Mock(spec=LiteLLMLoggingObj)
+        mock_logging_obj.optional_params = {}
         mock_logging_obj.litellm_call_id = "test-call-id-batch"
         mock_logging_obj.model_call_details = {}
 
@@ -1079,6 +1083,7 @@ class TestVertexAIPassThroughHandler:
         mock_httpx_response.status_code = 200
 
         mock_logging_obj = Mock(spec=LiteLLMLoggingObj)
+        mock_logging_obj.optional_params = {}
         mock_logging_obj.litellm_call_id = "test-call-id-gemini-studio"
         mock_logging_obj.model_call_details = {}
 
@@ -1109,6 +1114,117 @@ class TestVertexAIPassThroughHandler:
         assert result["kwargs"].get("model") == "gemini-embedding-2-preview"
         mock_completion_cost.assert_called_once()
 
+    @pytest.mark.parametrize("streaming", [False, True])
+    def test_vertex_passthrough_handler_prices_regional_endpoint_with_uplift(self, monkeypatch, streaming):
+        """
+        Both cost computations for a passthrough call must price on the URL's serving location:
+        the handler-computed cost, and the async success recompute, which re-resolves the
+        location from the logging object and previously fell through empty optional_params to
+        the us-central1 default, billing the regional uplift on global traffic too (#34393).
+        """
+        import datetime
+
+        from litellm.litellm_core_utils.litellm_logging import Logging
+        from litellm.proxy.pass_through_endpoints.llm_provider_handlers.vertex_passthrough_logging_handler import (
+            VertexPassthroughLoggingHandler,
+        )
+
+        monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
+        monkeypatch.setattr(
+            litellm,
+            "model_cost",
+            {
+                **litellm.get_model_cost_map(url=""),
+                "vertex_ai/gemini-fake-regional": {
+                    "litellm_provider": "vertex_ai",
+                    "mode": "chat",
+                    "input_cost_per_token": 1e-06,
+                    "output_cost_per_token": 2e-06,
+                    "regional_endpoint_uplift_multiplier": 1.1,
+                },
+            },
+        )
+
+        response_body: Final = {
+            "candidates": [
+                {
+                    "content": {"parts": [{"text": "hello"}], "role": "model"},
+                    "finishReason": "STOP",
+                }
+            ],
+            "usageMetadata": {
+                "promptTokenCount": 10,
+                "candidatesTokenCount": 20,
+                "totalTokenCount": 30,
+            },
+        }
+
+        def costs_for(location: str) -> tuple[float, float]:
+            url_route: Final = (
+                f"https://{location}-aiplatform.googleapis.com/v1/projects/p/locations/{location}"
+                "/publishers/google/models/gemini-fake-regional:"
+                f"{'streamGenerateContent' if streaming else 'generateContent'}"
+            )
+            start_time: Final = datetime.datetime.now()
+            end_time: Final = datetime.datetime.now()
+            logging_obj: Final = Logging(
+                model="gemini-fake-regional",
+                messages=[{"role": "user", "content": "hi"}],
+                stream=streaming,
+                call_type="pass_through_endpoint",
+                start_time=start_time,
+                litellm_call_id="call-id",
+                function_id="fn-id",
+            )
+            logging_obj.update_environment_variables(
+                model="gemini-fake-regional",
+                user="unknown",
+                optional_params={},
+                litellm_params={},
+                call_type="pass_through_endpoint",
+            )
+            if streaming:
+                result = VertexPassthroughLoggingHandler._handle_logging_vertex_collected_chunks(
+                    litellm_logging_obj=logging_obj,
+                    passthrough_success_handler_obj=Mock(),
+                    url_route=url_route,
+                    request_body={},
+                    endpoint_type="vertex_ai",
+                    start_time=start_time,
+                    all_chunks=[json.dumps(response_body)],
+                    model=None,
+                    end_time=end_time,
+                )
+            else:
+                mock_httpx_response: Final = Mock()
+                mock_httpx_response.json.return_value = response_body
+                mock_httpx_response.headers = {}
+                mock_httpx_response.status_code = 200
+                result = VertexPassthroughLoggingHandler.vertex_passthrough_handler(
+                    httpx_response=mock_httpx_response,
+                    logging_obj=logging_obj,
+                    url_route=url_route,
+                    result="test-result",
+                    start_time=start_time,
+                    end_time=end_time,
+                    cache_hit=False,
+                )
+            recomputed: Final = logging_obj._response_cost_calculator(result=result["result"])
+            return result["kwargs"]["response_cost"], recomputed
+
+        global_handler_cost, global_recomputed_cost = costs_for("global")
+        regional_handler_cost, regional_recomputed_cost = costs_for("us-east5")
+
+        plain_cost: Final = 10 * 1e-06 + 20 * 2e-06
+        assert global_handler_cost == pytest.approx(plain_cost, rel=1e-9)
+        assert regional_handler_cost == pytest.approx(plain_cost * 1.10, rel=1e-9), (
+            "regional Vertex passthrough traffic must bill at 1.1x the global rate"
+        )
+        assert global_recomputed_cost == pytest.approx(plain_cost, rel=1e-9), (
+            "the logging recompute must not price global passthrough traffic as regional"
+        )
+        assert regional_recomputed_cost == pytest.approx(plain_cost * 1.10, rel=1e-9)
+
 
 class TestVertexAIDiscoveryPassThroughHandler:
     """
diff --git a/tests/test_litellm/proxy/proxy_server/test_proxy_config.py b/tests/test_litellm/proxy/proxy_server/test_proxy_config.py
index f31f67c317a..58465772b3b 100644
--- a/tests/test_litellm/proxy/proxy_server/test_proxy_config.py
+++ b/tests/test_litellm/proxy/proxy_server/test_proxy_config.py
@@ -769,6 +769,214 @@ async def test_ProxyConfig_get_config_missing_file_raises(monkeypatch):
         await pc.get_config(config_file_path="/no/such/path.yaml")
 
 
+# ---------------------------------------------------------------------------
+# ProxyConfig._initialize_secret_manager_from_raw_config
+# ---------------------------------------------------------------------------
+
+VAULT_SECRET_MANAGER_MODULE = '''
+import os
+
+from litellm.integrations.custom_secret_manager import CustomSecretManager
+
+VAULT = {"LITELLM_MASTER_KEY": "master-from-vault", "MY_PROVIDER_KEY": "provider-from-vault"}
+
+
+class VaultSecretManager(CustomSecretManager):
+    def __init__(self):
+        super().__init__()
+        # The loader re-executes this module on every construction, so an in-module counter
+        # would reset. Append to a file instead, to count constructions across the whole load.
+        with open(os.environ["VAULT_CONSTRUCTION_LOG"], "a") as f:
+            f.write("constructed\\n")
+
+    def sync_read_secret(self, secret_name, optional_params=None, timeout=None, **kwargs):
+        return VAULT.get(secret_name)
+
+    async def async_read_secret(self, secret_name, optional_params=None, timeout=None, **kwargs):
+        return VAULT.get(secret_name)
+'''
+
+VAULT_BACKED_CONFIG = """
+model_list:
+  - model_name: my-model
+    litellm_params:
+      model: openai/gpt-4o-mini
+      api_key: os.environ/MY_PROVIDER_KEY
+
+general_settings:
+  master_key: os.environ/LITELLM_MASTER_KEY
+  key_management_system: custom
+  key_management_settings:
+    custom_secret_manager: vault_secret_manager.VaultSecretManager
+    hosted_keys:
+      - LITELLM_MASTER_KEY
+      - MY_PROVIDER_KEY
+"""
+
+
+def _write_vault_backed_config(tmp_path, monkeypatch, config_yaml: str) -> str:
+    """Write a config whose secrets live only in a custom secret manager, never in the env."""
+    (tmp_path / "vault_secret_manager.py").write_text(VAULT_SECRET_MANAGER_MODULE)
+    config_file = tmp_path / "c.yaml"
+    config_file.write_text(config_yaml)
+    monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", None)
+    monkeypatch.setattr("litellm.proxy.proxy_server.store_model_in_db", False)
+    monkeypatch.delenv("LITELLM_CONFIG_BUCKET_NAME", raising=False)
+    monkeypatch.delenv("LITELLM_MASTER_KEY", raising=False)
+    monkeypatch.delenv("MY_PROVIDER_KEY", raising=False)
+    monkeypatch.setenv("VAULT_CONSTRUCTION_LOG", str(tmp_path / "constructions.log"))
+    monkeypatch.setattr(litellm, "secret_manager_client", None)
+    return str(config_file)
+
+
+def _construction_count(tmp_path) -> int:
+    log = tmp_path / "constructions.log"
+    return len(log.read_text().splitlines()) if log.exists() else 0
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig_get_config_resolves_keys_held_only_by_the_secret_manager(tmp_path, monkeypatch):
+    """Regression for GH #35239.
+
+    get_config() used to resolve every ``os.environ/<KEY>`` reference and write the result
+    back into the config before the secret manager was initialized, so any key that lived
+    only in the manager became a permanent ``None``.
+    """
+    config_file_path = _write_vault_backed_config(tmp_path, monkeypatch, VAULT_BACKED_CONFIG)
+
+    cfg = await ProxyConfig().get_config(config_file_path=config_file_path)
+
+    assert {
+        "master_key": cfg["general_settings"]["master_key"],
+        "api_key": cfg["model_list"][0]["litellm_params"]["api_key"],
+        "hosted_keys": litellm._key_management_settings.hosted_keys,
+    } == {
+        "master_key": "master-from-vault",
+        "api_key": "provider-from-vault",
+        "hosted_keys": ["LITELLM_MASTER_KEY", "MY_PROVIDER_KEY"],
+    }
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig_load_config_builds_the_secret_manager_exactly_once(tmp_path, monkeypatch):
+    """The full startup path must not build the manager, then throw it away and build another.
+
+    A discarded client costs a Vault/CyberArk re-auth and leaks a gRPC channel on Google KMS.
+    """
+    config_file_path = _write_vault_backed_config(tmp_path, monkeypatch, VAULT_BACKED_CONFIG)
+
+    _router, _model_list, general_settings = await ProxyConfig().load_config(
+        router=None, config_file_path=config_file_path
+    )
+
+    assert {
+        "constructions": _construction_count(tmp_path),
+        "master_key": general_settings["master_key"],
+    } == {"constructions": 1, "master_key": "master-from-vault"}
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig_get_config_reuses_an_already_initialized_secret_manager(tmp_path, monkeypatch):
+    """get_config() also runs on management-endpoint request paths.
+
+    Rebuilding the client on every call would re-execute the custom manager module, drop the
+    Vault/CyberArk token caches, and leak a gRPC channel per request on Google KMS.
+    """
+    config_file_path = _write_vault_backed_config(tmp_path, monkeypatch, VAULT_BACKED_CONFIG)
+
+    await ProxyConfig().get_config(config_file_path=config_file_path)
+    first_client = litellm.secret_manager_client
+    second = await ProxyConfig().get_config(config_file_path=config_file_path)
+
+    assert {
+        "client_reused": litellm.secret_manager_client is first_client,
+        "master_key": second["general_settings"]["master_key"],
+    } == {"client_reused": True, "master_key": "master-from-vault"}
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig_get_config_without_key_management_system_leaves_secret_manager_unset(
+    tmp_path, monkeypatch
+):
+    """No ``key_management_system`` means no manager, an unresolvable reference stays None, and
+    nothing is warned about: with no manager there is nothing to have been absent from."""
+    config_yaml = VAULT_BACKED_CONFIG.replace("  key_management_system: custom\n", "")
+    config_file_path = _write_vault_backed_config(tmp_path, monkeypatch, config_yaml)
+    warn = MagicMock()
+    monkeypatch.setattr("litellm.proxy.proxy_server.verbose_proxy_logger.warning", warn)
+
+    cfg = await ProxyConfig().get_config(config_file_path=config_file_path)
+
+    assert {
+        "master_key": cfg["general_settings"]["master_key"],
+        "api_key": cfg["model_list"][0]["litellm_params"]["api_key"],
+        "client": litellm.secret_manager_client,
+        "warned_about": [call.args[1] for call in warn.call_args_list],
+    } == {"master_key": None, "api_key": None, "client": None, "warned_about": []}
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig_get_config_warns_when_a_reference_is_missing_from_the_secret_manager(
+    tmp_path, monkeypatch
+):
+    """A reference the manager cannot resolve is logged, instead of silently becoming None."""
+    config_yaml = VAULT_BACKED_CONFIG.replace("MY_PROVIDER_KEY", "NOT_IN_VAULT")
+    config_file_path = _write_vault_backed_config(tmp_path, monkeypatch, config_yaml)
+    warn = MagicMock()
+    monkeypatch.setattr("litellm.proxy.proxy_server.verbose_proxy_logger.warning", warn)
+
+    cfg = await ProxyConfig().get_config(config_file_path=config_file_path)
+
+    assert {
+        "api_key": cfg["model_list"][0]["litellm_params"]["api_key"],
+        "warned_about": [call.args[1] for call in warn.call_args_list],
+    } == {"api_key": None, "warned_about": ["os.environ/NOT_IN_VAULT"]}
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig_get_config_does_not_warn_for_a_name_outside_hosted_keys(tmp_path, monkeypatch):
+    """``hosted_keys`` is an allowlist, so a name outside it is never looked up in the manager.
+
+    Warning about it would claim a lookup that never happened, on every optional env-only
+    reference, on every config reload.
+    """
+    config_yaml = VAULT_BACKED_CONFIG.replace("api_key: os.environ/MY_PROVIDER_KEY", "api_key: os.environ/ENV_ONLY")
+    config_file_path = _write_vault_backed_config(tmp_path, monkeypatch, config_yaml)
+    warn = MagicMock()
+    monkeypatch.setattr("litellm.proxy.proxy_server.verbose_proxy_logger.warning", warn)
+
+    cfg = await ProxyConfig().get_config(config_file_path=config_file_path)
+
+    assert {
+        "api_key": cfg["model_list"][0]["litellm_params"]["api_key"],
+        "client_is_up": litellm.secret_manager_client is not None,
+        "warned_about": [call.args[1] for call in warn.call_args_list],
+    } == {"api_key": None, "client_is_up": True, "warned_about": []}
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig_get_config_does_not_warn_under_write_only_access_mode(tmp_path, monkeypatch):
+    """``write_only`` means reads never reach the manager, so an absent name is not its fault.
+
+    That mode exists so the manager can store virtual keys while config secrets stay in the
+    environment, which makes env-only references the expected state rather than an error.
+    """
+    config_yaml = VAULT_BACKED_CONFIG.replace(
+        "  key_management_settings:\n", "  key_management_settings:\n    access_mode: write_only\n"
+    )
+    config_file_path = _write_vault_backed_config(tmp_path, monkeypatch, config_yaml)
+    warn = MagicMock()
+    monkeypatch.setattr("litellm.proxy.proxy_server.verbose_proxy_logger.warning", warn)
+
+    cfg = await ProxyConfig().get_config(config_file_path=config_file_path)
+
+    assert {
+        "master_key": cfg["general_settings"]["master_key"],
+        "client_is_up": litellm.secret_manager_client is not None,
+        "warned_about": [call.args[1] for call in warn.call_args_list],
+    } == {"master_key": None, "client_is_up": True, "warned_about": []}
+
+
 # ---------------------------------------------------------------------------
 # ProxyConfig.update_config_state / get_config_state
 # ---------------------------------------------------------------------------
@@ -2442,6 +2650,43 @@ async def test_ProxyConfig__update_general_settings_updates_max_parallel(monkeyp
     }
 
 
+@pytest.mark.asyncio
+async def test_ProxyConfig__update_general_settings_applies_db_max_batch_file_size_mb(monkeypatch):
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {})
+    pc = ProxyConfig()
+    await pc._update_general_settings({"max_batch_file_size_mb": 5})
+    from litellm.proxy import proxy_server as ps
+
+    assert ps.general_settings.get("max_batch_file_size_mb") == 5
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig__update_general_settings_yaml_max_batch_file_size_mb_wins_over_db(monkeypatch):
+    monkeypatch.setattr(
+        "litellm.proxy.proxy_server.general_settings",
+        {"max_batch_file_size_mb": 3},
+    )
+    pc = ProxyConfig()
+    pc._yaml_general_settings_keys = {"max_batch_file_size_mb"}
+    await pc._update_general_settings({"max_batch_file_size_mb": 5})
+    from litellm.proxy import proxy_server as ps
+
+    assert ps.general_settings.get("max_batch_file_size_mb") == 3
+
+
+@pytest.mark.asyncio
+async def test_ProxyConfig__update_general_settings_cleared_db_max_batch_file_size_mb_lifts_cap(monkeypatch):
+    monkeypatch.setattr(
+        "litellm.proxy.proxy_server.general_settings",
+        {"max_batch_file_size_mb": 8},
+    )
+    pc = ProxyConfig()
+    await pc._update_general_settings({"max_parallel_requests": 1})
+    from litellm.proxy import proxy_server as ps
+
+    assert ps.general_settings.get("max_batch_file_size_mb") is None
+
+
 @pytest.mark.asyncio
 async def test_ProxyConfig__update_general_settings_none_input_noop():
     pc = ProxyConfig()
diff --git a/tests/test_litellm/proxy/spend_tracking/test_ptu_flat_cost_rollup.py b/tests/test_litellm/proxy/spend_tracking/test_ptu_flat_cost_rollup.py
index f41756d2b87..333fd597b49 100644
--- a/tests/test_litellm/proxy/spend_tracking/test_ptu_flat_cost_rollup.py
+++ b/tests/test_litellm/proxy/spend_tracking/test_ptu_flat_cost_rollup.py
@@ -210,8 +210,10 @@ async def test_rollup_prunes_stale_row_when_config_is_gone():
     where = table.delete_many.await_args.kwargs["where"]
     assert where["date"] == DAY.isoformat()
     assert where["api_key"] == PTU_SENTINEL_API_KEY
-    # the row is garbage because this run did not refresh it, not because of a key list
+    # the row is garbage because this run did not refresh it, and it is reachable at all
+    # because the run scanned the deployment it belongs to
     assert "lt" in where["updated_at"]
+    assert "model" not in where, "a database-only run has no reason to bound the sweep"
 
 
 @pytest.mark.asyncio
@@ -705,13 +707,20 @@ class _FakeSentinelTable:
     async def delete_many(self, where):
         self.delete_many_calls.append(where)
         cutoff = where["updated_at"]["lt"]
+        # honouring "model" matters: a fake that ignored an unknown clause would delete
+        # the row the prune-scoping test exists to protect and still report a pass
+        allowed = where.get("model", {}).get("in")
         doomed = [
             k
             for k, v in self.rows.items()
-            if k[1] == where["date"] and k[2] == where["api_key"] and v["updated_at"] < cutoff
+            if k[1] == where["date"]
+            and k[2] == where["api_key"]
+            and v["updated_at"] < cutoff
+            and (allowed is None or k[3] in allowed)
         ]
         for k in doomed:
             del self.rows[k]
+        return len(doomed)
 
     async def find_many(self, where=None):
         """Read back sentinel rows the way prisma would, honouring api_key and a date range."""
@@ -785,11 +794,11 @@ async def test_an_older_run_cannot_delete_a_newer_runs_row():
 
 @pytest.mark.asyncio
 async def test_a_later_clean_run_clears_the_row_the_race_left_behind():
-    """The race can leave a charge for a since-removed deployment in place for a day; the
-    next run, seeing only the current config, must sweep it."""
+    """The race can leave a charge for a no-longer-priced deployment in place for a day;
+    the next run, seeing only the current config, must sweep it."""
     table = _FakeSentinelTable()
     ptu = {"ptu_count": 10, "cost_per_ptu_per_hour": 2.0, "team_id": "t"}
-    stale_key = ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-removed")
+    stale_key = ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-retired")
     table.rows[stale_key] = {
         "ptu_flat_cost": 480.0,
         "model_group": "retired",
@@ -797,7 +806,14 @@ async def test_a_later_clean_run_clears_the_row_the_race_left_behind():
     }
 
     await run_ptu_flat_cost_rollup(
-        _prisma_for([_model_row(model_id="dep-live", model_info=ptu)], table), target_date=DAY
+        _prisma_for(
+            [
+                _model_row(model_id="dep-live", model_info=ptu),
+                _model_row(model_id="dep-retired", model_info={"team_id": "t"}),
+            ],
+            table,
+        ),
+        target_date=DAY,
     )
 
     assert stale_key not in table.rows
@@ -1715,16 +1731,19 @@ async def test_a_run_holding_the_lock_still_prunes():
     """Losing the sweep entirely would leave stale charges forever, so the guarded path,
     which is the normal one, keeps it."""
     table = _FakeSentinelTable()
-    table.seed("t", DAY, "dep-gone", 480.0, updated_at=datetime(2020, 1, 1, tzinfo=timezone.utc))
+    table.seed("t", DAY, "dep-unpriced", 480.0, updated_at=datetime(2020, 1, 1, tzinfo=timezone.utc))
     prisma = _prisma_for(
-        [_model_row(model_id="dep-live", model_info={"ptu_count": 5, "cost_per_ptu_per_hour": 2.0, "team_id": "t"})],
+        [
+            _model_row(model_id="dep-live", model_info={"ptu_count": 5, "cost_per_ptu_per_hour": 2.0, "team_id": "t"}),
+            _model_row(model_id="dep-unpriced", model_info={"team_id": "t"}),
+        ],
         table,
     )
 
     await run_scheduled_ptu_rollup(prisma, pod_lock_manager=_pod_lock(acquired=True), target_date=DAY)
 
     assert table.delete_many_calls != []
-    assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-gone") not in table.rows
+    assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-unpriced") not in table.rows
     assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-live") in table.rows
 
 
@@ -1737,7 +1756,7 @@ async def test_the_prune_cutoff_allows_for_clock_skew_between_hosts():
     just_written = datetime.now(timezone.utc) - timedelta(seconds=30)
     table.seed("t", DAY, "dep-concurrent", 480.0, updated_at=just_written)
     table.seed("t", DAY, "dep-stale", 480.0, updated_at=datetime.now(timezone.utc) - timedelta(hours=6))
-    prisma = _prisma_for([], table)
+    prisma = _prisma_for([_model_row(model_id="dep-concurrent"), _model_row(model_id="dep-stale")], table)
 
     await run_ptu_flat_cost_rollup(prisma, target_date=DAY)
 
@@ -1747,6 +1766,127 @@ async def test_the_prune_cutoff_allows_for_clock_skew_between_hosts():
     assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-stale") not in table.rows
 
 
+@pytest.mark.asyncio
+async def test_a_run_pricing_config_cannot_prune_a_row_it_did_not_scan(monkeypatch):
+    """Staleness alone stops being evidence once two hosts hold different configuration: a
+    row this run never considered belongs to a deployment another host is pricing from its
+    own file, and sweeping it drops that charge."""
+    table = _FakeSentinelTable()
+    table.seed("t", DAY, "dep-elsewhere", 480.0, updated_at=datetime(2020, 1, 1, tzinfo=timezone.utc))
+    entry = _router_entry(model_id="cfg-here", model_info=dict(_VALID_PTU))
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(entry))
+
+    await run_scheduled_ptu_rollup(_prisma_for([], table), pod_lock_manager=_pod_lock(acquired=True), target_date=DAY)
+
+    assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-elsewhere") in table.rows
+    assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "cfg-here") in table.rows
+    assert table.delete_many_calls[-1]["model"]["in"] == ("cfg-here",)
+
+
+@pytest.mark.asyncio
+async def test_a_deployment_deleted_from_the_table_keeps_the_day_it_was_charged(monkeypatch):
+    """The accepted cost of bounding the prune, driven through the sequence that produces
+    it: charge the day while the deployment exists, remove it, run the day again. Nothing
+    scans it now, so nothing may judge its row, and the amount it was billed stands."""
+    table = _FakeSentinelTable()
+    ptu = {"ptu_count": 5, "cost_per_ptu_per_hour": 2.0, "team_id": "t"}
+    live_row = _model_row(model_id="dep-live", model_info=ptu)
+    doomed_row = _model_row(model_id="dep-doomed", model_info=ptu)
+    charged_key = ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-doomed")
+    monkeypatch.setattr(
+        ptu_rollup, "_running_router", lambda: _router_holding(_router_entry(model_id="cfg", model_info=dict(ptu)))
+    )
+
+    await run_scheduled_ptu_rollup(
+        _prisma_for([live_row, doomed_row], table), pod_lock_manager=_pod_lock(acquired=True), target_date=DAY
+    )
+    billed = table.rows[charged_key]["ptu_flat_cost"]
+    table.rows[charged_key]["updated_at"] = datetime(2020, 1, 1, tzinfo=timezone.utc)
+
+    await run_scheduled_ptu_rollup(
+        _prisma_for([live_row], table), pod_lock_manager=_pod_lock(acquired=True), target_date=DAY
+    )
+
+    assert table.rows[charged_key]["ptu_flat_cost"] == billed
+    assert "dep-doomed" not in table.delete_many_calls[-1]["model"]["in"]
+
+
+@pytest.mark.asyncio
+async def test_a_database_only_run_sweeps_exactly_as_it_did_before():
+    """The bound exists for charges another host declares. A deployment nobody declares any
+    more still has its leftover row swept, which is what the table-only sweep always did."""
+    table = _FakeSentinelTable()
+    table.seed("t", DAY, "dep-gone", 480.0, updated_at=datetime(2020, 1, 1, tzinfo=timezone.utc))
+    prisma = _prisma_for(
+        [_model_row(model_id="dep-live", model_info={"ptu_count": 5, "cost_per_ptu_per_hour": 2.0, "team_id": "t"})],
+        table,
+    )
+
+    await run_scheduled_ptu_rollup(prisma, pod_lock_manager=_pod_lock(acquired=True), target_date=DAY)
+
+    assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-gone") not in table.rows
+    assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "dep-live") in table.rows
+
+
+@pytest.mark.asyncio
+async def test_every_deployment_that_prices_is_inside_the_set_that_bounds_the_prune():
+    """The bound has to be a superset of what the same run wrote, or a run's own charge
+    could fall outside its own delete filter and never be reconciled."""
+    table = _FakeSentinelTable()
+    prisma = _prisma_for(
+        [
+            _model_row(model_id="dep-a", model_info={"ptu_count": 5, "cost_per_ptu_per_hour": 2.0, "team_id": "t"}),
+            _model_row(model_id="dep-b", model_info={"ptu_count": 9, "cost_per_ptu_per_hour": 1.0, "team_id": "u"}),
+            _model_row(model_id="dep-unpriced", model_info={"team_id": "t"}),
+        ],
+        table,
+    )
+
+    loaded = await ptu_rollup._load_ptu_models(prisma)
+
+    assert {model.model_id for model in loaded.models} <= loaded.scanned_ids
+    assert loaded.scanned_ids == {"dep-a", "dep-b", "dep-unpriced"}
+
+
+@pytest.mark.asyncio
+async def test_a_priced_deployment_is_in_the_bound_even_with_an_id_the_scan_skips():
+    """The bound is built by construction rather than by coincidence. The row scan drops a
+    falsy id while the parser still prices one, and a charge outside its own run's delete
+    filter could never be reconciled by any later run."""
+    prisma = _prisma_for(
+        [_model_row(model_id="", model_info={"ptu_count": 5, "cost_per_ptu_per_hour": 2.0, "team_id": "t"})],
+        _FakeSentinelTable(),
+    )
+
+    loaded = await ptu_rollup._load_ptu_models(prisma)
+
+    assert {model.model_id for model in loaded.models} <= loaded.scanned_ids
+
+
+@pytest.mark.asyncio
+async def test_the_prune_splits_the_id_set_across_statements(monkeypatch):
+    """Every id is one bind variable and the server refuses a statement carrying more than
+    32767, so a proxy with that many deployments would fail the prune outright, and with it
+    the rest of the scheduled run."""
+    monkeypatch.setattr(ptu_rollup, "_PRUNE_ID_CHUNK_SIZE", 2)
+    table = _FakeSentinelTable()
+    ptu = {"ptu_count": 5, "cost_per_ptu_per_hour": 2.0, "team_id": "t"}
+    deployments = [_model_row(model_id=f"dep-{n}", model_info=ptu) for n in range(4)]
+    monkeypatch.setattr(
+        ptu_rollup, "_running_router", lambda: _router_holding(_router_entry(model_id="dep-4", model_info=dict(ptu)))
+    )
+    table.seed("t", DAY, "dep-3", 480.0, updated_at=datetime(2020, 1, 1, tzinfo=timezone.utc))
+
+    await run_scheduled_ptu_rollup(
+        _prisma_for(deployments, table), pod_lock_manager=_pod_lock(acquired=True), target_date=DAY
+    )
+
+    chunks = [call["model"]["in"] for call in table.delete_many_calls]
+    assert len(chunks) == 3
+    assert all(len(chunk) <= 2 for chunk in chunks)
+    assert sorted(i for chunk in chunks for i in chunk) == [f"dep-{n}" for n in range(5)]
+
+
 @pytest.mark.asyncio
 async def test_scheduled_rollup_writes_nothing_when_ptu_attribution_is_disabled(monkeypatch):
     """Startup already skips scheduling the cron, so this guards the function itself: a
@@ -1760,3 +1900,148 @@ async def test_scheduled_rollup_writes_nothing_when_ptu_attribution_is_disabled(
     assert result is None
     assert table.rows == {}
     assert table.upsert_keys == []
+
+
+# --- config.yaml deployments reach the rollup through the router ----------------
+
+
+def _router_holding(*entries):
+    """A stand-in for the proxy's router, carrying whatever model_list is passed."""
+    return types.SimpleNamespace(model_list=list(entries))
+
+
+@pytest.mark.asyncio
+async def test_a_config_declared_deployment_is_priced(monkeypatch):
+    """The whole point. A PTU deployment the proxy only knows from config.yaml is not in
+    LiteLLM_ProxyModelTable, so a DB-only scan bills the provider's reservation to nobody."""
+    entry = _router_entry(model_id="cfg-1", model_name="gpt-4o-ptu", model_info=dict(_VALID_PTU))
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(entry))
+
+    loaded = await ptu_rollup._load_ptu_models(_prisma_for([], _FakeSentinelTable()))
+
+    assert [(m.model_id, m.model_name, m.team_id) for m in loaded.models] == [("cfg-1", "gpt-4o-ptu", "t")]
+    assert "cfg-1" in loaded.scanned_ids
+
+
+@pytest.mark.asyncio
+async def test_a_database_backed_router_entry_is_not_counted_twice(monkeypatch):
+    """Every deployment loaded from the table is also in the router, flagged db_model. Pricing
+    both copies would write two charges for one reservation."""
+    row = _model_row(model_id="db-1", model_info=dict(_VALID_PTU))
+    mirrored = _router_entry(model_id="db-1", model_info={**_VALID_PTU, "db_model": True})
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(mirrored))
+
+    loaded = await ptu_rollup._load_ptu_models(_prisma_for([row], _FakeSentinelTable()))
+
+    assert [m.model_id for m in loaded.models] == ["db-1"]
+
+
+@pytest.mark.asyncio
+async def test_a_router_entry_sharing_an_id_with_the_table_is_priced_once(monkeypatch):
+    """db_model is data the router carries rather than something this module controls, so the
+    id anti-join is what actually maps onto the failure: two charges under one id."""
+    row = _model_row(model_id="both-1", model_info=dict(_VALID_PTU))
+    unflagged = _router_entry(model_id="both-1", model_info=dict(_VALID_PTU))
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(unflagged))
+
+    loaded = await ptu_rollup._load_ptu_models(_prisma_for([row], _FakeSentinelTable()))
+
+    assert [m.model_id for m in loaded.models] == ["both-1"]
+
+
+@pytest.mark.asyncio
+async def test_a_client_credential_clone_is_not_priced(monkeypatch):
+    """Supplying an api_key on a request mints a clone of the deployment under a fresh id,
+    carrying the source's PTU config. Pricing it bills one reservation per distinct caller key."""
+    source = _router_entry(model_id="cfg-1", model_info=dict(_VALID_PTU))
+    clone = _router_entry(model_id="cfg-1-clone", model_info={**_VALID_PTU, "original_model_id": "cfg-1"})
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(source, clone))
+
+    loaded = await ptu_rollup._load_ptu_models(_prisma_for([], _FakeSentinelTable()))
+
+    assert [m.model_id for m in loaded.models] == ["cfg-1"]
+
+
+@pytest.mark.asyncio
+async def test_a_config_deployment_without_ptu_config_is_scanned_but_not_priced(monkeypatch):
+    """It has to stay in the scanned set or its leftover sentinel rows become unprunable."""
+    entry = _router_entry(model_id="cfg-plain", model_info={"team_id": "t"})
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(entry))
+
+    loaded = await ptu_rollup._load_ptu_models(_prisma_for([], _FakeSentinelTable()))
+
+    assert loaded.models == ()
+    assert "cfg-plain" in loaded.scanned_ids
+
+
+@pytest.mark.asyncio
+async def test_no_router_in_the_process_prices_the_database_alone(monkeypatch):
+    """The rollup is importable and callable outside a running proxy."""
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: None)
+
+    loaded = await ptu_rollup._load_ptu_models(
+        _prisma_for([_model_row(model_id="db-1", model_info=dict(_VALID_PTU))], _FakeSentinelTable())
+    )
+
+    assert [m.model_id for m in loaded.models] == ["db-1"]
+
+
+@pytest.mark.asyncio
+async def test_a_config_deployment_is_charged_end_to_end(monkeypatch):
+    """Through the scheduled entry point, so the charge lands in a sentinel row rather than
+    stopping at the loader."""
+    table = _FakeSentinelTable()
+    entry = _router_entry(model_id="cfg-1", model_name="gpt-4o-ptu", model_info=dict(_VALID_PTU))
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(entry))
+
+    await run_scheduled_ptu_rollup(_prisma_for([], table), pod_lock_manager=_pod_lock(acquired=True), target_date=DAY)
+
+    assert ("t", DAY.isoformat(), PTU_SENTINEL_API_KEY, "cfg-1") in table.rows
+
+
+@pytest.mark.asyncio
+async def test_a_stale_database_backed_router_entry_is_not_treated_as_config(monkeypatch):
+    """The reconcile can leave a deployment on the router after its row is gone. The id
+    anti-join cannot see that one, so the flag is what keeps it from being priced as though
+    config.yaml had declared it."""
+    stale = _router_entry(model_id="db-gone", model_info={**_VALID_PTU, "db_model": True})
+    monkeypatch.setattr(ptu_rollup, "_running_router", lambda: _router_holding(stale))
+
+    loaded = await ptu_rollup._load_ptu_models(_prisma_for([], _FakeSentinelTable()))
+
+    assert loaded.models == ()
+
+
+def test_the_router_lookup_reads_the_proxys_own_global():
+    """Every other config test replaces this helper, so without one test driving the real
+    body a typo in the module path or the attribute name leaves the whole feature dead in
+    production with the suite still green."""
+    import sys
+    import types as _types
+
+    assert ptu_rollup._running_router() is None or "litellm.proxy.proxy_server" in sys.modules
+
+    sentinel = object()
+    stub = _types.SimpleNamespace(llm_router=sentinel)
+    real = sys.modules.get("litellm.proxy.proxy_server")
+    sys.modules["litellm.proxy.proxy_server"] = stub
+    try:
+        assert ptu_rollup._running_router() is sentinel
+        del stub.llm_router
+        assert ptu_rollup._running_router() is None
+    finally:
+        if real is None:
+            del sys.modules["litellm.proxy.proxy_server"]
+        else:
+            sys.modules["litellm.proxy.proxy_server"] = real
+
+
+def test_the_router_lookup_returns_none_outside_a_proxy():
+    import sys
+
+    real = sys.modules.pop("litellm.proxy.proxy_server", None)
+    try:
+        assert ptu_rollup._running_router() is None
+    finally:
+        if real is not None:
+            sys.modules["litellm.proxy.proxy_server"] = real
diff --git a/tests/test_litellm/proxy/spend_tracking/test_savings.py b/tests/test_litellm/proxy/spend_tracking/test_savings.py
index 1435547c434..9006288bdae 100644
--- a/tests/test_litellm/proxy/spend_tracking/test_savings.py
+++ b/tests/test_litellm/proxy/spend_tracking/test_savings.py
@@ -841,6 +841,44 @@ def test_the_baseline_is_priced_on_the_basis_the_request_was_billed_at(basis, ex
     assert reported == pytest.approx(expected_multiplier * baseline - served)
 
 
+def test_the_baseline_is_priced_on_the_vertex_location_the_request_was_billed_at(monkeypatch):
+    """A request served from a regional Vertex endpoint was billed with the
+    regional-endpoint uplift, so the counterfactual single-model operator would
+    have paid it too. The served model carries no uplift field, so only the
+    baseline moves with the recorded location."""
+    monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
+    monkeypatch.setattr(litellm, "model_cost", litellm.get_model_cost_map(url=""))
+
+    gemini = litellm.get_model_info("gemini-3.5-flash", "vertex_ai")
+    haiku = litellm.get_model_info("claude-haiku-4-5", "anthropic")
+    assert gemini.get("regional_endpoint_uplift_multiplier") == 1.1
+    assert haiku.get("regional_endpoint_uplift_multiplier") is None, "served model must not move with the basis"
+
+    usage = _usage(fresh=20_000, cached=0, written=0, out=1_000)
+    served = 20_000 * haiku["input_cost_per_token"] + 1_000 * haiku["output_cost_per_token"]
+    baseline = 20_000 * gemini["input_cost_per_token"] + 1_000 * gemini["output_cost_per_token"]
+
+    regional = compute_autorouter_savings(
+        baseline_model="vertex_ai/gemini-3.5-flash",
+        selected_model="claude-haiku-4-5",
+        selected_provider="anthropic",
+        usage=usage,
+        conversation_continuing=False,
+        cost_breakdown=_breakdown(served, vertex_location="us-east5"),
+    )
+    global_endpoint = compute_autorouter_savings(
+        baseline_model="vertex_ai/gemini-3.5-flash",
+        selected_model="claude-haiku-4-5",
+        selected_provider="anthropic",
+        usage=usage,
+        conversation_continuing=False,
+        cost_breakdown=_breakdown(served, vertex_location="global"),
+    )
+
+    assert regional == pytest.approx(1.1 * baseline - served)
+    assert global_endpoint == pytest.approx(baseline - served)
+
+
 def test_a_baseline_recorded_on_the_decision_turns_the_driver_on():
     """An operator who configures nothing still sees the driver work."""
     result = compute_savings_spend(
diff --git a/tests/test_litellm/proxy/spend_tracking/test_spend_tracking_utils.py b/tests/test_litellm/proxy/spend_tracking/test_spend_tracking_utils.py
index e5add059260..9710dc44e99 100644
--- a/tests/test_litellm/proxy/spend_tracking/test_spend_tracking_utils.py
+++ b/tests/test_litellm/proxy/spend_tracking/test_spend_tracking_utils.py
@@ -3164,3 +3164,80 @@ def test_batch_cost_row_id_is_stable_across_repeated_accounting():
     ]
 
     assert ids[0] == ids[1] == "batch_same_batch_cost"
+
+
+def _make_failed_request_standard_logging_payload() -> StandardLoggingPayload:
+    base: Final = _make_standard_logging_payload_with_usage_object(usage_object={})
+    return cast(
+        StandardLoggingPayload,
+        {
+            **base,
+            "status": "failure",
+            "call_type": "aresponses",
+            "model_id": "mid-123",
+            "model_group": "group-x",
+            "api_base": "https://api.openai.com/v1/responses",
+            "custom_llm_provider": "openai",
+        },
+    )
+
+
+def test_get_logging_payload_failed_request_falls_back_to_standard_logging_payload():
+    """Failed-request kwargs from the proxy failure hook carry no deployment info
+    (LIT-5795), so the attribution columns must come from the failure-time
+    standard_logging_object."""
+    payload = get_logging_payload(
+        kwargs={
+            "model": "group-x",
+            "litellm_params": {"metadata": {"user_api_key": "test-key", "status": "failure"}},
+            "standard_logging_object": _make_failed_request_standard_logging_payload(),
+        },
+        response_obj={},
+        start_time=datetime.datetime.now(timezone.utc),
+        end_time=datetime.datetime.now(timezone.utc),
+    )
+    assert payload["model_id"] == "mid-123"
+    assert payload["model_group"] == "group-x"
+    assert payload["api_base"] == "https://api.openai.com/v1/responses"
+    assert payload["custom_llm_provider"] == "openai"
+
+
+def test_get_logging_payload_request_kwargs_win_over_standard_logging_payload():
+    payload = get_logging_payload(
+        kwargs={
+            "model": "group-y",
+            "custom_llm_provider": "anthropic",
+            "litellm_params": {
+                "api_base": "https://kwargs.example.com",
+                "metadata": {
+                    "user_api_key": "test-key",
+                    "model_group": "kwargs-group",
+                    "model_info": {"id": "kwargs-mid"},
+                },
+            },
+            "standard_logging_object": _make_failed_request_standard_logging_payload(),
+        },
+        response_obj={},
+        start_time=datetime.datetime.now(timezone.utc),
+        end_time=datetime.datetime.now(timezone.utc),
+    )
+    assert payload["model_id"] == "kwargs-mid"
+    assert payload["model_group"] == "kwargs-group"
+    assert payload["api_base"] == "https://kwargs.example.com"
+    assert payload["custom_llm_provider"] == "anthropic"
+
+
+def test_get_logging_payload_failed_request_without_standard_logging_payload_leaves_fields_empty():
+    payload = get_logging_payload(
+        kwargs={
+            "model": "group-x",
+            "litellm_params": {"metadata": {"user_api_key": "test-key", "status": "failure"}},
+        },
+        response_obj={},
+        start_time=datetime.datetime.now(timezone.utc),
+        end_time=datetime.datetime.now(timezone.utc),
+    )
+    assert payload["model_id"] == ""
+    assert payload["model_group"] == ""
+    assert payload["api_base"] == ""
+    assert payload["custom_llm_provider"] == ""
diff --git a/tests/test_litellm/proxy/test_proxy_utils.py b/tests/test_litellm/proxy/test_proxy_utils.py
index d6cf0e30139..07877514b69 100644
--- a/tests/test_litellm/proxy/test_proxy_utils.py
+++ b/tests/test_litellm/proxy/test_proxy_utils.py
@@ -468,6 +468,23 @@ class TestPostCallFailureHookLiftsRecoveredPartialSpend:
         assert request_data["response_cost"] == 3.5e-05
         assert "litellm_logging_obj" not in request_data
 
+    @pytest.mark.asyncio
+    async def test_recovered_usage_without_cost_clobbers_client_cost_with_zero(self):
+        from litellm.types.utils import Usage
+
+        recovered_usage = Usage(prompt_tokens=30, completion_tokens=1, total_tokens=31)
+        logging_obj = MagicMock()
+        logging_obj.model_call_details = {"combined_usage_object": recovered_usage}
+        request_data = {
+            "litellm_logging_obj": logging_obj,
+            "response_cost": 999.0,
+            "metadata": {},
+        }
+        await self._run(request_data)
+
+        assert request_data["combined_usage_object"] is recovered_usage
+        assert request_data["response_cost"] == 0.0
+
     @pytest.mark.asyncio
     async def test_no_recovered_usage_is_noop(self):
         logging_obj = MagicMock()
@@ -478,6 +495,111 @@ class TestPostCallFailureHookLiftsRecoveredPartialSpend:
         assert "response_cost" not in request_data
 
 
+class TestPostCallFailureHookLiftsStandardLoggingObject:
+    """Failure callbacks read standard_logging_object from request_data, but
+    post_call_failure_hook pops litellm_logging_obj before they run. The hook
+    must lift the logging obj's standard_logging_object onto request_data so
+    failed-request spend logs keep deployment attribution (LIT-5795).
+    """
+
+    async def _run(self, request_data):
+        from unittest.mock import AsyncMock, patch
+
+        from litellm.proxy._types import UserAPIKeyAuth
+
+        proxy_logging_obj = ProxyLogging(user_api_key_cache=DualCache())
+        proxy_logging_obj.alert_types = []
+        with patch.object(proxy_logging_obj, "update_request_status", new=AsyncMock()):
+            await proxy_logging_obj.post_call_failure_hook(
+                request_data=request_data,
+                original_exception=Exception("boom"),
+                user_api_key_dict=UserAPIKeyAuth(),
+            )
+
+    @pytest.mark.asyncio
+    async def test_lifts_standard_logging_object(self):
+        sl_object = {"model_id": "mid-123", "model_group": "group-x"}
+        logging_obj = MagicMock()
+        logging_obj.model_call_details = {"standard_logging_object": sl_object}
+        request_data = {"litellm_logging_obj": logging_obj, "metadata": {}}
+        await self._run(request_data)
+        assert request_data["standard_logging_object"] is sl_object
+        assert "litellm_logging_obj" not in request_data
+
+    @pytest.mark.asyncio
+    async def test_logging_obj_value_overwrites_preexisting_key(self):
+        authoritative = {"model_id": "from-logging-obj"}
+        logging_obj = MagicMock()
+        logging_obj.model_call_details = {"standard_logging_object": authoritative}
+        request_data = {
+            "litellm_logging_obj": logging_obj,
+            "standard_logging_object": {"model_id": "client-injected"},
+            "metadata": {},
+        }
+        await self._run(request_data)
+        assert request_data["standard_logging_object"] is authoritative
+
+    @pytest.mark.asyncio
+    async def test_client_supplied_key_is_stripped_when_logging_obj_supplies_none(self):
+        spoofed = {"model_id": "client-injected"}
+        request_data = {"standard_logging_object": spoofed, "metadata": {}}
+        await self._run(request_data)
+        assert "standard_logging_object" not in request_data
+
+        logging_obj = MagicMock()
+        logging_obj.model_call_details = {}
+        request_data_with_obj = {
+            "litellm_logging_obj": logging_obj,
+            "standard_logging_object": spoofed,
+            "metadata": {},
+        }
+        await self._run(request_data_with_obj)
+        assert "standard_logging_object" not in request_data_with_obj
+
+    @pytest.mark.asyncio
+    async def test_pass_through_failure_never_relifts_client_supplied_key(self):
+        from datetime import datetime
+        from unittest.mock import AsyncMock, patch
+
+        from fastapi import HTTPException
+
+        from litellm.litellm_core_utils.litellm_logging import Logging
+        from litellm.proxy._types import UserAPIKeyAuth
+
+        logging_obj = Logging(
+            model="claude-haiku-4-5",
+            messages=[{"role": "user", "content": "hi"}],
+            stream=False,
+            call_type="pass_through_endpoint",
+            start_time=datetime.now(),
+            litellm_call_id="test-call-id",
+            function_id="test-function-id",
+        )
+        request_data = {
+            "litellm_logging_obj": logging_obj,
+            "standard_logging_object": {"model_id": "client-injected"},
+            "metadata": {},
+        }
+        proxy_logging_obj = ProxyLogging(user_api_key_cache=DualCache())
+        proxy_logging_obj.alert_types = []
+        with patch.object(proxy_logging_obj, "update_request_status", new=AsyncMock()):
+            await proxy_logging_obj.post_call_failure_hook(
+                request_data=request_data,
+                original_exception=HTTPException(status_code=401, detail="unauthorized"),
+                user_api_key_dict=UserAPIKeyAuth(request_route="/v1/chat/completions"),
+            )
+        assert "standard_logging_object" not in request_data
+        assert "standard_logging_object" not in logging_obj.model_call_details
+
+    @pytest.mark.asyncio
+    async def test_no_standard_logging_object_is_noop(self):
+        logging_obj = MagicMock()
+        logging_obj.model_call_details = {}
+        request_data = {"litellm_logging_obj": logging_obj, "metadata": {}}
+        await self._run(request_data)
+        assert "standard_logging_object" not in request_data
+
+
 class TestPostCallFailureHookEstimatesDispatchedInputTokens:
     """A non-stream request that failed after dispatch (timeout, provider
     error) consumed provider-billed input tokens but recovered no usage.
diff --git a/tests/test_litellm/proxy/utils/prisma_and_spend/test_proxy_update_spend.py b/tests/test_litellm/proxy/utils/prisma_and_spend/test_proxy_update_spend.py
index dd21bbc9e8a..7057a112c83 100644
--- a/tests/test_litellm/proxy/utils/prisma_and_spend/test_proxy_update_spend.py
+++ b/tests/test_litellm/proxy/utils/prisma_and_spend/test_proxy_update_spend.py
@@ -83,8 +83,8 @@ async def test_update_end_user_spend_retries_on_connect_error(
     mock_prisma_client: Any, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     """``DB_RETRY_SAFE_ERROR_TYPES`` (ConnectError, statements provably never
-    sent) retries with backoff; once retries are exhausted the original
-    exception bubbles up via ``_raise_failed_update_spend_exception``.
+    sent) retries with jittered backoff; once retries are exhausted the
+    original exception bubbles up via ``_raise_failed_update_spend_exception``.
     """
     import httpx
     import litellm.proxy.utils as utils_mod
@@ -107,7 +107,8 @@ async def test_update_end_user_spend_retries_on_connect_error(
             proxy_logging_obj=proxy_logging,
             end_user_list_transactions={"u": 1.0},
         )
-    assert sleeps == [1.0]
+    assert len(sleeps) == 1
+    assert 1.0 <= sleeps[0] <= 2.0
 
 
 @pytest.mark.asyncio
@@ -149,6 +150,79 @@ async def test_update_end_user_spend_non_connection_error_raises_immediately(
         )
 
 
+def _end_user_deadlock_error() -> Exception:
+    from prisma.errors import RawQueryError
+
+    return RawQueryError(data={"user_facing_error": {"error_code": "P2034", "meta": {"table": "LiteLLM_EndUserTable"}}})
+
+
+def _failing_tx(error: Exception) -> Any:
+    tx = MagicMock()
+    tx.__aenter__ = AsyncMock(side_effect=error)
+    tx.__aexit__ = AsyncMock(return_value=False)
+    return tx
+
+
+@pytest.mark.asyncio
+async def test_update_end_user_spend_retries_on_deadlock_then_commits(
+    mock_prisma_client: Any, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Regression for #27989: a Postgres deadlock (P2034/40P01) on the end-user
+    spend batch is retried with jittered backoff and the increments land,
+    instead of raising immediately and dropping the flushed spend."""
+    sleeps: list[float] = []
+
+    async def _fake_sleep(seconds: float) -> None:
+        sleeps.append(seconds)
+
+    monkeypatch.setattr(asyncio, "sleep", _fake_sleep)
+
+    batcher = MagicMock()
+    batcher.litellm_endusertable.upsert = MagicMock()
+    transaction = MagicMock()
+    transaction.batch_ = lambda: _AsyncCM(batcher)
+    mock_prisma_client.db.tx = MagicMock(side_effect=[_failing_tx(_end_user_deadlock_error()), _AsyncCM(transaction)])
+
+    proxy_logging = MagicMock()
+    proxy_logging.failure_handler = AsyncMock()
+
+    await ProxyUpdateSpend.update_end_user_spend(
+        n_retry_times=3,
+        prisma_client=mock_prisma_client,
+        proxy_logging_obj=proxy_logging,
+        end_user_list_transactions={"end-user-1": 0.25},
+    )
+
+    assert mock_prisma_client.db.tx.call_count == 2
+    batcher.litellm_endusertable.upsert.assert_called_once()
+    assert batcher.litellm_endusertable.upsert.call_args.kwargs["where"] == {"user_id": "end-user-1"}
+    assert len(sleeps) == 1
+    assert 1.0 <= sleeps[0] <= 2.0
+    proxy_logging.failure_handler.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_update_end_user_spend_raises_after_exhausting_deadlock_retries(
+    mock_prisma_client: Any, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    from prisma.errors import RawQueryError
+
+    monkeypatch.setattr(asyncio, "sleep", AsyncMock(return_value=None))
+    mock_prisma_client.db.tx = MagicMock(side_effect=lambda timeout: _failing_tx(_end_user_deadlock_error()))
+    proxy_logging = MagicMock()
+    proxy_logging.failure_handler = AsyncMock()
+
+    with pytest.raises(RawQueryError):
+        await ProxyUpdateSpend.update_end_user_spend(
+            n_retry_times=2,
+            prisma_client=mock_prisma_client,
+            proxy_logging_obj=proxy_logging,
+            end_user_list_transactions={"end-user-1": 0.25},
+        )
+
+    assert mock_prisma_client.db.tx.call_count == 3
+
+
 @pytest.mark.asyncio
 async def test_update_spend_logs_writes_batches_via_create_many(
     mock_prisma_client: Any, make_spend_log_row: Any
diff --git a/tests/test_litellm/responses/litellm_completion_transformation/test_litellm_completion_responses.py b/tests/test_litellm/responses/litellm_completion_transformation/test_litellm_completion_responses.py
index fef8c2d1349..aae053c2e8e 100644
--- a/tests/test_litellm/responses/litellm_completion_transformation/test_litellm_completion_responses.py
+++ b/tests/test_litellm/responses/litellm_completion_transformation/test_litellm_completion_responses.py
@@ -419,6 +419,107 @@ class TestLiteLLMCompletionResponsesConfig:
         ]
         assert len(message_items) == 2, "Should have two message items"
 
+    def test_signature_only_thinking_block_still_emits_reasoning_item(self):
+        response = ModelResponse(
+            id="test-id",
+            created=1234567890,
+            model="test-model",
+            object="chat.completion",
+            choices=[
+                Choices(
+                    finish_reason="stop",
+                    index=0,
+                    message=Message(
+                        content="10",
+                        role="assistant",
+                        reasoning_content="",
+                        thinking_blocks=[
+                            {"type": "thinking", "thinking": "", "signature": "signature-payload"}
+                        ],
+                    ),
+                )
+            ],
+        )
+
+        responses_api_response = LiteLLMCompletionResponsesConfig.transform_chat_completion_response_to_responses_api_response(
+            request_input="Test input",
+            responses_api_request={},
+            chat_completion_response=response,
+        )
+
+        reasoning_items = [
+            item for item in responses_api_response.output if item.type == "reasoning"
+        ]
+        assert len(reasoning_items) == 1, "Signature-only thinking should still surface a reasoning item"
+        assert reasoning_items[0].content == []
+        assert "signature-payload" in reasoning_items[0].encrypted_content
+
+    def test_redacted_thinking_block_preserved_as_encrypted_content(self):
+        response = ModelResponse(
+            id="test-id",
+            created=1234567890,
+            model="test-model",
+            object="chat.completion",
+            choices=[
+                Choices(
+                    finish_reason="stop",
+                    index=0,
+                    message=Message(
+                        content="10",
+                        role="assistant",
+                        thinking_blocks=[{"type": "redacted_thinking", "data": "redacted-payload"}],
+                    ),
+                )
+            ],
+        )
+
+        responses_api_response = LiteLLMCompletionResponsesConfig.transform_chat_completion_response_to_responses_api_response(
+            request_input="Test input",
+            responses_api_request={},
+            chat_completion_response=response,
+        )
+
+        reasoning_items = [
+            item for item in responses_api_response.output if item.type == "reasoning"
+        ]
+        assert len(reasoning_items) == 1
+        assert "redacted-payload" in reasoning_items[0].encrypted_content
+
+    def test_visible_thinking_keeps_text_and_signature(self):
+        response = ModelResponse(
+            id="test-id",
+            created=1234567890,
+            model="test-model",
+            object="chat.completion",
+            choices=[
+                Choices(
+                    finish_reason="stop",
+                    index=0,
+                    message=Message(
+                        content="10",
+                        role="assistant",
+                        reasoning_content="counting the primes",
+                        thinking_blocks=[
+                            {"type": "thinking", "thinking": "counting the primes", "signature": "sig"}
+                        ],
+                    ),
+                )
+            ],
+        )
+
+        responses_api_response = LiteLLMCompletionResponsesConfig.transform_chat_completion_response_to_responses_api_response(
+            request_input="Test input",
+            responses_api_request={},
+            chat_completion_response=response,
+        )
+
+        reasoning_items = [
+            item for item in responses_api_response.output if item.type == "reasoning"
+        ]
+        assert len(reasoning_items) == 1
+        assert reasoning_items[0].content[0].text == "counting the primes"
+        assert "sig" in reasoning_items[0].encrypted_content
+
     def test_transform_chat_completion_response_status_with_stop(self):
         """
         Test that transforming a chat completion response with 'stop' finish_reason
@@ -2537,10 +2638,10 @@ class TestUsageTransformation:
         assert response_usage.output_tokens_details.text_tokens == 50
         assert response_usage.output_tokens_details.image_tokens == 100
 
-    def test_reasoning_tokens_not_forced_to_zero_when_absent(self):
-        # Regression: previously the else branch wrote reasoning_tokens=0 even when
-        # completion_tokens_details had no reasoning (reasoning_tokens=None). That caused
-        # the proxy to always report reasoning_tokens=0 for non-thinking responses.
+    def test_reasoning_tokens_fall_back_to_zero_when_absent(self):
+        # The OpenAI SDK's ResponseUsage requires output_tokens_details.reasoning_tokens
+        # as an int, so an absent count degrades to 0 on the responses wire instead of
+        # dropping output_tokens_details and breaking SDK clients.
         usage = Usage(
             prompt_tokens=10,
             completion_tokens=50,
@@ -2571,7 +2672,8 @@ class TestUsageTransformation:
         )
 
         assert response_usage.output_tokens_details is not None
-        assert response_usage.output_tokens_details.reasoning_tokens is None
+        assert response_usage.output_tokens_details.reasoning_tokens == 0
+        assert response_usage.output_tokens_details.text_tokens == 50
 
     def test_reasoning_tokens_preserved_when_thinking_occurred(self):
         # Regression: reasoning_tokens must survive the chat->responses translation
diff --git a/tests/test_litellm/router_strategy/test_complexity_router.py b/tests/test_litellm/router_strategy/test_complexity_router.py
index e1e8d9553b3..006fb79b08f 100644
--- a/tests/test_litellm/router_strategy/test_complexity_router.py
+++ b/tests/test_litellm/router_strategy/test_complexity_router.py
@@ -267,6 +267,91 @@ class TestReasoningMarkerScoring:
         # 2+ reasoning markers should force REASONING tier
         assert tier == ComplexityTier.REASONING
 
+    def test_reasoning_override_does_not_rescue_a_simple_score(self, complexity_router):
+        """Reasoning markers on an otherwise trivial prompt must not reach REASONING."""
+        prompt = "hi, step by step, pros and cons"
+        tier, score, signals = complexity_router.classify(prompt)
+        assert score < complexity_router.config.tier_boundaries["simple_medium"]
+        assert any("step by step" in s and "pros and cons" in s for s in signals)
+        assert tier == ComplexityTier.SIMPLE
+
+    def test_reasoning_override_applies_at_the_simple_medium_boundary(self, complexity_router):
+        """A score sitting exactly on simple_medium is not SIMPLE, so the override still promotes it."""
+        prompt = (
+            "Give me the pros and cons, step by step, of moving our checkout service "
+            "to an event-driven architecture."
+        )
+        tier, score, signals = complexity_router.classify(prompt)
+        assert score == complexity_router.config.tier_boundaries["simple_medium"]
+        assert tier == ComplexityTier.REASONING
+
+    def test_explicit_zero_floor_restores_the_unconditional_override(self, mock_router_instance, basic_config):
+        """0 is a real floor, not an absent one, so the markers alone promote again."""
+        router = ComplexityRouter(
+            model_name="test-complexity-router",
+            litellm_router_instance=mock_router_instance,
+            complexity_router_config={**basic_config, "reasoning_override_min_score": 0.0},
+        )
+        tier, score, _ = router.classify("hi, step by step, pros and cons")
+        assert score < router.config.tier_boundaries["simple_medium"]
+        assert tier == ComplexityTier.REASONING
+
+    def test_floor_defaults_to_simple_medium_and_follows_it(self, mock_router_instance, basic_config):
+        """Unset tracks simple_medium, so moving that boundary moves the floor with it."""
+        prompt = (
+            "Give me the pros and cons, step by step, of moving our checkout service "
+            "to an event-driven architecture."
+        )
+        low = ComplexityRouter(
+            model_name="test-complexity-router",
+            litellm_router_instance=mock_router_instance,
+            complexity_router_config={**basic_config, "tier_boundaries": {"simple_medium": 0.20}},
+        )
+        high = ComplexityRouter(
+            model_name="test-complexity-router",
+            litellm_router_instance=mock_router_instance,
+            complexity_router_config={**basic_config, "tier_boundaries": {"simple_medium": 0.30}},
+        )
+        assert low._effective_reasoning_override_min_score() == 0.20
+        assert high._effective_reasoning_override_min_score() == 0.30
+        assert low.classify(prompt)[0] == ComplexityTier.REASONING
+        assert high.classify(prompt)[0] != ComplexityTier.REASONING
+
+    def test_explicit_floor_overrides_the_boundary(self, mock_router_instance, basic_config):
+        """A configured floor decides the override, not simple_medium."""
+        prompt = (
+            "Give me the pros and cons, step by step, of moving our checkout service "
+            "to an event-driven architecture."
+        )
+        router = ComplexityRouter(
+            model_name="test-complexity-router",
+            litellm_router_instance=mock_router_instance,
+            complexity_router_config={
+                **basic_config,
+                "tier_boundaries": {"simple_medium": 0.10},
+                "reasoning_override_min_score": 0.90,
+            },
+        )
+        tier, score, _ = router.classify(prompt)
+        assert score > router.config.tier_boundaries["simple_medium"]
+        assert router._effective_reasoning_override_min_score() == 0.90
+        assert tier != ComplexityTier.REASONING
+
+    def test_configured_floor_is_applied_with_greater_or_equal(self, mock_router_instance, basic_config):
+        """A score landing exactly on the configured floor still promotes."""
+        prompt = (
+            "Give me the pros and cons, step by step, of moving our checkout service "
+            "to an event-driven architecture."
+        )
+        router = ComplexityRouter(
+            model_name="test-complexity-router",
+            litellm_router_instance=mock_router_instance,
+            complexity_router_config={**basic_config, "reasoning_override_min_score": 0.25},
+        )
+        tier, score, _ = router.classify(prompt)
+        assert score == 0.25
+        assert tier == ComplexityTier.REASONING
+
     def test_system_prompt_reasoning_not_counted(self, complexity_router):
         """Reasoning markers in system prompt should not count for override."""
         user_prompt = "What is 2+2?"
@@ -2081,6 +2166,38 @@ class TestRouterPreRoutingAliasOverrides:
         assert request_kwargs["drop_params"] is True
         assert request_kwargs["cache_control_injection_points"] == [{"location": "message", "role": "system"}]
 
+    @pytest.mark.asyncio
+    async def test_tier_litellm_params_are_applied_before_deployment_selection(self):
+        router = Router(
+            model_list=[
+                {
+                    "model_name": "smart-router",
+                    "litellm_params": {
+                        "model": "auto_router/complexity_router",
+                        "complexity_router_config": {
+                            "tiers": {
+                                "SIMPLE": {
+                                    "model_name": "gpt-4o-mini",
+                                    "litellm_params": {"reasoning_effort": "xhigh"},
+                                }
+                            }
+                        },
+                    },
+                },
+                {"model_name": "gpt-4o-mini", "litellm_params": {"model": "openai/gpt-4o-mini"}},
+            ]
+        )
+        request_kwargs: Dict = {"reasoning_effort": "low"}
+
+        deployment = await router.async_get_available_deployment(
+            model="smart-router",
+            request_kwargs=request_kwargs,
+            messages=[{"role": "user", "content": "hi"}],
+        )
+
+        assert deployment["model_name"] == "gpt-4o-mini"
+        assert request_kwargs["reasoning_effort"] == "xhigh"
+
     @pytest.mark.asyncio
     async def test_alias_custom_pricing_is_not_applied_to_request_kwargs(self):
         """Custom pricing on the alias prices the alias, not the tier deployment
@@ -3766,7 +3883,7 @@ class TestSessionAffinity:
         cache.async_set_cache.assert_called_once()
         call_kwargs = cache.async_set_cache.call_args.kwargs
         assert call_kwargs["ttl"] == 120
-        assert call_kwargs["value"] == "gpt-4o-mini"
+        assert call_kwargs["value"] == {"model": "gpt-4o-mini", "tier": "SIMPLE"}
 
     @pytest.mark.asyncio
     async def test_ttl_refreshed_on_cache_hit(self, mock_router_instance, basic_config):
@@ -3790,7 +3907,7 @@ class TestSessionAffinity:
         assert result.model == "o1-preview"
         cache.async_set_cache.assert_called_once()
         call_kwargs = cache.async_set_cache.call_args.kwargs
-        assert call_kwargs["value"] == "o1-preview"
+        assert call_kwargs["value"] == {"model": "o1-preview", "tier": "REASONING"}
         assert call_kwargs["ttl"] == 90
 
     @pytest.mark.asyncio
@@ -5460,12 +5577,14 @@ class TestRedactedLoggingDropsPromptText:
             "tier_boundaries": {"simple_medium": 0.15, "medium_complex": 0.35, "complex_reasoning": 0.6},
             "classifier_model": "claude-haiku",
             "escalated": True,
+            "tier_litellm_params": {"reasoning_effort": "xhigh"},
             "signals": ["code (python)"],
             "matched_keyword": "deploy to k8s",
             "escalation_keyword": "LITELLM ESCALATE",
         }
         kept = Router._redact_prompt_text_if_needed(request_kwargs={}, routing_decision=full)
         assert set(full) - set(kept) == {"signals", "matched_keyword", "escalation_keyword"}
+        assert kept["tier_litellm_params"] == {"reasoning_effort": "xhigh"}
 
     @pytest.mark.asyncio
     async def test_redaction_via_request_header_is_honored(self):
@@ -7188,8 +7307,6 @@ class TestClassificationRubrics:
             },
         )
         assert config.classifier_llm_config.system_prompt == "Grade the data sensitivity of the request."
-
-
 def _custom_tier_config(**overrides) -> Dict:
     """A valid operator-defined tier set: two built-in names plus one custom tier."""
     return {
@@ -8038,3 +8155,243 @@ class TestPlanModeTierFloor:
         assert result.model == "gpt-4o"
         assert result.routing_decision is not None
         assert result.routing_decision["tier"] == "MEDIUM"
+def test_tier_model_params_are_normalized_without_changing_model_pools():
+    config = ComplexityRouterConfig(
+        tiers={
+            "SIMPLE": "mini",
+            "REASONING": [
+                {"model_name": "opus", "litellm_params": {"reasoning_effort": "xhigh"}},
+                "abc",
+            ],
+        }
+    )
+
+    assert config.tiers == {"SIMPLE": "mini", "REASONING": ["opus", "abc"]}
+    assert config.tier_model_configs["REASONING"][0].litellm_params == {"reasoning_effort": "xhigh"}
+    rebuilt = ComplexityRouterConfig.model_validate(config.model_dump())
+    assert rebuilt.tier_model_configs["REASONING"][0].litellm_params == {"reasoning_effort": "xhigh"}
+
+
+def test_tier_model_params_accept_a_single_object():
+    config = ComplexityRouterConfig(
+        tiers={"REASONING": {"model_name": "opus", "litellm_params": {"thinking": {"type": "enabled"}}}}
+    )
+
+    assert config.tiers == {"REASONING": "opus"}
+    assert config.tier_model_configs["REASONING"][0].model_name == "opus"
+
+
+@pytest.mark.parametrize(
+    "tiers",
+    [
+        {"REASONING": [{"litellm_params": {"reasoning_effort": "xhigh"}}]},
+    ],
+)
+def test_tier_model_params_reject_malformed_entries(tiers):
+    with pytest.raises(ValidationError):
+        ComplexityRouterConfig(tiers=tiers)
+
+
+def test_tier_model_params_reject_duplicate_models():
+    with pytest.raises(ValidationError, match="duplicate model_name"):
+        ComplexityRouterConfig(
+            tiers={
+                "REASONING": [
+                    {"model_name": "opus", "litellm_params": {"reasoning_effort": "xhigh"}},
+                    {"model_name": "opus", "litellm_params": {"reasoning_effort": "low"}},
+                ]
+            }
+        )
+
+
+def test_non_adaptive_empty_tier_pool_remains_valid():
+    config = ComplexityRouterConfig(tiers={"SIMPLE": []})
+    assert config.tiers == {"SIMPLE": []}
+
+
+def test_adaptive_empty_tier_pool_is_rejected():
+    with pytest.raises(ValidationError, match="adaptive=True"):
+        ComplexityRouterConfig(adaptive=True, tiers={"SIMPLE": []})
+
+
+def test_tier_model_params_are_used_by_pools_and_savings_baseline(mock_router_instance):
+    router = ComplexityRouter(
+        model_name="test-router",
+        litellm_router_instance=mock_router_instance,
+        complexity_router_config={
+            "tiers": {
+                "SIMPLE": "mini",
+                "REASONING": [{"model_name": "opus", "litellm_params": {"reasoning_effort": "xhigh"}}, "abc"],
+            }
+        },
+    )
+
+    assert router._tier_pools() == {"SIMPLE": ["mini"], "REASONING": ["opus", "abc"]}
+    assert router._hardest_tier_models() == ("opus", "abc")
+    assert router._litellm_params_for_model(ComplexityTier.REASONING, "opus") == {"reasoning_effort": "xhigh"}
+
+
+@pytest.mark.asyncio
+async def test_tier_model_params_reach_the_hook_response_and_override_client_values(mock_router_instance):
+    router = ComplexityRouter(
+        model_name="test-router",
+        litellm_router_instance=mock_router_instance,
+        complexity_router_config={
+            "tiers": {
+                "REASONING": {
+                    "model_name": "opus",
+                    "litellm_params": {"reasoning_effort": "xhigh", "max_tokens": 512},
+                }
+            },
+            "keyword_tier_rules": [{"keywords": ["reason carefully"], "tier": "REASONING"}],
+        },
+    )
+    request_kwargs = {"reasoning_effort": "low", "metadata": {}}
+
+    response = await router.async_pre_routing_hook(
+        model="test-router",
+        request_kwargs=request_kwargs,
+        messages=[{"role": "user", "content": "reason carefully about this"}],
+    )
+
+    assert response is not None
+    assert response.litellm_params == {"reasoning_effort": "xhigh", "max_tokens": 512}
+    assert response.routing_decision is not None
+    assert response.routing_decision["tier_litellm_params"] == response.litellm_params
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("route", ["classification", "keyword", "session"])
+async def test_tier_params_mask_credentials_in_routing_decision(route, mock_router_instance):
+    params = {"reasoning_effort": "xhigh", "api_key": "secret-tier-key"}
+    config = {
+        "tiers": {
+            tier.value: {"model_name": "opus", "litellm_params": params}
+            for tier in ComplexityTier
+        },
+        "keyword_tier_rules": [{"keywords": ["reason carefully"], "tier": "REASONING"}]
+        if route == "keyword"
+        else None,
+        "session_affinity": route == "session",
+    }
+    router = ComplexityRouter(
+        model_name="test-router",
+        litellm_router_instance=mock_router_instance,
+        complexity_router_config=config,
+    )
+    request_kwargs = {"metadata": {"session_id": "masked-params-session"}}
+    if route == "session":
+        mock_router_instance.cache = DualCache()
+        await mock_router_instance.cache.async_set_cache(
+            key=router._get_session_affinity_cache_key("masked-params-session", request_kwargs),
+            value={"model": "opus", "tier": "REASONING"},
+        )
+    message = "reason carefully about this" if route == "keyword" else "hello"
+
+    response = await router.async_pre_routing_hook(
+        model="test-router",
+        request_kwargs=request_kwargs,
+        messages=[{"role": "user", "content": message}],
+    )
+
+    assert response is not None
+    assert response.litellm_params == params
+    assert response.routing_decision is not None
+    assert response.routing_decision["tier_litellm_params"] == {
+        "reasoning_effort": "xhigh",
+        "api_key": "secr*******-key",
+    }
+
+
+@pytest.mark.asyncio
+async def test_session_pin_outside_tiers_does_not_inherit_medium_params(mock_router_instance):
+    mock_router_instance.cache = DualCache()
+    router = ComplexityRouter(
+        model_name="test-router",
+        litellm_router_instance=mock_router_instance,
+        complexity_router_config={
+            "tiers": {
+                "SIMPLE": "mini",
+                "MEDIUM": {"model_name": "medium", "litellm_params": {"reasoning_effort": "low"}},
+            },
+            "session_affinity": True,
+            "default_model": "orphan",
+        },
+    )
+    request_kwargs = {"metadata": {"session_id": "orphan-session"}}
+    await mock_router_instance.cache.async_set_cache(
+        key=router._get_session_affinity_cache_key("orphan-session", request_kwargs),
+        value="orphan",
+    )
+
+    response = await router.async_pre_routing_hook(
+        model="test-router",
+        request_kwargs=request_kwargs,
+        messages=[{"role": "user", "content": "hello"}],
+    )
+
+    assert response is not None
+    assert response.model == "orphan"
+    assert response.litellm_params == {}
+
+
+@pytest.mark.asyncio
+async def test_session_pin_uses_recorded_tier_when_model_is_in_multiple_tiers(mock_router_instance):
+    mock_router_instance.cache = DualCache()
+    router = ComplexityRouter(
+        model_name="test-router",
+        litellm_router_instance=mock_router_instance,
+        complexity_router_config={
+            "tiers": {
+                "SIMPLE": {"model_name": "shared", "litellm_params": {"reasoning_effort": "low"}},
+                "REASONING": {"model_name": "shared", "litellm_params": {"reasoning_effort": "xhigh"}},
+            },
+            "session_affinity": True,
+        },
+    )
+    request_kwargs = {"metadata": {"session_id": "shared-session"}}
+    await mock_router_instance.cache.async_set_cache(
+        key=router._get_session_affinity_cache_key("shared-session", request_kwargs),
+        value={"model": "shared", "tier": "SIMPLE"},
+    )
+
+    response = await router.async_pre_routing_hook(
+        model="test-router",
+        request_kwargs=request_kwargs,
+        messages=[{"role": "user", "content": "hello"}],
+    )
+
+    assert response is not None
+    assert response.litellm_params == {"reasoning_effort": "low"}
+    assert response.routing_decision is not None
+    assert response.routing_decision["tier"] == "SIMPLE"
+
+
+@pytest.mark.asyncio
+async def test_session_pin_survives_json_list_round_trip(mock_router_instance):
+    cache = AsyncMock()
+    cache.async_get_cache = AsyncMock(return_value=["shared", "SIMPLE"])
+    mock_router_instance.cache = cache
+    router = ComplexityRouter(
+        model_name="test-router",
+        litellm_router_instance=mock_router_instance,
+        complexity_router_config={
+            "tiers": {
+                "SIMPLE": {"model_name": "shared", "litellm_params": {"reasoning_effort": "low"}},
+                "REASONING": {"model_name": "shared", "litellm_params": {"reasoning_effort": "xhigh"}},
+            },
+            "session_affinity": True,
+        },
+    )
+    request_kwargs = {"metadata": {"session_id": "json-round-trip-session"}}
+
+    response = await router.async_pre_routing_hook(
+        model="test-router",
+        request_kwargs=request_kwargs,
+        messages=[{"role": "user", "content": "hello"}],
+    )
+
+    assert response is not None
+    assert response.model == "shared"
+    assert response.litellm_params == {"reasoning_effort": "low"}
+    assert cache.async_set_cache.call_args.kwargs["value"] == {"model": "shared", "tier": "SIMPLE"}
diff --git a/tests/test_litellm/secret_managers/test_secret_managers_main.py b/tests/test_litellm/secret_managers/test_secret_managers_main.py
index 3631f640136..acc91b691d4 100644
--- a/tests/test_litellm/secret_managers/test_secret_managers_main.py
+++ b/tests/test_litellm/secret_managers/test_secret_managers_main.py
@@ -7,7 +7,14 @@ from unittest.mock import Mock, patch
 
 import pytest
 
-from litellm.secret_managers.main import get_secret, normalize_nonempty_secret_str
+import litellm
+from litellm.integrations.custom_secret_manager import CustomSecretManager
+from litellm.secret_managers.main import (
+    get_secret,
+    normalize_nonempty_secret_str,
+    secret_manager_would_be_consulted,
+)
+from litellm.types.secret_managers.main import KeyManagementSettings, KeyManagementSystem
 
 # Set up logging for debugging
 logging.basicConfig(level=logging.DEBUG)
@@ -364,3 +371,63 @@ def test_unsupported_oidc_provider():
 )
 def test_normalize_nonempty_secret_str(raw, expected):
     assert normalize_nonempty_secret_str(raw) == expected
+
+
+class _SpySecretManager(CustomSecretManager):
+    """Records every name the manager is actually asked for."""
+
+    def __init__(self, asked):
+        self.asked = asked
+
+    def sync_read_secret(self, secret_name, optional_params=None, timeout=None, **kwargs):
+        self.asked.append(secret_name)
+        return "a-value"
+
+    async def async_read_secret(self, secret_name, optional_params=None, timeout=None, **kwargs):
+        self.asked.append(secret_name)
+        return "a-value"
+
+
+@pytest.mark.parametrize(
+    ("access_mode", "hosted_keys", "secret_name", "expected"),
+    [
+        ("read_only", None, "ANY_NAME", True),
+        ("read_only", ["ALLOWED"], "ALLOWED", True),
+        ("read_only", ["ALLOWED"], "NOT_ALLOWED", False),
+        ("read_and_write", ["ALLOWED"], "ALLOWED", True),
+        ("write_only", None, "ANY_NAME", False),
+        ("write_only", ["ALLOWED"], "ALLOWED", False),
+    ],
+)
+def test_secret_manager_would_be_consulted_matches_get_secret(
+    monkeypatch, access_mode, hosted_keys, secret_name, expected
+):
+    """The predicate must agree with what get_secret actually does, not with a reading of it.
+
+    Callers use it to tell "the manager does not have this key" apart from "the manager was
+    never asked", so a predicate that drifts from get_secret's gating makes them state a
+    lookup that never happened.
+    """
+    asked = []
+    monkeypatch.setattr(litellm, "secret_manager_client", _SpySecretManager(asked))
+    monkeypatch.setattr(litellm, "_key_management_system", KeyManagementSystem.CUSTOM)
+    monkeypatch.setattr(
+        litellm,
+        "_key_management_settings",
+        KeyManagementSettings(access_mode=access_mode, hosted_keys=hosted_keys),
+    )
+    monkeypatch.delenv(secret_name, raising=False)
+
+    predicted = secret_manager_would_be_consulted(f"os.environ/{secret_name}")
+    get_secret(f"os.environ/{secret_name}")
+
+    assert {"predicted": predicted, "actually_consulted": bool(asked)} == {
+        "predicted": expected,
+        "actually_consulted": expected,
+    }
+
+
+def test_secret_manager_would_be_consulted_is_false_without_a_client(monkeypatch):
+    monkeypatch.setattr(litellm, "secret_manager_client", None)
+
+    assert secret_manager_would_be_consulted("os.environ/ANY_NAME") is False
diff --git a/tests/test_litellm/test_circleci_path_filter.py b/tests/test_litellm/test_circleci_path_filter.py
index b8e763b4979..b427a1a3bd8 100644
--- a/tests/test_litellm/test_circleci_path_filter.py
+++ b/tests/test_litellm/test_circleci_path_filter.py
@@ -7,6 +7,9 @@ category, it prints `run` or `skip`. The gating contract we lock in here:
   * docs-only changes (``*.md``, ``*.mdx``, ``docs/``) run nothing
   * client-only changes (``ui/``) run client jobs but skip backend jobs
   * any backend change runs both client and backend jobs
+  * ``ui`` tracks ``ui/`` plus CI config, so a backend-only change skips it
+    where ``client`` would still run, while a change to the workflows that
+    define the dashboard jobs still exercises them
 
 If this logic silently regresses, real test jobs get skipped, so these cases
 are the guardrail against that.
@@ -40,6 +43,7 @@ def classify(category: str, changed: list[str]) -> str:
 DOCS = ["README.md", "docs/my_website/index.mdx", "litellm/anywhere.md"]
 CLIENT = ["ui/litellm-dashboard/src/App.tsx"]
 BACKEND = ["litellm/main.py"]
+CI = [".github/workflows/test-litellm-ui-unit.yml"]
 
 
 @pytest.mark.parametrize(
@@ -48,20 +52,27 @@ BACKEND = ["litellm/main.py"]
         # docs-only: skip everything
         ("backend", DOCS, "skip"),
         ("client", DOCS, "skip"),
+        ("ui", DOCS, "skip"),
         ("backend", [], "skip"),
         ("client", [], "skip"),
+        ("ui", [], "skip"),
         # client-only: backend skips, client runs
         ("backend", CLIENT, "skip"),
         ("client", CLIENT, "run"),
+        ("ui", CLIENT, "run"),
         ("backend", CLIENT + DOCS, "skip"),
         ("client", CLIENT + DOCS, "run"),
+        ("ui", CLIENT + DOCS, "run"),
         # any backend change: both run ("backend runs both")
         ("backend", BACKEND, "run"),
         ("client", BACKEND, "run"),
+        ("ui", BACKEND, "skip"),
         ("backend", BACKEND + DOCS, "run"),
         ("client", BACKEND + DOCS, "run"),
+        ("ui", BACKEND + DOCS, "skip"),
         ("backend", BACKEND + CLIENT, "run"),
         ("client", BACKEND + CLIENT, "run"),
+        ("ui", BACKEND + CLIENT, "run"),
     ],
 )
 def test_classify_decisions(category: str, changed: list[str], expected: str) -> None:
@@ -71,6 +82,31 @@ def test_classify_decisions(category: str, changed: list[str], expected: str) ->
 def test_markdown_under_ui_counts_as_client_not_docs() -> None:
     assert classify("client", ["ui/litellm-dashboard/README.md"]) == "run"
     assert classify("backend", ["ui/litellm-dashboard/README.md"]) == "skip"
+    assert classify("ui", ["ui/litellm-dashboard/README.md"]) == "run"
+
+
+def test_ci_config_changes_reach_every_category() -> None:
+    """A workflow edit has to exercise the jobs it defines, otherwise the change
+    ships unvalidated: the dashboard jobs would skip on the very pull request
+    that rewrites them."""
+    assert classify("ui", CI) == "run"
+    assert classify("backend", CI) == "run"
+    assert classify("client", CI) == "run"
+
+
+def test_markdown_under_dot_github_is_still_docs() -> None:
+    """`.github/**` counting as CI config must not drag the pull request template
+    and other markdown back into running the full suite."""
+    assert classify("ui", [".github/pull_request_template.md"]) == "skip"
+    assert classify("backend", [".github/pull_request_template.md"]) == "skip"
+
+
+def test_ui_and_client_diverge_on_a_backend_only_change() -> None:
+    """`client` gates CircleCI's dashboard end-to-end jobs, which drive a real
+    proxy and so must run on backend changes. `ui` gates the dashboard build and
+    its unit tests, which cannot see the backend at all."""
+    assert classify("client", BACKEND) == "run"
+    assert classify("ui", BACKEND) == "skip"
 
 
 def test_non_docs_directory_with_docs_in_name_is_backend() -> None:
diff --git a/tests/test_litellm/test_cost_calculator.py b/tests/test_litellm/test_cost_calculator.py
index 75c90d793fe..98938dee62e 100644
--- a/tests/test_litellm/test_cost_calculator.py
+++ b/tests/test_litellm/test_cost_calculator.py
@@ -1742,6 +1742,81 @@ def test_azure_ai_cache_cost_calculation():
     ), f"Output cost mismatch: got {output_cost}, expected {expected_output_cost}"
 
 
+def test_vertex_regional_deployment_costs_uplift_over_global(monkeypatch):
+    """
+    Regression for https://github.com/BerriAI/litellm/issues/34393: two Vertex
+    deployments differing only in vertex_location must not price identically.
+    Google bills non-global endpoints at 1.1x for regional-pricing models, so the
+    regional request costs 1.1x the global one for the exact same usage, through
+    both vertex cost routes (Claude via cost_per_token, Gemini via
+    cost_per_character's token fallback).
+    """
+    monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
+    monkeypatch.setattr(litellm, "model_cost", litellm.get_model_cost_map(url=""))
+
+    usage = Usage(prompt_tokens=15, completion_tokens=5, total_tokens=20)
+    for model in ("claude-haiku-4-5@20251001", "gemini-3.5-flash"):
+        global_prompt, global_completion = cost_per_token(
+            model=model,
+            custom_llm_provider="vertex_ai",
+            usage_object=usage,
+            vertex_location="global",
+        )
+        regional_prompt, regional_completion = cost_per_token(
+            model=model,
+            custom_llm_provider="vertex_ai",
+            usage_object=usage,
+            vertex_location="us-east5",
+        )
+        global_total = global_prompt + global_completion
+        regional_total = regional_prompt + regional_completion
+        assert global_total > 0
+        assert regional_total == pytest.approx(global_total * 1.10, rel=1e-9), (
+            f"{model}: regional Vertex request must cost 1.1x the global one"
+        )
+
+
+def test_vertex_uplift_composes_with_above_128k_pricing(monkeypatch):
+    """The regional-endpoint uplift multiplies whatever rate the request priced at,
+    including the above-128k dynamic rates, so a synthetic model carrying both keys
+    prices regional above-128k usage at 1.1x the above-128k rate."""
+    monkeypatch.setenv("LITELLM_LOCAL_MODEL_COST_MAP", "True")
+    monkeypatch.setattr(
+        litellm,
+        "model_cost",
+        {
+            **litellm.get_model_cost_map(url=""),
+            "vertex_ai/fake-regional-128k-model": {
+                "litellm_provider": "vertex_ai",
+                "mode": "chat",
+                "input_cost_per_token": 1e-06,
+                "output_cost_per_token": 2e-06,
+                "input_cost_per_token_above_128k_tokens": 2e-06,
+                "output_cost_per_token_above_128k_tokens": 4e-06,
+                "regional_endpoint_uplift_multiplier": 1.1,
+            },
+        },
+    )
+
+    usage = Usage(prompt_tokens=200_000, completion_tokens=10, total_tokens=200_010)
+    global_prompt, global_completion = cost_per_token(
+        model="fake-regional-128k-model",
+        custom_llm_provider="vertex_ai",
+        usage_object=usage,
+        vertex_location="global",
+    )
+    regional_prompt, regional_completion = cost_per_token(
+        model="fake-regional-128k-model",
+        custom_llm_provider="vertex_ai",
+        usage_object=usage,
+        vertex_location="europe-west1",
+    )
+
+    assert global_prompt == pytest.approx(200_000 * 2e-06, rel=1e-9)
+    assert regional_prompt == pytest.approx(global_prompt * 1.10, rel=1e-9)
+    assert regional_completion == pytest.approx(global_completion * 1.10, rel=1e-9)
+
+
 def test_cost_discount_vertex_ai():
     """
     Test that cost discount is applied correctly for Vertex AI provider
diff --git a/tests/test_litellm/test_detect_changes.py b/tests/test_litellm/test_detect_changes.py
new file mode 100644
index 00000000000..d8feb2371a3
--- /dev/null
+++ b/tests/test_litellm/test_detect_changes.py
@@ -0,0 +1,235 @@
+"""Regression tests for the GitHub Actions change-based job gating.
+
+`.github/scripts/detect_changes.sh` decides whether a pull request's jobs do
+real work. It asks the API which files the pull request touches and hands them
+to `classify_changes.sh` under one category. The contract locked in here:
+
+  * a UI-only pull request skips backend jobs even when the checked-out merge
+    ref carries backend commits from the base branch
+  * the ui category is the mirror image: it skips when only backend files
+    changed, so a backend-only PR stops building and unit-testing the dashboard
+  * anything the classification cannot resolve (no pull request, an API
+    failure, a truncated file list, a broken classifier) runs the job
+"""
+
+from __future__ import annotations
+
+import os
+import shutil
+import subprocess
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+SCRIPT = REPO_ROOT / ".github" / "scripts" / "detect_changes.sh"
+CLASSIFIER = REPO_ROOT / ".circleci" / "scripts" / "classify_changes.sh"
+
+UI_FILE = "ui/litellm-dashboard/src/components/Teams.tsx"
+BACKEND_FILE = "litellm/proxy/proxy_server.py"
+
+
+def _git(cwd: Path, *args: str) -> None:
+    subprocess.run(["git", *args], cwd=cwd, check=True, capture_output=True, text=True)
+
+
+def _merge_ref_checkout(tmp_path: Path) -> Path:
+    """A checkout shaped like `refs/pull/N/merge`: a UI-only branch merged into a
+    base tip that has moved ahead by a backend commit since the branch was cut."""
+    work = tmp_path / "work"
+    work.mkdir()
+    _git(work, "init", "-q", "-b", "main")
+    _git(work, "config", "user.email", "t@t")
+    _git(work, "config", "user.name", "t")
+    (work / "seed.txt").write_text("seed\n")
+    _git(work, "add", "-A")
+    _git(work, "commit", "-qm", "base")
+
+    _git(work, "checkout", "-q", "-b", "feature")
+    ui = work / UI_FILE
+    ui.parent.mkdir(parents=True, exist_ok=True)
+    ui.write_text("export const Teams = () => null\n")
+    _git(work, "add", "-A")
+    _git(work, "commit", "-qm", "ui change")
+
+    _git(work, "checkout", "-q", "main")
+    backend = work / BACKEND_FILE
+    backend.parent.mkdir(parents=True, exist_ok=True)
+    backend.write_text("x = 1\n")
+    _git(work, "add", "-A")
+    _git(work, "commit", "-qm", "someone else's backend change")
+
+    _git(work, "merge", "-q", "--no-ff", "-m", "Merge feature into main", "feature")
+    return work
+
+
+def _scripts_tree(tmp_path: Path, classifier_body: str | None = None) -> Path:
+    """Copy the scripts into a throwaway tree, preserving their relative layout."""
+    root = tmp_path / "tree"
+    (root / ".github" / "scripts").mkdir(parents=True)
+    (root / ".circleci" / "scripts").mkdir(parents=True)
+    shutil.copy(SCRIPT, root / ".github" / "scripts" / SCRIPT.name)
+    target = root / ".circleci" / "scripts" / CLASSIFIER.name
+    if classifier_body is None:
+        shutil.copy(CLASSIFIER, target)
+    else:
+        target.write_text(classifier_body)
+    target.chmod(0o755)
+    return root
+
+
+def _run(
+    tmp_path: Path,
+    *,
+    files: list[str],
+    cwd: Path | None = None,
+    pr_number: str = "37540",
+    changed_file_count: str | None = None,
+    gh_exit_code: int = 0,
+    classifier_body: str | None = None,
+    category: str | None = None,
+) -> tuple[str, str]:
+    """Run the script against a stubbed `gh`; returns (decision, stdout)."""
+    bin_dir = tmp_path / "bin"
+    bin_dir.mkdir(exist_ok=True)
+    listing = "".join(f"echo {f}\n" for f in files)
+    stub = bin_dir / "gh"
+    stub.write_text(f"#!/usr/bin/env bash\n{listing}exit {gh_exit_code}\n")
+    stub.chmod(0o755)
+
+    output_file = tmp_path / "github_output"
+    output_file.write_text("")
+
+    env = {k: v for k, v in os.environ.items() if k not in {"GH_TOKEN", "GITHUB_TOKEN"}}
+    env["PATH"] = f"{bin_dir}{os.pathsep}{env['PATH']}"
+    env["GITHUB_OUTPUT"] = str(output_file)
+    env["REPO"] = "BerriAI/litellm"
+    env["PR_NUMBER"] = pr_number
+    env["CHANGED_FILE_COUNT"] = changed_file_count if changed_file_count is not None else str(len(files))
+    if category is not None:
+        env["CATEGORY"] = category
+    else:
+        env.pop("CATEGORY", None)
+
+    tree = _scripts_tree(tmp_path, classifier_body)
+    result = subprocess.run(
+        ["bash", str(tree / ".github" / "scripts" / SCRIPT.name)],
+        cwd=cwd or tmp_path,
+        capture_output=True,
+        text=True,
+        env=env,
+        check=True,
+    )
+    return output_file.read_text().strip(), result.stdout
+
+
+def test_ui_only_pr_skips_even_when_the_merge_ref_carries_backend_commits(tmp_path: Path) -> None:
+    """The bug this replaces: diffing the checked-out merge ref against the event's
+    base sha attributed the base branch's own backend commits to the pull request,
+    so every UI-only PR ran the full backend suite."""
+    work = _merge_ref_checkout(tmp_path)
+    tracked = subprocess.run(
+        ["git", "diff", "--name-only", "HEAD~2", "HEAD"],
+        cwd=work,
+        capture_output=True,
+        text=True,
+        check=True,
+    ).stdout.split()
+    assert BACKEND_FILE in tracked, "the checkout must contain the base branch's backend commit"
+
+    decision, _ = _run(tmp_path, files=[UI_FILE], cwd=work)
+    assert decision == "decision=skip"
+
+
+def test_backend_file_in_the_pr_runs(tmp_path: Path) -> None:
+    decision, _ = _run(tmp_path, files=[UI_FILE, BACKEND_FILE])
+    assert decision == "decision=run"
+
+
+def test_docs_only_pr_skips(tmp_path: Path) -> None:
+    decision, _ = _run(tmp_path, files=["README.md", "docs/my-website/index.mdx"])
+    assert decision == "decision=skip"
+
+
+def test_non_pull_request_event_runs(tmp_path: Path) -> None:
+    decision, stdout = _run(tmp_path, files=[UI_FILE], pr_number="")
+    assert decision == "decision=run"
+    assert "not a pull_request event" in stdout
+
+
+def test_api_failure_runs(tmp_path: Path) -> None:
+    decision, stdout = _run(tmp_path, files=[], gh_exit_code=1)
+    assert decision == "decision=run"
+    assert "could not list the files" in stdout
+
+
+def test_empty_file_list_runs(tmp_path: Path) -> None:
+    decision, stdout = _run(tmp_path, files=[], changed_file_count="0")
+    assert decision == "decision=run"
+    assert "listed no files" in stdout
+
+
+def test_pr_past_the_listing_ceiling_runs(tmp_path: Path) -> None:
+    """The API caps its file listing, so a larger PR would be classified from a
+    truncated set and could skip backend jobs it needs."""
+    decision, stdout = _run(tmp_path, files=[UI_FILE], changed_file_count="3001")
+    assert decision == "decision=run"
+    assert "past the 3000-file listing ceiling" in stdout
+
+
+def test_broken_classifier_runs(tmp_path: Path) -> None:
+    decision, stdout = _run(
+        tmp_path,
+        files=[UI_FILE],
+        classifier_body="#!/usr/bin/env bash\nexit 1\n",
+    )
+    assert decision == "decision=run"
+    assert "classify_changes.sh failed" in stdout
+
+
+def test_unexpected_classifier_output_runs(tmp_path: Path) -> None:
+    decision, stdout = _run(
+        tmp_path,
+        files=[UI_FILE],
+        classifier_body="#!/usr/bin/env bash\ncat >/dev/null\necho maybe\n",
+    )
+    assert decision == "decision=run"
+    assert "unexpected decision: maybe" in stdout
+
+
+def test_ui_category_skips_a_backend_only_pr(tmp_path: Path) -> None:
+    """The dashboard build and its unit tests cannot be affected by a pull request
+    that touches no `ui/` file, and the `client` category cannot express that
+    because it deliberately runs whenever the backend changes."""
+    decision, _ = _run(tmp_path, files=[BACKEND_FILE], category="ui")
+    assert decision == "decision=skip"
+
+
+def test_ui_category_runs_a_ui_only_pr(tmp_path: Path) -> None:
+    decision, _ = _run(tmp_path, files=[UI_FILE], category="ui")
+    assert decision == "decision=run"
+
+
+def test_ui_category_runs_a_mixed_pr(tmp_path: Path) -> None:
+    decision, _ = _run(tmp_path, files=[UI_FILE, BACKEND_FILE], category="ui")
+    assert decision == "decision=run"
+
+
+def test_absent_category_still_runs_a_backend_pr(tmp_path: Path) -> None:
+    """Callers that pass no category keep the pre-existing backend behaviour."""
+    assert _run(tmp_path, files=[BACKEND_FILE])[0] == "decision=run"
+
+
+def test_absent_category_still_skips_a_ui_pr(tmp_path: Path) -> None:
+    assert _run(tmp_path, files=[UI_FILE])[0] == "decision=skip"
+
+
+def test_ui_category_fails_open_when_the_api_fails(tmp_path: Path) -> None:
+    decision, stdout = _run(tmp_path, files=[], gh_exit_code=1, category="ui")
+    assert decision == "decision=run"
+    assert "detect-changes[ui]" in stdout
+
+
+def test_ui_category_runs_when_the_ui_workflows_themselves_change(tmp_path: Path) -> None:
+    """Without this the dashboard jobs would skip on the pull request that edits
+    them, shipping a workflow change nothing ever exercised."""
+    decision, _ = _run(tmp_path, files=[".github/workflows/test-litellm-ui-unit.yml"], category="ui")
+    assert decision == "decision=run"
diff --git a/tests/test_litellm/test_responses_api_bridge_non_stream.py b/tests/test_litellm/test_responses_api_bridge_non_stream.py
index c272b151865..08d55ee8290 100644
--- a/tests/test_litellm/test_responses_api_bridge_non_stream.py
+++ b/tests/test_litellm/test_responses_api_bridge_non_stream.py
@@ -297,7 +297,8 @@ def test_transform_usage_with_zero_values():
 
     cached_tokens=0 is preserved (cache was available; nothing was cached).
     reasoning_tokens=0 is preserved the same way: an explicit provider-reported
-    zero passes through, while an absent value (None) is omitted.
+    zero passes through, while an absent value (None) falls back to 0 because the
+    Responses API wire contract requires reasoning_tokens as an int.
     """
     completion_response = create_mock_completion_response(
         model="gpt-4",
@@ -321,6 +322,32 @@ def test_transform_usage_with_zero_values():
     print("✓ Transformation preserves explicit reasoning_tokens=0 and omits absent values")
 
 
+def test_transform_usage_unknown_reasoning_split_keeps_output_tokens_details():
+    """
+    An unknown reasoning split (reasoning_tokens=None, text_tokens=None) must still
+    emit output_tokens_details with an integer reasoning_tokens: the OpenAI SDK's
+    ResponseUsage requires the field, so omitting it breaks /v1/responses clients.
+    """
+    from openai.types.responses.response_usage import (
+        OutputTokensDetails as OpenAISDKOutputTokensDetails,
+    )
+
+    from litellm.types.utils import CompletionTokensDetailsWrapper
+
+    usage = Usage(
+        prompt_tokens=100,
+        completion_tokens=500,
+        total_tokens=600,
+        completion_tokens_details=CompletionTokensDetailsWrapper(reasoning_tokens=None, text_tokens=None),
+    )
+
+    responses_usage = LiteLLMCompletionResponsesConfig._transform_chat_completion_usage_to_responses_usage(usage)
+
+    assert responses_usage.output_tokens_details is not None
+    assert responses_usage.output_tokens_details.reasoning_tokens == 0
+    OpenAISDKOutputTokensDetails.model_validate(responses_usage.output_tokens_details.model_dump(exclude_none=True))
+
+
 def test_input_tokens_details_requires_cached_tokens():
     """
     Test that InputTokensDetails has cached_tokens as an int with default value 0.
diff --git a/tests/test_litellm/test_router_model_cost_isolation.py b/tests/test_litellm/test_router_model_cost_isolation.py
index dfe46d54ab8..4674a8b1dfa 100644
--- a/tests/test_litellm/test_router_model_cost_isolation.py
+++ b/tests/test_litellm/test_router_model_cost_isolation.py
@@ -1584,3 +1584,116 @@ def test_inherit_builtin_tiered_output_rate_leaves_a_user_rate_alone():
     )
 
     assert model_info["output_cost_per_token"] == 9e-07
+
+
+# --- a config.yaml PTU deployment must not also bill per token ------------------
+
+_PTU_MODEL_INFO = {
+    "team_id": "team-alpha",
+    "ptu_count": 100,
+    "cost_per_ptu_per_hour": 0.02,
+    "ptu_effective_from": "2026-01-01T00:00:00Z",
+}
+
+
+def _ptu_router(model_info=None, litellm_params=None, ptu_enabled=True):
+    """A router built the way loading config.yaml builds one."""
+    with patch.dict(os.environ, {"LITELLM_ENABLE_PTU_COST_ATTRIBUTION": "True" if ptu_enabled else ""}, clear=False):
+        return Router(
+            model_list=[
+                {
+                    "model_name": "gpt-4o-ptu",
+                    "litellm_params": {
+                        "model": "anthropic/claude-sonnet-4-5-20250929",
+                        "api_key": "sk-not-used",
+                        **(litellm_params or {}),
+                    },
+                    "model_info": dict(_PTU_MODEL_INFO if model_info is None else model_info),
+                }
+            ]
+        )
+
+
+def test_a_config_ptu_deployment_bills_nothing_per_token():
+    """Reserved capacity is already billed by the hour, so charging its traffic bills the
+    same tokens twice. Left unset the rate falls back to the public cost map, which makes
+    the double charge the default rather than an opt-in."""
+    router = _ptu_router(litellm_params={"input_cost_per_token": 5e-06, "output_cost_per_token": 1.5e-05})
+    entry = router.model_list[0]
+
+    assert entry["litellm_params"]["input_cost_per_token"] == 0.0
+    assert entry["litellm_params"]["output_cost_per_token"] == 0.0
+    assert entry["model_info"]["input_cost_per_token"] == 0.0
+    assert litellm.model_cost[entry["model_info"]["id"]]["input_cost_per_token"] == 0.0
+
+
+@pytest.mark.parametrize(
+    "backend",
+    ["anthropic/claude-sonnet-4-5-20250929", "azure/gpt-4o", "gemini/gemini-2.5-flash"],
+)
+def test_a_config_ptu_deployment_imports_no_cache_rate_from_its_backend(backend):
+    """The cache back-fill runs whenever input_cost_per_token is set, and 0.0 is set, so a
+    partially zeroed deployment would silently inherit the backend model's real cache rates.
+    Every backend here publishes non-zero ones, which is what makes the assertion mean
+    something."""
+    cache_fields = (
+        "cache_creation_input_token_cost",
+        "cache_creation_input_token_cost_above_1hr",
+        "cache_creation_input_token_cost_above_200k_tokens",
+        "cache_read_input_token_cost",
+        "cache_read_input_token_cost_above_200k_tokens",
+    )
+    builtin = litellm.get_model_info(model=backend)
+    assert any(builtin.get(field) for field in cache_fields), "backend publishes no cache pricing to leak"
+
+    router = _ptu_router(litellm_params={"model": backend})
+    priced = litellm.model_cost[router.model_list[0]["model_info"]["id"]]
+
+    assert [field for field in cache_fields if priced.get(field)] == []
+
+
+def test_zeroing_a_ptu_deployment_leaves_its_backend_model_priced():
+    """A sibling deployment on the same backend must keep billing normally."""
+    backend = "anthropic/claude-sonnet-4-5-20250929"
+    builtin = litellm.get_model_info(model=backend)["input_cost_per_token"]
+    assert builtin > 0
+
+    _ptu_router(litellm_params={"model": backend})
+
+    assert litellm.get_model_info(model=backend)["input_cost_per_token"] == builtin
+
+
+def test_zeroing_does_not_change_the_deployment_id():
+    """The id is a hash of the deployment's params and keys its cooldowns, its budget, and
+    every spend row already written against it."""
+    params = {"input_cost_per_token": 5e-06}
+    priced = _ptu_router(litellm_params=params, ptu_enabled=False).model_list[0]["model_info"]["id"]
+    zeroed = _ptu_router(litellm_params=params).model_list[0]["model_info"]["id"]
+
+    assert priced == zeroed
+
+
+def test_a_database_backed_deployment_is_left_alone():
+    """The write endpoints already zero those, and they answer 400 rather than silently
+    rewriting a rate the caller sent."""
+    entry = _ptu_router(model_info={**_PTU_MODEL_INFO, "db_model": True}).model_list[0]
+
+    assert entry["litellm_params"].get("input_cost_per_token") is None
+
+
+def test_nothing_is_zeroed_while_the_feature_is_off():
+    """No flat cost accrues with the flag off, so zeroing would serve the traffic free."""
+    entry = _ptu_router(litellm_params={"input_cost_per_token": 5e-06}, ptu_enabled=False).model_list[0]
+
+    assert entry["litellm_params"]["input_cost_per_token"] == 5e-06
+
+
+@pytest.mark.parametrize("dropped", ["team_id", "ptu_effective_from"], ids=["no team_id", "no ptu_effective_from"])
+def test_a_deployment_the_rollup_will_not_charge_is_not_zeroed(dropped):
+    """The rollup refuses to price a reservation missing either field, so zeroing on the
+    looser count-and-rate test alone would leave the deployment serving for free with
+    nothing charged in its place."""
+    incomplete = {k: v for k, v in _PTU_MODEL_INFO.items() if k != dropped}
+    entry = _ptu_router(model_info=incomplete, litellm_params={"input_cost_per_token": 5e-06}).model_list[0]
+
+    assert entry["litellm_params"]["input_cost_per_token"] == 5e-06
diff --git a/tests/test_litellm/test_utils.py b/tests/test_litellm/test_utils.py
index efccdc4a986..60453931595 100644
--- a/tests/test_litellm/test_utils.py
+++ b/tests/test_litellm/test_utils.py
@@ -2,6 +2,7 @@ import json
 import logging
 import os
 import sys
+from typing import Final
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -831,6 +832,7 @@ def test_aaamodel_prices_and_context_window_json_is_valid():
                 "output_cost_per_token_above_200k_tokens_priority": {"type": "number"},
                 "output_cost_per_token_above_272k_tokens_priority": {"type": "number"},
                 "output_cost_per_token_above_272k_tokens_flex": {"type": "number"},
+                "regional_endpoint_uplift_multiplier": {"type": "number"},
                 "regional_processing_uplift_multiplier_eu": {"type": "number"},
                 "regional_processing_uplift_multiplier_us": {"type": "number"},
                 "input_cost_per_pixel": {"type": "number"},
@@ -3787,8 +3789,8 @@ def test_deepseek_v4_models_in_cost_map():
     configured in model_prices_and_context_window.json.
 
     Prices sourced from https://api-docs.deepseek.com/quick_start/pricing:
-    - deepseek-v4-flash: $0.14/M input, $0.28/M output
-    - deepseek-v4-pro:   $0.435/M input, $0.87/M output (75% discounted active price)
+    - deepseek-v4-flash: $0.44/M input, $1.32/M output
+    - deepseek-v4-pro:   $1.32/M input, $3.96/M output
 
     Closes https://github.com/BerriAI/litellm/issues/26709
     """
@@ -3801,8 +3803,8 @@ def test_deepseek_v4_models_in_cost_map():
 
     # --- bare model names ---
     for key, expected_input, expected_output, expected_cache in [
-        ("deepseek-v4-flash", 1.4e-07, 2.8e-07, 2.8e-09),
-        ("deepseek-v4-pro", 4.35e-07, 8.7e-07, 3.625e-09),
+        ("deepseek-v4-flash", 4.4e-07, 1.32e-06, 1.4e-08),
+        ("deepseek-v4-pro", 1.32e-06, 3.96e-06, 4.4e-08),
     ]:
         info = model_cost.get(key)
         assert info is not None, f"{key} missing from model_prices_and_context_window.json"
@@ -3817,8 +3819,8 @@ def test_deepseek_v4_models_in_cost_map():
 
     # --- provider-prefixed names ---
     for key, expected_input, expected_output, expected_cache in [
-        ("deepseek/deepseek-v4-flash", 1.4e-07, 2.8e-07, 2.8e-09),
-        ("deepseek/deepseek-v4-pro", 4.35e-07, 8.7e-07, 3.625e-09),
+        ("deepseek/deepseek-v4-flash", 4.4e-07, 1.32e-06, 1.4e-08),
+        ("deepseek/deepseek-v4-pro", 1.32e-06, 3.96e-06, 4.4e-08),
     ]:
         info = model_cost.get(key)
         assert info is not None, f"{key} missing from model_prices_and_context_window.json"
@@ -3845,8 +3847,8 @@ def test_deepseek_v4_models_in_backup_cost_map():
 
     # --- bare model names ---
     for key, expected_input, expected_output, expected_cache in [
-        ("deepseek-v4-flash", 1.4e-07, 2.8e-07, 2.8e-09),
-        ("deepseek-v4-pro", 4.35e-07, 8.7e-07, 3.625e-09),
+        ("deepseek-v4-flash", 4.4e-07, 1.32e-06, 1.4e-08),
+        ("deepseek-v4-pro", 1.32e-06, 3.96e-06, 4.4e-08),
     ]:
         info = model_cost.get(key)
         assert info is not None, f"{key} missing from backup JSON"
@@ -3859,8 +3861,8 @@ def test_deepseek_v4_models_in_backup_cost_map():
 
     # --- provider-prefixed names ---
     for key, expected_input, expected_output, expected_cache in [
-        ("deepseek/deepseek-v4-flash", 1.4e-07, 2.8e-07, 2.8e-09),
-        ("deepseek/deepseek-v4-pro", 4.35e-07, 8.7e-07, 3.625e-09),
+        ("deepseek/deepseek-v4-flash", 4.4e-07, 1.32e-06, 1.4e-08),
+        ("deepseek/deepseek-v4-pro", 1.32e-06, 3.96e-06, 4.4e-08),
     ]:
         info = model_cost.get(key)
         assert info is not None, f"{key} missing from backup JSON"
@@ -4384,6 +4386,45 @@ def test_get_prompt_cache_min_tokens_differs_per_platform_for_same_model(local_m
     )
 
 
+GEMINI_4096_CACHE_MIN_MODELS: Final = tuple(
+    prefix + base
+    for base in (
+        "gemini-3.5-flash",
+        "gemini-3.6-flash",
+        "gemini-3.7-flash",
+        "gemini-3.1-pro-preview",
+        "gemini-3.1-pro-preview-customtools",
+    )
+    for prefix in ("", "gemini/", "vertex_ai/")
+)
+
+
+def test_gemini_3_flash_and_31_pro_preview_resolve_4096_cache_minimum(local_model_cost_map: None) -> None:
+    """Regression for the cost map missing prompt_cache_min_tokens on these models: Google rejects
+    explicit caching below 4,096 tokens for them (https://ai.google.dev/gemini-api/docs/caching), so
+    the 1024 default sent cachedContents creates Vertex answered with a hard 400."""
+    wrong: Final = {
+        model: get_prompt_cache_min_tokens(model=model)
+        for model in GEMINI_4096_CACHE_MIN_MODELS
+        if get_prompt_cache_min_tokens(model=model) != 4096
+    }
+    assert not wrong, f"prompt_cache_min_tokens must be 4096: {wrong}"
+
+
+def test_gemini_4096_cache_minimum_present_in_root_cost_map() -> None:
+    """The root map ships to the CDN independently of the bundled backup, so both must carry the
+    minimum or proxies reading one of them regress to the 1024 default."""
+    root_map_path: Final = os.path.join(os.path.dirname(__file__), "..", "..", "model_prices_and_context_window.json")
+    with open(root_map_path) as f:
+        root_map: Final = json.load(f)
+    wrong: Final = {
+        model: root_map[model].get("prompt_cache_min_tokens")
+        for model in GEMINI_4096_CACHE_MIN_MODELS
+        if root_map[model].get("prompt_cache_min_tokens") != 4096
+    }
+    assert not wrong, f"prompt_cache_min_tokens must be 4096: {wrong}"
+
+
 def test_get_prompt_cache_min_tokens_unmapped_model_falls_back_to_default(local_model_cost_map: None) -> None:
     """get_model_info raises for a model it has no entry for. The resolver must swallow that and
     fall back to the default, otherwise the raise reaches callers that would read it as
diff --git a/type-discipline-budget.json b/type-discipline-budget.json
index 6f77a621a9e..20cd1165577 100644
--- a/type-discipline-budget.json
+++ b/type-discipline-budget.json
@@ -1,6 +1,6 @@
 {
   "LIT001": {
-    "limit": 22809
+    "limit": 22805
   },
   "LIT002": {
     "limit": 26878
diff --git a/ui/litellm-dashboard/eslint-suppressions.json b/ui/litellm-dashboard/eslint-suppressions.json
index 98225de5d8b..2d68ea2aa68 100644
--- a/ui/litellm-dashboard/eslint-suppressions.json
+++ b/ui/litellm-dashboard/eslint-suppressions.json
@@ -4,11 +4,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -62,9 +57,6 @@
     "local/no-complex-jsx-arrow": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/immutability": {
       "count": 1
     }
@@ -90,9 +82,6 @@
   "src/app/(dashboard)/budgets/_components/budget_modal.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/budgets/_components/budget_panel.tsx": {
@@ -103,9 +92,6 @@
   "src/app/(dashboard)/budgets/_components/edit_budget_modal.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/caching/_components/cache_dashboard.tsx": {
@@ -158,9 +144,6 @@
     },
     "no-nested-ternary": {
       "count": 2
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/cost-tracking/_components/how_it_works.tsx": {
@@ -213,11 +196,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/guardrails-monitor/_components/GuardrailDetail.tsx": {
     "no-nested-ternary": {
       "count": 3
@@ -248,9 +226,6 @@
     "no-nested-ternary": {
       "count": 2
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 1
     }
@@ -262,9 +237,6 @@
     "max-lines": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 1
     },
@@ -541,38 +513,12 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx": {
     "max-lines": {
       "count": 1
     },
     "no-nested-ternary": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 4
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx": {
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/mcp-servers/_components/MCPNetworkSettings.tsx": {
@@ -580,16 +526,6 @@
       "count": 2
     }
   },
-  "src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.test.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/mcp-servers/_components/MCPSubmissionsTab.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 1
@@ -606,25 +542,14 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.test.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx": {
     "no-nested-ternary": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx": {
     "local/no-complex-jsx-arrow": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 2
     }
   },
   "src/app/(dashboard)/mcp-servers/_components/OpenAPIQuickPicker.tsx": {
@@ -632,36 +557,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.test.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 1
@@ -670,9 +565,6 @@
   "src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx": {
     "no-nested-ternary": {
       "count": 2
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/mcp-servers/_components/index.tsx": {
@@ -684,9 +576,6 @@
     "local/filename-pascal-case": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/static-components": {
       "count": 4
     }
@@ -726,15 +615,6 @@
     },
     "max-lines": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react-hooks/immutability": {
-      "count": 1
-    },
-    "react-hooks/set-state-in-effect": {
-      "count": 5
     }
   },
   "src/app/(dashboard)/mcp-servers/_components/mcp_server_view.tsx": {
@@ -780,11 +660,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/memory/_components/MemoryEditModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/models-and-endpoints/components/ModelRetrySettingsTab.tsx": {
     "no-nested-ternary": {
       "count": 1
@@ -889,11 +764,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/playground/components/complianceUI/ComplianceUI.tsx": {
     "local/no-complex-jsx-arrow": {
       "count": 2
@@ -993,9 +863,6 @@
     "local/filename-pascal-case": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/immutability": {
       "count": 1
     }
@@ -1097,9 +964,6 @@
     "local/filename-pascal-case": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/immutability": {
       "count": 1
     }
@@ -1125,16 +989,6 @@
       "count": 1
     }
   },
-  "src/app/(dashboard)/projects/_components/ProjectModals/CreateProjectModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/projects/_components/ProjectModals/EditProjectModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/projects/_components/ProjectModals/ProjectBaseForm.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 2
@@ -1205,9 +1059,6 @@
     "no-nested-ternary": {
       "count": 3
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 2
     }
@@ -1238,18 +1089,10 @@
       "count": 2
     }
   },
-  "src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/search-tools/_components/SearchTools.tsx": {
     "local/no-complex-jsx-arrow": {
       "count": 2
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/static-components": {
       "count": 1
     }
@@ -1272,14 +1115,6 @@
   "src/app/(dashboard)/skills/_components/add_plugin_form.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/tag-management/_components/index.tsx": {
@@ -1392,29 +1227,13 @@
     "local/filename-pascal-case": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 1
     }
   },
-  "src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
-  "src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx": {
     "no-nested-ternary": {
       "count": 2
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/app/(dashboard)/vector-stores/_components/index.tsx": {
@@ -1453,9 +1272,6 @@
     "local/no-complex-jsx-arrow": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 2
     }
@@ -1470,11 +1286,6 @@
       "count": 1
     }
   },
-  "src/app/onboarding/OnboardingFormBody.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/AIHub/ModelHubTable.test.tsx": {
     "max-params": {
       "count": 1
@@ -1511,16 +1322,6 @@
       "count": 1
     }
   },
-  "src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/CreateUserButton.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1559,33 +1360,15 @@
       "count": 1
     }
   },
-  "src/components/SSOModals.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/Settings/AdminSettings/HashicorpVault/HashicorpVault.tsx": {
     "no-nested-ternary": {
       "count": 1
     }
   },
-  "src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx": {
     "no-nested-ternary": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 1
     }
@@ -1595,31 +1378,16 @@
       "count": 1
     }
   },
-  "src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx": {
     "max-nested-callbacks": {
       "count": 1
     }
   },
-  "src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/Settings/AdminSettings/SSOSettings/RedactableField.tsx": {
     "no-nested-ternary": {
       "count": 1
     }
   },
-  "src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/Settings/AdminSettings/UISettings/PageVisibilitySettings.tsx": {
     "react-hooks/set-state-in-render": {
       "count": 1
@@ -1635,23 +1403,7 @@
       "count": 1
     }
   },
-  "src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx": {
-    "local/no-complex-jsx-arrow": {
-      "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 1
     }
@@ -1668,7 +1420,7 @@
   },
   "src/components/Teams.tsx": {
     "local/no-complex-jsx-arrow": {
-      "count": 4
+      "count": 3
     },
     "max-lines": {
       "count": 1
@@ -1691,11 +1443,6 @@
       "count": 1
     }
   },
-  "src/components/UsagePage/components/EntityUsage/TopKeyView.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/UsagePage/utils/value_formatters.tsx": {
     "local/filename-pascal-case": {
       "count": 1
@@ -1704,9 +1451,6 @@
   "src/components/VirtualKeysPage/keyTableColumns.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/components/activity_metrics.tsx": {
@@ -1717,16 +1461,6 @@
       "count": 1
     }
   },
-  "src/components/add_model/AdaptiveRoutingConfig.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/add_model/AddModelForm.test.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/add_model/AddModelForm.tsx": {
     "local/no-complex-jsx-arrow": {
       "count": 1
@@ -1734,26 +1468,6 @@
     "no-nested-ternary": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
-  "src/components/add_model/ClassificationMethodConfig.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/add_model/ComplexityRouterConfig.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/add_model/EscalationKeywords.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/add_model/KeywordTierRules.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
@@ -1763,11 +1477,6 @@
       "count": 1
     }
   },
-  "src/components/add_model/SemanticKeywordMatching.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/add_model/add_auto_router_tab.tsx": {
     "local/filename-pascal-case": {
       "count": 1
@@ -1784,9 +1493,6 @@
   "src/components/add_model/advanced_settings.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 3
     }
   },
   "src/components/add_model/auto_router_connection_test.tsx": {
@@ -1806,9 +1512,6 @@
     "local/no-complex-jsx-arrow": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 2
     }
@@ -1829,9 +1532,6 @@
     },
     "no-nested-ternary": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 2
     }
   },
   "src/components/add_model/model_connection_test.tsx": {
@@ -1849,9 +1549,6 @@
     "no-nested-ternary": {
       "count": 3
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/immutability": {
       "count": 3
     }
@@ -1859,20 +1556,9 @@
   "src/components/add_pass_through.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/agent_management/AgentSelector.test.tsx": {
-    "react/display-name": {
-      "count": 1
     }
   },
   "src/components/agent_management/AgentSelector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "prefer-const": {
       "count": 1
     }
@@ -1963,11 +1649,6 @@
       "count": 1
     }
   },
-  "src/components/common_components/AccessGroupSelector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/common_components/DeleteResourceModal.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 1
@@ -1978,16 +1659,6 @@
       "count": 1
     }
   },
-  "src/components/common_components/MetadataKeyValueFields.test.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/common_components/MetadataKeyValueFields.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/common_components/ModelAliasManager.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 1
@@ -1998,16 +1669,6 @@
       "count": 1
     }
   },
-  "src/components/common_components/PassThroughGuardrailsSection.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/common_components/RateLimitTypeFormItem.test.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/common_components/budget_duration_dropdown.tsx": {
     "local/filename-pascal-case": {
       "count": 1
@@ -2016,9 +1677,6 @@
   "src/components/common_components/check_openapi_schema.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 2
     }
   },
   "src/components/common_components/fetch_teams.tsx": {
@@ -2050,9 +1708,6 @@
   "src/components/common_components/user_search_modal.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/components/constants.tsx": {
@@ -2092,16 +1747,6 @@
       "count": 1
     }
   },
-  "src/components/key_team_helpers/BudgetFallbacksEditor.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/key_team_helpers/BudgetWindowsEditor.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/key_team_helpers/fetch_available_models_team_key.tsx": {
     "local/filename-pascal-case": {
       "count": 1
@@ -2165,14 +1810,6 @@
       "count": 1
     }
   },
-  "src/components/mcp_server_management/MCPServerSelector.tsx": {
-    "local/no-complex-jsx-arrow": {
-      "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/mcp_server_management/MCPToolPermissions.tsx": {
     "local/no-complex-jsx-arrow": {
       "count": 1
@@ -2186,9 +1823,6 @@
   "src/components/mcp_tools/MCPToolArgumentsForm.tsx": {
     "no-nested-ternary": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/components/mcp_tools/McpCrudPermissionPanel.tsx": {
@@ -2203,20 +1837,12 @@
   },
   "src/components/model_add/CredentialModal.tsx": {
     "no-restricted-imports": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/model_add/reuse_credentials.tsx": {
     "local/filename-pascal-case": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/components/model_filters.tsx": {
@@ -2236,9 +1862,6 @@
     "local/filename-pascal-case": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "prefer-const": {
       "count": 5
     },
@@ -2289,11 +1912,6 @@
       "count": 1
     }
   },
-  "src/components/organisms/RegenerateKeyModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/organisms/create_key_button.tsx": {
     "local/filename-pascal-case": {
       "count": 1
@@ -2380,11 +1998,6 @@
       "count": 1
     }
   },
-  "src/components/router_settings/RoutingStrategySelector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/router_settings/index.tsx": {
     "local/filename-pascal-case": {
       "count": 1
@@ -2393,11 +2006,6 @@
       "count": 2
     }
   },
-  "src/components/routing_groups/RoutingGroupModal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/components/routing_groups/index.tsx": {
     "local/filename-pascal-case": {
       "count": 1
@@ -2536,14 +2144,6 @@
   "src/components/team/EditMembership.tsx": {
     "no-nested-ternary": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "src/components/team/LoggingSettings.tsx": {
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "src/components/team/TeamInfo.tsx": {
@@ -2553,9 +2153,6 @@
     "no-nested-ternary": {
       "count": 3
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/set-state-in-effect": {
       "count": 1
     }
@@ -2891,11 +2488,6 @@
       "count": 2
     }
   },
-  "src/contexts/AntdGlobalProvider.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "src/contexts/AuthContext.tsx": {
     "react-hooks/set-state-in-effect": {
       "count": 1
diff --git a/ui/litellm-dashboard/eslint.config.mjs b/ui/litellm-dashboard/eslint.config.mjs
index 35603123736..3cbb93f9a48 100644
--- a/ui/litellm-dashboard/eslint.config.mjs
+++ b/ui/litellm-dashboard/eslint.config.mjs
@@ -62,6 +62,10 @@ const eslintConfig = [
               message:
                 "antd is being phased out; build new UI with shadcn/ui primitives instead of adding antd imports.",
             },
+            {
+              group: ["@ant-design/icons", "@ant-design/icons/*"],
+              message: "@ant-design/icons is gone from the dashboard; use lucide-react instead.",
+            },
           ],
         },
       ],
diff --git a/ui/litellm-dashboard/package-lock.json b/ui/litellm-dashboard/package-lock.json
index 186d38234d5..154a19da7f3 100644
--- a/ui/litellm-dashboard/package-lock.json
+++ b/ui/litellm-dashboard/package-lock.json
@@ -9,7 +9,6 @@
       "version": "0.1.0",
       "dependencies": {
         "@ant-design/cssinjs": "1.24.0",
-        "@ant-design/icons": "5.6.1",
         "@anthropic-ai/sdk": "0.92.0",
         "@base-ui/react": "^1.6.0",
         "@headlessui/tailwindcss": "0.2.2",
@@ -32,9 +31,9 @@
         "openapi-fetch": "^0.17.0",
         "openapi-react-query": "^0.5.4",
         "papaparse": "5.5.3",
-        "react": "18.3.1",
+        "react": "19.2.8",
         "react-copy-to-clipboard": "5.1.1",
-        "react-dom": "18.3.1",
+        "react-dom": "19.2.8",
         "react-hook-form": "7.82.0",
         "react-json-view-lite": "2.5.0",
         "react-markdown": "9.1.0",
@@ -55,9 +54,9 @@
         "@testing-library/react": "16.3.2",
         "@testing-library/user-event": "14.6.1",
         "@types/node": "20.19.37",
-        "@types/react": "18.2.48",
+        "@types/react": "19.2.18",
         "@types/react-copy-to-clipboard": "5.0.7",
-        "@types/react-dom": "18.3.7",
+        "@types/react-dom": "19.2.4",
         "@types/react-syntax-highlighter": "15.5.13",
         "@vitest/coverage-v8": "3.2.6",
         "@vitest/ui": "3.2.6",
@@ -200,9 +199,9 @@
       }
     },
     "node_modules/@ant-design/icons-svg": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz",
-      "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.5.0.tgz",
+      "integrity": "sha512-1BTUFyKPTBZ53MuTP8s0k5SFEXL7o3VHEOwLgzaoWKwnBeqIcqUtVshc4SKzhI6uACfqhJqBwBUE9FsWR3uULA==",
       "license": "MIT"
     },
     "node_modules/@ant-design/react-slick": {
@@ -606,19 +605,6 @@
         }
       }
     },
-    "node_modules/@base-ui/react/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/@base-ui/utils": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/@base-ui/utils/-/utils-0.3.1.tgz",
@@ -1441,28 +1427,41 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
-      "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.8.0.tgz",
+      "integrity": "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.11"
+        "@floating-ui/utils": "^0.2.12"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
-      "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.8.0.tgz",
+      "integrity": "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.5",
-        "@floating-ui/utils": "^0.2.11"
+        "@floating-ui/core": "^1.8.0",
+        "@floating-ui/utils": "^0.2.12"
+      }
+    },
+    "node_modules/@floating-ui/react-dom": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.9.tgz",
+      "integrity": "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.8.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.11",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
-      "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.12.tgz",
+      "integrity": "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==",
       "license": "MIT"
     },
     "node_modules/@headlessui/tailwindcss": {
@@ -2627,9 +2626,9 @@
       "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",
-      "integrity": "sha512-n4HcR5siNUXRX23nDizbZBQPO0ZM/5oTtmKZ6/eqL0L2bo747cklFdZGRN2f+c9qWGICwDzrhW0H7tE9PptdcA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@rc-component/async-validator/-/async-validator-5.1.2.tgz",
+      "integrity": "sha512-WYbrZSjzznU1ekD0qFq2qRxt309VoS61MTG5npnFQlKYcoy9IzU8T+ZCIhq5bGAXRbXysABFWTspicMfmWFwow==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.24.4"
@@ -2669,9 +2668,9 @@
       }
     },
     "node_modules/@rc-component/mini-decimal": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rc-component/mini-decimal/-/mini-decimal-1.1.3.tgz",
-      "integrity": "sha512-bk/FJ09fLf+NLODMAFll6CfYrHPBioTedhW6lxDBuuWucJEqFUd4l/D/5JgIi3dina6sYahB8iuPAZTNz2pMxw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@rc-component/mini-decimal/-/mini-decimal-1.1.4.tgz",
+      "integrity": "sha512-xiuXcaCwyOWpD8a8scdExFl+bntNphAW8XeenL1ig2en0AAZY0Pcp4pC0dI22qJ+NvxKn9RoNIoRdqYU3BLH4w==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.0"
@@ -2717,9 +2716,9 @@
       }
     },
     "node_modules/@rc-component/qrcode": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@rc-component/qrcode/-/qrcode-1.1.1.tgz",
-      "integrity": "sha512-LfLGNymzKdUPjXUbRP+xOhIWY4jQ+YMj5MmWAcgcAq1Ij8XP7tRmAXqyuv96XvLUBE/5cA8hLFl9eO1JQMujrA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rc-component/qrcode/-/qrcode-1.1.3.tgz",
+      "integrity": "sha512-aGv6alnn4HbDEsURzKP+jv13rbi1VxmAYfBNZr5GKF1iohMNWy5tAVoJ1E3cOvzMB1kbUPvCXchM6zSFlRGPhA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.24.7"
@@ -3661,12 +3660,12 @@
       }
     },
     "node_modules/@tanstack/react-store": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-store/-/react-store-0.11.0.tgz",
-      "integrity": "sha512-tX4YXh3PDkmpvGQWkWqKpzs/MSqbtuwY9dWdWhtV9Q50PmO+jOkUKIWIX4G85dwt7lxdHLXsiaEKPdKmC8F41w==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-store/-/react-store-0.11.1.tgz",
+      "integrity": "sha512-HaIGKI3YLmjBYIvy5DFDY23oNaYZIsTZfngey07Uh5iLVJgM3bIGCnZeOFOqzjFld9JHWcaHJnasD/bKoGKwJQ==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/store": "0.11.0",
+        "@tanstack/store": "0.11.1",
         "use-sync-external-store": "^1.6.0"
       },
       "funding": {
@@ -3699,9 +3698,9 @@
       }
     },
     "node_modules/@tanstack/store": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/store/-/store-0.11.0.tgz",
-      "integrity": "sha512-WlzzCt3xi0G6pCAJu1U+2jiECwabETDpQDi3hfkFZvJii9AuZqEKbOiVarX1/bWhTNjU486yQtJCCasi/0q+Cw==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/store/-/store-0.11.1.tgz",
+      "integrity": "sha512-mzTOBhypOuDJAy/D8n2MfUZ1HFkXnmSETviRyhqEC8LUE7/IZQExOTxMANj3KjTofYTkFNpBY67qaVrT41YccA==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -3999,21 +3998,13 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.15",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
-      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
-      "license": "MIT"
-    },
     "node_modules/@types/react": {
-      "version": "18.2.48",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz",
-      "integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==",
+      "version": "19.2.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.18.tgz",
+      "integrity": "sha512-AnzbBERsrLKtk2XSfTbYRLjQPdy116Sty4q+T+Bp3IC4l6jNBvreVPAHmpq9qhXQM7CXZPjLVmGMw9sy+hxQ3w==",
       "license": "MIT",
       "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
+        "csstype": "^3.2.2"
       }
     },
     "node_modules/@types/react-copy-to-clipboard": {
@@ -4027,13 +4018,13 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.3.7",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
-      "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.4.tgz",
+      "integrity": "sha512-Bsc+QHgp+P/F02XDzNCY9jnZNCUuLki36KT7VKrTXXLdHf+vHMNZnW1rVu5DNW/rCK+fya3DATySbLM4yhtKUw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@types/react": "^18.0.0"
+        "@types/react": "^19.2.0"
       }
     },
     "node_modules/@types/react-syntax-highlighter": {
@@ -4046,12 +4037,6 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/scheduler": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.26.0.tgz",
-      "integrity": "sha512-WFHp9YUJQ6CKshqoC37iOlHnQSmxNc795UhB26CyBBttrN9svdIrUjl/NjnNmfcwtncN0h/0PPAFWv9ovP8mLA==",
-      "license": "MIT"
-    },
     "node_modules/@types/unist": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
@@ -11565,13 +11550,10 @@
       }
     },
     "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.8.tgz",
+      "integrity": "sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==",
       "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11590,16 +11572,15 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.8.tgz",
+      "integrity": "sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ==",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^19.2.8"
       }
     },
     "node_modules/react-hook-form": {
@@ -12204,13 +12185,10 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "license": "MIT"
     },
     "node_modules/scroll-into-view-if-needed": {
       "version": "3.1.0",
diff --git a/ui/litellm-dashboard/package.json b/ui/litellm-dashboard/package.json
index ac13a12620d..3f9c29d2afe 100644
--- a/ui/litellm-dashboard/package.json
+++ b/ui/litellm-dashboard/package.json
@@ -25,7 +25,6 @@
   },
   "dependencies": {
     "@ant-design/cssinjs": "1.24.0",
-    "@ant-design/icons": "5.6.1",
     "@anthropic-ai/sdk": "0.92.0",
     "@base-ui/react": "^1.6.0",
     "@headlessui/tailwindcss": "0.2.2",
@@ -48,9 +47,9 @@
     "openapi-fetch": "^0.17.0",
     "openapi-react-query": "^0.5.4",
     "papaparse": "5.5.3",
-    "react": "18.3.1",
+    "react": "19.2.8",
     "react-copy-to-clipboard": "5.1.1",
-    "react-dom": "18.3.1",
+    "react-dom": "19.2.8",
     "react-hook-form": "7.82.0",
     "react-json-view-lite": "2.5.0",
     "react-markdown": "9.1.0",
@@ -71,9 +70,9 @@
     "@testing-library/react": "16.3.2",
     "@testing-library/user-event": "14.6.1",
     "@types/node": "20.19.37",
-    "@types/react": "18.2.48",
+    "@types/react": "19.2.18",
     "@types/react-copy-to-clipboard": "5.0.7",
-    "@types/react-dom": "18.3.7",
+    "@types/react-dom": "19.2.4",
     "@types/react-syntax-highlighter": "15.5.13",
     "@vitest/coverage-v8": "3.2.6",
     "@vitest/ui": "3.2.6",
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx
index 6514c7072bb..7370b3bc195 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsModal/AccessGroupEditModal.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import React, { useState } from "react";
-import { Modal } from "antd";
 
 import { toast } from "@/lib/toast";
 import { useZodForm } from "@/lib/forms/useZodForm";
@@ -18,6 +17,7 @@ import {
   MODELS_TAB,
   type AccessGroupFormValues,
 } from "./AccessGroupBaseForm";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AccessGroupEditModalProps {
   visible: boolean;
@@ -87,13 +87,18 @@ function AccessGroupEditForm({ accessGroup, onCancel, onSuccess }: Omit<AccessGr
 
 export function AccessGroupEditModal({ visible, accessGroup, onCancel, onSuccess }: AccessGroupEditModalProps) {
   return (
-    <Modal title="Edit Access Group" open={visible} onCancel={onCancel} width={700} footer={null} destroyOnHidden>
-      <AccessGroupEditForm
-        key={accessGroup.access_group_id}
-        accessGroup={accessGroup}
-        onCancel={onCancel}
-        onSuccess={onSuccess}
-      />
-    </Modal>
+    <Dialog open={visible} onOpenChange={(open) => !open && onCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
+        <DialogHeader>
+          <DialogTitle>Edit Access Group</DialogTitle>
+        </DialogHeader>
+        <AccessGroupEditForm
+          key={accessGroup.access_group_id}
+          accessGroup={accessGroup}
+          onCancel={onCancel}
+          onSuccess={onSuccess}
+        />
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx
index 8f51177bafe..4fc51910161 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/access-groups/_components/AccessGroupsPage.tsx
@@ -3,7 +3,7 @@ import { useDeleteAccessGroup } from "@/app/(dashboard)/hooks/accessGroups/useDe
 import { Plus, SearchIcon, X } from "lucide-react";
 import { useMemo, useState } from "react";
 import DeleteResourceModal from "@/components/common_components/DeleteResourceModal";
-import { PageHeader } from "@/components/shared/PageHeader";
+import { LegacyPageHeader } from "@/components/shared/LegacyPageHeader";
 import { Button } from "@/components/ui/button";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
 import { AccessGroupDetail } from "./AccessGroupsDetailsPage";
@@ -61,7 +61,7 @@ export function AccessGroupsPage() {
   return (
     <div className="p-6 px-12">
       <div className="mb-4">
-        <PageHeader
+        <LegacyPageHeader
           title="Access Groups"
           subtitle="Manage resource permissions for your organization"
           actions={
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx
index 48eaa62e37b..903676d238a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/admin-panel/_components/AdminPanel.tsx
@@ -7,8 +7,8 @@ import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
-import { Alert as AntdAlert, Modal, Space, Tabs, Typography } from "antd";
-import { Info } from "lucide-react";
+import { Space, Tabs, Typography } from "antd";
+import { Info, TriangleAlert } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import NewBadge from "@/components/common_components/NewBadge";
 import { useBaseUrl } from "@/components/constants";
@@ -33,6 +33,7 @@ import { FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Input } from "@/components/ui/input";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const { Title, Paragraph, Text } = Typography;
 
@@ -223,12 +224,14 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
         <>
           <Card className="block p-6">
             <Title level={4}> ✨ Security Settings</Title>
-            <AntdAlert
-              message="SSO Configuration Deprecated"
-              description="Editing SSO Settings on this page is deprecated and will be removed in a future version. Please use the SSO Settings tab for SSO configuration."
-              type="warning"
-              showIcon
-            />
+            <Alert variant="warning">
+              <TriangleAlert />
+              <AlertTitle>SSO Configuration Deprecated</AlertTitle>
+              <AlertDescription>
+                Editing SSO Settings on this page is deprecated and will be removed in a future version. Please use the
+                SSO Settings tab for SSO configuration.
+              </AlertDescription>
+            </Alert>
             <div
               style={{
                 display: "flex",
@@ -276,87 +279,84 @@ const AdminPanel: React.FC<AdminPanelProps> = ({ proxySettings }) => {
               accessToken={accessToken}
               ssoConfigured={ssoConfigured}
             />
-            <Modal
-              title="Manage Allowed IP Addresses"
-              width={800}
-              open={isAllowedIPModalVisible}
-              onCancel={() => setIsAllowedIPModalVisible(false)}
-              footer={[
-                <Button className="mx-1" key="add" onClick={() => setIsAddIPModalVisible(true)}>
-                  Add IP Address
-                </Button>,
-                <Button key="close" onClick={() => setIsAllowedIPModalVisible(false)}>
-                  Close
-                </Button>,
-              ]}
-            >
-              <Table>
-                <TableHeader>
-                  <TableRow>
-                    <TableHead>IP Address</TableHead>
-                    <TableHead className="text-right">Action</TableHead>
-                  </TableRow>
-                </TableHeader>
-                <TableBody>
-                  {allowedIPs.map((ip, index) => (
-                    <TableRow key={index}>
-                      <TableCell>{ip}</TableCell>
-                      <TableCell className="text-right">
-                        {ip !== all_ip_address_allowed && (
-                          <Button onClick={() => handleDeleteIP(ip)} variant="destructive" size="sm">
-                            Delete
-                          </Button>
-                        )}
-                      </TableCell>
+            <Dialog open={isAllowedIPModalVisible} onOpenChange={(open) => !open && setIsAllowedIPModalVisible(false)}>
+              <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+                <DialogHeader>
+                  <DialogTitle>Manage Allowed IP Addresses</DialogTitle>
+                </DialogHeader>
+                <Table>
+                  <TableHeader>
+                    <TableRow>
+                      <TableHead>IP Address</TableHead>
+                      <TableHead className="text-right">Action</TableHead>
                     </TableRow>
-                  ))}
-                </TableBody>
-              </Table>
-            </Modal>
+                  </TableHeader>
+                  <TableBody>
+                    {allowedIPs.map((ip, index) => (
+                      <TableRow key={index}>
+                        <TableCell>{ip}</TableCell>
+                        <TableCell className="text-right">
+                          {ip !== all_ip_address_allowed && (
+                            <Button onClick={() => handleDeleteIP(ip)} variant="destructive" size="sm">
+                              Delete
+                            </Button>
+                          )}
+                        </TableCell>
+                      </TableRow>
+                    ))}
+                  </TableBody>
+                </Table>
+                <DialogFooter>
+                  <Button className="mx-1" onClick={() => setIsAddIPModalVisible(true)}>
+                    Add IP Address
+                  </Button>
+                  <Button onClick={() => setIsAllowedIPModalVisible(false)}>Close</Button>
+                </DialogFooter>
+              </DialogContent>
+            </Dialog>
 
-            <Modal
-              title="Add Allowed IP Address"
-              open={isAddIPModalVisible}
-              onCancel={() => setIsAddIPModalVisible(false)}
-              footer={null}
-            >
-              <AddAllowedIPForm onSubmit={handleAddIP} />
-            </Modal>
+            <Dialog open={isAddIPModalVisible} onOpenChange={(open) => !open && setIsAddIPModalVisible(false)}>
+              <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+                <DialogHeader>
+                  <DialogTitle>Add Allowed IP Address</DialogTitle>
+                </DialogHeader>
+                <AddAllowedIPForm onSubmit={handleAddIP} />
+              </DialogContent>
+            </Dialog>
 
-            <Modal
-              title="Confirm Delete"
-              open={isDeleteIPModalVisible}
-              onCancel={() => setIsDeleteIPModalVisible(false)}
-              onOk={confirmDeleteIP}
-              footer={[
-                <Button className="mx-1" key="delete" onClick={() => confirmDeleteIP()}>
-                  Yes
-                </Button>,
-                <Button key="close" onClick={() => setIsDeleteIPModalVisible(false)}>
-                  Close
-                </Button>,
-              ]}
-            >
-              <Text>Are you sure you want to delete the IP address: {ipToDelete}?</Text>
-            </Modal>
+            <Dialog open={isDeleteIPModalVisible} onOpenChange={(open) => !open && setIsDeleteIPModalVisible(false)}>
+              <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+                <DialogHeader>
+                  <DialogTitle>Confirm Delete</DialogTitle>
+                </DialogHeader>
+                <Text>Are you sure you want to delete the IP address: {ipToDelete}?</Text>
+                <DialogFooter>
+                  <Button className="mx-1" onClick={() => confirmDeleteIP()}>
+                    Yes
+                  </Button>
+                  <Button onClick={() => setIsDeleteIPModalVisible(false)}>Close</Button>
+                </DialogFooter>
+              </DialogContent>
+            </Dialog>
 
             {/* UI Access Control Modal */}
-            <Modal
-              title="UI Access Control Settings"
+            <Dialog
               open={isUIAccessControlModalVisible}
-              width={600}
-              footer={null}
-              onOk={handleUIAccessControlOk}
-              onCancel={handleUIAccessControlCancel}
+              onOpenChange={(open) => !open && handleUIAccessControlCancel()}
             >
-              <UIAccessControlForm
-                accessToken={accessToken}
-                onSuccess={() => {
-                  handleUIAccessControlOk();
-                  toast.success("UI Access Control settings updated successfully");
-                }}
-              />
-            </Modal>
+              <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
+                <DialogHeader>
+                  <DialogTitle>UI Access Control Settings</DialogTitle>
+                </DialogHeader>
+                <UIAccessControlForm
+                  accessToken={accessToken}
+                  onSuccess={() => {
+                    handleUIAccessControlOk();
+                    toast.success("UI Access Control settings updated successfully");
+                  }}
+                />
+              </DialogContent>
+            </Dialog>
           </div>
           <Alert variant="info">
             <Info />
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx
index 5e828537475..09737c3151b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/add_agent_form.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from "react";
-import { Modal, Select, Steps, Tag } from "antd";
+import { Select, Steps, Tag } from "antd";
 import { FormProvider, useForm, useWatch } from "react-hook-form";
 import { toast } from "@/lib/toast";
 import { Logo } from "@/components/molecules/logo/Logo";
-import { CheckCircleFilled, KeyOutlined, RobotOutlined, AppstoreOutlined } from "@ant-design/icons";
+import { Bot, CircleCheck, Key, LayoutGrid } from "lucide-react";
 import CreatedKeyDisplay from "@/components/shared/CreatedKeyDisplay";
 import { Button } from "@/components/ui/button";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
@@ -49,6 +49,7 @@ import {
 import MCPServerSelector from "@/components/mcp_server_management/MCPServerSelector";
 import MCPToolPermissions from "@/components/mcp_server_management/MCPToolPermissions";
 import GuardrailSelector from "@/components/guardrails/GuardrailSelector";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const { Step } = Steps;
 
@@ -706,7 +707,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
                   }`}
                   onClick={() => handleAgentTypeChange(CUSTOM_AGENT_TYPE)}
                 >
-                  <AppstoreOutlined className="text-lg text-amber-600 dark:text-amber-400" />
+                  <LayoutGrid className="size-4.5 text-amber-600 dark:text-amber-400" />
                   <div className="flex-1">
                     <div className="flex items-center gap-2">
                       <span className="font-medium text-amber-700 dark:text-amber-400">Custom / Other</span>
@@ -845,7 +846,8 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
       <div>
         {/* Agent name chip */}
         <div className="mb-6 flex justify-center">
-          <Tag icon={<RobotOutlined />} color="purple" className="px-3 py-1 text-sm">
+          <Tag color="purple" className="inline-flex items-center gap-1.5 px-3 py-1 text-sm">
+            <Bot className="size-3.5" />
             {agentName}
           </Tag>
         </div>
@@ -883,7 +885,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
                 <RadioGroupItem value="create_new" aria-label="Create a new key for this agent" />
                 <div className="flex-1">
                   <div className="flex items-center gap-2">
-                    <KeyOutlined className="text-indigo-600 dark:text-indigo-400" />
+                    <Key className="size-4 text-indigo-600 dark:text-indigo-400" />
                     <span className="font-medium text-foreground">Create a new key for this agent</span>
                   </div>
                   <p className="mt-1 text-sm text-muted-foreground">A dedicated key scoped to this agent.</p>
@@ -919,7 +921,7 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
               <RadioGroupItem value="existing_key" aria-label="Assign an existing key" />
               <div className="flex-1">
                 <div className="flex items-center gap-2">
-                  <KeyOutlined className="text-muted-foreground" />
+                  <Key className="size-4 text-muted-foreground" />
                   <span className="font-medium text-foreground">Assign an existing key</span>
                 </div>
                 <p className="mt-1 text-sm text-muted-foreground">Re-assign a key you already have to this agent.</p>
@@ -957,10 +959,11 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
 
   const renderReadyStep = () => (
     <div className="py-6 text-center">
-      <CheckCircleFilled className="mb-4 text-5xl text-green-500" style={{ fontSize: 48 }} />
+      <CircleCheck className="mb-4 size-12 text-green-500" />
       <h3 className="mb-2 text-xl font-semibold text-foreground">Agent Created!</h3>
       <div className="mb-4 flex justify-center">
-        <Tag icon={<RobotOutlined />} color="purple" className="px-3 py-1 text-sm">
+        <Tag color="purple" className="inline-flex items-center gap-1.5 px-3 py-1 text-sm">
+          <Bot className="size-3.5" />
           {createdAgentName}
         </Tag>
       </div>
@@ -983,72 +986,64 @@ const AddAgentForm: React.FC<AddAgentFormProps> = ({ visible, onClose, accessTok
   );
 
   return (
-    <Modal
-      title={
-        <div className="flex items-center space-x-3 border-b border-border pb-4">
-          {selectedLogo && currentStep < 1 && (
-            <Logo src={selectedLogo} label="Agent" className="h-6 w-6 object-contain" />
-          )}
-          <h2 className="text-xl font-semibold text-foreground">Add New Agent</h2>
-        </div>
-      }
-      open={visible}
-      onCancel={handleClose}
-      footer={null}
-      width={900}
-      className="top-8"
-      styles={{
-        body: { padding: "24px" },
-        header: { padding: "24px 24px 0 24px", border: "none" },
-      }}
-    >
-      <TooltipProvider>
-        <div className="mt-4">
-          <Steps current={currentStep} size="small" className="mb-8">
-            <Step title="Configure" />
-            <Step title="Entitlements" />
-            <Step title="Governance" />
-            <Step title="Agent Management" />
-            <Step title="Ready" />
-          </Steps>
+    <Dialog open={visible} onOpenChange={(open) => !open && handleClose()}>
+      <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[900px]">
+        <DialogHeader>
+          <div className="flex items-center space-x-3 border-b border-border pb-4">
+            {selectedLogo && currentStep < 1 && (
+              <Logo src={selectedLogo} label="Agent" className="h-6 w-6 object-contain" />
+            )}
+            <DialogTitle className="text-xl font-semibold text-foreground">Add New Agent</DialogTitle>
+          </div>
+        </DialogHeader>
+        <TooltipProvider>
+          <div className="mt-4">
+            <Steps current={currentStep} size="small" className="mb-8">
+              <Step title="Configure" />
+              <Step title="Entitlements" />
+              <Step title="Governance" />
+              <Step title="Agent Management" />
+              <Step title="Ready" />
+            </Steps>
 
-          <FormProvider {...form}>
-            <form onSubmit={(event) => event.preventDefault()} className="space-y-4">
-              {currentStep === 0 && renderConfigureStep()}
-              {currentStep === 1 && renderEntitlementsStep()}
-              {currentStep === 2 && renderObservabilityStep()}
-              {currentStep === 3 && renderAssignKeyStep()}
-              {currentStep === 4 && renderReadyStep()}
-            </form>
-          </FormProvider>
+            <FormProvider {...form}>
+              <form onSubmit={(event) => event.preventDefault()} className="space-y-4">
+                {currentStep === 0 && renderConfigureStep()}
+                {currentStep === 1 && renderEntitlementsStep()}
+                {currentStep === 2 && renderObservabilityStep()}
+                {currentStep === 3 && renderAssignKeyStep()}
+                {currentStep === 4 && renderReadyStep()}
+              </form>
+            </FormProvider>
 
-          <div className="mt-6 flex items-center justify-between border-t border-border pt-6">
-            <div>
-              {currentStep > 0 && currentStep < 4 && (
-                <Button type="button" variant="outline" onClick={handleBack}>
-                  ← Back
-                </Button>
-              )}
-            </div>
-            <div className="flex gap-3">
-              {currentStep < 4 && (
-                <Button variant="secondary" onClick={handleClose}>
-                  Cancel
-                </Button>
-              )}
-              {currentStep < 3 && <Button onClick={handleNext}>Next →</Button>}
-              {currentStep === 3 && (
-                <Button disabled={isSubmitting} aria-busy={isSubmitting} onClick={handleCreateAgent}>
-                  {isSubmitting && <UiLoadingSpinner className="size-4" />}
-                  {isSubmitting ? "Creating..." : "Create Agent →"}
-                </Button>
-              )}
-              {currentStep === 4 && <Button onClick={handleClose}>Done</Button>}
+            <div className="mt-6 flex items-center justify-between border-t border-border pt-6">
+              <div>
+                {currentStep > 0 && currentStep < 4 && (
+                  <Button type="button" variant="outline" onClick={handleBack}>
+                    ← Back
+                  </Button>
+                )}
+              </div>
+              <div className="flex gap-3">
+                {currentStep < 4 && (
+                  <Button variant="secondary" onClick={handleClose}>
+                    Cancel
+                  </Button>
+                )}
+                {currentStep < 3 && <Button onClick={handleNext}>Next →</Button>}
+                {currentStep === 3 && (
+                  <Button disabled={isSubmitting} aria-busy={isSubmitting} onClick={handleCreateAgent}>
+                    {isSubmitting && <UiLoadingSpinner className="size-4" />}
+                    {isSubmitting ? "Creating..." : "Create Agent →"}
+                  </Button>
+                )}
+                {currentStep === 4 && <Button onClick={handleClose}>Done</Button>}
+              </div>
             </div>
           </div>
-        </div>
-      </TooltipProvider>
-    </Modal>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx
index d37065317c2..c507d56a63b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/agents/_components/agent_info.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useMemo } from "react";
-import { Spin, Descriptions } from "antd";
+import { cx } from "@/lib/cva.config";
 import { FormProvider, useForm, useWatch } from "react-hook-form";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
@@ -40,6 +40,26 @@ interface AgentInfoViewProps {
   isAdmin: boolean;
 }
 
+const DetailList: React.FC<{ children: React.ReactNode; className?: string }> = ({ children, className }) => (
+  <dl
+    className={cx(
+      "grid grid-cols-[minmax(0,14rem)_minmax(0,1fr)] overflow-hidden rounded-lg border border-border text-sm",
+      className,
+    )}
+  >
+    {children}
+  </dl>
+);
+
+const DetailItem: React.FC<{ label: React.ReactNode; children: React.ReactNode }> = ({ label, children }) => (
+  <>
+    <dt className="border-b border-border bg-muted px-4 py-3 font-medium text-foreground last-of-type:border-b-0">
+      {label}
+    </dt>
+    <dd className="border-b border-border px-4 py-3 break-words text-foreground last-of-type:border-b-0">{children}</dd>
+  </>
+);
+
 const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessToken, isAdmin }) => {
   const [agent, setAgent] = useState<Agent | null>(null);
   const [selectedKey, setSelectedKey] = useState<KeyResponse | null>(null);
@@ -195,7 +215,7 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
     return (
       <div className="p-4">
         <div className="flex justify-center items-center h-64">
-          <Spin size="large" />
+          <UiLoadingSpinner className="size-8 text-primary" />
         </div>
       </div>
     );
@@ -276,51 +296,41 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
         <div>
           {/* Overview Panel */}
           <TabsContent value="overview" keepMounted>
-            <Descriptions bordered column={1}>
-              <Descriptions.Item label="Agent ID">{agent.agent_id}</Descriptions.Item>
-              <Descriptions.Item label="Agent Name">{agent.agent_name}</Descriptions.Item>
-              <Descriptions.Item label="Display Name">{agent.agent_card_params?.name || "-"}</Descriptions.Item>
-              <Descriptions.Item label="Description">{agent.agent_card_params?.description || "-"}</Descriptions.Item>
-              <Descriptions.Item label="URL">{agent.agent_card_params?.url || "-"}</Descriptions.Item>
-              <Descriptions.Item label="Version">{agent.agent_card_params?.version || "-"}</Descriptions.Item>
-              <Descriptions.Item label="Protocol Version">
-                {agent.agent_card_params?.protocolVersion || "-"}
-              </Descriptions.Item>
-              <Descriptions.Item label="Streaming">
+            <DetailList>
+              <DetailItem label="Agent ID">{agent.agent_id}</DetailItem>
+              <DetailItem label="Agent Name">{agent.agent_name}</DetailItem>
+              <DetailItem label="Display Name">{agent.agent_card_params?.name || "-"}</DetailItem>
+              <DetailItem label="Description">{agent.agent_card_params?.description || "-"}</DetailItem>
+              <DetailItem label="URL">{agent.agent_card_params?.url || "-"}</DetailItem>
+              <DetailItem label="Version">{agent.agent_card_params?.version || "-"}</DetailItem>
+              <DetailItem label="Protocol Version">{agent.agent_card_params?.protocolVersion || "-"}</DetailItem>
+              <DetailItem label="Streaming">
                 {agent.agent_card_params?.capabilities?.streaming ? "Yes" : "No"}
-              </Descriptions.Item>
+              </DetailItem>
               {agent.agent_card_params?.capabilities?.pushNotifications && (
-                <Descriptions.Item label="Push Notifications">Yes</Descriptions.Item>
+                <DetailItem label="Push Notifications">Yes</DetailItem>
               )}
               {agent.agent_card_params?.capabilities?.stateTransitionHistory && (
-                <Descriptions.Item label="State Transition History">Yes</Descriptions.Item>
-              )}
-              <Descriptions.Item label="Skills">
-                {agent.agent_card_params?.skills?.length || 0} configured
-              </Descriptions.Item>
-              {agent.litellm_params?.model && (
-                <Descriptions.Item label="Model">{agent.litellm_params.model}</Descriptions.Item>
+                <DetailItem label="State Transition History">Yes</DetailItem>
               )}
+              <DetailItem label="Skills">{agent.agent_card_params?.skills?.length || 0} configured</DetailItem>
+              {agent.litellm_params?.model && <DetailItem label="Model">{agent.litellm_params.model}</DetailItem>}
               {agent.litellm_params?.make_public !== undefined && (
-                <Descriptions.Item label="Make Public">
-                  {agent.litellm_params.make_public ? "Yes" : "No"}
-                </Descriptions.Item>
+                <DetailItem label="Make Public">{agent.litellm_params.make_public ? "Yes" : "No"}</DetailItem>
               )}
               {agent.agent_card_params?.iconUrl && (
-                <Descriptions.Item label="Icon URL">{agent.agent_card_params.iconUrl}</Descriptions.Item>
+                <DetailItem label="Icon URL">{agent.agent_card_params.iconUrl}</DetailItem>
               )}
               {agent.agent_card_params?.documentationUrl && (
-                <Descriptions.Item label="Documentation URL">
-                  {agent.agent_card_params.documentationUrl}
-                </Descriptions.Item>
+                <DetailItem label="Documentation URL">{agent.agent_card_params.documentationUrl}</DetailItem>
               )}
-              <Descriptions.Item label="TPM Limit">{agent.tpm_limit ?? "Unlimited"}</Descriptions.Item>
-              <Descriptions.Item label="RPM Limit">{agent.rpm_limit ?? "Unlimited"}</Descriptions.Item>
-              <Descriptions.Item label="Session TPM Limit">{agent.session_tpm_limit ?? "Unlimited"}</Descriptions.Item>
-              <Descriptions.Item label="Session RPM Limit">{agent.session_rpm_limit ?? "Unlimited"}</Descriptions.Item>
-              <Descriptions.Item label="Created At">{formatDate(agent.created_at)}</Descriptions.Item>
-              <Descriptions.Item label="Updated At">{formatDate(agent.updated_at)}</Descriptions.Item>
-            </Descriptions>
+              <DetailItem label="TPM Limit">{agent.tpm_limit ?? "Unlimited"}</DetailItem>
+              <DetailItem label="RPM Limit">{agent.rpm_limit ?? "Unlimited"}</DetailItem>
+              <DetailItem label="Session TPM Limit">{agent.session_tpm_limit ?? "Unlimited"}</DetailItem>
+              <DetailItem label="Session RPM Limit">{agent.session_rpm_limit ?? "Unlimited"}</DetailItem>
+              <DetailItem label="Created At">{formatDate(agent.created_at)}</DetailItem>
+              <DetailItem label="Updated At">{formatDate(agent.updated_at)}</DetailItem>
+            </DetailList>
 
             <AgentVirtualKeys keys={agentKeys} isLoading={keysLoading} onKeyClick={setSelectedKey} />
 
@@ -331,21 +341,19 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                   Object.keys(agent.object_permission.mcp_tool_permissions).length > 0)) && (
                 <div style={{ marginTop: 24 }}>
                   <h3 className="text-lg font-medium">MCP Tool Permissions</h3>
-                  <Descriptions bordered column={1} style={{ marginTop: 16 }}>
+                  <DetailList className="mt-4">
                     {agent.object_permission.mcp_servers && agent.object_permission.mcp_servers.length > 0 && (
-                      <Descriptions.Item label="MCP Servers">
-                        {agent.object_permission.mcp_servers.join(", ")}
-                      </Descriptions.Item>
+                      <DetailItem label="MCP Servers">{agent.object_permission.mcp_servers.join(", ")}</DetailItem>
                     )}
                     {agent.object_permission.mcp_access_groups &&
                       agent.object_permission.mcp_access_groups.length > 0 && (
-                        <Descriptions.Item label="MCP Access Groups">
+                        <DetailItem label="MCP Access Groups">
                           {agent.object_permission.mcp_access_groups.join(", ")}
-                        </Descriptions.Item>
+                        </DetailItem>
                       )}
                     {agent.object_permission.mcp_tool_permissions &&
                       Object.keys(agent.object_permission.mcp_tool_permissions).length > 0 && (
-                        <Descriptions.Item label="Tool permissions per server">
+                        <DetailItem label="Tool permissions per server">
                           <div className="space-y-1">
                             {Object.entries(agent.object_permission.mcp_tool_permissions).map(([serverId, tools]) => (
                               <div key={serverId}>
@@ -354,9 +362,9 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                               </div>
                             ))}
                           </div>
-                        </Descriptions.Item>
+                        </DetailItem>
                       )}
-                  </Descriptions>
+                  </DetailList>
                 </div>
               )}
 
@@ -365,9 +373,9 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
             {agent.agent_card_params?.skills && agent.agent_card_params.skills.length > 0 && (
               <div style={{ marginTop: 24 }}>
                 <h3 className="text-lg font-medium">Skills</h3>
-                <Descriptions bordered column={1} style={{ marginTop: 16 }}>
+                <DetailList className="mt-4">
                   {agent.agent_card_params.skills.map((skill: any, index: number) => (
-                    <Descriptions.Item label={skill.name || `Skill ${index + 1}`} key={index}>
+                    <DetailItem label={skill.name || `Skill ${index + 1}`} key={index}>
                       <div>
                         <div>
                           <strong>ID:</strong> {skill.id}
@@ -385,9 +393,9 @@ const AgentInfoView: React.FC<AgentInfoViewProps> = ({ agentId, onClose, accessT
                           </div>
                         )}
                       </div>
-                    </Descriptions.Item>
+                    </DetailItem>
                   ))}
-                </Descriptions>
+                </DetailList>
               </div>
             )}
           </TabsContent>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_modal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_modal.tsx
index fd657376066..5761d7308cd 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_modal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_modal.tsx
@@ -1,6 +1,5 @@
 import { ChevronRight } from "lucide-react";
 import React from "react";
-import { Modal } from "antd";
 import { z } from "zod/v4";
 import { useCreateBudget } from "@/app/(dashboard)/hooks/budgets/useBudgets";
 import { applyBudgetPrecision } from "./budgetPrecision";
@@ -12,6 +11,7 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/component
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const budgetShape = {
   budget_id: z.string().min(1, "Please input a human-friendly name for the budget"),
@@ -40,11 +40,6 @@ const BudgetModal: React.FC<BudgetModalProps> = ({ isModalVisible, setIsModalVis
   const form = useZodForm(budgetSchema, { defaultValues: { budget_id: "" } });
   const createBudget = useCreateBudget();
 
-  const handleOk = () => {
-    setIsModalVisible(false);
-    form.reset();
-  };
-
   const handleCancel = () => {
     setIsModalVisible(false);
     form.reset();
@@ -68,102 +63,100 @@ const BudgetModal: React.FC<BudgetModalProps> = ({ isModalVisible, setIsModalVis
   };
 
   return (
-    <Modal
-      title="Create Budget"
-      open={isModalVisible}
-      width={800}
-      footer={null}
-      onOk={handleOk}
-      onCancel={handleCancel}
-    >
-      <form onSubmit={form.handleSubmit(handleCreate)} noValidate>
-        <FieldGroup>
-          <FormField
-            control={form.control}
-            name="budget_id"
-            label="Budget ID"
-            description="A human-friendly name for the budget"
-          >
-            {({ ref, ...field }) => <Input {...field} ref={ref} value={field.value ?? ""} placeholder="" />}
-          </FormField>
-          <FormField
-            control={form.control}
-            name="tpm_limit"
-            label="Max Tokens per minute"
-            description="Default is model limit."
-          >
-            {({ ref, value, onChange, ...field }) => (
-              <Input
-                {...field}
-                ref={ref}
-                type="number"
-                step={1}
-                value={value ?? ""}
-                onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-              />
-            )}
-          </FormField>
-          <FormField
-            control={form.control}
-            name="rpm_limit"
-            label="Max Requests per minute"
-            description="Default is model limit."
-          >
-            {({ ref, value, onChange, ...field }) => (
-              <Input
-                {...field}
-                ref={ref}
-                type="number"
-                step={1}
-                value={value ?? ""}
-                onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-              />
-            )}
-          </FormField>
+    <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>Create Budget</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={form.handleSubmit(handleCreate)} noValidate>
+          <FieldGroup>
+            <FormField
+              control={form.control}
+              name="budget_id"
+              label="Budget ID"
+              description="A human-friendly name for the budget"
+            >
+              {({ ref, ...field }) => <Input {...field} ref={ref} value={field.value ?? ""} placeholder="" />}
+            </FormField>
+            <FormField
+              control={form.control}
+              name="tpm_limit"
+              label="Max Tokens per minute"
+              description="Default is model limit."
+            >
+              {({ ref, value, onChange, ...field }) => (
+                <Input
+                  {...field}
+                  ref={ref}
+                  type="number"
+                  step={1}
+                  value={value ?? ""}
+                  onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                />
+              )}
+            </FormField>
+            <FormField
+              control={form.control}
+              name="rpm_limit"
+              label="Max Requests per minute"
+              description="Default is model limit."
+            >
+              {({ ref, value, onChange, ...field }) => (
+                <Input
+                  {...field}
+                  ref={ref}
+                  type="number"
+                  step={1}
+                  value={value ?? ""}
+                  onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                />
+              )}
+            </FormField>
 
-          <Collapsible open={optionalSettingsOpen} onOpenChange={setOptionalSettingsOpen} className="mt-20 mb-8">
-            <CollapsibleTrigger className="group flex w-full items-center justify-between py-2 text-left">
-              <b>Optional Settings</b>
-              <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
-            </CollapsibleTrigger>
-            <CollapsibleContent>
-              <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
-                {({ ref, value, onChange, ...field }) => (
-                  <Input
-                    {...field}
-                    ref={ref}
-                    type="number"
-                    step={0.01}
-                    value={value ?? ""}
-                    onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-                  />
-                )}
-              </FormField>
-              <FormField className="mt-8" control={form.control} name="budget_duration" label="Reset Budget">
-                {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                  <Select items={BUDGET_DURATION_OPTIONS} value={value ?? null} onValueChange={onChange}>
-                    <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
-                      <SelectValue placeholder="n/a" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {BUDGET_DURATION_OPTIONS.map((option) => (
-                        <SelectItem key={option.value} value={option.value}>
-                          {option.label}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                )}
-              </FormField>
-            </CollapsibleContent>
-          </Collapsible>
-        </FieldGroup>
+            <Collapsible open={optionalSettingsOpen} onOpenChange={setOptionalSettingsOpen} className="mt-20 mb-8">
+              <CollapsibleTrigger className="group flex w-full items-center justify-between py-2 text-left">
+                <b>Optional Settings</b>
+                <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
+              </CollapsibleTrigger>
+              <CollapsibleContent>
+                <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
+                  {({ ref, value, onChange, ...field }) => (
+                    <Input
+                      {...field}
+                      ref={ref}
+                      type="number"
+                      step={0.01}
+                      value={value ?? ""}
+                      onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                    />
+                  )}
+                </FormField>
+                <FormField className="mt-8" control={form.control} name="budget_duration" label="Reset Budget">
+                  {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                    <Select items={BUDGET_DURATION_OPTIONS} value={value ?? null} onValueChange={onChange}>
+                      <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
+                        <SelectValue placeholder="n/a" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {BUDGET_DURATION_OPTIONS.map((option) => (
+                          <SelectItem key={option.value} value={option.value}>
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  )}
+                </FormField>
+              </CollapsibleContent>
+            </Collapsible>
+          </FieldGroup>
 
-        <div style={{ textAlign: "right", marginTop: "10px" }}>
-          <Button type="submit">Create Budget</Button>
-        </div>
-      </form>
-    </Modal>
+          <div style={{ textAlign: "right", marginTop: "10px" }}>
+            <Button type="submit">Create Budget</Button>
+          </div>
+        </form>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_panel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_panel.tsx
index 9aeedb29ecc..ad0f04f77aa 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_panel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/budget_panel.tsx
@@ -6,7 +6,7 @@
 import { Plus, Wallet } from "lucide-react";
 import React, { useCallback, useState } from "react";
 import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
-import { PageHeader } from "@/components/shared/PageHeader";
+import { LegacyPageHeader } from "@/components/shared/LegacyPageHeader";
 import { ToolbarSeparator } from "@/components/shared/ToolbarSeparator";
 import { Button } from "@/components/ui/button";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -76,7 +76,7 @@ const BudgetPanel: React.FC<BudgetSettingsPageProps> = ({ accessToken }) => {
 
   return (
     <div className="flex h-full flex-col gap-4 p-6 px-12">
-      <PageHeader
+      <LegacyPageHeader
         icon={<Wallet className="size-5" />}
         title="Budgets"
         subtitle="Spend, TPM and RPM limits you can assign to customers."
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/edit_budget_modal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/edit_budget_modal.tsx
index 7ebab06cba6..3f9de881710 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/edit_budget_modal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/budgets/_components/edit_budget_modal.tsx
@@ -1,6 +1,5 @@
 import { ChevronRight } from "lucide-react";
 import React, { useEffect } from "react";
-import { Modal } from "antd";
 import { useForm } from "react-hook-form";
 import { useUpdateBudget } from "@/app/(dashboard)/hooks/budgets/useBudgets";
 import { budgetItem } from "@/app/(dashboard)/hooks/budgets/useBudgets";
@@ -12,6 +11,7 @@ import { Button } from "@/components/ui/button";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 type EditBudgetFormValues = Pick<
   budgetItem,
@@ -46,11 +46,6 @@ const EditBudgetModal: React.FC<EditBudgetModalProps> = ({ isModalVisible, setIs
     form.reset(toFormValues(existingBudget));
   }, [existingBudget, form]);
 
-  const handleOk = () => {
-    setIsModalVisible(false);
-    form.reset();
-  };
-
   const handleCancel = () => {
     setIsModalVisible(false);
     form.reset();
@@ -74,95 +69,100 @@ const EditBudgetModal: React.FC<EditBudgetModalProps> = ({ isModalVisible, setIs
   };
 
   return (
-    <Modal title="Edit Budget" open={isModalVisible} width={800} footer={null} onOk={handleOk} onCancel={handleCancel}>
-      <form onSubmit={form.handleSubmit(handleUpdate)} noValidate>
-        <FieldGroup>
-          <FormField
-            control={form.control}
-            name="budget_id"
-            label="Budget ID"
-            description="Budget ID cannot be changed after creation"
-          >
-            {({ ref, ...field }) => <Input {...field} ref={ref} value={field.value ?? ""} disabled />}
-          </FormField>
-          <FormField
-            control={form.control}
-            name="tpm_limit"
-            label="Max Tokens per minute"
-            description="Default is model limit."
-          >
-            {({ ref, value, onChange, ...field }) => (
-              <Input
-                {...field}
-                ref={ref}
-                type="number"
-                step={1}
-                value={value ?? ""}
-                onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-              />
-            )}
-          </FormField>
-          <FormField
-            control={form.control}
-            name="rpm_limit"
-            label="Max Requests per minute"
-            description="Default is model limit."
-          >
-            {({ ref, value, onChange, ...field }) => (
-              <Input
-                {...field}
-                ref={ref}
-                type="number"
-                step={1}
-                value={value ?? ""}
-                onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-              />
-            )}
-          </FormField>
+    <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>Edit Budget</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={form.handleSubmit(handleUpdate)} noValidate>
+          <FieldGroup>
+            <FormField
+              control={form.control}
+              name="budget_id"
+              label="Budget ID"
+              description="Budget ID cannot be changed after creation"
+            >
+              {({ ref, ...field }) => <Input {...field} ref={ref} value={field.value ?? ""} disabled />}
+            </FormField>
+            <FormField
+              control={form.control}
+              name="tpm_limit"
+              label="Max Tokens per minute"
+              description="Default is model limit."
+            >
+              {({ ref, value, onChange, ...field }) => (
+                <Input
+                  {...field}
+                  ref={ref}
+                  type="number"
+                  step={1}
+                  value={value ?? ""}
+                  onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                />
+              )}
+            </FormField>
+            <FormField
+              control={form.control}
+              name="rpm_limit"
+              label="Max Requests per minute"
+              description="Default is model limit."
+            >
+              {({ ref, value, onChange, ...field }) => (
+                <Input
+                  {...field}
+                  ref={ref}
+                  type="number"
+                  step={1}
+                  value={value ?? ""}
+                  onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                />
+              )}
+            </FormField>
 
-          <Collapsible open={optionalSettingsOpen} onOpenChange={setOptionalSettingsOpen} className="mt-20 mb-8">
-            <CollapsibleTrigger className="group flex w-full items-center justify-between py-2 text-left">
-              <b>Optional Settings</b>
-              <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
-            </CollapsibleTrigger>
-            <CollapsibleContent>
-              <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
-                {({ ref, value, onChange, ...field }) => (
-                  <Input
-                    {...field}
-                    ref={ref}
-                    type="number"
-                    step={0.01}
-                    value={value ?? ""}
-                    onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-                  />
-                )}
-              </FormField>
-              <FormField className="mt-8" control={form.control} name="budget_duration" label="Reset Budget">
-                {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                  <Select items={BUDGET_DURATION_OPTIONS} value={value ?? null} onValueChange={onChange}>
-                    <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
-                      <SelectValue placeholder="n/a" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {BUDGET_DURATION_OPTIONS.map((option) => (
-                        <SelectItem key={option.value} value={option.value}>
-                          {option.label}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                )}
-              </FormField>
-            </CollapsibleContent>
-          </Collapsible>
-        </FieldGroup>
+            <Collapsible open={optionalSettingsOpen} onOpenChange={setOptionalSettingsOpen} className="mt-20 mb-8">
+              <CollapsibleTrigger className="group flex w-full items-center justify-between py-2 text-left">
+                <b>Optional Settings</b>
+                <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
+              </CollapsibleTrigger>
+              <CollapsibleContent>
+                <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
+                  {({ ref, value, onChange, ...field }) => (
+                    <Input
+                      {...field}
+                      ref={ref}
+                      type="number"
+                      step={0.01}
+                      value={value ?? ""}
+                      onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                    />
+                  )}
+                </FormField>
+                <FormField className="mt-8" control={form.control} name="budget_duration" label="Reset Budget">
+                  {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                    <Select items={BUDGET_DURATION_OPTIONS} value={value ?? null} onValueChange={onChange}>
+                      <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
+                        <SelectValue placeholder="n/a" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {BUDGET_DURATION_OPTIONS.map((option) => (
+                          <SelectItem key={option.value} value={option.value}>
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  )}
+                </FormField>
+              </CollapsibleContent>
+            </Collapsible>
+          </FieldGroup>
 
-        <div style={{ textAlign: "right", marginTop: "10px" }}>
-          <Button type="submit">Save</Button>
-        </div>
-      </form>
-    </Modal>
+          <div style={{ textAlign: "right", marginTop: "10px" }}>
+            <Button type="submit">Save</Button>
+          </div>
+        </form>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.test.tsx
index 7bb550f729e..b307e3d0f2a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.test.tsx
@@ -77,7 +77,15 @@ const job = (overrides: Partial<ShadowEvalJob> = {}): ShadowEvalJob => ({
   baseline_model: null,
   judge_model: "anthropic/claude-sonnet-5",
   shadow_percentage: 10,
-  max_turns: 200,
+  keys: [
+    {
+      api_key_id: "hashed-key-abc",
+      max_turns: 200,
+      stopped_at: null,
+      key_alias: "prod-alpha",
+      key_name: "sk-...alpha",
+    },
+  ],
   judged_count: 42,
   error_count: 1,
   judge_spend: 3.21,
@@ -110,19 +118,28 @@ const job = (overrides: Partial<ShadowEvalJob> = {}): ShadowEvalJob => ({
         avg_judge_confidence: 0.8,
       },
     ],
+    by_key: [],
     overall_shadow_win_rate_pct: 48.0,
     overall_tie_rate_pct: 22.0,
   },
   created_at: "2026-08-07T00:00:00Z",
   ends_at: "2026-09-07T00:00:00Z",
-  stopped_at: null,
-  api_key_id: "hashed-key-abc",
-  key_alias: "prod-alpha",
-  key_name: "sk-...alpha",
   last_error: null,
   ...overrides,
 });
 
+const keyEntry = (
+  api_key_id: string,
+  overrides: Partial<ShadowEvalJob["keys"][number]> = {},
+): ShadowEvalJob["keys"][number] => ({
+  api_key_id,
+  max_turns: 200,
+  stopped_at: null,
+  key_alias: null,
+  key_name: null,
+  ...overrides,
+});
+
 const mockHooks = ({
   jobs = [],
   detailsById = {},
@@ -199,8 +216,8 @@ describe("ShadowEvalSection", () => {
   it("gives every active job its own card with a stop button, with the form still offered", () => {
     mockHooks({
       jobs: [
-        job({ job_id: "job-a", status: "running", api_key_id: "key-a" }),
-        job({ job_id: "job-b", status: "running", api_key_id: "key-b" }),
+        job({ job_id: "job-a", status: "running", keys: [keyEntry("key-a")] }),
+        job({ job_id: "job-b", status: "running", keys: [keyEntry("key-b")] }),
       ],
     });
     render(<ShadowEvalSection />);
@@ -342,7 +359,7 @@ describe("ShadowEvalSection", () => {
     expect(container).toBeEmptyDOMElement();
   });
 
-  it("keeps the start button disabled until key, router, and judge model are picked, then submits them", async () => {
+  it("keeps the start button disabled until key, router, and judge model are picked, then submits the key as a list", async () => {
     const user = userEvent.setup();
     const { start } = mockHooks({});
     render(<ShadowEvalSection />);
@@ -361,7 +378,7 @@ describe("ShadowEvalSection", () => {
     await user.click(screen.getByText("Start shadow eval"));
 
     const expectedBody = {
-      api_key_id: "hash-alpha",
+      api_key_ids: ["hash-alpha"],
       router_name: "gpt-auto",
       direction: "forward",
       shadow_percentage: 10,
@@ -396,7 +413,7 @@ describe("ShadowEvalSection", () => {
     await user.click(screen.getByText("Start shadow eval"));
 
     const expectedBody = {
-      api_key_id: "hash-alpha",
+      api_key_ids: ["hash-alpha"],
       router_name: "gpt-auto",
       direction: "reverse",
       baseline_model: "prod-claude",
@@ -429,9 +446,9 @@ describe("ShadowEvalSection", () => {
   });
 
   it("labels the shadowed key by alias, then masked name, then truncated hash", () => {
-    expect(shadowedKeyLabel(job())).toBe("prod-alpha");
-    expect(shadowedKeyLabel(job({ key_alias: null }))).toBe("sk-...alpha");
-    expect(shadowedKeyLabel(job({ key_alias: null, key_name: null }))).toBe("hashed-key…");
+    expect(shadowedKeyLabel(job().keys[0])).toBe("prod-alpha");
+    expect(shadowedKeyLabel(keyEntry("hashed-key-abc", { key_name: "sk-...alpha" }))).toBe("sk-...alpha");
+    expect(shadowedKeyLabel(keyEntry("hashed-key-abc"))).toBe("hashed-key…");
   });
 
   it("keeps an older job's verdicts reachable through the previous evaluations list", async () => {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.tsx
index 005636615b1..6d240a84c98 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/ShadowEvalSection.tsx
@@ -24,6 +24,7 @@ import {
   useStartShadowEval,
   useStopShadowEval,
   type ShadowEvalJob,
+  type ShadowEvalJobKey,
   type ShadowEvalSlice,
 } from "./useShadowEval";
 
@@ -50,19 +51,24 @@ const routerMatchedOrBeatPct = (
     ? 100 - results.overall_shadow_win_rate_pct
     : results.overall_shadow_win_rate_pct + results.overall_tie_rate_pct;
 
-export const shadowedKeyLabel = (job: ShadowEvalJob): string =>
-  job.key_alias || job.key_name || `${job.api_key_id.slice(0, 10)}…`;
+export const shadowedKeyLabel = (key: ShadowEvalJobKey): string =>
+  key.key_alias || key.key_name || `${key.api_key_id.slice(0, 10)}…`;
+
+const shadowedKeysLabel = (job: ShadowEvalJob): string =>
+  job.keys.length === 1 ? shadowedKeyLabel(job.keys[0]) : `${job.keys.length} keys`;
+
+const totalBudget = (job: ShadowEvalJob): number => job.keys.reduce((sum, key) => sum + key.max_turns, 0);
 
 const jobHeadline = (job: ShadowEvalJob): React.ReactNode =>
   job.direction === "reverse" ? (
     <>
       Comparing <span className="font-mono text-xs">{job.router_name}</span> to{" "}
       <span className="font-mono text-xs">{job.baseline_model}</span> on {job.shadow_percentage}% of{" "}
-      <span className="font-mono text-xs">{shadowedKeyLabel(job)}</span> traffic
+      <span className="font-mono text-xs">{shadowedKeysLabel(job)}</span> traffic
     </>
   ) : (
     <>
-      Shadowing {job.shadow_percentage}% of <span className="font-mono text-xs">{shadowedKeyLabel(job)}</span> traffic
+      Shadowing {job.shadow_percentage}% of <span className="font-mono text-xs">{shadowedKeysLabel(job)}</span> traffic
       via <span className="font-mono text-xs">{job.router_name}</span>
     </>
   );
@@ -178,7 +184,8 @@ const emptyResultsText = (job: ShadowEvalJob, resultsError: boolean): string =>
 
 const ResultsBody: React.FC<{ job: ShadowEvalJob; resultsError?: boolean }> = ({ job, resultsError = false }) => {
   const results = job.results;
-  if (!results || (results.by_tier.length === 0 && results.by_current_model.length === 0)) {
+  const stratifications = results ? [results.by_tier, results.by_current_model, results.by_key] : [];
+  if (!results || stratifications.every((slices) => slices.length === 0)) {
     return <p className="px-6 py-8 text-center text-sm text-muted-foreground">{emptyResultsText(job, resultsError)}</p>;
   }
   return (
@@ -224,7 +231,7 @@ const JobResults: React.FC<{
           <div>
             <p className="text-sm font-medium text-foreground">{jobHeadline(job)}</p>
             <p className="text-xs text-muted-foreground">
-              {(job.judged_count ?? 0).toLocaleString()} of {job.max_turns.toLocaleString()} turns judged ·{" "}
+              {(job.judged_count ?? 0).toLocaleString()} of {totalBudget(job).toLocaleString()} turns judged ·{" "}
               {(job.error_count ?? 0).toLocaleString()} errored · {usd(job.judge_spend ?? 0)} judge spend
               {active && remaining ? ` · ${remaining}` : ""}
             </p>
@@ -386,14 +393,13 @@ const StartForm: React.FC = () => {
   const percentageValid = parsedPct >= 0.1 && parsedPct <= 100;
   const parsedMaxTurns = Number.parseInt(maxTurns, 10);
   const maxTurnsValid = parsedMaxTurns >= 1 && parsedMaxTurns <= 2000;
-  const filled =
-    [apiKeyId, routerName, judgeModel].every((field) => field !== "") &&
-    (direction === "forward" || baselineModel !== "");
+  const baselinePicked = direction === "forward" || baselineModel !== "";
+  const filled = [apiKeyId, routerName, judgeModel].every((field) => field !== "") && baselinePicked;
   const boundsValid = percentageValid && maxTurnsValid;
   const valid = Boolean(accessToken) && filled && boundsValid;
   const handleStart = () => {
     const startBody = {
-      api_key_id: apiKeyId,
+      api_key_ids: [apiKeyId],
       router_name: routerName,
       direction,
       ...(direction === "reverse" ? { baseline_model: baselineModel } : {}),
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/useShadowEval.ts b/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/useShadowEval.ts
index 7645fcc3346..eef98320e67 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/useShadowEval.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-optimization/_components/useShadowEval.ts
@@ -7,6 +7,7 @@ import { $api, fetchClient } from "@/lib/http/api";
 import type { components } from "@/lib/http/schema";
 
 export type ShadowEvalJob = components["schemas"]["ShadowEvalJobResponse"];
+export type ShadowEvalJobKey = components["schemas"]["ShadowEvalJobKeyResponse"];
 export type ShadowEvalSlice = components["schemas"]["ShadowEvalSlice"];
 export type StartShadowEvalRequest = components["schemas"]["StartShadowEvalRequest"];
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/add_provider_form.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/add_provider_form.integration.test.tsx
index 83875cfc676..4680a4d504a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/add_provider_form.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/add_provider_form.integration.test.tsx
@@ -1,5 +1,3 @@
-// eslint-disable-next-line no-restricted-imports -- the parent cost_tracking_settings still owns this antd Form, and the point of this test is that AddProviderForm registers nothing in it
-import { Form } from "antd";
 import { screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -10,42 +8,31 @@ import { DiscountConfig } from "./types";
 
 const onAddProvider = vi.fn();
 const onParentFinish = vi.fn();
-const readParentStore = vi.fn();
 
-const ParentOwnedForm = () => {
-  const [form] = Form.useForm();
-  return (
-    <Form form={form} onFinish={onParentFinish} layout="vertical" className="space-y-6">
-      <AddProviderForm
-        discountConfig={{} as DiscountConfig}
-        selectedProvider="OpenAI"
-        newDiscount="5"
-        onProviderChange={vi.fn()}
-        onDiscountChange={vi.fn()}
-        onAddProvider={() => {
-          readParentStore(form.getFieldsValue());
-          onAddProvider();
-        }}
-      />
-    </Form>
-  );
-};
+const ParentOwnedForm = () => (
+  <form
+    onSubmit={(event) => {
+      event.preventDefault();
+      onParentFinish();
+    }}
+    className="space-y-6"
+  >
+    <AddProviderForm
+      discountConfig={{} as DiscountConfig}
+      selectedProvider="OpenAI"
+      newDiscount="5"
+      onProviderChange={vi.fn()}
+      onDiscountChange={vi.fn()}
+      onAddProvider={onAddProvider}
+    />
+  </form>
+);
 
-describe("AddProviderForm inside the antd form its parent owns", () => {
+describe("AddProviderForm inside the form its parent owns", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it("registers no field in the parent FormInstance, so the parent's resetFields is a no-op", async () => {
-    const user = userEvent.setup();
-    renderWithProviders(<ParentOwnedForm />);
-
-    await user.click(screen.getByRole("button", { name: /add provider discount/i }));
-
-    expect(readParentStore).toHaveBeenCalledTimes(1);
-    expect(readParentStore.mock.calls[0][0]).toEqual({});
-  });
-
   it("drives both the onAddProvider prop and the parent form submit from one click", async () => {
     const user = userEvent.setup();
     renderWithProviders(<ParentOwnedForm />);
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.integration.test.tsx
index f811b55bc86..d4fbb7e153e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.integration.test.tsx
@@ -72,7 +72,7 @@ describe("CostTrackingSettings submit paths", () => {
     const header = screen.getByText("Provider Discounts").closest("button");
     if (header) await user.click(header);
     await user.click(await screen.findByRole("button", { name: /add provider discount/i }));
-    await screen.findByText("Add Provider Discount", { selector: "h2" });
+    await screen.findByRole("dialog", { name: "Add Provider Discount" });
   };
 
   const submitDiscount = () =>
@@ -101,7 +101,7 @@ describe("CostTrackingSettings submit paths", () => {
     const header = screen.getByText("Fee/Price Margin").closest("button");
     if (header) await user.click(header);
     await user.click(await screen.findByRole("button", { name: /add provider margin/i }));
-    await screen.findByText("Add Provider Margin", { selector: "h2" });
+    await screen.findByRole("dialog", { name: "Add Provider Margin" });
 
     await user.click(screen.getAllByRole("combobox")[0]);
     await user.click((await screen.findAllByRole("option"))[0]);
@@ -136,7 +136,7 @@ describe("CostTrackingSettings submit paths", () => {
     const header = screen.getByText("Fee/Price Margin").closest("button");
     if (header) await user.click(header);
     await user.click(await screen.findByRole("button", { name: /add provider margin/i }));
-    await screen.findByText("Add Provider Margin", { selector: "h2" });
+    await screen.findByRole("dialog", { name: "Add Provider Margin" });
 
     await user.click(screen.getAllByRole("combobox")[0]);
     await user.click((await screen.findAllByRole("option"))[0]);
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.test.tsx
index 9cdc8509fbf..a8609aef629 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/cost-tracking/_components/cost_tracking_settings.test.tsx
@@ -136,7 +136,7 @@ describe("CostTrackingSettings", () => {
       const addButton = await screen.findByRole("button", { name: /add provider discount/i });
       await user.click(addButton);
 
-      expect(await screen.findByText("Add Provider Discount", { selector: "h2" })).toBeInTheDocument();
+      expect(await screen.findByRole("dialog", { name: "Add Provider Discount" })).toBeInTheDocument();
     });
   });
 
@@ -153,7 +153,7 @@ describe("CostTrackingSettings", () => {
       const addButton = await screen.findByRole("button", { name: /add provider margin/i });
       await user.click(addButton);
 
-      expect(await screen.findByText("Add Provider Margin", { selector: "h2" })).toBeInTheDocument();
+      expect(await screen.findByRole("dialog", { name: "Add Provider Margin" })).toBeInTheDocument();
     });
   });
 
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 85350a539c2..bf5ae27aee0 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
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from "react";
 import { ChevronDown } from "lucide-react";
-import { Modal } from "antd";
 import {
   AlertDialog,
   AlertDialogCancel,
@@ -24,6 +23,7 @@ import HowItWorks from "./how_it_works";
 import { useDiscountConfig } from "./use_discount_config";
 import { useMarginConfig } from "./use_margin_config";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const DOCS_LINKS = [
   { label: "Custom pricing for models", href: "https://docs.litellm.ai/docs/proxy/custom_pricing" },
@@ -331,77 +331,61 @@ const CostTrackingSettings: React.FC<CostTrackingSettingsProps> = ({ userID, use
         </AlertDialog>
       )}
 
-      <Modal
-        title={
-          <div className="flex items-center space-x-3 pb-4 border-b border-gray-100">
-            <h2 className="text-xl font-semibold text-gray-900">Add Provider Discount</h2>
+      <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleModalCancel()}>
+        <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[1000px]">
+          <DialogHeader>
+            <div className="flex items-center space-x-3 pb-4 border-b border-gray-100">
+              <DialogTitle className="text-xl font-semibold text-gray-900">Add Provider Discount</DialogTitle>
+            </div>
+          </DialogHeader>
+          <div className="mt-6">
+            <p className="text-sm text-gray-600 mb-6">
+              Select a provider and set its discount percentage. Enter a value between 0% and 100% (e.g., 5 for a 5%
+              discount).
+            </p>
+            <form onSubmit={(event) => event.preventDefault()} className="space-y-6">
+              <AddProviderForm
+                discountConfig={discountConfig}
+                selectedProvider={selectedProvider}
+                newDiscount={newDiscount}
+                onProviderChange={setSelectedProvider}
+                onDiscountChange={setNewDiscount}
+                onAddProvider={handleAddProvider}
+              />
+            </form>
           </div>
-        }
-        open={isModalVisible}
-        width={1000}
-        onCancel={handleModalCancel}
-        footer={null}
-        className="top-8"
-        styles={{
-          body: { padding: "24px" },
-          header: { padding: "24px 24px 0 24px", border: "none" },
-        }}
-      >
-        <div className="mt-6">
-          <p className="text-sm text-gray-600 mb-6">
-            Select a provider and set its discount percentage. Enter a value between 0% and 100% (e.g., 5 for a 5%
-            discount).
-          </p>
-          <form onSubmit={(event) => event.preventDefault()} className="space-y-6">
-            <AddProviderForm
-              discountConfig={discountConfig}
-              selectedProvider={selectedProvider}
-              newDiscount={newDiscount}
-              onProviderChange={setSelectedProvider}
-              onDiscountChange={setNewDiscount}
-              onAddProvider={handleAddProvider}
-            />
-          </form>
-        </div>
-      </Modal>
+        </DialogContent>
+      </Dialog>
 
-      <Modal
-        title={
-          <div className="flex items-center space-x-3 pb-4 border-b border-gray-100">
-            <h2 className="text-xl font-semibold text-gray-900">Add Provider Margin</h2>
+      <Dialog open={isMarginModalVisible} onOpenChange={(open) => !open && handleMarginModalCancel()}>
+        <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[1000px]">
+          <DialogHeader>
+            <div className="flex items-center space-x-3 pb-4 border-b border-gray-100">
+              <DialogTitle className="text-xl font-semibold text-gray-900">Add Provider Margin</DialogTitle>
+            </div>
+          </DialogHeader>
+          <div className="mt-6">
+            <p className="text-sm text-gray-600 mb-6">
+              Select a provider (or &quot;Global&quot; for all providers) and configure the margin. You can use
+              percentage-based or fixed amount.
+            </p>
+            <form onSubmit={(event) => event.preventDefault()} className="space-y-6">
+              <AddMarginForm
+                marginConfig={marginConfig}
+                selectedProvider={selectedMarginProvider}
+                marginType={marginType}
+                percentageValue={percentageValue}
+                fixedAmountValue={fixedAmountValue}
+                onProviderChange={setSelectedMarginProvider}
+                onMarginTypeChange={setMarginType}
+                onPercentageChange={setPercentageValue}
+                onFixedAmountChange={setFixedAmountValue}
+                onAddProvider={handleAddMargin}
+              />
+            </form>
           </div>
-        }
-        open={isMarginModalVisible}
-        width={1000}
-        onCancel={handleMarginModalCancel}
-        footer={null}
-        className="top-8"
-        styles={{
-          body: { padding: "24px" },
-          header: { padding: "24px 24px 0 24px", border: "none" },
-        }}
-      >
-        <div className="mt-6">
-          <p className="text-sm text-gray-600 mb-6">
-            Select a provider (or &quot;Global&quot; for all providers) and configure the margin. You can use
-            percentage-based or fixed amount.
-          </p>
-          <form onSubmit={(event) => event.preventDefault()} className="space-y-6">
-            <AddMarginForm
-              marginConfig={marginConfig}
-              selectedProvider={selectedMarginProvider}
-              marginType={marginType}
-              percentageValue={percentageValue}
-              fixedAmountValue={fixedAmountValue}
-              onProviderChange={setSelectedMarginProvider}
-              onMarginTypeChange={setMarginType}
-              onPercentageChange={setPercentageValue}
-              onFixedAmountChange={setFixedAmountValue}
-              onAddProvider={handleAddMargin}
-            />
-          </form>
-        </div>
-      </Modal>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.test.tsx
index 78526251049..60bf235040f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.test.tsx
@@ -45,19 +45,7 @@ describe("GuardrailConfig", () => {
   it("should show custom code textarea when custom code override is toggled on", async () => {
     const user = userEvent.setup();
     render(<GuardrailConfig {...defaultProps} />);
-    // Walk up from "Custom Code Override" heading to find the enclosing section,
-    // then locate the switch within it
-    const heading = screen.getByText("Custom Code Override");
-    let container = heading.parentElement;
-    let customCodeSwitch: Element | null = null;
-    while (container && !customCodeSwitch) {
-      customCodeSwitch = container.querySelector('[role="switch"]');
-      container = container.parentElement;
-    }
-    if (!customCodeSwitch) {
-      throw new Error("Could not find the Custom Code Override switch via DOM traversal");
-    }
-    await user.click(customCodeSwitch);
+    await user.click(screen.getByRole("switch", { name: "Custom Code Override" }));
     expect(screen.getByPlaceholderText(/async def evaluate/)).toBeInTheDocument();
   });
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.tsx
index 667c52087f1..271de78c272 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails-monitor/_components/GuardrailConfig.tsx
@@ -1,13 +1,11 @@
-import {
-  CheckCircleOutlined,
-  CodeOutlined,
-  PlayCircleOutlined,
-  RollbackOutlined,
-  SaveOutlined,
-} from "@ant-design/icons";
-import { Input, Select, Switch } from "antd";
+import { CircleCheck, CirclePlay, Code, Save, Undo2 } from "lucide-react";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Button } from "@/components/ui/button";
-import React, { useState } from "react";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import { Textarea } from "@/components/ui/textarea";
+import React, { useId, useState } from "react";
 
 interface GuardrailConfigProps {
   guardrailName: string;
@@ -27,6 +25,28 @@ const versions = [
   { id: "v1", label: "v1", date: "2026-01-28", author: "admin@company.com", changes: "Initial configuration" },
 ];
 
+const ACTION_ITEMS = [
+  { value: "block", label: "Block Request" },
+  { value: "flag", label: "Flag for Review" },
+  { value: "log", label: "Log Only" },
+  { value: "fallback", label: "Use Fallback Response" },
+];
+
+const PROVIDER_ITEMS = [
+  { value: "bedrock", label: "AWS Bedrock Guardrails" },
+  { value: "google", label: "Google Cloud AI Safety" },
+  { value: "litellm", label: "LiteLLM Built-in" },
+  { value: "custom", label: "Custom Code" },
+];
+
+const GUARDRAIL_TYPE_ITEMS = [
+  { value: "Content Safety", label: "Content Safety" },
+  { value: "PII", label: "PII Detection" },
+  { value: "Topic", label: "Topic Restriction" },
+  { value: "prompt_injection", label: "Prompt Injection" },
+  { value: "custom", label: "Custom" },
+];
+
 export function GuardrailConfig({ guardrailName, guardrailType, provider }: GuardrailConfigProps) {
   const [action, setAction] = useState("block");
   const [enabled, setEnabled] = useState(true);
@@ -35,6 +55,7 @@ export function GuardrailConfig({ guardrailName, guardrailType, provider }: Guar
   const [rerunStatus, setRerunStatus] = useState<"idle" | "running" | "success" | "error">("idle");
   const [version, setVersion] = useState("v3");
   const [showVersionHistory, setShowVersionHistory] = useState(false);
+  const enabledToggleId = useId();
 
   const handleRerun = () => {
     setRerunStatus("running");
@@ -52,22 +73,32 @@ export function GuardrailConfig({ guardrailName, guardrailType, provider }: Guar
           <div className="flex items-center gap-3">
             <span className="text-sm font-medium text-gray-700">Version:</span>
             <Select
+              items={versions.map((v) => ({ value: v.id, label: v.label }))}
               value={version}
-              onChange={setVersion}
-              options={versions.map((v) => ({ value: v.id, label: v.label }))}
-              style={{ width: 140 }}
-            />
+              onValueChange={(value: string | null) => value && setVersion(value)}
+            >
+              <SelectTrigger className="w-[140px]">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {versions.map((v) => (
+                  <SelectItem key={v.id} value={v.id}>
+                    {v.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
             <Button variant="link" size="sm" onClick={() => setShowVersionHistory(!showVersionHistory)}>
               {showVersionHistory ? "Hide history" : "View history"}
             </Button>
           </div>
           <div className="flex items-center gap-2">
             <Button variant="outline">
-              <RollbackOutlined />
+              <Undo2 />
               Revert
             </Button>
             <Button>
-              <SaveOutlined />
+              <Save />
               Save as v{parseInt(version.replace("v", ""), 10) + 1}
             </Button>
           </div>
@@ -109,45 +140,53 @@ export function GuardrailConfig({ guardrailName, guardrailType, provider }: Guar
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1.5">Action on Failure</label>
             <Select
+              items={ACTION_ITEMS}
               value={action}
-              onChange={setAction}
-              style={{ width: "100%" }}
-              options={[
-                { value: "block", label: "Block Request" },
-                { value: "flag", label: "Flag for Review" },
-                { value: "log", label: "Log Only" },
-                { value: "fallback", label: "Use Fallback Response" },
-              ]}
-            />
+              onValueChange={(value: string | null) => value && setAction(value)}
+            >
+              <SelectTrigger className="w-full">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {ACTION_ITEMS.map((item) => (
+                  <SelectItem key={item.value} value={item.value}>
+                    {item.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
           </div>
 
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1.5">Provider</label>
-            <Select
-              style={{ width: "100%" }}
-              defaultValue={provider}
-              options={[
-                { value: "bedrock", label: "AWS Bedrock Guardrails" },
-                { value: "google", label: "Google Cloud AI Safety" },
-                { value: "litellm", label: "LiteLLM Built-in" },
-                { value: "custom", label: "Custom Code" },
-              ]}
-            />
+            <Select items={PROVIDER_ITEMS} defaultValue={provider}>
+              <SelectTrigger className="w-full">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {PROVIDER_ITEMS.map((item) => (
+                  <SelectItem key={item.value} value={item.value}>
+                    {item.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
           </div>
 
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1.5">Guardrail Type</label>
-            <Select
-              style={{ width: "100%" }}
-              defaultValue={guardrailType}
-              options={[
-                { value: "Content Safety", label: "Content Safety" },
-                { value: "PII", label: "PII Detection" },
-                { value: "Topic", label: "Topic Restriction" },
-                { value: "prompt_injection", label: "Prompt Injection" },
-                { value: "custom", label: "Custom" },
-              ]}
-            />
+            <Select items={GUARDRAIL_TYPE_ITEMS} defaultValue={guardrailType}>
+              <SelectTrigger className="w-full">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {GUARDRAIL_TYPE_ITEMS.map((item) => (
+                  <SelectItem key={item.value} value={item.value}>
+                    {item.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
           </div>
 
           <div className="md:col-span-2">
@@ -156,8 +195,10 @@ export function GuardrailConfig({ guardrailName, guardrailType, provider }: Guar
           </div>
 
           <div className="md:col-span-2 flex items-center gap-3">
-            <Switch checked={enabled} onChange={setEnabled} />
-            <span className="text-sm text-gray-700">Guardrail enabled in production</span>
+            <Switch id={enabledToggleId} checked={enabled} onCheckedChange={setEnabled} />
+            <Label htmlFor={enabledToggleId} className="font-normal text-gray-700">
+              Guardrail enabled in production
+            </Label>
           </div>
         </div>
       </div>
@@ -167,16 +208,16 @@ export function GuardrailConfig({ guardrailName, guardrailType, provider }: Guar
         <div className="flex items-center justify-between mb-4">
           <div>
             <h3 className="text-base font-semibold text-gray-900 flex items-center gap-2">
-              <CodeOutlined className="text-gray-500" />
+              <Code className="size-4 text-gray-500" />
               Custom Code Override
             </h3>
             <p className="text-xs text-gray-500 mt-0.5">Replace the built-in guardrail with custom evaluation code</p>
           </div>
-          <Switch checked={useCustomCode} onChange={setUseCustomCode} />
+          <Switch aria-label="Custom Code Override" checked={useCustomCode} onCheckedChange={setUseCustomCode} />
         </div>
 
         {useCustomCode && (
-          <Input.TextArea
+          <Textarea
             value={customCode}
             onChange={(e) => setCustomCode(e.target.value)}
             placeholder={`async def evaluate(input_text: str, context: dict) -> dict:
@@ -200,13 +241,13 @@ export function GuardrailConfig({ guardrailName, guardrailType, provider }: Guar
 
         <div className="flex items-center gap-3">
           <Button disabled={rerunStatus === "running"} aria-busy={rerunStatus === "running"} onClick={handleRerun}>
-            {rerunStatus === "running" ? null : <PlayCircleOutlined />}
+            {rerunStatus === "running" ? null : <CirclePlay />}
             {rerunStatus === "running" ? "Running on 10 samples..." : "Re-run on failing logs"}
           </Button>
 
           {rerunStatus === "success" && (
             <span className="text-sm text-green-600 flex items-center gap-2">
-              <CheckCircleOutlined /> 7/10 would now pass with new config
+              <CircleCheck className="size-4" /> 7/10 would now pass with new config
             </span>
           )}
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.integration.test.tsx
index 5c34eca9804..ef1746310ae 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.integration.test.tsx
@@ -136,7 +136,7 @@ describe("TeamGuardrailsTab submit payload", () => {
     await openSubmitModal(user);
 
     await fillRequiredFields(user, "https://guard.example.com/v1/check");
-    await user.click(screen.getAllByRole("combobox")[1]);
+    await user.click(screen.getByRole("combobox", { name: "Mode" }));
     const options = await screen.findAllByText("During Call");
     await user.click(options[options.length - 1]);
     await submit(user);
@@ -149,13 +149,13 @@ describe("TeamGuardrailsTab submit payload", () => {
     const user = userEvent.setup();
     await openSubmitModal(user);
 
-    const mode = screen.getAllByRole("combobox")[1];
+    const mode = screen.getByRole("combobox", { name: "Mode" });
     expect(mode).toHaveTextContent("Pre Call");
 
     await user.click(mode);
     await user.click(await screen.findByRole("option", { name: "During Call" }));
 
-    expect(screen.getAllByRole("combobox")[1]).toHaveTextContent("During Call");
+    expect(screen.getByRole("combobox", { name: "Mode" })).toHaveTextContent("During Call");
   });
 
   it("blocks an empty submit and reports every required field", async () => {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx
index fc77562e932..146e0fa86e6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/TeamGuardrailsTab.tsx
@@ -17,7 +17,6 @@ import {
   InfoIcon,
   CircleHelp,
 } from "lucide-react";
-import { Modal } from "antd";
 import { z } from "zod/v4";
 import {
   listGuardrailSubmissions,
@@ -39,6 +38,8 @@ import { Textarea } from "@/components/ui/textarea";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { isAntdUrl } from "@/lib/forms/antdUrl";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
 
 const GUARDRAIL_MODES = [
   { value: "pre_call", label: "Pre Call" },
@@ -1001,6 +1002,7 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
             />
           </div>
           <select
+            aria-label="Filter by status"
             value={statusFilter}
             onChange={(e) => setStatusFilter(e.target.value as typeof statusFilter)}
             className="border border-border rounded-md px-3 py-2 text-sm text-foreground focus:outline-hidden focus:ring-1 focus:ring-blue-500 focus:border-blue-500 bg-background"
@@ -1066,92 +1068,108 @@ export function TeamGuardrailsTab({ accessToken }: TeamGuardrailsTabProps) {
         />
       )}
 
-      <Modal
-        title="Submit Guardrail for Review"
+      <Dialog
         open={isSubmitModalOpen}
-        onCancel={() => {
-          setIsSubmitModalOpen(false);
-          submitForm.reset();
+        onOpenChange={(open) => {
+          if (!open) {
+            setIsSubmitModalOpen(false);
+            submitForm.reset();
+          }
         }}
-        onOk={handleSubmitGuardrail}
-        okText="Submit for Review"
       >
-        <div className="rounded-md bg-blue-50 dark:bg-blue-950 border border-blue-200 dark:border-blue-900 px-4 py-3 text-sm text-blue-800 dark:text-blue-200 mb-4">
-          Your guardrail will be sent for admin review before it becomes active.
-        </div>
-        <TooltipProvider>
-          <form onSubmit={handleSubmitGuardrail}>
-            <FieldGroup>
-              <FormField control={submitForm.control} name="team_id" label="Team">
-                {({ id, value, onChange }) => <TeamDropdown id={id} value={value} onChange={onChange} />}
-              </FormField>
-              <FormField control={submitForm.control} name="guardrail_name" label="Guardrail Name">
-                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. pii-detection" />}
-              </FormField>
-              <FormField control={submitForm.control} name="mode" label="Mode">
-                {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                  <Select items={GUARDRAIL_MODES} value={value} onValueChange={onChange}>
-                    <SelectTrigger
-                      id={id}
-                      aria-invalid={ariaInvalid}
-                      aria-describedby={ariaDescribedBy}
-                      className="w-full"
-                    >
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent alignItemWithTrigger={false}>
-                      {GUARDRAIL_MODES.map((mode) => (
-                        <SelectItem key={mode.value} value={mode.value} title={mode.label}>
-                          {mode.label}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                )}
-              </FormField>
-              <FormField control={submitForm.control} name="api_base" label="API Base URL">
-                {({ ref, ...field }) => (
-                  <Input
-                    {...field}
-                    ref={ref}
-                    placeholder="https://your-guardrail-api.com/v1/check"
-                    className="font-mono"
-                  />
-                )}
-              </FormField>
-              <FormField
-                control={submitForm.control}
-                name="extra_litellm_params"
-                label={labelWithHint(
-                  "Additional litellm_params (optional)",
-                  "JSON object merged into litellm_params. e.g. forward_api_key, headers, model, unreachable_fallback",
-                )}
-              >
-                {({ ref, ...field }) => (
-                  <Textarea
-                    {...field}
-                    ref={ref}
-                    rows={3}
-                    className="font-mono text-xs"
-                    placeholder='{"forward_api_key": true, "headers": {"X-Custom": "value"}}'
-                  />
-                )}
-              </FormField>
-              <FormField control={submitForm.control} name="guardrail_info" label="Guardrail Info (optional)">
-                {({ ref, ...field }) => (
-                  <Textarea
-                    {...field}
-                    ref={ref}
-                    rows={3}
-                    className="font-mono text-xs"
-                    placeholder='{"description": "Detects PII in requests"}'
-                  />
-                )}
-              </FormField>
-            </FieldGroup>
-          </form>
-        </TooltipProvider>
-      </Modal>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+          <DialogHeader>
+            <DialogTitle>Submit Guardrail for Review</DialogTitle>
+          </DialogHeader>
+          <div className="rounded-md bg-blue-50 dark:bg-blue-950 border border-blue-200 dark:border-blue-900 px-4 py-3 text-sm text-blue-800 dark:text-blue-200 mb-4">
+            Your guardrail will be sent for admin review before it becomes active.
+          </div>
+          <TooltipProvider>
+            <form onSubmit={handleSubmitGuardrail}>
+              <FieldGroup>
+                <FormField control={submitForm.control} name="team_id" label="Team">
+                  {({ id, value, onChange }) => <TeamDropdown id={id} value={value} onChange={onChange} />}
+                </FormField>
+                <FormField control={submitForm.control} name="guardrail_name" label="Guardrail Name">
+                  {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. pii-detection" />}
+                </FormField>
+                <FormField control={submitForm.control} name="mode" label="Mode">
+                  {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                    <Select items={GUARDRAIL_MODES} value={value} onValueChange={onChange}>
+                      <SelectTrigger
+                        id={id}
+                        aria-invalid={ariaInvalid}
+                        aria-describedby={ariaDescribedBy}
+                        className="w-full"
+                      >
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent alignItemWithTrigger={false}>
+                        {GUARDRAIL_MODES.map((mode) => (
+                          <SelectItem key={mode.value} value={mode.value} title={mode.label}>
+                            {mode.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  )}
+                </FormField>
+                <FormField control={submitForm.control} name="api_base" label="API Base URL">
+                  {({ ref, ...field }) => (
+                    <Input
+                      {...field}
+                      ref={ref}
+                      placeholder="https://your-guardrail-api.com/v1/check"
+                      className="font-mono"
+                    />
+                  )}
+                </FormField>
+                <FormField
+                  control={submitForm.control}
+                  name="extra_litellm_params"
+                  label={labelWithHint(
+                    "Additional litellm_params (optional)",
+                    "JSON object merged into litellm_params. e.g. forward_api_key, headers, model, unreachable_fallback",
+                  )}
+                >
+                  {({ ref, ...field }) => (
+                    <Textarea
+                      {...field}
+                      ref={ref}
+                      rows={3}
+                      className="font-mono text-xs"
+                      placeholder='{"forward_api_key": true, "headers": {"X-Custom": "value"}}'
+                    />
+                  )}
+                </FormField>
+                <FormField control={submitForm.control} name="guardrail_info" label="Guardrail Info (optional)">
+                  {({ ref, ...field }) => (
+                    <Textarea
+                      {...field}
+                      ref={ref}
+                      rows={3}
+                      className="font-mono text-xs"
+                      placeholder='{"description": "Detects PII in requests"}'
+                    />
+                  )}
+                </FormField>
+              </FieldGroup>
+            </form>
+          </TooltipProvider>
+          <DialogFooter>
+            <Button
+              variant="outline"
+              onClick={() => {
+                setIsSubmitModalOpen(false);
+                submitForm.reset();
+              }}
+            >
+              Cancel
+            </Button>
+            <Button onClick={handleSubmitGuardrail}>Submit for Review</Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.characterization.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.characterization.test.tsx
index c1b419d013d..aadc9ec0213 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.characterization.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.characterization.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { renderWithProviders } from "@/../tests/test-utils";
+import { chooseSelectOption, renderWithProviders } from "@/../tests/test-utils";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import AddGuardrailForm from "./add_guardrail_form";
 
@@ -252,14 +252,13 @@ describe("AddGuardrailForm create payload characterization", () => {
     await user.type(await screen.findByLabelText("Guardrail Name"), "my-bedrock");
     await pickProvider(user, "Bedrock Guardrail");
 
-    await user.click(screen.getByLabelText("Always On"));
-    await user.click((await screen.findAllByText("Yes")).at(-1) as HTMLElement);
-
-    await user.click(screen.getByLabelText("Skip system messages in guardrail"));
-    await user.click((await screen.findAllByText(/exclude from guardrail scan/)).at(-1) as HTMLElement);
-
-    await user.click(screen.getByLabelText("Skip tool messages in guardrail"));
-    await user.click((await screen.findAllByText(/always include in scan/)).at(-1) as HTMLElement);
+    await chooseSelectOption(user, screen.getByLabelText("Always On"), "Yes");
+    await chooseSelectOption(
+      user,
+      screen.getByLabelText("Skip system messages in guardrail"),
+      /exclude from guardrail scan/,
+    );
+    await chooseSelectOption(user, screen.getByLabelText("Skip tool messages in guardrail"), /always include in scan/);
 
     await user.type(await screen.findByPlaceholderText("The guardrail id on Bedrock"), "gr-123");
     await user.click(screen.getByRole("button", { name: "Next" }));
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.test.tsx
index e8463025e31..8ca4aba91c5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.test.tsx
@@ -26,12 +26,11 @@ describe("AddGuardrailForm close behavior", () => {
     const { onClose } = renderForm();
     expect(screen.getByText("Create guardrail")).toBeInTheDocument();
 
-    // eslint-disable-next-line local/no-antd-class-selectors -- exercises antd Modal mask dismissal; the mask has no role and is not reachable by an accessible query
-    const wrap = document.querySelector(".ant-modal-wrap") as HTMLElement;
-    expect(wrap).toBeTruthy();
-    fireEvent.mouseDown(wrap);
-    fireEvent.mouseUp(wrap);
-    fireEvent.click(wrap);
+    const backdrop = document.querySelector('[data-slot="dialog-overlay"]') as HTMLElement;
+    expect(backdrop).toBeTruthy();
+    fireEvent.mouseDown(backdrop);
+    fireEvent.mouseUp(backdrop);
+    fireEvent.click(backdrop);
 
     expect(onClose).not.toHaveBeenCalled();
   });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
index 0ca852feb52..fc09ff1a763 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
@@ -1,4 +1,3 @@
-import { Modal } from "antd";
 import React, { useEffect, useMemo, useState } from "react";
 import { useForm, type UseFormReturn } from "react-hook-form";
 import { toast } from "@/lib/toast";
@@ -57,6 +56,7 @@ import GuardrailProviderFields from "./guardrail_provider_fields";
 import LLMJudgeFields from "./llm_judge/LLMJudgeFields";
 import PiiConfiguration from "./pii_configuration";
 import ToolPermissionRulesEditor, { ToolPermissionConfig } from "./tool_permission/ToolPermissionRulesEditor";
+import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
 
 // Define human-friendly descriptions for each mode
 const modeDescriptions = {
@@ -1092,107 +1092,102 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
   const stepConfigs = getStepConfigs();
 
   return (
-    <Modal
-      title={null}
-      open={visible}
-      onCancel={handleClose}
-      maskClosable={false}
-      footer={null}
-      width={1000}
-      closable={false}
-      className="top-8"
-      styles={{
-        body: { padding: 0 },
-      }}
-    >
-      <TooltipProvider>
-        <div className="flex flex-col">
-          {/* Header */}
-          <div className="flex items-center justify-between border-b border-border px-6 py-4">
-            <h3 className="m-0 text-base font-semibold text-foreground">Create guardrail</h3>
-            <button
-              type="button"
-              onClick={handleClose}
-              className="cursor-pointer border-none bg-transparent p-1 text-base leading-none text-muted-foreground hover:text-foreground"
-            >
-              &#x2715;
-            </button>
-          </div>
+    <Dialog open={visible} onOpenChange={(open) => !open && handleClose()} disablePointerDismissal>
+      <DialogContent
+        className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 gap-0 overflow-hidden p-0 sm:max-w-[1000px]"
+        showCloseButton={false}
+      >
+        <TooltipProvider>
+          <div className="flex flex-col">
+            {/* Header */}
+            <div className="flex items-center justify-between border-b border-border px-6 py-4">
+              <DialogTitle className="m-0 text-base font-semibold text-foreground">Create guardrail</DialogTitle>
+              <button
+                type="button"
+                onClick={handleClose}
+                className="cursor-pointer border-none bg-transparent p-1 text-base leading-none text-muted-foreground hover:text-foreground"
+              >
+                &#x2715;
+              </button>
+            </div>
 
-          {/* Scrollable content - inline vertical stepper */}
-          <div className="max-h-[calc(80vh-120px)] overflow-auto px-6 py-4">
-            <form onSubmit={(event) => event.preventDefault()}>
-              {stepConfigs.map((step, index) => {
-                const isDone = index < currentStep;
-                const isCurrent = index === currentStep;
-                const isLast = index === stepConfigs.length - 1;
-                return (
-                  <div key={index} className={`relative flex gap-4 ${isLast ? "" : "pb-2"}`}>
-                    {/* Vertical line + step indicator */}
-                    <div className="flex w-6 shrink-0 flex-col items-center">
-                      <div
-                        className={`flex h-6 w-6 shrink-0 items-center justify-center rounded-full text-xs font-medium ${getStepIndicatorClass(isDone, isCurrent)}`}
-                      >
-                        {isDone ? "\u2713" : index + 1}
-                      </div>
-                      {!isLast && (
+            {/* Scrollable content - inline vertical stepper */}
+            <div className="max-h-[calc(80vh-120px)] overflow-auto px-6 py-4">
+              <form onSubmit={(event) => event.preventDefault()}>
+                {stepConfigs.map((step, index) => {
+                  const isDone = index < currentStep;
+                  const isCurrent = index === currentStep;
+                  const isLast = index === stepConfigs.length - 1;
+                  return (
+                    <div key={index} className={`relative flex gap-4 ${isLast ? "" : "pb-2"}`}>
+                      {/* Vertical line + step indicator */}
+                      <div className="flex w-6 shrink-0 flex-col items-center">
                         <div
-                          className={`min-h-4 w-px flex-1 ${isDone ? "bg-indigo-600 dark:bg-indigo-500" : "bg-border"}`}
-                        />
-                      )}
-                    </div>
-
-                    {/* Step content */}
-                    <div className={`min-w-0 flex-1 ${isLast ? "" : "pb-4"}`}>
-                      {/* Step header - clickable for completed steps */}
-                      <div
-                        className={`flex min-h-6 items-center gap-2 ${isDone ? "cursor-pointer" : ""}`}
-                        onClick={() => {
-                          if (isDone) setCurrentStep(index);
-                        }}
-                      >
-                        <span className={`text-sm ${getStepTitleClass(isDone, isCurrent)}`}>{step.title}</span>
-                        {step.optional && !isCurrent && (
-                          <span className="text-[11px] text-muted-foreground">optional</span>
-                        )}
-                        {isDone && (
-                          <span className="text-[11px] text-indigo-600 hover:underline dark:text-indigo-400">Edit</span>
+                          className={`flex h-6 w-6 shrink-0 items-center justify-center rounded-full text-xs font-medium ${getStepIndicatorClass(isDone, isCurrent)}`}
+                        >
+                          {isDone ? "\u2713" : index + 1}
+                        </div>
+                        {!isLast && (
+                          <div
+                            className={`min-h-4 w-px flex-1 ${isDone ? "bg-indigo-600 dark:bg-indigo-500" : "bg-border"}`}
+                          />
                         )}
                       </div>
 
-                      {/* Expanded form content for current step */}
-                      {isCurrent && <div className="mt-3">{renderStepContent()}</div>}
-                    </div>
-                  </div>
-                );
-              })}
-            </form>
-          </div>
+                      {/* Step content */}
+                      <div className={`min-w-0 flex-1 ${isLast ? "" : "pb-4"}`}>
+                        {/* Step header - clickable for completed steps */}
+                        <div
+                          className={`flex min-h-6 items-center gap-2 ${isDone ? "cursor-pointer" : ""}`}
+                          onClick={() => {
+                            if (isDone) setCurrentStep(index);
+                          }}
+                        >
+                          <span className={`text-sm ${getStepTitleClass(isDone, isCurrent)}`}>{step.title}</span>
+                          {step.optional && !isCurrent && (
+                            <span className="text-[11px] text-muted-foreground">optional</span>
+                          )}
+                          {isDone && (
+                            <span className="text-[11px] text-indigo-600 hover:underline dark:text-indigo-400">
+                              Edit
+                            </span>
+                          )}
+                        </div>
 
-          {/* Bottom bar */}
-          <div className="flex items-center justify-end space-x-3 border-t border-border px-6 py-3">
-            <Button type="button" variant="outline" onClick={handleClose}>
-              Cancel
-            </Button>
-            {currentStep > 0 && (
-              <Button type="button" variant="outline" onClick={prevStep}>
-                Previous
+                        {/* Expanded form content for current step */}
+                        {isCurrent && <div className="mt-3">{renderStepContent()}</div>}
+                      </div>
+                    </div>
+                  );
+                })}
+              </form>
+            </div>
+
+            {/* Bottom bar */}
+            <div className="flex items-center justify-end space-x-3 border-t border-border px-6 py-3">
+              <Button type="button" variant="outline" onClick={handleClose}>
+                Cancel
               </Button>
-            )}
-            {currentStep < stepConfigs.length - 1 ? (
-              <Button type="button" onClick={nextStep}>
-                Next
-              </Button>
-            ) : (
-              <Button type="button" onClick={handleSubmit} disabled={loading}>
-                {loading && <UiLoadingSpinner className="size-4" />}
-                Create Guardrail
-              </Button>
-            )}
+              {currentStep > 0 && (
+                <Button type="button" variant="outline" onClick={prevStep}>
+                  Previous
+                </Button>
+              )}
+              {currentStep < stepConfigs.length - 1 ? (
+                <Button type="button" onClick={nextStep}>
+                  Next
+                </Button>
+              ) : (
+                <Button type="button" onClick={handleSubmit} disabled={loading}>
+                  {loading && <UiLoadingSpinner className="size-4" />}
+                  Create Guardrail
+                </Button>
+              )}
+            </div>
           </div>
-        </div>
-      </TooltipProvider>
-    </Modal>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.test.tsx
index d81eaa5a4fc..25f63ca2902 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_garden_card.test.tsx
@@ -4,10 +4,6 @@ import userEvent from "@testing-library/user-event";
 import GuardrailCard from "./guardrail_garden_card";
 import type { GuardrailCardInfo } from "./guardrail_garden_data";
 
-vi.mock("@ant-design/icons", () => ({
-  CheckCircleFilled: ({ style, ...props }: any) => <span data-testid="check-icon" {...props} />,
-}));
-
 const baseCard: GuardrailCardInfo = {
   id: "test-guard",
   name: "Test Guardrail",
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.characterization.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.characterization.test.tsx
index d1b5c49bacd..5d16e899408 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.characterization.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.characterization.test.tsx
@@ -3,6 +3,7 @@ import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import GuardrailInfoView from "./guardrail_info";
+import { chooseSelectOption } from "@/../tests/test-utils";
 
 vi.mock("@/components/networking", () => ({
   getGuardrailInfo: vi.fn(),
@@ -152,8 +153,11 @@ describe("GuardrailInfoView update payload characterization", () => {
     renderView();
     await openEditor(user);
 
-    await user.click(screen.getByLabelText("Skip system messages in guardrail"));
-    await user.click(await screen.findByText("Yes — exclude from guardrail scan"));
+    await chooseSelectOption(
+      user,
+      screen.getByLabelText("Skip system messages in guardrail"),
+      /exclude from guardrail scan/,
+    );
     await saveChanges(user);
 
     await waitFor(() => expect(networking.updateGuardrailCall).toHaveBeenCalledTimes(1));
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.test.tsx
index b6ee130d50a..4f1ac3e7d7a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.test.tsx
@@ -153,7 +153,7 @@ describe("Guardrail Info", () => {
       expect(getByText("Guardrail Settings")).toBeInTheDocument();
     });
 
-    await userEvent.hover(within(container).getByRole("img", { name: "info-circle" }));
+    await userEvent.hover(within(container).getByRole("img", { name: "Config guardrail details" }));
 
     expect(await findByText("Guardrail is defined in the config file and cannot be edited.")).toBeInTheDocument();
   });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
index f89e8a3248c..8f3ec6185fd 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
@@ -5,9 +5,8 @@ import {
   updateGuardrailCall,
 } from "@/components/networking";
 import { copyToClipboard as utilCopyToClipboard } from "@/utils/dataUtils";
-import { EyeInvisibleOutlined, InfoCircleOutlined, StopOutlined } from "@ant-design/icons";
 
-import { ArrowLeft, CheckIcon, Code, CopyIcon } from "lucide-react";
+import { ArrowLeft, Ban, CheckIcon, Code, CopyIcon, EyeOff, Info } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Card } from "@/components/ui/card";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -607,7 +606,7 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                                 value === "MASK" ? "text-blue-600" : "text-red-600"
                               }`}
                             >
-                              {value === "MASK" ? <EyeInvisibleOutlined /> : <StopOutlined />}
+                              {value === "MASK" ? <EyeOff className="size-3.5" /> : <Ban className="size-3.5" />}
                               {String(value)}
                             </span>
                           </p>
@@ -667,7 +666,7 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
                   <h3 className="text-lg font-medium">Guardrail Settings</h3>
                   {isConfigGuardrail && (
                     <SimpleTooltip content="Guardrail is defined in the config file and cannot be edited.">
-                      <InfoCircleOutlined />
+                      <Info role="img" aria-label="Config guardrail details" className="size-4 text-muted-foreground" />
                     </SimpleTooltip>
                   )}
                   {!isEditing &&
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx
index 09016bda266..77a77596bed 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/AwsSigV4Fields.tsx
@@ -1,9 +1,11 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Input, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
+import { PasswordInput } from "@/components/shared/PasswordInput";
+import { Input } from "@/components/ui/input";
 import { requiredWhenSiblingSet, textControl } from "./mcpFieldRules";
 
 const fieldClassName = "rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500";
@@ -11,9 +13,9 @@ const fieldClassName = "rounded-lg border-gray-300 focus:border-blue-500 focus:r
 const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, tooltip }) => (
   <span className="text-sm font-medium text-gray-700 flex items-center">
     {label}
-    <Tooltip title={tooltip}>
-      <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-    </Tooltip>
+    <SimpleTooltip content={tooltip}>
+      <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+    </SimpleTooltip>
   </span>
 );
 
@@ -71,10 +73,10 @@ const AwsSigV4Fields: React.FC = () => (
       }}
     >
       {(control) => (
-        <Input.Password
+        <PasswordInput
           {...textControl(control)}
           placeholder="AKIA... (optional — uses IAM role if blank)"
-          className={fieldClassName}
+          groupClassName={fieldClassName}
         />
       )}
     </MountedFormField>
@@ -94,10 +96,10 @@ const AwsSigV4Fields: React.FC = () => (
       }}
     >
       {(control) => (
-        <Input.Password
+        <PasswordInput
           {...textControl(control)}
           placeholder="Enter secret key (optional — uses IAM role if blank)"
-          className={fieldClassName}
+          groupClassName={fieldClassName}
         />
       )}
     </MountedFormField>
@@ -106,10 +108,10 @@ const AwsSigV4Fields: React.FC = () => (
       name={["credentials", "aws_session_token"]}
     >
       {(control) => (
-        <Input.Password
+        <PasswordInput
           {...textControl(control)}
           placeholder="Enter session token (optional)"
-          className={fieldClassName}
+          groupClassName={fieldClassName}
         />
       )}
     </MountedFormField>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.integration.test.tsx
index 29887989cb7..6ab11d1c9ea 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.integration.test.tsx
@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import * as networking from "@/components/networking";
 import { setToken } from "@/utils/mcpTokenStore";
 import CreateMCPServer from "./CreateMCPServer";
-import { selectAntOption } from "./testUtils";
+import { selectOption } from "./testUtils";
 
 vi.mock("@/components/networking", () => ({
   createMCPServer: vi.fn(),
@@ -129,7 +129,7 @@ describe("CreateMCPServer", () => {
     expect(screen.getByText("Submit MCP Server for Review")).toBeInTheDocument();
     expect(screen.queryByText("Add New MCP Server")).not.toBeInTheDocument();
 
-    await selectAntOption("Transport Type", "Streamable HTTP");
+    await selectOption("Transport Type", "Streamable HTTP");
     await waitFor(() => {
       expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
     });
@@ -141,7 +141,7 @@ describe("CreateMCPServer", () => {
         target: { value: "https://example.com/mcp" },
       });
     });
-    await selectAntOption("Authentication", "None");
+    await selectOption("Authentication", "None");
 
     vi.mocked(networking.registerMCPServer).mockResolvedValue({
       server_id: "submitted-1",
@@ -167,7 +167,7 @@ describe("CreateMCPServer", () => {
   it("should show transport type options", async () => {
     render(<CreateMCPServer {...defaultProps} />);
 
-    await selectAntOption("Transport Type", "Streamable HTTP");
+    await selectOption("Transport Type", "Streamable HTTP");
 
     // Verify the option was applied by checking the URL field appears
     await waitFor(() => {
@@ -178,7 +178,7 @@ describe("CreateMCPServer", () => {
   describe("when HTTP transport is selected", () => {
     async function selectHttpTransport() {
       render(<CreateMCPServer {...defaultProps} />);
-      await selectAntOption("Transport Type", "Streamable HTTP");
+      await selectOption("Transport Type", "Streamable HTTP");
 
       // Wait for URL field to appear (confirms transport was set)
       await waitFor(() => {
@@ -201,7 +201,7 @@ describe("CreateMCPServer", () => {
     it("should show auth value field when API Key auth type is selected", async () => {
       await selectHttpTransport();
 
-      await selectAntOption("Authentication", "API Key");
+      await selectOption("Authentication", "API Key");
 
       await waitFor(() => {
         expect(screen.getByText("Authentication Value")).toBeInTheDocument();
@@ -211,7 +211,7 @@ describe("CreateMCPServer", () => {
     it("should warn that LiteLLM auth is disabled when True Passthrough is selected", async () => {
       await selectHttpTransport();
 
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
       await waitFor(() => {
         expect(
@@ -223,7 +223,7 @@ describe("CreateMCPServer", () => {
     it("should not show the True Passthrough warning when OAuth Delegate is selected", async () => {
       await selectHttpTransport();
 
-      await selectAntOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
+      await selectOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
 
       await waitFor(() => {
         expect(screen.getAllByText("OAuth Delegate (client-supplied upstream token)").length).toBeGreaterThan(0);
@@ -238,7 +238,7 @@ describe("CreateMCPServer", () => {
       async (optionLabel) => {
         await selectHttpTransport();
 
-        await selectAntOption("Authentication", optionLabel);
+        await selectOption("Authentication", optionLabel);
 
         await waitFor(() => {
           expect(screen.getByRole("button", { name: "Authorize & Fetch Tools (browser-only)" })).toBeInTheDocument();
@@ -251,7 +251,7 @@ describe("CreateMCPServer", () => {
     it("should not show the browser-only authorize section for API Key auth", async () => {
       await selectHttpTransport();
 
-      await selectAntOption("Authentication", "API Key");
+      await selectOption("Authentication", "API Key");
 
       await waitFor(() => {
         expect(screen.getByText("Authentication Value")).toBeInTheDocument();
@@ -273,7 +273,7 @@ describe("CreateMCPServer", () => {
       fireEvent.change(urlInput, { target: { value: "https://example.com/mcp" } });
 
       // Select API Key auth type
-      await selectAntOption("Authentication", "API Key");
+      await selectOption("Authentication", "API Key");
 
       await waitFor(() => {
         expect(screen.getByText("Authentication Value")).toBeInTheDocument();
@@ -315,7 +315,7 @@ describe("CreateMCPServer", () => {
       const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
       fireEvent.change(urlInput, { target: { value: "https://example.com/mcp" } });
 
-      await selectAntOption("Authentication", "Bearer Token");
+      await selectOption("Authentication", "Bearer Token");
 
       await waitFor(() => {
         expect(screen.getByText("Authentication Value")).toBeInTheDocument();
@@ -356,7 +356,7 @@ describe("CreateMCPServer", () => {
       const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
       fireEvent.change(urlInput, { target: { value: "https://example.com/mcp" } });
 
-      await selectAntOption("Authentication", "API Key");
+      await selectOption("Authentication", "API Key");
 
       await waitFor(() => {
         expect(screen.getByText("Authentication Value")).toBeInTheDocument();
@@ -402,7 +402,7 @@ describe("CreateMCPServer", () => {
         target: { value: "https://example.com/mcp" },
       });
 
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
       // Simulate the browser Authorize & Fetch flow handing back an upstream token.
       await waitFor(() => expect(oauthHook.onTokenReceived).toBeTruthy());
@@ -430,7 +430,7 @@ describe("CreateMCPServer", () => {
         target: { value: "https://example.com/mcp" },
       });
 
-      await selectAntOption("Authentication", optionLabel);
+      await selectOption("Authentication", optionLabel);
 
       await waitFor(() => expect(oauthHook.onTokenReceived).toBeTruthy());
       await act(async () => {
@@ -496,7 +496,7 @@ describe("CreateMCPServer", () => {
           target: { value: "https://example.com/mcp" },
         });
 
-        await selectAntOption("Authentication", optionLabel);
+        await selectOption("Authentication", optionLabel);
 
         // Admin declares the org's pre-registered upstream app; unlike the browser-authorized
         // token, this is config and must survive onto the server row so internal users'
@@ -560,7 +560,7 @@ describe("CreateMCPServer", () => {
         target: { value: "https://example.com/mcp" },
       });
 
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
       fireEvent.change(screen.getByPlaceholderText("Leave blank to use dynamic client registration"), {
         target: { value: "org-app-client-id" },
@@ -620,7 +620,7 @@ describe("CreateMCPServer", () => {
         target: { value: "https://example.com/mcp" },
       });
 
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
 
       // The oauth2 onTokenReceived branch writes the fetched token AND the DCR client into
       // form.credentials; both are minted for the oauth2 identity.
@@ -635,7 +635,7 @@ describe("CreateMCPServer", () => {
       // Switching into a client-forwarded mode changes the identity with auth_type in the changed
       // values, so the preserve carve-out must NOT apply: the minted material would otherwise ride
       // into a mode that now persists credentials onto the server row.
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
       const switchedServer = {
         server_id: "switched-server",
@@ -669,7 +669,7 @@ describe("CreateMCPServer", () => {
       fireEvent.change(screen.getByPlaceholderText("https://your-mcp-server.com"), {
         target: { value: "https://example.com/mcp" },
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
 
       await waitFor(() => expect(oauthHook.onTokenReceived).toBeTruthy());
       await act(async () => {
@@ -689,14 +689,14 @@ describe("CreateMCPServer", () => {
 
     it("clears the DCR ref and the upstream warning when the modal closes so nothing leaks to the next session", async () => {
       const { rerender } = render(<CreateMCPServer {...defaultProps} />);
-      await selectAntOption("Transport Type", "Streamable HTTP");
+      await selectOption("Transport Type", "Streamable HTTP");
       expect(await screen.findByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
       const user = userEvent.setup({ delay: null });
       fireEvent.change(getServerNameInput(), { target: { value: "Leak_Server" } });
       fireEvent.change(screen.getByPlaceholderText("https://your-mcp-server.com"), {
         target: { value: "https://example.com/mcp" },
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
 
       await waitFor(() => expect(oauthHook.onTokenReceived).toBeTruthy());
       await act(async () => {
@@ -725,7 +725,7 @@ describe("CreateMCPServer", () => {
       fireEvent.change(screen.getByPlaceholderText("https://your-mcp-server.com"), {
         target: { value: "https://example.com/mcp" },
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
 
       await waitFor(() => expect(oauthHook.onTokenReceived).toBeTruthy());
       await act(async () => {
@@ -767,7 +767,7 @@ describe("CreateMCPServer", () => {
       await selectHttpTransport();
       fillText(getServerNameInput(), "CF_Switch_Keep");
       fillText(screen.getByPlaceholderText("https://your-mcp-server.com"), "https://example.com/mcp");
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
       fillText(screen.getByPlaceholderText("Leave blank to use dynamic client registration"), "app-id");
       fillText(screen.getByPlaceholderText("Leave blank for public clients / PKCE"), "app-secret");
 
@@ -776,7 +776,7 @@ describe("CreateMCPServer", () => {
         oauthHook.onTokenReceived!({ access_token: "cf-tok", token_type: "Bearer" }, undefined);
       });
 
-      await selectAntOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
+      await selectOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
 
       const switched = {
         server_id: "cf-switch-keep",
@@ -804,7 +804,7 @@ describe("CreateMCPServer", () => {
       await selectHttpTransport();
       fillText(getServerNameInput(), "CF_Round");
       fillText(screen.getByPlaceholderText("https://your-mcp-server.com"), "https://example.com/mcp");
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
       fillText(screen.getByPlaceholderText("Leave blank to use dynamic client registration"), "app-id");
       fillText(screen.getByPlaceholderText("Leave blank for public clients / PKCE"), "app-secret");
 
@@ -813,8 +813,8 @@ describe("CreateMCPServer", () => {
         oauthHook.onTokenReceived!({ access_token: "cf-tok", token_type: "Bearer" }, undefined);
       });
 
-      await selectAntOption("Authentication", "OAuth");
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "OAuth");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
       const cfRoundServer = {
         server_id: "cf-round",
@@ -845,7 +845,7 @@ describe("CreateMCPServer", () => {
       fireEvent.change(screen.getByPlaceholderText("https://your-mcp-server.com"), {
         target: { value: "https://example.com/mcp" },
       });
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
       fireEvent.change(screen.getByPlaceholderText("Leave blank to use dynamic client registration"), {
         target: { value: "app-id" },
       });
@@ -871,7 +871,7 @@ describe("CreateMCPServer", () => {
       fireEvent.change(screen.getByPlaceholderText("https://your-mcp-server.com"), {
         target: { value: "https://example.com/mcp" },
       });
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
       fireEvent.change(screen.getByPlaceholderText("Leave blank to use dynamic client registration"), {
         target: { value: "app-id" },
       });
@@ -919,7 +919,7 @@ describe("CreateMCPServer", () => {
       fireEvent.change(screen.getByPlaceholderText("https://your-mcp-server.com"), {
         target: { value: "https://example.com/mcp" },
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
 
       await waitFor(() => expect(oauthHook.onTokenReceived).toBeTruthy());
       const firstToken = { access_token: "T1", refresh_token: "R1", scope: "read", token_type: "Bearer" };
@@ -939,7 +939,7 @@ describe("CreateMCPServer", () => {
     it("should not show auth value field when None auth type is selected", async () => {
       await selectHttpTransport();
 
-      await selectAntOption("Authentication", "None");
+      await selectOption("Authentication", "None");
 
       // Auth value field should not appear for "None"
       await waitFor(() => {
@@ -958,7 +958,7 @@ describe("CreateMCPServer", () => {
       const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
       fireEvent.change(urlInput, { target: { value: "https://example.com/mcp" } });
 
-      await selectAntOption("Authentication", "None");
+      await selectOption("Authentication", "None");
 
       vi.mocked(networking.createMCPServer).mockResolvedValue({
         server_id: "new-server-1",
@@ -992,20 +992,20 @@ describe("CreateMCPServer", () => {
       await selectHttpTransport();
 
       // Plain OAuth must not render the token-exchange section.
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
       await waitFor(() => {
         expect(screen.queryByText("Token Exchange Endpoint (optional)")).not.toBeInTheDocument();
       });
       expect(screen.queryByText("Subject Token Type (optional)")).not.toBeInTheDocument();
 
-      await selectAntOption("Authentication", "OAuth Token Exchange (OBO)");
+      await selectOption("Authentication", "OAuth Token Exchange (OBO)");
       await waitFor(() => {
         expect(screen.getByText("Token Exchange Endpoint (optional)")).toBeInTheDocument();
       });
       expect(screen.getByText("Subject Token Type (optional)")).toBeInTheDocument();
 
       // Switching away hides the section again.
-      await selectAntOption("Authentication", "API Key");
+      await selectOption("Authentication", "API Key");
       await waitFor(() => {
         expect(screen.queryByText("Token Exchange Endpoint (optional)")).not.toBeInTheDocument();
       });
@@ -1015,11 +1015,11 @@ describe("CreateMCPServer", () => {
       // whole Authentication section (the section-level transport gate), taking the
       // token-exchange fields with it — their required client_id/client_secret rules
       // cannot block a stdio submit because antd does not validate unmounted fields.
-      await selectAntOption("Authentication", "OAuth Token Exchange (OBO)");
+      await selectOption("Authentication", "OAuth Token Exchange (OBO)");
       await waitFor(() => {
         expect(screen.getByText("Token Exchange Endpoint (optional)")).toBeInTheDocument();
       });
-      await selectAntOption("Transport Type", "Standard Input/Output");
+      await selectOption("Transport Type", "Standard Input/Output");
       await waitFor(() => {
         expect(screen.queryByText("Token Exchange Endpoint (optional)")).not.toBeInTheDocument();
       });
@@ -1037,7 +1037,7 @@ describe("CreateMCPServer", () => {
       const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
       fireEvent.change(urlInput, { target: { value: "https://example.com/mcp" } });
 
-      await selectAntOption("Authentication", "None");
+      await selectOption("Authentication", "None");
 
       const limitInput = screen.getByPlaceholderText("e.g. 10");
       fireEvent.change(limitInput, { target: { value: "5" } });
@@ -1079,7 +1079,7 @@ describe("CreateMCPServer", () => {
       const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
       fireEvent.change(urlInput, { target: { value: "https://upstream.example.com/mcp" } });
 
-      await selectAntOption("Authentication", "OAuth Token Exchange (OBO)");
+      await selectOption("Authentication", "OAuth Token Exchange (OBO)");
 
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://idp.example.com/oauth2/token")).toBeInTheDocument();
@@ -1131,20 +1131,20 @@ describe("CreateMCPServer", () => {
       await selectHttpTransport();
 
       // The sibling OBO mode must not render the ID-JAG section.
-      await selectAntOption("Authentication", "OAuth Token Exchange (OBO)");
+      await selectOption("Authentication", "OAuth Token Exchange (OBO)");
       await waitFor(() => {
         expect(screen.queryByText("Org Token Endpoint (leg 1)")).not.toBeInTheDocument();
       });
       expect(screen.queryByText("Resource Token Endpoint (leg 2)")).not.toBeInTheDocument();
 
-      await selectAntOption("Authentication", "ID-JAG (Okta Cross App Access)");
+      await selectOption("Authentication", "ID-JAG (Okta Cross App Access)");
       await waitFor(() => {
         expect(screen.getByText("Org Token Endpoint (leg 1)")).toBeInTheDocument();
       });
       expect(screen.getByText("Resource Token Endpoint (leg 2)")).toBeInTheDocument();
       expect(screen.getByText("Client Private Key (PEM)")).toBeInTheDocument();
 
-      await selectAntOption("Authentication", "API Key");
+      await selectOption("Authentication", "API Key");
       await waitFor(() => {
         expect(screen.queryByText("Org Token Endpoint (leg 1)")).not.toBeInTheDocument();
       });
@@ -1159,7 +1159,7 @@ describe("CreateMCPServer", () => {
         target: { value: "https://upstream.example.com/mcp" },
       });
 
-      await selectAntOption("Authentication", "ID-JAG (Okta Cross App Access)");
+      await selectOption("Authentication", "ID-JAG (Okta Cross App Access)");
 
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://your-org.okta.com/oauth2/v1/token")).toBeInTheDocument();
@@ -1222,7 +1222,7 @@ describe("CreateMCPServer", () => {
         target: { value: "https://upstream.example.com/mcp" },
       });
 
-      await selectAntOption("Authentication", "ID-JAG (Okta Cross App Access)");
+      await selectOption("Authentication", "ID-JAG (Okta Cross App Access)");
 
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://your-org.okta.com/oauth2/v1/token")).toBeInTheDocument();
@@ -1259,12 +1259,12 @@ describe("CreateMCPServer", () => {
         target: { value: "https://upstream.example.com/mcp" },
       });
 
-      await selectAntOption("Authentication", "OAuth Token Exchange (OBO)");
+      await selectOption("Authentication", "OAuth Token Exchange (OBO)");
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://idp.example.com/oauth2/token")).toBeInTheDocument();
       });
 
-      await selectAntOption("Profile", "Microsoft Entra OBO");
+      await selectOption("Profile", "Microsoft Entra OBO");
 
       fireEvent.change(screen.getByPlaceholderText("https://idp.example.com/oauth2/token"), {
         target: { value: "https://login.microsoftonline.com/tenant/oauth2/v2.0/token" },
@@ -1301,7 +1301,7 @@ describe("CreateMCPServer", () => {
       const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
       fireEvent.change(urlInput, { target: { value: "https://example.com/mcp" } });
 
-      await selectAntOption("Authentication", "None");
+      await selectOption("Authentication", "None");
 
       await act(async () => {
         fireEvent.click(screen.getByRole("button", { name: "Disable all tools" }));
@@ -1339,13 +1339,13 @@ describe("CreateMCPServer", () => {
     /** Select HTTP transport + OAuth auth, then wait for the OAuth form to appear. */
     async function setupOAuthInteractive() {
       render(<CreateMCPServer {...defaultProps} />);
-      await selectAntOption("Transport Type", "Streamable HTTP");
+      await selectOption("Transport Type", "Streamable HTTP");
 
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
       });
 
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
 
       // Wait for OAuthFormFields to render (OAuth Flow Type selector is the sentinel)
       await waitFor(() => {
@@ -1376,7 +1376,7 @@ describe("CreateMCPServer", () => {
       oauthHook.reset.mockClear();
 
       // Switching the Authentication mode changes the OAuth identity, so the held token is discarded.
-      await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+      await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
       await waitFor(() => expect(oauthHook.reset).toHaveBeenCalled());
     });
@@ -1421,7 +1421,7 @@ describe("CreateMCPServer", () => {
       });
       vi.mocked(networking.testMCPToolsListRequest).mockClear();
 
-      await selectAntOption("Authentication", "API Key");
+      await selectOption("Authentication", "API Key");
 
       await waitFor(() => expect(vi.mocked(networking.testMCPToolsListRequest)).toHaveBeenCalled());
       for (const call of vi.mocked(networking.testMCPToolsListRequest).mock.calls) {
@@ -1443,7 +1443,7 @@ describe("CreateMCPServer", () => {
       });
       oauthHook.reset.mockClear();
 
-      await selectAntOption("Transport Type", "Server-Sent Events (SSE)");
+      await selectOption("Transport Type", "Server-Sent Events (SSE)");
 
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
@@ -1545,11 +1545,11 @@ describe("CreateMCPServer", () => {
 
     it("invalidates the DCR client and OAuth flow when the OpenAPI spec URL changes after Authorize & Fetch", async () => {
       render(<CreateMCPServer {...defaultProps} />);
-      await selectAntOption("Transport Type", "OpenAPI Spec");
+      await selectOption("Transport Type", "OpenAPI Spec");
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://petstore3.swagger.io/api/v3/openapi.json")).toBeInTheDocument();
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
       await waitFor(() => {
         expect(screen.getByText("OAuth Flow Type")).toBeInTheDocument();
       });
@@ -1601,11 +1601,11 @@ describe("CreateMCPServer", () => {
 
     it("invalidates the DCR client and OAuth flow when the transport changes after Authorize & Fetch", async () => {
       render(<CreateMCPServer {...defaultProps} />);
-      await selectAntOption("Transport Type", "OpenAPI Spec");
+      await selectOption("Transport Type", "OpenAPI Spec");
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://petstore3.swagger.io/api/v3/openapi.json")).toBeInTheDocument();
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
       await waitFor(() => {
         expect(screen.getByText("OAuth Flow Type")).toBeInTheDocument();
       });
@@ -1624,7 +1624,7 @@ describe("CreateMCPServer", () => {
       });
       oauthHook.reset.mockClear();
 
-      await selectAntOption("Transport Type", "Streamable HTTP");
+      await selectOption("Transport Type", "Streamable HTTP");
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
       });
@@ -1688,7 +1688,7 @@ describe("CreateMCPServer", () => {
         fireEvent.change(urlInput, { target: { value: "https://example.com/mcp" } });
       });
 
-      await selectAntOption("Token Endpoint Auth Method (optional)", "Client Secret Basic");
+      await selectOption("Token Endpoint Auth Method (optional)", "Client Secret Basic");
 
       const submitButton = screen.getByRole("button", { name: "Add MCP Server" });
       await act(async () => {
@@ -1804,11 +1804,11 @@ describe("CreateMCPServer", () => {
 
       const { rerender } = render(<CreateMCPServer {...defaultProps} />);
 
-      await selectAntOption("Transport Type", "Streamable HTTP");
+      await selectOption("Transport Type", "Streamable HTTP");
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
       await waitFor(() => {
         expect(screen.getByText("OAuth Flow Type")).toBeInTheDocument();
       });
@@ -1858,11 +1858,11 @@ describe("CreateMCPServer", () => {
 
       const { rerender } = render(<CreateMCPServer {...defaultProps} />);
 
-      await selectAntOption("Transport Type", "Streamable HTTP");
+      await selectOption("Transport Type", "Streamable HTTP");
       await waitFor(() => {
         expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
       });
-      await selectAntOption("Authentication", "OAuth");
+      await selectOption("Authentication", "OAuth");
       await waitFor(() => {
         expect(screen.getByText("OAuth Flow Type")).toBeInTheDocument();
       });
@@ -1883,15 +1883,15 @@ describe("CreateMCPServer", () => {
       // Parent dismisses the modal without routing through Cancel or create.
       rerender(<CreateMCPServer {...defaultProps} isModalVisible={false} />);
 
-      // Stale tools are cleared even though neither handler ran.
       await waitFor(() => {
-        expect(toolCount()).toBe("0");
+        expect(screen.queryByTestId("mcp-connection-status")).not.toBeInTheDocument();
       });
 
-      // Reopening starts clean: the URL the prior server left in the Ant form store is gone.
+      // Reopening starts clean: neither the prior server's URL nor its tool list survives.
       rerender(<CreateMCPServer {...defaultProps} isModalVisible={true} />);
       const reopenedUrlInput = screen.getByPlaceholderText("https://your-mcp-server.com") as HTMLInputElement;
       expect(reopenedUrlInput.value).toBe("");
+      expect(toolCount()).toBe("0");
     });
 
     it("does not reset an in-flight OAuth resume when mounted with the modal closed (post-redirect restore)", () => {
@@ -1915,7 +1915,7 @@ describe("CreateMCPServer", () => {
     it("should not show auth type or URL fields", async () => {
       render(<CreateMCPServer {...defaultProps} />);
 
-      await selectAntOption("Transport Type", "Standard Input/Output");
+      await selectOption("Transport Type", "Standard Input/Output");
 
       // Auth and URL fields should not be present for stdio
       await waitFor(() => {
@@ -1984,7 +1984,7 @@ describe("CreateMCPServer oauth2_flow persistence", () => {
 
   async function setupHttpServerForm() {
     render(<CreateMCPServer {...defaultProps} />);
-    await selectAntOption("Transport Type", "Streamable HTTP");
+    await selectOption("Transport Type", "Streamable HTTP");
     await waitFor(() => {
       expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
     });
@@ -2013,7 +2013,7 @@ describe("CreateMCPServer oauth2_flow persistence", () => {
   it("persists authorization_code for an interactive OAuth create", async () => {
     vi.mocked(networking.createMCPServer).mockResolvedValue(createdServer);
     await setupHttpServerForm();
-    await selectAntOption("Authentication", "OAuth");
+    await selectOption("Authentication", "OAuth");
     await waitFor(() => {
       expect(screen.getByText("OAuth Flow Type")).toBeInTheDocument();
     });
@@ -2026,11 +2026,11 @@ describe("CreateMCPServer oauth2_flow persistence", () => {
   it("persists client_credentials for an M2M OAuth create", async () => {
     vi.mocked(networking.createMCPServer).mockResolvedValue({ ...createdServer, oauth2_flow: "client_credentials" });
     await setupHttpServerForm();
-    await selectAntOption("Authentication", "OAuth");
+    await selectOption("Authentication", "OAuth");
     await waitFor(() => {
       expect(screen.getByText("OAuth Flow Type")).toBeInTheDocument();
     });
-    await selectAntOption("OAuth Flow Type", "Machine-to-Machine (M2M)");
+    await selectOption("OAuth Flow Type", "Machine-to-Machine (M2M)");
     await waitFor(() => {
       expect(screen.getByPlaceholderText("Enter OAuth client ID")).toBeInTheDocument();
     });
@@ -2074,11 +2074,11 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
     updated_by: "user-1",
   };
 
-  const getDcrToggle = () => document.getElementById("dcr_bridge");
+  const getDcrToggle = () => screen.queryByRole("switch", { name: /Gateway-hosted sign-in \(DCR bridge\)/ });
 
   async function setupHttpServerForm() {
     render(<CreateMCPServer {...defaultProps} />);
-    await selectAntOption("Transport Type", "Streamable HTTP");
+    await selectOption("Transport Type", "Streamable HTTP");
     await waitFor(() => {
       expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
     });
@@ -2109,7 +2109,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
     async (optionLabel) => {
       await setupHttpServerForm();
 
-      await selectAntOption("Authentication", optionLabel);
+      await selectOption("Authentication", optionLabel);
 
       await waitFor(() => {
         expect(getDcrToggle()).toBeInTheDocument();
@@ -2122,7 +2122,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
   it.each([["None"], ["API Key"], ["OAuth"]])("does not render the toggle for %s", async (optionLabel) => {
     await setupHttpServerForm();
 
-    await selectAntOption("Authentication", optionLabel);
+    await selectOption("Authentication", optionLabel);
 
     await waitFor(() => {
       expect(screen.queryByText("Gateway-hosted sign-in (DCR bridge)")).not.toBeInTheDocument();
@@ -2133,7 +2133,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
   it("renders the toggle between the OAuth client fields and the Authorize button", async () => {
     await setupHttpServerForm();
 
-    await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+    await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
     await waitFor(() => {
       expect(getDcrToggle()).toBeInTheDocument();
@@ -2151,7 +2151,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
   ])("sends dcr_bridge: true by default on create for %s", async (authType, optionLabel) => {
     vi.mocked(networking.createMCPServer).mockResolvedValue({ ...createdServer, auth_type: authType });
     await setupHttpServerForm();
-    await selectAntOption("Authentication", optionLabel);
+    await selectOption("Authentication", optionLabel);
     await waitFor(() => {
       expect(getDcrToggle()).toBeInTheDocument();
     });
@@ -2163,7 +2163,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
   it("sends an explicit dcr_bridge: false when the toggle is unchecked", async () => {
     vi.mocked(networking.createMCPServer).mockResolvedValue({ ...createdServer, auth_type: "oauth_delegate" });
     await setupHttpServerForm();
-    await selectAntOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
+    await selectOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
     await waitFor(() => {
       expect(getDcrToggle()).toBeInTheDocument();
     });
@@ -2184,7 +2184,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
   it("forces dcr_bridge: false when the auth type is switched away after toggling", async () => {
     vi.mocked(networking.createMCPServer).mockResolvedValue({ ...createdServer, auth_type: "none" });
     await setupHttpServerForm();
-    await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+    await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
     await waitFor(() => {
       expect(getDcrToggle()).toBeInTheDocument();
     });
@@ -2192,7 +2192,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
       fireEvent.click(getDcrToggle()!);
     });
 
-    await selectAntOption("Authentication", "None");
+    await selectOption("Authentication", "None");
     await waitFor(() => {
       expect(getDcrToggle()).not.toBeInTheDocument();
     });
@@ -2204,7 +2204,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
   it("preserves the toggle value when switching between the two client-forwarded modes", async () => {
     vi.mocked(networking.createMCPServer).mockResolvedValue({ ...createdServer, auth_type: "oauth_delegate" });
     await setupHttpServerForm();
-    await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+    await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
     await waitFor(() => {
       expect(getDcrToggle()).toBeInTheDocument();
     });
@@ -2212,7 +2212,7 @@ describe("CreateMCPServer dcr_bridge toggle", () => {
 
     // The field is mounted in both client-forwarded modes, so switching between them keeps the
     // live toggle value rather than forcing it back to the default or to false.
-    await selectAntOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
+    await selectOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
     await waitFor(() => {
       expect(getDcrToggle()).toBeInTheDocument();
     });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.permissions.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.permissions.integration.test.tsx
index 788be106d8a..c73a0d63252 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.permissions.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.permissions.integration.test.tsx
@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import * as networking from "@/components/networking";
 import CreateMCPServer from "./CreateMCPServer";
-import { selectAntOption } from "./testUtils";
+import { selectOption } from "./testUtils";
 
 vi.mock("@/components/networking", () => ({
   createMCPServer: vi.fn(),
@@ -58,25 +58,29 @@ const defaultProps = {
 
 const getServerNameInput = () => document.getElementById("server_name") as HTMLInputElement;
 
-const switchFor = (labelText: string): HTMLElement => {
-  const label = screen.getByText(labelText);
-  const row = label.closest(".flex.items-start.justify-between");
-  const control = row?.querySelector("button[role='switch']");
-  if (control === null || control === undefined) {
-    throw new Error(`no switch found for "${labelText}"`);
+// The switches live behind a collapsed panel, so they only reach the accessibility tree once an
+// operator expands it.
+const expandPermissionPanel = async (): Promise<void> => {
+  const trigger = screen.getByRole("button", { name: /Permission Management/ });
+  if (trigger.getAttribute("aria-expanded") !== "true") {
+    await userEvent.setup({ delay: null }).click(trigger);
   }
-  return control as HTMLElement;
+};
+
+const switchFor = async (labelText: string): Promise<HTMLElement> => {
+  await expandPermissionPanel();
+  return screen.getByRole("switch", { name: labelText });
 };
 
 const fillMinimalHttpServer = async (name: string) => {
-  await selectAntOption("Transport Type", "Streamable HTTP");
+  await selectOption("Transport Type", "Streamable HTTP");
   await waitFor(() => {
     expect(screen.getByPlaceholderText("https://your-mcp-server.com")).toBeInTheDocument();
   });
   const user = userEvent.setup({ delay: null });
   await user.type(getServerNameInput(), name);
   await user.type(screen.getByPlaceholderText("https://your-mcp-server.com"), "https://example.com/mcp");
-  await selectAntOption("Authentication", "None");
+  await selectOption("Authentication", "None");
 };
 
 const submitAndReadPayload = async () => {
@@ -120,8 +124,9 @@ describe("CreateMCPServer permission toggles reaching the payload", () => {
     render(<CreateMCPServer {...defaultProps} />);
     await fillMinimalHttpServer("Perm_Server");
 
+    const allowAllKeys = await switchFor("Allow All LiteLLM Keys");
     await act(async () => {
-      fireEvent.click(switchFor("Allow All LiteLLM Keys"));
+      fireEvent.click(allowAllKeys);
     });
 
     const payload = await submitAndReadPayload();
@@ -133,7 +138,7 @@ describe("CreateMCPServer permission toggles reaching the payload", () => {
     render(<CreateMCPServer {...defaultProps} />);
     await fillMinimalHttpServer("Perm_Server");
 
-    const internalOnly = switchFor("Internal network only");
+    const internalOnly = await switchFor("Internal network only");
     expect(internalOnly).toHaveAttribute("aria-checked", "false");
 
     await act(async () => {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx
index 92bdd14754c..75680d2e03f 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/CreateMCPServer.tsx
@@ -1,9 +1,13 @@
 import React, { useState } from "react";
-import { Modal, Tooltip, Select, Input as AntdInput, InputNumber, Collapse } from "antd";
 import { FormProvider, useForm, useWatch } from "react-hook-form";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { ChevronDown, Info } from "lucide-react";
 import { Button } from "@/components/ui/button";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { SimpleTooltip } from "@/components/ui/tooltip";
+import { PasswordInput } from "@/components/shared/PasswordInput";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { createMCPServer, registerMCPServer, storeMCPOAuthUserCredential } from "@/components/networking";
 import { setToken } from "@/utils/mcpTokenStore";
@@ -14,6 +18,8 @@ import {
   MCPServer,
   MCPServerCostInfo,
   TRANSPORT,
+  TRANSPORT_ITEMS,
+  AUTH_TYPE_ITEMS,
   getMcpOAuthMode,
   MCP_OAUTH2_FLOW_M2M,
   isClientForwardedTokenMode,
@@ -59,7 +65,7 @@ import {
 } from "@/components/common_components/MountedFormField";
 import { antdRequired, antdRules } from "@/components/common_components/antdFormRules";
 import { allFieldsValue, mountedPaths, resetFields, setFieldsValue, singleBranchChange } from "./mcpFormStore";
-import { numberControl, notOnlyWhitespace, selectControl, textControl } from "./mcpFieldRules";
+import { numberControl, notOnlyWhitespace, selectControl, selectTriggerControl, textControl } from "./mcpFieldRules";
 import mcpLogo from "../../../../../public/assets/logos/mcp_logo.png";
 
 export const mcpLogoImg = mcpLogo.src;
@@ -121,7 +127,6 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
   const [toolNameToDescription, setToolNameToDescription] = useState<Record<string, string>>({});
   const [transportType, setTransportType] = useState<string>("");
   const [keyTools, setKeyTools] = useState<OpenAPIKeyTool[]>([]);
-  const [searchValue, setSearchValue] = useState<string>("");
   const [oauthAccessToken, setOauthAccessToken] = useState<string | null>(null);
   const [logoUrl, setLogoUrl] = useState<string | undefined>(undefined);
   const [oauthDocsUrl, setOauthDocsUrl] = useState<string | null>(null);
@@ -173,7 +178,6 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
       costConfig,
       allowedTools,
       hasToolAllowlistInteraction,
-      searchValue,
       aliasManuallyEdited,
       logoUrl,
       authorizedIdentity,
@@ -339,9 +343,6 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
     if (restored.hasToolAllowlistInteraction !== undefined) {
       setHasToolAllowlistInteraction(restored.hasToolAllowlistInteraction);
     }
-    if (restored.searchValue) {
-      setSearchValue(restored.searchValue);
-    }
     if (restored.aliasManuallyEdited !== undefined) {
       setAliasManuallyEdited(restored.aliasManuallyEdited);
     }
@@ -526,37 +527,13 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
     setFormValues(allFieldsValue(form));
   };
 
-  // Generate options with existing groups and potential new group
-  const getAccessGroupOptions = () => {
-    const existingOptions = availableAccessGroups.map((group: string) => ({
-      value: group,
-      label: (
-        <div className="flex items-center gap-2">
-          <div className="w-2 h-2 bg-green-500 rounded-full"></div>
-          <span className="font-medium">{group}</span>
-        </div>
-      ),
-    }));
-
-    // If search value doesn't match any existing group and is not empty, add "create new group" option
-    if (
-      searchValue &&
-      !availableAccessGroups.some((group) => group.toLowerCase().includes(searchValue.toLowerCase()))
-    ) {
-      existingOptions.push({
-        value: searchValue,
-        label: (
-          <div className="flex items-center gap-2">
-            <div className="w-2 h-2 bg-blue-500 rounded-full"></div>
-            <span className="font-medium">{searchValue}</span>
-            <span className="text-gray-400 text-xs ml-1">create new group</span>
-          </div>
-        ),
-      });
-    }
-
-    return existingOptions;
-  };
+  const handleTransportSelected =
+    (onChange: (value: string) => void) =>
+    (value: string | null): void => {
+      if (value === null) return;
+      onChange(value);
+      handleTransportChange(value);
+    };
 
   // Auto-populate alias from server_name unless manually edited
   React.useEffect(() => {
@@ -643,411 +620,369 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
 
   // rendering
   return (
-    <Modal
-      title={
-        <div className="flex items-center pb-4 border-b border-gray-100" style={{ gap: 12 }}>
-          {onBackToDiscovery && (
-            <button
-              onClick={onBackToDiscovery}
-              className="text-sm text-blue-600 hover:text-blue-800 cursor-pointer bg-transparent border-none"
-              style={{ flexShrink: 0 }}
-            >
-              &#8592;
-            </button>
-          )}
-          <img
-            src={mcpLogoImg}
-            alt="MCP Logo"
-            className="w-8 h-8 object-contain"
-            style={{
-              height: "20px",
-              width: "20px",
-              objectFit: "contain",
-            }}
-          />
-          <h2 className="text-xl font-semibold text-gray-900">
-            {isAdmin ? "Add New MCP Server" : "Submit MCP Server for Review"}
-          </h2>
-        </div>
-      }
-      open={isModalVisible}
-      width={1000}
-      onCancel={handleCancel}
-      footer={null}
-      forceRender
-      className="top-8"
-      styles={{
-        body: { padding: "24px" },
-        header: { padding: "24px 24px 0 24px", border: "none" },
-      }}
-    >
-      <div className="mt-6">
-        <FormProvider {...form}>
-          <MountedFormProvider value={{ control: form.control, registry }}>
-            <form onSubmit={handleSubmit} className="space-y-6">
-              {!isAdmin && (
-                <div className="rounded-md bg-blue-50 border border-blue-200 px-4 py-3 text-sm text-blue-800">
-                  Your submission will be sent for admin review. Once approved, the server will appear in your MCP
-                  Servers list. The request must be made with a team-scoped API key.
-                </div>
-              )}
-              <div className="grid grid-cols-1 gap-6">
-                <MountedFormField
-                  label={
-                    <span className="text-sm font-medium text-gray-700 flex items-center">
-                      MCP Server Name
-                      <Tooltip title="Best practice: Use a descriptive name that indicates the server's purpose (e.g., 'GitHub_MCP', 'Email_Service'). Cannot contain spaces or hyphens; use underscores instead. Names must comply with SEP-986 and will be rejected if invalid (https://modelcontextprotocol.io/specification/2025-11-25/server/tools#tool-names).">
-                        <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                      </Tooltip>
-                    </span>
-                  }
-                  name="server_name"
-                  rules={{ validate: antdRules({ validator: (_, value) => validateMCPServerName(value) }) }}
-                >
-                  {(control) => (
-                    <Input
-                      {...textControl(control)}
-                      placeholder="e.g., GitHub_MCP, Zapier_MCP, etc."
-                      className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
-                    />
-                  )}
-                </MountedFormField>
+    <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[1000px]">
+        <DialogHeader>
+          <div className="flex items-center gap-3 border-b border-border pb-4">
+            {onBackToDiscovery && (
+              <Button variant="link" size="sm" className="shrink-0 px-0" onClick={onBackToDiscovery}>
+                &#8592;
+              </Button>
+            )}
+            <img src={mcpLogoImg} alt="MCP Logo" className="size-5 object-contain" />
+            <DialogTitle className="text-xl font-semibold">
+              {isAdmin ? "Add New MCP Server" : "Submit MCP Server for Review"}
+            </DialogTitle>
+          </div>
+        </DialogHeader>
 
-                <MountedFormField
-                  label={
-                    <span className="text-sm font-medium text-gray-700 flex items-center">
-                      Alias
-                      <Tooltip title="A short, unique identifier for this server. Defaults to the server name if not provided. Cannot contain spaces or hyphens; use underscores instead.">
-                        <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                      </Tooltip>
-                    </span>
-                  }
-                  name="alias"
-                  rules={{ validate: antdRules({ validator: (_, value) => validateMCPServerName(value) }) }}
-                >
-                  {(control) => (
-                    <Input
-                      {...textControl(control)}
-                      placeholder="e.g., GitHub_MCP, Zapier_MCP, etc."
-                      className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
-                      onChange={(event) => {
-                        control.onChange(event);
-                        setAliasManuallyEdited(true);
-                      }}
-                    />
-                  )}
-                </MountedFormField>
-
-                <MountedFormField
-                  label={<span className="text-sm font-medium text-gray-700">Description</span>}
-                  name="description"
-                >
-                  {(control) => (
-                    <Input
-                      {...textControl(control)}
-                      placeholder="Brief description of what this server does"
-                      className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
-                    />
-                  )}
-                </MountedFormField>
-
-                <MCPLogoSelector value={logoUrl} onChange={setLogoUrl} />
-
-                <MountedFormField
-                  label={<span className="text-sm font-medium text-gray-700">GitHub / Source URL</span>}
-                  name="source_url"
-                >
-                  {(control) => (
-                    <Input
-                      {...textControl(control)}
-                      placeholder="https://github.com/org/mcp-server"
-                      className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
-                    />
-                  )}
-                </MountedFormField>
-
-                <MountedFormField
-                  label={<span className="text-sm font-medium text-gray-700">Transport Type</span>}
-                  name="transport"
-                  required
-                  rules={{ validate: { required: antdRequired("Please select a transport type") } }}
-                >
-                  {(control) => (
-                    <Select
-                      {...selectControl<string>(control)}
-                      placeholder="Select transport"
-                      className="rounded-lg"
-                      size="large"
-                      onChange={(value: string) => {
-                        control.onChange(value);
-                        handleTransportChange(value);
-                      }}
-                    >
-                      <Select.Option value="http">Streamable HTTP (Recommended)</Select.Option>
-                      <Select.Option value="sse">Server-Sent Events (SSE)</Select.Option>
-                      <Select.Option value="stdio">Standard Input/Output (stdio)</Select.Option>
-                      <Select.Option value={TRANSPORT.OPENAPI}>OpenAPI Spec</Select.Option>
-                    </Select>
-                  )}
-                </MountedFormField>
-
-                {/* URL field - only show for HTTP and SSE */}
-                {(transportType === "http" || transportType === "sse") && (
+        <div className="mt-6">
+          <FormProvider {...form}>
+            <MountedFormProvider value={{ control: form.control, registry }}>
+              <form onSubmit={handleSubmit} className="space-y-6">
+                {!isAdmin && (
+                  <div className="rounded-md bg-blue-50 border border-blue-200 px-4 py-3 text-sm text-blue-800">
+                    Your submission will be sent for admin review. Once approved, the server will appear in your MCP
+                    Servers list. The request must be made with a team-scoped API key.
+                  </div>
+                )}
+                <div className="grid grid-cols-1 gap-6">
                   <MountedFormField
-                    label={<span className="text-sm font-medium text-gray-700">MCP Server URL</span>}
-                    name="url"
-                    required
-                    rules={{
-                      validate: {
-                        required: antdRequired("Please enter a server URL"),
-                        ...antdRules({ validator: (_, value) => validateMCPServerUrl(value) }),
-                      },
-                    }}
+                    label={
+                      <span className="text-sm font-medium text-gray-700 flex items-center">
+                        MCP Server Name
+                        <SimpleTooltip content="Best practice: Use a descriptive name that indicates the server's purpose (e.g., 'GitHub_MCP', 'Email_Service'). Cannot contain spaces or hyphens; use underscores instead. Names must comply with SEP-986 and will be rejected if invalid (https://modelcontextprotocol.io/specification/2025-11-25/server/tools#tool-names).">
+                          <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                        </SimpleTooltip>
+                      </span>
+                    }
+                    name="server_name"
+                    rules={{ validate: antdRules({ validator: (_, value) => validateMCPServerName(value) }) }}
                   >
                     {(control) => (
-                      <AntdInput
+                      <Input
                         {...textControl(control)}
-                        placeholder="https://your-mcp-server.com"
+                        placeholder="e.g., GitHub_MCP, Zapier_MCP, etc."
                         className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
                       />
                     )}
                   </MountedFormField>
-                )}
 
-                {/* OpenAPI: logo picker + spec URL input */}
-                {transportType === TRANSPORT.OPENAPI && (
-                  <OpenAPIFormSection
-                    form={form}
-                    accessToken={isModalVisible ? accessToken : null}
-                    onValuesChange={(updates) =>
-                      handleFormValuesChange(updates, { ...allFieldsValue(form), ...updates })
+                  <MountedFormField
+                    label={
+                      <span className="text-sm font-medium text-gray-700 flex items-center">
+                        Alias
+                        <SimpleTooltip content="A short, unique identifier for this server. Defaults to the server name if not provided. Cannot contain spaces or hyphens; use underscores instead.">
+                          <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                        </SimpleTooltip>
+                      </span>
                     }
-                    onKeyToolsChange={setKeyTools}
-                    onLogoUrlChange={setLogoUrl}
-                    onOAuthDocsUrlChange={setOauthDocsUrl}
-                  />
-                )}
+                    name="alias"
+                    rules={{ validate: antdRules({ validator: (_, value) => validateMCPServerName(value) }) }}
+                  >
+                    {(control) => (
+                      <Input
+                        {...textControl(control)}
+                        placeholder="e.g., GitHub_MCP, Zapier_MCP, etc."
+                        className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                        onChange={(event) => {
+                          control.onChange(event);
+                          setAliasManuallyEdited(true);
+                        }}
+                      />
+                    )}
+                  </MountedFormField>
 
-                {/* BYOK toggle - only for OpenAPI */}
-                {transportType === TRANSPORT.OPENAPI && <OpenApiByokFields />}
+                  <MountedFormField
+                    label={<span className="text-sm font-medium text-gray-700">Description</span>}
+                    name="description"
+                  >
+                    {(control) => (
+                      <Input
+                        {...textControl(control)}
+                        placeholder="Brief description of what this server does"
+                        className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                      />
+                    )}
+                  </MountedFormField>
 
-                <MountedFormField
-                  label={
-                    <span className="text-sm font-medium text-gray-700 flex items-center">
-                      Max Concurrent Requests (optional)
-                      <Tooltip title="Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.">
-                        <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                      </Tooltip>
-                    </span>
-                  }
-                  name="max_concurrent_requests"
-                >
-                  {(control) => (
-                    <InputNumber
-                      {...numberControl(control)}
-                      min={1}
-                      precision={0}
-                      placeholder="e.g. 10"
-                      style={{ width: "100%" }}
-                      className="rounded-lg"
+                  <MCPLogoSelector value={logoUrl} onChange={setLogoUrl} />
+
+                  <MountedFormField
+                    label={<span className="text-sm font-medium text-gray-700">GitHub / Source URL</span>}
+                    name="source_url"
+                  >
+                    {(control) => (
+                      <Input
+                        {...textControl(control)}
+                        placeholder="https://github.com/org/mcp-server"
+                        className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                      />
+                    )}
+                  </MountedFormField>
+
+                  <MountedFormField
+                    label={<span className="text-sm font-medium text-gray-700">Transport Type</span>}
+                    name="transport"
+                    required
+                    rules={{ validate: { required: antdRequired("Please select a transport type") } }}
+                  >
+                    {(control) => (
+                      <Select
+                        items={TRANSPORT_ITEMS}
+                        value={(control.value as string | undefined) ?? null}
+                        onValueChange={handleTransportSelected(control.onChange)}
+                      >
+                        <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
+                          <SelectValue placeholder="Select transport" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {TRANSPORT_ITEMS.map((item) => (
+                            <SelectItem key={item.value} value={item.value}>
+                              {item.label}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    )}
+                  </MountedFormField>
+
+                  {/* URL field - only show for HTTP and SSE */}
+                  {(transportType === "http" || transportType === "sse") && (
+                    <MountedFormField
+                      label={<span className="text-sm font-medium text-gray-700">MCP Server URL</span>}
+                      name="url"
+                      required
+                      rules={{
+                        validate: {
+                          required: antdRequired("Please enter a server URL"),
+                          ...antdRules({ validator: (_, value) => validateMCPServerUrl(value) }),
+                        },
+                      }}
+                    >
+                      {(control) => (
+                        <Input
+                          {...textControl(control)}
+                          placeholder="https://your-mcp-server.com"
+                          className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                        />
+                      )}
+                    </MountedFormField>
+                  )}
+
+                  {/* OpenAPI: logo picker + spec URL input */}
+                  {transportType === TRANSPORT.OPENAPI && (
+                    <OpenAPIFormSection
+                      form={form}
+                      accessToken={isModalVisible ? accessToken : null}
+                      onValuesChange={(updates) =>
+                        handleFormValuesChange(updates, { ...allFieldsValue(form), ...updates })
+                      }
+                      onKeyToolsChange={setKeyTools}
+                      onLogoUrlChange={setLogoUrl}
+                      onOAuthDocsUrlChange={setOauthDocsUrl}
                     />
                   )}
-                </MountedFormField>
 
-                {/* Authentication - show for HTTP, SSE, and OpenAPI */}
-                {transportType !== "stdio" && transportType !== "" && (
-                  <Collapse
-                    defaultActiveKey={["auth"]}
-                    className="mb-4"
-                    items={[
-                      {
-                        key: "auth",
-                        label: <span className="text-sm font-semibold text-gray-700">Authentication</span>,
-                        children: (
-                          <>
-                            <MountedFormField
-                              name="auth_type"
-                              required
-                              rules={{ validate: { required: antdRequired("Please select an auth type") } }}
-                            >
-                              {(control) => (
-                                <Select
-                                  {...selectControl<string>(control)}
-                                  placeholder="Select auth type"
-                                  className="rounded-lg"
-                                  size="large"
-                                  virtual={false}
-                                >
-                                  <Select.Option value="none">None</Select.Option>
-                                  <Select.Option value="api_key">API Key</Select.Option>
-                                  <Select.Option value="bearer_token">Bearer Token</Select.Option>
-                                  <Select.Option value="token">Token</Select.Option>
-                                  <Select.Option value="basic">Basic Auth</Select.Option>
-                                  <Select.Option value="oauth2">OAuth</Select.Option>
-                                  <Select.Option value="oauth2_token_exchange">
-                                    OAuth Token Exchange (OBO)
-                                  </Select.Option>
-                                  <Select.Option value="oauth2_id_jag">ID-JAG (Okta Cross App Access)</Select.Option>
-                                  <Select.Option value="aws_sigv4">AWS SigV4 (Bedrock AgentCore MCPs)</Select.Option>
-                                  <Select.Option value="true_passthrough">
-                                    True Passthrough (no LiteLLM auth)
-                                  </Select.Option>
-                                  <Select.Option value="oauth_delegate">
-                                    OAuth Delegate (client-supplied upstream token)
-                                  </Select.Option>
-                                </Select>
-                              )}
-                            </MountedFormField>
+                  {/* BYOK toggle - only for OpenAPI */}
+                  {transportType === TRANSPORT.OPENAPI && <OpenApiByokFields />}
 
-                            <TruePassthroughWarning authType={authType} />
+                  <MountedFormField
+                    label={
+                      <span className="text-sm font-medium text-gray-700 flex items-center">
+                        Max Concurrent Requests (optional)
+                        <SimpleTooltip content="Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.">
+                          <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                        </SimpleTooltip>
+                      </span>
+                    }
+                    name="max_concurrent_requests"
+                  >
+                    {(control) => (
+                      <Input
+                        {...numberControl(control, 0)}
+                        min={1}
+                        step={1}
+                        placeholder="e.g. 10"
+                        className="w-full rounded-lg"
+                      />
+                    )}
+                  </MountedFormField>
 
-                            <PassthroughAuthorizeSection
-                              authType={authType}
-                              dcrBridgeInitialChecked
-                              oauthFlow={{
-                                startOAuthFlow,
-                                status: oauthStatus,
-                                error: oauthError,
-                                tokenResponse: oauthTokenResponse,
-                              }}
-                              appMayNotMatchUpstream={appMayNotMatchUpstream}
-                            />
+                  {/* Authentication - show for HTTP, SSE, and OpenAPI */}
+                  {transportType !== "stdio" && transportType !== "" && (
+                    <Collapsible defaultOpen className="mb-4">
+                      <CollapsibleTrigger className="group flex w-full items-center justify-between gap-4 py-2 text-left">
+                        <span className="text-sm font-semibold text-gray-700">Authentication settings</span>
+                        <ChevronDown className="size-4 text-gray-500 transition-transform group-data-[panel-open]:rotate-180" />
+                      </CollapsibleTrigger>
+                      <CollapsibleContent keepMounted className="space-y-6 pt-2">
+                        <MountedFormField
+                          label="Authentication"
+                          name="auth_type"
+                          required
+                          rules={{ validate: { required: antdRequired("Please select an auth type") } }}
+                        >
+                          {(control) => (
+                            <Select {...selectControl<string>(control)} items={AUTH_TYPE_ITEMS}>
+                              <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
+                                <SelectValue placeholder="Select auth type" />
+                              </SelectTrigger>
+                              <SelectContent>
+                                {AUTH_TYPE_ITEMS.map((item) => (
+                                  <SelectItem key={item.value} value={item.value}>
+                                    {item.label}
+                                  </SelectItem>
+                                ))}
+                              </SelectContent>
+                            </Select>
+                          )}
+                        </MountedFormField>
 
-                            {shouldShowAuthValueField && (
-                              <MountedFormField
-                                label={
-                                  <span className="text-sm font-medium text-gray-700 flex items-center">
-                                    Authentication Value
-                                    <Tooltip title="Token, password, or header value to send with each request for the selected auth type.">
-                                      <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                                    </Tooltip>
-                                  </span>
-                                }
-                                name={["credentials", "auth_value"]}
-                                rules={{
-                                  validate: {
-                                    notWhitespace: notOnlyWhitespace("Authentication value cannot be empty whitespace"),
-                                  },
-                                }}
-                              >
-                                {(control) => (
-                                  <AntdInput.Password
-                                    {...textControl(control)}
-                                    placeholder="Enter token or secret"
-                                    className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
-                                  />
-                                )}
-                              </MountedFormField>
-                            )}
+                        <TruePassthroughWarning authType={authType} />
 
-                            {isOAuthAuthType && (
-                              <OAuthFormFields
-                                isM2M={isM2MFlow}
-                                initialFlowType={OAUTH_FLOW.INTERACTIVE}
-                                docsUrl={oauthDocsUrl}
-                                oauthFlow={{
-                                  startOAuthFlow,
-                                  status: oauthStatus,
-                                  error: oauthError,
-                                  tokenResponse: oauthTokenResponse,
-                                }}
+                        <PassthroughAuthorizeSection
+                          authType={authType}
+                          dcrBridgeInitialChecked
+                          oauthFlow={{
+                            startOAuthFlow,
+                            status: oauthStatus,
+                            error: oauthError,
+                            tokenResponse: oauthTokenResponse,
+                          }}
+                          appMayNotMatchUpstream={appMayNotMatchUpstream}
+                        />
+
+                        {shouldShowAuthValueField && (
+                          <MountedFormField
+                            label={
+                              <span className="text-sm font-medium text-gray-700 flex items-center">
+                                Authentication Value
+                                <SimpleTooltip content="Token, password, or header value to send with each request for the selected auth type.">
+                                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                                </SimpleTooltip>
+                              </span>
+                            }
+                            name={["credentials", "auth_value"]}
+                            rules={{
+                              validate: {
+                                notWhitespace: notOnlyWhitespace("Authentication value cannot be empty whitespace"),
+                              },
+                            }}
+                          >
+                            {(control) => (
+                              <PasswordInput
+                                {...textControl(control)}
+                                placeholder="Enter token or secret"
+                                groupClassName="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
                               />
                             )}
+                          </MountedFormField>
+                        )}
 
-                            {isTokenExchangeAuthType && <TokenExchangeFormFields />}
+                        {isOAuthAuthType && (
+                          <OAuthFormFields
+                            isM2M={isM2MFlow}
+                            initialFlowType={OAUTH_FLOW.INTERACTIVE}
+                            docsUrl={oauthDocsUrl}
+                            oauthFlow={{
+                              startOAuthFlow,
+                              status: oauthStatus,
+                              error: oauthError,
+                              tokenResponse: oauthTokenResponse,
+                            }}
+                          />
+                        )}
 
-                            {isIdJagAuthType && <IdJagFormFields />}
-                          </>
-                        ),
-                      },
-                    ]}
+                        {isTokenExchangeAuthType && <TokenExchangeFormFields />}
+
+                        {isIdJagAuthType && <IdJagFormFields />}
+                      </CollapsibleContent>
+                    </Collapsible>
+                  )}
+
+                  {transportType !== "stdio" && transportType !== "" && isAwsSigV4AuthType && <AwsSigV4Fields />}
+
+                  {/* Stdio Configuration - only show for stdio transport */}
+                  <StdioConfiguration isVisible={transportType === "stdio"} />
+                </div>
+
+                {/* Environment Variables Section */}
+                <div className="mt-8">
+                  <EnvVarsSection />
+                </div>
+
+                {/* Permission Management / Access Control Section */}
+                <div className="mt-8">
+                  <MCPPermissionManagement
+                    availableAccessGroups={availableAccessGroups}
+                    mcpServer={null}
+                    mountedAuthType={authSectionMounted ? watchedAuthType : undefined}
                   />
-                )}
+                </div>
 
-                {transportType !== "stdio" && transportType !== "" && isAwsSigV4AuthType && <AwsSigV4Fields />}
+                {/* Connection Status Section */}
+                <div className="mt-8 pt-6 border-t border-gray-200">
+                  <MCPConnectionStatus
+                    formValues={formValues}
+                    tools={tools}
+                    isLoadingTools={isLoadingTools}
+                    toolsError={toolsError}
+                    toolsErrorStatus={toolsErrorStatus}
+                    toolsErrorStackTrace={toolsErrorStackTrace}
+                    canFetchTools={canFetchTools}
+                    fetchTools={fetchTools}
+                  />
+                </div>
 
-                {/* Stdio Configuration - only show for stdio transport */}
-                <StdioConfiguration isVisible={transportType === "stdio"} />
-              </div>
+                {/* Tool Configuration Section */}
+                <div className="mt-6">
+                  <MCPToolConfiguration
+                    accessToken={accessToken}
+                    formValues={formValues}
+                    allowedTools={allowedTools}
+                    existingAllowedTools={null}
+                    onAllowedToolsChange={setAllowedTools}
+                    hasToolAllowlistInteraction={hasToolAllowlistInteraction}
+                    onToolAllowlistInteraction={() => setHasToolAllowlistInteraction(true)}
+                    toolNameToDisplayName={toolNameToDisplayName}
+                    toolNameToDescription={toolNameToDescription}
+                    onToolNameToDisplayNameChange={setToolNameToDisplayName}
+                    onToolNameToDescriptionChange={setToolNameToDescription}
+                    keyTools={keyTools}
+                    externalTools={tools}
+                    externalIsLoading={isLoadingTools}
+                    externalError={toolsError}
+                    externalErrorStatus={toolsErrorStatus}
+                    externalCanFetch={canFetchTools}
+                  />
+                </div>
 
-              {/* Environment Variables Section */}
-              <div className="mt-8">
-                <EnvVarsSection />
-              </div>
+                {/* Cost Configuration Section */}
+                <div className="mt-6">
+                  <MCPServerCostConfig
+                    value={costConfig}
+                    onChange={setCostConfig}
+                    tools={tools.filter((tool) => allowedTools.includes(tool.name))}
+                    disabled={false}
+                  />
+                </div>
 
-              {/* Permission Management / Access Control Section */}
-              <div className="mt-8">
-                <MCPPermissionManagement
-                  availableAccessGroups={availableAccessGroups}
-                  mcpServer={null}
-                  mountedAuthType={authSectionMounted ? watchedAuthType : undefined}
-                  searchValue={searchValue}
-                  setSearchValue={setSearchValue}
-                  getAccessGroupOptions={getAccessGroupOptions}
-                />
-              </div>
-
-              {/* Connection Status Section */}
-              <div className="mt-8 pt-6 border-t border-gray-200">
-                <MCPConnectionStatus
-                  formValues={formValues}
-                  tools={tools}
-                  isLoadingTools={isLoadingTools}
-                  toolsError={toolsError}
-                  toolsErrorStatus={toolsErrorStatus}
-                  toolsErrorStackTrace={toolsErrorStackTrace}
-                  canFetchTools={canFetchTools}
-                  fetchTools={fetchTools}
-                />
-              </div>
-
-              {/* Tool Configuration Section */}
-              <div className="mt-6">
-                <MCPToolConfiguration
-                  accessToken={accessToken}
-                  formValues={formValues}
-                  allowedTools={allowedTools}
-                  existingAllowedTools={null}
-                  onAllowedToolsChange={setAllowedTools}
-                  hasToolAllowlistInteraction={hasToolAllowlistInteraction}
-                  onToolAllowlistInteraction={() => setHasToolAllowlistInteraction(true)}
-                  toolNameToDisplayName={toolNameToDisplayName}
-                  toolNameToDescription={toolNameToDescription}
-                  onToolNameToDisplayNameChange={setToolNameToDisplayName}
-                  onToolNameToDescriptionChange={setToolNameToDescription}
-                  keyTools={keyTools}
-                  externalTools={tools}
-                  externalIsLoading={isLoadingTools}
-                  externalError={toolsError}
-                  externalErrorStatus={toolsErrorStatus}
-                  externalCanFetch={canFetchTools}
-                />
-              </div>
-
-              {/* Cost Configuration Section */}
-              <div className="mt-6">
-                <MCPServerCostConfig
-                  value={costConfig}
-                  onChange={setCostConfig}
-                  tools={tools.filter((tool) => allowedTools.includes(tool.name))}
-                  disabled={false}
-                />
-              </div>
-
-              <div className="flex items-center justify-end space-x-3 pt-6 border-t border-gray-100">
-                <Button variant="secondary" onClick={handleCancel}>
-                  Cancel
-                </Button>
-                <Button type="submit" disabled={isLoading} aria-busy={isLoading}>
-                  {isLoading && <UiLoadingSpinner className="size-4" />}
-                  {isLoading ? "Creating..." : "Add MCP Server"}
-                </Button>
-              </div>
-            </form>
-          </MountedFormProvider>
-        </FormProvider>
-      </div>
-    </Modal>
+                <div className="flex items-center justify-end space-x-3 pt-6 border-t border-gray-100">
+                  <Button variant="secondary" onClick={handleCancel}>
+                    Cancel
+                  </Button>
+                  <Button type="submit" disabled={isLoading} aria-busy={isLoading}>
+                    {isLoading && <UiLoadingSpinner className="size-4" />}
+                    {isLoading ? "Creating..." : "Add MCP Server"}
+                  </Button>
+                </div>
+              </form>
+            </MountedFormProvider>
+          </FormProvider>
+        </div>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx
index 35b23f9873c..acf65992ce1 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/DcrBridgeToggle.tsx
@@ -1,7 +1,8 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Switch, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 
+import { Switch } from "@/components/ui/switch";
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { isClientForwardedTokenMode } from "@/components/mcp_tools/types";
 import { switchControl } from "./mcpFieldRules";
@@ -28,9 +29,9 @@ export default function DcrBridgeToggle({
       label={
         <span className="text-sm font-medium text-gray-700 flex items-center">
           Gateway-hosted sign-in (DCR bridge)
-          <Tooltip title="Lets OAuth-only clients like Claude Desktop register and sign in through the gateway. Turn off to relay the upstream server's own OAuth metadata instead (for clients pre-registered with the upstream IdP).">
-            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-          </Tooltip>
+          <SimpleTooltip content="Lets OAuth-only clients like Claude Desktop register and sign in through the gateway. Turn off to relay the upstream server's own OAuth metadata instead (for clients pre-registered with the upstream IdP).">
+            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+          </SimpleTooltip>
         </span>
       }
       name="dcr_bridge"
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx
index 23a55d2dc1a..f6f724b666d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/EnvVarsSection.tsx
@@ -1,7 +1,10 @@
+import { CircleMinus, Info, Plus } from "lucide-react";
 import React from "react";
-import { Input, Select, Tooltip, Typography } from "antd";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 import { Button } from "@/components/ui/button";
-import { InfoCircleOutlined, MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { Input } from "@/components/ui/input";
+import { InputGroup, InputGroupAddon, InputGroupInput } from "@/components/ui/input-group";
 import { useFieldArray, useFormContext, useWatch } from "react-hook-form";
 
 import {
@@ -10,11 +13,9 @@ import {
   type MountedFormValues,
 } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
-import { matchesPattern, selectControl, textControl } from "./mcpFieldRules";
+import { matchesPattern, selectControl, selectTriggerControl, textControl } from "./mcpFieldRules";
 import { listControl } from "./mcpFormStore";
 
-const { Text } = Typography;
-
 const SCOPE_OPTIONS = [
   { value: "global", label: "Instance" },
   { value: "user", label: "Per-user" },
@@ -40,11 +41,9 @@ const EnvVarsSection: React.FC = () => {
   return (
     <div className="rounded-lg border border-gray-200 bg-gray-50 p-4">
       <div className="flex items-center gap-2 mb-1">
-        <Text strong className="text-sm">
-          Variables
-        </Text>
-        <Tooltip
-          title={
+        <strong className="text-sm font-semibold">Variables</strong>
+        <SimpleTooltip
+          content={
             <>
               Define variables you can interpolate in Static Headers or Authentication using{" "}
               <code>{"${VAR_NAME}"}</code>. <br />
@@ -55,15 +54,15 @@ const EnvVarsSection: React.FC = () => {
             </>
           }
         >
-          <InfoCircleOutlined className="text-blue-400 hover:text-blue-600 cursor-help" />
-        </Tooltip>
+          <Info className="size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+        </SimpleTooltip>
       </div>
-      <Text className="text-xs text-gray-600 block mb-3">
+      <span className="mb-3 block text-xs text-gray-600">
         Reference these in Static Headers or Authentication as <code>{"${VAR_NAME}"}</code>. For example:{" "}
         <code className="bg-white px-1 rounded-sm border border-gray-200">
           {"${DB_PROTOCOL}://${CORP_USERNAME}:${CORP_PASSWORD}@${DB_HOSTNAME}"}
         </code>
-      </Text>
+      </span>
 
       <div className="space-y-2">
         {fields.length > 0 && (
@@ -97,18 +96,31 @@ const EnvVarsSection: React.FC = () => {
               <ScopedValueOrDescription index={index} />
             </div>
             <MountedFormField name={["env_vars", String(index), "scope"]} className="mb-0 w-40" defaultValue="global">
-              {(control) => <Select {...selectControl<string>(control)} options={SCOPE_OPTIONS} />}
+              {(control) => (
+                <Select {...selectControl<string>(control)} items={SCOPE_OPTIONS}>
+                  <SelectTrigger {...selectTriggerControl(control)} className="w-full">
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {SCOPE_OPTIONS.map((option) => (
+                      <SelectItem key={option.value} value={option.value}>
+                        {option.label}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              )}
             </MountedFormField>
             <div style={{ width: 24, height: 32 }} className="flex items-center justify-center">
-              <MinusCircleOutlined
+              <CircleMinus
                 onClick={() => remove(index)}
-                className="text-gray-500 hover:text-red-500 cursor-pointer"
+                className="size-4 text-gray-500 hover:text-red-500 cursor-pointer"
               />
             </div>
           </div>
         ))}
         <Button variant="outline" className="w-full border-dashed" onClick={() => append({ scope: "global" })}>
-          <PlusOutlined />
+          <Plus />
           Add Variable
         </Button>
       </div>
@@ -125,19 +137,17 @@ const ScopedValueOrDescription: React.FC<{ index: number }> = ({ index }) => {
     return (
       <MountedFormField name={["env_vars", String(index), "description"]} className="mb-0">
         {(control) => (
-          <Input
-            {...textControl(control)}
-            addonBefore={
-              <Tooltip title="Per-user variables have no shared value. This text is only a hint shown to each user when they fill in their own value.">
+          <InputGroup>
+            <InputGroupAddon>
+              <SimpleTooltip content="Per-user variables have no shared value. This text is only a hint shown to each user when they fill in their own value.">
                 <span className="text-xs text-gray-500 cursor-help whitespace-nowrap">
-                  <InfoCircleOutlined className="mr-1" />
+                  <Info className="mr-1 inline size-3 align-text-bottom" />
                   Hint
                 </span>
-              </Tooltip>
-            }
-            placeholder="e.g. Your DB username"
-            styles={{ input: { color: "#9ca3af" } }}
-          />
+              </SimpleTooltip>
+            </InputGroupAddon>
+            <InputGroupInput {...textControl(control)} placeholder="e.g. Your DB username" className="text-gray-400" />
+          </InputGroup>
         )}
       </MountedFormField>
     );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx
index 9a6f4ab571f..d4760a65e6c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/IdJagFormFields.tsx
@@ -1,10 +1,14 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Input, Select, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
-import { requiredUnlessSiblingSet, selectControl, textControl } from "./mcpFieldRules";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { PasswordInput } from "@/components/shared/PasswordInput";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { requiredUnlessSiblingSet, tagsControl, textControl } from "./mcpFieldRules";
 
 interface IdJagFormFieldsProps {
   isEditing?: boolean;
@@ -15,9 +19,9 @@ const fieldClassName = "rounded-lg border-gray-300 focus:border-blue-500 focus:r
 const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, tooltip }) => (
   <span className="text-sm font-medium text-gray-700 flex items-center">
     {label}
-    <Tooltip title={tooltip}>
-      <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-    </Tooltip>
+    <SimpleTooltip content={tooltip}>
+      <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+    </SimpleTooltip>
   </span>
 );
 
@@ -75,10 +79,10 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
         rules={requiredWhenCreating("Client ID is required for ID-JAG")}
       >
         {(control) => (
-          <Input.Password
+          <PasswordInput
             {...textControl(control)}
             placeholder={`Enter OAuth client ID${placeholderSuffix}`}
-            className={fieldClassName}
+            groupClassName={fieldClassName}
           />
         )}
       </MountedFormField>
@@ -105,10 +109,10 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
         }
       >
         {(control) => (
-          <Input.Password
+          <PasswordInput
             {...textControl(control)}
             placeholder={`Enter OAuth client secret${placeholderSuffix}`}
-            className={fieldClassName}
+            groupClassName={fieldClassName}
           />
         )}
       </MountedFormField>
@@ -122,7 +126,7 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
         name={PRIVATE_KEY_PATH}
       >
         {(control) => (
-          <Input.TextArea
+          <Textarea
             {...textControl(control)}
             rows={3}
             placeholder={`-----BEGIN PRIVATE KEY-----${placeholderSuffix}`}
@@ -199,16 +203,7 @@ const IdJagFormFields: React.FC<IdJagFormFieldsProps> = ({ isEditing = false })
         label={<FieldLabel label="Scopes (optional)" tooltip="Scopes requested on leg 1 of the exchange." />}
         name={["credentials", "scopes"]}
       >
-        {(control) => (
-          <Select
-            {...selectControl(control)}
-            mode="tags"
-            tokenSeparators={[","]}
-            placeholder="Add scopes"
-            className="rounded-lg"
-            size="large"
-          />
-        )}
+        {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
       </MountedFormField>
     </>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.test.tsx
index 7d36872cee8..513fbc55ac5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.test.tsx
@@ -31,11 +31,7 @@ describe("MCPPermissionManagement", () => {
   it("should default allow_all_keys switch to unchecked for new servers", async () => {
     renderWithForm();
     await expandPanel();
-    // Find the switch associated with "Allow All LiteLLM Keys" text
-    // The first switch in the component is for allow_all_keys
-    const switches = screen.getAllByRole("switch");
-    const toggle = switches[0];
-    expect(toggle).not.toBeChecked();
+    expect(screen.getByRole("switch", { name: "Allow All LiteLLM Keys" })).not.toBeChecked();
   });
 
   const renderWithInitialValues = (initialValues: Record<string, unknown>, props = {}) =>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx
index b170157049c..c1da3f105db 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPPermissionManagement.tsx
@@ -1,29 +1,28 @@
 import React, { useEffect } from "react";
-import { Alert, Select, Tooltip, Collapse, Input, Space, Switch } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { SimpleTooltip } from "@/components/ui/tooltip";
+import { ChevronRight, CircleMinus, Info, Plus, TriangleAlert, X } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
-import { InfoCircleOutlined, MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
+import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
+import { Switch } from "@/components/ui/switch";
 import { useFieldArray, useFormContext, useWatch } from "react-hook-form";
 import { MCPServer, AUTH_TYPE } from "@/components/mcp_tools/types";
 import {
   MountedFormField,
   useMountedName,
+  type MountedFieldControlProps,
   type MountedFormValues,
 } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
 import { Field, FieldLabel } from "@/components/shared/form/field";
-import { invertedSwitchControl, selectControl, switchControl, textControl } from "./mcpFieldRules";
+import { invertedSwitchControl, switchControl, tagsControl, textControl } from "./mcpFieldRules";
 import { listControl } from "./mcpFormStore";
-const { Panel } = Collapse;
 
 interface MCPPermissionManagementProps {
   availableAccessGroups: string[];
   mcpServer: MCPServer | null;
-  searchValue: string;
-  setSearchValue: (value: string) => void;
-  getAccessGroupOptions: () => Array<{
-    value: string;
-    label: React.ReactNode;
-  }>;
   /**
    * The auth type as seen through the gate that mounts the auth_type field.
    * Callers pass undefined whenever that field is unmounted, because both
@@ -33,6 +32,26 @@ interface MCPPermissionManagementProps {
   mountedAuthType: string | null | undefined;
 }
 
+const ClearableInput: React.FC<{
+  control: MountedFieldControlProps;
+  placeholder: string;
+  clearLabel: string;
+}> = ({ control, placeholder, clearLabel }) => {
+  const text = textControl(control);
+  return (
+    <InputGroup className="rounded-lg">
+      <InputGroupInput {...text} placeholder={placeholder} />
+      {text.value !== "" && (
+        <InputGroupAddon align="inline-end">
+          <InputGroupButton size="icon-xs" aria-label={clearLabel} onClick={() => control.onChange("")}>
+            <X />
+          </InputGroupButton>
+        </InputGroupAddon>
+      )}
+    </InputGroup>
+  );
+};
+
 const StaticHeadersFieldArray: React.FC = () => {
   const { control } = useFormContext<MountedFormValues>();
   const { fields, append, remove } = useFieldArray({ control: listControl(control), name: "static_headers" });
@@ -41,19 +60,17 @@ const StaticHeadersFieldArray: React.FC = () => {
   return (
     <div className="space-y-3">
       {fields.map((item, index) => (
-        <Space key={item.id} className="flex w-full" align="baseline" size="middle">
+        <div key={item.id} className="flex w-full items-baseline gap-4">
           <MountedFormField
             name={["static_headers", String(index), "header"]}
             className="flex-1"
             rules={{ validate: { required: antdRequired("Header name is required") } }}
           >
             {(headerControl) => (
-              <Input
-                {...textControl(headerControl)}
-                size="large"
-                allowClear
-                className="rounded-lg"
+              <ClearableInput
+                control={headerControl}
                 placeholder="Header name (e.g., X-API-Key)"
+                clearLabel="Clear header name"
               />
             )}
           </MountedFormField>
@@ -63,23 +80,17 @@ const StaticHeadersFieldArray: React.FC = () => {
             rules={{ validate: { required: antdRequired("Header value is required") } }}
           >
             {(valueControl) => (
-              <Input
-                {...textControl(valueControl)}
-                size="large"
-                allowClear
-                className="rounded-lg"
-                placeholder="Header value"
-              />
+              <ClearableInput control={valueControl} placeholder="Header value" clearLabel="Clear header value" />
             )}
           </MountedFormField>
-          <MinusCircleOutlined
+          <CircleMinus
             onClick={() => remove(index)}
-            className="text-gray-500 hover:text-red-500 cursor-pointer"
+            className="size-4 text-gray-500 hover:text-red-500 cursor-pointer"
           />
-        </Space>
+        </div>
       ))}
       <Button variant="outline" className="w-full border-dashed" onClick={() => append({})}>
-        <PlusOutlined />
+        <Plus />
         Add Static Header
       </Button>
     </div>
@@ -89,9 +100,6 @@ const StaticHeadersFieldArray: React.FC = () => {
 const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
   availableAccessGroups,
   mcpServer,
-  searchValue,
-  setSearchValue,
-  getAccessGroupOptions,
   mountedAuthType,
 }) => {
   const { setValue } = useFormContext<MountedFormValues>();
@@ -173,36 +181,35 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
   }, [canEnableOAuthPassthrough, setValue]);
 
   return (
-    <Collapse className="bg-gray-50 border border-gray-200 rounded-lg" expandIconPosition="end" ghost={false}>
-      <Panel
-        header={
-          <div className="flex items-center">
-            <div className="flex items-center space-x-2">
-              <div className="w-2 h-2 bg-blue-500 rounded-full"></div>
-              <h3 className="text-lg font-semibold text-gray-900">Permission Management / Access Control</h3>
-            </div>
-            <p className="text-sm text-gray-600 ml-4">Configure access permissions and security settings (Optional)</p>
-          </div>
-        }
-        key="permissions"
-        className="border-0"
-        forceRender
-      >
+    <Collapsible className="bg-gray-50 border border-gray-200 rounded-lg">
+      <CollapsibleTrigger className="group flex w-full items-center justify-between gap-4 p-4 text-left">
+        <span className="flex items-center">
+          <span className="flex items-center space-x-2">
+            <span className="w-2 h-2 bg-blue-500 rounded-full"></span>
+            <span className="text-lg font-semibold text-gray-900">Permission Management / Access Control</span>
+          </span>
+          <span className="text-sm text-gray-600 ml-4">
+            Configure access permissions and security settings (Optional)
+          </span>
+        </span>
+        <ChevronRight className="size-4 shrink-0 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
+      </CollapsibleTrigger>
+      <CollapsibleContent keepMounted className="px-4 pb-4">
         <div className="space-y-6 pt-4">
           <div className="flex items-start justify-between gap-4">
             <div>
               <span className="text-sm font-medium text-gray-700 flex items-center">
                 Allow All LiteLLM Keys
-                <Tooltip title="When enabled, every API key can access this MCP server.">
-                  <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                </Tooltip>
+                <SimpleTooltip content="When enabled, every API key can access this MCP server.">
+                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                </SimpleTooltip>
               </span>
               <p className="text-sm text-gray-600 mt-1">
                 Enable if this server should be &quot;public&quot; to all keys.
               </p>
             </div>
             <MountedFormField name="allow_all_keys" defaultValue={mcpServer?.allow_all_keys ?? false} className="mb-0">
-              {(control) => <Switch {...switchControl(control)} />}
+              {(control) => <Switch aria-label="Allow All LiteLLM Keys" {...switchControl(control)} />}
             </MountedFormField>
           </div>
 
@@ -210,16 +217,16 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
             <div>
               <span className="text-sm font-medium text-gray-700 flex items-center">
                 Internal network only
-                <Tooltip title="When on, only requests from within your internal network are accepted. Turn off to allow external clients (other clusters, ChatGPT, etc). API key authentication is always required regardless of this setting.">
-                  <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                </Tooltip>
+                <SimpleTooltip content="When on, only requests from within your internal network are accepted. Turn off to allow external clients (other clusters, ChatGPT, etc). API key authentication is always required regardless of this setting.">
+                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                </SimpleTooltip>
               </span>
               <p className="text-sm text-gray-600 mt-1">
                 Turn on to restrict access to callers within your internal network only.
               </p>
             </div>
             <MountedFormField name="available_on_public_internet" defaultValue={true} className="mb-0">
-              {(control) => <Switch {...invertedSwitchControl(control)} />}
+              {(control) => <Switch aria-label="Internal network only" {...invertedSwitchControl(control)} />}
             </MountedFormField>
           </div>
 
@@ -228,9 +235,9 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
               <div>
                 <span className="text-sm font-medium text-gray-700 flex items-center">
                   Delegate auth to upstream (PKCE passthrough)
-                  <Tooltip title="When on, LiteLLM skips its own API key/SSO check for this server and lets the client complete PKCE directly with the upstream MCP server. Only honored when Auth Type is oauth2. No spend tracking or per-key rate limiting will run on this route.">
-                    <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                  </Tooltip>
+                  <SimpleTooltip content="When on, LiteLLM skips its own API key/SSO check for this server and lets the client complete PKCE directly with the upstream MCP server. Only honored when Auth Type is oauth2. No spend tracking or per-key rate limiting will run on this route.">
+                    <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                  </SimpleTooltip>
                 </span>
                 <p className="text-sm text-gray-600 mt-1">
                   Bypass LiteLLM auth so clients authenticate directly with the upstream OAuth MCP server.
@@ -241,7 +248,9 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
                 defaultValue={mcpServer?.delegate_auth_to_upstream ?? false}
                 className="mb-0"
               >
-                {(control) => <Switch {...switchControl(control)} />}
+                {(control) => (
+                  <Switch aria-label="Delegate auth to upstream (PKCE passthrough)" {...switchControl(control)} />
+                )}
               </MountedFormField>
             </div>
           )}
@@ -251,9 +260,9 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
               <div>
                 <span className="text-sm font-medium text-gray-700 flex items-center">
                   OAuth pass-through
-                  <Tooltip title="When on, this server is treated as an OAuth pass-through: the gateway proxies the upstream /.well-known/oauth-protected-resource metadata, emits spec-compliant 401 challenges when no bearer is supplied, and propagates upstream 401/403 responses. Only honored when Auth Type is None and 'Authorization' is in Extra Headers.">
-                    <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                  </Tooltip>
+                  <SimpleTooltip content="When on, this server is treated as an OAuth pass-through: the gateway proxies the upstream /.well-known/oauth-protected-resource metadata, emits spec-compliant 401 challenges when no bearer is supplied, and propagates upstream 401/403 responses. Only honored when Auth Type is None and 'Authorization' is in Extra Headers.">
+                    <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                  </SimpleTooltip>
                 </span>
                 <p className="text-sm text-gray-600 mt-1">
                   Forward upstream OAuth discovery and 401 challenges so clients negotiate OAuth directly with the
@@ -265,46 +274,41 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
                 defaultValue={mcpServer?.oauth_passthrough ?? false}
                 className="mb-0"
               >
-                {(control) => <Switch {...switchControl(control)} />}
+                {(control) => <Switch aria-label="OAuth pass-through" {...switchControl(control)} />}
               </MountedFormField>
             </div>
           )}
 
           {showInternalDelegatePkceWarning && (
-            <Alert
-              type="warning"
-              showIcon
-              className="mb-2"
-              message="Internal server with upstream OAuth delegation"
-              description="This MCP server is configured as internal-only but delegates auth to upstream. Anonymous users will be able to reach the upstream OAuth2 /authorize flow without a LiteLLM session. Ensure your upstream provider and network enforce access controls."
-            />
+            <Alert variant="warning" className="mb-2">
+              <TriangleAlert />
+              <AlertTitle>Internal server with upstream OAuth delegation</AlertTitle>
+              <AlertDescription>
+                This MCP server is configured as internal-only but delegates auth to upstream. Anonymous users will be
+                able to reach the upstream OAuth2 /authorize flow without a LiteLLM session. Ensure your upstream
+                provider and network enforce access controls.
+              </AlertDescription>
+            </Alert>
           )}
 
           <MountedFormField
             label={
               <span className="text-sm font-medium text-gray-700 flex items-center">
                 MCP Access Groups
-                <Tooltip title="Specify access groups for this MCP server. Users must be in at least one of these groups to access the server.">
-                  <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                </Tooltip>
+                <SimpleTooltip content="Specify access groups for this MCP server. Users must be in at least one of these groups to access the server.">
+                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                </SimpleTooltip>
               </span>
             }
             name="mcp_access_groups"
             className="mb-4"
           >
             {(control) => (
-              <Select
-                {...selectControl(control)}
-                mode="tags"
-                showSearch
+              <MultiSelect
+                {...tagsControl(control)}
+                options={availableAccessGroups.map((group) => ({ label: group, value: group }))}
                 placeholder="Select existing groups or type to create new ones"
-                optionFilterProp="value"
-                filterOption={(input, option) => (option?.value ?? "").toLowerCase().includes(input.toLowerCase())}
-                onSearch={(value) => setSearchValue(value)}
-                tokenSeparators={[","]}
-                options={getAccessGroupOptions()}
-                maxTagCount="responsive"
-                allowClear
+                className="rounded-lg"
               />
             )}
           </MountedFormField>
@@ -313,9 +317,9 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
             label={
               <span className="text-sm font-medium text-gray-700 flex items-center">
                 Extra Headers
-                <Tooltip title="Forward custom headers from incoming requests to this MCP server (e.g., Authorization, X-Custom-Header, User-Agent)">
-                  <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                </Tooltip>
+                <SimpleTooltip content="Forward custom headers from incoming requests to this MCP server (e.g., Authorization, X-Custom-Header, User-Agent)">
+                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                </SimpleTooltip>
                 {mcpServer?.extra_headers && mcpServer.extra_headers.length > 0 && (
                   <span className="ml-2 text-xs bg-blue-100 text-blue-700 px-2 py-1 rounded-full">
                     {mcpServer.extra_headers.length} configured
@@ -326,18 +330,14 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
             name="extra_headers"
           >
             {(control) => (
-              <Select
-                {...selectControl(control)}
-                mode="tags"
+              <MultiSelect
+                {...tagsControl(control)}
                 placeholder={
                   mcpServer?.extra_headers && mcpServer.extra_headers.length > 0
                     ? `Currently: ${mcpServer.extra_headers.join(", ")}`
                     : "Enter header names (e.g., Authorization, X-Custom-Header)"
                 }
                 className="rounded-lg"
-                size="large"
-                tokenSeparators={[","]}
-                allowClear
               />
             )}
           </MountedFormField>
@@ -346,16 +346,16 @@ const MCPPermissionManagement: React.FC<MCPPermissionManagementProps> = ({
             <FieldLabel>
               <span className="text-sm font-medium text-gray-700 flex items-center">
                 Static Headers
-                <Tooltip title="Send these key-value headers with every request to this MCP server.">
-                  <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                </Tooltip>
+                <SimpleTooltip content="Send these key-value headers with every request to this MCP server.">
+                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                </SimpleTooltip>
               </span>
             </FieldLabel>
             <StaticHeadersFieldArray />
           </Field>
         </div>
-      </Panel>
-    </Collapse>
+      </CollapsibleContent>
+    </Collapsible>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx
index 8d0901d7176..d61d6056972 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from "react";
-import { Modal, Input, message, Spin } from "antd";
+import { Input, message, Spin } from "antd";
 import { z } from "zod/v4";
 import { SortingState } from "@tanstack/react-table";
 import { Inbox, Plus } from "lucide-react";
@@ -22,6 +22,7 @@ import { Input as ShadcnInput } from "@/components/ui/input";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { displayToolName, getMCPToolsetTableColumns } from "./MCPToolsetTableColumns";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface MCPToolsetsTabProps {
   accessToken: string | null;
@@ -203,106 +204,104 @@ function CreateToolsetModal({ open, onClose, onSave, accessToken, initialToolset
   });
 
   return (
-    <Modal
-      open={open}
-      onCancel={onClose}
-      title={initialToolset ? "Edit Toolset" : "New Toolset"}
-      width={960}
-      footer={null}
-      forceRender
-    >
-      <form onSubmit={(event) => event.preventDefault()} className="mt-2">
-        <FieldGroup className="mb-4 flex-row gap-4">
-          <FormField control={form.control} name="toolset_name" label="Toolset Name" className="flex-1">
-            {(field) => <ShadcnInput {...field} placeholder="e.g. github-linear-tools" />}
-          </FormField>
-          <FormField control={form.control} name="description" label="Description" className="flex-1">
-            {(field) => <ShadcnInput {...field} placeholder="Optional description" />}
-          </FormField>
-        </FieldGroup>
-      </form>
+    <Dialog open={open} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[960px]">
+        <DialogHeader>
+          <DialogTitle>{initialToolset ? "Edit Toolset" : "New Toolset"}</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={(event) => event.preventDefault()} className="mt-2">
+          <FieldGroup className="mb-4 flex-row gap-4">
+            <FormField control={form.control} name="toolset_name" label="Toolset Name" className="flex-1">
+              {(field) => <ShadcnInput {...field} placeholder="e.g. github-linear-tools" />}
+            </FormField>
+            <FormField control={form.control} name="description" label="Description" className="flex-1">
+              {(field) => <ShadcnInput {...field} placeholder="Optional description" />}
+            </FormField>
+          </FieldGroup>
+        </form>
 
-      <div className="flex gap-4 mt-2" style={{ minHeight: 360 }}>
-        {/* Left panel: Available Tools */}
-        <div className="flex-1 min-w-0">
-          <div className="flex items-center justify-between mb-2">
-            <p className="text-sm font-semibold text-foreground">Available Tools</p>
+        <div className="flex gap-4 mt-2" style={{ minHeight: 360 }}>
+          {/* Left panel: Available Tools */}
+          <div className="flex-1 min-w-0">
+            <div className="flex items-center justify-between mb-2">
+              <p className="text-sm font-semibold text-foreground">Available Tools</p>
+            </div>
+            <Input
+              placeholder="Search MCP servers..."
+              value={serverSearch}
+              onChange={(e) => setServerSearch(e.target.value)}
+              className="mb-2"
+              allowClear
+            />
+            <div className="space-y-2 overflow-y-auto" style={{ maxHeight: 300 }}>
+              {filteredServers.length === 0 ? (
+                <p className="text-muted-foreground text-sm">
+                  {mcpServers.length === 0 ? "No MCP servers configured" : "No servers match your search"}
+                </p>
+              ) : (
+                filteredServers.map((server) => (
+                  <MCPToolList
+                    key={server.server_id}
+                    serverId={server.server_id}
+                    serverName={server.alias || server.server_name || server.server_id}
+                    accessToken={accessToken}
+                    selectedTools={selectedTools}
+                    onToggle={handleToggleTool}
+                  />
+                ))
+              )}
+            </div>
           </div>
-          <Input
-            placeholder="Search MCP servers..."
-            value={serverSearch}
-            onChange={(e) => setServerSearch(e.target.value)}
-            className="mb-2"
-            allowClear
-          />
-          <div className="space-y-2 overflow-y-auto" style={{ maxHeight: 300 }}>
-            {filteredServers.length === 0 ? (
-              <p className="text-muted-foreground text-sm">
-                {mcpServers.length === 0 ? "No MCP servers configured" : "No servers match your search"}
-              </p>
-            ) : (
-              filteredServers.map((server) => (
-                <MCPToolList
-                  key={server.server_id}
-                  serverId={server.server_id}
-                  serverName={server.alias || server.server_name || server.server_id}
-                  accessToken={accessToken}
-                  selectedTools={selectedTools}
-                  onToggle={handleToggleTool}
-                />
-              ))
-            )}
+
+          {/* Divider */}
+          <div className="w-px bg-border shrink-0" />
+
+          {/* Right panel: Your Toolset */}
+          <div className="w-72 shrink-0">
+            <p className="text-sm font-semibold text-foreground mb-2 block">
+              Your Toolset{" "}
+              <span className="text-xs font-normal text-muted-foreground">({selectedTools.length} tools)</span>
+            </p>
+            <div className="space-y-1 overflow-y-auto" style={{ maxHeight: 340 }}>
+              {selectedTools.length === 0 ? (
+                <p className="text-muted-foreground text-sm">No tools added yet</p>
+              ) : (
+                selectedTools.map((tool, idx) => (
+                  <button
+                    key={idx}
+                    type="button"
+                    onClick={() => handleToggleTool(tool)}
+                    className="w-full flex items-center justify-between px-3 py-1.5 rounded-lg border border-purple-200 bg-purple-50 hover:bg-red-50 hover:border-red-200 group transition-colors dark:border-purple-800 dark:bg-purple-950 dark:hover:bg-red-950 dark:hover:border-red-800"
+                  >
+                    <div className="min-w-0 text-left">
+                      <span className="text-xs font-medium text-purple-800 group-hover:text-red-600 truncate block dark:text-purple-200 dark:group-hover:text-red-400">
+                        {displayToolName(serverPrefixById.get(tool.server_id), tool.tool_name)}
+                      </span>
+                      <span className="text-[10px] text-purple-400 truncate block dark:text-purple-500">
+                        {tool.server_id.slice(0, 8)}…
+                      </span>
+                    </div>
+                    <span className="ml-2 text-purple-300 group-hover:text-red-400 text-xs shrink-0 dark:text-purple-600">
+                      ✕
+                    </span>
+                  </button>
+                ))
+              )}
+            </div>
           </div>
         </div>
 
-        {/* Divider */}
-        <div className="w-px bg-border shrink-0" />
-
-        {/* Right panel: Your Toolset */}
-        <div className="w-72 shrink-0">
-          <p className="text-sm font-semibold text-foreground mb-2 block">
-            Your Toolset{" "}
-            <span className="text-xs font-normal text-muted-foreground">({selectedTools.length} tools)</span>
-          </p>
-          <div className="space-y-1 overflow-y-auto" style={{ maxHeight: 340 }}>
-            {selectedTools.length === 0 ? (
-              <p className="text-muted-foreground text-sm">No tools added yet</p>
-            ) : (
-              selectedTools.map((tool, idx) => (
-                <button
-                  key={idx}
-                  type="button"
-                  onClick={() => handleToggleTool(tool)}
-                  className="w-full flex items-center justify-between px-3 py-1.5 rounded-lg border border-purple-200 bg-purple-50 hover:bg-red-50 hover:border-red-200 group transition-colors dark:border-purple-800 dark:bg-purple-950 dark:hover:bg-red-950 dark:hover:border-red-800"
-                >
-                  <div className="min-w-0 text-left">
-                    <span className="text-xs font-medium text-purple-800 group-hover:text-red-600 truncate block dark:text-purple-200 dark:group-hover:text-red-400">
-                      {displayToolName(serverPrefixById.get(tool.server_id), tool.tool_name)}
-                    </span>
-                    <span className="text-[10px] text-purple-400 truncate block dark:text-purple-500">
-                      {tool.server_id.slice(0, 8)}…
-                    </span>
-                  </div>
-                  <span className="ml-2 text-purple-300 group-hover:text-red-400 text-xs shrink-0 dark:text-purple-600">
-                    ✕
-                  </span>
-                </button>
-              ))
-            )}
-          </div>
+        <div className="flex justify-end gap-2 mt-4 pt-4 border-t border-border">
+          <Button variant="outline" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button onClick={() => void form.handleSubmit(handleSubmit)()} disabled={saving} aria-busy={saving}>
+            {saving && <UiLoadingSpinner className="size-4" />}
+            {initialToolset ? "Save Changes" : "Create Toolset"}
+          </Button>
         </div>
-      </div>
-
-      <div className="flex justify-end gap-2 mt-4 pt-4 border-t border-border">
-        <Button variant="outline" onClick={onClose}>
-          Cancel
-        </Button>
-        <Button onClick={() => void form.handleSubmit(handleSubmit)()} disabled={saving} aria-busy={saving}>
-          {saving && <UiLoadingSpinner className="size-4" />}
-          {initialToolset ? "Save Changes" : "Create Toolset"}
-        </Button>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   );
 }
 
@@ -472,18 +471,24 @@ export function MCPToolsetsTab({ accessToken, userRole }: MCPToolsetsTabProps) {
         />
       )}
 
-      <Modal
-        open={!!deleteId}
-        onCancel={() => setDeleteId(null)}
-        onOk={handleDelete}
-        okText="Delete"
-        okButtonProps={{ danger: true, loading: deleting }}
-        title="Delete Toolset"
-      >
-        <p>
-          Are you sure you want to delete this toolset? Keys and teams using it will lose access to the scoped tools.
-        </p>
-      </Modal>
+      <Dialog open={!!deleteId} onOpenChange={(open) => !open && setDeleteId(null)}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+          <DialogHeader>
+            <DialogTitle>Delete Toolset</DialogTitle>
+          </DialogHeader>
+          <p>
+            Are you sure you want to delete this toolset? Keys and teams using it will lose access to the scoped tools.
+          </p>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setDeleteId(null)}>
+              Cancel
+            </Button>
+            <Button onClick={handleDelete} variant="destructive" disabled={deleting} aria-busy={deleting}>
+              Delete
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx
index 545efb910c4..e88c78271d3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OAuthFormFields.tsx
@@ -1,13 +1,24 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Input as AntdInput, InputNumber, Select, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { SimpleTooltip } from "@/components/ui/tooltip";
+import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
 import { OAUTH_FLOW } from "@/components/mcp_tools/types";
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
 import TokenEndpointAuthMethodField from "./TokenEndpointAuthMethodField";
-import { numberControl, parsesAsJson, selectControl, textControl } from "./mcpFieldRules";
+import {
+  numberControl,
+  parsesAsJson,
+  selectControl,
+  selectTriggerControl,
+  tagsControl,
+  textControl,
+} from "./mcpFieldRules";
 
 interface OAuthFlowStatus {
   startOAuthFlow: () => void;
@@ -27,6 +38,11 @@ interface OAuthFormFieldsProps {
 
 const fieldClassName = "rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500";
 
+const OAUTH_FLOW_ITEMS = [
+  { value: OAUTH_FLOW.M2M, label: "Machine-to-Machine (M2M)" },
+  { value: OAUTH_FLOW.INTERACTIVE, label: "Interactive (PKCE)" },
+];
+
 const UPSTREAM_RESOURCE_TOOLTIP =
   "RFC 8707 resource indicator sent to the authorization server so it mints a token audienced for this MCP server. " +
   "Leave blank to send nothing, which is the default and what most providers expect. Use 'auto' to send this server's " +
@@ -37,9 +53,9 @@ const UPSTREAM_RESOURCE_TOOLTIP =
 const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, tooltip }) => (
   <span className="text-sm font-medium text-gray-700 flex items-center">
     {label}
-    <Tooltip title={tooltip}>
-      <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-    </Tooltip>
+    <SimpleTooltip content={tooltip}>
+      <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+    </SimpleTooltip>
   </span>
 );
 
@@ -78,19 +94,24 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
         {...(initialFlowType ? { defaultValue: initialFlowType } : {})}
       >
         {(control) => (
-          <Select {...selectControl(control)} placeholder="Select OAuth flow" className="rounded-lg" size="large">
-            <Select.Option value={OAUTH_FLOW.M2M}>
-              <div>
-                <span className="font-medium">Machine-to-Machine (M2M)</span>
-                <span className="text-gray-400 text-xs ml-2">server-to-server, no user interaction</span>
-              </div>
-            </Select.Option>
-            <Select.Option value={OAUTH_FLOW.INTERACTIVE}>
-              <div>
-                <span className="font-medium">Interactive (PKCE)</span>
-                <span className="text-gray-400 text-xs ml-2">browser-based user authorization</span>
-              </div>
-            </Select.Option>
+          <Select {...selectControl<string>(control)} items={OAUTH_FLOW_ITEMS}>
+            <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
+              <SelectValue placeholder="Select OAuth flow" />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value={OAUTH_FLOW.M2M}>
+                <div>
+                  <span className="font-medium">Machine-to-Machine (M2M)</span>
+                  <span className="ml-2 text-xs text-muted-foreground">server-to-server, no user interaction</span>
+                </div>
+              </SelectItem>
+              <SelectItem value={OAUTH_FLOW.INTERACTIVE}>
+                <div>
+                  <span className="font-medium">Interactive (PKCE)</span>
+                  <span className="ml-2 text-xs text-muted-foreground">browser-based user authorization</span>
+                </div>
+              </SelectItem>
+            </SelectContent>
           </Select>
         )}
       </MountedFormField>
@@ -104,10 +125,10 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             rules={requiredWhenCreating("Client ID is required for M2M OAuth")}
           >
             {(control) => (
-              <AntdInput.Password
+              <PasswordInput
                 {...textControl(control)}
                 placeholder={`Enter OAuth client ID${placeholderSuffix}`}
-                className={fieldClassName}
+                groupClassName={fieldClassName}
               />
             )}
           </MountedFormField>
@@ -120,10 +141,10 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             rules={requiredWhenCreating("Client Secret is required for M2M OAuth")}
           >
             {(control) => (
-              <AntdInput.Password
+              <PasswordInput
                 {...textControl(control)}
                 placeholder={`Enter OAuth client secret${placeholderSuffix}`}
-                className={fieldClassName}
+                groupClassName={fieldClassName}
               />
             )}
           </MountedFormField>
@@ -151,16 +172,7 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             }
             name={["credentials", "scopes"]}
           >
-            {(control) => (
-              <Select
-                {...selectControl(control)}
-                mode="tags"
-                tokenSeparators={[","]}
-                placeholder="Add scopes"
-                className="rounded-lg"
-                size="large"
-              />
-            )}
+            {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
           </MountedFormField>
           <UpstreamResourceField />
         </>
@@ -189,10 +201,10 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             name={["credentials", "client_id"]}
           >
             {(control) => (
-              <AntdInput.Password
+              <PasswordInput
                 {...textControl(control)}
                 placeholder={`Enter client ID${placeholderSuffix}`}
-                className={fieldClassName}
+                groupClassName={fieldClassName}
               />
             )}
           </MountedFormField>
@@ -206,10 +218,10 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             name={["credentials", "client_secret"]}
           >
             {(control) => (
-              <AntdInput.Password
+              <PasswordInput
                 {...textControl(control)}
                 placeholder={`Enter client secret${placeholderSuffix}`}
-                className={fieldClassName}
+                groupClassName={fieldClassName}
               />
             )}
           </MountedFormField>
@@ -222,16 +234,7 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             }
             name={["credentials", "scopes"]}
           >
-            {(control) => (
-              <Select
-                {...selectControl(control)}
-                mode="tags"
-                tokenSeparators={[","]}
-                placeholder="Add scopes"
-                className="rounded-lg"
-                size="large"
-              />
-            )}
+            {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
           </MountedFormField>
           <UpstreamResourceField />
           <MountedFormField
@@ -305,7 +308,7 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             rules={{ validate: { json: parsesAsJson("Must be valid JSON") } }}
           >
             {(control) => (
-              <AntdInput.TextArea
+              <Textarea
                 {...textControl(control)}
                 placeholder={'{\n  "organization": "my-org",\n  "team.id": "123"\n}'}
                 rows={4}
@@ -323,13 +326,7 @@ const OAuthFormFields: React.FC<OAuthFormFieldsProps> = ({
             name="token_storage_ttl_seconds"
           >
             {(control) => (
-              <InputNumber
-                {...numberControl(control)}
-                min={1}
-                placeholder="e.g. 3600"
-                className="w-full rounded-lg"
-                style={{ width: "100%" }}
-              />
+              <Input {...numberControl(control)} min={1} placeholder="e.g. 3600" className="w-full rounded-lg" />
             )}
           </MountedFormField>
           {oauthFlow && (
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx
index 78c8bbe73a9..8907595d92a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenAPIFormSection.tsx
@@ -1,6 +1,7 @@
+import { Info } from "lucide-react";
 import React, { useState } from "react";
-import { Input, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { SimpleTooltip } from "@/components/ui/tooltip";
+import { Input } from "@/components/ui/input";
 import { AUTH_TYPE, OAUTH_FLOW } from "@/components/mcp_tools/types";
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
@@ -68,9 +69,9 @@ const OpenAPIFormSection: React.FC<OpenAPIFormSectionProps> = ({
         label={
           <span className="text-sm font-medium text-gray-700 flex items-center">
             OpenAPI Spec URL
-            <Tooltip title="URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.">
-              <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-            </Tooltip>
+            <SimpleTooltip content="URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.">
+              <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+            </SimpleTooltip>
           </span>
         }
         name="spec_path"
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx
index 83c841439f0..982998c0aae 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/OpenApiByokFields.tsx
@@ -1,10 +1,13 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Input, Select, Switch, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 import { useWatch } from "react-hook-form";
 
+import { Input } from "@/components/ui/input";
+import { Switch } from "@/components/ui/switch";
 import { MountedFormField } from "@/components/common_components/MountedFormField";
-import { selectControl, switchControl, textControl } from "./mcpFieldRules";
+import { switchControl, tagsControl, textControl } from "./mcpFieldRules";
 
 const AUTH_HEADER_FORMATS: Readonly<Record<string, string>> = {
   bearer_token: "Authorization: Bearer {key}",
@@ -25,9 +28,9 @@ const OpenApiByokFields: React.FC = () => {
         label={
           <span className="text-sm font-medium text-gray-700 flex items-center gap-2">
             BYOK (Bring Your Own Key)
-            <Tooltip title="When enabled, each user provides their own API key for this service. Keys are stored per-user and never shared.">
-              <InfoCircleOutlined className="text-blue-400 hover:text-blue-600 cursor-help" />
-            </Tooltip>
+            <SimpleTooltip content="When enabled, each user provides their own API key for this service. Keys are stored per-user and never shared.">
+              <Info className="size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+            </SimpleTooltip>
           </span>
         }
         name="is_byok"
@@ -39,7 +42,7 @@ const OpenApiByokFields: React.FC = () => {
         <>
           {hasAuthType && (
             <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 shrink-0" />
+              <Info className="mt-0.5 size-4 shrink-0" />
               <span>
                 User keys will be sent as:{" "}
                 <code className="font-mono bg-blue-100 px-1 rounded-sm">
@@ -50,7 +53,7 @@ const OpenApiByokFields: React.FC = () => {
           )}
           {!authType && (
             <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 shrink-0" />
+              <Info className="mt-0.5 size-4 shrink-0" />
               <span>
                 Set the <strong>Authentication Type</strong> below to specify how user keys are sent (e.g., Bearer
                 Token, API Key header).
@@ -61,20 +64,18 @@ const OpenApiByokFields: React.FC = () => {
             label={
               <span className="text-sm font-medium text-gray-700">
                 Access Description
-                <Tooltip title="List of permissions shown to users in the connection modal (e.g. 'Create and manage Jira issues')">
-                  <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                </Tooltip>
+                <SimpleTooltip content="List of permissions shown to users in the connection modal (e.g. 'Create and manage Jira issues')">
+                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                </SimpleTooltip>
               </span>
             }
             name="byok_description"
           >
             {(control) => (
-              <Select
-                {...selectControl(control)}
-                mode="tags"
+              <MultiSelect
+                {...tagsControl(control)}
                 placeholder="Add access description items (press Enter after each)"
                 className="w-full"
-                tokenSeparators={[","]}
               />
             )}
           </MountedFormField>
@@ -83,9 +84,9 @@ const OpenApiByokFields: React.FC = () => {
             label={
               <span className="text-sm font-medium text-gray-700">
                 API Key Help URL
-                <Tooltip title="Optional link shown to users to help them find their API key">
-                  <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                </Tooltip>
+                <SimpleTooltip content="Optional link shown to users to help them find their API key">
+                  <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                </SimpleTooltip>
               </span>
             }
             name="byok_api_key_help_url"
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx
index 406da95901a..71abae58bb6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx
@@ -1,6 +1,8 @@
 import React from "react";
-import { Checkbox, Input } from "antd";
 import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Label } from "@/components/ui/label";
+import { PasswordInput } from "@/components/shared/PasswordInput";
 import DcrBridgeToggle from "./DcrBridgeToggle";
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { textControl } from "./mcpFieldRules";
@@ -90,11 +92,11 @@ export default function PassthroughAuthorizeSection({
         help={clientIdExtra}
       >
         {(control) => (
-          <Input.Password
+          <PasswordInput
             {...textControl(control)}
             placeholder={clientIdPlaceholder}
             disabled={removeStoredApp}
-            className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+            groupClassName="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
           />
         )}
       </MountedFormField>
@@ -103,21 +105,20 @@ export default function PassthroughAuthorizeSection({
         name={["credentials", "client_secret"]}
       >
         {(control) => (
-          <Input.Password
+          <PasswordInput
             {...textControl(control)}
             placeholder={clientSecretPlaceholder}
             disabled={removeStoredApp}
-            className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+            groupClassName="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
           />
         )}
       </MountedFormField>
       <DcrBridgeToggle authType={authType} initialChecked={dcrBridgeInitialChecked} />
       {isEditing && onRemoveStoredAppChange && (
-        <Checkbox checked={removeStoredApp} onChange={(e) => onRemoveStoredAppChange(e.target.checked)}>
-          <span className="text-sm text-gray-700">
-            Remove the saved OAuth app on save (the server goes back to dynamic client registration)
-          </span>
-        </Checkbox>
+        <Label className="items-start leading-normal font-normal text-gray-700">
+          <Checkbox className="mt-0.5" checked={removeStoredApp} onCheckedChange={onRemoveStoredAppChange} />
+          Remove the saved OAuth app on save (the server goes back to dynamic client registration)
+        </Label>
       )}
       <Button
         variant="outline"
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx
index bb410aa19dc..fb8bff1307a 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/StdioConfiguration.tsx
@@ -1,9 +1,10 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Input, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
+import { Textarea } from "@/components/ui/textarea";
 import { parsesAsJson, textControl } from "./mcpFieldRules";
 
 interface StdioConfigurationProps {
@@ -36,9 +37,9 @@ const StdioConfiguration: React.FC<StdioConfigurationProps> = ({ isVisible, requ
       label={
         <span className="text-sm font-medium text-gray-700 flex items-center">
           Stdio Configuration (JSON)
-          <Tooltip title="Paste your stdio MCP server configuration in JSON format. You can use the full mcpServers structure from config.yaml or just the inner server configuration.">
-            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-          </Tooltip>
+          <SimpleTooltip content="Paste your stdio MCP server configuration in JSON format. You can use the full mcpServers structure from config.yaml or just the inner server configuration.">
+            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+          </SimpleTooltip>
         </span>
       }
       name="stdio_config"
@@ -51,7 +52,7 @@ const StdioConfiguration: React.FC<StdioConfigurationProps> = ({ isVisible, requ
       }}
     >
       {(control) => (
-        <Input.TextArea
+        <Textarea
           {...textControl(control)}
           placeholder={PLACEHOLDER}
           rows={12}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx
index 38fa3573079..91706f35e95 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenEndpointAuthMethodField.tsx
@@ -1,9 +1,10 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Select, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
-import { selectControl } from "./mcpFieldRules";
+import { selectControl, selectTriggerControl } from "./mcpFieldRules";
 
 const TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS = [
   { value: "client_secret_basic", label: "Client Secret Basic" },
@@ -19,25 +20,33 @@ const TokenEndpointAuthMethodField: React.FC<TokenEndpointAuthMethodFieldProps>
     label={
       <span className="text-sm font-medium text-gray-700 flex items-center">
         Token Endpoint Auth Method (optional)
-        <Tooltip title="How the proxy authenticates to the upstream OAuth token endpoint. Client Secret Basic sends the client credentials in an HTTP Basic Authorization header; leave blank to use the default, Client Secret Post, which sends them in the request body.">
-          <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-        </Tooltip>
+        <SimpleTooltip content="How the proxy authenticates to the upstream OAuth token endpoint. Client Secret Basic sends the client credentials in an HTTP Basic Authorization header; leave blank to use the default, Client Secret Post, which sends them in the request body.">
+          <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+        </SimpleTooltip>
       </span>
     }
     name={["credentials", "token_endpoint_auth_method"]}
   >
-    {(control) => (
-      <Select
-        {...selectControl(control)}
-        allowClear
-        placeholder={
-          isEditing ? "Leave blank to keep existing (default Client Secret Post)" : "Default (Client Secret Post)"
-        }
-        className="rounded-lg"
-        size="large"
-        options={TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS}
-      />
-    )}
+    {(control) => {
+      const placeholder = isEditing
+        ? "Leave blank to keep existing (default Client Secret Post)"
+        : "Default (Client Secret Post)";
+      return (
+        <Select {...selectControl<string>(control)} items={TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS}>
+          <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
+            <SelectValue placeholder={placeholder} />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value={null}>{placeholder}</SelectItem>
+            {TOKEN_ENDPOINT_AUTH_METHOD_OPTIONS.map((option) => (
+              <SelectItem key={option.value} value={option.value}>
+                {option.label}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+      );
+    }}
   </MountedFormField>
 );
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx
index ba213b20655..5aaa013aba4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/TokenExchangeFormFields.tsx
@@ -1,11 +1,15 @@
+import { Info } from "lucide-react";
 import React from "react";
-import { Input, Select, Tooltip } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 import { useWatch } from "react-hook-form";
 
 import { MountedFormField } from "@/components/common_components/MountedFormField";
 import { antdRequired } from "@/components/common_components/antdFormRules";
-import { selectControl, textControl } from "./mcpFieldRules";
+import { PasswordInput } from "@/components/shared/PasswordInput";
+import { Input } from "@/components/ui/input";
+import { selectControl, selectTriggerControl, tagsControl, textControl } from "./mcpFieldRules";
 
 interface TokenExchangeFormFieldsProps {
   isEditing?: boolean;
@@ -13,12 +17,17 @@ interface TokenExchangeFormFieldsProps {
 
 const fieldClassName = "rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500";
 
+const TOKEN_EXCHANGE_PROFILE_ITEMS = [
+  { value: "rfc8693", label: "RFC 8693 (standard)" },
+  { value: "entra_obo", label: "Microsoft Entra OBO" },
+];
+
 const FieldLabel: React.FC<{ label: string; tooltip: string }> = ({ label, tooltip }) => (
   <span className="text-sm font-medium text-gray-700 flex items-center">
     {label}
-    <Tooltip title={tooltip}>
-      <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-    </Tooltip>
+    <SimpleTooltip content={tooltip}>
+      <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+    </SimpleTooltip>
   </span>
 );
 
@@ -41,13 +50,17 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
         {...(isEditing ? {} : { defaultValue: "rfc8693" })}
       >
         {(control) => (
-          <Select {...selectControl(control)} className="rounded-lg" size="large">
-            <Select.Option value="rfc8693">
-              <span className="font-medium">RFC 8693 (standard)</span>
-            </Select.Option>
-            <Select.Option value="entra_obo">
-              <span className="font-medium">Microsoft Entra OBO</span>
-            </Select.Option>
+          <Select {...selectControl<string>(control)} items={TOKEN_EXCHANGE_PROFILE_ITEMS}>
+            <SelectTrigger {...selectTriggerControl(control)} className="w-full rounded-lg">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {TOKEN_EXCHANGE_PROFILE_ITEMS.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  <span className="font-medium">{item.label}</span>
+                </SelectItem>
+              ))}
+            </SelectContent>
           </Select>
         )}
       </MountedFormField>
@@ -80,10 +93,10 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
         rules={requiredWhenCreating("Client ID is required for token exchange")}
       >
         {(control) => (
-          <Input.Password
+          <PasswordInput
             {...textControl(control)}
             placeholder={`Enter OAuth client ID${placeholderSuffix}`}
-            className={fieldClassName}
+            groupClassName={fieldClassName}
           />
         )}
       </MountedFormField>
@@ -99,10 +112,10 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
         rules={requiredWhenCreating("Client Secret is required for token exchange")}
       >
         {(control) => (
-          <Input.Password
+          <PasswordInput
             {...textControl(control)}
             placeholder={`Enter OAuth client secret${placeholderSuffix}`}
-            className={fieldClassName}
+            groupClassName={fieldClassName}
           />
         )}
       </MountedFormField>
@@ -164,13 +177,10 @@ const TokenExchangeFormFields: React.FC<TokenExchangeFormFieldsProps> = ({ isEdi
         }
       >
         {(control) => (
-          <Select
-            {...selectControl(control)}
-            mode="tags"
-            tokenSeparators={[","]}
+          <MultiSelect
+            {...tagsControl(control)}
             placeholder={isEntraObo ? "api://<app-id>/.default" : "Add scopes"}
             className="rounded-lg"
-            size="large"
           />
         )}
       </MountedFormField>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx
index 9238d604246..14d69c358ba 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolArgumentsForm.tsx
@@ -10,11 +10,13 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp
 import { FieldGroup } from "@/components/shared/form/field";
 import { FormField, type FormFieldControlProps } from "@/components/shared/form/FormField";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
+import type { InputSchemaProperty } from "@/components/mcp_tools/types";
 import {
   ToolArgumentField,
   ToolArgumentsFormValues,
   buildToolCallArguments,
   initialArgumentValues,
+  resolveSchemaProperty,
   toolArgumentsResolver,
 } from "./toolCallArguments";
 
@@ -44,9 +46,10 @@ const booleanTitle = (value: unknown): string | undefined => {
 
 const JsonArgumentControl: React.FC<{
   field: ToolArgumentField;
+  prop: InputSchemaProperty;
   control: FormFieldControlProps<ToolArgumentsFormValues, `args.${number}`>;
-}> = ({ field, control }) => {
-  const isObject = field.prop.type === "object";
+}> = ({ field, prop, control }) => {
+  const isObject = prop.type === "object";
   const fallbackPlaceholder = isObject ? `Enter JSON object for ${field.key}` : `Enter JSON array for ${field.key}`;
   return (
     <div className="space-y-2">
@@ -54,7 +57,7 @@ const JsonArgumentControl: React.FC<{
         {...control}
         rows={isObject ? 6 : 4}
         value={(control.value as string) ?? ""}
-        placeholder={field.prop.description || fallbackPlaceholder}
+        placeholder={prop.description || fallbackPlaceholder}
         spellCheck={false}
         data-testid={`textarea-${field.key}`}
         className="rounded-lg font-mono"
@@ -70,7 +73,9 @@ const ToolArgumentControl: React.FC<{
   field: ToolArgumentField;
   control: FormFieldControlProps<ToolArgumentsFormValues, `args.${number}`>;
 }> = ({ field, control }) => {
-  if (field.prop.type === "string" && field.prop.enum) {
+  const prop = resolveSchemaProperty(field.prop);
+
+  if (prop.type === "string" && prop.enum) {
     return (
       <select
         {...control}
@@ -78,7 +83,7 @@ const ToolArgumentControl: React.FC<{
         className="w-full rounded-lg border border-input bg-transparent px-3 py-2 text-sm shadow-xs transition-colors focus:border-ring focus:ring-3 focus:ring-ring/50 focus:outline-hidden"
       >
         {!field.required && <option value="">Select {field.key}</option>}
-        {field.prop.enum.map((option) => (
+        {prop.enum.map((option) => (
           <option key={option} value={option}>
             {option}
           </option>
@@ -87,20 +92,20 @@ const ToolArgumentControl: React.FC<{
     );
   }
 
-  if (field.prop.type === "number" || field.prop.type === "integer") {
+  if (prop.type === "number" || prop.type === "integer") {
     return (
       <Input
         {...control}
         type="number"
-        step={field.prop.type === "integer" ? 1 : "any"}
+        step={prop.type === "integer" ? 1 : "any"}
         value={(control.value as number | string) ?? ""}
-        placeholder={field.prop.description || `Enter ${field.key}`}
+        placeholder={prop.description || `Enter ${field.key}`}
         className="rounded-lg"
       />
     );
   }
 
-  if (field.prop.type === "boolean") {
+  if (prop.type === "boolean") {
     return (
       <Select
         items={field.required ? BOOLEAN_ITEMS : [{ value: "", label: `Select ${field.key}` }, ...BOOLEAN_ITEMS]}
@@ -124,15 +129,15 @@ const ToolArgumentControl: React.FC<{
     );
   }
 
-  if (field.prop.type === "object" || field.prop.type === "array") {
-    return <JsonArgumentControl field={field} control={control} />;
+  if (prop.type === "object" || prop.type === "array") {
+    return <JsonArgumentControl field={field} prop={prop} control={control} />;
   }
 
   return (
     <Input
       {...control}
       value={(control.value as string) ?? ""}
-      placeholder={field.prop.description || `Enter ${field.key}`}
+      placeholder={prop.description || `Enter ${field.key}`}
       className="rounded-lg"
     />
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.test.tsx
index 3fb5d602402..26e66c8338c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/ToolTestPanel.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import type { UserEvent } from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
@@ -389,3 +389,85 @@ describe("ToolTestPanel schema changes under a stable tool name", () => {
     expect(screen.getByLabelText("message")).toHaveValue("typed by hand");
   });
 });
+
+describe("ToolTestPanel optional union-typed parameters", () => {
+  const qaEchoSchema: InputSchema = {
+    type: "object",
+    properties: {
+      message: { type: "string" },
+      repeat: { type: "integer", default: 1 },
+      loud: { type: "boolean", default: false },
+      tags: { anyOf: [{ type: "array", items: { type: "string" } }, { type: "null" }], default: null },
+    },
+    required: ["message"],
+  };
+
+  const runPanel = async (drive: () => void) => {
+    const onSubmit = vi.fn();
+    render(
+      <ToolTestPanel
+        tool={buildTool(qaEchoSchema)}
+        onSubmit={onSubmit}
+        isLoading={false}
+        result={null}
+        error={null}
+        onClose={vi.fn()}
+      />,
+    );
+    drive();
+    await userEvent.setup().click(screen.getByRole("button", { name: "Call Tool" }));
+    return onSubmit;
+  };
+
+  it("renders the JSON textarea for an optional array parameter, not a plain text input", () => {
+    renderPanel(qaEchoSchema);
+
+    const tags = screen.getByTestId("textarea-tags");
+    expect(tags.tagName).toBe("TEXTAREA");
+    expect(tags).toHaveValue("");
+    expect(screen.getByPlaceholderText("Enter JSON array for tags")).toBe(tags);
+    expect(screen.queryByPlaceholderText("Enter tags")).not.toBeInTheDocument();
+  });
+
+  it("renders the JSON textarea for an optional object parameter, not a plain text input", () => {
+    renderPanel({
+      type: "object",
+      properties: {
+        payload: { anyOf: [{ type: "object", properties: { id: { type: "string" } } }, { type: "null" }] },
+      },
+    });
+
+    const payload = screen.getByTestId("textarea-payload");
+    expect(payload).toHaveValue(JSON.stringify({ id: "" }, null, 2));
+    expect(screen.getByPlaceholderText("Enter JSON object for payload")).toBe(payload);
+    expect(screen.queryByPlaceholderText("Enter payload")).not.toBeInTheDocument();
+  });
+
+  it("sends an optional array parameter as a real array", async () => {
+    const onSubmit = await runPanel(() => {
+      fireEvent.change(screen.getByPlaceholderText("Enter message"), { target: { value: "hi" } });
+      fireEvent.change(screen.getByTestId("textarea-tags"), { target: { value: '["a","b"]' } });
+    });
+
+    const expected = { message: "hi", repeat: 1, loud: false, tags: ["a", "b"] };
+    expect(onSubmit).toHaveBeenCalledWith(expected);
+  });
+
+  it("omits an optional array parameter the user never filled in", async () => {
+    const onSubmit = await runPanel(() => {
+      fireEvent.change(screen.getByPlaceholderText("Enter message"), { target: { value: "hi" } });
+    });
+
+    expect(onSubmit).toHaveBeenCalledWith({ message: "hi", repeat: 1, loud: false });
+  });
+
+  it("blocks the call instead of sending comma-separated text as a raw string", async () => {
+    const onSubmit = await runPanel(() => {
+      fireEvent.change(screen.getByPlaceholderText("Enter message"), { target: { value: "hi" } });
+      fireEvent.change(screen.getByTestId("textarea-tags"), { target: { value: "a,b" } });
+    });
+
+    expect(await screen.findByText("Invalid JSON")).toBeInTheDocument();
+    expect(onSubmit).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.integration.test.tsx
index ee9efdd3e72..daf53ed9291 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.integration.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import userEvent, { PointerEventsCheckLevel } from "@testing-library/user-event";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
@@ -23,21 +23,27 @@ const statusWith = (required: MCPUserEnvVarsStatus["required"]): MCPUserEnvVarsS
 
 const renderModal = (status: MCPUserEnvVarsStatus, onSaved = vi.fn(), onClose = vi.fn()) => {
   vi.mocked(networking.getMCPUserEnvVars).mockResolvedValue(status);
-  render(
+  const view = render(
     <QueryClientProvider client={createQueryClient()}>
       <UserEnvVarsModal server={server} open accessToken="sk-test" onClose={onClose} onSaved={onSaved} />
     </QueryClientProvider>,
   );
-  return { onSaved, onClose };
+  const setOpen = (open: boolean) =>
+    view.rerender(
+      <QueryClientProvider client={createQueryClient()}>
+        <UserEnvVarsModal server={server} open={open} accessToken="sk-test" onClose={onClose} onSaved={onSaved} />
+      </QueryClientProvider>,
+    );
+  return { onSaved, onClose, setOpen };
 };
 
 const save = (user: ReturnType<typeof setup>) => user.click(screen.getByRole("button", { name: "Save Credentials" }));
 
+// Opening the modal remounts the form so nothing carries over from the last time it was open.
+// Settle that remount before handing back a node, or the caller holds a detached one.
 const fieldAfterOpen = async (label: RegExp): Promise<HTMLElement> => {
-  const initial = await screen.findByLabelText(label);
-  await waitFor(() => {
-    expect(initial).not.toBeInTheDocument();
-  });
+  await screen.findByLabelText(label);
+  await act(async () => {});
   return screen.getByLabelText(label);
 };
 
@@ -149,6 +155,22 @@ describe("UserEnvVarsModal", () => {
     expect(screen.getByLabelText(/^API_KEY/)).toHaveAttribute("type", "password");
   });
 
+  it("starts from a blank form each time it is opened", async () => {
+    const { setOpen } = renderModal(statusWith([{ name: "API_KEY", description: null, is_set: false }]));
+
+    const input = await fieldAfterOpen(/^API_KEY/);
+    fireEvent.change(input, { target: { value: "hunter2" } });
+    expect(screen.getByLabelText(/^API_KEY/)).toHaveValue("hunter2");
+
+    setOpen(false);
+    await waitFor(() => {
+      expect(screen.queryByLabelText(/^API_KEY/)).not.toBeInTheDocument();
+    });
+
+    setOpen(true);
+    expect(await fieldAfterOpen(/^API_KEY/)).toHaveValue("");
+  });
+
   it("reports the empty state instead of a form when nothing is required", async () => {
     renderModal(statusWith([]));
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx
index df97f05c6fe..ea2addcd5f1 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/UserEnvVarsModal.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Modal, Alert, Spin, Tag, Typography } from "antd";
+import { CircleAlert, Info } from "lucide-react";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { z } from "zod/v4";
 import { MCPServer, MCPUserEnvVarsStatus, MCPUserEnvVarSpec } from "@/components/mcp_tools/types";
@@ -7,13 +7,14 @@ import { getMCPUserEnvVars, storeMCPUserEnvVars } from "@/components/networking"
 import { toast } from "@/lib/toast";
 import { FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
+import { Alert, AlertTitle } from "@/components/shared/Alert";
 import { PasswordInput } from "@/components/shared/PasswordInput";
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
 
-const { Text, Title } = Typography;
-
 interface UserEnvVarsModalProps {
   server: MCPServer | null;
   open: boolean;
@@ -54,7 +55,7 @@ const UserEnvVarsForm: React.FC<UserEnvVarsFormProps> = ({ required, isSaving, o
             label={
               <span className="flex items-center gap-2">
                 <span className="font-mono text-sm font-semibold">{spec.name}</span>
-                {spec.is_set && <Tag color="green">Set</Tag>}
+                {spec.is_set && <Badge variant="secondary">Set</Badge>}
               </span>
             }
           >
@@ -91,8 +92,6 @@ const UserEnvVarsForm: React.FC<UserEnvVarsFormProps> = ({ required, isSaving, o
  * description as the placeholder.
  */
 const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, accessToken, onClose, onSaved }) => {
-  const [formGeneration, setFormGeneration] = React.useState(0);
-
   const {
     data: status,
     isLoading,
@@ -129,56 +128,44 @@ const UserEnvVarsModal: React.FC<UserEnvVarsModalProps> = ({ server, open, acces
   const isSaving = saveMutation.isPending;
 
   return (
-    <Modal
-      open={open}
-      onCancel={onClose}
-      footer={null}
-      width={520}
-      destroyOnHidden
-      afterOpenChange={(opened) => {
-        if (opened) setFormGeneration((generation) => generation + 1);
-      }}
-      title={
-        <div>
+    <Dialog open={open} onOpenChange={(opened) => !opened && onClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[520px]">
+        <DialogHeader>
           <div className="flex items-center gap-2">
-            <Title level={5} style={{ margin: 0 }}>
-              Set your credentials
-            </Title>
-            <Tag color="blue">Per-user</Tag>
+            <DialogTitle className="text-base font-semibold">Set your credentials</DialogTitle>
+            <Badge variant="info">Per-user</Badge>
           </div>
-          <Text type="secondary" className="text-xs">
-            {displayName}
-          </Text>
+          <span className="text-xs text-muted-foreground">{displayName}</span>
+        </DialogHeader>
+
+        <div className="mt-2 space-y-4">
+          {isLoading ? (
+            <div className="flex items-center justify-center py-8">
+              <UiLoadingSpinner className="size-5" />
+            </div>
+          ) : isError ? (
+            <Alert variant="error">
+              <CircleAlert />
+              <AlertTitle>Failed to load env vars</AlertTitle>
+            </Alert>
+          ) : required.length === 0 ? (
+            <Alert variant="info">
+              <Info />
+              <AlertTitle>No per-user fields configured for this server.</AlertTitle>
+            </Alert>
+          ) : (
+            <>
+              <span className="block text-sm text-muted-foreground">
+                These values are private to you. Your admin configured this MCP server to require these per-user
+                credentials. Saved values are never shown back; leave an already-set field blank to keep it, or enter a
+                value to set or change it.
+              </span>
+              <UserEnvVarsForm required={required} isSaving={isSaving} onCancel={onClose} onSubmit={handleSave} />
+            </>
+          )}
         </div>
-      }
-    >
-      <div className="space-y-4 mt-2">
-        {isLoading ? (
-          <div className="flex items-center justify-center py-8">
-            <Spin />
-          </div>
-        ) : isError ? (
-          <Alert type="error" showIcon message="Failed to load env vars" />
-        ) : required.length === 0 ? (
-          <Alert type="info" showIcon message="No per-user fields configured for this server." />
-        ) : (
-          <>
-            <Text className="text-sm text-muted-foreground block">
-              These values are private to you. Your admin configured this MCP server to require these per-user
-              credentials. Saved values are never shown back; leave an already-set field blank to keep it, or enter a
-              value to set or change it.
-            </Text>
-            <UserEnvVarsForm
-              key={formGeneration}
-              required={required}
-              isSaving={isSaving}
-              onCancel={onClose}
-              onSubmit={handleSave}
-            />
-          </>
-        )}
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.test.ts
index 94544ec6e2d..97373939ad1 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.test.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.test.ts
@@ -13,7 +13,6 @@ const fullSnapshot: CreateUiSnapshot = {
   costConfig: { default_cost_per_query: 0.02 },
   allowedTools: ["search"],
   hasToolAllowlistInteraction: true,
-  searchValue: "group-a",
   aliasManuallyEdited: true,
   logoUrl: "https://cdn/logo.png",
   authorizedIdentity: "identity-abc",
@@ -82,9 +81,8 @@ describe("createOAuthUiState", () => {
   });
 
   it("omits falsy scalars so a restore never blanks freshly mounted state", () => {
-    seedRaw({ searchValue: "", logoUrl: "", transportType: "", modalVisible: false });
+    seedRaw({ logoUrl: "", transportType: "", modalVisible: false });
     const restored = readCreateUiSnapshot();
-    expect(restored).not.toHaveProperty("searchValue");
     expect(restored).not.toHaveProperty("logoUrl");
     expect(restored).not.toHaveProperty("transportType");
     expect(restored).not.toHaveProperty("modalVisible");
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.ts
index f6475b97830..b50ba0841c2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createOAuthUiState.ts
@@ -14,7 +14,6 @@ export interface CreateUiSnapshot {
   readonly costConfig: MCPServerCostInfo;
   readonly allowedTools: readonly string[];
   readonly hasToolAllowlistInteraction: boolean;
-  readonly searchValue: string;
   readonly aliasManuallyEdited: boolean;
   readonly logoUrl: string | undefined;
   readonly authorizedIdentity: string | undefined;
@@ -29,7 +28,6 @@ export type RestoredUiSnapshot = {
   readonly costConfig?: MCPServerCostInfo;
   readonly allowedTools?: readonly string[];
   readonly hasToolAllowlistInteraction?: boolean;
-  readonly searchValue?: string;
   readonly aliasManuallyEdited?: boolean;
   readonly logoUrl?: string;
   readonly authorizedIdentity?: string;
@@ -83,7 +81,6 @@ export const readCreateUiSnapshot = (): RestoredUiSnapshot | null => {
       ...(typeof parsed.hasToolAllowlistInteraction === "boolean"
         ? { hasToolAllowlistInteraction: parsed.hasToolAllowlistInteraction }
         : {}),
-      ...(parsed.searchValue ? { searchValue: parsed.searchValue } : {}),
       ...(typeof parsed.aliasManuallyEdited === "boolean" ? { aliasManuallyEdited: parsed.aliasManuallyEdited } : {}),
       ...(parsed.logoUrl ? { logoUrl: parsed.logoUrl } : {}),
     };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.test.ts
new file mode 100644
index 00000000000..52ab74f7669
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.test.ts
@@ -0,0 +1,49 @@
+import { describe, expect, it, vi } from "vitest";
+import type { MountedFieldControlProps } from "@/components/common_components/MountedFormField";
+import { tagsControl } from "./mcpFieldRules";
+
+const controlWith = (value: unknown, onChange = vi.fn()): MountedFieldControlProps =>
+  ({ id: "field", name: "field", value, onChange, onBlur: vi.fn() }) as unknown as MountedFieldControlProps;
+
+// These fields were antd Selects with tokenSeparators={[","]}, so a comma commits a tag as an admin
+// types. MultiSelect owns that rule now, which leaves this adapter one job: hand the stored value to
+// the input and the edited value back, without rewriting either. Stdio args are process argv, so a
+// comma inside one and a deliberately repeated flag both have to survive a round trip.
+describe("tagsControl", () => {
+  it("keeps a stored argument that contains a comma as one argument", () => {
+    expect(tagsControl(controlWith(["--filter=a,b", "--verbose"])).value).toStrictEqual(["--filter=a,b", "--verbose"]);
+  });
+
+  it("keeps a repeated stdio flag rather than collapsing it to one", () => {
+    expect(tagsControl(controlWith(["-v", "-v"])).value).toStrictEqual(["-v", "-v"]);
+  });
+
+  it("offers each repeated tag once, since the dropdown keys its entries by value", () => {
+    expect(tagsControl(controlWith(["-v", "-v"])).options).toStrictEqual([{ label: "-v", value: "-v" }]);
+  });
+
+  it("stores the edited tags exactly as the input committed them", () => {
+    const onChange = vi.fn();
+    tagsControl(controlWith(["npx"], onChange)).onValueChange(["npx", "--header=X-Trace: on"]);
+
+    expect(onChange).toHaveBeenCalledWith(["npx", "--header=X-Trace: on"]);
+  });
+
+  it("renders a stored list unchanged", () => {
+    expect(tagsControl(controlWith(["run", "--flag a"])).value).toStrictEqual(["run", "--flag a"]);
+  });
+
+  it("clears to an empty list rather than a blank tag when the field is emptied", () => {
+    expect(tagsControl(controlWith("")).value).toStrictEqual([]);
+    expect(tagsControl(controlWith([""])).value).toStrictEqual([]);
+  });
+
+  it("ignores a stored value that is neither a string nor a list", () => {
+    expect(tagsControl(controlWith(null)).value).toStrictEqual([]);
+    expect(tagsControl(controlWith(42)).value).toStrictEqual([]);
+  });
+
+  it("wraps a bare stored string into the single tag the antd field would have shown", () => {
+    expect(tagsControl(controlWith("Authorization")).value).toStrictEqual(["Authorization"]);
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts
index 76ff74eac52..9046cb6d039 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcpFieldRules.ts
@@ -1,3 +1,4 @@
+import type React from "react";
 import type { Validate } from "react-hook-form";
 
 import type { MountedFieldControlProps, MountedFormValues } from "@/components/common_components/MountedFormField";
@@ -20,27 +21,58 @@ export const textControl = (control: MountedFieldControlProps) => ({
 });
 
 export const selectControl = <TValue = unknown>(control: MountedFieldControlProps) => ({
-  ...ariaOf(control),
-  value: control.value as TValue,
-  onChange: control.onChange,
+  value: (control.value ?? null) as TValue | null,
+  onValueChange: control.onChange,
 });
 
-export const numberControl = (control: MountedFieldControlProps) => ({
+export const selectTriggerControl = (control: MountedFieldControlProps) => ariaOf(control);
+
+// These fields were antd Selects carrying tokenSeparators={[","]}, and MultiSelect applies that same
+// rule to what an admin types. So this only adapts the stored value: splitting or deduping it here
+// would rewrite stdio argv entries and repeated flags that nobody edited.
+const toTags = (value: unknown): string[] =>
+  (Array.isArray(value) ? value : [value]).filter(
+    (entry): entry is string => typeof entry === "string" && entry !== "",
+  );
+
+export const tagsControl = (control: MountedFieldControlProps) => {
+  const value = toTags(control.value);
+  return {
+    id: control.id,
+    options: [...new Set(value)].map((tag) => ({ label: tag, value: tag })),
+    value,
+    onValueChange: control.onChange,
+    emptyText: "Type to add",
+    allowCustomValues: true,
+  };
+};
+
+const toNumberOrNull = (raw: string, precision: number | undefined): number | null => {
+  if (raw.trim() === "") return null;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed)) return null;
+  return precision === undefined ? parsed : Number(parsed.toFixed(precision));
+};
+
+export const numberControl = (control: MountedFieldControlProps, precision?: number) => ({
   ...ariaOf(control),
-  value: control.value as number | null | undefined,
-  onChange: control.onChange,
+  name: control.name,
+  type: "number" as const,
+  value: control.value === null || control.value === undefined ? "" : String(control.value),
+  onChange: (event: React.ChangeEvent<HTMLInputElement>) =>
+    control.onChange(toNumberOrNull(event.target.value, precision)),
 });
 
 export const switchControl = (control: MountedFieldControlProps) => ({
   ...ariaOf(control),
   checked: control.value === true,
-  onChange: control.onChange,
+  onCheckedChange: (checked: boolean) => control.onChange(checked),
 });
 
 export const invertedSwitchControl = (control: MountedFieldControlProps) => ({
   ...ariaOf(control),
   checked: control.value !== true,
-  onChange: (checked: boolean) => control.onChange(!checked),
+  onCheckedChange: (checked: boolean) => control.onChange(!checked),
 });
 
 export const valueAt = (values: MountedFormValues, path: readonly string[]): unknown =>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx
index bb739901faa..663fd4c0f5c 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_connect.tsx
@@ -1,15 +1,27 @@
 /* eslint-disable react/no-unescaped-entities */
 
-import React, { useState } from "react";
-import { Card, Typography, Space, Alert, Switch } from "antd";
+import React, { useId, useState } from "react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { CopyIcon, Code, Terminal, Globe, CheckIcon, ExternalLinkIcon, KeyIcon, ServerIcon, Zap } from "lucide-react";
+import {
+  CopyIcon,
+  Code,
+  Terminal,
+  Globe,
+  CheckIcon,
+  ExternalLinkIcon,
+  Info,
+  KeyIcon,
+  ServerIcon,
+  Zap,
+} from "lucide-react";
 import { getProxyBaseUrl } from "@/components/networking";
 import { copyToClipboard as utilCopyToClipboard } from "@/utils/dataUtils";
 
-const { Title, Text } = Typography;
-
 interface CodeBlockProps {
   code: string;
   title?: string;
@@ -35,6 +47,7 @@ const FeatureCard: React.FC<FeatureCardProps> = ({
   accessGroups = ["dev-group"],
 }) => {
   const [useServerHeader, setUseServerHeader] = useState(false);
+  const serverHeaderToggleId = useId();
 
   const getHeadersConfig = () => {
     const headers: Record<string, any> = {
@@ -50,62 +63,65 @@ const FeatureCard: React.FC<FeatureCardProps> = ({
   };
 
   return (
-    <Card className="border border-border">
-      <div className="flex items-center gap-3 mb-3">
-        <span className="p-2 rounded-lg bg-muted">{icon}</span>
-        <div>
-          <Title level={5} className="mb-0">
-            {title}
-          </Title>
-          <Text className="text-muted-foreground">{description}</Text>
-        </div>
-      </div>
-      {serverName && (title === "Implementation Example" || title === "Configuration") && (
-        <div className="mb-4">
-          <div className="flex items-center gap-2 mb-2">
-            <Switch size="small" checked={useServerHeader} onChange={setUseServerHeader} />
-            <Text className="text-sm">
-              Limit tools to specific MCP servers or MCP groups by passing the <code>x-mcp-servers</code> header
-            </Text>
+    <Card>
+      <CardContent>
+        <div className="flex items-center gap-3 mb-3">
+          <span className="p-2 rounded-lg bg-muted">{icon}</span>
+          <div>
+            <h5 className="mb-0 text-base font-semibold text-foreground">{title}</h5>
+            <span className="text-muted-foreground">{description}</span>
           </div>
-          {useServerHeader && (
-            <Alert
-              className="mt-2"
-              type="info"
-              showIcon
-              message="Two Options"
-              description={
-                <div>
-                  <p>
-                    <strong>Option 1:</strong> Get a specific server: <code>"{serverName.replace(/\s+/g, "_")}"</code>
-                  </p>
-                  <p>
-                    <strong>Option 2:</strong> Get a group of MCPs: <code>"dev-group"</code>
-                  </p>
-                  <p className="mt-2 text-sm text-muted-foreground">
-                    You can also mix both: <code>"Server1,dev-group"</code>
-                  </p>
-                </div>
-              }
-            />
-          )}
         </div>
-      )}
-      {React.Children.map(children, (child) => {
-        if (
-          React.isValidElement<CodeBlockProps>(child) &&
-          child.props.hasOwnProperty("code") &&
-          child.props.hasOwnProperty("copyKey")
-        ) {
-          const code = child.props.code;
-          if (code && code.includes('"headers":')) {
-            return React.cloneElement(child, {
-              code: code.replace(/"headers":\s*{[^}]*}/, `"headers": ${JSON.stringify(getHeadersConfig(), null, 8)}`),
-            });
+        {serverName && (title === "Implementation Example" || title === "Configuration") && (
+          <div className="mb-4">
+            <div className="flex items-center gap-2 mb-2">
+              <Switch
+                id={serverHeaderToggleId}
+                size="sm"
+                checked={useServerHeader}
+                onCheckedChange={setUseServerHeader}
+              />
+              <Label htmlFor={serverHeaderToggleId} className="font-normal leading-normal">
+                Limit tools to specific MCP servers or MCP groups by passing the <code>x-mcp-servers</code> header
+              </Label>
+            </div>
+            {useServerHeader && (
+              <Alert className="mt-2" variant="info">
+                <Info />
+                <AlertTitle>Two Options</AlertTitle>
+                <AlertDescription>
+                  <div>
+                    <p>
+                      <strong>Option 1:</strong> Get a specific server: <code>"{serverName.replace(/\s+/g, "_")}"</code>
+                    </p>
+                    <p>
+                      <strong>Option 2:</strong> Get a group of MCPs: <code>"dev-group"</code>
+                    </p>
+                    <p className="mt-2 text-sm text-muted-foreground">
+                      You can also mix both: <code>"Server1,dev-group"</code>
+                    </p>
+                  </div>
+                </AlertDescription>
+              </Alert>
+            )}
+          </div>
+        )}
+        {React.Children.map(children, (child) => {
+          if (
+            React.isValidElement<CodeBlockProps>(child) &&
+            child.props.hasOwnProperty("code") &&
+            child.props.hasOwnProperty("copyKey")
+          ) {
+            const code = child.props.code;
+            if (code && code.includes('"headers":')) {
+              return React.cloneElement(child, {
+                code: code.replace(/"headers":\s*{[^}]*}/, `"headers": ${JSON.stringify(getHeadersConfig(), null, 8)}`),
+              });
+            }
           }
-        }
-        return child;
-      })}
+          return child;
+        })}
+      </CardContent>
     </Card>
   );
 };
@@ -139,25 +155,25 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
       {title && (
         <div className="flex items-center gap-2 mb-2">
           <Code size={16} className="text-blue-600 dark:text-blue-400" />
-          <Text strong className="text-foreground">
-            {title}
-          </Text>
+          <strong className="font-semibold text-foreground">{title}</strong>
         </div>
       )}
-      <Card className={`bg-muted border border-border relative ${className}`}>
-        <Button
-          variant="ghost"
-          size="icon-xs"
-          onClick={() => copyToClipboard(code, copyKey)}
-          className={`absolute top-2 right-2 z-10 transition-all duration-200 ${
-            copiedStates[copyKey]
-              ? "text-green-600 bg-green-50 border-green-200 dark:text-green-400 dark:bg-green-950 dark:border-green-800"
-              : "text-muted-foreground hover:text-foreground hover:bg-accent"
-          }`}
-        >
-          {copiedStates[copyKey] ? <CheckIcon size={12} /> : <CopyIcon size={12} />}
-        </Button>
-        <pre className="text-sm overflow-x-auto pr-10 text-foreground font-mono leading-relaxed">{code}</pre>
+      <Card className={`relative bg-muted ${className}`}>
+        <CardContent>
+          <Button
+            variant="ghost"
+            size="icon-xs"
+            onClick={() => copyToClipboard(code, copyKey)}
+            className={`absolute top-2 right-2 z-10 transition-all duration-200 ${
+              copiedStates[copyKey]
+                ? "text-green-600 bg-green-50 border-green-200 dark:text-green-400 dark:bg-green-950 dark:border-green-800"
+                : "text-muted-foreground hover:text-foreground hover:bg-accent"
+            }`}
+          >
+            {copiedStates[copyKey] ? <CheckIcon size={12} /> : <CopyIcon size={12} />}
+          </Button>
+          <pre className="text-sm overflow-x-auto pr-10 text-foreground font-mono leading-relaxed">{code}</pre>
+        </CardContent>
       </Card>
     </div>
   );
@@ -174,40 +190,36 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
         </div>
       </div>
       <div className="flex-1">
-        <Text strong className="text-foreground block mb-2">
-          {title}
-        </Text>
+        <strong className="mb-2 block font-semibold text-foreground">{title}</strong>
         {children}
       </div>
     </div>
   );
 
   const LiteLLMProxyTab = () => (
-    <Space direction="vertical" size="large" className="w-full">
+    <div className="flex w-full flex-col gap-6">
       <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">
-            LiteLLM Proxy API Integration
-          </Title>
+          <h4 className="mb-0 text-xl font-semibold text-emerald-900">LiteLLM Proxy API Integration</h4>
         </div>
-        <Text className="text-emerald-700">
+        <span className="text-emerald-700">
           Connect to LiteLLM Proxy Responses API for seamless tool integration with multiple model providers
-        </Text>
+        </span>
       </div>
 
-      <Space direction="vertical" size="large" className="w-full">
+      <div className="flex w-full flex-col gap-6">
         <FeatureCard
           icon={<KeyIcon className="text-emerald-600" size={16} />}
           title="Virtual Key Setup"
           description="Configure your LiteLLM Proxy Virtual Key for authentication"
         >
-          <Space direction="vertical" size="middle" className="w-full">
+          <div className="flex w-full flex-col gap-4">
             <div>
-              <Text>Get your Virtual Key from your LiteLLM Proxy dashboard or contact your administrator</Text>
+              <span>Get your Virtual Key from your LiteLLM Proxy dashboard or contact your administrator</span>
             </div>
             <CodeBlock title="Environment Variable" code='export LITELLM_API_KEY="sk-..."' copyKey="litellm-env" />
-          </Space>
+          </div>
         </FeatureCard>
 
         <FeatureCard
@@ -250,34 +262,33 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
             className="text-xs"
           />
         </FeatureCard>
-      </Space>
-    </Space>
+      </div>
+    </div>
   );
 
   const OpenAITab = () => (
-    <Space direction="vertical" size="large" className="w-full">
+    <div className="flex w-full flex-col gap-6">
       <div className="bg-linear-to-r from-blue-50 to-indigo-50 p-6 rounded-lg border border-blue-100 dark:from-blue-950 dark:to-indigo-950 dark:border-blue-900">
         <div className="flex items-center gap-3 mb-3">
           <Code className="text-blue-600 dark:text-blue-400" size={24} />
-          <Title level={4} className="mb-0 text-blue-900 dark:text-blue-100">
+          <h4 className="mb-0 text-xl font-semibold text-blue-900 dark:text-blue-100">
             OpenAI Responses API Integration
-          </Title>
+          </h4>
         </div>
-        <Text className="text-blue-700 dark:text-blue-300">
+        <span className="text-blue-700 dark:text-blue-300">
           Connect OpenAI Responses API to your LiteLLM MCP server for seamless tool integration
-        </Text>
+        </span>
       </div>
 
-      <Space direction="vertical" size="large" className="w-full">
+      <div className="flex w-full flex-col gap-6">
         <FeatureCard
           icon={<KeyIcon className="text-blue-600 dark:text-blue-400" size={16} />}
           title="API Key Setup"
           description="Configure your OpenAI API key for authentication"
         >
-          <Space direction="vertical" size="middle" className="w-full">
+          <div className="flex w-full flex-col gap-4">
             <div>
-              {/* eslint-disable-next-line react/no-unescaped-entities */}
-              <Text>
+              <span>
                 Get your API key from the{" "}
                 <a
                   href="https://platform.openai.com/api-keys"
@@ -287,10 +298,10 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
                 >
                   OpenAI platform <ExternalLinkIcon size={12} />
                 </a>
-              </Text>
+              </span>
             </div>
             <CodeBlock title="Environment Variable" code='export OPENAI_API_KEY="sk-..."' copyKey="openai-env" />
-          </Space>
+          </div>
         </FeatureCard>
 
         <FeatureCard
@@ -333,88 +344,84 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
             className="text-xs"
           />
         </FeatureCard>
-      </Space>
-    </Space>
+      </div>
+    </div>
   );
 
   const CursorTab = () => (
-    <Space direction="vertical" size="large" className="w-full">
+    <div className="flex w-full flex-col gap-6">
       <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">
-            Cursor IDE Integration
-          </Title>
+          <h4 className="mb-0 text-xl font-semibold text-purple-900">Cursor IDE Integration</h4>
         </div>
-        <Text className="text-purple-700">
+        <span className="text-purple-700">
           Use tools directly from Cursor IDE with LiteLLM MCP. Enable your AI assistant to perform real-world tasks
           without leaving your coding environment.
-        </Text>
+        </span>
       </div>
 
-      <Card className="border border-border">
-        <Title level={5} className="mb-4 text-foreground">
-          Setup Instructions
-        </Title>
-        <Space direction="vertical" size="large" className="w-full">
-          <StepCard step={1} title="Open Cursor Settings">
-            <Text className="text-muted-foreground">
-              Use the keyboard shortcut <code className="bg-muted px-2 py-1 rounded-sm">⇧+⌘+J</code> (Mac) or{" "}
-              <code className="bg-muted px-2 py-1 rounded-sm">Ctrl+Shift+J</code> (Windows/Linux)
-            </Text>
-          </StepCard>
+      <Card>
+        <CardContent>
+          <h5 className="mb-4 text-base font-semibold text-foreground">Setup Instructions</h5>
+          <div className="flex w-full flex-col gap-6">
+            <StepCard step={1} title="Open Cursor Settings">
+              <span className="text-muted-foreground">
+                Use the keyboard shortcut <code className="bg-muted px-2 py-1 rounded-sm">⇧+⌘+J</code> (Mac) or{" "}
+                <code className="bg-muted px-2 py-1 rounded-sm">Ctrl+Shift+J</code> (Windows/Linux)
+              </span>
+            </StepCard>
 
-          <StepCard step={2} title="Navigate to MCP Tools">
-            <Text className="text-muted-foreground">Go to the "MCP Tools" tab and click "New MCP Server"</Text>
-          </StepCard>
+            <StepCard step={2} title="Navigate to MCP Tools">
+              <span className="text-muted-foreground">Go to the "MCP Tools" tab and click "New MCP Server"</span>
+            </StepCard>
 
-          <StepCard step={3} title="Add Configuration">
-            <Text className="text-muted-foreground mb-3">
-              Copy the JSON configuration below and paste it into Cursor, then save with{" "}
-              <code className="bg-muted px-2 py-1 rounded-sm">Cmd+S</code> or{" "}
-              <code className="bg-muted px-2 py-1 rounded-sm">Ctrl+S</code>
-            </Text>
-            <FeatureCard
-              icon={<Code className="text-purple-600" size={16} />}
-              title="Configuration"
-              description="Cursor MCP configuration"
-              serverName="Zapier Gmail"
-              accessGroups={["dev-group"]}
-            >
-              <CodeBlock
-                code={`{
-  "mcpServers": {
-    "Zapier_MCP": {
-      "url": "${proxyBaseUrl}/mcp",
-      "headers": {
-        "x-litellm-api-key": "Bearer YOUR_LITELLM_API_KEY",
-        "x-mcp-servers": "Zapier_MCP,dev-group"
+            <StepCard step={3} title="Add Configuration">
+              <span className="mb-3 text-muted-foreground">
+                Copy the JSON configuration below and paste it into Cursor, then save with{" "}
+                <code className="bg-muted px-2 py-1 rounded-sm">Cmd+S</code> or{" "}
+                <code className="bg-muted px-2 py-1 rounded-sm">Ctrl+S</code>
+              </span>
+              <FeatureCard
+                icon={<Code className="text-purple-600" size={16} />}
+                title="Configuration"
+                description="Cursor MCP configuration"
+                serverName="Zapier Gmail"
+                accessGroups={["dev-group"]}
+              >
+                <CodeBlock
+                  code={`{
+    "mcpServers": {
+      "Zapier_MCP": {
+        "url": "${proxyBaseUrl}/mcp",
+        "headers": {
+          "x-litellm-api-key": "Bearer YOUR_LITELLM_API_KEY",
+          "x-mcp-servers": "Zapier_MCP,dev-group"
+        }
       }
     }
-  }
-}`}
-                copyKey="cursor-config"
-                className="text-xs"
-              />
-            </FeatureCard>
-          </StepCard>
-        </Space>
+  }`}
+                  copyKey="cursor-config"
+                  className="text-xs"
+                />
+              </FeatureCard>
+            </StepCard>
+          </div>
+        </CardContent>
       </Card>
-    </Space>
+    </div>
   );
 
   const StreamableHTTPTab = () => (
-    <Space direction="vertical" size="large" className="w-full">
+    <div className="flex w-full flex-col gap-6">
       <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 dark:text-green-400" size={24} />
-          <Title level={4} className="mb-0 text-green-900 dark:text-green-100">
-            Streamable HTTP Transport
-          </Title>
+          <h4 className="mb-0 text-xl font-semibold text-green-900 dark:text-green-100">Streamable HTTP Transport</h4>
         </div>
-        <Text className="text-green-700 dark:text-green-300">
+        <span className="text-green-700 dark:text-green-300">
           Connect to LiteLLM MCP using HTTP transport. Compatible with any MCP client that supports HTTP streaming.
-        </Text>
+        </span>
       </div>
 
       <FeatureCard
@@ -422,12 +429,12 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
         title="Universal MCP Connection"
         description="Use this URL with any MCP client that supports HTTP transport"
       >
-        <Space direction="vertical" size="middle" className="w-full">
+        <div className="flex w-full flex-col gap-4">
           <div>
-            <Text>
+            <span>
               Each MCP client supports different transports. Refer to your client documentation to determine the
               appropriate transport method.
-            </Text>
+            </span>
           </div>
           <CodeBlock title="Server URL" code={`${proxyBaseUrl}/mcp`} copyKey="http-server-url" />
           <CodeBlock
@@ -458,14 +465,14 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
               Learn more about MCP transports
             </Button>
           </div>
-        </Space>
+        </div>
       </FeatureCard>
-    </Space>
+    </div>
   );
 
   return (
     <div>
-      <Space direction="vertical" size="large" className="w-full">
+      <div className="flex w-full flex-col gap-6">
         <div>
           <h2 className="text-3xl font-bold text-foreground mb-3">Connect to your MCP client</h2>
           <p className="text-lg text-muted-foreground">
@@ -516,7 +523,7 @@ const MCPConnect: React.FC<MCPConnectProps> = ({ currentServerAccessGroups = []
             <StreamableHTTPTab />
           </TabsContent>
         </Tabs>
-      </Space>
+      </div>
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.test.tsx
index 14e26fa5393..438caa2f5e6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.test.tsx
@@ -6,7 +6,7 @@ import MCPServerEdit, { EDIT_OAUTH_UI_STATE_KEY } from "./mcp_server_edit";
 import { setSecureItem } from "@/utils/secureStorage";
 import * as networking from "@/components/networking";
 import { toast } from "@/lib/toast";
-import { selectAntOption } from "./testUtils";
+import { selectOption } from "./testUtils";
 
 vi.mock("@/components/networking", () => ({
   updateMCPServer: vi.fn(),
@@ -370,7 +370,7 @@ describe("MCPServerEdit (true passthrough warning)", () => {
       />,
     );
 
-    await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+    await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
     await waitFor(() => {
       expect(mockOauth.getTemporaryPayload).toBeTruthy();
@@ -407,7 +407,7 @@ describe("MCPServerEdit (auth type switch)", () => {
       />,
     );
 
-    await selectAntOption("Authentication", "OAuth Token Exchange (OBO)");
+    await selectOption("Authentication", "OAuth Token Exchange (OBO)");
 
     const saveButtons = screen.getAllByRole("button", { name: "Save Changes" });
     await act(async () => {
@@ -484,7 +484,7 @@ describe("MCPServerEdit OAuth token invalidation", () => {
     });
     mockOauth.reset.mockClear();
 
-    await selectAntOption("Transport Type", "Standard Input/Output (stdio)");
+    await selectOption("Transport Type", "Standard Input/Output (stdio)");
 
     await waitFor(() => expect(mockOauth.reset).toHaveBeenCalled());
     expect(mockRemoveToken).toHaveBeenCalledWith("oauth_server_1", undefined);
@@ -602,7 +602,7 @@ describe("MCPServerEdit OAuth token invalidation", () => {
     });
     mockOauth.reset.mockClear();
 
-    await selectAntOption("Transport Type", "Server-Sent Events (SSE)");
+    await selectOption("Transport Type", "Server-Sent Events (SSE)");
 
     expect(mockOauth.reset).not.toHaveBeenCalled();
     expect(mockRemoveToken).not.toHaveBeenCalled();
@@ -861,7 +861,7 @@ describe("MCPServerEdit (interactive OAuth)", () => {
       expect(screen.getByText("Token Endpoint Auth Method (optional)")).toBeInTheDocument();
     });
 
-    await selectAntOption("Token Endpoint Auth Method (optional)", "Client Secret Basic");
+    await selectOption("Token Endpoint Auth Method (optional)", "Client Secret Basic");
 
     const saveButtons = screen.getAllByRole("button", { name: "Save Changes" });
     await act(async () => {
@@ -1695,9 +1695,9 @@ describe("MCPServerEdit (OAuth token persistence on save)", () => {
       />,
     );
 
-    await selectAntOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
+    await selectOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
     mockOauth.tokenResponse = { access_token: "fresh-tok", token_type: "bearer" };
-    await selectAntOption("Authentication", "True Passthrough (no LiteLLM auth)");
+    await selectOption("Authentication", "True Passthrough (no LiteLLM auth)");
 
     await waitFor(() => {
       const withHeaders = vi
@@ -1838,7 +1838,7 @@ describe("MCPServerEdit oauth2_flow selector", () => {
       />,
     );
 
-    await selectAntOption("OAuth Flow Type", "Machine-to-Machine (M2M)");
+    await selectOption("OAuth Flow Type", "Machine-to-Machine (M2M)");
 
     const saveButtons = screen.getAllByRole("button", { name: "Save Changes" });
     await act(async () => {
@@ -1870,7 +1870,7 @@ describe("MCPServerEdit oauth2_flow selector", () => {
       />,
     );
 
-    await selectAntOption("OAuth Flow Type", "Interactive (PKCE)");
+    await selectOption("OAuth Flow Type", "Interactive (PKCE)");
 
     const saveButtons = screen.getAllByRole("button", { name: "Save Changes" });
     await act(async () => {
@@ -1939,6 +1939,24 @@ describe("MCPServerEdit OAuth flow prefill display", () => {
     expect(screen.queryByText("This server has no OAuth flow set")).not.toBeInTheDocument();
   });
 
+  it("never flashes the warning while mounting a server that already has a flow", async () => {
+    const flashes: Node[] = [];
+    const observer = new MutationObserver((records) => {
+      for (const record of records) {
+        for (const node of record.addedNodes) {
+          if (node.textContent?.includes("This server has no OAuth flow set")) flashes.push(node);
+        }
+      }
+    });
+    observer.observe(document.body, { childList: true, subtree: true });
+
+    renderEdit({ oauth2_flow: "client_credentials" });
+    await screen.findByText("Machine-to-Machine (M2M)");
+    observer.disconnect();
+
+    expect(flashes).toHaveLength(0);
+  });
+
   it("does not warn for a delegate (PKCE passthrough) server even with no flow set", () => {
     renderEdit({ oauth2_flow: null, delegate_auth_to_upstream: true });
 
@@ -1950,7 +1968,7 @@ describe("MCPServerEdit OAuth flow prefill display", () => {
 
     expect(screen.getByText("This server has no OAuth flow set")).toBeInTheDocument();
 
-    await selectAntOption("OAuth Flow Type", "Machine-to-Machine (M2M)");
+    await selectOption("OAuth Flow Type", "Machine-to-Machine (M2M)");
 
     await waitFor(() => {
       expect(screen.queryByText("This server has no OAuth flow set")).not.toBeInTheDocument();
@@ -2044,7 +2062,7 @@ describe("MCPServerEdit (dcr_bridge toggle)", () => {
     mockOauth.tokenResponse = null;
   });
 
-  const getDcrToggle = () => document.getElementById("dcr_bridge");
+  const getDcrToggle = () => screen.queryByRole("switch", { name: /Gateway-hosted sign-in \(DCR bridge\)/ });
 
   function renderEdit(server: Record<string, unknown>) {
     render(
@@ -2166,7 +2184,7 @@ describe("MCPServerEdit (dcr_bridge toggle)", () => {
       expect(getDcrToggle()).toBeInTheDocument();
     });
 
-    await selectAntOption("Authentication", "API Key");
+    await selectOption("Authentication", "API Key");
     await waitFor(() => {
       expect(getDcrToggle()).not.toBeInTheDocument();
     });
@@ -2192,7 +2210,7 @@ describe("MCPServerEdit (dcr_bridge toggle)", () => {
 
     // The field stays mounted across the two client-forwarded modes, so the live toggle value is
     // preserved rather than forced false by the switch.
-    await selectAntOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
+    await selectOption("Authentication", "OAuth Delegate (client-supplied upstream token)");
     await waitFor(() => {
       expect(getDcrToggle()).toBeInTheDocument();
     });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx
index eb462f788a5..b42d9ec5f40 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.tsx
@@ -1,8 +1,14 @@
 import React, { useState, useEffect } from "react";
-import { Select, Tooltip, Input, InputNumber, Alert } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { SimpleTooltip } from "@/components/ui/tooltip";
+import { Info, TriangleAlert } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { FormProvider, useForm } from "react-hook-form";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import {
   AUTH_TYPE,
@@ -19,6 +25,8 @@ import {
   MCPServer,
   MCPServerCostInfo,
   TRANSPORT,
+  TRANSPORT_ITEMS,
+  AUTH_TYPE_ITEMS,
   getMcpOAuthMode,
   oauth2FlowToFormValue,
 } from "@/components/mcp_tools/types";
@@ -61,7 +69,15 @@ import {
   singleBranchChange,
   useMountedValues,
 } from "./mcpFormStore";
-import { numberControl, notOnlyWhitespace, parsesAsJsonObject, selectControl, textControl } from "./mcpFieldRules";
+import {
+  numberControl,
+  notOnlyWhitespace,
+  parsesAsJsonObject,
+  selectControl,
+  selectTriggerControl,
+  tagsControl,
+  textControl,
+} from "./mcpFieldRules";
 import { getSecureItem, setSecureItem } from "@/utils/secureStorage";
 
 interface MCPServerEditProps {
@@ -149,7 +165,6 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
   const [tools, setTools] = useState<any[]>([]);
   const [isLoadingTools, setIsLoadingTools] = useState(false);
   const [toolsError, setToolsError] = useState<string | null>(null);
-  const [searchValue, setSearchValue] = useState<string>("");
   const [aliasManuallyEdited, setAliasManuallyEdited] = useState(false);
   const [removeStoredApp, setRemoveStoredApp] = useState(false);
   // Set when the upstream identity (url/endpoints) changed while a declared app is present, so the
@@ -171,7 +186,10 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
   const isTokenExchangeAuthType = authType === AUTH_TYPE.OAUTH2_TOKEN_EXCHANGE;
   const isIdJagAuthType = authType === AUTH_TYPE.OAUTH2_ID_JAG;
   const isAwsSigV4AuthType = authType === AUTH_TYPE.AWS_SIGV4;
-  const oauthFlowTypeValue = mountedValues.oauth_flow_type as string | undefined;
+  // Same fallback as the delegate switch below: the value is undefined until the field mounts, so
+  // reading it alone flashes the "no OAuth flow set" warning at a server that already has one.
+  const oauthFlowTypeValue =
+    (mountedValues.oauth_flow_type as string | undefined) ?? oauth2FlowToFormValue(mcpServer.oauth2_flow);
   const isM2MFlow = isOAuthAuthType && oauthFlowTypeValue === OAUTH_FLOW.M2M;
   // Watch reflects a live toggle when the delegate switch is mounted; fall back to
   // the stored value otherwise (useWatch returns undefined for an unmounted field,
@@ -208,7 +226,6 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
           costConfig,
           allowedTools,
           hasToolAllowlistInteraction,
-          searchValue,
           aliasManuallyEdited,
         }),
       );
@@ -393,9 +410,6 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
       if (typeof parsed.hasToolAllowlistInteraction === "boolean") {
         setHasToolAllowlistInteraction(parsed.hasToolAllowlistInteraction);
       }
-      if (parsed.searchValue) {
-        setSearchValue(parsed.searchValue);
-      }
       if (typeof parsed.aliasManuallyEdited === "boolean") {
         setAliasManuallyEdited(parsed.aliasManuallyEdited);
       }
@@ -606,38 +620,6 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
     }
   };
 
-  // Generate options with existing groups and potential new group
-  const getAccessGroupOptions = () => {
-    const existingOptions = availableAccessGroups.map((group: string) => ({
-      value: group,
-      label: (
-        <div className="flex items-center gap-2">
-          <div className="w-2 h-2 bg-green-500 rounded-full"></div>
-          <span className="font-medium">{group}</span>
-        </div>
-      ),
-    }));
-
-    // If search value doesn't match any existing group and is not empty, add "create new group" option
-    if (
-      searchValue &&
-      !availableAccessGroups.some((group) => group.toLowerCase().includes(searchValue.toLowerCase()))
-    ) {
-      existingOptions.push({
-        value: searchValue,
-        label: (
-          <div className="flex items-center gap-2">
-            <div className="w-2 h-2 bg-blue-500 rounded-full"></div>
-            <span className="font-medium">{searchValue}</span>
-            <span className="text-gray-400 text-xs ml-1">create new group</span>
-          </div>
-        ),
-      });
-    }
-
-    return existingOptions;
-  };
-
   const handleTransportChange = (value: string) => {
     // Clear fields that are not relevant for the selected transport.
     if (value === "stdio") {
@@ -675,6 +657,14 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
     }
   };
 
+  const handleTransportSelected =
+    (onChange: (value: string) => void) =>
+    (value: string | null): void => {
+      if (value === null) return;
+      onChange(value);
+      handleTransportChange(value);
+    };
+
   const valuesChangeRef = React.useRef(handleFormValuesChange);
   valuesChangeRef.current = handleFormValuesChange;
 
@@ -826,16 +816,20 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 >
                   {(control) => (
                     <Select
-                      {...selectControl<string>(control)}
-                      onChange={(value: string) => {
-                        control.onChange(value);
-                        handleTransportChange(value);
-                      }}
+                      items={TRANSPORT_ITEMS}
+                      value={(control.value as string | undefined) ?? null}
+                      onValueChange={handleTransportSelected(control.onChange)}
                     >
-                      <Select.Option value="http">Streamable HTTP (Recommended)</Select.Option>
-                      <Select.Option value="sse">Server-Sent Events (SSE)</Select.Option>
-                      <Select.Option value="stdio">Standard Input/Output (stdio)</Select.Option>
-                      <Select.Option value={TRANSPORT.OPENAPI}>OpenAPI Spec</Select.Option>
+                      <SelectTrigger {...selectTriggerControl(control)} className="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {TRANSPORT_ITEMS.map((item) => (
+                          <SelectItem key={item.value} value={item.value}>
+                            {item.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
                     </Select>
                   )}
                 </MountedFormField>
@@ -869,9 +863,9 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     label={
                       <span className="text-sm font-medium text-gray-700 flex items-center">
                         OpenAPI Spec URL
-                        <Tooltip title="URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.">
-                          <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                        </Tooltip>
+                        <SimpleTooltip content="URL to an OpenAPI specification (JSON or YAML). MCP tools will be automatically generated from the API endpoints defined in the spec.">
+                          <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                        </SimpleTooltip>
                       </span>
                     }
                     name="spec_path"
@@ -892,21 +886,20 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                   label={
                     <span className="text-sm font-medium text-gray-700 flex items-center">
                       Max Concurrent Requests (optional)
-                      <Tooltip title="Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.">
-                        <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                      </Tooltip>
+                      <SimpleTooltip content="Maximum number of tool calls LiteLLM will run against this server at the same time. Additional calls wait for a free slot. Leave blank for no limit.">
+                        <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                      </SimpleTooltip>
                     </span>
                   }
                   name="max_concurrent_requests"
                 >
                   {(control) => (
-                    <InputNumber
-                      {...numberControl(control)}
+                    <Input
+                      {...numberControl(control, 0)}
                       min={1}
-                      precision={0}
+                      step={1}
                       placeholder="e.g. 10"
-                      style={{ width: "100%" }}
-                      className="rounded-lg"
+                      className="w-full rounded-lg"
                     />
                   )}
                 </MountedFormField>
@@ -921,20 +914,17 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       rules={{ validate: { required: antdRequired("Authentication is required") } }}
                     >
                       {(control) => (
-                        <Select {...selectControl<string>(control)} virtual={false}>
-                          <Select.Option value="none">None</Select.Option>
-                          <Select.Option value="api_key">API Key</Select.Option>
-                          <Select.Option value="bearer_token">Bearer Token</Select.Option>
-                          <Select.Option value="token">Token</Select.Option>
-                          <Select.Option value="basic">Basic Auth</Select.Option>
-                          <Select.Option value="oauth2">OAuth</Select.Option>
-                          <Select.Option value="oauth2_token_exchange">OAuth Token Exchange (OBO)</Select.Option>
-                          <Select.Option value="oauth2_id_jag">ID-JAG (Okta Cross App Access)</Select.Option>
-                          <Select.Option value="aws_sigv4">AWS SigV4 (Bedrock AgentCore MCPs)</Select.Option>
-                          <Select.Option value="true_passthrough">True Passthrough (no LiteLLM auth)</Select.Option>
-                          <Select.Option value="oauth_delegate">
-                            OAuth Delegate (client-supplied upstream token)
-                          </Select.Option>
+                        <Select {...selectControl<string>(control)} items={AUTH_TYPE_ITEMS}>
+                          <SelectTrigger {...selectTriggerControl(control)} className="w-full">
+                            <SelectValue />
+                          </SelectTrigger>
+                          <SelectContent>
+                            {AUTH_TYPE_ITEMS.map((item) => (
+                              <SelectItem key={item.value} value={item.value}>
+                                {item.label}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
                         </Select>
                       )}
                     </MountedFormField>
@@ -980,11 +970,8 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
 
                     <MountedFormField label="Args" name="args">
                       {(control) => (
-                        <Select
-                          {...selectControl<string[]>(control)}
-                          mode="tags"
-                          size="large"
-                          tokenSeparators={[","]}
+                        <MultiSelect
+                          {...tagsControl(control)}
                           placeholder="Add args (press enter or comma)"
                           className="rounded-lg"
                         />
@@ -1001,7 +988,7 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       }}
                     >
                       {(control) => (
-                        <Input.TextArea
+                        <Textarea
                           {...textControl(control)}
                           rows={6}
                           className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500 font-mono text-sm"
@@ -1020,19 +1007,19 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     label={
                       <span className="text-sm font-medium text-gray-700 flex items-center">
                         Authentication Value
-                        <Tooltip title="Token, password, or header value to send with each request for the selected auth type.">
-                          <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                        </Tooltip>
+                        <SimpleTooltip content="Token, password, or header value to send with each request for the selected auth type.">
+                          <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                        </SimpleTooltip>
                       </span>
                     }
                     name={["credentials", "auth_value"]}
                     rules={{ validate: { notWhitespace: notOnlyWhitespace("Authentication value cannot be empty") } }}
                   >
                     {(control) => (
-                      <Input.Password
+                      <PasswordInput
                         {...textControl(control)}
                         placeholder="Enter token or secret (leave blank to keep existing)"
-                        className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                        groupClassName="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
                       />
                     )}
                   </MountedFormField>
@@ -1041,13 +1028,15 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                 {!isStdioTransport && isOAuthAuthType && (
                   <>
                     {!oauthFlowTypeValue && !isDelegateAuth && (
-                      <Alert
-                        type="warning"
-                        showIcon
-                        className="mb-4 rounded-lg"
-                        message="This server has no OAuth flow set"
-                        description="Choose Machine-to-Machine (M2M) or Interactive (PKCE) so LiteLLM authenticates it the way you intend, then save. Until it is set, LiteLLM falls back to interactive per-user auth and treats a machine-to-machine credential shape conservatively."
-                      />
+                      <Alert variant="warning" className="mb-4 rounded-lg">
+                        <TriangleAlert />
+                        <AlertTitle>This server has no OAuth flow set</AlertTitle>
+                        <AlertDescription>
+                          Choose Machine-to-Machine (M2M) or Interactive (PKCE) so LiteLLM authenticates it the way you
+                          intend, then save. Until it is set, LiteLLM falls back to interactive per-user auth and treats
+                          a machine-to-machine credential shape conservatively.
+                        </AlertDescription>
+                      </Alert>
                     )}
                     <OAuthFormFields
                       isM2M={isM2MFlow}
@@ -1083,9 +1072,9 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       label={
                         <span className="text-sm font-medium text-gray-700 flex items-center">
                           AWS Region
-                          <Tooltip title="AWS region for SigV4 signing (e.g., us-east-1)">
-                            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                          </Tooltip>
+                          <SimpleTooltip content="AWS region for SigV4 signing (e.g., us-east-1)">
+                            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                          </SimpleTooltip>
                         </span>
                       }
                       name={["credentials", "aws_region_name"]}
@@ -1102,9 +1091,9 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       label={
                         <span className="text-sm font-medium text-gray-700 flex items-center">
                           AWS Service Name
-                          <Tooltip title="AWS service name for SigV4 signing. Defaults to 'bedrock-agentcore'.">
-                            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                          </Tooltip>
+                          <SimpleTooltip content="AWS service name for SigV4 signing. Defaults to 'bedrock-agentcore'.">
+                            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                          </SimpleTooltip>
                         </span>
                       }
                       name={["credentials", "aws_service_name"]}
@@ -1121,18 +1110,18 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       label={
                         <span className="text-sm font-medium text-gray-700 flex items-center">
                           AWS Access Key ID
-                          <Tooltip title="Optional. If not provided, falls back to the boto3 credential chain (IAM role, env vars, etc.).">
-                            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                          </Tooltip>
+                          <SimpleTooltip content="Optional. If not provided, falls back to the boto3 credential chain (IAM role, env vars, etc.).">
+                            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                          </SimpleTooltip>
                         </span>
                       }
                       name={["credentials", "aws_access_key_id"]}
                     >
                       {(control) => (
-                        <Input.Password
+                        <PasswordInput
                           {...textControl(control)}
                           placeholder="Leave blank to keep existing"
-                          className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                          groupClassName="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
                         />
                       )}
                     </MountedFormField>
@@ -1140,18 +1129,18 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       label={
                         <span className="text-sm font-medium text-gray-700 flex items-center">
                           AWS Secret Access Key
-                          <Tooltip title="Optional. Required if AWS Access Key ID is provided.">
-                            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                          </Tooltip>
+                          <SimpleTooltip content="Optional. Required if AWS Access Key ID is provided.">
+                            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                          </SimpleTooltip>
                         </span>
                       }
                       name={["credentials", "aws_secret_access_key"]}
                     >
                       {(control) => (
-                        <Input.Password
+                        <PasswordInput
                           {...textControl(control)}
                           placeholder="Leave blank to keep existing"
-                          className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                          groupClassName="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
                         />
                       )}
                     </MountedFormField>
@@ -1159,18 +1148,18 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       label={
                         <span className="text-sm font-medium text-gray-700 flex items-center">
                           AWS Session Token
-                          <Tooltip title="Optional. Only needed for temporary STS credentials.">
-                            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                          </Tooltip>
+                          <SimpleTooltip content="Optional. Only needed for temporary STS credentials.">
+                            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                          </SimpleTooltip>
                         </span>
                       }
                       name={["credentials", "aws_session_token"]}
                     >
                       {(control) => (
-                        <Input.Password
+                        <PasswordInput
                           {...textControl(control)}
                           placeholder="Leave blank to keep existing"
-                          className="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
+                          groupClassName="rounded-lg border-gray-300 focus:border-blue-500 focus:ring-blue-500"
                         />
                       )}
                     </MountedFormField>
@@ -1178,9 +1167,9 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       label={
                         <span className="text-sm font-medium text-gray-700 flex items-center">
                           AWS Role ARN
-                          <Tooltip title="Optional. IAM role ARN to assume via STS before signing. If set, LiteLLM calls sts:AssumeRole to get temporary credentials.">
-                            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                          </Tooltip>
+                          <SimpleTooltip content="Optional. IAM role ARN to assume via STS before signing. If set, LiteLLM calls sts:AssumeRole to get temporary credentials.">
+                            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                          </SimpleTooltip>
                         </span>
                       }
                       name={["credentials", "aws_role_name"]}
@@ -1197,9 +1186,9 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                       label={
                         <span className="text-sm font-medium text-gray-700 flex items-center">
                           AWS Session Name
-                          <Tooltip title="Optional. Session name for the AssumeRole call — appears in CloudTrail logs. Auto-generated if omitted.">
-                            <InfoCircleOutlined className="ml-2 text-blue-400 hover:text-blue-600 cursor-help" />
-                          </Tooltip>
+                          <SimpleTooltip content="Optional. Session name for the AssumeRole call — appears in CloudTrail logs. Auto-generated if omitted.">
+                            <Info className="ml-2 size-4 text-blue-400 hover:text-blue-600 cursor-help" />
+                          </SimpleTooltip>
                         </span>
                       }
                       name={["credentials", "aws_session_name"]}
@@ -1226,9 +1215,6 @@ const MCPServerEdit: React.FC<MCPServerEditProps> = ({
                     availableAccessGroups={availableAccessGroups}
                     mcpServer={mcpServer}
                     mountedAuthType={authType}
-                    searchValue={searchValue}
-                    setSearchValue={setSearchValue}
-                    getAccessGroupOptions={getAccessGroupOptions}
                   />
                 </div>
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/testUtils.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/testUtils.ts
index c1692f436d7..cafa78f09a9 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/testUtils.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/testUtils.ts
@@ -1,28 +1,12 @@
-import { act, fireEvent, screen, waitFor } from "@testing-library/react";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
 import { expect } from "vitest";
 
-export async function selectAntOption(labelText: string, optionText: string) {
-  const label = screen.getByText(labelText);
-  const select =
-    label.closest("[data-slot='field']")?.querySelector(".ant-select") ??
-    label.closest(".ant-form-item")?.querySelector(".ant-select") ??
-    label.closest(".ant-collapse-item")?.querySelector(".ant-select") ??
-    label.closest("div")?.querySelector(".ant-select") ??
-    null;
+export async function selectOption(labelText: string, optionText: string) {
+  const user = userEvent.setup({ delay: null });
+  await user.click(screen.getByLabelText(labelText));
 
-  act(() => {
-    fireEvent.mouseDown(select!.querySelector(".ant-select-selector")!);
-  });
-
-  await waitFor(() => {
-    expect(document.querySelectorAll(".ant-select-item-option").length).toBeGreaterThan(0);
-  });
-
-  const option = Array.from(document.querySelectorAll(".ant-select-item-option")).find((el) =>
-    el.textContent?.includes(optionText),
-  );
+  const option = (await screen.findAllByRole("option")).find((el) => el.textContent?.includes(optionText));
   expect(option).toBeTruthy();
-  act(() => {
-    fireEvent.click(option!);
-  });
+  await user.click(option!);
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.test.ts
index 80157a5bc99..5c717402f19 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.test.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.test.ts
@@ -1,12 +1,13 @@
 import { describe, expect, it } from "vitest";
 
-import { InputSchema } from "@/components/mcp_tools/types";
+import { InputSchema, InputSchemaProperty } from "@/components/mcp_tools/types";
 import {
   ToolArgumentField,
   argumentsFormKey,
   buildToolCallArguments,
   hasNestedParamsSchema,
   initialArgumentValues,
+  resolveSchemaProperty,
   toolArgumentFields,
   toolArgumentsResolver,
   validateToolArgument,
@@ -332,3 +333,119 @@ describe("argumentsFormKey", () => {
     expect(argumentsFormKey(one)).toBe(argumentsFormKey(two));
   });
 });
+
+describe("union-typed properties", () => {
+  const optionalArray: InputSchemaProperty = {
+    anyOf: [{ type: "array", items: { type: "string" } }, { type: "null" }],
+    default: null,
+  };
+  const optionalObject: InputSchemaProperty = {
+    anyOf: [{ type: "object", properties: { id: { type: "string" } } }, { type: "null" }],
+    default: null,
+  };
+  const unionField = (key: string, prop: InputSchemaProperty, required = false): ToolArgumentField => ({
+    key,
+    prop,
+    required,
+  });
+
+  describe("resolveSchemaProperty", () => {
+    it("collapses an optional array to the array member", () => {
+      expect(resolveSchemaProperty(optionalArray)).toMatchObject({ type: "array", items: { type: "string" } });
+    });
+
+    it("carries the outer description and default onto the resolved member", () => {
+      const resolved = resolveSchemaProperty({
+        anyOf: [{ type: "array", items: { type: "string" } }, { type: "null" }],
+        description: "outer text",
+        default: ["a"],
+      });
+
+      expect(resolved).toMatchObject({ type: "array", description: "outer text", default: ["a"] });
+    });
+
+    it("keeps the enum of a resolved string member so the select still renders", () => {
+      expect(resolveSchemaProperty({ anyOf: [{ type: "string", enum: ["a", "b"] }, { type: "null" }] })).toMatchObject({
+        type: "string",
+        enum: ["a", "b"],
+      });
+    });
+
+    it("resolves oneOf the same way as anyOf", () => {
+      expect(resolveSchemaProperty({ oneOf: [{ type: "object" }, { type: "null" }] })).toMatchObject({
+        type: "object",
+      });
+    });
+
+    it("leaves a property that already declares a type untouched", () => {
+      const plain: InputSchemaProperty = { type: "string", anyOf: [{ type: "array" }, { type: "null" }] };
+
+      expect(resolveSchemaProperty(plain)).toBe(plain);
+    });
+
+    it("leaves a genuine multi-type union unresolved", () => {
+      const multi: InputSchemaProperty = { anyOf: [{ type: "string" }, { type: "integer" }, { type: "null" }] };
+
+      expect(resolveSchemaProperty(multi)).toBe(multi);
+    });
+  });
+
+  describe("validateToolArgument", () => {
+    it("reports an object supplied to an optional array parameter", () => {
+      expect(validateToolArgument(unionField("tags", optionalArray), '{"k":1}')).toBe("Please enter a JSON array");
+    });
+
+    it("reports an array supplied to an optional object parameter", () => {
+      expect(validateToolArgument(unionField("payload", optionalObject), "[1,2]")).toBe("Please enter a JSON object");
+    });
+
+    it("reports the comma-separated text a plain input would have produced as invalid JSON", () => {
+      expect(validateToolArgument(unionField("tags", optionalArray), "a,b")).toBe("Invalid JSON");
+    });
+
+    it("accepts a well-formed value and an empty optional value", () => {
+      expect(validateToolArgument(unionField("tags", optionalArray), '["a","b"]')).toBeUndefined();
+      expect(validateToolArgument(unionField("tags", optionalArray), "")).toBeUndefined();
+    });
+  });
+
+  describe("buildToolCallArguments", () => {
+    it("sends a real array for an optional array parameter", () => {
+      expect(buildToolCallArguments([unionField("tags", optionalArray)], ['["a","b"]'])).toEqual({
+        tags: ["a", "b"],
+      });
+    });
+
+    it("sends a real object for an optional object parameter", () => {
+      expect(buildToolCallArguments([unionField("payload", optionalObject)], ['{"id":"x"}'])).toEqual({
+        payload: { id: "x" },
+      });
+    });
+  });
+
+  describe("initialArgumentValues", () => {
+    it("leaves a null-defaulted optional parameter blank so it is not submitted at all", () => {
+      const fields = [unionField("tags", optionalArray), unionField("payload", optionalObject)];
+
+      expect(initialArgumentValues(fields)).toEqual(["", ""]);
+      expect(buildToolCallArguments(fields, initialArgumentValues(fields))).toEqual({});
+    });
+
+    it("builds a sample item from the resolved item schema when the union declares no default", () => {
+      const prop: InputSchemaProperty = { anyOf: [{ type: "array", items: { type: "string" } }, { type: "null" }] };
+
+      expect(initialArgumentValues([unionField("tags", prop)])).toEqual([JSON.stringify([""], null, 2)]);
+    });
+
+    it("seeds a nested optional array inside an object from the resolved member", () => {
+      const [payload] = initialArgumentValues([
+        unionField("payload", {
+          type: "object",
+          properties: { tags: { anyOf: [{ type: "array", items: { type: "string" } }, { type: "null" }] } },
+        }),
+      ]);
+
+      expect(payload).toBe(JSON.stringify({ tags: [""] }, null, 2));
+    });
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts
index 5fdeccd41bc..bdf0a52d02d 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/toolCallArguments.ts
@@ -15,6 +15,17 @@ export interface ToolArgumentsFormValues {
 const isPlainObject = (value: unknown): value is Record<string, unknown> =>
   typeof value === "object" && value !== null && !Array.isArray(value);
 
+export const resolveSchemaProperty = (prop: InputSchemaProperty): InputSchemaProperty => {
+  if (prop.type !== undefined) return prop;
+  const members = (prop.anyOf ?? prop.oneOf ?? []).filter((member) => member.type !== "null");
+  if (members.length !== 1 || members[0].type === undefined) return prop;
+  return {
+    ...members[0],
+    description: prop.description ?? members[0].description,
+    default: prop.default !== undefined ? prop.default : members[0].default,
+  };
+};
+
 const isJsonField = (prop: InputSchemaProperty): boolean => prop.type === "object" || prop.type === "array";
 
 export const toolArgumentFields = (schema: InputSchema): readonly ToolArgumentField[] =>
@@ -38,27 +49,29 @@ const parseJson = (raw: unknown): ParsedJson => {
 const isBlank = (value: unknown): boolean => value === undefined || value === null || value === "";
 
 export const validateToolArgument = (field: ToolArgumentField, value: unknown): string | undefined => {
+  const prop = resolveSchemaProperty(field.prop);
   const normalized = typeof value === "string" ? value.trim() : value;
   if (field.required && isBlank(normalized)) {
     return `Please enter ${field.key}`;
   }
-  if (!isJsonField(field.prop) || (isBlank(value) && !field.required)) {
+  if (!isJsonField(prop) || (isBlank(value) && !field.required)) {
     return undefined;
   }
   const parsed = parseJson(value);
   if (parsed.kind === "invalid") {
     return "Invalid JSON";
   }
-  if (field.prop.type === "object" && !isPlainObject(parsed.value)) {
+  if (prop.type === "object" && !isPlainObject(parsed.value)) {
     return "Please enter a JSON object";
   }
-  if (field.prop.type === "array" && !Array.isArray(parsed.value)) {
+  if (prop.type === "array" && !Array.isArray(parsed.value)) {
     return "Please enter a JSON array";
   }
   return undefined;
 };
 
-const coerceArgument = (prop: InputSchemaProperty, value: unknown): unknown => {
+const coerceArgument = (declared: InputSchemaProperty, value: unknown): unknown => {
+  const prop = resolveSchemaProperty(declared);
   const normalized = typeof value === "string" ? value.trim() : value;
   switch (prop.type) {
     case "boolean":
@@ -162,9 +175,11 @@ function buildArrayDefault(prop: InputSchemaProperty, effectiveDefault: unknown)
   return buildArrayItems(prop.items);
 }
 
-function buildDefaultValue(prop: InputSchemaProperty | undefined, overrideDefault?: unknown): unknown {
-  if (!prop) return undefined;
+function buildDefaultValue(declared: InputSchemaProperty | undefined, overrideDefault?: unknown): unknown {
+  if (!declared) return undefined;
+  const prop = resolveSchemaProperty(declared);
   const effectiveDefault: unknown = overrideDefault !== undefined ? overrideDefault : prop.default;
+  if (effectiveDefault === null) return null;
 
   if (prop.type === "object") return buildObjectDefault(prop, effectiveDefault);
   if (prop.type === "array") return buildArrayDefault(prop, effectiveDefault);
@@ -183,9 +198,10 @@ function buildDefaultValue(prop: InputSchemaProperty | undefined, overrideDefaul
 
 export const initialArgumentValues = (fields: readonly ToolArgumentField[]): unknown[] =>
   fields.map(({ prop }) => {
-    const defaultValue = buildDefaultValue(prop);
-    if (isJsonField(prop)) {
-      return JSON.stringify(defaultValue ?? (prop.type === "array" ? [] : {}), null, 2);
+    const resolved = resolveSchemaProperty(prop);
+    const defaultValue = buildDefaultValue(resolved);
+    if (isJsonField(resolved)) {
+      return isBlank(defaultValue) ? "" : JSON.stringify(defaultValue, null, 2);
     }
     return defaultValue;
   });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx
index f36f6cb30c4..cd238406237 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/memory/_components/MemoryEditModal.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Modal } from "antd";
 import { CircleHelp } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { z } from "zod/v4";
@@ -12,6 +11,8 @@ import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
 
 const memorySchema = z.object({
   key: z.string().min(1, "Key is required"),
@@ -68,63 +69,78 @@ export const MemoryEditModal: React.FC<MemoryEditModalProps> = ({ open, mode, in
   });
 
   return (
-    <Modal
+    <Dialog
       open={open}
-      title={mode === "create" ? "Create memory" : `Edit ${initialRow?.key ?? ""}`}
-      onCancel={() => {
-        form.reset(EMPTY_MEMORY);
-        onClose();
+      onOpenChange={(open) => {
+        if (!open) {
+          form.reset(EMPTY_MEMORY);
+          onClose();
+        }
       }}
-      onOk={handleOk}
-      okText={mode === "create" ? "Create" : "Save"}
-      confirmLoading={submitting}
-      width={640}
-      destroyOnClose
     >
-      <form onSubmit={(event) => event.preventDefault()} noValidate>
-        <TooltipProvider>
-          <FieldGroup>
-            <FormField
-              control={form.control}
-              name="key"
-              label={labelWithHint(
-                "Key",
-                "Globally unique — two memories cannot share a key. Namespace your own keys if you need per-user isolation (e.g. user:123:notes).",
-              )}
-            >
-              {({ ref, ...field }) => (
-                <Input {...field} ref={ref} placeholder="e.g. user_role" disabled={mode === "edit"} />
-              )}
-            </FormField>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[640px]">
+        <DialogHeader>
+          <DialogTitle>{mode === "create" ? "Create memory" : `Edit ${initialRow?.key ?? ""}`}</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={(event) => event.preventDefault()} noValidate>
+          <TooltipProvider>
+            <FieldGroup>
+              <FormField
+                control={form.control}
+                name="key"
+                label={labelWithHint(
+                  "Key",
+                  "Globally unique — two memories cannot share a key. Namespace your own keys if you need per-user isolation (e.g. user:123:notes).",
+                )}
+              >
+                {({ ref, ...field }) => (
+                  <Input {...field} ref={ref} placeholder="e.g. user_role" disabled={mode === "edit"} />
+                )}
+              </FormField>
 
-            <FormField
-              control={form.control}
-              name="value"
-              label={labelWithHint("Value", "Markdown/text injected into LLM context. Plain strings are fine.")}
-            >
-              {({ ref, ...field }) => (
-                <Textarea {...field} ref={ref} rows={8} placeholder="What the agent should remember…" />
-              )}
-            </FormField>
+              <FormField
+                control={form.control}
+                name="value"
+                label={labelWithHint("Value", "Markdown/text injected into LLM context. Plain strings are fine.")}
+              >
+                {({ ref, ...field }) => (
+                  <Textarea {...field} ref={ref} rows={8} placeholder="What the agent should remember…" />
+                )}
+              </FormField>
 
-            <FormField
-              control={form.control}
-              name="metadata"
-              label={labelWithHint(
-                <span>
-                  Metadata <span className="text-muted-foreground">(optional JSON)</span>
-                </span>,
-                "Optional structured metadata — must be valid JSON if provided.",
-              )}
-            >
-              {({ ref, ...field }) => (
-                <Textarea {...field} ref={ref} rows={4} placeholder='{"tags": ["example"]}' className="font-mono" />
-              )}
-            </FormField>
-          </FieldGroup>
-        </TooltipProvider>
-      </form>
-    </Modal>
+              <FormField
+                control={form.control}
+                name="metadata"
+                label={labelWithHint(
+                  <span>
+                    Metadata <span className="text-muted-foreground">(optional JSON)</span>
+                  </span>,
+                  "Optional structured metadata — must be valid JSON if provided.",
+                )}
+              >
+                {({ ref, ...field }) => (
+                  <Textarea {...field} ref={ref} rows={4} placeholder='{"tags": ["example"]}' className="font-mono" />
+                )}
+              </FormField>
+            </FieldGroup>
+          </TooltipProvider>
+        </form>
+        <DialogFooter>
+          <Button
+            variant="outline"
+            onClick={() => {
+              form.reset(EMPTY_MEMORY);
+              onClose();
+            }}
+          >
+            Cancel
+          </Button>
+          <Button onClick={handleOk} disabled={submitting} aria-busy={submitting}>
+            {mode === "create" ? "Create" : "Save"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.integration.test.tsx
index b762f006261..19e1e3aa8bd 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.integration.test.tsx
@@ -219,7 +219,7 @@ describe("AddModelPanel submit payload contract", () => {
     const { user, openAdvanced, fillRequired, submit } = await setup();
     await fillRequired();
     await openAdvanced();
-    await user.click(screen.getByLabelText("Custom Pricing"));
+    await user.click(screen.getByRole("switch", { name: "Custom Pricing" }));
     await user.type(await screen.findByLabelText("Input Cost (per 1M tokens)"), "3");
     await user.type(screen.getByLabelText("Output Cost (per 1M tokens)"), "9");
     await submit();
@@ -241,7 +241,7 @@ describe("AddModelPanel submit payload contract", () => {
     const { user, openAdvanced, fillRequired, submit } = await setup();
     await fillRequired();
     await openAdvanced();
-    await user.click(screen.getByLabelText("Cache Control Injection Points"));
+    await user.click(screen.getByRole("switch", { name: "Cache Control Injection Points" }));
     await screen.findByText("Add Injection Point");
     await submit();
 
@@ -260,7 +260,7 @@ describe("AddModelPanel submit payload contract", () => {
     const { user, openAdvanced, fillRequired, submit } = await setup();
     await fillRequired();
     await openAdvanced();
-    await user.click(screen.getByLabelText("Cache Control Injection Points"));
+    await user.click(screen.getByRole("switch", { name: "Cache Control Injection Points" }));
     await screen.findByText("Add Injection Point");
     await user.click(screen.getByText("Select a role"));
     await user.click(await screen.findByText("System"));
@@ -385,7 +385,7 @@ describe("AddModelPanel behaviours the removed Advanced Settings form instance n
     const { user, openAdvanced, fillRequired, submit } = await setup();
     await fillRequired();
     await openAdvanced();
-    await user.click(screen.getByLabelText("Use in pass through routes"));
+    await user.click(screen.getByRole("switch", { name: "Use in pass through routes" }));
     expect(screen.getByLabelText("LiteLLM Params")).toHaveValue("");
 
     await submit();
@@ -401,11 +401,11 @@ describe("AddModelPanel behaviours the removed Advanced Settings form instance n
     const { user, openAdvanced, fillRequired, submit } = await setup();
     await fillRequired();
     await openAdvanced();
-    await user.click(screen.getByLabelText("Custom Pricing"));
+    await user.click(screen.getByRole("switch", { name: "Custom Pricing" }));
     await user.type(await screen.findByLabelText("Input Cost (per 1M tokens)"), "3");
-    await user.click(screen.getByLabelText("Custom Pricing"));
+    await user.click(screen.getByRole("switch", { name: "Custom Pricing" }));
     await waitFor(() => expect(screen.queryByLabelText("Input Cost (per 1M tokens)")).not.toBeInTheDocument());
-    await user.click(screen.getByLabelText("Custom Pricing"));
+    await user.click(screen.getByRole("switch", { name: "Custom Pricing" }));
     expect(await screen.findByLabelText("Input Cost (per 1M tokens)")).toHaveValue("3");
 
     await submit();
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.tsx
index 59d4f95c038..1443c065d9b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/AddModelPanel.tsx
@@ -15,7 +15,6 @@ import { useModelCostMap } from "@/app/(dashboard)/hooks/models/useModelCostMap"
 import { useCredentials } from "@/app/(dashboard)/hooks/credentials/useCredentials";
 import { useTeams } from "@/app/(dashboard)/hooks/teams/useTeams";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
-import { vertexCredentialsUploadProps } from "@/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload";
 
 const INITIAL_VALUES: MountedFormValues = { litellm_credential_name: null };
 
@@ -60,9 +59,6 @@ export default function AddModelPanel() {
       providerModels={providerModels}
       setProviderModelsFn={(provider) => setProviderModels(getProviderModels(provider, modelCostMapData))}
       getPlaceholder={getPlaceholder}
-      uploadProps={vertexCredentialsUploadProps({
-        setFieldsValue: (values) => form.setValue("vertex_credentials", values.vertex_credentials),
-      })}
       showAdvancedSettings={showAdvancedSettings}
       setShowAdvancedSettings={setShowAdvancedSettings}
       teams={teams ?? null}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/LlmCredentialsPanel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/LlmCredentialsPanel.tsx
index 7251da7c3c3..c71ed177416 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/LlmCredentialsPanel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/panels/LlmCredentialsPanel.tsx
@@ -1,17 +1,7 @@
 "use client";
 
-import { useForm } from "react-hook-form";
 import CredentialsPanel from "@/components/model_add/CredentialsPanel";
-import type { MountedFormValues } from "@/components/common_components/MountedFormField";
-import { vertexCredentialsUploadProps } from "@/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload";
 
 export default function LlmCredentialsPanel() {
-  const form = useForm<MountedFormValues>();
-  return (
-    <CredentialsPanel
-      uploadProps={vertexCredentialsUploadProps({
-        setFieldsValue: (values) => form.setValue("vertex_credentials", values.vertex_credentials),
-      })}
-    />
-  );
+  return <CredentialsPanel />;
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload.test.ts
deleted file mode 100644
index e02e4974353..00000000000
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { waitFor } from "@testing-library/react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import { toast } from "@/lib/toast";
-
-import { vertexCredentialsUploadProps } from "./vertexCredentialsUpload";
-
-const makeForm = () => ({ setFieldsValue: vi.fn() });
-
-describe("vertexCredentialsUploadProps", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it("reads a JSON credential file into the vertex_credentials field without uploading it", async () => {
-    const form = makeForm();
-    const props = vertexCredentialsUploadProps(form as never);
-    const file = new File(['{"project_id":"example"}'], "vertex.json", { type: "application/json" });
-
-    expect(props.beforeUpload?.(file as never, [file] as never)).toBe(false);
-
-    await waitFor(() => {
-      expect(form.setFieldsValue).toHaveBeenCalledWith({ vertex_credentials: '{"project_id":"example"}' });
-    });
-  });
-
-  it("ignores non-JSON files", async () => {
-    const form = makeForm();
-    const props = vertexCredentialsUploadProps(form as never);
-    const file = new File(["not json"], "vertex.txt", { type: "text/plain" });
-
-    expect(props.beforeUpload?.(file as never, [file] as never)).toBe(false);
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    expect(form.setFieldsValue).not.toHaveBeenCalled();
-  });
-
-  it("reports completed and failed upload states", () => {
-    const props = vertexCredentialsUploadProps(makeForm() as never);
-
-    props.onChange?.({ file: { name: "vertex.json", status: "done" } } as never);
-    props.onChange?.({ file: { name: "vertex.json", status: "error" } } as never);
-
-    expect(toast.success).toHaveBeenCalledWith("vertex.json file uploaded successfully");
-    expect(toast.fromError).toHaveBeenCalledWith("vertex.json file upload failed.");
-  });
-});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload.ts b/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload.ts
deleted file mode 100644
index f658ec88c1c..00000000000
--- a/ui/litellm-dashboard/src/app/(dashboard)/models-and-endpoints/vertexCredentialsUpload.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { ComponentProps } from "react";
-
-import { toast } from "@/lib/toast";
-import type CredentialsPanel from "@/components/model_add/CredentialsPanel";
-
-interface VertexCredentialsForm {
-  setFieldsValue: (values: { vertex_credentials: string }) => void;
-}
-
-type UploadProps = ComponentProps<typeof CredentialsPanel>["uploadProps"];
-
-export function vertexCredentialsUploadProps(form: VertexCredentialsForm): UploadProps {
-  return {
-    name: "file",
-    accept: ".json",
-    pastable: false,
-    beforeUpload: (file) => {
-      if (file.type === "application/json") {
-        const reader = new FileReader();
-        reader.onload = (event) => {
-          if (event.target) {
-            form.setFieldsValue({ vertex_credentials: event.target.result as string });
-          }
-        };
-        reader.readAsText(file);
-      }
-      return false;
-    },
-    onChange(info) {
-      if (info.file.status === "done") {
-        toast.success(`${info.file.name} file uploaded successfully`);
-      } else if (info.file.status === "error") {
-        toast.fromError(`${info.file.name} file upload failed.`);
-      }
-    },
-  };
-}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.test.tsx
index 9c01521e77a..1c5a3cedb6b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.test.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from "@testing-library/react";
+import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 import { ModelSelector } from "./ModelSelector";
@@ -17,7 +17,7 @@ describe("ModelSelector", () => {
     render(<ModelSelector value="" onChange={onChange} models={MODELS} />);
 
     await user.click(screen.getByRole("combobox"));
-    await user.click(await screen.findByTitle("gpt-4"));
+    await user.click(await screen.findByRole("option", { name: "gpt-4" }));
 
     expect(onChange).toHaveBeenCalledWith("gpt-4");
   });
@@ -25,7 +25,7 @@ describe("ModelSelector", () => {
   it("displays a custom value that is not one of the known models", () => {
     render(<ModelSelector value="custom-model-123" onChange={vi.fn()} models={MODELS} />);
 
-    expect(screen.getByTitle("custom-model-123")).toHaveTextContent("custom-model-123");
+    expect(screen.getByRole("combobox")).toHaveValue("custom-model-123");
   });
 
   it("reports a custom model typed into the custom name field", async () => {
@@ -34,17 +34,28 @@ describe("ModelSelector", () => {
     render(<ModelSelector value="" onChange={onChange} models={MODELS} />);
 
     await user.click(screen.getByRole("combobox"));
-    fireEvent.click(await screen.findByTitle("+ Add custom model"));
+    await user.click(await screen.findByRole("option", { name: "+ Add custom model" }));
     await user.type(await screen.findByPlaceholderText("Custom Model Name (Enter to add)"), "my-custom-model{Enter}");
 
     expect(onChange).toHaveBeenCalledWith("my-custom-model");
   });
 
-  it("disables the control when disabled is set", () => {
-    const { rerender } = render(<ModelSelector value="custom-model-123" onChange={vi.fn()} models={MODELS} />);
+  it("disables the control when disabled is set", async () => {
+    const user = userEvent.setup();
+    const onChange = vi.fn();
+    const { rerender } = render(<ModelSelector value="custom-model-123" onChange={onChange} models={MODELS} />);
     expect(screen.getByRole("combobox")).toBeEnabled();
 
-    rerender(<ModelSelector value="custom-model-123" onChange={vi.fn()} models={MODELS} disabled={true} />);
-    expect(screen.getByRole("combobox")).toBeDisabled();
+    rerender(<ModelSelector value="custom-model-123" onChange={onChange} models={MODELS} disabled={true} />);
+
+    const combobox = screen.getByRole("combobox");
+    expect(combobox).toBeDisabled();
+
+    await user.click(combobox);
+    await user.keyboard("gpt-4");
+
+    expect(combobox).toHaveValue("custom-model-123");
+    expect(screen.queryByRole("option")).not.toBeInTheDocument();
+    expect(onChange).not.toHaveBeenCalled();
   });
 });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.tsx
index c88560ab4f5..5659875cf82 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/compareUI/components/ModelSelector.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo, useState } from "react";
-import { Select } from "antd";
+import { SearchSelect } from "@/components/shared/SearchSelect";
 import { Input } from "@/components/ui/input";
 interface ModelSelectorProps {
   value: string;
@@ -50,23 +50,19 @@ export function ModelSelector({ value, onChange, models, loading, disabled }: Mo
   };
   return (
     <div className="flex-1 min-w-0">
-      <Select<string>
-        value={selectValue}
-        onChange={handleSelectChange}
+      <SearchSelect
+        options={[
+          ...displayOptions.map((model) => ({ label: model, value: model })),
+          { label: "+ Add custom model", value: "__custom__" },
+        ]}
+        value={selectValue ?? ""}
+        onValueChange={handleSelectChange}
         disabled={disabled}
-        loading={loading}
         placeholder={loading ? "Loading models..." : "Select a model"}
-        className="w-full rounded-md"
-        showSearch
-        optionFilterProp="children"
-      >
-        {displayOptions.map((model) => (
-          <Select.Option key={model} value={model}>
-            {model}
-          </Select.Option>
-        ))}
-        <Select.Option value="__custom__">+ Add custom model</Select.Option>
-      </Select>
+        emptyText="No models found"
+        allowClear={false}
+        className="rounded-md"
+      />
       {isAddingCustom && (
         <Input
           className="mt-2"
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_attachment_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_attachment_form.tsx
index 292d22f23e6..83dee5c7075 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_attachment_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_attachment_form.tsx
@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from "react";
-import { Modal } from "antd";
 import { CircleHelp } from "lucide-react";
 import { z } from "zod/v4";
 import { Policy } from "@/components/policies/types";
@@ -18,6 +17,7 @@ import { buildAttachmentData } from "./build_attachment_data";
 import { getInvalidTeamEntries } from "./scope_validation";
 import ImpactPreviewAlert from "./impact_preview_alert";
 import { TokenSelect } from "./TokenSelect";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddAttachmentFormProps {
   visible: boolean;
@@ -231,216 +231,228 @@ const AddAttachmentForm: React.FC<AddAttachmentFormProps> = ({
   const policyOptions = policies.map((p) => p.policy_name);
 
   return (
-    <Modal title="Create Policy Attachment" open={visible} onCancel={handleClose} footer={null} width={600}>
-      <TooltipProvider>
-        <form onSubmit={(event) => event.preventDefault()} noValidate>
-          <FieldGroup>
-            <FormField control={form.control} name="policy_names" label="Policies">
-              {({ id, value, onChange, onBlur, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                <TokenSelect
-                  id={id}
-                  value={value}
-                  onValueChange={onChange}
-                  onBlur={onBlur}
-                  placeholder="Select policies to attach"
-                  options={policyOptions}
-                  emptyText="No matching policies"
-                  ariaInvalid={ariaInvalid}
-                  ariaDescribedBy={ariaDescribedBy}
-                />
+    <Dialog open={visible} onOpenChange={(open) => !open && handleClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
+        <DialogHeader>
+          <DialogTitle>Create Policy Attachment</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={(event) => event.preventDefault()} noValidate>
+            <FieldGroup>
+              <FormField control={form.control} name="policy_names" label="Policies">
+                {({
+                  id,
+                  value,
+                  onChange,
+                  onBlur,
+                  "aria-invalid": ariaInvalid,
+                  "aria-describedby": ariaDescribedBy,
+                }) => (
+                  <TokenSelect
+                    id={id}
+                    value={value}
+                    onValueChange={onChange}
+                    onBlur={onBlur}
+                    placeholder="Select policies to attach"
+                    options={policyOptions}
+                    emptyText="No matching policies"
+                    ariaInvalid={ariaInvalid}
+                    ariaDescribedBy={ariaDescribedBy}
+                  />
+                )}
+              </FormField>
+
+              <div className="flex items-center gap-3">
+                <span className="text-sm font-semibold">Scope</span>
+                <Separator className="flex-1" />
+              </div>
+
+              <div>
+                <FieldTitle className="mb-2">Scope Type</FieldTitle>
+                <RadioGroup value={scopeType} onValueChange={(value: unknown) => setScopeType(value as ScopeType)}>
+                  <FieldLabel className="font-normal">
+                    <RadioGroupItem value="specific" />
+                    Specific (teams, keys, models, or tags)
+                  </FieldLabel>
+                  <FieldLabel className="font-normal">
+                    <RadioGroupItem value="global" />
+                    Global (applies to all requests)
+                  </FieldLabel>
+                </RadioGroup>
+              </div>
+
+              {scopeType === "specific" && (
+                <>
+                  <FormField
+                    control={form.control}
+                    name="teams"
+                    label={labelWithHint(
+                      "Teams",
+                      "Select team aliases or enter custom patterns. Supports wildcards (e.g., healthcare-*)",
+                    )}
+                  >
+                    {({
+                      id,
+                      value,
+                      onChange,
+                      onBlur,
+                      "aria-invalid": ariaInvalid,
+                      "aria-describedby": ariaDescribedBy,
+                    }) => (
+                      <TokenSelect
+                        id={id}
+                        value={value}
+                        onValueChange={onChange}
+                        onBlur={onBlur}
+                        placeholder={isLoadingTeams ? "Loading teams..." : "Select or enter team aliases"}
+                        options={availableTeams}
+                        allowCustomValues
+                        tokenSeparators={[","]}
+                        emptyText="No matching teams"
+                        ariaInvalid={ariaInvalid}
+                        ariaDescribedBy={ariaDescribedBy}
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="keys"
+                    label={labelWithHint(
+                      "Keys",
+                      "Select key aliases or enter custom patterns. Supports wildcards (e.g., dev-*)",
+                    )}
+                  >
+                    {({
+                      id,
+                      value,
+                      onChange,
+                      onBlur,
+                      "aria-invalid": ariaInvalid,
+                      "aria-describedby": ariaDescribedBy,
+                    }) => (
+                      <TokenSelect
+                        id={id}
+                        value={value}
+                        onValueChange={onChange}
+                        onBlur={onBlur}
+                        placeholder={isLoadingKeys ? "Loading keys..." : "Select or enter key aliases"}
+                        options={availableKeys}
+                        allowCustomValues
+                        tokenSeparators={[","]}
+                        emptyText="No matching keys"
+                        ariaInvalid={ariaInvalid}
+                        ariaDescribedBy={ariaDescribedBy}
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="models"
+                    label={labelWithHint(
+                      "Models",
+                      "Model names this attachment applies to. Supports wildcards (e.g., gpt-4*). Leave empty to apply to all models.",
+                    )}
+                  >
+                    {({
+                      id,
+                      value,
+                      onChange,
+                      onBlur,
+                      "aria-invalid": ariaInvalid,
+                      "aria-describedby": ariaDescribedBy,
+                    }) => (
+                      <TokenSelect
+                        id={id}
+                        value={value}
+                        onValueChange={onChange}
+                        onBlur={onBlur}
+                        placeholder={
+                          isLoadingModels ? "Loading models..." : "Select or enter model names (e.g., gpt-4, bedrock/*)"
+                        }
+                        options={availableModels}
+                        allowCustomValues
+                        tokenSeparators={[","]}
+                        emptyText="No matching models"
+                        ariaInvalid={ariaInvalid}
+                        ariaDescribedBy={ariaDescribedBy}
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="tags"
+                    label={labelWithHint(
+                      "Tags",
+                      "Match against tags set in key or team metadata. Use exact values (e.g., healthcare) or wildcard patterns (e.g., health-*) where * matches any suffix.",
+                    )}
+                    description={
+                      <span className="text-xs">
+                        Matches tags from key/team <code>metadata.tags</code> or tags passed dynamically in the request
+                        body. Use <code>*</code> as a suffix wildcard (e.g., <code>prod-*</code> matches{" "}
+                        <code>prod-us</code>, <code>prod-eu</code>).
+                      </span>
+                    }
+                  >
+                    {({
+                      id,
+                      value,
+                      onChange,
+                      onBlur,
+                      "aria-invalid": ariaInvalid,
+                      "aria-describedby": ariaDescribedBy,
+                    }) => (
+                      <TokenSelect
+                        id={id}
+                        value={value}
+                        onValueChange={onChange}
+                        onBlur={onBlur}
+                        placeholder="Type a tag and press Enter (e.g. healthcare, prod-*)"
+                        allowCustomValues
+                        tokenSeparators={[",", " "]}
+                        ariaInvalid={ariaInvalid}
+                        ariaDescribedBy={ariaDescribedBy}
+                      />
+                    )}
+                  </FormField>
+                </>
               )}
-            </FormField>
+            </FieldGroup>
 
-            <div className="flex items-center gap-3">
-              <span className="text-sm font-semibold">Scope</span>
-              <Separator className="flex-1" />
-            </div>
+            {impactResult && <ImpactPreviewAlert impactResult={impactResult} />}
 
-            <div>
-              <FieldTitle className="mb-2">Scope Type</FieldTitle>
-              <RadioGroup value={scopeType} onValueChange={(value: unknown) => setScopeType(value as ScopeType)}>
-                <FieldLabel className="font-normal">
-                  <RadioGroupItem value="specific" />
-                  Specific (teams, keys, models, or tags)
-                </FieldLabel>
-                <FieldLabel className="font-normal">
-                  <RadioGroupItem value="global" />
-                  Global (applies to all requests)
-                </FieldLabel>
-              </RadioGroup>
-            </div>
-
-            {scopeType === "specific" && (
-              <>
-                <FormField
-                  control={form.control}
-                  name="teams"
-                  label={labelWithHint(
-                    "Teams",
-                    "Select team aliases or enter custom patterns. Supports wildcards (e.g., healthcare-*)",
-                  )}
+            <div className="flex justify-end space-x-2 mt-4">
+              <Button type="button" variant="secondary" onClick={handleClose}>
+                Cancel
+              </Button>
+              {scopeType === "specific" && (
+                <Button
+                  type="button"
+                  variant="secondary"
+                  onClick={handlePreviewImpact}
+                  disabled={isEstimating}
+                  aria-busy={isEstimating}
                 >
-                  {({
-                    id,
-                    value,
-                    onChange,
-                    onBlur,
-                    "aria-invalid": ariaInvalid,
-                    "aria-describedby": ariaDescribedBy,
-                  }) => (
-                    <TokenSelect
-                      id={id}
-                      value={value}
-                      onValueChange={onChange}
-                      onBlur={onBlur}
-                      placeholder={isLoadingTeams ? "Loading teams..." : "Select or enter team aliases"}
-                      options={availableTeams}
-                      allowCustomValues
-                      tokenSeparators={[","]}
-                      emptyText="No matching teams"
-                      ariaInvalid={ariaInvalid}
-                      ariaDescribedBy={ariaDescribedBy}
-                    />
-                  )}
-                </FormField>
-
-                <FormField
-                  control={form.control}
-                  name="keys"
-                  label={labelWithHint(
-                    "Keys",
-                    "Select key aliases or enter custom patterns. Supports wildcards (e.g., dev-*)",
-                  )}
-                >
-                  {({
-                    id,
-                    value,
-                    onChange,
-                    onBlur,
-                    "aria-invalid": ariaInvalid,
-                    "aria-describedby": ariaDescribedBy,
-                  }) => (
-                    <TokenSelect
-                      id={id}
-                      value={value}
-                      onValueChange={onChange}
-                      onBlur={onBlur}
-                      placeholder={isLoadingKeys ? "Loading keys..." : "Select or enter key aliases"}
-                      options={availableKeys}
-                      allowCustomValues
-                      tokenSeparators={[","]}
-                      emptyText="No matching keys"
-                      ariaInvalid={ariaInvalid}
-                      ariaDescribedBy={ariaDescribedBy}
-                    />
-                  )}
-                </FormField>
-
-                <FormField
-                  control={form.control}
-                  name="models"
-                  label={labelWithHint(
-                    "Models",
-                    "Model names this attachment applies to. Supports wildcards (e.g., gpt-4*). Leave empty to apply to all models.",
-                  )}
-                >
-                  {({
-                    id,
-                    value,
-                    onChange,
-                    onBlur,
-                    "aria-invalid": ariaInvalid,
-                    "aria-describedby": ariaDescribedBy,
-                  }) => (
-                    <TokenSelect
-                      id={id}
-                      value={value}
-                      onValueChange={onChange}
-                      onBlur={onBlur}
-                      placeholder={
-                        isLoadingModels ? "Loading models..." : "Select or enter model names (e.g., gpt-4, bedrock/*)"
-                      }
-                      options={availableModels}
-                      allowCustomValues
-                      tokenSeparators={[","]}
-                      emptyText="No matching models"
-                      ariaInvalid={ariaInvalid}
-                      ariaDescribedBy={ariaDescribedBy}
-                    />
-                  )}
-                </FormField>
-
-                <FormField
-                  control={form.control}
-                  name="tags"
-                  label={labelWithHint(
-                    "Tags",
-                    "Match against tags set in key or team metadata. Use exact values (e.g., healthcare) or wildcard patterns (e.g., health-*) where * matches any suffix.",
-                  )}
-                  description={
-                    <span className="text-xs">
-                      Matches tags from key/team <code>metadata.tags</code> or tags passed dynamically in the request
-                      body. Use <code>*</code> as a suffix wildcard (e.g., <code>prod-*</code> matches{" "}
-                      <code>prod-us</code>, <code>prod-eu</code>).
-                    </span>
-                  }
-                >
-                  {({
-                    id,
-                    value,
-                    onChange,
-                    onBlur,
-                    "aria-invalid": ariaInvalid,
-                    "aria-describedby": ariaDescribedBy,
-                  }) => (
-                    <TokenSelect
-                      id={id}
-                      value={value}
-                      onValueChange={onChange}
-                      onBlur={onBlur}
-                      placeholder="Type a tag and press Enter (e.g. healthcare, prod-*)"
-                      allowCustomValues
-                      tokenSeparators={[",", " "]}
-                      ariaInvalid={ariaInvalid}
-                      ariaDescribedBy={ariaDescribedBy}
-                    />
-                  )}
-                </FormField>
-              </>
-            )}
-          </FieldGroup>
-
-          {impactResult && <ImpactPreviewAlert impactResult={impactResult} />}
-
-          <div className="flex justify-end space-x-2 mt-4">
-            <Button type="button" variant="secondary" onClick={handleClose}>
-              Cancel
-            </Button>
-            {scopeType === "specific" && (
+                  {isEstimating && <UiLoadingSpinner className="size-4" />}
+                  Estimate Impact
+                </Button>
+              )}
               <Button
                 type="button"
-                variant="secondary"
-                onClick={handlePreviewImpact}
-                disabled={isEstimating}
-                aria-busy={isEstimating}
+                onClick={form.handleSubmit(handleSubmit)}
+                disabled={isSubmitting}
+                aria-busy={isSubmitting}
               >
-                {isEstimating && <UiLoadingSpinner className="size-4" />}
-                Estimate Impact
+                {isSubmitting && <UiLoadingSpinner className="size-4" />}
+                Create Attachment
               </Button>
-            )}
-            <Button
-              type="button"
-              onClick={form.handleSubmit(handleSubmit)}
-              disabled={isSubmitting}
-              aria-busy={isSubmitting}
-            >
-              {isSubmitting && <UiLoadingSpinner className="size-4" />}
-              Create Attachment
-            </Button>
-          </div>
-        </form>
-      </TooltipProvider>
-    </Modal>
+            </div>
+          </form>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_policy_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_policy_form.tsx
index cc0a85eedb9..b1f00ee64ad 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_policy_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/add_policy_form.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { Modal, Alert, Tag } from "antd";
+import { Tag } from "antd";
 import { z } from "zod/v4";
 import { Policy, PolicyCreateRequest, PolicyUpdateRequest } from "@/components/policies/types";
 import { Guardrail } from "@/components/guardrails/types";
@@ -19,7 +19,9 @@ import { Textarea } from "@/components/ui/textarea";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
-import { CircleHelp } from "lucide-react";
+import { CircleHelp, Info } from "lucide-react";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 
 interface AddPolicyFormProps {
   visible: boolean;
@@ -335,132 +337,138 @@ const AddPolicyForm: React.FC<AddPolicyFormProps> = ({
   // ── Mode Picker Step ──────────────────────────────────────────────────────
   if (step === "pick_mode") {
     return (
-      <Modal title="Create New Policy" open={visible} onCancel={handleClose} footer={null} width={620}>
-        <ModePicker selected={selectedMode} onSelect={setSelectedMode} />
+      <Dialog open={visible} onOpenChange={(open) => !open && handleClose()}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[620px]">
+          <DialogHeader>
+            <DialogTitle>Create New Policy</DialogTitle>
+          </DialogHeader>
+          <ModePicker selected={selectedMode} onSelect={setSelectedMode} />
 
-        {selectedMode === "flow_builder" && (
-          <Alert
-            message="You'll be redirected to the full-screen Flow Builder to design your policy logic visually."
-            type="info"
-            className="mt-4 border border-indigo-200 bg-indigo-50 dark:border-indigo-800 dark:bg-indigo-950"
-          />
-        )}
+          {selectedMode === "flow_builder" && (
+            <Alert
+              variant="info"
+              className="mt-4 border border-indigo-200 bg-indigo-50 dark:border-indigo-800 dark:bg-indigo-950"
+            >
+              <AlertTitle>
+                You&apos;ll be redirected to the full-screen Flow Builder to design your policy logic visually.
+              </AlertTitle>
+            </Alert>
+          )}
 
-        <div className="mt-6 flex justify-end gap-2">
-          <Button type="button" variant="outline" onClick={handleClose}>
-            Cancel
-          </Button>
-          <Button type="button" onClick={handleModeConfirm}>
-            {selectedMode === "flow_builder" ? "Continue to Builder" : "Create Policy"}
-          </Button>
-        </div>
-      </Modal>
+          <div className="mt-6 flex justify-end gap-2">
+            <Button type="button" variant="outline" onClick={handleClose}>
+              Cancel
+            </Button>
+            <Button type="button" onClick={handleModeConfirm}>
+              {selectedMode === "flow_builder" ? "Continue to Builder" : "Create Policy"}
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
     );
   }
 
   // ── Simple Form Step ──────────────────────────────────────────────────────
   return (
-    <Modal
-      title={isEditing ? "Edit Policy" : "Create New Policy"}
-      open={visible}
-      onCancel={handleClose}
-      footer={null}
-      width={700}
-    >
-      <TooltipProvider>
-        <form onSubmit={(event) => event.preventDefault()} noValidate>
-          <FieldGroup>
-            <FormField control={form.control} name="policy_name" label="Policy Name">
-              {({ ref, ...control }) => (
-                <Input
-                  {...control}
-                  ref={ref}
-                  placeholder="e.g., global-baseline, healthcare-compliance"
-                  disabled={isEditing}
-                />
-              )}
-            </FormField>
+    <Dialog open={visible} onOpenChange={(open) => !open && handleClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
+        <DialogHeader>
+          <DialogTitle>{isEditing ? "Edit Policy" : "Create New Policy"}</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={(event) => event.preventDefault()} noValidate>
+            <FieldGroup>
+              <FormField control={form.control} name="policy_name" label="Policy Name">
+                {({ ref, ...control }) => (
+                  <Input
+                    {...control}
+                    ref={ref}
+                    placeholder="e.g., global-baseline, healthcare-compliance"
+                    disabled={isEditing}
+                  />
+                )}
+              </FormField>
 
-            <FormField control={form.control} name="description" label="Description">
-              {({ ref, ...control }) => (
-                <Textarea {...control} ref={ref} rows={2} placeholder="Describe what this policy does..." />
-              )}
-            </FormField>
+              <FormField control={form.control} name="description" label="Description">
+                {({ ref, ...control }) => (
+                  <Textarea {...control} ref={ref} rows={2} placeholder="Describe what this policy does..." />
+                )}
+              </FormField>
 
-            <SectionHeading label="Inheritance" />
+              <SectionHeading label="Inheritance" />
 
-            <FormField
-              control={form.control}
-              name="inherit"
-              label={labelWithHint(
-                "Inherit From",
-                "Inherit guardrails from another policy. The child policy will include all guardrails from the parent.",
-              )}
-            >
-              {({ id, value, onChange }) => (
-                <SearchSelect
-                  inputId={id}
-                  options={policyOptions}
-                  value={value}
-                  onValueChange={(selected) => {
-                    onChange(selected);
-                    refreshResolvedGuardrails({ inherit: selected });
-                  }}
-                  placeholder="Select a parent policy (optional)"
-                  className="h-9"
-                />
-              )}
-            </FormField>
+              <FormField
+                control={form.control}
+                name="inherit"
+                label={labelWithHint(
+                  "Inherit From",
+                  "Inherit guardrails from another policy. The child policy will include all guardrails from the parent.",
+                )}
+              >
+                {({ id, value, onChange }) => (
+                  <SearchSelect
+                    inputId={id}
+                    options={policyOptions}
+                    value={value}
+                    onValueChange={(selected) => {
+                      onChange(selected);
+                      refreshResolvedGuardrails({ inherit: selected });
+                    }}
+                    placeholder="Select a parent policy (optional)"
+                    className="h-9"
+                  />
+                )}
+              </FormField>
 
-            <SectionHeading label="Guardrails" />
+              <SectionHeading label="Guardrails" />
 
-            <FormField
-              control={form.control}
-              name="guardrails_add"
-              label={labelWithHint(
-                "Guardrails to Add",
-                "These guardrails will be added to requests matching this policy",
-              )}
-            >
-              {({ value, onChange }) => (
-                <MultiSelect
-                  options={guardrailOptions}
-                  value={value}
-                  onValueChange={(selected) => {
-                    onChange(selected);
-                    refreshResolvedGuardrails({ guardrails_add: selected });
-                  }}
-                  placeholder="Select guardrails to add"
-                />
-              )}
-            </FormField>
+              <FormField
+                control={form.control}
+                name="guardrails_add"
+                label={labelWithHint(
+                  "Guardrails to Add",
+                  "These guardrails will be added to requests matching this policy",
+                )}
+              >
+                {({ value, onChange }) => (
+                  <MultiSelect
+                    options={guardrailOptions}
+                    value={value}
+                    onValueChange={(selected) => {
+                      onChange(selected);
+                      refreshResolvedGuardrails({ guardrails_add: selected });
+                    }}
+                    placeholder="Select guardrails to add"
+                  />
+                )}
+              </FormField>
 
-            <FormField
-              control={form.control}
-              name="guardrails_remove"
-              label={labelWithHint(
-                "Guardrails to Remove",
-                "These guardrails will be removed from inherited guardrails",
-              )}
-            >
-              {({ value, onChange }) => (
-                <MultiSelect
-                  options={guardrailOptions}
-                  value={value}
-                  onValueChange={(selected) => {
-                    onChange(selected);
-                    refreshResolvedGuardrails({ guardrails_remove: selected });
-                  }}
-                  placeholder="Select guardrails to remove (from inherited)"
-                />
-              )}
-            </FormField>
+              <FormField
+                control={form.control}
+                name="guardrails_remove"
+                label={labelWithHint(
+                  "Guardrails to Remove",
+                  "These guardrails will be removed from inherited guardrails",
+                )}
+              >
+                {({ value, onChange }) => (
+                  <MultiSelect
+                    options={guardrailOptions}
+                    value={value}
+                    onValueChange={(selected) => {
+                      onChange(selected);
+                      refreshResolvedGuardrails({ guardrails_remove: selected });
+                    }}
+                    placeholder="Select guardrails to remove (from inherited)"
+                  />
+                )}
+              </FormField>
 
-            {resolvedGuardrails.length > 0 && (
-              <Alert
-                message="Resolved Guardrails"
-                description={
-                  <div>
+              {resolvedGuardrails.length > 0 && (
+                <Alert variant="info">
+                  <Info />
+                  <AlertTitle>Resolved Guardrails</AlertTitle>
+                  <AlertDescription>
                     <span className="mb-2 block text-muted-foreground">
                       These are the final guardrails that will be applied (including inheritance):
                     </span>
@@ -471,94 +479,94 @@ const AddPolicyForm: React.FC<AddPolicyFormProps> = ({
                         </Tag>
                       ))}
                     </div>
-                  </div>
-                }
-                type="info"
-                showIcon
-              />
-            )}
-
-            <SectionHeading label="Conditions (Optional)" />
-
-            <Alert
-              message="Model Scope"
-              description="By default, this policy will run on all models. You can optionally restrict it to specific models below."
-              type="info"
-              showIcon
-            />
-
-            <div role="group" className="flex w-full flex-col gap-3">
-              <span className="text-sm leading-snug font-medium text-foreground">Model Condition Type</span>
-              <RadioGroup
-                value={modelConditionType}
-                onValueChange={(value) => {
-                  setModelConditionType(value as ModelConditionType);
-                  form.setValue("model_condition", "");
-                }}
-                className="flex flex-row gap-6"
-              >
-                <label className="flex cursor-pointer items-center gap-2 text-sm">
-                  <RadioGroupItem value="model" />
-                  Select Model
-                </label>
-                <label className="flex cursor-pointer items-center gap-2 text-sm">
-                  <RadioGroupItem value="regex" />
-                  Custom Regex Pattern
-                </label>
-              </RadioGroup>
-            </div>
-
-            <FormField
-              control={form.control}
-              name="model_condition"
-              label={labelWithHint(
-                modelConditionType === "model" ? "Model (Optional)" : "Regex Pattern (Optional)",
-                modelConditionType === "model"
-                  ? "Select a specific model to apply this policy to. Leave empty to apply to all models."
-                  : "Enter a regex pattern to match models (e.g., gpt-4.* or bedrock/.*). Leave empty to apply to all models.",
+                  </AlertDescription>
+                </Alert>
               )}
-            >
-              {({ ref, id, value, onChange, ...control }) =>
-                modelConditionType === "model" ? (
-                  <SearchSelect
-                    inputId={id}
-                    options={availableModels.map((model) => ({ label: model, value: model }))}
-                    value={value}
-                    onValueChange={onChange}
-                    placeholder="Leave empty to apply to all models"
-                    className="h-9"
-                  />
-                ) : (
-                  <Input
-                    {...control}
-                    id={id}
-                    ref={ref}
-                    value={value}
-                    onChange={onChange}
-                    placeholder="Leave empty to apply to all models (e.g., gpt-4.* or bedrock/claude-.*)"
-                  />
-                )
-              }
-            </FormField>
-          </FieldGroup>
 
-          <div className="mt-6 flex justify-end gap-2">
-            <Button type="button" variant="outline" onClick={handleClose}>
-              Cancel
-            </Button>
-            <Button
-              type="button"
-              onClick={form.handleSubmit(handleSubmit)}
-              disabled={isSubmitting}
-              aria-busy={isSubmitting}
-            >
-              {isSubmitting && <UiLoadingSpinner className="size-4" />}
-              {isEditing ? "Update Policy" : "Create Policy"}
-            </Button>
-          </div>
-        </form>
-      </TooltipProvider>
-    </Modal>
+              <SectionHeading label="Conditions (Optional)" />
+
+              <Alert variant="info">
+                <Info />
+                <AlertTitle>Model Scope</AlertTitle>
+                <AlertDescription>
+                  By default, this policy will run on all models. You can optionally restrict it to specific models
+                  below.
+                </AlertDescription>
+              </Alert>
+
+              <div role="group" className="flex w-full flex-col gap-3">
+                <span className="text-sm leading-snug font-medium text-foreground">Model Condition Type</span>
+                <RadioGroup
+                  value={modelConditionType}
+                  onValueChange={(value) => {
+                    setModelConditionType(value as ModelConditionType);
+                    form.setValue("model_condition", "");
+                  }}
+                  className="flex flex-row gap-6"
+                >
+                  <label className="flex cursor-pointer items-center gap-2 text-sm">
+                    <RadioGroupItem value="model" />
+                    Select Model
+                  </label>
+                  <label className="flex cursor-pointer items-center gap-2 text-sm">
+                    <RadioGroupItem value="regex" />
+                    Custom Regex Pattern
+                  </label>
+                </RadioGroup>
+              </div>
+
+              <FormField
+                control={form.control}
+                name="model_condition"
+                label={labelWithHint(
+                  modelConditionType === "model" ? "Model (Optional)" : "Regex Pattern (Optional)",
+                  modelConditionType === "model"
+                    ? "Select a specific model to apply this policy to. Leave empty to apply to all models."
+                    : "Enter a regex pattern to match models (e.g., gpt-4.* or bedrock/.*). Leave empty to apply to all models.",
+                )}
+              >
+                {({ ref, id, value, onChange, ...control }) =>
+                  modelConditionType === "model" ? (
+                    <SearchSelect
+                      inputId={id}
+                      options={availableModels.map((model) => ({ label: model, value: model }))}
+                      value={value}
+                      onValueChange={onChange}
+                      placeholder="Leave empty to apply to all models"
+                      className="h-9"
+                    />
+                  ) : (
+                    <Input
+                      {...control}
+                      id={id}
+                      ref={ref}
+                      value={value}
+                      onChange={onChange}
+                      placeholder="Leave empty to apply to all models (e.g., gpt-4.* or bedrock/claude-.*)"
+                    />
+                  )
+                }
+              </FormField>
+            </FieldGroup>
+
+            <div className="mt-6 flex justify-end gap-2">
+              <Button type="button" variant="outline" onClick={handleClose}>
+                Cancel
+              </Button>
+              <Button
+                type="button"
+                onClick={form.handleSubmit(handleSubmit)}
+                disabled={isSubmitting}
+                aria-busy={isSubmitting}
+              >
+                {isSubmitting && <UiLoadingSpinner className="size-4" />}
+                {isEditing ? "Update Policy" : "Create Policy"}
+              </Button>
+            </div>
+          </form>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/policy_test_panel.tsx b/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/policy_test_panel.tsx
index 90642d23a46..d8a6601e3d4 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/policy_test_panel.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/policies/_components/policy_test_panel.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { useForm } from "react-hook-form";
-import { Alert, Empty } from "antd";
+import { CircleAlert, Inbox } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { resolvePoliciesCall, teamListCall, keyListCall, modelAvailableCall } from "@/components/networking";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { FieldGroup } from "@/components/shared/form/field";
@@ -258,7 +259,10 @@ const PolicyTestPanel: React.FC<PolicyTestPanelProps> = ({ accessToken }) => {
       {hasSearched && result && (
         <div className="bg-card border border-border rounded-lg p-6">
           {result.matched_policies.length === 0 ? (
-            <Empty description="No policies matched this context" />
+            <div className="py-6 text-center">
+              <Inbox className="mx-auto mb-2 size-8 text-muted-foreground" aria-hidden="true" />
+              <p className="text-sm text-muted-foreground">No policies matched this context</p>
+            </div>
           ) : (
             <>
               <div className="mb-4">
@@ -325,7 +329,11 @@ const PolicyTestPanel: React.FC<PolicyTestPanelProps> = ({ accessToken }) => {
       )}
 
       {hasSearched && !result && !isLoading && (
-        <Alert message="Error" description="Failed to resolve policies. Check the proxy logs." type="error" showIcon />
+        <Alert variant="error">
+          <CircleAlert />
+          <AlertTitle>Error</AlertTitle>
+          <AlertDescription>Failed to resolve policies. Check the proxy logs.</AlertDescription>
+        </Alert>
       )}
     </div>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/CreateProjectModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/CreateProjectModal.tsx
index 7e2d74c0944..14bcc40bfea 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/CreateProjectModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/CreateProjectModal.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { useState } from "react";
-import { Modal } from "antd";
 import { FolderPlus } from "lucide-react";
 
 import { toast } from "@/lib/toast";
@@ -12,6 +11,7 @@ import { useCreateProject, ProjectCreateParams } from "@/app/(dashboard)/hooks/p
 import { ProjectBaseForm } from "./ProjectBaseForm";
 import { emptyProjectFormValues, projectFormSchema } from "./projectFormSchema";
 import { buildProjectApiParams } from "./projectFormUtils";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface CreateProjectModalProps {
   isOpen: boolean;
@@ -65,15 +65,13 @@ function CreateProjectForm({ onClose }: { onClose: () => void }) {
 
 export function CreateProjectModal({ isOpen, onClose }: CreateProjectModalProps) {
   return (
-    <Modal
-      title={<span className="text-lg font-semibold text-foreground">Create New Project</span>}
-      open={isOpen}
-      onCancel={onClose}
-      width={720}
-      destroyOnHidden
-      footer={null}
-    >
-      <CreateProjectForm onClose={onClose} />
-    </Modal>
+    <Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[720px]">
+        <DialogHeader>
+          <DialogTitle className="text-lg">Create New Project</DialogTitle>
+        </DialogHeader>
+        <CreateProjectForm onClose={onClose} />
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/EditProjectModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/EditProjectModal.tsx
index d8b4076f404..307ba88e0f3 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/EditProjectModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectModals/EditProjectModal.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { useState } from "react";
-import { Modal } from "antd";
 import { Save } from "lucide-react";
 
 import { toast } from "@/lib/toast";
@@ -13,6 +12,7 @@ import { useUpdateProject, ProjectUpdateParams } from "@/app/(dashboard)/hooks/p
 import { ProjectBaseForm } from "./ProjectBaseForm";
 import { projectFormSchema, type ProjectFormValues } from "./projectFormSchema";
 import { buildProjectApiParams } from "./projectFormUtils";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface EditProjectModalProps {
   isOpen: boolean;
@@ -107,15 +107,13 @@ function EditProjectForm({ project, onClose, onSuccess }: Omit<EditProjectModalP
 
 export function EditProjectModal({ isOpen, project, onClose, onSuccess }: EditProjectModalProps) {
   return (
-    <Modal
-      title={<span className="text-lg font-semibold text-foreground">Edit Project</span>}
-      open={isOpen}
-      onCancel={onClose}
-      width={720}
-      destroyOnHidden
-      footer={null}
-    >
-      <EditProjectForm key={project.project_id} project={project} onClose={onClose} onSuccess={onSuccess} />
-    </Modal>
+    <Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[720px]">
+        <DialogHeader>
+          <DialogTitle className="text-lg">Edit Project</DialogTitle>
+        </DialogHeader>
+        <EditProjectForm key={project.project_id} project={project} onClose={onClose} onSuccess={onSuccess} />
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectsPage.tsx b/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectsPage.tsx
index 91ad9f847f5..dc18a05edca 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectsPage.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/projects/_components/ProjectsPage.tsx
@@ -3,7 +3,7 @@ import { useTeams } from "@/app/(dashboard)/hooks/teams/useTeams";
 import { Plus, SearchIcon, X } from "lucide-react";
 import { parseAsString, useQueryState } from "nuqs";
 import { useMemo, useState } from "react";
-import { PageHeader } from "@/components/shared/PageHeader";
+import { LegacyPageHeader } from "@/components/shared/LegacyPageHeader";
 import { Button } from "@/components/ui/button";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
 import { CreateProjectModal } from "./ProjectModals/CreateProjectModal";
@@ -56,7 +56,7 @@ export function ProjectsPage() {
   return (
     <div className="p-6 px-12">
       <div className="mb-4">
-        <PageHeader
+        <LegacyPageHeader
           title="Projects"
           subtitle="Manage projects within your teams"
           actions={
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx
index dc5221f9983..67e0b4e604b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/add_prompt_form.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Modal, Upload } from "antd";
+import { Upload } from "antd";
 import type { UploadFile, UploadProps } from "antd";
 import { Upload as UploadIcon } from "lucide-react";
 import { z } from "zod/v4";
@@ -12,6 +12,7 @@ import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddPromptFormProps {
   visible: boolean;
@@ -144,67 +145,70 @@ const AddPromptForm: React.FC<AddPromptFormProps> = ({ visible, onClose, accessT
   };
 
   return (
-    <Modal
-      title="Add New Prompt"
-      open={visible}
-      onCancel={handleCancel}
-      footer={[
-        <Button key="cancel" type="button" variant="outline" onClick={handleCancel}>
-          Cancel
-        </Button>,
-        <Button key="submit" type="button" disabled={loading} onClick={() => void form.handleSubmit(handleSubmit)()}>
-          {loading && <UiLoadingSpinner className="size-4" />}
-          Create Prompt
-        </Button>,
-      ]}
-      width={600}
-    >
-      <form onSubmit={(event) => event.preventDefault()} noValidate>
-        <FieldGroup>
-          <FormField control={form.control} name="prompt_id" label="Prompt ID">
-            {({ ref, ...field }) => (
-              <Input {...field} ref={ref} placeholder="Enter unique prompt ID (e.g., my_prompt_id)" />
-            )}
-          </FormField>
+    <Dialog open={visible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
+        <DialogHeader>
+          <DialogTitle>Add New Prompt</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={(event) => event.preventDefault()} noValidate>
+          <FieldGroup>
+            <FormField control={form.control} name="prompt_id" label="Prompt ID">
+              {({ ref, ...field }) => (
+                <Input {...field} ref={ref} placeholder="Enter unique prompt ID (e.g., my_prompt_id)" />
+              )}
+            </FormField>
 
-          <FormField control={form.control} name="prompt_integration" label="Prompt Integration">
-            {({ id, value, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-              <Select items={PROMPT_INTEGRATION_OPTIONS} value={value} onValueChange={handleIntegrationChange}>
-                <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent>
-                  {PROMPT_INTEGRATION_OPTIONS.map((option) => (
-                    <SelectItem key={option.value} value={option.value}>
-                      {option.label}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            )}
-          </FormField>
+            <FormField control={form.control} name="prompt_integration" label="Prompt Integration">
+              {({ id, value, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                <Select items={PROMPT_INTEGRATION_OPTIONS} value={value} onValueChange={handleIntegrationChange}>
+                  <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {PROMPT_INTEGRATION_OPTIONS.map((option) => (
+                      <SelectItem key={option.value} value={option.value}>
+                        {option.label}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              )}
+            </FormField>
 
-          {promptIntegration === "dotprompt" && (
-            <>
-              <FieldSeparator />
-              <Field>
-                <FieldTitle>Prompt File</FieldTitle>
-                <Upload {...uploadProps}>
-                  <Button type="button" variant="outline">
-                    <UploadIcon />
-                    Select .prompt File
-                  </Button>
-                </Upload>
-                {fileList.length > 0 && (
-                  <div className="mt-2 text-sm text-muted-foreground">Selected: {fileList[0].name}</div>
-                )}
-                <FieldDescription>Upload a .prompt file that follows the Dotprompt specification</FieldDescription>
-              </Field>
-            </>
-          )}
-        </FieldGroup>
-      </form>
-    </Modal>
+            {promptIntegration === "dotprompt" && (
+              <>
+                <FieldSeparator />
+                <Field>
+                  <FieldTitle>Prompt File</FieldTitle>
+                  <Upload {...uploadProps}>
+                    <Button type="button" variant="outline">
+                      <UploadIcon />
+                      Select .prompt File
+                    </Button>
+                  </Upload>
+                  {fileList.length > 0 && (
+                    <div className="mt-2 text-sm text-muted-foreground">Selected: {fileList[0].name}</div>
+                  )}
+                  <FieldDescription>Upload a .prompt file that follows the Dotprompt specification</FieldDescription>
+                </Field>
+              </>
+            )}
+          </FieldGroup>
+        </form>
+        <DialogFooter>
+          {" "}
+          <Button type="button" variant="outline" onClick={handleCancel}>
+            Cancel
+          </Button>
+          ,
+          <Button type="button" disabled={loading} onClick={() => void form.handleSubmit(handleSubmit)()}>
+            {loading && <UiLoadingSpinner className="size-4" />}
+            Create Prompt
+          </Button>
+          , ]
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx
index 347553630ae..48d6697a052 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/prompts/_components/prompt_editor_view/conversation_panel/MessageList.tsx
@@ -8,7 +8,7 @@ interface MessageListProps {
   messages: Message[];
   isLoading: boolean;
   hasVariables: boolean;
-  messagesEndRef: React.RefObject<HTMLDivElement>;
+  messagesEndRef: React.RefObject<HTMLDivElement | null>;
 }
 
 const MessageList: React.FC<MessageListProps> = ({ messages, isLoading, hasVariables, messagesEndRef }) => {
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 5ce91f15bd4..c58975ed500 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
@@ -4,7 +4,6 @@ import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Modal } from "antd";
 import {
   getPromptInfo,
   getPromptVersions,
@@ -17,6 +16,7 @@ import { ArrowLeft, CheckIcon, CopyIcon, Pencil, Trash2 } from "lucide-react";
 import { toast } from "@/lib/toast";
 import PromptCodeSnippets from "./prompt_editor_view/PromptCodeSnippets";
 import { extractModel, extractTemplateVariables, getBasePromptId, getCurrentVersion } from "./prompt_utils";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 export interface PromptInfoProps {
   promptId: string;
@@ -489,20 +489,25 @@ const PromptInfoView: React.FC<PromptInfoProps> = ({ promptId, onClose, accessTo
       </Tabs>
 
       {/* Delete Confirmation Modal */}
-      <Modal
-        title="Delete Prompt"
-        open={showDeleteConfirm}
-        onOk={handleDeleteConfirm}
-        onCancel={handleDeleteCancel}
-        confirmLoading={isDeleting}
-        okText="Delete"
-        okButtonProps={{ danger: true }}
-      >
-        <p>
-          Are you sure you want to delete prompt: <strong>{basePromptId}</strong>?
-        </p>
-        <p>This action cannot be undone.</p>
-      </Modal>
+      <Dialog open={showDeleteConfirm} onOpenChange={(open) => !open && handleDeleteCancel()}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+          <DialogHeader>
+            <DialogTitle>Delete Prompt</DialogTitle>
+          </DialogHeader>
+          <p>
+            Are you sure you want to delete prompt: <strong>{basePromptId}</strong>?
+          </p>
+          <p>This action cannot be undone.</p>
+          <DialogFooter>
+            <Button variant="outline" onClick={handleDeleteCancel}>
+              Cancel
+            </Button>
+            <Button onClick={handleDeleteConfirm} variant="destructive" disabled={isDeleting} aria-busy={isDeleting}>
+              Delete
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx
index 86baba7470a..9b21525a948 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/CreateSearchTools.tsx
@@ -1,6 +1,5 @@
 import { isAdminRole } from "@/utils/roles";
 import { useQuery } from "@tanstack/react-query";
-import { Modal } from "antd";
 import { CircleHelp } from "lucide-react";
 import React, { useCallback, useMemo, useState } from "react";
 import { useWatch } from "react-hook-form";
@@ -35,6 +34,7 @@ import nimbleLogo from "../../../../../public/assets/logos/nimble.png";
 import parallelAiLogo from "../../../../../public/assets/logos/parallel_ai.png";
 import perplexityLogo from "../../../../../public/assets/logos/perplexity.png";
 import tavilyLogo from "../../../../../public/assets/logos/tavily.png";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const searchProviderLogoMap: Record<string, string> = {
   perplexity: perplexityLogo.src,
@@ -172,186 +172,183 @@ const CreateSearchTool: React.FC<CreateSearchToolProps> = ({
   }
 
   return (
-    <Modal
-      title={
-        <div className="flex items-center space-x-3 pb-4 border-b border-border">
-          <span className="text-2xl">🔍</span>
-          <h2 className="text-xl font-semibold text-foreground">Add New Search Tool</h2>
-        </div>
-      }
-      open={isModalVisible}
-      width={800}
-      onCancel={handleCancel}
-      footer={null}
-      className="top-8"
-      styles={{
-        body: { padding: "24px" },
-        header: { padding: "24px 24px 0 24px", border: "none" },
-      }}
-    >
-      <div className="mt-6">
-        <TooltipProvider>
-          <form onSubmit={form.handleSubmit(handleCreate)} className="space-y-6">
-            <FieldGroup>
-              <FormField
-                control={form.control}
-                name="search_tool_name"
-                label={labelWithHint(
-                  "Search Tool Name",
-                  "A unique name to identify this search tool configuration (e.g., 'perplexity-search', 'tavily-news-search').",
-                )}
-              >
-                {({ ref, ...field }) => (
-                  <Input
-                    {...field}
-                    ref={ref}
-                    placeholder="e.g., perplexity-search, my-tavily-tool"
-                    className="rounded-lg"
-                  />
-                )}
-              </FormField>
-
-              <FormField
-                control={form.control}
-                name="search_provider"
-                label={labelWithHint(
-                  "Search Provider",
-                  "Select the search provider you want to use. Each provider has different capabilities and pricing.",
-                )}
-              >
-                {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                  <Combobox
-                    items={providerNames}
-                    itemToStringLabel={providerLabel}
-                    value={value === "" ? null : value}
-                    onValueChange={(provider: string | null) => onChange(provider ?? "")}
-                  >
-                    <ComboboxInput
-                      id={id}
-                      aria-invalid={ariaInvalid}
-                      aria-describedby={ariaDescribedBy}
-                      placeholder="Select a search provider"
-                      className="h-10 w-full rounded-lg"
-                      disabled={isLoadingProviders}
-                      showClear={value !== ""}
+    <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <div className="flex items-center space-x-3 pb-4 border-b border-border">
+            <span className="text-2xl">🔍</span>
+            <DialogTitle className="text-xl font-semibold text-foreground">Add New Search Tool</DialogTitle>
+          </div>
+        </DialogHeader>
+        <div className="mt-6">
+          <TooltipProvider>
+            <form onSubmit={form.handleSubmit(handleCreate)} className="space-y-6">
+              <FieldGroup>
+                <FormField
+                  control={form.control}
+                  name="search_tool_name"
+                  label={labelWithHint(
+                    "Search Tool Name",
+                    "A unique name to identify this search tool configuration (e.g., 'perplexity-search', 'tavily-news-search').",
+                  )}
+                >
+                  {({ ref, ...field }) => (
+                    <Input
+                      {...field}
+                      ref={ref}
+                      placeholder="e.g., perplexity-search, my-tavily-tool"
+                      className="rounded-lg"
                     />
-                    <ComboboxContent>
-                      <ComboboxEmpty>No matching search providers</ComboboxEmpty>
-                      <ComboboxList>
-                        {(providerName: string) => (
-                          <ComboboxItem key={providerName} value={providerName}>
-                            <SearchProviderLabel
-                              providerName={providerName}
-                              displayName={providerLabel(providerName)}
-                            />
-                          </ComboboxItem>
-                        )}
-                      </ComboboxList>
-                    </ComboboxContent>
-                  </Combobox>
-                )}
-              </FormField>
+                  )}
+                </FormField>
 
-              <FormField
-                control={form.control}
-                name="api_key"
-                label={labelWithHint(
-                  "API Key",
-                  "The API key for authenticating with the search provider. This will be securely stored.",
-                )}
-              >
-                {({ ref, value, ...field }) => (
-                  <PasswordInput
-                    {...field}
-                    ref={ref}
-                    value={value ?? ""}
-                    placeholder="Enter your API key"
-                    groupClassName="h-10 rounded-lg"
-                  />
-                )}
-              </FormField>
-
-              <FormField control={form.control} name="description" label="Description (Optional)">
-                {({ ref, value, ...field }) => (
-                  <Textarea
-                    {...field}
-                    ref={ref}
-                    value={value ?? ""}
-                    rows={3}
-                    placeholder="Brief description of this search tool's purpose"
-                    className="rounded-lg"
-                  />
-                )}
-              </FormField>
-            </FieldGroup>
-
-            <div className="flex justify-between items-center pt-6 border-t border-border">
-              <Tooltip>
-                <TooltipTrigger
-                  render={
-                    <a
-                      className="text-sm text-blue-600 hover:underline dark:text-blue-400"
-                      href="https://github.com/BerriAI/litellm/issues"
-                      target="_blank"
-                      rel="noopener noreferrer"
+                <FormField
+                  control={form.control}
+                  name="search_provider"
+                  label={labelWithHint(
+                    "Search Provider",
+                    "Select the search provider you want to use. Each provider has different capabilities and pricing.",
+                  )}
+                >
+                  {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                    <Combobox
+                      items={providerNames}
+                      itemToStringLabel={providerLabel}
+                      value={value === "" ? null : value}
+                      onValueChange={(provider: string | null) => onChange(provider ?? "")}
                     >
-                      Need Help?
-                    </a>
-                  }
-                />
-                <TooltipContent>Get help on our github</TooltipContent>
-              </Tooltip>
-              <div className="flex gap-2">
-                <Button type="submit" variant="outline" onClick={handleTestConnection} disabled={isTestingConnection}>
-                  {isTestingConnection && <UiLoadingSpinner className="size-4" />}
-                  Test Connection
-                </Button>
-                <Button type="submit" variant="outline" disabled={isLoading}>
-                  {isLoading && <UiLoadingSpinner className="size-4" />}
-                  Add Search Tool
-                </Button>
-              </div>
-            </div>
-          </form>
-        </TooltipProvider>
-      </div>
+                      <ComboboxInput
+                        id={id}
+                        aria-invalid={ariaInvalid}
+                        aria-describedby={ariaDescribedBy}
+                        placeholder="Select a search provider"
+                        className="h-10 w-full rounded-lg"
+                        disabled={isLoadingProviders}
+                        showClear={value !== ""}
+                      />
+                      <ComboboxContent>
+                        <ComboboxEmpty>No matching search providers</ComboboxEmpty>
+                        <ComboboxList>
+                          {(providerName: string) => (
+                            <ComboboxItem key={providerName} value={providerName}>
+                              <SearchProviderLabel
+                                providerName={providerName}
+                                displayName={providerLabel(providerName)}
+                              />
+                            </ComboboxItem>
+                          )}
+                        </ComboboxList>
+                      </ComboboxContent>
+                    </Combobox>
+                  )}
+                </FormField>
 
-      <Modal
-        title="Connection Test Results"
-        open={isTestModalVisible}
-        onCancel={() => {
-          setIsTestModalVisible(false);
-          setIsTestingConnection(false);
-        }}
-        footer={[
-          <Button
-            key="close"
-            type="button"
-            variant="outline"
-            onClick={() => {
+                <FormField
+                  control={form.control}
+                  name="api_key"
+                  label={labelWithHint(
+                    "API Key",
+                    "The API key for authenticating with the search provider. This will be securely stored.",
+                  )}
+                >
+                  {({ ref, value, ...field }) => (
+                    <PasswordInput
+                      {...field}
+                      ref={ref}
+                      value={value ?? ""}
+                      placeholder="Enter your API key"
+                      groupClassName="h-10 rounded-lg"
+                    />
+                  )}
+                </FormField>
+
+                <FormField control={form.control} name="description" label="Description (Optional)">
+                  {({ ref, value, ...field }) => (
+                    <Textarea
+                      {...field}
+                      ref={ref}
+                      value={value ?? ""}
+                      rows={3}
+                      placeholder="Brief description of this search tool's purpose"
+                      className="rounded-lg"
+                    />
+                  )}
+                </FormField>
+              </FieldGroup>
+
+              <div className="flex justify-between items-center pt-6 border-t border-border">
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <a
+                        className="text-sm text-blue-600 hover:underline dark:text-blue-400"
+                        href="https://github.com/BerriAI/litellm/issues"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        Need Help?
+                      </a>
+                    }
+                  />
+                  <TooltipContent>Get help on our github</TooltipContent>
+                </Tooltip>
+                <div className="flex gap-2">
+                  <Button type="submit" variant="outline" onClick={handleTestConnection} disabled={isTestingConnection}>
+                    {isTestingConnection && <UiLoadingSpinner className="size-4" />}
+                    Test Connection
+                  </Button>
+                  <Button type="submit" variant="outline" disabled={isLoading}>
+                    {isLoading && <UiLoadingSpinner className="size-4" />}
+                    Add Search Tool
+                  </Button>
+                </div>
+              </div>
+            </form>
+          </TooltipProvider>
+        </div>
+
+        <Dialog
+          open={isTestModalVisible}
+          onOpenChange={(open) => {
+            if (!open) {
               setIsTestModalVisible(false);
               setIsTestingConnection(false);
-            }}
-          >
-            Close
-          </Button>,
-        ]}
-        width={700}
-      >
-        {isTestModalVisible && accessToken && (
-          <SearchConnectionTest
-            key={connectionTestId}
-            litellmParams={{
-              search_provider: watchedProvider,
-              api_key: watchedApiKey,
-              api_base: undefined,
-            }}
-            accessToken={accessToken}
-            onTestComplete={() => setIsTestingConnection(false)}
-          />
-        )}
-      </Modal>
-    </Modal>
+            }
+          }}
+        >
+          <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
+            <DialogHeader>
+              <DialogTitle>Connection Test Results</DialogTitle>
+            </DialogHeader>
+            {isTestModalVisible && accessToken && (
+              <SearchConnectionTest
+                key={connectionTestId}
+                litellmParams={{
+                  search_provider: watchedProvider,
+                  api_key: watchedApiKey,
+                  api_base: undefined,
+                }}
+                accessToken={accessToken}
+                onTestComplete={() => setIsTestingConnection(false)}
+              />
+            )}
+            <DialogFooter>
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => {
+                  setIsTestModalVisible(false);
+                  setIsTestingConnection(false);
+                }}
+              >
+                Close
+              </Button>
+              , ]
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx
index 153734a6aa9..e171ed9969b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/search-tools/_components/SearchTools.tsx
@@ -1,6 +1,5 @@
 import { isAdminRole } from "@/utils/roles";
 import { useQuery } from "@tanstack/react-query";
-import { Modal } from "antd";
 import React, { useState } from "react";
 import { z } from "zod/v4";
 import DeleteResourceModal from "@/components/common_components/DeleteResourceModal";
@@ -25,6 +24,7 @@ import { buildSearchToolPayload } from "./searchToolPayload";
 import SearchToolTable from "./SearchToolTable";
 import { SearchToolView } from "./SearchToolView";
 import { AvailableSearchProvider, SearchTool } from "./types";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface SearchToolsProps {
   accessToken: string | null;
@@ -284,19 +284,36 @@ const SearchTools: React.FC<SearchToolsProps> = ({ accessToken, userRole, userID
         setModalVisible={setCreateModalVisible}
       />
 
-      <Modal
-        title="Edit Search Tool"
+      <Dialog
         open={isEditModalVisible}
-        onOk={handleEditSubmit}
-        onCancel={() => {
-          setEditModalVisible(false);
-          form.reset(EMPTY_EDIT_VALUES);
-          setSelectedToolId(null);
+        onOpenChange={(open) => {
+          if (!open) {
+            setEditModalVisible(false);
+            form.reset(EMPTY_EDIT_VALUES);
+            setSelectedToolId(null);
+          }
         }}
-        width={600}
       >
-        {renderEditForm()}
-      </Modal>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
+          <DialogHeader>
+            <DialogTitle>Edit Search Tool</DialogTitle>
+          </DialogHeader>
+          {renderEditForm()}
+          <DialogFooter>
+            <Button
+              variant="outline"
+              onClick={() => {
+                setEditModalVisible(false);
+                form.reset(EMPTY_EDIT_VALUES);
+                setSelectedToolId(null);
+              }}
+            >
+              Cancel
+            </Button>
+            <Button onClick={handleEditSubmit}>OK</Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
 
       <h1 className="text-lg font-semibold text-foreground">Search Tools</h1>
       <p className="mt-2 text-sm text-muted-foreground">Configure and manage your search providers</p>
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx
index 4fa0fed9eee..5fb13f2b124 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/skills/_components/add_plugin_form.tsx
@@ -1,5 +1,4 @@
 import React, { useState } from "react";
-import { Modal } from "antd";
 import { CircleHelp } from "lucide-react";
 import { z } from "zod/v4";
 import { toast } from "@/lib/toast";
@@ -30,6 +29,7 @@ import {
   SkillSourcePreview,
 } from "@/components/claude_code_plugins/helpers";
 import { PluginAuthor, PluginSource, SkillRegisterRequest } from "@/components/claude_code_plugins/types";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddPluginFormProps {
   visible: boolean;
@@ -195,194 +195,199 @@ const AddPluginForm: React.FC<AddPluginFormProps> = ({ visible, onClose, accessT
   };
 
   return (
-    <Modal title="Add New Skill" open={visible} onCancel={handleCancel} footer={null} width={700} className="top-8">
-      <TooltipProvider>
-        <form onSubmit={form.handleSubmit(handleSubmit)} noValidate className="mt-4">
-          <FieldGroup>
-            <FormField
-              control={form.control}
-              name="skillUrl"
-              label={labelWithHint(
-                "Repository URL",
-                "Paste an HTTPS git repository URL from GitHub, GitLab, Bitbucket, or a self-hosted host. E.g. github.com/org/repo, gitlab.com/org/repo, or github.com/org/repo/tree/main/my-skill",
-              )}
-            >
-              {({ ref, onChange, ...field }) => (
-                <Input
-                  {...field}
-                  ref={ref}
-                  placeholder="https://github.com/org/repo or https://gitlab.com/org/repo"
-                  className="rounded-lg"
-                  onChange={(event) => {
-                    onChange(event);
-                    recomputePreview(event.target.value, form.getValues("subPath"));
-                  }}
-                />
-              )}
-            </FormField>
-
-            <FormField
-              control={form.control}
-              name="subPath"
-              label={labelWithHint(
-                "Subfolder path (Optional)",
-                "Path within the repository where the skill lives (e.g., plugins/my-skill). Leave empty if the skill is at the repo root.",
-              )}
-              description={
-                urlEncodesSubdir ? "The URL already points to a subfolder, so this field is disabled" : undefined
-              }
-            >
-              {({ ref, onChange, ...field }) => (
-                <Input
-                  {...field}
-                  ref={ref}
-                  placeholder="plugins/my-skill"
-                  className="rounded-lg"
-                  onChange={(event) => {
-                    onChange(event);
-                    recomputePreview(form.getValues("skillUrl"), event.target.value);
-                  }}
-                  disabled={urlEncodesSubdir}
-                />
-              )}
-            </FormField>
-
-            {urlPreview && (
-              <div className="rounded-lg border border-blue-200 bg-blue-50 px-3 py-2 text-sm text-blue-700 dark:border-blue-800 dark:bg-blue-950 dark:text-blue-300">
-                Detected: {urlPreview.label}
-              </div>
-            )}
-
-            <FormField
-              control={form.control}
-              name="name"
-              label={labelWithHint("Skill Name", "Unique identifier in kebab-case format (e.g., my-skill)")}
-            >
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="my-skill" className="rounded-lg" />}
-            </FormField>
-
-            <div className="flex gap-4">
+    <Dialog open={visible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[700px]">
+        <DialogHeader>
+          <DialogTitle>Add New Skill</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={form.handleSubmit(handleSubmit)} noValidate className="mt-4">
+            <FieldGroup>
               <FormField
                 control={form.control}
-                name="domain"
-                label={labelWithHint("Domain (Optional)", "Top-level grouping in the Skill Hub (e.g., Productivity)")}
-                className="flex-1"
+                name="skillUrl"
+                label={labelWithHint(
+                  "Repository URL",
+                  "Paste an HTTPS git repository URL from GitHub, GitLab, Bitbucket, or a self-hosted host. E.g. github.com/org/repo, gitlab.com/org/repo, or github.com/org/repo/tree/main/my-skill",
+                )}
               >
-                {({ ref, ...field }) => (
-                  <Input {...field} ref={ref} placeholder="Productivity" className="rounded-lg" />
+                {({ ref, onChange, ...field }) => (
+                  <Input
+                    {...field}
+                    ref={ref}
+                    placeholder="https://github.com/org/repo or https://gitlab.com/org/repo"
+                    className="rounded-lg"
+                    onChange={(event) => {
+                      onChange(event);
+                      recomputePreview(event.target.value, form.getValues("subPath"));
+                    }}
+                  />
                 )}
               </FormField>
+
               <FormField
                 control={form.control}
-                name="namespace"
-                label={labelWithHint("Namespace (Optional)", "Sub-grouping within domain (e.g., workflows)")}
-                className="flex-1"
+                name="subPath"
+                label={labelWithHint(
+                  "Subfolder path (Optional)",
+                  "Path within the repository where the skill lives (e.g., plugins/my-skill). Leave empty if the skill is at the repo root.",
+                )}
+                description={
+                  urlEncodesSubdir ? "The URL already points to a subfolder, so this field is disabled" : undefined
+                }
               >
-                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="workflows" className="rounded-lg" />}
-              </FormField>
-            </div>
-
-            <FormField
-              control={form.control}
-              name="description"
-              label={labelWithHint("Description (Optional)", "Brief description of what the skill does")}
-            >
-              {({ ref, ...field }) => (
-                <Textarea
-                  {...field}
-                  ref={ref}
-                  rows={3}
-                  placeholder="A skill that helps with..."
-                  maxLength={500}
-                  className="rounded-lg"
-                />
-              )}
-            </FormField>
-
-            <FormField
-              control={form.control}
-              name="category"
-              label={labelWithHint("Category (Optional)", "Select a category or enter a custom one")}
-            >
-              {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                <Combobox
-                  items={PREDEFINED_CATEGORIES}
-                  value={value === "" ? null : value}
-                  onValueChange={(category: string | null) => onChange(category ?? "")}
-                >
-                  <ComboboxInput
-                    id={id}
-                    aria-invalid={ariaInvalid}
-                    aria-describedby={ariaDescribedBy}
-                    placeholder="Select or type a category"
-                    className="w-full rounded-lg"
-                    showClear={value !== ""}
+                {({ ref, onChange, ...field }) => (
+                  <Input
+                    {...field}
+                    ref={ref}
+                    placeholder="plugins/my-skill"
+                    className="rounded-lg"
+                    onChange={(event) => {
+                      onChange(event);
+                      recomputePreview(form.getValues("skillUrl"), event.target.value);
+                    }}
+                    disabled={urlEncodesSubdir}
                   />
-                  <ComboboxContent>
-                    <ComboboxEmpty>No matching categories</ComboboxEmpty>
-                    <ComboboxList>
-                      {(category: string) => (
-                        <ComboboxItem key={category} value={category}>
-                          {category}
-                        </ComboboxItem>
-                      )}
-                    </ComboboxList>
-                  </ComboboxContent>
-                </Combobox>
+                )}
+              </FormField>
+
+              {urlPreview && (
+                <div className="rounded-lg border border-blue-200 bg-blue-50 px-3 py-2 text-sm text-blue-700 dark:border-blue-800 dark:bg-blue-950 dark:text-blue-300">
+                  Detected: {urlPreview.label}
+                </div>
               )}
-            </FormField>
 
-            <FormField
-              control={form.control}
-              name="keywords"
-              label={labelWithHint("Keywords (Optional)", "Comma-separated list of keywords for search")}
-            >
-              {({ ref, ...field }) => (
-                <Input {...field} ref={ref} placeholder="search, web, api" className="rounded-lg" />
-              )}
-            </FormField>
+              <FormField
+                control={form.control}
+                name="name"
+                label={labelWithHint("Skill Name", "Unique identifier in kebab-case format (e.g., my-skill)")}
+              >
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="my-skill" className="rounded-lg" />}
+              </FormField>
 
-            <FormField
-              control={form.control}
-              name="version"
-              label={labelWithHint("Version (Optional)", "Semantic version (e.g., 1.0.0)")}
-            >
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="1.0.0" className="rounded-lg" />}
-            </FormField>
+              <div className="flex gap-4">
+                <FormField
+                  control={form.control}
+                  name="domain"
+                  label={labelWithHint("Domain (Optional)", "Top-level grouping in the Skill Hub (e.g., Productivity)")}
+                  className="flex-1"
+                >
+                  {({ ref, ...field }) => (
+                    <Input {...field} ref={ref} placeholder="Productivity" className="rounded-lg" />
+                  )}
+                </FormField>
+                <FormField
+                  control={form.control}
+                  name="namespace"
+                  label={labelWithHint("Namespace (Optional)", "Sub-grouping within domain (e.g., workflows)")}
+                  className="flex-1"
+                >
+                  {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="workflows" className="rounded-lg" />}
+                </FormField>
+              </div>
 
-            <FormField
-              control={form.control}
-              name="authorName"
-              label={labelWithHint("Author Name (Optional)", "Name of the skill author or organization")}
-            >
-              {({ ref, ...field }) => (
-                <Input {...field} ref={ref} placeholder="Your Name or Organization" className="rounded-lg" />
-              )}
-            </FormField>
+              <FormField
+                control={form.control}
+                name="description"
+                label={labelWithHint("Description (Optional)", "Brief description of what the skill does")}
+              >
+                {({ ref, ...field }) => (
+                  <Textarea
+                    {...field}
+                    ref={ref}
+                    rows={3}
+                    placeholder="A skill that helps with..."
+                    maxLength={500}
+                    className="rounded-lg"
+                  />
+                )}
+              </FormField>
 
-            <FormField
-              control={form.control}
-              name="authorEmail"
-              label={labelWithHint("Author Email (Optional)", "Contact email for the skill author")}
-            >
-              {({ ref, ...field }) => (
-                <Input {...field} ref={ref} type="email" placeholder="author@example.com" className="rounded-lg" />
-              )}
-            </FormField>
-          </FieldGroup>
+              <FormField
+                control={form.control}
+                name="category"
+                label={labelWithHint("Category (Optional)", "Select a category or enter a custom one")}
+              >
+                {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                  <Combobox
+                    items={PREDEFINED_CATEGORIES}
+                    value={value === "" ? null : value}
+                    onValueChange={(category: string | null) => onChange(category ?? "")}
+                  >
+                    <ComboboxInput
+                      id={id}
+                      aria-invalid={ariaInvalid}
+                      aria-describedby={ariaDescribedBy}
+                      placeholder="Select or type a category"
+                      className="w-full rounded-lg"
+                      showClear={value !== ""}
+                    />
+                    <ComboboxContent>
+                      <ComboboxEmpty>No matching categories</ComboboxEmpty>
+                      <ComboboxList>
+                        {(category: string) => (
+                          <ComboboxItem key={category} value={category}>
+                            {category}
+                          </ComboboxItem>
+                        )}
+                      </ComboboxList>
+                    </ComboboxContent>
+                  </Combobox>
+                )}
+              </FormField>
 
-          <div className="mt-6 flex justify-end gap-2">
-            <Button type="button" variant="outline" onClick={handleCancel} disabled={isSubmitting}>
-              Cancel
-            </Button>
-            <Button type="submit" disabled={isSubmitting} aria-busy={isSubmitting}>
-              {isSubmitting && <UiLoadingSpinner className="size-4" />}
-              {isSubmitting ? "Adding..." : "Add Skill"}
-            </Button>
-          </div>
-        </form>
-      </TooltipProvider>
-    </Modal>
+              <FormField
+                control={form.control}
+                name="keywords"
+                label={labelWithHint("Keywords (Optional)", "Comma-separated list of keywords for search")}
+              >
+                {({ ref, ...field }) => (
+                  <Input {...field} ref={ref} placeholder="search, web, api" className="rounded-lg" />
+                )}
+              </FormField>
+
+              <FormField
+                control={form.control}
+                name="version"
+                label={labelWithHint("Version (Optional)", "Semantic version (e.g., 1.0.0)")}
+              >
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="1.0.0" className="rounded-lg" />}
+              </FormField>
+
+              <FormField
+                control={form.control}
+                name="authorName"
+                label={labelWithHint("Author Name (Optional)", "Name of the skill author or organization")}
+              >
+                {({ ref, ...field }) => (
+                  <Input {...field} ref={ref} placeholder="Your Name or Organization" className="rounded-lg" />
+                )}
+              </FormField>
+
+              <FormField
+                control={form.control}
+                name="authorEmail"
+                label={labelWithHint("Author Email (Optional)", "Contact email for the skill author")}
+              >
+                {({ ref, ...field }) => (
+                  <Input {...field} ref={ref} type="email" placeholder="author@example.com" className="rounded-lg" />
+                )}
+              </FormField>
+            </FieldGroup>
+
+            <div className="mt-6 flex justify-end gap-2">
+              <Button type="button" variant="outline" onClick={handleCancel} disabled={isSubmitting}>
+                Cancel
+              </Button>
+              <Button type="submit" disabled={isSubmitting} aria-busy={isSubmitting}>
+                {isSubmitting && <UiLoadingSpinner className="size-4" />}
+                {isSubmitting ? "Adding..." : "Add Skill"}
+              </Button>
+            </div>
+          </form>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx
index c43e5be3b64..6ea940130c2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/tag-management/_components/components/CreateTagModal.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Modal } from "antd";
 import { ChevronRight, CircleHelp } from "lucide-react";
 import React from "react";
 import { z } from "zod/v4";
@@ -15,6 +14,7 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/component
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const labelWithHint = (label: React.ReactNode, hint: string): React.ReactNode => (
   <>
@@ -77,96 +77,101 @@ const CreateTagModal: React.FC<CreateTagModalProps> = ({ visible, onCancel, onSu
   };
 
   return (
-    <Modal title="Create New Tag" open={visible} width={800} footer={null} onCancel={handleCancel}>
-      <form onSubmit={form.handleSubmit(handleFinish)} noValidate>
-        <TooltipProvider>
-          <FieldGroup>
-            <FormField control={form.control} name="tag_name" label="Tag Name">
-              {({ ref, ...field }) => <Input {...field} ref={ref} />}
-            </FormField>
+    <Dialog open={visible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>Create New Tag</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={form.handleSubmit(handleFinish)} noValidate>
+          <TooltipProvider>
+            <FieldGroup>
+              <FormField control={form.control} name="tag_name" label="Tag Name">
+                {({ ref, ...field }) => <Input {...field} ref={ref} />}
+              </FormField>
 
-            <FormField control={form.control} name="description" label="Description">
-              {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
-            </FormField>
+              <FormField control={form.control} name="description" label="Description">
+                {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
+              </FormField>
 
-            <FormField
-              control={form.control}
-              name="allowed_llms"
-              label={labelWithHint(
-                "Allowed Models",
-                "Select which models are allowed to process requests from this tag",
-              )}
+              <FormField
+                control={form.control}
+                name="allowed_llms"
+                label={labelWithHint(
+                  "Allowed Models",
+                  "Select which models are allowed to process requests from this tag",
+                )}
+              >
+                {({ value, onChange }) => (
+                  <MultiSelect
+                    options={modelOptions}
+                    value={value}
+                    onValueChange={onChange}
+                    placeholder="Select Models"
+                  />
+                )}
+              </FormField>
+            </FieldGroup>
+
+            <Collapsible
+              open={budgetSectionOpen}
+              onOpenChange={setBudgetSectionOpen}
+              className="mt-4 mb-4 rounded-md border border-border"
             >
-              {({ value, onChange }) => (
-                <MultiSelect
-                  options={modelOptions}
-                  value={value}
-                  onValueChange={onChange}
-                  placeholder="Select Models"
-                />
-              )}
-            </FormField>
-          </FieldGroup>
-
-          <Collapsible
-            open={budgetSectionOpen}
-            onOpenChange={setBudgetSectionOpen}
-            className="mt-4 mb-4 rounded-md border border-border"
-          >
-            <CollapsibleTrigger className="group flex w-full items-center justify-between px-4 py-3 text-base font-medium text-foreground">
-              Budget & Rate Limits (Optional)
-              <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
-            </CollapsibleTrigger>
-            <CollapsibleContent className="px-4 pb-4">
-              <FieldGroup className="mt-4">
-                <FormField
-                  control={form.control}
-                  name="max_budget"
-                  label={labelWithHint(
-                    "Max Budget (USD)",
-                    "Maximum amount in USD this tag can spend. When reached, requests with this tag will be blocked",
-                  )}
-                >
-                  {({ ref, value, ...field }) => <NumericalInput {...field} value={value ?? ""} step={0.01} />}
-                </FormField>
-
-                <FormField
-                  control={form.control}
-                  name="budget_duration"
-                  label={labelWithHint(
-                    "Reset Budget",
-                    "How often the budget should reset. For example, setting 'daily' will reset the budget every 24 hours",
-                  )}
-                >
-                  {({ id, value, onChange }) => (
-                    <BudgetDurationDropdown id={id} value={value ?? null} onChange={onChange} />
-                  )}
-                </FormField>
-              </FieldGroup>
-
-              <div className="mt-4 rounded-md border border-border bg-muted p-3">
-                <p className="text-sm text-muted-foreground">
-                  TPM/RPM limits for tags are not currently supported. If you need this feature, please{" "}
-                  <a
-                    href="https://github.com/BerriAI/litellm/issues/new"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-blue-600 underline hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300"
+              <CollapsibleTrigger className="group flex w-full items-center justify-between px-4 py-3 text-base font-medium text-foreground">
+                Budget & Rate Limits (Optional)
+                <ChevronRight className="size-4 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
+              </CollapsibleTrigger>
+              <CollapsibleContent className="px-4 pb-4">
+                <FieldGroup className="mt-4">
+                  <FormField
+                    control={form.control}
+                    name="max_budget"
+                    label={labelWithHint(
+                      "Max Budget (USD)",
+                      "Maximum amount in USD this tag can spend. When reached, requests with this tag will be blocked",
+                    )}
                   >
-                    create a GitHub issue
-                  </a>
-                  .
-                </p>
-              </div>
-            </CollapsibleContent>
-          </Collapsible>
+                    {({ ref, value, ...field }) => <NumericalInput {...field} value={value ?? ""} step={0.01} />}
+                  </FormField>
 
-          <div className="mt-2.5 text-right">
-            <Button type="submit">Create Tag</Button>
-          </div>
-        </TooltipProvider>
-      </form>
-    </Modal>
+                  <FormField
+                    control={form.control}
+                    name="budget_duration"
+                    label={labelWithHint(
+                      "Reset Budget",
+                      "How often the budget should reset. For example, setting 'daily' will reset the budget every 24 hours",
+                    )}
+                  >
+                    {({ id, value, onChange }) => (
+                      <BudgetDurationDropdown id={id} value={value ?? null} onChange={onChange} />
+                    )}
+                  </FormField>
+                </FieldGroup>
+
+                <div className="mt-4 rounded-md border border-border bg-muted p-3">
+                  <p className="text-sm text-muted-foreground">
+                    TPM/RPM limits for tags are not currently supported. If you need this feature, please{" "}
+                    <a
+                      href="https://github.com/BerriAI/litellm/issues/new"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-blue-600 underline hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300"
+                    >
+                      create a GitHub issue
+                    </a>
+                    .
+                  </p>
+                </div>
+              </CollapsibleContent>
+            </Collapsible>
+
+            <div className="mt-2.5 text-right">
+              <Button type="submit">Create Tag</Button>
+            </div>
+          </TooltipProvider>
+        </form>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsagePageView.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsagePageView.test.tsx
index a6f46ee8242..118371aa9ac 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsagePageView.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsagePageView.test.tsx
@@ -971,8 +971,8 @@ describe("UsagePage", () => {
         expect(mockUserDailyActivityCall).toHaveBeenCalled();
       });
 
-      // Should still render the data from the paginated fallback
-      expect(screen.getByText("1,500")).toBeInTheDocument();
+      // Should still render the data from the paginated fallback, which lands a render after the call
+      expect(await screen.findByText("1,500")).toBeInTheDocument();
     });
 
     it("should stop showing the previous range's paginated pages while a new range is in flight", async () => {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsageViewSelect/UsageViewSelect.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsageViewSelect/UsageViewSelect.test.tsx
index 3d835c98f52..8848ef9f49e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsageViewSelect/UsageViewSelect.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsageViewSelect/UsageViewSelect.test.tsx
@@ -1,6 +1,7 @@
 import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import { chooseSelectOption } from "@/../tests/test-utils";
 import { UsageViewSelect } from "./UsageViewSelect";
 
 const openMenu = async (user: ReturnType<typeof userEvent.setup>) => {
@@ -35,9 +36,7 @@ describe("UsageViewSelect", () => {
     const user = userEvent.setup();
     render(<UsageViewSelect value="global" onChange={mockOnChange} userRole="Admin" />);
 
-    await openMenu(user);
-    const matches = screen.getAllByText("Team Usage");
-    await user.click(matches[matches.length - 1]);
+    await chooseSelectOption(user, screen.getByRole("combobox"), /^Team Usage/);
 
     expect(mockOnChange).toHaveBeenCalled();
     expect(mockOnChange.mock.calls[0][0]).toBe("team");
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/BulkEditUsers.tsx b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/BulkEditUsers.tsx
index 207cee4bc1b..5e540baaaf9 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/BulkEditUsers.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/BulkEditUsers.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from "react";
-import { Modal, Typography, Divider, Table, Select, InputNumber, Card, Space, Checkbox } from "antd";
+import { Typography, Divider, Table, Select, InputNumber, Card, Space, Checkbox } from "antd";
 import { userBulkUpdateUserCall, teamBulkMemberAddCall, Member } from "@/components/networking";
 import { UserEditView } from "./user_edit_view";
 import { toast } from "@/lib/toast";
 import { MoneyCell } from "@/components/shared/table_cells";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const { Text, Title } = Typography;
 
@@ -200,163 +201,164 @@ const BulkEditUserModal: React.FC<BulkEditUserModalProps> = ({
   };
 
   return (
-    <Modal
-      open={open}
-      onCancel={handleCancel}
-      footer={null}
-      title={updateAllUsers ? "Bulk Edit All Users" : `Bulk Edit ${selectedUsers.length} User(s)`}
-      width={800}
-    >
-      {allowAllUsers && (
-        <div className="mb-4">
-          <Checkbox checked={updateAllUsers} onChange={(e) => setUpdateAllUsers(e.target.checked)}>
-            <Text strong>Update ALL users in the system</Text>
-          </Checkbox>
-          {updateAllUsers && (
-            <div style={{ marginTop: 8 }}>
-              <Text type="warning" style={{ fontSize: "12px" }}>
-                ⚠️ This will apply changes to ALL users in the system, not just the selected ones.
-              </Text>
-            </div>
-          )}
-        </div>
-      )}
-
-      {!updateAllUsers && (
-        <div className="mb-4">
-          <Title level={5}>Selected Users ({selectedUsers.length}):</Title>
-          <Table
-            size="small"
-            bordered
-            dataSource={selectedUsers}
-            pagination={false}
-            scroll={{ y: 200 }}
-            rowKey="user_id"
-            columns={[
-              {
-                title: "User ID",
-                dataIndex: "user_id",
-                key: "user_id",
-                width: "30%",
-                render: (text: string) => (
-                  <Text strong style={{ fontSize: "12px" }}>
-                    {text.length > 20 ? `${text.slice(0, 20)}...` : text}
-                  </Text>
-                ),
-              },
-              {
-                title: "Email",
-                dataIndex: "user_email",
-                key: "user_email",
-                width: "25%",
-                render: (text: string) => (
-                  <Text type="secondary" style={{ fontSize: "12px" }}>
-                    {text || "No email"}
-                  </Text>
-                ),
-              },
-              {
-                title: "Current Role",
-                dataIndex: "user_role",
-                key: "user_role",
-                width: "25%",
-                render: (role: string) => (
-                  <Text style={{ fontSize: "12px" }}>{possibleUIRoles?.[role]?.ui_label || role}</Text>
-                ),
-              },
-              {
-                title: "Budget",
-                dataIndex: "max_budget",
-                key: "max_budget",
-                width: "20%",
-                render: (budget: number | null) => (
-                  <MoneyCell value={budget} decimals={2} emptyText="Unlimited" showZero />
-                ),
-              },
-            ]}
-          />
-        </div>
-      )}
-
-      <Divider />
-
-      <div className="mb-4">
-        <Text>
-          <strong>Instructions:</strong> Fill in the fields below with the values you want to apply to all selected
-          users. You can bulk edit: role, budget, models, and metadata. You can also add users to teams.
-        </Text>
-      </div>
-
-      {/* Team Management Section */}
-      <Card title="Team Management" size="small" className="mb-4" style={{ backgroundColor: "#fafafa" }}>
-        <Space direction="vertical" style={{ width: "100%" }}>
-          <Checkbox checked={addToTeams} onChange={(e) => setAddToTeams(e.target.checked)}>
-            Add selected users to teams
-          </Checkbox>
-
-          {addToTeams && (
-            <>
-              <div>
-                <Text strong>Select Teams:</Text>
-                <Select
-                  mode="multiple"
-                  placeholder="Select teams to add users to"
-                  value={selectedTeams}
-                  onChange={setSelectedTeams}
-                  style={{ width: "100%", marginTop: 8 }}
-                  options={
-                    teams?.map((team) => ({
-                      label: team.team_alias || team.team_id,
-                      value: team.team_id,
-                    })) || []
-                  }
-                />
-              </div>
-
-              <div>
-                <Text strong>Team Budget (Optional):</Text>
-                <InputNumber
-                  placeholder="Max budget per user in team"
-                  value={teamBudget}
-                  onChange={(value) => setTeamBudget(value)}
-                  style={{ width: "100%", marginTop: 8 }}
-                  min={0}
-                  step={0.01}
-                  precision={2}
-                />
-                <Text type="secondary" style={{ fontSize: "12px" }}>
-                  Leave empty for unlimited budget within team limits
+    <Dialog open={open} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>
+            {updateAllUsers ? "Bulk Edit All Users" : `Bulk Edit ${selectedUsers.length} User(s)`}
+          </DialogTitle>
+        </DialogHeader>
+        {allowAllUsers && (
+          <div className="mb-4">
+            <Checkbox checked={updateAllUsers} onChange={(e) => setUpdateAllUsers(e.target.checked)}>
+              <Text strong>Update ALL users in the system</Text>
+            </Checkbox>
+            {updateAllUsers && (
+              <div style={{ marginTop: 8 }}>
+                <Text type="warning" style={{ fontSize: "12px" }}>
+                  ⚠️ This will apply changes to ALL users in the system, not just the selected ones.
                 </Text>
               </div>
+            )}
+          </div>
+        )}
 
-              <Text type="secondary" style={{ fontSize: "12px" }}>
-                Users will be added with &quot;user&quot; role by default. All users will be added to each selected
-                team.
-              </Text>
-            </>
-          )}
-        </Space>
-      </Card>
+        {!updateAllUsers && (
+          <div className="mb-4">
+            <Title level={5}>Selected Users ({selectedUsers.length}):</Title>
+            <Table
+              size="small"
+              bordered
+              dataSource={selectedUsers}
+              pagination={false}
+              scroll={{ y: 200 }}
+              rowKey="user_id"
+              columns={[
+                {
+                  title: "User ID",
+                  dataIndex: "user_id",
+                  key: "user_id",
+                  width: "30%",
+                  render: (text: string) => (
+                    <Text strong style={{ fontSize: "12px" }}>
+                      {text.length > 20 ? `${text.slice(0, 20)}...` : text}
+                    </Text>
+                  ),
+                },
+                {
+                  title: "Email",
+                  dataIndex: "user_email",
+                  key: "user_email",
+                  width: "25%",
+                  render: (text: string) => (
+                    <Text type="secondary" style={{ fontSize: "12px" }}>
+                      {text || "No email"}
+                    </Text>
+                  ),
+                },
+                {
+                  title: "Current Role",
+                  dataIndex: "user_role",
+                  key: "user_role",
+                  width: "25%",
+                  render: (role: string) => (
+                    <Text style={{ fontSize: "12px" }}>{possibleUIRoles?.[role]?.ui_label || role}</Text>
+                  ),
+                },
+                {
+                  title: "Budget",
+                  dataIndex: "max_budget",
+                  key: "max_budget",
+                  width: "20%",
+                  render: (budget: number | null) => (
+                    <MoneyCell value={budget} decimals={2} emptyText="Unlimited" showZero />
+                  ),
+                },
+              ]}
+            />
+          </div>
+        )}
 
-      <UserEditView
-        userData={mockUserData}
-        onCancel={handleCancel}
-        onSubmit={handleSubmit}
-        teams={teams}
-        accessToken={accessToken}
-        userID="bulk_edit"
-        userRole={userRole}
-        userModels={userModels}
-        possibleUIRoles={possibleUIRoles}
-        isBulkEdit={true}
-      />
+        <Divider />
 
-      {loading && (
-        <div style={{ textAlign: "center", marginTop: "10px" }}>
-          <Text>Updating {updateAllUsers ? "all users" : selectedUsers.length} user(s)...</Text>
+        <div className="mb-4">
+          <Text>
+            <strong>Instructions:</strong> Fill in the fields below with the values you want to apply to all selected
+            users. You can bulk edit: role, budget, models, and metadata. You can also add users to teams.
+          </Text>
         </div>
-      )}
-    </Modal>
+
+        {/* Team Management Section */}
+        <Card title="Team Management" size="small" className="mb-4" style={{ backgroundColor: "#fafafa" }}>
+          <Space direction="vertical" style={{ width: "100%" }}>
+            <Checkbox checked={addToTeams} onChange={(e) => setAddToTeams(e.target.checked)}>
+              Add selected users to teams
+            </Checkbox>
+
+            {addToTeams && (
+              <>
+                <div>
+                  <Text strong>Select Teams:</Text>
+                  <Select
+                    mode="multiple"
+                    placeholder="Select teams to add users to"
+                    value={selectedTeams}
+                    onChange={setSelectedTeams}
+                    style={{ width: "100%", marginTop: 8 }}
+                    options={
+                      teams?.map((team) => ({
+                        label: team.team_alias || team.team_id,
+                        value: team.team_id,
+                      })) || []
+                    }
+                  />
+                </div>
+
+                <div>
+                  <Text strong>Team Budget (Optional):</Text>
+                  <InputNumber
+                    placeholder="Max budget per user in team"
+                    value={teamBudget}
+                    onChange={(value) => setTeamBudget(value)}
+                    style={{ width: "100%", marginTop: 8 }}
+                    min={0}
+                    step={0.01}
+                    precision={2}
+                  />
+                  <Text type="secondary" style={{ fontSize: "12px" }}>
+                    Leave empty for unlimited budget within team limits
+                  </Text>
+                </div>
+
+                <Text type="secondary" style={{ fontSize: "12px" }}>
+                  Users will be added with &quot;user&quot; role by default. All users will be added to each selected
+                  team.
+                </Text>
+              </>
+            )}
+          </Space>
+        </Card>
+
+        <UserEditView
+          userData={mockUserData}
+          onCancel={handleCancel}
+          onSubmit={handleSubmit}
+          teams={teams}
+          accessToken={accessToken}
+          userID="bulk_edit"
+          userRole={userRole}
+          userModels={userModels}
+          possibleUIRoles={possibleUIRoles}
+          isBulkEdit={true}
+        />
+
+        {loading && (
+          <div style={{ textAlign: "center", marginTop: "10px" }}>
+            <Text>Updating {updateAllUsers ? "all users" : selectedUsers.length} user(s)...</Text>
+          </div>
+        )}
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.test.tsx
index f1a7f5e42d0..d06267ffed6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.test.tsx
@@ -231,10 +231,25 @@ describe("UserEditView", () => {
     renderWithProviders(<UserEditView {...defaultProps} />);
 
     await waitFor(() => {
-      expect(screen.getByLabelText("Unlimited Budget")).toBeInTheDocument();
+      expect(screen.getByRole("checkbox", { name: "Unlimited Budget" })).toBeInTheDocument();
     });
   });
 
+  it("should check unlimited budget when clicking its visible text", async () => {
+    renderWithProviders(<UserEditView {...defaultProps} />);
+
+    await waitFor(() => {
+      expect(screen.getByRole("spinbutton", { name: /max budget/i })).toBeEnabled();
+    });
+
+    await userEvent.click(screen.getByText("Unlimited Budget"));
+
+    await waitFor(() => {
+      expect(screen.getByRole("checkbox", { name: "Unlimited Budget" })).toBeChecked();
+    });
+    expect(screen.getByRole("spinbutton", { name: /max budget/i })).toBeDisabled();
+  });
+
   it("should set unlimited budget checkbox when max_budget is null", async () => {
     const userDataWithNullBudget = {
       ...MOCK_USER_DATA,
@@ -247,7 +262,7 @@ describe("UserEditView", () => {
     renderWithProviders(<UserEditView {...defaultProps} userData={userDataWithNullBudget} />);
 
     await waitFor(() => {
-      const checkbox = screen.getByLabelText("Unlimited Budget");
+      const checkbox = screen.getByRole("checkbox", { name: "Unlimited Budget" });
       expect(checkbox).toBeChecked();
     });
   });
@@ -282,10 +297,10 @@ describe("UserEditView", () => {
     renderWithProviders(<UserEditView {...defaultProps} />);
 
     await waitFor(() => {
-      expect(screen.getByLabelText("Unlimited Budget")).toBeInTheDocument();
+      expect(screen.getByRole("checkbox", { name: "Unlimited Budget" })).toBeInTheDocument();
     });
 
-    const checkbox = screen.getByLabelText("Unlimited Budget");
+    const checkbox = screen.getByRole("checkbox", { name: "Unlimited Budget" });
     await userEvent.click(checkbox);
 
     await waitFor(() => {
@@ -400,7 +415,7 @@ describe("UserEditView", () => {
     const budgetInput = screen.getByRole("spinbutton", { name: /max budget/i });
     await userEvent.clear(budgetInput);
 
-    const checkbox = screen.getByLabelText("Unlimited Budget");
+    const checkbox = screen.getByRole("checkbox", { name: "Unlimited Budget" });
     expect(checkbox).not.toBeChecked();
 
     const submitButton = screen.getByRole("button", { name: /save changes/i });
@@ -416,10 +431,10 @@ describe("UserEditView", () => {
     renderWithProviders(<UserEditView {...defaultProps} onSubmit={onSubmitMock} />);
 
     await waitFor(() => {
-      expect(screen.getByLabelText("Unlimited Budget")).toBeInTheDocument();
+      expect(screen.getByRole("checkbox", { name: "Unlimited Budget" })).toBeInTheDocument();
     });
 
-    const checkbox = screen.getByLabelText("Unlimited Budget");
+    const checkbox = screen.getByRole("checkbox", { name: "Unlimited Budget" });
     await userEvent.click(checkbox);
 
     await waitFor(() => {
@@ -494,7 +509,7 @@ describe("UserEditView", () => {
     renderWithProviders(<UserEditView {...defaultProps} userData={userDataWithUndefinedBudget} />);
 
     await waitFor(() => {
-      const checkbox = screen.getByLabelText("Unlimited Budget");
+      const checkbox = screen.getByRole("checkbox", { name: "Unlimited Budget" });
       expect(checkbox).toBeChecked();
     });
   });
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.tsx b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.tsx
index 0aebdf69575..5612f5cd5f6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/users/_components/user_edit_view.tsx
@@ -256,14 +256,10 @@ export function UserEditView({
             label={
               <>
                 Max Budget (USD)
-                <span className="ml-3 inline-flex items-center gap-2 font-normal">
-                  <Checkbox
-                    aria-label="Unlimited Budget"
-                    checked={unlimitedBudget}
-                    onCheckedChange={handleUnlimitedBudgetChange}
-                  />
+                <label className="ml-3 inline-flex items-center gap-2 font-normal">
+                  <Checkbox checked={unlimitedBudget} onCheckedChange={handleUnlimitedBudgetChange} />
                   Unlimited Budget
-                </span>
+                </label>
               </>
             }
           >
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 9fb4dad67e4..3db7e010a71 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
@@ -18,7 +18,6 @@ import {
   Member,
 } from "@/components/networking";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Modal } from "antd";
 import { Field, FieldGroup, FieldLabel } from "@/components/shared/form/field";
 import {
   Combobox,
@@ -43,6 +42,7 @@ import MCPServerPermissions from "@/components/permissions/MCPServerPermissions"
 import { useMCPServers } from "@/app/(dashboard)/hooks/mcpServers/useMCPServers";
 import { useMCPToolsets } from "@/app/(dashboard)/hooks/mcpServers/useMCPToolsets";
 import { extractMcpEntitlement } from "@/components/mcp_server_management/mcpEntitlement";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface UserInfoViewProps {
   userId: string;
@@ -703,71 +703,73 @@ export default function UserInfoView({
       />
 
       {/* Add to Team Modal */}
-      <Modal
-        title="Add User to Team"
+      <Dialog
         open={isAddTeamModalOpen}
-        onCancel={() => setIsAddTeamModalOpen(false)}
-        footer={null}
-        width={500}
-        maskClosable={!isAddingTeam}
+        onOpenChange={(open) => !open && setIsAddTeamModalOpen(false)}
+        disablePointerDismissal={isAddingTeam}
       >
-        <form
-          onSubmit={(event) => {
-            event.preventDefault();
-            handleAddTeamSubmit();
-          }}
-        >
-          <FieldGroup>
-            <Field>
-              <FieldLabel htmlFor={ADD_TEAM_FIELD_ID}>Team</FieldLabel>
-              <Combobox
-                items={availableTeamsForAdd}
-                value={selectedTeamOption}
-                onValueChange={(team: TeamOption | null) => setSelectedTeamId(team?.team_id ?? "")}
-                itemToStringLabel={(team: TeamOption) => team.team_alias}
-                isItemEqualToValue={(team: TeamOption, value: TeamOption) => team.team_id === value.team_id}
-              >
-                <ComboboxInput id={ADD_TEAM_FIELD_ID} placeholder="Select a team" className="w-full" />
-                <ComboboxContent>
-                  <ComboboxEmpty>No teams found</ComboboxEmpty>
-                  <ComboboxList>
-                    {(team: TeamOption) => (
-                      <ComboboxItem key={team.team_id} value={team} title={team.team_alias}>
-                        {team.team_alias}
-                      </ComboboxItem>
-                    )}
-                  </ComboboxList>
-                </ComboboxContent>
-              </Combobox>
-            </Field>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[500px]">
+          <DialogHeader>
+            <DialogTitle>Add User to Team</DialogTitle>
+          </DialogHeader>
+          <form
+            onSubmit={(event) => {
+              event.preventDefault();
+              handleAddTeamSubmit();
+            }}
+          >
+            <FieldGroup>
+              <Field>
+                <FieldLabel htmlFor={ADD_TEAM_FIELD_ID}>Team</FieldLabel>
+                <Combobox
+                  items={availableTeamsForAdd}
+                  value={selectedTeamOption}
+                  onValueChange={(team: TeamOption | null) => setSelectedTeamId(team?.team_id ?? "")}
+                  itemToStringLabel={(team: TeamOption) => team.team_alias}
+                  isItemEqualToValue={(team: TeamOption, value: TeamOption) => team.team_id === value.team_id}
+                >
+                  <ComboboxInput id={ADD_TEAM_FIELD_ID} placeholder="Select a team" className="w-full" />
+                  <ComboboxContent>
+                    <ComboboxEmpty>No teams found</ComboboxEmpty>
+                    <ComboboxList>
+                      {(team: TeamOption) => (
+                        <ComboboxItem key={team.team_id} value={team} title={team.team_alias}>
+                          {team.team_alias}
+                        </ComboboxItem>
+                      )}
+                    </ComboboxList>
+                  </ComboboxContent>
+                </Combobox>
+              </Field>
 
-            <Field>
-              <FieldLabel htmlFor={ADD_TEAM_ROLE_FIELD_ID}>Member Role</FieldLabel>
-              <Select value={selectedRole} onValueChange={(value) => value !== null && setSelectedRole(value)}>
-                <SelectTrigger id={ADD_TEAM_ROLE_FIELD_ID} className="w-full">
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent>
-                  {MEMBER_ROLE_OPTIONS.map((option) => (
-                    <SelectItem key={option.value} value={option.value} title={option.value}>
-                      <SimpleTooltip content={option.hint}>
-                        <span className="font-medium">{option.value}</span>
-                        <span className="ml-2 text-muted-foreground text-sm">- {option.hint}</span>
-                      </SimpleTooltip>
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </Field>
-          </FieldGroup>
+              <Field>
+                <FieldLabel htmlFor={ADD_TEAM_ROLE_FIELD_ID}>Member Role</FieldLabel>
+                <Select value={selectedRole} onValueChange={(value) => value !== null && setSelectedRole(value)}>
+                  <SelectTrigger id={ADD_TEAM_ROLE_FIELD_ID} className="w-full">
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {MEMBER_ROLE_OPTIONS.map((option) => (
+                      <SelectItem key={option.value} value={option.value} title={option.value}>
+                        <SimpleTooltip content={option.hint}>
+                          <span className="font-medium">{option.value}</span>
+                          <span className="ml-2 text-muted-foreground text-sm">- {option.hint}</span>
+                        </SimpleTooltip>
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </Field>
+            </FieldGroup>
 
-          <div className="text-right mt-4">
-            <Button type="submit" disabled={isAddingTeam || !selectedTeamId} aria-busy={isAddingTeam}>
-              {isAddingTeam ? "Adding..." : "Add to Team"}
-            </Button>
-          </div>
-        </form>
-      </Modal>
+            <div className="text-right mt-4">
+              <Button type="submit" disabled={isAddingTeam || !selectedTeamId} aria-busy={isAddingTeam}>
+                {isAddingTeam ? "Adding..." : "Add to Team"}
+              </Button>
+            </div>
+          </form>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx
index 93aaa90ef7c..eae4a3fd799 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/CreateVectorStore.tsx
@@ -1,9 +1,8 @@
-import React, { useState } from "react";
-import { Upload, Alert } from "antd";
+import React, { useId, useState } from "react";
 import { toast } from "@/lib/toast";
-import { InboxOutlined } from "@ant-design/icons";
-import type { UploadProps } from "antd";
-import { CircleHelp } from "lucide-react";
+import { CircleCheck, CircleHelp, Inbox, X } from "lucide-react";
+import { v4 as uuidv4 } from "uuid";
+import { Alert, AlertAction, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { ragIngestCall } from "@/components/networking";
 import { DocumentUpload, RAGIngestResponse } from "@/components/vector_store_management/types";
 import DocumentsTable from "./DocumentsTable";
@@ -25,7 +24,17 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import S3VectorsConfig from "./S3VectorsConfig";
 
-const { Dragger } = Upload;
+const ACCEPTED_DOCUMENT_EXTENSIONS = ".pdf,.txt,.docx,.md,.doc";
+
+const ACCEPTED_DOCUMENT_TYPES = [
+  "application/pdf",
+  "text/plain",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  "application/msword",
+  "text/markdown",
+];
+
+const MAX_DOCUMENT_BYTES = 50 * 1024 * 1024;
 
 const RAG_INGEST_UNSUPPORTED_PROVIDERS = new Set(["valkey"]);
 
@@ -38,6 +47,36 @@ const providerItems = Object.entries(VectorStoreProviders)
 
 const asText = (value: unknown): string => (typeof value === "string" ? value : "");
 
+const IngestSuccessAlert: React.FC<{ ingestResults: RAGIngestResponse[] }> = ({ ingestResults }) => {
+  const [dismissed, setDismissed] = useState(false);
+
+  if (dismissed) {
+    return null;
+  }
+
+  return (
+    <Alert variant="success">
+      <CircleCheck />
+      <AlertTitle>Vector Store Created Successfully</AlertTitle>
+      <AlertDescription>
+        <div>
+          <p>
+            <strong>Vector Store ID:</strong> {ingestResults[0]?.vector_store_id}
+          </p>
+          <p>
+            <strong>Documents Ingested:</strong> {ingestResults.length}
+          </p>
+        </div>
+      </AlertDescription>
+      <AlertAction>
+        <Button variant="ghost" size="icon-sm" aria-label="Close" onClick={() => setDismissed(true)}>
+          <X className="size-4" />
+        </Button>
+      </AlertAction>
+    </Alert>
+  );
+};
+
 const labelWithHint = (label: string, hint: string): React.ReactNode => (
   <>
     {label}
@@ -61,53 +100,33 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
   const [vectorStoreDescription, setVectorStoreDescription] = useState<string>("");
   const [ingestResults, setIngestResults] = useState<RAGIngestResponse[]>([]);
   const [providerParams, setProviderParams] = useState<Record<string, unknown>>({});
+  const documentsInputId = useId();
 
-  const uploadProps: UploadProps = {
-    name: "file",
-    multiple: true,
-    accept: ".pdf,.txt,.docx,.md,.doc",
-    beforeUpload: (file) => {
-      const isValidType = [
-        "application/pdf",
-        "text/plain",
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-        "application/msword",
-        "text/markdown",
-      ].includes(file.type);
+  const isSupportedDocument = (file: File): boolean => {
+    if (!ACCEPTED_DOCUMENT_TYPES.includes(file.type)) {
+      toast.error(`${file.name} is not a supported file type. Please upload PDF, TXT, DOCX, or MD files.`);
+      return false;
+    }
+    if (file.size >= MAX_DOCUMENT_BYTES) {
+      toast.error(`${file.name} must be smaller than 50MB!`);
+      return false;
+    }
+    return true;
+  };
 
-      if (!isValidType) {
-        toast.error(`${file.name} is not a supported file type. Please upload PDF, TXT, DOCX, or MD files.`);
-        return Upload.LIST_IGNORE;
-      }
+  const handleAddDocuments = (files: readonly File[]) => {
+    const accepted: DocumentUpload[] = files.filter(isSupportedDocument).map((file) => ({
+      uid: uuidv4(),
+      name: file.name,
+      status: "done",
+      size: file.size,
+      type: file.type,
+      originFileObj: file,
+    }));
 
-      const isLt50M = file.size / 1024 / 1024 < 50;
-      if (!isLt50M) {
-        toast.error(`${file.name} must be smaller than 50MB!`);
-        return Upload.LIST_IGNORE;
-      }
-
-      const newDoc: DocumentUpload = {
-        uid: file.uid,
-        name: file.name,
-        status: "done",
-        size: file.size,
-        type: file.type,
-        originFileObj: file,
-      };
-
-      setDocuments((prev) => [...prev, newDoc]);
-      return false; // Prevent auto upload
-    },
-    onRemove: (file) => {
-      setDocuments((prev) => prev.filter((doc) => doc.uid !== file.uid));
-    },
-    fileList: documents.map((doc) => ({
-      uid: doc.uid,
-      name: doc.name,
-      status: doc.status,
-      size: doc.size,
-    })),
-    showUploadList: false, // We'll use our custom table
+    if (accepted.length > 0) {
+      setDocuments((prev) => [...prev, ...accepted]);
+    }
   };
 
   const handleRemoveDocument = (uid: string) => {
@@ -234,15 +253,32 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
                 Upload one or more documents (PDF, TXT, DOCX, MD). Maximum file size: 50MB per file.
               </p>
             </div>
-            <Dragger {...uploadProps}>
-              <p className="ant-upload-drag-icon">
-                <InboxOutlined style={{ fontSize: "48px", color: "#1890ff" }} />
-              </p>
-              <p className="ant-upload-text">Click or drag files to this area to upload</p>
-              <p className="ant-upload-hint">
+            <label
+              htmlFor={documentsInputId}
+              className="flex cursor-pointer flex-col items-center gap-2 rounded-md border border-dashed border-input bg-muted/30 px-6 py-10 text-center transition-colors hover:border-primary hover:bg-muted/50 focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/50"
+              onDragOver={(event) => event.preventDefault()}
+              onDrop={(event) => {
+                event.preventDefault();
+                handleAddDocuments(Array.from(event.dataTransfer.files));
+              }}
+            >
+              <Inbox className="size-12 text-primary" />
+              <span className="text-base">Click or drag files to this area to upload</span>
+              <span className="text-sm text-muted-foreground">
                 Support for single or bulk upload. Supported formats: PDF, TXT, DOCX, MD
-              </p>
-            </Dragger>
+              </span>
+              <input
+                id={documentsInputId}
+                type="file"
+                multiple
+                accept={ACCEPTED_DOCUMENT_EXTENSIONS}
+                className="sr-only"
+                onChange={(event) => {
+                  handleAddDocuments(Array.from(event.target.files ?? []));
+                  event.target.value = "";
+                }}
+              />
+            </label>
           </CardContent>
         </Card>
 
@@ -358,24 +394,7 @@ const CreateVectorStore: React.FC<CreateVectorStoreProps> = ({ accessToken, onSu
         </Card>
 
         {/* Success Message */}
-        {ingestResults.length > 0 && (
-          <Alert
-            message="Vector Store Created Successfully"
-            description={
-              <div>
-                <p>
-                  <strong>Vector Store ID:</strong> {ingestResults[0]?.vector_store_id}
-                </p>
-                <p>
-                  <strong>Documents Ingested:</strong> {ingestResults.length}
-                </p>
-              </div>
-            }
-            type="success"
-            showIcon
-            closable
-          />
-        )}
+        {ingestResults.length > 0 && <IngestSuccessAlert ingestResults={ingestResults} />}
       </div>
     </TooltipProvider>
   );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx
index 3e286ee9b92..7243291d740 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/S3VectorsConfig.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
-import { Alert } from "antd";
-import { CircleHelp } from "lucide-react";
+import { CircleHelp, Info } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
 import { Field, FieldError, FieldLabel } from "@/components/shared/form/field";
 import {
@@ -72,9 +72,10 @@ const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, provider
 
   return (
     <TooltipProvider>
-      <Alert
-        message="AWS S3 Vectors Setup"
-        description={
+      <Alert variant="info" className="mb-4">
+        <Info />
+        <AlertTitle>AWS S3 Vectors Setup</AlertTitle>
+        <AlertDescription>
           <div>
             <p>AWS S3 Vectors allows you to store and query vector embeddings directly in S3:</p>
             <ul style={{ marginLeft: "16px", marginTop: "8px" }}>
@@ -93,11 +94,8 @@ const S3VectorsConfig: React.FC<S3VectorsConfigProps> = ({ accessToken, provider
               </li>
             </ul>
           </div>
-        }
-        type="info"
-        showIcon
-        style={{ marginBottom: "16px" }}
-      />
+        </AlertDescription>
+      </Alert>
 
       <Field data-invalid={bucketNameError !== undefined || undefined}>
         <FieldLabel htmlFor="s3-vector-bucket-name">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx
index 05c829d79df..0c7d8cebb4b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/vector-stores/_components/VectorStoreForm.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
-import { Modal, Alert } from "antd";
-import { CircleHelp, Eye, EyeOff } from "lucide-react";
+import { CircleHelp, Eye, EyeOff, Info } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { useWatch } from "react-hook-form";
 import { z } from "zod/v4";
 import { CredentialItem, vectorStoreCreateCall } from "@/components/networking";
@@ -26,6 +26,7 @@ import {
   ComboboxItem,
   ComboboxList,
 } from "@/components/ui/combobox";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
@@ -264,56 +265,60 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
           : "Enter vector store ID from your provider";
 
   return (
-    <Modal title="Add New Vector Store" open={isVisible} width={1000} footer={null} onCancel={handleCancel}>
-      <TooltipProvider>
-        <form onSubmit={form.handleSubmit(handleCreate)}>
-          <FieldGroup>
-            <FormField
-              control={form.control}
-              name="custom_llm_provider"
-              label={labelWithHint("Provider", "Select the provider for this vector store")}
-            >
-              {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                <Select value={value} onValueChange={makeProviderChangeHandler(onChange)}>
-                  <SelectTrigger
-                    id={id}
-                    aria-invalid={ariaInvalid}
-                    aria-describedby={ariaDescribedBy}
-                    className="w-full"
-                  >
-                    <SelectValue>
-                      {(provider: string) => {
-                        const { displayName, logo } = getVectorStoreProviderLogoAndName(provider);
-                        return (
-                          <>
-                            <Logo src={logo} label={displayName} className="w-5 h-5" />
-                            <span>{displayName}</span>
-                          </>
-                        );
-                      }}
-                    </SelectValue>
-                  </SelectTrigger>
-                  <SelectContent alignItemWithTrigger={false}>
-                    {Object.entries(VectorStoreProviders).map(([providerEnum, providerDisplayName]) => (
-                      <SelectItem key={providerEnum} value={vectorStoreProviderMap[providerEnum]}>
-                        <Logo
-                          src={vectorStoreProviderLogoMap[providerDisplayName]}
-                          label={providerDisplayName}
-                          className="w-5 h-5"
-                        />
-                        <span>{providerDisplayName}</span>
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              )}
-            </FormField>
+    <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[1000px]">
+        <DialogHeader>
+          <DialogTitle>Add New Vector Store</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={form.handleSubmit(handleCreate)}>
+            <FieldGroup>
+              <FormField
+                control={form.control}
+                name="custom_llm_provider"
+                label={labelWithHint("Provider", "Select the provider for this vector store")}
+              >
+                {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                  <Select value={value} onValueChange={makeProviderChangeHandler(onChange)}>
+                    <SelectTrigger
+                      id={id}
+                      aria-invalid={ariaInvalid}
+                      aria-describedby={ariaDescribedBy}
+                      className="w-full"
+                    >
+                      <SelectValue>
+                        {(provider: string) => {
+                          const { displayName, logo } = getVectorStoreProviderLogoAndName(provider);
+                          return (
+                            <>
+                              <Logo src={logo} label={displayName} className="w-5 h-5" />
+                              <span>{displayName}</span>
+                            </>
+                          );
+                        }}
+                      </SelectValue>
+                    </SelectTrigger>
+                    <SelectContent alignItemWithTrigger={false}>
+                      {Object.entries(VectorStoreProviders).map(([providerEnum, providerDisplayName]) => (
+                        <SelectItem key={providerEnum} value={vectorStoreProviderMap[providerEnum]}>
+                          <Logo
+                            src={vectorStoreProviderLogoMap[providerDisplayName]}
+                            label={providerDisplayName}
+                            className="w-5 h-5"
+                          />
+                          <span>{providerDisplayName}</span>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                )}
+              </FormField>
 
-            {selectedProvider === "pg_vector" && (
-              <Alert
-                message="PG Vector Setup Required"
-                description={
-                  <div>
+              {selectedProvider === "pg_vector" && (
+                <Alert variant="info">
+                  <Info />
+                  <AlertTitle>PG Vector Setup Required</AlertTitle>
+                  <AlertDescription>
                     <p>LiteLLM provides a server to connect to PG Vector. To use this provider:</p>
                     <ol style={{ marginLeft: "16px", marginTop: "8px", listStyleType: "decimal" }}>
                       <li>
@@ -326,18 +331,15 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
                       <li>Start the server and note the API base URL and API key</li>
                       <li>Enter those details in the fields below</li>
                     </ol>
-                  </div>
-                }
-                type="info"
-                showIcon
-              />
-            )}
+                  </AlertDescription>
+                </Alert>
+              )}
 
-            {selectedProvider === "valkey" && (
-              <Alert
-                message="Valkey Setup Required"
-                description={
-                  <div>
+              {selectedProvider === "valkey" && (
+                <Alert variant="info">
+                  <Info />
+                  <AlertTitle>Valkey Setup Required</AlertTitle>
+                  <AlertDescription>
                     <p>
                       LiteLLM searches documents you have already stored in Valkey. It does not create the index or
                       upload documents for you. Before creating this vector store, make sure:
@@ -364,18 +366,15 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
                       When a query comes in, LiteLLM converts it to an embedding with the model below and returns the
                       closest matching documents from your index.
                     </p>
-                  </div>
-                }
-                type="info"
-                showIcon
-              />
-            )}
+                  </AlertDescription>
+                </Alert>
+              )}
 
-            {selectedProvider === "vertex_rag_engine" && (
-              <Alert
-                message="Vertex AI RAG Engine Setup"
-                description={
-                  <div>
+              {selectedProvider === "vertex_rag_engine" && (
+                <Alert variant="info">
+                  <Info />
+                  <AlertTitle>Vertex AI RAG Engine Setup</AlertTitle>
+                  <AlertDescription>
                     <p>To use Vertex AI RAG Engine:</p>
                     <p style={{ marginTop: "4px", fontStyle: "italic" }}>
                       Note: Google Cloud has renamed this to &quot;RAG Engine&quot; in its console — the steps below
@@ -399,18 +398,15 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
                       </li>
                       <li>Enter the corpus ID in the Vector Store ID field below</li>
                     </ol>
-                  </div>
-                }
-                type="info"
-                showIcon
-              />
-            )}
+                  </AlertDescription>
+                </Alert>
+              )}
 
-            {selectedProvider === "vertex_ai/search_api" && (
-              <Alert
-                message="Vertex AI Search Setup"
-                description={
-                  <div>
+              {selectedProvider === "vertex_ai/search_api" && (
+                <Alert variant="info">
+                  <Info />
+                  <AlertTitle>Vertex AI Search Setup</AlertTitle>
+                  <AlertDescription>
                     <p>To use Vertex AI Search (Discovery Engine):</p>
                     <p style={{ marginTop: "4px", fontStyle: "italic" }}>
                       Note: Google Cloud has renamed this to &quot;Agent Search&quot; in its console — the steps below
@@ -441,104 +437,102 @@ const VectorStoreForm: React.FC<VectorStoreFormProps> = ({
                         record, but it isn&apos;t used in the GCP URL when Engine ID is set.
                       </li>
                     </ol>
-                  </div>
-                }
-                type="info"
-                showIcon
-              />
-            )}
-
-            <FormField
-              control={form.control}
-              name="vector_store_id"
-              label={labelWithHint("Vector Store ID", "Enter the vector store ID from your api provider")}
-            >
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder={vectorStoreIdPlaceholder} />}
-            </FormField>
-
-            {getProviderSpecificFields(selectedProvider)
-              .filter(isSupportedProviderField)
-              .map((field) => (
-                <ProviderField key={field.name} field={field} control={form.control} modelInfo={modelInfo} />
-              ))}
-
-            <FormField
-              control={form.control}
-              name="vector_store_name"
-              label={labelWithHint(
-                "Vector Store Name",
-                "Custom name you want to give to the vector store, this name will be rendered on the LiteLLM UI",
+                  </AlertDescription>
+                </Alert>
               )}
-            >
-              {({ ref, value, ...field }) => <Input {...field} ref={ref} value={value ?? ""} />}
-            </FormField>
 
-            <FormField control={form.control} name="vector_store_description" label="Description">
-              {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
-            </FormField>
+              <FormField
+                control={form.control}
+                name="vector_store_id"
+                label={labelWithHint("Vector Store ID", "Enter the vector store ID from your api provider")}
+              >
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder={vectorStoreIdPlaceholder} />}
+              </FormField>
 
-            <FormField
-              control={form.control}
-              name="litellm_credential_name"
-              label={labelWithHint(
-                "Existing Credentials",
-                "Optionally select API provider credentials for this vector store eg. Bedrock API KEY",
-              )}
-            >
-              {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-                <Combobox
-                  items={credentialOptions}
-                  value={credentialOptions.find((option) => option.value === value) ?? null}
-                  onValueChange={(option: CredentialOption | null) => onChange(option ? option.value : undefined)}
-                  itemToStringLabel={(option: CredentialOption) => option.label}
-                  isItemEqualToValue={(option: CredentialOption, selected: CredentialOption) =>
-                    option.value === selected.value
-                  }
-                >
-                  <ComboboxInput
-                    id={id}
-                    aria-invalid={ariaInvalid}
-                    aria-describedby={ariaDescribedBy}
-                    placeholder="Select or search for existing credentials"
-                    className="w-full"
-                    showClear={value !== undefined}
-                  />
-                  <ComboboxContent>
-                    <ComboboxEmpty>No matching credentials</ComboboxEmpty>
-                    <ComboboxList>
-                      {(option: CredentialOption) => (
-                        <ComboboxItem key={option.label} value={option}>
-                          {option.label}
-                        </ComboboxItem>
-                      )}
-                    </ComboboxList>
-                  </ComboboxContent>
-                </Combobox>
-              )}
-            </FormField>
+              {getProviderSpecificFields(selectedProvider)
+                .filter(isSupportedProviderField)
+                .map((field) => (
+                  <ProviderField key={field.name} field={field} control={form.control} modelInfo={modelInfo} />
+                ))}
 
-            <div role="group" className="flex w-full flex-col gap-3">
-              <span className="flex w-fit gap-2 text-sm leading-snug font-medium">
-                {labelWithHint("Metadata", "JSON metadata for the vector store (optional)")}
-              </span>
-              <Textarea
-                rows={4}
-                value={metadataJson}
-                onChange={(event) => setMetadataJson(event.target.value)}
-                placeholder='{"key": "value"}'
-              />
+              <FormField
+                control={form.control}
+                name="vector_store_name"
+                label={labelWithHint(
+                  "Vector Store Name",
+                  "Custom name you want to give to the vector store, this name will be rendered on the LiteLLM UI",
+                )}
+              >
+                {({ ref, value, ...field }) => <Input {...field} ref={ref} value={value ?? ""} />}
+              </FormField>
+
+              <FormField control={form.control} name="vector_store_description" label="Description">
+                {({ ref, value, ...field }) => <Textarea {...field} ref={ref} value={value ?? ""} rows={4} />}
+              </FormField>
+
+              <FormField
+                control={form.control}
+                name="litellm_credential_name"
+                label={labelWithHint(
+                  "Existing Credentials",
+                  "Optionally select API provider credentials for this vector store eg. Bedrock API KEY",
+                )}
+              >
+                {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                  <Combobox
+                    items={credentialOptions}
+                    value={credentialOptions.find((option) => option.value === value) ?? null}
+                    onValueChange={(option: CredentialOption | null) => onChange(option ? option.value : undefined)}
+                    itemToStringLabel={(option: CredentialOption) => option.label}
+                    isItemEqualToValue={(option: CredentialOption, selected: CredentialOption) =>
+                      option.value === selected.value
+                    }
+                  >
+                    <ComboboxInput
+                      id={id}
+                      aria-invalid={ariaInvalid}
+                      aria-describedby={ariaDescribedBy}
+                      placeholder="Select or search for existing credentials"
+                      className="w-full"
+                      showClear={value !== undefined}
+                    />
+                    <ComboboxContent>
+                      <ComboboxEmpty>No matching credentials</ComboboxEmpty>
+                      <ComboboxList>
+                        {(option: CredentialOption) => (
+                          <ComboboxItem key={option.label} value={option}>
+                            {option.label}
+                          </ComboboxItem>
+                        )}
+                      </ComboboxList>
+                    </ComboboxContent>
+                  </Combobox>
+                )}
+              </FormField>
+
+              <div role="group" className="flex w-full flex-col gap-3">
+                <span className="flex w-fit gap-2 text-sm leading-snug font-medium">
+                  {labelWithHint("Metadata", "JSON metadata for the vector store (optional)")}
+                </span>
+                <Textarea
+                  rows={4}
+                  value={metadataJson}
+                  onChange={(event) => setMetadataJson(event.target.value)}
+                  placeholder='{"key": "value"}'
+                />
+              </div>
+            </FieldGroup>
+
+            <div className="mt-6 flex justify-end space-x-3">
+              <Button type="button" variant="outline" onClick={handleCancel}>
+                Cancel
+              </Button>
+              <Button type="submit">Create</Button>
             </div>
-          </FieldGroup>
-
-          <div className="mt-6 flex justify-end space-x-3">
-            <Button type="button" variant="outline" onClick={handleCancel}>
-              Cancel
-            </Button>
-            <Button type="submit">Create</Button>
-          </div>
-        </form>
-      </TooltipProvider>
-    </Modal>
+          </form>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/app/login/LoginPage.tsx b/ui/litellm-dashboard/src/app/login/LoginPage.tsx
index ee88789aa12..3a1d120c8a5 100644
--- a/ui/litellm-dashboard/src/app/login/LoginPage.tsx
+++ b/ui/litellm-dashboard/src/app/login/LoginPage.tsx
@@ -4,6 +4,7 @@ import { useLogin } from "@/app/(dashboard)/hooks/login/useLogin";
 import { useUIConfig } from "@/app/(dashboard)/hooks/uiConfig/useUIConfig";
 import LoadingScreen from "@/components/common_components/LoadingScreen";
 import { exchangeLoginCode, getProxyBaseUrl, switchToWorkerUrl } from "@/components/networking";
+import { Alert, AlertAction, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Field, FieldGroup, FieldLabel } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -17,8 +18,7 @@ import { useZodForm } from "@/lib/forms/useZodForm";
 import { clearTokenCookies, getCookieFromDocument } from "@/utils/cookieUtils";
 import { isJwtExpired } from "@/utils/jwtUtils";
 import { consumeReturnUrl, getLoginUrl, getReturnUrl, isValidReturnUrl } from "@/utils/returnUrlUtils";
-import { InfoCircleOutlined } from "@ant-design/icons";
-import { Alert } from "antd";
+import { CircleAlert, Info, TriangleAlert, X } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useEffect, useId, useState } from "react";
 import { z } from "zod/v4";
@@ -31,6 +31,31 @@ const loginSchema = z.object({
 
 type LoginFormValues = z.infer<typeof loginSchema>;
 
+function SsoEnabledNotice() {
+  const [dismissed, setDismissed] = useState(false);
+
+  if (dismissed) {
+    return null;
+  }
+
+  return (
+    <Alert variant="info" className="mt-4">
+      <Info />
+      <AlertTitle>
+        Single Sign-On (SSO) is enabled. LiteLLM no longer automatically redirects to the SSO login flow upon loading
+        this page. To re-enable auto-redirect-to-SSO, set{" "}
+        <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">AUTO_REDIRECT_UI_LOGIN_TO_SSO=true</code> in your
+        environment configuration.
+      </AlertTitle>
+      <AlertAction>
+        <Button variant="ghost" size="icon-sm" aria-label="Close" onClick={() => setDismissed(true)}>
+          <X className="size-4" />
+        </Button>
+      </AlertAction>
+    </Alert>
+  );
+}
+
 function LoginPageContent() {
   const [isLoading, setIsLoading] = useState(true);
   const { data: uiConfig, isLoading: isConfigLoading } = useUIConfig();
@@ -170,22 +195,19 @@ function LoginPageContent() {
                 <h2 className="text-3xl font-semibold text-foreground">🚅 LiteLLM</h2>
               </div>
 
-              <Alert
-                message="Admin UI Disabled"
-                description={
-                  <>
-                    <p className="text-sm">
-                      The Admin UI has been disabled by the administrator. To re-enable it, please update the following
-                      environment variable:
-                    </p>
-                    <p className="mt-2 text-sm">
-                      <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">DISABLE_ADMIN_UI=False</code>
-                    </p>
-                  </>
-                }
-                type="warning"
-                showIcon
-              />
+              <Alert variant="warning">
+                <TriangleAlert />
+                <AlertTitle>Admin UI Disabled</AlertTitle>
+                <AlertDescription>
+                  <p className="text-sm">
+                    The Admin UI has been disabled by the administrator. To re-enable it, please update the following
+                    environment variable:
+                  </p>
+                  <p className="mt-2 text-sm">
+                    <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">DISABLE_ADMIN_UI=False</code>
+                  </p>
+                </AlertDescription>
+              </Alert>
             </div>
           </CardContent>
         </Card>
@@ -209,31 +231,32 @@ function LoginPageContent() {
               </div>
 
               {!uiConfig?.hide_default_credentials_hint && (
-                <Alert
-                  message="Default Credentials"
-                  description={
-                    <>
-                      <p className="text-sm">
-                        By default, Username is <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">admin</code>{" "}
-                        and Password is your set LiteLLM Proxy
-                        <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">MASTER_KEY</code>.
-                      </p>
-                      <p className="mt-2 text-sm">
-                        Need to set UI credentials or SSO?{" "}
-                        <a href="https://docs.litellm.ai/docs/proxy/ui" target="_blank" rel="noopener noreferrer">
-                          Check the documentation
-                        </a>
-                        .
-                      </p>
-                    </>
-                  }
-                  type="info"
-                  icon={<InfoCircleOutlined />}
-                  showIcon
-                />
+                <Alert variant="info">
+                  <Info />
+                  <AlertTitle>Default Credentials</AlertTitle>
+                  <AlertDescription>
+                    <p className="text-sm">
+                      By default, Username is <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">admin</code> and
+                      Password is your set LiteLLM Proxy
+                      <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">MASTER_KEY</code>.
+                    </p>
+                    <p className="mt-2 text-sm">
+                      Need to set UI credentials or SSO?{" "}
+                      <a href="https://docs.litellm.ai/docs/proxy/ui" target="_blank" rel="noopener noreferrer">
+                        Check the documentation
+                      </a>
+                      .
+                    </p>
+                  </AlertDescription>
+                </Alert>
               )}
 
-              {error && <Alert message={error} type="error" showIcon />}
+              {error && (
+                <Alert variant="error">
+                  <CircleAlert />
+                  <AlertTitle>{error}</AlertTitle>
+                </Alert>
+              )}
 
               <form onSubmit={form.handleSubmit(handleSubmit)}>
                 <FieldGroup>
@@ -326,22 +349,7 @@ function LoginPageContent() {
                 </FieldGroup>
               </form>
             </div>
-            {uiConfig?.sso_configured && (
-              <Alert
-                type="info"
-                showIcon
-                closable
-                className="mt-4"
-                message={
-                  <span>
-                    Single Sign-On (SSO) is enabled. LiteLLM no longer automatically redirects to the SSO login flow
-                    upon loading this page. To re-enable auto-redirect-to-SSO, set{" "}
-                    <code className="bg-muted px-1 py-0.5 rounded-sm text-xs">AUTO_REDIRECT_UI_LOGIN_TO_SSO=true</code>{" "}
-                    in your environment configuration.
-                  </span>
-                }
-              />
-            )}
+            {uiConfig?.sso_configured && <SsoEnabledNotice />}
           </TooltipProvider>
         </CardContent>
       </Card>
diff --git a/ui/litellm-dashboard/src/app/onboarding/OnboardingFormBody.tsx b/ui/litellm-dashboard/src/app/onboarding/OnboardingFormBody.tsx
index 1f2441c4870..77fae186c90 100644
--- a/ui/litellm-dashboard/src/app/onboarding/OnboardingFormBody.tsx
+++ b/ui/litellm-dashboard/src/app/onboarding/OnboardingFormBody.tsx
@@ -1,6 +1,7 @@
-import { Alert } from "antd";
 import React from "react";
+import { CircleAlert, Info } from "lucide-react";
 import { z } from "zod/v4";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Field, FieldLabel, FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -46,11 +47,10 @@ export function OnboardingFormBody({ variant, userEmail, isPending, claimError,
           </p>
 
           {variant === "signup" && (
-            <Alert
-              className="mt-4"
-              type="info"
-              message="SSO"
-              description={
+            <Alert className="mt-4" variant="info">
+              <Info />
+              <AlertTitle>SSO</AlertTitle>
+              <AlertDescription>
                 <div className="flex justify-between items-center">
                   <span>SSO is under the Enterprise Tier.</span>
                   <a
@@ -62,9 +62,8 @@ export function OnboardingFormBody({ variant, userEmail, isPending, claimError,
                     Get Free Trial
                   </a>
                 </div>
-              }
-              showIcon
-            />
+              </AlertDescription>
+            </Alert>
           )}
 
           <form className="mt-10 mb-5" onSubmit={form.handleSubmit(handleSubmit)}>
@@ -84,7 +83,12 @@ export function OnboardingFormBody({ variant, userEmail, isPending, claimError,
               </FormField>
             </FieldGroup>
 
-            {claimError && <Alert type="error" message={claimError} showIcon className="mt-6 mb-4" />}
+            {claimError && (
+              <Alert variant="error" className="mt-6 mb-4">
+                <CircleAlert />
+                <AlertTitle>{claimError}</AlertTitle>
+              </Alert>
+            )}
 
             <div className="mt-10">
               <Button type="submit" variant="outline" disabled={isPending}>
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx
index 4b1bffb5f52..5d89386493d 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroCreateModal.tsx
@@ -1,4 +1,3 @@
-import { Modal } from "antd";
 import { useEffect } from "react";
 import { z } from "zod/v4";
 
@@ -13,6 +12,8 @@ import { toast } from "@/lib/toast";
 
 import { CloudZeroApiKeyInput, labelWithHint } from "./CloudZeroFormControls";
 import { buildCloudZeroPayload, EMPTY_CLOUDZERO_FORM_VALUES, type CloudZeroFormValues } from "./cloudZeroPayload";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
 
 interface CloudZeroCreationModalProps {
   open: boolean;
@@ -56,42 +57,45 @@ export default function CloudZeroCreationModal({ open, onOk, onCancel }: CloudZe
   };
 
   return (
-    <Modal
-      title="Create CloudZero Integration"
-      open={open}
-      onOk={() => void form.handleSubmit(handleSubmit)()}
-      onCancel={handleCancel}
-      confirmLoading={createMutation.isPending}
-      okText={createMutation.isPending ? "Creating..." : "Create"}
-      cancelText="Cancel"
-      okButtonProps={{
-        disabled: createMutation.isPending,
-      }}
-      cancelButtonProps={{
-        disabled: createMutation.isPending,
-      }}
-    >
-      <TooltipProvider>
-        <form onSubmit={(event) => event.preventDefault()} noValidate>
-          <FieldGroup>
-            <FormField control={form.control} name="api_key" label="CloudZero API Key">
-              {({ ref, ...field }) => (
-                <CloudZeroApiKeyInput {...field} ref={ref} placeholder="Enter your CloudZero API key" />
-              )}
-            </FormField>
-            <FormField control={form.control} name="connection_id" label="Connection ID">
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Enter your CloudZero connection ID" />}
-            </FormField>
-            <FormField
-              control={form.control}
-              name="timezone"
-              label={labelWithHint("Timezone", "Timezone for date handling (defaults to UTC if not provided)")}
-            >
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="UTC" />}
-            </FormField>
-          </FieldGroup>
-        </form>
-      </TooltipProvider>
-    </Modal>
+    <Dialog open={open} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle>Create CloudZero Integration</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={(event) => event.preventDefault()} noValidate>
+            <FieldGroup>
+              <FormField control={form.control} name="api_key" label="CloudZero API Key">
+                {({ ref, ...field }) => (
+                  <CloudZeroApiKeyInput {...field} ref={ref} placeholder="Enter your CloudZero API key" />
+                )}
+              </FormField>
+              <FormField control={form.control} name="connection_id" label="Connection ID">
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Enter your CloudZero connection ID" />}
+              </FormField>
+              <FormField
+                control={form.control}
+                name="timezone"
+                label={labelWithHint("Timezone", "Timezone for date handling (defaults to UTC if not provided)")}
+              >
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="UTC" />}
+              </FormField>
+            </FieldGroup>
+          </form>
+        </TooltipProvider>
+        <DialogFooter>
+          <Button variant="outline" onClick={handleCancel} disabled={createMutation.isPending}>
+            Cancel
+          </Button>
+          <Button
+            onClick={() => void form.handleSubmit(handleSubmit)()}
+            disabled={createMutation.isPending}
+            aria-busy={createMutation.isPending}
+          >
+            {createMutation.isPending ? "Creating..." : "Create"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx
index 74c16624887..ceee32df4aa 100644
--- a/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx
+++ b/ui/litellm-dashboard/src/components/CloudZeroCostTracking/CloudZeroUpdateModal.tsx
@@ -1,4 +1,3 @@
-import { Modal } from "antd";
 import { useEffect } from "react";
 import { z } from "zod/v4";
 
@@ -14,6 +13,8 @@ import { toast } from "@/lib/toast";
 import { CloudZeroApiKeyInput, labelWithHint } from "./CloudZeroFormControls";
 import { buildCloudZeroPayload, EMPTY_CLOUDZERO_FORM_VALUES, type CloudZeroFormValues } from "./cloudZeroPayload";
 import { CloudZeroSettings } from "./types";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
 
 interface CloudZeroUpdateModalProps {
   open: boolean;
@@ -64,46 +65,49 @@ export default function CloudZeroUpdateModal({ open, onOk, onCancel, settings }:
   };
 
   return (
-    <Modal
-      title="Edit CloudZero Integration"
-      open={open}
-      onOk={() => void form.handleSubmit(handleSubmit)()}
-      onCancel={handleCancel}
-      confirmLoading={updateMutation.isPending}
-      okText={updateMutation.isPending ? "Updating..." : "Update"}
-      cancelText="Cancel"
-      okButtonProps={{
-        disabled: updateMutation.isPending,
-      }}
-      cancelButtonProps={{
-        disabled: updateMutation.isPending,
-      }}
-    >
-      <TooltipProvider>
-        <form onSubmit={(event) => event.preventDefault()} noValidate>
-          <FieldGroup>
-            <FormField
-              control={form.control}
-              name="api_key"
-              label={labelWithHint("CloudZero API Key", "Leave empty to keep the existing API key")}
-            >
-              {({ ref, ...field }) => (
-                <CloudZeroApiKeyInput {...field} ref={ref} placeholder="Leave empty to keep existing" />
-              )}
-            </FormField>
-            <FormField control={form.control} name="connection_id" label="Connection ID">
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Enter your CloudZero connection ID" />}
-            </FormField>
-            <FormField
-              control={form.control}
-              name="timezone"
-              label={labelWithHint("Timezone", "Timezone for date handling (defaults to UTC if not provided)")}
-            >
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="UTC" />}
-            </FormField>
-          </FieldGroup>
-        </form>
-      </TooltipProvider>
-    </Modal>
+    <Dialog open={open} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle>Edit CloudZero Integration</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={(event) => event.preventDefault()} noValidate>
+            <FieldGroup>
+              <FormField
+                control={form.control}
+                name="api_key"
+                label={labelWithHint("CloudZero API Key", "Leave empty to keep the existing API key")}
+              >
+                {({ ref, ...field }) => (
+                  <CloudZeroApiKeyInput {...field} ref={ref} placeholder="Leave empty to keep existing" />
+                )}
+              </FormField>
+              <FormField control={form.control} name="connection_id" label="Connection ID">
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Enter your CloudZero connection ID" />}
+              </FormField>
+              <FormField
+                control={form.control}
+                name="timezone"
+                label={labelWithHint("Timezone", "Timezone for date handling (defaults to UTC if not provided)")}
+              >
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="UTC" />}
+              </FormField>
+            </FieldGroup>
+          </form>
+        </TooltipProvider>
+        <DialogFooter>
+          <Button variant="outline" onClick={handleCancel} disabled={updateMutation.isPending}>
+            Cancel
+          </Button>
+          <Button
+            onClick={() => void form.handleSubmit(handleSubmit)()}
+            disabled={updateMutation.isPending}
+            aria-busy={updateMutation.isPending}
+          >
+            {updateMutation.isPending ? "Updating..." : "Update"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/CreateUserButton.tsx b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
index 89b0f369720..a57ea763b6c 100644
--- a/ui/litellm-dashboard/src/components/CreateUserButton.tsx
+++ b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
@@ -10,8 +10,9 @@ import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import { Alert, Modal, Typography } from "antd";
-import { ChevronRight, CircleHelp, UserPlus } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
+import { Modal, Typography } from "antd";
+import { ChevronRight, CircleHelp, Info, UserPlus } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import TeamDropdown from "./common_components/team_dropdown";
@@ -134,20 +135,16 @@ const labelWithHint = (label: string, hint: string): React.ReactNode => (
 );
 
 const EmailInvitationsNotice: React.FC = () => (
-  <Alert
-    message="Email invitations"
-    description={
-      <>
-        New users receive an email invite only when an email integration (SMTP, Resend, or SendGrid) is configured.{" "}
-        <Link href="https://docs.litellm.ai/docs/proxy/email" target="_blank">
-          Learn how to set up email notifications
-        </Link>
-      </>
-    }
-    type="info"
-    showIcon
-    className="mb-4"
-  />
+  <Alert variant="info" className="mb-4">
+    <Info />
+    <AlertTitle>Email invitations</AlertTitle>
+    <AlertDescription>
+      New users receive an email invite only when an email integration (SMTP, Resend, or SendGrid) is configured.{" "}
+      <Link href="https://docs.litellm.ai/docs/proxy/email" target="_blank">
+        Learn how to set up email notifications
+      </Link>
+    </AlertDescription>
+  </Alert>
 );
 
 export const CreateUserButton: React.FC<CreateuserProps> = ({
diff --git a/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx b/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx
index fff732fe270..d56e65237eb 100644
--- a/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx
+++ b/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx
@@ -1,8 +1,6 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
-// eslint-disable-next-line no-restricted-imports -- the dashboard has no shadcn date-time picker; the PTU window fields need one
-import { DatePicker } from "antd";
 import { CircleHelp } from "lucide-react";
 import type { Dayjs } from "dayjs";
 import * as React from "react";
@@ -11,6 +9,7 @@ import { z } from "zod/v4";
 
 import { TagsInput } from "@/app/(dashboard)/guardrails/_components/content_filter/TagsInput";
 import { FormField } from "@/components/shared/form/FormField";
+import { UtcDateTimeInput } from "@/components/shared/form/UtcDateTimeInput";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -292,9 +291,16 @@ const Display: React.FC<{ children: React.ReactNode }> = ({ children }) => (
   <div className="mt-1 rounded-sm bg-muted p-2">{children}</div>
 );
 
-const FieldLabel: React.FC<{ children: React.ReactNode }> = ({ children }) => (
-  <p className="text-sm font-medium text-foreground">{children}</p>
-);
+const FIELD_LABEL_CLASS = "text-sm font-medium text-foreground";
+
+const FieldLabel: React.FC<{ htmlFor?: string; children: React.ReactNode }> = ({ htmlFor, children }) =>
+  htmlFor === undefined ? (
+    <p className={FIELD_LABEL_CLASS}>{children}</p>
+  ) : (
+    <label htmlFor={htmlFor} className={FIELD_LABEL_CLASS}>
+      {children}
+    </label>
+  );
 
 const Hint: React.FC<{ text: string }> = ({ text }) => (
   <Tooltip>
@@ -463,13 +469,14 @@ const ModelInfoEditForm: React.FC<ModelInfoEditFormProps> = ({
             {ptuCostAttributionEnabled &&
               PTU_EDIT_FIELDS.map((ptuField) => (
                 <div key={ptuField.name}>
-                  <FieldLabel>{ptuField.label}</FieldLabel>
+                  <FieldLabel htmlFor={ptuField.name}>{ptuField.label}</FieldLabel>
                   {isEditing ? (
                     <FormField control={form.control} name={ptuField.name as ModelEditFieldName}>
                       {({ value, onChange, ...control }) =>
                         ptuField.input === "number" ? (
                           <NumericalInput
                             {...control}
+                            id={ptuField.name}
                             onChange={onChange}
                             value={value ?? ""}
                             placeholder={ptuField.placeholder}
@@ -477,10 +484,10 @@ const ModelInfoEditForm: React.FC<ModelInfoEditFormProps> = ({
                             min={ptuField.isCount ? 1 : 0}
                           />
                         ) : (
-                          <DatePicker
-                            showTime
-                            style={{ width: "100%" }}
-                            value={(value as Dayjs | null) ?? null}
+                          <UtcDateTimeInput
+                            {...control}
+                            id={ptuField.name}
+                            value={value as Dayjs | null}
                             onChange={onChange}
                           />
                         )
diff --git a/ui/litellm-dashboard/src/components/NoRedisWarningBanner.test.tsx b/ui/litellm-dashboard/src/components/NoRedisWarningBanner.test.tsx
index 8afde8eec94..600315e789e 100644
--- a/ui/litellm-dashboard/src/components/NoRedisWarningBanner.test.tsx
+++ b/ui/litellm-dashboard/src/components/NoRedisWarningBanner.test.tsx
@@ -20,6 +20,7 @@ describe("NoRedisWarningBanner", () => {
     renderWithProviders(<NoRedisWarningBanner accessToken="token" />);
     expect(screen.getByRole("alert")).toBeInTheDocument();
     expect(screen.getByText(/No Redis configured\. Redis is highly recommended/i)).toBeInTheDocument();
+    expect(screen.getByText(/more than one worker/i)).toBeInTheDocument();
   });
 
   it("should link to the docs page listing what breaks without Redis", () => {
diff --git a/ui/litellm-dashboard/src/components/NoRedisWarningBanner.tsx b/ui/litellm-dashboard/src/components/NoRedisWarningBanner.tsx
index 93c0f55486d..02433fad521 100644
--- a/ui/litellm-dashboard/src/components/NoRedisWarningBanner.tsx
+++ b/ui/litellm-dashboard/src/components/NoRedisWarningBanner.tsx
@@ -26,13 +26,13 @@ export const NoRedisWarningBanner: React.FC<NoRedisWarningBannerProps> = ({ acce
       <div>
         <p className="font-semibold">No Redis configured. Redis is highly recommended</p>
         <p>
-          Rate limits, budgets, router state, and cache invalidation are per worker without Redis, so limits are
-          enforced once per worker and spend can overshoot.{" "}
+          This proxy is running more than one worker (or the worker count could not be verified). Without Redis, rate
+          limits, budgets, router state, and cache invalidation are per worker, so limits are enforced once per worker
+          and spend can overshoot.{" "}
           <a className="underline" href={REDIS_DOCS_URL} target="_blank" rel="noreferrer">
             See everything that does not work without Redis
           </a>
-          . If you run a single worker and this is intentional, set{" "}
-          <code className="font-mono">LITELLM_DISABLE_NO_REDIS_WARNING=true</code> to hide this banner.
+          . Set <code className="font-mono">LITELLM_DISABLE_NO_REDIS_WARNING=true</code> to hide this banner anyway.
         </p>
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/components/SSOModals.tsx b/ui/litellm-dashboard/src/components/SSOModals.tsx
index 2bcc7849449..e20d6ab3093 100644
--- a/ui/litellm-dashboard/src/components/SSOModals.tsx
+++ b/ui/litellm-dashboard/src/components/SSOModals.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from "react";
 import { FormProvider, useWatch, type UseFormReturn } from "react-hook-form";
-import { Modal } from "antd";
 import { getSSOSettings, updateSSOSettings } from "./networking";
 import { toast } from "@/lib/toast";
 import { parseErrorMessage } from "./shared/errorUtils";
@@ -18,6 +17,7 @@ import {
   submitMountedSSOValues,
   type SSOSettingsFormValues,
 } from "./Settings/AdminSettings/SSOSettings/Modals/BaseSSOSettingsForm";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface SSOModalsProps {
   isAddSSOModalVisible: boolean;
@@ -247,85 +247,80 @@ const SSOModals: React.FC<SSOModalsProps> = ({
   // Helper function to render provider fields
   return (
     <>
-      <Modal
-        title={ssoConfigured ? "Edit SSO Settings" : "Add SSO"}
-        open={isAddSSOModalVisible}
-        width={800}
-        footer={null}
-        onOk={handleAddSSOOk}
-        onCancel={handleAddSSOCancel}
-      >
-        <FormProvider {...form}>
-          <form
-            onSubmit={(event) => {
-              event.preventDefault();
-              submitMountedSSOValues(form, "admin-panel", handleFormSubmit)();
-            }}
-          >
-            <FieldGroup>
-              <SSOProviderSelectField />
-              {provider ? renderProviderFields(provider) : null}
-              <ProxyAdminEmailField />
-              <ProxyBaseUrlField />
-              {showRoleMappingToggle && <MappingToggleField name="use_role_mappings" label="Use Role Mappings" />}
-              {useRoleMappings && (
-                <>
-                  <GroupClaimField />
-                  <RoleMappingTeamFields />
-                </>
-              )}
-            </FieldGroup>
-            <div className="mt-4 flex items-center justify-end gap-2">
-              {ssoConfigured && (
-                <Button type="button" variant="secondary" onClick={() => setIsClearConfirmModalVisible(true)}>
-                  Clear
-                </Button>
-              )}
-              <Button type="submit">Save</Button>
-            </div>
-          </form>
-        </FormProvider>
-      </Modal>
+      <Dialog open={isAddSSOModalVisible} onOpenChange={(open) => !open && handleAddSSOCancel()}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+          <DialogHeader>
+            <DialogTitle>{ssoConfigured ? "Edit SSO Settings" : "Add SSO"}</DialogTitle>
+          </DialogHeader>
+          <FormProvider {...form}>
+            <form
+              onSubmit={(event) => {
+                event.preventDefault();
+                submitMountedSSOValues(form, "admin-panel", handleFormSubmit)();
+              }}
+            >
+              <FieldGroup>
+                <SSOProviderSelectField />
+                {provider ? renderProviderFields(provider) : null}
+                <ProxyAdminEmailField />
+                <ProxyBaseUrlField />
+                {showRoleMappingToggle && <MappingToggleField name="use_role_mappings" label="Use Role Mappings" />}
+                {useRoleMappings && (
+                  <>
+                    <GroupClaimField />
+                    <RoleMappingTeamFields />
+                  </>
+                )}
+              </FieldGroup>
+              <div className="mt-4 flex items-center justify-end gap-2">
+                {ssoConfigured && (
+                  <Button type="button" variant="secondary" onClick={() => setIsClearConfirmModalVisible(true)}>
+                    Clear
+                  </Button>
+                )}
+                <Button type="submit">Save</Button>
+              </div>
+            </form>
+          </FormProvider>
+        </DialogContent>
+      </Dialog>
 
       {/* Clear Confirmation Modal */}
-      <Modal
-        title="Confirm Clear SSO Settings"
-        open={isClearConfirmModalVisible}
-        onOk={handleClearSSO}
-        onCancel={() => setIsClearConfirmModalVisible(false)}
-        okText="Yes, Clear"
-        cancelText="Cancel"
-        okButtonProps={{
-          danger: true,
-          style: {
-            backgroundColor: "#dc2626",
-            borderColor: "#dc2626",
-          },
-        }}
-      >
-        <p>Are you sure you want to clear all SSO settings? This action cannot be undone.</p>
-        <p>Users will no longer be able to login using SSO after this change.</p>
-      </Modal>
+      <Dialog open={isClearConfirmModalVisible} onOpenChange={(open) => !open && setIsClearConfirmModalVisible(false)}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+          <DialogHeader>
+            <DialogTitle>Confirm Clear SSO Settings</DialogTitle>
+          </DialogHeader>
+          <p>Are you sure you want to clear all SSO settings? This action cannot be undone.</p>
+          <p>Users will no longer be able to login using SSO after this change.</p>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setIsClearConfirmModalVisible(false)}>
+              Cancel
+            </Button>
+            <Button onClick={handleClearSSO} variant="destructive">
+              Yes, Clear
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
 
-      <Modal
-        title="SSO Setup Instructions"
-        open={isInstructionsModalVisible}
-        width={800}
-        footer={null}
-        onOk={handleInstructionsOk}
-        onCancel={handleInstructionsCancel}
-      >
-        <p>Follow these steps to complete the SSO setup:</p>
-        <p className="text-sm mt-2">1. DO NOT Exit this TAB</p>
-        <p className="text-sm mt-2">2. Open a new tab, visit your proxy base url</p>
-        <p className="text-sm mt-2">3. Confirm your SSO is configured correctly and you can login on the new Tab</p>
-        <p className="text-sm mt-2">4. If Step 3 is successful, you can close this tab</p>
-        <div style={{ textAlign: "right", marginTop: "10px" }}>
-          <Button type="button" onClick={handleInstructionsOk}>
-            Done
-          </Button>
-        </div>
-      </Modal>
+      <Dialog open={isInstructionsModalVisible} onOpenChange={(open) => !open && handleInstructionsCancel()}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+          <DialogHeader>
+            <DialogTitle>SSO Setup Instructions</DialogTitle>
+          </DialogHeader>
+          <p>Follow these steps to complete the SSO setup:</p>
+          <p className="text-sm mt-2">1. DO NOT Exit this TAB</p>
+          <p className="text-sm mt-2">2. Open a new tab, visit your proxy base url</p>
+          <p className="text-sm mt-2">3. Confirm your SSO is configured correctly and you can login on the new Tab</p>
+          <p className="text-sm mt-2">4. If Step 3 is successful, you can close this tab</p>
+          <div style={{ textAlign: "right", marginTop: "10px" }}>
+            <Button type="button" onClick={handleInstructionsOk}>
+              Done
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
     </>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx
index 0658f28611a..41d41e64da0 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/HashicorpVault/EditHashicorpVaultModal.tsx
@@ -4,7 +4,6 @@ import { useHashicorpVaultConfig } from "@/app/(dashboard)/hooks/configOverrides
 import { useUpdateHashicorpVaultConfig } from "@/app/(dashboard)/hooks/configOverrides/useUpdateHashicorpVaultConfig";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { toast } from "@/lib/toast";
-import { Modal } from "antd";
 import React, { useMemo } from "react";
 import { z } from "zod/v4";
 import { FieldGroup } from "@/components/shared/form/field";
@@ -16,6 +15,7 @@ import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { Separator } from "@/components/ui/separator";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { SENSITIVE_FIELDS, FIELD_LABELS } from "./constants";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface VaultFieldGroup {
   title: string;
@@ -142,34 +142,34 @@ const EditHashicorpVaultModal: React.FC<EditHashicorpVaultModalProps> = ({ isVis
   };
 
   return (
-    <Modal
-      title="Edit Hashicorp Vault Configuration"
-      open={isVisible}
-      width={700}
-      footer={
-        <div className="flex items-center justify-end gap-2">
-          <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
-            Cancel
-          </Button>
-          <Button type="button" disabled={isPending} onClick={() => void form.handleSubmit(handleSubmit)()}>
-            {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
-            {isPending ? "Saving..." : "Save"}
-          </Button>
-        </div>
-      }
-      onCancel={handleCancel}
-    >
-      <form onSubmit={form.handleSubmit(handleSubmit)}>
-        {FIELD_GROUPS.map((group, index) => (
-          <div key={group.title}>
-            {index > 0 && <Separator className="my-6" />}
-            <h5 className="mb-1 text-base font-semibold text-foreground">{group.title}</h5>
-            {group.subtitle && <p className="mb-4 text-sm text-muted-foreground">{group.subtitle}</p>}
-            <FieldGroup>{group.fields.map(renderField)}</FieldGroup>
+    <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
+        <DialogHeader>
+          <DialogTitle>Edit Hashicorp Vault Configuration</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={form.handleSubmit(handleSubmit)}>
+          {FIELD_GROUPS.map((group, index) => (
+            <div key={group.title}>
+              {index > 0 && <Separator className="my-6" />}
+              <h5 className="mb-1 text-base font-semibold text-foreground">{group.title}</h5>
+              {group.subtitle && <p className="mb-4 text-sm text-muted-foreground">{group.subtitle}</p>}
+              <FieldGroup>{group.fields.map(renderField)}</FieldGroup>
+            </div>
+          ))}
+        </form>
+        <DialogFooter>
+          <div className="flex items-center justify-end gap-2">
+            <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
+              Cancel
+            </Button>
+            <Button type="button" disabled={isPending} onClick={() => void form.handleSubmit(handleSubmit)()}>
+              {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
+              {isPending ? "Saving..." : "Save"}
+            </Button>
           </div>
-        ))}
-      </form>
-    </Modal>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.test.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.test.tsx
index 46aaa2b4f98..94a6d389db2 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.test.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.test.tsx
@@ -500,9 +500,7 @@ describe("LoggingSettings", () => {
     expect(screen.queryByPlaceholderText("e.g., 7d, 30d")).not.toBeInTheDocument();
     expect(screen.queryByRole("button", { name: "Save Settings" })).not.toBeInTheDocument();
 
-    // eslint-disable-next-line local/no-antd-class-selectors -- antd Skeleton exposes no role, label or aria-busy to query the loading affordance by
-    const skeletons = document.querySelectorAll(".ant-skeleton");
-    expect(skeletons.length).toBeGreaterThan(0);
+    expect(document.querySelectorAll('[data-slot="skeleton"]').length).toBeGreaterThan(0);
   });
 
   it("should report an error and not claim success when clearing a field fails", async () => {
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx
index f67406a4204..a9702451035 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/LoggingSettings/LoggingSettings.tsx
@@ -20,9 +20,9 @@ import { InputGroup, InputGroupAddon, InputGroupInput } from "@/components/ui/in
 import { Switch } from "@/components/ui/switch";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
-import { ClockCircleOutlined } from "@ant-design/icons";
-import { Card, Skeleton, Space, Typography } from "antd";
-import { CircleHelp } from "lucide-react";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { CircleHelp, Clock } from "lucide-react";
 import React, { useCallback, useMemo } from "react";
 import { useForm } from "react-hook-form";
 
@@ -198,7 +198,7 @@ const LoggingSettingsForm: React.FC<LoggingSettingsFormProps> = ({
                       placeholder={field.placeholder}
                     />
                     <InputGroupAddon>
-                      <ClockCircleOutlined />
+                      <Clock />
                     </InputGroupAddon>
                   </InputGroup>
                 ) : (
@@ -317,23 +317,34 @@ const LoggingSettings: React.FC = () => {
   };
 
   return (
-    <Card title="Logging Settings">
-      <Space direction="vertical" size="large" style={{ width: "100%" }}>
-        <Typography.Paragraph style={{ marginBottom: 0 }} type="secondary">
-          Proxy-wide settings that control how request and response data are written to spend logs.
-        </Typography.Paragraph>
+    <Card>
+      <CardHeader className="border-b">
+        <CardTitle>Logging Settings</CardTitle>
+      </CardHeader>
+      <CardContent>
+        <div className="flex w-full flex-col gap-6">
+          <p className="mb-0 text-muted-foreground">
+            Proxy-wide settings that control how request and response data are written to spend logs.
+          </p>
 
-        {isLoadingConfig ? (
-          <Skeleton active paragraph={{ rows: 4 }} />
-        ) : (
-          <LoggingSettingsForm
-            initialValues={initialValues}
-            describeField={describeField}
-            isSaving={isPending || isDeletingField}
-            onSubmit={handleFormSubmit}
-          />
-        )}
-      </Space>
+          {isLoadingConfig ? (
+            <div className="flex flex-col gap-3">
+              <Skeleton className="h-4 w-2/5" />
+              <Skeleton className="h-4 w-full" />
+              <Skeleton className="h-4 w-full" />
+              <Skeleton className="h-4 w-full" />
+              <Skeleton className="h-4 w-3/5" />
+            </div>
+          ) : (
+            <LoggingSettingsForm
+              initialValues={initialValues}
+              describeField={describeField}
+              isSaving={isPending || isDeletingField}
+              onSubmit={handleFormSubmit}
+            />
+          )}
+        </div>
+      </CardContent>
     </Card>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx
index d8305171447..f7ec5238a9d 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/MCPSemanticFilterSettings/MCPSemanticFilterSettings.tsx
@@ -3,9 +3,9 @@
 import { useMCPSemanticFilterSettings } from "@/app/(dashboard)/hooks/mcpSemanticFilterSettings/useMCPSemanticFilterSettings";
 import { useUpdateMCPSemanticFilterSettings } from "@/app/(dashboard)/hooks/mcpSemanticFilterSettings/useUpdateMCPSemanticFilterSettings";
 import { toast } from "@/lib/toast";
-import { Alert, Card, Col, Row, Skeleton } from "antd";
-import { CheckCircleOutlined } from "@ant-design/icons";
-import { CircleHelp, Save } from "lucide-react";
+import { Skeleton } from "@/components/ui/skeleton";
+import { CircleCheck, CircleHelp, Info, Save, X } from "lucide-react";
+import { Alert, AlertAction, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { fetchAvailableModels, ModelGroup } from "@/components/llm_calls/fetch_models";
@@ -13,6 +13,7 @@ import { FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { SearchSelect } from "@/components/shared/SearchSelect";
 import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { Slider } from "@/components/ui/slider";
 import { Switch } from "@/components/ui/switch";
@@ -79,6 +80,26 @@ const clampTopK = (value: number | null): number | null =>
 const parseTopK = (raw: string, rawAsNumber: number): number | null =>
   raw === "" || Number.isNaN(rawAsNumber) ? null : rawAsNumber;
 
+const SaveSuccessAlert = () => {
+  const [dismissed, setDismissed] = useState(false);
+
+  if (dismissed) {
+    return null;
+  }
+
+  return (
+    <Alert variant="success" className="mb-4">
+      <CircleCheck />
+      <AlertTitle>Settings saved successfully</AlertTitle>
+      <AlertAction>
+        <Button variant="ghost" size="icon-sm" aria-label="Close" onClick={() => setDismissed(true)}>
+          <X className="size-4" />
+        </Button>
+      </AlertAction>
+    </Alert>
+  );
+};
+
 export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFilterSettingsProps) {
   const { data, isLoading, isError, error } = useMCPSemanticFilterSettings();
   const {
@@ -175,159 +196,160 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
   return (
     <div style={{ width: "100%" }}>
       {isLoading ? (
-        <Skeleton active />
+        <div className="flex flex-col gap-3">
+          <Skeleton className="h-4 w-2/5" />
+          <Skeleton className="h-4 w-full" />
+          <Skeleton className="h-4 w-full" />
+          <Skeleton className="h-4 w-3/5" />
+        </div>
       ) : isError ? (
-        <Alert
-          type="error"
-          message="Could not load MCP Semantic Filter settings"
-          description={error instanceof Error ? error.message : undefined}
-          style={{ marginBottom: 24 }}
-        />
+        <Alert variant="error" className="mb-6">
+          <AlertTitle>Could not load MCP Semantic Filter settings</AlertTitle>
+          {error instanceof Error && <AlertDescription>{error.message}</AlertDescription>}
+        </Alert>
       ) : (
         <>
-          <Alert
-            type="info"
-            message="Semantic Tool Filtering"
-            description="Filter MCP tools semantically based on query relevance. This reduces context window size and improves tool selection accuracy. Click 'Save Settings' to apply changes across all pods (takes effect within 10 seconds)."
-            showIcon
-            style={{ marginBottom: 24 }}
-          />
+          <Alert variant="info" className="mb-6">
+            <Info />
+            <AlertTitle>Semantic Tool Filtering</AlertTitle>
+            <AlertDescription>
+              Filter MCP tools semantically based on query relevance. This reduces context window size and improves tool
+              selection accuracy. Click &apos;Save Settings&apos; to apply changes across all pods (takes effect within
+              10 seconds).
+            </AlertDescription>
+          </Alert>
 
-          {saveSuccess && (
-            <Alert
-              type="success"
-              message="Settings saved successfully"
-              icon={<CheckCircleOutlined />}
-              showIcon
-              closable
-              style={{ marginBottom: 16 }}
-            />
-          )}
+          {saveSuccess && <SaveSuccessAlert />}
 
           {updateError && (
-            <Alert
-              type="error"
-              message="Could not update settings"
-              description={updateError instanceof Error ? updateError.message : undefined}
-              style={{ marginBottom: 16 }}
-            />
+            <Alert variant="error" className="mb-4">
+              <AlertTitle>Could not update settings</AlertTitle>
+              {updateError instanceof Error && <AlertDescription>{updateError.message}</AlertDescription>}
+            </Alert>
           )}
 
-          <Row gutter={24}>
+          <div className="grid grid-cols-1 gap-x-6 lg:grid-cols-2">
             {/* Left Column - Settings */}
-            <Col xs={24} lg={12}>
+            <div>
               <TooltipProvider>
                 <form onSubmit={(event) => event.preventDefault()} noValidate>
-                  <Card style={{ marginBottom: 16 }}>
-                    <FieldGroup>
-                      <FormField
-                        control={form.control}
-                        name="enabled"
-                        label={labelWithHint(
-                          "Enable Semantic Filtering",
-                          "When enabled, only the most relevant MCP tools will be included in requests based on semantic similarity",
-                        )}
-                        description={schema?.properties?.enabled?.description}
-                      >
-                        {({ value, onChange, onBlur, id }) => (
-                          <Switch
-                            id={id}
-                            checked={value}
-                            onCheckedChange={(checked) => commitChange(onChange, checked)}
-                            onBlur={onBlur}
-                            disabled={isUpdating}
-                          />
-                        )}
-                      </FormField>
-                    </FieldGroup>
-                  </Card>
-
-                  <Card title="Configuration" style={{ marginBottom: 16 }}>
-                    <FieldGroup>
-                      <FormField
-                        control={form.control}
-                        name="embedding_model"
-                        label={labelWithHint(
-                          "Embedding Model",
-                          "The model used to generate embeddings for semantic matching",
-                        )}
-                      >
-                        {({ value, onChange, id }) => (
-                          <SearchSelect
-                            inputId={id}
-                            options={embeddingModels.map((model) => ({
-                              label: model.model_group,
-                              value: model.model_group,
-                            }))}
-                            value={value}
-                            onValueChange={(selected) => commitChange(onChange, selected)}
-                            allowClear={false}
-                            placeholder={loadingModels ? "Loading models..." : "Select embedding model"}
-                            emptyText={loadingModels ? "Loading..." : "No embedding models available"}
-                            disabled={isUpdating || loadingModels}
-                          />
-                        )}
-                      </FormField>
-
-                      <FormField
-                        control={form.control}
-                        name="top_k"
-                        label={labelWithHint("Top K Results", "Maximum number of tools to return after filtering")}
-                      >
-                        {({ ref, value, onChange, onBlur, id }) => (
-                          <Input
-                            id={id}
-                            ref={ref}
-                            type="number"
-                            min={TOP_K_MIN}
-                            max={TOP_K_MAX}
-                            value={value ?? ""}
-                            onChange={(event) =>
-                              commitChange(onChange, parseTopK(event.target.value, event.target.valueAsNumber))
-                            }
-                            onBlur={() => {
-                              onChange(clampTopK(value));
-                              onBlur();
-                            }}
-                            disabled={isUpdating}
-                          />
-                        )}
-                      </FormField>
-
-                      <FormField
-                        control={form.control}
-                        name="similarity_threshold"
-                        label={labelWithHint(
-                          "Similarity Threshold",
-                          "Minimum similarity score (0-1) for a tool to be included",
-                        )}
-                      >
-                        {({ value, onChange, id }) => (
-                          <div className="w-full">
-                            <Slider
+                  <Card className="mb-4">
+                    <CardContent>
+                      <FieldGroup>
+                        <FormField
+                          control={form.control}
+                          name="enabled"
+                          label={labelWithHint(
+                            "Enable Semantic Filtering",
+                            "When enabled, only the most relevant MCP tools will be included in requests based on semantic similarity",
+                          )}
+                          description={schema?.properties?.enabled?.description}
+                        >
+                          {({ value, onChange, onBlur, id }) => (
+                            <Switch
                               id={id}
-                              min={0}
-                              max={1}
-                              step={0.05}
-                              value={[value]}
-                              onValueChange={(next) => commitChange(onChange, Array.isArray(next) ? next[0] : next)}
+                              checked={value}
+                              onCheckedChange={(checked) => commitChange(onChange, checked)}
+                              onBlur={onBlur}
                               disabled={isUpdating}
                             />
-                            <div className="relative mt-2 h-4 text-xs text-muted-foreground">
-                              {SIMILARITY_THRESHOLD_MARKS.map((mark) => (
-                                <span
-                                  key={mark.value}
-                                  className="absolute -translate-x-1/2"
-                                  style={{ left: `${mark.value * 100}%` }}
-                                >
-                                  {mark.label}
-                                </span>
-                              ))}
+                          )}
+                        </FormField>
+                      </FieldGroup>
+                    </CardContent>
+                  </Card>
+
+                  <Card className="mb-4">
+                    <CardHeader className="border-b">
+                      <CardTitle>Configuration</CardTitle>
+                    </CardHeader>
+                    <CardContent>
+                      <FieldGroup>
+                        <FormField
+                          control={form.control}
+                          name="embedding_model"
+                          label={labelWithHint(
+                            "Embedding Model",
+                            "The model used to generate embeddings for semantic matching",
+                          )}
+                        >
+                          {({ value, onChange, id }) => (
+                            <SearchSelect
+                              inputId={id}
+                              options={embeddingModels.map((model) => ({
+                                label: model.model_group,
+                                value: model.model_group,
+                              }))}
+                              value={value}
+                              onValueChange={(selected) => commitChange(onChange, selected)}
+                              allowClear={false}
+                              placeholder={loadingModels ? "Loading models..." : "Select embedding model"}
+                              emptyText={loadingModels ? "Loading..." : "No embedding models available"}
+                              disabled={isUpdating || loadingModels}
+                            />
+                          )}
+                        </FormField>
+
+                        <FormField
+                          control={form.control}
+                          name="top_k"
+                          label={labelWithHint("Top K Results", "Maximum number of tools to return after filtering")}
+                        >
+                          {({ ref, value, onChange, onBlur, id }) => (
+                            <Input
+                              id={id}
+                              ref={ref}
+                              type="number"
+                              min={TOP_K_MIN}
+                              max={TOP_K_MAX}
+                              value={value ?? ""}
+                              onChange={(event) =>
+                                commitChange(onChange, parseTopK(event.target.value, event.target.valueAsNumber))
+                              }
+                              onBlur={() => {
+                                onChange(clampTopK(value));
+                                onBlur();
+                              }}
+                              disabled={isUpdating}
+                            />
+                          )}
+                        </FormField>
+
+                        <FormField
+                          control={form.control}
+                          name="similarity_threshold"
+                          label={labelWithHint(
+                            "Similarity Threshold",
+                            "Minimum similarity score (0-1) for a tool to be included",
+                          )}
+                        >
+                          {({ value, onChange, id }) => (
+                            <div className="w-full">
+                              <Slider
+                                id={id}
+                                min={0}
+                                max={1}
+                                step={0.05}
+                                value={[value]}
+                                onValueChange={(next) => commitChange(onChange, Array.isArray(next) ? next[0] : next)}
+                                disabled={isUpdating}
+                              />
+                              <div className="relative mt-2 h-4 text-xs text-muted-foreground">
+                                {SIMILARITY_THRESHOLD_MARKS.map((mark) => (
+                                  <span
+                                    key={mark.value}
+                                    className="absolute -translate-x-1/2"
+                                    style={{ left: `${mark.value * 100}%` }}
+                                  >
+                                    {mark.label}
+                                  </span>
+                                ))}
+                              </div>
                             </div>
-                          </div>
-                        )}
-                      </FormField>
-                    </FieldGroup>
+                          )}
+                        </FormField>
+                      </FieldGroup>
+                    </CardContent>
                   </Card>
 
                   <div style={{ display: "flex", justifyContent: "flex-end", gap: 8 }}>
@@ -342,10 +364,10 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                   </div>
                 </form>
               </TooltipProvider>
-            </Col>
+            </div>
 
             {/* Right Column - Test Configuration */}
-            <Col xs={24} lg={12}>
+            <div>
               <MCPSemanticFilterTestPanel
                 accessToken={accessToken}
                 testQuery={testQuery}
@@ -359,8 +381,8 @@ export default function MCPSemanticFilterSettings({ accessToken }: MCPSemanticFi
                 testError={testError}
                 curlCommand={getCurlCommand(testModel, testQuery)}
               />
-            </Col>
-          </Row>
+            </div>
+          </div>
         </>
       )}
     </div>
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.integration.test.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.integration.test.tsx
index 998fa0ecd99..a91e54b058b 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.integration.test.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.integration.test.tsx
@@ -33,7 +33,7 @@ describe("PluginSettings config payload", () => {
     const user = userEvent.setup();
     getConfigFieldSettingMock.mockResolvedValue({ field_value: [] });
     render(<PluginSettings />);
-    expect(await screen.findAllByText("No data")).not.toHaveLength(0);
+    expect(await screen.findByText("No data", { ignore: "title" })).toBeInTheDocument();
 
     await user.click(screen.getByRole("button", { name: /add plugin/i }));
     fireEvent.change(await screen.findByLabelText(/Name \(identifier\)/), { target: { value: "beta" } });
@@ -62,7 +62,7 @@ describe("PluginSettings config payload", () => {
     render(<PluginSettings />);
     expect(await screen.findByText("Alpha")).toBeInTheDocument();
 
-    await user.click(screen.getByRole("button", { name: "edit" }));
+    await user.click(screen.getByRole("button", { name: "Edit alpha" }));
     expect(await screen.findByLabelText(/Plugin Key/)).toHaveValue("");
 
     await user.click(screen.getByRole("button", { name: "Save" }));
@@ -88,7 +88,7 @@ describe("PluginSettings config payload", () => {
     render(<PluginSettings />);
     expect(await screen.findByText("Alpha")).toBeInTheDocument();
 
-    await user.click(screen.getByRole("button", { name: "edit" }));
+    await user.click(screen.getByRole("button", { name: "Edit alpha" }));
     fireEvent.change(await screen.findByLabelText(/Plugin Key/), { target: { value: "sk-brand-new" } });
     await user.click(screen.getByRole("button", { name: "Save" }));
 
@@ -119,7 +119,7 @@ describe("PluginSettings plugin key reveal (post-migration shadcn affordance)",
     render(<PluginSettings />);
     expect(await screen.findByText("Alpha")).toBeInTheDocument();
 
-    await user.click(screen.getByRole("button", { name: "edit" }));
+    await user.click(screen.getByRole("button", { name: "Edit alpha" }));
     const keyInput = await screen.findByLabelText(/Plugin Key/);
     expect(keyInput).toHaveAttribute("type", "password");
 
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx
index fc085ebbd9e..7628dfbc13a 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/PluginSettings/PluginSettings.tsx
@@ -1,10 +1,9 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import { Card, Modal, Space, Table, Typography } from "antd";
+import { Card, Space, Table, Typography } from "antd";
 import { Button } from "@/components/ui/button";
-import { DeleteOutlined, EditOutlined, PlusOutlined } from "@ant-design/icons";
-import { Eye, EyeOff } from "lucide-react";
+import { Eye, EyeOff, Pencil, Plus, Trash2 } from "lucide-react";
 import { getConfigFieldSetting, updateConfigFieldSetting } from "@/components/networking";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { FieldGroup } from "@/components/shared/form/field";
@@ -13,6 +12,7 @@ import { Input } from "@/components/ui/input";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { pluginSchema, type PluginFormValues } from "./schema";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const { Title, Text, Paragraph } = Typography;
 
@@ -112,13 +112,18 @@ export default function PluginSettings() {
     {
       title: "Actions",
       key: "actions",
-      render: (_: unknown, __: Plugin, idx: number) => (
+      render: (_: unknown, plugin: Plugin, idx: number) => (
         <Space>
-          <Button variant="outline" size="icon-sm" onClick={() => openEdit(idx)}>
-            <EditOutlined />
+          <Button variant="outline" size="icon-sm" aria-label={`Edit ${plugin.name}`} onClick={() => openEdit(idx)}>
+            <Pencil />
           </Button>
-          <Button variant="destructive" size="icon-sm" onClick={() => handleDelete(idx)}>
-            <DeleteOutlined />
+          <Button
+            variant="destructive"
+            size="icon-sm"
+            aria-label={`Delete ${plugin.name}`}
+            onClick={() => handleDelete(idx)}
+          >
+            <Trash2 />
           </Button>
         </Space>
       ),
@@ -137,66 +142,72 @@ export default function PluginSettings() {
       </Paragraph>
 
       <Button className="mb-4" onClick={openAdd}>
-        <PlusOutlined />
+        <Plus />
         Add Plugin
       </Button>
 
       <Table dataSource={plugins} columns={columns} rowKey="name" loading={loading} pagination={false} size="small" />
 
-      <Modal
-        title={editingIndex !== null ? "Edit Plugin" : "Add Plugin"}
-        open={modalOpen}
-        onOk={form.handleSubmit(handleOk)}
-        onCancel={() => setModalOpen(false)}
-        confirmLoading={saving}
-        okText="Save"
-      >
-        <form onSubmit={(event) => event.preventDefault()} noValidate style={{ marginTop: 16 }}>
-          <FieldGroup>
-            <FormField
-              control={form.control}
-              name="name"
-              label="Name (identifier)"
-              description="Used in URLs and config. No spaces. E.g. litellm-platform-plugin"
-            >
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="litellm-platform-plugin" />}
-            </FormField>
-            <FormField control={form.control} name="display_name" label="Display Name">
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Agent Control Plane" />}
-            </FormField>
-            <FormField control={form.control} name="url" label="URL" description="Base URL of the plugin service">
-              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="https://your-plugin.example.com" />}
-            </FormField>
-            <FormField
-              control={form.control}
-              name="plugin_key"
-              label="Plugin Key"
-              description="Optional. The plugin's own credential, injected as Authorization: Bearer <key> only when litellm reverse-proxies API calls to the plugin's backend (/plugin-proxy/<name>/*). Leave blank for plugins that use the forwarded litellm user token (e.g. iframe plugins) — that path uses the user's token, not this key."
-            >
-              {({ ref, ...field }) => (
-                <InputGroup>
-                  <InputGroupInput
-                    {...field}
-                    ref={ref}
-                    type={keyVisible ? "text" : "password"}
-                    value={field.value ?? ""}
-                    placeholder={editingIndex !== null ? "Leave blank to keep current key" : "sk-... (optional)"}
-                  />
-                  <InputGroupAddon align="inline-end">
-                    <InputGroupButton
-                      size="icon-xs"
-                      onClick={() => setKeyVisible(!keyVisible)}
-                      aria-label={keyVisible ? "Hide plugin key" : "Show plugin key"}
-                    >
-                      {keyVisible ? <EyeOff /> : <Eye />}
-                    </InputGroupButton>
-                  </InputGroupAddon>
-                </InputGroup>
-              )}
-            </FormField>
-          </FieldGroup>
-        </form>
-      </Modal>
+      <Dialog open={modalOpen} onOpenChange={(open) => !open && setModalOpen(false)}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+          <DialogHeader>
+            <DialogTitle>{editingIndex !== null ? "Edit Plugin" : "Add Plugin"}</DialogTitle>
+          </DialogHeader>
+          <form onSubmit={(event) => event.preventDefault()} noValidate style={{ marginTop: 16 }}>
+            <FieldGroup>
+              <FormField
+                control={form.control}
+                name="name"
+                label="Name (identifier)"
+                description="Used in URLs and config. No spaces. E.g. litellm-platform-plugin"
+              >
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="litellm-platform-plugin" />}
+              </FormField>
+              <FormField control={form.control} name="display_name" label="Display Name">
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="Agent Control Plane" />}
+              </FormField>
+              <FormField control={form.control} name="url" label="URL" description="Base URL of the plugin service">
+                {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="https://your-plugin.example.com" />}
+              </FormField>
+              <FormField
+                control={form.control}
+                name="plugin_key"
+                label="Plugin Key"
+                description="Optional. The plugin's own credential, injected as Authorization: Bearer <key> only when litellm reverse-proxies API calls to the plugin's backend (/plugin-proxy/<name>/*). Leave blank for plugins that use the forwarded litellm user token (e.g. iframe plugins) — that path uses the user's token, not this key."
+              >
+                {({ ref, ...field }) => (
+                  <InputGroup>
+                    <InputGroupInput
+                      {...field}
+                      ref={ref}
+                      type={keyVisible ? "text" : "password"}
+                      value={field.value ?? ""}
+                      placeholder={editingIndex !== null ? "Leave blank to keep current key" : "sk-... (optional)"}
+                    />
+                    <InputGroupAddon align="inline-end">
+                      <InputGroupButton
+                        size="icon-xs"
+                        onClick={() => setKeyVisible(!keyVisible)}
+                        aria-label={keyVisible ? "Hide plugin key" : "Show plugin key"}
+                      >
+                        {keyVisible ? <EyeOff /> : <Eye />}
+                      </InputGroupButton>
+                    </InputGroupAddon>
+                  </InputGroup>
+                )}
+              </FormField>
+            </FieldGroup>
+          </form>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setModalOpen(false)}>
+              Cancel
+            </Button>
+            <Button onClick={form.handleSubmit(handleOk)} disabled={saving} aria-busy={saving}>
+              Save
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </Card>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx
index fcbb6300d70..7fa16515bf5 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/AddSSOSettingsModal.tsx
@@ -2,7 +2,6 @@
 
 import { toast } from "@/lib/toast";
 import { parseErrorMessage } from "@/components/shared/errorUtils";
-import { Modal } from "antd";
 import React from "react";
 import BaseSSOSettingsForm, {
   emptySSOSettingsFormValues,
@@ -14,6 +13,7 @@ import { Button } from "@/components/ui/button";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useEditSSOSettings } from "@/app/(dashboard)/hooks/sso/useEditSSOSettings";
 import { processSSOSettingsPayload } from "../utils";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddSSOSettingsModalProps {
   isVisible: boolean;
@@ -45,29 +45,29 @@ const AddSSOSettingsModal: React.FC<AddSSOSettingsModalProps> = ({ isVisible, on
   };
 
   return (
-    <Modal
-      title="Add SSO"
-      open={isVisible}
-      width={800}
-      footer={
-        <div className="flex items-center justify-end gap-2">
-          <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
-            Cancel
-          </Button>
-          <Button
-            type="button"
-            disabled={isPending}
-            onClick={submitMountedSSOValues(form, "sso-settings", handleFormSubmit)}
-          >
-            {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
-            {isPending ? "Adding..." : "Add SSO"}
-          </Button>
-        </div>
-      }
-      onCancel={handleCancel}
-    >
-      <BaseSSOSettingsForm form={form} onFormSubmit={handleFormSubmit} />
-    </Modal>
+    <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>Add SSO</DialogTitle>
+        </DialogHeader>
+        <BaseSSOSettingsForm form={form} onFormSubmit={handleFormSubmit} />
+        <DialogFooter>
+          <div className="flex items-center justify-end gap-2">
+            <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
+              Cancel
+            </Button>
+            <Button
+              type="button"
+              disabled={isPending}
+              onClick={submitMountedSSOValues(form, "sso-settings", handleFormSubmit)}
+            >
+              {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
+              {isPending ? "Adding..." : "Add SSO"}
+            </Button>
+          </div>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx
index 0e289c12c5b..ef78e3827d8 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.test.tsx
@@ -20,7 +20,6 @@ const SSO_PROVIDERS = {
 
 const TEST_DATA = {
   MODAL_TITLE: "Edit SSO Settings",
-  MODAL_WIDTH: "800",
   SUCCESS_MESSAGE: "SSO settings updated successfully",
   ERROR_MESSAGE_PREFIX: "Failed to save SSO settings:",
   BUTTON_TEXT: {
@@ -31,8 +30,6 @@ const TEST_DATA = {
 } as const;
 
 const TEST_IDS = {
-  MODAL: "modal",
-  BUTTON: "button",
   BASE_SSO_FORM: "base-sso-form",
   TRIGGER_FORM_SUBMIT: "trigger-form-submit",
 } as const;
@@ -125,16 +122,6 @@ const createMockHooks = (): {
 
 let lastSeededForm: any;
 
-vi.mock("antd", () => ({
-  Modal: ({ children, open, title, footer, onCancel, width, ...props }: any) => (
-    <div data-testid={TEST_IDS.MODAL} data-open={open} data-title={title} data-width={width} {...props}>
-      <div data-testid="modal-content">{children}</div>
-      <div data-testid="modal-footer">{footer}</div>
-      <button data-testid="modal-cancel" onClick={onCancel} />
-    </div>
-  ),
-}));
-
 vi.mock("./BaseSSOSettingsForm", async (importOriginal) => ({
   ...(await importOriginal<typeof import("./BaseSSOSettingsForm")>()),
   default: ({ form, onFormSubmit }: any) => {
@@ -199,9 +186,9 @@ const renderComponent = (props: Partial<React.ComponentProps<typeof EditSSOSetti
   };
 };
 
-const getButtons = () => within(screen.getByTestId("modal-footer")).getAllByRole("button");
-const getCancelButton = () => getButtons()[0];
-const getSaveButton = () => getButtons()[1];
+const getDialog = () => screen.getByRole("dialog");
+const getCancelButton = () => within(getDialog()).getByRole("button", { name: TEST_DATA.BUTTON_TEXT.CANCEL });
+const getSaveButton = () => within(getDialog()).getByRole("button", { name: /^(Save|Saving)/ });
 
 const seededValuesFor = (ssoData: SSOData) => toSSOFormValues(ssoData.values as SSOSettingsValues);
 
@@ -219,17 +206,15 @@ describe("EditSSOSettingsModal", () => {
     it("displays modal with correct configuration", () => {
       renderComponent();
 
-      const modal = screen.getByTestId(TEST_IDS.MODAL);
-      expect(modal).toHaveAttribute("data-open", "true");
-      expect(modal).toHaveAttribute("data-title", TEST_DATA.MODAL_TITLE);
-      expect(modal).toHaveAttribute("data-width", TEST_DATA.MODAL_WIDTH);
+      expect(within(getDialog()).getByText(TEST_DATA.MODAL_TITLE)).toBeInTheDocument();
+      expect(screen.getByTestId(TEST_IDS.BASE_SSO_FORM)).toBeInTheDocument();
     });
 
     it("displays modal as closed when not visible", () => {
       renderComponent({ isVisible: false });
 
-      const modal = screen.getByTestId(TEST_IDS.MODAL);
-      expect(modal).toHaveAttribute("data-open", "false");
+      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+      expect(screen.queryByText(TEST_DATA.MODAL_TITLE)).not.toBeInTheDocument();
     });
   });
 
@@ -237,10 +222,8 @@ describe("EditSSOSettingsModal", () => {
     it("renders cancel and save buttons", () => {
       renderComponent();
 
-      const buttons = getButtons();
-      expect(buttons).toHaveLength(2);
-      expect(buttons[0]).toHaveTextContent(TEST_DATA.BUTTON_TEXT.CANCEL);
-      expect(buttons[1]).toHaveTextContent(TEST_DATA.BUTTON_TEXT.SAVE);
+      expect(getCancelButton()).toBeInTheDocument();
+      expect(getSaveButton()).toHaveTextContent(TEST_DATA.BUTTON_TEXT.SAVE);
     });
 
     it("calls onCancel and resets form when cancel button is clicked", () => {
@@ -481,7 +464,8 @@ describe("EditSSOSettingsModal", () => {
 
         renderComponent({ isVisible: false });
 
-        expect(screen.getByTestId(TEST_IDS.MODAL)).toHaveAttribute("data-open", "false");
+        expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+        expect(screen.queryByTestId(TEST_IDS.BASE_SSO_FORM)).not.toBeInTheDocument();
       });
 
       it("skips initialization when SSO data is unavailable", () => {
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx
index 364fb68fd91..58c03eda979 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/Modals/EditSSOSettingsModal.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Modal } from "antd";
 import React, { useMemo } from "react";
 import BaseSSOSettingsForm, {
   emptySSOSettingsFormValues,
@@ -15,6 +14,7 @@ import { parseErrorMessage } from "@/components/shared/errorUtils";
 import { detectSSOProvider, processSSOSettingsPayload } from "../utils";
 import { useSSOSettings, type SSOSettingsValues } from "@/app/(dashboard)/hooks/sso/useSSOSettings";
 import { useEditSSOSettings } from "@/app/(dashboard)/hooks/sso/useEditSSOSettings";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface EditSSOSettingsModalProps {
   isVisible: boolean;
@@ -108,29 +108,29 @@ const EditSSOSettingsModal: React.FC<EditSSOSettingsModalProps> = ({ isVisible,
   };
 
   return (
-    <Modal
-      title="Edit SSO Settings"
-      open={isVisible}
-      width={800}
-      footer={
-        <div className="flex items-center justify-end gap-2">
-          <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
-            Cancel
-          </Button>
-          <Button
-            type="button"
-            disabled={isPending}
-            onClick={submitMountedSSOValues(form, "sso-settings", handleFormSubmit)}
-          >
-            {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
-            {isPending ? "Saving..." : "Save"}
-          </Button>
-        </div>
-      }
-      onCancel={handleCancel}
-    >
-      <BaseSSOSettingsForm form={form} onFormSubmit={handleFormSubmit} />
-    </Modal>
+    <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>Edit SSO Settings</DialogTitle>
+        </DialogHeader>
+        <BaseSSOSettingsForm form={form} onFormSubmit={handleFormSubmit} />
+        <DialogFooter>
+          <div className="flex items-center justify-end gap-2">
+            <Button type="button" variant="outline" onClick={handleCancel} disabled={isPending}>
+              Cancel
+            </Button>
+            <Button
+              type="button"
+              disabled={isPending}
+              onClick={submitMountedSSOValues(form, "sso-settings", handleFormSubmit)}
+            >
+              {isPending && <UiLoadingSpinner className="size-4 mr-1" />}
+              {isPending ? "Saving..." : "Save"}
+            </Button>
+          </div>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx
index 3750ee88183..b99cb59618f 100644
--- a/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/AdminSettings/SSOSettings/RoleMappings.tsx
@@ -1,74 +1,83 @@
 import type { RoleMappings as RoleMappingsType } from "@/app/(dashboard)/hooks/sso/useSSOSettings";
-import { Card, Divider, Table, Tag, Typography } from "antd";
+import type { ColumnDef } from "@tanstack/react-table";
+import { DataTable } from "@/components/shared/DataTable";
+import { Badge } from "@/components/ui/badge";
+import { Card, CardContent } from "@/components/ui/card";
+import { Separator } from "@/components/ui/separator";
 import { Users } from "lucide-react";
 import { defaultRoleDisplayNames } from "./constants";
-const { Title, Text } = Typography;
+
+const inlineCodeClass = "rounded-sm border border-border bg-muted px-1 py-0.5 font-mono text-xs";
+
+interface RoleMappingRow {
+  role: string;
+  groups: string[];
+}
 
 export default function RoleMappings({ roleMappings }: { roleMappings: RoleMappingsType | undefined }) {
   if (!roleMappings) {
     return null;
   }
 
-  const roleMappingsColumns = [
+  const roleMappingsColumns: ColumnDef<RoleMappingRow>[] = [
     {
-      title: "Role",
-      dataIndex: "role",
-      key: "role",
-      render: (text: string) => <Text strong>{defaultRoleDisplayNames[text]}</Text>,
+      id: "role",
+      accessorKey: "role",
+      header: "Role",
+      cell: ({ row }) => <strong className="font-semibold">{defaultRoleDisplayNames[row.original.role]}</strong>,
     },
     {
-      title: "Mapped Groups",
-      dataIndex: "groups",
-      key: "groups",
-      render: (groups: string[]) => (
-        <>
-          {groups.length > 0 ? (
-            groups.map((group, index) => (
-              <Tag key={index} color="blue">
+      id: "groups",
+      accessorKey: "groups",
+      header: "Mapped Groups",
+      cell: ({ row }) =>
+        row.original.groups.length > 0 ? (
+          <div className="flex flex-wrap gap-1">
+            {row.original.groups.map((group, index) => (
+              <Badge key={index} variant="info">
                 {group}
-              </Tag>
-            ))
-          ) : (
-            <Text className="text-gray-400 italic">No groups mapped</Text>
-          )}
-        </>
-      ),
+              </Badge>
+            ))}
+          </div>
+        ) : (
+          <span className="text-gray-400 italic">No groups mapped</span>
+        ),
     },
   ];
   return (
     <Card>
-      <div className="flex items-center gap-3">
-        <Users className="w-6 h-6 text-gray-400 mb-2" />
-        <Title level={3}>Role Mappings</Title>
-      </div>
-      <div className="space-y-8">
-        <div className="grid grid-cols-2 gap-4">
-          <div>
-            <Title level={5}>Group Claim</Title>
-            <div>
-              <Text code>{roleMappings.group_claim}</Text>
-            </div>
-          </div>
-          <div>
-            <Title level={5}>Default Role</Title>
-            <div>
-              <Text strong>{defaultRoleDisplayNames[roleMappings.default_role]}</Text>
-            </div>
-          </div>
+      <CardContent>
+        <div className="flex items-center gap-3">
+          <Users className="w-6 h-6 text-gray-400 mb-2" />
+          <h3 className="mb-2 text-2xl font-semibold text-foreground">Role Mappings</h3>
         </div>
-        <Divider />
-        <Table
-          columns={roleMappingsColumns}
-          dataSource={Object.entries(roleMappings.roles).map(([role, groups]) => ({
-            role,
-            groups,
-          }))}
-          pagination={false}
-          bordered
-          size="small"
-          className="w-full"
-        />
-      </div>
+        <div className="space-y-8">
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <h5 className="mb-2 text-base font-semibold text-foreground">Group Claim</h5>
+              <div>
+                <code className={inlineCodeClass}>{roleMappings.group_claim}</code>
+              </div>
+            </div>
+            <div>
+              <h5 className="mb-2 text-base font-semibold text-foreground">Default Role</h5>
+              <div>
+                <strong className="font-semibold">{defaultRoleDisplayNames[roleMappings.default_role]}</strong>
+              </div>
+            </div>
+          </div>
+          <Separator className="my-6" />
+          <DataTable
+            columns={roleMappingsColumns}
+            data={Object.entries(roleMappings.roles).map(([role, groups]) => ({
+              role,
+              groups,
+            }))}
+            getRowId={(row) => row.role}
+            size="compact"
+          />
+        </div>
+      </CardContent>
     </Card>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx
index 5af85d6989e..868996fa663 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/AddFallbacksModal.tsx
@@ -3,9 +3,9 @@
  * Handles modal visibility and layout, but delegates content to children
  */
 
-import { Modal } from "antd";
 import { ArrowRight } from "lucide-react";
 import React from "react";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddFallbacksModalProps {
   open: boolean;
@@ -15,34 +15,25 @@ interface AddFallbacksModalProps {
 
 export function AddFallbacksModal({ open, onCancel, children }: AddFallbacksModalProps) {
   return (
-    <Modal
-      title={
-        <div className="pb-4 border-b border-gray-100">
-          <div className="flex items-center gap-2 text-gray-800">
-            <div className="p-2 bg-indigo-50 rounded-lg">
-              <ArrowRight className="w-5 h-5 text-indigo-600" />
-            </div>
-            <div>
-              <h2 className="text-lg font-bold m-0">Configure Model Fallbacks</h2>
-              <p className="text-sm text-gray-500 font-normal m-0">
-                Manage multiple fallback chains for different models (up to 5 groups at a time)
-              </p>
+    <Dialog open={open} onOpenChange={(open) => !open && onCancel()} disablePointerDismissal>
+      <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[900px]">
+        <DialogHeader>
+          <div className="pb-4 border-b border-gray-100">
+            <div className="flex items-center gap-2 text-gray-800">
+              <div className="p-2 bg-indigo-50 rounded-lg">
+                <ArrowRight className="w-5 h-5 text-indigo-600" />
+              </div>
+              <div>
+                <DialogTitle className="text-lg font-bold m-0">Configure Model Fallbacks</DialogTitle>
+                <p className="text-sm text-gray-500 font-normal m-0">
+                  Manage multiple fallback chains for different models (up to 5 groups at a time)
+                </p>
+              </div>
             </div>
           </div>
-        </div>
-      }
-      open={open}
-      width={900}
-      footer={null}
-      onCancel={onCancel}
-      maskClosable={false}
-      className="top-8"
-      styles={{
-        body: { padding: "24px" },
-        header: { padding: "24px 24px 0 24px", border: "none" },
-      }}
-    >
-      <div className="mt-6">{children}</div>
-    </Modal>
+        </DialogHeader>
+        <div className="mt-6">{children}</div>
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.test.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.test.tsx
index 225c308af91..c0db38eb187 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.test.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/EditFallbacks.test.tsx
@@ -1,5 +1,5 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { render, screen, waitFor } from "@testing-library/react";
+import { render, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import EditFallbacks, { Fallbacks } from "./EditFallbacks";
@@ -49,10 +49,9 @@ describe("EditFallbacks", () => {
 
   it("prefills the existing fallback chain for the primary model", async () => {
     setup();
-    await waitFor(() => {
-      expect(screen.getByText("gpt-3.5-turbo")).toBeInTheDocument();
-      expect(screen.getByText("claude-3-opus")).toBeInTheDocument();
-    });
+    const chain = await screen.findByRole("list", { name: "Fallback chain" });
+    expect(within(chain).getByText("gpt-3.5-turbo")).toBeInTheDocument();
+    expect(within(chain).getByText("claude-3-opus")).toBeInTheDocument();
   });
 
   it("removes a fallback model and saves only the edited entry", async () => {
@@ -61,8 +60,8 @@ describe("EditFallbacks", () => {
     const onClose = vi.fn();
     setup({ onChange, onClose });
 
-    await screen.findByText("gpt-3.5-turbo");
-    await user.click(screen.getByTestId("remove-fallback-gpt-3.5-turbo"));
+    const chain = await screen.findByRole("list", { name: "Fallback chain" });
+    await user.click(within(chain).getByRole("button", { name: "Remove gpt-3.5-turbo" }));
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
 
@@ -77,8 +76,8 @@ describe("EditFallbacks", () => {
     const onChange = vi.fn().mockResolvedValue(undefined);
     setup({ fallbackEntry: { "gpt-4": ["gpt-3.5-turbo"] }, onChange });
 
-    await screen.findByText("gpt-3.5-turbo");
-    await user.click(screen.getByTestId("remove-fallback-gpt-3.5-turbo"));
+    const chain = await screen.findByRole("list", { name: "Fallback chain" });
+    await user.click(within(chain).getByRole("button", { name: "Remove gpt-3.5-turbo" }));
 
     const saveButton = screen.getByRole("button", { name: /save changes/i });
     expect(saveButton).toBeDisabled();
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 e3a36f4fbf2..129f509dcd9 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackGroupConfig.tsx
@@ -3,10 +3,10 @@
  * Handles primary model selection and fallback chain configuration
  */
 
-import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Select } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { SearchSelect } from "@/components/shared/SearchSelect";
 import { AlertCircle, ArrowDown, X } from "lucide-react";
-import React from "react";
+import React, { useId } from "react";
 
 export interface FallbackGroup {
   id: string;
@@ -64,25 +64,24 @@ export function FallbackGroupConfig({
   };
 
   const canAddMoreFallbacks = group.fallbackModels.length < maxFallbacks;
+  const primaryModelInputId = useId();
 
   return (
     <div className="flex flex-col gap-8 py-4">
       {/* Primary Model Section */}
       <div className="relative">
-        <label className="block text-sm font-semibold text-gray-700 mb-2">
+        <label htmlFor={primaryModelInputId} className="block text-sm font-semibold text-gray-700 mb-2">
           Primary Model <span className="text-red-500">*</span>
         </label>
-        <Select
-          className="w-full h-12"
-          size="large"
-          placeholder="Select primary model"
-          value={group.primaryModel}
-          onChange={handlePrimaryChange}
-          disabled={disablePrimaryModel}
-          showSearch
-          getPopupContainer={(trigger) => trigger.parentElement || document.body}
-          filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+        <SearchSelect
+          inputId={primaryModelInputId}
           options={availableModels.map((m) => ({ label: m, value: m }))}
+          value={group.primaryModel ?? ""}
+          onValueChange={handlePrimaryChange}
+          placeholder="Select primary model"
+          emptyText="No models found"
+          disabled={disablePrimaryModel}
+          className="h-12"
         />
         {!disablePrimaryModel && !group.primaryModel && (
           <div className="mt-2 flex items-center gap-2 text-amber-600 text-xs bg-amber-50 p-2 rounded-sm">
@@ -112,43 +111,16 @@ export function FallbackGroupConfig({
         <div className="bg-gray-50 rounded-xl p-4 border border-gray-200">
           {/* Add Fallback Input */}
           <div className="mb-4">
-            <Select
-              mode="multiple"
-              className="w-full"
-              size="large"
+            <MultiSelect
+              options={availableFallbackOptions.map((m) => ({ label: m, value: m }))}
+              value={group.fallbackModels}
+              onValueChange={handleFallbackSelect}
               placeholder={
                 canAddMoreFallbacks ? "Select fallback models to add..." : `Maximum ${maxFallbacks} fallbacks reached`
               }
-              value={group.fallbackModels}
-              onChange={handleFallbackSelect}
+              emptyText="No models found"
               disabled={!group.primaryModel}
-              getPopupContainer={(trigger) => trigger.parentElement || document.body}
-              options={availableFallbackOptions.map((m) => ({
-                label: m,
-                value: m,
-              }))}
-              optionRender={(option, info) => {
-                const isSelected = group.fallbackModels.includes(option.value as string);
-                const orderIndex = isSelected ? group.fallbackModels.indexOf(option.value as string) + 1 : null;
-                return (
-                  <div className="flex items-center gap-2">
-                    {isSelected && orderIndex !== null && (
-                      <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>
-                    )}
-                    <span>{option.label}</span>
-                  </div>
-                );
-              }}
-              maxTagCount="responsive"
-              maxTagPlaceholder={(omittedValues) => (
-                <SimpleTooltip content={omittedValues.map(({ value }) => value).join(", ")}>
-                  <span>+{omittedValues.length} more</span>
-                </SimpleTooltip>
-              )}
-              showSearch
-              filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+              className="w-full"
             />
             <p className="text-xs text-gray-500 mt-1 ml-1">
               {canAddMoreFallbacks
@@ -165,9 +137,9 @@ export function FallbackGroupConfig({
                 <span className="text-xs mt-1">Add models from the dropdown above</span>
               </div>
             ) : (
-              group.fallbackModels.map((modelValue, index) => {
-                return (
-                  <div
+              <ol aria-label="Fallback chain" className="space-y-2">
+                {group.fallbackModels.map((modelValue, index) => (
+                  <li
                     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-xs transition-all"
                   >
@@ -182,15 +154,15 @@ export function FallbackGroupConfig({
 
                     <button
                       type="button"
-                      data-testid={`remove-fallback-${modelValue}`}
+                      aria-label={`Remove ${modelValue}`}
                       onClick={() => removeFallback(index)}
                       className="opacity-0 group-hover:opacity-100 transition-opacity text-gray-400 hover:text-red-500 p-1"
                     >
                       <X className="w-4 h-4" />
                     </button>
-                  </div>
-                );
-              })
+                  </li>
+                ))}
+              </ol>
             )}
           </div>
         </div>
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.test.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.test.tsx
index ac9b4d98aed..738040149f0 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.test.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from "@testing-library/react";
+import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { FallbackSelectionForm } from "./FallbackSelectionForm";
@@ -69,7 +69,7 @@ describe("FallbackSelectionForm", () => {
       <FallbackSelectionForm groups={groups} onGroupsChange={mockOnGroupsChange} availableModels={AVAILABLE_MODELS} />,
     );
 
-    const addTabButton = screen.getByRole("button", { name: /add tab/i });
+    const addTabButton = screen.getByRole("button", { name: /add fallback group/i });
     await user.click(addTabButton);
 
     expect(mockOnGroupsChange).toHaveBeenCalledTimes(1);
@@ -98,7 +98,7 @@ describe("FallbackSelectionForm", () => {
         maxGroups={5}
       />,
     );
-    expect(screen.queryByRole("button", { name: /add tab/i })).not.toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: /add fallback group/i })).not.toBeInTheDocument();
   });
 
   it("should show add tab button when below maxGroups with custom maxGroups", () => {
@@ -111,7 +111,7 @@ describe("FallbackSelectionForm", () => {
         maxGroups={3}
       />,
     );
-    expect(screen.getByRole("button", { name: /add tab/i })).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: /add fallback group/i })).toBeInTheDocument();
   });
 
   it("should call onGroupsChange when a group is removed", async () => {
@@ -124,7 +124,8 @@ describe("FallbackSelectionForm", () => {
       <FallbackSelectionForm groups={groups} onGroupsChange={mockOnGroupsChange} availableModels={AVAILABLE_MODELS} />,
     );
 
-    const removeButtons = screen.getAllByRole("tab", { name: "remove" });
+    const removeButtons = screen.getAllByRole("button", { name: /^remove /i });
+    expect(removeButtons).toHaveLength(2);
     await user.click(removeButtons[0]);
 
     expect(mockOnGroupsChange).toHaveBeenCalledTimes(1);
@@ -139,7 +140,7 @@ describe("FallbackSelectionForm", () => {
     render(
       <FallbackSelectionForm groups={groups} onGroupsChange={mockOnGroupsChange} availableModels={AVAILABLE_MODELS} />,
     );
-    expect(screen.getByText("Select primary model")).toBeInTheDocument();
+    expect(screen.getByRole("combobox", { name: /primary model/i })).toHaveValue("");
     expect(screen.getByText("Primary Model")).toBeInTheDocument();
   });
 
@@ -150,7 +151,8 @@ describe("FallbackSelectionForm", () => {
     );
     expect(screen.getByRole("tab", { name: "gpt-4" })).toBeInTheDocument();
     expect(screen.getAllByText("gpt-4").length).toBeGreaterThan(0);
-    expect(screen.getByText("gpt-3.5-turbo")).toBeInTheDocument();
+    const chain = screen.getByRole("list", { name: "Fallback chain" });
+    expect(within(chain).getByText("gpt-3.5-turbo")).toBeInTheDocument();
   });
 
   it("should not add group when add button clicked at maxGroups", () => {
@@ -168,7 +170,7 @@ describe("FallbackSelectionForm", () => {
       />,
     );
 
-    expect(screen.queryByRole("button", { name: /add tab/i })).not.toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: /add fallback group/i })).not.toBeInTheDocument();
     expect(mockOnGroupsChange).not.toHaveBeenCalled();
   });
 });
diff --git a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx
index 10bbcd9ba3b..2639171fbe8 100644
--- a/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx
+++ b/ui/litellm-dashboard/src/components/Settings/RouterSettings/Fallbacks/FallbackSelectionForm.tsx
@@ -5,8 +5,8 @@
  */
 
 import { Button } from "@/components/ui/button";
-import { Tabs } from "antd";
-import { Plus } from "lucide-react";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Plus, X } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { toast } from "@/lib/toast";
 import { FallbackGroup, FallbackGroupConfig } from "./FallbackGroupConfig";
@@ -76,23 +76,8 @@ export function FallbackSelectionForm({
     onGroupsChange(newGroups);
   };
 
-  // Generate tab items
-  const items = groups.map((group, index) => {
-    const label = group.primaryModel ? group.primaryModel : `Group ${index + 1}`;
-    return {
-      key: group.id,
-      label: label,
-      closable: groups.length > 1, // Only allow closing if there's more than 1 group
-      children: (
-        <FallbackGroupConfig
-          group={group}
-          onChange={handleGroupUpdate}
-          availableModels={availableModels}
-          maxFallbacks={maxFallbacks}
-        />
-      ),
-    };
-  });
+  const groupLabel = (group: FallbackGroup, index: number) =>
+    group.primaryModel ? group.primaryModel : `Group ${index + 1}`;
 
   if (groups.length === 0) {
     return (
@@ -107,22 +92,47 @@ export function FallbackSelectionForm({
   }
 
   return (
-    <Tabs
-      type="editable-card"
-      activeKey={activeKey}
-      onChange={setActiveKey}
-      onEdit={(targetKey, action) => {
-        if (action === "add") handleAddGroup();
-        else if (action === "remove" && groups.length > 1) {
-          handleRemoveGroup(targetKey as string);
-        }
-      }}
-      items={items}
-      className="fallback-tabs"
-      tabBarStyle={{
-        marginBottom: 0,
-      }}
-      hideAdd={groups.length >= maxGroups}
-    />
+    <Tabs value={activeKey} onValueChange={setActiveKey}>
+      <div className="flex items-center border-b">
+        <TabsList variant="line" className="h-auto justify-start rounded-none p-0">
+          {groups.map((group, index) => (
+            <div key={group.id} className="relative flex items-center">
+              <TabsTrigger
+                value={group.id}
+                className={`flex-none rounded-none py-2 pl-4 ${groups.length > 1 ? "pr-9" : "pr-4"}`}
+              >
+                {groupLabel(group, index)}
+              </TabsTrigger>
+              {groups.length > 1 && (
+                <Button
+                  variant="ghost"
+                  size="icon-xs"
+                  className="absolute right-1"
+                  aria-label={`Remove ${groupLabel(group, index)}`}
+                  onClick={() => handleRemoveGroup(group.id)}
+                >
+                  <X />
+                </Button>
+              )}
+            </div>
+          ))}
+        </TabsList>
+        {groups.length < maxGroups && (
+          <Button variant="ghost" size="icon-sm" aria-label="Add fallback group" onClick={handleAddGroup}>
+            <Plus />
+          </Button>
+        )}
+      </div>
+      {groups.map((group) => (
+        <TabsContent key={group.id} value={group.id} className="pt-4">
+          <FallbackGroupConfig
+            group={group}
+            onChange={handleGroupUpdate}
+            availableModels={availableModels}
+            maxFallbacks={maxFallbacks}
+          />
+        </TabsContent>
+      ))}
+    </Tabs>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/Teams.test.tsx b/ui/litellm-dashboard/src/components/Teams.test.tsx
index d0d41837dce..bee35ac5c5d 100644
--- a/ui/litellm-dashboard/src/components/Teams.test.tsx
+++ b/ui/litellm-dashboard/src/components/Teams.test.tsx
@@ -1,5 +1,5 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { act, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { NuqsTestingAdapter, OnUrlUpdateFunction } from "nuqs/adapters/testing";
 import React from "react";
@@ -504,6 +504,15 @@ describe("Teams - team detail deep link (?team=)", () => {
     expect(onUrlUpdate.mock.calls.at(-1)![0].searchParams.has("team")).toBe(false);
     await waitFor(() => expect(screen.queryByTestId("team-info-view")).not.toBeInTheDocument());
   });
+
+  it("should preserve the legacy inset for the team detail view", async () => {
+    renderWithQueryClient(<Teams accessToken="test-token" userID="user-123" userRole="Admin" />, {
+      searchParams: "?team=team-from-url",
+    });
+
+    await waitFor(() => expect(mockTeamInfoView).toHaveBeenCalled());
+    expect(screen.getByRole("main")).toHaveClass("px-12", "py-6");
+  });
 });
 
 describe("Teams - Create Team CTA is grouped with the tabs on the left", () => {
@@ -512,21 +521,19 @@ describe("Teams - Create Team CTA is grouped with the tabs on the left", () => {
     mockUseOrganizations.mockReturnValue({ data: [] });
   });
 
-  it("renders the Create Team button inside the tab bar, ahead of the tabs", () => {
+  it("should render the Create Team button inside the tab bar, ahead of the tabs", () => {
     renderWithQueryClient(<Teams accessToken="test-token" userID="user-123" userRole="Admin" />);
 
-    const createButton = screen.getByTestId("create-team-button");
-    const tabBar = screen.getByRole("tablist").parentElement!;
+    const tabNav = screen.getByRole("tablist");
+    const createButton = within(tabNav).getByTestId("create-team-button");
+    const firstTab = within(tabNav).getByRole("tab", { name: "Your Teams" });
 
-    // The CTA lives in the tab bar's left slot, not the standalone page header.
-    expect(tabBar.contains(createButton)).toBe(true);
-
-    // It reads as the left end of the cluster: it precedes the first tab in DOM order.
-    const firstTab = screen.getByRole("tab", { name: "Your Teams" });
+    expect(screen.getByRole("main")).toHaveClass("p-8");
+    expect(within(tabNav).getByRole("separator")).toBeInTheDocument();
     expect(createButton.compareDocumentPosition(firstTab) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
   });
 
-  it("omits the Create Team CTA for a role that cannot manage teams", () => {
+  it("should omit the Create Team CTA for a role that cannot manage teams", () => {
     renderWithQueryClient(<Teams accessToken="test-token" userID="user-123" userRole="Admin Viewer" />);
     expect(screen.queryByTestId("create-team-button")).not.toBeInTheDocument();
   });
diff --git a/ui/litellm-dashboard/src/components/Teams.tsx b/ui/litellm-dashboard/src/components/Teams.tsx
index 94e84c6e721..8d9fdd7598f 100644
--- a/ui/litellm-dashboard/src/components/Teams.tsx
+++ b/ui/litellm-dashboard/src/components/Teams.tsx
@@ -15,7 +15,7 @@ import { SearchSelect } from "@/components/shared/SearchSelect";
 import { labelWithDocsHint, labelWithHint } from "@/components/shared/form/LabelWithHint";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { TagsInput } from "@/app/(dashboard)/guardrails/_components/content_filter/TagsInput";
-import { Layout, Modal, Tabs, theme } from "antd";
+import { Layout, Tabs } from "antd";
 import { ChevronDown, Plus, Users } from "lucide-react";
 import React, { useEffect, useMemo, useState } from "react";
 import { z } from "zod/v4";
@@ -50,6 +50,7 @@ import { Organization, getDefaultTeamSettings, getGuardrailsList, getPoliciesLis
 import NumericalInput from "./shared/numerical_input";
 import VectorStoreSelector from "./vector_store_management/VectorStoreSelector";
 import SearchToolSelector from "./search_tools/SearchToolSelector";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface TeamProps {
   accessToken: string | null;
@@ -331,11 +332,6 @@ const Teams: React.FC<TeamProps> = ({ accessToken, userID, userRole, premiumUser
     setRouterSettingsKey((prev) => prev + 1);
   };
 
-  const handleOk = () => {
-    setIsTeamModalVisible(false);
-    resetCreateForm();
-  };
-
   const handleCancel = () => {
     setIsTeamModalVisible(false);
     resetCreateForm();
@@ -546,7 +542,6 @@ const Teams: React.FC<TeamProps> = ({ accessToken, userID, userRole, premiumUser
     return false;
   };
 
-  const { token } = theme.useToken();
   const { Content } = Layout;
 
   const tabItems = [
@@ -616,7 +611,7 @@ const Teams: React.FC<TeamProps> = ({ accessToken, userID, userRole, premiumUser
   ];
 
   return (
-    <Content style={{ padding: token.paddingLG, paddingInline: token.paddingLG * 2 }}>
+    <Content className={selectedTeamId ? "px-12 py-6" : "p-8"}>
       {selectedTeamId ? (
         <TeamInfoView
           teamId={selectedTeamId}
@@ -636,575 +631,577 @@ const Teams: React.FC<TeamProps> = ({ accessToken, userID, userRole, premiumUser
           premiumUser={premiumUser}
         />
       ) : (
-        <>
-          <div className="mb-4">
-            <PageHeader
-              icon={<Users className="size-5" />}
-              title="Teams"
-              subtitle="Manage teams, members, and their access to models and budgets"
+        <PageHeader
+          icon={<Users />}
+          title="Teams"
+          subtitle="Manage teams, members, and their access to models and budgets"
+          primaryAction={
+            canCreateOrManageTeams(userRole, userID, organizations) ? (
+              <UIButton onClick={() => setIsTeamModalVisible(true)} data-testid="create-team-button">
+                <Plus className="size-4" />
+                Create Team
+              </UIButton>
+            ) : undefined
+          }
+          tabs={({ leadingControls }) => (
+            <Tabs
+              items={tabItems}
+              tabBarExtraContent={{ left: leadingControls }}
+              className="[&>.ant-tabs-nav]:!mb-6 [&>.ant-tabs-nav]:before:!border-b-0 [&_.ant-tabs-ink-bar]:!h-0.5 [&_.ant-tabs-tab]:!py-[7px] [&_.ant-tabs-tab+_.ant-tabs-tab]:!ml-[22px] [&_.ant-tabs-tab-active]:font-semibold"
             />
-          </div>
-
-          <Tabs
-            items={tabItems}
-            tabBarExtraContent={{
-              left: canCreateOrManageTeams(userRole, userID, organizations) ? (
-                <div className="flex items-center gap-4 pr-4">
-                  <UIButton onClick={() => setIsTeamModalVisible(true)} data-testid="create-team-button">
-                    <Plus className="size-4" />
-                    Create Team
-                  </UIButton>
-                  <div className="h-6 w-px bg-gray-200" />
-                </div>
-              ) : undefined,
-            }}
-          />
-        </>
+          )}
+        />
       )}
 
       {canCreateOrManageTeams(userRole, userID, organizations) && (
-        <Modal
-          title="Create Team"
-          open={isTeamModalVisible}
-          width={1000}
-          footer={null}
-          onOk={handleOk}
-          onCancel={handleCancel}
-          destroyOnHidden
-        >
-          <TooltipProvider>
-            <form onSubmit={form.handleSubmit(onCreateSubmit)}>
-              <FieldGroup>
-                <FormField control={form.control} name="team_alias" label="Team Name">
-                  {({ ref, value, ...field }) => (
-                    <UIInput {...field} ref={ref} value={value ?? ""} data-testid="team-name-input" />
-                  )}
-                </FormField>
-                {(() => {
-                  const adminOrgs = getAdminOrganizations(userRole, userID, organizations);
-                  const isSingleOrg = adminOrgs.length === 1;
-                  const hasNoOrgs = adminOrgs.length === 0;
+        <Dialog open={isTeamModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+          <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[1000px]">
+            <DialogHeader>
+              <DialogTitle>Create Team</DialogTitle>
+            </DialogHeader>
+            <TooltipProvider>
+              <form onSubmit={form.handleSubmit(onCreateSubmit)}>
+                <FieldGroup>
+                  <FormField control={form.control} name="team_alias" label="Team Name">
+                    {({ ref, value, ...field }) => (
+                      <UIInput {...field} ref={ref} value={value ?? ""} data-testid="team-name-input" />
+                    )}
+                  </FormField>
+                  {(() => {
+                    const adminOrgs = getAdminOrganizations(userRole, userID, organizations);
+                    const isSingleOrg = adminOrgs.length === 1;
+                    const hasNoOrgs = adminOrgs.length === 0;
 
-                  return (
-                    <>
-                      <FormField
-                        control={form.control}
-                        name="organization_id"
-                        className="mt-8"
-                        label={labelWithDocsHint(
-                          "Organization",
-                          "Organizations can have multiple teams. Learn more about the user management hierarchy",
-                          "https://docs.litellm.ai/docs/proxy/user_management_heirarchy",
-                        )}
-                        description={
-                          isOrgAdmin && isSingleOrg
-                            ? "You can only create teams within this organization"
-                            : isOrgAdmin
-                              ? "required"
-                              : undefined
-                        }
-                      >
-                        {({ id, value, onChange }) => (
-                          <SearchSelect
-                            inputId={id}
-                            value={value ?? ""}
-                            options={adminOrgs.map((org) => ({
-                              value: org.organization_id ?? "",
-                              label: org.organization_alias ?? "",
-                              sublabel: org.organization_id ?? "",
-                            }))}
-                            disabled={isOrgAdmin && isSingleOrg}
-                            allowClear={!isOrgAdmin}
-                            placeholder={hasNoOrgs ? "No organizations available" : "Search or select an Organization"}
-                            emptyText="No organizations available"
-                            onValueChange={(next) => {
-                              onChange(next === "" ? null : next);
-                              setCurrentOrgForCreateTeam(adminOrgs.find((org) => org.organization_id === next) ?? null);
-                            }}
-                          />
-                        )}
-                      </FormField>
-
-                      {isOrgAdmin && !isSingleOrg && adminOrgs.length > 1 && (
-                        <div className="mb-8 rounded-md border border-blue-200 bg-blue-50 p-4">
-                          <span className="text-sm text-blue-800">
-                            Please select an organization to create a team for. You can only create teams within
-                            organizations where you are an admin.
-                          </span>
-                        </div>
-                      )}
-                    </>
-                  );
-                })()}
-                <FormField
-                  control={form.control}
-                  name="models"
-                  label={labelWithHint(
-                    "Models",
-                    "These are the models that your selected team has access to. Leave empty to grant no models directly, e.g. when the team gets its models from access groups",
-                  )}
-                >
-                  {({ id, value, onChange }) => (
-                    <ModelSelect
-                      id={id}
-                      value={value ?? []}
-                      onChange={onChange}
-                      organizationID={watchedOrganizationId ?? undefined}
-                      options={{
-                        includeSpecialOptions: true,
-                        showAllProxyModelsOverride: !watchedOrganizationId,
-                      }}
-                      context="team"
-                      dataTestId="create-team-models-select"
-                    />
-                  )}
-                </FormField>
-
-                <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
-                  {({ ref, value, ...field }) => (
-                    <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} width={200} />
-                  )}
-                </FormField>
-                <FormField control={form.control} name="budget_duration" className="mt-8" label="Reset Budget">
-                  {({ id, value, onChange }) => (
-                    <BudgetDurationDropdown
-                      id={id}
-                      showNeverResets
-                      placeholder={budgetDurationPlaceholder}
-                      value={value}
-                      onChange={onChange}
-                    />
-                  )}
-                </FormField>
-                <FormField control={form.control} name="tpm_limit" label="Tokens per minute Limit (TPM)">
-                  {({ ref, value, ...field }) => (
-                    <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
-                  )}
-                </FormField>
-                <FormField control={form.control} name="rpm_limit" label="Requests per minute Limit (RPM)">
-                  {({ ref, value, ...field }) => (
-                    <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
-                  )}
-                </FormField>
-                <Field>
-                  <FieldLabel>Metadata</FieldLabel>
-                  <MetadataKeyValueFields
-                    control={form.control}
-                    getValues={form.getValues}
-                    name="metadata"
-                    schemaFields={teamMetadataSchemaFields}
-                    schemaLoading={isTeamMetadataSchemaLoading}
-                  />
-                  <FieldDescription>
-                    Values are saved as text. Enter JSON for typed values, e.g. 3, true, or {'{"region": "us"}'}.
-                  </FieldDescription>
-                </Field>
-
-                <Collapsible
-                  open={additionalSettingsOpen}
-                  onOpenChange={setAdditionalSettingsOpen}
-                  className="mt-20 mb-8 overflow-hidden rounded-lg border"
-                >
-                  <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                    <b>Additional Settings</b>
-                    <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <FieldGroup>
-                      <FormField
-                        control={form.control}
-                        name="team_id"
-                        label="Team ID"
-                        description="ID of the team you want to create. If not provided, it will be generated automatically."
-                      >
-                        {({ ref, value, ...field }) => <UIInput {...field} ref={ref} value={value ?? ""} />}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="team_member_budget"
-                        label={labelWithHint(
-                          "Team Member Budget (USD)",
-                          "This is the individual budget for a user in the team.",
-                        )}
-                      >
-                        {({ ref, value, onChange, ...field }) => (
-                          <NumericalInput
-                            {...field}
-                            ref={ref}
-                            value={value ?? ""}
-                            onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                              onChange(event.target.value ? Number(event.target.value) : undefined)
-                            }
-                            step={0.01}
-                            precision={2}
-                            width={200}
-                          />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="team_member_key_duration"
-                        label={labelWithHint(
-                          "Team Member Key Duration (eg: 1d, 1mo)",
-                          "Set a limit to the duration of a team member's key. Format: 30s (seconds), 30m (minutes), 30h (hours), 30d (days), 1mo (month)",
-                        )}
-                      >
-                        {({ ref, value, ...field }) => (
-                          <UIInput {...field} ref={ref} value={value ?? ""} placeholder="e.g., 30d" />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="team_member_rpm_limit"
-                        label={labelWithHint(
-                          "Team Member RPM Limit",
-                          "The RPM (Requests Per Minute) limit for individual team members",
-                        )}
-                      >
-                        {({ ref, value, ...field }) => (
-                          <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="team_member_tpm_limit"
-                        label={labelWithHint(
-                          "Team Member TPM Limit",
-                          "The TPM (Tokens Per Minute) limit for individual team members",
-                        )}
-                      >
-                        {({ ref, value, ...field }) => (
-                          <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="secret_manager_settings"
-                        label="Secret Manager Settings"
-                        description={
-                          premiumUser
-                            ? "Enter secret manager configuration as a JSON object."
-                            : "Premium feature - Upgrade to manage secret manager settings."
-                        }
-                      >
-                        {({ ref, value, ...field }) => (
-                          <Textarea
-                            {...field}
-                            ref={ref}
-                            value={value ?? ""}
-                            rows={4}
-                            placeholder='{"namespace": "admin", "mount": "secret", "path_prefix": "litellm"}'
-                            disabled={!premiumUser}
-                          />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="guardrails"
-                        className="mt-8"
-                        label={labelWithDocsHint(
-                          "Guardrails",
-                          "Setup your first guardrail",
-                          "https://docs.litellm.ai/docs/proxy/guardrails/quick_start",
-                        )}
-                        description="Select existing guardrails or enter new ones"
-                      >
-                        {({ id, value, onChange }) => (
-                          <TagsInput
-                            id={id}
-                            value={value ?? []}
-                            onValueChange={onChange}
-                            options={guardrailsList.map((name) => ({ value: name, label: name }))}
-                            placeholder="Select or enter guardrails"
-                          />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="disable_global_guardrails"
-                        className="mt-4"
-                        label={labelWithHint(
-                          "Disable Global Guardrails",
-                          "When enabled, this team will bypass any guardrails configured to run on every request (global guardrails)",
-                        )}
-                        description={
-                          premiumUser
-                            ? "Bypass global guardrails for this team"
-                            : "Premium feature - Upgrade to disable global guardrails by team"
-                        }
-                      >
-                        {({ id, value, onChange }) => (
-                          <Switch id={id} disabled={!premiumUser} checked={value === true} onCheckedChange={onChange} />
-                        )}
-                      </FormField>
-                      {canViewPolicies && (
+                    return (
+                      <>
                         <FormField
                           control={form.control}
-                          name="policies"
+                          name="organization_id"
                           className="mt-8"
                           label={labelWithDocsHint(
-                            "Policies",
-                            "Apply policies to this team to control guardrails and other settings",
-                            "https://docs.litellm.ai/docs/proxy/guardrails/guardrail_policies",
+                            "Organization",
+                            "Organizations can have multiple teams. Learn more about the user management hierarchy",
+                            "https://docs.litellm.ai/docs/proxy/user_management_heirarchy",
                           )}
-                          description="Select existing policies or enter new ones"
+                          description={
+                            isOrgAdmin && isSingleOrg
+                              ? "You can only create teams within this organization"
+                              : isOrgAdmin
+                                ? "required"
+                                : undefined
+                          }
+                        >
+                          {({ id, value, onChange }) => (
+                            <SearchSelect
+                              inputId={id}
+                              value={value ?? ""}
+                              options={adminOrgs.map((org) => ({
+                                value: org.organization_id ?? "",
+                                label: org.organization_alias ?? "",
+                                sublabel: org.organization_id ?? "",
+                              }))}
+                              disabled={isOrgAdmin && isSingleOrg}
+                              allowClear={!isOrgAdmin}
+                              placeholder={
+                                hasNoOrgs ? "No organizations available" : "Search or select an Organization"
+                              }
+                              emptyText="No organizations available"
+                              onValueChange={(next) => {
+                                onChange(next === "" ? null : next);
+                                setCurrentOrgForCreateTeam(
+                                  adminOrgs.find((org) => org.organization_id === next) ?? null,
+                                );
+                              }}
+                            />
+                          )}
+                        </FormField>
+
+                        {isOrgAdmin && !isSingleOrg && adminOrgs.length > 1 && (
+                          <div className="mb-8 rounded-md border border-blue-200 bg-blue-50 p-4">
+                            <span className="text-sm text-blue-800">
+                              Please select an organization to create a team for. You can only create teams within
+                              organizations where you are an admin.
+                            </span>
+                          </div>
+                        )}
+                      </>
+                    );
+                  })()}
+                  <FormField
+                    control={form.control}
+                    name="models"
+                    label={labelWithHint(
+                      "Models",
+                      "These are the models that your selected team has access to. Leave empty to grant no models directly, e.g. when the team gets its models from access groups",
+                    )}
+                  >
+                    {({ id, value, onChange }) => (
+                      <ModelSelect
+                        id={id}
+                        value={value ?? []}
+                        onChange={onChange}
+                        organizationID={watchedOrganizationId ?? undefined}
+                        options={{
+                          includeSpecialOptions: true,
+                          showAllProxyModelsOverride: !watchedOrganizationId,
+                        }}
+                        context="team"
+                        dataTestId="create-team-models-select"
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
+                    {({ ref, value, ...field }) => (
+                      <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} width={200} />
+                    )}
+                  </FormField>
+                  <FormField control={form.control} name="budget_duration" className="mt-8" label="Reset Budget">
+                    {({ id, value, onChange }) => (
+                      <BudgetDurationDropdown
+                        id={id}
+                        showNeverResets
+                        placeholder={budgetDurationPlaceholder}
+                        value={value}
+                        onChange={onChange}
+                      />
+                    )}
+                  </FormField>
+                  <FormField control={form.control} name="tpm_limit" label="Tokens per minute Limit (TPM)">
+                    {({ ref, value, ...field }) => (
+                      <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
+                    )}
+                  </FormField>
+                  <FormField control={form.control} name="rpm_limit" label="Requests per minute Limit (RPM)">
+                    {({ ref, value, ...field }) => (
+                      <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
+                    )}
+                  </FormField>
+                  <Field>
+                    <FieldLabel>Metadata</FieldLabel>
+                    <MetadataKeyValueFields
+                      control={form.control}
+                      getValues={form.getValues}
+                      name="metadata"
+                      schemaFields={teamMetadataSchemaFields}
+                      schemaLoading={isTeamMetadataSchemaLoading}
+                    />
+                    <FieldDescription>
+                      Values are saved as text. Enter JSON for typed values, e.g. 3, true, or {'{"region": "us"}'}.
+                    </FieldDescription>
+                  </Field>
+
+                  <Collapsible
+                    open={additionalSettingsOpen}
+                    onOpenChange={setAdditionalSettingsOpen}
+                    className="mt-20 mb-8 overflow-hidden rounded-lg border"
+                  >
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Additional Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <FieldGroup>
+                        <FormField
+                          control={form.control}
+                          name="team_id"
+                          label="Team ID"
+                          description="ID of the team you want to create. If not provided, it will be generated automatically."
+                        >
+                          {({ ref, value, ...field }) => <UIInput {...field} ref={ref} value={value ?? ""} />}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_budget"
+                          label={labelWithHint(
+                            "Team Member Budget (USD)",
+                            "This is the individual budget for a user in the team.",
+                          )}
+                        >
+                          {({ ref, value, onChange, ...field }) => (
+                            <NumericalInput
+                              {...field}
+                              ref={ref}
+                              value={value ?? ""}
+                              onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                                onChange(event.target.value ? Number(event.target.value) : undefined)
+                              }
+                              step={0.01}
+                              precision={2}
+                              width={200}
+                            />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_key_duration"
+                          label={labelWithHint(
+                            "Team Member Key Duration (eg: 1d, 1mo)",
+                            "Set a limit to the duration of a team member's key. Format: 30s (seconds), 30m (minutes), 30h (hours), 30d (days), 1mo (month)",
+                          )}
+                        >
+                          {({ ref, value, ...field }) => (
+                            <UIInput {...field} ref={ref} value={value ?? ""} placeholder="e.g., 30d" />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_rpm_limit"
+                          label={labelWithHint(
+                            "Team Member RPM Limit",
+                            "The RPM (Requests Per Minute) limit for individual team members",
+                          )}
+                        >
+                          {({ ref, value, ...field }) => (
+                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_tpm_limit"
+                          label={labelWithHint(
+                            "Team Member TPM Limit",
+                            "The TPM (Tokens Per Minute) limit for individual team members",
+                          )}
+                        >
+                          {({ ref, value, ...field }) => (
+                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} width={400} />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="secret_manager_settings"
+                          label="Secret Manager Settings"
+                          description={
+                            premiumUser
+                              ? "Enter secret manager configuration as a JSON object."
+                              : "Premium feature - Upgrade to manage secret manager settings."
+                          }
+                        >
+                          {({ ref, value, ...field }) => (
+                            <Textarea
+                              {...field}
+                              ref={ref}
+                              value={value ?? ""}
+                              rows={4}
+                              placeholder='{"namespace": "admin", "mount": "secret", "path_prefix": "litellm"}'
+                              disabled={!premiumUser}
+                            />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="guardrails"
+                          className="mt-8"
+                          label={labelWithDocsHint(
+                            "Guardrails",
+                            "Setup your first guardrail",
+                            "https://docs.litellm.ai/docs/proxy/guardrails/quick_start",
+                          )}
+                          description="Select existing guardrails or enter new ones"
                         >
                           {({ id, value, onChange }) => (
                             <TagsInput
                               id={id}
                               value={value ?? []}
                               onValueChange={onChange}
-                              options={policiesList.map((name) => ({ value: name, label: name }))}
-                              placeholder="Select or enter policies"
+                              options={guardrailsList.map((name) => ({ value: name, label: name }))}
+                              placeholder="Select or enter guardrails"
                             />
                           )}
                         </FormField>
-                      )}
-                      <FormField
-                        control={form.control}
-                        name="access_group_ids"
-                        className="mt-8"
-                        label={labelWithHint(
-                          "Access Groups",
-                          "Assign access groups to this team. Access groups control which models, MCP servers, and agents this team can use",
+                        <FormField
+                          control={form.control}
+                          name="disable_global_guardrails"
+                          className="mt-4"
+                          label={labelWithHint(
+                            "Disable Global Guardrails",
+                            "When enabled, this team will bypass any guardrails configured to run on every request (global guardrails)",
+                          )}
+                          description={
+                            premiumUser
+                              ? "Bypass global guardrails for this team"
+                              : "Premium feature - Upgrade to disable global guardrails by team"
+                          }
+                        >
+                          {({ id, value, onChange }) => (
+                            <Switch
+                              id={id}
+                              disabled={!premiumUser}
+                              checked={value === true}
+                              onCheckedChange={onChange}
+                            />
+                          )}
+                        </FormField>
+                        {canViewPolicies && (
+                          <FormField
+                            control={form.control}
+                            name="policies"
+                            className="mt-8"
+                            label={labelWithDocsHint(
+                              "Policies",
+                              "Apply policies to this team to control guardrails and other settings",
+                              "https://docs.litellm.ai/docs/proxy/guardrails/guardrail_policies",
+                            )}
+                            description="Select existing policies or enter new ones"
+                          >
+                            {({ id, value, onChange }) => (
+                              <TagsInput
+                                id={id}
+                                value={value ?? []}
+                                onValueChange={onChange}
+                                options={policiesList.map((name) => ({ value: name, label: name }))}
+                                placeholder="Select or enter policies"
+                              />
+                            )}
+                          </FormField>
                         )}
-                        description="Select access groups to assign to this team"
-                      >
-                        {({ value, onChange }) => (
-                          <AccessGroupSelector
-                            value={value}
-                            onChange={onChange}
-                            placeholder="Select access groups (optional)"
-                          />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="allowed_vector_store_ids"
-                        className="mt-8"
-                        label={labelWithHint(
-                          "Allowed Vector Stores",
-                          "Select which vector stores this team can access by default. Leave empty for access to all vector stores",
-                        )}
-                        description="Select vector stores this team can access. Leave empty for access to all vector stores"
-                      >
-                        {({ value, onChange }) => (
-                          <VectorStoreSelector
-                            onChange={onChange}
-                            value={value}
-                            accessToken={accessToken || ""}
-                            placeholder="Select vector stores (optional)"
-                          />
-                        )}
-                      </FormField>
-                      <FormField
-                        control={form.control}
-                        name="allowed_passthrough_routes"
-                        className="mt-8"
-                        label={
-                          !premiumUser
-                            ? labelWithHint(
-                                "Allowed Pass Through Routes",
-                                "Premium feature - Upgrade to set allowed pass through routes",
-                              )
-                            : !isProxyAdminRole(userRole || "")
+                        <FormField
+                          control={form.control}
+                          name="access_group_ids"
+                          className="mt-8"
+                          label={labelWithHint(
+                            "Access Groups",
+                            "Assign access groups to this team. Access groups control which models, MCP servers, and agents this team can use",
+                          )}
+                          description="Select access groups to assign to this team"
+                        >
+                          {({ value, onChange }) => (
+                            <AccessGroupSelector
+                              value={value}
+                              onChange={onChange}
+                              placeholder="Select access groups (optional)"
+                            />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="allowed_vector_store_ids"
+                          className="mt-8"
+                          label={labelWithHint(
+                            "Allowed Vector Stores",
+                            "Select which vector stores this team can access by default. Leave empty for access to all vector stores",
+                          )}
+                          description="Select vector stores this team can access. Leave empty for access to all vector stores"
+                        >
+                          {({ value, onChange }) => (
+                            <VectorStoreSelector
+                              onChange={onChange}
+                              value={value}
+                              accessToken={accessToken || ""}
+                              placeholder="Select vector stores (optional)"
+                            />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="allowed_passthrough_routes"
+                          className="mt-8"
+                          label={
+                            !premiumUser
                               ? labelWithHint(
                                   "Allowed Pass Through Routes",
-                                  "Only proxy admins can set allowed pass through routes",
+                                  "Premium feature - Upgrade to set allowed pass through routes",
                                 )
-                              : "Allowed Pass Through Routes"
-                        }
+                              : !isProxyAdminRole(userRole || "")
+                                ? labelWithHint(
+                                    "Allowed Pass Through Routes",
+                                    "Only proxy admins can set allowed pass through routes",
+                                  )
+                                : "Allowed Pass Through Routes"
+                          }
+                        >
+                          {({ value, onChange }) => (
+                            <PassThroughRoutesSelector
+                              value={value}
+                              onChange={onChange}
+                              accessToken={accessToken || ""}
+                              placeholder="Select pass through routes (optional)"
+                              disabled={!premiumUser || !isProxyAdminRole(userRole || "")}
+                            />
+                          )}
+                        </FormField>
+                      </FieldGroup>
+                    </CollapsibleContent>
+                  </Collapsible>
+
+                  <Collapsible
+                    open={mcpSettingsOpen}
+                    onOpenChange={setMcpSettingsOpen}
+                    className="mt-8 mb-8 overflow-hidden rounded-lg border"
+                  >
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>MCP Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <FormField
+                        control={form.control}
+                        name="allowed_mcp_servers_and_groups"
+                        className="mt-4"
+                        label={labelWithHint(
+                          "Allowed MCP Servers",
+                          "Select which MCP servers or access groups this team can access",
+                        )}
+                        description="Select MCP servers or access groups this team can access"
                       >
                         {({ value, onChange }) => (
-                          <PassThroughRoutesSelector
-                            value={value}
+                          <MCPServerSelector
                             onChange={onChange}
+                            value={value}
                             accessToken={accessToken || ""}
-                            placeholder="Select pass through routes (optional)"
-                            disabled={!premiumUser || !isProxyAdminRole(userRole || "")}
+                            placeholder="Select MCP servers or access groups (optional)"
+                            allowAllProxyMcpServers={isProxyAdminRole(userRole || "")}
                           />
                         )}
                       </FormField>
-                    </FieldGroup>
-                  </CollapsibleContent>
-                </Collapsible>
 
-                <Collapsible
-                  open={mcpSettingsOpen}
-                  onOpenChange={setMcpSettingsOpen}
-                  className="mt-8 mb-8 overflow-hidden rounded-lg border"
-                >
-                  <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                    <b>MCP Settings</b>
-                    <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <FormField
-                      control={form.control}
-                      name="allowed_mcp_servers_and_groups"
-                      className="mt-4"
-                      label={labelWithHint(
-                        "Allowed MCP Servers",
-                        "Select which MCP servers or access groups this team can access",
-                      )}
-                      description="Select MCP servers or access groups this team can access"
-                    >
-                      {({ value, onChange }) => (
-                        <MCPServerSelector
-                          onChange={onChange}
-                          value={value}
+                      <div className="mt-6">
+                        <MCPToolPermissions
                           accessToken={accessToken || ""}
-                          placeholder="Select MCP servers or access groups (optional)"
-                          allowAllProxyMcpServers={isProxyAdminRole(userRole || "")}
+                          selectedServers={watchedMcpSelection?.servers || []}
+                          toolPermissions={watchedToolPermissions || {}}
+                          onChange={(toolPerms) => form.setValue("mcp_tool_permissions", toolPerms)}
                         />
-                      )}
-                    </FormField>
+                      </div>
+                    </CollapsibleContent>
+                  </Collapsible>
 
-                    <div className="mt-6">
-                      <MCPToolPermissions
-                        accessToken={accessToken || ""}
-                        selectedServers={watchedMcpSelection?.servers || []}
-                        toolPermissions={watchedToolPermissions || {}}
-                        onChange={(toolPerms) => form.setValue("mcp_tool_permissions", toolPerms)}
-                      />
-                    </div>
-                  </CollapsibleContent>
-                </Collapsible>
+                  <Collapsible
+                    open={agentSettingsOpen}
+                    onOpenChange={setAgentSettingsOpen}
+                    className="mt-8 mb-8 overflow-hidden rounded-lg border"
+                  >
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Agent Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <FormField
+                        control={form.control}
+                        name="allowed_agents_and_groups"
+                        className="mt-4"
+                        label={labelWithHint(
+                          "Allowed Agents",
+                          "Select which agents or access groups this team can access",
+                        )}
+                        description="Select agents or access groups this team can access"
+                      >
+                        {({ value, onChange }) => (
+                          <AgentSelector
+                            onChange={onChange}
+                            value={value}
+                            accessToken={accessToken || ""}
+                            placeholder="Select agents or access groups (optional)"
+                          />
+                        )}
+                      </FormField>
+                    </CollapsibleContent>
+                  </Collapsible>
 
-                <Collapsible
-                  open={agentSettingsOpen}
-                  onOpenChange={setAgentSettingsOpen}
-                  className="mt-8 mb-8 overflow-hidden rounded-lg border"
-                >
-                  <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                    <b>Agent Settings</b>
-                    <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <FormField
-                      control={form.control}
-                      name="allowed_agents_and_groups"
-                      className="mt-4"
-                      label={labelWithHint(
-                        "Allowed Agents",
-                        "Select which agents or access groups this team can access",
-                      )}
-                      description="Select agents or access groups this team can access"
-                    >
-                      {({ value, onChange }) => (
-                        <AgentSelector
-                          onChange={onChange}
-                          value={value}
+                  <Collapsible
+                    open={searchToolSettingsOpen}
+                    onOpenChange={setSearchToolSettingsOpen}
+                    className="mt-8 mb-8 overflow-hidden rounded-lg border"
+                  >
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Search Tool Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <FormField
+                        control={form.control}
+                        name="object_permission_search_tools"
+                        className="mt-4"
+                        label={labelWithHint(
+                          "Allowed Search Tools",
+                          "Select which search tools this team can access. Leave empty to allow all search tools.",
+                        )}
+                        description="Restrict which configured search tools keys on this team may call."
+                      >
+                        {({ value, onChange }) => (
+                          <SearchToolSelector
+                            onChange={onChange}
+                            value={value}
+                            accessToken={accessToken || ""}
+                            placeholder="Select search tools (optional, empty = all allowed)"
+                          />
+                        )}
+                      </FormField>
+                    </CollapsibleContent>
+                  </Collapsible>
+
+                  <Collapsible className="mt-8 mb-8 overflow-hidden rounded-lg border">
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Logging Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <div className="mt-4">
+                        <PremiumLoggingSettings
+                          value={loggingSettings}
+                          onChange={setLoggingSettings}
+                          premiumUser={premiumUser}
+                        />
+                      </div>
+                    </CollapsibleContent>
+                  </Collapsible>
+
+                  <Collapsible
+                    key={`router-settings-accordion-${routerSettingsKey}`}
+                    className="mt-8 mb-8 overflow-hidden rounded-lg border"
+                  >
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Router Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <div className="mt-4 w-full">
+                        <RouterSettingsAccordion
+                          key={routerSettingsKey}
                           accessToken={accessToken || ""}
-                          placeholder="Select agents or access groups (optional)"
+                          value={routerSettings || undefined}
+                          onChange={setRouterSettings}
+                          modelData={
+                            userModels.length > 0
+                              ? { data: userModels.map((model) => ({ model_name: model })) }
+                              : undefined
+                          }
                         />
-                      )}
-                    </FormField>
-                  </CollapsibleContent>
-                </Collapsible>
+                      </div>
+                    </CollapsibleContent>
+                  </Collapsible>
 
-                <Collapsible
-                  open={searchToolSettingsOpen}
-                  onOpenChange={setSearchToolSettingsOpen}
-                  className="mt-8 mb-8 overflow-hidden rounded-lg border"
-                >
-                  <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                    <b>Search Tool Settings</b>
-                    <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <FormField
-                      control={form.control}
-                      name="object_permission_search_tools"
-                      className="mt-4"
-                      label={labelWithHint(
-                        "Allowed Search Tools",
-                        "Select which search tools this team can access. Leave empty to allow all search tools.",
-                      )}
-                      description="Restrict which configured search tools keys on this team may call."
-                    >
-                      {({ value, onChange }) => (
-                        <SearchToolSelector
-                          onChange={onChange}
-                          value={value}
+                  <Collapsible className="mt-8 mb-8 overflow-hidden rounded-lg border">
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Model Aliases</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <div className="mt-4">
+                        <p className="mb-4 block text-sm text-muted-foreground">
+                          Create custom aliases for models that can be used by team members in API calls. This allows
+                          you to create shortcuts for specific models.
+                        </p>
+                        <ModelAliasManager
                           accessToken={accessToken || ""}
-                          placeholder="Select search tools (optional, empty = all allowed)"
+                          initialModelAliases={modelAliases}
+                          onAliasUpdate={setModelAliases}
+                          showExampleConfig={false}
                         />
-                      )}
-                    </FormField>
-                  </CollapsibleContent>
-                </Collapsible>
-
-                <Collapsible className="mt-8 mb-8 overflow-hidden rounded-lg border">
-                  <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                    <b>Logging Settings</b>
-                    <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <div className="mt-4">
-                      <PremiumLoggingSettings
-                        value={loggingSettings}
-                        onChange={setLoggingSettings}
-                        premiumUser={premiumUser}
-                      />
-                    </div>
-                  </CollapsibleContent>
-                </Collapsible>
-
-                <Collapsible
-                  key={`router-settings-accordion-${routerSettingsKey}`}
-                  className="mt-8 mb-8 overflow-hidden rounded-lg border"
-                >
-                  <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                    <b>Router Settings</b>
-                    <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <div className="mt-4 w-full">
-                      <RouterSettingsAccordion
-                        key={routerSettingsKey}
-                        accessToken={accessToken || ""}
-                        value={routerSettings || undefined}
-                        onChange={setRouterSettings}
-                        modelData={
-                          userModels.length > 0
-                            ? { data: userModels.map((model) => ({ model_name: model })) }
-                            : undefined
-                        }
-                      />
-                    </div>
-                  </CollapsibleContent>
-                </Collapsible>
-
-                <Collapsible className="mt-8 mb-8 overflow-hidden rounded-lg border">
-                  <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                    <b>Model Aliases</b>
-                    <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <div className="mt-4">
-                      <p className="mb-4 block text-sm text-muted-foreground">
-                        Create custom aliases for models that can be used by team members in API calls. This allows you
-                        to create shortcuts for specific models.
-                      </p>
-                      <ModelAliasManager
-                        accessToken={accessToken || ""}
-                        initialModelAliases={modelAliases}
-                        onAliasUpdate={setModelAliases}
-                        showExampleConfig={false}
-                      />
-                    </div>
-                  </CollapsibleContent>
-                </Collapsible>
-              </FieldGroup>
-              <div className="mt-[10px] text-right">
-                <UIButton type="submit" data-testid="create-team-submit">
-                  Create Team
-                </UIButton>
-              </div>
-            </form>
-          </TooltipProvider>
-        </Modal>
+                      </div>
+                    </CollapsibleContent>
+                  </Collapsible>
+                </FieldGroup>
+                <div className="mt-[10px] text-right">
+                  <UIButton type="submit" data-testid="create-team-submit">
+                    Create Team
+                  </UIButton>
+                </div>
+              </form>
+            </TooltipProvider>
+          </DialogContent>
+        </Dialog>
       )}
     </Content>
   );
diff --git a/ui/litellm-dashboard/src/components/ToolPolicies/ToolPoliciesPanel.test.tsx b/ui/litellm-dashboard/src/components/ToolPolicies/ToolPoliciesPanel.test.tsx
index aaa70a5e357..a2d3539a58b 100644
--- a/ui/litellm-dashboard/src/components/ToolPolicies/ToolPoliciesPanel.test.tsx
+++ b/ui/litellm-dashboard/src/components/ToolPolicies/ToolPoliciesPanel.test.tsx
@@ -4,7 +4,7 @@ import { act, render, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { focusManager, QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
-import { renderWithProviders, testQueryClient } from "../../../tests/test-utils";
+import { chooseSelectOption, renderWithProviders, testQueryClient } from "../../../tests/test-utils";
 import type { ToolRow } from "@/components/networking";
 import { ToolPoliciesPanel } from "./ToolPoliciesPanel";
 import { toast } from "@/lib/toast";
@@ -84,17 +84,6 @@ const policyValue = (toolId: string, kind: "input" | "output"): string => {
 const isSaving = (toolId: string, kind: "input" | "output"): boolean =>
   policySelect(toolId, kind).hasAttribute("disabled");
 
-const chooseOption = async (user: ReturnType<typeof userEvent.setup>, trigger: HTMLElement, label: string) => {
-  await user.click(trigger);
-  // The label also renders in the trigger once selected, so take the last match:
-  // the popup is portalled after the table in document order.
-  const option = await waitFor(() => {
-    const matches = screen.getAllByText(label);
-    return matches[matches.length - 1];
-  });
-  await user.click(option);
-};
-
 const renderPanel = (onSelectTool = vi.fn()) =>
   renderWithProviders(<ToolPoliciesPanel accessToken="sk-token" onSelectTool={onSelectTool} />);
 
@@ -202,7 +191,7 @@ describe("ToolPoliciesPanel inline policy editing", () => {
     renderPanel();
     await waitForRows();
 
-    await chooseOption(user, policySelect("tool-1", "input"), "trusted");
+    await chooseSelectOption(user, policySelect("tool-1", "input"), "trusted");
 
     expect(updateToolPolicy).toHaveBeenCalledWith("sk-token", "get_weather", { input_policy: "trusted" });
     await waitFor(() => expect(policyValue("tool-1", "input")).toBe("trusted"));
@@ -214,7 +203,7 @@ describe("ToolPoliciesPanel inline policy editing", () => {
     renderPanel();
     await waitForRows();
 
-    await chooseOption(user, policySelect("tool-1", "output"), "trusted");
+    await chooseSelectOption(user, policySelect("tool-1", "output"), "trusted");
 
     expect(updateToolPolicy).toHaveBeenCalledWith("sk-token", "get_weather", { output_policy: "trusted" });
   });
@@ -225,8 +214,8 @@ describe("ToolPoliciesPanel inline policy editing", () => {
     renderPanel();
     await waitForRows();
 
-    await chooseOption(user, policySelect("tool-1", "input"), "trusted");
-    await chooseOption(user, policySelect("tool-2", "input"), "blocked");
+    await chooseSelectOption(user, policySelect("tool-1", "input"), "trusted");
+    await chooseSelectOption(user, policySelect("tool-2", "input"), "blocked");
 
     expect(isSaving("tool-2", "input")).toBe(true);
     expect(isSaving("tool-1", "input")).toBe(true);
@@ -241,8 +230,8 @@ describe("ToolPoliciesPanel inline policy editing", () => {
     renderPanel();
     await waitForRows();
 
-    await chooseOption(user, policySelect("tool-1", "input"), "trusted");
-    await chooseOption(user, policySelect("tool-2", "input"), "blocked");
+    await chooseSelectOption(user, policySelect("tool-1", "input"), "trusted");
+    await chooseSelectOption(user, policySelect("tool-2", "input"), "blocked");
     await act(async () => {
       finishFirst();
     });
@@ -262,7 +251,7 @@ describe("ToolPoliciesPanel inline policy editing", () => {
       () => new Promise<ToolRow[]>((resolve) => (landStaleRefresh = () => resolve(TOOLS))),
     );
     await user.click(screen.getByTestId("datatable-refresh"));
-    await chooseOption(user, policySelect("tool-1", "input"), "trusted");
+    await chooseSelectOption(user, policySelect("tool-1", "input"), "trusted");
     await waitFor(() => expect(policyValue("tool-1", "input")).toBe("trusted"));
 
     await act(async () => {
@@ -281,7 +270,7 @@ describe("ToolPoliciesPanel inline policy editing", () => {
     renderPanel();
     await waitForRows();
 
-    await chooseOption(user, policySelect("tool-1", "input"), "trusted");
+    await chooseSelectOption(user, policySelect("tool-1", "input"), "trusted");
 
     await waitFor(() => expect(fromBackend).toHaveBeenCalledWith("Failed to update input policy: nope"));
     expect(policyValue("tool-1", "input")).toBe("untrusted");
@@ -293,7 +282,7 @@ describe("ToolPoliciesPanel inline policy editing", () => {
     renderPanel();
     await waitForRows();
 
-    await chooseOption(user, policySelect("tool-1", "input"), "trusted");
+    await chooseSelectOption(user, policySelect("tool-1", "input"), "trusted");
 
     await waitFor(() => expect(isSaving("tool-1", "input")).toBe(true));
     expect(isSaving("tool-1", "output")).toBe(false);
diff --git a/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.test.tsx b/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.test.tsx
index dda1b805582..504e4e45e10 100644
--- a/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.test.tsx
+++ b/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.test.tsx
@@ -180,19 +180,11 @@ describe("TopKeyView", () => {
     expect(tableViewButton).toHaveClass("bg-blue-100");
   });
 
-  it("should call setTopKeysLimit when limit is changed via Segmented control", async () => {
+  it("should call setTopKeysLimit when limit is changed via the segmented control", async () => {
     const user = userEvent.setup();
     render(<TopKeyView {...baseProps} />);
 
-    const limit10Radio = screen.getByRole("radio", { name: "10" });
-    const limit10Label = limit10Radio.closest("label");
-    if (limit10Label) {
-      await user.click(limit10Label);
-    } else {
-      // Fallback: click the div with title="10"
-      const limit10Div = screen.getByTitle("10");
-      await user.click(limit10Div);
-    }
+    await user.click(screen.getByRole("radio", { name: "10" }));
 
     expect(mockSetTopKeysLimit).toHaveBeenCalledWith(10);
   });
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 b3c1be62e88..3f181435e09 100644
--- a/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.tsx
+++ b/ui/litellm-dashboard/src/components/UsagePage/components/EntityUsage/TopKeyView.tsx
@@ -3,8 +3,9 @@ import { BarChart } from "@/components/shared/charts";
 import { DataTable } from "@/components/shared/DataTable";
 import { IdCell, MoneyCell } from "@/components/shared/table_cells";
 import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/outline";
+import { Label } from "@/components/ui/label";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Segmented } from "antd";
 import React, { useState } from "react";
 import { formatNumberWithCommas } from "../../../../utils/dataUtils";
 import { transformKeyInfo } from "../../../key_team_helpers/transform_key_info";
@@ -12,6 +13,8 @@ import { keyInfoV1Call } from "../../../networking";
 import KeyInfoView from "../../../templates/key_info_view";
 import { TagUsage } from "../../types";
 
+const TOP_KEYS_LIMITS = [5, 10, 25, 50] as const;
+
 interface TopKeyViewProps {
   topKeys: any[];
   teams: any[] | null;
@@ -167,16 +170,22 @@ const TopKeyView: React.FC<TopKeyViewProps> = ({ topKeys, teams, showTags = fals
   return (
     <>
       <div className="mb-4 flex justify-between items-center">
-        <Segmented
-          options={[
-            { label: "5", value: 5 },
-            { label: "10", value: 10 },
-            { label: "25", value: 25 },
-            { label: "50", value: 50 },
-          ]}
-          value={topKeysLimit}
-          onChange={(value) => setTopKeysLimit(value as number)}
-        />
+        <RadioGroup
+          aria-label="Number of top keys to show"
+          value={String(topKeysLimit)}
+          onValueChange={(limit: unknown) => setTopKeysLimit(Number(limit))}
+          className="inline-flex w-fit items-center gap-1 rounded-lg bg-muted p-[3px]"
+        >
+          {TOP_KEYS_LIMITS.map((limit) => (
+            <Label
+              key={limit}
+              className="cursor-pointer rounded-md px-3 py-1 font-medium text-foreground/60 transition-colors has-data-checked:bg-background has-data-checked:text-foreground has-data-checked:shadow-sm"
+            >
+              <RadioGroupItem value={String(limit)} className="sr-only" />
+              {limit}
+            </Label>
+          ))}
+        </RadioGroup>
         <div className="flex space-x-2">
           <button
             onClick={() => setViewMode("table")}
diff --git a/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx b/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx
index fa0360c0dda..b278b4f675d 100644
--- a/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx
+++ b/ui/litellm-dashboard/src/components/VirtualKeysPage/VirtualKeysTable.tsx
@@ -12,7 +12,7 @@ import {
   DataTableToolbar,
 } from "@/components/shared/DataTable";
 import { SearchSelect } from "@/components/shared/SearchSelect";
-import { PageHeader } from "@/components/shared/PageHeader";
+import { LegacyPageHeader } from "@/components/shared/LegacyPageHeader";
 import { Input } from "@/components/ui/input";
 import { useDebouncedValue } from "@tanstack/react-pacer/debouncer";
 import { ColumnFiltersState, OnChangeFn, PaginationState, SortingState } from "@tanstack/react-table";
@@ -172,7 +172,7 @@ export function VirtualKeysTable({ headerActions }: VirtualKeysTableProps) {
 
   return (
     <div className="flex h-full flex-col gap-4 overflow-hidden py-2">
-      <PageHeader
+      <LegacyPageHeader
         icon={<KeyRound className="size-5" />}
         title="Virtual Keys"
         subtitle="Every key that authenticates requests to the gateway."
diff --git a/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx b/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx
index 48eb4dd08d5..2fecdb01547 100644
--- a/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx
+++ b/ui/litellm-dashboard/src/components/VirtualKeysPage/keyTableColumns.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { Info } from "lucide-react";
 import { ColumnDef } from "@tanstack/react-table";
-import { Popover, Typography } from "antd";
 
 import { DataTableMultiSortHeader, DataTableSortHeader, type DataTableSortField } from "@/components/shared/DataTable";
 import { inheritedBudgetGates } from "@/components/shared/InheritedBudgetHint";
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
   DateCell,
@@ -78,9 +78,7 @@ const UserPopoverCell = ({
         <div key={label} className="flex flex-col min-w-0">
           <span className="text-gray-400">{label}</span>
           {value ? (
-            <Typography.Text className="font-mono text-xs" ellipsis={{ tooltip: value }} copyable>
-              {value}
-            </Typography.Text>
+            <IdCell value={value} variant="plain" copyable className="max-w-full" />
           ) : (
             <span className="font-mono">-</span>
           )}
@@ -91,29 +89,39 @@ const UserPopoverCell = ({
 
   if (isDefaultAdmin && !userAlias && !userEmail) {
     return (
-      <Popover content={popoverContent} trigger="hover" placement="bottomLeft">
-        <span className="cursor-default">
+      <HoverCard>
+        <HoverCardTrigger render={<span className="cursor-default" />}>
           <DefaultProxyAdminTag userId={userId} />
-        </span>
-      </Popover>
+        </HoverCardTrigger>
+        <HoverCardContent align="start">{popoverContent}</HoverCardContent>
+      </HoverCard>
     );
   }
 
   return (
-    <Popover content={popoverContent} trigger="hover" placement="bottomLeft">
-      <span className="font-mono text-xs truncate block cursor-default" style={{ maxWidth: width, overflow: "hidden" }}>
+    <HoverCard>
+      <HoverCardTrigger
+        render={
+          <span
+            className="font-mono text-xs truncate block cursor-default"
+            style={{ maxWidth: width, overflow: "hidden" }}
+          />
+        }
+      >
         {displayValue || "-"}
-      </span>
-    </Popover>
+      </HoverCardTrigger>
+      <HoverCardContent align="start">{popoverContent}</HoverCardContent>
+    </HoverCard>
   );
 };
 
 const InfoHeader = ({ label, tooltip }: { label: string; tooltip: string }) => (
   <span className="flex items-center gap-1">
     {label}
-    <Popover content={tooltip} trigger="hover">
-      <InfoCircleOutlined className="text-gray-400 text-xs cursor-help" />
-    </Popover>
+    <HoverCard>
+      <HoverCardTrigger render={<Info className="size-3 text-gray-400 cursor-help" />} />
+      <HoverCardContent className="w-auto">{tooltip}</HoverCardContent>
+    </HoverCard>
   </span>
 );
 
diff --git a/ui/litellm-dashboard/src/components/add_model/AdaptiveRoutingConfig.tsx b/ui/litellm-dashboard/src/components/add_model/AdaptiveRoutingConfig.tsx
index 720b6f88db3..137ef297d56 100644
--- a/ui/litellm-dashboard/src/components/add_model/AdaptiveRoutingConfig.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/AdaptiveRoutingConfig.tsx
@@ -1,4 +1,9 @@
-import { Card, InputNumber, Radio, Slider, Space, Switch, Typography } from "antd";
+import { Card, CardContent } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import { Slider } from "@/components/ui/slider";
+import { Switch } from "@/components/ui/switch";
 import React from "react";
 import {
   AdaptiveEligible,
@@ -7,8 +12,6 @@ import {
   DEFAULT_TIER_DISTANCE_PENALTY,
 } from "./ComplexityRouterConfig";
 
-const { Text } = Typography;
-
 interface AdaptiveRoutingConfigProps {
   value: ComplexityRouterConfigValue;
   onChange: (value: ComplexityRouterConfigValue) => void;
@@ -45,84 +48,91 @@ const AdaptiveRoutingConfig: React.FC<AdaptiveRoutingConfigProps> = ({ value, on
 
   return (
     <>
-      <div className="flex items-center gap-2 mb-2">
-        <Switch checked={value.adaptive ?? false} onChange={handleAdaptiveToggle} />
-        <Text strong>Enable adaptive bandit selection</Text>
-      </div>
-      <Text type="secondary" style={{ display: "block", fontSize: 12 }}>
+      <Label className="mb-2">
+        <Switch checked={value.adaptive ?? false} onCheckedChange={handleAdaptiveToggle} />
+        <strong className="font-semibold">Enable adaptive bandit selection</strong>
+      </Label>
+      <span className="block text-xs text-muted-foreground">
         When disabled, each request always uses the model assigned to its classified tier.
-      </Text>
+      </span>
 
       <Card className="bg-gray-50 mt-4">
-        <Text strong style={{ display: "block", marginBottom: 8 }}>
-          How Adaptive Routing Works
-        </Text>
-        <Text type="secondary" style={{ fontSize: 13 }}>
-          It learns from how each conversation actually goes: does the user have to rephrase or correct the model, does
-          it get stuck repeating itself, does it run out of tool calls, does the user seem satisfied. Combined with
-          cost, this live feedback shifts future routing toward the models that are actually working well, and improves
-          as more conversations come in. Until there&apos;s enough feedback, it defaults to the classified tier&apos;s
-          model.
-        </Text>
+        <CardContent>
+          <strong className="mb-2 block font-semibold">How Adaptive Routing Works</strong>
+          <span className="text-[13px] text-muted-foreground">
+            It learns from how each conversation actually goes: does the user have to rephrase or correct the model,
+            does it get stuck repeating itself, does it run out of tool calls, does the user seem satisfied. Combined
+            with cost, this live feedback shifts future routing toward the models that are actually working well, and
+            improves as more conversations come in. Until there&apos;s enough feedback, it defaults to the classified
+            tier&apos;s model.
+          </span>
+        </CardContent>
       </Card>
 
       {value.adaptive && (
         <div className="mt-4 space-y-4">
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
+            <strong className="mb-1 block font-semibold">
               Quality vs. Cost ({Math.round(adaptiveWeights.quality * 100)}% quality /{" "}
               {Math.round(adaptiveWeights.cost * 100)}% cost)
-            </Text>
+            </strong>
             <Slider
+              aria-label="Quality vs. Cost"
               min={0}
               max={100}
-              value={Math.round(adaptiveWeights.quality * 100)}
-              onChange={handleQualityWeightChange}
-              tooltip={{ formatter: (v) => `${v}% quality / ${100 - (v ?? 0)}% cost` }}
+              value={[Math.round(adaptiveWeights.quality * 100)]}
+              onValueChange={(next) => handleQualityWeightChange(Array.isArray(next) ? next[0] : next)}
             />
-            <Text type="secondary" style={{ fontSize: 12 }}>
+            <span className="text-xs text-muted-foreground">
               Higher quality weight favors more capable (pricier) models; higher cost weight favors cheaper models when
               the bandit has feedback to act on. Recommended: 30% quality / 70% cost split.
-            </Text>
+            </span>
           </div>
 
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
-              Eligible Model Pool
-            </Text>
-            <Radio.Group
+            <strong className="mb-1 block font-semibold">Eligible Model Pool</strong>
+            <RadioGroup
               value={adaptiveEligible}
-              onChange={(e) => handleAdaptiveEligibleChange(e.target.value)}
+              onValueChange={(eligible: unknown) => handleAdaptiveEligibleChange(eligible as AdaptiveEligible)}
               className="w-full"
             >
-              <Space direction="vertical" className="w-full">
-                <Radio value="all">
-                  <Text strong>All tiers (soft floor)</Text>{" "}
-                  <Text type="secondary">— router can pick across tiers, depending on the best fit for the prompt</Text>
-                </Radio>
-                <Radio value="classified_tier">
-                  <Text strong>Classified tier only</Text>{" "}
-                  <Text type="secondary">— router can only pick models within tier</Text>
-                </Radio>
-              </Space>
-            </Radio.Group>
+              <div className="flex w-full flex-col items-start gap-2">
+                <Label className="items-start font-normal leading-normal">
+                  <RadioGroupItem value="all" className="mt-0.5" />
+                  <span>
+                    <strong className="font-semibold">All tiers (soft floor)</strong>{" "}
+                    <span className="text-muted-foreground">
+                      — router can pick across tiers, depending on the best fit for the prompt
+                    </span>
+                  </span>
+                </Label>
+                <Label className="items-start font-normal leading-normal">
+                  <RadioGroupItem value="classified_tier" className="mt-0.5" />
+                  <span>
+                    <strong className="font-semibold">Classified tier only</strong>{" "}
+                    <span className="text-muted-foreground">— router can only pick models within tier</span>
+                  </span>
+                </Label>
+              </div>
+            </RadioGroup>
           </div>
 
           {adaptiveEligible === "all" && (
             <div>
-              <Text strong style={{ display: "block", marginBottom: 4 }}>
-                Tier Distance Penalty
-              </Text>
-              <InputNumber
+              <strong className="mb-1 block font-semibold">Tier Distance Penalty</strong>
+              <Input
+                type="number"
                 value={tierDistancePenalty}
-                onChange={handleTierDistancePenaltyChange}
+                onChange={(event) =>
+                  handleTierDistancePenaltyChange(event.target.value === "" ? null : event.target.valueAsNumber)
+                }
                 min={0}
                 step={0.1}
-                style={{ width: "100%" }}
+                className="w-full"
               />
-              <Text type="secondary" style={{ fontSize: 12 }}>
+              <span className="text-xs text-muted-foreground">
                 Score penalty applied per tier-step away from the classified tier.
-              </Text>
+              </span>
             </div>
           )}
         </div>
diff --git a/ui/litellm-dashboard/src/components/add_model/AddModelForm.test.tsx b/ui/litellm-dashboard/src/components/add_model/AddModelForm.test.tsx
index 26bd9af94a8..340fd811e97 100644
--- a/ui/litellm-dashboard/src/components/add_model/AddModelForm.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/AddModelForm.test.tsx
@@ -1,6 +1,5 @@
 import { renderHook, screen, waitFor, renderWithProviders } from "../../../tests/test-utils";
 import userEvent, { PointerEventsCheckLevel } from "@testing-library/user-event";
-import type { UploadProps } from "antd/es/upload";
 import { describe, expect, it, vi } from "vitest";
 import type { Team } from "../key_team_helpers/key_list";
 import type { CredentialItem } from "../networking";
@@ -157,11 +156,6 @@ const createTestProps = (userRole = "proxy_admin", userId = "user-1", isTeamAdmi
     },
   ];
 
-  const uploadProps: UploadProps = {
-    beforeUpload: () => false,
-    showUploadList: false,
-  };
-
   return {
     form,
     registry,
@@ -176,7 +170,6 @@ const createTestProps = (userRole = "proxy_admin", userId = "user-1", isTeamAdmi
     showAdvancedSettings: false,
     teams,
     credentials,
-    uploadProps,
     userRole,
     userId,
   };
@@ -318,6 +311,35 @@ describe("AddModelForm", () => {
     expect(await screen.findByRole("button", { name: "Add Model" })).toBeInTheDocument();
   });
 
+  describe("the enterprise gate on the Team-BYOK switch", () => {
+    const renderForm = async (premiumUser: boolean) => {
+      const mockUseAuthorized = vi.mocked(await import("@/app/(dashboard)/hooks/useAuthorized"));
+      mockUseAuthorized.default.mockReturnValue(mockAuthorizedUser("proxy_admin", "user-1", premiumUser));
+      renderWithProviders(<AddModelForm {...createTestProps()} />);
+      return screen.findByRole("switch", { name: "Team-BYOK Model" });
+    };
+
+    it("explains the gate on hover even though the switch it sits on is disabled", async () => {
+      const user = userEvent.setup({ pointerEventsCheck: PointerEventsCheckLevel.Never });
+      const teamOnlySwitch = await renderForm(false);
+      expect(teamOnlySwitch).toHaveAttribute("aria-disabled", "true");
+
+      await user.hover(teamOnlySwitch);
+
+      expect(await screen.findByText(/enterprise-only feature/)).toBeInTheDocument();
+    });
+
+    it("says nothing on hover once the user is premium", async () => {
+      const user = userEvent.setup();
+      const teamOnlySwitch = await renderForm(true);
+      expect(teamOnlySwitch).not.toHaveAttribute("aria-disabled", "true");
+
+      await user.hover(teamOnlySwitch);
+
+      expect(screen.queryByText(/enterprise-only feature/)).not.toBeInTheDocument();
+    });
+  });
+
   describe("cache control bindings reach the parent form store", () => {
     const renderWithForm = async () => {
       const mockUseAuthorized = vi.mocked(await import("@/app/(dashboard)/hooks/useAuthorized"));
@@ -331,11 +353,11 @@ describe("AddModelForm", () => {
         user,
         openCacheControl: async () => {
           await user.click(await screen.findByText("Advanced Settings"));
-          await user.click(screen.getByLabelText("Cache Control Injection Points"));
+          await user.click(screen.getByRole("switch", { name: "Cache Control Injection Points" }));
           await screen.findByText("Add Injection Point");
         },
         closeCacheControl: async () => {
-          await user.click(screen.getByLabelText("Cache Control Injection Points"));
+          await user.click(screen.getByRole("switch", { name: "Cache Control Injection Points" }));
           await waitFor(() => expect(screen.queryByText("Add Injection Point")).not.toBeInTheDocument());
         },
         mountedValues: async (): Promise<Record<string, unknown>> => props.mountedValues(),
diff --git a/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx b/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx
index 4cb60dc116a..b6dddf43588 100644
--- a/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/AddModelForm.tsx
@@ -5,9 +5,10 @@ import { all_admin_roles, isUserTeamAdminForAnyTeam } from "@/utils/roles";
 import { modelCreationScope } from "@/utils/modelPermissions";
 import { Switch } from "@/components/ui/switch";
 import { Field, FieldLabel } from "@/components/shared/form/field";
-import { Select as AntdSelect, Card, Col, Modal, Row, Tooltip, Typography, Alert } from "antd";
+import { Select as AntdSelect, Card, Col, Row, Tooltip, Typography } from "antd";
+import { Info } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
-import type { UploadProps } from "antd/es/upload";
 import React, { useEffect, useMemo, useState } from "react";
 import { FormProvider, useWatch, type UseFormReturn } from "react-hook-form";
 import TeamDropdown from "../common_components/team_dropdown";
@@ -30,6 +31,7 @@ import ConnectionErrorDisplay from "./model_connection_test";
 import ProviderSpecificFields from "./provider_specific_fields";
 import { TEST_MODES } from "./add_model_modes";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddModelFormProps {
   form: UseFormReturn<MountedFormValues>; // For the Add Model tab
@@ -41,7 +43,6 @@ interface AddModelFormProps {
   providerModels: string[];
   setProviderModelsFn: (provider: Providers) => void;
   getPlaceholder: (provider: Providers) => string;
-  uploadProps: UploadProps;
   showAdvancedSettings: boolean;
   setShowAdvancedSettings: (show: boolean) => void;
   teams: Team[] | null;
@@ -68,7 +69,6 @@ const AddModelForm: React.FC<AddModelFormProps> = ({
   providerModels,
   setProviderModelsFn,
   getPlaceholder,
-  uploadProps,
   showAdvancedSettings,
   setShowAdvancedSettings,
   teams,
@@ -168,13 +168,13 @@ const AddModelForm: React.FC<AddModelFormProps> = ({
                       )}
                     </MountedFormField>
                     {!teamAdminSelectedTeam && (
-                      <Alert
-                        message="Team Selection Required"
-                        description="As a team admin, you need to select your team first before adding models."
-                        type="info"
-                        showIcon
-                        className="mb-4"
-                      />
+                      <Alert variant="info" className="mb-4">
+                        <Info />
+                        <AlertTitle>Team Selection Required</AlertTitle>
+                        <AlertDescription>
+                          As a team admin, you need to select your team first before adding models.
+                        </AlertDescription>
+                      </Alert>
                     )}
                   </>
                 )}
@@ -308,7 +308,7 @@ const AddModelForm: React.FC<AddModelFormProps> = ({
                           <span className="px-4 text-muted-foreground text-sm">OR</span>
                           <div className="grow border-t border-border"></div>
                         </div>
-                        <ProviderSpecificFields selectedProvider={selectedProvider} uploadProps={uploadProps} />
+                        <ProviderSpecificFields selectedProvider={selectedProvider} />
                       </>
                     )}
                     <div className="flex items-center my-4">
@@ -440,44 +440,50 @@ const AddModelForm: React.FC<AddModelFormProps> = ({
       </Card>
 
       {/* Test Connection Results Modal */}
-      <Modal
-        title="Connection Test Results"
+      <Dialog
         open={isResultModalVisible}
-        onCancel={() => {
-          setIsResultModalVisible(false);
-          setIsTestingConnection(false);
+        onOpenChange={(open) => {
+          if (!open) {
+            setIsResultModalVisible(false);
+            setIsTestingConnection(false);
+          }
         }}
-        footer={[
-          <Button
-            key="close"
-            variant="outline"
-            onClick={() => {
-              setIsResultModalVisible(false);
-              setIsTestingConnection(false);
-            }}
-          >
-            Close
-          </Button>,
-        ]}
-        width={700}
       >
-        {/* Only render the ConnectionErrorDisplay when modal is visible and we have a test ID */}
-        {isResultModalVisible && (
-          <ConnectionErrorDisplay
-            // The key prop tells React to create a fresh component instance when it changes
-            key={connectionTestId}
-            formValues={mountedValues()}
-            accessToken={accessToken}
-            testMode={testMode}
-            modelName={connectionTestModelName(form.getValues())}
-            onClose={() => {
-              setIsResultModalVisible(false);
-              setIsTestingConnection(false);
-            }}
-            onTestComplete={() => setIsTestingConnection(false)}
-          />
-        )}
-      </Modal>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
+          <DialogHeader>
+            <DialogTitle>Connection Test Results</DialogTitle>
+          </DialogHeader>
+          {/* Only render the ConnectionErrorDisplay when modal is visible and we have a test ID */}
+          {isResultModalVisible && (
+            <ConnectionErrorDisplay
+              // The key prop tells React to create a fresh component instance when it changes
+              key={connectionTestId}
+              formValues={mountedValues()}
+              accessToken={accessToken}
+              testMode={testMode}
+              modelName={connectionTestModelName(form.getValues())}
+              onClose={() => {
+                setIsResultModalVisible(false);
+                setIsTestingConnection(false);
+              }}
+              onTestComplete={() => setIsTestingConnection(false)}
+            />
+          )}
+          <DialogFooter>
+            {" "}
+            <Button
+              variant="outline"
+              onClick={() => {
+                setIsResultModalVisible(false);
+                setIsTestingConnection(false);
+              }}
+            >
+              Close
+            </Button>
+            , ]
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx b/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx
index 8d42b34a14b..3c384aed1b3 100644
--- a/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/ClassificationMethodConfig.tsx
@@ -1,6 +1,13 @@
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { Info } from "lucide-react";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Select as AntdSelect, Card, InputNumber, Radio, Space, Switch, Typography } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { SearchSelect } from "@/components/shared/SearchSelect";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Card, CardContent } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import { Switch } from "@/components/ui/switch";
 import React from "react";
 import ClassifierPromptEditor from "./ClassifierPromptEditor";
 import HeuristicScoringConfig from "./HeuristicScoringConfig";
@@ -21,8 +28,6 @@ import {
   effectiveTierLabel,
 } from "./ComplexityRouterConfig";
 
-const { Text } = Typography;
-
 const DEFAULT_SCORING_EXPLANATION =
   "The router scores each request across 7 dimensions: token count, code presence, reasoning markers, technical " +
   "terms, simple indicators, multi-step patterns, and question complexity. The weighted score determines the tier:";
@@ -58,50 +63,64 @@ const scoringExplanation = (value: ComplexityRouterConfigValue): string => {
 const boundaryRanges = (
   shipped: Record<string, number> | undefined,
   overrides: Record<string, number> | undefined,
-): { simpleMedium: string; mediumComplex: string; complexReasoning: string } | null => {
+  reasoningOverrideMinScore: number | undefined,
+): {
+  simpleMedium: string;
+  mediumComplex: string;
+  complexReasoning: string;
+  reasoningOverrideFloor: string;
+} | null => {
   const effective: Record<string, number> = { ...shipped, ...overrides };
   const [low, mid, high] = [effective.simple_medium, effective.medium_complex, effective.complex_reasoning];
   if (low === undefined || mid === undefined || high === undefined) return null;
-  return { simpleMedium: low.toFixed(2), mediumComplex: mid.toFixed(2), complexReasoning: high.toFixed(2) };
+  return {
+    simpleMedium: low.toFixed(2),
+    mediumComplex: mid.toFixed(2),
+    complexReasoning: high.toFixed(2),
+    reasoningOverrideFloor: (reasoningOverrideMinScore ?? low).toFixed(2),
+  };
 };
 
 const HowClassificationWorks: React.FC<{ value: ComplexityRouterConfigValue }> = ({ value }) => {
   // The shipped boundaries come from the proxy, so this card cannot state ranges the router stopped using.
   const { data: scorerDefaults, isError } = useComplexityScorerDefaults();
-  const ranges = boundaryRanges(scorerDefaults?.tier_boundaries, value.tier_boundaries);
+  const ranges = boundaryRanges(
+    scorerDefaults?.tier_boundaries,
+    value.tier_boundaries,
+    value.reasoning_override_min_score,
+  );
 
   return (
     <Card className="bg-gray-50 mt-4">
-      <Text strong style={{ display: "block", marginBottom: 8 }}>
-        How Classification Works
-      </Text>
-      <Text type="secondary" style={{ fontSize: 13 }}>
-        {scoringExplanation(value)}
-      </Text>
-      {ranges && (
-        <ul style={{ marginTop: 8, marginBottom: 0, paddingLeft: 20, fontSize: 13, color: "rgba(0, 0, 0, 0.45)" }}>
-          <li>
-            <strong>{effectiveTierLabel("SIMPLE", value.tier_labels)}</strong>: Score &lt; {ranges.simpleMedium}
-          </li>
-          <li>
-            <strong>{effectiveTierLabel("MEDIUM", value.tier_labels)}</strong>: Score {ranges.simpleMedium} -{" "}
-            {ranges.mediumComplex}
-          </li>
-          <li>
-            <strong>{effectiveTierLabel("COMPLEX", value.tier_labels)}</strong>: Score {ranges.mediumComplex} -{" "}
-            {ranges.complexReasoning}
-          </li>
-          <li>
-            <strong>{effectiveTierLabel("REASONING", value.tier_labels)}</strong>: Score &gt; {ranges.complexReasoning}{" "}
-            (or 2+ reasoning markers)
-          </li>
-        </ul>
-      )}
-      {!ranges && isError && (
-        <Text type="secondary" style={{ fontSize: 13, display: "block", marginTop: 8 }}>
-          The tier score ranges could not be loaded from the proxy.
-        </Text>
-      )}
+      <CardContent>
+        <strong className="block mb-2 font-semibold">How Classification Works</strong>
+        <span className="text-[13px] text-muted-foreground">{scoringExplanation(value)}</span>
+        {ranges && (
+          <ul style={{ marginTop: 8, marginBottom: 0, paddingLeft: 20, fontSize: 13, color: "rgba(0, 0, 0, 0.45)" }}>
+            <li>
+              <strong>{effectiveTierLabel("SIMPLE", value.tier_labels)}</strong>: Score &lt; {ranges.simpleMedium}
+            </li>
+            <li>
+              <strong>{effectiveTierLabel("MEDIUM", value.tier_labels)}</strong>: Score {ranges.simpleMedium} -{" "}
+              {ranges.mediumComplex}
+            </li>
+            <li>
+              <strong>{effectiveTierLabel("COMPLEX", value.tier_labels)}</strong>: Score {ranges.mediumComplex} -{" "}
+              {ranges.complexReasoning}
+            </li>
+            <li>
+              <strong>{effectiveTierLabel("REASONING", value.tier_labels)}</strong>: Score &gt;{" "}
+              {ranges.complexReasoning} (or 2+ reasoning markers with a score of at least{" "}
+              {ranges.reasoningOverrideFloor})
+            </li>
+          </ul>
+        )}
+        {!ranges && isError && (
+          <span className="text-[13px] block mt-2 text-muted-foreground">
+            The tier score ranges could not be loaded from the proxy.
+          </span>
+        )}
+      </CardContent>
     </Card>
   );
 };
@@ -232,91 +251,103 @@ const ClassificationMethodConfig: React.FC<ClassificationMethodConfigProps> = ({
 
   return (
     <>
-      <Radio.Group
+      <RadioGroup
         value={value.classifier_type}
-        onChange={(e) => handleClassifierTypeChange(e.target.value)}
+        onValueChange={(classifierType: unknown) => handleClassifierTypeChange(classifierType as ClassifierType)}
         className="w-full"
       >
-        <Space direction="vertical" className="w-full">
-          <Radio value="heuristic">
-            <Text strong>Heuristic</Text>{" "}
-            <Text type="secondary">(default) — rule-based scoring, no API calls, &lt;1ms latency</Text>
-          </Radio>
-          <Radio value="llm">
-            <Text strong>LLM Classifier</Text>{" "}
-            <Text type="secondary">— use a model to decide the tier (e.g. a small/fast model)</Text>
-          </Radio>
-        </Space>
-      </Radio.Group>
+        <div className="flex w-full flex-col items-start gap-2">
+          <Label className="items-start font-normal leading-normal">
+            <RadioGroupItem value="heuristic" className="mt-0.5" />
+            <span>
+              <strong className="font-semibold">Heuristic</strong>{" "}
+              <span className="text-muted-foreground">
+                (default) — rule-based scoring, no API calls, &lt;1ms latency
+              </span>
+            </span>
+          </Label>
+          <Label className="items-start font-normal leading-normal">
+            <RadioGroupItem value="llm" className="mt-0.5" />
+            <span>
+              <strong className="font-semibold">LLM Classifier</strong>{" "}
+              <span className="text-muted-foreground">— use a model to decide the tier (e.g. a small/fast model)</span>
+            </span>
+          </Label>
+        </div>
+      </RadioGroup>
 
       {value.classifier_type === "llm" && (
         <div className="mt-4 space-y-3">
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
-              Classifier Model
-            </Text>
-            <AntdSelect
-              value={value.classifier_llm_config?.model || undefined}
-              onChange={handleClassifierModelChange}
-              placeholder="Select the model that will classify request complexity"
-              showSearch
-              style={{ width: "100%" }}
+            <strong className="block mb-1 font-semibold">Classifier Model</strong>
+            <SearchSelect
               options={modelOptions}
-              status={classifierModelMissing ? "error" : undefined}
+              value={value.classifier_llm_config?.model ?? ""}
+              onValueChange={handleClassifierModelChange}
+              placeholder="Select the model that will classify request complexity"
+              emptyText="No models found"
+              allowClear={false}
+              className={classifierModelMissing ? "border-destructive" : undefined}
             />
-            {classifierModelMissing && (
-              <Text type="danger" style={{ fontSize: 12 }}>
-                A classifier model is required
-              </Text>
-            )}
+            {classifierModelMissing && <span className="text-xs text-destructive">A classifier model is required</span>}
           </div>
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
-              Timeout (ms)
-            </Text>
-            <InputNumber
+            <strong className="block mb-1 font-semibold">Timeout (ms)</strong>
+            <Input
+              type="number"
               value={value.classifier_llm_config?.timeout_ms ?? DEFAULT_CLASSIFIER_TIMEOUT_MS}
-              onChange={handleClassifierTimeoutChange}
+              onChange={(event) =>
+                handleClassifierTimeoutChange(event.target.value === "" ? null : event.target.valueAsNumber)
+              }
               min={1}
-              style={{ width: "100%" }}
+              className="w-full"
             />
-            <Text type="secondary" style={{ fontSize: 12 }}>
+            <span className="text-xs text-muted-foreground">
               How long the classifier call has before it fails and the fallback below takes over.
-            </Text>
+            </span>
           </div>
           <div>
             <div className="flex items-center gap-2 mb-1">
-              <Text strong>Classification Rubric</Text>
+              <strong className="font-semibold">Classification Rubric</strong>
               <SimpleTooltip content="Every rubric uses the same four tiers and the same tier definitions. They differ only in the worked examples that show the classifier where the boundary between tiers sits.">
-                <InfoCircleOutlined className="text-gray-400" />
+                <Info className="size-4 text-gray-400" />
               </SimpleTooltip>
             </div>
             <SimpleTooltip
               content={usesCustomPrompt ? "Your custom prompt replaces the built-in rubric entirely" : undefined}
               className="w-full"
             >
-              <AntdSelect
-                value={classificationRubric}
-                onChange={handleClassificationRubricChange}
-                disabled={usesCustomPrompt}
-                style={{ width: "100%" }}
-                aria-label="Classification Rubric"
-                options={CLASSIFICATION_RUBRIC_KEYS.map((preset) => ({
+              <Select
+                items={CLASSIFICATION_RUBRIC_KEYS.map((preset) => ({
                   value: preset,
                   label: CLASSIFICATION_RUBRIC_DESCRIPTIONS[preset].label,
                 }))}
-              />
+                value={classificationRubric}
+                onValueChange={(preset: ClassificationRubric | null) =>
+                  preset && handleClassificationRubricChange(preset)
+                }
+                disabled={usesCustomPrompt}
+              >
+                <SelectTrigger aria-label="Classification Rubric" className="w-full">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {CLASSIFICATION_RUBRIC_KEYS.map((preset) => (
+                    <SelectItem key={preset} value={preset}>
+                      {CLASSIFICATION_RUBRIC_DESCRIPTIONS[preset].label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
             </SimpleTooltip>
-            <Text type="secondary" style={{ display: "block", fontSize: 12 }}>
+            <span className="block text-xs text-muted-foreground">
               {usesCustomPrompt
                 ? "Not in use: the custom prompt below is the classifier's entire rubric."
                 : CLASSIFICATION_RUBRIC_DESCRIPTIONS[classificationRubric].description}
-            </Text>
+            </span>
           </div>
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
-              Classifier Prompt
-            </Text>
+            <strong className="block mb-1 font-semibold">Classifier Prompt</strong>
             <ClassifierPromptEditor
               systemPrompt={value.classifier_llm_config?.system_prompt}
               onChange={handleClassifierSystemPromptChange}
@@ -326,19 +357,21 @@ const ClassificationMethodConfig: React.FC<ClassificationMethodConfigProps> = ({
             />
           </div>
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
-              If the classifier fails
-            </Text>
-            <Radio.Group
+            <strong className="block mb-1 font-semibold">If the classifier fails</strong>
+            <RadioGroup
               value={value.classifier_fallback ?? DEFAULT_CLASSIFIER_FALLBACK}
-              onChange={(e) => handleClassifierFallbackChange(e.target.value)}
+              onValueChange={(fallback: unknown) => handleClassifierFallbackChange(fallback as ClassifierFallback)}
             >
-              <Space direction="vertical">
-                <Radio value="heuristic">
-                  <Text>Score with the heuristic</Text>{" "}
-                  <Text type="secondary">— right when the classifier grades complexity too</Text>
-                </Radio>
-                <Radio value="default_model" disabled={!hasDefaultModel}>
+              <div className="inline-flex flex-col gap-2">
+                <Label className="items-start font-normal leading-normal">
+                  <RadioGroupItem value="heuristic" className="mt-0.5" />
+                  <span>
+                    <span>Score with the heuristic</span>{" "}
+                    <span className="text-muted-foreground">— right when the classifier grades complexity too</span>
+                  </span>
+                </Label>
+                <Label className="items-start font-normal leading-normal has-data-disabled:cursor-not-allowed has-data-disabled:opacity-50">
+                  <RadioGroupItem value="default_model" disabled={!hasDefaultModel} className="mt-0.5" />
                   <SimpleTooltip
                     content={
                       hasDefaultModel
@@ -347,66 +380,68 @@ const ClassificationMethodConfig: React.FC<ClassificationMethodConfigProps> = ({
                     }
                   >
                     <span>
-                      <Text>Route to the default model{defaultModel ? ` (${defaultModel})` : ""}</Text>{" "}
-                      <Text type="secondary">— right when your prompt grades something other than complexity</Text>
+                      <span>Route to the default model{defaultModel ? ` (${defaultModel})` : ""}</span>{" "}
+                      <span className="text-muted-foreground">
+                        — right when your prompt grades something other than complexity
+                      </span>
                     </span>
                   </SimpleTooltip>
-                </Radio>
-              </Space>
-            </Radio.Group>
-            <Text type="secondary" style={{ display: "block", fontSize: 12 }}>
+                </Label>
+              </div>
+            </RadioGroup>
+            <span className="block text-xs text-muted-foreground">
               Applies when the classifier call errors, times out, or returns an unparseable response.
-            </Text>
+            </span>
           </div>
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
-              Context Window Size
-            </Text>
-            <InputNumber
+            <strong className="block mb-1 font-semibold">Context Window Size</strong>
+            <Input
+              type="number"
               value={value.classifier_context_window_size ?? DEFAULT_CLASSIFIER_CONTEXT_WINDOW_SIZE}
-              onChange={handleClassifierContextWindowSizeChange}
+              onChange={(event) =>
+                handleClassifierContextWindowSizeChange(event.target.value === "" ? null : event.target.valueAsNumber)
+              }
               min={0}
-              style={{ width: "100%" }}
+              className="w-full"
             />
-            <Text type="secondary" style={{ fontSize: 12 }}>
+            <span className="text-xs text-muted-foreground">
               Number of prior user turns (tool output and harness reminders excluded) sent to the classifier as context,
               so a referring follow-up like &quot;now do the same for the streaming path&quot; is classified against
               what it refers to. Set to 0 to send only the current message.
-            </Text>
+            </span>
           </div>
           <div>
-            <Text strong style={{ display: "block", marginBottom: 4 }}>
-              Context Per-Turn Character Limit
-            </Text>
-            <InputNumber
+            <strong className="block mb-1 font-semibold">Context Per-Turn Character Limit</strong>
+            <Input
+              type="number"
               value={value.classifier_context_per_turn_chars ?? DEFAULT_CLASSIFIER_CONTEXT_PER_TURN_CHARS}
-              onChange={handleClassifierContextPerTurnCharsChange}
+              onChange={(event) =>
+                handleClassifierContextPerTurnCharsChange(event.target.value === "" ? null : event.target.valueAsNumber)
+              }
               min={1}
-              style={{ width: "100%" }}
+              className="w-full"
             />
-            <Text type="secondary" style={{ fontSize: 12 }}>
-              Prior turns longer than this are truncated.
-            </Text>
+            <span className="text-xs text-muted-foreground">Prior turns longer than this are truncated.</span>
           </div>
           <div>
             <div className="flex items-center gap-2 mb-1">
               <Switch
                 checked={value.classifier_context_include_assistant_turns ?? false}
-                onChange={handleClassifierContextIncludeAssistantTurnsChange}
-                size="small"
+                onCheckedChange={handleClassifierContextIncludeAssistantTurnsChange}
+                size="sm"
                 aria-label="Include Assistant Turns"
               />
-              <Text strong>Include Assistant Turns</Text>
+              <strong className="font-semibold">Include Assistant Turns</strong>
               <SimpleTooltip content="Off by default. Enabling it changes tier decisions, and therefore spend, for an existing router, and sends assistant text to the classifier model, which may be a different provider than the routed model.">
-                <InfoCircleOutlined className="text-gray-400" />
+                <Info className="size-4 text-gray-400" />
               </SimpleTooltip>
             </div>
-            <Text type="secondary" style={{ fontSize: 12 }}>
+            <span className="text-xs text-muted-foreground">
               Let the classifier read the assistant&apos;s replies, so difficulty the model stated rather than the user
               stays visible: a plan the assistant calls complex, approved with &quot;yes&quot;, is classified on the
               work being approved. Context Window Size then counts the last N turns across both roles rather than the
               last N user turns.
-            </Text>
+            </span>
           </div>
         </div>
       )}
@@ -414,25 +449,29 @@ const ClassificationMethodConfig: React.FC<ClassificationMethodConfigProps> = ({
       {value.classifier_type === "heuristic" && (
         <div className="mt-4">
           <div className="flex items-center gap-2 mb-1">
-            <Text strong>Custom Technical Keywords</Text>
+            <strong className="font-semibold">Custom Technical Keywords</strong>
             <SimpleTooltip content="Domain-specific terms appended to the built-in technical keyword list. Prompts containing these terms score higher on the technical dimension and route to more capable models.">
-              <InfoCircleOutlined className="text-gray-400" />
+              <Info className="size-4 text-gray-400" />
             </SimpleTooltip>
           </div>
-          <Text type="secondary" style={{ display: "block", marginBottom: 8, fontSize: 12 }}>
+          <span className="block mb-2 text-xs text-muted-foreground">
             Optional: Add terms to the built-in list to improve classification accuracy on the technical dimension.
             (e.g., udp, kafka, terraform).
-          </Text>
-          <AntdSelect
-            mode="tags"
+          </span>
+          <MultiSelect
+            options={(customTechnicalKeywords ?? []).map((keyword) => ({ label: keyword, value: keyword }))}
             value={customTechnicalKeywords ?? []}
-            onChange={(keywords: string[]) => onCustomTechnicalKeywordsChange?.(keywords)}
-            placeholder="Type a keyword and press Enter, or paste a comma-separated list"
-            tokenSeparators={[","]}
-            open={false}
-            suffixIcon={null}
-            style={{ width: "100%" }}
-            allowClear
+            onValueChange={(keywords: string[]) =>
+              onCustomTechnicalKeywordsChange?.(
+                Array.from(
+                  new Set(keywords.flatMap((keyword) => keyword.split(",").map((part) => part.trim())).filter(Boolean)),
+                ),
+              )
+            }
+            placeholder="Type a keyword and press Enter"
+            emptyText="Type to add a keyword"
+            allowCustomValues
+            className="w-full"
           />
         </div>
       )}
diff --git a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.test.tsx b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.test.tsx
index d0fda9962e5..5f5ae703b0e 100644
--- a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.test.tsx
@@ -280,11 +280,28 @@ describe("ComplexityRouterConfig", () => {
     );
     fireEvent.click(screen.getByText("Advanced: Classification Method"));
     const keywordsSection = screen.getByText("Custom Technical Keywords").closest("div")?.parentElement as HTMLElement;
-    const input = within(keywordsSection).getByRole("combobox");
-    fireEvent.change(input, { target: { value: "udp," } });
+    await user.type(within(keywordsSection).getByRole("combobox"), "udp");
+    await user.click(await screen.findByText('Create "udp"'));
     expect(onCustomTechnicalKeywordsChange).toHaveBeenCalledWith(["udp"]);
   });
 
+  it("splits a comma-separated keyword entry into one keyword per token", async () => {
+    const user = userEvent.setup();
+    const onCustomTechnicalKeywordsChange = vi.fn();
+    renderWithProviders(
+      <ComplexityRouterConfig
+        {...baseProps}
+        customTechnicalKeywords={[]}
+        onCustomTechnicalKeywordsChange={onCustomTechnicalKeywordsChange}
+      />,
+    );
+    fireEvent.click(screen.getByText("Advanced: Classification Method"));
+    const keywordsSection = screen.getByText("Custom Technical Keywords").closest("div")?.parentElement as HTMLElement;
+    await user.type(within(keywordsSection).getByRole("combobox"), "udp, kafka ,terraform");
+    await user.click(await screen.findByText('Create "udp, kafka ,terraform"'));
+    expect(onCustomTechnicalKeywordsChange).toHaveBeenCalledWith(["udp", "kafka", "terraform"]);
+  });
+
   it("should render an empty state when no keyword tier rules exist", () => {
     renderWithProviders(<ComplexityRouterConfig {...baseProps} />);
     fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching"));
@@ -314,9 +331,7 @@ describe("ComplexityRouterConfig", () => {
     expect(newRules[0]).toMatchObject({ keywords: [], tier: "COMPLEX" });
   });
 
-  // The dropdown is closed, so antd has nothing for Enter to select and the word would only land
-  // on blur. Submitting used to provide that blur; it no longer can while the row reads as empty.
-  it("commits a typed keyword on Enter, with the dropdown closed", async () => {
+  it("commits a typed keyword to the rule it was typed into", async () => {
     const user = userEvent.setup();
     const onKeywordTierRulesChange = vi.fn();
     renderWithProviders(
@@ -329,7 +344,8 @@ describe("ComplexityRouterConfig", () => {
     fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching"));
 
     const field = screen.getByText("Keywords 1").closest("div") as HTMLElement;
-    await user.type(within(field).getByRole("combobox"), "invoice{enter}");
+    await user.type(within(field).getByRole("combobox"), "invoice");
+    await user.click(await screen.findByText('Create "invoice"'));
 
     expect(onKeywordTierRulesChange).toHaveBeenCalledWith([{ id: "rule-1", keywords: ["invoice"], tier: "COMPLEX" }]);
   });
@@ -482,7 +498,7 @@ describe("ComplexityRouterConfig classifier fallback", () => {
     };
     renderWithProviders(<ComplexityRouterConfig modelInfo={mockModelInfo} value={noTiers} onChange={vi.fn()} />);
     fireEvent.click(screen.getByText("Advanced: Classification Method"));
-    expect(screen.getByRole("radio", { name: /Route to the default model/ })).toBeDisabled();
+    expect(screen.getByRole("radio", { name: /Route to the default model/ })).toHaveAttribute("aria-disabled", "true");
   });
 
   it("hides the fallback choice for the heuristic classifier, which has nothing to fall back from", () => {
@@ -584,8 +600,8 @@ describe("ComplexityRouterConfig classifier rubric", () => {
 
   it("records the chat preset the operator picks", async () => {
     const onChange = openClassificationPanel(llmValue);
-    fireEvent.mouseDown(screen.getByRole("combobox", { name: "Classification Rubric" }));
-    await userEvent.click(await screen.findByTitle("Chat"));
+    await userEvent.click(screen.getByRole("combobox", { name: "Classification Rubric" }));
+    await userEvent.click(await screen.findByRole("option", { name: "Chat" }));
     expect(onChange).toHaveBeenCalledWith(
       expect.objectContaining({ classifier_llm_config: expect.objectContaining({ classification_rubric: "chat" }) }),
     );
@@ -678,7 +694,7 @@ describe("ComplexityRouterConfig tier labels", () => {
       />,
     );
     fireEvent.click(screen.getByText("Advanced: Keyword/Semantic Matching"));
-    expect(screen.getByTitle("Deep")).toBeInTheDocument();
+    expect(screen.getByRole("combobox", { name: "Route keyword rule 1 to tier" })).toHaveTextContent("Deep");
   });
 });
 
@@ -716,7 +732,7 @@ describe("ComplexityRouterConfig default model", () => {
 
   it("shows what the tiers currently imply, so an untouched router still names its default", () => {
     renderWithProviders(<ComplexityRouterConfig {...baseProps} />);
-    expect(screen.getByText("Derived from tiers: gpt-3.5-turbo")).toBeInTheDocument();
+    expect(getDefaultModelSelect()).toHaveAttribute("placeholder", "Derived from tiers: gpt-3.5-turbo");
   });
 
   it("asks for a model rather than naming a derived one when no tier holds one", () => {
@@ -725,7 +741,7 @@ describe("ComplexityRouterConfig default model", () => {
       tiers: { SIMPLE: [], MEDIUM: [], COMPLEX: [], REASONING: [] },
     };
     renderWithProviders(<ComplexityRouterConfig {...baseProps} value={noTiers} />);
-    expect(screen.getByText("Add a model to the Simple or Medium tier")).toBeInTheDocument();
+    expect(getDefaultModelSelect()).toHaveAttribute("placeholder", "Add a model to the Simple or Medium tier");
   });
 
   it("records a pinned model", async () => {
@@ -734,7 +750,7 @@ describe("ComplexityRouterConfig default model", () => {
     renderWithProviders(<ComplexityRouterConfig {...baseProps} onChange={onChange} />);
 
     await user.click(getDefaultModelSelect());
-    await user.click((await screen.findAllByTitle("claude-3-opus")).slice(-1)[0]);
+    await user.click(await screen.findByRole("option", { name: "claude-3-opus" }));
 
     expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ default_model: "claude-3-opus" }));
   });
@@ -745,8 +761,7 @@ describe("ComplexityRouterConfig default model", () => {
     const pinned: ComplexityRouterConfigValue = { ...defaultValue, default_model: "claude-3-opus" };
     renderWithProviders(<ComplexityRouterConfig {...baseProps} value={pinned} onChange={onChange} />);
 
-    // eslint-disable-next-line local/no-antd-class-selectors -- antd marks the clear affordance aria-hidden, so no accessible query reaches it
-    await user.click(document.querySelector(".ant-select-clear") as HTMLElement);
+    await user.click(screen.getByRole("button", { name: "Clear" }));
 
     expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ default_model: undefined }));
   });
@@ -754,10 +769,7 @@ describe("ComplexityRouterConfig default model", () => {
   it("shows a pinned model as the selection instead of the tier-derived one", () => {
     const pinned: ComplexityRouterConfigValue = { ...defaultValue, default_model: "claude-3-opus" };
     renderWithProviders(<ComplexityRouterConfig {...baseProps} value={pinned} />);
-    expect(
-      // eslint-disable-next-line local/no-antd-class-selectors -- the tier selects show the same model as a tag, so the assertion has to scope to this select's root, which antd exposes only as a class
-      within(getDefaultModelSelect().closest(".ant-select") as HTMLElement).getByTitle("claude-3-opus"),
-    ).toBeInTheDocument();
+    expect(getDefaultModelSelect()).toHaveValue("claude-3-opus");
   });
 
   it("unlocks the default model fallback on a pin alone, with no tier to derive from", () => {
@@ -770,7 +782,7 @@ describe("ComplexityRouterConfig default model", () => {
     };
     renderWithProviders(<ComplexityRouterConfig {...baseProps} value={pinnedNoTiers} />);
     fireEvent.click(screen.getByText("Advanced: Classification Method"));
-    expect(screen.getByRole("radio", { name: /Route to the default model/ })).toBeEnabled();
+    expect(screen.getByRole("radio", { name: /Route to the default model/ })).not.toHaveAttribute("aria-disabled");
   });
 
   it("names the resolved default on the fallback option, so the destination is not a guess", () => {
@@ -827,9 +839,9 @@ describe("plan-mode override", () => {
       />,
     );
     openPanel();
-    fireEvent.mouseDown(await screen.findByRole("combobox", { name: "Plan-mode minimum tier" }));
-    expect(await screen.findByTitle("Medium")).toBeInTheDocument();
-    expect(screen.queryByTitle("Reasoning")).not.toBeInTheDocument();
+    await userEvent.click(await screen.findByRole("combobox", { name: "Plan-mode minimum tier" }));
+    expect(await screen.findByRole("option", { name: "Medium" })).toBeInTheDocument();
+    expect(screen.queryByRole("option", { name: "Reasoning" })).not.toBeInTheDocument();
   });
 
   it("disables the toggle until some tier has models", async () => {
@@ -840,6 +852,6 @@ describe("plan-mode override", () => {
       />,
     );
     openPanel();
-    expect(await screen.findByRole("switch", { name: switchName })).toBeDisabled();
+    expect(await screen.findByRole("switch", { name: switchName })).toHaveAttribute("aria-disabled", "true");
   });
 });
diff --git a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx
index 9f1108639ac..ab6b1d401ce 100644
--- a/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/ComplexityRouterConfig.tsx
@@ -1,6 +1,13 @@
-import { InfoCircleOutlined } from "@ant-design/icons";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Select as AntdSelect, Card, Collapse, Divider, Input, Space, Switch, Typography } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { SearchSelect } from "@/components/shared/SearchSelect";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { ChevronRight, Info, X } from "lucide-react";
+import { Switch } from "@/components/ui/switch";
+import { Card, CardContent } from "@/components/ui/card";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
+import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
+import { Separator } from "@/components/ui/separator";
 import React from "react";
 import { ModelGroup } from "@/components/llm_calls/fetch_models";
 import AdaptiveRoutingConfig from "./AdaptiveRoutingConfig";
@@ -13,8 +20,6 @@ import { type DimensionWeights, type TierBoundaries, type TokenThresholds } from
 
 export type { DimensionWeights, TierBoundaries, TokenThresholds };
 
-const { Text } = Typography;
-
 export const DEFAULT_CLASSIFIER_TIMEOUT_MS = 3000;
 export const DEFAULT_TIER_DISTANCE_PENALTY = 0.5;
 export const DEFAULT_CLASSIFIER_CONTEXT_WINDOW_SIZE = 3;
@@ -136,6 +141,11 @@ export interface ComplexityRouterConfigValue {
   tier_boundaries?: TierBoundaries;
   token_thresholds?: TokenThresholds;
   dimension_weights?: DimensionWeights;
+  /**
+   * Score floor the reasoning-marker override must clear. Undefined keeps the key out of the payload, so the
+   * floor tracks tier_boundaries.simple_medium; an explicit 0 is a real floor that promotes on the markers alone.
+   */
+  reasoning_override_min_score?: number;
 }
 
 interface ComplexityRouterConfigProps {
@@ -213,6 +223,9 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
   showValidationErrors = false,
 }) => {
   const planModeTiers = planModeEligibleTiers(value.tiers);
+  const planModeTierOptions = tierOptions(value.tier_labels).filter((option) =>
+    (planModeTiers as string[]).includes(option.value),
+  );
   const derivedDefaultModel = resolveComplexityDefaultModel(value.tiers);
   const defaultModel = resolveComplexityDefaultModel(value.tiers, value.default_model);
 
@@ -246,128 +259,119 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
 
   return (
     <div className="w-full max-w-none">
-      <Space align="center" style={{ marginBottom: 16 }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          Complexity Tier Configuration
-        </Typography.Title>
+      <div className="inline-flex items-center gap-2 mb-4">
+        <h4 className="m-0 text-xl font-semibold text-foreground">Complexity Tier Configuration</h4>
         <SimpleTooltip content="Map each complexity tier to one or more models. Simple queries use cheaper/faster models, complex queries use more capable models.">
-          <InfoCircleOutlined className="text-gray-400" />
+          <Info className="size-4 text-gray-400" />
         </SimpleTooltip>
-      </Space>
+      </div>
 
-      <Text type="secondary" style={{ display: "block", marginBottom: 24 }}>
+      <span className="block mb-6 text-muted-foreground">
         The complexity router automatically classifies requests by complexity using rule-based scoring (no API calls,
         &lt;1ms latency). Configure which model(s) handle each tier.
-      </Text>
+      </span>
 
-      <Text type="secondary" style={{ display: "block", marginBottom: 16, fontSize: 12 }}>
+      <span className="block mb-4 text-xs text-muted-foreground">
         Rename a tier to use your own vocabulary in the dashboard and your spend logs. Renaming doesn&apos;t change how
         requests are classified, and callers never see these names.
         {value.classifier_type === "llm" &&
           " Your classifier model reads these names, so clearer ones can sharpen its choices."}
-      </Text>
+      </span>
 
       <Card>
-        {TIER_KEYS.map((tier, index) => {
-          const tierInfo = TIER_DESCRIPTIONS[tier];
-          const label = effectiveTierLabel(tier, value.tier_labels);
-          const tierMissing = showValidationErrors && value.tiers[tier].length === 0;
-          return (
-            <div key={tier}>
-              {index > 0 && <Divider style={{ margin: "16px 0" }} />}
-              <div className="mb-4">
-                <div className="flex items-center gap-2 mb-2">
-                  <Text strong style={{ fontSize: 16 }}>
-                    {label} Tier
-                  </Text>
-                  <SimpleTooltip content={tierInfo.description}>
-                    <InfoCircleOutlined className="text-gray-400" />
-                  </SimpleTooltip>
-                  <Text type="secondary" style={{ fontSize: 12 }}>
-                    Tier {index + 1} of {TIER_KEYS.length} &middot; {tier}
-                  </Text>
+        <CardContent>
+          {TIER_KEYS.map((tier, index) => {
+            const tierInfo = TIER_DESCRIPTIONS[tier];
+            const label = effectiveTierLabel(tier, value.tier_labels);
+            const tierMissing = showValidationErrors && value.tiers[tier].length === 0;
+            return (
+              <div key={tier}>
+                {index > 0 && <Separator className="my-4" />}
+                <div className="mb-4">
+                  <div className="flex items-center gap-2 mb-2">
+                    <strong className="text-base font-semibold">{label} Tier</strong>
+                    <SimpleTooltip content={tierInfo.description}>
+                      <Info className="size-4 text-gray-400" />
+                    </SimpleTooltip>
+                    <span className="text-xs text-muted-foreground">
+                      Tier {index + 1} of {TIER_KEYS.length} &middot; {tier}
+                    </span>
+                  </div>
+                  <span className="block mb-2 text-xs text-muted-foreground">Examples: {tierInfo.examples}</span>
+                  <InputGroup className="mb-2">
+                    <InputGroupInput
+                      value={value.tier_labels?.[tier] ?? ""}
+                      onChange={(event) => handleTierLabelChange(tier, event.target.value)}
+                      placeholder={`Display name (default: ${tierInfo.label})`}
+                      aria-label={`Display name for the ${tierInfo.label} tier`}
+                    />
+                    {value.tier_labels?.[tier] && (
+                      <InputGroupAddon align="inline-end">
+                        <InputGroupButton
+                          size="icon-xs"
+                          aria-label={`Clear display name for the ${tierInfo.label} tier`}
+                          onClick={() => handleTierLabelChange(tier, "")}
+                        >
+                          <X />
+                        </InputGroupButton>
+                      </InputGroupAddon>
+                    )}
+                  </InputGroup>
+                  <MultiSelect
+                    options={modelOptions}
+                    value={value.tiers[tier]}
+                    onValueChange={(models: string[]) => handleTierChange(tier, models)}
+                    placeholder={`Select model(s) for ${label.toLowerCase()} queries`}
+                    emptyText="No models found"
+                    className={tierMissing ? "w-full border-destructive" : "w-full"}
+                  />
+                  {value.tiers[tier].length > 1 && (
+                    <span className="text-xs text-muted-foreground">
+                      Multiple models selected — the router randomly picks among them per request (or Thompson-samples
+                      within the pool when adaptive routing is on).
+                    </span>
+                  )}
+                  {tierMissing && <span className="text-xs text-destructive">The {label} tier is required</span>}
                 </div>
-                <Text type="secondary" style={{ display: "block", marginBottom: 8, fontSize: 12 }}>
-                  Examples: {tierInfo.examples}
-                </Text>
-                <Input
-                  value={value.tier_labels?.[tier] ?? ""}
-                  onChange={(event) => handleTierLabelChange(tier, event.target.value)}
-                  placeholder={`Display name (default: ${tierInfo.label})`}
-                  aria-label={`Display name for the ${tierInfo.label} tier`}
-                  style={{ marginBottom: 8 }}
-                  allowClear
-                />
-                <AntdSelect
-                  mode="multiple"
-                  value={value.tiers[tier]}
-                  onChange={(models) => handleTierChange(tier, models)}
-                  placeholder={`Select model(s) for ${label.toLowerCase()} queries`}
-                  showSearch
-                  style={{ width: "100%" }}
-                  options={modelOptions}
-                  status={tierMissing ? "error" : undefined}
-                />
-                {value.tiers[tier].length > 1 && (
-                  <Text type="secondary" style={{ fontSize: 12 }}>
-                    Multiple models selected — the router randomly picks among them per request (or Thompson-samples
-                    within the pool when adaptive routing is on).
-                  </Text>
-                )}
-                {tierMissing && (
-                  <Text type="danger" style={{ fontSize: 12 }}>
-                    The {label} tier is required
-                  </Text>
-                )}
               </div>
-            </div>
-          );
-        })}
-        <Divider style={{ margin: "16px 0" }} />
+            );
+          })}
+          <Separator className="my-4" />
 
-        <div className="mb-2">
-          <div className="flex items-center gap-2 mb-2">
-            <Text strong style={{ fontSize: 16 }}>
-              Default Model
-            </Text>
-            <SimpleTooltip content="Leave empty to follow the tiers. A model chosen here is pinned: it stays the default however the tiers change.">
-              <InfoCircleOutlined className="text-gray-400" />
-            </SimpleTooltip>
+          <div className="mb-2">
+            <div className="flex items-center gap-2 mb-2">
+              <strong className="text-base font-semibold">Default Model</strong>
+              <SimpleTooltip content="Leave empty to follow the tiers. A model chosen here is pinned: it stays the default however the tiers change.">
+                <Info className="size-4 text-gray-400" />
+              </SimpleTooltip>
+            </div>
+            <SearchSelect
+              options={modelOptions}
+              value={value.default_model ?? ""}
+              onValueChange={handleDefaultModelChange}
+              placeholder={
+                derivedDefaultModel
+                  ? `Derived from tiers: ${derivedDefaultModel}`
+                  : "Add a model to the Simple or Medium tier"
+              }
+              emptyText="No models found"
+              aria-label="Default model"
+            />
+            <span className="block mt-1 text-xs text-muted-foreground">
+              Used when the tier the request lands in has no model, and when the classifier fails with &quot;Route to
+              the default model&quot; selected.
+            </span>
           </div>
-          <AntdSelect
-            value={value.default_model || undefined}
-            onChange={handleDefaultModelChange}
-            placeholder={
-              derivedDefaultModel
-                ? `Derived from tiers: ${derivedDefaultModel}`
-                : "Add a model to the Simple or Medium tier"
-            }
-            aria-label="Default model"
-            showSearch
-            allowClear
-            style={{ width: "100%" }}
-            options={modelOptions}
-          />
-          <Text type="secondary" style={{ display: "block", marginTop: 4, fontSize: 12 }}>
-            Used when the tier the request lands in has no model, and when the classifier fails with &quot;Route to the
-            default model&quot; selected.
-          </Text>
-        </div>
+        </CardContent>
       </Card>
 
-      <Divider />
+      <Separator className="my-6" />
 
-      <Collapse
-        ghost
-        style={{ background: "#f9fafb", borderRadius: 8, border: "1px solid #e5e7eb" }}
-        items={[
+      <div className="rounded-lg border border-gray-200 bg-gray-50">
+        {[
           {
             key: "classifier",
-            label: (
-              <Text strong style={{ color: "#374151" }}>
-                Advanced: Classification Method
-              </Text>
-            ),
+            label: <strong className="text-gray-700 font-semibold">Advanced: Classification Method</strong>,
             children: (
               <ClassificationMethodConfig
                 value={value}
@@ -382,85 +386,82 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
           },
           {
             key: "adaptive",
-            label: (
-              <Text strong style={{ color: "#374151" }}>
-                Advanced: Adaptive Routing
-              </Text>
-            ),
+            label: <strong className="text-gray-700 font-semibold">Advanced: Adaptive Routing</strong>,
             children: <AdaptiveRoutingConfig value={value} onChange={onChange} />,
           },
           {
             key: "affinity",
-            label: (
-              <Text strong style={{ color: "#374151" }}>
-                Advanced: Affinity
-              </Text>
-            ),
+            label: <strong className="text-gray-700 font-semibold">Advanced: Affinity</strong>,
             children: (
               <>
                 <div className="flex items-center gap-2 mb-2">
                   <Switch
                     checked={value.deployment_affinity ?? DEFAULT_DEPLOYMENT_AFFINITY}
-                    onChange={(deploymentAffinity) => onChange({ ...value, deployment_affinity: deploymentAffinity })}
+                    onCheckedChange={(deploymentAffinity) =>
+                      onChange({ ...value, deployment_affinity: deploymentAffinity })
+                    }
                     aria-label="Pin a session to one deployment per model group"
                   />
-                  <Text strong>Pin a session to one deployment per model group</Text>
+                  <strong className="font-semibold">Pin a session to one deployment per model group</strong>
                 </div>
-                <Text type="secondary" style={{ display: "block", fontSize: 12, marginBottom: 12 }}>
+                <span className="block text-xs mb-3 text-muted-foreground">
                   Keeps a session on the same deployment within a group, so provider prompt caches stay warm. Turn off
                   to load-balance every turn.
-                </Text>
+                </span>
                 <div className="flex items-center gap-2 mb-2">
                   <Switch
                     checked={value.session_affinity ?? DEFAULT_SESSION_AFFINITY}
-                    onChange={(sessionAffinity) => onChange({ ...value, session_affinity: sessionAffinity })}
+                    onCheckedChange={(sessionAffinity) => onChange({ ...value, session_affinity: sessionAffinity })}
                     aria-label="Pin a session to its first model"
                   />
-                  <Text strong>Pin a session to its first model</Text>
+                  <strong className="font-semibold">Pin a session to its first model</strong>
                 </div>
-                <Text type="secondary" style={{ display: "block", fontSize: 12 }}>
+                <span className="block text-xs text-muted-foreground">
                   Keeps a session on its first turn&apos;s model instead of re-classifying each turn. Also pins the
                   deployment.
-                </Text>
+                </span>
               </>
             ),
           },
           {
             key: "plan-mode",
-            label: (
-              <Text strong style={{ color: "#374151" }}>
-                Advanced: Plan-Mode Override
-              </Text>
-            ),
+            label: <strong className="text-gray-700 font-semibold">Advanced: Plan-Mode Override</strong>,
             children: (
               <>
                 <div className="flex items-center gap-2 mb-2">
                   <Switch
                     checked={value.plan_mode_min_tier !== undefined}
                     disabled={planModeTiers.length === 0}
-                    onChange={(enabled) =>
+                    onCheckedChange={(enabled) =>
                       onChange({ ...value, plan_mode_min_tier: enabled ? planModeTiers.at(-1) : undefined })
                     }
                     aria-label="Route plan-mode requests to a minimum tier"
                   />
-                  <Text strong>Route plan-mode requests to a minimum tier</Text>
+                  <strong className="font-semibold">Route plan-mode requests to a minimum tier</strong>
                 </div>
-                <Text type="secondary" style={{ display: "block", fontSize: 12, marginBottom: 12 }}>
+                <span className="block text-xs mb-3 text-muted-foreground">
                   Requests from coding agents in plan mode (Claude Code, GitHub Copilot) route to at least this tier.
                   The classifier still wins when it picks higher, and the override only lasts while plan mode is active.
                   {planModeTiers.length === 0 && " Add models to a tier to enable this."}
-                </Text>
+                </span>
                 {value.plan_mode_min_tier !== undefined && (
                   <div style={{ maxWidth: 320 }}>
-                    <AntdSelect
-                      aria-label="Plan-mode minimum tier"
-                      style={{ width: "100%" }}
+                    <Select
+                      items={planModeTierOptions}
                       value={value.plan_mode_min_tier}
-                      options={tierOptions(value.tier_labels).filter((option) =>
-                        (planModeTiers as string[]).includes(option.value),
-                      )}
-                      onChange={(tier: string) => onChange({ ...value, plan_mode_min_tier: tier })}
-                    />
+                      onValueChange={(tier: string | null) => tier && onChange({ ...value, plan_mode_min_tier: tier })}
+                    >
+                      <SelectTrigger aria-label="Plan-mode minimum tier" className="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {planModeTierOptions.map((option) => (
+                          <SelectItem key={option.value} value={option.value}>
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
                   </div>
                 )}
               </>
@@ -468,23 +469,22 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
           },
           {
             key: "response",
-            label: (
-              <Text strong style={{ color: "#374151" }}>
-                Advanced: Response Format
-              </Text>
-            ),
+            label: <strong className="text-gray-700 font-semibold">Advanced: Response Format</strong>,
             children: (
               <>
                 <div className="flex items-center gap-2 mb-2">
                   <Switch
                     checked={value.return_raw_model_name ?? false}
-                    onChange={(returnRawModelName) => onChange({ ...value, return_raw_model_name: returnRawModelName })}
+                    onCheckedChange={(returnRawModelName) =>
+                      onChange({ ...value, return_raw_model_name: returnRawModelName })
+                    }
+                    aria-label="Return raw model name"
                   />
-                  <Text strong>Return raw model name</Text>
+                  <strong className="font-semibold">Return raw model name</strong>
                 </div>
-                <Text type="secondary" style={{ display: "block", fontSize: 12 }}>
+                <span className="block text-xs text-muted-foreground">
                   Return the resolved underlying model name in responses instead of the autorouter alias.
-                </Text>
+                </span>
               </>
             ),
           },
@@ -492,11 +492,7 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
             ? [
                 {
                   key: "escalation",
-                  label: (
-                    <Text strong style={{ color: "#374151" }}>
-                      Advanced: Escalation Keywords
-                    </Text>
-                  ),
+                  label: <strong className="text-gray-700 font-semibold">Advanced: Escalation Keywords</strong>,
                   children: <EscalationKeywords keywords={escalationKeywords} onChange={onEscalationKeywordsChange} />,
                 },
               ]
@@ -505,11 +501,7 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
             ? [
                 {
                   key: "keyword-semantic",
-                  label: (
-                    <Text strong style={{ color: "#374151" }}>
-                      Advanced: Keyword/Semantic Matching
-                    </Text>
-                  ),
+                  label: <strong className="text-gray-700 font-semibold">Advanced: Keyword/Semantic Matching</strong>,
                   children: (
                     <>
                       {onKeywordTierRulesChange && (
@@ -519,9 +511,7 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
                           tierLabels={value.tier_labels}
                         />
                       )}
-                      {onKeywordTierRulesChange && onSemanticMatchingEnabledChange && (
-                        <Divider style={{ margin: "16px 0" }} />
-                      )}
+                      {onKeywordTierRulesChange && onSemanticMatchingEnabledChange && <Separator className="my-4" />}
                       {onSemanticMatchingEnabledChange && (
                         <SemanticKeywordMatching
                           enabled={semanticMatchingEnabled}
@@ -539,8 +529,16 @@ const ComplexityRouterConfig: React.FC<ComplexityRouterConfigProps> = ({
                 },
               ]
             : []),
-        ]}
-      />
+        ].map(({ key, label, children }) => (
+          <Collapsible key={key} className="border-b border-gray-200 last:border-b-0">
+            <CollapsibleTrigger className="group flex w-full items-center gap-2 px-4 py-3 text-left">
+              <ChevronRight className="size-4 shrink-0 text-muted-foreground transition-transform group-data-panel-open:rotate-90" />
+              {label}
+            </CollapsibleTrigger>
+            <CollapsibleContent className="px-4 pb-4">{children}</CollapsibleContent>
+          </Collapsible>
+        ))}
+      </div>
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/add_model/EscalationKeywords.tsx b/ui/litellm-dashboard/src/components/add_model/EscalationKeywords.tsx
index 5d5e2c7b02d..b1bb25deb13 100644
--- a/ui/litellm-dashboard/src/components/add_model/EscalationKeywords.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/EscalationKeywords.tsx
@@ -1,10 +1,8 @@
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { Info } from "lucide-react";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Select as AntdSelect, Typography } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
 import React from "react";
 
-const { Text } = Typography;
-
 export const DEFAULT_ESCALATION_KEYWORDS = ["LITELLM ESCALATE"];
 
 interface EscalationKeywordsProps {
@@ -16,28 +14,24 @@ const EscalationKeywords: React.FC<EscalationKeywordsProps> = ({ keywords, onCha
   return (
     <div className="w-full max-w-none">
       <div className="flex items-center gap-2 mb-1">
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          Escalation Keywords
-        </Typography.Title>
+        <h4 className="m-0 text-xl font-semibold text-foreground">Escalation Keywords</h4>
         <SimpleTooltip content="Case-sensitive phrases a user can include in their message to force a bump to the next-higher complexity tier when they aren't happy with results. They can force a stronger model, but not choose which one.">
-          <InfoCircleOutlined className="text-gray-400" />
+          <Info className="size-4 text-gray-400" />
         </SimpleTooltip>
       </div>
-      <Text type="secondary" style={{ display: "block", marginBottom: 8, fontSize: 12 }}>
+      <span className="mb-2 block text-xs text-muted-foreground">
         Optional: when a user message contains one of these phrases, the request is bumped one tier higher than it would
         otherwise route to. Matching is case-sensitive, so &quot;LITELLM ESCALATE&quot; only fires on the exact, shouted
         form. Leave empty to disable.
-      </Text>
-      <AntdSelect
-        mode="tags"
+      </span>
+      <MultiSelect
+        options={keywords.map((keyword) => ({ label: keyword, value: keyword }))}
         value={keywords}
-        onChange={onChange}
+        onValueChange={onChange}
         placeholder="e.g., LITELLM ESCALATE"
-        tokenSeparators={[","]}
-        open={false}
-        suffixIcon={null}
-        style={{ width: "100%" }}
-        allowClear
+        emptyText="Type to add a phrase"
+        allowCustomValues
+        className="w-full"
       />
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.test.tsx b/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.test.tsx
index f1a79ab7c33..9dccd767e49 100644
--- a/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.test.tsx
@@ -95,6 +95,57 @@ describe("HeuristicScoringConfig", () => {
     expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ token_thresholds: undefined }));
   });
 
+  it("shows the boundary an untouched override floor tracks, rather than a fixed number", async () => {
+    await render(BASE);
+
+    const field = screen.getByLabelText("Minimum score");
+    expect(field).toHaveValue("");
+    expect(field).toHaveAttribute("placeholder", SHIPPED_SCORER_DEFAULTS.tier_boundaries.simple_medium.toFixed(2));
+  });
+
+  it("tracks the operator's own Simple to Medium override, not the shipped boundary", async () => {
+    await render({ ...BASE, tier_boundaries: { simple_medium: 0.42, medium_complex: 0.5, complex_reasoning: 0.7 } });
+
+    expect(screen.getByLabelText("Minimum score")).toHaveAttribute("placeholder", "0.42");
+  });
+
+  // 0 restores an unconditional override, so it has to reach the config as 0 rather than as "untouched".
+  it("commits an explicit 0 override floor", async () => {
+    const onChange = await render(BASE);
+    fireEvent.change(screen.getByLabelText("Minimum score"), { target: { value: "0" } });
+
+    expect(onChange.mock.calls.at(-1)?.[0]).toMatchObject({ reasoning_override_min_score: 0 });
+  });
+
+  it("renders a stored 0 as 0 rather than as an untouched field", async () => {
+    await render({ ...BASE, reasoning_override_min_score: 0 });
+
+    expect(screen.getByLabelText("Minimum score")).toHaveValue("0");
+  });
+
+  it("counts a set override floor among the overrides", () => {
+    renderWithProviders(
+      <HeuristicScoringConfig value={{ ...BASE, reasoning_override_min_score: 0 }} onChange={vi.fn()} />,
+    );
+
+    expect(screen.getByTestId("advanced-scoring-override-count")).toHaveTextContent("1 override");
+  });
+
+  it("clamps the override floor to the score range", async () => {
+    const onChange = await render(BASE);
+    fireEvent.change(screen.getByLabelText("Minimum score"), { target: { value: "9" } });
+
+    expect(onChange.mock.calls.at(-1)?.[0]).toMatchObject({ reasoning_override_min_score: 1 });
+  });
+
+  it("resets the override floor back to tracking the boundary", async () => {
+    const onChange = await render({ ...BASE, reasoning_override_min_score: 0 });
+
+    await userEvent.click(screen.getAllByRole("button", { name: "Reset to defaults" }).at(-1)!);
+
+    expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ reasoning_override_min_score: undefined }));
+  });
+
   it("flags decreasing boundaries as an error without blocking the save", async () => {
     const bad = { ...BASE, tier_boundaries: { simple_medium: 0.5, medium_complex: 0.2, complex_reasoning: 0.6 } };
     await render(bad);
@@ -136,6 +187,18 @@ describe("ClassificationMethodConfig scorer gating", () => {
     expect(screen.queryByText(/0.15/)).not.toBeInTheDocument();
   });
 
+  it("states the configured override floor in the reasoning-marker aside, not the boundary", () => {
+    renderWithProviders(<ClassificationMethodConfig {...props} value={{ ...BASE, reasoning_override_min_score: 0 }} />);
+
+    expect(screen.getByText(/2\+ reasoning markers with a score of at least 0\.00/)).toBeInTheDocument();
+  });
+
+  it("falls back to the Simple to Medium boundary when no override floor is set", () => {
+    renderWithProviders(<ClassificationMethodConfig {...props} value={BASE} />);
+
+    expect(screen.getByText(/2\+ reasoning markers with a score of at least 0\.15/)).toBeInTheDocument();
+  });
+
   it("renders a row for every scored dimension", async () => {
     await render(BASE);
 
diff --git a/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.tsx b/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.tsx
index 1b0a781a33a..540beff8177 100644
--- a/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/HeuristicScoringConfig.tsx
@@ -23,6 +23,8 @@ interface GroupSpec {
   labels: Record<string, string>;
 }
 
+const OVERRIDE_FLOOR_ID = "reasoning-override-min-score";
+
 const GROUPS: GroupSpec[] = [
   {
     group: "tier_boundaries",
@@ -88,7 +90,12 @@ const HeuristicScoringConfig: React.FC<HeuristicScoringConfigProps> = ({ value,
   // falls back to the default model, so there is nothing here to configure.
   const scorerRuns = heuristicScoringRole(value) !== "never";
 
-  const overrides = GROUPS.filter((spec) => value[spec.group] !== undefined).length;
+  // What an untouched override floor follows: the boundary in effect, override included, not the shipped one.
+  const trackedFloor: number | undefined = { ...defaults?.tier_boundaries, ...value.tier_boundaries }.simple_medium;
+
+  const overrides =
+    GROUPS.filter((spec) => value[spec.group] !== undefined).length +
+    (value.reasoning_override_min_score !== undefined ? 1 : 0);
 
   // min/max are inert on a text input, and a plain number input renders Number("0.") as "0" so a decimal
   // cannot be typed. Hence the local draft plus an explicit clamp here.
@@ -102,6 +109,12 @@ const HeuristicScoringConfig: React.FC<HeuristicScoringConfigProps> = ({ value,
     });
   };
 
+  const commitOverrideFloor = (raw: string) => {
+    const parsed = Number(raw);
+    if (raw.trim() === "" || !Number.isFinite(parsed)) return;
+    onChange({ ...value, reasoning_override_min_score: Math.min(1, Math.max(-1, parsed)) });
+  };
+
   if (!scorerRuns) return null;
 
   return (
@@ -215,6 +228,50 @@ const HeuristicScoringConfig: React.FC<HeuristicScoringConfigProps> = ({ value,
                   </section>
                 );
               })}
+
+              <section className="space-y-2">
+                <div className="flex items-center justify-between">
+                  <span className="text-sm font-medium">Reasoning override floor</span>
+                  {value.reasoning_override_min_score !== undefined && (
+                    <Button
+                      type="button"
+                      variant="link"
+                      size="xs"
+                      onClick={() => onChange({ ...value, reasoning_override_min_score: undefined })}
+                    >
+                      Reset to defaults
+                    </Button>
+                  )}
+                </div>
+                <p className="text-xs text-muted-foreground">
+                  Two or more reasoning markers promote a request to the reasoning tier, but only once its weighted
+                  score reaches this floor.{" "}
+                  {trackedFloor === undefined
+                    ? "Left untouched, it tracks the Simple to Medium boundary."
+                    : `Left untouched, it tracks the Simple to Medium boundary, currently ${trackedFloor.toFixed(2)}.`}{" "}
+                  Set it to 0 to promote on the markers alone.
+                </p>
+                <div className="flex items-center gap-3">
+                  <Label htmlFor={OVERRIDE_FLOOR_ID} className="w-44 text-xs font-normal">
+                    Minimum score
+                  </Label>
+                  <Input
+                    id={OVERRIDE_FLOOR_ID}
+                    type="text"
+                    inputMode="decimal"
+                    className="w-28"
+                    placeholder={trackedFloor === undefined ? undefined : trackedFloor.toFixed(2)}
+                    value={
+                      draft?.id === OVERRIDE_FLOOR_ID ? draft.raw : value.reasoning_override_min_score?.toString() ?? ""
+                    }
+                    onChange={(event) => {
+                      setDraft({ id: OVERRIDE_FLOOR_ID, raw: event.target.value });
+                      commitOverrideFloor(event.target.value);
+                    }}
+                    onBlur={() => setDraft(null)}
+                  />
+                </div>
+              </section>
             </>
           )}
         </div>
diff --git a/ui/litellm-dashboard/src/components/add_model/KeywordTierRules.tsx b/ui/litellm-dashboard/src/components/add_model/KeywordTierRules.tsx
index 24e4c33a49d..f7edd26f0d8 100644
--- a/ui/litellm-dashboard/src/components/add_model/KeywordTierRules.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/KeywordTierRules.tsx
@@ -1,14 +1,14 @@
-import { DeleteOutlined, InfoCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { Inbox, Info, Plus, Trash2 } from "lucide-react";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Card, Empty, Select as AntdSelect, Typography } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Card, CardContent } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import React from "react";
 
 import { emptyKeywordTierRuleIndexes } from "./complexity_router_keywords";
 import { tierOptions } from "./complexity_router_tiers";
 
-const { Text } = Typography;
-
 export type ComplexityTier = "SIMPLE" | "MEDIUM" | "COMPLEX" | "REASONING";
 
 export interface KeywordTierRule {
@@ -28,29 +28,9 @@ interface KeywordTierRulesProps {
 // there is no failed attempt left to surface it.
 const KeywordTierRules: React.FC<KeywordTierRulesProps> = ({ rules, onChange, tierLabels }) => {
   const emptyRuleIndexes = new Set(emptyKeywordTierRuleIndexes(rules));
-  const [drafts, setDrafts] = React.useState<Record<string, string>>({});
-
-  const setDraft = (id: string, text: string) => setDrafts((current) => ({ ...current, [id]: text }));
-
-  // The dropdown is kept closed, which leaves antd nothing for Enter to select, so a typed keyword
-  // would only become a tag on blur. Submitting used to supply that blur; the button is disabled
-  // while the row reads as empty, so Enter has to commit the word itself or the row cannot be filled.
-  const commitDraft = (rule: KeywordTierRule) => {
-    const keyword = (drafts[rule.id] ?? "").trim();
-    if (!keyword) return;
-    updateRule(rule.id, { keywords: [...rule.keywords, keyword] });
-    setDraft(rule.id, "");
-  };
-
-  const commitDraftOnEnter = (rule: KeywordTierRule) => (event: React.KeyboardEvent<HTMLElement>) => {
-    if (event.key !== "Enter") return;
-    event.preventDefault();
-    commitDraft(rule);
-  };
 
   const replaceKeywords = (rule: KeywordTierRule) => (keywords: string[]) => {
     updateRule(rule.id, { keywords });
-    setDraft(rule.id, "");
   };
 
   const addRule = () => {
@@ -69,79 +49,81 @@ const KeywordTierRules: React.FC<KeywordTierRulesProps> = ({ rules, onChange, ti
     <div className="w-full max-w-none">
       <div className="flex items-center justify-between mb-2">
         <div className="flex items-center gap-2">
-          <Typography.Title level={4} style={{ margin: 0 }}>
-            Keyword Tier Overrides
-          </Typography.Title>
+          <h4 className="m-0 text-xl font-semibold text-foreground">Keyword Tier Overrides</h4>
           <SimpleTooltip content="Match known terms and force the request straight to a chosen complexity tier, bypassing rule-based scoring.">
-            <InfoCircleOutlined className="text-gray-400" />
+            <Info className="size-4 text-gray-400" />
           </SimpleTooltip>
         </div>
         <Button variant="outline" onClick={addRule}>
-          <PlusOutlined />
+          <Plus />
           Add keyword rule
         </Button>
       </div>
-      <Text type="secondary" style={{ display: "block", marginBottom: 16 }}>
+      <span className="mb-4 block text-muted-foreground">
         Optional: route requests containing specific keywords directly to a tier, e.g. route &quot;invoice, refund,
         billing&quot; to the medium tier.
-      </Text>
+      </span>
 
       {rules.length === 0 ? (
         <Card className="bg-gray-50">
-          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="No keyword tier overrides configured" />
+          <CardContent>
+            <div className="py-2 text-center">
+              <Inbox className="mx-auto mb-2 size-6 text-muted-foreground" aria-hidden="true" />
+              <p className="text-sm text-muted-foreground">No keyword tier overrides configured</p>
+            </div>
+          </CardContent>
         </Card>
       ) : (
         <div className="flex flex-col gap-3">
           {rules.map((rule, index) => (
-            <Card key={rule.id} size="small">
-              <div className="flex items-end gap-3">
-                <div className="flex-1">
-                  <Text strong style={{ display: "block", marginBottom: 8 }}>
-                    Keywords {index + 1}
-                  </Text>
-                  <AntdSelect
-                    mode="tags"
-                    value={rule.keywords}
-                    onChange={replaceKeywords(rule)}
-                    searchValue={drafts[rule.id] ?? ""}
-                    onSearch={(text) => setDraft(rule.id, text)}
-                    onInputKeyDown={commitDraftOnEnter(rule)}
-                    onBlur={() => commitDraft(rule)}
-                    placeholder="e.g., invoice, refund, billing"
-                    tokenSeparators={[","]}
-                    open={false}
-                    suffixIcon={null}
-                    style={{ width: "100%" }}
-                    allowClear
-                    status={emptyRuleIndexes.has(index) ? "error" : undefined}
-                  />
-                  {emptyRuleIndexes.has(index) && (
-                    <Text type="danger" style={{ fontSize: 12 }}>
-                      At least one keyword is required
-                    </Text>
-                  )}
+            <Card key={rule.id} size="sm">
+              <CardContent>
+                <div className="flex items-end gap-3">
+                  <div className="flex-1">
+                    <strong className="mb-2 block font-semibold">Keywords {index + 1}</strong>
+                    <MultiSelect
+                      options={rule.keywords.map((keyword) => ({ label: keyword, value: keyword }))}
+                      value={rule.keywords}
+                      onValueChange={replaceKeywords(rule)}
+                      placeholder="e.g., invoice, refund, billing"
+                      emptyText="Type to add a keyword"
+                      allowCustomValues
+                      className={emptyRuleIndexes.has(index) ? "w-full border-destructive" : "w-full"}
+                    />
+                    {emptyRuleIndexes.has(index) && (
+                      <span className="text-xs text-destructive">At least one keyword is required</span>
+                    )}
+                  </div>
+                  <div style={{ width: 220 }}>
+                    <strong className="mb-2 block font-semibold">Route to tier</strong>
+                    <Select
+                      items={tierOptions(tierLabels)}
+                      value={rule.tier}
+                      onValueChange={(tier: ComplexityTier | null) => tier && updateRule(rule.id, { tier })}
+                    >
+                      <SelectTrigger aria-label={`Route keyword rule ${index + 1} to tier`} className="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {tierOptions(tierLabels).map((option) => (
+                          <SelectItem key={option.value} value={option.value}>
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </div>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="text-destructive hover:text-destructive"
+                    aria-label={`Remove keyword rule ${index + 1}`}
+                    onClick={() => removeRule(rule.id)}
+                  >
+                    <Trash2 />
+                  </Button>
                 </div>
-                <div style={{ width: 220 }}>
-                  <Text strong style={{ display: "block", marginBottom: 8 }}>
-                    Route to tier
-                  </Text>
-                  <AntdSelect
-                    value={rule.tier}
-                    onChange={(tier: ComplexityTier) => updateRule(rule.id, { tier })}
-                    options={tierOptions(tierLabels)}
-                    style={{ width: "100%" }}
-                  />
-                </div>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="text-destructive hover:text-destructive"
-                  aria-label={`Remove keyword rule ${index + 1}`}
-                  onClick={() => removeRule(rule.id)}
-                >
-                  <DeleteOutlined />
-                </Button>
-              </div>
+              </CardContent>
             </Card>
           ))}
         </div>
diff --git a/ui/litellm-dashboard/src/components/add_model/SemanticKeywordMatching.tsx b/ui/litellm-dashboard/src/components/add_model/SemanticKeywordMatching.tsx
index 867f6a901e8..9da0bf394e5 100644
--- a/ui/litellm-dashboard/src/components/add_model/SemanticKeywordMatching.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/SemanticKeywordMatching.tsx
@@ -1,11 +1,11 @@
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { Info } from "lucide-react";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { InputNumber, Select as AntdSelect, Switch, Typography } from "antd";
+import { SearchSelect } from "@/components/shared/SearchSelect";
+import { Input } from "@/components/ui/input";
+import { Switch } from "@/components/ui/switch";
 import React from "react";
 import { ModelGroup } from "@/components/llm_calls/fetch_models";
 
-const { Text } = Typography;
-
 const DEFAULT_MATCH_THRESHOLD = 0.5;
 
 interface SemanticKeywordMatchingProps {
@@ -41,49 +41,49 @@ const SemanticKeywordMatching: React.FC<SemanticKeywordMatchingProps> = ({
       <div className="flex items-center justify-between gap-4">
         <div>
           <div className="flex items-center gap-2">
-            <Text className="font-medium">Semantic keyword matching</Text>
+            <span className="font-medium">Semantic keyword matching</span>
             <SimpleTooltip content="Recognize related phrasing beyond exact keyword matches by comparing embeddings instead of plain text. Overrides direct keyword matching">
-              <InfoCircleOutlined className="text-gray-400" />
+              <Info className="size-4 text-gray-400" />
             </SimpleTooltip>
           </div>
-          <Text className="text-gray-500 text-sm">
+          <span className="text-gray-500 text-sm">
             Uses same keyword-tier pairs as above and overrides direct keyword matching. Adds latency based on embedding
             model network request.
-          </Text>
+          </span>
         </div>
-        <Switch checked={enabled} onChange={onEnabledChange} aria-label="Semantic keyword matching" />
+        <Switch checked={enabled} onCheckedChange={onEnabledChange} aria-label="Semantic keyword matching" />
       </div>
 
       {enabled && (
         <div className="grid gap-4 md:grid-cols-2 mt-4 pt-4 border-t border-gray-200">
           <div>
-            <Text className="text-sm font-medium mb-1 block">Embedding model</Text>
-            <AntdSelect
-              value={embeddingModel}
-              onChange={onEmbeddingModelChange}
-              placeholder="Select an embedding model"
-              showSearch
-              style={{ width: "100%" }}
+            <span className="mb-1 block text-sm font-medium">Embedding model</span>
+            <SearchSelect
               options={modelOptions}
-              status={embeddingModelMissing ? "error" : undefined}
+              value={embeddingModel ?? ""}
+              onValueChange={onEmbeddingModelChange}
+              placeholder="Select an embedding model"
+              emptyText="No embedding models found"
+              aria-label="Embedding model"
+              allowClear={false}
+              className={embeddingModelMissing ? "border-destructive" : undefined}
             />
-            {embeddingModelMissing && (
-              <Text type="danger" style={{ fontSize: 12 }}>
-                An embedding model is required
-              </Text>
-            )}
+            {embeddingModelMissing && <span className="text-xs text-destructive">An embedding model is required</span>}
           </div>
           <div>
-            <Text className="text-sm font-medium mb-1 block">Minimum match score</Text>
-            <InputNumber
+            <span className="mb-1 block text-sm font-medium">Minimum match score</span>
+            <Input
+              type="number"
               value={matchThreshold}
-              onChange={(value) => onMatchThresholdChange(value ?? DEFAULT_MATCH_THRESHOLD)}
+              onChange={(event) =>
+                onMatchThresholdChange(event.target.value === "" ? DEFAULT_MATCH_THRESHOLD : event.target.valueAsNumber)
+              }
               min={0}
               max={1}
               step={0.05}
-              style={{ width: "100%" }}
+              className="w-full"
             />
-            <Text className="text-gray-500 text-xs mt-1 block">Match only at or above this similarity score.</Text>
+            <span className="mt-1 block text-xs text-gray-500">Match only at or above this similarity score.</span>
           </div>
         </div>
       )}
diff --git a/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.test.tsx b/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.test.tsx
index 5643dafc0f5..e45422dee08 100644
--- a/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/add_auto_router_tab.test.tsx
@@ -27,7 +27,7 @@ const ALL_FAMILY_MODELS: ModelGroup[] = [
 const ANTHROPIC_ONLY_MODEL = ANTHROPIC_TIERS.COMPLEX[0];
 
 const openTemplateDropdown = (): void => {
-  fireEvent.mouseDown(within(screen.getByTestId("template-selector")).getByRole("combobox"));
+  fireEvent.click(screen.getByTestId("template-selector"));
 };
 
 // Detailed Configuration is collapsed by default, so any test reaching into it (a tier select, an
@@ -36,15 +36,32 @@ const expandDetailedConfiguration = (): void => {
   fireEvent.click(screen.getByTestId("detailed-configuration-toggle"));
 };
 
-const visibleOptions = (): HTMLElement[] =>
-  // eslint-disable-next-line local/no-antd-class-selectors -- antd puts role="option" only on a hidden mirror list of raw values; the visible options carry no role, no aria-disabled, and only a tooltip in title
-  Array.from(document.querySelectorAll<HTMLElement>(".ant-select-item-option"));
+const visibleOptions = (): HTMLElement[] => screen.queryAllByRole("option");
 
 const optionByLabel = (label: string): HTMLElement | undefined =>
   visibleOptions().find((el) => el.textContent?.startsWith(label));
 
-// eslint-disable-next-line local/no-antd-class-selectors -- antd signals option disabled state only through this class
-const isOptionDisabled = (option: HTMLElement): boolean => option.classList.contains("ant-select-item-option-disabled");
+const isOptionDisabled = (option: HTMLElement): boolean => option.getAttribute("aria-disabled") === "true";
+
+const selectTemplate = async (label: string): Promise<void> => {
+  await userEvent.click(optionByLabel(label)!);
+};
+
+// Opens the dropdown only when it is closed, since openTemplateDropdown toggles: waiting on a
+// second preset in the same test would otherwise close the list out from under the poll.
+const waitForPresetEnabled = async (label: string) => {
+  if (visibleOptions().length === 0) openTemplateDropdown();
+  await waitFor(() => {
+    expect(isOptionDisabled(optionByLabel(label)!)).toBe(false);
+  });
+};
+
+// The keyword field is a combobox that offers whatever is typed as a "Create ..." entry, so a
+// keyword only lands on the rule once that entry is picked.
+const addKeyword = async (user: ReturnType<typeof userEvent.setup>, field: HTMLElement, keyword: string) => {
+  await user.type(within(field).getByRole("combobox"), keyword);
+  await user.click(await screen.findByText(`Create "${keyword}"`));
+};
 
 const { mockFetchAvailableModels, mockFetchAllModelDeployments } = vi.hoisted(() => ({
   mockFetchAvailableModels: vi.fn(),
@@ -202,10 +219,7 @@ describe("AddAutoRouterTab", () => {
     await user.click(screen.getByRole("button", { name: /add keyword rule/i }));
     expect(screen.getByRole("button", { name: /add auto router/i })).toBeDisabled();
 
-    await user.type(
-      within(screen.getByText("Keywords 1").closest("div") as HTMLElement).getByRole("combobox"),
-      "invoice{enter}",
-    );
+    await addKeyword(user, screen.getByText("Keywords 1").closest("div") as HTMLElement, "invoice");
 
     expect(screen.getByRole("button", { name: /add auto router/i })).toBeEnabled();
     expect(screen.queryByText("At least one keyword is required")).not.toBeInTheDocument();
@@ -221,10 +235,7 @@ describe("AddAutoRouterTab", () => {
     expandDetailedConfiguration();
     await user.click(screen.getByText("Advanced: Keyword/Semantic Matching"));
     await user.click(screen.getByRole("button", { name: /add keyword rule/i }));
-    await user.type(
-      within(screen.getByText("Keywords 1").closest("div") as HTMLElement).getByRole("combobox"),
-      "invoice{enter}",
-    );
+    await addKeyword(user, screen.getByText("Keywords 1").closest("div") as HTMLElement, "invoice");
     await user.click(screen.getByRole("button", { name: /add keyword rule/i }));
 
     expect(await screen.findAllByText("At least one keyword is required")).toHaveLength(1);
@@ -242,7 +253,7 @@ describe("AddAutoRouterTab", () => {
     await user.click(screen.getByText("Advanced: Keyword/Semantic Matching"));
     await user.click(screen.getByRole("button", { name: /add keyword rule/i }));
     const keywordsField = screen.getByText("Keywords 1").closest("div") as HTMLElement;
-    await user.type(within(keywordsField).getByRole("combobox"), "invoice{enter}");
+    await addKeyword(user, keywordsField, "invoice");
     await user.click(screen.getByRole("button", { name: /add auto router/i }));
 
     await waitFor(() => expect(handleAddAutoRouterSubmit).toHaveBeenCalled());
@@ -285,6 +296,28 @@ describe("AddAutoRouterTab", () => {
     });
   });
 
+  // The scalar floor is the one scorer knob with no group dict behind it, so its wiring into the create
+  // payload is only proven end to end. 0 is the case a truthy check would silently drop.
+  it("carries a reasoning override floor of 0 through to the create payload", async () => {
+    const user = userEvent.setup();
+    vi.mocked(getMissingTiersError).mockReturnValue(null);
+
+    renderWithProviders(<Harness />);
+
+    await user.type(screen.getByPlaceholderText(/smart_router/i), "override-floor-router");
+    expandDetailedConfiguration();
+    await user.click(screen.getByText("Advanced: Classification Method"));
+    await user.click(await screen.findByText("Advanced scoring"));
+    fireEvent.change(await screen.findByLabelText("Minimum score"), { target: { value: "0" } });
+
+    await user.click(screen.getByRole("button", { name: /add auto router/i }));
+
+    await waitFor(() => expect(handleAddAutoRouterSubmit).toHaveBeenCalled());
+    expect(vi.mocked(handleAddAutoRouterSubmit).mock.calls.at(-1)?.[0].complexity_router_config).toMatchObject({
+      reasoning_override_min_score: 0,
+    });
+  });
+
   it("carries session affinity turned on through to the create payload", async () => {
     const user = userEvent.setup();
     vi.mocked(getMissingTiersError).mockReturnValue(null);
@@ -385,7 +418,7 @@ describe("AddAutoRouterTab", () => {
       await user.click(screen.getByText("Advanced: Keyword/Semantic Matching"));
       await user.click(screen.getByRole("button", { name: /add keyword rule/i }));
       const keywordsField = screen.getByText("Keywords 1").closest("div") as HTMLElement;
-      await user.type(within(keywordsField).getByRole("combobox"), "invoice{enter}");
+      await addKeyword(user, keywordsField, "invoice");
 
       await user.click(screen.getByTestId("auto-router-test-routing-btn"));
       await user.type(await screen.findByTestId("auto-router-routing-test-prompt"), "reconcile this invoice");
@@ -430,17 +463,6 @@ describe("AddAutoRouterTab", () => {
   });
 
   describe("template presets", () => {
-    // Opens the dropdown once, then waits out the useQuery load: an open antd Select re-renders its
-    // already-mounted options in place as state changes, so polling only re-reads the DOM here.
-    // Re-firing the open/close mousedown on every poll (calling openTemplateDropdown inside the
-    // waitFor callback) fights the dropdown's own open/close animation and hangs the test.
-    const waitForPresetEnabled = async (label: string) => {
-      openTemplateDropdown();
-      await waitFor(() => {
-        expect(isOptionDisabled(optionByLabel(label)!)).toBe(false);
-      });
-    };
-
     it("disables every preset while the model list is loading", async () => {
       let resolveModels: (models: ModelGroup[]) => void = () => {};
       mockFetchAvailableModels.mockImplementation(
@@ -515,7 +537,7 @@ describe("AddAutoRouterTab", () => {
       renderWithProviders(<Harness />);
       await waitForPresetEnabled("Anthropic Family");
 
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
 
       expect(screen.queryByText("Advanced: Keyword/Semantic Matching")).not.toBeInTheDocument();
       expect(
@@ -526,11 +548,11 @@ describe("AddAutoRouterTab", () => {
       ).toBeInTheDocument();
     });
 
-    it("expands detailed configuration when Custom Configuration is chosen", () => {
+    it("expands detailed configuration when Custom Configuration is chosen", async () => {
       renderWithProviders(<Harness />);
       openTemplateDropdown();
 
-      fireEvent.click(optionByLabel("Custom Configuration")!);
+      await selectTemplate("Custom Configuration");
 
       expect(screen.getByText("Advanced: Keyword/Semantic Matching")).toBeInTheDocument();
     });
@@ -539,7 +561,7 @@ describe("AddAutoRouterTab", () => {
       mockFetchAvailableModels.mockResolvedValue(ALL_FAMILY_MODELS);
       renderWithProviders(<Harness />);
       await waitForPresetEnabled("Anthropic Family");
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
       expect(screen.queryByText("Advanced: Keyword/Semantic Matching")).not.toBeInTheDocument();
 
       fireEvent.click(screen.getByTestId("detailed-configuration-toggle"));
@@ -556,7 +578,7 @@ describe("AddAutoRouterTab", () => {
 
       renderWithProviders(<Harness />);
       await waitForPresetEnabled("Anthropic Family");
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
 
       await user.type(screen.getByPlaceholderText(/smart_router/i), "anthropic-router");
       await user.click(screen.getByRole("button", { name: /add auto router/i }));
@@ -578,7 +600,7 @@ describe("AddAutoRouterTab", () => {
 
       const { container } = renderWithProviders(<Harness />);
       await waitForPresetEnabled("Anthropic Family");
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
       fireEvent.change(screen.getByPlaceholderText(/smart_router/i), { target: { value: "stale-model-router" } });
       expect(screen.getByRole("button", { name: /add auto router/i })).toBeEnabled();
 
@@ -600,26 +622,16 @@ describe("AddAutoRouterTab", () => {
   describe("default model pin", () => {
     const PINNED_MODEL = "pinned-default-model";
 
-    const waitForPresetEnabled = async (label: string) => {
-      openTemplateDropdown();
-      await waitFor(() => {
-        expect(isOptionDisabled(optionByLabel(label)!)).toBe(false);
-      });
-    };
-
     const applyPresetAndPin = async (user: ReturnType<typeof userEvent.setup>) => {
       await waitForPresetEnabled("Anthropic Family");
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
 
       // Applying a preset collapses Detailed Configuration, so the default model row is behind it.
       expandDetailedConfiguration();
       const defaultModel = screen.getByRole("combobox", { name: "Default model" });
       await user.click(defaultModel);
-      // antd virtualizes the option list and jsdom gives every row zero height, so options past
-      // the first window never render. Typing filters the list down to the pin instead of relying
-      // on its index, which adding a preset to the bundled JSON shifts.
       await user.type(defaultModel, PINNED_MODEL);
-      await user.click((await screen.findAllByTitle(PINNED_MODEL)).slice(-1)[0]);
+      await user.click(await screen.findByRole("option", { name: PINNED_MODEL }));
     };
 
     beforeEach(() => {
@@ -670,19 +682,12 @@ describe("AddAutoRouterTab", () => {
       mockFetchAvailableModels.mockResolvedValue(ALL_FAMILY_MODELS);
     });
 
-    const waitForPresetEnabled = async (label: string) => {
-      openTemplateDropdown();
-      await waitFor(() => {
-        expect(isOptionDisabled(optionByLabel(label)!)).toBe(false);
-      });
-    };
-
     it("omits plan_mode_min_tier from the payload when never touched", async () => {
       const user = userEvent.setup();
       renderWithProviders(<Harness />);
 
       await waitForPresetEnabled("Anthropic Family");
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
       await user.type(screen.getByPlaceholderText(/smart_router/i), "no-plan-router");
       await user.click(screen.getByRole("button", { name: /add auto router/i }));
 
@@ -697,7 +702,7 @@ describe("AddAutoRouterTab", () => {
       renderWithProviders(<Harness />);
 
       await waitForPresetEnabled("Anthropic Family");
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
       expandDetailedConfiguration();
       await user.click(screen.getByText("Advanced: Plan-Mode Override"));
       await user.click(await screen.findByRole("switch", { name: "Route plan-mode requests to a minimum tier" }));
@@ -751,7 +756,7 @@ describe("AddAutoRouterTab", () => {
       await waitFor(() => {
         expect(isOptionDisabled(optionByLabel("Anthropic Family")!)).toBe(false);
       });
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
 
       expect(screen.getByText("Advanced: Keyword/Semantic Matching")).toBeInTheDocument();
 
@@ -840,7 +845,7 @@ describe("AddAutoRouterTab", () => {
       await waitFor(() => {
         expect(isOptionDisabled(optionByLabel("Anthropic Family")!)).toBe(false);
       });
-      fireEvent.click(optionByLabel("Anthropic Family")!);
+      await selectTemplate("Anthropic Family");
 
       await user.type(screen.getByPlaceholderText(/smart_router/i), "wildcard-router");
       await user.click(screen.getByRole("button", { name: /add auto router/i }));
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 e35b9581d9c..64d1519f915 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
@@ -1,13 +1,14 @@
 import React, { useEffect, useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { useWatch } from "react-hook-form";
-import { Card, Select as AntdSelect, Modal } from "antd";
+import { Card } from "antd";
 import { ChevronDown, ChevronRight, CircleHelp } from "lucide-react";
 import { z } from "zod/v4";
 import { FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
@@ -57,6 +58,7 @@ import {
   PresetPrefill,
   AutoRouterPreset,
 } from "@/lib/autorouter_presets";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface AddAutoRouterTabProps {
   handleOk: () => void;
@@ -288,6 +290,14 @@ const AddAutoRouterTab: React.FC<AddAutoRouterTabProps> = ({
     [presetAvailability],
   );
 
+  const templateItems = React.useMemo(
+    () => [
+      ...sortedPresetOptions.map(({ preset }) => ({ value: preset.key, label: preset.label })),
+      { value: "custom", label: "Custom Configuration" },
+    ],
+    [sortedPresetOptions],
+  );
+
   const applyPrefill = (prefill: PresetPrefill) => {
     setComplexityRouterConfig(prefill.complexityRouterConfig);
     setCustomTechnicalKeywords(prefill.customTechnicalKeywords);
@@ -361,6 +371,7 @@ const AddAutoRouterTab: React.FC<AddAutoRouterTabProps> = ({
     tierBoundaries: complexityRouterConfig.tier_boundaries,
     tokenThresholds: complexityRouterConfig.token_thresholds,
     dimensionWeights: complexityRouterConfig.dimension_weights,
+    reasoningOverrideMinScore: complexityRouterConfig.reasoning_override_min_score,
   };
 
   const submitRecommendedRouter = async (name: string) => {
@@ -484,49 +495,52 @@ const AddAutoRouterTab: React.FC<AddAutoRouterTabProps> = ({
 
             <div>
               <label className="block text-sm font-medium text-foreground mb-2">Template</label>
-              <AntdSelect
-                value={selectedPreset}
-                onChange={handlePresetChange}
-                placeholder="Choose a template or select Custom to define your own"
-                className="w-full"
-                optionLabelProp="label"
-                data-testid="template-selector"
+              <Select
+                items={templateItems}
+                value={selectedPreset ?? null}
+                onValueChange={(presetKey: string | null) => handlePresetChange(presetKey ?? undefined)}
               >
-                {sortedPresetOptions.map(({ preset, availability: presetState }) => {
-                  const disabledHint = presetDisabledHint(presetState);
-                  const isDisabled = disabledHint !== null;
-                  const hintClass = isPresetHintAlarming(presetState)
-                    ? "text-red-500 dark:text-red-400"
-                    : "text-muted-foreground";
-                  const matchedHint =
-                    presetState.kind === "available" && presetState.viaDeployments ? "Matches your deployments" : null;
+                <SelectTrigger data-testid="template-selector" className="w-full">
+                  <SelectValue placeholder="Choose a template or select Custom to define your own" />
+                </SelectTrigger>
+                <SelectContent>
+                  {sortedPresetOptions.map(({ preset, availability: presetState }) => {
+                    const disabledHint = presetDisabledHint(presetState);
+                    const hintClass = isPresetHintAlarming(presetState)
+                      ? "text-red-500 dark:text-red-400"
+                      : "text-muted-foreground";
+                    const matchedHint =
+                      presetState.kind === "available" && presetState.viaDeployments
+                        ? "Matches your deployments"
+                        : null;
 
-                  return (
-                    <AntdSelect.Option
-                      key={preset.key}
-                      value={preset.key}
-                      label={preset.label}
-                      disabled={isDisabled}
-                      title={disabledHint ?? preset.description}
-                    >
-                      <div>
-                        <div className="font-medium">{preset.label}</div>
-                        <div className="text-xs text-muted-foreground">{preset.description}</div>
-                        {disabledHint && <div className={`text-xs mt-1 ${hintClass}`}>{disabledHint}</div>}
-                        {matchedHint && (
-                          <div className="text-xs mt-1 text-green-600 dark:text-green-400">{matchedHint}</div>
-                        )}
-                      </div>
-                    </AntdSelect.Option>
-                  );
-                })}
-                <AntdSelect.Option value="custom" label="Custom Configuration">
-                  <div>
-                    <div className="font-medium">Custom Configuration</div>
-                    <div className="text-xs text-muted-foreground">Define your auto router from scratch</div>
-                  </div>
-                </AntdSelect.Option>
-              </AntdSelect>
+                    return (
+                      <SelectItem
+                        key={preset.key}
+                        value={preset.key}
+                        label={preset.label}
+                        disabled={disabledHint !== null}
+                        title={disabledHint ?? preset.description}
+                      >
+                        <div>
+                          <div className="font-medium">{preset.label}</div>
+                          <div className="text-xs text-muted-foreground">{preset.description}</div>
+                          {disabledHint && <div className={`text-xs mt-1 ${hintClass}`}>{disabledHint}</div>}
+                          {matchedHint && (
+                            <div className="text-xs mt-1 text-green-600 dark:text-green-400">{matchedHint}</div>
+                          )}
+                        </div>
+                      </SelectItem>
+                    );
+                  })}
+                  <SelectItem value="custom" label="Custom Configuration">
+                    <div>
+                      <div className="font-medium">Custom Configuration</div>
+                      <div className="text-xs text-muted-foreground">Define your auto router from scratch</div>
+                    </div>
+                  </SelectItem>
+                </SelectContent>
+              </Select>
               {modelsUnverifiable && (
                 <div className="text-xs mt-1 text-red-500 dark:text-red-400">
                   Could not load available models.{" "}
@@ -670,62 +684,69 @@ const AddAutoRouterTab: React.FC<AddAutoRouterTabProps> = ({
         </form>
       </Card>
 
-      <Modal
-        title="Test Routing"
-        open={isRoutingTestVisible}
-        destroyOnHidden
-        onCancel={() => setIsRoutingTestVisible(false)}
-        footer={[
-          <Button key="close" variant="outline" onClick={() => setIsRoutingTestVisible(false)}>
-            Close
-          </Button>,
-        ]}
-        width={760}
-      >
-        {isRoutingTestVisible && (
-          <AutoRouterRoutingTest
-            accessToken={accessToken}
-            config={buildComplexityRouterConfig(complexityRouterConfigParams)}
-            defaultModel={resolveComplexityDefaultModel(
-              complexityRouterConfig.tiers,
-              complexityRouterConfig.default_model,
-            )}
-            routerName={watchedName}
-            teamId={requiresTeamScope ? watchedTeamId : undefined}
-          />
-        )}
-      </Modal>
+      <Dialog open={isRoutingTestVisible} onOpenChange={(open) => !open && setIsRoutingTestVisible(false)}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[760px]">
+          <DialogHeader>
+            <DialogTitle>Test Routing</DialogTitle>
+          </DialogHeader>
+          {isRoutingTestVisible && (
+            <AutoRouterRoutingTest
+              accessToken={accessToken}
+              config={buildComplexityRouterConfig(complexityRouterConfigParams)}
+              defaultModel={resolveComplexityDefaultModel(
+                complexityRouterConfig.tiers,
+                complexityRouterConfig.default_model,
+              )}
+              routerName={watchedName}
+              teamId={requiresTeamScope ? watchedTeamId : undefined}
+            />
+          )}
+          <DialogFooter>
+            {" "}
+            <Button variant="outline" onClick={() => setIsRoutingTestVisible(false)}>
+              Close
+            </Button>
+            , ]
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
 
-      <Modal
-        title="Connection Test Results"
+      <Dialog
         open={isTestModalVisible}
-        onCancel={() => {
-          setIsTestModalVisible(false);
-          setIsTestingConnection(false);
+        onOpenChange={(open) => {
+          if (!open) {
+            setIsTestModalVisible(false);
+            setIsTestingConnection(false);
+          }
         }}
-        footer={[
-          <Button
-            key="close"
-            variant="outline"
-            onClick={() => {
-              setIsTestModalVisible(false);
-              setIsTestingConnection(false);
-            }}
-          >
-            Close
-          </Button>,
-        ]}
-        width={700}
       >
-        {isTestModalVisible && (
-          <AutoRouterConnectionTest
-            key={connectionTestId}
-            accessToken={accessToken}
-            targets={testTargets}
-            onTestComplete={() => setIsTestingConnection(false)}
-          />
-        )}
-      </Modal>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
+          <DialogHeader>
+            <DialogTitle>Connection Test Results</DialogTitle>
+          </DialogHeader>
+          {isTestModalVisible && (
+            <AutoRouterConnectionTest
+              key={connectionTestId}
+              accessToken={accessToken}
+              targets={testTargets}
+              onTestComplete={() => setIsTestingConnection(false)}
+            />
+          )}
+          <DialogFooter>
+            {" "}
+            <Button
+              variant="outline"
+              onClick={() => {
+                setIsTestModalVisible(false);
+                setIsTestingConnection(false);
+              }}
+            >
+              Close
+            </Button>
+            , ]
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </TooltipProvider>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx b/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx
index 140b4363327..5bc0dcd143d 100644
--- a/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx
@@ -1,15 +1,18 @@
 import React from "react";
-import { Switch, Select, Tooltip, DatePicker } from "antd";
-import { ChevronDown } from "lucide-react";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Switch } from "@/components/ui/switch";
+import { SimpleTooltip } from "@/components/ui/tooltip";
+import type { Dayjs } from "dayjs";
+import { ChevronDown, Info } from "lucide-react";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import { Input } from "@/components/ui/input";
-import { Row, Col, Typography } from "antd";
-import TextArea from "antd/es/input/TextArea";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { Textarea } from "@/components/ui/textarea";
 import { Team } from "../key_team_helpers/key_list";
 import { antdRules } from "../common_components/antdFormRules";
 import { labelWithHint } from "@/components/shared/form/LabelWithHint";
 import { MountedFormField } from "../common_components/MountedFormField";
+import { UtcDateTimeInput } from "@/components/shared/form/UtcDateTimeInput";
 import CacheControlInjectionPoints, {
   CACHE_CONTROL_LABEL,
   CACHE_CONTROL_TOOLTIP,
@@ -31,7 +34,6 @@ import {
   PTU_END_FIELD,
 } from "../../utils/ptuValidation";
 import { usePtuCostAttributionEnabled } from "@/app/(dashboard)/hooks/uiSettings/usePtuCostAttributionEnabled";
-const { Link } = Typography;
 
 interface AdvancedSettingsProps {
   showAdvancedSettings: boolean;
@@ -52,6 +54,11 @@ const USAGE_COST_FIELDS = [
 
 const REVALIDATED_WHEN_PTU_COUNT_CHANGES = [PTU_RATE_FIELD, PTU_START_FIELD, ...USAGE_COST_FIELDS];
 
+const PRICING_MODEL_ITEMS = [
+  { value: "per_token", label: "Per Million Tokens" },
+  { value: "per_second", label: "Per Second" },
+] as const;
+
 const validateNumber = (_: unknown, value: unknown) => {
   if (!value) {
     return Promise.resolve();
@@ -80,6 +87,14 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
   const [showCacheControl, setShowCacheControl] = React.useState(false);
   const ptuCostAttributionEnabled = usePtuCostAttributionEnabled();
 
+  const handlePricingModelChange =
+    (onChange: (value: string) => void) =>
+    (value: "per_token" | "per_second" | null): void => {
+      if (value === null) return;
+      onChange(value);
+      setPricingModel(value);
+    };
+
   return (
     <>
       <Collapsible className="mt-2 mb-4 overflow-hidden rounded-lg border">
@@ -94,11 +109,10 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                 <Switch
                   id={control.id}
                   checked={control.value === true}
-                  onChange={(checked) => {
+                  onCheckedChange={(checked) => {
                     control.onChange(checked);
                     setCustomPricing(checked);
                   }}
-                  className="bg-gray-600"
                 />
               )}
             </MountedFormField>
@@ -108,16 +122,16 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
               label={
                 <span>
                   Attached Knowledge Bases (RAG){" "}
-                  <Tooltip title="Vector stores to use for RAG. Every request to this model will automatically retrieve context from these knowledge bases.">
+                  <SimpleTooltip content="Vector stores to use for RAG. Every request to this model will automatically retrieve context from these knowledge bases.">
                     <a
                       href="https://docs.litellm.ai/docs/completion/knowledgebase"
                       target="_blank"
                       rel="noopener noreferrer"
                       onClick={(e) => e.stopPropagation()}
                     >
-                      <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+                      <Info className="ml-1 inline size-3.5 align-text-bottom" />
                     </a>
-                  </Tooltip>
+                  </SimpleTooltip>
                 </span>
               }
               className="mt-4"
@@ -138,50 +152,48 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
               label={
                 <span>
                   Guardrails{" "}
-                  <Tooltip title="Apply safety guardrails to this key to filter content or enforce policies">
+                  <SimpleTooltip content="Apply safety guardrails to this key to filter content or enforce policies">
                     <a
                       href="https://docs.litellm.ai/docs/proxy/guardrails/quick_start"
                       target="_blank"
                       rel="noopener noreferrer"
                       onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
                     >
-                      <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+                      <Info className="ml-1 inline size-3.5 align-text-bottom" />
                     </a>
-                  </Tooltip>
+                  </SimpleTooltip>
                 </span>
               }
               className="mt-4"
               help="Select existing guardrails. Go to 'Guardrails' tab to create new guardrails."
             >
               {(control) => (
-                <Select
+                <MultiSelect
                   id={control.id}
-                  mode="tags"
-                  style={{ width: "100%" }}
                   placeholder="Select or enter guardrails"
-                  value={control.value as string[] | undefined}
-                  onChange={control.onChange}
-                  onBlur={control.onBlur}
+                  emptyText="Type to add a guardrail"
+                  value={(control.value as string[] | undefined) ?? []}
+                  onValueChange={control.onChange}
                   options={guardrailsList.map((name) => ({ value: name, label: name }))}
+                  allowCustomValues
                 />
               )}
             </MountedFormField>
 
             <MountedFormField name="tags" label="Tags" className="mb-4">
               {(control) => (
-                <Select
+                <MultiSelect
                   id={control.id}
-                  mode="tags"
-                  style={{ width: "100%" }}
                   placeholder="Select or enter tags"
-                  value={control.value as string[] | undefined}
-                  onChange={control.onChange}
-                  onBlur={control.onBlur}
+                  emptyText="Type to add a tag"
+                  value={(control.value as string[] | undefined) ?? []}
+                  onValueChange={control.onChange}
                   options={Object.values(tagsList).map((tag) => ({
                     value: tag.name,
                     label: tag.name,
-                    title: tag.description || tag.name,
+                    description: tag.description || undefined,
                   }))}
+                  allowCustomValues
                 />
               )}
             </MountedFormField>
@@ -250,11 +262,9 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                   className="mb-4"
                 >
                   {(control) => (
-                    <DatePicker
+                    <UtcDateTimeInput
                       id={control.id}
-                      showTime
-                      style={{ width: "100%" }}
-                      value={control.value as never}
+                      value={control.value as Dayjs | null}
                       onChange={control.onChange}
                       onBlur={control.onBlur}
                     />
@@ -274,11 +284,9 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                   className="mb-4"
                 >
                   {(control) => (
-                    <DatePicker
+                    <UtcDateTimeInput
                       id={control.id}
-                      showTime
-                      style={{ width: "100%" }}
-                      value={control.value as never}
+                      value={control.value as Dayjs | null}
                       onChange={control.onChange}
                       onBlur={control.onBlur}
                     />
@@ -292,19 +300,21 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                 <MountedFormField name="pricing_model" label="Pricing Model" className="mb-4">
                   {(control) => (
                     <Select
-                      id={control.id}
-                      defaultValue="per_token"
-                      value={control.value as "per_token" | "per_second" | undefined}
-                      onBlur={control.onBlur}
-                      onChange={(value: "per_token" | "per_second") => {
-                        control.onChange(value);
-                        setPricingModel(value);
-                      }}
-                      options={[
-                        { value: "per_token", label: "Per Million Tokens" },
-                        { value: "per_second", label: "Per Second" },
-                      ]}
-                    />
+                      items={PRICING_MODEL_ITEMS}
+                      value={(control.value as "per_token" | "per_second" | undefined) ?? "per_token"}
+                      onValueChange={handlePricingModelChange(control.onChange)}
+                    >
+                      <SelectTrigger id={control.id} onBlur={control.onBlur} className="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {PRICING_MODEL_ITEMS.map((item) => (
+                          <SelectItem key={item.value} value={item.value}>
+                            {item.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
                   )}
                 </MountedFormField>
 
@@ -402,20 +412,20 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                 "Use in pass through routes",
                 <span>
                   Allow using these credentials in pass through routes.{" "}
-                  <Link href="https://docs.litellm.ai/docs/pass_through/vertex_ai" target="_blank">
+                  <a
+                    href="https://docs.litellm.ai/docs/pass_through/vertex_ai"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-primary underline-offset-4 hover:underline"
+                  >
                     Learn more
-                  </Link>
+                  </a>
                 </span>,
               )}
               className="mb-4 mt-4"
             >
               {(control) => (
-                <Switch
-                  id={control.id}
-                  checked={control.value === true}
-                  onChange={control.onChange}
-                  className="bg-gray-600"
-                />
+                <Switch id={control.id} checked={control.value === true} onCheckedChange={control.onChange} />
               )}
             </MountedFormField>
 
@@ -428,11 +438,10 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                 <Switch
                   id={control.id}
                   checked={control.value === true}
-                  onChange={(checked) => {
+                  onCheckedChange={(checked) => {
                     control.onChange(checked);
                     setShowCacheControl(checked);
                   }}
-                  className="bg-gray-600"
                 />
               )}
             </MountedFormField>
@@ -457,7 +466,7 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
               rules={{ validate: antdRules({ validator: formItemValidateJSON }) }}
             >
               {(control) => (
-                <TextArea
+                <Textarea
                   id={control.id}
                   value={(control.value as string | undefined) ?? ""}
                   onChange={control.onChange}
@@ -471,17 +480,19 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                 />
               )}
             </MountedFormField>
-            <Row className="mb-4">
-              <Col span={10}></Col>
-              <Col span={10}>
-                <p className="text-muted-foreground text-sm">
-                  Pass JSON of litellm supported params{" "}
-                  <Link href="https://docs.litellm.ai/docs/completion/input" target="_blank">
-                    litellm.completion() call
-                  </Link>
-                </p>
-              </Col>
-            </Row>
+            <div className="grid grid-cols-24 mb-4">
+              <p className="col-start-11 col-span-10 text-muted-foreground text-sm">
+                Pass JSON of litellm supported params{" "}
+                <a
+                  href="https://docs.litellm.ai/docs/completion/input"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-primary underline-offset-4 hover:underline"
+                >
+                  litellm.completion() call
+                </a>
+              </p>
+            </div>
             <MountedFormField
               name="model_info_params"
               label={labelWithHint(
@@ -492,7 +503,7 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
               rules={{ validate: antdRules({ validator: formItemValidateJSON }) }}
             >
               {(control) => (
-                <TextArea
+                <Textarea
                   id={control.id}
                   value={(control.value as string | undefined) ?? ""}
                   onChange={control.onChange}
diff --git a/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.test.ts b/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.test.ts
index 81d54a7b773..3e33136a3cc 100644
--- a/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.test.ts
+++ b/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.test.ts
@@ -601,6 +601,27 @@ describe("buildComplexityRouterConfig scorer knobs", () => {
   it("drops them when the classifier falls back to the default model and nothing is scored", () => {
     expect(buildComplexityRouterConfig(llmWithDefaultFallback)).not.toHaveProperty("tier_boundaries");
   });
+
+  it("omits the reasoning override floor while untouched, so it keeps tracking simple_medium", () => {
+    expect(buildComplexityRouterConfig(baseParams)).not.toHaveProperty("reasoning_override_min_score");
+  });
+
+  it("emits the reasoning override floor that was set", () => {
+    const config = buildComplexityRouterConfig({ ...baseParams, reasoningOverrideMinScore: 0.4 });
+    expect(config.reasoning_override_min_score).toBe(0.4);
+  });
+
+  // 0 is an unconditional override, not an absent knob, so a falsy check here would silently discard it.
+  it("emits an explicit 0 reasoning override floor", () => {
+    const config = buildComplexityRouterConfig({ ...baseParams, reasoningOverrideMinScore: 0 });
+    expect(config.reasoning_override_min_score).toBe(0);
+  });
+
+  it("drops the reasoning override floor when nothing is scored", () => {
+    expect(buildComplexityRouterConfig({ ...llmWithDefaultFallback, reasoningOverrideMinScore: 0 })).not.toHaveProperty(
+      "reasoning_override_min_score",
+    );
+  });
 });
 
 describe("plan-mode minimum tier", () => {
diff --git a/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.ts b/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.ts
index 0ab2db8c16f..bddf8321ad2 100644
--- a/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.ts
+++ b/ui/litellm-dashboard/src/components/add_model/build_complexity_router_config.ts
@@ -46,6 +46,7 @@ interface ScorerKnobInputs {
   tierBoundaries: TierBoundaries | undefined;
   tokenThresholds: TokenThresholds | undefined;
   dimensionWeights: DimensionWeights | undefined;
+  reasoningOverrideMinScore: number | undefined;
 }
 
 /**
@@ -59,6 +60,7 @@ const scorerKnobPayload = ({
   tierBoundaries,
   tokenThresholds,
   dimensionWeights,
+  reasoningOverrideMinScore,
 }: ScorerKnobInputs) =>
   heuristicScoringRoleFor(classifierType, classifierFallback) === "never"
     ? {}
@@ -66,6 +68,7 @@ const scorerKnobPayload = ({
         ...(tierBoundaries && { tier_boundaries: tierBoundaries }),
         ...(tokenThresholds && { token_thresholds: tokenThresholds }),
         ...(dimensionWeights && { dimension_weights: dimensionWeights }),
+        ...(reasoningOverrideMinScore !== undefined && { reasoning_override_min_score: reasoningOverrideMinScore }),
       };
 
 export interface BuildComplexityRouterConfigParams {
@@ -95,6 +98,7 @@ export interface BuildComplexityRouterConfigParams {
   tierBoundaries?: TierBoundaries;
   tokenThresholds?: TokenThresholds;
   dimensionWeights?: DimensionWeights;
+  reasoningOverrideMinScore?: number;
 }
 
 export interface ComplexityRouterConfigPayload {
@@ -124,6 +128,7 @@ export interface ComplexityRouterConfigPayload {
   tier_boundaries?: TierBoundaries;
   token_thresholds?: TokenThresholds;
   dimension_weights?: DimensionWeights;
+  reasoning_override_min_score?: number;
 }
 
 const TIER_KEYS: Array<keyof ComplexityTiers> = ["SIMPLE", "MEDIUM", "COMPLEX", "REASONING"];
@@ -230,11 +235,19 @@ export const buildComplexityRouterConfig = ({
   tierBoundaries,
   tokenThresholds,
   dimensionWeights,
+  reasoningOverrideMinScore,
 }: BuildComplexityRouterConfigParams): ComplexityRouterConfigPayload => {
   const cleanedEscalationKeywords = escalationKeywords.map((keyword) => keyword.trim()).filter(Boolean);
   const cleanedKeywordTierRules = serializeKeywordTierRules(keywordTierRules);
   const cleanedTierLabels = serializeTierLabels(tierLabels);
-  const scorerInputs = { classifierType, classifierFallback, tierBoundaries, tokenThresholds, dimensionWeights };
+  const scorerInputs = {
+    classifierType,
+    classifierFallback,
+    tierBoundaries,
+    tokenThresholds,
+    dimensionWeights,
+    reasoningOverrideMinScore,
+  };
   const scorerKnobs = scorerKnobPayload(scorerInputs);
 
   return {
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 ff165415105..c75cebed6a2 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
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from "react";
-import { Table } from "antd";
+import type { ColumnDef } from "@tanstack/react-table";
 import { useFormContext, useWatch } from "react-hook-form";
+import { DataTable } from "@/components/shared/DataTable";
 import { Input } from "@/components/ui/input";
 import { SimpleTooltip } from "@/components/ui/tooltip";
 import { antdRules } from "../common_components/antdFormRules";
@@ -136,20 +137,20 @@ const ConditionalPublicModelName: React.FC = () => {
 
   const liteLLMModelTooltipContent = <div>The model name LiteLLM will send to the LLM API</div>;
 
-  const columns = [
+  const columns: ColumnDef<ModelMapping>[] = [
     {
-      title: (
+      id: "public_name",
+      accessorKey: "public_name",
+      header: () => (
         <span className="flex items-center">
           Public Model Name
           <SimpleTooltip content={publicNameTooltipContent} width="500px" />
         </span>
       ),
-      dataIndex: "public_name",
-      key: "public_name",
-      render: (text: string, record: any, index: number) => {
+      cell: ({ row }) => {
         return (
           <Input
-            value={text}
+            value={row.original.public_name}
             onChange={(e) => {
               const newValue = e.target.value;
               const newMappings = [...((form.getValues("model_mappings") as ModelMapping[]) ?? [])];
@@ -175,7 +176,7 @@ const ConditionalPublicModelName: React.FC = () => {
                 finalPublicName = newValue.slice(0, -3); // Remove "-1m" (3 characters)
               }
 
-              newMappings[index].public_name = finalPublicName;
+              newMappings[row.index].public_name = finalPublicName;
               form.setValue("model_mappings", newMappings);
             }}
           />
@@ -183,14 +184,14 @@ const ConditionalPublicModelName: React.FC = () => {
       },
     },
     {
-      title: (
+      id: "litellm_model",
+      accessorKey: "litellm_model",
+      header: () => (
         <span className="flex items-center">
           LiteLLM Model Name
           <SimpleTooltip content={liteLLMModelTooltipContent} width="360px" />
         </span>
       ),
-      dataIndex: "litellm_model",
-      key: "litellm_model",
     },
   ];
 
@@ -208,12 +209,12 @@ const ConditionalPublicModelName: React.FC = () => {
       className="mb-4"
     >
       {(control) => (
-        <Table
+        <DataTable
           key={tableKey} // Add key to force re-render
-          dataSource={control.value as ModelMapping[] | undefined}
+          data={(control.value as ModelMapping[] | undefined) ?? []}
           columns={columns}
-          pagination={false}
-          size="small"
+          getRowId={(row) => row.litellm_model}
+          size="compact"
         />
       )}
     </MountedFormField>
diff --git a/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.test.ts b/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.test.ts
index 4f6c92e5a35..ee1d819872b 100644
--- a/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.test.ts
+++ b/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.test.ts
@@ -4,6 +4,7 @@ import { heuristicScoringRoleFor } from "./ComplexityRouterConfig";
 import {
   dimensionLabel,
   hydrateDimensionWeights,
+  hydrateReasoningOverrideMinScore,
   hydrateTierBoundaries,
   hydrateTokenThresholds,
   weightTotal,
@@ -46,6 +47,21 @@ describe("hydrating the scorer knobs", () => {
     expect(weightTotal({ a: 0.1, b: 0.2 })).toBe(0.3);
   });
 
+  it.each([[undefined], [null], ["0.15"], [Number.NaN], [Number.POSITIVE_INFINITY], [{ value: 0.15 }]])(
+    "hydrates the reasoning override floor %s to undefined",
+    (raw) => {
+      expect(hydrateReasoningOverrideMinScore(raw)).toBeUndefined();
+    },
+  );
+
+  // A stored 0 is an unconditional override, so hydrating it to undefined would silently retune the router
+  // back to tracking simple_medium on the next save.
+  it("hydrates a stored reasoning override floor, zero and negatives included", () => {
+    expect(hydrateReasoningOverrideMinScore(0)).toBe(0);
+    expect(hydrateReasoningOverrideMinScore(-0.3)).toBe(-0.3);
+    expect(hydrateReasoningOverrideMinScore(0.42)).toBe(0.42);
+  });
+
   it("falls back to the raw key when a dimension has no label yet", () => {
     expect(dimensionLabel("codePresence")).toBe("Code presence");
     expect(dimensionLabel("somethingNew")).toBe("somethingNew");
diff --git a/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.ts b/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.ts
index 46e145554ac..1f44a479c60 100644
--- a/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.ts
+++ b/ui/litellm-dashboard/src/components/add_model/heuristic_scoring_knobs.ts
@@ -44,5 +44,12 @@ export const hydrateTokenThresholds = (raw: unknown): TokenThresholds | undefine
 
 export const hydrateDimensionWeights = (raw: unknown): DimensionWeights | undefined => hydrateNumericMap(raw);
 
+/**
+ * The scalar counterpart of hydrateNumericMap: absent hydrates to undefined so an untouched save keeps the
+ * floor tracking tier_boundaries.simple_medium, while a stored 0 hydrates to 0, which is a real floor.
+ */
+export const hydrateReasoningOverrideMinScore = (raw: unknown): number | undefined =>
+  typeof raw === "number" && Number.isFinite(raw) ? raw : undefined;
+
 export const weightTotal = (weights: DimensionWeights): number =>
   Math.round(Object.values(weights).reduce((total, weight) => total + weight, 0) * 100) / 100;
diff --git a/ui/litellm-dashboard/src/components/add_model/litellm_model_name.tsx b/ui/litellm-dashboard/src/components/add_model/litellm_model_name.tsx
index 0af21b2adf6..664edd07143 100644
--- a/ui/litellm-dashboard/src/components/add_model/litellm_model_name.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/litellm_model_name.tsx
@@ -1,8 +1,7 @@
 import React from "react";
-import { Select as AntSelect } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
 import { useFormContext, useWatch } from "react-hook-form";
 import { Input } from "@/components/ui/input";
-import { Row, Col } from "antd";
 import { antdRequired } from "../common_components/antdFormRules";
 import { labelWithHint } from "@/components/shared/form/LabelWithHint";
 import { MountedFormField, type MountedFormValues } from "../common_components/MountedFormField";
@@ -133,21 +132,15 @@ const LiteLLMModelNameField: React.FC<LiteLLMModelNameFieldProps> = ({
               }}
             />
           ) : providerModels.length > 0 ? (
-            <AntSelect
+            <MultiSelect
               id={control.id}
-              data-testid="model-name-select"
-              mode="multiple"
-              allowClear
-              showSearch
               placeholder="Select models"
-              value={control.value as string[] | undefined}
-              onBlur={control.onBlur}
-              onChange={(value) => {
+              emptyText="No models found"
+              value={(control.value as string[] | undefined) ?? []}
+              onValueChange={(value: string[]) => {
                 control.onChange(value);
                 handleModelChange(value);
               }}
-              optionFilterProp="children"
-              filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
               options={[
                 {
                   label: "Custom Model Name (Enter below)",
@@ -162,7 +155,7 @@ const LiteLLMModelNameField: React.FC<LiteLLMModelNameFieldProps> = ({
                   value: model,
                 })),
               ]}
-              style={{ width: "100%" }}
+              className="w-full"
             />
           ) : (
             <Input
@@ -199,16 +192,13 @@ const LiteLLMModelNameField: React.FC<LiteLLMModelNameFieldProps> = ({
           )}
         </MountedFormField>
       )}
-      <Row>
-        <Col span={10}></Col>
-        <Col span={14}>
-          <p className="text-sm mb-3 mt-1">
-            {selectedProvider === Providers.Azure
-              ? "Your deployment name will be saved as the public model name, and LiteLLM will use 'azure/deployment-name' internally"
-              : "The model name LiteLLM will send to the LLM API"}
-          </p>
-        </Col>
-      </Row>
+      <div className="grid grid-cols-24">
+        <p className="col-start-11 col-span-14 text-sm mb-3 mt-1">
+          {selectedProvider === Providers.Azure
+            ? "Your deployment name will be saved as the public model name, and LiteLLM will use 'azure/deployment-name' internally"
+            : "The model name LiteLLM will send to the LLM API"}
+        </p>
+      </div>
     </>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.test.tsx b/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.test.tsx
index c3e8accae0a..1ea9505201c 100644
--- a/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.test.tsx
@@ -1,7 +1,9 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { beforeAll, describe, expect, it, vi } from "vitest";
+import { useFormContext } from "react-hook-form";
 import { Providers } from "../provider_info_helpers";
+import type { MountedFormValues } from "../common_components/MountedFormField";
 import { MountedFormHost } from "../../../tests/mounted-form-host";
 import ProviderSpecificFields from "./provider_specific_fields";
 
@@ -38,6 +40,19 @@ vi.mock("../networking", async () => {
           },
         ],
       },
+      {
+        provider: "Vertex_AI",
+        provider_display_name: Providers.Vertex_AI,
+        litellm_provider: "vertex_ai",
+        default_model_placeholder: "gemini-pro",
+        credential_fields: [
+          {
+            key: "vertex_credentials",
+            label: "Vertex Credentials",
+            field_type: "upload",
+          },
+        ],
+      },
       {
         provider: "Hosted_Vllm",
         provider_display_name: Providers.Hosted_Vllm,
@@ -124,7 +139,52 @@ const createQueryClient = () =>
     },
   });
 
+const VertexCredentialsProbe = () => {
+  const { watch } = useFormContext<MountedFormValues>();
+  return <output data-testid="vertex-credentials">{String(watch("vertex_credentials") ?? "")}</output>;
+};
+
 describe("ProviderSpecificFields", () => {
+  it("reads a picked service-account file into the vertex credentials field", async () => {
+    const queryClient = createQueryClient();
+    render(
+      <QueryClientProvider client={queryClient}>
+        <MountedFormHost>
+          <ProviderSpecificFields selectedProvider={"Vertex_AI" as Providers} />
+          <VertexCredentialsProbe />
+        </MountedFormHost>
+      </QueryClientProvider>,
+    );
+
+    const fileInput = await screen.findByLabelText("Vertex Credentials");
+    const serviceAccount = '{"project_id":"example"}';
+    fireEvent.change(fileInput, {
+      target: { files: [new File([serviceAccount], "vertex.json", { type: "application/json" })] },
+    });
+
+    await waitFor(() => expect(screen.getByTestId("vertex-credentials")).toHaveTextContent(serviceAccount));
+  });
+
+  it("ignores a picked file that is not JSON", async () => {
+    const queryClient = createQueryClient();
+    render(
+      <QueryClientProvider client={queryClient}>
+        <MountedFormHost>
+          <ProviderSpecificFields selectedProvider={"Vertex_AI" as Providers} />
+          <VertexCredentialsProbe />
+        </MountedFormHost>
+      </QueryClientProvider>,
+    );
+
+    const fileInput = await screen.findByLabelText("Vertex Credentials");
+    fireEvent.change(fileInput, {
+      target: { files: [new File(["not json"], "vertex.txt", { type: "text/plain" })] },
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(screen.getByTestId("vertex-credentials")).toBeEmptyDOMElement();
+  });
+
   it("should render", async () => {
     const queryClient = createQueryClient();
     render(
@@ -174,8 +234,11 @@ describe("ProviderSpecificFields", () => {
     const apiKeyInput = await screen.findByLabelText("OpenAI API Key");
     expect(apiKeyInput).toHaveAttribute("type", "password");
 
-    fireEvent.click(screen.getByLabelText("eye-invisible"));
+    fireEvent.click(screen.getByRole("button", { name: "Show password" }));
     expect(await screen.findByLabelText("OpenAI API Key")).toHaveAttribute("type", "text");
+
+    fireEvent.click(screen.getByRole("button", { name: "Hide password" }));
+    expect(await screen.findByLabelText("OpenAI API Key")).toHaveAttribute("type", "password");
   });
 
   it("should render the provider specific fields for vLLM", async () => {
diff --git a/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.tsx b/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.tsx
index e5f1f108b4f..7db59ae6e8d 100644
--- a/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/provider_specific_fields.tsx
@@ -1,8 +1,10 @@
 import { useProviderFields } from "@/app/(dashboard)/hooks/providers/useProviderFields";
-import { UploadOutlined } from "@ant-design/icons";
+import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Input } from "@/components/ui/input";
-import { Col, Input as AntdInput, Row, Select, Typography, Upload, UploadProps } from "antd";
+import { Textarea } from "@/components/ui/textarea";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Button } from "@/components/ui/button";
+import { Upload as UploadIcon } from "lucide-react";
 import React from "react";
 import { useFormContext } from "react-hook-form";
 import { antdRequired } from "../common_components/antdFormRules";
@@ -14,13 +16,21 @@ import {
 import { CredentialItem, ProviderCredentialFieldMetadata } from "../networking";
 import { provider_map, Providers } from "../provider_info_helpers";
 import { labelWithHint } from "@/components/shared/form/LabelWithHint";
-const { Link } = Typography;
 
 interface ProviderSpecificFieldsProps {
   selectedProvider: Providers;
-  uploadProps?: UploadProps;
 }
 
+const readTextFile = (file: File, onLoaded: (contents: string) => void) => {
+  const reader = new FileReader();
+  reader.onload = (event) => {
+    if (event.target) {
+      onLoaded(event.target.result as string);
+    }
+  };
+  reader.readAsText(file);
+};
+
 interface ProviderCredentialField {
   key: string;
   label: string;
@@ -107,9 +117,18 @@ export const createCredentialFromModel = (provider: string, modelData: any): Cre
   return credential;
 };
 
-const ProviderSpecificFields: React.FC<ProviderSpecificFieldsProps> = ({ selectedProvider, uploadProps }) => {
+const ProviderSpecificFields: React.FC<ProviderSpecificFieldsProps> = ({ selectedProvider }) => {
   const selectedProviderEnum = Providers[selectedProvider as keyof typeof Providers] as Providers;
   const form = useFormContext<MountedFormValues>();
+  const credentialsFileRef = React.useRef<HTMLInputElement>(null);
+  const pickCredentialsFile =
+    (onLoaded: (contents: string) => void) => (event: React.ChangeEvent<HTMLInputElement>) => {
+      const file = event.target.files?.[0];
+      event.target.value = "";
+      if (file?.type === "application/json") {
+        readTextFile(file, onLoaded);
+      }
+    };
 
   const { data: providerMetadata, isLoading, error: loadError } = useProviderFields();
 
@@ -206,67 +225,51 @@ const ProviderSpecificFields: React.FC<ProviderSpecificFieldsProps> = ({ selecte
     [form, hasApiVersionField],
   );
 
-  const handleUpload = {
-    name: "file",
-    accept: ".json",
-    beforeUpload: (file: any) => {
-      if (file.type === "application/json") {
-        const reader = new FileReader();
-        reader.onload = (e) => {
-          if (e.target) {
-            const jsonStr = e.target.result as string;
-            form.setValue("vertex_credentials", jsonStr);
-          }
-        };
-        reader.readAsText(file);
-      }
-      // Prevent upload
-      return false;
-    },
-  };
-
   const renderFieldControl = (field: ProviderCredentialField, control: MountedFieldControlProps) => {
     if (field.type === "select") {
       return (
         <Select
-          id={control.id}
-          value={control.value as string | undefined}
-          onChange={control.onChange}
-          onBlur={control.onBlur}
-          placeholder={field.placeholder}
-          defaultValue={field.defaultValue}
+          items={(field.options ?? []).map((option) => ({ value: option, label: option }))}
+          value={(control.value as string | undefined) ?? field.defaultValue ?? null}
+          onValueChange={control.onChange}
         >
-          {field.options?.map((option) => (
-            <Select.Option key={option} value={option}>
-              {option}
-            </Select.Option>
-          ))}
+          <SelectTrigger id={control.id} onBlur={control.onBlur} className="w-full">
+            <SelectValue placeholder={field.placeholder} />
+          </SelectTrigger>
+          <SelectContent>
+            {field.options?.map((option) => (
+              <SelectItem key={option} value={option}>
+                {option}
+              </SelectItem>
+            ))}
+          </SelectContent>
         </Select>
       );
     }
 
     if (field.type === "upload") {
       return (
-        <Upload
-          {...handleUpload}
-          onChange={(info) => {
-            control.onChange(info);
-            if (uploadProps?.onChange) {
-              uploadProps.onChange(info);
-            }
-          }}
-        >
-          <Button variant="outline">
-            <UploadOutlined />
+        <>
+          <Button type="button" variant="outline" className="w-fit" onClick={() => credentialsFileRef.current?.click()}>
+            <UploadIcon />
             Click to Upload
           </Button>
-        </Upload>
+          <input
+            ref={credentialsFileRef}
+            id={control.id}
+            type="file"
+            accept=".json"
+            className="sr-only"
+            onBlur={control.onBlur}
+            onChange={pickCredentialsFile(control.onChange)}
+          />
+        </>
       );
     }
 
     if (field.type === "textarea") {
       return (
-        <AntdInput.TextArea
+        <Textarea
           id={control.id}
           value={control.value as string | undefined}
           onChange={control.onChange}
@@ -274,14 +277,14 @@ const ProviderSpecificFields: React.FC<ProviderSpecificFieldsProps> = ({ selecte
           placeholder={field.placeholder}
           defaultValue={field.defaultValue}
           rows={6}
-          style={{ fontFamily: "monospace", fontSize: "12px" }}
+          className="font-mono text-xs"
         />
       );
     }
 
     if (field.type === "password") {
       return (
-        <AntdInput.Password
+        <PasswordInput
           id={control.id}
           value={control.value as string | undefined}
           onChange={control.onChange}
@@ -312,21 +315,11 @@ const ProviderSpecificFields: React.FC<ProviderSpecificFieldsProps> = ({ selecte
 
   return (
     <>
-      {isLoading && allFields.length === 0 && (
-        <Row>
-          <Col span={24}>
-            <p className="text-sm mb-2">Loading provider fields...</p>
-          </Col>
-        </Row>
-      )}
+      {isLoading && allFields.length === 0 && <p className="text-sm mb-2">Loading provider fields...</p>}
       {loadError && allFields.length === 0 && (
-        <Row>
-          <Col span={24}>
-            <p className="text-sm mb-2 text-destructive">
-              {loadError instanceof Error ? loadError.message : "Failed to load provider credential fields"}
-            </p>
-          </Col>
-        </Row>
+        <p className="text-sm mb-2 text-destructive">
+          {loadError instanceof Error ? loadError.message : "Failed to load provider credential fields"}
+        </p>
       )}
       {allFields.map((field) => (
         <React.Fragment key={field.key}>
@@ -342,29 +335,24 @@ const ProviderSpecificFields: React.FC<ProviderSpecificFieldsProps> = ({ selecte
 
           {/* Special case for Vertex Credentials help text */}
           {field.key === "vertex_credentials" && (
-            <Row>
-              <Col>
-                <p className="text-sm mb-3 mt-1">Give a gcp service account(.json file)</p>
-              </Col>
-            </Row>
+            <p className="text-sm mb-3 mt-1">Give a gcp service account(.json file)</p>
           )}
 
           {/* Special case for Azure Base Model help text */}
           {field.key === "base_model" && (
-            <Row>
-              <Col span={10}></Col>
-              <Col span={10}>
-                <p className="text-sm mb-2">
-                  The actual model your azure deployment uses. Used for accurate cost tracking. Select name from{" "}
-                  <Link
-                    href="https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json"
-                    target="_blank"
-                  >
-                    here
-                  </Link>
-                </p>
-              </Col>
-            </Row>
+            <div className="grid grid-cols-24">
+              <p className="col-start-11 col-span-10 text-sm mb-2">
+                The actual model your azure deployment uses. Used for accurate cost tracking. Select name from{" "}
+                <a
+                  href="https://github.com/BerriAI/litellm/blob/main/model_prices_and_context_window.json"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-primary underline-offset-4 hover:underline"
+                >
+                  here
+                </a>
+              </p>
+            </div>
           )}
         </React.Fragment>
       ))}
diff --git a/ui/litellm-dashboard/src/components/add_pass_through.integration.test.tsx b/ui/litellm-dashboard/src/components/add_pass_through.integration.test.tsx
index 3e2af8821e4..df4dbff4111 100644
--- a/ui/litellm-dashboard/src/components/add_pass_through.integration.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_pass_through.integration.test.tsx
@@ -34,20 +34,59 @@ const openModal = async (user: User) => {
   await screen.findByText("Route Configuration");
 };
 
-const fillRequiredFields = async (user: User) => {
-  fireEvent.change(screen.getByPlaceholderText("bria"), { target: { value: "bria" } });
+interface RequiredFieldValues {
+  path?: string;
+  target?: string;
+  headerName?: string;
+  headerValue?: string;
+}
+
+const fillRequiredFields = async (user: User, values: RequiredFieldValues = {}) => {
+  const {
+    path = "bria",
+    target = "https://example.com",
+    headerName = "Authorization",
+    headerValue = "Bearer abc",
+  } = values;
+
+  fireEvent.change(screen.getByPlaceholderText("bria"), { target: { value: path } });
   fireEvent.change(screen.getByPlaceholderText("https://engine.prod.bria-api.com"), {
-    target: { value: "https://example.com" },
+    target: { value: target },
   });
   await user.click(screen.getByRole("button", { name: /add header/i }));
-  fireEvent.change(screen.getByPlaceholderText("Header Name"), { target: { value: "Authorization" } });
-  fireEvent.change(screen.getByPlaceholderText("Header Value"), { target: { value: "Bearer abc" } });
+  fireEvent.change(screen.getByPlaceholderText("Header Name"), { target: { value: headerName } });
+  fireEvent.change(screen.getByPlaceholderText("Header Value"), { target: { value: headerValue } });
+};
+
+const addQueryParam = async (user: User, name: string, value: string) => {
+  await user.click(screen.getByRole("button", { name: /add query parameter/i }));
+  fireEvent.change(screen.getByPlaceholderText("Parameter Name (e.g., version)"), { target: { value: name } });
+  fireEvent.change(screen.getByPlaceholderText("Parameter Value (e.g., v1)"), { target: { value } });
 };
 
 const submit = async (user: User) => user.click(screen.getByRole("button", { name: "Add Pass-Through Endpoint" }));
 
 const lastPayload = () => createPassThroughEndpoint.mock.calls.at(-1)?.[1] as Record<string, unknown>;
 
+const reopenedFields: RequiredFieldValues = {
+  path: "adobe",
+  target: "https://adobe.example.com",
+  headerName: "x-api-key",
+  headerValue: "second-secret",
+};
+
+const reopenedPayload = {
+  path: "/adobe",
+  target: "https://adobe.example.com",
+  headers: { "x-api-key": "second-secret" },
+  include_subpath: true,
+  methods: undefined,
+  default_query_params: undefined,
+  auth: undefined,
+  timeout: undefined,
+  cost_per_request: undefined,
+};
+
 describe("add_pass_through submit payload", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -218,4 +257,35 @@ describe("add_pass_through submit payload", () => {
 
     expect(createPassThroughEndpoint).not.toHaveBeenCalled();
   });
+
+  it("leaves no header or query parameter rows behind when the modal is cancelled and reopened", async () => {
+    const user = setup();
+    renderForm();
+    await openModal(user);
+    await fillRequiredFields(user);
+    await addQueryParam(user, "version", "v1");
+
+    await user.click(screen.getByRole("button", { name: "Cancel" }));
+    await openModal(user);
+
+    expect(screen.queryByPlaceholderText("Header Name")).not.toBeInTheDocument();
+    expect(screen.queryByPlaceholderText("Parameter Name (e.g., version)")).not.toBeInTheDocument();
+  });
+
+  it("submits the reopened endpoint instead of rejecting it as missing headers", async () => {
+    const user = setup();
+    renderForm();
+    await openModal(user);
+    await fillRequiredFields(user);
+
+    await user.click(screen.getByRole("button", { name: "Cancel" }));
+    await openModal(user);
+    await fillRequiredFields(user, reopenedFields);
+
+    await submit(user);
+
+    await waitFor(() => expect(createPassThroughEndpoint).toHaveBeenCalled());
+    expect(screen.queryByText("Please configure the headers")).not.toBeInTheDocument();
+    expect(lastPayload()).toStrictEqual(reopenedPayload);
+  });
 });
diff --git a/ui/litellm-dashboard/src/components/add_pass_through.tsx b/ui/litellm-dashboard/src/components/add_pass_through.tsx
index 9f95e7f27ac..e38c3082b45 100644
--- a/ui/litellm-dashboard/src/components/add_pass_through.tsx
+++ b/ui/litellm-dashboard/src/components/add_pass_through.tsx
@@ -1,14 +1,14 @@
 "use client";
 
 import React, { useState } from "react";
-import { Modal, Alert } from "antd";
-import { CircleHelp, Plug } from "lucide-react";
+import { CircleHelp, Info, Plug } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 import { useWatch } from "react-hook-form";
 import { z } from "zod/v4";
 
 import { createPassThroughEndpoint } from "./networking";
 import NumericalInput from "./shared/numerical_input";
-import KeyValueInput from "./key_value_input";
+import KeyValueInput, { type KeyValuePair } from "./key_value_input";
 import QueryParamInput from "./query_param_input";
 import { passThroughItem } from "./PassThroughSettings/PassThroughSettings";
 import RoutePreview from "./route_preview";
@@ -17,6 +17,7 @@ import PassThroughSecuritySection from "./common_components/PassThroughSecurityS
 import PassThroughGuardrailsSection from "./common_components/PassThroughGuardrailsSection";
 import { FormField } from "@/components/shared/form/FormField";
 import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Card } from "@/components/ui/card";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { Input } from "@/components/ui/input";
@@ -30,6 +31,8 @@ const HTTP_METHOD_OPTIONS = HTTP_METHODS.map((method) => ({ label: method, value
 
 type GuardrailSettings = Record<string, { request_fields?: string[]; response_fields?: string[] } | null>;
 
+const keyValuePairsSchema = z.array(z.tuple([z.string(), z.string()]));
+
 const passThroughFormSchema = z.object({
   path: z.string().min(1, "Path is required").regex(/^\//, "Path is required"),
   target: z
@@ -38,8 +41,10 @@ const passThroughFormSchema = z.object({
     .pipe(z.url({ error: "Please enter a valid URL" })),
   methods: z.array(z.string()).optional(),
   include_subpath: z.boolean(),
-  headers: z.record(z.string(), z.string(), { error: "Please configure the headers" }),
-  default_query_params: z.record(z.string(), z.string()).optional(),
+  headers: keyValuePairsSchema.refine((pairs) => pairs.some(([name]) => name !== ""), {
+    error: "Please configure the headers",
+  }),
+  default_query_params: keyValuePairsSchema.optional(),
   auth: z.boolean().optional(),
   timeout: z.string().optional(),
   cost_per_request: z.string().optional(),
@@ -52,7 +57,7 @@ const emptyFormValues = {
   target: "",
   methods: undefined,
   include_subpath: true,
-  headers: undefined,
+  headers: [],
   default_query_params: undefined,
   auth: undefined,
   timeout: undefined,
@@ -71,6 +76,14 @@ const labelWithHint = (label: React.ReactNode, hint: string): React.ReactNode =>
 
 const optionalText = (raw: string): string | undefined => (raw === "" ? undefined : raw);
 
+const toRecord = (pairs: readonly KeyValuePair[]): Record<string, string> =>
+  Object.fromEntries(pairs.filter(([name]) => name !== ""));
+
+const optionalRecord = (pairs: readonly KeyValuePair[] | undefined): Record<string, string> | undefined => {
+  const record = toRecord(pairs ?? []);
+  return Object.keys(record).length > 0 ? record : undefined;
+};
+
 interface AddFallbacksProps {
   accessToken: string;
   passThroughItems: passThroughItem[];
@@ -108,8 +121,8 @@ const AddPassThroughEndpoint: React.FC<AddFallbacksProps> = ({
         target: values.target,
         methods: values.methods,
         include_subpath: values.include_subpath,
-        headers: values.headers,
-        default_query_params: values.default_query_params,
+        headers: toRecord(values.headers),
+        default_query_params: optionalRecord(values.default_query_params),
         ...(premiumUser ? { auth: values.auth } : {}),
         timeout: values.timeout,
         cost_per_request: values.cost_per_request,
@@ -138,254 +151,250 @@ const AddPassThroughEndpoint: React.FC<AddFallbacksProps> = ({
         <Button className="mx-auto mb-4 mt-4" onClick={() => setIsModalVisible(true)}>
           + Add Pass-Through Endpoint
         </Button>
-        <Modal
-          title={
-            <div className="flex items-center space-x-3 border-b border-border pb-4">
-              <Plug className="size-5 text-blue-500" />
-              <h2 className="text-xl font-semibold text-foreground">Add Pass-Through Endpoint</h2>
-            </div>
-          }
-          open={isModalVisible}
-          width={1000}
-          onCancel={handleCancel}
-          footer={null}
-          className="top-8"
-          styles={{
-            body: { padding: "24px" },
-            header: { padding: "24px 24px 0 24px", border: "none" },
-          }}
-        >
-          <div className="mt-6">
-            <Alert
-              message="What is a Pass-Through Endpoint?"
-              description="Route requests from your LiteLLM proxy to any external API. Perfect for custom models, image generation APIs, or any service you want to proxy through LiteLLM."
-              type="info"
-              showIcon
-              className="mb-6"
-            />
+        <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+          <DialogContent className="top-8 max-h-[calc(100dvh-4rem)] translate-y-0 overflow-y-auto sm:max-w-[1000px]">
+            <DialogHeader>
+              <div className="flex items-center space-x-3 border-b border-border pb-4">
+                <Plug className="size-5 text-blue-500" />
+                <DialogTitle className="text-xl font-semibold text-foreground">Add Pass-Through Endpoint</DialogTitle>
+              </div>
+            </DialogHeader>
+            <div className="mt-6">
+              <Alert variant="info" className="mb-6">
+                <Info />
+                <AlertTitle>What is a Pass-Through Endpoint?</AlertTitle>
+                <AlertDescription>
+                  Route requests from your LiteLLM proxy to any external API. Perfect for custom models, image
+                  generation APIs, or any service you want to proxy through LiteLLM.
+                </AlertDescription>
+              </Alert>
 
-            <form onSubmit={form.handleSubmit(addPassThrough)} className="space-y-6">
-              <Card className="block p-5">
-                <h3 className="mb-2 text-lg font-semibold text-foreground">Route Configuration</h3>
-                <p className="mb-5 text-sm text-muted-foreground">
-                  Configure how requests to your domain will be forwarded to the target API
-                </p>
+              <form onSubmit={form.handleSubmit(addPassThrough)} className="space-y-6">
+                <Card className="block p-5">
+                  <h3 className="mb-2 text-lg font-semibold text-foreground">Route Configuration</h3>
+                  <p className="mb-5 text-sm text-muted-foreground">
+                    Configure how requests to your domain will be forwarded to the target API
+                  </p>
+
+                  <div className="space-y-5">
+                    <FormField
+                      control={form.control}
+                      name="path"
+                      label="Path Prefix"
+                      description="Example: /bria, /adobe-photoshop, /elasticsearch"
+                    >
+                      {({ value, onChange, ...field }) => (
+                        <Input
+                          {...field}
+                          placeholder="bria"
+                          value={value ?? ""}
+                          onChange={(event) => {
+                            const raw = event.target.value;
+                            onChange(raw && !raw.startsWith("/") ? "/" + raw : raw);
+                          }}
+                        />
+                      )}
+                    </FormField>
+
+                    <FormField
+                      control={form.control}
+                      name="target"
+                      label="Target URL"
+                      description="Example:https://engine.prod.bria-api.com"
+                    >
+                      {({ value, ...field }) => (
+                        <Input {...field} placeholder="https://engine.prod.bria-api.com" value={value ?? ""} />
+                      )}
+                    </FormField>
+
+                    <FormField
+                      control={form.control}
+                      name="methods"
+                      label={labelWithHint(
+                        "HTTP Methods (Optional)",
+                        "Select specific HTTP methods. Leave empty to support all methods (GET, POST, PUT, DELETE, PATCH). Useful when the same path needs different targets for different methods.",
+                      )}
+                      description={
+                        selectedMethods.length === 0
+                          ? "All HTTP methods supported (default)"
+                          : `Only ${selectedMethods.join(", ")} requests will be routed to this endpoint`
+                      }
+                    >
+                      {({ value, onChange, ref: _ref, ...field }) => (
+                        <Select multiple items={HTTP_METHOD_OPTIONS} value={value ?? []} onValueChange={onChange}>
+                          <SelectTrigger {...field} className="w-full">
+                            <SelectValue placeholder="Select methods (leave empty for all)">
+                              {(selected: string[]) =>
+                                selected.length === 0 ? "Select methods (leave empty for all)" : selected.join(", ")
+                              }
+                            </SelectValue>
+                          </SelectTrigger>
+                          <SelectContent>
+                            {HTTP_METHODS.map((method) => (
+                              <SelectItem key={method} value={method} title={method}>
+                                {method}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
+                        </Select>
+                      )}
+                    </FormField>
+
+                    <div className="flex items-center justify-between py-3">
+                      <div>
+                        <div className="text-sm font-medium text-foreground">Include Subpaths</div>
+                        <div className="mt-0.5 text-xs text-muted-foreground">
+                          Forward all subpaths to the target API (recommended for REST APIs)
+                        </div>
+                      </div>
+                      <FormField control={form.control} name="include_subpath">
+                        {({ value, onChange, ref: _ref, ...field }) => (
+                          <Switch {...field} checked={value} onCheckedChange={onChange} />
+                        )}
+                      </FormField>
+                    </div>
+                  </div>
+                </Card>
+
+                <RoutePreview pathValue={pathValue} targetValue={targetValue} includeSubpath={includeSubpath} />
+
+                <Card className="block p-6">
+                  <h3 className="mb-2 text-lg font-semibold text-foreground">Headers</h3>
+                  <p className="mb-6 text-sm text-muted-foreground">
+                    Add headers that will be sent with every request to the target API
+                  </p>
 
-                <div className="space-y-5">
                   <FormField
                     control={form.control}
-                    name="path"
-                    label="Path Prefix"
-                    description="Example: /bria, /adobe-photoshop, /elasticsearch"
+                    name="headers"
+                    label={labelWithHint(
+                      "Authentication Headers",
+                      "Authentication and other headers to forward with requests",
+                    )}
+                    description={
+                      <>
+                        <span className="mb-1 block font-medium">
+                          Add authentication tokens and other required headers
+                        </span>
+                        <span className="block">Common examples: auth_token, Authorization, x-api-key</span>
+                      </>
+                    }
                   >
-                    {({ value, onChange, ...field }) => (
-                      <Input
+                    {({ value, onChange }) => <KeyValueInput value={value} onChange={onChange} />}
+                  </FormField>
+                </Card>
+
+                <Card className="block p-6">
+                  <h3 className="mb-2 text-lg font-semibold text-foreground">Default Query Parameters</h3>
+                  <p className="mb-6 text-sm text-muted-foreground">
+                    Add query parameters that will be automatically sent with every request to the target API
+                  </p>
+
+                  <FormField
+                    control={form.control}
+                    name="default_query_params"
+                    label={labelWithHint(
+                      "Default Query Parameters (Optional)",
+                      "Query parameters that will be added to all requests. Clients can override these by providing their own values.",
+                    )}
+                    description={
+                      <>
+                        <span className="mb-1 block font-medium">
+                          Parameters are sent with all GET, POST, PUT, PATCH requests
+                        </span>
+                        <span className="block">
+                          Client parameters override defaults. Examples: version=v1, format=json, key=default
+                        </span>
+                      </>
+                    }
+                  >
+                    {({ value, onChange }) => <QueryParamInput value={value} onChange={onChange} />}
+                  </FormField>
+                </Card>
+
+                <FormField control={form.control} name="auth">
+                  {({ value, onChange }) => (
+                    <PassThroughSecuritySection
+                      premiumUser={premiumUser}
+                      authEnabled={value ?? false}
+                      onAuthChange={onChange}
+                    />
+                  )}
+                </FormField>
+
+                <PassThroughGuardrailsSection accessToken={accessToken} value={guardrails} onChange={setGuardrails} />
+
+                <Card className="block p-6">
+                  <h3 className="mb-2 text-lg font-semibold text-foreground">Performance</h3>
+                  <p className="mb-6 text-sm text-muted-foreground">
+                    Configure upstream request timeout for this endpoint
+                  </p>
+
+                  <FormField
+                    control={form.control}
+                    name="timeout"
+                    label={labelWithHint(
+                      "Request Timeout (seconds)",
+                      "Max time to wait for the upstream API to respond. Leave empty to use general_settings.pass_through_request_timeout (default 600s).",
+                    )}
+                    description="Use a higher value for slow upstream APIs (e.g. 1200 for long-running LLM calls)"
+                  >
+                    {({ value, onChange, ref: _ref, ...field }) => (
+                      <NumericalInput
                         {...field}
-                        placeholder="bria"
+                        min={1}
+                        step={1}
+                        placeholder="600"
                         value={value ?? ""}
-                        onChange={(event) => {
-                          const raw = event.target.value;
-                          onChange(raw && !raw.startsWith("/") ? "/" + raw : raw);
-                        }}
+                        onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                          onChange(optionalText(event.target.value))
+                        }
                       />
                     )}
                   </FormField>
+                </Card>
+
+                <Card className="block p-6">
+                  <h3 className="mb-2 text-lg font-semibold text-foreground">Billing</h3>
+                  <p className="mb-6 text-sm text-muted-foreground">Optional cost tracking for this endpoint</p>
 
                   <FormField
                     control={form.control}
-                    name="target"
-                    label="Target URL"
-                    description="Example:https://engine.prod.bria-api.com"
-                  >
-                    {({ value, ...field }) => (
-                      <Input {...field} placeholder="https://engine.prod.bria-api.com" value={value ?? ""} />
-                    )}
-                  </FormField>
-
-                  <FormField
-                    control={form.control}
-                    name="methods"
+                    name="cost_per_request"
                     label={labelWithHint(
-                      "HTTP Methods (Optional)",
-                      "Select specific HTTP methods. Leave empty to support all methods (GET, POST, PUT, DELETE, PATCH). Useful when the same path needs different targets for different methods.",
+                      "Cost Per Request (USD)",
+                      "Optional: Track costs for requests to this endpoint",
                     )}
-                    description={
-                      selectedMethods.length === 0
-                        ? "All HTTP methods supported (default)"
-                        : `Only ${selectedMethods.join(", ")} requests will be routed to this endpoint`
-                    }
+                    description="The cost charged for each request through this endpoint"
                   >
                     {({ value, onChange, ref: _ref, ...field }) => (
-                      <Select multiple items={HTTP_METHOD_OPTIONS} value={value ?? []} onValueChange={onChange}>
-                        <SelectTrigger {...field} className="w-full">
-                          <SelectValue placeholder="Select methods (leave empty for all)">
-                            {(selected: string[]) =>
-                              selected.length === 0 ? "Select methods (leave empty for all)" : selected.join(", ")
-                            }
-                          </SelectValue>
-                        </SelectTrigger>
-                        <SelectContent>
-                          {HTTP_METHODS.map((method) => (
-                            <SelectItem key={method} value={method} title={method}>
-                              {method}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
+                      <NumericalInput
+                        {...field}
+                        min={0}
+                        step={0.001}
+                        placeholder="2.0000"
+                        value={value ?? ""}
+                        onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                          onChange(optionalText(event.target.value))
+                        }
+                      />
                     )}
                   </FormField>
+                </Card>
 
-                  <div className="flex items-center justify-between py-3">
-                    <div>
-                      <div className="text-sm font-medium text-foreground">Include Subpaths</div>
-                      <div className="mt-0.5 text-xs text-muted-foreground">
-                        Forward all subpaths to the target API (recommended for REST APIs)
-                      </div>
-                    </div>
-                    <FormField control={form.control} name="include_subpath">
-                      {({ value, onChange, ref: _ref, ...field }) => (
-                        <Switch {...field} checked={value} onCheckedChange={onChange} />
-                      )}
-                    </FormField>
-                  </div>
+                <div className="flex items-center justify-end space-x-3 border-t border-border pt-6">
+                  <Button type="button" variant="outline" onClick={handleCancel}>
+                    Cancel
+                  </Button>
+                  <Button type="submit" disabled={isLoading} aria-busy={isLoading}>
+                    {isLoading && <UiLoadingSpinner className="size-4" />}
+                    {isLoading ? "Creating..." : "Add Pass-Through Endpoint"}
+                  </Button>
                 </div>
-              </Card>
-
-              <RoutePreview pathValue={pathValue} targetValue={targetValue} includeSubpath={includeSubpath} />
-
-              <Card className="block p-6">
-                <h3 className="mb-2 text-lg font-semibold text-foreground">Headers</h3>
-                <p className="mb-6 text-sm text-muted-foreground">
-                  Add headers that will be sent with every request to the target API
-                </p>
-
-                <FormField
-                  control={form.control}
-                  name="headers"
-                  label={labelWithHint(
-                    "Authentication Headers",
-                    "Authentication and other headers to forward with requests",
-                  )}
-                  description={
-                    <>
-                      <span className="mb-1 block font-medium">
-                        Add authentication tokens and other required headers
-                      </span>
-                      <span className="block">Common examples: auth_token, Authorization, x-api-key</span>
-                    </>
-                  }
-                >
-                  {({ value, onChange }) => <KeyValueInput value={value} onChange={onChange} />}
-                </FormField>
-              </Card>
-
-              <Card className="block p-6">
-                <h3 className="mb-2 text-lg font-semibold text-foreground">Default Query Parameters</h3>
-                <p className="mb-6 text-sm text-muted-foreground">
-                  Add query parameters that will be automatically sent with every request to the target API
-                </p>
-
-                <FormField
-                  control={form.control}
-                  name="default_query_params"
-                  label={labelWithHint(
-                    "Default Query Parameters (Optional)",
-                    "Query parameters that will be added to all requests. Clients can override these by providing their own values.",
-                  )}
-                  description={
-                    <>
-                      <span className="mb-1 block font-medium">
-                        Parameters are sent with all GET, POST, PUT, PATCH requests
-                      </span>
-                      <span className="block">
-                        Client parameters override defaults. Examples: version=v1, format=json, key=default
-                      </span>
-                    </>
-                  }
-                >
-                  {({ value, onChange }) => <QueryParamInput value={value} onChange={onChange} />}
-                </FormField>
-              </Card>
-
-              <FormField control={form.control} name="auth">
-                {({ value, onChange }) => (
-                  <PassThroughSecuritySection
-                    premiumUser={premiumUser}
-                    authEnabled={value ?? false}
-                    onAuthChange={onChange}
-                  />
-                )}
-              </FormField>
-
-              <PassThroughGuardrailsSection accessToken={accessToken} value={guardrails} onChange={setGuardrails} />
-
-              <Card className="block p-6">
-                <h3 className="mb-2 text-lg font-semibold text-foreground">Performance</h3>
-                <p className="mb-6 text-sm text-muted-foreground">
-                  Configure upstream request timeout for this endpoint
-                </p>
-
-                <FormField
-                  control={form.control}
-                  name="timeout"
-                  label={labelWithHint(
-                    "Request Timeout (seconds)",
-                    "Max time to wait for the upstream API to respond. Leave empty to use general_settings.pass_through_request_timeout (default 600s).",
-                  )}
-                  description="Use a higher value for slow upstream APIs (e.g. 1200 for long-running LLM calls)"
-                >
-                  {({ value, onChange, ref: _ref, ...field }) => (
-                    <NumericalInput
-                      {...field}
-                      min={1}
-                      step={1}
-                      placeholder="600"
-                      value={value ?? ""}
-                      onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                        onChange(optionalText(event.target.value))
-                      }
-                    />
-                  )}
-                </FormField>
-              </Card>
-
-              <Card className="block p-6">
-                <h3 className="mb-2 text-lg font-semibold text-foreground">Billing</h3>
-                <p className="mb-6 text-sm text-muted-foreground">Optional cost tracking for this endpoint</p>
-
-                <FormField
-                  control={form.control}
-                  name="cost_per_request"
-                  label={labelWithHint("Cost Per Request (USD)", "Optional: Track costs for requests to this endpoint")}
-                  description="The cost charged for each request through this endpoint"
-                >
-                  {({ value, onChange, ref: _ref, ...field }) => (
-                    <NumericalInput
-                      {...field}
-                      min={0}
-                      step={0.001}
-                      placeholder="2.0000"
-                      value={value ?? ""}
-                      onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                        onChange(optionalText(event.target.value))
-                      }
-                    />
-                  )}
-                </FormField>
-              </Card>
-
-              <div className="flex items-center justify-end space-x-3 border-t border-border pt-6">
-                <Button type="button" variant="outline" onClick={handleCancel}>
-                  Cancel
-                </Button>
-                <Button type="submit" disabled={isLoading} aria-busy={isLoading}>
-                  {isLoading && <UiLoadingSpinner className="size-4" />}
-                  {isLoading ? "Creating..." : "Add Pass-Through Endpoint"}
-                </Button>
-              </div>
-            </form>
-          </div>
-        </Modal>
+              </form>
+            </div>
+          </DialogContent>
+        </Dialog>
       </div>
     </TooltipProvider>
   );
diff --git a/ui/litellm-dashboard/src/components/agent_management/AgentSelector.test.tsx b/ui/litellm-dashboard/src/components/agent_management/AgentSelector.test.tsx
index a41167df673..ed022711ab2 100644
--- a/ui/litellm-dashboard/src/components/agent_management/AgentSelector.test.tsx
+++ b/ui/litellm-dashboard/src/components/agent_management/AgentSelector.test.tsx
@@ -1,4 +1,5 @@
 import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
 // Mock networking module
@@ -7,35 +8,6 @@ vi.mock("../networking", () => ({
   getAgentsList: (...args: any[]) => mockGetAgentsList(...args),
 }));
 
-// Mock antd Select
-vi.mock("antd", () => {
-  const SelectComponent = ({ children, onChange, value, mode, placeholder, loading, disabled, ...props }: any) => (
-    <div data-testid="agent-select" data-loading={loading} data-disabled={disabled}>
-      <select
-        data-testid="select-input"
-        multiple={mode === "multiple"}
-        value={value || []}
-        onChange={(e) => {
-          const selected = Array.from(e.target.selectedOptions, (opt: any) => opt.value);
-          onChange?.(selected);
-        }}
-        disabled={disabled}
-      >
-        {children}
-      </select>
-      {loading && <span data-testid="loading-indicator">Loading</span>}
-    </div>
-  );
-
-  SelectComponent.Option = ({ children, value, ...props }: any) => (
-    <option value={value} {...props}>
-      {children}
-    </option>
-  );
-
-  return { Select: SelectComponent };
-});
-
 import AgentSelector from "./AgentSelector";
 
 describe("AgentSelector", () => {
@@ -56,7 +28,7 @@ describe("AgentSelector", () => {
 
   it("renders the selector", () => {
     render(<AgentSelector {...defaultProps} />);
-    expect(screen.getByTestId("agent-select")).toBeInTheDocument();
+    expect(screen.getByRole("combobox")).toBeInTheDocument();
   });
 
   it("fetches agents on mount with access token", async () => {
@@ -81,34 +53,38 @@ describe("AgentSelector", () => {
     );
 
     render(<AgentSelector {...defaultProps} />);
-    expect(screen.getByTestId("agent-select")).toHaveAttribute("data-loading", "true");
+    expect(screen.getByRole("combobox")).toHaveAttribute("placeholder", "Loading...");
 
     // Resolve to clean up
     resolve({ agents: [] });
     await waitFor(() => {
-      expect(screen.getByTestId("agent-select")).toHaveAttribute("data-loading", "false");
+      expect(screen.getByRole("combobox")).toHaveAttribute("placeholder", "Select agents");
     });
   });
 
   it("renders agent options after fetch", async () => {
+    const user = userEvent.setup();
     render(<AgentSelector {...defaultProps} />);
-    await waitFor(() => {
-      expect(screen.getByText("Agent One")).toBeInTheDocument();
-      expect(screen.getByText("Agent Two")).toBeInTheDocument();
-    });
+
+    await user.click(screen.getByRole("combobox"));
+
+    expect(await screen.findByRole("option", { name: /Agent One/ })).toBeInTheDocument();
+    expect(screen.getByRole("option", { name: /Agent Two/ })).toBeInTheDocument();
   });
 
   it("renders access group options with group prefix", async () => {
+    const user = userEvent.setup();
     render(<AgentSelector {...defaultProps} />);
-    await waitFor(() => {
-      expect(screen.getByText("group-a")).toBeInTheDocument();
-      expect(screen.getByText("group-b")).toBeInTheDocument();
-    });
+
+    await user.click(screen.getByRole("combobox"));
+
+    expect(await screen.findByRole("option", { name: /group-a/ })).toBeInTheDocument();
+    expect(screen.getByRole("option", { name: /group-b/ })).toBeInTheDocument();
   });
 
   it("respects disabled prop", () => {
     render(<AgentSelector {...defaultProps} disabled />);
-    expect(screen.getByTestId("agent-select")).toHaveAttribute("data-disabled", "true");
+    expect(screen.getByRole("combobox")).toBeDisabled();
   });
 
   it("handles API error gracefully", async () => {
@@ -123,20 +99,20 @@ describe("AgentSelector", () => {
     consoleSpy.mockRestore();
   });
 
-  it("passes value as flattened selectedValues", async () => {
+  // An agent and an access group are stored under separate keys but share one control, so the
+  // chips are what prove both halves reached it.
+  it("shows both a selected agent and a selected access group", async () => {
     render(<AgentSelector {...defaultProps} value={{ agents: ["agent-1"], accessGroups: ["group-a"] }} />);
-    await waitFor(() => {
-      const select = screen.getByTestId("select-input");
-      // The value should contain agent-1 and group:group-a
-      expect(select).toBeInTheDocument();
-    });
+
+    expect(await screen.findByLabelText("Agent One")).toBeInTheDocument();
+    expect(screen.getByLabelText("group-a")).toBeInTheDocument();
   });
 
   it("handles null response from API", async () => {
     mockGetAgentsList.mockResolvedValue(null);
     render(<AgentSelector {...defaultProps} />);
     await waitFor(() => {
-      expect(screen.getByTestId("agent-select")).toHaveAttribute("data-loading", "false");
+      expect(screen.getByRole("combobox")).toHaveAttribute("placeholder", "Select agents");
     });
   });
 });
diff --git a/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx b/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx
index 6dfbff5fbac..d26772d5c9a 100644
--- a/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx
+++ b/ui/litellm-dashboard/src/components/agent_management/AgentSelector.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Select } from "antd";
+import { MultiSelect, type MultiSelectOption } from "@/components/shared/MultiSelect";
 import { getAgentsList } from "../networking";
 
 interface Agent {
@@ -61,18 +61,16 @@ const AgentSelector: React.FC<AgentSelectorProps> = ({
   }, [accessToken]);
 
   // Combine options, access groups first
-  const options = [
+  const options: MultiSelectOption[] = [
     ...accessGroups.map((group) => ({
       label: group,
       value: `group:${group}`,
-      isAccessGroup: true,
-      searchText: `${group} Access Group`,
+      description: "Access Group",
     })),
     ...agents.map((agent) => ({
       label: `${agent.agent_name || agent.agent_id}`,
       value: agent.agent_id,
-      isAccessGroup: false,
-      searchText: `${agent.agent_name || agent.agent_id} ${agent.agent_id} Agent`,
+      description: "Agent",
     })),
   ];
 
@@ -88,50 +86,16 @@ const AgentSelector: React.FC<AgentSelectorProps> = ({
 
   return (
     <div>
-      <Select
-        mode="multiple"
-        placeholder={placeholder}
-        onChange={handleChange}
+      <MultiSelect
+        options={options}
         value={selectedValues}
+        onValueChange={handleChange}
+        placeholder={placeholder}
+        emptyText="No agents found"
         loading={loading}
-        className={className}
-        allowClear
-        showSearch
-        style={{ width: "100%" }}
         disabled={disabled}
-        filterOption={(input, option) => {
-          const searchText = options.find((opt) => opt.value === option?.value)?.searchText || "";
-          return searchText.toLowerCase().includes(input.toLowerCase());
-        }}
-      >
-        {options.map((opt) => (
-          <Select.Option key={opt.value} value={opt.value} label={opt.label}>
-            <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-              <span
-                style={{
-                  display: "inline-block",
-                  width: 8,
-                  height: 8,
-                  borderRadius: "50%",
-                  background: opt.isAccessGroup ? "#52c41a" : "#722ed1",
-                  flexShrink: 0,
-                }}
-              />
-              <span style={{ flex: 1 }}>{opt.label}</span>
-              <span
-                style={{
-                  color: opt.isAccessGroup ? "#52c41a" : "#722ed1",
-                  fontSize: "12px",
-                  fontWeight: 500,
-                  opacity: 0.8,
-                }}
-              >
-                {opt.isAccessGroup ? "Access Group" : "Agent"}
-              </span>
-            </div>
-          </Select.Option>
-        ))}
-      </Select>
+        className={`w-full ${className ?? ""}`}
+      />
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx b/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx
index fe001641135..c4f692a4d8d 100644
--- a/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx
+++ b/ui/litellm-dashboard/src/components/claude_code_plugins/skill_detail.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { ArrowLeftOutlined, CopyOutlined, CheckOutlined, LinkOutlined } from "@ant-design/icons";
+import { ArrowLeft, Check, Copy, Link2 } from "lucide-react";
 import { buildMarketplaceSettingsSnippet, formatInstallCommand } from "./helpers";
 import { Plugin } from "./types";
 
@@ -64,7 +64,7 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
           marginBottom: 24,
         }}
       >
-        <ArrowLeftOutlined style={{ fontSize: 11 }} />
+        <ArrowLeft className="size-3" />
         <span>Skills</span>
       </div>
 
@@ -163,7 +163,7 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
                   }}
                 >
                   {sourceUrl.replace("https://", "")}
-                  <LinkOutlined style={{ fontSize: 11, flexShrink: 0 }} />
+                  <Link2 className="size-3 shrink-0" />
                 </a>
               </div>
             )}
@@ -243,7 +243,7 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
                   padding: 0,
                 }}
               >
-                {copiedKey === "install" ? <CheckOutlined /> : <CopyOutlined />}
+                {copiedKey === "install" ? <Check className="size-3" /> : <Copy className="size-3" />}
                 {copiedKey === "install" ? "Copied" : "Copy"}
               </button>
             </div>
@@ -315,7 +315,7 @@ const SkillDetail: React.FC<SkillDetailProps> = ({ skill, onBack }) => {
                   padding: 0,
                 }}
               >
-                {copiedKey === "settings" ? <CheckOutlined /> : <CopyOutlined />}
+                {copiedKey === "settings" ? <Check className="size-3" /> : <Copy className="size-3" />}
                 {copiedKey === "settings" ? "Copied" : "Copy"}
               </button>
             </div>
diff --git a/ui/litellm-dashboard/src/components/cloudzero_export_modal.tsx b/ui/litellm-dashboard/src/components/cloudzero_export_modal.tsx
index 24aa0d9d1b8..c8ef2218093 100644
--- a/ui/litellm-dashboard/src/components/cloudzero_export_modal.tsx
+++ b/ui/litellm-dashboard/src/components/cloudzero_export_modal.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { Modal, Spin, Select } from "antd";
+import { Spin, Select } from "antd";
 import { CircleCheck, FileDown } from "lucide-react";
 import { z } from "zod/v4";
 import { getGlobalLitellmHeaderName } from "@/components/networking";
@@ -12,6 +12,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const cloudZeroSettingsSchema = z.object({
   api_key: z.string().min(1, "Please enter your CloudZero API key"),
@@ -241,85 +242,96 @@ const CloudZeroExportModal: React.FC<CloudZeroExportModalProps> = ({ isOpen, onC
   ];
 
   return (
-    <Modal title="Export Data" open={isOpen} onCancel={handleModalClose} footer={null} width={600} destroyOnHidden>
-      <div className="space-y-4">
-        {/* Export Type Selection */}
-        <div>
-          <p className="text-sm font-medium mb-2 block">Export Destination</p>
-          <Select value={exportType} onChange={setExportType} options={exportOptions} className="w-full" size="large" />
-        </div>
-
-        {/* CloudZero Configuration */}
-        {exportType === "cloudzero" && (
+    <Dialog open={isOpen} onOpenChange={(open) => !open && handleModalClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
+        <DialogHeader>
+          <DialogTitle>Export Data</DialogTitle>
+        </DialogHeader>
+        <div className="space-y-4">
+          {/* Export Type Selection */}
           <div>
-            {settingsLoading ? (
-              <div className="flex justify-center py-8">
-                <Spin size="large" />
-              </div>
-            ) : (
-              <>
-                {existingSettings && (
-                  <Alert className="mb-4">
-                    <CircleCheck />
-                    <AlertTitle>Existing CloudZero Configuration</AlertTitle>
-                    <AlertDescription>
-                      API Key: {existingSettings.api_key_masked}
-                      <br />
-                      Connection ID: {existingSettings.connection_id}
-                    </AlertDescription>
-                  </Alert>
-                )}
-
-                {!existingSettings && (
-                  <form onSubmit={(event) => event.preventDefault()}>
-                    <FieldGroup>
-                      <FormField control={form.control} name="api_key" label="CloudZero API Key">
-                        {({ ref, ...field }) => (
-                          <PasswordInput {...field} ref={ref} placeholder="Enter your CloudZero API key" />
-                        )}
-                      </FormField>
-
-                      <FormField control={form.control} name="connection_id" label="Connection ID">
-                        {({ ref, ...field }) => (
-                          <Input {...field} ref={ref} placeholder="Enter CloudZero connection ID" />
-                        )}
-                      </FormField>
-                    </FieldGroup>
-                  </form>
-                )}
-              </>
-            )}
+            <p className="text-sm font-medium mb-2 block">Export Destination</p>
+            <Select
+              value={exportType}
+              onChange={setExportType}
+              options={exportOptions}
+              className="w-full"
+              size="large"
+            />
           </div>
-        )}
 
-        {/* CSV Export Info */}
-        {exportType === "csv" && (
-          <Alert variant="info">
-            <FileDown />
-            <AlertTitle>CSV Export</AlertTitle>
-            <AlertDescription>
-              Export your usage data as a CSV file for analysis in spreadsheet applications.
-            </AlertDescription>
-          </Alert>
-        )}
+          {/* CloudZero Configuration */}
+          {exportType === "cloudzero" && (
+            <div>
+              {settingsLoading ? (
+                <div className="flex justify-center py-8">
+                  <Spin size="large" />
+                </div>
+              ) : (
+                <>
+                  {existingSettings && (
+                    <Alert className="mb-4">
+                      <CircleCheck />
+                      <AlertTitle>Existing CloudZero Configuration</AlertTitle>
+                      <AlertDescription>
+                        API Key: {existingSettings.api_key_masked}
+                        <br />
+                        Connection ID: {existingSettings.connection_id}
+                      </AlertDescription>
+                    </Alert>
+                  )}
 
-        {/* Action Buttons */}
-        <div className="flex justify-end space-x-2 pt-4">
-          <Button type="button" variant="secondary" onClick={handleModalClose}>
-            Cancel
-          </Button>
-          <Button
-            type="button"
-            onClick={handleExport}
-            disabled={loading || exportLoading}
-            aria-busy={loading || exportLoading}
-          >
-            {(loading || exportLoading) && <UiLoadingSpinner className="size-4" />}
-            {exportType === "cloudzero" ? "Export to CloudZero" : "Export CSV"}
-          </Button>
+                  {!existingSettings && (
+                    <form onSubmit={(event) => event.preventDefault()}>
+                      <FieldGroup>
+                        <FormField control={form.control} name="api_key" label="CloudZero API Key">
+                          {({ ref, ...field }) => (
+                            <PasswordInput {...field} ref={ref} placeholder="Enter your CloudZero API key" />
+                          )}
+                        </FormField>
+
+                        <FormField control={form.control} name="connection_id" label="Connection ID">
+                          {({ ref, ...field }) => (
+                            <Input {...field} ref={ref} placeholder="Enter CloudZero connection ID" />
+                          )}
+                        </FormField>
+                      </FieldGroup>
+                    </form>
+                  )}
+                </>
+              )}
+            </div>
+          )}
+
+          {/* CSV Export Info */}
+          {exportType === "csv" && (
+            <Alert variant="info">
+              <FileDown />
+              <AlertTitle>CSV Export</AlertTitle>
+              <AlertDescription>
+                Export your usage data as a CSV file for analysis in spreadsheet applications.
+              </AlertDescription>
+            </Alert>
+          )}
+
+          {/* Action Buttons */}
+          <div className="flex justify-end space-x-2 pt-4">
+            <Button type="button" variant="secondary" onClick={handleModalClose}>
+              Cancel
+            </Button>
+            <Button
+              type="button"
+              onClick={handleExport}
+              disabled={loading || exportLoading}
+              aria-busy={loading || exportLoading}
+            >
+              {(loading || exportLoading) && <UiLoadingSpinner className="size-4" />}
+              {exportType === "cloudzero" ? "Export to CloudZero" : "Export CSV"}
+            </Button>
+          </div>
         </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/common_components/AccessGroupSelector.tsx b/ui/litellm-dashboard/src/components/common_components/AccessGroupSelector.tsx
index fb8629dc8fa..e522e7c7e62 100644
--- a/ui/litellm-dashboard/src/components/common_components/AccessGroupSelector.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/AccessGroupSelector.tsx
@@ -1,6 +1,7 @@
 import React from "react";
-import { Select, Skeleton } from "antd";
-import { TeamOutlined } from "@ant-design/icons";
+import { Users } from "lucide-react";
+import { Skeleton } from "@/components/ui/skeleton";
+import { MultiSelect, type MultiSelectOption } from "@/components/shared/MultiSelect";
 import { useAccessGroups, AccessGroupResponse } from "@/app/(dashboard)/hooks/accessGroups/useAccessGroups";
 
 export interface AccessGroupSelectorProps {
@@ -12,8 +13,6 @@ export interface AccessGroupSelectorProps {
   className?: string;
   showLabel?: boolean;
   labelText?: string;
-  /** Allow clearing the selection */
-  allowClear?: boolean;
 }
 
 /**
@@ -32,7 +31,6 @@ const AccessGroupSelector: React.FC<AccessGroupSelectorProps> = ({
   className,
   showLabel = false,
   labelText = "Access Group",
-  allowClear = true,
 }) => {
   const { data: accessGroups, isLoading, isError } = useAccessGroups();
 
@@ -42,25 +40,19 @@ const AccessGroupSelector: React.FC<AccessGroupSelectorProps> = ({
       <div>
         {showLabel && (
           <p className="mb-2 flex items-center text-sm font-medium text-foreground">
-            <TeamOutlined className="mr-2" /> {labelText}
+            <Users className="mr-2 size-4" /> {labelText}
           </p>
         )}
-        <Skeleton.Input active block style={{ height: 32, ...style }} />
+        <Skeleton className="h-8 w-full" style={style} />
       </div>
     );
   }
 
   // ── Build options ────────────────────────────────────────────────────────
-  const options = (accessGroups ?? []).map((group: AccessGroupResponse) => ({
-    label: (
-      <span>
-        <span className="font-medium">{group.access_group_name}</span>{" "}
-        <span className="text-xs text-muted-foreground">({group.access_group_id})</span>
-      </span>
-    ),
+  const options: MultiSelectOption[] = (accessGroups ?? []).map((group: AccessGroupResponse) => ({
+    label: group.access_group_name,
     value: group.access_group_id,
-    selectedLabel: group.access_group_name,
-    searchText: `${group.access_group_name} ${group.access_group_id}`,
+    description: group.access_group_id,
   }));
 
   // ── Render ───────────────────────────────────────────────────────────────
@@ -68,33 +60,20 @@ const AccessGroupSelector: React.FC<AccessGroupSelectorProps> = ({
     <div>
       {showLabel && (
         <p className="mb-2 flex items-center text-sm font-medium text-foreground">
-          <TeamOutlined className="mr-2" /> {labelText}
+          <Users className="mr-2 size-4" /> {labelText}
         </p>
       )}
-      <Select
-        mode="multiple"
-        value={value}
-        placeholder={placeholder}
-        onChange={onChange}
-        disabled={disabled}
-        allowClear={allowClear}
-        showSearch
-        style={{ width: "100%", ...style }}
-        className={`rounded-md ${className ?? ""}`}
-        notFoundContent={
-          isError ? <span className="text-destructive">Failed to load access groups</span> : "No access groups found"
-        }
-        filterOption={(input, option) => {
-          const searchText = options.find((opt) => opt.value === option?.value)?.searchText ?? "";
-          return searchText.toLowerCase().includes(input.toLowerCase());
-        }}
-        optionLabelProp="selectedLabel"
-        options={options.map((opt) => ({
-          label: opt.label,
-          value: opt.value,
-          selectedLabel: opt.selectedLabel,
-        }))}
-      />
+      <div style={style}>
+        <MultiSelect
+          options={options}
+          value={value}
+          onValueChange={onChange ?? (() => {})}
+          placeholder={placeholder}
+          emptyText={isError ? "Failed to load access groups" : "No access groups found"}
+          disabled={disabled}
+          className={`w-full rounded-md ${className ?? ""}`}
+        />
+      </div>
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx b/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx
index f51629b7ee1..a544a8be32b 100644
--- a/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/PassThroughGuardrailsSection.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import { Alert } from "antd";
-import { CircleHelp } from "lucide-react";
+import { CircleHelp, Info } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "@/components/shared/Alert";
 
 import GuardrailSelector from "../guardrails/GuardrailSelector";
 import { TagsInput } from "@/app/(dashboard)/guardrails/_components/content_filter/TagsInput";
@@ -67,21 +67,20 @@ const PassThroughGuardrailsSection: React.FC<PassThroughGuardrailsSectionProps>
           endpoints.
         </p>
 
-        <Alert
-          message={
-            <span>
-              Field-Level Targeting{" "}
-              <a
-                href="https://docs.litellm.ai/docs/proxy/pass_through_guardrails#field-level-targeting"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-blue-600 underline hover:text-blue-800"
-              >
-                (Learn More)
-              </a>
-            </span>
-          }
-          description={
+        <Alert variant="info" className="mb-4">
+          <Info />
+          <AlertTitle>
+            Field-Level Targeting{" "}
+            <a
+              href="https://docs.litellm.ai/docs/proxy/pass_through_guardrails#field-level-targeting"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-blue-600 underline hover:text-blue-800"
+            >
+              (Learn More)
+            </a>
+          </AlertTitle>
+          <AlertDescription>
             <div className="space-y-2">
               <div>
                 Optionally specify which fields to check. If left empty, the entire request/response is sent to the
@@ -100,11 +99,8 @@ const PassThroughGuardrailsSection: React.FC<PassThroughGuardrailsSectionProps>
                 </div>
               </div>
             </div>
-          }
-          type="info"
-          showIcon
-          className="mb-4"
-        />
+          </AlertDescription>
+        </Alert>
 
         <Field>
           <FieldLabel htmlFor="pass-through-guardrails">
diff --git a/ui/litellm-dashboard/src/components/common_components/RateLimitTypeFormItem.test.tsx b/ui/litellm-dashboard/src/components/common_components/RateLimitTypeFormItem.test.tsx
index 617dd4189f7..5b612c4c2eb 100644
--- a/ui/litellm-dashboard/src/components/common_components/RateLimitTypeFormItem.test.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/RateLimitTypeFormItem.test.tsx
@@ -1,57 +1,33 @@
 import { renderWithProviders, screen } from "../../../tests/test-utils";
 import userEvent from "@testing-library/user-event";
 import { vi } from "vitest";
-import { Form } from "antd";
-import React from "react";
 import { RateLimitTypeFormItem } from "./RateLimitTypeFormItem";
 
-const Wrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => <Form>{children}</Form>;
-
 describe("RateLimitTypeFormItem", () => {
   it("should render", () => {
-    renderWithProviders(
-      <Wrapper>
-        <RateLimitTypeFormItem type="tpm" name="tpm_type" />
-      </Wrapper>,
-    );
+    renderWithProviders(<RateLimitTypeFormItem type="tpm" name="tpm_type" />);
     expect(screen.getByText(/TPM Rate Limit Type/)).toBeInTheDocument();
   });
 
   it("should display TPM label for tpm type", () => {
-    renderWithProviders(
-      <Wrapper>
-        <RateLimitTypeFormItem type="tpm" name="tpm_type" />
-      </Wrapper>,
-    );
+    renderWithProviders(<RateLimitTypeFormItem type="tpm" name="tpm_type" />);
     expect(screen.getByText(/TPM Rate Limit Type/)).toBeInTheDocument();
   });
 
   it("should display RPM label for rpm type", () => {
-    renderWithProviders(
-      <Wrapper>
-        <RateLimitTypeFormItem type="rpm" name="rpm_type" />
-      </Wrapper>,
-    );
+    renderWithProviders(<RateLimitTypeFormItem type="rpm" name="rpm_type" />);
     expect(screen.getByText(/RPM Rate Limit Type/)).toBeInTheDocument();
   });
 
   it("should show the select placeholder by default", () => {
-    renderWithProviders(
-      <Wrapper>
-        <RateLimitTypeFormItem type="tpm" name="tpm_type" />
-      </Wrapper>,
-    );
+    renderWithProviders(<RateLimitTypeFormItem type="tpm" name="tpm_type" />);
     expect(screen.getByText("Select rate limit type")).toBeInTheDocument();
   });
 
   it("should call onChange when provided", async () => {
     const user = userEvent.setup();
     const onChange = vi.fn();
-    renderWithProviders(
-      <Wrapper>
-        <RateLimitTypeFormItem type="tpm" name="tpm_type" onChange={onChange} />
-      </Wrapper>,
-    );
+    renderWithProviders(<RateLimitTypeFormItem type="tpm" name="tpm_type" onChange={onChange} />);
     await user.click(screen.getByRole("combobox"));
     await user.click(screen.getByText("Guaranteed throughput"));
     expect(onChange).toHaveBeenCalledWith("guaranteed_throughput");
diff --git a/ui/litellm-dashboard/src/components/common_components/check_openapi_schema.tsx b/ui/litellm-dashboard/src/components/common_components/check_openapi_schema.tsx
index 2bcd516eb7b..cdeef9acbf7 100644
--- a/ui/litellm-dashboard/src/components/common_components/check_openapi_schema.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/check_openapi_schema.tsx
@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from "react";
-import { Input as AntdInput, InputNumber, Select } from "antd";
 import { Input } from "@/components/ui/input";
-import { InfoCircleOutlined } from "@ant-design/icons";
-import { Tooltip } from "antd";
+import { Textarea } from "@/components/ui/textarea";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Info } from "lucide-react";
+import { SimpleTooltip } from "@/components/ui/tooltip";
 import type { UseFormSetValue } from "react-hook-form";
 import { getOpenAPISchema } from "../networking";
 import { formatLabel } from "@/utils/textUtils";
@@ -57,6 +58,13 @@ const validateJSON = (value: string): boolean => {
 
 const isBlank = (value: unknown): boolean => value === undefined || value === null || value === "";
 
+const toSchemaNumber = (raw: string, isInteger: boolean): number | null => {
+  if (raw === "") return null;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed)) return null;
+  return isInteger ? Math.trunc(parsed) : parsed;
+};
+
 const messageOf = (error: unknown): string => (error instanceof Error ? error.message : String(error));
 
 const getFieldHelp = (key: string, property: SchemaProperty, type: string): string => {
@@ -182,9 +190,9 @@ const SchemaFormFields: React.FC<SchemaFormFieldsProps> = ({
     const formLabel = tooltip ? (
       <span>
         {label}{" "}
-        <Tooltip title={tooltip}>
-          <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-        </Tooltip>
+        <SimpleTooltip content={tooltip}>
+          <Info className="ml-1 inline size-3.5 align-text-bottom" />
+        </SimpleTooltip>
       </span>
     ) : (
       label
@@ -204,7 +212,7 @@ const SchemaFormFields: React.FC<SchemaFormFieldsProps> = ({
         {(control) => {
           if (isJSONField(key, property)) {
             return (
-              <AntdInput.TextArea
+              <Textarea
                 {...control}
                 value={control.value as string | undefined}
                 rows={4}
@@ -215,22 +223,34 @@ const SchemaFormFields: React.FC<SchemaFormFieldsProps> = ({
           }
           if (property.enum) {
             return (
-              <Select {...control} value={control.value as string | undefined}>
-                {property.enum.map((value) => (
-                  <Select.Option key={value} value={value}>
-                    {value}
-                  </Select.Option>
-                ))}
+              <Select value={(control.value as string | undefined) ?? null} onValueChange={control.onChange}>
+                <SelectTrigger
+                  id={control.id}
+                  onBlur={control.onBlur}
+                  aria-invalid={control["aria-invalid"]}
+                  className="w-full"
+                >
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {property.enum.map((value) => (
+                    <SelectItem key={value} value={value}>
+                      {value}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
               </Select>
             );
           }
           if (type === "number" || type === "integer") {
             return (
-              <InputNumber
+              <Input
                 {...control}
-                value={control.value as number | undefined}
-                style={{ width: "100%" }}
-                precision={type === "integer" ? 0 : undefined}
+                type="number"
+                step={type === "integer" ? 1 : "any"}
+                value={(control.value as number | undefined) ?? ""}
+                onChange={(event) => control.onChange(toSchemaNumber(event.target.value, type === "integer"))}
+                className="w-full"
               />
             );
           }
diff --git a/ui/litellm-dashboard/src/components/common_components/user_search_modal.test.tsx b/ui/litellm-dashboard/src/components/common_components/user_search_modal.test.tsx
index cbaf00b7131..e320a90f01a 100644
--- a/ui/litellm-dashboard/src/components/common_components/user_search_modal.test.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/user_search_modal.test.tsx
@@ -74,7 +74,7 @@ describe("UserSearchModal", () => {
     expect(notice).toHaveTextContent(/users that already exist/i);
     expect(notice).toHaveTextContent(/ask a proxy admin to create their account first/i);
     // info, not warning: a warning here would read as an error state on an empty form
-    expect(notice.className).toMatch(/ant-alert-info/);
+    expect(notice).toHaveAttribute("data-variant", "info");
   });
 });
 
@@ -198,3 +198,98 @@ describe("UserSearchModal submit payload", () => {
     await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1));
   });
 });
+
+describe("UserSearchModal out-of-order search results", () => {
+  const answers = new Map<string, (users: { user_id: string; user_email: string }[]) => void>();
+
+  beforeEach(() => {
+    answers.clear();
+    vi.mocked(userFilterUICall).mockReset();
+    vi.mocked(userFilterUICall).mockImplementation(
+      (_accessToken, params) =>
+        new Promise((resolve) => {
+          answers.set(params.get("user_email") ?? "", resolve);
+        }) as never,
+    );
+  });
+
+  const answerFor = async (search: string, users: { user_id: string; user_email: string }[]) => {
+    const resolve = answers.get(search);
+    if (resolve === undefined) throw new Error(`no pending search for "${search}"`);
+    await act(async () => {
+      resolve(users);
+    });
+  };
+
+  it("commits the current search's match when an abandoned search answers last", async () => {
+    const user = userEvent.setup();
+    const onSubmit = vi.fn();
+    render(<UserSearchModal isVisible onCancel={vi.fn()} onSubmit={onSubmit} accessToken="sk-test" />);
+
+    const input = getEmailSearchInput();
+    await user.click(input);
+    await user.type(input, "ali");
+    await waitFor(() => expect(answers.has("ali")).toBe(true), { timeout: 3000 });
+
+    await user.type(input, "ce.smith@example.com");
+    await waitFor(() => expect(answers.has("alice.smith@example.com")).toBe(true), { timeout: 3000 });
+
+    await answerFor("alice.smith@example.com", [{ user_id: "u-smith", user_email: "alice.smith@example.com" }]);
+    await screen.findByRole("option", { name: "alice.smith@example.com" });
+
+    await answerFor("ali", [
+      { user_id: "u-jones", user_email: "alice.jones@example.com" },
+      { user_id: "u-smith", user_email: "alice.smith@example.com" },
+    ]);
+
+    await user.keyboard("{Enter}");
+    await user.click(screen.getByRole("button", { name: /add member/i }));
+
+    await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1));
+    expect(onSubmit.mock.calls[0][0]).toStrictEqual({
+      user_email: "alice.smith@example.com",
+      user_id: "u-smith",
+      role: "user",
+    });
+  });
+
+  it("stops loading once the box is cleared and the abandoned search answers", async () => {
+    const user = userEvent.setup();
+    render(<UserSearchModal isVisible onCancel={vi.fn()} onSubmit={vi.fn()} accessToken="sk-test" />);
+
+    const input = getEmailSearchInput();
+    await user.click(input);
+    await user.type(input, "ali");
+    await waitFor(() => expect(answers.has("ali")).toBe(true), { timeout: 3000 });
+    await screen.findByText("Loading...");
+
+    await user.clear(input);
+    await screen.findByText("No results");
+
+    await answerFor("ali", [{ user_id: "u-jones", user_email: "alice.jones@example.com" }]);
+
+    expect(screen.queryByRole("option")).not.toBeInTheDocument();
+    expect(screen.getByText("No results")).toBeInTheDocument();
+  });
+
+  it("keeps loading while a newer search is still in flight", async () => {
+    const user = userEvent.setup();
+    render(<UserSearchModal isVisible onCancel={vi.fn()} onSubmit={vi.fn()} accessToken="sk-test" />);
+
+    const input = getEmailSearchInput();
+    await user.click(input);
+    await user.type(input, "ali");
+    await waitFor(() => expect(answers.has("ali")).toBe(true), { timeout: 3000 });
+
+    await user.type(input, "ce.smith@example.com");
+    await waitFor(() => expect(answers.has("alice.smith@example.com")).toBe(true), { timeout: 3000 });
+
+    await answerFor("ali", []);
+
+    expect(screen.getByText("Loading...")).toBeInTheDocument();
+    expect(screen.queryByText("No results")).not.toBeInTheDocument();
+
+    await answerFor("alice.smith@example.com", [{ user_id: "u-smith", user_email: "alice.smith@example.com" }]);
+    await screen.findByRole("option", { name: "alice.smith@example.com" });
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/common_components/user_search_modal.tsx b/ui/litellm-dashboard/src/components/common_components/user_search_modal.tsx
index aeead9d82e6..2977a9e4941 100644
--- a/ui/litellm-dashboard/src/components/common_components/user_search_modal.tsx
+++ b/ui/litellm-dashboard/src/components/common_components/user_search_modal.tsx
@@ -1,6 +1,6 @@
-import { useState } from "react";
-import { Modal, Alert } from "antd";
-import { UserAddOutlined } from "@ant-design/icons";
+import { useRef, useState } from "react";
+import { Info, UserPlus } from "lucide-react";
+import { Alert, AlertTitle } from "@/components/shared/Alert";
 import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
 import { useForm } from "react-hook-form";
 import { userFilterUICall } from "@/components/networking";
@@ -16,6 +16,7 @@ import {
   ComboboxItem,
   ComboboxList,
 } from "@/components/ui/combobox";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
@@ -78,10 +79,16 @@ const UserSearchModal: React.FC<UserSearchModalProps> = ({
   const [loading, setLoading] = useState<boolean>(false);
   const [selectedField, setSelectedField] = useState<"user_email" | "user_id">("user_email");
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const latestSearchRef = useRef(0);
 
   const fetchUsers = async (searchText: string, fieldName: "user_email" | "user_id"): Promise<void> => {
+    const searchId = latestSearchRef.current + 1;
+    latestSearchRef.current = searchId;
+    const isLatestSearch = (): boolean => searchId === latestSearchRef.current;
+
     if (!searchText) {
       setUserOptions([]);
+      setLoading(false);
       return;
     }
 
@@ -96,6 +103,7 @@ const UserSearchModal: React.FC<UserSearchModalProps> = ({
         return;
       }
       const response = await userFilterUICall(accessToken, params);
+      if (!isLatestSearch()) return;
 
       const data: User[] = response;
       const options: UserOption[] = data.map((user) => ({
@@ -107,7 +115,7 @@ const UserSearchModal: React.FC<UserSearchModalProps> = ({
     } catch (error) {
       console.error("Error fetching users:", error);
     } finally {
-      setLoading(false);
+      if (isLatestSearch()) setLoading(false);
     }
   };
 
@@ -199,67 +207,72 @@ const UserSearchModal: React.FC<UserSearchModalProps> = ({
   };
 
   return (
-    <Modal title={title} open={isVisible} onCancel={handleClose} footer={null} width={800} maskClosable={!isSubmitting}>
-      <TooltipProvider>
-        <form onSubmit={form.handleSubmit(handleSubmit)} noValidate>
-          <Alert
-            type="info"
-            showIcon
-            className="mb-4"
-            message="Search selects from users that already exist. To add someone new, ask a proxy admin to create their account first."
-            data-testid="member-existing-users-notice"
-          />
+    <Dialog open={isVisible} onOpenChange={(open) => !open && handleClose()} disablePointerDismissal={isSubmitting}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>{title}</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={form.handleSubmit(handleSubmit)} noValidate>
+            <Alert variant="info" className="mb-4" data-testid="member-existing-users-notice">
+              <Info />
+              <AlertTitle>
+                Search selects from users that already exist. To add someone new, ask a proxy admin to create their
+                account first.
+              </AlertTitle>
+            </Alert>
 
-          <FieldGroup>
-            <FormField control={form.control} name="user_email" label="Email">
-              {({ id, value, onChange }) =>
-                renderUserSearch("user_email", "Search by email", { id, value, onChange }, "member-email-search")
-              }
-            </FormField>
+            <FieldGroup>
+              <FormField control={form.control} name="user_email" label="Email">
+                {({ id, value, onChange }) =>
+                  renderUserSearch("user_email", "Search by email", { id, value, onChange }, "member-email-search")
+                }
+              </FormField>
 
-            <div className="text-center">OR</div>
+              <div className="text-center">OR</div>
 
-            <FormField control={form.control} name="user_id" label="User ID">
-              {({ id, value, onChange }) => renderUserSearch("user_id", "Search by user ID", { id, value, onChange })}
-            </FormField>
+              <FormField control={form.control} name="user_id" label="User ID">
+                {({ id, value, onChange }) => renderUserSearch("user_id", "Search by user ID", { id, value, onChange })}
+              </FormField>
 
-            <FormField control={form.control} name="role" label="Member Role">
-              {({ id, value, onChange }) => (
-                <Select items={roles} value={value} onValueChange={(next) => onChange(next as string)}>
-                  <SelectTrigger id={id}>
-                    <SelectValue />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {roles.map((role) => (
-                      <SelectItem key={role.value} value={role.value}>
-                        <Tooltip>
-                          <TooltipTrigger
-                            render={
-                              <span>
-                                <span className="font-medium">{role.label}</span>
-                                <span className="ml-2 text-sm text-muted-foreground">- {role.description}</span>
-                              </span>
-                            }
-                          />
-                          <TooltipContent>{role.description}</TooltipContent>
-                        </Tooltip>
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              )}
-            </FormField>
-          </FieldGroup>
+              <FormField control={form.control} name="role" label="Member Role">
+                {({ id, value, onChange }) => (
+                  <Select items={roles} value={value} onValueChange={(next) => onChange(next as string)}>
+                    <SelectTrigger id={id}>
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {roles.map((role) => (
+                        <SelectItem key={role.value} value={role.value}>
+                          <Tooltip>
+                            <TooltipTrigger
+                              render={
+                                <span>
+                                  <span className="font-medium">{role.label}</span>
+                                  <span className="ml-2 text-sm text-muted-foreground">- {role.description}</span>
+                                </span>
+                              }
+                            />
+                            <TooltipContent>{role.description}</TooltipContent>
+                          </Tooltip>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                )}
+              </FormField>
+            </FieldGroup>
 
-          <div className="mt-4 text-right">
-            <Button type="submit" disabled={isSubmitting}>
-              {isSubmitting ? <UiLoadingSpinner className="size-4" /> : <UserAddOutlined />}
-              {isSubmitting ? "Adding..." : "Add Member"}
-            </Button>
-          </div>
-        </form>
-      </TooltipProvider>
-    </Modal>
+            <div className="mt-4 text-right">
+              <Button type="submit" disabled={isSubmitting}>
+                {isSubmitting ? <UiLoadingSpinner className="size-4" /> : <UserPlus />}
+                {isSubmitting ? "Adding..." : "Add Member"}
+              </Button>
+            </div>
+          </form>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/edit_auto_router/build_updated_complexity_router_config.test.ts b/ui/litellm-dashboard/src/components/edit_auto_router/build_updated_complexity_router_config.test.ts
index c62955b6683..0ae782dc5fc 100644
--- a/ui/litellm-dashboard/src/components/edit_auto_router/build_updated_complexity_router_config.test.ts
+++ b/ui/litellm-dashboard/src/components/edit_auto_router/build_updated_complexity_router_config.test.ts
@@ -313,6 +313,42 @@ describe("buildUpdatedComplexityRouterConfig scorer knobs", () => {
   it("never invents knobs for a router that never had them", () => {
     expect(buildUpdatedComplexityRouterConfig(STORED, FORM_VALUE)).not.toHaveProperty("tier_boundaries");
   });
+
+  // 0 is an unconditional reasoning override. Treating it as unset here would quietly retune the router
+  // back to tracking simple_medium on the next save.
+  it("round-trips a stored reasoning override floor of 0", () => {
+    const result = buildUpdatedComplexityRouterConfig(
+      { ...STORED, reasoning_override_min_score: 0 },
+      { ...FORM_VALUE, reasoning_override_min_score: 0 },
+    );
+    expect(result.reasoning_override_min_score).toBe(0);
+  });
+
+  it("writes a newly set reasoning override floor over the stored one", () => {
+    const result = buildUpdatedComplexityRouterConfig(
+      { ...STORED, reasoning_override_min_score: 0 },
+      { ...FORM_VALUE, reasoning_override_min_score: 0.5 },
+    );
+    expect(result.reasoning_override_min_score).toBe(0.5);
+  });
+
+  it("drops a stored reasoning override floor when the operator resets it", () => {
+    const result = buildUpdatedComplexityRouterConfig({ ...STORED, reasoning_override_min_score: 0.5 }, FORM_VALUE);
+
+    expect(result).not.toHaveProperty("reasoning_override_min_score");
+    expect(result.some_future_backend_key).toEqual({ nested: true });
+  });
+
+  it("drops the reasoning override floor on a router whose scorer never runs", () => {
+    const neverScores = {
+      ...FORM_VALUE,
+      reasoning_override_min_score: 0,
+      classifier_type: "llm" as const,
+      classifier_fallback: "default_model" as const,
+    };
+    const result = buildUpdatedComplexityRouterConfig({ ...STORED, reasoning_override_min_score: 0 }, neverScores);
+    expect(result).not.toHaveProperty("reasoning_override_min_score");
+  });
 });
 
 describe("buildUpdatedComplexityRouterConfig plan-mode minimum tier", () => {
diff --git a/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.test.tsx b/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.test.tsx
index 9702fa85db0..e2217cda190 100644
--- a/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.test.tsx
+++ b/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.test.tsx
@@ -64,10 +64,6 @@ const savedConfig = () => {
   return payload?.litellm_params?.complexity_router_config;
 };
 
-const selectedValueIn = (combobox: HTMLElement): string | null =>
-  // eslint-disable-next-line local/no-antd-class-selectors -- antd keeps the rendered selection in a sibling of the combobox, reachable only through these classes; the tier selects show the same models, so an unscoped title query is ambiguous
-  combobox.closest(".ant-select")?.querySelector(".ant-select-selection-item")?.getAttribute("title") ?? null;
-
 describe("EditAutoRouterModal keyword matching", () => {
   beforeEach(() => {
     modelPatchUpdateCall.mockClear();
@@ -201,8 +197,9 @@ describe("EditAutoRouterModal keyword matching", () => {
 
     await user.type(
       within(screen.getByText("Keywords 2").closest("div") as HTMLElement).getByRole("combobox"),
-      "chargeback{enter}",
+      "chargeback",
     );
+    await user.click(await screen.findByText('Create "chargeback"'));
 
     expect(screen.getByRole("button", { name: /save changes/i })).toBeEnabled();
     expect(screen.queryByText("At least one keyword is required")).not.toBeInTheDocument();
@@ -523,8 +520,7 @@ describe("EditAutoRouterModal custom classifier prompt and fallback", () => {
 
     await user.click(await screen.findByText("Advanced: Classification Method"));
     expect(await screen.findByRole("button", { name: "Edit custom prompt" })).toBeInTheDocument();
-    // eslint-disable-next-line jest-dom/prefer-checked -- antd sets the checked attribute without the DOM property, so toBeChecked reads false
-    expect(screen.getByRole("radio", { name: /Route to the default model/ })).toHaveAttribute("checked");
+    expect(screen.getByRole("radio", { name: /Route to the default model/ })).toBeChecked();
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
 
@@ -623,7 +619,7 @@ describe("EditAutoRouterModal default model", () => {
     renderWithStoredPin("out-of-band-default");
 
     const select = await screen.findByRole("combobox", { name: "Default model" });
-    expect(selectedValueIn(select)).toBe("out-of-band-default");
+    expect(select).toHaveValue("out-of-band-default");
   });
 
   // The pin is recorded in the config rather than inferred by comparing the stored default to a
@@ -633,7 +629,7 @@ describe("EditAutoRouterModal default model", () => {
     renderWithStoredPin(STORED_CONFIG.tiers.MEDIUM[0]);
 
     const select = await screen.findByRole("combobox", { name: "Default model" });
-    expect(selectedValueIn(select)).toBe(STORED_CONFIG.tiers.MEDIUM[0]);
+    expect(select).toHaveValue(STORED_CONFIG.tiers.MEDIUM[0]);
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
     await waitFor(() => expect(modelPatchUpdateCall).toHaveBeenCalled());
@@ -649,7 +645,7 @@ describe("EditAutoRouterModal default model", () => {
     renderWithLitellmParamsDefaultOnly(STORED_CONFIG.tiers.MEDIUM[0]);
 
     const select = await screen.findByRole("combobox", { name: "Default model" });
-    expect(selectedValueIn(select)).toBeNull();
+    expect(select).toHaveValue("");
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
     await waitFor(() => expect(modelPatchUpdateCall).toHaveBeenCalled());
@@ -666,7 +662,7 @@ describe("EditAutoRouterModal default model", () => {
     renderWithLitellmParamsDefaultOnly("claude-sonnet-4");
 
     const select = await screen.findByRole("combobox", { name: "Default model" });
-    expect(selectedValueIn(select)).toBe("claude-sonnet-4");
+    expect(select).toHaveValue("claude-sonnet-4");
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
     await waitFor(() => expect(modelPatchUpdateCall).toHaveBeenCalled());
@@ -698,7 +694,7 @@ describe("EditAutoRouterModal default model", () => {
     );
 
     const select = await screen.findByRole("combobox", { name: "Default model" });
-    expect(selectedValueIn(select)).toBe("blob-pin");
+    expect(select).toHaveValue("blob-pin");
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
     await waitFor(() => expect(modelPatchUpdateCall).toHaveBeenCalled());
@@ -740,7 +736,7 @@ describe("EditAutoRouterModal default model", () => {
     renderWithStoredPin();
 
     const select = await screen.findByRole("combobox", { name: "Default model" });
-    expect(selectedValueIn(select)).toBeNull();
+    expect(select).toHaveValue("");
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
     await waitFor(() => expect(modelPatchUpdateCall).toHaveBeenCalled());
diff --git a/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.tsx b/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.tsx
index 54f992b08f4..012624454d3 100644
--- a/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.tsx
+++ b/ui/litellm-dashboard/src/components/edit_auto_router/edit_auto_router_modal.tsx
@@ -30,6 +30,7 @@ import { DEFAULT_MATCH_THRESHOLD } from "../add_model/SemanticKeywordMatching";
 import { hydrateKeywordTierRules, serializeKeywordTierRules } from "../add_model/complexity_router_keywords";
 import {
   hydrateDimensionWeights,
+  hydrateReasoningOverrideMinScore,
   hydrateTierBoundaries,
   hydrateTokenThresholds,
 } from "../add_model/heuristic_scoring_knobs";
@@ -84,6 +85,7 @@ const MANAGED_COMPLEXITY_ROUTER_KEYS = new Set([
   "tier_boundaries",
   "token_thresholds",
   "dimension_weights",
+  "reasoning_override_min_score",
 ]);
 
 // Managed only when the caller passes the corresponding state. A caller that does not render
@@ -200,6 +202,10 @@ export const buildUpdatedComplexityRouterConfig = (
     ...(scorerRuns && value.tier_boundaries !== undefined && { tier_boundaries: value.tier_boundaries }),
     ...(scorerRuns && value.token_thresholds !== undefined && { token_thresholds: value.token_thresholds }),
     ...(scorerRuns && value.dimension_weights !== undefined && { dimension_weights: value.dimension_weights }),
+    ...(scorerRuns &&
+      value.reasoning_override_min_score !== undefined && {
+        reasoning_override_min_score: value.reasoning_override_min_score,
+      }),
   };
 };
 
@@ -367,6 +373,7 @@ const EditAutoRouterModal: React.FC<EditAutoRouterModalProps> = ({
           tier_boundaries: hydrateTierBoundaries(parsedConfig.tier_boundaries),
           token_thresholds: hydrateTokenThresholds(parsedConfig.token_thresholds),
           dimension_weights: hydrateDimensionWeights(parsedConfig.dimension_weights),
+          reasoning_override_min_score: hydrateReasoningOverrideMinScore(parsedConfig.reasoning_override_min_score),
           session_affinity:
             typeof parsedConfig.session_affinity === "boolean"
               ? parsedConfig.session_affinity
diff --git a/ui/litellm-dashboard/src/components/key_team_helpers/BudgetFallbacksEditor.tsx b/ui/litellm-dashboard/src/components/key_team_helpers/BudgetFallbacksEditor.tsx
index 1d327b87346..4e1c17a4c68 100644
--- a/ui/litellm-dashboard/src/components/key_team_helpers/BudgetFallbacksEditor.tsx
+++ b/ui/litellm-dashboard/src/components/key_team_helpers/BudgetFallbacksEditor.tsx
@@ -1,5 +1,5 @@
-import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Select } from "antd";
+import { MultiSelect } from "@/components/shared/MultiSelect";
+import { SearchSelect } from "@/components/shared/SearchSelect";
 import { Button } from "@/components/ui/button";
 import { ArrowDown, Plus, X } from "lucide-react";
 import React, { useState } from "react";
@@ -94,18 +94,15 @@ export function BudgetFallbacksEditor({ value, onChange, availableModels }: Budg
 
             <div className="mb-3">
               <label className="block text-xs font-medium text-gray-600 mb-1">Primary Model</label>
-              <Select
-                className="w-full"
-                placeholder="Select model"
-                value={entry.primaryModel}
-                onChange={(v) => {
-                  const newFallbacks = entry.fallbackModels.filter((m) => m !== v);
-                  updateEntry(entry.id, { primaryModel: v, fallbackModels: newFallbacks });
-                }}
-                showSearch
-                filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+              <SearchSelect
                 options={availablePrimaryOptions.map((m) => ({ label: m, value: m }))}
-                getPopupContainer={(trigger) => trigger.parentElement || document.body}
+                value={entry.primaryModel ?? ""}
+                onValueChange={(v) => {
+                  const newFallbacks = entry.fallbackModels.filter((m) => m !== v);
+                  updateEntry(entry.id, { primaryModel: v === "" ? null : v, fallbackModels: newFallbacks });
+                }}
+                placeholder="Select model"
+                emptyText="No models found"
               />
             </div>
 
@@ -118,23 +115,14 @@ export function BudgetFallbacksEditor({ value, onChange, availableModels }: Budg
 
             <div>
               <label className="block text-xs font-medium text-gray-600 mb-1">Fallback Models</label>
-              <Select
-                mode="multiple"
-                className="w-full"
-                placeholder={entry.primaryModel ? "Select fallback models" : "Select a primary model first"}
-                value={entry.fallbackModels}
-                onChange={(values) => updateEntry(entry.id, { fallbackModels: values })}
-                disabled={!entry.primaryModel}
-                showSearch
-                filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+              <MultiSelect
                 options={availableFallbackOptions.map((m) => ({ label: m, value: m }))}
-                getPopupContainer={(trigger) => trigger.parentElement || document.body}
-                maxTagCount="responsive"
-                maxTagPlaceholder={(omittedValues) => (
-                  <SimpleTooltip content={omittedValues.map(({ value: v }) => v).join(", ")}>
-                    <span>+{omittedValues.length} more</span>
-                  </SimpleTooltip>
-                )}
+                value={entry.fallbackModels}
+                onValueChange={(values) => updateEntry(entry.id, { fallbackModels: values })}
+                placeholder={entry.primaryModel ? "Select fallback models" : "Select a primary model first"}
+                emptyText="No models found"
+                disabled={!entry.primaryModel}
+                className="w-full"
               />
               {entry.fallbackModels.length > 1 && (
                 <div className="text-[10px] text-gray-400 mt-1 ml-1">
diff --git a/ui/litellm-dashboard/src/components/key_team_helpers/BudgetWindowsEditor.tsx b/ui/litellm-dashboard/src/components/key_team_helpers/BudgetWindowsEditor.tsx
index c9a422dcb85..43861d43c0d 100644
--- a/ui/litellm-dashboard/src/components/key_team_helpers/BudgetWindowsEditor.tsx
+++ b/ui/litellm-dashboard/src/components/key_team_helpers/BudgetWindowsEditor.tsx
@@ -1,5 +1,6 @@
-import { InputNumber, Select } from "antd";
 import { Button } from "@/components/ui/button";
+import { InputGroup, InputGroupAddon, InputGroupInput, InputGroupText } from "@/components/ui/input-group";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import React from "react";
 
 export interface BudgetWindowEntry {
@@ -41,21 +42,43 @@ export function BudgetWindowsEditor({ value, onChange }: BudgetWindowsEditorProp
           <div key={idx} style={{ marginBottom: 12 }}>
             <div style={{ display: "flex", gap: 8, alignItems: "center" }}>
               <Select
+                items={BUDGET_WINDOW_OPTIONS}
                 value={window.budget_duration}
-                onChange={(v) => updateWindow(idx, "budget_duration", v)}
-                style={{ width: 130 }}
-                options={BUDGET_WINDOW_OPTIONS.map((o) => ({ value: o.value, label: o.label }))}
-              />
-              <InputNumber
-                step={0.01}
-                min={0}
-                precision={2}
-                value={window.max_budget ?? undefined}
-                onChange={(v) => updateWindow(idx, "max_budget", v ?? null)}
-                placeholder="Max spend ($)"
-                style={{ width: 160 }}
-                prefix="$"
-              />
+                onValueChange={(v: string | null) => v && updateWindow(idx, "budget_duration", v)}
+              >
+                <SelectTrigger className="w-[130px]">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {BUDGET_WINDOW_OPTIONS.map((option) => (
+                    <SelectItem key={option.value} value={option.value}>
+                      {option.label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <InputGroup className="w-40">
+                <InputGroupAddon>
+                  <InputGroupText>$</InputGroupText>
+                </InputGroupAddon>
+                <InputGroupInput
+                  type="number"
+                  step={0.01}
+                  min={0}
+                  value={window.max_budget ?? ""}
+                  onChange={(event) => {
+                    const typed = event.target.valueAsNumber;
+                    updateWindow(idx, "max_budget", Number.isNaN(typed) ? null : typed);
+                  }}
+                  onBlur={(event) => {
+                    const typed = event.target.valueAsNumber;
+                    if (!Number.isNaN(typed)) {
+                      updateWindow(idx, "max_budget", Number(typed.toFixed(2)));
+                    }
+                  }}
+                  placeholder="Max spend ($)"
+                />
+              </InputGroup>
               <Button
                 variant="ghost"
                 size="sm"
diff --git a/ui/litellm-dashboard/src/components/key_value_input.test.tsx b/ui/litellm-dashboard/src/components/key_value_input.test.tsx
index 0f9b8e682ae..649720676e9 100644
--- a/ui/litellm-dashboard/src/components/key_value_input.test.tsx
+++ b/ui/litellm-dashboard/src/components/key_value_input.test.tsx
@@ -1,12 +1,26 @@
+import { useState } from "react";
 import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
-import KeyValueInput from "./key_value_input";
+import KeyValueInput, { type KeyValuePair } from "./key_value_input";
+
+const ControlledKeyValueInput = ({ onChange }: { onChange?: (value: readonly KeyValuePair[]) => void }) => {
+  const [value, setValue] = useState<readonly KeyValuePair[]>([]);
+  return (
+    <KeyValueInput
+      value={value}
+      onChange={(next) => {
+        setValue(next);
+        onChange?.(next);
+      }}
+    />
+  );
+};
 
 describe("KeyValueInput", () => {
   it("renders existing header pairs", () => {
-    render(<KeyValueInput value={{ Authorization: "Bearer token" }} />);
+    render(<KeyValueInput value={[["Authorization", "Bearer token"]]} />);
 
     expect(screen.getByPlaceholderText("Header Name")).toHaveValue("Authorization");
     expect(screen.getByPlaceholderText("Header Value")).toHaveValue("Bearer token");
@@ -15,12 +29,54 @@ describe("KeyValueInput", () => {
   it("adds a header row and emits edits", async () => {
     const user = userEvent.setup();
     const onChange = vi.fn();
-    render(<KeyValueInput onChange={onChange} />);
+    render(<ControlledKeyValueInput onChange={onChange} />);
 
     await user.click(screen.getByRole("button", { name: /Add Header$/ }));
     fireEvent.change(screen.getByPlaceholderText("Header Name"), { target: { value: "X-Trace" } });
     fireEvent.change(screen.getByPlaceholderText("Header Value"), { target: { value: "enabled" } });
 
-    expect(onChange).toHaveBeenLastCalledWith({ "X-Trace": "enabled" });
+    expect(onChange).toHaveBeenLastCalledWith([["X-Trace", "enabled"]]);
+  });
+
+  it("renders no rows once the value prop goes back to empty", () => {
+    const { rerender } = render(<KeyValueInput value={[["Authorization", "Bearer token"]]} />);
+    expect(screen.getByPlaceholderText("Header Name")).toHaveValue("Authorization");
+
+    rerender(<KeyValueInput value={[]} />);
+
+    expect(screen.queryByPlaceholderText("Header Name")).not.toBeInTheDocument();
+    expect(screen.queryByPlaceholderText("Header Value")).not.toBeInTheDocument();
+  });
+
+  it("keeps a half-typed row editable while its name is still empty", async () => {
+    const user = userEvent.setup();
+    render(<ControlledKeyValueInput />);
+
+    await user.click(screen.getByRole("button", { name: /Add Header$/ }));
+    await user.click(screen.getByRole("button", { name: /Add Header$/ }));
+    expect(screen.getAllByPlaceholderText("Header Name")).toHaveLength(2);
+
+    fireEvent.change(screen.getAllByPlaceholderText("Header Value")[1], { target: { value: "pending" } });
+
+    expect(screen.getAllByPlaceholderText("Header Name")).toHaveLength(2);
+    expect(screen.getAllByPlaceholderText("Header Value")[1]).toHaveValue("pending");
+  });
+
+  it("removes only the row whose remove button is clicked", async () => {
+    const user = userEvent.setup();
+    const onChange = vi.fn();
+    render(
+      <KeyValueInput
+        value={[
+          ["a", "1"],
+          ["b", "2"],
+        ]}
+        onChange={onChange}
+      />,
+    );
+
+    await user.click(screen.getByRole("button", { name: "Remove header 1" }));
+
+    expect(onChange).toHaveBeenLastCalledWith([["b", "2"]]);
   });
 });
diff --git a/ui/litellm-dashboard/src/components/key_value_input.tsx b/ui/litellm-dashboard/src/components/key_value_input.tsx
index a35968ce0e7..363f24f4535 100644
--- a/ui/litellm-dashboard/src/components/key_value_input.tsx
+++ b/ui/litellm-dashboard/src/components/key_value_input.tsx
@@ -1,40 +1,30 @@
-import React, { useState } from "react";
+import React from "react";
 import { Minus, Plus } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 
+export type KeyValuePair = readonly [string, string];
+
 interface KeyValueInputProps {
-  value?: Record<string, string>;
-  onChange?: (value: Record<string, string>) => void;
+  value?: readonly KeyValuePair[];
+  onChange?: (value: readonly KeyValuePair[]) => void;
 }
 
-const KeyValueInput: React.FC<KeyValueInputProps> = ({ value = {}, onChange }) => {
-  const [pairs, setPairs] = useState<[string, string][]>(Object.entries(value));
+const KeyValueInput: React.FC<KeyValueInputProps> = ({ value = [], onChange }) => {
+  const handleAdd = () => onChange?.([...value, ["", ""]]);
 
-  const handleAdd = () => {
-    setPairs([...pairs, ["", ""]]);
-  };
+  const handleRemove = (index: number) => onChange?.(value.filter((_, i) => i !== index));
 
-  const handleRemove = (index: number) => {
-    const newPairs = pairs.filter((_, i) => i !== index);
-    setPairs(newPairs);
-    onChange?.(Object.fromEntries(newPairs));
-  };
-
-  const handleChange = (index: number, key: string, val: string) => {
-    const newPairs = [...pairs];
-    newPairs[index] = [key, val];
-    setPairs(newPairs);
-    onChange?.(Object.fromEntries(newPairs));
-  };
+  const handleChange = (index: number, pair: KeyValuePair) =>
+    onChange?.(value.map((existing, i) => (i === index ? pair : existing)));
 
   return (
     <div className="space-y-2">
-      {pairs.map(([key, val], index) => (
+      {value.map(([key, val], index) => (
         <div key={index} className="flex items-center gap-2">
-          <Input placeholder="Header Name" value={key} onChange={(e) => handleChange(index, e.target.value, val)} />
-          <Input placeholder="Header Value" value={val} onChange={(e) => handleChange(index, key, e.target.value)} />
+          <Input placeholder="Header Name" value={key} onChange={(e) => handleChange(index, [e.target.value, val])} />
+          <Input placeholder="Header Value" value={val} onChange={(e) => handleChange(index, [key, e.target.value])} />
           <Button
             type="button"
             variant="ghost"
diff --git a/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.test.tsx b/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.test.tsx
index e6e778e49e5..47fb5643b22 100644
--- a/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.test.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.test.tsx
@@ -15,28 +15,6 @@ vi.mock("@/app/(dashboard)/hooks/mcpServers/useMCPToolsets", () => ({
   useMCPToolsets: vi.fn(),
 }));
 
-vi.mock("antd", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("antd")>();
-  const Select = ({ value, onChange, children, mode }: any) => (
-    <select
-      data-testid="mcp-select"
-      multiple={mode === "multiple"}
-      value={value}
-      onChange={(e) => onChange(Array.from(e.target.selectedOptions, (o) => (o as HTMLOptionElement).value))}
-    >
-      {children}
-    </select>
-  );
-  Select.displayName = "MockSelect";
-  Select.Option = ({ value, disabled, label }: any) => (
-    <option value={value} disabled={disabled}>
-      {label}
-    </option>
-  );
-  Select.Option.displayName = "MockSelectOption";
-  return { ...actual, Select };
-});
-
 import { useMCPAccessGroups } from "@/app/(dashboard)/hooks/mcpServers/useMCPAccessGroups";
 import { useMCPServers } from "@/app/(dashboard)/hooks/mcpServers/useMCPServers";
 import { useMCPToolsets } from "@/app/(dashboard)/hooks/mcpServers/useMCPToolsets";
@@ -45,6 +23,15 @@ const mockUseMCPServers = vi.mocked(useMCPServers);
 const mockUseMCPAccessGroups = vi.mocked(useMCPAccessGroups);
 const mockUseMCPToolsets = vi.mocked(useMCPToolsets);
 
+// The dropdown mounts its list asynchronously, so opening means waiting for the options too.
+const openSelector = async (user: ReturnType<typeof userEvent.setup>): Promise<void> => {
+  await user.click(screen.getByRole("combobox"));
+  await screen.findAllByRole("option");
+};
+
+const optionByLabel = (label: string): HTMLElement | undefined =>
+  screen.queryAllByRole("option").find((option) => option.textContent?.startsWith(label));
+
 const setupMcpMocks = () => {
   mockUseMCPServers.mockReturnValue({
     data: [{ server_id: "srv-1", server_name: "Server One" }],
@@ -60,19 +47,20 @@ describe("MCPServerSelector no-mcp-servers option", () => {
     setupMcpMocks();
   });
 
-  const optionByValue = (value: string) =>
-    Array.from(screen.getByTestId("mcp-select").querySelectorAll("option")).find(
-      (o) => (o as HTMLOptionElement).value === value,
-    ) as HTMLOptionElement | undefined;
-
-  it("hides the No MCP Servers option by default", () => {
+  it("hides the No MCP Servers option by default", async () => {
+    const user = userEvent.setup();
     renderWithProviders(
       <MCPServerSelector accessToken="tok" onChange={vi.fn()} value={{ servers: [], accessGroups: [] }} />,
     );
-    expect(optionByValue(NO_MCP_SERVERS_SENTINEL)).toBeUndefined();
+
+    await openSelector(user);
+
+    expect(optionByLabel("Server One")).toBeDefined();
+    expect(optionByLabel("No MCP Servers")).toBeUndefined();
   });
 
   it("emits an exclusive sentinel when No MCP Servers is selected", async () => {
+    const user = userEvent.setup();
     const onChange = vi.fn();
     renderWithProviders(
       <MCPServerSelector
@@ -82,14 +70,15 @@ describe("MCPServerSelector no-mcp-servers option", () => {
         value={{ servers: ["srv-1"], accessGroups: [] }}
       />,
     );
-    expect(optionByValue(NO_MCP_SERVERS_SENTINEL)).toBeDefined();
 
-    await userEvent.selectOptions(screen.getByTestId("mcp-select"), [NO_MCP_SERVERS_SENTINEL]);
+    await openSelector(user);
+    await user.click(optionByLabel("No MCP Servers")!);
 
     expect(onChange).toHaveBeenCalledWith({ servers: [NO_MCP_SERVERS_SENTINEL], accessGroups: [], toolsets: [] });
   });
 
-  it("disables real server options while the sentinel is selected", () => {
+  it("disables real server options while the sentinel is selected", async () => {
+    const user = userEvent.setup();
     renderWithProviders(
       <MCPServerSelector
         accessToken="tok"
@@ -98,8 +87,11 @@ describe("MCPServerSelector no-mcp-servers option", () => {
         value={{ servers: [NO_MCP_SERVERS_SENTINEL], accessGroups: [] }}
       />,
     );
-    expect(optionByValue("srv-1")?.disabled).toBe(true);
-    expect(optionByValue(NO_MCP_SERVERS_SENTINEL)?.disabled).toBe(false);
+
+    await openSelector(user);
+
+    expect(optionByLabel("Server One")).toHaveAttribute("aria-disabled", "true");
+    expect(optionByLabel("No MCP Servers")).not.toHaveAttribute("aria-disabled", "true");
   });
 });
 
@@ -109,19 +101,20 @@ describe("MCPServerSelector all-proxy-mcpservers option", () => {
     setupMcpMocks();
   });
 
-  const optionByValue = (value: string) =>
-    Array.from(screen.getByTestId("mcp-select").querySelectorAll("option")).find(
-      (o) => (o as HTMLOptionElement).value === value,
-    ) as HTMLOptionElement | undefined;
-
-  it("hides the All Proxy MCP Servers option by default", () => {
+  it("hides the All Proxy MCP Servers option by default", async () => {
+    const user = userEvent.setup();
     renderWithProviders(
       <MCPServerSelector accessToken="tok" onChange={vi.fn()} value={{ servers: [], accessGroups: [] }} />,
     );
-    expect(optionByValue(ALL_PROXY_MCP_SERVERS_SENTINEL)).toBeUndefined();
+
+    await openSelector(user);
+
+    expect(optionByLabel("Server One")).toBeDefined();
+    expect(optionByLabel("All Proxy MCP Servers")).toBeUndefined();
   });
 
   it("emits an exclusive sentinel when All Proxy MCP Servers is selected", async () => {
+    const user = userEvent.setup();
     const onChange = vi.fn();
     renderWithProviders(
       <MCPServerSelector
@@ -131,9 +124,9 @@ describe("MCPServerSelector all-proxy-mcpservers option", () => {
         value={{ servers: ["srv-1"], accessGroups: [] }}
       />,
     );
-    expect(optionByValue(ALL_PROXY_MCP_SERVERS_SENTINEL)).toBeDefined();
 
-    await userEvent.selectOptions(screen.getByTestId("mcp-select"), [ALL_PROXY_MCP_SERVERS_SENTINEL]);
+    await openSelector(user);
+    await user.click(optionByLabel("All Proxy MCP Servers")!);
 
     expect(onChange).toHaveBeenCalledWith({
       servers: [ALL_PROXY_MCP_SERVERS_SENTINEL],
@@ -142,7 +135,8 @@ describe("MCPServerSelector all-proxy-mcpservers option", () => {
     });
   });
 
-  it("disables real server options while the sentinel is selected", () => {
+  it("disables real server options while the sentinel is selected", async () => {
+    const user = userEvent.setup();
     renderWithProviders(
       <MCPServerSelector
         accessToken="tok"
@@ -151,11 +145,15 @@ describe("MCPServerSelector all-proxy-mcpservers option", () => {
         value={{ servers: [ALL_PROXY_MCP_SERVERS_SENTINEL], accessGroups: [] }}
       />,
     );
-    expect(optionByValue("srv-1")?.disabled).toBe(true);
-    expect(optionByValue(ALL_PROXY_MCP_SERVERS_SENTINEL)?.disabled).toBe(false);
+
+    await openSelector(user);
+
+    expect(optionByLabel("Server One")).toHaveAttribute("aria-disabled", "true");
+    expect(optionByLabel("All Proxy MCP Servers")).not.toHaveAttribute("aria-disabled", "true");
   });
 
-  it("renders the friendly option, not the raw literal, when the sentinel is already stored but the flag is off", () => {
+  it("renders the friendly label, not the raw literal, when the sentinel is already stored but the flag is off", async () => {
+    const user = userEvent.setup();
     renderWithProviders(
       <MCPServerSelector
         accessToken="tok"
@@ -163,9 +161,12 @@ describe("MCPServerSelector all-proxy-mcpservers option", () => {
         value={{ servers: [ALL_PROXY_MCP_SERVERS_SENTINEL], accessGroups: [] }}
       />,
     );
-    const option = optionByValue(ALL_PROXY_MCP_SERVERS_SENTINEL);
-    expect(option).toBeDefined();
-    expect(option?.textContent).toContain("All Proxy MCP Servers");
-    expect(optionByValue("srv-1")?.disabled).toBe(true);
+
+    expect(screen.getByLabelText("All Proxy MCP Servers")).toBeInTheDocument();
+    expect(screen.queryByText(ALL_PROXY_MCP_SERVERS_SENTINEL)).not.toBeInTheDocument();
+
+    await openSelector(user);
+
+    expect(optionByLabel("Server One")).toHaveAttribute("aria-disabled", "true");
   });
 });
diff --git a/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx b/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx
index f31f60d2084..969db57462f 100644
--- a/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_server_management/MCPServerSelector.tsx
@@ -1,7 +1,7 @@
 import { useMCPAccessGroups } from "@/app/(dashboard)/hooks/mcpServers/useMCPAccessGroups";
 import { useMCPServers } from "@/app/(dashboard)/hooks/mcpServers/useMCPServers";
 import { useMCPToolsets } from "@/app/(dashboard)/hooks/mcpServers/useMCPToolsets";
-import { Select } from "antd";
+import { MultiSelect, type MultiSelectOption } from "@/components/shared/MultiSelect";
 import React from "react";
 import { ALL_PROXY_MCP_SERVERS_SENTINEL, NO_MCP_SERVERS_SENTINEL } from "@/components/mcp_tools/constants";
 
@@ -42,39 +42,25 @@ const MCPServerSelector: React.FC<MCPServerSelectorProps> = ({
 
   const accessGroupSet = new Set(accessGroups);
 
-  // Combine options: access groups (green) + servers (blue) + toolsets (purple)
+  // Combine options: access groups + servers + toolsets
   const options = [
     ...accessGroups.map((group) => ({
       label: group,
       value: group,
-      type: "accessGroup" as const,
-      searchText: `${group} Access Group`,
+      description: "Access Group",
     })),
     ...mcpServers.map((server) => ({
       label: `${server.server_name || server.server_id} (${server.server_id})`,
       value: server.server_id,
-      type: "server" as const,
-      searchText: `${server.server_name || server.server_id} ${server.server_id} MCP Server`,
+      description: "MCP Server",
     })),
     ...toolsets.map((toolset) => ({
       label: toolset.toolset_name,
       value: `${TOOLSET_PREFIX}${toolset.toolset_id}`,
-      type: "toolset" as const,
-      searchText: `${toolset.toolset_name} ${toolset.toolset_id} Toolset`,
+      description: "Toolset",
     })),
   ];
 
-  const colorByType: Record<string, string> = {
-    accessGroup: "#52c41a",
-    server: "#1890ff",
-    toolset: "#722ed1",
-  };
-  const labelByType: Record<string, string> = {
-    accessGroup: "Access Group",
-    server: "MCP Server",
-    toolset: "Toolset",
-  };
-
   // Flatten value for Select — prefix toolset IDs
   const selectedValues = [
     ...(value?.servers || []),
@@ -105,76 +91,31 @@ const MCPServerSelector: React.FC<MCPServerSelectorProps> = ({
     onChange({ servers, accessGroups: accessGroupsSelected, toolsets: toolsetsSelected });
   };
 
+  const selectOptions: MultiSelectOption[] = [
+    ...(allowAllProxyMcpServers || hasAllProxyMcpServersSelected
+      ? [{ label: "All Proxy MCP Servers", value: ALL_PROXY_MCP_SERVERS_SENTINEL }]
+      : []),
+    ...(allowNoMcpServers
+      ? [{ label: "No MCP Servers", value: NO_MCP_SERVERS_SENTINEL, description: "Block all" }]
+      : []),
+    ...options.map((opt) => ({
+      ...opt,
+      disabled: hasNoMcpServersSelected || hasAllProxyMcpServersSelected,
+    })),
+  ];
+
   return (
     <div>
-      <Select
-        mode="multiple"
-        placeholder={placeholder}
-        onChange={handleChange}
+      <MultiSelect
+        options={selectOptions}
         value={selectedValues}
+        onValueChange={handleChange}
+        placeholder={placeholder}
+        emptyText="No MCP servers found"
         loading={loading}
-        className={className}
-        allowClear
-        showSearch
-        style={{ width: "100%" }}
         disabled={disabled}
-        filterOption={(input, option) => {
-          if (option?.value === NO_MCP_SERVERS_SENTINEL) return true;
-          if (option?.value === ALL_PROXY_MCP_SERVERS_SENTINEL) return true;
-          const searchText = options.find((opt) => opt.value === option?.value)?.searchText || "";
-          return searchText.toLowerCase().includes(input.toLowerCase());
-        }}
-      >
-        {(allowAllProxyMcpServers || hasAllProxyMcpServersSelected) && (
-          <Select.Option
-            key={ALL_PROXY_MCP_SERVERS_SENTINEL}
-            value={ALL_PROXY_MCP_SERVERS_SENTINEL}
-            label="All Proxy MCP Servers"
-          >
-            <span style={{ color: "#1890ff", fontWeight: 500 }}>All Proxy MCP Servers</span>
-          </Select.Option>
-        )}
-        {allowNoMcpServers && (
-          <Select.Option key={NO_MCP_SERVERS_SENTINEL} value={NO_MCP_SERVERS_SENTINEL} label="No MCP Servers">
-            <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-              <span style={{ flex: 1 }}>No MCP Servers</span>
-              <span style={{ color: "#8c8c8c", fontSize: "12px", fontWeight: 500, opacity: 0.8 }}>Block all</span>
-            </div>
-          </Select.Option>
-        )}
-        {options.map((opt) => (
-          <Select.Option
-            key={opt.value}
-            value={opt.value}
-            label={opt.label}
-            disabled={hasNoMcpServersSelected || hasAllProxyMcpServersSelected}
-          >
-            <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-              <span
-                style={{
-                  display: "inline-block",
-                  width: 8,
-                  height: 8,
-                  borderRadius: "50%",
-                  background: colorByType[opt.type],
-                  flexShrink: 0,
-                }}
-              />
-              <span style={{ flex: 1 }}>{opt.label}</span>
-              <span
-                style={{
-                  color: colorByType[opt.type],
-                  fontSize: "12px",
-                  fontWeight: 500,
-                  opacity: 0.8,
-                }}
-              >
-                {labelByType[opt.type]}
-              </span>
-            </div>
-          </Select.Option>
-        ))}
-      </Select>
+        className={`w-full ${className ?? ""}`}
+      />
     </div>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx b/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
index 9fe306de0e8..f21af04d5d5 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/ByokCredentialModal.tsx
@@ -1,20 +1,13 @@
 "use client";
 
 import React, { useState } from "react";
-import { Modal, Input, Switch } from "antd";
+import { Input, Switch } from "antd";
 import { toast } from "@/lib/toast";
 import { fetchClient } from "@/lib/http/api";
 import { ApiError } from "@/lib/http/client";
-import {
-  KeyOutlined,
-  LockOutlined,
-  CheckOutlined,
-  ArrowRightOutlined,
-  ArrowLeftOutlined,
-  CloseOutlined,
-  LinkOutlined,
-} from "@ant-design/icons";
+import { ArrowLeft, ArrowRight, Check, Key, Link2, Lock, X } from "lucide-react";
 import { MCPServer } from "./types";
+import { Dialog, DialogContent } from "@/components/ui/dialog";
 
 const byokSaveErrorMessage = (e: unknown): string => {
   if (e instanceof ApiError) {
@@ -70,159 +63,166 @@ export const ByokCredentialModal: React.FC<ByokCredentialModalProps> = ({ server
   };
 
   return (
-    <Modal open={open} onCancel={handleClose} footer={null} width={480} closeIcon={null} className="byok-modal">
-      <div className="relative p-2">
-        {/* Step dots + close */}
-        <div className="flex items-center justify-between mb-6">
-          {step === 2 ? (
-            <button
-              onClick={() => setStep(1)}
-              className="flex items-center gap-1 text-gray-500 hover:text-gray-800 text-sm"
-            >
-              <ArrowLeftOutlined /> Back
-            </button>
-          ) : (
-            <div />
-          )}
-          <div className="flex items-center gap-1.5">
-            <div className={`w-2 h-2 rounded-full ${step === 1 ? "bg-blue-500" : "bg-gray-300"}`} />
-            <div className={`w-2 h-2 rounded-full ${step === 2 ? "bg-blue-500" : "bg-gray-300"}`} />
-          </div>
-          <button onClick={handleClose} className="text-gray-400 hover:text-gray-600">
-            <CloseOutlined />
-          </button>
-        </div>
-
-        {step === 1 ? (
-          <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-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-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>
-
-            <h2 className="text-2xl font-bold text-gray-900 mb-2">Connect {serverDisplayName}</h2>
-            <p className="text-gray-500 mb-6">LiteLLM needs access to {serverDisplayName} to complete your request.</p>
-
-            {/* How it works */}
-            <div className="bg-gray-50 rounded-xl p-4 text-left mb-4">
-              <div className="flex items-start gap-3">
-                <div className="mt-0.5">
-                  <svg width="20" height="20" viewBox="0 0 24 24" fill="none" className="text-gray-500">
-                    <rect x="2" y="4" width="20" height="16" rx="2" stroke="currentColor" strokeWidth="2" />
-                    <path d="M8 4v16M16 4v16" stroke="currentColor" strokeWidth="2" />
-                  </svg>
-                </div>
-                <div>
-                  <p className="font-semibold text-gray-800 mb-1">How it works</p>
-                  <p className="text-gray-500 text-sm">
-                    LiteLLM acts as a secure bridge. Your requests are routed through our MCP client directly to{" "}
-                    {serverDisplayName}&apos;s API.
-                  </p>
-                </div>
-              </div>
-            </div>
-
-            {/* Requested access */}
-            {server.byok_description && server.byok_description.length > 0 && (
-              <div className="bg-gray-50 rounded-xl p-4 text-left mb-6">
-                <p className="text-xs font-semibold text-gray-500 uppercase tracking-widest mb-3 flex items-center gap-2">
-                  <svg width="14" height="14" viewBox="0 0 24 24" fill="none" className="text-green-500">
-                    <path d="M12 2L12 22M2 12L22 12" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
-                    <circle cx="12" cy="12" r="9" stroke="currentColor" strokeWidth="2" />
-                  </svg>
-                  Requested Access
-                </p>
-                <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 shrink-0" />
-                      {item}
-                    </li>
-                  ))}
-                </ul>
-              </div>
+    <Dialog open={open} onOpenChange={(open) => !open && handleClose()}>
+      <DialogContent
+        className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[480px] byok-modal"
+        showCloseButton={false}
+      >
+        <div className="relative p-2">
+          {/* Step dots + close */}
+          <div className="flex items-center justify-between mb-6">
+            {step === 2 ? (
+              <button
+                onClick={() => setStep(1)}
+                className="flex items-center gap-1 text-gray-500 hover:text-gray-800 text-sm"
+              >
+                <ArrowLeft className="size-3.5" /> Back
+              </button>
+            ) : (
+              <div />
             )}
-
-            <button
-              onClick={() => setStep(2)}
-              className="w-full bg-gray-900 hover:bg-gray-700 text-white font-medium py-3 px-6 rounded-xl flex items-center justify-center gap-2 transition-colors"
-            >
-              Continue to Authentication <ArrowRightOutlined />
-            </button>
-            <button onClick={handleClose} className="mt-3 w-full text-gray-400 hover:text-gray-600 text-sm py-2">
-              Cancel
+            <div className="flex items-center gap-1.5">
+              <div className={`w-2 h-2 rounded-full ${step === 1 ? "bg-blue-500" : "bg-gray-300"}`} />
+              <div className={`w-2 h-2 rounded-full ${step === 2 ? "bg-blue-500" : "bg-gray-300"}`} />
+            </div>
+            <button onClick={handleClose} className="text-gray-400 hover:text-gray-600">
+              <X className="size-4" />
             </button>
           </div>
-        ) : (
-          <div>
-            {/* Key icon */}
-            <div className="w-12 h-12 rounded-full bg-blue-50 flex items-center justify-center mb-4">
-              <KeyOutlined className="text-blue-400 text-xl" />
-            </div>
 
-            <h2 className="text-2xl font-bold text-gray-900 mb-2">Provide API Key</h2>
-            <p className="text-gray-500 mb-6">Enter your {serverDisplayName} API key to authorize this connection.</p>
-
-            <div className="mb-4">
-              <label className="block text-sm font-semibold text-gray-800 mb-2">{serverDisplayName} API Key</label>
-              <Input.Password
-                placeholder="Enter your API key"
-                value={apiKey}
-                onChange={(e) => setApiKey(e.target.value)}
-                size="large"
-                className="rounded-lg"
-              />
-              {server.byok_api_key_help_url && (
-                <a
-                  href={server.byok_api_key_help_url}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="text-blue-500 hover:text-blue-700 text-sm mt-2 flex items-center gap-1"
-                >
-                  Where do I find my API key? <LinkOutlined />
-                </a>
-              )}
-            </div>
-
-            {/* Save toggle */}
-            <div className="bg-gray-50 rounded-xl p-4 flex items-center justify-between mb-4">
-              <div className="flex items-center gap-3">
-                <svg width="20" height="20" viewBox="0 0 24 24" fill="none" className="text-gray-500">
-                  <path
-                    d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"
-                    fill="currentColor"
-                  />
-                </svg>
-                <span className="text-sm font-medium text-gray-800">Save key for future use</span>
+          {step === 1 ? (
+            <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-linear-to-br from-teal-400 to-cyan-600 flex items-center justify-center text-white font-bold text-xl shadow-sm">
+                  L
+                </div>
+                <ArrowRight className="size-4.5 text-gray-400" />
+                <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>
-              <Switch checked={saveKey} onChange={setSaveKey} />
-            </div>
 
-            {/* 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 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.
+              <h2 className="text-2xl font-bold text-gray-900 mb-2">Connect {serverDisplayName}</h2>
+              <p className="text-gray-500 mb-6">
+                LiteLLM needs access to {serverDisplayName} to complete your request.
               </p>
-            </div>
 
-            <button
-              onClick={handleAuthorize}
-              disabled={loading}
-              className="w-full bg-blue-500 hover:bg-blue-600 disabled:opacity-60 text-white font-medium py-3 px-6 rounded-xl flex items-center justify-center gap-2 transition-colors"
-            >
-              <LockOutlined /> Connect &amp; Authorize
-            </button>
-          </div>
-        )}
-      </div>
-    </Modal>
+              {/* How it works */}
+              <div className="bg-gray-50 rounded-xl p-4 text-left mb-4">
+                <div className="flex items-start gap-3">
+                  <div className="mt-0.5">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="none" className="text-gray-500">
+                      <rect x="2" y="4" width="20" height="16" rx="2" stroke="currentColor" strokeWidth="2" />
+                      <path d="M8 4v16M16 4v16" stroke="currentColor" strokeWidth="2" />
+                    </svg>
+                  </div>
+                  <div>
+                    <p className="font-semibold text-gray-800 mb-1">How it works</p>
+                    <p className="text-gray-500 text-sm">
+                      LiteLLM acts as a secure bridge. Your requests are routed through our MCP client directly to{" "}
+                      {serverDisplayName}&apos;s API.
+                    </p>
+                  </div>
+                </div>
+              </div>
+
+              {/* Requested access */}
+              {server.byok_description && server.byok_description.length > 0 && (
+                <div className="bg-gray-50 rounded-xl p-4 text-left mb-6">
+                  <p className="text-xs font-semibold text-gray-500 uppercase tracking-widest mb-3 flex items-center gap-2">
+                    <svg width="14" height="14" viewBox="0 0 24 24" fill="none" className="text-green-500">
+                      <path d="M12 2L12 22M2 12L22 12" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
+                      <circle cx="12" cy="12" r="9" stroke="currentColor" strokeWidth="2" />
+                    </svg>
+                    Requested Access
+                  </p>
+                  <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">
+                        <Check className="size-3.5 shrink-0 text-green-500" />
+                        {item}
+                      </li>
+                    ))}
+                  </ul>
+                </div>
+              )}
+
+              <button
+                onClick={() => setStep(2)}
+                className="w-full bg-gray-900 hover:bg-gray-700 text-white font-medium py-3 px-6 rounded-xl flex items-center justify-center gap-2 transition-colors"
+              >
+                Continue to Authentication <ArrowRight className="size-4" />
+              </button>
+              <button onClick={handleClose} className="mt-3 w-full text-gray-400 hover:text-gray-600 text-sm py-2">
+                Cancel
+              </button>
+            </div>
+          ) : (
+            <div>
+              {/* Key icon */}
+              <div className="w-12 h-12 rounded-full bg-blue-50 flex items-center justify-center mb-4">
+                <Key className="size-5 text-blue-400" />
+              </div>
+
+              <h2 className="text-2xl font-bold text-gray-900 mb-2">Provide API Key</h2>
+              <p className="text-gray-500 mb-6">Enter your {serverDisplayName} API key to authorize this connection.</p>
+
+              <div className="mb-4">
+                <label className="block text-sm font-semibold text-gray-800 mb-2">{serverDisplayName} API Key</label>
+                <Input.Password
+                  placeholder="Enter your API key"
+                  value={apiKey}
+                  onChange={(e) => setApiKey(e.target.value)}
+                  size="large"
+                  className="rounded-lg"
+                />
+                {server.byok_api_key_help_url && (
+                  <a
+                    href={server.byok_api_key_help_url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-blue-500 hover:text-blue-700 text-sm mt-2 flex items-center gap-1"
+                  >
+                    Where do I find my API key? <Link2 className="size-3.5" />
+                  </a>
+                )}
+              </div>
+
+              {/* Save toggle */}
+              <div className="bg-gray-50 rounded-xl p-4 flex items-center justify-between mb-4">
+                <div className="flex items-center gap-3">
+                  <svg width="20" height="20" viewBox="0 0 24 24" fill="none" className="text-gray-500">
+                    <path
+                      d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                  <span className="text-sm font-medium text-gray-800">Save key for future use</span>
+                </div>
+                <Switch checked={saveKey} onChange={setSaveKey} />
+              </div>
+
+              {/* Security note */}
+              <div className="bg-blue-50 rounded-xl p-4 flex items-start gap-3 mb-6">
+                <Lock className="mt-0.5 size-4 shrink-0 text-blue-400" />
+                <p className="text-sm text-blue-700">
+                  Your key is stored securely and transmitted over HTTPS. It is never shared with third parties.
+                </p>
+              </div>
+
+              <button
+                onClick={handleAuthorize}
+                disabled={loading}
+                className="w-full bg-blue-500 hover:bg-blue-600 disabled:opacity-60 text-white font-medium py-3 px-6 rounded-xl flex items-center justify-center gap-2 transition-colors"
+              >
+                <Lock className="size-4" /> Connect &amp; Authorize
+              </button>
+            </div>
+          )}
+        </div>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/MCPToolArgumentsForm.tsx b/ui/litellm-dashboard/src/components/mcp_tools/MCPToolArgumentsForm.tsx
index 2e8402f52eb..f0b211aecb3 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/MCPToolArgumentsForm.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/MCPToolArgumentsForm.tsx
@@ -1,10 +1,10 @@
 import React, { forwardRef, useImperativeHandle, useMemo } from "react";
-import { Select } from "antd";
 import { CircleHelp } from "lucide-react";
 import { useForm, type Resolver } from "react-hook-form";
 import { FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Input } from "@/components/ui/input";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { MCPTool, InputSchema, InputSchemaProperty } from "./types";
@@ -13,6 +13,11 @@ type ToolFormValues = Record<string, unknown>;
 
 const STRING_SCHEMA_MESSAGES: Readonly<Record<string, string>> = { input: "Please enter input for this tool" };
 
+const BOOLEAN_ITEMS = [
+  { value: true, label: "True" },
+  { value: false, label: "False" },
+];
+
 const isBlank = (value: unknown): boolean => value === undefined || value === null || value === "";
 
 const jsonErrorFor = (prop: InputSchemaProperty, value: unknown): string | null => {
@@ -325,33 +330,43 @@ const MCPToolArgumentsForm = forwardRef<MCPToolArgumentsFormRef, MCPToolArgument
                   {(field) => {
                     if (prop.type === "string" && prop.enum) {
                       return (
-                        <Select
-                          id={field.id}
-                          value={field.value as string | undefined}
-                          onChange={field.onChange}
-                          onBlur={field.onBlur}
-                          placeholder={`Select ${key}`}
-                          allowClear={!required}
-                          options={prop.enum.map((v) => ({ value: v, label: v }))}
-                          className="w-full"
-                        />
+                        <Select value={field.value ?? ""} onValueChange={field.onChange}>
+                          <SelectTrigger
+                            id={field.id}
+                            onBlur={field.onBlur}
+                            aria-invalid={field["aria-invalid"]}
+                            className="w-full"
+                          >
+                            <SelectValue placeholder={`Select ${key}`} />
+                          </SelectTrigger>
+                          <SelectContent>
+                            {!required && <SelectItem value="">Select {key}</SelectItem>}
+                            {prop.enum.map((v) => (
+                              <SelectItem key={v} value={v}>
+                                {v}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
+                        </Select>
                       );
                     }
                     if (prop.type === "boolean") {
                       return (
-                        <Select
-                          id={field.id}
-                          value={field.value as boolean | undefined}
-                          onChange={field.onChange}
-                          onBlur={field.onBlur}
-                          placeholder={`Select ${key}`}
-                          allowClear={!required}
-                          options={[
-                            { value: true, label: "True" },
-                            { value: false, label: "False" },
-                          ]}
-                          className="w-full"
-                        />
+                        <Select items={BOOLEAN_ITEMS} value={field.value ?? ""} onValueChange={field.onChange}>
+                          <SelectTrigger
+                            id={field.id}
+                            onBlur={field.onBlur}
+                            aria-invalid={field["aria-invalid"]}
+                            className="w-full"
+                          >
+                            <SelectValue placeholder={`Select ${key}`} />
+                          </SelectTrigger>
+                          <SelectContent>
+                            {!required && <SelectItem value="">Select {key}</SelectItem>}
+                            <SelectItem value={true}>True</SelectItem>
+                            <SelectItem value={false}>False</SelectItem>
+                          </SelectContent>
+                        </Select>
                       );
                     }
                     if (prop.type === "number" || prop.type === "integer") {
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/types.tsx b/ui/litellm-dashboard/src/components/mcp_tools/types.tsx
index 8d0d6dd0b89..67e51ab23aa 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/types.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/types.tsx
@@ -46,6 +46,20 @@ export const AUTH_TYPE = {
   OAUTH_DELEGATE: "oauth_delegate",
 };
 
+export const AUTH_TYPE_ITEMS = [
+  { value: AUTH_TYPE.NONE, label: "None" },
+  { value: AUTH_TYPE.API_KEY, label: "API Key" },
+  { value: AUTH_TYPE.BEARER_TOKEN, label: "Bearer Token" },
+  { value: AUTH_TYPE.TOKEN, label: "Token" },
+  { value: AUTH_TYPE.BASIC, label: "Basic Auth" },
+  { value: AUTH_TYPE.OAUTH2, label: "OAuth" },
+  { value: AUTH_TYPE.OAUTH2_TOKEN_EXCHANGE, label: "OAuth Token Exchange (OBO)" },
+  { value: AUTH_TYPE.OAUTH2_ID_JAG, label: "ID-JAG (Okta Cross App Access)" },
+  { value: AUTH_TYPE.AWS_SIGV4, label: "AWS SigV4 (Bedrock AgentCore MCPs)" },
+  { value: AUTH_TYPE.TRUE_PASSTHROUGH, label: "True Passthrough (no LiteLLM auth)" },
+  { value: AUTH_TYPE.OAUTH_DELEGATE, label: "OAuth Delegate (client-supplied upstream token)" },
+];
+
 // The two client-forwarded token modes: the caller supplies the upstream Authorization (forwarded
 // verbatim for true_passthrough, alongside LiteLLM admission for oauth_delegate). The dashboard holds
 // their token in sessionStorage instead of persisting it, and the browser-authorize temp payload keeps
@@ -250,6 +264,13 @@ export const TRANSPORT = {
   OPENAPI: "openapi",
 };
 
+export const TRANSPORT_ITEMS = [
+  { value: TRANSPORT.HTTP, label: "Streamable HTTP (Recommended)" },
+  { value: TRANSPORT.SSE, label: "Server-Sent Events (SSE)" },
+  { value: TRANSPORT.STDIO, label: "Standard Input/Output (stdio)" },
+  { value: TRANSPORT.OPENAPI, label: "OpenAPI Spec" },
+];
+
 export const handleTransport = (transport?: string | null, specPath?: string | null): string => {
   if (transport === null || transport === undefined) {
     return TRANSPORT.SSE;
@@ -273,13 +294,15 @@ export const handleAuth = (authType?: string | null): string => {
 
 // Define the structure for tool input schema properties
 export interface InputSchemaProperty {
-  type: string;
+  type?: string;
   description?: string;
   properties?: Record<string, InputSchemaProperty>; // For nested object properties
   required?: string[]; // For required fields in nested objects
   enum?: string[]; // For enum values
   default?: any; // For default values
   items?: InputSchemaProperty | InputSchemaProperty[]; // For array item schemas
+  anyOf?: InputSchemaProperty[];
+  oneOf?: InputSchemaProperty[];
 }
 
 // Define the structure for the input schema of a tool
diff --git a/ui/litellm-dashboard/src/components/model_add/CredentialModal.test.tsx b/ui/litellm-dashboard/src/components/model_add/CredentialModal.test.tsx
index c8140765479..8d94ae0d213 100644
--- a/ui/litellm-dashboard/src/components/model_add/CredentialModal.test.tsx
+++ b/ui/litellm-dashboard/src/components/model_add/CredentialModal.test.tsx
@@ -58,11 +58,6 @@ const createQueryClient = () =>
     },
   });
 
-const mockUploadProps = {
-  beforeUpload: vi.fn(),
-  onChange: vi.fn(),
-};
-
 const mockCredential: CredentialItem = {
   credential_name: "test-credential",
   credential_values: {
@@ -77,14 +72,7 @@ const mockCredential: CredentialItem = {
 const renderModal = (props: Partial<React.ComponentProps<typeof CredentialModal>> = {}) =>
   render(
     <QueryClientProvider client={createQueryClient()}>
-      <CredentialModal
-        open={true}
-        mode="add"
-        onCancel={vi.fn()}
-        onSubmit={vi.fn()}
-        uploadProps={mockUploadProps}
-        {...props}
-      />
+      <CredentialModal open={true} mode="add" onCancel={vi.fn()} onSubmit={vi.fn()} {...props} />
     </QueryClientProvider>,
   );
 
diff --git a/ui/litellm-dashboard/src/components/model_add/CredentialModal.tsx b/ui/litellm-dashboard/src/components/model_add/CredentialModal.tsx
index bf660e65e4e..0fba7c1cd9f 100644
--- a/ui/litellm-dashboard/src/components/model_add/CredentialModal.tsx
+++ b/ui/litellm-dashboard/src/components/model_add/CredentialModal.tsx
@@ -1,7 +1,6 @@
 import { Input } from "@/components/ui/input";
-import { Select as AntdSelect, Modal, Tooltip, Typography } from "antd";
+import { Select as AntdSelect, Tooltip, Typography } from "antd";
 import { Button } from "@/components/ui/button";
-import type { UploadProps } from "antd/es/upload";
 import { useState } from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import ProviderSpecificFields from "../add_model/provider_specific_fields";
@@ -18,6 +17,7 @@ import { CredentialItem } from "../networking";
 import { Providers } from "../provider_info_helpers";
 import { Logo } from "@/components/molecules/logo/Logo";
 import { resetCredentialFormOnProviderChange } from "./credential_form_helpers";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const { Link } = Typography;
 
@@ -25,7 +25,6 @@ interface CredentialModalProps {
   open: boolean;
   onCancel: () => void;
   onSubmit: (values: any) => void;
-  uploadProps: UploadProps;
   mode: "add" | "edit";
   existingCredential?: CredentialItem | null;
 }
@@ -34,7 +33,6 @@ export default function CredentialModal({
   open,
   onCancel,
   onSubmit,
-  uploadProps,
   mode,
   existingCredential = null,
 }: CredentialModalProps) {
@@ -84,88 +82,86 @@ export default function CredentialModal({
   };
 
   return (
-    <Modal
-      title={isEdit ? "Edit Credential" : "Add New Credential"}
-      open={open}
-      onCancel={closeAndReset}
-      footer={null}
-      width={600}
-      destroyOnHidden={isEdit}
-    >
-      <FormProvider {...form}>
-        <MountedFormProvider value={{ control: form.control, registry }}>
-          <form
-            onSubmit={(event) => {
-              event.preventDefault();
-              void handleSubmit();
-            }}
-          >
-            <MountedFormField
-              label="Credential Name:"
-              name="credential_name"
-              required
-              rules={{ validate: { required: antdRequired("Credential name is required") } }}
-              className="mb-4"
+    <Dialog open={open} onOpenChange={(open) => !open && closeAndReset()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
+        <DialogHeader>
+          <DialogTitle>{isEdit ? "Edit Credential" : "Add New Credential"}</DialogTitle>
+        </DialogHeader>
+        <FormProvider {...form}>
+          <MountedFormProvider value={{ control: form.control, registry }}>
+            <form
+              onSubmit={(event) => {
+                event.preventDefault();
+                void handleSubmit();
+              }}
             >
-              {(control) => (
-                <Input
-                  id={control.id}
-                  value={(control.value as string | undefined) ?? ""}
-                  onChange={control.onChange}
-                  onBlur={control.onBlur}
-                  placeholder="Enter a friendly name for these credentials"
-                  disabled={isEdit}
-                />
-              )}
-            </MountedFormField>
+              <MountedFormField
+                label="Credential Name:"
+                name="credential_name"
+                required
+                rules={{ validate: { required: antdRequired("Credential name is required") } }}
+                className="mb-4"
+              >
+                {(control) => (
+                  <Input
+                    id={control.id}
+                    value={(control.value as string | undefined) ?? ""}
+                    onChange={control.onChange}
+                    onBlur={control.onBlur}
+                    placeholder="Enter a friendly name for these credentials"
+                    disabled={isEdit}
+                  />
+                )}
+              </MountedFormField>
 
-            <MountedFormField
-              label={labelWithHint("Provider:", "Helper to auto-populate provider specific fields")}
-              name="custom_llm_provider"
-              required
-              rules={{ validate: { required: antdRequired("Required") } }}
-              className="mb-4"
-            >
-              {(control) => (
-                <AntdSelect
-                  id={control.id}
-                  showSearch
-                  value={control.value as string | undefined}
-                  onBlur={control.onBlur}
-                  onChange={(value) => {
-                    control.onChange(value);
-                    resetCredentialFormOnProviderChange(formAdapter, value as Providers, setSelectedProvider);
-                  }}
-                >
-                  {Object.entries(Providers).map(([providerEnum, providerDisplayName]) => (
-                    <AntdSelect.Option key={providerEnum} value={providerEnum}>
-                      <div className="flex items-center space-x-2">
-                        <Logo provider={providerEnum} label={providerDisplayName} className="w-5 h-5" />
-                        <span>{providerDisplayName}</span>
-                      </div>
-                    </AntdSelect.Option>
-                  ))}
-                </AntdSelect>
-              )}
-            </MountedFormField>
+              <MountedFormField
+                label={labelWithHint("Provider:", "Helper to auto-populate provider specific fields")}
+                name="custom_llm_provider"
+                required
+                rules={{ validate: { required: antdRequired("Required") } }}
+                className="mb-4"
+              >
+                {(control) => (
+                  <AntdSelect
+                    id={control.id}
+                    showSearch
+                    value={control.value as string | undefined}
+                    onBlur={control.onBlur}
+                    onChange={(value) => {
+                      control.onChange(value);
+                      resetCredentialFormOnProviderChange(formAdapter, value as Providers, setSelectedProvider);
+                    }}
+                  >
+                    {Object.entries(Providers).map(([providerEnum, providerDisplayName]) => (
+                      <AntdSelect.Option key={providerEnum} value={providerEnum}>
+                        <div className="flex items-center space-x-2">
+                          <Logo provider={providerEnum} label={providerDisplayName} className="w-5 h-5" />
+                          <span>{providerDisplayName}</span>
+                        </div>
+                      </AntdSelect.Option>
+                    ))}
+                  </AntdSelect>
+                )}
+              </MountedFormField>
 
-            <ProviderSpecificFields selectedProvider={selectedProvider} uploadProps={uploadProps} />
+              <ProviderSpecificFields selectedProvider={selectedProvider} />
 
-            <div className="flex justify-between items-center">
-              <Tooltip title="Get help on our github">
-                <Link href="https://github.com/BerriAI/litellm/issues">Need Help?</Link>
-              </Tooltip>
+              <div className="flex justify-between items-center">
+                <Tooltip title="Get help on our github">
+                  <Link href="https://github.com/BerriAI/litellm/issues">Need Help?</Link>
+                </Tooltip>
 
-              <div>
-                <Button variant="outline" className="mr-2.5" onClick={closeAndReset}>
-                  Cancel
-                </Button>
-                <Button type="submit">{isEdit ? "Update Credential" : "Add Credential"}</Button>
+                <div>
+                  <Button variant="outline" className="mr-2.5" onClick={closeAndReset}>
+                    Cancel
+                  </Button>
+                  <Button type="submit">{isEdit ? "Update Credential" : "Add Credential"}</Button>
+                </div>
               </div>
-            </div>
-          </form>
-        </MountedFormProvider>
-      </FormProvider>
-    </Modal>
+            </form>
+          </MountedFormProvider>
+        </FormProvider>
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.test.tsx b/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.test.tsx
index 8121f7c230f..92885262dca 100644
--- a/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.test.tsx
+++ b/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.test.tsx
@@ -1,7 +1,6 @@
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import type { ComponentProps } from "react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { CredentialItem, credentialCreateCall, credentialUpdateCall } from "@/components/networking";
@@ -9,8 +8,6 @@ import { toast } from "@/lib/toast";
 
 import CredentialsPanel from "./CredentialsPanel";
 
-const DEFAULT_UPLOAD_PROPS = {} as ComponentProps<typeof CredentialsPanel>["uploadProps"];
-
 const mockUseAuthorized = vi.fn();
 const mockUseCredentials = vi.fn();
 
@@ -85,7 +82,7 @@ const createQueryClient = () =>
 const renderPanel = () =>
   render(
     <QueryClientProvider client={createQueryClient()}>
-      <CredentialsPanel uploadProps={DEFAULT_UPLOAD_PROPS} />
+      <CredentialsPanel />
     </QueryClientProvider>,
   );
 
diff --git a/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.tsx b/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.tsx
index bccf546e7e4..80a8216dbaf 100644
--- a/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.tsx
+++ b/ui/litellm-dashboard/src/components/model_add/CredentialsPanel.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { Plus } from "lucide-react";
-import { type ComponentProps, useState } from "react";
+import { useState } from "react";
 
 import { useCredentials } from "@/app/(dashboard)/hooks/credentials/useCredentials";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
@@ -20,10 +20,6 @@ import { toast } from "@/lib/toast";
 import CredentialModal from "./CredentialModal";
 import CredentialsTable from "./CredentialsTable";
 
-interface CredentialsPanelProps {
-  uploadProps: ComponentProps<typeof CredentialModal>["uploadProps"];
-}
-
 const restrictedFields = ["credential_name", "custom_llm_provider"];
 
 const buildCredential = (values: Record<string, unknown>, credentialValues: Record<string, unknown>) => ({
@@ -37,7 +33,7 @@ const buildCredential = (values: Record<string, unknown>, credentialValues: Reco
 const withoutRestrictedFields = (values: Record<string, unknown>): Record<string, unknown> =>
   Object.fromEntries(Object.entries(values).filter(([key]) => !restrictedFields.includes(key)));
 
-export default function CredentialsPanel({ uploadProps }: CredentialsPanelProps) {
+export default function CredentialsPanel() {
   const { accessToken, userRole } = useAuthorized();
   // Admin Viewer follows the read-parity rule: see credentials, do not modify.
   const canModifyCredentials = isProxyAdminRole(userRole ?? "");
@@ -142,7 +138,6 @@ export default function CredentialsPanel({ uploadProps }: CredentialsPanelProps)
           onSubmit={handleAddCredential}
           open={isAddModalOpen}
           onCancel={() => setIsAddModalOpen(false)}
-          uploadProps={uploadProps}
         />
       )}
       {isUpdateModalOpen && (
@@ -151,7 +146,6 @@ export default function CredentialsPanel({ uploadProps }: CredentialsPanelProps)
           open={isUpdateModalOpen}
           existingCredential={selectedCredential}
           onSubmit={handleUpdateCredential}
-          uploadProps={uploadProps}
           onCancel={() => setIsUpdateModalOpen(false)}
         />
       )}
diff --git a/ui/litellm-dashboard/src/components/model_add/reuse_credentials.tsx b/ui/litellm-dashboard/src/components/model_add/reuse_credentials.tsx
index 0e5c8ebca29..f67413ebee7 100644
--- a/ui/litellm-dashboard/src/components/model_add/reuse_credentials.tsx
+++ b/ui/litellm-dashboard/src/components/model_add/reuse_credentials.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import { Modal } from "antd";
 import { z } from "zod/v4";
 import { Field, FieldGroup, FieldLabel } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -8,6 +7,7 @@ import { Input } from "@/components/ui/input";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { CredentialItem } from "../networking";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface ReuseCredentialsModalProps {
   isVisible: boolean;
@@ -53,55 +53,60 @@ const ReuseCredentialsModal: React.FC<ReuseCredentialsModalProps> = ({
   };
 
   return (
-    <Modal title="Reuse Credentials" open={isVisible} onCancel={handleCancel} footer={null} width={600}>
-      <TooltipProvider>
-        <form onSubmit={form.handleSubmit(handleSubmit)} noValidate>
-          <FieldGroup>
-            <FormField control={form.control} name="credential_name" label="Credential Name:">
-              {({ ref, ...field }) => (
-                <Input {...field} ref={ref} placeholder="Enter a friendly name for these credentials" />
-              )}
-            </FormField>
+    <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[600px]">
+        <DialogHeader>
+          <DialogTitle>Reuse Credentials</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={form.handleSubmit(handleSubmit)} noValidate>
+            <FieldGroup>
+              <FormField control={form.control} name="credential_name" label="Credential Name:">
+                {({ ref, ...field }) => (
+                  <Input {...field} ref={ref} placeholder="Enter a friendly name for these credentials" />
+                )}
+              </FormField>
 
-            {Object.entries(storedValues).map(([key, value]) => (
-              <Field key={key}>
-                <FieldLabel htmlFor={`${fieldIdPrefix}-${key}`}>{key}</FieldLabel>
-                <Input
-                  id={`${fieldIdPrefix}-${key}`}
-                  value={String(value)}
-                  placeholder={`Enter ${key}`}
-                  disabled
-                  readOnly
-                />
-              </Field>
-            ))}
+              {Object.entries(storedValues).map(([key, value]) => (
+                <Field key={key}>
+                  <FieldLabel htmlFor={`${fieldIdPrefix}-${key}`}>{key}</FieldLabel>
+                  <Input
+                    id={`${fieldIdPrefix}-${key}`}
+                    value={String(value)}
+                    placeholder={`Enter ${key}`}
+                    disabled
+                    readOnly
+                  />
+                </Field>
+              ))}
 
-            <div className="flex items-center justify-between">
-              <Tooltip>
-                <TooltipTrigger
-                  render={
-                    <a
-                      href="https://github.com/BerriAI/litellm/issues"
-                      className="text-sm text-primary underline-offset-4 hover:underline"
-                    >
-                      Need Help?
-                    </a>
-                  }
-                />
-                <TooltipContent>Get help on our github</TooltipContent>
-              </Tooltip>
+              <div className="flex items-center justify-between">
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <a
+                        href="https://github.com/BerriAI/litellm/issues"
+                        className="text-sm text-primary underline-offset-4 hover:underline"
+                      >
+                        Need Help?
+                      </a>
+                    }
+                  />
+                  <TooltipContent>Get help on our github</TooltipContent>
+                </Tooltip>
 
-              <div className="flex gap-2.5">
-                <Button type="button" variant="outline" onClick={handleCancel}>
-                  Cancel
-                </Button>
-                <Button type="submit">Reuse Credentials</Button>
+                <div className="flex gap-2.5">
+                  <Button type="button" variant="outline" onClick={handleCancel}>
+                    Cancel
+                  </Button>
+                  <Button type="submit">Reuse Credentials</Button>
+                </div>
               </div>
-            </div>
-          </FieldGroup>
-        </form>
-      </TooltipProvider>
-    </Modal>
+            </FieldGroup>
+          </form>
+        </TooltipProvider>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.test.tsx b/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.test.tsx
index ccf5bb062b2..86b95fbd2bd 100644
--- a/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.test.tsx
+++ b/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.test.tsx
@@ -271,9 +271,7 @@ describe("ModelSettingsModal", () => {
     renderWithProviders(<ModelSettingsModal {...defaultProps} />);
 
     expect(screen.queryByRole("switch")).not.toBeInTheDocument();
-    // eslint-disable-next-line local/no-antd-class-selectors -- antd Skeleton exposes no role, label or aria-busy to query the loading affordance by
-    const skeletons = document.querySelectorAll(".ant-skeleton");
-    expect(skeletons.length).toBeGreaterThan(0);
+    expect(screen.getByRole("status", { name: "Loading model settings" })).toBeInTheDocument();
   });
 
   it("should not call onSuccess when it is not provided", async () => {
diff --git a/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.tsx b/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.tsx
index 400b1c2859d..65f607a897f 100644
--- a/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.tsx
+++ b/ui/litellm-dashboard/src/components/model_dashboard/ModelSettingsModal/ModelSettingsModal.tsx
@@ -8,11 +8,12 @@ import { FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
 import { Switch } from "@/components/ui/switch";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import { Modal, Skeleton, Space, Typography } from "antd";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Button } from "@/components/ui/button";
 import { CircleHelp } from "lucide-react";
 import React, { useEffect, useMemo } from "react";
 import { useForm } from "react-hook-form";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface ModelSettingsModalProps {
   isVisible: boolean;
@@ -81,11 +82,45 @@ const ModelSettingsModal: React.FC<ModelSettingsModalProps> = ({ isVisible, onCa
   };
 
   return (
-    <Modal
-      title={<Typography.Title level={5}>Model Settings</Typography.Title>}
-      open={isVisible}
-      footer={
-        <Space>
+    <Dialog open={isVisible} onOpenChange={(open) => !open && handleCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle className="text-base">Model Settings</DialogTitle>
+        </DialogHeader>
+        <TooltipProvider>
+          <form onSubmit={(event) => event.preventDefault()}>
+            <FieldGroup>
+              <FormField
+                control={form.control}
+                name="store_model_in_db"
+                label={labelWithHint(
+                  "Store Model in DB",
+                  proxyConfigData?.find((f) => f.field_name === "store_model_in_db")?.field_description ||
+                    "If enabled, models and config are stored in and loaded from the database.",
+                )}
+              >
+                {({ id, value, onChange, onBlur }) =>
+                  isLoadingConfig ? (
+                    <Skeleton
+                      role="status"
+                      aria-label="Loading model settings"
+                      className="h-[18.4px] w-8 rounded-full"
+                    />
+                  ) : (
+                    <Switch
+                      id={id}
+                      checked={Boolean(value)}
+                      onCheckedChange={onChange}
+                      onBlur={onBlur}
+                      className="w-fit"
+                    />
+                  )
+                }
+              </FormField>
+            </FieldGroup>
+          </form>
+        </TooltipProvider>
+        <DialogFooter>
           <Button variant="outline" onClick={handleCancel} disabled={isPending || isLoadingConfig}>
             Cancel
           </Button>
@@ -96,40 +131,9 @@ const ModelSettingsModal: React.FC<ModelSettingsModalProps> = ({ isVisible, onCa
           >
             {isPending ? "Saving..." : "Save Settings"}
           </Button>
-        </Space>
-      }
-      onCancel={handleCancel}
-    >
-      <TooltipProvider>
-        <form onSubmit={(event) => event.preventDefault()}>
-          <FieldGroup>
-            <FormField
-              control={form.control}
-              name="store_model_in_db"
-              label={labelWithHint(
-                "Store Model in DB",
-                proxyConfigData?.find((f) => f.field_name === "store_model_in_db")?.field_description ||
-                  "If enabled, models and config are stored in and loaded from the database.",
-              )}
-            >
-              {({ id, value, onChange, onBlur }) =>
-                isLoadingConfig ? (
-                  <Skeleton.Input active block />
-                ) : (
-                  <Switch
-                    id={id}
-                    checked={Boolean(value)}
-                    onCheckedChange={onChange}
-                    onBlur={onBlur}
-                    className="w-fit"
-                  />
-                )
-              }
-            </FormField>
-          </FieldGroup>
-        </form>
-      </TooltipProvider>
-    </Modal>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/model_info_view.test.tsx b/ui/litellm-dashboard/src/components/model_info_view.test.tsx
index 3770c52b97d..742d2593ade 100644
--- a/ui/litellm-dashboard/src/components/model_info_view.test.tsx
+++ b/ui/litellm-dashboard/src/components/model_info_view.test.tsx
@@ -861,10 +861,9 @@ describe("ModelInfoView", () => {
       const user = userEvent.setup();
       await enterPtuEdit(user);
 
-      const to = screen.getAllByPlaceholderText("Select date")[1];
-      await user.clear(to);
-      await user.type(to, "2026-06-01 00:00:00");
-      await user.tab();
+      fireEvent.change(screen.getByLabelText("PTU Effective To (UTC)"), {
+        target: { value: "2026-06-01T00:00:00" },
+      });
 
       await expectBlocked(user, /PTU Effective To must be after PTU Effective From/i);
     });
@@ -907,17 +906,13 @@ describe("ModelInfoView", () => {
       await user.clear(screen.getByPlaceholderText("e.g. 2.00"));
       await user.type(screen.getByPlaceholderText("e.g. 2.00"), "3.5");
 
-      const dates = () => screen.getAllByPlaceholderText("Select date");
-      expect(dates()[0]).toHaveValue("2026-07-01 00:00:00");
-      expect(dates()[1]).toHaveValue("2026-08-01 00:00:00");
+      const from = screen.getByLabelText("PTU Effective From (UTC)");
+      const to = screen.getByLabelText("PTU Effective To (UTC)");
+      expect(from).toHaveValue("2026-07-01T00:00");
+      expect(to).toHaveValue("2026-08-01T00:00");
 
-      const setDate = async (index: number, value: string) => {
-        await user.clear(dates()[index]);
-        await user.type(dates()[index], value);
-        await user.tab();
-      };
-      await setDate(1, "2026-10-03 02:00:00");
-      await setDate(0, "2026-09-02 01:00:00");
+      fireEvent.change(to, { target: { value: "2026-10-03T02:00:00" } });
+      fireEvent.change(from, { target: { value: "2026-09-02T01:00:00" } });
 
       await user.click(screen.getByRole("button", { name: /save changes/i }));
       await waitFor(() => expect(mockModelPatchUpdateCall).toHaveBeenCalled());
diff --git a/ui/litellm-dashboard/src/components/model_info_view.tsx b/ui/litellm-dashboard/src/components/model_info_view.tsx
index ecc99e4437c..407144d1a52 100644
--- a/ui/litellm-dashboard/src/components/model_info_view.tsx
+++ b/ui/litellm-dashboard/src/components/model_info_view.tsx
@@ -2,16 +2,14 @@ import { useModelCostMap } from "@/app/(dashboard)/hooks/models/useModelCostMap"
 import { useModelHub, useModelsInfo } from "@/app/(dashboard)/hooks/models/useModels";
 import { useQueryClient } from "@tanstack/react-query";
 import { transformModelData } from "@/app/(dashboard)/models-and-endpoints/utils/modelDataTransformer";
-import { InfoCircleOutlined } from "@ant-design/icons";
 import { KeyIcon, RefreshIcon, TrashIcon } from "@heroicons/react/outline";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Modal } from "antd";
 import { applyPtuModelInfo } from "../utils/ptuModelInfo";
 import { usePtuCostAttributionEnabled } from "@/app/(dashboard)/hooks/uiSettings/usePtuCostAttributionEnabled";
-import { ArrowLeft, CheckIcon, CopyIcon } from "lucide-react";
+import { ArrowLeft, CheckIcon, CopyIcon, Info } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { copyToClipboard as utilCopyToClipboard } from "../utils/dataUtils";
 import { stripMaskedSecrets } from "../utils/maskedSecretUtils";
@@ -47,6 +45,7 @@ import UpdateModelCredentialsModal from "./update_model_credentials_modal";
 import ModelInfoEditForm, { type ModelEditFormValues, type TouchedPricingField } from "./ModelInfoEditForm";
 import { Tag } from "./tag_management/types";
 import { getDisplayModelName } from "./view_model/model_name_display";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface ModelInfoViewProps {
   modelId: string;
@@ -757,7 +756,7 @@ export default function ModelInfoView({
                     )
                   ) : (
                     <SimpleTooltip content="Only DB models can be edited. You must be an admin or the creator of the model to edit it.">
-                      <InfoCircleOutlined />
+                      <Info className="size-4 text-muted-foreground" />
                     </SimpleTooltip>
                   )}
                 </div>
@@ -833,13 +832,19 @@ export default function ModelInfoView({
           setIsCredentialModalOpen={setIsCredentialModalOpen}
         />
       ) : (
-        <Modal
-          open={isCredentialModalOpen}
-          onCancel={() => setIsCredentialModalOpen(false)}
-          title="Using Existing Credential"
-        >
-          <p className="text-sm">{modelData.litellm_params.litellm_credential_name}</p>
-        </Modal>
+        <Dialog open={isCredentialModalOpen} onOpenChange={(open) => !open && setIsCredentialModalOpen(false)}>
+          <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+            <DialogHeader>
+              <DialogTitle>Using Existing Credential</DialogTitle>
+            </DialogHeader>
+            <p className="text-sm">{modelData.litellm_params.litellm_credential_name}</p>
+            <DialogFooter>
+              <Button variant="outline" onClick={() => setIsCredentialModalOpen(false)}>
+                Cancel
+              </Button>
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
       )}
 
       {isUpdateCredentialsModalOpen && accessToken && (
@@ -864,21 +869,25 @@ export default function ModelInfoView({
         userRole={userRole || ""}
       />
 
-      <Modal
-        title="Connection Test Results"
-        open={isAutoRouterTestModalOpen}
-        onCancel={() => setIsAutoRouterTestModalOpen(false)}
-        footer={[
-          <Button key="close" variant="outline" onClick={() => setIsAutoRouterTestModalOpen(false)}>
-            Close
-          </Button>,
-        ]}
-        width={700}
-      >
-        {isAutoRouterTestModalOpen && accessToken && (
-          <AutoRouterConnectionTest key={autoRouterTestId} accessToken={accessToken} targets={autoRouterTestTargets} />
-        )}
-      </Modal>
+      <Dialog open={isAutoRouterTestModalOpen} onOpenChange={(open) => !open && setIsAutoRouterTestModalOpen(false)}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[700px]">
+          <DialogHeader>
+            <DialogTitle>Connection Test Results</DialogTitle>
+          </DialogHeader>
+          {isAutoRouterTestModalOpen && accessToken && (
+            <AutoRouterConnectionTest
+              key={autoRouterTestId}
+              accessToken={accessToken}
+              targets={autoRouterTestTargets}
+            />
+          )}
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setIsAutoRouterTestModalOpen(false)}>
+              Close
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/onboarding_link.tsx b/ui/litellm-dashboard/src/components/onboarding_link.tsx
index 583a0d25b29..29cb52ce08c 100644
--- a/ui/litellm-dashboard/src/components/onboarding_link.tsx
+++ b/ui/litellm-dashboard/src/components/onboarding_link.tsx
@@ -1,8 +1,9 @@
 import React from "react";
-import { Modal, Typography } from "antd";
+import { Typography } from "antd";
 import { Button } from "@/components/ui/button";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import { toast } from "@/lib/toast";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 export interface InvitationLink {
   id: string;
@@ -59,10 +60,6 @@ export default function OnboardingModal({
   modalType = "invitation",
 }: OnboardingProps) {
   const { Paragraph } = Typography;
-  const handleInvitationOk = () => {
-    setIsInvitationLinkModalVisible(false);
-  };
-
   const handleInvitationCancel = () => {
     setIsInvitationLinkModalVisible(false);
   };
@@ -76,32 +73,30 @@ export default function OnboardingModal({
     });
 
   return (
-    <Modal
-      title={modalType === "invitation" ? "Invitation Link" : "Reset Password Link"}
-      open={isInvitationLinkModalVisible}
-      width={800}
-      footer={null}
-      onOk={handleInvitationOk}
-      onCancel={handleInvitationCancel}
-    >
-      <Paragraph>
-        {modalType === "invitation"
-          ? "Copy and send the generated link to onboard this user to the proxy."
-          : "Copy and send the generated link to the user to reset their password."}
-      </Paragraph>
-      <div className="flex justify-between pt-5 pb-2">
-        <p className="text-base">User ID</p>
-        <p className="text-sm">{invitationLinkData?.user_id}</p>
-      </div>
-      <div className="flex justify-between pt-5 pb-2">
-        <p className="text-sm">{modalType === "invitation" ? "Invitation Link" : "Reset Password Link"}</p>
-        <p className="text-sm">{getInvitationUrl()}</p>
-      </div>
-      <div className="flex justify-end mt-5">
-        <CopyToClipboard text={getInvitationUrl()} onCopy={() => toast.success("Copied!")}>
-          <Button>{modalType === "invitation" ? "Copy invitation link" : "Copy password reset link"}</Button>
-        </CopyToClipboard>
-      </div>
-    </Modal>
+    <Dialog open={isInvitationLinkModalVisible} onOpenChange={(open) => !open && handleInvitationCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+        <DialogHeader>
+          <DialogTitle>{modalType === "invitation" ? "Invitation Link" : "Reset Password Link"}</DialogTitle>
+        </DialogHeader>
+        <Paragraph>
+          {modalType === "invitation"
+            ? "Copy and send the generated link to onboard this user to the proxy."
+            : "Copy and send the generated link to the user to reset their password."}
+        </Paragraph>
+        <div className="flex justify-between pt-5 pb-2">
+          <p className="text-base">User ID</p>
+          <p className="text-sm">{invitationLinkData?.user_id}</p>
+        </div>
+        <div className="flex justify-between pt-5 pb-2">
+          <p className="text-sm">{modalType === "invitation" ? "Invitation Link" : "Reset Password Link"}</p>
+          <p className="text-sm">{getInvitationUrl()}</p>
+        </div>
+        <div className="flex justify-end mt-5">
+          <CopyToClipboard text={getInvitationUrl()} onCopy={() => toast.success("Copied!")}>
+            <Button>{modalType === "invitation" ? "Copy invitation link" : "Copy password reset link"}</Button>
+          </CopyToClipboard>
+        </div>
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx b/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx
index d717c11de86..81d3dcc61a2 100644
--- a/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx
+++ b/ui/litellm-dashboard/src/components/organisms/RegenerateKeyModal.tsx
@@ -1,8 +1,8 @@
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
-import { CheckOutlined, CopyOutlined, SyncOutlined } from "@ant-design/icons";
-import { Alert, Modal, Space } from "antd";
+import { Alert, AlertTitle } from "@/components/shared/Alert";
 import { Button } from "@/components/ui/button";
-import { CircleHelp } from "lucide-react";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Check, CircleHelp, Copy, RefreshCw, TriangleAlert } from "lucide-react";
 import React, { useEffect, useMemo, useState } from "react";
 import { useWatch } from "react-hook-form";
 import { CopyToClipboard } from "react-copy-to-clipboard";
@@ -148,139 +148,139 @@ export function RegenerateKeyModal({ selectedToken, visible, onClose, onKeyUpdat
   };
 
   return (
-    <Modal
-      title="Regenerate Virtual Key"
-      open={visible}
-      onCancel={handleClose}
-      width={520}
-      maskClosable={false}
-      footer={
-        regeneratedKey
-          ? [
-              <Space key="footer-actions">
-                <Button variant="outline" onClick={handleClose}>
-                  Close
-                </Button>
-                <CopyToClipboard text={regeneratedKey} onCopy={handleCopyKey}>
-                  <Button>
-                    {copied ? <CheckOutlined /> : <CopyOutlined />}
-                    {copied ? "Copied" : "Copy Key"}
-                  </Button>
-                </CopyToClipboard>
-              </Space>,
-            ]
-          : [
-              <Space key="footer-actions">
-                <Button variant="outline" onClick={handleClose}>
-                  Cancel
-                </Button>
-                <Button onClick={handleRegenerateKey} disabled={isRegenerating} aria-busy={isRegenerating}>
-                  <SyncOutlined />
-                  Regenerate
-                </Button>
-              </Space>,
-            ]
-      }
-    >
-      {regeneratedKey ? (
-        <div className="flex flex-col gap-4">
-          <Alert type="warning" showIcon message="Save it now, you will not see it again" />
+    <Dialog open={visible} onOpenChange={(open) => !open && handleClose()} disablePointerDismissal>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[520px]">
+        <DialogHeader>
+          <DialogTitle>Regenerate Virtual Key</DialogTitle>
+        </DialogHeader>
+        {regeneratedKey ? (
+          <div className="flex flex-col gap-4">
+            <Alert variant="warning">
+              <TriangleAlert />
+              <AlertTitle>Save it now, you will not see it again</AlertTitle>
+            </Alert>
 
-          <div className="flex flex-col gap-0.5">
-            <span className="text-xs text-muted-foreground">Key Alias</span>
-            <span className="text-sm text-foreground">{selectedToken?.key_alias || "No alias set"}</span>
-          </div>
+            <div className="flex flex-col gap-0.5">
+              <span className="text-xs text-muted-foreground">Key Alias</span>
+              <span className="text-sm text-foreground">{selectedToken?.key_alias || "No alias set"}</span>
+            </div>
 
-          <div className="flex flex-col gap-1.5">
-            <span className="text-xs text-muted-foreground">Virtual Key</span>
-            <div className="rounded-md border border-border bg-muted px-4 py-3.5 font-mono text-base break-all text-foreground">
-              {regeneratedKey}
+            <div className="flex flex-col gap-1.5">
+              <span className="text-xs text-muted-foreground">Virtual Key</span>
+              <div className="rounded-md border border-border bg-muted px-4 py-3.5 font-mono text-base break-all text-foreground">
+                {regeneratedKey}
+              </div>
             </div>
           </div>
-        </div>
-      ) : (
-        <TooltipProvider>
-          <form onSubmit={(event) => event.preventDefault()} noValidate className="mt-1">
-            <FieldGroup>
-              <FormField control={form.control} name="key_alias" label="Key Alias">
-                {({ ref, value, ...field }) => <Input {...field} ref={ref} value={value ?? ""} disabled />}
-              </FormField>
-
-              <div className="grid grid-cols-3 gap-3">
-                <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
-                  {({ ref, value, onChange, ...field }) => (
-                    <Input
-                      {...field}
-                      ref={ref}
-                      type="number"
-                      step={0.01}
-                      value={value ?? ""}
-                      onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-                    />
-                  )}
+        ) : (
+          <TooltipProvider>
+            <form onSubmit={(event) => event.preventDefault()} noValidate className="mt-1">
+              <FieldGroup>
+                <FormField control={form.control} name="key_alias" label="Key Alias">
+                  {({ ref, value, ...field }) => <Input {...field} ref={ref} value={value ?? ""} disabled />}
                 </FormField>
 
-                <FormField control={form.control} name="tpm_limit" label="TPM Limit">
-                  {({ ref, value, onChange, ...field }) => (
-                    <Input
-                      {...field}
-                      ref={ref}
-                      type="number"
-                      value={value ?? ""}
-                      onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-                    />
-                  )}
-                </FormField>
+                <div className="grid grid-cols-3 gap-3">
+                  <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
+                    {({ ref, value, onChange, ...field }) => (
+                      <Input
+                        {...field}
+                        ref={ref}
+                        type="number"
+                        step={0.01}
+                        value={value ?? ""}
+                        onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                      />
+                    )}
+                  </FormField>
 
-                <FormField control={form.control} name="rpm_limit" label="RPM Limit">
-                  {({ ref, value, onChange, ...field }) => (
-                    <Input
-                      {...field}
-                      ref={ref}
-                      type="number"
-                      value={value ?? ""}
-                      onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
-                    />
-                  )}
-                </FormField>
-              </div>
+                  <FormField control={form.control} name="tpm_limit" label="TPM Limit">
+                    {({ ref, value, onChange, ...field }) => (
+                      <Input
+                        {...field}
+                        ref={ref}
+                        type="number"
+                        value={value ?? ""}
+                        onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                      />
+                    )}
+                  </FormField>
 
-              <div className="grid grid-cols-2 gap-3">
-                <FormField
-                  control={form.control}
-                  name="duration"
-                  label="Expire Key"
-                  description={
-                    <span className="flex flex-col gap-0.5 text-xs">
-                      <span className={keyIsExpired ? "text-destructive" : "text-muted-foreground"}>
-                        Current expiry: {selectedToken?.expires ? formatExpiresUtc(selectedToken.expires) : "Never"}
-                        {keyIsExpired && " (expired)"}
+                  <FormField control={form.control} name="rpm_limit" label="RPM Limit">
+                    {({ ref, value, onChange, ...field }) => (
+                      <Input
+                        {...field}
+                        ref={ref}
+                        type="number"
+                        value={value ?? ""}
+                        onChange={(event) => onChange(event.target.value === "" ? null : event.target.valueAsNumber)}
+                      />
+                    )}
+                  </FormField>
+                </div>
+
+                <div className="grid grid-cols-2 gap-3">
+                  <FormField
+                    control={form.control}
+                    name="duration"
+                    label="Expire Key"
+                    description={
+                      <span className="flex flex-col gap-0.5 text-xs">
+                        <span className={keyIsExpired ? "text-destructive" : "text-muted-foreground"}>
+                          Current expiry: {selectedToken?.expires ? formatExpiresUtc(selectedToken.expires) : "Never"}
+                          {keyIsExpired && " (expired)"}
+                        </span>
+                        {newExpiryTime && (
+                          <span className="text-green-600 dark:text-green-400">New expiry: {newExpiryTime}</span>
+                        )}
                       </span>
-                      {newExpiryTime && (
-                        <span className="text-green-600 dark:text-green-400">New expiry: {newExpiryTime}</span>
-                      )}
-                    </span>
-                  }
-                >
-                  {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. 30s, 30h, 30d" />}
-                </FormField>
+                    }
+                  >
+                    {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. 30s, 30h, 30d" />}
+                  </FormField>
 
-                <FormField
-                  control={form.control}
-                  name="grace_period"
-                  label={labelWithHint(
-                    "Grace Period",
-                    "Keep the old key valid for this duration after rotation. Both keys work during this period for seamless cutover. Empty = immediate revoke.",
-                  )}
-                  description={<span className="text-xs">Recommended: 24h to 72h for production keys</span>}
-                >
-                  {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. 24h, 2d" />}
-                </FormField>
-              </div>
-            </FieldGroup>
-          </form>
-        </TooltipProvider>
-      )}
-    </Modal>
+                  <FormField
+                    control={form.control}
+                    name="grace_period"
+                    label={labelWithHint(
+                      "Grace Period",
+                      "Keep the old key valid for this duration after rotation. Both keys work during this period for seamless cutover. Empty = immediate revoke.",
+                    )}
+                    description={<span className="text-xs">Recommended: 24h to 72h for production keys</span>}
+                  >
+                    {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="e.g. 24h, 2d" />}
+                  </FormField>
+                </div>
+              </FieldGroup>
+            </form>
+          </TooltipProvider>
+        )}
+        <DialogFooter>
+          {regeneratedKey ? (
+            <>
+              <Button variant="outline" onClick={handleClose}>
+                Close
+              </Button>
+              <CopyToClipboard text={regeneratedKey} onCopy={handleCopyKey}>
+                <Button>
+                  {copied ? <Check /> : <Copy />}
+                  {copied ? "Copied" : "Copy Key"}
+                </Button>
+              </CopyToClipboard>
+            </>
+          ) : (
+            <>
+              <Button variant="outline" onClick={handleClose}>
+                Cancel
+              </Button>
+              <Button onClick={handleRegenerateKey} disabled={isRegenerating} aria-busy={isRegenerating}>
+                <RefreshCw />
+                Regenerate
+              </Button>
+            </>
+          )}
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/organisms/create_key_button.integration.test.tsx b/ui/litellm-dashboard/src/components/organisms/create_key_button.integration.test.tsx
index 3069d25a18b..b6a9926b144 100644
--- a/ui/litellm-dashboard/src/components/organisms/create_key_button.integration.test.tsx
+++ b/ui/litellm-dashboard/src/components/organisms/create_key_button.integration.test.tsx
@@ -1,8 +1,9 @@
 import userEvent from "@testing-library/user-event";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { renderWithProviders, screen, testQueryClient, waitFor } from "../../../tests/test-utils";
+import { act, renderWithProviders, screen, testQueryClient, waitFor } from "../../../tests/test-utils";
 import type { Team } from "../key_team_helpers/key_list";
 import { keyCreateCall, keyCreateServiceAccountCall, modelAvailableCall, userFilterUICall } from "../networking";
+import { toast } from "@/lib/toast";
 import CreateKey from "./create_key_button";
 
 const state = vi.hoisted(() => ({
@@ -21,6 +22,16 @@ const state = vi.hoisted(() => ({
   projects: [] as { project_id: string; project_alias: string; team_id?: string; models?: string[] }[],
 }));
 
+vi.mock("@/lib/toast", () => ({
+  toast: {
+    success: vi.fn(),
+    info: vi.fn(),
+    warning: vi.fn(),
+    error: vi.fn(),
+    fromError: vi.fn(),
+    dismiss: vi.fn(),
+  },
+}));
 vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({ default: () => state.authorized }));
 vi.mock("@/app/(dashboard)/hooks/useCan", () => ({
   default: (capability: string) => state.can[capability] ?? true,
@@ -186,10 +197,6 @@ const antdSearchInput = (placeholder: HTMLElement): HTMLInputElement => {
   return input;
 };
 
-const openAntdSelect = async (placeholder: HTMLElement) => {
-  await userEvent.click(antdSearchInput(placeholder));
-};
-
 const openSection = async (name: RegExp) => {
   await userEvent.click(await screen.findByRole("button", { name }));
 };
@@ -225,6 +232,7 @@ describe("CreateKey", () => {
       .mockClear()
       .mockResolvedValue({ key: "sk-service-account", soft_budget: null });
     vi.mocked(userFilterUICall).mockClear().mockResolvedValue([]);
+    vi.mocked(toast.fromError).mockClear();
     vi.mocked(modelAvailableCall)
       .mockClear()
       .mockResolvedValue({ data: [{ id: "gpt-4" }] });
@@ -456,8 +464,9 @@ describe("CreateKey", () => {
       await nameTheKey();
       await openSection(/Optional Settings/i);
 
-      await openAntdSelect(await screen.findByText("Select access groups (optional)"));
-      await userEvent.click(await screen.findByText("Group One"));
+      await userEvent.click(await screen.findByLabelText("Select access groups (optional)"));
+      await userEvent.click(await screen.findByRole("option", { name: /Group One/ }));
+      await userEvent.keyboard("{Escape}");
       await submit();
 
       expect((await createdPayload()).access_group_ids).toStrictEqual(["ag-1"]);
@@ -526,7 +535,7 @@ describe("CreateKey", () => {
       await openModal();
       await nameTheKey();
       await openSection(/Optional Settings/i);
-      await userEvent.click(await screen.findByLabelText("Disable Global Guardrails"));
+      await userEvent.click(await screen.findByRole("switch", { name: /Disable Global Guardrails/ }));
       await submit();
 
       expect((await createdPayload()).disable_global_guardrails).toBe(true);
@@ -655,7 +664,7 @@ describe("CreateKey", () => {
     it("prefills models once the available model list arrives", async () => {
       renderCreateKey({ autoOpenCreate: true, prefillData: { models: ["gpt-4"] } });
 
-      expect(await screen.findByTitle("gpt-4")).toBeInTheDocument();
+      expect(await screen.findByTitle("gpt-4", {}, { timeout: 5000 })).toBeInTheDocument();
     });
 
     it("ignores a team the user has no access to", async () => {
@@ -803,6 +812,144 @@ describe("CreateKey", () => {
         vi.useRealTimers();
       }
     });
+
+    it("keeps the current search's users when an abandoned search answers last", async () => {
+      const answers = new Map<string, (users: { user_id: string; user_email: string }[]) => void>();
+      vi.mocked(userFilterUICall).mockImplementation(
+        (_accessToken, params) =>
+          new Promise((resolve) => {
+            answers.set(params.get("user_email") ?? "", resolve);
+          }) as never,
+      );
+
+      const user = userEvent.setup();
+      renderCreateKey({ autoOpenCreate: true, prefillData: { owned_by: "another_user" } });
+      const search = antdSearchInput(await screen.findByText("Type email to search for users"));
+
+      await user.type(search, "ali");
+      await waitFor(() => expect(answers.has("ali")).toBe(true), { timeout: 3000 });
+
+      await user.type(search, "ce.smith@example.com");
+      await waitFor(() => expect(answers.has("alice.smith@example.com")).toBe(true), { timeout: 3000 });
+
+      await act(async () => {
+        answers.get("alice.smith@example.com")?.([{ user_id: "u-smith", user_email: "alice.smith@example.com" }]);
+      });
+      await screen.findByTitle("alice.smith@example.com (u-smith)");
+
+      await act(async () => {
+        answers.get("ali")?.([{ user_id: "u-jones", user_email: "alice.jones@example.com" }]);
+      });
+
+      expect(screen.queryByTitle("alice.jones@example.com (u-jones)")).not.toBeInTheDocument();
+      expect(screen.getByTitle("alice.smith@example.com (u-smith)")).toBeInTheDocument();
+    });
+
+    it("stops searching once the box is cleared and the abandoned search answers", async () => {
+      const answers = new Map<string, (users: { user_id: string; user_email: string }[]) => void>();
+      vi.mocked(userFilterUICall).mockImplementation(
+        (_accessToken, params) =>
+          new Promise((resolve) => {
+            answers.set(params.get("user_email") ?? "", resolve);
+          }) as never,
+      );
+
+      const user = userEvent.setup();
+      renderCreateKey({ autoOpenCreate: true, prefillData: { owned_by: "another_user" } });
+      const search = antdSearchInput(await screen.findByText("Type email to search for users"));
+
+      await user.type(search, "ali");
+      await waitFor(() => expect(answers.has("ali")).toBe(true), { timeout: 3000 });
+      await screen.findByText("Searching...");
+
+      await user.clear(search);
+      await screen.findByText("No users found");
+
+      await act(async () => {
+        answers.get("ali")?.([{ user_id: "u-jones", user_email: "alice.jones@example.com" }]);
+      });
+
+      expect(screen.queryByTitle("alice.jones@example.com (u-jones)")).not.toBeInTheDocument();
+      expect(screen.getByText("No users found")).toBeInTheDocument();
+    });
+
+    it("keeps searching while a newer search is still in flight", async () => {
+      const answers = new Map<string, (users: { user_id: string; user_email: string }[]) => void>();
+      vi.mocked(userFilterUICall).mockImplementation(
+        (_accessToken, params) =>
+          new Promise((resolve) => {
+            answers.set(params.get("user_email") ?? "", resolve);
+          }) as never,
+      );
+
+      const user = userEvent.setup();
+      renderCreateKey({ autoOpenCreate: true, prefillData: { owned_by: "another_user" } });
+      const search = antdSearchInput(await screen.findByText("Type email to search for users"));
+
+      await user.type(search, "ali");
+      await waitFor(() => expect(answers.has("ali")).toBe(true), { timeout: 3000 });
+
+      await user.type(search, "ce.smith@example.com");
+      await waitFor(() => expect(answers.has("alice.smith@example.com")).toBe(true), { timeout: 3000 });
+
+      await act(async () => {
+        answers.get("ali")?.([]);
+      });
+
+      expect(screen.getByText("Searching...")).toBeInTheDocument();
+      expect(screen.queryByText("No users found")).not.toBeInTheDocument();
+
+      await act(async () => {
+        answers.get("alice.smith@example.com")?.([{ user_id: "u-smith", user_email: "alice.smith@example.com" }]);
+      });
+      await screen.findByTitle("alice.smith@example.com (u-smith)");
+    });
+
+    it("only warns about a failed search when it is the one the box is waiting on", async () => {
+      const answers = new Map<
+        string,
+        { resolve: (users: { user_id: string; user_email: string }[]) => void; reject: (error: Error) => void }
+      >();
+      vi.mocked(userFilterUICall).mockImplementation(
+        (_accessToken, params) =>
+          new Promise((resolve, reject) => {
+            answers.set(params.get("user_email") ?? "", { resolve, reject });
+          }) as never,
+      );
+
+      const user = userEvent.setup();
+      renderCreateKey({ autoOpenCreate: true, prefillData: { owned_by: "another_user" } });
+      const search = antdSearchInput(await screen.findByText("Type email to search for users"));
+
+      await user.type(search, "ali");
+      await waitFor(() => expect(answers.has("ali")).toBe(true), { timeout: 3000 });
+
+      await user.type(search, "ce.smith@example.com");
+      await waitFor(() => expect(answers.has("alice.smith@example.com")).toBe(true), { timeout: 3000 });
+
+      await act(async () => {
+        answers
+          .get("alice.smith@example.com")
+          ?.resolve([{ user_id: "u-smith", user_email: "alice.smith@example.com" }]);
+      });
+      await screen.findByTitle("alice.smith@example.com (u-smith)");
+
+      await act(async () => {
+        answers.get("ali")?.reject(new Error("search failed"));
+      });
+
+      expect(toast.fromError).not.toHaveBeenCalled();
+      expect(screen.getByTitle("alice.smith@example.com (u-smith)")).toBeInTheDocument();
+
+      await user.type(search, "x");
+      await waitFor(() => expect(answers.has("alice.smith@example.comx")).toBe(true), { timeout: 3000 });
+
+      await act(async () => {
+        answers.get("alice.smith@example.comx")?.reject(new Error("search failed"));
+      });
+
+      expect(toast.fromError).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe("created key display", () => {
@@ -827,6 +974,23 @@ describe("CreateKey", () => {
     });
   });
 
+  describe("dialog accessible names", () => {
+    it("names the create form dialog", async () => {
+      await openModal();
+
+      expect(screen.getByRole("dialog", { name: "Create New Key" })).toBeInTheDocument();
+    });
+
+    it("names the created key dialog", async () => {
+      await openModal();
+      await nameTheKey();
+      await submit();
+      await createdPayload();
+
+      expect(await screen.findByRole("dialog", { name: "Save your Key" })).toBeInTheDocument();
+    });
+  });
+
   describe("key type gating", () => {
     it("labels the llm_api option AI APIs", async () => {
       await openModal();
@@ -935,7 +1099,7 @@ describe("CreateKey", () => {
       await openModal();
       await nameTheKey();
       await openSection(/Optional Settings/i);
-      await userEvent.click(await screen.findByLabelText("Enable Prompt Caching"));
+      await userEvent.click(await screen.findByRole("switch", { name: /Enable Prompt Caching/ }));
       await submit();
 
       expect((await createdPayload()).enable_prompt_caching).toBe(true);
diff --git a/ui/litellm-dashboard/src/components/organisms/create_key_button.tsx b/ui/litellm-dashboard/src/components/organisms/create_key_button.tsx
index 0c78319bd6e..168b7f6cf25 100644
--- a/ui/litellm-dashboard/src/components/organisms/create_key_button.tsx
+++ b/ui/litellm-dashboard/src/components/organisms/create_key_button.tsx
@@ -7,17 +7,16 @@ import { useUISettings } from "@/app/(dashboard)/hooks/uiSettings/useUISettings"
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import useCan from "@/app/(dashboard)/hooks/useCan";
 import { formatNumberWithCommas } from "@/utils/dataUtils";
-import { InfoCircleOutlined } from "@ant-design/icons";
 import { useQueryClient } from "@tanstack/react-query";
 import { Button } from "@/components/ui/button";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
 import { Input } from "@/components/ui/input";
 import { Field, FieldLabel } from "@/components/shared/form/field";
-import { Input as AntdInput, Modal, Radio, Select, Switch, Tag, Tooltip, Typography } from "antd";
-import { ChevronDown } from "lucide-react";
+import { Input as AntdInput, Radio, Select, Switch, Tag, Tooltip, Typography } from "antd";
+import { ChevronDown, Info } from "lucide-react";
 import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
 import { DEBOUNCE_WAIT_MS } from "@/utils/debounceConstants";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import { type Control, useForm, useWatch, type UseFormSetValue } from "react-hook-form";
 import { rolesWithWriteAccess } from "../../utils/roles";
 import AgentSelector from "../agent_management/AgentSelector";
@@ -71,6 +70,7 @@ import NumericalInput from "../shared/numerical_input";
 import VectorStoreSelector from "../vector_store_management/VectorStoreSelector";
 import { buildKeyCreatePayload, type KeyCreateInput } from "./createKeyPayload";
 import { simplifyKeyGenerateError } from "./utils";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const { Option } = Select;
 
@@ -246,6 +246,7 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
   const [possibleUIRoles, setPossibleUIRoles] = useState<Record<string, Record<string, string>>>({});
   const [userOptions, setUserOptions] = useState<UserOption[]>([]);
   const [userSearchLoading, setUserSearchLoading] = useState<boolean>(false);
+  const latestUserSearchRef = useRef(0);
   const [disabledCallbacks, setDisabledCallbacks] = useState<string[]>([]);
   const [keyType, setKeyType] = useState<string>("llm_api");
   const [modelAliases, setModelAliases] = useState<{ [key: string]: string }>({});
@@ -260,26 +261,6 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
   const [agentsList, setAgentsList] = useState<{ agent_id: string; agent_name: string }[]>([]);
   const [selectedAgentId, setSelectedAgentId] = useState<string | null>(null);
   const selectedModels: string[] = (useWatch({ control: form.control, name: "models" }) as string[] | undefined) ?? [];
-  const handleOk = () => {
-    setIsModalVisible(false);
-    form.reset(formDefaults);
-    setLoggingSettings([]);
-    setDisabledCallbacks([]);
-    setKeyType("llm_api");
-    setModelAliases({});
-    setAutoRotationEnabled(false);
-    setRotationInterval("30d");
-    setRouterSettings(null);
-    setRouterSettingsKey((prev) => prev + 1);
-    setSelectedAgentId(null);
-    setSelectedOrganizationId(null);
-    setSelectedProjectId(null);
-    setBudgetLimits([]);
-    setTagRateLimits([]);
-    setBudgetFallbacks({});
-    setBudgetFallbacksKey((k) => k + 1);
-  };
-
   const handleCancel = () => {
     setIsModalVisible(false);
     setApiKey(null);
@@ -556,8 +537,13 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
   };
 
   const fetchUsers = async (searchText: string): Promise<void> => {
+    const searchId = latestUserSearchRef.current + 1;
+    latestUserSearchRef.current = searchId;
+    const isLatestSearch = (): boolean => searchId === latestUserSearchRef.current;
+
     if (!searchText) {
       setUserOptions([]);
+      setUserSearchLoading(false);
       return;
     }
 
@@ -569,6 +555,7 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
         return;
       }
       const response = await userFilterUICall(accessToken, params);
+      if (!isLatestSearch()) return;
 
       const data: User[] = response;
       const options: UserOption[] = data.map((user) => ({
@@ -580,9 +567,9 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
       setUserOptions(options);
     } catch (error) {
       console.error("Error fetching users:", error);
-      toast.fromError("Failed to search for users");
+      if (isLatestSearch()) toast.fromError("Failed to search for users");
     } finally {
-      setUserSearchLoading(false);
+      if (isLatestSearch()) setUserSearchLoading(false);
     }
   };
 
@@ -644,645 +631,576 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
           + Create New Key
         </Button>
       )}
-      <Modal open={isModalVisible} width={1000} footer={null} onOk={handleOk} onCancel={handleCancel}>
-        <MountedFormProvider value={mountedForm}>
-          <form onSubmit={handleSubmit}>
-            {/* Section 1: Key Ownership */}
-            <div className="mb-8">
-              <h3 className="text-lg font-medium text-foreground mb-4">Key Ownership</h3>
-              <Field className="mb-4">
-                <FieldLabel>
-                  <span>
-                    Owned By{" "}
-                    <Tooltip title="Select who will own this Virtual Key">
-                      <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                    </Tooltip>
-                  </span>
-                </FieldLabel>
-                <Radio.Group onChange={(e) => setKeyOwner(e.target.value)} value={keyOwner}>
-                  <Radio value="you">You</Radio>
-                  <Radio value="service_account">Service Account</Radio>
-                  {userRole === "Admin" && <Radio value="another_user">Another User</Radio>}
-                  <Radio value="agent">
-                    Agent <Tag color="purple">New</Tag>
-                  </Radio>
-                </Radio.Group>
-              </Field>
+      <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[1000px]">
+          <DialogHeader>
+            <DialogTitle className="text-xl font-semibold text-foreground">Create New Key</DialogTitle>
+          </DialogHeader>
+          <MountedFormProvider value={mountedForm}>
+            <form onSubmit={handleSubmit}>
+              {/* Section 1: Key Ownership */}
+              <div className="mb-8">
+                <h3 className="text-lg font-medium text-foreground mb-4">Key Ownership</h3>
+                <Field className="mb-4">
+                  <FieldLabel>
+                    <span>
+                      Owned By{" "}
+                      <Tooltip title="Select who will own this Virtual Key">
+                        <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                      </Tooltip>
+                    </span>
+                  </FieldLabel>
+                  <Radio.Group onChange={(e) => setKeyOwner(e.target.value)} value={keyOwner}>
+                    <Radio value="you">You</Radio>
+                    <Radio value="service_account">Service Account</Radio>
+                    {userRole === "Admin" && <Radio value="another_user">Another User</Radio>}
+                    <Radio value="agent">
+                      Agent <Tag color="purple">New</Tag>
+                    </Radio>
+                  </Radio.Group>
+                </Field>
 
-              {keyOwner === "another_user" && (
-                <MountedFormField
-                  label={
-                    <span>
-                      User ID{" "}
-                      <Tooltip title="The user who will own this key and be responsible for its usage">
-                        <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                      </Tooltip>
-                    </span>
-                  }
-                  name="user_id"
-                  className="mt-4"
-                  required
-                  rules={requiredRule(
-                    keyOwner === "another_user",
-                    `Please input the user ID of the user you are assigning the key to`,
-                  )}
-                >
-                  {(control) => (
-                    <div
-                      id={control.id}
-                      aria-required={control["aria-required"]}
-                      aria-invalid={control["aria-invalid"]}
-                      aria-describedby={control["aria-describedby"]}
-                      onChange={control.onChange}
-                    >
-                      <div style={{ display: "flex", marginBottom: "8px" }}>
-                        <Select
-                          showSearch
-                          placeholder="Type email to search for users"
-                          filterOption={false}
-                          onSearch={handleUserSearch}
-                          onSelect={(value, option) => handleUserSelect(value, option as UserOption)}
-                          options={userOptions}
-                          loading={userSearchLoading}
-                          allowClear
-                          style={{ width: "100%" }}
-                          notFoundContent={userSearchLoading ? "Searching..." : "No users found"}
-                        />
-                        <Button variant="outline" className="ml-2" onClick={() => setIsCreateUserModalVisible(true)}>
-                          Create User
-                        </Button>
-                      </div>
-                      <div className="text-xs text-muted-foreground">Search by email to find users</div>
-                    </div>
-                  )}
-                </MountedFormField>
-              )}
-              {keyOwner === "agent" && (
-                <div className="mt-4 p-4 bg-purple-50 border border-purple-200 rounded-md">
-                  <div className="mb-3">
-                    <span className="text-sm font-medium text-foreground">
-                      Select Agent <span className="text-destructive">*</span>
-                    </span>
-                  </div>
-                  <Select
-                    showSearch
-                    placeholder="Select an agent"
-                    style={{ width: "100%" }}
-                    value={selectedAgentId}
-                    onChange={(value) => setSelectedAgentId(value)}
-                    filterOption={(input, option) =>
-                      (option?.label as string)?.toLowerCase().includes(input.toLowerCase())
+                {keyOwner === "another_user" && (
+                  <MountedFormField
+                    label={
+                      <span>
+                        User ID{" "}
+                        <Tooltip title="The user who will own this key and be responsible for its usage">
+                          <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                        </Tooltip>
+                      </span>
                     }
-                    options={agentsList.map((a) => ({
-                      label: a.agent_name || a.agent_id,
-                      value: a.agent_id,
-                    }))}
-                  />
-                  <div className="text-xs text-muted-foreground mt-2">
-                    This key will be used by the selected agent to make requests to LiteLLM
+                    name="user_id"
+                    className="mt-4"
+                    required
+                    rules={requiredRule(
+                      keyOwner === "another_user",
+                      `Please input the user ID of the user you are assigning the key to`,
+                    )}
+                  >
+                    {(control) => (
+                      <div
+                        id={control.id}
+                        aria-required={control["aria-required"]}
+                        aria-invalid={control["aria-invalid"]}
+                        aria-describedby={control["aria-describedby"]}
+                        onChange={control.onChange}
+                      >
+                        <div style={{ display: "flex", marginBottom: "8px" }}>
+                          <Select
+                            showSearch
+                            placeholder="Type email to search for users"
+                            filterOption={false}
+                            onSearch={handleUserSearch}
+                            onSelect={(value, option) => handleUserSelect(value, option as UserOption)}
+                            options={userOptions}
+                            loading={userSearchLoading}
+                            allowClear
+                            style={{ width: "100%" }}
+                            notFoundContent={userSearchLoading ? "Searching..." : "No users found"}
+                          />
+                          <Button variant="outline" className="ml-2" onClick={() => setIsCreateUserModalVisible(true)}>
+                            Create User
+                          </Button>
+                        </div>
+                        <div className="text-xs text-muted-foreground">Search by email to find users</div>
+                      </div>
+                    )}
+                  </MountedFormField>
+                )}
+                {keyOwner === "agent" && (
+                  <div className="mt-4 p-4 bg-purple-50 border border-purple-200 rounded-md">
+                    <div className="mb-3">
+                      <span className="text-sm font-medium text-foreground">
+                        Select Agent <span className="text-destructive">*</span>
+                      </span>
+                    </div>
+                    <Select
+                      showSearch
+                      placeholder="Select an agent"
+                      style={{ width: "100%" }}
+                      value={selectedAgentId}
+                      onChange={(value) => setSelectedAgentId(value)}
+                      filterOption={(input, option) =>
+                        (option?.label as string)?.toLowerCase().includes(input.toLowerCase())
+                      }
+                      options={agentsList.map((a) => ({
+                        label: a.agent_name || a.agent_id,
+                        value: a.agent_id,
+                      }))}
+                    />
+                    <div className="text-xs text-muted-foreground mt-2">
+                      This key will be used by the selected agent to make requests to LiteLLM
+                    </div>
                   </div>
-                </div>
-              )}
-              <MountedFormField
-                label={
-                  <span>
-                    Organization{" "}
-                    <Tooltip title="The organization this key belongs to. Selecting an organization filters the available teams.">
-                      <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                    </Tooltip>
-                  </span>
-                }
-                name="organization_id"
-                className="mt-4"
-              >
-                {(control) => (
-                  <OrganizationDropdown
-                    id={control.id}
-                    value={control.value as string | undefined}
-                    organizations={organizations}
-                    loading={isOrganizationsLoading}
-                    disabled={userRole !== "Admin"}
-                    onChange={changeOrganization(control.onChange)}
-                  />
                 )}
-              </MountedFormField>
-              <MountedFormField
-                label={
-                  <span>
-                    Team{" "}
-                    <Tooltip title="The team this key belongs to, which determines available models and budget limits">
-                      <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                    </Tooltip>
-                  </span>
-                }
-                name="team_id"
-                className="mt-4"
-                required={keyOwner === "service_account"}
-                rules={requiredRule(keyOwner === "service_account", "Please select a team for the service account")}
-                help={keyOwner === "service_account" ? "required" : ""}
-              >
-                {(control) => (
-                  <TeamDropdown
-                    id={control.id}
-                    value={control.value as string | undefined}
-                    onChange={control.onChange}
-                    disabled={selectedProjectId !== null}
-                    organizationId={selectedOrganizationId}
-                    onTeamSelect={selectTeam}
-                  />
-                )}
-              </MountedFormField>
-              {enableProjectsUI && (
                 <MountedFormField
                   label={
                     <span>
-                      Project{" "}
-                      <Tooltip title="Assign this key to a project. Selecting a project will lock the team to the project's team.">
-                        <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+                      Organization{" "}
+                      <Tooltip title="The organization this key belongs to. Selecting an organization filters the available teams.">
+                        <Info className="ml-1 inline size-3.5 align-text-bottom" />
                       </Tooltip>
                     </span>
                   }
-                  name="project_id"
+                  name="organization_id"
                   className="mt-4"
                 >
                   {(control) => (
-                    <ProjectDropdown
+                    <OrganizationDropdown
                       id={control.id}
                       value={control.value as string | undefined}
-                      projects={projects}
-                      teamId={selectedCreateKeyTeam?.team_id}
-                      loading={isProjectsLoading || !teams}
-                      onChange={changeProject(control.onChange)}
+                      organizations={organizations}
+                      loading={isOrganizationsLoading}
+                      disabled={userRole !== "Admin"}
+                      onChange={changeOrganization(control.onChange)}
                     />
                   )}
                 </MountedFormField>
-              )}
-            </div>
-
-            {/* Show message when team selection is required */}
-            {isFormDisabled && (
-              <div className="mb-8 p-4 bg-blue-50 border border-blue-200 rounded-md">
-                <p className="text-blue-800 text-sm">
-                  Please select a team to continue configuring your Virtual Key. If you do not see any teams, please
-                  contact your Proxy Admin to either provide you with access to models or to add you to a team.
-                </p>
-              </div>
-            )}
-
-            {/* Section 2: Key Details */}
-            {!isFormDisabled && (
-              <div className="mb-8">
-                <h3 className="text-lg font-medium text-foreground mb-4">Key Details</h3>
                 <MountedFormField
                   label={
                     <span>
-                      {keyOwner === "you" || keyOwner === "another_user" ? "Key Name" : "Service Account ID"}{" "}
-                      <Tooltip
-                        title={
-                          keyOwner === "you" || keyOwner === "another_user"
-                            ? "A descriptive name to identify this key"
-                            : "Unique identifier for this service account"
-                        }
-                      >
-                        <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+                      Team{" "}
+                      <Tooltip title="The team this key belongs to, which determines available models and budget limits">
+                        <Info className="ml-1 inline size-3.5 align-text-bottom" />
                       </Tooltip>
                     </span>
                   }
-                  name="key_alias"
-                  required
-                  rules={requiredRule(true, `Please input a ${keyOwner === "you" ? "key name" : "service account ID"}`)}
-                  help="required"
-                >
-                  {(control) => <Input {...control} value={(control.value as string | undefined) ?? ""} />}
-                </MountedFormField>
-
-                <MountedFormField
-                  label={
-                    <span>
-                      Models{" "}
-                      <Tooltip title="Select which models this key can access. Choose 'All Team Models' to grant access to all models available to the team. Leave empty to allow access to all models.">
-                        <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                      </Tooltip>
-                    </span>
-                  }
-                  name="models"
-                  help={
-                    keyType === "management" || keyType === "read_only"
-                      ? "Models field is disabled for this key type"
-                      : "optional - leave empty to allow access to all models"
-                  }
+                  name="team_id"
                   className="mt-4"
+                  required={keyOwner === "service_account"}
+                  rules={requiredRule(keyOwner === "service_account", "Please select a team for the service account")}
+                  help={keyOwner === "service_account" ? "required" : ""}
                 >
                   {(control) => (
-                    <Select
-                      {...control}
-                      value={control.value as string[] | undefined}
-                      mode="multiple"
-                      placeholder="Select models"
-                      style={{ width: "100%" }}
-                      disabled={keyType === "management" || keyType === "read_only"}
-                      onChange={(values: string[]) => {
-                        control.onChange(values);
-                        if (values.includes("all-team-models")) {
-                          form.setValue("models", ["all-team-models"]);
-                        } else if (values.includes("all-proxy-models")) {
-                          form.setValue("models", ["all-proxy-models"]);
-                        }
-                      }}
-                    >
-                      {!selectedProjectId && selectedCreateKeyTeam && (
-                        <Option key="all-team-models" value="all-team-models">
-                          All Team Models
-                        </Option>
-                      )}
-                      {!selectedProjectId && !selectedCreateKeyTeam && (
-                        <Option key="all-proxy-models" value="all-proxy-models">
-                          All Proxy Models
-                        </Option>
-                      )}
-                      {modelsToPick.map((model: string) => (
-                        <Option key={model} value={model} disabled={hasAllModelsSentinel(selectedModels)}>
-                          {getModelDisplayName(model)}
-                        </Option>
-                      ))}
-                    </Select>
-                  )}
-                </MountedFormField>
-
-                <MountedFormField
-                  label={
-                    <span>
-                      Key Type{" "}
-                      <Tooltip title="Select the type of key to determine what routes and operations this key can access">
-                        <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                      </Tooltip>
-                    </span>
-                  }
-                  name="key_type"
-                  className="mt-4"
-                >
-                  {(control) => (
-                    <Select
-                      {...control}
+                    <TeamDropdown
+                      id={control.id}
                       value={control.value as string | undefined}
-                      placeholder="Select key type"
-                      style={{ width: "100%" }}
-                      optionLabelProp="label"
-                      onChange={changeKeyType(control.onChange)}
-                    >
-                      <Option value="llm_api" label="AI APIs">
-                        <div style={{ padding: "4px 0" }}>
-                          <Typography.Text strong>AI APIs</Typography.Text>
-                          <Typography.Paragraph type="secondary" style={{ fontSize: 11, margin: "2px 0 0" }}>
-                            Can call only AI API routes (chat/completions, embeddings, etc.)
-                          </Typography.Paragraph>
-                        </div>
-                      </Option>
-                      <Option value="management" label="Management">
-                        <div style={{ padding: "4px 0" }}>
-                          <Typography.Text strong>Management</Typography.Text>
-                          <Typography.Paragraph type="secondary" style={{ fontSize: 11, margin: "2px 0 0" }}>
-                            Can call only management routes (user/team/key management)
-                          </Typography.Paragraph>
-                        </div>
-                      </Option>
-                      <Option value="default" label="Full Access">
-                        <div style={{ padding: "4px 0" }}>
-                          <Typography.Text strong>Full Access</Typography.Text>
-                          <Typography.Paragraph type="secondary" style={{ fontSize: 11, margin: "2px 0 0" }}>
-                            Can call all routes (AI APIs, Management, and read-only)
-                          </Typography.Paragraph>
-                        </div>
-                      </Option>
-                    </Select>
+                      onChange={control.onChange}
+                      disabled={selectedProjectId !== null}
+                      organizationId={selectedOrganizationId}
+                      onTeamSelect={selectTeam}
+                    />
                   )}
                 </MountedFormField>
-              </div>
-            )}
-
-            {/* Section 3: Optional Settings */}
-            {!isFormDisabled && (
-              <div className="mb-8">
-                <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
-                  <h3 className="m-0 text-lg font-medium text-foreground">
-                    <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                      Optional Settings
-                      <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                    </CollapsibleTrigger>
-                  </h3>
-                  <CollapsibleContent className="px-4 pb-3">
-                    <MountedFormField
-                      className="mt-4"
-                      label={
-                        <span>
-                          Max Budget (USD){" "}
-                          <Tooltip title="Maximum amount in USD this key can spend. When reached, the key will be blocked from making further requests">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="max_budget"
-                      help={`Budget cannot exceed team max budget: $${team?.max_budget !== null && team?.max_budget !== undefined ? team?.max_budget : "unlimited"}`}
-                      rules={ceilingRule(
-                        team?.max_budget,
-                        (limit) => `Budget cannot exceed team max budget: $${formatNumberWithCommas(limit, 4)}`,
-                      )}
-                    >
-                      {(control) => (
-                        <NumericalInput
-                          {...control}
-                          value={control.value as number | string | undefined}
-                          step={0.01}
-                          precision={2}
-                          width={200}
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      className="mt-4"
-                      label={
-                        <span>
-                          Reset Budget{" "}
-                          <Tooltip title="How often the budget should reset. For example, setting 'daily' will reset the budget every 24 hours">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="budget_duration"
-                      help={`Team Reset Budget: ${team?.budget_duration !== null && team?.budget_duration !== undefined ? team?.budget_duration : "None"}`}
-                    >
-                      {(control) => (
-                        <BudgetDurationDropdown
-                          id={control.id}
-                          value={control.value as string | null | undefined}
-                          showNeverResets
-                          placeholder="Not set"
-                          onChange={control.onChange}
-                        />
-                      )}
-                    </MountedFormField>
-                    <Field className="mt-4">
-                      <FieldLabel>
-                        <span>
-                          Budget Windows{" "}
-                          <Tooltip title="Set multiple independent budget windows (e.g., hourly $10 AND monthly $200). Each window tracks spend separately and resets on its own schedule.">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      </FieldLabel>
-                      <BudgetWindowsEditor value={budgetLimits} onChange={setBudgetLimits} />
-                    </Field>
-                    <Field className="mt-4">
-                      <FieldLabel>
-                        <span>
-                          Budget Fallbacks{" "}
-                          <Tooltip title="When a model exceeds its per-model budget (model_max_budget), requests automatically reroute to fallback models instead of failing. Configure per-model budgets in Advanced Settings.">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      </FieldLabel>
-                      <BudgetFallbacksEditor
-                        key={budgetFallbacksKey}
-                        value={budgetFallbacks}
-                        onChange={setBudgetFallbacks}
-                        availableModels={modelsToPick}
+                {enableProjectsUI && (
+                  <MountedFormField
+                    label={
+                      <span>
+                        Project{" "}
+                        <Tooltip title="Assign this key to a project. Selecting a project will lock the team to the project's team.">
+                          <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                        </Tooltip>
+                      </span>
+                    }
+                    name="project_id"
+                    className="mt-4"
+                  >
+                    {(control) => (
+                      <ProjectDropdown
+                        id={control.id}
+                        value={control.value as string | undefined}
+                        projects={projects}
+                        teamId={selectedCreateKeyTeam?.team_id}
+                        loading={isProjectsLoading || !teams}
+                        onChange={changeProject(control.onChange)}
                       />
-                    </Field>
-                    <MountedFormField
-                      className="mt-4"
-                      label={
-                        <span>
-                          Tokens per minute Limit (TPM){" "}
-                          <Tooltip title="Maximum number of tokens this key can process per minute. Helps control usage and costs">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="tpm_limit"
-                      help={`TPM cannot exceed team TPM limit: ${team?.tpm_limit !== null && team?.tpm_limit !== undefined ? team?.tpm_limit : "unlimited"}`}
-                      rules={ceilingRule(
-                        team?.tpm_limit,
-                        (limit) => `TPM limit cannot exceed team TPM limit: ${limit}`,
-                      )}
-                    >
-                      {(control) => (
-                        <NumericalInput
-                          {...control}
-                          value={control.value as number | string | undefined}
-                          step={1}
-                          width={400}
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField name="tpm_limit_type" bare>
-                      {(control) => (
-                        <RateLimitTypeFormItem
-                          type="tpm"
-                          name="tpm_limit_type"
-                          className="mt-4"
-                          showDetailedDescriptions
-                          id={control.id}
-                          value={control.value as string | null | undefined}
-                          onChange={control.onChange}
-                          aria-invalid={control["aria-invalid"] ? true : undefined}
-                          aria-describedby={control["aria-describedby"]}
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      className="mt-4"
-                      label={
-                        <span>
-                          Requests per minute Limit (RPM){" "}
-                          <Tooltip title="Maximum number of API requests this key can make per minute. Helps prevent abuse and manage load">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="rpm_limit"
-                      help={`RPM cannot exceed team RPM limit: ${team?.rpm_limit !== null && team?.rpm_limit !== undefined ? team?.rpm_limit : "unlimited"}`}
-                      rules={ceilingRule(
-                        team?.rpm_limit,
-                        (limit) => `RPM limit cannot exceed team RPM limit: ${limit}`,
-                      )}
-                    >
-                      {(control) => (
-                        <NumericalInput
-                          {...control}
-                          value={control.value as number | string | undefined}
-                          step={1}
-                          width={400}
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField name="rpm_limit_type" bare>
-                      {(control) => (
-                        <RateLimitTypeFormItem
-                          type="rpm"
-                          name="rpm_limit_type"
-                          className="mt-4"
-                          showDetailedDescriptions
-                          id={control.id}
-                          value={control.value as string | null | undefined}
-                          onChange={control.onChange}
-                          aria-invalid={control["aria-invalid"] ? true : undefined}
-                          aria-describedby={control["aria-describedby"]}
-                        />
-                      )}
-                    </MountedFormField>
-                    <Field className="mt-4">
-                      <FieldLabel>
-                        <span>
-                          Per-Tag Rate Limits{" "}
-                          <Tooltip title="Scope rate limits to a request tag so each tag (e.g. a cell or group) gets its own RPM counter. Requests without a matching tag fall back to the key-level limit.">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      </FieldLabel>
-                      <TagRateLimitEditor value={tagRateLimits} onChange={setTagRateLimits} />
-                    </Field>
-                    <MountedFormField
-                      className="mt-4"
-                      label={
-                        <span>
-                          Throttle on budget exceeded{" "}
-                          <Tooltip title="When this key exceeds its max budget, throttle its TPM/RPM to the globally configured percentage instead of blocking access entirely. Requires budget_exceeded_throttle_percentage in litellm_settings and a TPM/RPM limit on the key.">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="throttle_on_budget_exceeded"
-                    >
-                      {(control) => (
-                        <Switch
-                          id={control.id}
-                          checked={control.value as boolean | undefined}
-                          onChange={control.onChange}
-                          checkedChildren="Yes"
-                          unCheckedChildren="No"
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      className="mt-4"
-                      label={
-                        <span>
-                          Enable Prompt Caching{" "}
-                          <Tooltip title="Automatically add prompt caching breakpoints (cache_control markers) to requests made with this key, cutting input cost on repeated prompts. Applies to Anthropic and Bedrock Claude models; requests that already set their own cache_control markers are left untouched.">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="enable_prompt_caching"
-                    >
-                      {(control) => (
-                        <Switch
-                          id={control.id}
-                          checked={control.value as boolean | undefined}
-                          onChange={control.onChange}
-                          checkedChildren="Yes"
-                          unCheckedChildren="No"
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      label={
-                        <span>
-                          Guardrails{" "}
-                          <Tooltip title="Apply safety guardrails to this key to filter content or enforce policies">
-                            <a
-                              href="https://docs.litellm.ai/docs/proxy/guardrails/quick_start"
-                              target="_blank"
-                              rel="noopener noreferrer"
-                              onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
-                            >
-                              <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                            </a>
-                          </Tooltip>
-                        </span>
-                      }
-                      name="guardrails"
-                      className="mt-4"
-                      help={
-                        canEditGuardrails
-                          ? "Select existing guardrails or enter new ones"
-                          : "Premium feature - Upgrade to set guardrails by key"
-                      }
-                    >
-                      {(control) => (
-                        <Select
-                          {...control}
-                          value={control.value as string[] | undefined}
-                          mode="tags"
-                          style={{ width: "100%" }}
-                          disabled={!canEditGuardrails}
-                          placeholder={
-                            !canEditGuardrails
-                              ? "Premium feature - Upgrade to set guardrails by key"
-                              : "Select or enter guardrails"
+                    )}
+                  </MountedFormField>
+                )}
+              </div>
+
+              {/* Show message when team selection is required */}
+              {isFormDisabled && (
+                <div className="mb-8 p-4 bg-blue-50 border border-blue-200 rounded-md">
+                  <p className="text-blue-800 text-sm">
+                    Please select a team to continue configuring your Virtual Key. If you do not see any teams, please
+                    contact your Proxy Admin to either provide you with access to models or to add you to a team.
+                  </p>
+                </div>
+              )}
+
+              {/* Section 2: Key Details */}
+              {!isFormDisabled && (
+                <div className="mb-8">
+                  <h3 className="text-lg font-medium text-foreground mb-4">Key Details</h3>
+                  <MountedFormField
+                    label={
+                      <span>
+                        {keyOwner === "you" || keyOwner === "another_user" ? "Key Name" : "Service Account ID"}{" "}
+                        <Tooltip
+                          title={
+                            keyOwner === "you" || keyOwner === "another_user"
+                              ? "A descriptive name to identify this key"
+                              : "Unique identifier for this service account"
                           }
-                          options={guardrailsList.map((name) => ({ value: name, label: name }))}
+                        >
+                          <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                        </Tooltip>
+                      </span>
+                    }
+                    name="key_alias"
+                    required
+                    rules={requiredRule(
+                      true,
+                      `Please input a ${keyOwner === "you" ? "key name" : "service account ID"}`,
+                    )}
+                    help="required"
+                  >
+                    {(control) => <Input {...control} value={(control.value as string | undefined) ?? ""} />}
+                  </MountedFormField>
+
+                  <MountedFormField
+                    label={
+                      <span>
+                        Models{" "}
+                        <Tooltip title="Select which models this key can access. Choose 'All Team Models' to grant access to all models available to the team. Leave empty to allow access to all models.">
+                          <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                        </Tooltip>
+                      </span>
+                    }
+                    name="models"
+                    help={
+                      keyType === "management" || keyType === "read_only"
+                        ? "Models field is disabled for this key type"
+                        : "optional - leave empty to allow access to all models"
+                    }
+                    className="mt-4"
+                  >
+                    {(control) => (
+                      <Select
+                        {...control}
+                        value={control.value as string[] | undefined}
+                        mode="multiple"
+                        placeholder="Select models"
+                        style={{ width: "100%" }}
+                        disabled={keyType === "management" || keyType === "read_only"}
+                        onChange={(values: string[]) => {
+                          control.onChange(values);
+                          if (values.includes("all-team-models")) {
+                            form.setValue("models", ["all-team-models"]);
+                          } else if (values.includes("all-proxy-models")) {
+                            form.setValue("models", ["all-proxy-models"]);
+                          }
+                        }}
+                      >
+                        {!selectedProjectId && selectedCreateKeyTeam && (
+                          <Option key="all-team-models" value="all-team-models">
+                            All Team Models
+                          </Option>
+                        )}
+                        {!selectedProjectId && !selectedCreateKeyTeam && (
+                          <Option key="all-proxy-models" value="all-proxy-models">
+                            All Proxy Models
+                          </Option>
+                        )}
+                        {modelsToPick.map((model: string) => (
+                          <Option key={model} value={model} disabled={hasAllModelsSentinel(selectedModels)}>
+                            {getModelDisplayName(model)}
+                          </Option>
+                        ))}
+                      </Select>
+                    )}
+                  </MountedFormField>
+
+                  <MountedFormField
+                    label={
+                      <span>
+                        Key Type{" "}
+                        <Tooltip title="Select the type of key to determine what routes and operations this key can access">
+                          <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                        </Tooltip>
+                      </span>
+                    }
+                    name="key_type"
+                    className="mt-4"
+                  >
+                    {(control) => (
+                      <Select
+                        {...control}
+                        value={control.value as string | undefined}
+                        placeholder="Select key type"
+                        style={{ width: "100%" }}
+                        optionLabelProp="label"
+                        onChange={changeKeyType(control.onChange)}
+                      >
+                        <Option value="llm_api" label="AI APIs">
+                          <div style={{ padding: "4px 0" }}>
+                            <Typography.Text strong>AI APIs</Typography.Text>
+                            <Typography.Paragraph type="secondary" style={{ fontSize: 11, margin: "2px 0 0" }}>
+                              Can call only AI API routes (chat/completions, embeddings, etc.)
+                            </Typography.Paragraph>
+                          </div>
+                        </Option>
+                        <Option value="management" label="Management">
+                          <div style={{ padding: "4px 0" }}>
+                            <Typography.Text strong>Management</Typography.Text>
+                            <Typography.Paragraph type="secondary" style={{ fontSize: 11, margin: "2px 0 0" }}>
+                              Can call only management routes (user/team/key management)
+                            </Typography.Paragraph>
+                          </div>
+                        </Option>
+                        <Option value="default" label="Full Access">
+                          <div style={{ padding: "4px 0" }}>
+                            <Typography.Text strong>Full Access</Typography.Text>
+                            <Typography.Paragraph type="secondary" style={{ fontSize: 11, margin: "2px 0 0" }}>
+                              Can call all routes (AI APIs, Management, and read-only)
+                            </Typography.Paragraph>
+                          </div>
+                        </Option>
+                      </Select>
+                    )}
+                  </MountedFormField>
+                </div>
+              )}
+
+              {/* Section 3: Optional Settings */}
+              {!isFormDisabled && (
+                <div className="mb-8">
+                  <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
+                    <h3 className="m-0 text-lg font-medium text-foreground">
+                      <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                        Optional Settings
+                        <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                      </CollapsibleTrigger>
+                    </h3>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <MountedFormField
+                        className="mt-4"
+                        label={
+                          <span>
+                            Max Budget (USD){" "}
+                            <Tooltip title="Maximum amount in USD this key can spend. When reached, the key will be blocked from making further requests">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="max_budget"
+                        help={`Budget cannot exceed team max budget: $${team?.max_budget !== null && team?.max_budget !== undefined ? team?.max_budget : "unlimited"}`}
+                        rules={ceilingRule(
+                          team?.max_budget,
+                          (limit) => `Budget cannot exceed team max budget: $${formatNumberWithCommas(limit, 4)}`,
+                        )}
+                      >
+                        {(control) => (
+                          <NumericalInput
+                            {...control}
+                            value={control.value as number | string | undefined}
+                            step={0.01}
+                            precision={2}
+                            width={200}
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField
+                        className="mt-4"
+                        label={
+                          <span>
+                            Reset Budget{" "}
+                            <Tooltip title="How often the budget should reset. For example, setting 'daily' will reset the budget every 24 hours">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="budget_duration"
+                        help={`Team Reset Budget: ${team?.budget_duration !== null && team?.budget_duration !== undefined ? team?.budget_duration : "None"}`}
+                      >
+                        {(control) => (
+                          <BudgetDurationDropdown
+                            id={control.id}
+                            value={control.value as string | null | undefined}
+                            showNeverResets
+                            placeholder="Not set"
+                            onChange={control.onChange}
+                          />
+                        )}
+                      </MountedFormField>
+                      <Field className="mt-4">
+                        <FieldLabel>
+                          <span>
+                            Budget Windows{" "}
+                            <Tooltip title="Set multiple independent budget windows (e.g., hourly $10 AND monthly $200). Each window tracks spend separately and resets on its own schedule.">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        </FieldLabel>
+                        <BudgetWindowsEditor value={budgetLimits} onChange={setBudgetLimits} />
+                      </Field>
+                      <Field className="mt-4">
+                        <FieldLabel>
+                          <span>
+                            Budget Fallbacks{" "}
+                            <Tooltip title="When a model exceeds its per-model budget (model_max_budget), requests automatically reroute to fallback models instead of failing. Configure per-model budgets in Advanced Settings.">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        </FieldLabel>
+                        <BudgetFallbacksEditor
+                          key={budgetFallbacksKey}
+                          value={budgetFallbacks}
+                          onChange={setBudgetFallbacks}
+                          availableModels={modelsToPick}
                         />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      label={
-                        <span>
-                          Disable Global Guardrails{" "}
-                          <Tooltip title="When enabled, this key will bypass any guardrails configured to run on every request (global guardrails)">
-                            <a
-                              href="https://docs.litellm.ai/docs/proxy/guardrails/quick_start"
-                              target="_blank"
-                              rel="noopener noreferrer"
-                              onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
-                            >
-                              <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                            </a>
-                          </Tooltip>
-                        </span>
-                      }
-                      name="disable_global_guardrails"
-                      className="mt-4"
-                      help={
-                        canEditGuardrails
-                          ? "Bypass global guardrails for this key"
-                          : "Premium feature - Upgrade to disable global guardrails by key"
-                      }
-                    >
-                      {(control) => (
-                        <Switch
-                          id={control.id}
-                          checked={control.value as boolean | undefined}
-                          onChange={control.onChange}
-                          disabled={!canEditGuardrails}
-                          checkedChildren="Yes"
-                          unCheckedChildren="No"
-                        />
-                      )}
-                    </MountedFormField>
-                    {canViewPolicies && (
+                      </Field>
+                      <MountedFormField
+                        className="mt-4"
+                        label={
+                          <span>
+                            Tokens per minute Limit (TPM){" "}
+                            <Tooltip title="Maximum number of tokens this key can process per minute. Helps control usage and costs">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="tpm_limit"
+                        help={`TPM cannot exceed team TPM limit: ${team?.tpm_limit !== null && team?.tpm_limit !== undefined ? team?.tpm_limit : "unlimited"}`}
+                        rules={ceilingRule(
+                          team?.tpm_limit,
+                          (limit) => `TPM limit cannot exceed team TPM limit: ${limit}`,
+                        )}
+                      >
+                        {(control) => (
+                          <NumericalInput
+                            {...control}
+                            value={control.value as number | string | undefined}
+                            step={1}
+                            width={400}
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField name="tpm_limit_type" bare>
+                        {(control) => (
+                          <RateLimitTypeFormItem
+                            type="tpm"
+                            name="tpm_limit_type"
+                            className="mt-4"
+                            showDetailedDescriptions
+                            id={control.id}
+                            value={control.value as string | null | undefined}
+                            onChange={control.onChange}
+                            aria-invalid={control["aria-invalid"] ? true : undefined}
+                            aria-describedby={control["aria-describedby"]}
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField
+                        className="mt-4"
+                        label={
+                          <span>
+                            Requests per minute Limit (RPM){" "}
+                            <Tooltip title="Maximum number of API requests this key can make per minute. Helps prevent abuse and manage load">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="rpm_limit"
+                        help={`RPM cannot exceed team RPM limit: ${team?.rpm_limit !== null && team?.rpm_limit !== undefined ? team?.rpm_limit : "unlimited"}`}
+                        rules={ceilingRule(
+                          team?.rpm_limit,
+                          (limit) => `RPM limit cannot exceed team RPM limit: ${limit}`,
+                        )}
+                      >
+                        {(control) => (
+                          <NumericalInput
+                            {...control}
+                            value={control.value as number | string | undefined}
+                            step={1}
+                            width={400}
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField name="rpm_limit_type" bare>
+                        {(control) => (
+                          <RateLimitTypeFormItem
+                            type="rpm"
+                            name="rpm_limit_type"
+                            className="mt-4"
+                            showDetailedDescriptions
+                            id={control.id}
+                            value={control.value as string | null | undefined}
+                            onChange={control.onChange}
+                            aria-invalid={control["aria-invalid"] ? true : undefined}
+                            aria-describedby={control["aria-describedby"]}
+                          />
+                        )}
+                      </MountedFormField>
+                      <Field className="mt-4">
+                        <FieldLabel>
+                          <span>
+                            Per-Tag Rate Limits{" "}
+                            <Tooltip title="Scope rate limits to a request tag so each tag (e.g. a cell or group) gets its own RPM counter. Requests without a matching tag fall back to the key-level limit.">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        </FieldLabel>
+                        <TagRateLimitEditor value={tagRateLimits} onChange={setTagRateLimits} />
+                      </Field>
+                      <MountedFormField
+                        className="mt-4"
+                        label={
+                          <span>
+                            Throttle on budget exceeded{" "}
+                            <Tooltip title="When this key exceeds its max budget, throttle its TPM/RPM to the globally configured percentage instead of blocking access entirely. Requires budget_exceeded_throttle_percentage in litellm_settings and a TPM/RPM limit on the key.">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="throttle_on_budget_exceeded"
+                      >
+                        {(control) => (
+                          <Switch
+                            id={control.id}
+                            checked={control.value as boolean | undefined}
+                            onChange={control.onChange}
+                            checkedChildren="Yes"
+                            unCheckedChildren="No"
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField
+                        className="mt-4"
+                        label={
+                          <span>
+                            Enable Prompt Caching{" "}
+                            <Tooltip title="Automatically add prompt caching breakpoints (cache_control markers) to requests made with this key, cutting input cost on repeated prompts. Applies to Anthropic and Bedrock Claude models; requests that already set their own cache_control markers are left untouched.">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="enable_prompt_caching"
+                      >
+                        {(control) => (
+                          <Switch
+                            id={control.id}
+                            checked={control.value as boolean | undefined}
+                            onChange={control.onChange}
+                            checkedChildren="Yes"
+                            unCheckedChildren="No"
+                          />
+                        )}
+                      </MountedFormField>
                       <MountedFormField
                         label={
                           <span>
-                            Policies{" "}
-                            <Tooltip title="Apply policies to this key to control guardrails and other settings">
+                            Guardrails{" "}
+                            <Tooltip title="Apply safety guardrails to this key to filter content or enforce policies">
                               <a
-                                href="https://docs.litellm.ai/docs/proxy/guardrails/guardrail_policies"
+                                href="https://docs.litellm.ai/docs/proxy/guardrails/quick_start"
                                 target="_blank"
                                 rel="noopener noreferrer"
                                 onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
                               >
-                                <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+                                <Info className="ml-1 inline size-3.5 align-text-bottom" />
                               </a>
                             </Tooltip>
                           </span>
                         }
-                        name="policies"
+                        name="guardrails"
                         className="mt-4"
                         help={
-                          premiumUser
-                            ? "Select existing policies or enter new ones"
-                            : "Premium feature - Upgrade to set policies by key"
+                          canEditGuardrails
+                            ? "Select existing guardrails or enter new ones"
+                            : "Premium feature - Upgrade to set guardrails by key"
                         }
                       >
                         {(control) => (
@@ -1291,41 +1209,250 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
                             value={control.value as string[] | undefined}
                             mode="tags"
                             style={{ width: "100%" }}
-                            disabled={!premiumUser}
+                            disabled={!canEditGuardrails}
                             placeholder={
-                              !premiumUser
-                                ? "Premium feature - Upgrade to set policies by key"
-                                : "Select or enter policies"
+                              !canEditGuardrails
+                                ? "Premium feature - Upgrade to set guardrails by key"
+                                : "Select or enter guardrails"
                             }
-                            options={policiesList.map((name) => ({ value: name, label: name }))}
+                            options={guardrailsList.map((name) => ({ value: name, label: name }))}
                           />
                         )}
                       </MountedFormField>
-                    )}
-                    {canViewPrompts && (
                       <MountedFormField
                         label={
                           <span>
-                            Prompts{" "}
-                            <Tooltip title="Allow this key to use specific prompt templates">
+                            Disable Global Guardrails{" "}
+                            <Tooltip title="When enabled, this key will bypass any guardrails configured to run on every request (global guardrails)">
                               <a
-                                href="https://docs.litellm.ai/docs/proxy/prompt_management"
+                                href="https://docs.litellm.ai/docs/proxy/guardrails/quick_start"
                                 target="_blank"
                                 rel="noopener noreferrer"
                                 onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
                               >
-                                <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+                                <Info className="ml-1 inline size-3.5 align-text-bottom" />
                               </a>
                             </Tooltip>
                           </span>
                         }
-                        name="prompts"
+                        name="disable_global_guardrails"
+                        className="mt-4"
+                        help={
+                          canEditGuardrails
+                            ? "Bypass global guardrails for this key"
+                            : "Premium feature - Upgrade to disable global guardrails by key"
+                        }
+                      >
+                        {(control) => (
+                          <Switch
+                            id={control.id}
+                            checked={control.value as boolean | undefined}
+                            onChange={control.onChange}
+                            disabled={!canEditGuardrails}
+                            checkedChildren="Yes"
+                            unCheckedChildren="No"
+                          />
+                        )}
+                      </MountedFormField>
+                      {canViewPolicies && (
+                        <MountedFormField
+                          label={
+                            <span>
+                              Policies{" "}
+                              <Tooltip title="Apply policies to this key to control guardrails and other settings">
+                                <a
+                                  href="https://docs.litellm.ai/docs/proxy/guardrails/guardrail_policies"
+                                  target="_blank"
+                                  rel="noopener noreferrer"
+                                  onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
+                                >
+                                  <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                                </a>
+                              </Tooltip>
+                            </span>
+                          }
+                          name="policies"
+                          className="mt-4"
+                          help={
+                            premiumUser
+                              ? "Select existing policies or enter new ones"
+                              : "Premium feature - Upgrade to set policies by key"
+                          }
+                        >
+                          {(control) => (
+                            <Select
+                              {...control}
+                              value={control.value as string[] | undefined}
+                              mode="tags"
+                              style={{ width: "100%" }}
+                              disabled={!premiumUser}
+                              placeholder={
+                                !premiumUser
+                                  ? "Premium feature - Upgrade to set policies by key"
+                                  : "Select or enter policies"
+                              }
+                              options={policiesList.map((name) => ({ value: name, label: name }))}
+                            />
+                          )}
+                        </MountedFormField>
+                      )}
+                      {canViewPrompts && (
+                        <MountedFormField
+                          label={
+                            <span>
+                              Prompts{" "}
+                              <Tooltip title="Allow this key to use specific prompt templates">
+                                <a
+                                  href="https://docs.litellm.ai/docs/proxy/prompt_management"
+                                  target="_blank"
+                                  rel="noopener noreferrer"
+                                  onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
+                                >
+                                  <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                                </a>
+                              </Tooltip>
+                            </span>
+                          }
+                          name="prompts"
+                          className="mt-4"
+                          help={
+                            premiumUser
+                              ? "Select existing prompts or enter new ones"
+                              : "Premium feature - Upgrade to set prompts by key"
+                          }
+                        >
+                          {(control) => (
+                            <Select
+                              {...control}
+                              value={control.value as string[] | undefined}
+                              mode="tags"
+                              style={{ width: "100%" }}
+                              disabled={!premiumUser}
+                              placeholder={
+                                !premiumUser
+                                  ? "Premium feature - Upgrade to set prompts by key"
+                                  : "Select or enter prompts"
+                              }
+                              options={promptsList.map((name) => ({ value: name, label: name }))}
+                            />
+                          )}
+                        </MountedFormField>
+                      )}
+                      <MountedFormField
+                        label={
+                          <span>
+                            Access Groups{" "}
+                            <Tooltip title="Assign access groups to this key. Access groups control which models, MCP servers, and agents this key can use">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="access_group_ids"
+                        className="mt-4"
+                        help="Select access groups to assign to this key"
+                      >
+                        {(control) => (
+                          <AccessGroupSelector
+                            value={control.value as string[] | undefined}
+                            onChange={control.onChange}
+                            placeholder="Select access groups (optional)"
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField
+                        label={
+                          <span>
+                            Allowed Pass Through Routes{" "}
+                            <Tooltip title="Allow this key to use specific pass through routes">
+                              <a
+                                href="https://docs.litellm.ai/docs/proxy/pass_through"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
+                              >
+                                <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                              </a>
+                            </Tooltip>
+                          </span>
+                        }
+                        name="allowed_passthrough_routes"
                         className="mt-4"
                         help={
                           premiumUser
-                            ? "Select existing prompts or enter new ones"
-                            : "Premium feature - Upgrade to set prompts by key"
+                            ? "Select existing pass through routes or enter new ones"
+                            : "Premium feature - Upgrade to set pass through routes by key"
                         }
+                      >
+                        {(control) => (
+                          <PassThroughRoutesSelector
+                            value={control.value as string[] | undefined}
+                            onChange={control.onChange}
+                            accessToken={accessToken}
+                            placeholder={
+                              !premiumUser
+                                ? "Premium feature - Upgrade to set pass through routes by key"
+                                : "Select or enter pass through routes"
+                            }
+                            disabled={!premiumUser}
+                            teamId={selectedCreateKeyTeam ? selectedCreateKeyTeam.team_id : null}
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField
+                        label={
+                          <span>
+                            Allowed Vector Stores{" "}
+                            <Tooltip title="Select which vector stores this key can access. If none selected, the key will have access to all available vector stores">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="allowed_vector_store_ids"
+                        className="mt-4"
+                        help="Select vector stores this key can access. Leave empty for access to all vector stores"
+                      >
+                        {(control) => (
+                          <VectorStoreSelector
+                            onChange={control.onChange}
+                            value={control.value as string[] | undefined}
+                            accessToken={accessToken}
+                            placeholder="Select vector stores (optional)"
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField
+                        label={
+                          <span>
+                            Metadata{" "}
+                            <Tooltip title="JSON object with additional information about this key. Used for tracking or custom logic">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="metadata"
+                        className="mt-4"
+                      >
+                        {(control) => (
+                          <AntdInput.TextArea
+                            {...control}
+                            value={control.value as string | undefined}
+                            rows={4}
+                            placeholder="Enter metadata as JSON"
+                          />
+                        )}
+                      </MountedFormField>
+                      <MountedFormField
+                        label={
+                          <span>
+                            Tags{" "}
+                            <Tooltip title="Tags for tracking spend and/or doing tag-based routing. Used for analytics and filtering">
+                              <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                            </Tooltip>
+                          </span>
+                        }
+                        name="tags"
+                        className="mt-4"
+                        help={`Tags for tracking spend and/or doing tag-based routing.`}
                       >
                         {(control) => (
                           <Select
@@ -1333,437 +1460,306 @@ const CreateKey: React.FC<CreateKeyProps> = ({ team, teams, data, addKey, autoOp
                             value={control.value as string[] | undefined}
                             mode="tags"
                             style={{ width: "100%" }}
-                            disabled={!premiumUser}
-                            placeholder={
-                              !premiumUser
-                                ? "Premium feature - Upgrade to set prompts by key"
-                                : "Select or enter prompts"
-                            }
-                            options={promptsList.map((name) => ({ value: name, label: name }))}
+                            placeholder="Select or enter tags"
+                            tokenSeparators={[","]}
+                            options={tagOptions}
                           />
                         )}
                       </MountedFormField>
-                    )}
-                    <MountedFormField
-                      label={
-                        <span>
-                          Access Groups{" "}
-                          <Tooltip title="Assign access groups to this key. Access groups control which models, MCP servers, and agents this key can use">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="access_group_ids"
-                      className="mt-4"
-                      help="Select access groups to assign to this key"
-                    >
-                      {(control) => (
-                        <AccessGroupSelector
-                          value={control.value as string[] | undefined}
-                          onChange={control.onChange}
-                          placeholder="Select access groups (optional)"
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      label={
-                        <span>
-                          Allowed Pass Through Routes{" "}
-                          <Tooltip title="Allow this key to use specific pass through routes">
-                            <a
-                              href="https://docs.litellm.ai/docs/proxy/pass_through"
-                              target="_blank"
-                              rel="noopener noreferrer"
-                              onClick={(e) => e.stopPropagation()} // Prevent accordion from collapsing when clicking link
-                            >
-                              <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                            </a>
-                          </Tooltip>
-                        </span>
-                      }
-                      name="allowed_passthrough_routes"
-                      className="mt-4"
-                      help={
-                        premiumUser
-                          ? "Select existing pass through routes or enter new ones"
-                          : "Premium feature - Upgrade to set pass through routes by key"
-                      }
-                    >
-                      {(control) => (
-                        <PassThroughRoutesSelector
-                          value={control.value as string[] | undefined}
-                          onChange={control.onChange}
-                          accessToken={accessToken}
-                          placeholder={
-                            !premiumUser
-                              ? "Premium feature - Upgrade to set pass through routes by key"
-                              : "Select or enter pass through routes"
-                          }
-                          disabled={!premiumUser}
-                          teamId={selectedCreateKeyTeam ? selectedCreateKeyTeam.team_id : null}
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      label={
-                        <span>
-                          Allowed Vector Stores{" "}
-                          <Tooltip title="Select which vector stores this key can access. If none selected, the key will have access to all available vector stores">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="allowed_vector_store_ids"
-                      className="mt-4"
-                      help="Select vector stores this key can access. Leave empty for access to all vector stores"
-                    >
-                      {(control) => (
-                        <VectorStoreSelector
-                          onChange={control.onChange}
-                          value={control.value as string[] | undefined}
-                          accessToken={accessToken}
-                          placeholder="Select vector stores (optional)"
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      label={
-                        <span>
-                          Metadata{" "}
-                          <Tooltip title="JSON object with additional information about this key. Used for tracking or custom logic">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="metadata"
-                      className="mt-4"
-                    >
-                      {(control) => (
-                        <AntdInput.TextArea
-                          {...control}
-                          value={control.value as string | undefined}
-                          rows={4}
-                          placeholder="Enter metadata as JSON"
-                        />
-                      )}
-                    </MountedFormField>
-                    <MountedFormField
-                      label={
-                        <span>
-                          Tags{" "}
-                          <Tooltip title="Tags for tracking spend and/or doing tag-based routing. Used for analytics and filtering">
-                            <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                          </Tooltip>
-                        </span>
-                      }
-                      name="tags"
-                      className="mt-4"
-                      help={`Tags for tracking spend and/or doing tag-based routing.`}
-                    >
-                      {(control) => (
-                        <Select
-                          {...control}
-                          value={control.value as string[] | undefined}
-                          mode="tags"
-                          style={{ width: "100%" }}
-                          placeholder="Select or enter tags"
-                          tokenSeparators={[","]}
-                          options={tagOptions}
-                        />
-                      )}
-                    </MountedFormField>
-                    <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
-                      <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                        <b>MCP Settings</b>
-                        <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                      </CollapsibleTrigger>
-                      <CollapsibleContent className="px-4 pb-3">
-                        <MountedFormField
-                          label={
-                            <span>
-                              Allowed MCP Servers{" "}
-                              <Tooltip title="Select which MCP servers or access groups this key can access">
-                                <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                              </Tooltip>
-                            </span>
-                          }
-                          name="allowed_mcp_servers_and_groups"
-                          help="Select MCP servers or access groups this key can access"
-                        >
-                          {(control) => (
-                            <MCPServerSelector
-                              onChange={control.onChange}
-                              value={control.value as McpSelectorValue | undefined}
-                              accessToken={accessToken}
-                              teamId={selectedCreateKeyTeam?.team_id ?? null}
-                              placeholder="Select MCP servers or access groups (optional)"
-                              allowNoMcpServers
-                            />
-                          )}
-                        </MountedFormField>
-
-                        {/* Hidden field to register mcp_tool_permissions with the form */}
-                        <MountedFormField name="mcp_tool_permissions" bare>
-                          {(control) => <input type="hidden" id={control.id} name={control.name} />}
-                        </MountedFormField>
-
-                        <McpToolPermissionsField
-                          accessToken={accessToken}
-                          control={form.control}
-                          setValue={form.setValue}
-                        />
-                      </CollapsibleContent>
-                    </Collapsible>
-
-                    <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
-                      <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                        <b>Agent Settings</b>
-                        <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                      </CollapsibleTrigger>
-                      <CollapsibleContent className="px-4 pb-3">
-                        <MountedFormField
-                          label={
-                            <span>
-                              Allowed Agents{" "}
-                              <Tooltip title="Select which agents or access groups this key can access">
-                                <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                              </Tooltip>
-                            </span>
-                          }
-                          name="allowed_agents_and_groups"
-                          help="Select agents or access groups this key can access"
-                        >
-                          {(control) => (
-                            <AgentSelector
-                              onChange={control.onChange}
-                              value={control.value as AgentSelectorValue | undefined}
-                              accessToken={accessToken}
-                              placeholder="Select agents or access groups (optional)"
-                            />
-                          )}
-                        </MountedFormField>
-                      </CollapsibleContent>
-                    </Collapsible>
-
-                    {premiumUser ? (
                       <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
                         <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                          <b>Logging Settings</b>
+                          <b>MCP Settings</b>
                           <ChevronDown className={SECTION_CHEVRON_CLASS} />
                         </CollapsibleTrigger>
                         <CollapsibleContent className="px-4 pb-3">
-                          <div className="mt-4">
-                            <PremiumLoggingSettings
-                              value={loggingSettings}
-                              onChange={setLoggingSettings}
-                              premiumUser={true}
-                              disabledCallbacks={disabledCallbacks}
-                              onDisabledCallbacksChange={setDisabledCallbacks}
+                          <MountedFormField
+                            label={
+                              <span>
+                                Allowed MCP Servers{" "}
+                                <Tooltip title="Select which MCP servers or access groups this key can access">
+                                  <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                                </Tooltip>
+                              </span>
+                            }
+                            name="allowed_mcp_servers_and_groups"
+                            help="Select MCP servers or access groups this key can access"
+                          >
+                            {(control) => (
+                              <MCPServerSelector
+                                onChange={control.onChange}
+                                value={control.value as McpSelectorValue | undefined}
+                                accessToken={accessToken}
+                                teamId={selectedCreateKeyTeam?.team_id ?? null}
+                                placeholder="Select MCP servers or access groups (optional)"
+                                allowNoMcpServers
+                              />
+                            )}
+                          </MountedFormField>
+
+                          {/* Hidden field to register mcp_tool_permissions with the form */}
+                          <MountedFormField name="mcp_tool_permissions" bare>
+                            {(control) => <input type="hidden" id={control.id} name={control.name} />}
+                          </MountedFormField>
+
+                          <McpToolPermissionsField
+                            accessToken={accessToken}
+                            control={form.control}
+                            setValue={form.setValue}
+                          />
+                        </CollapsibleContent>
+                      </Collapsible>
+
+                      <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
+                        <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                          <b>Agent Settings</b>
+                          <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                        </CollapsibleTrigger>
+                        <CollapsibleContent className="px-4 pb-3">
+                          <MountedFormField
+                            label={
+                              <span>
+                                Allowed Agents{" "}
+                                <Tooltip title="Select which agents or access groups this key can access">
+                                  <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                                </Tooltip>
+                              </span>
+                            }
+                            name="allowed_agents_and_groups"
+                            help="Select agents or access groups this key can access"
+                          >
+                            {(control) => (
+                              <AgentSelector
+                                onChange={control.onChange}
+                                value={control.value as AgentSelectorValue | undefined}
+                                accessToken={accessToken}
+                                placeholder="Select agents or access groups (optional)"
+                              />
+                            )}
+                          </MountedFormField>
+                        </CollapsibleContent>
+                      </Collapsible>
+
+                      {premiumUser ? (
+                        <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
+                          <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                            <b>Logging Settings</b>
+                            <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                          </CollapsibleTrigger>
+                          <CollapsibleContent className="px-4 pb-3">
+                            <div className="mt-4">
+                              <PremiumLoggingSettings
+                                value={loggingSettings}
+                                onChange={setLoggingSettings}
+                                premiumUser={true}
+                                disabledCallbacks={disabledCallbacks}
+                                onDisabledCallbacksChange={setDisabledCallbacks}
+                              />
+                            </div>
+                          </CollapsibleContent>
+                        </Collapsible>
+                      ) : (
+                        <Tooltip
+                          title={
+                            <span>
+                              Key-level logging settings is an enterprise feature, get in touch -
+                              <a href="https://www.litellm.ai/enterprise" target="_blank">
+                                https://www.litellm.ai/enterprise
+                              </a>
+                            </span>
+                          }
+                          placement="top"
+                        >
+                          <div style={{ position: "relative" }}>
+                            <div style={{ opacity: 0.5 }}>
+                              <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
+                                <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                                  <b>Logging Settings</b>
+                                  <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                                </CollapsibleTrigger>
+                                <CollapsibleContent className="px-4 pb-3">
+                                  <div className="mt-4">
+                                    <PremiumLoggingSettings
+                                      value={loggingSettings}
+                                      onChange={setLoggingSettings}
+                                      premiumUser={false}
+                                      disabledCallbacks={disabledCallbacks}
+                                      onDisabledCallbacksChange={setDisabledCallbacks}
+                                    />
+                                  </div>
+                                </CollapsibleContent>
+                              </Collapsible>
+                            </div>
+                            <div style={{ position: "absolute", inset: 0, cursor: "not-allowed" }} />
+                          </div>
+                        </Tooltip>
+                      )}
+
+                      <Collapsible
+                        key={`router-settings-accordion-${routerSettingsKey}`}
+                        className="mt-4 mb-4 overflow-hidden rounded-lg border"
+                      >
+                        <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                          <b>Router Settings</b>
+                          <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                        </CollapsibleTrigger>
+                        <CollapsibleContent className="px-4 pb-3">
+                          <div className="mt-4 w-full">
+                            <RouterSettingsAccordion
+                              key={routerSettingsKey}
+                              accessToken={accessToken || ""}
+                              value={routerSettings || undefined}
+                              onChange={setRouterSettings}
+                              modelData={
+                                userModels.length > 0
+                                  ? { data: userModels.map((model) => ({ model_name: model })) }
+                                  : undefined
+                              }
                             />
                           </div>
                         </CollapsibleContent>
                       </Collapsible>
-                    ) : (
-                      <Tooltip
-                        title={
-                          <span>
-                            Key-level logging settings is an enterprise feature, get in touch -
-                            <a href="https://www.litellm.ai/enterprise" target="_blank">
-                              https://www.litellm.ai/enterprise
-                            </a>
-                          </span>
-                        }
-                        placement="top"
-                      >
-                        <div style={{ position: "relative" }}>
-                          <div style={{ opacity: 0.5 }}>
-                            <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
-                              <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                                <b>Logging Settings</b>
-                                <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                              </CollapsibleTrigger>
-                              <CollapsibleContent className="px-4 pb-3">
-                                <div className="mt-4">
-                                  <PremiumLoggingSettings
-                                    value={loggingSettings}
-                                    onChange={setLoggingSettings}
-                                    premiumUser={false}
-                                    disabledCallbacks={disabledCallbacks}
-                                    onDisabledCallbacksChange={setDisabledCallbacks}
-                                  />
-                                </div>
-                              </CollapsibleContent>
-                            </Collapsible>
+
+                      <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
+                        <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                          <b>Model Aliases</b>
+                          <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                        </CollapsibleTrigger>
+                        <CollapsibleContent className="px-4 pb-3">
+                          <div className="mt-4">
+                            <p className="text-sm text-muted-foreground mb-4">
+                              Create custom aliases for models that can be used in API calls. This allows you to create
+                              shortcuts for specific models.
+                            </p>
+                            <ModelAliasManager
+                              accessToken={accessToken}
+                              initialModelAliases={modelAliases}
+                              onAliasUpdate={setModelAliases}
+                              showExampleConfig={false}
+                            />
                           </div>
-                          <div style={{ position: "absolute", inset: 0, cursor: "not-allowed" }} />
-                        </div>
-                      </Tooltip>
-                    )}
+                        </CollapsibleContent>
+                      </Collapsible>
 
-                    <Collapsible
-                      key={`router-settings-accordion-${routerSettingsKey}`}
-                      className="mt-4 mb-4 overflow-hidden rounded-lg border"
-                    >
-                      <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                        <b>Router Settings</b>
-                        <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                      </CollapsibleTrigger>
-                      <CollapsibleContent className="px-4 pb-3">
-                        <div className="mt-4 w-full">
-                          <RouterSettingsAccordion
-                            key={routerSettingsKey}
-                            accessToken={accessToken || ""}
-                            value={routerSettings || undefined}
-                            onChange={setRouterSettings}
-                            modelData={
-                              userModels.length > 0
-                                ? { data: userModels.map((model) => ({ model_name: model })) }
-                                : undefined
-                            }
+                      <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
+                        <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                          <b>Key Lifecycle</b>
+                          <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                        </CollapsibleTrigger>
+                        <CollapsibleContent className="px-4 pb-3">
+                          <div className="mt-4">
+                            <MountedFormField name="duration" bare>
+                              {(control) => (
+                                <KeyLifecycleSettings
+                                  id={control.id}
+                                  value={control.value as string | undefined}
+                                  onChange={control.onChange}
+                                  autoRotationEnabled={autoRotationEnabled}
+                                  onAutoRotationChange={setAutoRotationEnabled}
+                                  rotationInterval={rotationInterval}
+                                  onRotationIntervalChange={setRotationInterval}
+                                  isCreateMode={true}
+                                />
+                              )}
+                            </MountedFormField>
+                          </div>
+                        </CollapsibleContent>
+                      </Collapsible>
+                      <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
+                        <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
+                          <div className="flex items-center gap-2">
+                            <b>Advanced Settings</b>
+                            <Tooltip
+                              title={
+                                <span>
+                                  Learn more about advanced settings in our{" "}
+                                  <a
+                                    href={
+                                      proxyBaseUrl
+                                        ? `${proxyBaseUrl}/#/key%20management/generate_key_fn_key_generate_post`
+                                        : `/#/key%20management/generate_key_fn_key_generate_post`
+                                    }
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    className="text-blue-400 hover:text-blue-300"
+                                  >
+                                    documentation
+                                  </a>
+                                </span>
+                              }
+                            >
+                              <Info className="size-4 text-muted-foreground hover:text-foreground cursor-help" />
+                            </Tooltip>
+                          </div>
+                          <ChevronDown className={SECTION_CHEVRON_CLASS} />
+                        </CollapsibleTrigger>
+                        <CollapsibleContent className="px-4 pb-3">
+                          <SchemaFormFields
+                            schemaComponent="GenerateKeyRequest"
+                            setValue={form.setValue}
+                            excludedFields={[
+                              "key_alias",
+                              "team_id",
+                              "organization_id",
+                              "models",
+                              "duration",
+                              "metadata",
+                              "tags",
+                              "guardrails",
+                              "max_budget",
+                              "budget_duration",
+                              "tpm_limit",
+                              "rpm_limit",
+                              ...(disableCustomApiKeys ? ["key"] : []),
+                            ]}
                           />
-                        </div>
-                      </CollapsibleContent>
-                    </Collapsible>
+                        </CollapsibleContent>
+                      </Collapsible>
+                    </CollapsibleContent>
+                  </Collapsible>
+                </div>
+              )}
 
-                    <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
-                      <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                        <b>Model Aliases</b>
-                        <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                      </CollapsibleTrigger>
-                      <CollapsibleContent className="px-4 pb-3">
-                        <div className="mt-4">
-                          <p className="text-sm text-muted-foreground mb-4">
-                            Create custom aliases for models that can be used in API calls. This allows you to create
-                            shortcuts for specific models.
-                          </p>
-                          <ModelAliasManager
-                            accessToken={accessToken}
-                            initialModelAliases={modelAliases}
-                            onAliasUpdate={setModelAliases}
-                            showExampleConfig={false}
-                          />
-                        </div>
-                      </CollapsibleContent>
-                    </Collapsible>
-
-                    <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
-                      <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                        <b>Key Lifecycle</b>
-                        <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                      </CollapsibleTrigger>
-                      <CollapsibleContent className="px-4 pb-3">
-                        <div className="mt-4">
-                          <MountedFormField name="duration" bare>
-                            {(control) => (
-                              <KeyLifecycleSettings
-                                id={control.id}
-                                value={control.value as string | undefined}
-                                onChange={control.onChange}
-                                autoRotationEnabled={autoRotationEnabled}
-                                onAutoRotationChange={setAutoRotationEnabled}
-                                rotationInterval={rotationInterval}
-                                onRotationIntervalChange={setRotationInterval}
-                                isCreateMode={true}
-                              />
-                            )}
-                          </MountedFormField>
-                        </div>
-                      </CollapsibleContent>
-                    </Collapsible>
-                    <Collapsible className="mt-4 mb-4 overflow-hidden rounded-lg border">
-                      <CollapsibleTrigger className={SECTION_HEADER_CLASS}>
-                        <div className="flex items-center gap-2">
-                          <b>Advanced Settings</b>
-                          <Tooltip
-                            title={
-                              <span>
-                                Learn more about advanced settings in our{" "}
-                                <a
-                                  href={
-                                    proxyBaseUrl
-                                      ? `${proxyBaseUrl}/#/key%20management/generate_key_fn_key_generate_post`
-                                      : `/#/key%20management/generate_key_fn_key_generate_post`
-                                  }
-                                  target="_blank"
-                                  rel="noopener noreferrer"
-                                  className="text-blue-400 hover:text-blue-300"
-                                >
-                                  documentation
-                                </a>
-                              </span>
-                            }
-                          >
-                            <InfoCircleOutlined className="text-muted-foreground hover:text-foreground cursor-help" />
-                          </Tooltip>
-                        </div>
-                        <ChevronDown className={SECTION_CHEVRON_CLASS} />
-                      </CollapsibleTrigger>
-                      <CollapsibleContent className="px-4 pb-3">
-                        <SchemaFormFields
-                          schemaComponent="GenerateKeyRequest"
-                          setValue={form.setValue}
-                          excludedFields={[
-                            "key_alias",
-                            "team_id",
-                            "organization_id",
-                            "models",
-                            "duration",
-                            "metadata",
-                            "tags",
-                            "guardrails",
-                            "max_budget",
-                            "budget_duration",
-                            "tpm_limit",
-                            "rpm_limit",
-                            ...(disableCustomApiKeys ? ["key"] : []),
-                          ]}
-                        />
-                      </CollapsibleContent>
-                    </Collapsible>
-                  </CollapsibleContent>
-                </Collapsible>
+              <div style={{ textAlign: "right", marginTop: "10px" }}>
+                <Button type="submit" disabled={isFormDisabled}>
+                  Create Key
+                </Button>
               </div>
-            )}
-
-            <div style={{ textAlign: "right", marginTop: "10px" }}>
-              <Button type="submit" disabled={isFormDisabled}>
-                Create Key
-              </Button>
-            </div>
-          </form>
-        </MountedFormProvider>
-      </Modal>
+            </form>
+          </MountedFormProvider>
+        </DialogContent>
+      </Dialog>
 
       {/* Add the Create User Modal */}
       {isCreateUserModalVisible && (
-        <Modal
-          title="Create New User"
-          open={isCreateUserModalVisible}
-          onCancel={() => setIsCreateUserModalVisible(false)}
-          footer={null}
-          width={800}
-        >
-          <CreateUserButton
-            userID={userID}
-            accessToken={accessToken}
-            possibleUIRoles={possibleUIRoles}
-            onUserCreated={handleUserCreated}
-            isEmbedded={true}
-          />
-        </Modal>
+        <Dialog open={isCreateUserModalVisible} onOpenChange={(open) => !open && setIsCreateUserModalVisible(false)}>
+          <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[800px]">
+            <DialogHeader>
+              <DialogTitle>Create New User</DialogTitle>
+            </DialogHeader>
+            <CreateUserButton
+              userID={userID}
+              accessToken={accessToken}
+              possibleUIRoles={possibleUIRoles}
+              onUserCreated={handleUserCreated}
+              isEmbedded={true}
+            />
+          </DialogContent>
+        </Dialog>
       )}
 
       {apiKey && (
-        <Modal open={isModalVisible} onOk={handleOk} onCancel={handleCancel} footer={null}>
-          <div className="grid grid-cols-1 gap-2 w-full">
-            <h3 className="text-lg font-medium text-foreground">Save your Key</h3>
-            {apiKey != null ? (
-              <CreatedKeyDisplay apiKey={apiKey} />
-            ) : (
-              <p className="text-sm">Key being created, this might take 30s</p>
-            )}
-          </div>
-        </Modal>
+        <Dialog open={isModalVisible} onOpenChange={(open) => !open && handleCancel()}>
+          <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+            <div className="grid grid-cols-1 gap-2 w-full">
+              <DialogTitle className="text-lg font-medium text-foreground">Save your Key</DialogTitle>
+              {apiKey != null ? (
+                <CreatedKeyDisplay apiKey={apiKey} />
+              ) : (
+                <p className="text-sm">Key being created, this might take 30s</p>
+              )}
+            </div>
+          </DialogContent>
+        </Dialog>
       )}
     </div>
   );
diff --git a/ui/litellm-dashboard/src/components/query_param_input.test.tsx b/ui/litellm-dashboard/src/components/query_param_input.test.tsx
index fc68103c252..43fa350344b 100644
--- a/ui/litellm-dashboard/src/components/query_param_input.test.tsx
+++ b/ui/litellm-dashboard/src/components/query_param_input.test.tsx
@@ -1,12 +1,27 @@
+import { useState } from "react";
 import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
 import QueryParamInput from "./query_param_input";
+import type { KeyValuePair } from "./key_value_input";
+
+const ControlledQueryParamInput = ({ onChange }: { onChange?: (value: readonly KeyValuePair[]) => void }) => {
+  const [value, setValue] = useState<readonly KeyValuePair[]>([]);
+  return (
+    <QueryParamInput
+      value={value}
+      onChange={(next) => {
+        setValue(next);
+        onChange?.(next);
+      }}
+    />
+  );
+};
 
 describe("QueryParamInput", () => {
   it("renders existing query parameter pairs", () => {
-    render(<QueryParamInput value={{ version: "v1" }} />);
+    render(<QueryParamInput value={[["version", "v1"]]} />);
 
     expect(screen.getByPlaceholderText("Parameter Name (e.g., version)")).toHaveValue("version");
     expect(screen.getByPlaceholderText("Parameter Value (e.g., v1)")).toHaveValue("v1");
@@ -15,12 +30,31 @@ describe("QueryParamInput", () => {
   it("adds a query parameter row and emits edits", async () => {
     const user = userEvent.setup();
     const onChange = vi.fn();
-    render(<QueryParamInput onChange={onChange} />);
+    render(<ControlledQueryParamInput onChange={onChange} />);
 
     await user.click(screen.getByRole("button", { name: /Add Query Parameter$/ }));
     fireEvent.change(screen.getByPlaceholderText("Parameter Name (e.g., version)"), { target: { value: "region" } });
     fireEvent.change(screen.getByPlaceholderText("Parameter Value (e.g., v1)"), { target: { value: "us-west" } });
 
-    expect(onChange).toHaveBeenLastCalledWith({ region: "us-west" });
+    expect(onChange).toHaveBeenLastCalledWith([["region", "us-west"]]);
+  });
+
+  it("renders no rows once the value prop goes back to empty", () => {
+    const { rerender } = render(<QueryParamInput value={[["version", "v1"]]} />);
+    expect(screen.getByPlaceholderText("Parameter Name (e.g., version)")).toHaveValue("version");
+
+    rerender(<QueryParamInput value={[]} />);
+
+    expect(screen.queryByPlaceholderText("Parameter Name (e.g., version)")).not.toBeInTheDocument();
+  });
+
+  it("keeps a half-typed row editable while its name is still empty", async () => {
+    const user = userEvent.setup();
+    render(<ControlledQueryParamInput />);
+
+    await user.click(screen.getByRole("button", { name: /Add Query Parameter$/ }));
+    await user.click(screen.getByRole("button", { name: /Add Query Parameter$/ }));
+
+    expect(screen.getAllByPlaceholderText("Parameter Name (e.g., version)")).toHaveLength(2);
   });
 });
diff --git a/ui/litellm-dashboard/src/components/query_param_input.tsx b/ui/litellm-dashboard/src/components/query_param_input.tsx
index 1c7a67b35ea..4bb53f68a42 100644
--- a/ui/litellm-dashboard/src/components/query_param_input.tsx
+++ b/ui/litellm-dashboard/src/components/query_param_input.tsx
@@ -1,47 +1,36 @@
-import React, { useState } from "react";
+import React from "react";
 import { Minus, Plus } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import type { KeyValuePair } from "./key_value_input";
 
 interface QueryParamInputProps {
-  value?: Record<string, string>;
-  onChange?: (value: Record<string, string>) => void;
+  value?: readonly KeyValuePair[];
+  onChange?: (value: readonly KeyValuePair[]) => void;
 }
 
-const QueryParamInput: React.FC<QueryParamInputProps> = ({ value = {}, onChange }) => {
-  const [pairs, setPairs] = useState<[string, string][]>(Object.entries(value));
+const QueryParamInput: React.FC<QueryParamInputProps> = ({ value = [], onChange }) => {
+  const handleAdd = () => onChange?.([...value, ["", ""]]);
 
-  const handleAdd = () => {
-    setPairs([...pairs, ["", ""]]);
-  };
+  const handleRemove = (index: number) => onChange?.(value.filter((_, i) => i !== index));
 
-  const handleRemove = (index: number) => {
-    const newPairs = pairs.filter((_, i) => i !== index);
-    setPairs(newPairs);
-    onChange?.(Object.fromEntries(newPairs));
-  };
-
-  const handleChange = (index: number, key: string, val: string) => {
-    const newPairs = [...pairs];
-    newPairs[index] = [key, val];
-    setPairs(newPairs);
-    onChange?.(Object.fromEntries(newPairs));
-  };
+  const handleChange = (index: number, pair: KeyValuePair) =>
+    onChange?.(value.map((existing, i) => (i === index ? pair : existing)));
 
   return (
     <div className="space-y-2">
-      {pairs.map(([key, val], index) => (
+      {value.map(([key, val], index) => (
         <div key={index} className="flex items-center gap-2">
           <Input
             placeholder="Parameter Name (e.g., version)"
             value={key}
-            onChange={(e) => handleChange(index, e.target.value, val)}
+            onChange={(e) => handleChange(index, [e.target.value, val])}
           />
           <Input
             placeholder="Parameter Value (e.g., v1)"
             value={val}
-            onChange={(e) => handleChange(index, key, e.target.value)}
+            onChange={(e) => handleChange(index, [key, e.target.value])}
           />
           <Button
             type="button"
diff --git a/ui/litellm-dashboard/src/components/router_settings/RouterSettingsForm.test.tsx b/ui/litellm-dashboard/src/components/router_settings/RouterSettingsForm.test.tsx
index 850bc8c20be..64f9f113fcc 100644
--- a/ui/litellm-dashboard/src/components/router_settings/RouterSettingsForm.test.tsx
+++ b/ui/litellm-dashboard/src/components/router_settings/RouterSettingsForm.test.tsx
@@ -4,25 +4,6 @@ import userEvent from "@testing-library/user-event";
 import RouterSettingsForm from "./RouterSettingsForm";
 import type { RouterSettingsFormValue } from "./RouterSettingsForm";
 
-// Override antd Select (complex to drive in JSDOM) while preserving the rest
-// of antd (Switch, Button, etc.) so nested components render normally.
-vi.mock("antd", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("antd")>();
-  return {
-    ...actual,
-    Select: Object.assign(
-      ({ value, onChange, children }: any) => (
-        <select data-testid="strategy-select" value={value ?? ""} onChange={(e) => onChange(e.target.value)}>
-          {children}
-        </select>
-      ),
-      {
-        Option: ({ value, children }: any) => <option value={value}>{children}</option>,
-      },
-    ),
-  };
-});
-
 const defaultValue: RouterSettingsFormValue = {
   routerSettings: {},
   selectedStrategy: null,
@@ -45,7 +26,7 @@ describe("RouterSettingsForm", () => {
 
   it("should not show the strategy selector when no strategies are provided", () => {
     render(<RouterSettingsForm {...baseProps} />);
-    expect(screen.queryByTestId("strategy-select")).not.toBeInTheDocument();
+    expect(screen.queryByRole("combobox")).not.toBeInTheDocument();
   });
 
   it("should show the strategy selector when strategies are available", () => {
@@ -54,7 +35,7 @@ describe("RouterSettingsForm", () => {
       availableRoutingStrategies: ["simple-shuffle", "latency-based-routing"],
     };
     render(<RouterSettingsForm {...props} />);
-    expect(screen.getByTestId("strategy-select")).toBeInTheDocument();
+    expect(screen.getByRole("combobox")).toBeInTheDocument();
   });
 
   it("should not render LatencyBasedConfiguration for non-latency strategies", () => {
@@ -91,7 +72,8 @@ describe("RouterSettingsForm", () => {
     };
     render(<RouterSettingsForm {...props} />);
 
-    await user.selectOptions(screen.getByTestId("strategy-select"), "latency-based-routing");
+    await user.click(screen.getByRole("combobox"));
+    await user.click(await screen.findByRole("option", { name: /latency-based-routing/ }));
 
     expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ selectedStrategy: "latency-based-routing" }));
   });
diff --git a/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.test.tsx b/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.test.tsx
index c3c3cebbefa..f9e19458bb8 100644
--- a/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.test.tsx
+++ b/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.test.tsx
@@ -3,22 +3,8 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import RoutingStrategySelector from "./RoutingStrategySelector";
 
-// Ant Design's Select is complex to drive in JSDOM; swap it for a plain
-// <select> so we can assert options and fire change events normally.
-vi.mock("antd", () => ({
-  Select: Object.assign(
-    ({ value, onChange, children }: any) => (
-      <div data-testid="ant-select">
-        <select data-testid="strategy-select" value={value ?? ""} onChange={(e) => onChange(e.target.value)}>
-          {children}
-        </select>
-      </div>
-    ),
-    {
-      Option: ({ value, children }: any) => <option value={value}>{children}</option>,
-    },
-  ),
-}));
+const openStrategyDropdown = async (user: ReturnType<typeof userEvent.setup>) =>
+  user.click(screen.getByRole("combobox"));
 
 const baseProps = {
   selectedStrategy: null,
@@ -34,7 +20,7 @@ const baseProps = {
 describe("RoutingStrategySelector", () => {
   it("should render", () => {
     render(<RoutingStrategySelector {...baseProps} />);
-    expect(screen.getByTestId("ant-select")).toBeInTheDocument();
+    expect(screen.getByRole("combobox")).toBeInTheDocument();
   });
 
   it("should display default label when no metadata is provided", () => {
@@ -57,23 +43,35 @@ describe("RoutingStrategySelector", () => {
     expect(screen.getByText("How to pick a deployment")).toBeInTheDocument();
   });
 
-  it("should render all available strategies as options", () => {
+  it("should render all available strategies as options", async () => {
+    const user = userEvent.setup();
     render(<RoutingStrategySelector {...baseProps} />);
-    expect(screen.getByText("simple-shuffle")).toBeInTheDocument();
-    expect(screen.getByText("latency-based-routing")).toBeInTheDocument();
-    expect(screen.getByText("least-busy")).toBeInTheDocument();
+
+    await openStrategyDropdown(user);
+
+    expect(await screen.findByRole("option", { name: /simple-shuffle/ })).toBeInTheDocument();
+    expect(screen.getByRole("option", { name: /latency-based-routing/ })).toBeInTheDocument();
+    expect(screen.getByRole("option", { name: /least-busy/ })).toBeInTheDocument();
   });
 
-  it("should display strategy descriptions alongside option labels", () => {
+  it("should display strategy descriptions alongside option labels", async () => {
+    const user = userEvent.setup();
     render(<RoutingStrategySelector {...baseProps} />);
-    expect(screen.getByText("Randomly pick a deployment")).toBeInTheDocument();
+
+    await openStrategyDropdown(user);
+
+    expect(await screen.findByText("Randomly pick a deployment")).toBeInTheDocument();
     expect(screen.getByText("Pick the lowest-latency deployment")).toBeInTheDocument();
   });
 
-  it("should not render a description for a strategy that has none", () => {
+  it("should not render a description for a strategy that has none", async () => {
+    const user = userEvent.setup();
     render(<RoutingStrategySelector {...baseProps} />);
-    // "least-busy" has no entry in routingStrategyDescriptions — it still renders without crashing
-    expect(screen.getByText("least-busy")).toBeInTheDocument();
+
+    await openStrategyDropdown(user);
+
+    // "least-busy" has no entry in routingStrategyDescriptions - it still offers the bare option
+    expect(await screen.findByRole("option", { name: "least-busy" })).toBeInTheDocument();
   });
 
   it("should call onStrategyChange with the selected strategy value", async () => {
@@ -81,7 +79,8 @@ describe("RoutingStrategySelector", () => {
     const user = userEvent.setup();
     render(<RoutingStrategySelector {...baseProps} onStrategyChange={onStrategyChange} />);
 
-    await user.selectOptions(screen.getByTestId("strategy-select"), "latency-based-routing");
+    await openStrategyDropdown(user);
+    await user.click(await screen.findByRole("option", { name: /latency-based-routing/ }));
 
     expect(onStrategyChange).toHaveBeenCalledWith("latency-based-routing");
   });
diff --git a/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.tsx b/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.tsx
index 44e91cde34a..95214f61324 100644
--- a/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.tsx
+++ b/ui/litellm-dashboard/src/components/router_settings/RoutingStrategySelector.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Select } from "antd";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 
 interface RoutingStrategySelectorProps {
   selectedStrategy: string | null;
@@ -27,17 +27,27 @@ const RoutingStrategySelector: React.FC<RoutingStrategySelectorProps> = ({
         </p>
       </div>
       <div className="routing-strategy-select max-w-3xl">
-        <Select value={selectedStrategy} onChange={onStrategyChange} style={{ width: "100%" }} size="large">
-          {availableStrategies.map((strategy) => (
-            <Select.Option key={strategy} value={strategy} label={strategy}>
-              <div className="flex flex-col gap-0.5 py-1">
-                <span className="font-mono text-sm font-medium">{strategy}</span>
-                {routingStrategyDescriptions[strategy] && (
-                  <span className="text-xs text-gray-500 font-normal">{routingStrategyDescriptions[strategy]}</span>
-                )}
-              </div>
-            </Select.Option>
-          ))}
+        <Select
+          value={selectedStrategy}
+          onValueChange={(strategy: string | null) => strategy && onStrategyChange(strategy)}
+        >
+          <SelectTrigger className="w-full">
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent>
+            {availableStrategies.map((strategy) => (
+              <SelectItem key={strategy} value={strategy}>
+                <div className="flex flex-col gap-0.5 py-1">
+                  <span className="font-mono text-sm font-medium">{strategy}</span>
+                  {routingStrategyDescriptions[strategy] && (
+                    <span className="text-xs font-normal text-muted-foreground">
+                      {routingStrategyDescriptions[strategy]}
+                    </span>
+                  )}
+                </div>
+              </SelectItem>
+            ))}
+          </SelectContent>
         </Select>
       </div>
     </div>
diff --git a/ui/litellm-dashboard/src/components/router_settings/index.test.tsx b/ui/litellm-dashboard/src/components/router_settings/index.test.tsx
index 23f48d7e9ac..1875085231a 100644
--- a/ui/litellm-dashboard/src/components/router_settings/index.test.tsx
+++ b/ui/litellm-dashboard/src/components/router_settings/index.test.tsx
@@ -3,22 +3,9 @@ import { fireEvent, renderWithProviders, screen, waitFor } from "../../../tests/
 import userEvent from "@testing-library/user-event";
 import RouterSettings from "./index";
 
-vi.mock("antd", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("antd")>();
-  return {
-    ...actual,
-    Select: Object.assign(
-      ({ value, onChange, children }: any) => (
-        <select data-testid="strategy-select" value={value ?? ""} onChange={(e) => onChange(e.target.value)}>
-          {children}
-        </select>
-      ),
-      {
-        Option: ({ value, children }: any) => <option value={value}>{children}</option>,
-      },
-    ),
-  };
-});
+// The strategy select only renders once getRouterSettingsCall resolves, so awaiting it is how a
+// test knows the loaded settings are on screen.
+const findStrategySelect = () => screen.findByRole("combobox");
 
 vi.mock("@/components/networking", () => ({
   getCallbacksCall: vi.fn(),
@@ -101,26 +88,20 @@ describe("RouterSettings", () => {
   });
 
   it("should render routing strategies loaded from the API", async () => {
+    const user = userEvent.setup();
     renderWithProviders(<RouterSettings {...defaultProps} />);
 
-    await waitFor(() => {
-      expect(screen.getByTestId("strategy-select")).toBeInTheDocument();
-    });
+    await user.click(await findStrategySelect());
 
-    const select = screen.getByTestId("strategy-select") as HTMLSelectElement;
-    const optionValues = Array.from(select.options).map((o) => o.value);
-    expect(optionValues).toContain("simple-shuffle");
-    expect(optionValues).toContain("latency-based-routing");
+    expect(await screen.findByRole("option", { name: /simple-shuffle/ })).toBeInTheDocument();
+    expect(screen.getByRole("option", { name: /latency-based-routing/ })).toBeInTheDocument();
   });
 
   it("should call setCallbacksCall with updated settings on Save Changes", async () => {
     const user = userEvent.setup();
     renderWithProviders(<RouterSettings {...defaultProps} />);
 
-    // Wait for the strategy select to appear — it only renders after getRouterSettingsCall resolves
-    await waitFor(() => {
-      expect(screen.getByTestId("strategy-select")).toBeInTheDocument();
-    });
+    await findStrategySelect();
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
 
@@ -138,9 +119,7 @@ describe("RouterSettings", () => {
     const user = userEvent.setup();
     renderWithProviders(<RouterSettings {...defaultProps} />);
 
-    await waitFor(() => {
-      expect(screen.getByTestId("strategy-select")).toBeInTheDocument();
-    });
+    await findStrategySelect();
 
     const numRetries = await screen.findByRole("textbox", { name: /num_retries/i });
     await user.clear(numRetries);
@@ -162,10 +141,7 @@ describe("RouterSettings", () => {
     const user = userEvent.setup();
     renderWithProviders(<RouterSettings {...defaultProps} />);
 
-    // Wait for data to load before interacting
-    await waitFor(() => {
-      expect(screen.getByTestId("strategy-select")).toBeInTheDocument();
-    });
+    await findStrategySelect();
     await user.click(screen.getByRole("button", { name: /save changes/i }));
 
     expect(toast.success).toHaveBeenCalledWith("router settings updated successfully");
@@ -182,9 +158,7 @@ describe("RouterSettings", () => {
     });
     renderWithProviders(<RouterSettings {...defaultProps} />);
 
-    await waitFor(() => {
-      expect(screen.getByTestId("strategy-select")).toBeInTheDocument();
-    });
+    await findStrategySelect();
     expect(document.querySelector('input[name="routing_groups"]')).toBeNull();
 
     await user.click(screen.getByRole("button", { name: /save changes/i }));
@@ -201,9 +175,7 @@ describe("RouterSettings", () => {
     vi.mocked(setCallbacksCall).mockRejectedValue(new Error("422 Unprocessable Entity"));
     renderWithProviders(<RouterSettings {...defaultProps} />);
 
-    await waitFor(() => {
-      expect(screen.getByTestId("strategy-select")).toBeInTheDocument();
-    });
+    await findStrategySelect();
     await user.click(screen.getByRole("button", { name: /save changes/i }));
 
     await waitFor(() => {
diff --git a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx
index 48d707e833e..8b7361fb572 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/RoutingGroupModal.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import React, { useEffect, useMemo } from "react";
-import { Modal } from "antd";
 import { useWatch } from "react-hook-form";
 import { z } from "zod/v4";
 import { FieldGroup } from "@/components/shared/form/field";
@@ -31,6 +30,8 @@ import {
   toRoutingGroupFormValues,
 } from "./routingGroupPayload";
 import type { RoutingGroup } from "./types";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
 
 interface RoutingGroupModalProps {
   open: boolean;
@@ -102,120 +103,125 @@ const RoutingGroupModal: React.FC<RoutingGroupModalProps> = ({
   };
 
   return (
-    <Modal
-      title={mode === "create" ? "Create Routing Group" : `Edit ${initialValue?.group_name ?? ""}`}
-      open={open}
-      onCancel={onClose}
-      onOk={() => void form.handleSubmit(handleSubmit)()}
-      okText={mode === "create" ? "Create Group" : "Save Changes"}
-      cancelText="Cancel"
-      confirmLoading={saving}
-      destroyOnClose
-      width={560}
-    >
-      <form onSubmit={(event) => event.preventDefault()} noValidate>
-        <FieldGroup>
-          <FormField
-            control={form.control}
-            name="group_name"
-            label="Group Name"
-            description="Use this name as the model in API calls — LiteLLM routes the request to one of the group's models."
-          >
-            {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="fast-chat" disabled={mode === "edit"} />}
-          </FormField>
-
-          <FormField
-            control={form.control}
-            name="models"
-            label="Models"
-            description="Models from your model list that this group routes between."
-          >
-            {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-              <Combobox multiple items={modelOptions} value={value} onValueChange={onChange}>
-                <ComboboxChips render={<div ref={modelsAnchor} />}>
-                  <ComboboxValue>
-                    {(selected: string[]) => (
-                      <>
-                        {selected.map((model) => (
-                          <ComboboxChip key={model} aria-label={model}>
-                            {model}
-                          </ComboboxChip>
-                        ))}
-                        <ComboboxChipsInput
-                          id={id}
-                          aria-invalid={ariaInvalid}
-                          aria-describedby={ariaDescribedBy}
-                          placeholder="Select models"
-                        />
-                      </>
-                    )}
-                  </ComboboxValue>
-                </ComboboxChips>
-                <ComboboxContent anchor={modelsAnchor}>
-                  <ComboboxEmpty>No models found</ComboboxEmpty>
-                  <ComboboxList>
-                    {(model: string) => (
-                      <ComboboxItem key={model} value={model}>
-                        {model}
-                      </ComboboxItem>
-                    )}
-                  </ComboboxList>
-                </ComboboxContent>
-              </Combobox>
-            )}
-          </FormField>
-
-          <FormField
-            control={form.control}
-            name="routing_strategy"
-            label="Routing Strategy"
-            description={strategyDescriptions[selectedStrategy]}
-          >
-            {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
-              <Select
-                items={strategyItems}
-                value={value}
-                onValueChange={(next: string | null) => {
-                  onChange(next ?? "");
-                  form.setValue(
-                    "routing_strategy_args",
-                    argsForStrategy(next ?? "", form.getValues("routing_strategy_args")),
-                  );
-                }}
-              >
-                <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
-                  <SelectValue placeholder="Select strategy" />
-                </SelectTrigger>
-                <SelectContent>
-                  {availableStrategies.map((strategy) => (
-                    <SelectItem key={strategy} value={strategy}>
-                      {strategy}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            )}
-          </FormField>
-
-          {STRATEGIES_WITH_ARGS.has(selectedStrategy) && (
+    <Dialog open={open} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[560px]">
+        <DialogHeader>
+          <DialogTitle>
+            {mode === "create" ? "Create Routing Group" : `Edit ${initialValue?.group_name ?? ""}`}
+          </DialogTitle>
+        </DialogHeader>
+        <form onSubmit={(event) => event.preventDefault()} noValidate>
+          <FieldGroup>
             <FormField
               control={form.control}
-              name="routing_strategy_args"
-              label="Strategy Arguments (JSON)"
-              description={ARGS_EXAMPLES[selectedStrategy] ?? 'Example: { "ttl": 60 }'}
+              name="group_name"
+              label="Group Name"
+              description="Use this name as the model in API calls — LiteLLM routes the request to one of the group's models."
             >
-              {({ ref, ...field }) => (
-                <Textarea {...field} ref={ref} rows={4} placeholder='{ "ttl": 3600 }' className="font-mono text-xs" />
+              {({ ref, ...field }) => <Input {...field} ref={ref} placeholder="fast-chat" disabled={mode === "edit"} />}
+            </FormField>
+
+            <FormField
+              control={form.control}
+              name="models"
+              label="Models"
+              description="Models from your model list that this group routes between."
+            >
+              {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                <Combobox multiple items={modelOptions} value={value} onValueChange={onChange}>
+                  <ComboboxChips render={<div ref={modelsAnchor} />}>
+                    <ComboboxValue>
+                      {(selected: string[]) => (
+                        <>
+                          {selected.map((model) => (
+                            <ComboboxChip key={model} aria-label={model}>
+                              {model}
+                            </ComboboxChip>
+                          ))}
+                          <ComboboxChipsInput
+                            id={id}
+                            aria-invalid={ariaInvalid}
+                            aria-describedby={ariaDescribedBy}
+                            placeholder="Select models"
+                          />
+                        </>
+                      )}
+                    </ComboboxValue>
+                  </ComboboxChips>
+                  <ComboboxContent anchor={modelsAnchor}>
+                    <ComboboxEmpty>No models found</ComboboxEmpty>
+                    <ComboboxList>
+                      {(model: string) => (
+                        <ComboboxItem key={model} value={model}>
+                          {model}
+                        </ComboboxItem>
+                      )}
+                    </ComboboxList>
+                  </ComboboxContent>
+                </Combobox>
               )}
             </FormField>
-          )}
 
-          <p className="text-xs text-muted-foreground">
-            Models not claimed by an explicit group fall through to the proxy&apos;s top-level routing strategy.
-          </p>
-        </FieldGroup>
-      </form>
-    </Modal>
+            <FormField
+              control={form.control}
+              name="routing_strategy"
+              label="Routing Strategy"
+              description={strategyDescriptions[selectedStrategy]}
+            >
+              {({ id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy }) => (
+                <Select
+                  items={strategyItems}
+                  value={value}
+                  onValueChange={(next: string | null) => {
+                    onChange(next ?? "");
+                    form.setValue(
+                      "routing_strategy_args",
+                      argsForStrategy(next ?? "", form.getValues("routing_strategy_args")),
+                    );
+                  }}
+                >
+                  <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy}>
+                    <SelectValue placeholder="Select strategy" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {availableStrategies.map((strategy) => (
+                      <SelectItem key={strategy} value={strategy}>
+                        {strategy}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              )}
+            </FormField>
+
+            {STRATEGIES_WITH_ARGS.has(selectedStrategy) && (
+              <FormField
+                control={form.control}
+                name="routing_strategy_args"
+                label="Strategy Arguments (JSON)"
+                description={ARGS_EXAMPLES[selectedStrategy] ?? 'Example: { "ttl": 60 }'}
+              >
+                {({ ref, ...field }) => (
+                  <Textarea {...field} ref={ref} rows={4} placeholder='{ "ttl": 3600 }' className="font-mono text-xs" />
+                )}
+              </FormField>
+            )}
+
+            <p className="text-xs text-muted-foreground">
+              Models not claimed by an explicit group fall through to the proxy&apos;s top-level routing strategy.
+            </p>
+          </FieldGroup>
+        </form>
+        <DialogFooter>
+          <Button variant="outline" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button onClick={() => void form.handleSubmit(handleSubmit)()} disabled={saving} aria-busy={saving}>
+            {mode === "create" ? "Create Group" : "Save Changes"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/routing_groups/index.integration.test.tsx b/ui/litellm-dashboard/src/components/routing_groups/index.integration.test.tsx
new file mode 100644
index 00000000000..ebe45d5c117
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/routing_groups/index.integration.test.tsx
@@ -0,0 +1,130 @@
+import { render, screen, within } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import RoutingGroups from "./index";
+import type { RoutingGroup } from "./types";
+import { useRoutingGroups, useSaveRoutingGroups } from "@/app/(dashboard)/hooks/routingGroups/useRoutingGroups";
+import { toast } from "@/lib/toast";
+
+vi.mock("@/app/(dashboard)/hooks/routingGroups/useRoutingGroups", () => ({
+  useRoutingGroups: vi.fn(),
+  useSaveRoutingGroups: vi.fn(),
+}));
+
+vi.mock("@/app/(dashboard)/hooks/router/useRouterFields", () => ({
+  useRouterFields: () => ({ data: undefined }),
+}));
+
+vi.mock("@/app/(dashboard)/hooks/models/useModels", () => ({
+  useModelHub: () => ({ data: undefined }),
+}));
+
+vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({
+  __esModule: true,
+  default: () => ({ accessToken: "test-token" }),
+}));
+
+vi.mock("@/app/(dashboard)/hooks/proxySettings/useProxySettings", () => ({
+  __esModule: true,
+  default: () => ({ PROXY_BASE_URL: "https://proxy.example.com" }),
+}));
+
+vi.mock("@/lib/toast", () => ({
+  toast: { success: vi.fn(), error: vi.fn(), fromError: vi.fn() },
+}));
+
+const prodGroup: RoutingGroup = {
+  group_name: "prod-group",
+  models: ["gpt-4o"],
+  routing_strategy: "usage-based-routing",
+};
+
+const devGroup: RoutingGroup = {
+  group_name: "dev-group",
+  models: ["gpt-4o-mini"],
+  routing_strategy: "simple-shuffle",
+};
+
+const setup = (overrides: { mutateAsync?: ReturnType<typeof vi.fn>; isPending?: boolean } = {}) => {
+  const mutateAsync = overrides.mutateAsync ?? vi.fn().mockResolvedValue(undefined);
+  vi.mocked(useRoutingGroups).mockReturnValue({
+    data: { routingGroups: [prodGroup, devGroup], availableStrategies: [] },
+    isLoading: false,
+    refetch: vi.fn(),
+    isFetching: false,
+  } as unknown as ReturnType<typeof useRoutingGroups>);
+  vi.mocked(useSaveRoutingGroups).mockReturnValue({
+    mutateAsync,
+    isPending: overrides.isPending ?? false,
+  } as unknown as ReturnType<typeof useSaveRoutingGroups>);
+  return { mutateAsync };
+};
+
+const openDeleteConfirm = async (user: ReturnType<typeof userEvent.setup>) => {
+  await user.click(screen.getByTestId("routing-group-actions-prod-group"));
+  await user.click(await screen.findByTestId("routing-group-action-delete"));
+  return screen.getByRole("dialog");
+};
+
+describe("RoutingGroups delete confirmation", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should not show the confirmation until a group is chosen for deletion", () => {
+    setup();
+    render(<RoutingGroups />);
+    expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByText("Delete routing group?")).not.toBeInTheDocument();
+  });
+
+  it("should name the group being deleted in the confirmation", async () => {
+    const user = userEvent.setup();
+    setup();
+    render(<RoutingGroups />);
+
+    const dialog = await openDeleteConfirm(user);
+
+    expect(within(dialog).getByText("Delete routing group?")).toBeInTheDocument();
+    expect(within(dialog).getByText("prod-group")).toBeInTheDocument();
+    expect(within(dialog).getByText(/This cannot be undone/)).toBeInTheDocument();
+  });
+
+  it("should save the remaining groups and report success when confirmed", async () => {
+    const user = userEvent.setup();
+    const { mutateAsync } = setup();
+    render(<RoutingGroups />);
+
+    const dialog = await openDeleteConfirm(user);
+    await user.click(within(dialog).getByRole("button", { name: "Delete" }));
+
+    expect(mutateAsync).toHaveBeenCalledWith([devGroup]);
+    expect(toast.success).toHaveBeenCalledWith('Deleted routing group "prod-group"');
+  });
+
+  it("should report the failure and keep the confirmation open when the save rejects", async () => {
+    const user = userEvent.setup();
+    const mutateAsync = vi.fn().mockRejectedValue(new Error("boom"));
+    setup({ mutateAsync });
+    render(<RoutingGroups />);
+
+    const dialog = await openDeleteConfirm(user);
+    await user.click(within(dialog).getByRole("button", { name: "Delete" }));
+
+    expect(toast.error).toHaveBeenCalledWith("boom");
+    expect(screen.getByRole("dialog")).toBeInTheDocument();
+  });
+
+  it("should dismiss without saving when cancelled", async () => {
+    const user = userEvent.setup();
+    const { mutateAsync } = setup();
+    render(<RoutingGroups />);
+
+    const dialog = await openDeleteConfirm(user);
+    await user.click(within(dialog).getByRole("button", { name: "Cancel" }));
+
+    expect(mutateAsync).not.toHaveBeenCalled();
+    expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/routing_groups/index.tsx b/ui/litellm-dashboard/src/components/routing_groups/index.tsx
index 1ecea5b10da..9f94fbf6c98 100644
--- a/ui/litellm-dashboard/src/components/routing_groups/index.tsx
+++ b/ui/litellm-dashboard/src/components/routing_groups/index.tsx
@@ -1,9 +1,9 @@
 "use client";
 
 import React, { useMemo, useState } from "react";
-import { Card, Flex, Input, Modal, Space, Typography } from "antd";
+import { Card, Flex, Input, Space, Typography } from "antd";
 import { Button } from "@/components/ui/button";
-import { PlusOutlined, ReloadOutlined, SearchOutlined } from "@ant-design/icons";
+import { Plus, RefreshCw, Search } from "lucide-react";
 import { useRoutingGroups, useSaveRoutingGroups } from "@/app/(dashboard)/hooks/routingGroups/useRoutingGroups";
 import { useRouterFields } from "@/app/(dashboard)/hooks/router/useRouterFields";
 import { useModelHub } from "@/app/(dashboard)/hooks/models/useModels";
@@ -13,6 +13,7 @@ import RoutingGroupsTable from "./RoutingGroupsTable";
 import RoutingGroupModal from "./RoutingGroupModal";
 import { toast } from "@/lib/toast";
 import type { RoutingGroup } from "./types";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 const { Text } = Typography;
 
@@ -106,7 +107,7 @@ const RoutingGroups: React.FC = () => {
         <Flex justify="space-between" align="center" gap={12} className="mb-4">
           <Input
             allowClear
-            prefix={<SearchOutlined className="text-gray-400" />}
+            prefix={<Search className="size-4 text-gray-400" />}
             placeholder="Search groups..."
             value={searchQuery}
             onChange={(e) => setSearchQuery(e.target.value)}
@@ -119,11 +120,11 @@ const RoutingGroups: React.FC = () => {
               disabled={isFetching && !isLoading}
               aria-busy={isFetching && !isLoading}
             >
-              <ReloadOutlined />
+              <RefreshCw />
               Refresh
             </Button>
             <Button onClick={openCreate}>
-              <PlusOutlined />
+              <Plus />
               Create Group
             </Button>
             <Text type="secondary" className="text-sm whitespace-nowrap">
@@ -154,20 +155,30 @@ const RoutingGroups: React.FC = () => {
         saving={saveMutation.isPending}
       />
 
-      <Modal
-        open={Boolean(deletingGroup)}
-        title="Delete routing group?"
-        okText="Delete"
-        okButtonProps={{ danger: true, loading: saveMutation.isPending }}
-        cancelText="Cancel"
-        onOk={confirmDelete}
-        onCancel={() => setDeletingGroup(null)}
-      >
-        <Text>
-          Models in <Text strong>{deletingGroup?.group_name}</Text> will fall back to the proxy&apos;s top-level routing
-          strategy. This cannot be undone.
-        </Text>
-      </Modal>
+      <Dialog open={Boolean(deletingGroup)} onOpenChange={(open) => !open && setDeletingGroup(null)}>
+        <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto">
+          <DialogHeader>
+            <DialogTitle>Delete routing group?</DialogTitle>
+          </DialogHeader>
+          <Text>
+            Models in <Text strong>{deletingGroup?.group_name}</Text> will fall back to the proxy&apos;s top-level
+            routing strategy. This cannot be undone.
+          </Text>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setDeletingGroup(null)}>
+              Cancel
+            </Button>
+            <Button
+              onClick={confirmDelete}
+              variant="destructive"
+              disabled={saveMutation.isPending}
+              aria-busy={saveMutation.isPending}
+            >
+              Delete
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </Space>
   );
 };
diff --git a/ui/litellm-dashboard/src/components/shared/Alert.test.tsx b/ui/litellm-dashboard/src/components/shared/Alert.test.tsx
new file mode 100644
index 00000000000..81aa6c95459
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/shared/Alert.test.tsx
@@ -0,0 +1,80 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { Alert, AlertAction, AlertDescription, AlertTitle } from "./Alert";
+
+describe("Alert", () => {
+  it("exposes the alert role plus the slot and variant hooks", () => {
+    render(
+      <Alert variant="warning">
+        <AlertTitle>License expiring</AlertTitle>
+        <AlertDescription>Renew before it lapses.</AlertDescription>
+      </Alert>,
+    );
+
+    const alert = screen.getByRole("alert");
+    expect(alert).toHaveAttribute("data-slot", "alert");
+    expect(alert).toHaveAttribute("data-variant", "warning");
+    expect(alert).toHaveTextContent("License expiring");
+    expect(alert).toHaveTextContent("Renew before it lapses.");
+  });
+
+  it("reports the default variant when none is given", () => {
+    render(<Alert>Heads up</Alert>);
+    expect(screen.getByRole("alert")).toHaveAttribute("data-variant", "default");
+  });
+
+  it.each([
+    ["info", "text-info"],
+    ["success", "text-success"],
+    ["warning", "text-warning"],
+    ["error", "text-red-900"],
+    ["destructive", "text-destructive"],
+  ] as const)("paints the %s variant with its own token color", (variant, tokenClass) => {
+    render(<Alert variant={variant}>message</Alert>);
+    const alert = screen.getByRole("alert");
+    expect(alert).toHaveAttribute("data-variant", variant);
+    expect(alert).toHaveClass(tokenClass);
+  });
+
+  it("keeps success off the warning color so a save does not read as a problem", () => {
+    render(<Alert variant="success">saved</Alert>);
+    expect(screen.getByRole("alert")).not.toHaveClass("text-warning");
+  });
+
+  it("lets className win over the variant classes through twMerge", () => {
+    render(
+      <Alert variant="info" className="bg-card">
+        message
+      </Alert>,
+    );
+    const alert = screen.getByRole("alert");
+    expect(alert).toHaveClass("bg-card");
+    expect(alert).not.toHaveClass("bg-info/5");
+  });
+
+  it("renders the action slot so a dismiss control stays reachable", () => {
+    render(
+      <Alert variant="info">
+        <AlertTitle>SSO enabled</AlertTitle>
+        <AlertAction>
+          <button type="button" aria-label="Close" />
+        </AlertAction>
+      </Alert>,
+    );
+
+    const action = screen.getByRole("button", { name: "Close" }).parentElement;
+    expect(action).toHaveAttribute("data-slot", "alert-action");
+  });
+
+  it("tags the title and description parts for the layout selectors", () => {
+    render(
+      <Alert>
+        <AlertTitle>Title</AlertTitle>
+        <AlertDescription>Description</AlertDescription>
+      </Alert>,
+    );
+
+    expect(screen.getByText("Title")).toHaveAttribute("data-slot", "alert-title");
+    expect(screen.getByText("Description")).toHaveAttribute("data-slot", "alert-description");
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/shared/Alert.tsx b/ui/litellm-dashboard/src/components/shared/Alert.tsx
index 718957b4f08..a76b4a99c0d 100644
--- a/ui/litellm-dashboard/src/components/shared/Alert.tsx
+++ b/ui/litellm-dashboard/src/components/shared/Alert.tsx
@@ -10,6 +10,7 @@ const alertVariants = cva({
       default: "bg-card text-card-foreground",
       destructive: "bg-card text-destructive *:data-[slot=alert-description]:text-destructive/90 *:[svg]:text-current",
       info: "border-info/20 bg-info/5 text-info *:[svg]:text-current",
+      success: "border-success/20 bg-success/5 text-success *:[svg]:text-current",
       warning: "border-warning/20 bg-warning/5 text-warning *:[svg]:text-current",
       error: "border-red-200 bg-red-50 text-red-900 *:data-[slot=alert-description]:text-red-800 *:[svg]:text-red-600",
     },
@@ -21,8 +22,15 @@ const alertVariants = cva({
 
 type AlertProps = React.ComponentProps<"div"> & VariantProps<typeof alertVariants>;
 
-const Alert = React.forwardRef<HTMLDivElement, AlertProps>(({ className, variant, ...props }, ref) => (
-  <div ref={ref} data-slot="alert" role="alert" className={cn(alertVariants({ variant }), className)} {...props} />
+const Alert = React.forwardRef<HTMLDivElement, AlertProps>(({ className, variant = "default", ...props }, ref) => (
+  <div
+    ref={ref}
+    data-slot="alert"
+    data-variant={variant}
+    role="alert"
+    className={cn(alertVariants({ variant }), className)}
+    {...props}
+  />
 ));
 Alert.displayName = "Alert";
 
diff --git a/ui/litellm-dashboard/src/components/shared/LegacyPageHeader.test.tsx b/ui/litellm-dashboard/src/components/shared/LegacyPageHeader.test.tsx
new file mode 100644
index 00000000000..a0081c1c7f1
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/shared/LegacyPageHeader.test.tsx
@@ -0,0 +1,33 @@
+import { renderWithProviders, screen } from "@/../tests/test-utils";
+import { describe, expect, it } from "vitest";
+
+import { LegacyPageHeader } from "./LegacyPageHeader";
+
+describe("LegacyPageHeader", () => {
+  it("should render the title as a heading", () => {
+    renderWithProviders(<LegacyPageHeader title="Virtual Keys" />);
+
+    expect(screen.getByRole("heading", { name: "Virtual Keys" })).toBeInTheDocument();
+  });
+
+  it("should render the optional identity and actions", () => {
+    renderWithProviders(
+      <LegacyPageHeader
+        title="Virtual Keys"
+        subtitle="Every key that authenticates requests"
+        icon={<span>Key icon</span>}
+        actions={<button>Create New Key</button>}
+      />,
+    );
+
+    expect(screen.getByText("Every key that authenticates requests")).toBeInTheDocument();
+    expect(screen.getByText("Key icon")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Create New Key" })).toBeInTheDocument();
+  });
+
+  it("should omit optional actions when none are provided", () => {
+    renderWithProviders(<LegacyPageHeader title="Virtual Keys" />);
+
+    expect(screen.queryByRole("button")).not.toBeInTheDocument();
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/shared/LegacyPageHeader.tsx b/ui/litellm-dashboard/src/components/shared/LegacyPageHeader.tsx
new file mode 100644
index 00000000000..43979ad00b4
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/shared/LegacyPageHeader.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import * as React from "react";
+
+interface LegacyPageHeaderProps {
+  title: React.ReactNode;
+  subtitle?: React.ReactNode;
+  icon?: React.ReactNode;
+  actions?: React.ReactNode;
+}
+
+export function LegacyPageHeader({ title, subtitle, icon, actions }: LegacyPageHeaderProps) {
+  return (
+    <div className="flex flex-wrap items-start justify-between gap-4">
+      <div className="flex items-center gap-2.5">
+        {icon != null && <span className="flex flex-none items-center text-foreground">{icon}</span>}
+        <div className="min-w-0">
+          <h1 className="text-xl font-semibold tracking-tight text-foreground">{title}</h1>
+          {subtitle != null && <p className="mt-0.5 text-sm text-muted-foreground">{subtitle}</p>}
+        </div>
+      </div>
+      {actions != null && <div className="flex items-center gap-2">{actions}</div>}
+    </div>
+  );
+}
diff --git a/ui/litellm-dashboard/src/components/shared/MultiSelect.test.tsx b/ui/litellm-dashboard/src/components/shared/MultiSelect.test.tsx
index 6fe2f0fe51c..cc4084a952e 100644
--- a/ui/litellm-dashboard/src/components/shared/MultiSelect.test.tsx
+++ b/ui/litellm-dashboard/src/components/shared/MultiSelect.test.tsx
@@ -93,6 +93,49 @@ describe("MultiSelect", () => {
     expect(await screen.findByText("No options found")).toBeInTheDocument();
   });
 
+  it("splits a comma-separated custom entry into one value per token", async () => {
+    const { onValueChange, input } = renderMultiSelect({ allowCustomValues: true });
+
+    await userEvent.type(input, "udp, kafka ,terraform");
+    await userEvent.click(await screen.findByText('Create "udp, kafka ,terraform"'));
+
+    expect(onValueChange).toHaveBeenCalledWith(["udp", "kafka", "terraform"]);
+  });
+
+  it("leaves an already selected value that contains a comma alone when a later entry is added", async () => {
+    const onValueChange = vi.fn();
+    render(
+      <MultiSelect
+        options={OPTIONS}
+        value={["--filter=a,b"]}
+        onValueChange={onValueChange}
+        allowCustomValues
+        placeholder="Select stores"
+      />,
+    );
+
+    await userEvent.type(screen.getByRole("combobox"), "--verbose");
+    await userEvent.click(await screen.findByText('Create "--verbose"'));
+
+    expect(onValueChange).toHaveBeenCalledWith(["--filter=a,b", "--verbose"]);
+  });
+
+  it("clears every selection at once", async () => {
+    const onValueChange = vi.fn();
+    render(
+      <MultiSelect
+        options={OPTIONS}
+        value={["vs-alpha", "vs-beta"]}
+        onValueChange={onValueChange}
+        placeholder="Select stores"
+      />,
+    );
+
+    await userEvent.click(screen.getByRole("button", { name: "Clear all" }));
+
+    expect(onValueChange).toHaveBeenCalledWith([]);
+  });
+
   it("marks a disabled option as disabled and refuses to select it", async () => {
     const { onValueChange, input } = renderMultiSelect({
       options: [OPTIONS[0], { ...OPTIONS[1], disabled: true }],
diff --git a/ui/litellm-dashboard/src/components/shared/MultiSelect.tsx b/ui/litellm-dashboard/src/components/shared/MultiSelect.tsx
index c60a019db06..3a153ff2a5f 100644
--- a/ui/litellm-dashboard/src/components/shared/MultiSelect.tsx
+++ b/ui/litellm-dashboard/src/components/shared/MultiSelect.tsx
@@ -4,6 +4,7 @@ import { useState } from "react";
 import {
   Combobox,
   ComboboxChip,
+  ComboboxClear,
   ComboboxChips,
   ComboboxChipsInput,
   ComboboxContent,
@@ -34,6 +35,12 @@ interface MultiSelectProps {
   className?: string;
 }
 
+const splitOnCommas = (raw: string): string[] =>
+  raw
+    .split(",")
+    .map((part) => part.trim())
+    .filter((part) => part.length > 0);
+
 const matchesQuery = (option: MultiSelectOption, query: string): boolean => {
   const normalizedQuery = query.trim().toLowerCase();
   return (
@@ -78,15 +85,22 @@ export function MultiSelect({
       ? [...safeOptions, { label: `Create "${customOption}"`, value: customOption }]
       : safeOptions;
 
+  const canClear = (selected: MultiSelectOption[]) => selected.length > 0 && !disabled && !loading;
+
+  const handleValueChange = (selected: MultiSelectOption[]) => {
+    const next = allowCustomValues
+      ? selected.flatMap((option) => (value.includes(option.value) ? [option.value] : splitOnCommas(option.value)))
+      : selected.map((option) => option.value);
+    onValueChange(Array.from(new Set(next)));
+    setQuery("");
+  };
+
   return (
     <Combobox
       multiple
       items={items}
       value={selectedOptions}
-      onValueChange={(selected: MultiSelectOption[]) => {
-        onValueChange(selected.map((option) => option.value));
-        setQuery("");
-      }}
+      onValueChange={handleValueChange}
       inputValue={query}
       onInputValueChange={setQuery}
       isItemEqualToValue={(option: MultiSelectOption, selected: MultiSelectOption) => option.value === selected.value}
@@ -109,6 +123,7 @@ export function MultiSelect({
                 className="min-w-24"
                 aria-label={placeholder || undefined}
               />
+              {canClear(selected) && <ComboboxClear className="ml-auto self-center" aria-label="Clear all" />}
             </>
           )}
         </ComboboxValue>
diff --git a/ui/litellm-dashboard/src/components/shared/PageHeader.test.tsx b/ui/litellm-dashboard/src/components/shared/PageHeader.test.tsx
index f7a313271da..3741542abad 100644
--- a/ui/litellm-dashboard/src/components/shared/PageHeader.test.tsx
+++ b/ui/litellm-dashboard/src/components/shared/PageHeader.test.tsx
@@ -1,31 +1,77 @@
-import { render, screen } from "@testing-library/react";
+import { renderWithProviders, screen, within } from "@/../tests/test-utils";
 import { describe, expect, it } from "vitest";
 
 import { PageHeader } from "./PageHeader";
 
+const identity = {
+  icon: <span>Teams icon</span>,
+  title: "Teams",
+  subtitle: "Manage teams, members, and their access to models and budgets",
+};
+
 describe("PageHeader", () => {
-  it("renders the title as a heading", () => {
-    render(<PageHeader title="Virtual Keys" />);
-    expect(screen.getByRole("heading", { name: "Virtual Keys" })).toBeInTheDocument();
+  it("should render the page identity", () => {
+    renderWithProviders(<PageHeader {...identity} />);
+
+    expect(screen.getByRole("heading", { name: "Teams" })).toBeInTheDocument();
+    expect(screen.getByText("Teams icon").parentElement).toHaveAttribute("aria-hidden", "true");
+    expect(screen.getByText(identity.subtitle)).toBeInTheDocument();
   });
 
-  it("renders the subtitle, icon, and actions when provided", () => {
-    render(
+  it("should apply the standard title and subtext typography", () => {
+    renderWithProviders(<PageHeader {...identity} />);
+
+    const icon = screen.getByText("Teams icon").parentElement;
+    expect(screen.getByRole("heading", { name: "Teams" })).toHaveClass("text-2xl", "font-semibold", "tracking-tight");
+    expect(screen.getByText(identity.subtitle)).toHaveClass("mt-1.5", "text-sm", "text-muted-foreground");
+    expect(icon).toHaveClass("size-5", "[&_svg]:size-5", "[&_svg]:stroke-[1.75]");
+    expect(icon?.parentElement).toHaveClass("gap-2.5");
+  });
+
+  it("should render the primary action, divider, tabs, and utilities in the standard control row", () => {
+    renderWithProviders(
       <PageHeader
-        title="Virtual Keys"
-        subtitle="Every key that authenticates requests"
-        icon={<svg data-testid="icon" />}
-        actions={<button>Create New Key</button>}
+        {...identity}
+        primaryAction={<button>Create Team</button>}
+        tabs={
+          <div role="tablist">
+            <button role="tab">Your Teams</button>
+          </div>
+        }
+        utilities={<button>Refresh</button>}
       />,
     );
-    expect(screen.getByText("Every key that authenticates requests")).toBeInTheDocument();
-    expect(screen.getByTestId("icon")).toBeInTheDocument();
-    expect(screen.getByRole("button", { name: "Create New Key" })).toBeInTheDocument();
+
+    const controls = screen.getByRole("group", { name: "Page controls" });
+    expect(controls).toHaveClass("mt-5", "h-9");
+    expect(within(controls).getByRole("separator")).toHaveClass("mx-4", "h-6");
+    expect(controls).toHaveTextContent("Create TeamYour TeamsRefresh");
   });
 
-  it("omits the optional slots when not provided", () => {
-    render(<PageHeader title="Virtual Keys" />);
-    expect(screen.queryByRole("button")).not.toBeInTheDocument();
-    expect(document.querySelector("p")).toBeNull();
+  it("should omit the divider when tabs are absent", () => {
+    renderWithProviders(<PageHeader {...identity} primaryAction={<button>Create Team</button>} />);
+
+    expect(screen.queryByRole("separator")).not.toBeInTheDocument();
+  });
+
+  it("should provide standard controls to an embedded tab shell", () => {
+    renderWithProviders(
+      <PageHeader
+        {...identity}
+        primaryAction={<button>Create Team</button>}
+        tabs={({ leadingControls, utilities }) => (
+          <div role="tablist">
+            {leadingControls}
+            <button role="tab">Your Teams</button>
+            {utilities}
+          </div>
+        )}
+        utilities={<button>Refresh</button>}
+      />,
+    );
+
+    const tabs = screen.getByRole("tablist");
+    expect(within(tabs).getByRole("separator")).toBeInTheDocument();
+    expect(tabs).toHaveTextContent("Create TeamYour TeamsRefresh");
   });
 });
diff --git a/ui/litellm-dashboard/src/components/shared/PageHeader.tsx b/ui/litellm-dashboard/src/components/shared/PageHeader.tsx
index e314e8e8bc2..81092821efc 100644
--- a/ui/litellm-dashboard/src/components/shared/PageHeader.tsx
+++ b/ui/litellm-dashboard/src/components/shared/PageHeader.tsx
@@ -2,24 +2,57 @@
 
 import * as React from "react";
 
-interface PageHeaderProps {
-  title: React.ReactNode;
-  subtitle?: React.ReactNode;
-  icon?: React.ReactNode;
-  actions?: React.ReactNode;
+import { ToolbarSeparator } from "./ToolbarSeparator";
+
+interface EmbeddedTabsSlots {
+  leadingControls: React.ReactNode;
+  utilities: React.ReactNode;
 }
 
-export function PageHeader({ title, subtitle, icon, actions }: PageHeaderProps) {
-  return (
-    <div className="flex flex-wrap items-start justify-between gap-4">
-      <div className="flex items-center gap-2.5">
-        {icon != null && <span className="flex flex-none items-center text-foreground">{icon}</span>}
-        <div className="min-w-0">
-          <h1 className="text-xl font-semibold tracking-tight text-foreground">{title}</h1>
-          {subtitle != null && <p className="mt-0.5 text-sm text-muted-foreground">{subtitle}</p>}
-        </div>
+interface PageHeaderProps {
+  title: React.ReactNode;
+  subtitle: React.ReactNode;
+  icon: React.ReactNode;
+  primaryAction?: React.ReactNode;
+  tabs?: React.ReactNode | ((slots: EmbeddedTabsSlots) => React.ReactNode);
+  utilities?: React.ReactNode;
+}
+
+export function PageHeader({ title, subtitle, icon, primaryAction, tabs, utilities }: PageHeaderProps) {
+  const leadingControls =
+    primaryAction == null ? null : (
+      <div className="flex h-9 items-center">
+        {primaryAction}
+        {tabs != null && <ToolbarSeparator className="mx-4 h-6" />}
       </div>
-      {actions != null && <div className="flex items-center gap-2">{actions}</div>}
+    );
+  const utilityControls = utilities == null ? null : <div className="flex items-center gap-2">{utilities}</div>;
+  const hasControlRow = primaryAction != null || tabs != null || utilities != null;
+
+  return (
+    <div>
+      <div className="flex items-center gap-2.5">
+        <span
+          aria-hidden="true"
+          className="flex size-5 flex-none items-center justify-center text-foreground [&_svg]:size-5 [&_svg]:stroke-[1.75]"
+        >
+          {icon}
+        </span>
+        <h1 className="text-2xl font-semibold tracking-tight text-foreground">{title}</h1>
+      </div>
+      <p className="mt-1.5 text-sm text-muted-foreground">{subtitle}</p>
+
+      {typeof tabs === "function" ? (
+        <div className="mt-5">{tabs({ leadingControls, utilities: utilityControls })}</div>
+      ) : (
+        hasControlRow && (
+          <div className="mt-5 flex h-9 items-center" role="group" aria-label="Page controls">
+            {leadingControls}
+            {tabs}
+            {utilityControls != null && <div className="ml-auto">{utilityControls}</div>}
+          </div>
+        )
+      )}
     </div>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/shared/PaginatedSearchSelect.tsx b/ui/litellm-dashboard/src/components/shared/PaginatedSearchSelect.tsx
index 47dc429bcc5..14a3280dfc3 100644
--- a/ui/litellm-dashboard/src/components/shared/PaginatedSearchSelect.tsx
+++ b/ui/litellm-dashboard/src/components/shared/PaginatedSearchSelect.tsx
@@ -25,7 +25,7 @@ interface PaginatedSearchSelectProps {
   value?: string;
   onValueChange: (value: string) => void;
   onSearchChange: (query: string) => void;
-  onLoadMore: () => void;
+  onLoadMore?: () => void;
   hasNextPage?: boolean;
   isLoading?: boolean;
   isFetchingNextPage?: boolean;
@@ -82,7 +82,7 @@ export function PaginatedSearchSelect({
     if (target.scrollHeight === 0) return;
     const ratio = (target.scrollTop + target.clientHeight) / target.scrollHeight;
     if (ratio >= SCROLL_THRESHOLD && hasNextPage && !isFetchingNextPage) {
-      onLoadMore();
+      onLoadMore?.();
     }
   };
 
diff --git a/ui/litellm-dashboard/src/components/shared/SearchSelect.test.tsx b/ui/litellm-dashboard/src/components/shared/SearchSelect.test.tsx
index c241bc4fe04..c0b9bc7d8ae 100644
--- a/ui/litellm-dashboard/src/components/shared/SearchSelect.test.tsx
+++ b/ui/litellm-dashboard/src/components/shared/SearchSelect.test.tsx
@@ -16,6 +16,13 @@ describe("SearchSelect", () => {
     expect(screen.getByPlaceholderText("Select Team…")).toBeInTheDocument();
   });
 
+  it("names the field from aria-label so callers can label it independently of the placeholder", () => {
+    render(
+      <SearchSelect options={OPTIONS} onValueChange={vi.fn()} placeholder="Select Team…" aria-label="Default model" />,
+    );
+    expect(screen.getByRole("combobox", { name: "Default model" })).toBeInTheDocument();
+  });
+
   it("shows the selected option's label in the field", () => {
     render(<SearchSelect options={OPTIONS} value="team-2" onValueChange={vi.fn()} />);
     expect(screen.getByRole("combobox")).toHaveValue("Growth");
@@ -68,4 +75,20 @@ describe("SearchSelect", () => {
     await user.click(await screen.findByText("Growth"));
     expect(onValueChange).toHaveBeenCalledWith("team-2");
   });
+
+  it("makes the field non-interactive when disabled", async () => {
+    const onValueChange = vi.fn();
+    const user = userEvent.setup();
+    render(<SearchSelect options={OPTIONS} value="team-1" onValueChange={onValueChange} disabled />);
+
+    const input = screen.getByRole("combobox");
+    expect(input).toBeDisabled();
+
+    await user.click(input);
+    await user.keyboard("Growth");
+
+    expect(input).toHaveValue("Acme Prod");
+    expect(screen.queryByText("Growth")).not.toBeInTheDocument();
+    expect(onValueChange).not.toHaveBeenCalled();
+  });
 });
diff --git a/ui/litellm-dashboard/src/components/shared/SearchSelect.tsx b/ui/litellm-dashboard/src/components/shared/SearchSelect.tsx
index e2ac466e275..53a5371d72d 100644
--- a/ui/litellm-dashboard/src/components/shared/SearchSelect.tsx
+++ b/ui/litellm-dashboard/src/components/shared/SearchSelect.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import React from "react";
 import {
   Combobox,
   ComboboxContent,
@@ -14,6 +15,8 @@ export interface SearchSelectOption {
   value: string;
   /** Optional muted second line (e.g. an id); also matched when searching. */
   sublabel?: string;
+  /** Optional leading glyph (e.g. a provider logo); not matched when searching. */
+  icon?: React.ReactNode;
 }
 
 interface SearchSelectProps {
@@ -26,6 +29,7 @@ interface SearchSelectProps {
   className?: string;
   inputId?: string;
   allowClear?: boolean;
+  "aria-label"?: string;
 }
 
 const matchesQuery = (option: SearchSelectOption, query: string): boolean => {
@@ -44,6 +48,7 @@ export function SearchSelect({
   className,
   inputId,
   allowClear = true,
+  "aria-label": ariaLabel,
 }: SearchSelectProps) {
   const selected =
     value === undefined || value === ""
@@ -64,6 +69,7 @@ export function SearchSelect({
     >
       <ComboboxInput
         id={inputId}
+        aria-label={ariaLabel}
         placeholder={placeholder}
         showClear={allowClear && value != null && value !== ""}
         className={`h-8 w-full text-sm ${className ?? ""}`}
@@ -73,6 +79,7 @@ export function SearchSelect({
         <ComboboxList>
           {(item: SearchSelectOption) => (
             <ComboboxItem key={item.value} value={item}>
+              {item.icon}
               <span className="flex min-w-0 flex-col">
                 <span className="truncate">{item.label}</span>
                 {item.sublabel != null && item.sublabel !== "" && (
diff --git a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.test.tsx b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.test.tsx
index c907aeae035..bb4e0865f3f 100644
--- a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.test.tsx
+++ b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.test.tsx
@@ -49,10 +49,8 @@ describe("AdvancedDatePicker", () => {
   });
 
   it("should display formatted date range", () => {
-    render(<AdvancedDatePicker value={defaultValue} onValueChange={mockOnValueChange} />);
-    // The component displays date range in the format "D MMM, HH:mm - D MMM, HH:mm"
-    // Just check that the clock icon is present
-    expect(screen.getByLabelText("clock-circle")).toBeInTheDocument();
+    const { container } = render(<AdvancedDatePicker value={defaultValue} onValueChange={mockOnValueChange} />);
+    expect(getTrigger(container)).toHaveTextContent(/\d{1,2} \w{3}, \d{2}:\d{2} - \d{1,2} \w{3}, \d{2}:\d{2}/);
   });
 
   it("should open dropdown when clicked", () => {
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 b9a4d28539b..0013f702362 100644
--- a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx
+++ b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx
@@ -1,4 +1,4 @@
-import { CalendarOutlined, ClockCircleOutlined } from "@ant-design/icons";
+import { Calendar, Clock } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/cva.config";
 import type { DateRangePickerValue } from "./date_picker_types";
@@ -291,7 +291,7 @@ const AdvancedDatePicker: React.FC<AdvancedDatePickerProps> = ({
         >
           <span className="flex items-center justify-between">
             <span className="flex items-center gap-2">
-              <ClockCircleOutlined className="text-gray-600" />
+              <Clock className="size-4 text-gray-600" />
               <span className="text-gray-900">{formatDisplayRange(value.from, value.to)}</span>
             </span>
             <svg
@@ -355,7 +355,7 @@ const AdvancedDatePicker: React.FC<AdvancedDatePickerProps> = ({
               <div className="w-1/2 relative">
                 <div className="p-3.5 border-b border-gray-200">
                   <div className="flex items-center gap-2">
-                    <CalendarOutlined className="text-gray-600" />
+                    <Calendar className="size-4 text-gray-600" />
                     <span className="text-sm font-semibold text-gray-900">Start and end dates</span>
                   </div>
                 </div>
diff --git a/ui/litellm-dashboard/src/components/shared/form/UtcDateTimeInput.tsx b/ui/litellm-dashboard/src/components/shared/form/UtcDateTimeInput.tsx
new file mode 100644
index 00000000000..935333620fb
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/shared/form/UtcDateTimeInput.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+import * as React from "react";
+import dayjs, { type Dayjs } from "dayjs";
+import utc from "dayjs/plugin/utc";
+
+import { Input } from "@/components/ui/input";
+import { cn } from "@/lib/cva.config";
+
+dayjs.extend(utc);
+
+const MINUTE_FORMAT = "YYYY-MM-DDTHH:mm";
+const SECOND_FORMAT = "YYYY-MM-DDTHH:mm:ss";
+
+export interface UtcDateTimeInputProps
+  extends Omit<React.ComponentProps<"input">, "value" | "onChange" | "type" | "step"> {
+  value: Dayjs | null | undefined;
+  onChange: (value: Dayjs | null) => void;
+}
+
+/**
+ * The wall clock the operator sees is the wall clock that gets stored, so the value stays in UTC
+ * mode end to end instead of being converted through the browser zone - see utils/ptuDatetime.
+ */
+const toInputValue = (value: Dayjs | null | undefined): string => {
+  if (!value || typeof value.format !== "function" || !value.isValid()) {
+    return "";
+  }
+  return value.second() === 0 && value.millisecond() === 0 ? value.format(MINUTE_FORMAT) : value.format(SECOND_FORMAT);
+};
+
+const toUtcValue = (raw: string): Dayjs | null => {
+  if (!raw) {
+    return null;
+  }
+  const parsed = dayjs.utc(raw);
+  return parsed.isValid() ? parsed : null;
+};
+
+export const UtcDateTimeInput = React.forwardRef<HTMLInputElement, UtcDateTimeInputProps>(
+  ({ value, onChange, className, ...props }, ref) => (
+    <Input
+      {...props}
+      ref={ref}
+      type="datetime-local"
+      step={1}
+      className={cn("w-full", className)}
+      value={toInputValue(value)}
+      onChange={(event) => onChange(toUtcValue(event.target.value))}
+    />
+  ),
+);
+UtcDateTimeInput.displayName = "UtcDateTimeInput";
diff --git a/ui/litellm-dashboard/src/components/team/EditMembership.tsx b/ui/litellm-dashboard/src/components/team/EditMembership.tsx
index e89a62778d8..96ebb5fe0fd 100644
--- a/ui/litellm-dashboard/src/components/team/EditMembership.tsx
+++ b/ui/litellm-dashboard/src/components/team/EditMembership.tsx
@@ -1,4 +1,3 @@
-import { Modal } from "antd";
 import React, { useEffect, useMemo, useState } from "react";
 import { z } from "zod/v4";
 import NumericalInput from "../shared/numerical_input";
@@ -19,6 +18,7 @@ import {
   type MemberFieldsConfig,
   type MemberFormValues,
 } from "./memberFormValues";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 
 interface BaseMember {
   user_email?: string;
@@ -168,91 +168,98 @@ const MemberModal = <T extends BaseMember>({
   );
 
   return (
-    <Modal
-      title={config.title || (mode === "add" ? "Add Member" : "Edit Member")}
-      open={visible}
-      width={1000}
-      footer={null}
-      onCancel={onCancel}
-    >
-      <form onSubmit={form.handleSubmit(handleSubmit)}>
-        <FieldGroup>
-          {config.showEmail && (
-            <FormField control={form.control} name="user_email" label="Email">
-              {({ ref, value, onChange, ...rest }) => (
-                <Input
-                  {...rest}
-                  ref={ref}
-                  placeholder="user@example.com"
-                  value={typeof value === "string" ? value : ""}
-                  onChange={(event) => onChange(event.target.value)}
-                />
-              )}
-            </FormField>
-          )}
-
-          {config.showEmail && config.showUserId && <div className="text-center text-sm text-muted-foreground">OR</div>}
-
-          {config.showUserId && (
-            <FormField control={form.control} name="user_id" label="User ID">
-              {({ ref, value, onChange, ...rest }) => (
-                <Input
-                  {...rest}
-                  ref={ref}
-                  placeholder="user_123"
-                  value={typeof value === "string" ? value : ""}
-                  onChange={(event) => onChange(event.target.value)}
-                />
-              )}
-            </FormField>
-          )}
-
-          <FormField
-            control={form.control}
-            name="role"
-            label={
-              <span className="flex items-center gap-2">
-                <span>Role</span>
-                {mode === "edit" && initialData && (
-                  <span className="text-sm text-muted-foreground">(Current: {getRoleLabel(initialData.role)})</span>
+    <Dialog open={visible} onOpenChange={(open) => !open && onCancel()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[1000px]">
+        <DialogHeader>
+          <DialogTitle>{config.title || (mode === "add" ? "Add Member" : "Edit Member")}</DialogTitle>
+        </DialogHeader>
+        <form onSubmit={form.handleSubmit(handleSubmit)}>
+          <FieldGroup>
+            {config.showEmail && (
+              <FormField control={form.control} name="user_email" label="Email">
+                {({ ref, value, onChange, ...rest }) => (
+                  <Input
+                    {...rest}
+                    ref={ref}
+                    placeholder="user@example.com"
+                    value={typeof value === "string" ? value : ""}
+                    onChange={(event) => onChange(event.target.value)}
+                  />
                 )}
-              </span>
-            }
-          >
-            {({ id, value, onChange }) => (
-              <Select
-                items={Object.fromEntries(orderedRoleOptions.map((option) => [option.value, option.label]))}
-                value={typeof value === "string" && value !== "" ? value : null}
-                onValueChange={(selected: string | null) => onChange(selected ?? undefined)}
-              >
-                <SelectTrigger id={id} className="w-full">
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent>
-                  {orderedRoleOptions.map((option) => (
-                    <SelectItem key={option.value} value={option.value}>
-                      {option.label}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+              </FormField>
             )}
-          </FormField>
 
-          {config.additionalFields?.map((field) => renderField(field, field.name))}
-        </FieldGroup>
+            {config.showEmail && config.showUserId && (
+              <div className="text-center text-sm text-muted-foreground">OR</div>
+            )}
 
-        <div className="mt-6 text-right">
-          <Button type="button" variant="outline" onClick={onCancel} disabled={isSubmitting} className="mr-2">
-            Cancel
-          </Button>
-          <Button type="submit" variant="outline" disabled={isSubmitting}>
-            {isSubmitting && <UiLoadingSpinner className="size-4" />}
-            {mode === "add" ? (isSubmitting ? "Adding..." : "Add Member") : isSubmitting ? "Saving..." : "Save Changes"}
-          </Button>
-        </div>
-      </form>
-    </Modal>
+            {config.showUserId && (
+              <FormField control={form.control} name="user_id" label="User ID">
+                {({ ref, value, onChange, ...rest }) => (
+                  <Input
+                    {...rest}
+                    ref={ref}
+                    placeholder="user_123"
+                    value={typeof value === "string" ? value : ""}
+                    onChange={(event) => onChange(event.target.value)}
+                  />
+                )}
+              </FormField>
+            )}
+
+            <FormField
+              control={form.control}
+              name="role"
+              label={
+                <span className="flex items-center gap-2">
+                  <span>Role</span>
+                  {mode === "edit" && initialData && (
+                    <span className="text-sm text-muted-foreground">(Current: {getRoleLabel(initialData.role)})</span>
+                  )}
+                </span>
+              }
+            >
+              {({ id, value, onChange }) => (
+                <Select
+                  items={Object.fromEntries(orderedRoleOptions.map((option) => [option.value, option.label]))}
+                  value={typeof value === "string" && value !== "" ? value : null}
+                  onValueChange={(selected: string | null) => onChange(selected ?? undefined)}
+                >
+                  <SelectTrigger id={id} className="w-full">
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {orderedRoleOptions.map((option) => (
+                      <SelectItem key={option.value} value={option.value}>
+                        {option.label}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              )}
+            </FormField>
+
+            {config.additionalFields?.map((field) => renderField(field, field.name))}
+          </FieldGroup>
+
+          <div className="mt-6 text-right">
+            <Button type="button" variant="outline" onClick={onCancel} disabled={isSubmitting} className="mr-2">
+              Cancel
+            </Button>
+            <Button type="submit" variant="outline" disabled={isSubmitting}>
+              {isSubmitting && <UiLoadingSpinner className="size-4" />}
+              {mode === "add"
+                ? isSubmitting
+                  ? "Adding..."
+                  : "Add Member"
+                : isSubmitting
+                  ? "Saving..."
+                  : "Save Changes"}
+            </Button>
+          </div>
+        </form>
+      </DialogContent>
+    </Dialog>
   );
 };
 
diff --git a/ui/litellm-dashboard/src/components/team/LoggingSettings.test.tsx b/ui/litellm-dashboard/src/components/team/LoggingSettings.test.tsx
index ae02a26ddb0..efdef4c2536 100644
--- a/ui/litellm-dashboard/src/components/team/LoggingSettings.test.tsx
+++ b/ui/litellm-dashboard/src/components/team/LoggingSettings.test.tsx
@@ -194,8 +194,8 @@ describe("LoggingSettings", () => {
 
     renderWithProviders(<LoggingSettings value={initialValue} onChange={mockOnChange} />);
 
-    await user.click(screen.getByTitle("Success Only"));
-    await user.click(await screen.findByTitle("Failure Only"));
+    await user.click(screen.getByRole("combobox", { name: "Event Type" }));
+    await user.click(await screen.findByRole("option", { name: "Failure Only" }));
 
     expect(mockOnChange).toHaveBeenCalledWith([expect.objectContaining({ callback_type: "failure" })]);
   });
diff --git a/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx b/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx
index 159f8fa0b74..b7f2dfaf398 100644
--- a/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx
+++ b/ui/litellm-dashboard/src/components/team/LoggingSettings.tsx
@@ -1,20 +1,24 @@
 /* eslint-disable react/no-unescaped-entities */
 import React from "react";
 import { SimpleTooltip } from "@/components/ui/tooltip";
-import { Select, Divider } from "antd";
-import { InfoCircleOutlined } from "@ant-design/icons";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Separator } from "@/components/ui/separator";
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { Card } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
 import { CogIcon, BanIcon } from "@heroicons/react/outline";
-import { Eye, EyeOff, Plus, Trash2 } from "lucide-react";
+import { Eye, EyeOff, Info, Plus, Trash2 } from "lucide-react";
 import { callbackInfo, callback_map, mapDisplayToInternalNames } from "../callback_info_helpers";
 import { Logo } from "@/components/molecules/logo/Logo";
 import NumericalInput from "../shared/numerical_input";
 
-const { Option } = Select;
+const CALLBACK_TYPE_ITEMS = [
+  { value: "success", label: "Success Only" },
+  { value: "failure", label: "Failure Only" },
+  { value: "success_and_failure", label: "Success & Failure" },
+];
 
 const CallbackVarInput: React.FC<{
   sensitive: boolean;
@@ -193,37 +197,37 @@ const LoggingSettings: React.FC<LoggingSettingsProps> = ({
           <BanIcon className="w-5 h-5 text-destructive" />
           <span className="text-base font-semibold text-foreground">Disabled Callbacks</span>
           <SimpleTooltip content="Select callbacks to disable for this key. Disabled callbacks will not receive any logging data.">
-            <InfoCircleOutlined className="text-muted-foreground cursor-help" />
+            <Info className="size-4 text-muted-foreground cursor-help" />
           </SimpleTooltip>
         </div>
 
         <div className="space-y-2">
           <label className="text-sm font-medium text-foreground">Disabled Callbacks</label>
-          <Select
-            mode="multiple"
-            placeholder="Select callbacks to disable"
-            value={disabledCallbacks}
-            onChange={handleDisabledCallbacksChange}
-            style={{ width: "100%" }}
-            optionLabelProp="label"
-          >
-            {allCallbacks.map((callbackName) => {
-              const description = callbackInfo[callbackName]?.description;
-              return (
-                <Option key={callbackName} value={callbackName} label={callbackName}>
-                  <SimpleTooltip content={description} side="right">
-                    <div className="flex items-center space-x-2">
-                      <Logo
-                        src={callbackInfo[callbackName]?.logo}
-                        label={callbackName}
-                        className="w-4 h-4 object-contain"
-                      />
-                      <span>{callbackName}</span>
-                    </div>
-                  </SimpleTooltip>
-                </Option>
-              );
-            })}
+          <Select multiple value={disabledCallbacks} onValueChange={handleDisabledCallbacksChange}>
+            <SelectTrigger className="w-full">
+              <SelectValue placeholder="Select callbacks to disable">
+                {(selected: string[]) => (selected.length === 0 ? "Select callbacks to disable" : selected.join(", "))}
+              </SelectValue>
+            </SelectTrigger>
+            <SelectContent>
+              {allCallbacks.map((callbackName) => {
+                const description = callbackInfo[callbackName]?.description;
+                return (
+                  <SelectItem key={callbackName} value={callbackName}>
+                    <SimpleTooltip content={description} side="right">
+                      <div className="flex items-center space-x-2">
+                        <Logo
+                          src={callbackInfo[callbackName]?.logo}
+                          label={callbackName}
+                          className="w-4 h-4 object-contain"
+                        />
+                        <span>{callbackName}</span>
+                      </div>
+                    </SimpleTooltip>
+                  </SelectItem>
+                );
+              })}
+            </SelectContent>
           </Select>
           <div className="text-xs text-muted-foreground">
             Select callbacks that should be disabled for this key. These callbacks will not receive any logging data.
@@ -231,7 +235,7 @@ const LoggingSettings: React.FC<LoggingSettingsProps> = ({
         </div>
       </div>
 
-      <Divider />
+      <Separator className="my-6" />
 
       {/* Logging Integrations Section */}
       <div className="flex justify-between items-center">
@@ -239,7 +243,7 @@ const LoggingSettings: React.FC<LoggingSettingsProps> = ({
           <CogIcon className="w-5 h-5 text-foreground" />
           <span className="text-base font-semibold text-foreground">Logging Integrations</span>
           <SimpleTooltip content="Configure callback logging integrations for this team.">
-            <InfoCircleOutlined className="text-muted-foreground cursor-help" />
+            <Info className="size-4 text-muted-foreground cursor-help" />
           </SimpleTooltip>
         </div>
         <Button variant="secondary" onClick={addLoggingConfig} size="sm" type="button">
@@ -286,42 +290,55 @@ const LoggingSettings: React.FC<LoggingSettingsProps> = ({
                   <div className="space-y-2">
                     <label className="text-sm font-medium text-foreground">Integration Type</label>
                     <Select
-                      value={callbackDisplayName}
-                      placeholder="Select integration"
-                      onChange={(value) => updateLoggingConfig(index, "callback_name", value)}
-                      className="w-full"
-                      optionLabelProp="label"
+                      value={callbackDisplayName ?? null}
+                      onValueChange={(value: string | null) =>
+                        value && updateLoggingConfig(index, "callback_name", value)
+                      }
                     >
-                      {supportedCallbacks.map((callbackName) => {
-                        const description = callbackInfo[callbackName]?.description;
-                        return (
-                          <Option key={callbackName} value={callbackName} label={callbackName}>
-                            <SimpleTooltip content={description} side="right">
-                              <div className="flex items-center space-x-2">
-                                <Logo
-                                  src={callbackInfo[callbackName]?.logo}
-                                  label={callbackName}
-                                  className="w-4 h-4 object-contain"
-                                />
-                                <span>{callbackName}</span>
-                              </div>
-                            </SimpleTooltip>
-                          </Option>
-                        );
-                      })}
+                      <SelectTrigger className="w-full">
+                        <SelectValue placeholder="Select integration" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {supportedCallbacks.map((callbackName) => {
+                          const description = callbackInfo[callbackName]?.description;
+                          return (
+                            <SelectItem key={callbackName} value={callbackName}>
+                              <SimpleTooltip content={description} side="right">
+                                <div className="flex items-center space-x-2">
+                                  <Logo
+                                    src={callbackInfo[callbackName]?.logo}
+                                    label={callbackName}
+                                    className="w-4 h-4 object-contain"
+                                  />
+                                  <span>{callbackName}</span>
+                                </div>
+                              </SimpleTooltip>
+                            </SelectItem>
+                          );
+                        })}
+                      </SelectContent>
                     </Select>
                   </div>
 
                   <div className="space-y-2">
                     <label className="text-sm font-medium text-foreground">Event Type</label>
                     <Select
+                      items={CALLBACK_TYPE_ITEMS}
                       value={config.callback_type}
-                      onChange={(value) => updateLoggingConfig(index, "callback_type", value)}
-                      className="w-full"
+                      onValueChange={(value: string | null) =>
+                        value && updateLoggingConfig(index, "callback_type", value)
+                      }
                     >
-                      <Option value="success">Success Only</Option>
-                      <Option value="failure">Failure Only</Option>
-                      <Option value="success_and_failure">Success &amp; Failure</Option>
+                      <SelectTrigger aria-label="Event Type" className="w-full">
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {CALLBACK_TYPE_ITEMS.map((item) => (
+                          <SelectItem key={item.value} value={item.value}>
+                            {item.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
                     </Select>
                   </div>
                 </div>
diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx
index 77f35762528..a7e8e6788dd 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.test.tsx
@@ -3,7 +3,7 @@ import * as networking from "@/components/networking";
 import { fireEvent, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { renderWithProviders, testQueryClient } from "../../../tests/test-utils";
+import { chooseSelectOption, renderWithProviders, testQueryClient } from "../../../tests/test-utils";
 import TeamInfoView from "./TeamInfo";
 
 const authState = vi.hoisted(() => ({ userRole: "Admin" }));
@@ -993,8 +993,7 @@ describe("TeamInfoView", () => {
       const user = userEvent.setup({ delay: null });
       const resetBudgetSelect = await openSettingsEditorForTeam(user, { budget_duration: "30d" });
 
-      await user.click(resetBudgetSelect);
-      await user.click(await screen.findByText("Never resets"));
+      await chooseSelectOption(user, resetBudgetSelect, "Never resets");
 
       await waitFor(() => {
         expect(resetBudgetSelect).toHaveTextContent("Never resets");
@@ -1028,8 +1027,7 @@ describe("TeamInfoView", () => {
       const user = userEvent.setup({ delay: null });
       const resetBudgetSelect = await openSettingsEditorForTeam(user, { budget_duration: null });
 
-      await user.click(resetBudgetSelect);
-      await user.click(await screen.findByText("weekly"));
+      await chooseSelectOption(user, resetBudgetSelect, "weekly");
 
       await user.click(screen.getByRole("button", { name: /save changes/i }));
 
diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index 1684c3b1225..fa73f1d8a43 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -20,7 +20,6 @@ import { formatNumberWithCommas } from "@/utils/dataUtils";
 import { mapEmptyStringToNull } from "@/utils/keyUpdateUtils";
 import type { ObjectPermission } from "@/components/object_permission_types";
 import { isProxyAdminRole } from "@/utils/roles";
-import { EditOutlined, InfoCircleOutlined } from "@ant-design/icons";
 import { ArrowLeftIcon } from "@heroicons/react/outline";
 import { StatusBadge, type StatusTone } from "@/components/shared/table_cells/status_badge";
 import { Badge } from "@/components/ui/badge";
@@ -30,7 +29,7 @@ import { Input as UIInput } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
 import { Textarea } from "@/components/ui/textarea";
-import { TooltipProvider } from "@/components/ui/tooltip";
+import { SimpleTooltip, TooltipProvider } from "@/components/ui/tooltip";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { Field, FieldDescription, FieldGroup, FieldLabel } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
@@ -39,9 +38,10 @@ import { MultiSelect } from "@/components/shared/MultiSelect";
 import { SearchSelect } from "@/components/shared/SearchSelect";
 import { useZodForm } from "@/lib/forms/useZodForm";
 import { TagsInput } from "@/app/(dashboard)/guardrails/_components/content_filter/TagsInput";
-import { Tabs, Tooltip } from "antd";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { useVisitedTabs } from "@/hooks/useVisitedTabs";
 import { toast } from "@/lib/toast";
-import { CheckIcon, ChevronDown, CircleMinus, CopyIcon, Plus, Save } from "lucide-react";
+import { CheckIcon, ChevronDown, CircleMinus, CopyIcon, Info, Pencil, Plus, Save } from "lucide-react";
 import React, { useEffect, useMemo, useState } from "react";
 import { useFieldArray } from "react-hook-form";
 import { z } from "zod/v4";
@@ -475,6 +475,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
   const canEditTeam = is_team_admin || is_proxy_admin || is_org_admin || isOrgAdminForTeam || isTeamAdminFromTeamData;
   const visibleTabs = useMemo(() => getTeamInfoVisibleTabs(canEditTeam), [canEditTeam]);
   const defaultTabKey = useMemo(() => getTeamInfoDefaultTab(editTeam, canEditTeam), [editTeam, canEditTeam]);
+  const { onTabChange, hasVisited } = useVisitedTabs(defaultTabKey);
 
   const teamFormValues = (): TeamUpdateFormValues => {
     const info = teamData?.team_info;
@@ -946,6 +947,965 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
     }
   };
 
+  const tabItems = [
+    {
+      key: TEAM_INFO_TAB_KEYS.OVERVIEW,
+      label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.OVERVIEW],
+      children: (
+        <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
+          <Card className="block p-6">
+            <p>Budget Status</p>
+            <div className="mt-2">
+              <h3 className="text-lg font-medium">${formatNumberWithCommas(info.spend, 2)}</h3>
+              <p>of {info.max_budget === null ? "Unlimited" : `$${formatNumberWithCommas(info.max_budget, 2)}`}</p>
+              {info.budget_duration && <p className="text-gray-500">Reset: {info.budget_duration}</p>}
+              <br />
+              {info.team_member_budget_table && (
+                <p className="text-gray-500">
+                  Team Member Budget: ${formatNumberWithCommas(info.team_member_budget_table.max_budget, 2)}
+                </p>
+              )}
+            </div>
+          </Card>
+
+          <Card className="block p-6">
+            <p>Rate Limits</p>
+            <div className="mt-2">
+              <p>TPM: {info.tpm_limit || "Unlimited"}</p>
+              <p>RPM: {info.rpm_limit || "Unlimited"}</p>
+              {info.max_parallel_requests && <p>Max Parallel Requests: {info.max_parallel_requests}</p>}
+              {(() => {
+                const modelTpm = (info.metadata?.model_tpm_limit ?? {}) as Record<string, number>;
+                const modelRpm = (info.metadata?.model_rpm_limit ?? {}) as Record<string, number>;
+                const models = Array.from(new Set([...Object.keys(modelTpm), ...Object.keys(modelRpm)]));
+                if (models.length === 0) return null;
+                return (
+                  <div className="mt-3">
+                    <p className="text-gray-500">Per-model limits:</p>
+                    {models.map((m) => (
+                      <p key={m} className="text-xs">
+                        {m}: TPM {modelTpm[m] ?? "—"}, RPM {modelRpm[m] ?? "—"}
+                      </p>
+                    ))}
+                  </div>
+                );
+              })()}
+              <p>Estimated Output Tokens: {info.metadata?.default_estimated_output_tokens ?? "Default"}</p>
+              <p>
+                Estimated Output Tokens Per Model:{" "}
+                {info.metadata?.default_estimated_output_tokens_per_model
+                  ? JSON.stringify(info.metadata.default_estimated_output_tokens_per_model)
+                  : "Default"}
+              </p>
+            </div>
+          </Card>
+
+          <Card className="block p-6">
+            <p>Models</p>
+            <div className="mt-2 flex flex-wrap gap-2">
+              {computeTeamModelBadges(info.models, info.access_group_models || [], info.access_group_details).map(
+                (badge, index) => (
+                  <SimpleTooltip key={`${badge.kind}-${badge.label}-${index}`} content={badge.tooltip}>
+                    <span>
+                      <StatusBadge tone={TEAM_MODEL_BADGE_TONES[badge.kind]} label={badge.label} />
+                    </span>
+                  </SimpleTooltip>
+                ),
+              )}
+            </div>
+          </Card>
+
+          <Card className="block p-6">
+            <p className="font-semibold text-gray-900">Virtual Keys</p>
+            <div className="mt-2">
+              <p>User Keys: {teamData.keys.filter((key) => key.user_id).length}</p>
+              <p>Service Account Keys: {teamData.keys.filter((key) => !key.user_id).length}</p>
+              <p className="text-gray-500">Total: {teamData.keys.length}</p>
+            </div>
+          </Card>
+
+          <ObjectPermissionsView objectPermission={info.object_permission} variant="card" accessToken={accessToken} />
+
+          <Card className="block p-6">
+            <GuardrailSettingsView
+              globalGuardrailNames={globalGuardrailNames}
+              teamGuardrails={Array.isArray(info.metadata?.guardrails) ? info.metadata.guardrails : []}
+              optedOutGlobalGuardrails={
+                Array.isArray(info.metadata?.opted_out_global_guardrails)
+                  ? info.metadata.opted_out_global_guardrails
+                  : []
+              }
+              killSwitchOn={initialKillSwitchOn}
+              variant="inline"
+            />
+          </Card>
+
+          <Card className="block p-6">
+            <p className="font-semibold text-gray-900 mb-3">Policies</p>
+            {info.policies && info.policies.length > 0 ? (
+              <div className="space-y-4">
+                {info.policies.map((policy: string, index: number) => (
+                  <div key={index} className="space-y-2">
+                    <div className="flex items-center gap-2">
+                      <Badge variant="secondary">{policy}</Badge>
+                      {loadingPolicies && <p className="text-xs text-gray-400">Loading guardrails...</p>}
+                    </div>
+                    {!loadingPolicies && policyGuardrails[policy] && policyGuardrails[policy].length > 0 && (
+                      <div className="ml-4 pl-3 border-l-2 border-gray-200">
+                        <p className="text-xs text-gray-500 mb-1">Resolved Guardrails:</p>
+                        <div className="flex flex-wrap gap-1">
+                          {policyGuardrails[policy].map((guardrail: string, gIndex: number) => (
+                            <Badge key={gIndex} variant="secondary">
+                              {guardrail}
+                            </Badge>
+                          ))}
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                ))}
+              </div>
+            ) : (
+              <p className="text-gray-500">No policies configured</p>
+            )}
+          </Card>
+
+          <LoggingSettingsView loggingConfigs={info.metadata?.logging || []} disabledCallbacks={[]} variant="card" />
+        </div>
+      ),
+    },
+    {
+      key: TEAM_INFO_TAB_KEYS.MY_USER,
+      label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.MY_USER],
+      children: <MyUserTab teamId={teamId} />,
+    },
+    {
+      key: TEAM_INFO_TAB_KEYS.VIRTUAL_KEYS,
+      label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.VIRTUAL_KEYS],
+      children: <TeamVirtualKeysTable teamId={teamId} teamAlias={info.team_alias} organization={organization} />,
+    },
+    {
+      key: TEAM_INFO_TAB_KEYS.MEMBERS,
+      label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.MEMBERS],
+      children: (
+        <TeamMembersComponent
+          teamData={teamData}
+          canEditTeam={canEditTeam}
+          handleMemberDelete={handleMemberDelete}
+          setSelectedEditMember={setSelectedEditMember}
+          setIsEditMemberModalVisible={setIsEditMemberModalVisible}
+          setIsAddMemberModalVisible={setIsAddMemberModalVisible}
+        />
+      ),
+    },
+    {
+      key: TEAM_INFO_TAB_KEYS.MEMBER_PERMISSIONS,
+      label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.MEMBER_PERMISSIONS],
+      children: <MemberPermissions teamId={teamId} accessToken={accessToken} canEditTeam={canEditTeam} />,
+    },
+    {
+      key: TEAM_INFO_TAB_KEYS.SETTINGS,
+      label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.SETTINGS],
+      children: (
+        <Card className="block p-6 overflow-y-auto max-h-[65vh]">
+          <div className="flex justify-between items-center mb-4">
+            <h3 className="text-lg font-medium">Team Settings</h3>
+            {canEditTeam && !isEditing && (
+              <Button
+                variant="outline"
+                onClick={() => {
+                  setTeamModelAliases(info.litellm_model_table?.model_aliases ?? {});
+                  startEditing();
+                }}
+              >
+                <Pencil />
+                Edit Settings
+              </Button>
+            )}
+          </div>
+
+          {isEditing && isGuardrailsLoading ? (
+            <div className="p-4">Loading...</div>
+          ) : isEditing ? (
+            <TooltipProvider>
+              <form onSubmit={(event) => void form.handleSubmit(onTeamUpdateSubmit)(event)}>
+                <FieldGroup>
+                  <FormField control={form.control} name="team_alias" label="Team Name">
+                    {({ ref, value, ...field }) => <UIInput {...field} ref={ref} value={value ?? ""} />}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="models"
+                    label="Models"
+                    description="Leave empty to grant no models directly. The team keeps any models granted through its access groups"
+                  >
+                    {({ id, value, onChange }) => (
+                      <ModelSelect
+                        id={id}
+                        value={value ?? []}
+                        onChange={onChange}
+                        teamID={teamId}
+                        organizationID={teamData?.team_info?.organization_id || undefined}
+                        options={{
+                          includeSpecialOptions: true,
+                          includeUserModels: !teamData?.team_info?.organization_id,
+                          showAllProxyModelsOverride:
+                            isProxyAdminRole(userRole) && !teamData?.team_info?.organization_id,
+                        }}
+                        context="team"
+                        dataTestId="models-select"
+                      />
+                    )}
+                  </FormField>
+
+                  <Field>
+                    <FieldLabel>
+                      {labelWithHint(
+                        "Model Aliases",
+                        "Map a custom alias to an underlying model. Team members can call the alias in API requests instead of the real model name.",
+                      )}
+                    </FieldLabel>
+                    <ModelAliasManager
+                      accessToken={accessToken || ""}
+                      initialModelAliases={teamModelAliases}
+                      onAliasUpdate={setTeamModelAliases}
+                      showExampleConfig={false}
+                    />
+                  </Field>
+
+                  <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
+                    {({ ref, value, ...field }) => (
+                      <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} />
+                    )}
+                  </FormField>
+
+                  <FormField control={form.control} name="soft_budget" label="Soft Budget (USD)">
+                    {({ ref, value, ...field }) => (
+                      <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="soft_budget_alerting_emails"
+                    label={labelWithHint(
+                      "Soft Budget Alerting Emails",
+                      "Comma-separated email addresses to receive alerts when the soft budget is reached",
+                    )}
+                  >
+                    {({ ref, value, ...field }) => (
+                      <UIInput
+                        {...field}
+                        ref={ref}
+                        value={typeof value === "string" ? value : ""}
+                        placeholder="example1@test.com, example2@test.com"
+                      />
+                    )}
+                  </FormField>
+
+                  <Collapsible
+                    open={teamMemberSettingsOpen}
+                    onOpenChange={setTeamMemberSettingsOpen}
+                    className="mt-4 mb-4 overflow-hidden rounded-lg border"
+                  >
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Team Member Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <p className="mb-4 text-xs text-gray-500">
+                        Optional defaults applied when members join this team. All fields can be overridden per member.
+                      </p>
+                      <FieldGroup>
+                        <FormField
+                          control={form.control}
+                          name="default_team_member_models"
+                          label={labelWithHint(
+                            "Default Model Access",
+                            "Optional. If set, new members can only access these models by default. Must be a subset of the team's models above. Leave empty to give all members access to all team models.",
+                          )}
+                        >
+                          {({ id, value, onChange }) => (
+                            <MultiSelect
+                              id={id}
+                              value={value ?? []}
+                              onValueChange={onChange}
+                              options={(watchedModels ?? info.models ?? []).map((model) => ({
+                                label: model,
+                                value: model,
+                              }))}
+                              placeholder="Leave empty — all team models accessible to every member"
+                            />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_budget"
+                          label={labelWithHint(
+                            "Default Budget (USD)",
+                            "Default spend budget for each member in this team.",
+                          )}
+                        >
+                          {({ ref, value, ...field }) => (
+                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_budget_duration"
+                          label="Default Budget Duration"
+                        >
+                          {({ value, onChange }) => <DurationSelect value={value ?? undefined} onChange={onChange} />}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_key_duration"
+                          label={labelWithHint(
+                            "Default Key Duration (eg: 1d, 1mo)",
+                            "Set a limit to the duration of a team member's key. Format: 30s (seconds), 30m (minutes), 30h (hours), 30d (days), 1mo (month)",
+                          )}
+                        >
+                          {({ ref, value, ...field }) => (
+                            <UIInput {...field} ref={ref} value={value ?? ""} placeholder="e.g., 30d" />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_tpm_limit"
+                          label={labelWithHint(
+                            "Default TPM Limit",
+                            "Default tokens per minute limit for each member. Can be overridden per member.",
+                          )}
+                        >
+                          {({ ref, value, ...field }) => (
+                            <NumericalInput
+                              {...field}
+                              ref={ref}
+                              value={value ?? ""}
+                              step={1}
+                              placeholder="e.g., 1000"
+                            />
+                          )}
+                        </FormField>
+                        <FormField
+                          control={form.control}
+                          name="team_member_rpm_limit"
+                          label={labelWithHint(
+                            "Default RPM Limit",
+                            "Default requests per minute limit for each member. Can be overridden per member.",
+                          )}
+                        >
+                          {({ ref, value, ...field }) => (
+                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} placeholder="e.g., 100" />
+                          )}
+                        </FormField>
+                      </FieldGroup>
+                    </CollapsibleContent>
+                  </Collapsible>
+
+                  <FormField control={form.control} name="budget_duration" label="Reset Budget">
+                    {({ id, value, onChange }) => (
+                      <BudgetDurationDropdown
+                        id={id}
+                        placeholder="Never resets"
+                        value={value}
+                        onChange={(next) => onChange(next ?? null)}
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField control={form.control} name="tpm_limit" label="Tokens per minute Limit (TPM)">
+                    {({ ref, value, ...field }) => <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} />}
+                  </FormField>
+
+                  <FormField control={form.control} name="rpm_limit" label="Requests per minute Limit (RPM)">
+                    {({ ref, value, ...field }) => <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} />}
+                  </FormField>
+
+                  <Field>
+                    <FieldLabel>Metadata</FieldLabel>
+                    <MetadataKeyValueFields
+                      control={form.control}
+                      getValues={form.getValues}
+                      name="metadata"
+                      schemaFields={teamMetadataSchemaFields}
+                      schemaLoading={isTeamMetadataSchemaLoading}
+                    />
+                    <FieldDescription>
+                      Values are saved as text. Enter JSON for typed values, e.g. 3, true, or {'{"region": "us"}'}.
+                    </FieldDescription>
+                  </Field>
+
+                  <Field>
+                    <FieldLabel>
+                      {labelWithHint(
+                        "Model-Specific Rate Limits",
+                        "Set per-model TPM/RPM limits that apply across the whole team.",
+                      )}
+                    </FieldLabel>
+                    {modelLimitRows.map((row, index) => (
+                      <div key={row.id} className="mb-2 flex items-start gap-2">
+                        <FormField control={form.control} name={`modelLimits.${index}.model`} className="min-w-60">
+                          {({ id, value, onChange }) => (
+                            <SearchSelect
+                              inputId={id}
+                              value={value ?? ""}
+                              onValueChange={onChange}
+                              options={availableRateLimitModels.map((model) => ({
+                                label: model,
+                                value: model,
+                              }))}
+                              placeholder="Select model"
+                            />
+                          )}
+                        </FormField>
+                        <FormField control={form.control} name={`modelLimits.${index}.tpm`}>
+                          {({ ref, value, onChange, ...field }) => (
+                            <NumericalInput
+                              {...field}
+                              ref={ref}
+                              value={value ?? ""}
+                              onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                                onChange(event.target.value === "" ? null : Number(event.target.value))
+                              }
+                              placeholder="TPM Limit"
+                              min={0}
+                              step={1}
+                            />
+                          )}
+                        </FormField>
+                        <FormField control={form.control} name={`modelLimits.${index}.rpm`}>
+                          {({ ref, value, onChange, ...field }) => (
+                            <NumericalInput
+                              {...field}
+                              ref={ref}
+                              value={value ?? ""}
+                              onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                                onChange(event.target.value === "" ? null : Number(event.target.value))
+                              }
+                              placeholder="RPM Limit"
+                              min={0}
+                              step={1}
+                            />
+                          )}
+                        </FormField>
+                        <Button
+                          type="button"
+                          variant="ghost"
+                          size="icon"
+                          aria-label="Remove model limit"
+                          className="mt-1 text-destructive"
+                          onClick={() => removeModelLimit(index)}
+                        >
+                          <CircleMinus className="size-4" />
+                        </Button>
+                      </div>
+                    ))}
+                    <Button
+                      type="button"
+                      variant="outline"
+                      className="w-full border-dashed"
+                      onClick={() => appendModelLimit({ model: "", tpm: null, rpm: null })}
+                    >
+                      <Plus className="size-4" />
+                      Add Model Limit
+                    </Button>
+                  </Field>
+
+                  <FormField
+                    control={form.control}
+                    name="default_estimated_output_tokens"
+                    label={labelWithHint("Estimated Output Tokens", teamEstimateTooltip.estimate)}
+                  >
+                    {({ ref, value, ...field }) => (
+                      <NumericalInput
+                        {...field}
+                        ref={ref}
+                        value={value ?? ""}
+                        min={1}
+                        step={1}
+                        disabled={!canEditTeamEstimates}
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="default_estimated_output_tokens_per_model"
+                    label={labelWithHint("Estimated Output Tokens Per Model", teamEstimateTooltip.perModel)}
+                  >
+                    {({ ref, value, ...field }) => (
+                      <Textarea
+                        {...field}
+                        ref={ref}
+                        value={value ?? ""}
+                        rows={4}
+                        placeholder='{"gpt-4": 4096}'
+                        disabled={!canEditTeamEstimates}
+                      />
+                    )}
+                  </FormField>
+
+                  <Field>
+                    <FieldLabel>Router Settings</FieldLabel>
+                    <RouterSettingsAccordion
+                      ref={routerSettingsRef}
+                      accessToken={accessToken || ""}
+                      teamId={teamId}
+                      value={info.router_settings ? { router_settings: info.router_settings } : undefined}
+                    />
+                  </Field>
+
+                  <FormField
+                    control={form.control}
+                    name="guardrails"
+                    label={labelWithDocsHint(
+                      "Guardrails",
+                      "Select which guardrails apply to this team. Global guardrails are enabled by default, uncheck to opt out. Other guardrails are opt-in.",
+                      "https://docs.litellm.ai/docs/proxy/guardrails/quick_start",
+                    )}
+                  >
+                    {({ id, value, onChange }) => (
+                      <GuardrailsSelect
+                        id={id}
+                        value={value ?? []}
+                        onValueChange={onChange}
+                        globalGuardrails={globalGuardrails.map((g) => ({
+                          name: g.guardrail_name,
+                          disabled: Boolean(killSwitchOn),
+                        }))}
+                        otherGuardrails={otherGuardrails.map((g) => ({
+                          name: g.guardrail_name,
+                          disabled: false,
+                        }))}
+                        globalGuardrailNames={globalGuardrailNames}
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="disable_global_guardrails"
+                    label={labelWithHint(
+                      "Disable all global guardrails",
+                      "Kill switch: bypass every global guardrail for this team, including any added in the future. For per-guardrail opt-out instead, use the Guardrails dropdown above.",
+                    )}
+                  >
+                    {({ id, value, onChange }) => (
+                      <Switch
+                        id={id}
+                        checked={value === true}
+                        onCheckedChange={(checked) => {
+                          onChange(checked);
+                          applyKillSwitchToGuardrails(checked);
+                        }}
+                      />
+                    )}
+                  </FormField>
+
+                  {canViewPolicies && (
+                    <FormField
+                      control={form.control}
+                      name="policies"
+                      label={labelWithDocsHint(
+                        "Policies",
+                        "Apply policies to this team to control guardrails and other settings",
+                        "https://docs.litellm.ai/docs/proxy/guardrails/guardrail_policies",
+                      )}
+                    >
+                      {({ id, value, onChange }) => (
+                        <TagsInput
+                          id={id}
+                          value={value ?? []}
+                          onValueChange={onChange}
+                          options={policiesList.map((name) => ({ value: name, label: name }))}
+                          placeholder="Select or enter policies"
+                        />
+                      )}
+                    </FormField>
+                  )}
+
+                  <FormField
+                    control={form.control}
+                    name="access_group_ids"
+                    label={labelWithHint(
+                      "Access Groups",
+                      "Assign access groups to this team. Access groups control which models, MCP servers, and agents this team can use",
+                    )}
+                  >
+                    {({ value, onChange }) => (
+                      <AccessGroupSelector
+                        value={value}
+                        onChange={onChange}
+                        placeholder="Select access groups (optional)"
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField control={form.control} name="vector_stores" label="Vector Stores">
+                    {({ value, onChange }) => (
+                      <VectorStoreSelector
+                        onChange={onChange}
+                        value={value}
+                        accessToken={accessToken || ""}
+                        placeholder="Select vector stores"
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="allowed_passthrough_routes"
+                    label={
+                      !premiumUser
+                        ? labelWithHint(
+                            "Allowed Pass Through Routes",
+                            "Premium feature - Upgrade to set allowed pass through routes",
+                          )
+                        : !is_proxy_admin
+                          ? labelWithHint(
+                              "Allowed Pass Through Routes",
+                              "Only proxy admins can set allowed pass through routes",
+                            )
+                          : "Allowed Pass Through Routes"
+                    }
+                  >
+                    {({ value, onChange }) => (
+                      <PassThroughRoutesSelector
+                        value={value}
+                        onChange={onChange}
+                        accessToken={accessToken || ""}
+                        placeholder="Select pass through routes"
+                        disabled={!premiumUser || !is_proxy_admin}
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField control={form.control} name="mcp_servers_and_groups" label="MCP Servers / Access Groups">
+                    {({ value, onChange }) => (
+                      <MCPServerSelector
+                        onChange={onChange}
+                        value={value}
+                        accessToken={accessToken || ""}
+                        placeholder="Select MCP servers or access groups (optional)"
+                        allowAllProxyMcpServers={is_proxy_admin}
+                      />
+                    )}
+                  </FormField>
+
+                  <div className="mb-6">
+                    <MCPToolPermissions
+                      accessToken={accessToken || ""}
+                      selectedServers={watchedMcpSelection?.servers || []}
+                      toolPermissions={watchedToolPermissions || {}}
+                      onChange={(toolPerms) => form.setValue("mcp_tool_permissions", toolPerms)}
+                    />
+                  </div>
+
+                  <FormField control={form.control} name="agents_and_groups" label="Agents / Access Groups">
+                    {({ value, onChange }) => (
+                      <AgentSelector
+                        onChange={onChange}
+                        value={value}
+                        accessToken={accessToken || ""}
+                        placeholder="Select agents or access groups (optional)"
+                      />
+                    )}
+                  </FormField>
+
+                  <Collapsible
+                    open={searchToolSettingsOpen}
+                    onOpenChange={setSearchToolSettingsOpen}
+                    className="mt-4 mb-4 overflow-hidden rounded-lg border"
+                  >
+                    <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
+                      <b>Search Tool Settings</b>
+                      <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
+                    </CollapsibleTrigger>
+                    <CollapsibleContent className="px-4 pb-3">
+                      <FormField
+                        control={form.control}
+                        name="object_permission_search_tools"
+                        label={labelWithHint(
+                          "Allowed Search Tools",
+                          "Select which search tools this team can access. Leave empty to allow all search tools.",
+                        )}
+                      >
+                        {({ value, onChange }) => (
+                          <SearchToolSelector
+                            onChange={onChange}
+                            value={value}
+                            accessToken={accessToken || ""}
+                            placeholder="Select search tools (optional, empty = all allowed)"
+                          />
+                        )}
+                      </FormField>
+                    </CollapsibleContent>
+                  </Collapsible>
+
+                  <FormField control={form.control} name="organization_id" label="Organization">
+                    {({ id, value, onChange }) => (
+                      <SearchSelect
+                        inputId={id}
+                        value={value ?? ""}
+                        onValueChange={(next) => onChange(next === "" ? null : next)}
+                        options={userOrganizations.map((org) => ({
+                          value: org.organization_id ?? "",
+                          label: org.organization_alias || org.organization_id || "",
+                        }))}
+                        placeholder="Select an organization"
+                        emptyText="No matching organizations"
+                      />
+                    )}
+                  </FormField>
+
+                  <FormField control={form.control} name="logging_settings" label="Logging Settings">
+                    {({ value, onChange }) => (
+                      <EditLoggingSettings value={(value as unknown[]) ?? []} onChange={onChange} />
+                    )}
+                  </FormField>
+
+                  <FormField
+                    control={form.control}
+                    name="secret_manager_settings"
+                    label="Secret Manager Settings"
+                    description={
+                      premiumUser
+                        ? "Enter secret manager configuration as a JSON object."
+                        : "Premium feature - Upgrade to manage secret manager settings."
+                    }
+                  >
+                    {({ ref, value, ...field }) => (
+                      <Textarea
+                        {...field}
+                        ref={ref}
+                        value={value ?? ""}
+                        rows={6}
+                        placeholder='{"namespace": "admin", "mount": "secret", "path_prefix": "litellm"}'
+                        disabled={!premiumUser}
+                      />
+                    )}
+                  </FormField>
+                </FieldGroup>
+
+                <div className="sticky z-10 -inset-x-6 -bottom-6 border-t border-gray-200 bg-white p-4 pr-0">
+                  <div className="flex items-center justify-end gap-2">
+                    <Button type="button" variant="outline" onClick={() => setIsEditing(false)} disabled={isTeamSaving}>
+                      Cancel
+                    </Button>
+                    <Button type="submit" disabled={isTeamSaving}>
+                      {isTeamSaving ? <UiLoadingSpinner className="size-4" /> : <Save className="size-4" />}
+                      Save Changes
+                    </Button>
+                  </div>
+                </div>
+              </form>
+            </TooltipProvider>
+          ) : (
+            <div className="space-y-4">
+              <div>
+                <p className="font-medium">Team Name</p>
+                <div>{info.team_alias}</div>
+              </div>
+              <div>
+                <p className="font-medium">Team ID</p>
+                <div className="font-mono">{info.team_id}</div>
+              </div>
+              <div>
+                <p className="font-medium">Created At</p>
+                <div>{new Date(info.created_at).toLocaleString()}</div>
+              </div>
+              <div>
+                <p className="font-medium">Models</p>
+                <div className="flex flex-wrap gap-2 mt-1">
+                  {info.models.map((model, index) => (
+                    <Badge key={index} variant="secondary">
+                      {model}
+                    </Badge>
+                  ))}
+                </div>
+              </div>
+              {info.default_team_member_models && info.default_team_member_models.length > 0 && (
+                <div>
+                  <p className="font-medium">Default Member Models</p>
+                  <div className="flex flex-wrap gap-2 mt-1">
+                    {info.default_team_member_models.map((model, index) => (
+                      <Badge key={index} variant="secondary">
+                        {model}
+                      </Badge>
+                    ))}
+                  </div>
+                </div>
+              )}
+              <div>
+                <p className="font-medium">Model Aliases</p>
+                {(() => {
+                  const aliasEntries = Object.entries(info.litellm_model_table?.model_aliases ?? {});
+                  if (aliasEntries.length === 0) {
+                    return <div className="text-gray-400">No model aliases configured</div>;
+                  }
+                  return (
+                    <div className="mt-1 space-y-1">
+                      {aliasEntries.map(([alias, target]) => (
+                        <div key={alias} className="text-sm">
+                          <span className="font-mono">{alias}</span>
+                          <span className="text-gray-400">{" -> "}</span>
+                          <span className="font-mono">{target}</span>
+                        </div>
+                      ))}
+                    </div>
+                  );
+                })()}
+              </div>
+              <div>
+                <p className="font-medium">Rate Limits</p>
+                <div>TPM: {info.tpm_limit || "Unlimited"}</div>
+                <div>RPM: {info.rpm_limit || "Unlimited"}</div>
+                {(() => {
+                  const modelTpm = (info.metadata?.model_tpm_limit ?? {}) as Record<string, number>;
+                  const modelRpm = (info.metadata?.model_rpm_limit ?? {}) as Record<string, number>;
+                  const models = Array.from(new Set([...Object.keys(modelTpm), ...Object.keys(modelRpm)]));
+                  if (models.length === 0) return null;
+                  return (
+                    <div className="mt-2">
+                      <p className="text-gray-500">Per-model limits:</p>
+                      {models.map((m) => (
+                        <div key={m} className="text-xs ml-2">
+                          {m}: TPM {modelTpm[m] ?? "—"}, RPM {modelRpm[m] ?? "—"}
+                        </div>
+                      ))}
+                    </div>
+                  );
+                })()}
+                <div>Estimated Output Tokens: {info.metadata?.default_estimated_output_tokens ?? "Default"}</div>
+                <div>
+                  Estimated Output Tokens Per Model:{" "}
+                  {info.metadata?.default_estimated_output_tokens_per_model
+                    ? JSON.stringify(info.metadata.default_estimated_output_tokens_per_model)
+                    : "Default"}
+                </div>
+              </div>
+              <div>
+                <p className="font-medium">Team Budget</p>
+                <div>
+                  Max Budget: {info.max_budget !== null ? `$${formatNumberWithCommas(info.max_budget, 4)}` : "No Limit"}
+                </div>
+                <div>
+                  Soft Budget:{" "}
+                  {info.soft_budget !== null && info.soft_budget !== undefined
+                    ? `$${formatNumberWithCommas(info.soft_budget, 4)}`
+                    : "No Limit"}
+                </div>
+                <div>Budget Reset: {info.budget_duration || "Never"}</div>
+                {info.metadata?.soft_budget_alerting_emails &&
+                  Array.isArray(info.metadata.soft_budget_alerting_emails) &&
+                  info.metadata.soft_budget_alerting_emails.length > 0 && (
+                    <div>Soft Budget Alerting Emails: {info.metadata.soft_budget_alerting_emails.join(", ")}</div>
+                  )}
+              </div>
+              <div>
+                <p className="font-medium">
+                  Team Member Settings{" "}
+                  <SimpleTooltip content="These are limits on individual team members">
+                    <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                  </SimpleTooltip>
+                </p>
+                <div>Max Budget: {info.team_member_budget_table?.max_budget || "No Limit"}</div>
+                <div>Budget Duration: {info.team_member_budget_table?.budget_duration || "No Limit"}</div>
+                <div>Key Duration: {info.metadata?.team_member_key_duration || "No Limit"}</div>
+                <div>TPM Limit: {info.team_member_budget_table?.tpm_limit || "No Limit"}</div>
+                <div>RPM Limit: {info.team_member_budget_table?.rpm_limit || "No Limit"}</div>
+              </div>
+              <div>
+                <p className="font-medium">Router Settings</p>
+                {info.router_settings &&
+                Object.values(info.router_settings).some(
+                  (v) => v !== null && v !== undefined && v !== "" && !(Array.isArray(v) && v.length === 0),
+                ) ? (
+                  <div className="mt-1 space-y-1">
+                    {info.router_settings.routing_strategy && (
+                      <div>
+                        Routing Strategy: <Badge variant="secondary">{info.router_settings.routing_strategy}</Badge>
+                      </div>
+                    )}
+                    {info.router_settings.num_retries != null && (
+                      <div>Number of Retries: {info.router_settings.num_retries}</div>
+                    )}
+                    {info.router_settings.allowed_fails != null && (
+                      <div>Allowed Failures: {info.router_settings.allowed_fails}</div>
+                    )}
+                    {info.router_settings.cooldown_time != null && (
+                      <div>Cooldown Time: {info.router_settings.cooldown_time}s</div>
+                    )}
+                    {info.router_settings.timeout != null && <div>Timeout: {info.router_settings.timeout}s</div>}
+                    {info.router_settings.retry_after != null && (
+                      <div>Retry After: {info.router_settings.retry_after}s</div>
+                    )}
+                    {info.router_settings.fallbacks &&
+                      Array.isArray(info.router_settings.fallbacks) &&
+                      info.router_settings.fallbacks.length > 0 && (
+                        <div>Fallbacks: {info.router_settings.fallbacks.length} configured</div>
+                      )}
+                    {info.router_settings.enable_tag_filtering && <div>Tag Filtering: Enabled</div>}
+                  </div>
+                ) : (
+                  <div className="text-gray-400">No router settings configured</div>
+                )}
+              </div>
+              <div>
+                <p className="font-medium">Organization ID</p>
+                <div>{info.organization_id}</div>
+              </div>
+              <div>
+                <p className="font-medium">Status</p>
+                <Badge variant={info.blocked ? "destructive" : "secondary"}>
+                  {info.blocked ? "Blocked" : "Active"}
+                </Badge>
+              </div>
+
+              <ObjectPermissionsView
+                objectPermission={info.object_permission}
+                variant="inline"
+                className="pt-4 border-t border-gray-200"
+                accessToken={accessToken}
+              />
+
+              <GuardrailSettingsView
+                globalGuardrailNames={globalGuardrailNames}
+                teamGuardrails={Array.isArray(info.metadata?.guardrails) ? info.metadata.guardrails : []}
+                optedOutGlobalGuardrails={
+                  Array.isArray(info.metadata?.opted_out_global_guardrails)
+                    ? info.metadata.opted_out_global_guardrails
+                    : []
+                }
+                killSwitchOn={initialKillSwitchOn}
+                variant="inline"
+                className="pt-4 border-t border-gray-200"
+              />
+
+              <LoggingSettingsView
+                loggingConfigs={info.metadata?.logging || []}
+                disabledCallbacks={[]}
+                variant="inline"
+                className="pt-4 border-t border-gray-200"
+              />
+
+              {info.metadata?.secret_manager_settings && (
+                <div className="pt-4 border-t border-gray-200">
+                  <p className="font-medium">Secret Manager Settings</p>
+                  <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>
+              )}
+            </div>
+          )}
+        </Card>
+      ),
+    },
+  ].filter((tab) => visibleTabs.includes(tab.key));
+
   return (
     <div className="p-4">
       <div className="flex justify-between items-center mb-6">
@@ -973,1007 +1933,20 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
         </div>
       </div>
 
-      <Tabs
-        defaultActiveKey={defaultTabKey}
-        className="mb-4"
-        items={[
-          {
-            key: TEAM_INFO_TAB_KEYS.OVERVIEW,
-            label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.OVERVIEW],
-            children: (
-              <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
-                <Card className="block p-6">
-                  <p>Budget Status</p>
-                  <div className="mt-2">
-                    <h3 className="text-lg font-medium">${formatNumberWithCommas(info.spend, 2)}</h3>
-                    <p>
-                      of {info.max_budget === null ? "Unlimited" : `$${formatNumberWithCommas(info.max_budget, 2)}`}
-                    </p>
-                    {info.budget_duration && <p className="text-gray-500">Reset: {info.budget_duration}</p>}
-                    <br />
-                    {info.team_member_budget_table && (
-                      <p className="text-gray-500">
-                        Team Member Budget: ${formatNumberWithCommas(info.team_member_budget_table.max_budget, 2)}
-                      </p>
-                    )}
-                  </div>
-                </Card>
-
-                <Card className="block p-6">
-                  <p>Rate Limits</p>
-                  <div className="mt-2">
-                    <p>TPM: {info.tpm_limit || "Unlimited"}</p>
-                    <p>RPM: {info.rpm_limit || "Unlimited"}</p>
-                    {info.max_parallel_requests && <p>Max Parallel Requests: {info.max_parallel_requests}</p>}
-                    {(() => {
-                      const modelTpm = (info.metadata?.model_tpm_limit ?? {}) as Record<string, number>;
-                      const modelRpm = (info.metadata?.model_rpm_limit ?? {}) as Record<string, number>;
-                      const models = Array.from(new Set([...Object.keys(modelTpm), ...Object.keys(modelRpm)]));
-                      if (models.length === 0) return null;
-                      return (
-                        <div className="mt-3">
-                          <p className="text-gray-500">Per-model limits:</p>
-                          {models.map((m) => (
-                            <p key={m} className="text-xs">
-                              {m}: TPM {modelTpm[m] ?? "—"}, RPM {modelRpm[m] ?? "—"}
-                            </p>
-                          ))}
-                        </div>
-                      );
-                    })()}
-                    <p>Estimated Output Tokens: {info.metadata?.default_estimated_output_tokens ?? "Default"}</p>
-                    <p>
-                      Estimated Output Tokens Per Model:{" "}
-                      {info.metadata?.default_estimated_output_tokens_per_model
-                        ? JSON.stringify(info.metadata.default_estimated_output_tokens_per_model)
-                        : "Default"}
-                    </p>
-                  </div>
-                </Card>
-
-                <Card className="block p-6">
-                  <p>Models</p>
-                  <div className="mt-2 flex flex-wrap gap-2">
-                    {computeTeamModelBadges(info.models, info.access_group_models || [], info.access_group_details).map(
-                      (badge, index) => (
-                        <Tooltip key={`${badge.kind}-${badge.label}-${index}`} title={badge.tooltip}>
-                          <span>
-                            <StatusBadge tone={TEAM_MODEL_BADGE_TONES[badge.kind]} label={badge.label} />
-                          </span>
-                        </Tooltip>
-                      ),
-                    )}
-                  </div>
-                </Card>
-
-                <Card className="block p-6">
-                  <p className="font-semibold text-gray-900">Virtual Keys</p>
-                  <div className="mt-2">
-                    <p>User Keys: {teamData.keys.filter((key) => key.user_id).length}</p>
-                    <p>Service Account Keys: {teamData.keys.filter((key) => !key.user_id).length}</p>
-                    <p className="text-gray-500">Total: {teamData.keys.length}</p>
-                  </div>
-                </Card>
-
-                <ObjectPermissionsView
-                  objectPermission={info.object_permission}
-                  variant="card"
-                  accessToken={accessToken}
-                />
-
-                <Card className="block p-6">
-                  <GuardrailSettingsView
-                    globalGuardrailNames={globalGuardrailNames}
-                    teamGuardrails={Array.isArray(info.metadata?.guardrails) ? info.metadata.guardrails : []}
-                    optedOutGlobalGuardrails={
-                      Array.isArray(info.metadata?.opted_out_global_guardrails)
-                        ? info.metadata.opted_out_global_guardrails
-                        : []
-                    }
-                    killSwitchOn={initialKillSwitchOn}
-                    variant="inline"
-                  />
-                </Card>
-
-                <Card className="block p-6">
-                  <p className="font-semibold text-gray-900 mb-3">Policies</p>
-                  {info.policies && info.policies.length > 0 ? (
-                    <div className="space-y-4">
-                      {info.policies.map((policy: string, index: number) => (
-                        <div key={index} className="space-y-2">
-                          <div className="flex items-center gap-2">
-                            <Badge variant="secondary">{policy}</Badge>
-                            {loadingPolicies && <p className="text-xs text-gray-400">Loading guardrails...</p>}
-                          </div>
-                          {!loadingPolicies && policyGuardrails[policy] && policyGuardrails[policy].length > 0 && (
-                            <div className="ml-4 pl-3 border-l-2 border-gray-200">
-                              <p className="text-xs text-gray-500 mb-1">Resolved Guardrails:</p>
-                              <div className="flex flex-wrap gap-1">
-                                {policyGuardrails[policy].map((guardrail: string, gIndex: number) => (
-                                  <Badge key={gIndex} variant="secondary">
-                                    {guardrail}
-                                  </Badge>
-                                ))}
-                              </div>
-                            </div>
-                          )}
-                        </div>
-                      ))}
-                    </div>
-                  ) : (
-                    <p className="text-gray-500">No policies configured</p>
-                  )}
-                </Card>
-
-                <LoggingSettingsView
-                  loggingConfigs={info.metadata?.logging || []}
-                  disabledCallbacks={[]}
-                  variant="card"
-                />
-              </div>
-            ),
-          },
-          {
-            key: TEAM_INFO_TAB_KEYS.MY_USER,
-            label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.MY_USER],
-            children: <MyUserTab teamId={teamId} />,
-          },
-          {
-            key: TEAM_INFO_TAB_KEYS.VIRTUAL_KEYS,
-            label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.VIRTUAL_KEYS],
-            children: <TeamVirtualKeysTable teamId={teamId} teamAlias={info.team_alias} organization={organization} />,
-          },
-          {
-            key: TEAM_INFO_TAB_KEYS.MEMBERS,
-            label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.MEMBERS],
-            children: (
-              <TeamMembersComponent
-                teamData={teamData}
-                canEditTeam={canEditTeam}
-                handleMemberDelete={handleMemberDelete}
-                setSelectedEditMember={setSelectedEditMember}
-                setIsEditMemberModalVisible={setIsEditMemberModalVisible}
-                setIsAddMemberModalVisible={setIsAddMemberModalVisible}
-              />
-            ),
-          },
-          {
-            key: TEAM_INFO_TAB_KEYS.MEMBER_PERMISSIONS,
-            label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.MEMBER_PERMISSIONS],
-            children: <MemberPermissions teamId={teamId} accessToken={accessToken} canEditTeam={canEditTeam} />,
-          },
-          {
-            key: TEAM_INFO_TAB_KEYS.SETTINGS,
-            label: TEAM_INFO_TAB_LABELS[TEAM_INFO_TAB_KEYS.SETTINGS],
-            children: (
-              <Card className="block p-6 overflow-y-auto max-h-[65vh]">
-                <div className="flex justify-between items-center mb-4">
-                  <h3 className="text-lg font-medium">Team Settings</h3>
-                  {canEditTeam && !isEditing && (
-                    <Button
-                      variant="outline"
-                      onClick={() => {
-                        setTeamModelAliases(info.litellm_model_table?.model_aliases ?? {});
-                        startEditing();
-                      }}
-                    >
-                      <EditOutlined className="h-4 w-4" />
-                      Edit Settings
-                    </Button>
-                  )}
-                </div>
-
-                {isEditing && isGuardrailsLoading ? (
-                  <div className="p-4">Loading...</div>
-                ) : isEditing ? (
-                  <TooltipProvider>
-                    <form onSubmit={(event) => void form.handleSubmit(onTeamUpdateSubmit)(event)}>
-                      <FieldGroup>
-                        <FormField control={form.control} name="team_alias" label="Team Name">
-                          {({ ref, value, ...field }) => <UIInput {...field} ref={ref} value={value ?? ""} />}
-                        </FormField>
-
-                        <FormField
-                          control={form.control}
-                          name="models"
-                          label="Models"
-                          description="Leave empty to grant no models directly. The team keeps any models granted through its access groups"
-                        >
-                          {({ id, value, onChange }) => (
-                            <ModelSelect
-                              id={id}
-                              value={value ?? []}
-                              onChange={onChange}
-                              teamID={teamId}
-                              organizationID={teamData?.team_info?.organization_id || undefined}
-                              options={{
-                                includeSpecialOptions: true,
-                                includeUserModels: !teamData?.team_info?.organization_id,
-                                showAllProxyModelsOverride:
-                                  isProxyAdminRole(userRole) && !teamData?.team_info?.organization_id,
-                              }}
-                              context="team"
-                              dataTestId="models-select"
-                            />
-                          )}
-                        </FormField>
-
-                        <Field>
-                          <FieldLabel>
-                            {labelWithHint(
-                              "Model Aliases",
-                              "Map a custom alias to an underlying model. Team members can call the alias in API requests instead of the real model name.",
-                            )}
-                          </FieldLabel>
-                          <ModelAliasManager
-                            accessToken={accessToken || ""}
-                            initialModelAliases={teamModelAliases}
-                            onAliasUpdate={setTeamModelAliases}
-                            showExampleConfig={false}
-                          />
-                        </Field>
-
-                        <FormField control={form.control} name="max_budget" label="Max Budget (USD)">
-                          {({ ref, value, ...field }) => (
-                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} />
-                          )}
-                        </FormField>
-
-                        <FormField control={form.control} name="soft_budget" label="Soft Budget (USD)">
-                          {({ ref, value, ...field }) => (
-                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} />
-                          )}
-                        </FormField>
-
-                        <FormField
-                          control={form.control}
-                          name="soft_budget_alerting_emails"
-                          label={labelWithHint(
-                            "Soft Budget Alerting Emails",
-                            "Comma-separated email addresses to receive alerts when the soft budget is reached",
-                          )}
-                        >
-                          {({ ref, value, ...field }) => (
-                            <UIInput
-                              {...field}
-                              ref={ref}
-                              value={typeof value === "string" ? value : ""}
-                              placeholder="example1@test.com, example2@test.com"
-                            />
-                          )}
-                        </FormField>
-
-                        <Collapsible
-                          open={teamMemberSettingsOpen}
-                          onOpenChange={setTeamMemberSettingsOpen}
-                          className="mt-4 mb-4 overflow-hidden rounded-lg border"
-                        >
-                          <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                            <b>Team Member Settings</b>
-                            <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                          </CollapsibleTrigger>
-                          <CollapsibleContent className="px-4 pb-3">
-                            <p className="mb-4 text-xs text-gray-500">
-                              Optional defaults applied when members join this team. All fields can be overridden per
-                              member.
-                            </p>
-                            <FieldGroup>
-                              <FormField
-                                control={form.control}
-                                name="default_team_member_models"
-                                label={labelWithHint(
-                                  "Default Model Access",
-                                  "Optional. If set, new members can only access these models by default. Must be a subset of the team's models above. Leave empty to give all members access to all team models.",
-                                )}
-                              >
-                                {({ id, value, onChange }) => (
-                                  <MultiSelect
-                                    id={id}
-                                    value={value ?? []}
-                                    onValueChange={onChange}
-                                    options={(watchedModels ?? info.models ?? []).map((model) => ({
-                                      label: model,
-                                      value: model,
-                                    }))}
-                                    placeholder="Leave empty — all team models accessible to every member"
-                                  />
-                                )}
-                              </FormField>
-                              <FormField
-                                control={form.control}
-                                name="team_member_budget"
-                                label={labelWithHint(
-                                  "Default Budget (USD)",
-                                  "Default spend budget for each member in this team.",
-                                )}
-                              >
-                                {({ ref, value, ...field }) => (
-                                  <NumericalInput {...field} ref={ref} value={value ?? ""} step={0.01} precision={2} />
-                                )}
-                              </FormField>
-                              <FormField
-                                control={form.control}
-                                name="team_member_budget_duration"
-                                label="Default Budget Duration"
-                              >
-                                {({ value, onChange }) => (
-                                  <DurationSelect value={value ?? undefined} onChange={onChange} />
-                                )}
-                              </FormField>
-                              <FormField
-                                control={form.control}
-                                name="team_member_key_duration"
-                                label={labelWithHint(
-                                  "Default Key Duration (eg: 1d, 1mo)",
-                                  "Set a limit to the duration of a team member's key. Format: 30s (seconds), 30m (minutes), 30h (hours), 30d (days), 1mo (month)",
-                                )}
-                              >
-                                {({ ref, value, ...field }) => (
-                                  <UIInput {...field} ref={ref} value={value ?? ""} placeholder="e.g., 30d" />
-                                )}
-                              </FormField>
-                              <FormField
-                                control={form.control}
-                                name="team_member_tpm_limit"
-                                label={labelWithHint(
-                                  "Default TPM Limit",
-                                  "Default tokens per minute limit for each member. Can be overridden per member.",
-                                )}
-                              >
-                                {({ ref, value, ...field }) => (
-                                  <NumericalInput
-                                    {...field}
-                                    ref={ref}
-                                    value={value ?? ""}
-                                    step={1}
-                                    placeholder="e.g., 1000"
-                                  />
-                                )}
-                              </FormField>
-                              <FormField
-                                control={form.control}
-                                name="team_member_rpm_limit"
-                                label={labelWithHint(
-                                  "Default RPM Limit",
-                                  "Default requests per minute limit for each member. Can be overridden per member.",
-                                )}
-                              >
-                                {({ ref, value, ...field }) => (
-                                  <NumericalInput
-                                    {...field}
-                                    ref={ref}
-                                    value={value ?? ""}
-                                    step={1}
-                                    placeholder="e.g., 100"
-                                  />
-                                )}
-                              </FormField>
-                            </FieldGroup>
-                          </CollapsibleContent>
-                        </Collapsible>
-
-                        <FormField control={form.control} name="budget_duration" label="Reset Budget">
-                          {({ id, value, onChange }) => (
-                            <BudgetDurationDropdown
-                              id={id}
-                              placeholder="Never resets"
-                              value={value}
-                              onChange={(next) => onChange(next ?? null)}
-                            />
-                          )}
-                        </FormField>
-
-                        <FormField control={form.control} name="tpm_limit" label="Tokens per minute Limit (TPM)">
-                          {({ ref, value, ...field }) => (
-                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} />
-                          )}
-                        </FormField>
-
-                        <FormField control={form.control} name="rpm_limit" label="Requests per minute Limit (RPM)">
-                          {({ ref, value, ...field }) => (
-                            <NumericalInput {...field} ref={ref} value={value ?? ""} step={1} />
-                          )}
-                        </FormField>
-
-                        <Field>
-                          <FieldLabel>Metadata</FieldLabel>
-                          <MetadataKeyValueFields
-                            control={form.control}
-                            getValues={form.getValues}
-                            name="metadata"
-                            schemaFields={teamMetadataSchemaFields}
-                            schemaLoading={isTeamMetadataSchemaLoading}
-                          />
-                          <FieldDescription>
-                            Values are saved as text. Enter JSON for typed values, e.g. 3, true, or {'{"region": "us"}'}
-                            .
-                          </FieldDescription>
-                        </Field>
-
-                        <Field>
-                          <FieldLabel>
-                            {labelWithHint(
-                              "Model-Specific Rate Limits",
-                              "Set per-model TPM/RPM limits that apply across the whole team.",
-                            )}
-                          </FieldLabel>
-                          {modelLimitRows.map((row, index) => (
-                            <div key={row.id} className="mb-2 flex items-start gap-2">
-                              <FormField
-                                control={form.control}
-                                name={`modelLimits.${index}.model`}
-                                className="min-w-60"
-                              >
-                                {({ id, value, onChange }) => (
-                                  <SearchSelect
-                                    inputId={id}
-                                    value={value ?? ""}
-                                    onValueChange={onChange}
-                                    options={availableRateLimitModels.map((model) => ({
-                                      label: model,
-                                      value: model,
-                                    }))}
-                                    placeholder="Select model"
-                                  />
-                                )}
-                              </FormField>
-                              <FormField control={form.control} name={`modelLimits.${index}.tpm`}>
-                                {({ ref, value, onChange, ...field }) => (
-                                  <NumericalInput
-                                    {...field}
-                                    ref={ref}
-                                    value={value ?? ""}
-                                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                                      onChange(event.target.value === "" ? null : Number(event.target.value))
-                                    }
-                                    placeholder="TPM Limit"
-                                    min={0}
-                                    step={1}
-                                  />
-                                )}
-                              </FormField>
-                              <FormField control={form.control} name={`modelLimits.${index}.rpm`}>
-                                {({ ref, value, onChange, ...field }) => (
-                                  <NumericalInput
-                                    {...field}
-                                    ref={ref}
-                                    value={value ?? ""}
-                                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
-                                      onChange(event.target.value === "" ? null : Number(event.target.value))
-                                    }
-                                    placeholder="RPM Limit"
-                                    min={0}
-                                    step={1}
-                                  />
-                                )}
-                              </FormField>
-                              <Button
-                                type="button"
-                                variant="ghost"
-                                size="icon"
-                                aria-label="Remove model limit"
-                                className="mt-1 text-destructive"
-                                onClick={() => removeModelLimit(index)}
-                              >
-                                <CircleMinus className="size-4" />
-                              </Button>
-                            </div>
-                          ))}
-                          <Button
-                            type="button"
-                            variant="outline"
-                            className="w-full border-dashed"
-                            onClick={() => appendModelLimit({ model: "", tpm: null, rpm: null })}
-                          >
-                            <Plus className="size-4" />
-                            Add Model Limit
-                          </Button>
-                        </Field>
-
-                        <FormField
-                          control={form.control}
-                          name="default_estimated_output_tokens"
-                          label={labelWithHint("Estimated Output Tokens", teamEstimateTooltip.estimate)}
-                        >
-                          {({ ref, value, ...field }) => (
-                            <NumericalInput
-                              {...field}
-                              ref={ref}
-                              value={value ?? ""}
-                              min={1}
-                              step={1}
-                              disabled={!canEditTeamEstimates}
-                            />
-                          )}
-                        </FormField>
-
-                        <FormField
-                          control={form.control}
-                          name="default_estimated_output_tokens_per_model"
-                          label={labelWithHint("Estimated Output Tokens Per Model", teamEstimateTooltip.perModel)}
-                        >
-                          {({ ref, value, ...field }) => (
-                            <Textarea
-                              {...field}
-                              ref={ref}
-                              value={value ?? ""}
-                              rows={4}
-                              placeholder='{"gpt-4": 4096}'
-                              disabled={!canEditTeamEstimates}
-                            />
-                          )}
-                        </FormField>
-
-                        <Field>
-                          <FieldLabel>Router Settings</FieldLabel>
-                          <RouterSettingsAccordion
-                            ref={routerSettingsRef}
-                            accessToken={accessToken || ""}
-                            teamId={teamId}
-                            value={info.router_settings ? { router_settings: info.router_settings } : undefined}
-                          />
-                        </Field>
-
-                        <FormField
-                          control={form.control}
-                          name="guardrails"
-                          label={labelWithDocsHint(
-                            "Guardrails",
-                            "Select which guardrails apply to this team. Global guardrails are enabled by default, uncheck to opt out. Other guardrails are opt-in.",
-                            "https://docs.litellm.ai/docs/proxy/guardrails/quick_start",
-                          )}
-                        >
-                          {({ id, value, onChange }) => (
-                            <GuardrailsSelect
-                              id={id}
-                              value={value ?? []}
-                              onValueChange={onChange}
-                              globalGuardrails={globalGuardrails.map((g) => ({
-                                name: g.guardrail_name,
-                                disabled: Boolean(killSwitchOn),
-                              }))}
-                              otherGuardrails={otherGuardrails.map((g) => ({
-                                name: g.guardrail_name,
-                                disabled: false,
-                              }))}
-                              globalGuardrailNames={globalGuardrailNames}
-                            />
-                          )}
-                        </FormField>
-
-                        <FormField
-                          control={form.control}
-                          name="disable_global_guardrails"
-                          label={labelWithHint(
-                            "Disable all global guardrails",
-                            "Kill switch: bypass every global guardrail for this team, including any added in the future. For per-guardrail opt-out instead, use the Guardrails dropdown above.",
-                          )}
-                        >
-                          {({ id, value, onChange }) => (
-                            <Switch
-                              id={id}
-                              checked={value === true}
-                              onCheckedChange={(checked) => {
-                                onChange(checked);
-                                applyKillSwitchToGuardrails(checked);
-                              }}
-                            />
-                          )}
-                        </FormField>
-
-                        {canViewPolicies && (
-                          <FormField
-                            control={form.control}
-                            name="policies"
-                            label={labelWithDocsHint(
-                              "Policies",
-                              "Apply policies to this team to control guardrails and other settings",
-                              "https://docs.litellm.ai/docs/proxy/guardrails/guardrail_policies",
-                            )}
-                          >
-                            {({ id, value, onChange }) => (
-                              <TagsInput
-                                id={id}
-                                value={value ?? []}
-                                onValueChange={onChange}
-                                options={policiesList.map((name) => ({ value: name, label: name }))}
-                                placeholder="Select or enter policies"
-                              />
-                            )}
-                          </FormField>
-                        )}
-
-                        <FormField
-                          control={form.control}
-                          name="access_group_ids"
-                          label={labelWithHint(
-                            "Access Groups",
-                            "Assign access groups to this team. Access groups control which models, MCP servers, and agents this team can use",
-                          )}
-                        >
-                          {({ value, onChange }) => (
-                            <AccessGroupSelector
-                              value={value}
-                              onChange={onChange}
-                              placeholder="Select access groups (optional)"
-                            />
-                          )}
-                        </FormField>
-
-                        <FormField control={form.control} name="vector_stores" label="Vector Stores">
-                          {({ value, onChange }) => (
-                            <VectorStoreSelector
-                              onChange={onChange}
-                              value={value}
-                              accessToken={accessToken || ""}
-                              placeholder="Select vector stores"
-                            />
-                          )}
-                        </FormField>
-
-                        <FormField
-                          control={form.control}
-                          name="allowed_passthrough_routes"
-                          label={
-                            !premiumUser
-                              ? labelWithHint(
-                                  "Allowed Pass Through Routes",
-                                  "Premium feature - Upgrade to set allowed pass through routes",
-                                )
-                              : !is_proxy_admin
-                                ? labelWithHint(
-                                    "Allowed Pass Through Routes",
-                                    "Only proxy admins can set allowed pass through routes",
-                                  )
-                                : "Allowed Pass Through Routes"
-                          }
-                        >
-                          {({ value, onChange }) => (
-                            <PassThroughRoutesSelector
-                              value={value}
-                              onChange={onChange}
-                              accessToken={accessToken || ""}
-                              placeholder="Select pass through routes"
-                              disabled={!premiumUser || !is_proxy_admin}
-                            />
-                          )}
-                        </FormField>
-
-                        <FormField
-                          control={form.control}
-                          name="mcp_servers_and_groups"
-                          label="MCP Servers / Access Groups"
-                        >
-                          {({ value, onChange }) => (
-                            <MCPServerSelector
-                              onChange={onChange}
-                              value={value}
-                              accessToken={accessToken || ""}
-                              placeholder="Select MCP servers or access groups (optional)"
-                              allowAllProxyMcpServers={is_proxy_admin}
-                            />
-                          )}
-                        </FormField>
-
-                        <div className="mb-6">
-                          <MCPToolPermissions
-                            accessToken={accessToken || ""}
-                            selectedServers={watchedMcpSelection?.servers || []}
-                            toolPermissions={watchedToolPermissions || {}}
-                            onChange={(toolPerms) => form.setValue("mcp_tool_permissions", toolPerms)}
-                          />
-                        </div>
-
-                        <FormField control={form.control} name="agents_and_groups" label="Agents / Access Groups">
-                          {({ value, onChange }) => (
-                            <AgentSelector
-                              onChange={onChange}
-                              value={value}
-                              accessToken={accessToken || ""}
-                              placeholder="Select agents or access groups (optional)"
-                            />
-                          )}
-                        </FormField>
-
-                        <Collapsible
-                          open={searchToolSettingsOpen}
-                          onOpenChange={setSearchToolSettingsOpen}
-                          className="mt-4 mb-4 overflow-hidden rounded-lg border"
-                        >
-                          <CollapsibleTrigger className="group/section flex w-full items-center justify-between px-4 py-3 text-left">
-                            <b>Search Tool Settings</b>
-                            <ChevronDown className="size-5 shrink-0 text-gray-500 transition-transform group-data-[panel-open]/section:rotate-180" />
-                          </CollapsibleTrigger>
-                          <CollapsibleContent className="px-4 pb-3">
-                            <FormField
-                              control={form.control}
-                              name="object_permission_search_tools"
-                              label={labelWithHint(
-                                "Allowed Search Tools",
-                                "Select which search tools this team can access. Leave empty to allow all search tools.",
-                              )}
-                            >
-                              {({ value, onChange }) => (
-                                <SearchToolSelector
-                                  onChange={onChange}
-                                  value={value}
-                                  accessToken={accessToken || ""}
-                                  placeholder="Select search tools (optional, empty = all allowed)"
-                                />
-                              )}
-                            </FormField>
-                          </CollapsibleContent>
-                        </Collapsible>
-
-                        <FormField control={form.control} name="organization_id" label="Organization">
-                          {({ id, value, onChange }) => (
-                            <SearchSelect
-                              inputId={id}
-                              value={value ?? ""}
-                              onValueChange={(next) => onChange(next === "" ? null : next)}
-                              options={userOrganizations.map((org) => ({
-                                value: org.organization_id ?? "",
-                                label: org.organization_alias || org.organization_id || "",
-                              }))}
-                              placeholder="Select an organization"
-                              emptyText="No matching organizations"
-                            />
-                          )}
-                        </FormField>
-
-                        <FormField control={form.control} name="logging_settings" label="Logging Settings">
-                          {({ value, onChange }) => (
-                            <EditLoggingSettings value={(value as unknown[]) ?? []} onChange={onChange} />
-                          )}
-                        </FormField>
-
-                        <FormField
-                          control={form.control}
-                          name="secret_manager_settings"
-                          label="Secret Manager Settings"
-                          description={
-                            premiumUser
-                              ? "Enter secret manager configuration as a JSON object."
-                              : "Premium feature - Upgrade to manage secret manager settings."
-                          }
-                        >
-                          {({ ref, value, ...field }) => (
-                            <Textarea
-                              {...field}
-                              ref={ref}
-                              value={value ?? ""}
-                              rows={6}
-                              placeholder='{"namespace": "admin", "mount": "secret", "path_prefix": "litellm"}'
-                              disabled={!premiumUser}
-                            />
-                          )}
-                        </FormField>
-                      </FieldGroup>
-
-                      <div className="sticky z-10 -inset-x-6 -bottom-6 border-t border-gray-200 bg-white p-4 pr-0">
-                        <div className="flex items-center justify-end gap-2">
-                          <Button
-                            type="button"
-                            variant="outline"
-                            onClick={() => setIsEditing(false)}
-                            disabled={isTeamSaving}
-                          >
-                            Cancel
-                          </Button>
-                          <Button type="submit" disabled={isTeamSaving}>
-                            {isTeamSaving ? <UiLoadingSpinner className="size-4" /> : <Save className="size-4" />}
-                            Save Changes
-                          </Button>
-                        </div>
-                      </div>
-                    </form>
-                  </TooltipProvider>
-                ) : (
-                  <div className="space-y-4">
-                    <div>
-                      <p className="font-medium">Team Name</p>
-                      <div>{info.team_alias}</div>
-                    </div>
-                    <div>
-                      <p className="font-medium">Team ID</p>
-                      <div className="font-mono">{info.team_id}</div>
-                    </div>
-                    <div>
-                      <p className="font-medium">Created At</p>
-                      <div>{new Date(info.created_at).toLocaleString()}</div>
-                    </div>
-                    <div>
-                      <p className="font-medium">Models</p>
-                      <div className="flex flex-wrap gap-2 mt-1">
-                        {info.models.map((model, index) => (
-                          <Badge key={index} variant="secondary">
-                            {model}
-                          </Badge>
-                        ))}
-                      </div>
-                    </div>
-                    {info.default_team_member_models && info.default_team_member_models.length > 0 && (
-                      <div>
-                        <p className="font-medium">Default Member Models</p>
-                        <div className="flex flex-wrap gap-2 mt-1">
-                          {info.default_team_member_models.map((model, index) => (
-                            <Badge key={index} variant="secondary">
-                              {model}
-                            </Badge>
-                          ))}
-                        </div>
-                      </div>
-                    )}
-                    <div>
-                      <p className="font-medium">Model Aliases</p>
-                      {(() => {
-                        const aliasEntries = Object.entries(info.litellm_model_table?.model_aliases ?? {});
-                        if (aliasEntries.length === 0) {
-                          return <div className="text-gray-400">No model aliases configured</div>;
-                        }
-                        return (
-                          <div className="mt-1 space-y-1">
-                            {aliasEntries.map(([alias, target]) => (
-                              <div key={alias} className="text-sm">
-                                <span className="font-mono">{alias}</span>
-                                <span className="text-gray-400">{" -> "}</span>
-                                <span className="font-mono">{target}</span>
-                              </div>
-                            ))}
-                          </div>
-                        );
-                      })()}
-                    </div>
-                    <div>
-                      <p className="font-medium">Rate Limits</p>
-                      <div>TPM: {info.tpm_limit || "Unlimited"}</div>
-                      <div>RPM: {info.rpm_limit || "Unlimited"}</div>
-                      {(() => {
-                        const modelTpm = (info.metadata?.model_tpm_limit ?? {}) as Record<string, number>;
-                        const modelRpm = (info.metadata?.model_rpm_limit ?? {}) as Record<string, number>;
-                        const models = Array.from(new Set([...Object.keys(modelTpm), ...Object.keys(modelRpm)]));
-                        if (models.length === 0) return null;
-                        return (
-                          <div className="mt-2">
-                            <p className="text-gray-500">Per-model limits:</p>
-                            {models.map((m) => (
-                              <div key={m} className="text-xs ml-2">
-                                {m}: TPM {modelTpm[m] ?? "—"}, RPM {modelRpm[m] ?? "—"}
-                              </div>
-                            ))}
-                          </div>
-                        );
-                      })()}
-                      <div>Estimated Output Tokens: {info.metadata?.default_estimated_output_tokens ?? "Default"}</div>
-                      <div>
-                        Estimated Output Tokens Per Model:{" "}
-                        {info.metadata?.default_estimated_output_tokens_per_model
-                          ? JSON.stringify(info.metadata.default_estimated_output_tokens_per_model)
-                          : "Default"}
-                      </div>
-                    </div>
-                    <div>
-                      <p className="font-medium">Team Budget</p>
-                      <div>
-                        Max Budget:{" "}
-                        {info.max_budget !== null ? `$${formatNumberWithCommas(info.max_budget, 4)}` : "No Limit"}
-                      </div>
-                      <div>
-                        Soft Budget:{" "}
-                        {info.soft_budget !== null && info.soft_budget !== undefined
-                          ? `$${formatNumberWithCommas(info.soft_budget, 4)}`
-                          : "No Limit"}
-                      </div>
-                      <div>Budget Reset: {info.budget_duration || "Never"}</div>
-                      {info.metadata?.soft_budget_alerting_emails &&
-                        Array.isArray(info.metadata.soft_budget_alerting_emails) &&
-                        info.metadata.soft_budget_alerting_emails.length > 0 && (
-                          <div>Soft Budget Alerting Emails: {info.metadata.soft_budget_alerting_emails.join(", ")}</div>
-                        )}
-                    </div>
-                    <div>
-                      <p className="font-medium">
-                        Team Member Settings{" "}
-                        <Tooltip title="These are limits on individual team members">
-                          <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                        </Tooltip>
-                      </p>
-                      <div>Max Budget: {info.team_member_budget_table?.max_budget || "No Limit"}</div>
-                      <div>Budget Duration: {info.team_member_budget_table?.budget_duration || "No Limit"}</div>
-                      <div>Key Duration: {info.metadata?.team_member_key_duration || "No Limit"}</div>
-                      <div>TPM Limit: {info.team_member_budget_table?.tpm_limit || "No Limit"}</div>
-                      <div>RPM Limit: {info.team_member_budget_table?.rpm_limit || "No Limit"}</div>
-                    </div>
-                    <div>
-                      <p className="font-medium">Router Settings</p>
-                      {info.router_settings &&
-                      Object.values(info.router_settings).some(
-                        (v) => v !== null && v !== undefined && v !== "" && !(Array.isArray(v) && v.length === 0),
-                      ) ? (
-                        <div className="mt-1 space-y-1">
-                          {info.router_settings.routing_strategy && (
-                            <div>
-                              Routing Strategy:{" "}
-                              <Badge variant="secondary">{info.router_settings.routing_strategy}</Badge>
-                            </div>
-                          )}
-                          {info.router_settings.num_retries != null && (
-                            <div>Number of Retries: {info.router_settings.num_retries}</div>
-                          )}
-                          {info.router_settings.allowed_fails != null && (
-                            <div>Allowed Failures: {info.router_settings.allowed_fails}</div>
-                          )}
-                          {info.router_settings.cooldown_time != null && (
-                            <div>Cooldown Time: {info.router_settings.cooldown_time}s</div>
-                          )}
-                          {info.router_settings.timeout != null && <div>Timeout: {info.router_settings.timeout}s</div>}
-                          {info.router_settings.retry_after != null && (
-                            <div>Retry After: {info.router_settings.retry_after}s</div>
-                          )}
-                          {info.router_settings.fallbacks &&
-                            Array.isArray(info.router_settings.fallbacks) &&
-                            info.router_settings.fallbacks.length > 0 && (
-                              <div>Fallbacks: {info.router_settings.fallbacks.length} configured</div>
-                            )}
-                          {info.router_settings.enable_tag_filtering && <div>Tag Filtering: Enabled</div>}
-                        </div>
-                      ) : (
-                        <div className="text-gray-400">No router settings configured</div>
-                      )}
-                    </div>
-                    <div>
-                      <p className="font-medium">Organization ID</p>
-                      <div>{info.organization_id}</div>
-                    </div>
-                    <div>
-                      <p className="font-medium">Status</p>
-                      <Badge variant={info.blocked ? "destructive" : "secondary"}>
-                        {info.blocked ? "Blocked" : "Active"}
-                      </Badge>
-                    </div>
-
-                    <ObjectPermissionsView
-                      objectPermission={info.object_permission}
-                      variant="inline"
-                      className="pt-4 border-t border-gray-200"
-                      accessToken={accessToken}
-                    />
-
-                    <GuardrailSettingsView
-                      globalGuardrailNames={globalGuardrailNames}
-                      teamGuardrails={Array.isArray(info.metadata?.guardrails) ? info.metadata.guardrails : []}
-                      optedOutGlobalGuardrails={
-                        Array.isArray(info.metadata?.opted_out_global_guardrails)
-                          ? info.metadata.opted_out_global_guardrails
-                          : []
-                      }
-                      killSwitchOn={initialKillSwitchOn}
-                      variant="inline"
-                      className="pt-4 border-t border-gray-200"
-                    />
-
-                    <LoggingSettingsView
-                      loggingConfigs={info.metadata?.logging || []}
-                      disabledCallbacks={[]}
-                      variant="inline"
-                      className="pt-4 border-t border-gray-200"
-                    />
-
-                    {info.metadata?.secret_manager_settings && (
-                      <div className="pt-4 border-t border-gray-200">
-                        <p className="font-medium">Secret Manager Settings</p>
-                        <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>
-                    )}
-                  </div>
-                )}
-              </Card>
-            ),
-          },
-        ].filter((tab) => visibleTabs.includes(tab.key))}
-      />
+      <Tabs defaultValue={defaultTabKey} className="mb-4" onValueChange={onTabChange}>
+        <TabsList variant="line" className="mb-4 h-auto w-full justify-start rounded-none border-b p-0">
+          {tabItems.map(({ key, label }) => (
+            <TabsTrigger key={key} value={key} className="flex-none rounded-none px-4 py-2">
+              {label}
+            </TabsTrigger>
+          ))}
+        </TabsList>
+        {tabItems.map(({ key, children }) => (
+          <TabsContent key={key} value={key} keepMounted={hasVisited(key)}>
+            {children}
+          </TabsContent>
+        ))}
+      </Tabs>
 
       <MemberModal
         visible={isEditMemberModalVisible}
@@ -1995,9 +1968,9 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
               label: (
                 <span>
                   Team Member Budget (USD){" "}
-                  <Tooltip title="Maximum amount in USD this member can spend within this team. This is separate from any global user budget limits">
-                    <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                  </Tooltip>
+                  <SimpleTooltip content="Maximum amount in USD this member can spend within this team. This is separate from any global user budget limits">
+                    <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                  </SimpleTooltip>
                 </span>
               ),
               type: "numerical" as const,
@@ -2010,9 +1983,9 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
               label: (
                 <span>
                   Budget Reset Period{" "}
-                  <Tooltip title="How often this member's budget resets within the team. Leave unset and the budget never resets.">
-                    <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                  </Tooltip>
+                  <SimpleTooltip content="How often this member's budget resets within the team. Leave unset and the budget never resets.">
+                    <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                  </SimpleTooltip>
                 </span>
               ),
               type: "budget-duration" as const,
@@ -2022,9 +1995,9 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
               label: (
                 <span>
                   Team Member TPM Limit{" "}
-                  <Tooltip title="Maximum tokens per minute this member can use within this team. This is separate from any global user TPM limit">
-                    <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                  </Tooltip>
+                  <SimpleTooltip content="Maximum tokens per minute this member can use within this team. This is separate from any global user TPM limit">
+                    <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                  </SimpleTooltip>
                 </span>
               ),
               type: "numerical" as const,
@@ -2037,9 +2010,9 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
               label: (
                 <span>
                   Team Member RPM Limit{" "}
-                  <Tooltip title="Maximum requests per minute this member can make within this team. This is separate from any global user RPM limit">
-                    <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                  </Tooltip>
+                  <SimpleTooltip content="Maximum requests per minute this member can make within this team. This is separate from any global user RPM limit">
+                    <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                  </SimpleTooltip>
                 </span>
               ),
               type: "numerical" as const,
@@ -2052,9 +2025,9 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
               label: (
                 <span>
                   Allowed Models{" "}
-                  <Tooltip title="Models this member can access within this team. Leave empty to inherit all team models.">
-                    <InfoCircleOutlined style={{ marginLeft: "4px" }} />
-                  </Tooltip>
+                  <SimpleTooltip content="Models this member can access within this team. Leave empty to inherit all team models.">
+                    <Info className="ml-1 inline size-3.5 align-text-bottom" />
+                  </SimpleTooltip>
                 </span>
               ),
               type: "multi-select" as const,
diff --git a/ui/litellm-dashboard/src/components/team/memberFormValues.test.ts b/ui/litellm-dashboard/src/components/team/memberFormValues.test.ts
index b03f0f6e09e..398719c6197 100644
--- a/ui/litellm-dashboard/src/components/team/memberFormValues.test.ts
+++ b/ui/litellm-dashboard/src/components/team/memberFormValues.test.ts
@@ -133,11 +133,31 @@ describe("buildMemberFormValues", () => {
 });
 
 describe("emptyMemberFormValues", () => {
-  it("unsets every rendered field so a reset clears the form", () => {
+  it("clears every rendered field to the empty value its control understands", () => {
     expect(emptyMemberFormValues(orgConfig)).toStrictEqual({
-      user_email: undefined,
-      user_id: undefined,
-      role: undefined,
+      user_email: "",
+      user_id: "",
+      role: "",
+    });
+  });
+
+  it("clears numeric, duration and multi-select fields to values their controls accept", () => {
+    expect(
+      emptyMemberFormValues({
+        ...orgConfig,
+        additionalFields: [
+          { name: "max_budget_in_team", label: "Budget", type: "numerical" },
+          { name: "budget_duration", label: "Reset", type: "budget-duration" },
+          { name: "allowed_models", label: "Models", type: "multi-select" },
+        ],
+      }),
+    ).toStrictEqual({
+      user_email: "",
+      user_id: "",
+      role: "",
+      max_budget_in_team: null,
+      budget_duration: null,
+      allowed_models: [],
     });
   });
 });
diff --git a/ui/litellm-dashboard/src/components/team/memberFormValues.ts b/ui/litellm-dashboard/src/components/team/memberFormValues.ts
index b39e2a07401..942b9b665fe 100644
--- a/ui/litellm-dashboard/src/components/team/memberFormValues.ts
+++ b/ui/litellm-dashboard/src/components/team/memberFormValues.ts
@@ -56,7 +56,22 @@ export const buildMemberFormValues = (
   return pickFieldNames(config, { role: config.defaultRole || config.roleOptions[0]?.value });
 };
 
-export const emptyMemberFormValues = (config: MemberFieldsConfig): MemberFormValues => pickFieldNames(config, {});
+const emptyValueForType = (type: MemberFieldType | undefined): MemberFieldValue => {
+  switch (type) {
+    case "multi-select":
+      return [];
+    case "numerical":
+    case "budget-duration":
+      return null;
+    default:
+      return "";
+  }
+};
+
+export const emptyMemberFormValues = (config: MemberFieldsConfig): MemberFormValues => {
+  const typeByName = new Map((config.additionalFields ?? []).map((field) => [field.name, field.type]));
+  return Object.fromEntries(memberFieldNames(config).map((name) => [name, emptyValueForType(typeByName.get(name))]));
+};
 
 export const buildMemberFormData = (values: MemberFormValues): MemberFormValues =>
   Object.fromEntries(
diff --git a/ui/litellm-dashboard/src/components/ui/badge.tsx b/ui/litellm-dashboard/src/components/ui/badge.tsx
index bf17c76aa55..ec5417d227a 100644
--- a/ui/litellm-dashboard/src/components/ui/badge.tsx
+++ b/ui/litellm-dashboard/src/components/ui/badge.tsx
@@ -13,6 +13,9 @@ const badgeVariants = cva({
       secondary: "bg-secondary text-secondary-foreground [a]:hover:bg-secondary/80",
       destructive:
         "bg-destructive/10 text-destructive focus-visible:ring-destructive/20 dark:bg-destructive/20 dark:focus-visible:ring-destructive/40 [a]:hover:bg-destructive/20",
+      success: "bg-success/10 text-success dark:bg-success/20 [a]:hover:bg-success/20",
+      warning: "bg-warning/10 text-warning dark:bg-warning/20 [a]:hover:bg-warning/20",
+      info: "bg-info/10 text-info dark:bg-info/20 [a]:hover:bg-info/20",
       outline: "border-border text-foreground [a]:hover:bg-muted [a]:hover:text-muted-foreground",
       ghost: "hover:bg-muted hover:text-muted-foreground dark:hover:bg-muted/50",
       link: "text-primary underline-offset-4 hover:underline",
diff --git a/ui/litellm-dashboard/src/components/ui/combobox.tsx b/ui/litellm-dashboard/src/components/ui/combobox.tsx
index 6dabc994217..bc9215c065f 100644
--- a/ui/litellm-dashboard/src/components/ui/combobox.tsx
+++ b/ui/litellm-dashboard/src/components/ui/combobox.tsx
@@ -32,12 +32,13 @@ const ComboboxTrigger = React.forwardRef<
 });
 ComboboxTrigger.displayName = "ComboboxTrigger";
 
-function ComboboxClear({ className, ...props }: ComboboxPrimitive.Clear.Props) {
+function ComboboxClear({ className, "aria-label": ariaLabel = "Clear", ...props }: ComboboxPrimitive.Clear.Props) {
   return (
     <ComboboxPrimitive.Clear
       data-slot="combobox-clear"
       render={<InputGroupButton variant="ghost" size="icon-xs" />}
       className={cn(className)}
+      aria-label={ariaLabel}
       {...props}
     >
       <XIcon className="pointer-events-none" />
@@ -58,7 +59,7 @@ function ComboboxInput({
 }) {
   return (
     <InputGroup className={cn("w-auto", className)}>
-      <ComboboxPrimitive.Input render={<InputGroupInput disabled={disabled} />} {...props} />
+      <ComboboxPrimitive.Input disabled={disabled} render={<InputGroupInput />} {...props} />
       <InputGroupAddon align="inline-end">
         {showTrigger && (
           <InputGroupButton
diff --git a/ui/litellm-dashboard/src/components/ui/ref-forwarding.test.tsx b/ui/litellm-dashboard/src/components/ui/ref-forwarding.test.tsx
index 48b1e8be226..66f7bd27138 100644
--- a/ui/litellm-dashboard/src/components/ui/ref-forwarding.test.tsx
+++ b/ui/litellm-dashboard/src/components/ui/ref-forwarding.test.tsx
@@ -138,15 +138,13 @@ describe("ui primitives forward refs to their DOM node", () => {
   });
 });
 
-describe("setupTests ref tripwire", () => {
-  it("records a violation when a ref is passed to a plain function component", () => {
-    const Plain = (props: React.ComponentPropsWithoutRef<"span">) => <span {...props} />;
+describe("plain function components", () => {
+  it("receives a ref as a prop instead of dropping it", () => {
+    const Plain = (props: React.ComponentPropsWithoutRef<"span"> & { ref?: React.Ref<HTMLSpanElement> }) => (
+      <span {...props} />
+    );
     const ref = React.createRef<HTMLSpanElement>();
-    render(React.createElement(Plain as never, { ref }));
-    const consume = (globalThis as { __consumePendingRefWarnings?: () => string[] }).__consumePendingRefWarnings;
-    expect(consume).toBeDefined();
-    const violations = consume!();
-    expect(violations).toHaveLength(1);
-    expect(violations[0]).toContain("Function components cannot be given refs");
+    render(<Plain ref={ref}>ok</Plain>);
+    expect(ref.current).toBeInstanceOf(HTMLSpanElement);
   });
 });
diff --git a/ui/litellm-dashboard/src/components/update_model_credentials_modal.tsx b/ui/litellm-dashboard/src/components/update_model_credentials_modal.tsx
index b0a19e7ea05..4db8c83ba9d 100644
--- a/ui/litellm-dashboard/src/components/update_model_credentials_modal.tsx
+++ b/ui/litellm-dashboard/src/components/update_model_credentials_modal.tsx
@@ -1,12 +1,15 @@
-import { Alert, Modal, Typography } from "antd";
+import { Typography } from "antd";
+import { TriangleAlert } from "lucide-react";
 import { useState } from "react";
 import { z } from "zod/v4";
 import { modelPatchUpdateCall } from "./networking";
 import { toast } from "@/lib/toast";
 import { FieldGroup } from "@/components/shared/form/field";
 import { FormField } from "@/components/shared/form/FormField";
+import { Alert, AlertTitle } from "@/components/shared/Alert";
 import { PasswordInput } from "@/components/shared/PasswordInput";
 import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
 import { useZodForm } from "@/lib/forms/useZodForm";
 
@@ -69,35 +72,42 @@ export default function UpdateModelCredentialsModal({
   };
 
   return (
-    <Modal title="Update API Key" open={open} onCancel={close} footer={null} width={520} destroyOnHidden={true}>
-      <Text className="block mb-4 text-muted-foreground">
-        Update this model&apos;s API key. Only the new key is sent; the rest of the deployment configuration is left
-        untouched.
-      </Text>
-      <Alert
-        type="warning"
-        showIcon
-        className="mb-4"
-        message="Only the API key is rotated here. Models that authenticate with an Azure AD token, AWS credentials, or a Vertex service-account JSON aren't supported yet; update those from the model's LiteLLM Params for now."
-      />
-      <form onSubmit={form.handleSubmit(handleSubmit)}>
-        <FieldGroup>
-          <FormField control={form.control} name="api_key" label="New API Key">
-            {({ ref, ...field }) => (
-              <PasswordInput {...field} ref={ref} placeholder="Enter the new API key" autoComplete="new-password" />
-            )}
-          </FormField>
-        </FieldGroup>
-        <div className="flex justify-end items-center mt-4 gap-2.5">
-          <Button type="button" variant="outline" onClick={close}>
-            Cancel
-          </Button>
-          <Button type="submit" disabled={isSaving}>
-            {isSaving && <UiLoadingSpinner className="size-4" />}
-            Update API Key
-          </Button>
-        </div>
-      </form>
-    </Modal>
+    <Dialog open={open} onOpenChange={(nextOpen) => !nextOpen && close()}>
+      <DialogContent className="max-h-[calc(100dvh-2rem)] overflow-y-auto sm:max-w-[520px]">
+        <DialogHeader>
+          <DialogTitle>Update API Key</DialogTitle>
+        </DialogHeader>
+        <Text className="block mb-4 text-muted-foreground">
+          Update this model&apos;s API key. Only the new key is sent; the rest of the deployment configuration is left
+          untouched.
+        </Text>
+        <Alert variant="warning" className="mb-4">
+          <TriangleAlert />
+          <AlertTitle>
+            Only the API key is rotated here. Models that authenticate with an Azure AD token, AWS credentials, or a
+            Vertex service-account JSON aren&apos;t supported yet; update those from the model&apos;s LiteLLM Params for
+            now.
+          </AlertTitle>
+        </Alert>
+        <form onSubmit={form.handleSubmit(handleSubmit)}>
+          <FieldGroup>
+            <FormField control={form.control} name="api_key" label="New API Key">
+              {({ ref, ...field }) => (
+                <PasswordInput {...field} ref={ref} placeholder="Enter the new API key" autoComplete="new-password" />
+              )}
+            </FormField>
+          </FieldGroup>
+          <div className="flex justify-end items-center mt-4 gap-2.5">
+            <Button type="button" variant="outline" onClick={close}>
+              Cancel
+            </Button>
+            <Button type="submit" disabled={isSaving}>
+              {isSaving && <UiLoadingSpinner className="size-4" />}
+              Update API Key
+            </Button>
+          </div>
+        </form>
+      </DialogContent>
+    </Dialog>
   );
 }
diff --git a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.test.tsx b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.test.tsx
index a2afe0d7a0d..b6803f23f50 100644
--- a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.test.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.test.tsx
@@ -59,7 +59,11 @@ describe("RoutingDecisionCard", () => {
         }}
       />,
     );
-    expect(screen.getByText("Heuristic, REASONING override (2 or more reasoning markers)")).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        "Heuristic, REASONING override (2 or more reasoning markers, score of at least the Simple to Medium boundary)",
+      ),
+    ).toBeInTheDocument();
     expect(screen.getByText("0.20")).toBeInTheDocument();
     // The score did not decide this tier, so NO band explanation may render at all.
     // Asserting the absence of one specific band would pass vacuously: 0.20 sits in
@@ -188,7 +192,11 @@ describe("RoutingDecisionCard", () => {
     // `signals` is gone under redaction; the cause alone must suppress the band.
     render(<RoutingDecisionCard decision={{ ...heuristic, cause: "reasoning_override", signals: undefined }} />);
     expect(screen.queryByText(/SIMPLE|MEDIUM|COMPLEX|at or above/)).not.toBeInTheDocument();
-    expect(screen.getByText("Heuristic, REASONING override (2 or more reasoning markers)")).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        "Heuristic, REASONING override (2 or more reasoning markers, score of at least the Simple to Medium boundary)",
+      ),
+    ).toBeInTheDocument();
   });
 
   it("shows the operator's tier name on the badge instead of the canonical one", () => {
@@ -212,7 +220,40 @@ describe("RoutingDecisionCard", () => {
     render(
       <RoutingDecisionCard decision={{ ...heuristic, cause: "reasoning_override", score: 0.2, tier_label: "Deep" }} />,
     );
-    expect(screen.getByText("Heuristic, Deep override (2 or more reasoning markers)")).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        "Heuristic, Deep override (2 or more reasoning markers, score of at least the Simple to Medium boundary)",
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it("states the floor the override actually cleared", () => {
+    render(
+      <RoutingDecisionCard
+        decision={{ ...heuristic, cause: "reasoning_override", score: 0.2, reasoning_override_min_score: 0.05 }}
+      />,
+    );
+    expect(
+      screen.getByText("Heuristic, REASONING override (2 or more reasoning markers, score of at least 0.05)"),
+    ).toBeInTheDocument();
+  });
+
+  // A floor of 0 is an unconditional override, so a falsy check here would print the "before this change"
+  // wording on a row that recorded a real floor.
+  it("states a recorded floor of 0 rather than treating it as unrecorded", () => {
+    render(
+      <RoutingDecisionCard
+        decision={{ ...heuristic, cause: "reasoning_override", score: 0.2, reasoning_override_min_score: 0 }}
+      />,
+    );
+    expect(
+      screen.getByText("Heuristic, REASONING override (2 or more reasoning markers, score of at least 0)"),
+    ).toBeInTheDocument();
+  });
+
+  it("never prints undefined on a row logged before the floor was recorded", () => {
+    render(<RoutingDecisionCard decision={{ ...heuristic, cause: "reasoning_override", score: 0.2 }} />);
+    expect(screen.queryByText(/undefined/)).not.toBeInTheDocument();
   });
 
   it("falls back to the raw cause for a value this build does not know", () => {
diff --git a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.tsx b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.tsx
index 0876a539653..eaee4d3ce23 100644
--- a/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/LogDetailsDrawer/RoutingDecisionCard.tsx
@@ -26,6 +26,7 @@ export interface RoutingDecision {
   classifier_model?: string;
   escalated?: boolean;
   tier_boundaries?: RoutingDecisionTierBoundaries;
+  reasoning_override_min_score?: number;
 }
 
 const ROUTER_TYPE_LABELS: Record<string, string> = {
@@ -65,14 +66,26 @@ function describePlanModeFloor(matchedKeyword: string | undefined): string {
   return "Plan-mode floor";
 }
 
+/** Rows logged before the floor was recorded name what it tracked back then instead of a number. */
+function describeReasoningOverride(tierLabel: string | undefined, floor: number | undefined): string {
+  const stated = floor === undefined ? "the Simple to Medium boundary" : String(floor);
+  return `Heuristic, ${tierLabel ?? "REASONING"} override (2 or more reasoning markers, score of at least ${stated})`;
+}
+
 function describeCause(decision: RoutingDecision): string {
-  const { cause, classifier_model: classifierModel, matched_keyword: matchedKeyword, tier_label: tierLabel } = decision;
+  const {
+    cause,
+    classifier_model: classifierModel,
+    matched_keyword: matchedKeyword,
+    tier_label: tierLabel,
+    reasoning_override_min_score: overrideFloor,
+  } = decision;
 
   switch (cause) {
     case "heuristic_scorer":
       return "Heuristic scorer";
     case "reasoning_override":
-      return `Heuristic, ${tierLabel ?? "REASONING"} override (2 or more reasoning markers)`;
+      return describeReasoningOverride(tierLabel, overrideFloor);
     case "llm_classifier":
       return classifierModel ? `LLM classifier (${classifierModel})` : "LLM classifier";
     case "literal_keyword_match":
diff --git a/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx b/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx
index 90370e3b00b..d7aafd8aaae 100644
--- a/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx
+++ b/ui/litellm-dashboard/src/contexts/AntdGlobalProvider.tsx
@@ -1,13 +1,8 @@
 "use client";
 
 import React from "react";
-import { ConfigProvider } from "antd";
 import { StyleProvider } from "@ant-design/cssinjs";
 
 export default function AntdGlobalProvider({ children }: { children: React.ReactNode }) {
-  return (
-    <StyleProvider layer>
-      <ConfigProvider theme={{ cssVar: true }}>{children}</ConfigProvider>
-    </StyleProvider>
-  );
+  return <StyleProvider layer>{children}</StyleProvider>;
 }
diff --git a/ui/litellm-dashboard/src/lib/http/schema.d.ts b/ui/litellm-dashboard/src/lib/http/schema.d.ts
index 5794c60e97b..fed15a2ba41 100644
--- a/ui/litellm-dashboard/src/lib/http/schema.d.ts
+++ b/ui/litellm-dashboard/src/lib/http/schema.d.ts
@@ -816,7 +816,8 @@ export interface paths {
         };
         /**
          * List Shadow Eval Jobs
-         * @description List shadow eval jobs, newest first. Counts and results ride the detail endpoint only.
+         * @description List shadow eval jobs, newest first, each key with its attempt count so status is
+         *     accurate. Judged counts, spend, and results ride the detail endpoint only.
          */
         get: operations["list_shadow_eval_jobs_auto_router_shadow_eval_get"];
         put?: never;
@@ -838,20 +839,21 @@ export interface paths {
         put?: never;
         /**
          * Start Shadow Eval
-         * @description Start a shadow eval: duplicate a sampled slice of a key's live traffic against a second
-         *     arm, judge the two responses blind, and stratify win rates by tier and by the model that
-         *     served the real arm.
+         * @description Start a shadow eval: duplicate a sampled slice of one or more keys' live traffic against
+         *     a second arm, judge the two responses blind, and stratify win rates by tier, by the model
+         *     that served the real arm, and by key.
          *
-         *     A forward job answers whether the key should adopt router_name: it samples the requests
+         *     A forward job answers whether the keys should adopt router_name: it samples the requests
          *     the router did not serve and duplicates them through it. A reverse job answers whether a
          *     key already on the router still gains from it: it samples the requests the router did
          *     serve and duplicates them against baseline_model. A key can hold one active job per
          *     direction, so both questions can run at once.
          *
-         *     Shadow responses are never served to users. The job samples until it has judged
-         *     max_turns turns, reaches the end of its window, or is stopped; sampling changes
-         *     propagate to pods within about 10 seconds. Shadow and judge calls bill to the
-         *     shadowed key but are excluded from request counts and auto-router adoption metrics.
+         *     Shadow responses are never served to users. Each key samples until it has judged
+         *     max_turns turns of its own traffic, the job's window ends, or the job is stopped, so one
+         *     key running out of budget does not end sampling for the others; sampling changes
+         *     propagate to pods within about 10 seconds. Shadow and judge calls bill to the shadowed
+         *     key but are excluded from request counts and auto-router adoption metrics.
          */
         post: operations["start_shadow_eval_auto_router_shadow_eval_start_post"];
         delete?: never;
@@ -891,7 +893,12 @@ export interface paths {
         put?: never;
         /**
          * Stop Shadow Eval Job
-         * @description Stop an active shadow eval job. Attempts are kept; sampling halts within ~10s.
+         * @description Stop an active shadow eval job, every key it scopes at once. Attempts are kept;
+         *     sampling halts within ~10s. Keys that already stopped on their own budget keep the
+         *     stopped_at they earned. The statement is the whole state machine: it claims the job
+         *     only while a leg still samples inside the window with no stop recorded, so a racing
+         *     operator, a same-instant budget spend, and a repeat stop all read the same 400 with
+         *     the status the job actually holds.
          */
         post: operations["stop_shadow_eval_job_auto_router_shadow_eval__job_id__stop_post"];
         delete?: never;
@@ -23793,6 +23800,15 @@ export interface components {
          * @enum {string}
          */
         ComplexityTier: "SIMPLE" | "MEDIUM" | "COMPLEX" | "REASONING";
+        /** ComplexityTierModel */
+        ComplexityTierModel: {
+            /** Litellm Params */
+            litellm_params?: {
+                [key: string]: unknown;
+            };
+            /** Model Name */
+            model_name: string;
+        };
         /**
          * ComplianceCheckRequest
          * @description Request payload for compliance check endpoints.
@@ -24045,6 +24061,11 @@ export interface components {
              * @description require a key for all calls to proxy
              */
             master_key?: string | null;
+            /**
+             * Max Batch File Size Mb
+             * @description max batch input file size in MB for /v1/files uploads with purpose=batch, if a file is larger than this size it will be rejected before being forwarded to the provider
+             */
+            max_batch_file_size_mb?: number | null;
             /**
              * Max Parallel Requests
              * @description maximum parallel requests for each api key
@@ -27559,6 +27580,8 @@ export interface components {
             quality_router_default_model?: string | null;
             /** Region Name */
             region_name?: string | null;
+            /** Regional Endpoint Uplift Multiplier */
+            regional_endpoint_uplift_multiplier?: number | null;
             /** Regional Processing Uplift Multiplier Eu */
             regional_processing_uplift_multiplier_eu?: number | null;
             /** Regional Processing Uplift Multiplier Us */
@@ -32473,6 +32496,11 @@ export interface components {
              * @description Keywords indicating reasoning-required content
              */
             reasoning_keywords?: string[] | null;
+            /**
+             * Reasoning Override Min Score
+             * @description Minimum weighted score a request must reach before 2+ reasoning markers may promote it to the reasoning tier. Unset tracks tier_boundaries.simple_medium, so the override never rescues a request the scorer placed in the cheapest tier; 0 restores the unconditional override
+             */
+            reasoning_override_min_score?: number | null;
             /**
              * Reminder Markers
              * @description Override the delimiter pairs used to recognize and strip harness-injected reminder blocks before classification. A harness that wraps injected context differently per agent type (main, subagent, cron) lists every pair it emits. Replaces, rather than adds to, the built-in default of ('<system-reminder>', '</system-reminder>'), so a harness that also emits that pair lists it too. Matching is case-insensitive.
@@ -32537,6 +32565,10 @@ export interface components {
             tier_labels?: {
                 [key: string]: string;
             };
+            /** Tier Model Configs */
+            tier_model_configs?: {
+                [key: string]: components["schemas"]["ComplexityTierModel"][];
+            };
             /**
              * Tiers
              * @description Mapping of complexity tiers to a model or model pool. A list is randomly picked from when adaptive=False, and used as a soft-floor home pool when adaptive=True
@@ -33201,18 +33233,49 @@ export interface components {
             timeout?: number | null;
         };
         /**
-         * ShadowEvalJobResponse
-         * @description A shadow-eval job. Validates directly from the prisma record (job_id reads the
-         *     row's id); status is derived from stopped_at and ends_at, never stored, so no writer
-         *     anywhere can produce an inconsistent one. Aggregate fields are populated by the
-         *     detail endpoint only and stay None on list responses.
+         * ShadowEvalJobKeyResponse
+         * @description One key a job shadows, with its own budget and stop state.
          */
-        ShadowEvalJobResponse: {
+        ShadowEvalJobKeyResponse: {
             /**
              * Api Key Id
-             * @description The hashed virtual key whose traffic this job evaluates, and only that key's
+             * @description The hashed virtual key whose traffic this entry scopes
              */
             api_key_id: string;
+            /**
+             * Attempt Count
+             * @description This key's sampled attempts so far, judged and errored alike, the same count the sampler budgets against max_turns; populated on list and detail responses. Frozen at stopped_at once the key is stamped, so in-flight attempts landing after a stop never reclassify it
+             */
+            attempt_count?: number | null;
+            /**
+             * Key Alias
+             * @description Alias of the shadowed key, resolved from the key row at read time; None when unset or deleted
+             */
+            key_alias?: string | null;
+            /**
+             * Key Name
+             * @description Masked display name (sk-...) of the shadowed key, resolved at read time like key_alias
+             */
+            key_name?: string | null;
+            /**
+             * Max Turns
+             * @description This key's own sample budget, independent of its siblings'
+             */
+            max_turns: number;
+            /**
+             * Stopped At
+             * @description When this key's slot was stamped free, whether its own budget ran out, the window closed, or an operator stopped the job; status is derived, so a spent budget reads completed even while this is still unset
+             */
+            stopped_at?: string | null;
+        };
+        /**
+         * ShadowEvalJobResponse
+         * @description A shadow-eval job over one or more keys, each with its own budget and stop state;
+         *     status is derived from stopped_by, the keys' stop and budget state, and ends_at,
+         *     never stored, so no writer anywhere can produce an inconsistent one. Aggregate
+         *     fields are populated by the detail endpoint only and stay None on list responses.
+         */
+        ShadowEvalJobResponse: {
             /** Baseline Model */
             baseline_model?: string | null;
             /**
@@ -33251,22 +33314,15 @@ export interface components {
              */
             judged_count?: number | null;
             /**
-             * Key Alias
-             * @description Alias of the shadowed key, resolved from the key row at read time; None when unset or deleted
+             * Keys
+             * @description The keys whose traffic this job evaluates, and only those keys', each with its own budget
              */
-            key_alias?: string | null;
-            /**
-             * Key Name
-             * @description Masked display name (sk-...) of the shadowed key, resolved at read time like key_alias
-             */
-            key_name?: string | null;
+            keys: components["schemas"]["ShadowEvalJobKeyResponse"][];
             /**
              * Last Error
              * @description Most recent attempt error; detail endpoint only
              */
             last_error?: string | null;
-            /** Max Turns */
-            max_turns: number;
             /** @description Stratified verdicts; detail endpoint only */
             results?: components["schemas"]["ShadowEvalResult"] | null;
             /** Router Name */
@@ -33275,13 +33331,19 @@ export interface components {
             shadow_percentage: number;
             /**
              * Status
-             * @description A job whose window has passed reads completed even if a later sweep stamped
-             *     stopped_at; stopped means sampling ended before the window did.
+             * @description Three recorded facts, no history-guessing: a stop is stopped_by (the migration
+             *     backfills it for every job that displayed stopped when the column arrived, so the
+             *     pre-column population is closed), completion is the window passing or every key
+             *     spending its budget, and anything else is running. The all-keys-stamped fallback
+             *     covers only stops written by pre-column pods during a rolling deploy.
              * @enum {string}
              */
             readonly status: "running" | "completed" | "stopped";
-            /** Stopped At */
-            stopped_at?: string | null;
+            /**
+             * Stopped By
+             * @description The operator who stopped the job early, recorded by the stop endpoint; 'unknown' backfilled by migration for jobs that displayed stopped when the column arrived; None when the job ended on its own. Its presence is what makes a job read stopped rather than completed
+             */
+            stopped_by?: string | null;
         };
         /**
          * ShadowEvalResult
@@ -33290,9 +33352,14 @@ export interface components {
         ShadowEvalResult: {
             /**
              * By Current Model
-             * @description Sliced by the model that served the real arm: the key's incumbent models in forward mode, and in reverse the models the router itself picked
+             * @description Sliced by the model that served the real arm: the keys' incumbent models in forward mode, and in reverse the models the router itself picked
              */
             by_current_model: components["schemas"]["ShadowEvalSlice"][];
+            /**
+             * By Key
+             * @description One slice per scoped key that has judged verdicts, grouped on the raw key hash. Keys the job scopes but has not judged a turn for yet are absent rather than reported as zero
+             */
+            by_key: components["schemas"]["ShadowEvalSlice"][];
             /** By Tier */
             by_tier: components["schemas"]["ShadowEvalSlice"][];
             /** Overall Shadow Win Rate Pct */
@@ -33460,6 +33527,8 @@ export interface components {
             escalation_keyword?: string;
             /** Matched Keyword */
             matched_keyword?: string;
+            /** Reasoning Override Min Score */
+            reasoning_override_min_score?: number;
             /** Request Type */
             request_type?: string;
             /** Routed Model */
@@ -33484,6 +33553,10 @@ export interface components {
             tier_boundaries?: components["schemas"]["StandardLoggingRoutingDecisionTierBoundaries"];
             /** Tier Label */
             tier_label?: string;
+            /** Tier Litellm Params */
+            tier_litellm_params?: {
+                [key: string]: unknown;
+            };
         };
         /**
          * StandardLoggingRoutingDecisionTierBoundaries
@@ -33500,14 +33573,14 @@ export interface components {
         };
         /**
          * StartShadowEvalRequest
-         * @description Start duplicating a key's traffic for blind comparison against an auto-router.
+         * @description Start duplicating one or more keys' traffic for blind comparison against an auto-router.
          */
         StartShadowEvalRequest: {
             /**
-             * Api Key Id
-             * @description The hashed virtual key whose traffic will be shadowed. Shadow evaluation runs ONLY on this key's traffic; requests made with any other key are not sampled.
+             * Api Key Ids
+             * @description The hashed virtual keys whose traffic will be shadowed. Shadow evaluation runs ONLY on these keys' traffic; requests made with any other key are not sampled. Each key carries its own max_turns budget, so one key exhausting its budget leaves the others sampling. At most 100 keys per job, which also bounds every read the job's endpoints make.
              */
-            api_key_id: string;
+            api_key_ids: string[];
             /**
              * Baseline Model
              * @description Required when direction is reverse and rejected otherwise: the fixed model the router's own responses are judged against. Must be a plain model rather than another auto-router
@@ -33534,7 +33607,7 @@ export interface components {
             judge_model: string;
             /**
              * Max Turns
-             * @description Sample budget: the job judges at most this many turns, then completes. This is also the spend bound; expected judge cost is roughly max_turns times one judge call
+             * @description Per-key sample budget: the job judges at most this many turns of EACH scoped key's traffic, so a job over N keys judges at most N times max_turns turns. This is also the spend bound; expected judge cost is roughly that turn ceiling times one judge call
              * @default 200
              */
             max_turns: number;
@@ -36689,6 +36762,8 @@ export interface components {
             quality_router_default_model?: string | null;
             /** Region Name */
             region_name?: string | null;
+            /** Regional Endpoint Uplift Multiplier */
+            regional_endpoint_uplift_multiplier?: number | null;
             /** Regional Processing Uplift Multiplier Eu */
             regional_processing_uplift_multiplier_eu?: number | null;
             /** Regional Processing Uplift Multiplier Us */
@@ -37931,7 +38006,7 @@ export interface operations {
     list_shadow_eval_jobs_auto_router_shadow_eval_get: {
         parameters: {
             query?: {
-                /** @description Filter to jobs shadowing this key */
+                /** @description Filter to jobs that shadow this key, alone or alongside others */
                 api_key_id?: string | null;
                 /** @description Newest jobs to return */
                 limit?: number;
diff --git a/ui/litellm-dashboard/tests/setupTests.ts b/ui/litellm-dashboard/tests/setupTests.ts
index 3eceef211a5..16a500a4518 100644
--- a/ui/litellm-dashboard/tests/setupTests.ts
+++ b/ui/litellm-dashboard/tests/setupTests.ts
@@ -113,30 +113,25 @@ vi.mock("@/app/(dashboard)/hooks/useAuthorized", () => ({
   }),
 }));
 
-const pendingRefWarnings: string[] = [];
-const consumePendingRefWarnings = (): string[] => pendingRefWarnings.splice(0, pendingRefWarnings.length);
-(globalThis as { __consumePendingRefWarnings?: () => string[] }).__consumePendingRefWarnings =
-  consumePendingRefWarnings;
-
-const originalConsoleError = console.error.bind(console);
-vi.spyOn(console, "error").mockImplementation((...args: unknown[]) => {
-  originalConsoleError(...args);
-  if (typeof args[0] === "string" && args[0].includes("Function components cannot be given refs")) {
-    pendingRefWarnings.push(args.map(String).join(" "));
+// Unmounting a Base UI dialog that is still open leaves its scroll lock behind: the <html>
+// and <body> inline styles and the marker attribute survive cleanup() and make every later
+// test in the file see a locked page, where popups compute pointer-events: none and clicks
+// silently do nothing. Real users never unmount an open dialog, so undo it here.
+const releaseBaseUiScrollLock = () => {
+  const root = document.documentElement;
+  if (!root.hasAttribute("data-base-ui-scroll-locked")) return;
+  root.removeAttribute("data-base-ui-scroll-locked");
+  for (const property of ["scrollbar-gutter", "overflow-y", "overflow-x", "scroll-behavior"]) {
+    root.style.removeProperty(property);
   }
-});
+  for (const property of ["position", "height", "width", "box-sizing", "overflow", "scroll-behavior"]) {
+    document.body.style.removeProperty(property);
+  }
+};
 
 afterEach(() => {
   cleanup();
-  const refWarnings = consumePendingRefWarnings();
-  if (refWarnings.length > 0) {
-    throw new Error(
-      "A ref was passed to a plain function component and silently dropped under React 18, which breaks " +
-        "ref-based composition (Base UI render triggers, tooltips, focus). Wrap the component in React.forwardRef. " +
-        "This tripwire lives in tests/setupTests.ts and can be removed after the React 19 upgrade.\n\n" +
-        refWarnings.join("\n\n"),
-    );
-  }
+  releaseBaseUiScrollLock();
 });
 
 // Make toLocaleString deterministic in tests; individual tests can override
diff --git a/ui/litellm-dashboard/tests/test-utils.tsx b/ui/litellm-dashboard/tests/test-utils.tsx
index 2573fbdfeac..66966201a9c 100644
--- a/ui/litellm-dashboard/tests/test-utils.tsx
+++ b/ui/litellm-dashboard/tests/test-utils.tsx
@@ -1,7 +1,9 @@
 import React, { PropsWithChildren } from "react";
-import { render, RenderOptions } from "@testing-library/react";
+import { render, RenderOptions, screen, waitFor } from "@testing-library/react";
+import type userEvent from "@testing-library/user-event";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { NuqsTestingAdapter, OnUrlUpdateFunction } from "nuqs/adapters/testing";
+import { expect } from "vitest";
 
 // Create a client for testing
 export const testQueryClient = new QueryClient({
@@ -35,4 +37,29 @@ export const renderWithProviders = (ui: React.ReactElement, options?: RenderOpti
   return render(ui, { wrapper: Providers, ...renderOptions });
 };
 
+const pointerBlocked = (element: HTMLElement): boolean => {
+  for (let node: HTMLElement | null = element; node !== null; node = node.parentElement) {
+    if (node.style.pointerEvents === "none") return true;
+  }
+  return false;
+};
+
+/**
+ * Opens a Base UI Select and picks an option by its accessible name.
+ *
+ * The option is in the DOM one render before the popup finishes entering, and until then its
+ * positioner still carries `pointer-events: none`, which user-event refuses to click. Waiting on
+ * the option text alone is a race that React 19's flush timing loses.
+ */
+export const chooseSelectOption = async (
+  user: ReturnType<typeof userEvent.setup>,
+  trigger: HTMLElement,
+  optionName: string | RegExp,
+) => {
+  await user.click(trigger);
+  const option = await screen.findByRole("option", { name: optionName });
+  await waitFor(() => expect(pointerBlocked(option)).toBe(false));
+  await user.click(option);
+};
+
 export * from "@testing-library/react";