refactor(ui): 重构批量模型管理对话框为单列勾选模式

- BatchAssignModelsDialog: 从左右双栏改为单列勾选，支持统一保存
- KeyAllowedModelsEditDialog: 添加分组折叠功能，优化布局
- Dialog: 调整移动端内边距适配
- ProviderDetailDrawer: 密钥列表改为两行显示
- KeyFormDialog: 缩小对话框尺寸
- ModelsTab: 调整表格列宽

.env.example

@@ -1,8 +1,16 @@
 # ==================== 必须配置（启动前） ====================
 # 以下配置项必须在项目启动前设置
 
-# 数据库密码
+# 数据库配置
+DB_HOST=localhost
+DB_PORT=5432
+DB_USER=postgres
+DB_NAME=aether
 DB_PASSWORD=your_secure_password_here
+
+# Redis 配置
+REDIS_HOST=localhost
+REDIS_PORT=6379
 REDIS_PASSWORD=your_redis_password_here
 
 # JWT密钥（使用 python generate_keys.py 生成）

.github/workflows/docker-publish.yml

@@ -15,6 +15,8 @@ env:
   REGISTRY: ghcr.io
   BASE_IMAGE_NAME: fawney19/aether-base
   APP_IMAGE_NAME: fawney19/aether
+  # Files that affect base image - used for hash calculation
+  BASE_FILES: "Dockerfile.base pyproject.toml frontend/package.json frontend/package-lock.json"
 
 jobs:
   check-base-changes:
@@ -23,8 +25,13 @@ jobs:
       base_changed: ${{ steps.check.outputs.base_changed }}
     steps:
       - uses: actions/checkout@v4
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
         with:
-          fetch-depth: 2
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check if base image needs rebuild
         id: check
@@ -34,10 +41,26 @@ jobs:
             exit 0
           fi
 
-          # Check if base-related files changed
-          if git diff --name-only HEAD~1 HEAD | grep -qE '^(Dockerfile\.base|pyproject\.toml|frontend/package.*\.json)$'; then
+          # Calculate current hash of base-related files
+          CURRENT_HASH=$(cat ${{ env.BASE_FILES }} 2>/dev/null | sha256sum | cut -d' ' -f1)
+          echo "Current base files hash: $CURRENT_HASH"
+
+          # Try to get hash label from remote image config
+          # Pull the image config and extract labels
+          REMOTE_HASH=""
+          if docker pull ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest 2>/dev/null; then
+            REMOTE_HASH=$(docker inspect ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest --format '{{ index .Config.Labels "org.opencontainers.image.base.hash" }}' 2>/dev/null) || true
+          fi
+
+          if [ -z "$REMOTE_HASH" ] || [ "$REMOTE_HASH" == "<no value>" ]; then
+            # No remote image or no hash label, need to rebuild
+            echo "No remote base image or hash label found, need rebuild"
+            echo "base_changed=true" >> $GITHUB_OUTPUT
+          elif [ "$CURRENT_HASH" != "$REMOTE_HASH" ]; then
+            echo "Hash mismatch: remote=$REMOTE_HASH, current=$CURRENT_HASH"
             echo "base_changed=true" >> $GITHUB_OUTPUT
           else
+            echo "Hash matches, no rebuild needed"
             echo "base_changed=false" >> $GITHUB_OUTPUT
           fi
 
@@ -61,6 +84,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Calculate base files hash
+        id: hash
+        run: |
+          HASH=$(cat ${{ env.BASE_FILES }} 2>/dev/null | sha256sum | cut -d' ' -f1)
+          echo "hash=$HASH" >> $GITHUB_OUTPUT
+
       - name: Extract metadata for base image
         id: meta
         uses: docker/metadata-action@v5
@@ -69,6 +98,8 @@ jobs:
           tags: |
             type=raw,value=latest
             type=sha,prefix=
+          labels: |
+            org.opencontainers.image.base.hash=${{ steps.hash.outputs.hash }}
 
       - name: Build and push base image
         uses: docker/build-push-action@v5
@@ -115,9 +146,32 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=sha,prefix=
 
+      - name: Extract version from tag
+        id: version
+        run: |
+          # 从 tag 提取版本号，如 v0.2.5 -> 0.2.5
+          VERSION="${GITHUB_REF#refs/tags/v}"
+          if [ "$VERSION" = "$GITHUB_REF" ]; then
+            # 不是 tag 触发，使用 git describe
+            VERSION=$(git describe --tags --always | sed 's/^v//')
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Extracted version: $VERSION"
+
       - name: Update Dockerfile.app to use registry base image
         run: |
-          sed -i "s|FROM aether-base:latest|FROM ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest|g" Dockerfile.app
+          sed -i "s|FROM aether-base:latest AS builder|FROM ${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:latest AS builder|g" Dockerfile.app
+
+      - name: Generate version file
+        run: |
+          # 生成 _version.py 文件
+          cat > src/_version.py << EOF
+          # Auto-generated by CI
+          __version__ = '${{ steps.version.outputs.version }}'
+          __version_tuple__ = tuple(int(x) for x in '${{ steps.version.outputs.version }}'.split('.') if x.isdigit())
+          version = __version__
+          version_tuple = __version_tuple__
+          EOF
 
       - name: Build and push app image
         uses: docker/build-push-action@v5

.gitignore

@@ -224,3 +224,6 @@ extracted_*.ts
 .deps-hash
 .code-hash
 .migration-hash
+
+# Version file (auto-generated by hatch-vcs)
+src/_version.py

Dockerfile.app

@@ -1,16 +1,169 @@
-# 应用镜像：基于基础镜像，只复制代码（秒级构建）
+# 运行镜像：从 base 提取产物到精简运行时
 # 构建命令: docker build -f Dockerfile.app -t aether-app:latest .
-FROM aether-base:latest
+# 用于 GitHub Actions CI（官方源）
+FROM aether-base:latest AS builder
 
 WORKDIR /app
 
+# 复制前端源码并构建
+COPY frontend/ ./frontend/
+RUN cd frontend && npm run build
+
+# ==================== 运行时镜像 ====================
+FROM python:3.12-slim
+
+WORKDIR /app
+
+# 运行时依赖（无 gcc/nodejs/npm）
+RUN apt-get update && apt-get install -y \
+    nginx \
+    supervisor \
+    libpq5 \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# 从 base 镜像复制 Python 包
+COPY --from=builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
+
+# 只复制需要的 Python 可执行文件
+COPY --from=builder /usr/local/bin/gunicorn /usr/local/bin/
+COPY --from=builder /usr/local/bin/uvicorn /usr/local/bin/
+COPY --from=builder /usr/local/bin/alembic /usr/local/bin/
+
+# 从 builder 阶段复制前端构建产物
+COPY --from=builder /app/frontend/dist /usr/share/nginx/html
+
 # 复制后端代码
 COPY src/ ./src/
 COPY alembic.ini ./
 COPY alembic/ ./alembic/
 
-# 构建前端（使用基础镜像中已安装的 node_modules）
-COPY frontend/ /tmp/frontend/
-RUN cd /tmp/frontend && npm run build && \
-    cp -r dist/* /usr/share/nginx/html/ && \
-    rm -rf /tmp/frontend
+# Nginx 配置模板
+# 智能处理 IP：有外层代理头就透传，没有就用直连 IP
+RUN printf '%s\n' \
+'map $http_x_real_ip $real_ip {' \
+'    default $http_x_real_ip;' \
+'    ""      $remote_addr;' \
+'}' \
+'' \
+'map $http_x_forwarded_for $forwarded_for {' \
+'    default $http_x_forwarded_for;' \
+'    ""      $remote_addr;' \
+'}' \
+'' \
+'server {' \
+'    listen 80;' \
+'    server_name _;' \
+'    root /usr/share/nginx/html;' \
+'    index index.html;' \
+'    client_max_body_size 100M;' \
+'' \
+'    # gzip 压缩配置（对 base64 图片等非流式响应有效）' \
+'    gzip on;' \
+'    gzip_min_length 256;' \
+'    gzip_comp_level 5;' \
+'    gzip_vary on;' \
+'    gzip_proxied any;' \
+'    gzip_types application/json text/plain text/css text/javascript application/javascript application/octet-stream;' \
+'    gzip_disable "msie6";' \
+'' \
+'    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {' \
+'        expires 1y;' \
+'        add_header Cache-Control "public, no-transform";' \
+'        try_files $uri =404;' \
+'    }' \
+'' \
+'    location ~ ^/(src|node_modules)/ {' \
+'        deny all;' \
+'        return 404;' \
+'    }' \
+'' \
+'    location ~ ^/(dashboard|admin|login)(/|$) {' \
+'        try_files $uri $uri/ /index.html;' \
+'    }' \
+'' \
+'    location ~ ^/(docs|redoc|openapi\\.json)$ {' \
+'        proxy_pass http://127.0.0.1:PORT_PLACEHOLDER;' \
+'        proxy_http_version 1.1;' \
+'        proxy_set_header Host $host;' \
+'        proxy_set_header X-Real-IP $real_ip;' \
+'        proxy_set_header X-Forwarded-For $forwarded_for;' \
+'        proxy_set_header X-Forwarded-Proto $scheme;' \
+'    }' \
+'' \
+'    location / {' \
+'        try_files $uri $uri/ @backend;' \
+'    }' \
+'' \
+'    location @backend {' \
+'        proxy_pass http://127.0.0.1:PORT_PLACEHOLDER;' \
+'        proxy_http_version 1.1;' \
+'        proxy_set_header Host $host;' \
+'        proxy_set_header X-Real-IP $real_ip;' \
+'        proxy_set_header X-Forwarded-For $forwarded_for;' \
+'        proxy_set_header X-Forwarded-Proto $scheme;' \
+'        proxy_set_header Connection "";' \
+'        proxy_set_header Accept $http_accept;' \
+'        proxy_set_header Content-Type $content_type;' \
+'        proxy_set_header Authorization $http_authorization;' \
+'        proxy_set_header X-Api-Key $http_x_api_key;' \
+'        proxy_buffering off;' \
+'        proxy_cache off;' \
+'        proxy_request_buffering off;' \
+'        chunked_transfer_encoding on;' \
+'        gzip off;' \
+'        add_header X-Accel-Buffering no;' \
+'        proxy_connect_timeout 600s;' \
+'        proxy_send_timeout 600s;' \
+'        proxy_read_timeout 600s;' \
+'    }' \
+'}' > /etc/nginx/sites-available/default.template
+
+# Supervisor 配置
+RUN printf '%s\n' \
+'[supervisord]' \
+'nodaemon=true' \
+'logfile=/var/log/supervisor/supervisord.log' \
+'pidfile=/var/run/supervisord.pid' \
+'' \
+'[program:nginx]' \
+'command=/bin/bash -c "sed \"s/PORT_PLACEHOLDER/8084/g\" /etc/nginx/sites-available/default.template > /etc/nginx/sites-available/default && /usr/sbin/nginx -g \"daemon off;\""' \
+'autostart=true' \
+'autorestart=true' \
+'stdout_logfile=/var/log/nginx/access.log' \
+'stderr_logfile=/var/log/nginx/error.log' \
+'' \
+'[program:app]' \
+'command=gunicorn src.main:app --preload -w %(ENV_GUNICORN_WORKERS)s -k uvicorn.workers.UvicornWorker --bind 127.0.0.1:8084 --timeout 120 --access-logfile - --error-logfile - --log-level info' \
+'directory=/app' \
+'autostart=true' \
+'autorestart=true' \
+'stdout_logfile=/dev/stdout' \
+'stdout_logfile_maxbytes=0' \
+'stderr_logfile=/dev/stderr' \
+'stderr_logfile_maxbytes=0' \
+'environment=PYTHONUNBUFFERED=1,PYTHONIOENCODING=utf-8,LANG=C.UTF-8,LC_ALL=C.UTF-8,DOCKER_CONTAINER=true' > /etc/supervisor/conf.d/supervisord.conf
+
+# 创建目录
+RUN mkdir -p /var/log/supervisor /app/logs /app/data
+
+# 入口脚本（启动前执行迁移）
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# 环境变量
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONIOENCODING=utf-8 \
+    LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    PORT=8084 \
+    GUNICORN_WORKERS=4
+
+EXPOSE 80
+
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost/health || exit 1
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

Dockerfile.app.local

@@ -0,0 +1,160 @@
+# 运行镜像：从 base 提取产物到精简运行时（国内镜像源版本）
+# 构建命令: docker build -f Dockerfile.app.local -t aether-app:latest .
+# 用于本地/国内服务器部署
+FROM aether-base:latest AS builder
+
+WORKDIR /app
+
+# 复制前端源码并构建
+COPY frontend/ ./frontend/
+RUN cd frontend && npm run build
+
+# ==================== 运行时镜像 ====================
+FROM python:3.12-slim
+
+WORKDIR /app
+
+# 运行时依赖（使用清华镜像源）
+RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list.d/debian.sources && \
+    apt-get update && apt-get install -y \
+    nginx \
+    supervisor \
+    libpq5 \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# 从 base 镜像复制 Python 包
+COPY --from=builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
+
+# 只复制需要的 Python 可执行文件
+COPY --from=builder /usr/local/bin/gunicorn /usr/local/bin/
+COPY --from=builder /usr/local/bin/uvicorn /usr/local/bin/
+COPY --from=builder /usr/local/bin/alembic /usr/local/bin/
+
+# 从 builder 阶段复制前端构建产物
+COPY --from=builder /app/frontend/dist /usr/share/nginx/html
+
+# 复制后端代码
+COPY src/ ./src/
+COPY alembic.ini ./
+COPY alembic/ ./alembic/
+
+# Nginx 配置模板
+# 智能处理 IP：有外层代理头就透传，没有就用直连 IP
+RUN printf '%s\n' \
+'map $http_x_real_ip $real_ip {' \
+'    default $http_x_real_ip;' \
+'    ""      $remote_addr;' \
+'}' \
+'' \
+'map $http_x_forwarded_for $forwarded_for {' \
+'    default $http_x_forwarded_for;' \
+'    ""      $remote_addr;' \
+'}' \
+'' \
+'server {' \
+'    listen 80;' \
+'    server_name _;' \
+'    root /usr/share/nginx/html;' \
+'    index index.html;' \
+'    client_max_body_size 100M;' \
+'' \
+'    # gzip 压缩配置（对 base64 图片等非流式响应有效）' \
+'    gzip on;' \
+'    gzip_min_length 256;' \
+'    gzip_comp_level 5;' \
+'    gzip_vary on;' \
+'    gzip_proxied any;' \
+'    gzip_types application/json text/plain text/css text/javascript application/javascript application/octet-stream;' \
+'    gzip_disable "msie6";' \
+'' \
+'    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {' \
+'        expires 1y;' \
+'        add_header Cache-Control "public, no-transform";' \
+'        try_files $uri =404;' \
+'    }' \
+'' \
+'    location ~ ^/(src|node_modules)/ {' \
+'        deny all;' \
+'        return 404;' \
+'    }' \
+'' \
+'    location ~ ^/(dashboard|admin|login)(/|$) {' \
+'        try_files $uri $uri/ /index.html;' \
+'    }' \
+'' \
+'    location / {' \
+'        try_files $uri $uri/ @backend;' \
+'    }' \
+'' \
+'    location @backend {' \
+'        proxy_pass http://127.0.0.1:PORT_PLACEHOLDER;' \
+'        proxy_http_version 1.1;' \
+'        proxy_set_header Host $host;' \
+'        proxy_set_header X-Real-IP $real_ip;' \
+'        proxy_set_header X-Forwarded-For $forwarded_for;' \
+'        proxy_set_header X-Forwarded-Proto $scheme;' \
+'        proxy_set_header Connection "";' \
+'        proxy_set_header Accept $http_accept;' \
+'        proxy_set_header Content-Type $content_type;' \
+'        proxy_set_header Authorization $http_authorization;' \
+'        proxy_set_header X-Api-Key $http_x_api_key;' \
+'        proxy_buffering off;' \
+'        proxy_cache off;' \
+'        proxy_request_buffering off;' \
+'        chunked_transfer_encoding on;' \
+'        gzip off;' \
+'        add_header X-Accel-Buffering no;' \
+'        proxy_connect_timeout 600s;' \
+'        proxy_send_timeout 600s;' \
+'        proxy_read_timeout 600s;' \
+'    }' \
+'}' > /etc/nginx/sites-available/default.template
+
+# Supervisor 配置
+RUN printf '%s\n' \
+'[supervisord]' \
+'nodaemon=true' \
+'logfile=/var/log/supervisor/supervisord.log' \
+'pidfile=/var/run/supervisord.pid' \
+'' \
+'[program:nginx]' \
+'command=/bin/bash -c "sed \"s/PORT_PLACEHOLDER/${PORT:-8084}/g\" /etc/nginx/sites-available/default.template > /etc/nginx/sites-available/default && /usr/sbin/nginx -g \"daemon off;\""' \
+'autostart=true' \
+'autorestart=true' \
+'stdout_logfile=/var/log/nginx/access.log' \
+'stderr_logfile=/var/log/nginx/error.log' \
+'' \
+'[program:app]' \
+'command=gunicorn src.main:app --preload -w %(ENV_GUNICORN_WORKERS)s -k uvicorn.workers.UvicornWorker --bind 0.0.0.0:%(ENV_PORT)s --timeout 120 --access-logfile - --error-logfile - --log-level info' \
+'directory=/app' \
+'autostart=true' \
+'autorestart=true' \
+'stdout_logfile=/dev/stdout' \
+'stdout_logfile_maxbytes=0' \
+'stderr_logfile=/dev/stderr' \
+'stderr_logfile_maxbytes=0' \
+'environment=PYTHONUNBUFFERED=1,PYTHONIOENCODING=utf-8,LANG=C.UTF-8,LC_ALL=C.UTF-8,DOCKER_CONTAINER=true' > /etc/supervisor/conf.d/supervisord.conf
+
+# 创建目录
+RUN mkdir -p /var/log/supervisor /app/logs /app/data
+
+# 入口脚本（启动前执行迁移）
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# 环境变量
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONIOENCODING=utf-8 \
+    LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    PORT=8084
+
+EXPOSE 80
+
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost/health || exit 1
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

Dockerfile.base

@@ -1,122 +1,25 @@
-# 基础镜像：包含所有依赖，只在依赖变化时需要重建
+# 构建镜像：编译环境 + 预编译的依赖
 # 用于 GitHub Actions CI 构建（不使用国内镜像源）
+# 构建命令: docker build -f Dockerfile.base -t aether-base:latest .
+# 只在 pyproject.toml 或 frontend/package*.json 变化时需要重建
 FROM python:3.12-slim
 
 WORKDIR /app
 
-# 系统依赖
+# 构建工具
 RUN apt-get update && apt-get install -y \
-    nginx \
-    supervisor \
     libpq-dev \
     gcc \
-    curl \
-    gettext-base \
     nodejs \
     npm \
     && rm -rf /var/lib/apt/lists/*
 
-# Python 依赖（安装到系统，不用 -e 模式）
+# Python 依赖
 COPY pyproject.toml README.md ./
 RUN mkdir -p src && touch src/__init__.py && \
-    pip install --no-cache-dir .
+    SETUPTOOLS_SCM_PRETEND_VERSION=0.1.0 pip install --no-cache-dir . && \
+    pip cache purge
 
-# 前端依赖
-COPY frontend/package*.json /tmp/frontend/
-WORKDIR /tmp/frontend
-RUN npm ci
-
-# Nginx 配置模板
-RUN printf '%s\n' \
-'server {' \
-'    listen 80;' \
-'    server_name _;' \
-'    root /usr/share/nginx/html;' \
-'    index index.html;' \
-'    client_max_body_size 100M;' \
-'' \
-'    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {' \
-'        expires 1y;' \
-'        add_header Cache-Control "public, no-transform";' \
-'        try_files $uri =404;' \
-'    }' \
-'' \
-'    location ~ ^/(src|node_modules)/ {' \
-'        deny all;' \
-'        return 404;' \
-'    }' \
-'' \
-'    location ~ ^/(dashboard|admin|login)(/|$) {' \
-'        try_files $uri $uri/ /index.html;' \
-'    }' \
-'' \
-'    location / {' \
-'        try_files $uri $uri/ @backend;' \
-'    }' \
-'' \
-'    location @backend {' \
-'        proxy_pass http://127.0.0.1:PORT_PLACEHOLDER;' \
-'        proxy_http_version 1.1;' \
-'        proxy_set_header Host $host;' \
-'        proxy_set_header X-Real-IP $remote_addr;' \
-'        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' \
-'        proxy_set_header X-Forwarded-Proto $scheme;' \
-'        proxy_set_header Connection "";' \
-'        proxy_set_header Accept $http_accept;' \
-'        proxy_set_header Content-Type $content_type;' \
-'        proxy_set_header Authorization $http_authorization;' \
-'        proxy_set_header X-Api-Key $http_x_api_key;' \
-'        proxy_buffering off;' \
-'        proxy_cache off;' \
-'        proxy_request_buffering off;' \
-'        chunked_transfer_encoding on;' \
-'        proxy_connect_timeout 600s;' \
-'        proxy_send_timeout 600s;' \
-'        proxy_read_timeout 600s;' \
-'    }' \
-'}' > /etc/nginx/sites-available/default.template
-
-# Supervisor 配置
-RUN printf '%s\n' \
-'[supervisord]' \
-'nodaemon=true' \
-'logfile=/var/log/supervisor/supervisord.log' \
-'pidfile=/var/run/supervisord.pid' \
-'' \
-'[program:nginx]' \
-'command=/bin/bash -c "sed \"s/PORT_PLACEHOLDER/${PORT:-8084}/g\" /etc/nginx/sites-available/default.template > /etc/nginx/sites-available/default && /usr/sbin/nginx -g \"daemon off;\""' \
-'autostart=true' \
-'autorestart=true' \
-'stdout_logfile=/var/log/nginx/access.log' \
-'stderr_logfile=/var/log/nginx/error.log' \
-'' \
-'[program:app]' \
-'command=gunicorn src.main:app -w %(ENV_GUNICORN_WORKERS)s -k uvicorn.workers.UvicornWorker --bind 0.0.0.0:%(ENV_PORT)s --timeout 120 --access-logfile - --error-logfile - --log-level info' \
-'directory=/app' \
-'autostart=true' \
-'autorestart=true' \
-'stdout_logfile=/dev/stdout' \
-'stdout_logfile_maxbytes=0' \
-'stderr_logfile=/dev/stderr' \
-'stderr_logfile_maxbytes=0' \
-'environment=PYTHONUNBUFFERED=1,PYTHONIOENCODING=utf-8,LANG=C.UTF-8,LC_ALL=C.UTF-8,DOCKER_CONTAINER=true' > /etc/supervisor/conf.d/supervisord.conf
-
-# 创建目录
-RUN mkdir -p /var/log/supervisor /app/logs /app/data /usr/share/nginx/html
-
-WORKDIR /app
-
-# 环境变量
-ENV PYTHONUNBUFFERED=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONIOENCODING=utf-8 \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    PORT=8084
-
-EXPOSE 80
-
-HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-    CMD curl -f http://localhost/health || exit 1
-
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+# 前端依赖（只安装，不构建）
+COPY frontend/package*.json ./frontend/
+RUN cd frontend && npm ci

Dockerfile.base.local

@@ -1,18 +1,15 @@
-# 基础镜像：包含所有依赖，只在依赖变化时需要重建
-# 构建命令: docker build -f Dockerfile.base -t aether-base:latest .
+# 构建镜像：编译环境 + 预编译的依赖（国内镜像源版本）
+# 构建命令: docker build -f Dockerfile.base.local -t aether-base:latest .
+# 只在 pyproject.toml 或 frontend/package*.json 变化时需要重建
 FROM python:3.12-slim
 
 WORKDIR /app
 
-# 系统依赖
+# 构建工具（使用清华镜像源）
 RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list.d/debian.sources && \
     apt-get update && apt-get install -y \
-    nginx \
-    supervisor \
     libpq-dev \
     gcc \
-    curl \
-    gettext-base \
     nodejs \
     npm \
     && rm -rf /var/lib/apt/lists/*
@@ -20,107 +17,12 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.li
 # pip 镜像源
 RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
 
-# Python 依赖（安装到系统，不用 -e 模式）
+# Python 依赖
 COPY pyproject.toml README.md ./
 RUN mkdir -p src && touch src/__init__.py && \
-    pip install --no-cache-dir .
+    SETUPTOOLS_SCM_PRETEND_VERSION=0.1.0 pip install --no-cache-dir . && \
+    pip cache purge
 
-# 前端依赖
-COPY frontend/package*.json /tmp/frontend/
-WORKDIR /tmp/frontend
-RUN npm config set registry https://registry.npmmirror.com && npm ci
-
-# Nginx 配置模板
-RUN printf '%s\n' \
-'server {' \
-'    listen 80;' \
-'    server_name _;' \
-'    root /usr/share/nginx/html;' \
-'    index index.html;' \
-'    client_max_body_size 100M;' \
-'' \
-'    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {' \
-'        expires 1y;' \
-'        add_header Cache-Control "public, no-transform";' \
-'        try_files $uri =404;' \
-'    }' \
-'' \
-'    location ~ ^/(src|node_modules)/ {' \
-'        deny all;' \
-'        return 404;' \
-'    }' \
-'' \
-'    location ~ ^/(dashboard|admin|login)(/|$) {' \
-'        try_files $uri $uri/ /index.html;' \
-'    }' \
-'' \
-'    location / {' \
-'        try_files $uri $uri/ @backend;' \
-'    }' \
-'' \
-'    location @backend {' \
-'        proxy_pass http://127.0.0.1:PORT_PLACEHOLDER;' \
-'        proxy_http_version 1.1;' \
-'        proxy_set_header Host $host;' \
-'        proxy_set_header X-Real-IP $remote_addr;' \
-'        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' \
-'        proxy_set_header X-Forwarded-Proto $scheme;' \
-'        proxy_set_header Connection "";' \
-'        proxy_set_header Accept $http_accept;' \
-'        proxy_set_header Content-Type $content_type;' \
-'        proxy_set_header Authorization $http_authorization;' \
-'        proxy_set_header X-Api-Key $http_x_api_key;' \
-'        proxy_buffering off;' \
-'        proxy_cache off;' \
-'        proxy_request_buffering off;' \
-'        chunked_transfer_encoding on;' \
-'        proxy_connect_timeout 600s;' \
-'        proxy_send_timeout 600s;' \
-'        proxy_read_timeout 600s;' \
-'    }' \
-'}' > /etc/nginx/sites-available/default.template
-
-# Supervisor 配置
-RUN printf '%s\n' \
-'[supervisord]' \
-'nodaemon=true' \
-'logfile=/var/log/supervisor/supervisord.log' \
-'pidfile=/var/run/supervisord.pid' \
-'' \
-'[program:nginx]' \
-'command=/bin/bash -c "sed \"s/PORT_PLACEHOLDER/${PORT:-8084}/g\" /etc/nginx/sites-available/default.template > /etc/nginx/sites-available/default && /usr/sbin/nginx -g \"daemon off;\""' \
-'autostart=true' \
-'autorestart=true' \
-'stdout_logfile=/var/log/nginx/access.log' \
-'stderr_logfile=/var/log/nginx/error.log' \
-'' \
-'[program:app]' \
-'command=gunicorn src.main:app -w %(ENV_GUNICORN_WORKERS)s -k uvicorn.workers.UvicornWorker --bind 0.0.0.0:%(ENV_PORT)s --timeout 120 --access-logfile - --error-logfile - --log-level info' \
-'directory=/app' \
-'autostart=true' \
-'autorestart=true' \
-'stdout_logfile=/dev/stdout' \
-'stdout_logfile_maxbytes=0' \
-'stderr_logfile=/dev/stderr' \
-'stderr_logfile_maxbytes=0' \
-'environment=PYTHONUNBUFFERED=1,PYTHONIOENCODING=utf-8,LANG=C.UTF-8,LC_ALL=C.UTF-8,DOCKER_CONTAINER=true' > /etc/supervisor/conf.d/supervisord.conf
-
-# 创建目录
-RUN mkdir -p /var/log/supervisor /app/logs /app/data /usr/share/nginx/html
-
-WORKDIR /app
-
-# 环境变量
-ENV PYTHONUNBUFFERED=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONIOENCODING=utf-8 \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    PORT=8084
-
-EXPOSE 80
-
-HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-    CMD curl -f http://localhost/health || exit 1
-
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+# 前端依赖（只安装，不构建，使用淘宝镜像源）
+COPY frontend/package*.json ./frontend/
+RUN cd frontend && npm config set registry https://registry.npmmirror.com && npm ci

LICENSE

@@ -5,12 +5,17 @@ Aether 非商业开源许可证
 特此授予任何获得本软件及其相关文档文件（以下简称"软件"）副本的人免费使用、
 复制、修改、合并、发布和分发本软件的权限，但须遵守以下条件：
 
-1. 仅限非商业用途
-   本软件不得用于商业目的。商业目的包括但不限于：
+1. 仅限非盈利用途
+   本软件不得用于盈利目的。盈利目的包括但不限于：
    - 出售本软件或任何衍生作品
    - 使用本软件提供付费服务
-   - 将本软件用于商业产品或服务
-   - 将本软件用于任何旨在获取商业利益或金钱报酬的活动
+   - 将本软件用于以盈利为目的的商业产品或服务
+
+   以下用途被明确允许：
+   - 个人学习和研究
+   - 教育机构的教学和研究
+   - 非盈利组织的内部使用
+   - 企业内部非盈利性质的使用（如内部工具、测试环境等）
 
 2. 署名要求
    上述版权声明和本许可声明应包含在本软件的所有副本或主要部分中。
@@ -22,7 +27,7 @@ Aether 非商业开源许可证
    您不得以不同的条款将本软件再许可给他人。
 
 5. 商业许可
-   如需商业使用，请联系版权持有人以获取单独的商业许可。
+   如需将本软件用于盈利目的，请联系版权持有人以获取单独的商业许可。
 
 本软件按"原样"提供，不提供任何明示或暗示的保证，包括但不限于对适销性、
 特定用途适用性和非侵权性的保证。在任何情况下，作者或版权持有人均不对任何

README.md

@@ -51,17 +51,14 @@ Aether 是一个自托管的 AI API 网关，为团队和个人提供多租户
 ```bash
 # 1. 克隆代码
 git clone https://github.com/fawney19/Aether.git
-cd aether
+cd Aether
 
 # 2. 配置环境变量
 cp .env.example .env
 python generate_keys.py  # 生成密钥, 并将生成的密钥填入 .env
 
-# 3. 部署
-docker-compose up -d
-
-# 4. 更新
-docker-compose pull && docker-compose up -d
+# 3. 部署 / 更新（自动执行数据库迁移）
+docker compose pull && docker compose up -d
 ```
 
 ### Docker Compose（本地构建镜像）
@@ -69,7 +66,7 @@ docker-compose pull && docker-compose up -d
 ```bash
 # 1. 克隆代码
 git clone https://github.com/fawney19/Aether.git
-cd aether
+cd Aether
 
 # 2. 配置环境变量
 cp .env.example .env
@@ -83,7 +80,7 @@ python generate_keys.py  # 生成密钥, 并将生成的密钥填入 .env
 
 ```bash
 # 启动依赖
-docker-compose -f docker-compose.build.yml up -d postgres redis
+docker compose -f docker-compose.build.yml up -d postgres redis
 
 # 后端
 uv sync
@@ -140,7 +137,7 @@ cd frontend && npm install && npm run dev
 - **模型级别**: 在模型管理中针对指定模型开启 1H缓存策略
 - **密钥级别**: 在密钥管理中针对指定密钥使用 1H缓存策略
 
-> **注意**: 若对密钥设置强制 1H缓存, 则该密钥只能调用支持 1H缓存的模型
+> **注意**: 若对密钥设置强制 1H缓存, 则该密钥只能使用支持 1H缓存的模型, 匹配提供商Key, 将会导致这个Key无法同时用于Claude Code、Codex、GeminiCLI, 因为更推荐使用模型开启1H缓存.
 
 ### Q: 如何配置负载均衡？
 
@@ -159,4 +156,16 @@ cd frontend && npm install && npm run dev
 
 ## 许可证
 
-本项目采用 [Aether 非商业开源许可证](LICENSE)。
+本项目采用 [Aether 非商业开源许可证](LICENSE)。允许个人学习、教育研究、非盈利组织及企业内部非盈利性质的使用；禁止用于盈利目的。商业使用请联系获取商业许可。
+
+## 联系作者
+
+<p align="center">
+  <img src="docs/author/qq_qrcode.jpg" width="200" alt="QQ二维码">
+</p>
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=fawney19/Aether&type=Date)](https://star-history.com/#fawney19/Aether&Date)
+
+

alembic/env.py

@@ -30,7 +30,7 @@ from src.models.database import Base
 config = context.config
 
 # 从环境变量获取数据库 URL
-# 优先使用 DATABASE_URL，否则从 DB_PASSWORD 自动构建（与 docker-compose 保持一致）
+# 优先使用 DATABASE_URL，否则从 DB_PASSWORD 自动构建（与 docker compose 保持一致）
 database_url = os.getenv("DATABASE_URL")
 if not database_url:
     db_password = os.getenv("DB_PASSWORD", "")

alembic/versions/20251210_baseline.py

@@ -20,10 +20,10 @@ depends_on = None
 
 
 def upgrade() -> None:
-    # Create ENUM types
-    op.execute("CREATE TYPE userrole AS ENUM ('admin', 'user')")
+    # Create ENUM types (with IF NOT EXISTS for idempotency)
+    op.execute("DO $$ BEGIN CREATE TYPE userrole AS ENUM ('admin', 'user'); EXCEPTION WHEN duplicate_object THEN NULL; END $$")
     op.execute(
-        "CREATE TYPE providerbillingtype AS ENUM ('monthly_quota', 'pay_as_you_go', 'free_tier')"
+        "DO $$ BEGIN CREATE TYPE providerbillingtype AS ENUM ('monthly_quota', 'pay_as_you_go', 'free_tier'); EXCEPTION WHEN duplicate_object THEN NULL; END $$"
     )
 
     # ==================== users ====================
@@ -35,7 +35,7 @@ def upgrade() -> None:
         sa.Column("password_hash", sa.String(255), nullable=False),
         sa.Column(
             "role",
-            sa.Enum("admin", "user", name="userrole", create_type=False),
+            postgresql.ENUM("admin", "user", name="userrole", create_type=False),
             nullable=False,
             server_default="user",
         ),
@@ -67,7 +67,7 @@ def upgrade() -> None:
         sa.Column("website", sa.String(500), nullable=True),
         sa.Column(
             "billing_type",
-            sa.Enum(
+            postgresql.ENUM(
                 "monthly_quota", "pay_as_you_go", "free_tier", name="providerbillingtype", create_type=False
             ),
             nullable=False,
@@ -394,6 +394,10 @@ def upgrade() -> None:
             index=True,
         ),
     )
+    # usage 表复合索引（优化常见查询）
+    op.create_index("idx_usage_user_created", "usage", ["user_id", "created_at"])
+    op.create_index("idx_usage_apikey_created", "usage", ["api_key_id", "created_at"])
+    op.create_index("idx_usage_provider_model_created", "usage", ["provider", "model", "created_at"])
 
     # ==================== user_quotas ====================
     op.create_table(

alembic/versions/20251214_1300_e9b3d63f0cbf_remove_model_mappings_add_aliases.py

@@ -0,0 +1,315 @@
+"""remove_model_mappings_add_aliases
+
+合并迁移：
+1. 添加 provider_model_aliases 字段到 models 表
+2. 迁移 model_mappings 数据到 provider_model_aliases
+3. 删除 model_mappings 表
+4. 添加索引优化别名解析性能
+
+Revision ID: e9b3d63f0cbf
+Revises: 20251210_baseline
+Create Date: 2025-12-14 13:00:22.828183+00:00
+
+"""
+import json
+from datetime import datetime, timezone
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.orm import Session
+
+
+# revision identifiers, used by Alembic.
+revision = 'e9b3d63f0cbf'
+down_revision = '20251210_baseline'
+branch_labels = None
+depends_on = None
+
+
+def column_exists(bind, table_name: str, column_name: str) -> bool:
+    """检查列是否存在"""
+    result = bind.execute(
+        sa.text(
+            """
+            SELECT EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = :table_name AND column_name = :column_name
+            )
+            """
+        ),
+        {"table_name": table_name, "column_name": column_name},
+    )
+    return result.scalar()
+
+
+def table_exists(bind, table_name: str) -> bool:
+    """检查表是否存在"""
+    result = bind.execute(
+        sa.text(
+            """
+            SELECT EXISTS (
+                SELECT 1 FROM information_schema.tables
+                WHERE table_name = :table_name
+            )
+            """
+        ),
+        {"table_name": table_name},
+    )
+    return result.scalar()
+
+
+def index_exists(bind, index_name: str) -> bool:
+    """检查索引是否存在"""
+    result = bind.execute(
+        sa.text(
+            """
+            SELECT EXISTS (
+                SELECT 1 FROM pg_indexes
+                WHERE indexname = :index_name
+            )
+            """
+        ),
+        {"index_name": index_name},
+    )
+    return result.scalar()
+
+
+def upgrade() -> None:
+    """添加 provider_model_aliases 字段，迁移数据，删除 model_mappings 表"""
+    bind = op.get_bind()
+
+    # 1. 添加 provider_model_aliases 字段（如果不存在）
+    if not column_exists(bind, "models", "provider_model_aliases"):
+        op.add_column(
+            'models',
+            sa.Column('provider_model_aliases', sa.JSON(), nullable=True)
+        )
+
+    # 2. 迁移 model_mappings 数据（如果表存在）
+    session = Session(bind=bind)
+
+    model_mappings_table = sa.table(
+        "model_mappings",
+        sa.column("source_model", sa.String),
+        sa.column("target_global_model_id", sa.String),
+        sa.column("provider_id", sa.String),
+        sa.column("mapping_type", sa.String),
+        sa.column("is_active", sa.Boolean),
+    )
+
+    models_table = sa.table(
+        "models",
+        sa.column("id", sa.String),
+        sa.column("provider_id", sa.String),
+        sa.column("global_model_id", sa.String),
+        sa.column("provider_model_aliases", sa.JSON),
+        sa.column("updated_at", sa.DateTime(timezone=True)),
+    )
+
+    def normalize_alias_list(value) -> list[dict]:
+        """将 DB 返回的 JSON 值规范化为 list[{'name': str, 'priority': int}]"""
+        if value is None:
+            return []
+
+        if isinstance(value, str):
+            try:
+                value = json.loads(value) if value else []
+            except Exception:
+                return []
+
+        if not isinstance(value, list):
+            return []
+
+        normalized: list[dict] = []
+        for item in value:
+            if not isinstance(item, dict):
+                continue
+
+            raw_name = item.get("name")
+            if not isinstance(raw_name, str):
+                continue
+            name = raw_name.strip()
+            if not name:
+                continue
+
+            raw_priority = item.get("priority", 1)
+            try:
+                priority = int(raw_priority)
+            except Exception:
+                priority = 1
+            if priority < 1:
+                priority = 1
+
+            normalized.append({"name": name, "priority": priority})
+
+        return normalized
+
+    # 查询所有活跃的 provider 级别 alias（只迁移 is_active=True 且 mapping_type='alias' 的）
+    # 全局别名/映射不迁移（新架构不再支持 source_model -> GlobalModel.name 的解析）
+    # 仅当 model_mappings 表存在时执行迁移
+    if table_exists(bind, "model_mappings"):
+        mappings = session.execute(
+            sa.select(
+                model_mappings_table.c.source_model,
+                model_mappings_table.c.target_global_model_id,
+                model_mappings_table.c.provider_id,
+            )
+            .where(
+                model_mappings_table.c.is_active.is_(True),
+                model_mappings_table.c.provider_id.isnot(None),
+                model_mappings_table.c.mapping_type == "alias",
+            )
+            .order_by(model_mappings_table.c.provider_id, model_mappings_table.c.source_model)
+        ).all()
+
+        # 按 (provider_id, target_global_model_id) 分组，收集别名
+        alias_groups: dict = {}
+        for source_model, target_global_model_id, provider_id in mappings:
+            if not isinstance(source_model, str):
+                continue
+            source_model = source_model.strip()
+            if not source_model:
+                continue
+            if not isinstance(provider_id, str) or not provider_id:
+                continue
+            if not isinstance(target_global_model_id, str) or not target_global_model_id:
+                continue
+
+            key = (provider_id, target_global_model_id)
+            if key not in alias_groups:
+                alias_groups[key] = []
+            priority = len(alias_groups[key]) + 1
+            alias_groups[key].append({"name": source_model, "priority": priority})
+
+        # 更新对应的 models 记录
+        for (provider_id, global_model_id), aliases in alias_groups.items():
+            model_row = session.execute(
+                sa.select(models_table.c.id, models_table.c.provider_model_aliases)
+                .where(
+                    models_table.c.provider_id == provider_id,
+                    models_table.c.global_model_id == global_model_id,
+                )
+                .limit(1)
+            ).first()
+
+            if model_row:
+                model_id = model_row[0]
+                existing_aliases = normalize_alias_list(model_row[1])
+
+                existing_names = {a["name"] for a in existing_aliases}
+                merged_aliases = list(existing_aliases)
+                for alias in aliases:
+                    name = alias.get("name")
+                    if not isinstance(name, str):
+                        continue
+                    name = name.strip()
+                    if not name or name in existing_names:
+                        continue
+
+                    merged_aliases.append(
+                        {
+                            "name": name,
+                            "priority": len(merged_aliases) + 1,
+                        }
+                    )
+                    existing_names.add(name)
+
+                session.execute(
+                    models_table.update()
+                    .where(models_table.c.id == model_id)
+                    .values(
+                        provider_model_aliases=merged_aliases if merged_aliases else None,
+                        updated_at=datetime.now(timezone.utc),
+                    )
+                )
+
+        session.commit()
+
+        # 3. 删除 model_mappings 表
+        op.drop_table('model_mappings')
+
+    # 4. 添加索引优化别名解析性能
+    # provider_model_name 索引（支持精确匹配，如果不存在）
+    if not index_exists(bind, "idx_model_provider_model_name"):
+        op.create_index(
+            "idx_model_provider_model_name",
+            "models",
+            ["provider_model_name"],
+            unique=False,
+            postgresql_where=sa.text("is_active = true"),
+        )
+
+    # provider_model_aliases GIN 索引（支持 JSONB 查询，仅 PostgreSQL）
+    if bind.dialect.name == "postgresql":
+        # 将 json 列转为 jsonb（jsonb 性能更好且支持 GIN 索引）
+        # 使用 IF NOT EXISTS 风格的检查来避免重复转换
+        op.execute(
+            """
+            DO $$
+            BEGIN
+                IF EXISTS (
+                    SELECT 1 FROM information_schema.columns
+                    WHERE table_name = 'models'
+                    AND column_name = 'provider_model_aliases'
+                    AND data_type = 'json'
+                ) THEN
+                    ALTER TABLE models
+                    ALTER COLUMN provider_model_aliases TYPE jsonb
+                    USING provider_model_aliases::jsonb;
+                END IF;
+            END $$;
+            """
+        )
+        # 创建 GIN 索引
+        op.execute(
+            """
+            CREATE INDEX IF NOT EXISTS idx_model_provider_model_aliases_gin
+            ON models USING gin(provider_model_aliases jsonb_path_ops)
+            WHERE is_active = true
+            """
+        )
+
+
+def downgrade() -> None:
+    """恢复 model_mappings 表，移除 provider_model_aliases 字段和索引"""
+    bind = op.get_bind()
+
+    # 1. 删除索引
+    op.drop_index("idx_model_provider_model_name", table_name="models")
+
+    if bind.dialect.name == "postgresql":
+        op.execute("DROP INDEX IF EXISTS idx_model_provider_model_aliases_gin")
+        # 将 jsonb 列还原为 json
+        op.execute(
+            """
+            ALTER TABLE models
+            ALTER COLUMN provider_model_aliases TYPE json
+            USING provider_model_aliases::json
+            """
+        )
+
+    # 2. 恢复 model_mappings 表
+    op.create_table(
+        'model_mappings',
+        sa.Column('id', sa.String(36), primary_key=True),
+        sa.Column('source_model', sa.String(200), nullable=False),
+        sa.Column(
+            'target_global_model_id',
+            sa.String(36),
+            sa.ForeignKey('global_models.id', ondelete='CASCADE'),
+            nullable=False,
+        ),
+        sa.Column('provider_id', sa.String(36), sa.ForeignKey('providers.id'), nullable=True),
+        sa.Column('mapping_type', sa.String(20), nullable=False, server_default='alias'),
+        sa.Column('is_active', sa.Boolean(), nullable=False, server_default='true'),
+        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.UniqueConstraint('source_model', 'provider_id', name='uq_model_mapping_source_provider'),
+    )
+    op.create_index('ix_model_mappings_source_model', 'model_mappings', ['source_model'])
+    op.create_index('ix_model_mappings_target_global_model_id', 'model_mappings', ['target_global_model_id'])
+    op.create_index('ix_model_mappings_provider_id', 'model_mappings', ['provider_id'])
+    op.create_index('ix_model_mappings_mapping_type', 'model_mappings', ['mapping_type'])
+
+    # 3. 移除 provider_model_aliases 字段
+    op.drop_column('models', 'provider_model_aliases')

alembic/versions/20251215_1707_180e63a9c83a_add_first_byte_time_ms_to_usage_table.py

@@ -0,0 +1,47 @@
+"""add first_byte_time_ms to usage table
+
+Revision ID: 180e63a9c83a
+Revises: e9b3d63f0cbf
+Create Date: 2025-12-15 17:07:44.631032+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = '180e63a9c83a'
+down_revision = 'e9b3d63f0cbf'
+branch_labels = None
+depends_on = None
+
+
+def column_exists(bind, table_name: str, column_name: str) -> bool:
+    """检查列是否存在"""
+    result = bind.execute(
+        sa.text(
+            """
+            SELECT EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = :table_name AND column_name = :column_name
+            )
+            """
+        ),
+        {"table_name": table_name, "column_name": column_name},
+    )
+    return result.scalar()
+
+
+def upgrade() -> None:
+    """应用迁移：升级到新版本"""
+    bind = op.get_bind()
+
+    # 添加首字时间字段到 usage 表（如果不存在）
+    if not column_exists(bind, "usage", "first_byte_time_ms"):
+        op.add_column('usage', sa.Column('first_byte_time_ms', sa.Integer(), nullable=True))
+
+
+def downgrade() -> None:
+    """回滚迁移：降级到旧版本"""
+    # 删除首字时间字段
+    op.drop_column('usage', 'first_byte_time_ms')

alembic/versions/20251216_0311_1cc6942cf06f_refactor_global_model_to_use_config_.py

@@ -0,0 +1,110 @@
+"""refactor global_model to use config json field
+
+Revision ID: 1cc6942cf06f
+Revises: 180e63a9c83a
+Create Date: 2025-12-16 03:11:32.480976+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '1cc6942cf06f'
+down_revision = '180e63a9c83a'
+branch_labels = None
+depends_on = None
+
+
+def column_exists(bind, table_name: str, column_name: str) -> bool:
+    """检查列是否存在"""
+    result = bind.execute(
+        sa.text(
+            """
+            SELECT EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = :table_name AND column_name = :column_name
+            )
+            """
+        ),
+        {"table_name": table_name, "column_name": column_name},
+    )
+    return result.scalar()
+
+
+def upgrade() -> None:
+    """应用迁移：升级到新版本
+
+    1. 添加 config 列
+    2. 把旧数据迁移到 config
+    3. 删除旧列
+    """
+    bind = op.get_bind()
+
+    # 检查是否已经迁移过（config 列存在且旧列不存在）
+    has_config = column_exists(bind, "global_models", "config")
+    has_old_columns = column_exists(bind, "global_models", "default_supports_streaming")
+
+    if has_config and not has_old_columns:
+        # 已完成迁移，跳过
+        return
+
+    # 1. 添加 config 列（使用 JSONB 类型，支持索引和更高效的查询）
+    if not has_config:
+        op.add_column('global_models', sa.Column('config', postgresql.JSONB(), nullable=True))
+
+    # 2. 迁移数据：把旧字段合并到 config JSON（仅当旧列存在时）
+    if has_old_columns:
+        op.execute("""
+            UPDATE global_models
+            SET config = jsonb_strip_nulls(jsonb_build_object(
+                'streaming', COALESCE(default_supports_streaming, true),
+                'vision', CASE WHEN COALESCE(default_supports_vision, false) THEN true ELSE NULL END,
+                'function_calling', CASE WHEN COALESCE(default_supports_function_calling, false) THEN true ELSE NULL END,
+                'extended_thinking', CASE WHEN COALESCE(default_supports_extended_thinking, false) THEN true ELSE NULL END,
+                'image_generation', CASE WHEN COALESCE(default_supports_image_generation, false) THEN true ELSE NULL END,
+                'description', description,
+                'icon_url', icon_url,
+                'official_url', official_url
+            ))
+        """)
+
+        # 3. 删除旧列
+        op.drop_column('global_models', 'default_supports_streaming')
+        op.drop_column('global_models', 'default_supports_vision')
+        op.drop_column('global_models', 'default_supports_function_calling')
+        op.drop_column('global_models', 'default_supports_extended_thinking')
+        op.drop_column('global_models', 'default_supports_image_generation')
+        op.drop_column('global_models', 'description')
+        op.drop_column('global_models', 'icon_url')
+        op.drop_column('global_models', 'official_url')
+
+
+def downgrade() -> None:
+    """回滚迁移：降级到旧版本"""
+    # 1. 添加旧列
+    op.add_column('global_models', sa.Column('icon_url', sa.VARCHAR(length=500), nullable=True))
+    op.add_column('global_models', sa.Column('official_url', sa.VARCHAR(length=500), nullable=True))
+    op.add_column('global_models', sa.Column('description', sa.TEXT(), nullable=True))
+    op.add_column('global_models', sa.Column('default_supports_streaming', sa.BOOLEAN(), nullable=True))
+    op.add_column('global_models', sa.Column('default_supports_vision', sa.BOOLEAN(), nullable=True))
+    op.add_column('global_models', sa.Column('default_supports_function_calling', sa.BOOLEAN(), nullable=True))
+    op.add_column('global_models', sa.Column('default_supports_extended_thinking', sa.BOOLEAN(), nullable=True))
+    op.add_column('global_models', sa.Column('default_supports_image_generation', sa.BOOLEAN(), nullable=True))
+
+    # 2. 从 config 恢复数据
+    op.execute("""
+        UPDATE global_models
+        SET
+            default_supports_streaming = COALESCE((config->>'streaming')::boolean, true),
+            default_supports_vision = COALESCE((config->>'vision')::boolean, false),
+            default_supports_function_calling = COALESCE((config->>'function_calling')::boolean, false),
+            default_supports_extended_thinking = COALESCE((config->>'extended_thinking')::boolean, false),
+            default_supports_image_generation = COALESCE((config->>'image_generation')::boolean, false),
+            description = config->>'description',
+            icon_url = config->>'icon_url',
+            official_url = config->>'official_url'
+    """)
+
+    # 3. 删除 config 列
+    op.drop_column('global_models', 'config')

alembic/versions/20251218_0631_f30f9936f6a2_add_proxy_field_to_provider_endpoints.py

@@ -0,0 +1,57 @@
+"""add proxy field to provider_endpoints
+
+Revision ID: f30f9936f6a2
+Revises: 1cc6942cf06f
+Create Date: 2025-12-18 06:31:58.451112+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy import inspect
+
+# revision identifiers, used by Alembic.
+revision = 'f30f9936f6a2'
+down_revision = '1cc6942cf06f'
+branch_labels = None
+depends_on = None
+
+
+def column_exists(table_name: str, column_name: str) -> bool:
+    """检查列是否存在"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    columns = [col['name'] for col in inspector.get_columns(table_name)]
+    return column_name in columns
+
+
+def get_column_type(table_name: str, column_name: str) -> str:
+    """获取列的类型"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    for col in inspector.get_columns(table_name):
+        if col['name'] == column_name:
+            return str(col['type']).upper()
+    return ''
+
+
+def upgrade() -> None:
+    """添加 proxy 字段到 provider_endpoints 表"""
+    if not column_exists('provider_endpoints', 'proxy'):
+        # 字段不存在，直接添加 JSONB 类型
+        op.add_column('provider_endpoints', sa.Column('proxy', JSONB(), nullable=True))
+    else:
+        # 字段已存在，检查是否需要转换类型
+        col_type = get_column_type('provider_endpoints', 'proxy')
+        if 'JSONB' not in col_type:
+            # 如果是 JSON 类型，转换为 JSONB
+            op.execute(
+                'ALTER TABLE provider_endpoints '
+                'ALTER COLUMN proxy TYPE JSONB USING proxy::jsonb'
+            )
+
+
+def downgrade() -> None:
+    """移除 proxy 字段"""
+    if column_exists('provider_endpoints', 'proxy'):
+        op.drop_column('provider_endpoints', 'proxy')

alembic/versions/20251220_1200_add_stats_daily_model_table.py

@@ -0,0 +1,86 @@
+"""add stats_daily_model table and rename provider_model_aliases
+
+Revision ID: a1b2c3d4e5f6
+Revises: f30f9936f6a2
+Create Date: 2025-12-20 12:00:00.000000+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import inspect
+
+# revision identifiers, used by Alembic.
+revision = 'a1b2c3d4e5f6'
+down_revision = 'f30f9936f6a2'
+branch_labels = None
+depends_on = None
+
+
+def table_exists(table_name: str) -> bool:
+    """检查表是否存在"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    return table_name in inspector.get_table_names()
+
+
+def column_exists(table_name: str, column_name: str) -> bool:
+    """检查列是否存在"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    columns = [col['name'] for col in inspector.get_columns(table_name)]
+    return column_name in columns
+
+
+def upgrade() -> None:
+    """创建 stats_daily_model 表，重命名 provider_model_aliases 为 provider_model_mappings"""
+    # 1. 创建 stats_daily_model 表
+    if not table_exists('stats_daily_model'):
+        op.create_table(
+            'stats_daily_model',
+            sa.Column('id', sa.String(36), primary_key=True),
+            sa.Column('date', sa.DateTime(timezone=True), nullable=False),
+            sa.Column('model', sa.String(100), nullable=False),
+            sa.Column('total_requests', sa.Integer(), nullable=False, default=0),
+            sa.Column('input_tokens', sa.BigInteger(), nullable=False, default=0),
+            sa.Column('output_tokens', sa.BigInteger(), nullable=False, default=0),
+            sa.Column('cache_creation_tokens', sa.BigInteger(), nullable=False, default=0),
+            sa.Column('cache_read_tokens', sa.BigInteger(), nullable=False, default=0),
+            sa.Column('total_cost', sa.Float(), nullable=False, default=0.0),
+            sa.Column('avg_response_time_ms', sa.Float(), nullable=False, default=0.0),
+            sa.Column('created_at', sa.DateTime(timezone=True), nullable=False,
+                      server_default=sa.func.now()),
+            sa.Column('updated_at', sa.DateTime(timezone=True), nullable=False,
+                      server_default=sa.func.now(), onupdate=sa.func.now()),
+            sa.UniqueConstraint('date', 'model', name='uq_stats_daily_model'),
+        )
+
+        # 创建索引
+        op.create_index('idx_stats_daily_model_date', 'stats_daily_model', ['date'])
+        op.create_index('idx_stats_daily_model_date_model', 'stats_daily_model', ['date', 'model'])
+
+    # 2. 重命名 models 表的 provider_model_aliases 为 provider_model_mappings
+    if column_exists('models', 'provider_model_aliases') and not column_exists('models', 'provider_model_mappings'):
+        op.alter_column('models', 'provider_model_aliases', new_column_name='provider_model_mappings')
+
+
+def index_exists(table_name: str, index_name: str) -> bool:
+    """检查索引是否存在"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    indexes = [idx['name'] for idx in inspector.get_indexes(table_name)]
+    return index_name in indexes
+
+
+def downgrade() -> None:
+    """删除 stats_daily_model 表，恢复 provider_model_aliases 列名"""
+    # 恢复列名
+    if column_exists('models', 'provider_model_mappings') and not column_exists('models', 'provider_model_aliases'):
+        op.alter_column('models', 'provider_model_mappings', new_column_name='provider_model_aliases')
+
+    # 删除表
+    if table_exists('stats_daily_model'):
+        if index_exists('stats_daily_model', 'idx_stats_daily_model_date_model'):
+            op.drop_index('idx_stats_daily_model_date_model', table_name='stats_daily_model')
+        if index_exists('stats_daily_model', 'idx_stats_daily_model_date'):
+            op.drop_index('idx_stats_daily_model_date', table_name='stats_daily_model')
+        op.drop_table('stats_daily_model')

alembic/versions/20251220_1500_add_usage_composite_indexes.py

@@ -0,0 +1,65 @@
+"""add usage table composite indexes for query optimization
+
+Revision ID: b2c3d4e5f6g7
+Revises: a1b2c3d4e5f6
+Create Date: 2025-12-20 15:00:00.000000+00:00
+
+"""
+from alembic import op
+from sqlalchemy import text
+
+# revision identifiers, used by Alembic.
+revision = 'b2c3d4e5f6g7'
+down_revision = 'a1b2c3d4e5f6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """为 usage 表添加复合索引以优化常见查询
+
+    注意：这些索引已经在 baseline 迁移中创建。
+    此迁移仅用于从旧版本升级的场景，新安装会跳过。
+    """
+    conn = op.get_bind()
+
+    # 检查 usage 表是否存在
+    result = conn.execute(text(
+        "SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = 'usage')"
+    ))
+    if not result.scalar():
+        # 表不存在，跳过
+        return
+
+    # 定义需要创建的索引
+    indexes = [
+        ("idx_usage_user_created", "ON usage (user_id, created_at)"),
+        ("idx_usage_apikey_created", "ON usage (api_key_id, created_at)"),
+        ("idx_usage_provider_model_created", "ON usage (provider, model, created_at)"),
+    ]
+
+    # 分别检查并创建每个索引
+    for index_name, index_def in indexes:
+        result = conn.execute(text(
+            f"SELECT EXISTS (SELECT 1 FROM pg_indexes WHERE indexname = '{index_name}')"
+        ))
+        if result.scalar():
+            continue  # 索引已存在，跳过
+
+        conn.execute(text(f"CREATE INDEX {index_name} {index_def}"))
+
+
+def downgrade() -> None:
+    """删除复合索引"""
+    conn = op.get_bind()
+
+    # 使用 IF EXISTS 避免索引不存在时报错
+    conn.execute(text(
+        "DROP INDEX IF EXISTS idx_usage_provider_model_created"
+    ))
+    conn.execute(text(
+        "DROP INDEX IF EXISTS idx_usage_apikey_created"
+    ))
+    conn.execute(text(
+        "DROP INDEX IF EXISTS idx_usage_user_created"
+    ))

alembic/versions/20260101_1400_add_ldap_authentication_support.py

@@ -0,0 +1,161 @@
+"""add ldap authentication support
+
+Revision ID: c3d4e5f6g7h8
+Revises: b2c3d4e5f6g7
+Create Date: 2026-01-01 14:00:00.000000+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import text
+
+# revision identifiers, used by Alembic.
+revision = 'c3d4e5f6g7h8'
+down_revision = 'b2c3d4e5f6g7'
+branch_labels = None
+depends_on = None
+
+
+def _type_exists(conn, type_name: str) -> bool:
+    """检查 PostgreSQL 类型是否存在"""
+    result = conn.execute(
+        text("SELECT 1 FROM pg_type WHERE typname = :name"),
+        {"name": type_name}
+    )
+    return result.scalar() is not None
+
+
+def _column_exists(conn, table_name: str, column_name: str) -> bool:
+    """检查列是否存在"""
+    result = conn.execute(
+        text("""
+            SELECT 1 FROM information_schema.columns
+            WHERE table_name = :table AND column_name = :column
+        """),
+        {"table": table_name, "column": column_name}
+    )
+    return result.scalar() is not None
+
+
+def _index_exists(conn, index_name: str) -> bool:
+    """检查索引是否存在"""
+    result = conn.execute(
+        text("SELECT 1 FROM pg_indexes WHERE indexname = :name"),
+        {"name": index_name}
+    )
+    return result.scalar() is not None
+
+
+def _table_exists(conn, table_name: str) -> bool:
+    """检查表是否存在"""
+    result = conn.execute(
+        text("""
+            SELECT 1 FROM information_schema.tables
+            WHERE table_name = :name AND table_schema = 'public'
+        """),
+        {"name": table_name}
+    )
+    return result.scalar() is not None
+
+
+def upgrade() -> None:
+    """添加 LDAP 认证支持
+
+    1. 创建 authsource 枚举类型
+    2. 在 users 表添加 auth_source 字段和 LDAP 标识字段
+    3. 创建 ldap_configs 表
+    """
+    conn = op.get_bind()
+
+    # 1. 创建 authsource 枚举类型（幂等）
+    if not _type_exists(conn, 'authsource'):
+        conn.execute(text("CREATE TYPE authsource AS ENUM ('local', 'ldap')"))
+
+    # 2. 在 users 表添加字段（幂等）
+    if not _column_exists(conn, 'users', 'auth_source'):
+        op.add_column('users', sa.Column(
+            'auth_source',
+            sa.Enum('local', 'ldap', name='authsource', create_type=False),
+            nullable=False,
+            server_default='local'
+        ))
+
+    if not _column_exists(conn, 'users', 'ldap_dn'):
+        op.add_column('users', sa.Column('ldap_dn', sa.String(length=512), nullable=True))
+
+    if not _column_exists(conn, 'users', 'ldap_username'):
+        op.add_column('users', sa.Column('ldap_username', sa.String(length=255), nullable=True))
+
+    # 创建索引（幂等）
+    if not _index_exists(conn, 'ix_users_ldap_dn'):
+        op.create_index('ix_users_ldap_dn', 'users', ['ldap_dn'])
+
+    if not _index_exists(conn, 'ix_users_ldap_username'):
+        op.create_index('ix_users_ldap_username', 'users', ['ldap_username'])
+
+    # 3. 创建 ldap_configs 表（幂等）
+    if not _table_exists(conn, 'ldap_configs'):
+        op.create_table(
+            'ldap_configs',
+            sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+            sa.Column('server_url', sa.String(length=255), nullable=False),
+            sa.Column('bind_dn', sa.String(length=255), nullable=False),
+            sa.Column('bind_password_encrypted', sa.Text(), nullable=True),
+            sa.Column('base_dn', sa.String(length=255), nullable=False),
+            sa.Column('user_search_filter', sa.String(length=500), nullable=False, server_default='(uid={username})'),
+            sa.Column('username_attr', sa.String(length=50), nullable=False, server_default='uid'),
+            sa.Column('email_attr', sa.String(length=50), nullable=False, server_default='mail'),
+            sa.Column('display_name_attr', sa.String(length=50), nullable=False, server_default='cn'),
+            sa.Column('is_enabled', sa.Boolean(), nullable=False, server_default='false'),
+            sa.Column('is_exclusive', sa.Boolean(), nullable=False, server_default='false'),
+            sa.Column('use_starttls', sa.Boolean(), nullable=False, server_default='false'),
+            sa.Column('connect_timeout', sa.Integer(), nullable=False, server_default='10'),
+            sa.Column('created_at', sa.DateTime(timezone=True), nullable=False, server_default=sa.text('now()')),
+            sa.Column('updated_at', sa.DateTime(timezone=True), nullable=False, server_default=sa.text('now()')),
+            sa.PrimaryKeyConstraint('id')
+        )
+
+
+def downgrade() -> None:
+    """回滚 LDAP 认证支持
+
+    警告：回滚前请确保：
+    1. 已备份数据库
+    2. 没有 LDAP 用户需要保留
+    """
+    conn = op.get_bind()
+
+    # 检查是否存在 LDAP 用户，防止数据丢失
+    if _column_exists(conn, 'users', 'auth_source'):
+        result = conn.execute(text("SELECT COUNT(*) FROM users WHERE auth_source = 'ldap'"))
+        ldap_user_count = result.scalar()
+        if ldap_user_count and ldap_user_count > 0:
+            raise RuntimeError(
+                f"无法回滚：存在 {ldap_user_count} 个 LDAP 用户。"
+                f"请先删除或转换这些用户，或使用 --force 参数强制回滚（将丢失数据）。"
+            )
+
+    # 1. 删除 ldap_configs 表（幂等）
+    if _table_exists(conn, 'ldap_configs'):
+        op.drop_table('ldap_configs')
+
+    # 2. 删除 users 表的 LDAP 相关字段（幂等）
+    if _index_exists(conn, 'ix_users_ldap_username'):
+        op.drop_index('ix_users_ldap_username', table_name='users')
+
+    if _index_exists(conn, 'ix_users_ldap_dn'):
+        op.drop_index('ix_users_ldap_dn', table_name='users')
+
+    if _column_exists(conn, 'users', 'ldap_username'):
+        op.drop_column('users', 'ldap_username')
+
+    if _column_exists(conn, 'users', 'ldap_dn'):
+        op.drop_column('users', 'ldap_dn')
+
+    if _column_exists(conn, 'users', 'auth_source'):
+        op.drop_column('users', 'auth_source')
+
+    # 3. 删除 authsource 枚举类型（幂等）
+    # 注意：不使用 CASCADE，因为此时所有依赖应该已被删除
+    if _type_exists(conn, 'authsource'):
+        conn.execute(text("DROP TYPE authsource"))

alembic/versions/20260106_1524_ad55f1d008b7_add_management_tokens_table.py

@@ -0,0 +1,131 @@
+"""add_management_tokens_table
+
+Revision ID: ad55f1d008b7
+Revises: c3d4e5f6g7h8
+Create Date: 2026-01-06 15:24:10.660394+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import inspect
+
+# revision identifiers, used by Alembic.
+revision = 'ad55f1d008b7'
+down_revision = 'c3d4e5f6g7h8'
+branch_labels = None
+depends_on = None
+
+
+def table_exists(table_name: str) -> bool:
+    """检查表是否存在"""
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    return table_name in inspector.get_table_names()
+
+
+def index_exists(table_name: str, index_name: str) -> bool:
+    """检查索引是否存在"""
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    try:
+        indexes = inspector.get_indexes(table_name)
+        return any(idx["name"] == index_name for idx in indexes)
+    except Exception:
+        return False
+
+
+def constraint_exists(table_name: str, constraint_name: str) -> bool:
+    """检查约束是否存在"""
+    conn = op.get_bind()
+    inspector = inspect(conn)
+    try:
+        constraints = inspector.get_unique_constraints(table_name)
+        if any(c["name"] == constraint_name for c in constraints):
+            return True
+        # 也检查 check 约束
+        check_constraints = inspector.get_check_constraints(table_name)
+        if any(c["name"] == constraint_name for c in check_constraints):
+            return True
+        return False
+    except Exception:
+        return False
+
+
+def upgrade() -> None:
+    """应用迁移：创建 management_tokens 表"""
+    # 幂等性检查
+    if table_exists("management_tokens"):
+        # 表已存在，检查是否需要添加约束
+        if not constraint_exists("management_tokens", "uq_management_tokens_user_name"):
+            op.create_unique_constraint(
+                "uq_management_tokens_user_name",
+                "management_tokens",
+                ["user_id", "name"],
+            )
+        # 添加 IP 白名单非空检查约束
+        if not constraint_exists("management_tokens", "check_allowed_ips_not_empty"):
+            op.create_check_constraint(
+                "check_allowed_ips_not_empty",
+                "management_tokens",
+                "allowed_ips IS NULL OR allowed_ips::text = 'null' OR json_array_length(allowed_ips) > 0",
+            )
+        return
+
+    op.create_table('management_tokens',
+        sa.Column('id', sa.String(length=36), nullable=False),
+        sa.Column('user_id', sa.String(length=36), nullable=False),
+        sa.Column('token_hash', sa.String(length=64), nullable=False),
+        sa.Column('token_prefix', sa.String(length=12), nullable=True),
+        sa.Column('name', sa.String(length=100), nullable=False),
+        sa.Column('description', sa.Text(), nullable=True),
+        sa.Column('allowed_ips', sa.JSON(), nullable=True),
+        sa.Column('expires_at', sa.DateTime(timezone=True), nullable=True),
+        sa.Column('last_used_at', sa.DateTime(timezone=True), nullable=True),
+        sa.Column('last_used_ip', sa.String(length=45), nullable=True),
+        sa.Column('usage_count', sa.Integer(), server_default='0', nullable=False),
+        sa.Column('is_active', sa.Boolean(), server_default='true', nullable=False),
+        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index('idx_management_tokens_is_active', 'management_tokens', ['is_active'], unique=False)
+    op.create_index('idx_management_tokens_user_id', 'management_tokens', ['user_id'], unique=False)
+    op.create_index(op.f('ix_management_tokens_token_hash'), 'management_tokens', ['token_hash'], unique=True)
+    # 添加用户名称唯一约束
+    op.create_unique_constraint(
+        "uq_management_tokens_user_name",
+        "management_tokens",
+        ["user_id", "name"],
+    )
+    # 添加 IP 白名单非空检查约束
+    # 注意：JSON 类型的 NULL 可能被序列化为 JSON 'null'，需要同时处理
+    op.create_check_constraint(
+        "check_allowed_ips_not_empty",
+        "management_tokens",
+        "allowed_ips IS NULL OR allowed_ips::text = 'null' OR json_array_length(allowed_ips) > 0",
+    )
+
+
+def downgrade() -> None:
+    """回滚迁移：删除 management_tokens 表"""
+    # 幂等性检查
+    if not table_exists("management_tokens"):
+        return
+
+    # 删除约束
+    if constraint_exists("management_tokens", "check_allowed_ips_not_empty"):
+        op.drop_constraint("check_allowed_ips_not_empty", "management_tokens", type_="check")
+    if constraint_exists("management_tokens", "uq_management_tokens_user_name"):
+        op.drop_constraint("uq_management_tokens_user_name", "management_tokens", type_="unique")
+
+    # 删除索引
+    if index_exists("management_tokens", "ix_management_tokens_token_hash"):
+        op.drop_index(op.f('ix_management_tokens_token_hash'), table_name='management_tokens')
+    if index_exists("management_tokens", "idx_management_tokens_user_id"):
+        op.drop_index('idx_management_tokens_user_id', table_name='management_tokens')
+    if index_exists("management_tokens", "idx_management_tokens_is_active"):
+        op.drop_index('idx_management_tokens_is_active', table_name='management_tokens')
+
+    # 删除表
+    op.drop_table('management_tokens')

alembic/versions/20260107_1120_02a45b66b7c4_cleanup_allowed_endpoints_fields.py

@@ -0,0 +1,73 @@
+"""cleanup ambiguous database fields
+
+Revision ID: 02a45b66b7c4
+Revises: ad55f1d008b7
+Create Date: 2026-01-07 11:20:12.684426+00:00
+
+变更内容：
+1. users 表：重命名 allowed_endpoints 为 allowed_api_formats（修正历史命名错误）
+2. api_keys 表：删除 allowed_endpoints 字段（未使用的功能）
+3. providers 表：删除 rate_limit 字段（与 rpm_limit 功能重复，且未使用）
+4. usage 表：重命名 provider 为 provider_name（避免与 provider_id 外键混淆）
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import inspect
+
+
+# revision identifiers, used by Alembic.
+revision = '02a45b66b7c4'
+down_revision = 'ad55f1d008b7'
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table_name: str, column_name: str) -> bool:
+    """检查列是否存在"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    columns = [col['name'] for col in inspector.get_columns(table_name)]
+    return column_name in columns
+
+
+def upgrade() -> None:
+    """
+    1. users.allowed_endpoints -> allowed_api_formats（重命名）
+    2. api_keys.allowed_endpoints 删除
+    3. providers.rate_limit 删除（与 rpm_limit 重复）
+    4. usage.provider -> provider_name（重命名）
+    """
+    # 1. users 表：重命名 allowed_endpoints 为 allowed_api_formats
+    if _column_exists('users', 'allowed_endpoints'):
+        op.alter_column('users', 'allowed_endpoints', new_column_name='allowed_api_formats')
+
+    # 2. api_keys 表：删除 allowed_endpoints 字段
+    if _column_exists('api_keys', 'allowed_endpoints'):
+        op.drop_column('api_keys', 'allowed_endpoints')
+
+    # 3. providers 表：删除 rate_limit 字段（与 rpm_limit 功能重复）
+    if _column_exists('providers', 'rate_limit'):
+        op.drop_column('providers', 'rate_limit')
+
+    # 4. usage 表：重命名 provider 为 provider_name
+    if _column_exists('usage', 'provider'):
+        op.alter_column('usage', 'provider', new_column_name='provider_name')
+
+
+def downgrade() -> None:
+    """回滚：恢复原字段"""
+    # 4. usage 表：将 provider_name 改回 provider
+    if _column_exists('usage', 'provider_name'):
+        op.alter_column('usage', 'provider_name', new_column_name='provider')
+
+    # 3. providers 表：恢复 rate_limit 字段
+    if not _column_exists('providers', 'rate_limit'):
+        op.add_column('providers', sa.Column('rate_limit', sa.Integer(), nullable=True))
+
+    # 2. api_keys 表：恢复 allowed_endpoints 字段
+    if not _column_exists('api_keys', 'allowed_endpoints'):
+        op.add_column('api_keys', sa.Column('allowed_endpoints', sa.JSON(), nullable=True))
+
+    # 1. users 表：将 allowed_api_formats 改回 allowed_endpoints
+    if _column_exists('users', 'allowed_api_formats'):
+        op.alter_column('users', 'allowed_api_formats', new_column_name='allowed_endpoints')

alembic/versions/20260110_2000_consolidated_schema_updates.py

@@ -0,0 +1,530 @@
+"""consolidated schema updates
+
+Revision ID: m4n5o6p7q8r9
+Revises: 02a45b66b7c4
+Create Date: 2026-01-10 20:00:00.000000
+
+This migration consolidates all schema changes from 2026-01-08 to 2026-01-10:
+
+1. provider_api_keys: Key 直接关联 Provider (provider_id, api_formats)
+2. provider_api_keys: 添加 rate_multipliers JSON 字段（按格式费率）
+3. models: global_model_id 改为可空（支持独立 ProviderModel）
+4. providers: 添加 timeout, max_retries, proxy（从 endpoint 迁移）
+5. providers: display_name 重命名为 name，删除原 name
+6. provider_api_keys: max_concurrent -> rpm_limit（并发改 RPM）
+7. provider_api_keys: 健康度改为按格式存储（health_by_format, circuit_breaker_by_format）
+8. provider_endpoints: 删除废弃的 rate_limit 列
+9. usage: 添加 client_response_headers 字段
+10. provider_api_keys: 删除 endpoint_id（Key 不再与 Endpoint 绑定）
+11. provider_endpoints: 删除废弃的 max_concurrent 列
+12. providers: 删除废弃的 rpm_limit, rpm_used, rpm_reset_at 列
+"""
+
+import logging
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+from sqlalchemy import inspect
+
+
+# 配置日志
+alembic_logger = logging.getLogger("alembic.runtime.migration")
+
+revision = "m4n5o6p7q8r9"
+down_revision = "02a45b66b7c4"
+branch_labels = None
+depends_on = None
+
+
+def _column_exists(table_name: str, column_name: str) -> bool:
+    """Check if a column exists in the table"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    columns = [col["name"] for col in inspector.get_columns(table_name)]
+    return column_name in columns
+
+
+def _constraint_exists(table_name: str, constraint_name: str) -> bool:
+    """Check if a constraint exists"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    fks = inspector.get_foreign_keys(table_name)
+    return any(fk.get("name") == constraint_name for fk in fks)
+
+
+def _index_exists(table_name: str, index_name: str) -> bool:
+    """Check if an index exists"""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    indexes = inspector.get_indexes(table_name)
+    return any(idx.get("name") == index_name for idx in indexes)
+
+
+def upgrade() -> None:
+    """Apply all consolidated schema changes"""
+    bind = op.get_bind()
+
+    # ========== 1. provider_api_keys: 添加 provider_id 和 api_formats ==========
+    if not _column_exists("provider_api_keys", "provider_id"):
+        op.add_column("provider_api_keys", sa.Column("provider_id", sa.String(36), nullable=True))
+
+        # 数据迁移：从 endpoint 获取 provider_id
+        op.execute("""
+            UPDATE provider_api_keys k
+            SET provider_id = e.provider_id
+            FROM provider_endpoints e
+            WHERE k.endpoint_id = e.id AND k.provider_id IS NULL
+        """)
+
+        # 检查无法关联的孤儿 Key
+        result = bind.execute(sa.text(
+            "SELECT COUNT(*) FROM provider_api_keys WHERE provider_id IS NULL"
+        ))
+        orphan_count = result.scalar() or 0
+        if orphan_count > 0:
+            # 使用 logger 记录更明显的告警
+            alembic_logger.warning("=" * 60)
+            alembic_logger.warning(f"[MIGRATION WARNING] 发现 {orphan_count} 个无法关联 Provider 的孤儿 Key")
+            alembic_logger.warning("=" * 60)
+            alembic_logger.info("正在备份孤儿 Key 到 _orphan_api_keys_backup 表...")
+
+            # 先备份孤儿数据到临时表，避免数据丢失
+            op.execute("""
+                CREATE TABLE IF NOT EXISTS _orphan_api_keys_backup AS
+                SELECT *, NOW() as backup_at
+                FROM provider_api_keys
+                WHERE provider_id IS NULL
+            """)
+
+            # 记录备份的 Key ID
+            orphan_ids = bind.execute(sa.text(
+                "SELECT id, name FROM provider_api_keys WHERE provider_id IS NULL"
+            )).fetchall()
+            alembic_logger.info("备份的孤儿 Key 列表：")
+            for key_id, key_name in orphan_ids:
+                alembic_logger.info(f"  - Key: {key_name} (ID: {key_id})")
+
+            # 删除孤儿数据
+            op.execute("DELETE FROM provider_api_keys WHERE provider_id IS NULL")
+            alembic_logger.info(f"已备份并删除 {orphan_count} 个孤儿 Key")
+
+            # 提供恢复指南
+            alembic_logger.warning("-" * 60)
+            alembic_logger.warning("[恢复指南] 如需恢复孤儿 Key：")
+            alembic_logger.warning("  1. 查询备份表: SELECT * FROM _orphan_api_keys_backup;")
+            alembic_logger.warning("  2. 确定正确的 provider_id")
+            alembic_logger.warning("  3. 执行恢复:")
+            alembic_logger.warning("     INSERT INTO provider_api_keys (...)")
+            alembic_logger.warning("     SELECT ... FROM _orphan_api_keys_backup WHERE ...;")
+            alembic_logger.warning("-" * 60)
+
+        # 设置 NOT NULL 并创建外键
+        op.alter_column("provider_api_keys", "provider_id", nullable=False)
+
+        if not _constraint_exists("provider_api_keys", "fk_provider_api_keys_provider"):
+            op.create_foreign_key(
+                "fk_provider_api_keys_provider",
+                "provider_api_keys",
+                "providers",
+                ["provider_id"],
+                ["id"],
+                ondelete="CASCADE",
+            )
+
+        if not _index_exists("provider_api_keys", "idx_provider_api_keys_provider_id"):
+            op.create_index("idx_provider_api_keys_provider_id", "provider_api_keys", ["provider_id"])
+
+    if not _column_exists("provider_api_keys", "api_formats"):
+        op.add_column("provider_api_keys", sa.Column("api_formats", sa.JSON(), nullable=True))
+
+        # 数据迁移：从 endpoint 获取 api_format
+        op.execute("""
+            UPDATE provider_api_keys k
+            SET api_formats = json_build_array(e.api_format)
+            FROM provider_endpoints e
+            WHERE k.endpoint_id = e.id AND k.api_formats IS NULL
+        """)
+
+        op.alter_column("provider_api_keys", "api_formats", nullable=False, server_default="[]")
+
+    # 修改 endpoint_id 为可空，外键改为 SET NULL
+    if _constraint_exists("provider_api_keys", "provider_api_keys_endpoint_id_fkey"):
+        op.drop_constraint("provider_api_keys_endpoint_id_fkey", "provider_api_keys", type_="foreignkey")
+        op.alter_column("provider_api_keys", "endpoint_id", nullable=True)
+        # 不再重建外键，因为后面会删除这个字段
+
+    # ========== 2. provider_api_keys: 添加 rate_multipliers ==========
+    if not _column_exists("provider_api_keys", "rate_multipliers"):
+        op.add_column(
+            "provider_api_keys",
+            sa.Column("rate_multipliers", postgresql.JSON(astext_type=sa.Text()), nullable=True),
+        )
+
+        # 数据迁移：将 rate_multiplier 按 api_formats 转换
+        op.execute("""
+            UPDATE provider_api_keys
+            SET rate_multipliers = (
+                SELECT jsonb_object_agg(elem, rate_multiplier)
+                FROM jsonb_array_elements_text(api_formats::jsonb) AS elem
+            )
+            WHERE api_formats IS NOT NULL
+              AND api_formats::text != '[]'
+              AND api_formats::text != 'null'
+              AND rate_multipliers IS NULL
+        """)
+
+    # ========== 3. models: global_model_id 改为可空 ==========
+    op.alter_column("models", "global_model_id", existing_type=sa.String(36), nullable=True)
+
+    # ========== 4. providers: 添加 timeout, max_retries, proxy ==========
+    if not _column_exists("providers", "timeout"):
+        op.add_column(
+            "providers",
+            sa.Column("timeout", sa.Integer(), nullable=True, comment="请求超时（秒）"),
+        )
+
+    if not _column_exists("providers", "max_retries"):
+        op.add_column(
+            "providers",
+            sa.Column("max_retries", sa.Integer(), nullable=True, comment="最大重试次数"),
+        )
+
+    if not _column_exists("providers", "proxy"):
+        op.add_column(
+            "providers",
+            sa.Column("proxy", postgresql.JSONB(), nullable=True, comment="代理配置"),
+        )
+
+    # 从端点迁移数据到 provider
+    op.execute("""
+        UPDATE providers p
+        SET
+            timeout = COALESCE(
+                p.timeout,
+                (SELECT MAX(e.timeout) FROM provider_endpoints e WHERE e.provider_id = p.id AND e.timeout IS NOT NULL),
+                300
+            ),
+            max_retries = COALESCE(
+                p.max_retries,
+                (SELECT MAX(e.max_retries) FROM provider_endpoints e WHERE e.provider_id = p.id AND e.max_retries IS NOT NULL),
+                2
+            ),
+            proxy = COALESCE(
+                p.proxy,
+                (SELECT e.proxy FROM provider_endpoints e WHERE e.provider_id = p.id AND e.proxy IS NOT NULL ORDER BY e.created_at LIMIT 1)
+            )
+        WHERE p.timeout IS NULL OR p.max_retries IS NULL
+    """)
+
+    # ========== 5. providers: display_name -> name ==========
+    # 注意：这里假设 display_name 已经被重命名为 name
+    # 如果 display_name 仍然存在，则需要执行重命名
+    if _column_exists("providers", "display_name"):
+        # 删除旧的 name 索引
+        if _index_exists("providers", "ix_providers_name"):
+            op.drop_index("ix_providers_name", table_name="providers")
+
+        # 如果存在旧的 name 列，先删除
+        if _column_exists("providers", "name"):
+            op.drop_column("providers", "name")
+
+        # 重命名 display_name 为 name
+        op.alter_column("providers", "display_name", new_column_name="name")
+
+        # 创建新索引
+        op.create_index("ix_providers_name", "providers", ["name"], unique=True)
+
+    # ========== 6. provider_api_keys: max_concurrent -> rpm_limit ==========
+    if _column_exists("provider_api_keys", "max_concurrent"):
+        op.alter_column("provider_api_keys", "max_concurrent", new_column_name="rpm_limit")
+
+    if _column_exists("provider_api_keys", "learned_max_concurrent"):
+        op.alter_column("provider_api_keys", "learned_max_concurrent", new_column_name="learned_rpm_limit")
+
+    if _column_exists("provider_api_keys", "last_concurrent_peak"):
+        op.alter_column("provider_api_keys", "last_concurrent_peak", new_column_name="last_rpm_peak")
+
+    # 删除废弃字段
+    for col in ["rate_limit", "daily_limit", "monthly_limit"]:
+        if _column_exists("provider_api_keys", col):
+            op.drop_column("provider_api_keys", col)
+
+    # ========== 7. provider_api_keys: 健康度改为按格式存储 ==========
+    if not _column_exists("provider_api_keys", "health_by_format"):
+        op.add_column(
+            "provider_api_keys",
+            sa.Column(
+                "health_by_format",
+                postgresql.JSONB(astext_type=sa.Text()),
+                nullable=True,
+                comment="按API格式存储的健康度数据",
+            ),
+        )
+
+    if not _column_exists("provider_api_keys", "circuit_breaker_by_format"):
+        op.add_column(
+            "provider_api_keys",
+            sa.Column(
+                "circuit_breaker_by_format",
+                postgresql.JSONB(astext_type=sa.Text()),
+                nullable=True,
+                comment="按API格式存储的熔断器状态",
+            ),
+        )
+
+    # 数据迁移：如果存在旧字段，迁移数据到新结构
+    if _column_exists("provider_api_keys", "health_score"):
+        op.execute("""
+            UPDATE provider_api_keys
+            SET health_by_format = (
+                SELECT jsonb_object_agg(
+                    elem,
+                    jsonb_build_object(
+                        'health_score', COALESCE(health_score, 1.0),
+                        'consecutive_failures', COALESCE(consecutive_failures, 0),
+                        'last_failure_at', last_failure_at,
+                        'request_results_window', COALESCE(request_results_window::jsonb, '[]'::jsonb)
+                    )
+                )
+                FROM jsonb_array_elements_text(api_formats::jsonb) AS elem
+            )
+            WHERE api_formats IS NOT NULL
+              AND api_formats::text != '[]'
+              AND health_by_format IS NULL
+        """)
+
+    # Circuit Breaker 迁移策略：
+    # 不复制旧的 circuit_breaker_open 状态到所有 format，而是全部重置为 closed
+    # 原因：旧的单一 circuit breaker 状态可能因某一个 format 失败而打开，
+    #       如果复制到所有 format，会导致其他正常工作的 format 被错误标记为不可用
+    if _column_exists("provider_api_keys", "circuit_breaker_open"):
+        op.execute("""
+            UPDATE provider_api_keys
+            SET circuit_breaker_by_format = (
+                SELECT jsonb_object_agg(
+                    elem,
+                    jsonb_build_object(
+                        'open', false,
+                        'open_at', NULL,
+                        'next_probe_at', NULL,
+                        'half_open_until', NULL,
+                        'half_open_successes', 0,
+                        'half_open_failures', 0
+                    )
+                )
+                FROM jsonb_array_elements_text(api_formats::jsonb) AS elem
+            )
+            WHERE api_formats IS NOT NULL
+              AND api_formats::text != '[]'
+              AND circuit_breaker_by_format IS NULL
+        """)
+
+    # 设置默认空对象
+    op.execute("""
+        UPDATE provider_api_keys
+        SET health_by_format = '{}'::jsonb
+        WHERE health_by_format IS NULL
+    """)
+    op.execute("""
+        UPDATE provider_api_keys
+        SET circuit_breaker_by_format = '{}'::jsonb
+        WHERE circuit_breaker_by_format IS NULL
+    """)
+
+    # 创建 GIN 索引
+    if not _index_exists("provider_api_keys", "ix_provider_api_keys_health_by_format"):
+        op.create_index(
+            "ix_provider_api_keys_health_by_format",
+            "provider_api_keys",
+            ["health_by_format"],
+            postgresql_using="gin",
+        )
+    if not _index_exists("provider_api_keys", "ix_provider_api_keys_circuit_breaker_by_format"):
+        op.create_index(
+            "ix_provider_api_keys_circuit_breaker_by_format",
+            "provider_api_keys",
+            ["circuit_breaker_by_format"],
+            postgresql_using="gin",
+        )
+
+    # 删除旧字段
+    old_health_columns = [
+        "health_score",
+        "consecutive_failures",
+        "last_failure_at",
+        "request_results_window",
+        "circuit_breaker_open",
+        "circuit_breaker_open_at",
+        "next_probe_at",
+        "half_open_until",
+        "half_open_successes",
+        "half_open_failures",
+    ]
+    for col in old_health_columns:
+        if _column_exists("provider_api_keys", col):
+            op.drop_column("provider_api_keys", col)
+
+    # ========== 8. provider_endpoints: 删除废弃的 rate_limit 列 ==========
+    if _column_exists("provider_endpoints", "rate_limit"):
+        op.drop_column("provider_endpoints", "rate_limit")
+
+    # ========== 9. usage: 添加 client_response_headers ==========
+    if not _column_exists("usage", "client_response_headers"):
+        op.add_column(
+            "usage",
+            sa.Column("client_response_headers", sa.JSON(), nullable=True),
+        )
+
+    # ========== 10. provider_api_keys: 删除 endpoint_id ==========
+    # Key 不再与 Endpoint 绑定，通过 provider_id + api_formats 关联
+    if _column_exists("provider_api_keys", "endpoint_id"):
+        # 确保外键已删除（前面可能已经删除）
+        try:
+            bind = op.get_bind()
+            inspector = inspect(bind)
+            for fk in inspector.get_foreign_keys("provider_api_keys"):
+                constrained = fk.get("constrained_columns") or []
+                if "endpoint_id" in constrained:
+                    name = fk.get("name")
+                    if name:
+                        op.drop_constraint(name, "provider_api_keys", type_="foreignkey")
+        except Exception:
+            pass  # 外键可能已经不存在
+        op.drop_column("provider_api_keys", "endpoint_id")
+
+    # ========== 11. provider_endpoints: 删除废弃的 max_concurrent 列 ==========
+    if _column_exists("provider_endpoints", "max_concurrent"):
+        op.drop_column("provider_endpoints", "max_concurrent")
+
+    # ========== 12. providers: 删除废弃的 RPM 相关字段 ==========
+    if _column_exists("providers", "rpm_limit"):
+        op.drop_column("providers", "rpm_limit")
+    if _column_exists("providers", "rpm_used"):
+        op.drop_column("providers", "rpm_used")
+    if _column_exists("providers", "rpm_reset_at"):
+        op.drop_column("providers", "rpm_reset_at")
+
+    alembic_logger.info("[OK] Consolidated migration completed successfully")
+
+
+def downgrade() -> None:
+    """
+    Downgrade is complex due to data migrations.
+    For safety, this only removes new columns without restoring old structure.
+    Manual intervention may be required for full rollback.
+    """
+    bind = op.get_bind()
+
+    # 12. 恢复 providers RPM 相关字段
+    if not _column_exists("providers", "rpm_limit"):
+        op.add_column("providers", sa.Column("rpm_limit", sa.Integer(), nullable=True))
+    if not _column_exists("providers", "rpm_used"):
+        op.add_column(
+            "providers",
+            sa.Column("rpm_used", sa.Integer(), server_default="0", nullable=True),
+        )
+    if not _column_exists("providers", "rpm_reset_at"):
+        op.add_column(
+            "providers",
+            sa.Column("rpm_reset_at", sa.DateTime(timezone=True), nullable=True),
+        )
+
+    # 11. 恢复 provider_endpoints.max_concurrent
+    if not _column_exists("provider_endpoints", "max_concurrent"):
+        op.add_column("provider_endpoints", sa.Column("max_concurrent", sa.Integer(), nullable=True))
+
+    # 10. 恢复 endpoint_id
+    if not _column_exists("provider_api_keys", "endpoint_id"):
+        op.add_column("provider_api_keys", sa.Column("endpoint_id", sa.String(36), nullable=True))
+
+    # 9. 删除 client_response_headers
+    if _column_exists("usage", "client_response_headers"):
+        op.drop_column("usage", "client_response_headers")
+
+    # 8. 恢复 provider_endpoints.rate_limit（如果需要）
+    if not _column_exists("provider_endpoints", "rate_limit"):
+        op.add_column("provider_endpoints", sa.Column("rate_limit", sa.Integer(), nullable=True))
+
+    # 7. 删除健康度 JSON 字段
+    bind.execute(sa.text("DROP INDEX IF EXISTS ix_provider_api_keys_health_by_format"))
+    bind.execute(sa.text("DROP INDEX IF EXISTS ix_provider_api_keys_circuit_breaker_by_format"))
+    if _column_exists("provider_api_keys", "health_by_format"):
+        op.drop_column("provider_api_keys", "health_by_format")
+    if _column_exists("provider_api_keys", "circuit_breaker_by_format"):
+        op.drop_column("provider_api_keys", "circuit_breaker_by_format")
+
+    # 6. rpm_limit -> max_concurrent（简化版：仅重命名）
+    if _column_exists("provider_api_keys", "rpm_limit"):
+        op.alter_column("provider_api_keys", "rpm_limit", new_column_name="max_concurrent")
+    if _column_exists("provider_api_keys", "learned_rpm_limit"):
+        op.alter_column("provider_api_keys", "learned_rpm_limit", new_column_name="learned_max_concurrent")
+    if _column_exists("provider_api_keys", "last_rpm_peak"):
+        op.alter_column("provider_api_keys", "last_rpm_peak", new_column_name="last_concurrent_peak")
+
+    # 恢复已删除的字段
+    if not _column_exists("provider_api_keys", "rate_limit"):
+        op.add_column("provider_api_keys", sa.Column("rate_limit", sa.Integer(), nullable=True))
+    if not _column_exists("provider_api_keys", "daily_limit"):
+        op.add_column("provider_api_keys", sa.Column("daily_limit", sa.Integer(), nullable=True))
+    if not _column_exists("provider_api_keys", "monthly_limit"):
+        op.add_column("provider_api_keys", sa.Column("monthly_limit", sa.Integer(), nullable=True))
+
+    # 5. name -> display_name (需要先删除索引)
+    if _index_exists("providers", "ix_providers_name"):
+        op.drop_index("ix_providers_name", table_name="providers")
+    op.alter_column("providers", "name", new_column_name="display_name")
+    # 重新添加原 name 字段
+    op.add_column("providers", sa.Column("name", sa.String(100), nullable=True))
+    op.execute("""
+        UPDATE providers
+        SET name = LOWER(REPLACE(REPLACE(display_name, ' ', '_'), '-', '_'))
+    """)
+    op.alter_column("providers", "name", nullable=False)
+    op.create_index("ix_providers_name", "providers", ["name"], unique=True)
+
+    # 4. 删除 providers 的 timeout, max_retries, proxy
+    if _column_exists("providers", "proxy"):
+        op.drop_column("providers", "proxy")
+    if _column_exists("providers", "max_retries"):
+        op.drop_column("providers", "max_retries")
+    if _column_exists("providers", "timeout"):
+        op.drop_column("providers", "timeout")
+
+    # 3. models: global_model_id 改回 NOT NULL
+    result = bind.execute(sa.text(
+        "SELECT COUNT(*) FROM models WHERE global_model_id IS NULL"
+    ))
+    orphan_model_count = result.scalar() or 0
+    if orphan_model_count > 0:
+        alembic_logger.warning(f"[WARN] 发现 {orphan_model_count} 个无 global_model_id 的独立模型，将被删除")
+        op.execute("DELETE FROM models WHERE global_model_id IS NULL")
+        alembic_logger.info(f"已删除 {orphan_model_count} 个独立模型")
+    op.alter_column("models", "global_model_id", nullable=False)
+
+    # 2. 删除 rate_multipliers
+    if _column_exists("provider_api_keys", "rate_multipliers"):
+        op.drop_column("provider_api_keys", "rate_multipliers")
+
+    # 1. 删除 provider_id 和 api_formats
+    if _index_exists("provider_api_keys", "idx_provider_api_keys_provider_id"):
+        op.drop_index("idx_provider_api_keys_provider_id", table_name="provider_api_keys")
+    if _constraint_exists("provider_api_keys", "fk_provider_api_keys_provider"):
+        op.drop_constraint("fk_provider_api_keys_provider", "provider_api_keys", type_="foreignkey")
+    if _column_exists("provider_api_keys", "api_formats"):
+        op.drop_column("provider_api_keys", "api_formats")
+    if _column_exists("provider_api_keys", "provider_id"):
+        op.drop_column("provider_api_keys", "provider_id")
+
+    # 恢复 endpoint_id 外键（简化版：仅创建外键，不强制 NOT NULL）
+    if _column_exists("provider_api_keys", "endpoint_id"):
+        if not _constraint_exists("provider_api_keys", "provider_api_keys_endpoint_id_fkey"):
+            op.create_foreign_key(
+                "provider_api_keys_endpoint_id_fkey",
+                "provider_api_keys",
+                "provider_endpoints",
+                ["endpoint_id"],
+                ["id"],
+                ondelete="SET NULL",
+            )
+
+    alembic_logger.info("[OK] Downgrade completed (simplified version)")

deploy.sh

@@ -21,15 +21,18 @@ HASH_FILE=".deps-hash"
 CODE_HASH_FILE=".code-hash"
 MIGRATION_HASH_FILE=".migration-hash"
 
-# 计算依赖文件的哈希值
+# 计算依赖文件的哈希值（包含 Dockerfile.base.local）
 calc_deps_hash() {
-    cat pyproject.toml frontend/package.json frontend/package-lock.json 2>/dev/null | md5sum | cut -d' ' -f1
+    cat pyproject.toml frontend/package.json frontend/package-lock.json Dockerfile.base.local 2>/dev/null | md5sum | cut -d' ' -f1
 }
 
-# 计算代码文件的哈希值
+# 计算代码文件的哈希值（包含 Dockerfile.app.local）
 calc_code_hash() {
-    find src -type f -name "*.py" 2>/dev/null | sort | xargs cat 2>/dev/null | md5sum | cut -d' ' -f1
-    find frontend/src -type f \( -name "*.vue" -o -name "*.ts" -o -name "*.tsx" -o -name "*.js" \) 2>/dev/null | sort | xargs cat 2>/dev/null | md5sum | cut -d' ' -f1
+    {
+        cat Dockerfile.app.local 2>/dev/null
+        find src -type f -name "*.py" 2>/dev/null | sort | xargs cat 2>/dev/null
+        find frontend/src -type f \( -name "*.vue" -o -name "*.ts" -o -name "*.tsx" -o -name "*.js" \) 2>/dev/null | sort | xargs cat 2>/dev/null
+    } | md5sum | cut -d' ' -f1
 }
 
 # 计算迁移文件的哈希值
@@ -85,10 +88,29 @@ build_base() {
     save_deps_hash
 }
 
+# 生成版本文件
+generate_version_file() {
+    # 从 git 获取版本号
+    local version
+    version=$(git describe --tags --always 2>/dev/null | sed 's/^v//')
+    if [ -z "$version" ]; then
+        version="unknown"
+    fi
+    echo ">>> Generating version file: $version"
+    cat > src/_version.py << EOF
+# Auto-generated by deploy.sh - do not edit
+__version__ = '$version'
+__version_tuple__ = tuple(int(x) for x in '$version'.split('-')[0].split('.') if x.isdigit())
+version = __version__
+version_tuple = __version_tuple__
+EOF
+}
+
 # 构建应用镜像
 build_app() {
     echo ">>> Building app image (code only)..."
-    docker build -f Dockerfile.app -t aether-app:latest .
+    generate_version_file
+    docker build -f Dockerfile.app.local -t aether-app:latest .
     save_code_hash
 }
 
@@ -162,29 +184,46 @@ git pull
 
 # 标记是否需要重启
 NEED_RESTART=false
+BASE_REBUILT=false
 
 # 检查基础镜像是否存在，或依赖是否变化
 if ! docker image inspect aether-base:latest >/dev/null 2>&1; then
     echo ">>> Base image not found, building..."
     build_base
+    BASE_REBUILT=true
     NEED_RESTART=true
 elif check_deps_changed; then
     echo ">>> Dependencies changed, rebuilding base image..."
     build_base
+    BASE_REBUILT=true
     NEED_RESTART=true
 else
     echo ">>> Dependencies unchanged."
 fi
 
-# 检查代码是否变化
+# 检查代码或迁移是否变化，或者 base 重建了（app 依赖 base）
+# 注意：迁移文件打包在镜像中，所以迁移变化也需要重建 app 镜像
+MIGRATION_CHANGED=false
+if check_migration_changed; then
+    MIGRATION_CHANGED=true
+fi
+
 if ! docker image inspect aether-app:latest >/dev/null 2>&1; then
     echo ">>> App image not found, building..."
     build_app
     NEED_RESTART=true
+elif [ "$BASE_REBUILT" = true ]; then
+    echo ">>> Base image rebuilt, rebuilding app image..."
+    build_app
+    NEED_RESTART=true
 elif check_code_changed; then
     echo ">>> Code changed, rebuilding app image..."
     build_app
     NEED_RESTART=true
+elif [ "$MIGRATION_CHANGED" = true ]; then
+    echo ">>> Migration files changed, rebuilding app image..."
+    build_app
+    NEED_RESTART=true
 else
     echo ">>> Code unchanged."
 fi
@@ -197,9 +236,9 @@ else
     echo ">>> No changes detected, skipping restart."
 fi
 
-# 检查迁移变化
-if check_migration_changed; then
-    echo ">>> Migration files changed, running database migration..."
+# 检查迁移变化（如果前面已经检测到变化并重建了镜像，这里直接运行迁移）
+if [ "$MIGRATION_CHANGED" = true ]; then
+    echo ">>> Running database migration..."
     sleep 3
     run_migration
 else

dev.sh

@@ -8,7 +8,8 @@ source .env
 set +a
 
 # 构建 DATABASE_URL
-export DATABASE_URL="postgresql://postgres:${DB_PASSWORD}@localhost:5432/aether"
+export DATABASE_URL="postgresql://${DB_USER:-postgres}:${DB_PASSWORD}@${DB_HOST:-localhost}:${DB_PORT:-5432}/${DB_NAME:-aether}"
+export REDIS_URL=redis://:${REDIS_PASSWORD}@${REDIS_HOST:-localhost}:${REDIS_PORT:-6379}/0
 
 # 启动 uvicorn（热重载模式）
 echo "🚀 启动本地开发服务器..."

docker-compose.build.yml

@@ -1,7 +1,7 @@
 # Aether 部署配置 - 本地构建
 # 使用方法:
 #   首次构建 base: docker build -f Dockerfile.base -t aether-base:latest .
-#   启动服务: docker-compose -f docker-compose.build.yml up -d --build
+#   启动服务: docker compose -f docker-compose.build.yml up -d --build
 
 services:
   postgres:
@@ -17,7 +17,7 @@ services:
     ports:
       - "${DB_PORT:-5432}:5432"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -32,7 +32,7 @@ services:
     ports:
       - "${REDIS_PORT:-6379}:6379"
     healthcheck:
-      test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
       interval: 5s
       timeout: 3s
       retries: 5
@@ -41,23 +41,18 @@ services:
   app:
     build:
       context: .
-      dockerfile: Dockerfile.app
+      dockerfile: Dockerfile.app.local
     image: aether-app:latest
     container_name: aether-app
+    env_file:
+      - .env
     environment:
+      # 需要组合的变量
       DATABASE_URL: postgresql://postgres:${DB_PASSWORD}@postgres:5432/aether
       REDIS_URL: redis://:${REDIS_PASSWORD}@redis:6379/0
-      PORT: 8084
-      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
-      ENCRYPTION_KEY: ${ENCRYPTION_KEY}
-      JWT_ALGORITHM: HS256
-      JWT_EXPIRATION_DELTA: 86400
-      LOG_LEVEL: ${LOG_LEVEL:-INFO}
-      ADMIN_EMAIL: ${ADMIN_EMAIL}
-      ADMIN_USERNAME: ${ADMIN_USERNAME}
-      ADMIN_PASSWORD: ${ADMIN_PASSWORD}
-      API_KEY_PREFIX: ${API_KEY_PREFIX:-sk}
+      # Supervisor 需要的变量
       GUNICORN_WORKERS: ${GUNICORN_WORKERS:-4}
+      # 容器级别设置
       TZ: Asia/Shanghai
       PYTHONIOENCODING: utf-8
       LANG: C.UTF-8

docker-compose.yml

@@ -1,5 +1,5 @@
 # Aether 部署配置 - 使用预构建镜像
-# 使用方法: docker-compose up -d
+# 使用方法: docker compose up -d
 
 services:
   postgres:
@@ -12,10 +12,8 @@ services:
       TZ: Asia/Shanghai
     volumes:
       - postgres_data:/var/lib/postgresql/data
-    ports:
-      - "${DB_PORT:-5432}:5432"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -27,10 +25,8 @@ services:
     command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD}
     volumes:
       - redis_data:/data
-    ports:
-      - "${REDIS_PORT:-6379}:6379"
     healthcheck:
-      test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
       interval: 5s
       timeout: 3s
       retries: 5
@@ -39,20 +35,15 @@ services:
   app:
     image: ghcr.io/fawney19/aether:latest
     container_name: aether-app
+    env_file:
+      - .env
     environment:
+      # 需要组合的变量
       DATABASE_URL: postgresql://postgres:${DB_PASSWORD}@postgres:5432/aether
       REDIS_URL: redis://:${REDIS_PASSWORD}@redis:6379/0
-      PORT: 8084
-      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
-      ENCRYPTION_KEY: ${ENCRYPTION_KEY}
-      JWT_ALGORITHM: HS256
-      JWT_EXPIRATION_DELTA: 86400
-      LOG_LEVEL: ${LOG_LEVEL:-INFO}
-      ADMIN_EMAIL: ${ADMIN_EMAIL}
-      ADMIN_USERNAME: ${ADMIN_USERNAME}
-      ADMIN_PASSWORD: ${ADMIN_PASSWORD}
-      API_KEY_PREFIX: ${API_KEY_PREFIX:-sk}
+      # Supervisor 需要的变量
       GUNICORN_WORKERS: ${GUNICORN_WORKERS:-4}
+      # 容器级别设置
       TZ: Asia/Shanghai
       PYTHONIOENCODING: utf-8
       LANG: C.UTF-8

entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+echo "Running database migrations..."
+alembic upgrade head
+
+echo "Starting application..."
+exec "$@"

frontend/package-lock.json

@@ -262,6 +262,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -305,6 +306,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -316,9 +318,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
-      "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
+      "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==",
       "cpu": [
         "ppc64"
       ],
@@ -333,9 +335,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
-      "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz",
+      "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==",
       "cpu": [
         "arm"
       ],
@@ -350,9 +352,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
-      "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz",
+      "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==",
       "cpu": [
         "arm64"
       ],
@@ -367,9 +369,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
-      "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz",
+      "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==",
       "cpu": [
         "x64"
       ],
@@ -384,9 +386,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
-      "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz",
+      "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==",
       "cpu": [
         "arm64"
       ],
@@ -401,9 +403,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
-      "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz",
+      "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==",
       "cpu": [
         "x64"
       ],
@@ -418,9 +420,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==",
       "cpu": [
         "arm64"
       ],
@@ -435,9 +437,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
-      "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz",
+      "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==",
       "cpu": [
         "x64"
       ],
@@ -452,9 +454,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
-      "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz",
+      "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==",
       "cpu": [
         "arm"
       ],
@@ -469,9 +471,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
-      "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz",
+      "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==",
       "cpu": [
         "arm64"
       ],
@@ -486,9 +488,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
-      "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz",
+      "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==",
       "cpu": [
         "ia32"
       ],
@@ -503,9 +505,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
-      "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz",
+      "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==",
       "cpu": [
         "loong64"
       ],
@@ -520,9 +522,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
-      "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz",
+      "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==",
       "cpu": [
         "mips64el"
       ],
@@ -537,9 +539,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
-      "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz",
+      "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==",
       "cpu": [
         "ppc64"
       ],
@@ -554,9 +556,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
-      "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz",
+      "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==",
       "cpu": [
         "riscv64"
       ],
@@ -571,9 +573,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
-      "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz",
+      "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==",
       "cpu": [
         "s390x"
       ],
@@ -588,9 +590,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
-      "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz",
+      "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==",
       "cpu": [
         "x64"
       ],
@@ -605,9 +607,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==",
       "cpu": [
         "arm64"
       ],
@@ -622,9 +624,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
-      "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz",
+      "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==",
       "cpu": [
         "x64"
       ],
@@ -639,9 +641,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==",
       "cpu": [
         "arm64"
       ],
@@ -656,9 +658,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
-      "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz",
+      "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==",
       "cpu": [
         "x64"
       ],
@@ -673,9 +675,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
-      "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz",
+      "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==",
       "cpu": [
         "arm64"
       ],
@@ -690,9 +692,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
-      "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz",
+      "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==",
       "cpu": [
         "x64"
       ],
@@ -707,9 +709,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
-      "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz",
+      "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==",
       "cpu": [
         "arm64"
       ],
@@ -724,9 +726,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
-      "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz",
+      "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==",
       "cpu": [
         "ia32"
       ],
@@ -741,9 +743,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
-      "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz",
+      "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==",
       "cpu": [
         "x64"
       ],
@@ -1598,6 +1600,7 @@
       "integrity": "sha512-GKBNHjoNw3Kra1Qg5UXttsY5kiWMEfoHq2TmXb+b1rcm6N7B3wTrFYIf/oSZ1xNQ+hVVijgLkiDZh7jRRsh+Gw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~7.10.0"
       }
@@ -1676,6 +1679,7 @@
       "integrity": "sha512-N9lBGA9o9aqb1hVMc9hzySbhKibHmB+N3IpoShyV6HyQYRGIhlrO5rQgttypi+yEeKsKI4idxC8Jw6gXKD4THA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.49.0",
         "@typescript-eslint/types": "8.49.0",
@@ -2004,6 +2008,7 @@
       "integrity": "sha512-oWtNM89Np+YsQO3ttT5i1Aer/0xbzQzp66NzuJn/U16bB7MnvSzdLKXgk1kkMLYyKSSzA2ajzqMkYheaE9opuQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vitest/utils": "4.0.10",
         "fflate": "^0.8.2",
@@ -2301,6 +2306,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2602,6 +2608,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.2",
         "caniuse-lite": "^1.0.30001741",
@@ -2718,6 +2725,7 @@
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.0.tgz",
       "integrity": "sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -2940,6 +2948,7 @@
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
       "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/kossnocorp"
@@ -2999,18 +3008,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/detect-libc": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
-      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -3134,9 +3131,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
-      "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
+      "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3147,32 +3144,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.9",
-        "@esbuild/android-arm": "0.25.9",
-        "@esbuild/android-arm64": "0.25.9",
-        "@esbuild/android-x64": "0.25.9",
-        "@esbuild/darwin-arm64": "0.25.9",
-        "@esbuild/darwin-x64": "0.25.9",
-        "@esbuild/freebsd-arm64": "0.25.9",
-        "@esbuild/freebsd-x64": "0.25.9",
-        "@esbuild/linux-arm": "0.25.9",
-        "@esbuild/linux-arm64": "0.25.9",
-        "@esbuild/linux-ia32": "0.25.9",
-        "@esbuild/linux-loong64": "0.25.9",
-        "@esbuild/linux-mips64el": "0.25.9",
-        "@esbuild/linux-ppc64": "0.25.9",
-        "@esbuild/linux-riscv64": "0.25.9",
-        "@esbuild/linux-s390x": "0.25.9",
-        "@esbuild/linux-x64": "0.25.9",
-        "@esbuild/netbsd-arm64": "0.25.9",
-        "@esbuild/netbsd-x64": "0.25.9",
-        "@esbuild/openbsd-arm64": "0.25.9",
-        "@esbuild/openbsd-x64": "0.25.9",
-        "@esbuild/openharmony-arm64": "0.25.9",
-        "@esbuild/sunos-x64": "0.25.9",
-        "@esbuild/win32-arm64": "0.25.9",
-        "@esbuild/win32-ia32": "0.25.9",
-        "@esbuild/win32-x64": "0.25.9"
+        "@esbuild/aix-ppc64": "0.27.2",
+        "@esbuild/android-arm": "0.27.2",
+        "@esbuild/android-arm64": "0.27.2",
+        "@esbuild/android-x64": "0.27.2",
+        "@esbuild/darwin-arm64": "0.27.2",
+        "@esbuild/darwin-x64": "0.27.2",
+        "@esbuild/freebsd-arm64": "0.27.2",
+        "@esbuild/freebsd-x64": "0.27.2",
+        "@esbuild/linux-arm": "0.27.2",
+        "@esbuild/linux-arm64": "0.27.2",
+        "@esbuild/linux-ia32": "0.27.2",
+        "@esbuild/linux-loong64": "0.27.2",
+        "@esbuild/linux-mips64el": "0.27.2",
+        "@esbuild/linux-ppc64": "0.27.2",
+        "@esbuild/linux-riscv64": "0.27.2",
+        "@esbuild/linux-s390x": "0.27.2",
+        "@esbuild/linux-x64": "0.27.2",
+        "@esbuild/netbsd-arm64": "0.27.2",
+        "@esbuild/netbsd-x64": "0.27.2",
+        "@esbuild/openbsd-arm64": "0.27.2",
+        "@esbuild/openbsd-x64": "0.27.2",
+        "@esbuild/openharmony-arm64": "0.27.2",
+        "@esbuild/sunos-x64": "0.27.2",
+        "@esbuild/win32-arm64": "0.27.2",
+        "@esbuild/win32-ia32": "0.27.2",
+        "@esbuild/win32-x64": "0.27.2"
       }
     },
     "node_modules/escalade": {
@@ -3204,6 +3201,7 @@
       "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3747,9 +3745,9 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -4084,18 +4082,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/jiti": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz",
-      "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
-      }
-    },
     "node_modules/js-yaml": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
@@ -4115,6 +4101,7 @@
       "integrity": "sha512-454TI39PeRDW1LgpyLPyURtB4Zx1tklSr6+OFOipsxGUH1WMTvk6C65JQdrj455+DP2uJ1+veBEHTGFKWVLFoA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@acemir/cssom": "^0.9.23",
         "@asamuzakjp/dom-selector": "^6.7.4",
@@ -4194,257 +4181,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lightningcss": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.1.tgz",
-      "integrity": "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==",
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "detect-libc": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.30.1",
-        "lightningcss-darwin-x64": "1.30.1",
-        "lightningcss-freebsd-x64": "1.30.1",
-        "lightningcss-linux-arm-gnueabihf": "1.30.1",
-        "lightningcss-linux-arm64-gnu": "1.30.1",
-        "lightningcss-linux-arm64-musl": "1.30.1",
-        "lightningcss-linux-x64-gnu": "1.30.1",
-        "lightningcss-linux-x64-musl": "1.30.1",
-        "lightningcss-win32-arm64-msvc": "1.30.1",
-        "lightningcss-win32-x64-msvc": "1.30.1"
-      }
-    },
-    "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz",
-      "integrity": "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-darwin-x64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz",
-      "integrity": "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz",
-      "integrity": "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz",
-      "integrity": "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz",
-      "integrity": "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz",
-      "integrity": "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz",
-      "integrity": "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz",
-      "integrity": "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz",
-      "integrity": "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz",
-      "integrity": "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "peer": true,
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
     "node_modules/lilconfig": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
@@ -4930,6 +4666,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -4997,6 +4734,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -6027,6 +5765,7 @@
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6115,13 +5854,14 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.5.tgz",
-      "integrity": "sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
+      "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "esbuild": "^0.25.0",
+        "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
         "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
@@ -6195,6 +5935,7 @@
       "integrity": "sha512-2Fqty3MM9CDwOVet/jaQalYlbcjATZwPYGcqpiYQqgQ/dLC7GuHdISKgTYIVF/kaishKxLzleKWWfbSDklyIKg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vitest/expect": "4.0.10",
         "@vitest/mocker": "4.0.10",
@@ -6279,6 +6020,7 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.21.tgz",
       "integrity": "sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.21",
         "@vue/compiler-sfc": "3.5.21",
@@ -6311,7 +6053,6 @@
       "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "eslint-scope": "^8.2.0",
@@ -6336,7 +6077,6 @@
       "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },

frontend/src/api/admin.ts

@@ -1,5 +1,263 @@
 import apiClient from './client'
 
+// 配置导出数据结构
+export interface ConfigExportData {
+  version: string
+  exported_at: string
+  global_models: GlobalModelExport[]
+  providers: ProviderExport[]
+}
+
+// 用户导出数据结构
+export interface UsersExportData {
+  version: string
+  exported_at: string
+  users: UserExport[]
+  standalone_keys?: StandaloneKeyExport[]
+}
+
+export interface UserExport {
+  email: string
+  username: string
+  password_hash: string
+  role: string
+  allowed_providers?: string[] | null
+  allowed_api_formats?: string[] | null
+  allowed_models?: string[] | null
+  model_capability_settings?: any
+  quota_usd?: number | null
+  used_usd?: number
+  total_usd?: number
+  is_active: boolean
+  api_keys: UserApiKeyExport[]
+}
+
+export interface UserApiKeyExport {
+  key_hash: string
+  key_encrypted?: string | null
+  name?: string | null
+  is_standalone: boolean
+  balance_used_usd?: number
+  current_balance_usd?: number | null
+  allowed_providers?: string[] | null
+  allowed_api_formats?: string[] | null
+  allowed_models?: string[] | null
+  rate_limit?: number | null  // null = 无限制
+  concurrent_limit?: number | null
+  force_capabilities?: any
+  is_active: boolean
+  expires_at?: string | null
+  auto_delete_on_expiry?: boolean
+  total_requests?: number
+  total_cost_usd?: number
+}
+
+// 独立余额 Key 导出结构（与 UserApiKeyExport 相同，但不包含 is_standalone）
+export type StandaloneKeyExport = Omit<UserApiKeyExport, 'is_standalone'>
+
+export interface GlobalModelExport {
+  name: string
+  display_name: string
+  default_price_per_request?: number | null
+  default_tiered_pricing: any
+  supported_capabilities?: string[] | null
+  config?: any
+  is_active: boolean
+}
+
+export interface ProviderExport {
+  name: string
+  description?: string | null
+  website?: string | null
+  billing_type?: string | null
+  monthly_quota_usd?: number | null
+  quota_reset_day?: number
+  rpm_limit?: number | null
+  provider_priority?: number
+  is_active: boolean
+  concurrent_limit?: number | null
+  timeout?: number | null
+  max_retries?: number | null
+  proxy?: any
+  config?: any
+  endpoints: EndpointExport[]
+  api_keys: ProviderKeyExport[]
+  models: ModelExport[]
+}
+
+export interface EndpointExport {
+  api_format: string
+  base_url: string
+  headers?: any
+  timeout?: number
+  max_retries?: number
+  is_active: boolean
+  custom_path?: string | null
+  config?: any
+  proxy?: any
+}
+
+export interface ProviderKeyExport {
+  api_key: string
+  name?: string | null
+  note?: string | null
+  api_formats: string[]
+  rate_multiplier?: number
+  rate_multipliers?: Record<string, number> | null
+  internal_priority?: number
+  global_priority?: number | null
+  rpm_limit?: number | null
+  allowed_models?: any
+  capabilities?: any
+  cache_ttl_minutes?: number
+  max_probe_interval_minutes?: number
+  is_active: boolean
+}
+
+export interface ModelExport {
+  global_model_name: string | null
+  provider_model_name: string
+  provider_model_mappings?: any
+  price_per_request?: number | null
+  tiered_pricing?: any
+  supports_vision?: boolean | null
+  supports_function_calling?: boolean | null
+  supports_streaming?: boolean | null
+  supports_extended_thinking?: boolean | null
+  supports_image_generation?: boolean | null
+  is_active: boolean
+  config?: any
+}
+
+// 邮件模板接口
+export interface EmailTemplateInfo {
+  type: string
+  name: string
+  variables: string[]
+  subject: string
+  html: string
+  is_custom: boolean
+  default_subject?: string
+  default_html?: string
+}
+
+export interface EmailTemplatesResponse {
+  templates: EmailTemplateInfo[]
+}
+
+export interface EmailTemplatePreviewResponse {
+  html: string
+  variables: Record<string, string>
+}
+
+export interface EmailTemplateResetResponse {
+  message: string
+  template: {
+    type: string
+    name: string
+    subject: string
+    html: string
+  }
+}
+
+// 检查更新响应
+export interface CheckUpdateResponse {
+  current_version: string
+  latest_version: string | null
+  has_update: boolean
+  release_url: string | null
+  error: string | null
+}
+
+// LDAP 配置响应
+export interface LdapConfigResponse {
+  server_url: string | null
+  bind_dn: string | null
+  base_dn: string | null
+  has_bind_password: boolean
+  user_search_filter: string
+  username_attr: string
+  email_attr: string
+  display_name_attr: string
+  is_enabled: boolean
+  is_exclusive: boolean
+  use_starttls: boolean
+  connect_timeout: number
+}
+
+// LDAP 配置更新请求
+export interface LdapConfigUpdateRequest {
+  server_url: string
+  bind_dn: string
+  bind_password?: string
+  base_dn: string
+  user_search_filter?: string
+  username_attr?: string
+  email_attr?: string
+  display_name_attr?: string
+  is_enabled?: boolean
+  is_exclusive?: boolean
+  use_starttls?: boolean
+  connect_timeout?: number
+}
+
+// LDAP 连接测试响应
+export interface LdapTestResponse {
+  success: boolean
+  message: string
+}
+
+// Provider 模型查询响应
+export interface ProviderModelsQueryResponse {
+  success: boolean
+  data: {
+    models: Array<{
+      id: string
+      object?: string
+      created?: number
+      owned_by?: string
+      display_name?: string
+      api_format?: string
+    }>
+    error?: string
+  }
+  provider: {
+    id: string
+    name: string
+    display_name: string
+  }
+}
+
+export interface ConfigImportRequest extends ConfigExportData {
+  merge_mode: 'skip' | 'overwrite' | 'error'
+}
+
+export interface UsersImportRequest extends UsersExportData {
+  merge_mode: 'skip' | 'overwrite' | 'error'
+}
+
+export interface UsersImportResponse {
+  message: string
+  stats: {
+    users: { created: number; updated: number; skipped: number }
+    api_keys: { created: number; skipped: number }
+    standalone_keys?: { created: number; skipped: number }
+    errors: string[]
+  }
+}
+
+export interface ConfigImportResponse {
+  message: string
+  stats: {
+    global_models: { created: number; updated: number; skipped: number }
+    providers: { created: number; updated: number; skipped: number }
+    endpoints: { created: number; updated: number; skipped: number }
+    keys: { created: number; updated: number; skipped: number }
+    models: { created: number; updated: number; skipped: number }
+    errors: string[]
+  }
+}
+
 // API密钥管理相关接口定义
 export interface AdminApiKey {
   id: string // UUID
@@ -15,7 +273,7 @@ export interface AdminApiKey {
   total_requests?: number
   total_tokens?: number
   total_cost_usd?: number
-  rate_limit?: number
+  rate_limit?: number | null  // null = 无限制
   allowed_providers?: string[] | null  // 允许的提供商列表
   allowed_api_formats?: string[] | null  // 允许的 API 格式列表
   allowed_models?: string[] | null  // 允许的模型列表
@@ -31,8 +289,8 @@ export interface CreateStandaloneApiKeyRequest {
   allowed_providers?: string[] | null
   allowed_api_formats?: string[] | null
   allowed_models?: string[] | null
-  rate_limit?: number
-  expire_days?: number | null  // null = 永不过期
+  rate_limit?: number | null  // null = 无限制
+  expires_at?: string | null  // ISO 日期字符串，如 "2025-12-31"，null = 永不过期
   initial_balance_usd: number  // 初始余额，必须设置
   auto_delete_on_expiry?: boolean  // 过期后是否自动删除
 }
@@ -173,5 +431,138 @@ export const adminApi = {
       '/api/admin/system/api-formats'
     )
     return response.data
+  },
+
+  // 导出配置
+  async exportConfig(): Promise<ConfigExportData> {
+    const response = await apiClient.get<ConfigExportData>('/api/admin/system/config/export')
+    return response.data
+  },
+
+  // 导入配置
+  async importConfig(data: ConfigImportRequest): Promise<ConfigImportResponse> {
+    const response = await apiClient.post<ConfigImportResponse>(
+      '/api/admin/system/config/import',
+      data
+    )
+    return response.data
+  },
+
+  // 导出用户数据
+  async exportUsers(): Promise<UsersExportData> {
+    const response = await apiClient.get<UsersExportData>('/api/admin/system/users/export')
+    return response.data
+  },
+
+  // 导入用户数据
+  async importUsers(data: UsersImportRequest): Promise<UsersImportResponse> {
+    const response = await apiClient.post<UsersImportResponse>(
+      '/api/admin/system/users/import',
+      data
+    )
+    return response.data
+  },
+
+  // 查询 Provider 可用模型（从上游 API 获取）
+  async queryProviderModels(providerId: string, apiKeyId?: string): Promise<ProviderModelsQueryResponse> {
+    const response = await apiClient.post<ProviderModelsQueryResponse>(
+      '/api/admin/provider-query/models',
+      { provider_id: providerId, api_key_id: apiKeyId }
+    )
+    return response.data
+  },
+
+  // 测试 SMTP 连接，支持传入未保存的配置
+  async testSmtpConnection(config: Record<string, any> = {}): Promise<{ success: boolean; message: string }> {
+    const response = await apiClient.post<{ success: boolean; message: string }>(
+      '/api/admin/system/smtp/test',
+      config
+    )
+    return response.data
+  },
+
+  // 邮件模板相关
+  // 获取所有邮件模板
+  async getEmailTemplates(): Promise<EmailTemplatesResponse> {
+    const response = await apiClient.get<EmailTemplatesResponse>('/api/admin/system/email/templates')
+    return response.data
+  },
+
+  // 获取指定类型的邮件模板
+  async getEmailTemplate(templateType: string): Promise<EmailTemplateInfo> {
+    const response = await apiClient.get<EmailTemplateInfo>(
+      `/api/admin/system/email/templates/${templateType}`
+    )
+    return response.data
+  },
+
+  // 更新邮件模板
+  async updateEmailTemplate(
+    templateType: string,
+    data: { subject?: string; html?: string }
+  ): Promise<{ message: string }> {
+    const response = await apiClient.put<{ message: string }>(
+      `/api/admin/system/email/templates/${templateType}`,
+      data
+    )
+    return response.data
+  },
+
+  // 预览邮件模板
+  async previewEmailTemplate(
+    templateType: string,
+    data?: { html?: string } & Record<string, string>
+  ): Promise<EmailTemplatePreviewResponse> {
+    const response = await apiClient.post<EmailTemplatePreviewResponse>(
+      `/api/admin/system/email/templates/${templateType}/preview`,
+      data || {}
+    )
+    return response.data
+  },
+
+  // 重置邮件模板为默认值
+  async resetEmailTemplate(templateType: string): Promise<EmailTemplateResetResponse> {
+    const response = await apiClient.post<EmailTemplateResetResponse>(
+      `/api/admin/system/email/templates/${templateType}/reset`
+    )
+    return response.data
+  },
+
+  // 获取系统版本信息
+  async getSystemVersion(): Promise<{ version: string }> {
+    const response = await apiClient.get<{ version: string }>(
+      '/api/admin/system/version'
+    )
+    return response.data
+  },
+
+  // 检查系统更新
+  async checkUpdate(): Promise<CheckUpdateResponse> {
+    const response = await apiClient.get<CheckUpdateResponse>(
+      '/api/admin/system/check-update'
+    )
+    return response.data
+  },
+
+  // LDAP 配置相关
+  // 获取 LDAP 配置
+  async getLdapConfig(): Promise<LdapConfigResponse> {
+    const response = await apiClient.get<LdapConfigResponse>('/api/admin/ldap/config')
+    return response.data
+  },
+
+  // 更新 LDAP 配置
+  async updateLdapConfig(config: LdapConfigUpdateRequest): Promise<{ message: string }> {
+    const response = await apiClient.put<{ message: string }>(
+      '/api/admin/ldap/config',
+      config
+    )
+    return response.data
+  },
+
+  // 测试 LDAP 连接
+  async testLdapConnection(config: LdapConfigUpdateRequest): Promise<LdapTestResponse> {
+    const response = await apiClient.post<LdapTestResponse>('/api/admin/ldap/test', config)
+    return response.data
   }
 }

frontend/src/api/auth.ts

@@ -4,6 +4,7 @@ import { log } from '@/utils/logger'
 export interface LoginRequest {
   email: string
   password: string
+  auth_type?: 'local' | 'ldap'
 }
 
 export interface LoginResponse {
@@ -31,6 +32,62 @@ export interface UserStats {
   [key: string]: unknown // 允许扩展其他统计数据
 }
 
+export interface SendVerificationCodeRequest {
+  email: string
+}
+
+export interface SendVerificationCodeResponse {
+  message: string
+  success: boolean
+  expire_minutes?: number
+}
+
+export interface VerifyEmailRequest {
+  email: string
+  code: string
+}
+
+export interface VerifyEmailResponse {
+  message: string
+  success: boolean
+}
+
+export interface VerificationStatusRequest {
+  email: string
+}
+
+export interface VerificationStatusResponse {
+  email: string
+  has_pending_code: boolean
+  is_verified: boolean
+  cooldown_remaining: number | null
+  code_expires_in: number | null
+}
+
+export interface RegisterRequest {
+  email: string
+  username: string
+  password: string
+}
+
+export interface RegisterResponse {
+  user_id: string
+  email: string
+  username: string
+  message: string
+}
+
+export interface RegistrationSettingsResponse {
+  enable_registration: boolean
+  require_email_verification: boolean
+}
+
+export interface AuthSettingsResponse {
+  local_enabled: boolean
+  ldap_enabled: boolean
+  ldap_exclusive: boolean
+}
+
 export interface User {
   id: string // UUID
   username: string
@@ -41,7 +98,7 @@ export interface User {
   used_usd?: number
   total_usd?: number
   allowed_providers?: string[] | null  // 允许使用的提供商 ID 列表
-  allowed_endpoints?: string[] | null  // 允许使用的端点 ID 列表
+  allowed_api_formats?: string[] | null  // 允许使用的 API 格式列表
   allowed_models?: string[] | null  // 允许使用的模型名称列表
   created_at: string
   last_login_at?: string
@@ -87,5 +144,46 @@ export const authApi = {
       localStorage.setItem('refresh_token', response.data.refresh_token)
     }
     return response.data
+  },
+
+  async sendVerificationCode(email: string): Promise<SendVerificationCodeResponse> {
+    const response = await apiClient.post<SendVerificationCodeResponse>(
+      '/api/auth/send-verification-code',
+      { email }
+    )
+    return response.data
+  },
+
+  async verifyEmail(email: string, code: string): Promise<VerifyEmailResponse> {
+    const response = await apiClient.post<VerifyEmailResponse>(
+      '/api/auth/verify-email',
+      { email, code }
+    )
+    return response.data
+  },
+
+  async register(data: RegisterRequest): Promise<RegisterResponse> {
+    const response = await apiClient.post<RegisterResponse>('/api/auth/register', data)
+    return response.data
+  },
+
+  async getRegistrationSettings(): Promise<RegistrationSettingsResponse> {
+    const response = await apiClient.get<RegistrationSettingsResponse>(
+      '/api/auth/registration-settings'
+    )
+    return response.data
+  },
+
+  async getVerificationStatus(email: string): Promise<VerificationStatusResponse> {
+    const response = await apiClient.post<VerificationStatusResponse>(
+      '/api/auth/verification-status',
+      { email }
+    )
+    return response.data
+  },
+
+  async getAuthSettings(): Promise<AuthSettingsResponse> {
+    const response = await apiClient.get<AuthSettingsResponse>('/api/auth/settings')
+    return response.data
   }
 }

frontend/src/api/cache.ts

@@ -66,6 +66,7 @@ export interface UserAffinity {
   key_name: string | null
   key_prefix: string | null  // Provider Key 脱敏显示（前4...后4）
   rate_multiplier: number
+  global_model_id: string | null  // 原始的 global_model_id（用于删除）
   model_name: string | null  // 模型名称（如 claude-haiku-4-5-20250514）
   model_display_name: string | null  // 模型显示名称（如 Claude Haiku 4.5）
   api_format: string | null  // API 格式 (claude/openai)
@@ -119,6 +120,18 @@ export const cacheApi = {
     await api.delete(`/api/admin/monitoring/cache/users/${userIdentifier}`)
   },
 
+  /**
+   * 清除单条缓存亲和性
+   *
+   * @param affinityKey API Key ID
+   * @param endpointId Endpoint ID
+   * @param modelId GlobalModel ID
+   * @param apiFormat API 格式 (claude/openai)
+   */
+  async clearSingleAffinity(affinityKey: string, endpointId: string, modelId: string, apiFormat: string): Promise<void> {
+    await api.delete(`/api/admin/monitoring/cache/affinity/${affinityKey}/${endpointId}/${modelId}/${apiFormat}`)
+  },
+
   /**
    * 清除所有缓存
    */
@@ -271,3 +284,93 @@ export const cacheAnalysisApi = {
     return response.data
   }
 }
+
+// ==================== 模型映射缓存管理 API ====================
+
+// 映射条目
+export interface ModelMappingItem {
+  mapping_name: string
+  global_model_name: string | null
+  global_model_display_name: string | null
+  providers: string[]
+  ttl: number | null
+}
+
+// 未映射的条目（NOT_FOUND、invalid、error）
+export interface UnmappedEntry {
+  mapping_name: string
+  status: 'not_found' | 'invalid' | 'error'
+  ttl: number | null
+}
+
+// Provider 模型映射缓存（Redis 缓存）
+export interface ProviderModelMapping {
+  provider_id: string
+  provider_name: string
+  global_model_id: string
+  global_model_name: string
+  global_model_display_name: string | null
+  provider_model_name: string
+  aliases: string[] | null
+  ttl: number | null
+  hit_count: number
+}
+
+export interface ModelMappingCacheStats {
+  available: boolean
+  message?: string
+  ttl_seconds?: number
+  total_keys?: number
+  breakdown?: {
+    model_by_id: number
+    model_by_provider_global: number
+    global_model_by_id: number
+    global_model_by_name: number
+    global_model_resolve: number
+  }
+  mappings?: ModelMappingItem[]
+  provider_model_mappings?: ProviderModelMapping[] | null
+  unmapped?: UnmappedEntry[] | null
+}
+
+export interface ClearModelMappingCacheResponse {
+  status: string
+  message: string
+  deleted_count?: number
+  model_name?: string
+  deleted_keys?: string[]
+}
+
+export const modelMappingCacheApi = {
+  /**
+   * 获取模型映射缓存统计
+   */
+  async getStats(): Promise<ModelMappingCacheStats> {
+    const response = await api.get('/api/admin/monitoring/cache/model-mapping/stats')
+    return response.data.data
+  },
+
+  /**
+   * 清除所有模型映射缓存
+   */
+  async clearAll(): Promise<ClearModelMappingCacheResponse> {
+    const response = await api.delete('/api/admin/monitoring/cache/model-mapping')
+    return response.data
+  },
+
+  /**
+   * 清除指定模型名称的映射缓存
+   */
+  async clearByName(modelName: string): Promise<ClearModelMappingCacheResponse> {
+    const response = await api.delete(`/api/admin/monitoring/cache/model-mapping/${encodeURIComponent(modelName)}`)
+    return response.data
+  },
+
+  /**
+   * 清除指定 Provider 和 GlobalModel 的映射缓存
+   */
+  async clearProviderModel(providerId: string, globalModelId: string): Promise<ClearModelMappingCacheResponse> {
+    const response = await api.delete(`/api/admin/monitoring/cache/model-mapping/provider/${providerId}/${globalModelId}`)
+    return response.data
+  }
+}

frontend/src/api/dashboard.ts

@@ -87,6 +87,8 @@ export interface DashboardStatsResponse {
   cache_stats?: CacheStats
   users?: UserStats
   token_breakdown?: TokenBreakdown
+  // 普通用户专用字段
+  monthly_cost?: number
 }
 
 export interface RecentRequestsResponse {
@@ -153,6 +155,7 @@ export interface RequestDetail {
   request_body?: Record<string, any>
   provider_request_headers?: Record<string, any>
   response_headers?: Record<string, any>
+  client_response_headers?: Record<string, any>
   response_body?: Record<string, any>
   metadata?: Record<string, any>
   // 阶梯计费信息

frontend/src/api/endpoints/adaptive.ts

@@ -14,7 +14,7 @@ export async function toggleAdaptiveMode(
   message: string
   key_id: string
   is_adaptive: boolean
-  max_concurrent: number | null
+  rpm_limit: number | null
   effective_limit: number | null
 }> {
   const response = await client.patch(`/api/admin/adaptive/keys/${keyId}/mode`, data)
@@ -22,16 +22,16 @@ export async function toggleAdaptiveMode(
 }
 
 /**
- * 设置 Key 的固定并发限制
+ * 设置 Key 的固定 RPM 限制
  */
-export async function setConcurrentLimit(
+export async function setRpmLimit(
   keyId: string,
   limit: number
 ): Promise<{
   message: string
   key_id: string
   is_adaptive: boolean
-  max_concurrent: number
+  rpm_limit: number
   previous_mode: string
 }> {
   const response = await client.patch(`/api/admin/adaptive/keys/${keyId}/limit`, null, {

frontend/src/api/endpoints/aliases.ts

@@ -1,121 +0,0 @@
-/**
- * 模型别名管理 API
- */
-
-import client from '../client'
-import type { ModelMapping, ModelMappingCreate, ModelMappingUpdate } from './types'
-
-export interface ModelAlias {
-  id: string
-  alias: string
-  global_model_id: string
-  global_model_name: string | null
-  global_model_display_name: string | null
-  provider_id: string | null
-  provider_name: string | null
-  scope: 'global' | 'provider'
-  mapping_type: 'alias' | 'mapping'
-  is_active: boolean
-  created_at: string
-  updated_at: string
-}
-
-export interface CreateModelAliasRequest {
-  alias: string
-  global_model_id: string
-  provider_id?: string | null
-  mapping_type?: 'alias' | 'mapping'
-  is_active?: boolean
-}
-
-export interface UpdateModelAliasRequest {
-  alias?: string
-  global_model_id?: string
-  provider_id?: string | null
-  mapping_type?: 'alias' | 'mapping'
-  is_active?: boolean
-}
-
-function transformMapping(mapping: ModelMapping): ModelAlias {
-  return {
-    id: mapping.id,
-    alias: mapping.source_model,
-    global_model_id: mapping.target_global_model_id,
-    global_model_name: mapping.target_global_model_name,
-    global_model_display_name: mapping.target_global_model_display_name,
-    provider_id: mapping.provider_id ?? null,
-    provider_name: mapping.provider_name ?? null,
-    scope: mapping.scope,
-    mapping_type: mapping.mapping_type || 'alias',
-    is_active: mapping.is_active,
-    created_at: mapping.created_at,
-    updated_at: mapping.updated_at
-  }
-}
-
-/**
- * 获取别名列表
- */
-export async function getAliases(params?: {
-  provider_id?: string
-  global_model_id?: string
-  is_active?: boolean
-  skip?: number
-  limit?: number
-}): Promise<ModelAlias[]> {
-  const response = await client.get('/api/admin/models/mappings', {
-    params: {
-      provider_id: params?.provider_id,
-      target_global_model_id: params?.global_model_id,
-      is_active: params?.is_active,
-      skip: params?.skip,
-      limit: params?.limit
-    }
-  })
-  return (response.data as ModelMapping[]).map(transformMapping)
-}
-
-/**
- * 获取单个别名
- */
-export async function getAlias(id: string): Promise<ModelAlias> {
-  const response = await client.get(`/api/admin/models/mappings/${id}`)
-  return transformMapping(response.data)
-}
-
-/**
- * 创建别名
- */
-export async function createAlias(data: CreateModelAliasRequest): Promise<ModelAlias> {
-  const payload: ModelMappingCreate = {
-    source_model: data.alias,
-    target_global_model_id: data.global_model_id,
-    provider_id: data.provider_id ?? null,
-    mapping_type: data.mapping_type ?? 'alias',
-    is_active: data.is_active ?? true
-  }
-  const response = await client.post('/api/admin/models/mappings', payload)
-  return transformMapping(response.data)
-}
-
-/**
- * 更新别名
- */
-export async function updateAlias(id: string, data: UpdateModelAliasRequest): Promise<ModelAlias> {
-  const payload: ModelMappingUpdate = {
-    source_model: data.alias,
-    target_global_model_id: data.global_model_id,
-    provider_id: data.provider_id ?? null,
-    mapping_type: data.mapping_type,
-    is_active: data.is_active
-  }
-  const response = await client.patch(`/api/admin/models/mappings/${id}`, payload)
-  return transformMapping(response.data)
-}
-
-/**
- * 删除别名
- */
-export async function deleteAlias(id: string): Promise<void> {
-  await client.delete(`/api/admin/models/mappings/${id}`)
-}

frontend/src/api/endpoints/endpoints.ts

@@ -1,5 +1,5 @@
 import client from '../client'
-import type { ProviderEndpoint } from './types'
+import type { ProviderEndpoint, ProxyConfig } from './types'
 
 /**
  * 获取指定 Provider 的所有 Endpoints
@@ -27,17 +27,12 @@ export async function createEndpoint(
     api_format: string
     base_url: string
     custom_path?: string
-    auth_type?: string
-    auth_header?: string
     headers?: Record<string, string>
     timeout?: number
     max_retries?: number
-    priority?: number
-    weight?: number
-    max_concurrent?: number
-    rate_limit?: number
     is_active?: boolean
     config?: Record<string, any>
+    proxy?: ProxyConfig | null
   }
 ): Promise<ProviderEndpoint> {
   const response = await client.post(`/api/admin/endpoints/providers/${providerId}/endpoints`, data)
@@ -51,18 +46,13 @@ export async function updateEndpoint(
   endpointId: string,
   data: Partial<{
     base_url: string
-    custom_path: string
-    auth_type: string
-    auth_header: string
+    custom_path: string | null
     headers: Record<string, string>
     timeout: number
     max_retries: number
-    priority: number
-    weight: number
-    max_concurrent: number
-    rate_limit: number
     is_active: boolean
     config: Record<string, any>
+    proxy: ProxyConfig | null
   }>
 ): Promise<ProviderEndpoint> {
   const response = await client.put(`/api/admin/endpoints/${endpointId}`, data)
@@ -72,7 +62,7 @@ export async function updateEndpoint(
 /**
  * 删除 Endpoint
  */
-export async function deleteEndpoint(endpointId: string): Promise<{ message: string; deleted_keys_count: number }> {
+export async function deleteEndpoint(endpointId: string): Promise<{ message: string; affected_keys_count: number }> {
   const response = await client.delete(`/api/admin/endpoints/${endpointId}`)
   return response.data
 }

frontend/src/api/endpoints/global-models.ts

@@ -4,7 +4,8 @@ import type {
   GlobalModelUpdate,
   GlobalModelResponse,
   GlobalModelWithStats,
-  GlobalModelListResponse
+  GlobalModelListResponse,
+  ModelCatalogProviderDetail,
 } from './types'
 
 /**
@@ -83,3 +84,16 @@ export async function batchAssignToProviders(
   )
   return response.data
 }
+
+/**
+ * 获取 GlobalModel 的所有关联提供商（包括非活跃的）
+ */
+export async function getGlobalModelProviders(globalModelId: string): Promise<{
+  providers: ModelCatalogProviderDetail[]
+  total: number
+}> {
+  const response = await client.get(
+    `/api/admin/models/global/${globalModelId}/providers`
+  )
+  return response.data
+}

frontend/src/api/endpoints/health.ts

@@ -32,16 +32,21 @@ export async function getKeyHealth(keyId: string): Promise<HealthStatus> {
 
 /**
  * 恢复Key健康状态（一键恢复：重置健康度 + 关闭熔断器 + 取消自动禁用）
+ * @param keyId Key ID
+ * @param apiFormat 可选，指定 API 格式（如 CLAUDE、OPENAI），不指定则恢复所有格式
  */
-export async function recoverKeyHealth(keyId: string): Promise<{
+export async function recoverKeyHealth(keyId: string, apiFormat?: string): Promise<{
   message: string
   details: {
+    api_format?: string
     health_score: number
     circuit_breaker_open: boolean
     is_active: boolean
   }
 }> {
-  const response = await client.patch(`/api/admin/endpoints/health/keys/${keyId}`)
+  const response = await client.patch(`/api/admin/endpoints/health/keys/${keyId}`, null, {
+    params: apiFormat ? { api_format: apiFormat } : undefined
+  })
   return response.data
 }
 

frontend/src/api/endpoints/index.ts

@@ -4,6 +4,5 @@ export * from './endpoints'
 export * from './keys'
 export * from './health'
 export * from './models'
-export * from './aliases'
 export * from './adaptive'
 export * from './global-models'

frontend/src/api/endpoints/keys.ts

@@ -1,5 +1,5 @@
 import client from '../client'
-import type { EndpointAPIKey } from './types'
+import type { EndpointAPIKey, AllowedModels } from './types'
 
 /**
  * 能力定义类型
@@ -50,83 +50,79 @@ export async function getModelCapabilities(modelName: string): Promise<ModelCapa
 }
 
 /**
- * 获取 Endpoint 的所有 Keys
+ * 获取完整的 API Key（用于查看和复制）
  */
-export async function getEndpointKeys(endpointId: string): Promise<EndpointAPIKey[]> {
-  const response = await client.get(`/api/admin/endpoints/${endpointId}/keys`)
+export async function revealEndpointKey(keyId: string): Promise<{ api_key: string }> {
+  const response = await client.get(`/api/admin/endpoints/keys/${keyId}/reveal`)
   return response.data
 }
 
 /**
- * 为 Endpoint 添加 Key
- */
-export async function addEndpointKey(
-  endpointId: string,
-  data: {
-    endpoint_id: string
-    api_key: string
-    name: string  // 密钥名称（必填）
-    rate_multiplier?: number  // 成本倍率（默认 1.0）
-    internal_priority?: number  // Endpoint 内部优先级（数字越小越优先）
-    max_concurrent?: number  // 最大并发数（留空=自适应模式）
-    rate_limit?: number
-    daily_limit?: number
-    monthly_limit?: number
-    cache_ttl_minutes?: number  // 缓存 TTL（分钟），0=禁用
-    max_probe_interval_minutes?: number  // 熔断探测间隔（分钟）
-    allowed_models?: string[]  // 允许使用的模型列表
-    capabilities?: Record<string, boolean>  // 能力标签配置
-    note?: string  // 备注说明（可选）
-  }
-): Promise<EndpointAPIKey> {
-  const response = await client.post(`/api/admin/endpoints/${endpointId}/keys`, data)
-  return response.data
-}
-
-/**
- * 更新 Endpoint Key
- */
-export async function updateEndpointKey(
-  keyId: string,
-  data: Partial<{
-    api_key: string
-    name: string  // 密钥名称
-    rate_multiplier: number  // 成本倍率
-    internal_priority: number  // Endpoint 内部优先级（提供商优先模式，数字越小越优先）
-    global_priority: number  // 全局 Key 优先级（全局 Key 优先模式，数字越小越优先）
-    max_concurrent: number  // 最大并发数（留空=自适应模式）
-    rate_limit: number
-    daily_limit: number
-    monthly_limit: number
-    cache_ttl_minutes: number  // 缓存 TTL（分钟），0=禁用
-    max_probe_interval_minutes: number  // 熔断探测间隔（分钟）
-    allowed_models: string[] | null  // 允许使用的模型列表，null 表示允许所有
-    capabilities: Record<string, boolean> | null  // 能力标签配置
-    is_active: boolean
-    note: string  // 备注说明
-  }>
-): Promise<EndpointAPIKey> {
-  const response = await client.put(`/api/admin/endpoints/keys/${keyId}`, data)
-  return response.data
-}
-
-/**
- * 删除 Endpoint Key
+ * 删除 Key
  */
 export async function deleteEndpointKey(keyId: string): Promise<{ message: string }> {
   const response = await client.delete(`/api/admin/endpoints/keys/${keyId}`)
   return response.data
 }
 
+
+// ========== Provider 级别的 Keys API ==========
+
+
 /**
- * 批量更新 Endpoint Keys 的优先级（用于拖动排序）
+ * 获取 Provider 的所有 Keys
  */
-export async function batchUpdateKeyPriority(
-  endpointId: string,
-  priorities: Array<{ key_id: string; internal_priority: number }>
-): Promise<{ message: string; updated_count: number }> {
-  const response = await client.put(`/api/admin/endpoints/${endpointId}/keys/batch-priority`, {
-    priorities
-  })
+export async function getProviderKeys(providerId: string): Promise<EndpointAPIKey[]> {
+  const response = await client.get(`/api/admin/endpoints/providers/${providerId}/keys`)
+  return response.data
+}
+
+/**
+ * 为 Provider 添加 Key
+ */
+export async function addProviderKey(
+  providerId: string,
+  data: {
+    api_formats: string[]  // 支持的 API 格式列表（必填）
+    api_key: string
+    name: string
+    rate_multiplier?: number  // 默认成本倍率
+    rate_multipliers?: Record<string, number> | null  // 按 API 格式的成本倍率
+    internal_priority?: number
+    rpm_limit?: number | null  // RPM 限制（留空=自适应模式）
+    cache_ttl_minutes?: number
+    max_probe_interval_minutes?: number
+    allowed_models?: AllowedModels
+    capabilities?: Record<string, boolean>
+    note?: string
+  }
+): Promise<EndpointAPIKey> {
+  const response = await client.post(`/api/admin/endpoints/providers/${providerId}/keys`, data)
+  return response.data
+}
+
+/**
+ * 更新 Key
+ */
+export async function updateProviderKey(
+  keyId: string,
+  data: Partial<{
+    api_formats: string[]  // 支持的 API 格式列表
+    api_key: string
+    name: string
+    rate_multiplier: number  // 默认成本倍率
+    rate_multipliers: Record<string, number> | null  // 按 API 格式的成本倍率
+    internal_priority: number
+    global_priority: number | null
+    rpm_limit: number | null  // RPM 限制（留空=自适应模式）
+    cache_ttl_minutes: number
+    max_probe_interval_minutes: number
+    allowed_models: AllowedModels
+    capabilities: Record<string, boolean> | null
+    is_active: boolean
+    note: string
+  }>
+): Promise<EndpointAPIKey> {
+  const response = await client.put(`/api/admin/endpoints/keys/${keyId}`, data)
   return response.data
 }

frontend/src/api/endpoints/models.ts

@@ -5,9 +5,8 @@ import type {
   ModelUpdate,
   ModelCatalogResponse,
   ProviderAvailableSourceModelsResponse,
-  UpdateModelMappingRequest,
-  UpdateModelMappingResponse,
-  DeleteModelMappingResponse
+  UpstreamModel,
+  ImportFromUpstreamResponse,
 } from './types'
 
 /**
@@ -99,27 +98,6 @@ export async function getProviderAvailableSourceModels(
   return response.data
 }
 
-/**
- * 更新目录中的模型映射
- */
-export async function updateCatalogMapping(
-  mappingId: string,
-  data: UpdateModelMappingRequest
-): Promise<UpdateModelMappingResponse> {
-  const response = await client.put(`/api/admin/models/catalog/mappings/${mappingId}`, data)
-  return response.data
-}
-
-/**
- * 删除目录中的模型映射
- */
-export async function deleteCatalogMapping(
-  mappingId: string
-): Promise<DeleteModelMappingResponse> {
-  const response = await client.delete(`/api/admin/models/catalog/mappings/${mappingId}`)
-  return response.data
-}
-
 /**
  * 批量为 Provider 关联 GlobalModels
  */
@@ -143,3 +121,52 @@ export async function batchAssignModelsToProvider(
   )
   return response.data
 }
+
+/**
+ * 查询提供商的上游模型列表
+ */
+export async function queryProviderUpstreamModels(
+  providerId: string
+): Promise<{
+  success: boolean
+  data: {
+    models: UpstreamModel[]
+    error: string | null
+  }
+  provider: {
+    id: string
+    name: string
+    display_name: string
+  }
+}> {
+  const response = await client.post('/api/admin/provider-query/models', {
+    provider_id: providerId,
+  })
+  return response.data
+}
+
+/**
+ * 从上游提供商导入模型
+ * @param providerId 提供商 ID
+ * @param modelIds 模型 ID 列表
+ * @param options 可选配置
+ * @param options.tiered_pricing 阶梯计费配置
+ * @param options.price_per_request 按次计费价格
+ */
+export async function importModelsFromUpstream(
+  providerId: string,
+  modelIds: string[],
+  options?: {
+    tiered_pricing?: object
+    price_per_request?: number
+  }
+): Promise<ImportFromUpstreamResponse> {
+  const response = await client.post(
+    `/api/admin/providers/${providerId}/import-from-upstream`,
+    {
+      model_ids: modelIds,
+      ...options
+    }
+  )
+  return response.data
+}

frontend/src/api/endpoints/providers.ts

@@ -1,5 +1,5 @@
 import client from '../client'
-import type { ProviderWithEndpointsSummary } from './types'
+import type { ProviderWithEndpointsSummary, ProxyConfig } from './types'
 
 /**
  * 获取 Providers 摘要（包含 Endpoints 统计）
@@ -23,7 +23,7 @@ export async function getProvider(providerId: string): Promise<ProviderWithEndpo
 export async function updateProvider(
   providerId: string,
   data: Partial<{
-    display_name: string
+    name: string
     description: string
     website: string
     provider_priority: number
@@ -33,6 +33,10 @@ export async function updateProvider(
     quota_last_reset_at: string  // 周期开始时间
     quota_expires_at: string
     rpm_limit: number | null
+    // 请求配置（从 Endpoint 迁移）
+    timeout: number
+    max_retries: number
+    proxy: ProxyConfig | null
     cache_ttl_minutes: number  // 0表示不支持缓存，>0表示支持缓存并设置TTL(分钟)
     max_probe_interval_minutes: number
     is_active: boolean
@@ -58,3 +62,36 @@ export async function deleteProvider(providerId: string): Promise<{ message: str
   return response.data
 }
 
+/**
+ * 测试模型连接性
+ */
+export interface TestModelRequest {
+  provider_id: string
+  model_name: string
+  api_key_id?: string
+  message?: string
+  api_format?: string
+}
+
+export interface TestModelResponse {
+  success: boolean
+  error?: string
+  data?: {
+    response?: {
+      status_code?: number
+      error?: string | { message?: string }
+      choices?: Array<{ message?: { content?: string } }>
+    }
+    content_preview?: string
+  }
+  provider?: {
+    id: string
+    name: string
+  }
+  model?: string
+}
+
+export async function testModel(data: TestModelRequest): Promise<TestModelResponse> {
+  const response = await client.post('/api/admin/provider-query/test-model', data)
+  return response.data
+}

frontend/src/api/endpoints/types.ts

@@ -1,3 +1,67 @@
+// API 格式常量
+export const API_FORMATS = {
+  CLAUDE: 'CLAUDE',
+  CLAUDE_CLI: 'CLAUDE_CLI',
+  OPENAI: 'OPENAI',
+  OPENAI_CLI: 'OPENAI_CLI',
+  GEMINI: 'GEMINI',
+  GEMINI_CLI: 'GEMINI_CLI',
+} as const
+
+export type APIFormat = typeof API_FORMATS[keyof typeof API_FORMATS]
+
+// API 格式显示名称映射（按品牌分组：API 在前，CLI 在后）
+export const API_FORMAT_LABELS: Record<string, string> = {
+  [API_FORMATS.CLAUDE]: 'Claude',
+  [API_FORMATS.CLAUDE_CLI]: 'Claude CLI',
+  [API_FORMATS.OPENAI]: 'OpenAI',
+  [API_FORMATS.OPENAI_CLI]: 'OpenAI CLI',
+  [API_FORMATS.GEMINI]: 'Gemini',
+  [API_FORMATS.GEMINI_CLI]: 'Gemini CLI',
+}
+
+// API 格式缩写映射（用于空间紧凑的显示场景）
+export const API_FORMAT_SHORT: Record<string, string> = {
+  [API_FORMATS.OPENAI]: 'O',
+  [API_FORMATS.OPENAI_CLI]: 'OC',
+  [API_FORMATS.CLAUDE]: 'C',
+  [API_FORMATS.CLAUDE_CLI]: 'CC',
+  [API_FORMATS.GEMINI]: 'G',
+  [API_FORMATS.GEMINI_CLI]: 'GC',
+}
+
+// API 格式排序顺序（统一的显示顺序）
+export const API_FORMAT_ORDER: string[] = [
+  API_FORMATS.OPENAI,
+  API_FORMATS.OPENAI_CLI,
+  API_FORMATS.CLAUDE,
+  API_FORMATS.CLAUDE_CLI,
+  API_FORMATS.GEMINI,
+  API_FORMATS.GEMINI_CLI,
+]
+
+// 工具函数：按标准顺序排序 API 格式数组
+export function sortApiFormats(formats: string[]): string[] {
+  return [...formats].sort((a, b) => {
+    const aIdx = API_FORMAT_ORDER.indexOf(a)
+    const bIdx = API_FORMAT_ORDER.indexOf(b)
+    if (aIdx === -1 && bIdx === -1) return 0
+    if (aIdx === -1) return 1
+    if (bIdx === -1) return -1
+    return aIdx - bIdx
+  })
+}
+
+/**
+ * 代理配置类型
+ */
+export interface ProxyConfig {
+  url: string
+  username?: string
+  password?: string
+  enabled?: boolean  // 是否启用代理（false 时保留配置但不使用）
+}
+
 export interface ProviderEndpoint {
   id: string
   provider_id: string
@@ -5,45 +69,67 @@ export interface ProviderEndpoint {
   api_format: string
   base_url: string
   custom_path?: string  // 自定义请求路径（可选，为空则使用 API 格式默认路径）
-  auth_type: string
-  auth_header?: string
   headers?: Record<string, string>
   timeout: number
   max_retries: number
-  priority: number
-  weight: number
-  max_concurrent?: number
-  rate_limit?: number
-  health_score: number
-  consecutive_failures: number
-  last_failure_at?: string
   is_active: boolean
   config?: Record<string, any>
+  proxy?: ProxyConfig | null
   total_keys: number
   active_keys: number
   created_at: string
   updated_at: string
 }
 
+/**
+ * 模型权限配置类型（支持简单列表和按格式字典两种模式）
+ *
+ * 使用示例：
+ * 1. 不限制（允许所有模型）: null
+ * 2. 简单列表模式（所有 API 格式共享同一个白名单）: ["gpt-4", "claude-3-opus"]
+ * 3. 按格式字典模式（不同 API 格式使用不同的白名单）:
+ *    { "OPENAI": ["gpt-4"], "CLAUDE": ["claude-3-opus"] }
+ */
+export type AllowedModels = string[] | Record<string, string[]> | null
+
+// AllowedModels 类型守卫函数
+export function isAllowedModelsList(value: AllowedModels): value is string[] {
+  return Array.isArray(value)
+}
+
+export function isAllowedModelsDict(value: AllowedModels): value is Record<string, string[]> {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+    return false
+  }
+  // 验证所有值都是字符串数组
+  return Object.values(value).every(
+    (v) => Array.isArray(v) && v.every((item) => typeof item === 'string')
+  )
+}
+
 export interface EndpointAPIKey {
   id: string
-  endpoint_id: string
+  provider_id: string
+  api_formats: string[]  // 支持的 API 格式列表
   api_key_masked: string
   api_key_plain?: string | null
   name: string  // 密钥名称（必填，用于识别）
-  rate_multiplier: number  // 成本倍率（真实成本 = 表面成本 × 倍率）
-  internal_priority: number  // Endpoint 内部优先级
+  rate_multiplier: number  // 默认成本倍率（真实成本 = 表面成本 × 倍率）
+  rate_multipliers?: Record<string, number> | null  // 按 API 格式的成本倍率，如 {"CLAUDE": 1.0, "OPENAI": 0.8}
+  internal_priority: number  // Key 内部优先级
   global_priority?: number | null  // 全局 Key 优先级
-  max_concurrent?: number
-  rate_limit?: number
-  daily_limit?: number
-  monthly_limit?: number
-  allowed_models?: string[] | null  // 允许使用的模型列表（null = 支持所有模型）
+  rpm_limit?: number | null  // RPM 速率限制 (1-10000)，null 表示自适应模式
+  allowed_models?: AllowedModels  // 允许使用的模型列表（null=不限制，列表=简单白名单，字典=按格式区分）
   capabilities?: Record<string, boolean> | null  // 能力标签配置（如 cache_1h, context_1m）
   // 缓存与熔断配置
   cache_ttl_minutes: number  // 缓存 TTL（分钟），0=禁用
   max_probe_interval_minutes: number  // 熔断探测间隔（分钟）
+  // 按格式的健康度数据
+  health_by_format?: Record<string, FormatHealthData>
+  circuit_breaker_by_format?: Record<string, FormatCircuitBreakerData>
+  // 聚合字段（从 health_by_format 计算，用于列表显示）
   health_score: number
+  circuit_breaker_open?: boolean
   consecutive_failures: number
   last_failure_at?: string
   request_count: number
@@ -56,10 +142,10 @@ export interface EndpointAPIKey {
   last_used_at?: string
   created_at: string
   updated_at: string
-  // 自适应并发字段
-  is_adaptive?: boolean  // 是否为自适应模式（max_concurrent=NULL）
-  effective_limit?: number  // 当前有效限制（自适应使用学习值，固定使用配置值）
-  learned_max_concurrent?: number
+  // 自适应 RPM 字段
+  is_adaptive?: boolean  // 是否为自适应模式（rpm_limit=NULL）
+  effective_limit?: number  // 当前有效 RPM 限制（自适应使用学习值，固定使用配置值）
+  learned_rpm_limit?: number  // 学习到的 RPM 限制
   // 滑动窗口利用率采样
   utilization_samples?: Array<{ ts: number; util: number }>  // 利用率采样窗口
   last_probe_increase_at?: string  // 上次探测性扩容时间
@@ -67,8 +153,7 @@ export interface EndpointAPIKey {
   rpm_429_count?: number
   last_429_at?: string
   last_429_type?: string
-  // 熔断器字段（滑动窗口 + 半开模式）
-  circuit_breaker_open?: boolean
+  // 单格式场景的熔断器字段
   circuit_breaker_open_at?: string
   next_probe_at?: string
   half_open_until?: string
@@ -77,6 +162,43 @@ export interface EndpointAPIKey {
   request_results_window?: Array<{ ts: number; ok: boolean }>  // 请求结果滑动窗口
 }
 
+// 按格式的健康度数据
+export interface FormatHealthData {
+  health_score: number
+  error_rate: number
+  window_size: number
+  consecutive_failures: number
+  last_failure_at?: string | null
+  circuit_breaker: FormatCircuitBreakerData
+}
+
+// 按格式的熔断器数据
+export interface FormatCircuitBreakerData {
+  open: boolean
+  open_at?: string | null
+  next_probe_at?: string | null
+  half_open_until?: string | null
+  half_open_successes: number
+  half_open_failures: number
+}
+
+export interface EndpointAPIKeyUpdate {
+  api_formats?: string[]  // 支持的 API 格式列表
+  name?: string
+  api_key?: string  // 仅在需要更新时提供
+  rate_multiplier?: number  // 默认成本倍率
+  rate_multipliers?: Record<string, number> | null  // 按 API 格式的成本倍率
+  internal_priority?: number
+  global_priority?: number | null
+  rpm_limit?: number | null  // RPM 速率限制 (1-10000)，null 表示切换为自适应模式
+  allowed_models?: AllowedModels
+  capabilities?: Record<string, boolean> | null
+  cache_ttl_minutes?: number
+  max_probe_interval_minutes?: number
+  note?: string
+  is_active?: boolean
+}
+
 export interface EndpointHealthDetail {
   api_format: string
   health_score: number
@@ -147,7 +269,6 @@ export interface PublicEndpointStatusMonitorResponse {
 export interface ProviderWithEndpointsSummary {
   id: string
   name: string
-  display_name: string
   description?: string
   website?: string
   provider_priority: number
@@ -157,9 +278,10 @@ export interface ProviderWithEndpointsSummary {
   quota_reset_day?: number
   quota_last_reset_at?: string  // 当前周期开始时间
   quota_expires_at?: string
-  rpm_limit?: number | null
-  rpm_used?: number
-  rpm_reset_at?: string
+  // 请求配置（从 Endpoint 迁移）
+  timeout?: number  // 请求超时（秒）
+  max_retries?: number  // 最大重试次数
+  proxy?: ProxyConfig | null  // 代理配置
   is_active: boolean
   total_endpoints: number
   active_endpoints: number
@@ -202,20 +324,27 @@ export interface HealthSummary {
   }
 }
 
-export interface ConcurrencyStatus {
-  endpoint_id?: string
-  endpoint_current_concurrency: number
-  endpoint_max_concurrent?: number
-  key_id?: string
-  key_current_concurrency: number
-  key_max_concurrent?: number
+export interface KeyRpmStatus {
+  key_id: string
+  current_rpm: number
+  rpm_limit?: number
 }
 
+export interface ProviderModelMapping {
+  name: string
+  priority: number  // 优先级（数字越小优先级越高）
+  api_formats?: string[]  // 作用域（适用的 API 格式），为空表示对所有格式生效
+}
+
+// 保留别名以保持向后兼容
+export type ProviderModelAlias = ProviderModelMapping
+
 export interface Model {
   id: string
   provider_id: string
   global_model_id?: string  // 关联的 GlobalModel ID
-  provider_model_name: string  // Provider 侧的模型名称（原 name）
+  provider_model_name: string  // Provider 侧的主模型名称
+  provider_model_mappings?: ProviderModelMapping[] | null  // 模型名称映射列表（带优先级）
   // 原始配置值（可能为空，为空时使用 GlobalModel 默认值）
   price_per_request?: number | null  // 按次计费价格
   tiered_pricing?: TieredPricingConfig | null  // 阶梯计费配置
@@ -244,7 +373,8 @@ export interface Model {
 }
 
 export interface ModelCreate {
-  provider_model_name: string  // Provider 侧的模型名称（原 name）
+  provider_model_name: string  // Provider 侧的主模型名称
+  provider_model_mappings?: ProviderModelMapping[]  // 模型名称映射列表（带优先级）
   global_model_id: string  // 关联的 GlobalModel ID（必填）
   // 计费配置（可选，为空时使用 GlobalModel 默认值）
   price_per_request?: number  // 按次计费价格
@@ -261,6 +391,7 @@ export interface ModelCreate {
 
 export interface ModelUpdate {
   provider_model_name?: string
+  provider_model_mappings?: ProviderModelMapping[] | null  // 模型名称映射列表（带优先级）
   global_model_id?: string
   price_per_request?: number | null  // 按次计费价格（null 表示清空/使用默认值）
   tiered_pricing?: TieredPricingConfig | null  // 阶梯计费配置
@@ -273,21 +404,6 @@ export interface ModelUpdate {
   is_available?: boolean
 }
 
-export interface ModelMapping {
-  id: string
-  source_model: string  // 别名/源模型名
-  target_global_model_id: string  // 目标 GlobalModel ID
-  target_global_model_name: string | null
-  target_global_model_display_name: string | null
-  provider_id: string | null
-  provider_name: string | null
-  scope: 'global' | 'provider'
-  mapping_type: 'alias' | 'mapping'
-  is_active: boolean
-  created_at: string
-  updated_at: string
-}
-
 export interface ModelCapabilities {
   supports_vision: boolean
   supports_function_calling: boolean
@@ -313,7 +429,6 @@ export interface ModelPriceRange {
 export interface ModelCatalogProviderDetail {
   provider_id: string
   provider_name: string
-  provider_display_name?: string | null
   model_id?: string | null
   target_model: string
   input_price_per_1m?: number | null
@@ -335,7 +450,6 @@ export interface ModelCatalogItem {
   global_model_name: string  // GlobalModel.name（原 source_model）
   display_name: string  // GlobalModel.display_name
   description?: string | null  // GlobalModel.description
-  aliases: string[]  // 所有指向该 GlobalModel 的别名列表
   providers: ModelCatalogProviderDetail[]  // 支持该模型的 Provider 列表
   price_range: ModelPriceRange  // 价格区间
   total_providers: number
@@ -351,8 +465,6 @@ export interface ProviderAvailableSourceModel {
   global_model_name: string  // GlobalModel.name（原 source_model）
   display_name: string  // GlobalModel.display_name
   provider_model_name: string  // Model.provider_model_name（Provider 侧的模型名）
-  has_alias: boolean  // 是否有别名指向该 GlobalModel
-  aliases: string[]  // 别名列表
   model_id?: string | null  // Model.id
   price: ProviderModelPriceInfo
   capabilities: ModelCapabilities
@@ -371,65 +483,6 @@ export interface BatchAssignProviderConfig {
   model_id?: string
 }
 
-export interface BatchAssignModelMappingRequest {
-  global_model_id: string  // 要分配的 GlobalModel ID（原 source_model）
-  providers: BatchAssignProviderConfig[]
-}
-
-export interface BatchAssignProviderResult {
-  provider_id: string
-  mapping_id?: string | null
-  created_model: boolean
-  model_id?: string | null
-  updated: boolean
-}
-
-export interface BatchAssignError {
-  provider_id: string
-  error: string
-}
-
-export interface BatchAssignModelMappingResponse {
-  success: boolean
-  created_mappings: BatchAssignProviderResult[]
-  errors: BatchAssignError[]
-}
-
-export interface ModelMappingCreate {
-  source_model: string  // 源模型名或别名
-  target_global_model_id: string  // 目标 GlobalModel ID
-  provider_id?: string | null
-  mapping_type?: 'alias' | 'mapping'
-  is_active?: boolean
-}
-
-export interface ModelMappingUpdate {
-  source_model?: string  // 源模型名或别名
-  target_global_model_id?: string  // 目标 GlobalModel ID
-  provider_id?: string | null
-  mapping_type?: 'alias' | 'mapping'
-  is_active?: boolean
-}
-
-export interface UpdateModelMappingRequest {
-  source_model?: string
-  target_global_model_id?: string
-  provider_id?: string | null
-  mapping_type?: 'alias' | 'mapping'
-  is_active?: boolean
-}
-
-export interface UpdateModelMappingResponse {
-  success: boolean
-  mapping_id: string
-  message?: string
-}
-
-export interface DeleteModelMappingResponse {
-  success: boolean
-  message?: string
-}
-
 export interface AdaptiveStatsResponse {
   adaptive_mode: boolean
   current_limit: number | null
@@ -476,67 +529,45 @@ export interface TieredPricingConfig {
 export interface GlobalModelCreate {
   name: string
   display_name: string
-  description?: string
-  official_url?: string
-  icon_url?: string
   // 按次计费配置（可选，与阶梯计费叠加）
   default_price_per_request?: number
   // 阶梯计费配置（必填，固定价格用单阶梯表示）
   default_tiered_pricing: TieredPricingConfig
-  // 默认能力配置
-  default_supports_vision?: boolean
-  default_supports_function_calling?: boolean
-  default_supports_streaming?: boolean
-  default_supports_extended_thinking?: boolean
-  default_supports_image_generation?: boolean
   // Key 能力配置 - 模型支持的能力列表
   supported_capabilities?: string[]
+  // 模型配置（JSON格式）- 包含能力、规格、元信息等
+  config?: Record<string, any>
   is_active?: boolean
 }
 
 export interface GlobalModelUpdate {
   display_name?: string
-  description?: string
-  official_url?: string
-  icon_url?: string
   is_active?: boolean
   // 按次计费配置
   default_price_per_request?: number | null  // null 表示清空
   // 阶梯计费配置
   default_tiered_pricing?: TieredPricingConfig
-  // 默认能力配置
-  default_supports_vision?: boolean
-  default_supports_function_calling?: boolean
-  default_supports_streaming?: boolean
-  default_supports_extended_thinking?: boolean
-  default_supports_image_generation?: boolean
   // Key 能力配置 - 模型支持的能力列表
   supported_capabilities?: string[] | null
+  // 模型配置（JSON格式）- 包含能力、规格、元信息等
+  config?: Record<string, any> | null
 }
 
 export interface GlobalModelResponse {
   id: string
   name: string
   display_name: string
-  description?: string
-  official_url?: string
-  icon_url?: string
   is_active: boolean
   // 按次计费配置
   default_price_per_request?: number
   // 阶梯计费配置（必填）
   default_tiered_pricing: TieredPricingConfig
-  // 默认能力配置
-  default_supports_vision?: boolean
-  default_supports_function_calling?: boolean
-  default_supports_streaming?: boolean
-  default_supports_extended_thinking?: boolean
-  default_supports_image_generation?: boolean
   // Key 能力配置 - 模型支持的能力列表
   supported_capabilities?: string[] | null
+  // 模型配置（JSON格式）
+  config?: Record<string, any> | null
   // 统计数据
   provider_count?: number
-  alias_count?: number
   usage_count?: number
   created_at: string
   updated_at?: string
@@ -552,3 +583,42 @@ export interface GlobalModelListResponse {
   models: GlobalModelResponse[]
   total: number
 }
+
+// ==================== 上游模型导入相关 ====================
+
+/**
+ * 上游模型（从提供商 API 获取的原始模型）
+ */
+export interface UpstreamModel {
+  id: string
+  owned_by?: string
+  display_name?: string
+  api_format?: string
+}
+
+/**
+ * 导入成功的模型信息
+ */
+export interface ImportFromUpstreamSuccessItem {
+  model_id: string
+  provider_model_id: string
+  global_model_id?: string  // 可选，未关联时为空字符串
+  global_model_name?: string  // 可选，未关联时为空字符串
+  created_global_model: boolean  // 始终为 false（不再自动创建 GlobalModel）
+}
+
+/**
+ * 导入失败的模型信息
+ */
+export interface ImportFromUpstreamErrorItem {
+  model_id: string
+  error: string
+}
+
+/**
+ * 从上游提供商导入模型响应
+ */
+export interface ImportFromUpstreamResponse {
+  success: ImportFromUpstreamSuccessItem[]
+  errors: ImportFromUpstreamErrorItem[]
+}

frontend/src/api/global-models.ts

@@ -20,4 +20,5 @@ export {
   updateGlobalModel,
   deleteGlobalModel,
   batchAssignToProviders,
+  getGlobalModelProviders,
 } from './endpoints/global-models'

frontend/src/api/management-tokens.ts

@@ -0,0 +1,203 @@
+/**
+ * Management Token API
+ */
+
+import apiClient from './client'
+
+// ============== 类型定义 ==============
+
+export interface ManagementToken {
+  id: string
+  user_id: string
+  name: string
+  description?: string
+  token_display: string
+  allowed_ips?: string[] | null
+  expires_at?: string | null
+  last_used_at?: string | null
+  last_used_ip?: string | null
+  usage_count: number
+  is_active: boolean
+  created_at: string
+  updated_at: string
+  user?: {
+    id: string
+    email: string
+    username: string
+    role: string
+  }
+}
+
+export interface CreateManagementTokenRequest {
+  name: string
+  description?: string
+  allowed_ips?: string[]
+  expires_at?: string | null
+}
+
+export interface CreateManagementTokenResponse {
+  message: string
+  token: string
+  data: ManagementToken
+}
+
+export interface UpdateManagementTokenRequest {
+  name?: string
+  description?: string | null
+  allowed_ips?: string[] | null
+  expires_at?: string | null
+  is_active?: boolean
+}
+
+export interface ManagementTokenListResponse {
+  items: ManagementToken[]
+  total: number
+  skip: number
+  limit: number
+  quota?: {
+    used: number
+    max: number
+  }
+}
+
+// ============== 用户自助管理 API ==============
+
+export const managementTokenApi = {
+  /**
+   * 列出当前用户的 Management Tokens
+   */
+  async listTokens(params?: {
+    is_active?: boolean
+    skip?: number
+    limit?: number
+  }): Promise<ManagementTokenListResponse> {
+    const response = await apiClient.get<ManagementTokenListResponse>(
+      '/api/me/management-tokens',
+      { params }
+    )
+    return response.data
+  },
+
+  /**
+   * 创建 Management Token
+   */
+  async createToken(
+    data: CreateManagementTokenRequest
+  ): Promise<CreateManagementTokenResponse> {
+    const response = await apiClient.post<CreateManagementTokenResponse>(
+      '/api/me/management-tokens',
+      data
+    )
+    return response.data
+  },
+
+  /**
+   * 获取 Token 详情
+   */
+  async getToken(tokenId: string): Promise<ManagementToken> {
+    const response = await apiClient.get<ManagementToken>(
+      `/api/me/management-tokens/${tokenId}`
+    )
+    return response.data
+  },
+
+  /**
+   * 更新 Token
+   */
+  async updateToken(
+    tokenId: string,
+    data: UpdateManagementTokenRequest
+  ): Promise<{ message: string; data: ManagementToken }> {
+    const response = await apiClient.put<{ message: string; data: ManagementToken }>(
+      `/api/me/management-tokens/${tokenId}`,
+      data
+    )
+    return response.data
+  },
+
+  /**
+   * 删除 Token
+   */
+  async deleteToken(tokenId: string): Promise<{ message: string }> {
+    const response = await apiClient.delete<{ message: string }>(
+      `/api/me/management-tokens/${tokenId}`
+    )
+    return response.data
+  },
+
+  /**
+   * 切换 Token 状态
+   */
+  async toggleToken(
+    tokenId: string
+  ): Promise<{ message: string; data: ManagementToken }> {
+    const response = await apiClient.patch<{ message: string; data: ManagementToken }>(
+      `/api/me/management-tokens/${tokenId}/status`
+    )
+    return response.data
+  },
+
+  /**
+   * 重新生成 Token
+   */
+  async regenerateToken(
+    tokenId: string
+  ): Promise<{ token: string; data: ManagementToken }> {
+    const response = await apiClient.post<{ token: string; data: ManagementToken }>(
+      `/api/me/management-tokens/${tokenId}/regenerate`
+    )
+    return response.data
+  }
+}
+
+// ============== 管理员 API ==============
+
+export const adminManagementTokenApi = {
+  /**
+   * 列出所有 Management Tokens（管理员）
+   */
+  async listAllTokens(params?: {
+    user_id?: string
+    is_active?: boolean
+    skip?: number
+    limit?: number
+  }): Promise<ManagementTokenListResponse> {
+    const response = await apiClient.get<ManagementTokenListResponse>(
+      '/api/admin/management-tokens',
+      { params }
+    )
+    return response.data
+  },
+
+  /**
+   * 获取 Token 详情（管理员）
+   */
+  async getToken(tokenId: string): Promise<ManagementToken> {
+    const response = await apiClient.get<ManagementToken>(
+      `/api/admin/management-tokens/${tokenId}`
+    )
+    return response.data
+  },
+
+  /**
+   * 删除任意 Token（管理员）
+   */
+  async deleteToken(tokenId: string): Promise<{ message: string }> {
+    const response = await apiClient.delete<{ message: string }>(
+      `/api/admin/management-tokens/${tokenId}`
+    )
+    return response.data
+  },
+
+  /**
+   * 切换任意 Token 状态（管理员）
+   */
+  async toggleToken(
+    tokenId: string
+  ): Promise<{ message: string; data: ManagementToken }> {
+    const response = await apiClient.patch<{ message: string; data: ManagementToken }>(
+      `/api/admin/management-tokens/${tokenId}/status`
+    )
+    return response.data
+  }
+}

frontend/src/api/me.ts

@@ -62,6 +62,11 @@ export interface UsageRecordDetail {
   cache_creation_price_per_1m?: number
   cache_read_price_per_1m?: number
   price_per_request?: number  // 按次计费价格
+  api_key?: {
+    id: string
+    name: string
+    display: string
+  }
 }
 
 // 模型统计接口
@@ -75,6 +80,16 @@ export interface ModelSummary {
   actual_total_cost_usd?: number  // 倍率消耗（仅管理员可见）
 }
 
+// 提供商统计接口
+export interface ProviderSummary {
+  provider: string
+  requests: number
+  total_tokens: number
+  total_cost_usd: number
+  success_rate: number | null
+  avg_response_time_ms: number | null
+}
+
 // 使用统计响应接口
 export interface UsageResponse {
   total_requests: number
@@ -87,6 +102,13 @@ export interface UsageResponse {
   quota_usd: number | null
   used_usd: number
   summary_by_model: ModelSummary[]
+  summary_by_provider?: ProviderSummary[]
+  pagination?: {
+    total: number
+    limit: number
+    offset: number
+    has_more: boolean
+  }
   records: UsageRecordDetail[]
   activity_heatmap?: ActivityHeatmap | null
 }
@@ -175,6 +197,9 @@ export const meApi = {
   async getUsage(params?: {
     start_date?: string
     end_date?: string
+    search?: string  // 通用搜索：密钥名、模型名
+    limit?: number
+    offset?: number
   }): Promise<UsageResponse> {
     const response = await apiClient.get<UsageResponse>('/api/users/me/usage', { params })
     return response.data
@@ -184,11 +209,12 @@ export const meApi = {
   async getActiveRequests(ids?: string): Promise<{
     requests: Array<{
       id: string
-      status: string
+      status: 'pending' | 'streaming' | 'completed' | 'failed'
       input_tokens: number
       output_tokens: number
       cost: number
       response_time_ms: number | null
+      first_byte_time_ms: number | null
     }>
   }> {
     const params = ids ? { ids } : {}
@@ -267,5 +293,14 @@ export const meApi = {
   }> {
     const response = await apiClient.get('/api/users/me/usage/interval-timeline', { params })
     return response.data
+  },
+
+  /**
+   * 获取活跃度热力图数据（用户）
+   * 后端已缓存5分钟
+   */
+  async getActivityHeatmap(): Promise<ActivityHeatmap> {
+    const response = await apiClient.get<ActivityHeatmap>('/api/users/me/usage/heatmap')
+    return response.data
   }
 }

frontend/src/api/models-dev.ts

@@ -0,0 +1,295 @@
+/**
+ * Models.dev API 服务
+ * 通过后端代理获取 models.dev 数据（解决跨域问题）
+ */
+
+import api from './client'
+
+// 缓存配置
+const CACHE_KEY = 'models_dev_cache'
+const CACHE_DURATION = 15 * 60 * 1000 // 15 分钟
+
+// Models.dev API 数据结构
+export interface ModelsDevCost {
+  input?: number
+  output?: number
+  reasoning?: number
+  cache_read?: number
+}
+
+export interface ModelsDevLimit {
+  context?: number
+  output?: number
+}
+
+export interface ModelsDevModel {
+  id: string
+  name: string
+  family?: string
+  reasoning?: boolean
+  tool_call?: boolean
+  structured_output?: boolean
+  temperature?: boolean
+  attachment?: boolean
+  knowledge?: string
+  release_date?: string
+  last_updated?: string
+  input?: string[] // 输入模态: text, image, audio, video, pdf
+  output?: string[] // 输出模态: text, image, audio
+  open_weights?: boolean
+  cost?: ModelsDevCost
+  limit?: ModelsDevLimit
+  deprecated?: boolean
+}
+
+export interface ModelsDevProvider {
+  id: string
+  env?: string[]
+  npm?: string
+  api?: string
+  name: string
+  doc?: string
+  models: Record<string, ModelsDevModel>
+  official?: boolean // 是否为官方提供商
+}
+
+export type ModelsDevData = Record<string, ModelsDevProvider>
+
+// 扁平化的模型列表项（用于搜索和选择）
+export interface ModelsDevModelItem {
+  providerId: string
+  providerName: string
+  modelId: string
+  modelName: string
+  family?: string
+  inputPrice?: number
+  outputPrice?: number
+  contextLimit?: number
+  outputLimit?: number
+  supportsVision?: boolean
+  supportsToolCall?: boolean
+  supportsReasoning?: boolean
+  supportsStructuredOutput?: boolean
+  supportsTemperature?: boolean
+  supportsAttachment?: boolean
+  openWeights?: boolean
+  deprecated?: boolean
+  official?: boolean // 是否来自官方提供商
+  // 用于 display_metadata 的额外字段
+  knowledgeCutoff?: string
+  releaseDate?: string
+  inputModalities?: string[]
+  outputModalities?: string[]
+}
+
+interface CacheData {
+  timestamp: number
+  data: ModelsDevData
+}
+
+// 内存缓存
+let memoryCache: CacheData | null = null
+
+function hasOfficialFlag(data: ModelsDevData): boolean {
+  return Object.values(data).some(provider => typeof provider?.official === 'boolean')
+}
+
+/**
+ * 获取 models.dev 数据（带缓存）
+ */
+export async function getModelsDevData(): Promise<ModelsDevData> {
+  // 1. 检查内存缓存
+  if (memoryCache && Date.now() - memoryCache.timestamp < CACHE_DURATION) {
+    // 兼容旧缓存：没有 official 字段时丢弃，强制刷新一次
+    if (hasOfficialFlag(memoryCache.data)) {
+      return memoryCache.data
+    }
+    memoryCache = null
+  }
+
+  // 2. 检查 localStorage 缓存
+  try {
+    const cached = localStorage.getItem(CACHE_KEY)
+    if (cached) {
+      const cacheData: CacheData = JSON.parse(cached)
+      if (Date.now() - cacheData.timestamp < CACHE_DURATION) {
+        // 兼容旧缓存：没有 official 字段时丢弃，强制刷新一次
+        if (hasOfficialFlag(cacheData.data)) {
+          memoryCache = cacheData
+          return cacheData.data
+        }
+        localStorage.removeItem(CACHE_KEY)
+      }
+    }
+  } catch {
+    // 缓存解析失败，忽略
+  }
+
+  // 3. 从后端代理获取新数据
+  const response = await api.get<ModelsDevData>('/api/admin/models/external')
+  const data = response.data
+
+  // 4. 更新缓存
+  const cacheData: CacheData = {
+    timestamp: Date.now(),
+    data,
+  }
+  memoryCache = cacheData
+  try {
+    localStorage.setItem(CACHE_KEY, JSON.stringify(cacheData))
+  } catch {
+    // localStorage 写入失败，忽略
+  }
+
+  return data
+}
+
+// 模型列表缓存（避免重复转换）
+let modelsListCache: ModelsDevModelItem[] | null = null
+let modelsListCacheTimestamp: number | null = null
+
+/**
+ * 获取扁平化的模型列表
+ * 数据只加载一次，通过参数过滤官方/全部
+ */
+export async function getModelsDevList(officialOnly: boolean = true): Promise<ModelsDevModelItem[]> {
+  const data = await getModelsDevData()
+  const currentTimestamp = memoryCache?.timestamp ?? 0
+
+  // 如果缓存为空或数据已刷新，构建一次
+  if (!modelsListCache || modelsListCacheTimestamp !== currentTimestamp) {
+    const items: ModelsDevModelItem[] = []
+
+    for (const [providerId, provider] of Object.entries(data)) {
+      if (!provider.models) continue
+
+      for (const [modelId, model] of Object.entries(provider.models)) {
+        items.push({
+          providerId,
+          providerName: provider.name,
+          modelId,
+          modelName: model.name || modelId,
+          family: model.family,
+          inputPrice: model.cost?.input,
+          outputPrice: model.cost?.output,
+          contextLimit: model.limit?.context,
+          outputLimit: model.limit?.output,
+          supportsVision: model.input?.includes('image'),
+          supportsToolCall: model.tool_call,
+          supportsReasoning: model.reasoning,
+          supportsStructuredOutput: model.structured_output,
+          supportsTemperature: model.temperature,
+          supportsAttachment: model.attachment,
+          openWeights: model.open_weights,
+          deprecated: model.deprecated,
+          official: provider.official,
+          // display_metadata 相关字段
+          knowledgeCutoff: model.knowledge,
+          releaseDate: model.release_date,
+          inputModalities: model.input,
+          outputModalities: model.output,
+        })
+      }
+    }
+
+    // 按 provider 名称排序，provider 中的模型按 release_date 从近到远排序
+    items.sort((a, b) => {
+      const providerCompare = a.providerName.localeCompare(b.providerName)
+      if (providerCompare !== 0) return providerCompare
+      
+      // 模型按 release_date 从近到远排序（没有日期的排到最后）
+      const aDate = a.releaseDate ? new Date(a.releaseDate).getTime() : 0
+      const bDate = b.releaseDate ? new Date(b.releaseDate).getTime() : 0
+      if (aDate !== bDate) return bDate - aDate // 降序：新的在前
+      
+      // 日期相同或都没有日期时，按模型名称排序
+      return a.modelName.localeCompare(b.modelName)
+    })
+
+    modelsListCache = items
+    modelsListCacheTimestamp = currentTimestamp
+  }
+
+  // 根据参数过滤
+  if (officialOnly) {
+    return modelsListCache.filter(m => m.official)
+  }
+  return modelsListCache
+}
+
+/**
+ * 搜索模型
+ * 搜索时包含所有提供商（包括第三方）
+ */
+export async function searchModelsDevModels(
+  query: string,
+  options?: {
+    limit?: number
+    excludeDeprecated?: boolean
+  }
+): Promise<ModelsDevModelItem[]> {
+  // 搜索时包含全部提供商
+  const allModels = await getModelsDevList(false)
+  const { limit = 50, excludeDeprecated = true } = options || {}
+
+  const queryLower = query.toLowerCase()
+
+  const filtered = allModels.filter((model) => {
+    if (excludeDeprecated && model.deprecated) return false
+
+    // 搜索模型 ID、名称、provider 名称、family
+    return (
+      model.modelId.toLowerCase().includes(queryLower) ||
+      model.modelName.toLowerCase().includes(queryLower) ||
+      model.providerName.toLowerCase().includes(queryLower) ||
+      model.family?.toLowerCase().includes(queryLower)
+    )
+  })
+
+  // 排序：精确匹配优先
+  filtered.sort((a, b) => {
+    const aExact =
+      a.modelId.toLowerCase() === queryLower ||
+      a.modelName.toLowerCase() === queryLower
+    const bExact =
+      b.modelId.toLowerCase() === queryLower ||
+      b.modelName.toLowerCase() === queryLower
+    if (aExact && !bExact) return -1
+    if (!aExact && bExact) return 1
+    return 0
+  })
+
+  return filtered.slice(0, limit)
+}
+
+/**
+ * 获取特定模型详情
+ */
+export async function getModelsDevModel(
+  providerId: string,
+  modelId: string
+): Promise<ModelsDevModel | null> {
+  const data = await getModelsDevData()
+  return data[providerId]?.models?.[modelId] || null
+}
+
+/**
+ * 获取 provider logo URL
+ */
+export function getProviderLogoUrl(providerId: string): string {
+  return `https://models.dev/logos/${providerId}.svg`
+}
+
+/**
+ * 清除缓存
+ */
+export function clearModelsDevCache(): void {
+  memoryCache = null
+  modelsListCache = null
+  modelsListCacheTimestamp = null
+  try {
+    localStorage.removeItem(CACHE_KEY)
+  } catch {
+    // 忽略错误
+  }
+}

frontend/src/api/public-models.ts

@@ -9,20 +9,14 @@ export interface PublicGlobalModel {
   id: string
   name: string
   display_name: string | null
-  description: string | null
-  icon_url: string | null
   is_active: boolean
   // 阶梯计费配置
   default_tiered_pricing: TieredPricingConfig
   default_price_per_request: number | null  // 按次计费价格
-  // 能力
-  default_supports_vision: boolean
-  default_supports_function_calling: boolean
-  default_supports_streaming: boolean
-  default_supports_extended_thinking: boolean
-  default_supports_image_generation: boolean
   // Key 能力支持
   supported_capabilities: string[] | null
+  // 模型配置（JSON）
+  config: Record<string, any> | null
 }
 
 export interface PublicGlobalModelListResponse {

frontend/src/api/usage.ts

@@ -164,6 +164,7 @@ export const usageApi = {
   async getAllUsageRecords(params?: {
     start_date?: string
     end_date?: string
+    search?: string  // 通用搜索：用户名、密钥名、模型名、提供商名
     user_id?: string // UUID
     username?: string
     model?: string
@@ -193,10 +194,22 @@ export const usageApi = {
       output_tokens: number
       cost: number
       response_time_ms: number | null
+      first_byte_time_ms: number | null
+      provider?: string | null
+      api_key_name?: string | null
     }>
   }> {
     const params = ids?.length ? { ids: ids.join(',') } : {}
     const response = await apiClient.get('/api/admin/usage/active', { params })
     return response.data
+  },
+
+  /**
+   * 获取活跃度热力图数据（管理员）
+   * 后端已缓存5分钟
+   */
+  async getActivityHeatmap(): Promise<ActivityHeatmap> {
+    const response = await apiClient.get<ActivityHeatmap>('/api/admin/usage/heatmap')
+    return response.data
   }
 }

frontend/src/api/users.ts

@@ -10,7 +10,7 @@ export interface User {
   used_usd: number
   total_usd: number
   allowed_providers: string[] | null  // 允许使用的提供商 ID 列表
-  allowed_endpoints: string[] | null  // 允许使用的端点 ID 列表
+  allowed_api_formats: string[] | null  // 允许使用的 API 格式列表
   allowed_models: string[] | null  // 允许使用的模型名称列表
   created_at: string
   updated_at?: string
@@ -23,7 +23,7 @@ export interface CreateUserRequest {
   role?: 'admin' | 'user'
   quota_usd?: number | null
   allowed_providers?: string[] | null
-  allowed_endpoints?: string[] | null
+  allowed_api_formats?: string[] | null
   allowed_models?: string[] | null
 }
 
@@ -34,7 +34,7 @@ export interface UpdateUserRequest {
   quota_usd?: number | null
   password?: string
   allowed_providers?: string[] | null
-  allowed_endpoints?: string[] | null
+  allowed_api_formats?: string[] | null
   allowed_models?: string[] | null
 }
 

frontend/src/components/VerificationCodeInput.vue

@@ -0,0 +1,192 @@
+<template>
+  <div class="verification-code-input">
+    <div class="code-inputs flex gap-2">
+      <input
+        v-for="(digit, index) in digits"
+        :key="index"
+        :ref="(el) => (inputRefs[index] = el as HTMLInputElement)"
+        v-model="digits[index]"
+        type="text"
+        inputmode="numeric"
+        maxlength="1"
+        class="code-digit"
+        :class="{ error: hasError }"
+        @input="handleInput(index, $event)"
+        @keydown="handleKeyDown(index, $event)"
+        @paste="handlePaste"
+      >
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+
+interface Props {
+  modelValue?: string
+  length?: number
+  hasError?: boolean
+}
+
+interface Emits {
+  (e: 'update:modelValue', value: string): void
+  (e: 'complete', value: string): void
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: '',
+  length: 6,
+  hasError: false
+})
+
+const emit = defineEmits<Emits>()
+
+const digits = ref<string[]>(Array(props.length).fill(''))
+const inputRefs = ref<HTMLInputElement[]>([])
+
+// Watch modelValue changes from parent
+watch(
+  () => props.modelValue,
+  (newValue) => {
+    if (newValue.length <= props.length) {
+      digits.value = newValue.split('').concat(Array(props.length - newValue.length).fill(''))
+    }
+  },
+  { immediate: true }
+)
+
+const updateValue = () => {
+  const value = digits.value.join('')
+  emit('update:modelValue', value)
+
+  // Emit complete event when all digits are filled
+  if (value.length === props.length && /^\d+$/.test(value)) {
+    emit('complete', value)
+  }
+}
+
+const handleInput = (index: number, event: Event) => {
+  const input = event.target as HTMLInputElement
+  const value = input.value
+
+  // Only allow digits
+  if (!/^\d*$/.test(value)) {
+    input.value = digits.value[index]
+    return
+  }
+
+  digits.value[index] = value
+
+  // Auto-focus next input
+  if (value && index < props.length - 1) {
+    inputRefs.value[index + 1]?.focus()
+  }
+
+  updateValue()
+}
+
+const handleKeyDown = (index: number, event: KeyboardEvent) => {
+  // Handle backspace
+  if (event.key === 'Backspace') {
+    if (!digits.value[index] && index > 0) {
+      // If current input is empty, move to previous and clear it
+      inputRefs.value[index - 1]?.focus()
+      digits.value[index - 1] = ''
+      updateValue()
+    } else {
+      // Clear current input
+      digits.value[index] = ''
+      updateValue()
+    }
+  }
+  // Handle arrow keys
+  else if (event.key === 'ArrowLeft' && index > 0) {
+    inputRefs.value[index - 1]?.focus()
+  } else if (event.key === 'ArrowRight' && index < props.length - 1) {
+    inputRefs.value[index + 1]?.focus()
+  }
+}
+
+const handlePaste = (event: ClipboardEvent) => {
+  event.preventDefault()
+  const pastedData = event.clipboardData?.getData('text') || ''
+  const cleanedData = pastedData.replace(/\D/g, '').slice(0, props.length)
+
+  if (cleanedData) {
+    digits.value = cleanedData.split('').concat(Array(props.length - cleanedData.length).fill(''))
+    updateValue()
+
+    // Focus the next empty input or the last input
+    const nextEmptyIndex = digits.value.findIndex((d) => !d)
+    const focusIndex = nextEmptyIndex >= 0 ? nextEmptyIndex : props.length - 1
+    inputRefs.value[focusIndex]?.focus()
+  }
+}
+
+// Expose method to clear inputs
+const clear = () => {
+  digits.value = Array(props.length).fill('')
+  inputRefs.value[0]?.focus()
+  updateValue()
+}
+
+// Expose method to focus first input
+const focus = () => {
+  inputRefs.value[0]?.focus()
+}
+
+defineExpose({
+  clear,
+  focus
+})
+</script>
+
+<style scoped>
+.code-inputs {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.code-digit {
+  width: 3rem;
+  height: 3.5rem;
+  text-align: center;
+  font-size: 1.5rem;
+  font-weight: 600;
+  border: 2px solid hsl(var(--border));
+  border-radius: var(--radius);
+  background-color: hsl(var(--background));
+  color: hsl(var(--foreground));
+  transition: all 0.2s;
+}
+
+.code-digit:focus {
+  outline: none;
+  border-color: hsl(var(--primary));
+  box-shadow: 0 0 0 3px hsl(var(--primary) / 0.1);
+}
+
+.code-digit:hover:not(:focus) {
+  border-color: hsl(var(--primary) / 0.5);
+}
+
+.code-digit.error {
+  border-color: hsl(var(--destructive));
+}
+
+.code-digit.error:focus {
+  box-shadow: 0 0 0 3px hsl(var(--destructive) / 0.1);
+}
+
+/* Prevent spinner buttons on number inputs */
+.code-digit::-webkit-outer-spin-button,
+.code-digit::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+.code-digit[type='number'] {
+  -moz-appearance: textfield;
+}
+</style>

frontend/src/components/charts/ScatterChart.vue

@@ -299,7 +299,7 @@ function formatDuration(ms: number): string {
   const hours = Math.floor(ms / (1000 * 60 * 60))
   const minutes = Math.floor((ms % (1000 * 60 * 60)) / (1000 * 60))
   if (hours > 0) {
-    return `${hours}h${minutes > 0 ? minutes + 'm' : ''}`
+    return `${hours}h${minutes > 0 ? `${minutes}m` : ''}`
   }
   return `${minutes}m`
 }

frontend/src/components/common/ModelMultiSelect.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="space-y-2">
+    <Label class="text-sm font-medium">允许的模型</Label>
+    <div class="relative">
+      <button
+        type="button"
+        class="w-full h-10 px-3 border rounded-lg bg-background text-left flex items-center justify-between hover:bg-muted/50 transition-colors"
+        @click="isOpen = !isOpen"
+      >
+        <span :class="modelValue.length ? 'text-foreground' : 'text-muted-foreground'">
+          {{ modelValue.length ? `已选择 ${modelValue.length} 个` : '全部可用' }}
+          <span
+            v-if="invalidModels.length"
+            class="text-destructive"
+          >({{ invalidModels.length }} 个已失效)</span>
+        </span>
+        <ChevronDown
+          class="h-4 w-4 text-muted-foreground transition-transform"
+          :class="isOpen ? 'rotate-180' : ''"
+        />
+      </button>
+      <div
+        v-if="isOpen"
+        class="fixed inset-0 z-[80]"
+        @click.stop="isOpen = false"
+      />
+      <div
+        v-if="isOpen"
+        class="absolute z-[90] w-full mt-1 bg-popover border rounded-lg shadow-lg max-h-48 overflow-y-auto"
+      >
+        <!-- 失效模型（置顶显示，只能取消选择） -->
+        <div
+          v-for="modelName in invalidModels"
+          :key="modelName"
+          class="flex items-center gap-2 px-3 py-2 hover:bg-muted/50 cursor-pointer bg-destructive/5"
+          @click="removeModel(modelName)"
+        >
+          <input
+            type="checkbox"
+            :checked="true"
+            class="h-4 w-4 rounded border-gray-300 cursor-pointer"
+            @click.stop
+            @change="removeModel(modelName)"
+          >
+          <span class="text-sm text-destructive">{{ modelName }}</span>
+          <span class="text-xs text-destructive/70">(已失效)</span>
+        </div>
+        <!-- 有效模型 -->
+        <div
+          v-for="model in models"
+          :key="model.name"
+          class="flex items-center gap-2 px-3 py-2 hover:bg-muted/50 cursor-pointer"
+          @click="toggleModel(model.name)"
+        >
+          <input
+            type="checkbox"
+            :checked="modelValue.includes(model.name)"
+            class="h-4 w-4 rounded border-gray-300 cursor-pointer"
+            @click.stop
+            @change="toggleModel(model.name)"
+          >
+          <span class="text-sm">{{ model.name }}</span>
+        </div>
+        <div
+          v-if="models.length === 0 && invalidModels.length === 0"
+          class="px-3 py-2 text-sm text-muted-foreground"
+        >
+          暂无可用模型
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import { Label } from '@/components/ui'
+import { ChevronDown } from 'lucide-vue-next'
+import { useInvalidModels } from '@/composables/useInvalidModels'
+
+export interface ModelWithName {
+  name: string
+}
+
+const props = defineProps<{
+  modelValue: string[]
+  models: ModelWithName[]
+}>()
+
+const emit = defineEmits<{
+  'update:modelValue': [value: string[]]
+}>()
+
+const isOpen = ref(false)
+
+// 检测失效模型
+const { invalidModels } = useInvalidModels(
+  computed(() => props.modelValue),
+  computed(() => props.models)
+)
+
+function toggleModel(name: string) {
+  const newValue = [...props.modelValue]
+  const index = newValue.indexOf(name)
+  if (index === -1) {
+    newValue.push(name)
+  } else {
+    newValue.splice(index, 1)
+  }
+  emit('update:modelValue', newValue)
+}
+
+function removeModel(name: string) {
+  const newValue = props.modelValue.filter(m => m !== name)
+  emit('update:modelValue', newValue)
+}
+</script>

frontend/src/components/common/UpdateDialog.vue

@@ -0,0 +1,112 @@
+<template>
+  <Dialog
+    v-model="isOpen"
+    size="md"
+    title=""
+  >
+    <div class="flex flex-col items-center text-center py-2">
+      <!-- Logo -->
+      <HeaderLogo
+        size="h-16 w-16"
+        class-name="text-primary"
+      />
+
+      <!-- Title -->
+      <h2 class="text-xl font-semibold text-foreground mt-4 mb-2">
+        发现新版本
+      </h2>
+
+      <!-- Version Info -->
+      <div class="flex items-center gap-3 mb-4">
+        <span class="px-3 py-1.5 rounded-lg bg-muted text-sm font-mono text-muted-foreground">
+          v{{ currentVersion }}
+        </span>
+        <svg
+          class="h-4 w-4 text-muted-foreground"
+          fill="none"
+          stroke="currentColor"
+          viewBox="0 0 24 24"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M13 7l5 5m0 0l-5 5m5-5H6"
+          />
+        </svg>
+        <span class="px-3 py-1.5 rounded-lg bg-primary/10 text-sm font-mono font-medium text-primary">
+          v{{ latestVersion }}
+        </span>
+      </div>
+
+      <!-- Description -->
+      <p class="text-sm text-muted-foreground max-w-xs">
+        新版本已发布，建议更新以获得最新功能和安全修复
+      </p>
+    </div>
+
+    <template #footer>
+      <div class="flex w-full gap-3">
+        <Button
+          variant="outline"
+          class="flex-1"
+          @click="handleLater"
+        >
+          稍后提醒
+        </Button>
+        <Button
+          class="flex-1"
+          @click="handleViewRelease"
+        >
+          查看更新
+        </Button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { Dialog } from '@/components/ui'
+import Button from '@/components/ui/button.vue'
+import HeaderLogo from '@/components/HeaderLogo.vue'
+
+const props = defineProps<{
+  modelValue: boolean
+  currentVersion: string
+  latestVersion: string
+  releaseUrl: string | null
+}>()
+
+const emit = defineEmits<{
+  'update:modelValue': [value: boolean]
+}>()
+
+const isOpen = ref(props.modelValue)
+
+watch(() => props.modelValue, (val) => {
+  isOpen.value = val
+})
+
+watch(isOpen, (val) => {
+  emit('update:modelValue', val)
+})
+
+function handleLater() {
+  // 记录忽略的版本，24小时内不再提醒
+  const ignoreKey = 'aether_update_ignore'
+  const ignoreData = {
+    version: props.latestVersion,
+    until: Date.now() + 24 * 60 * 60 * 1000 // 24小时
+  }
+  localStorage.setItem(ignoreKey, JSON.stringify(ignoreData))
+  isOpen.value = false
+}
+
+function handleViewRelease() {
+  if (props.releaseUrl) {
+    window.open(props.releaseUrl, '_blank')
+  }
+  isOpen.value = false
+}
+</script>

frontend/src/components/common/index.ts

@@ -7,3 +7,6 @@
 export { default as EmptyState } from './EmptyState.vue'
 export { default as AlertDialog } from './AlertDialog.vue'
 export { default as LoadingState } from './LoadingState.vue'
+
+// 表单组件
+export { default as ModelMultiSelect } from './ModelMultiSelect.vue'

frontend/src/components/icons/GithubIcon.vue

@@ -0,0 +1,13 @@
+<template>
+  <svg
+    viewBox="0 0 24 24"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="2"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+  >
+    <path d="M15 22v-4a4.8 4.8 0 0 0-1-3.5c3 0 6-2 6-5.5.08-1.25-.27-2.48-1-3.5.28-1.15.28-2.35 0-3.5 0 0-1 0-3 1.5-2.64-.5-5.36-.5-8 0C6 2 5 2 5 2c-.3 1.15-.3 2.35 0 3.5A5.403 5.403 0 0 0 4 9c0 3.5 3 5.5 6 5.5-.39.49-.68 1.05-.85 1.65-.17.6-.22 1.23-.15 1.85v4" />
+    <path d="M9 18c-4.51 2-5-2-7-2" />
+  </svg>
+</template>

frontend/src/components/ui/button.vue

@@ -34,11 +34,10 @@ const buttonClass = computed(() => {
     'inline-flex items-center justify-center rounded-xl text-sm font-semibold transition-all duration-200 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 active:scale-[0.98]'
 
   const variantClasses = {
-    default:
-      'bg-primary text-white shadow-[0_20px_35px_rgba(204,120,92,0.35)] hover:bg-primary/90 hover:shadow-[0_25px_45px_rgba(204,120,92,0.45)]',
-    destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/85 shadow-sm',
+    default: 'bg-primary text-white hover:bg-primary/90',
+    destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/85',
     outline:
-      'border border-border/60 bg-card/60 text-foreground hover:border-primary/60 hover:text-primary hover:bg-primary/10 shadow-sm backdrop-blur transition-all',
+      'border border-border/60 bg-card/60 text-foreground hover:border-primary/60 hover:text-primary hover:bg-primary/10 backdrop-blur transition-all',
     secondary:
       'bg-secondary text-secondary-foreground shadow-inner hover:bg-secondary/80',
     ghost: 'hover:bg-accent hover:text-accent-foreground',

frontend/src/components/ui/collapsible-content.vue

@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import { CollapsibleContent, type CollapsibleContentProps } from 'radix-vue'
+import { cn } from '@/lib/utils'
+
+const props = defineProps<CollapsibleContentProps & { class?: string }>()
+</script>
+
+<template>
+  <CollapsibleContent
+    v-bind="props"
+    :class="cn('overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down', props.class)"
+  >
+    <slot />
+  </CollapsibleContent>
+</template>

frontend/src/components/ui/collapsible-trigger.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import { CollapsibleTrigger, type CollapsibleTriggerProps } from 'radix-vue'
+
+const props = defineProps<CollapsibleTriggerProps>()
+</script>
+
+<template>
+  <CollapsibleTrigger v-bind="props" as-child>
+    <slot />
+  </CollapsibleTrigger>
+</template>

frontend/src/components/ui/collapsible.vue

@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import { CollapsibleRoot, type CollapsibleRootEmits, type CollapsibleRootProps } from 'radix-vue'
+import { useForwardPropsEmits } from 'radix-vue'
+
+const props = defineProps<CollapsibleRootProps>()
+const emits = defineEmits<CollapsibleRootEmits>()
+
+const forwarded = useForwardPropsEmits(props, emits)
+</script>
+
+<template>
+  <CollapsibleRoot v-bind="forwarded">
+    <slot />
+  </CollapsibleRoot>
+</template>

frontend/src/components/ui/dialog/Dialog.vue

@@ -2,7 +2,7 @@
   <Teleport to="body">
     <div
       v-if="isOpen"
-      class="fixed inset-0 overflow-y-auto"
+      class="fixed inset-0 overflow-y-auto pointer-events-none"
       :style="{ zIndex: containerZIndex }"
     >
       <!-- 背景遮罩 -->
@@ -16,13 +16,13 @@
       >
         <div
           v-if="isOpen"
-          class="fixed inset-0 bg-black/40 backdrop-blur-sm transition-opacity"
+          class="fixed inset-0 bg-black/40 backdrop-blur-sm transition-opacity pointer-events-auto"
           :style="{ zIndex: backdropZIndex }"
-          @click="handleClose"
+          @click="handleBackdropClick"
         />
       </Transition>
 
-      <div class="relative flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+      <div class="relative flex min-h-full items-end justify-center px-3 py-4 text-center sm:items-center sm:p-0 pointer-events-none">
         <!-- 对话框内容 -->
         <Transition
           enter-active-class="duration-300 ease-out"
@@ -34,7 +34,7 @@
         >
           <div
             v-if="isOpen"
-            class="relative transform rounded-lg bg-background text-left shadow-2xl transition-all sm:my-8 sm:w-full border border-border"
+            class="relative transform rounded-lg bg-background text-left shadow-2xl transition-all w-full sm:my-8 sm:w-full border border-border pointer-events-auto"
             :style="{ zIndex: contentZIndex }"
             :class="maxWidthClass"
             @click.stop
@@ -71,8 +71,8 @@
               </div>
             </slot>
 
-            <!-- 内容区域：统一添加 padding -->
-            <div class="px-6 py-3">
+            <!-- 内容区域：可选添加 padding -->
+            <div :class="noPadding ? '' : 'px-6 py-3'">
               <slot />
             </div>
 
@@ -92,6 +92,7 @@
 
 <script setup lang="ts">
 import { computed, useSlots, type Component } from 'vue'
+import { useEscapeKey } from '@/composables/useEscapeKey'
 
 // Props 定义
 const props = defineProps<{
@@ -104,6 +105,8 @@ const props = defineProps<{
   icon?: Component // Lucide icon component
   iconClass?: string // Custom icon color class
   zIndex?: number // Custom z-index for nested dialogs (default: 60)
+  noPadding?: boolean // Disable default content padding
+  persistent?: boolean // Prevent closing on backdrop click
 }>()
 
 // Emits 定义
@@ -136,6 +139,13 @@ function handleClose() {
   }
 }
 
+// 处理背景点击
+function handleBackdropClick() {
+  if (!props.persistent) {
+    handleClose()
+  }
+}
+
 const maxWidthClass = computed(() => {
   const sizeValue = props.maxWidth || props.size || 'md'
   const sizes = {
@@ -157,4 +167,16 @@ const maxWidthClass = computed(() => {
 const containerZIndex = computed(() => props.zIndex || 60)
 const backdropZIndex = computed(() => props.zIndex || 60)
 const contentZIndex = computed(() => (props.zIndex || 60) + 10)
+
+// 添加 ESC 键监听
+useEscapeKey(() => {
+  if (isOpen.value && !props.persistent) {
+    handleClose()
+    return true  // 阻止其他监听器（如父级抽屉的 ESC 监听器）
+  }
+  return false
+}, {
+  disableOnInput: true,
+  once: false
+})
 </script>

frontend/src/components/ui/index.ts

@@ -65,3 +65,8 @@ export { default as RefreshButton } from './refresh-button.vue'
 
 // Tooltip 提示系列
 export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './tooltip'
+
+// Collapsible 折叠系列
+export { default as Collapsible } from './collapsible.vue'
+export { default as CollapsibleTrigger } from './collapsible-trigger.vue'
+export { default as CollapsibleContent } from './collapsible-content.vue'

frontend/src/components/ui/input.vue

@@ -3,6 +3,9 @@
     :class="inputClass"
     :value="modelValue"
     :autocomplete="autocompleteAttr"
+    :data-lpignore="disableAutofill ? 'true' : undefined"
+    :data-1p-ignore="disableAutofill ? 'true' : undefined"
+    :data-form-type="disableAutofill ? 'other' : undefined"
     v-bind="$attrs"
     @input="handleInput"
   >
@@ -16,6 +19,7 @@ interface Props {
   modelValue?: string | number
   class?: string
   autocomplete?: string
+  disableAutofill?: boolean
 }
 
 const props = defineProps<Props>()
@@ -23,7 +27,12 @@ const emit = defineEmits<{
   'update:modelValue': [value: string]
 }>()
 
-const autocompleteAttr = computed(() => props.autocomplete ?? 'off')
+const autocompleteAttr = computed(() => {
+  if (props.disableAutofill) {
+    return 'one-time-code'
+  }
+  return props.autocomplete ?? 'off'
+})
 
 const inputClass = computed(() =>
   cn(

frontend/src/components/ui/select-content.vue

@@ -45,7 +45,7 @@ const props = withDefaults(defineProps<Props>(), {
 
 const contentClass = computed(() =>
   cn(
-    'z-[100] max-h-96 min-w-[8rem] overflow-hidden rounded-2xl border border-border bg-card text-foreground shadow-2xl backdrop-blur-xl pointer-events-auto',
+    'z-[200] max-h-96 min-w-[8rem] overflow-hidden rounded-2xl border border-border bg-card text-foreground shadow-2xl backdrop-blur-xl pointer-events-auto',
     'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
     'data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
     props.class

frontend/src/composables/useClipboard.ts

@@ -4,11 +4,11 @@ import { log } from '@/utils/logger'
 export function useClipboard() {
   const { success, error: showError } = useToast()
 
-  async function copyToClipboard(text: string): Promise<boolean> {
+  async function copyToClipboard(text: string, showToast = true): Promise<boolean> {
     try {
       if (navigator.clipboard && window.isSecureContext) {
         await navigator.clipboard.writeText(text)
-        success('已复制到剪贴板')
+        if (showToast) success('已复制到剪贴板')
         return true
       }
 
@@ -25,17 +25,17 @@ export function useClipboard() {
       try {
         const successful = document.execCommand('copy')
         if (successful) {
-          success('已复制到剪贴板')
+          if (showToast) success('已复制到剪贴板')
           return true
         }
-        showError('复制失败，请手动复制')
+        if (showToast) showError('复制失败，请手动复制')
         return false
       } finally {
         document.body.removeChild(textArea)
       }
     } catch (err) {
       log.error('复制失败:', err)
-      showError('复制失败，请手动选择文本进行复制')
+      if (showToast) showError('复制失败，请手动选择文本进行复制')
       return false
     }
   }

frontend/src/composables/useConfirm.ts

@@ -47,11 +47,11 @@ export function useConfirm() {
   /**
    * 便捷方法：危险操作确认（红色主题）
    */
-  const confirmDanger = (message: string, title?: string): Promise<boolean> => {
+  const confirmDanger = (message: string, title?: string, confirmText?: string): Promise<boolean> => {
     return confirm({
       message,
       title: title || '危险操作',
-      confirmText: '删除',
+      confirmText: confirmText || '删除',
       variant: 'danger'
     })
   }

frontend/src/composables/useEscapeKey.ts

@@ -0,0 +1,83 @@
+import { onMounted, onUnmounted, ref } from 'vue'
+
+/**
+ * ESC 键监听 Composable（简化版本，直接使用独立监听器）
+ * 用于按 ESC 键关闭弹窗或其他可关闭的组件
+ *
+ * @param callback - 按 ESC 键时执行的回调函数，返回 true 表示已处理事件，阻止其他监听器执行
+ * @param options - 配置选项
+ */
+export function useEscapeKey(
+  callback: () => void | boolean,
+  options: {
+    /** 是否在输入框获得焦点时禁用 ESC 键，默认 true */
+    disableOnInput?: boolean
+    /** 是否只监听一次，默认 false */
+    once?: boolean
+  } = {}
+) {
+  const { disableOnInput = true, once = false } = options
+  const isActive = ref(true)
+
+  function handleKeyDown(event: KeyboardEvent) {
+    // 只处理 ESC 键
+    if (event.key !== 'Escape') return
+
+    // 检查组件是否还活跃
+    if (!isActive.value) return
+
+    // 如果配置了在输入框获得焦点时禁用，则检查当前焦点元素
+    if (disableOnInput) {
+      const activeElement = document.activeElement
+      const isInputElement = activeElement && (
+        activeElement.tagName === 'INPUT' ||
+        activeElement.tagName === 'TEXTAREA' ||
+        activeElement.tagName === 'SELECT' ||
+        activeElement.contentEditable === 'true' ||
+        activeElement.getAttribute('role') === 'textbox' ||
+        activeElement.getAttribute('role') === 'combobox'
+      )
+
+      // 如果焦点在输入框中，不处理 ESC 键
+      if (isInputElement) return
+    }
+
+    // 执行回调，如果返回 true 则阻止其他监听器
+    const handled = callback()
+    if (handled === true) {
+      event.stopImmediatePropagation()
+    }
+
+    // 移除当前元素的焦点，避免残留样式
+    if (document.activeElement instanceof HTMLElement) {
+      document.activeElement.blur()
+    }
+
+    // 如果只监听一次，则移除监听器
+    if (once) {
+      removeEventListener()
+    }
+  }
+
+  function addEventListener() {
+    document.addEventListener('keydown', handleKeyDown)
+  }
+
+  function removeEventListener() {
+    document.removeEventListener('keydown', handleKeyDown)
+  }
+
+  onMounted(() => {
+    addEventListener()
+  })
+
+  onUnmounted(() => {
+    isActive.value = false
+    removeEventListener()
+  })
+
+  return {
+    addEventListener,
+    removeEventListener
+  }
+}

frontend/src/composables/useInvalidModels.ts

@@ -0,0 +1,34 @@
+import { computed, type Ref, type ComputedRef } from 'vue'
+
+/**
+ * 检测失效模型的 composable
+ *
+ * 用于检测 allowed_models 中已不存在于 globalModels 的模型名称，
+ * 这些模型可能已被删除但引用未清理。
+ *
+ * @example
+ * ```typescript
+ * const { invalidModels } = useInvalidModels(
+ *   computed(() => form.value.allowed_models),
+ *   globalModels
+ * )
+ * ```
+ */
+export interface ModelWithName {
+  name: string
+}
+
+export function useInvalidModels<T extends ModelWithName>(
+  allowedModels: Ref<string[]> | ComputedRef<string[]>,
+  globalModels: Ref<T[]>
+): { invalidModels: ComputedRef<string[]> } {
+  const validModelNames = computed(() =>
+    new Set(globalModels.value.map(m => m.name))
+  )
+
+  const invalidModels = computed(() =>
+    allowedModels.value.filter(name => !validModelNames.value.has(name))
+  )
+
+  return { invalidModels }
+}

frontend/src/features/api-keys/components/StandaloneKeyFormDialog.vue

@@ -79,45 +79,45 @@
 
           <div class="space-y-2">
             <Label
-              for="form-expire-days"
+              for="form-expires-at"
               class="text-sm font-medium"
             >有效期设置</Label>
             <div class="flex items-center gap-2">
+              <div class="relative flex-1">
                 <Input
-                id="form-expire-days"
-                :model-value="form.expire_days ?? ''"
-                type="number"
-                min="1"
-                max="3650"
-                placeholder="天数"
-                :class="form.never_expire ? 'flex-1 h-9 opacity-50' : 'flex-1 h-9'"
-                :disabled="form.never_expire"
-                @update:model-value="(v) => form.expire_days = parseNumberInput(v, { min: 1, max: 3650 })"
+                  id="form-expires-at"
+                  :model-value="form.expires_at || ''"
+                  type="date"
+                  :min="minExpiryDate"
+                  class="h-9 pr-8"
+                  :placeholder="form.expires_at ? '' : '永不过期'"
+                  @update:model-value="(v) => form.expires_at = v || undefined"
                 />
-              <label class="flex items-center gap-1.5 border rounded-md px-2 py-1.5 bg-muted/50 cursor-pointer text-xs whitespace-nowrap">
-                <input
-                  v-model="form.never_expire"
-                  type="checkbox"
-                  class="h-3.5 w-3.5 rounded border-gray-300 cursor-pointer"
-                  @change="onNeverExpireChange"
+                <button
+                  v-if="form.expires_at"
+                  type="button"
+                  class="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
+                  title="清空（永不过期）"
+                  @click="clearExpiryDate"
                 >
-                永不过期
-              </label>
+                  <X class="h-4 w-4" />
+                </button>
+              </div>
               <label
                 class="flex items-center gap-1.5 border rounded-md px-2 py-1.5 bg-muted/50 cursor-pointer text-xs whitespace-nowrap"
-                :class="form.never_expire ? 'opacity-50' : ''"
+                :class="!form.expires_at ? 'opacity-50 cursor-not-allowed' : ''"
               >
                 <input
                   v-model="form.auto_delete_on_expiry"
                   type="checkbox"
                   class="h-3.5 w-3.5 rounded border-gray-300 cursor-pointer"
-                  :disabled="form.never_expire"
+                  :disabled="!form.expires_at"
                 >
                 到期删除
               </label>
             </div>
             <p class="text-xs text-muted-foreground">
-              不勾选"到期删除"则仅禁用
+              {{ form.expires_at ? '到期后' + (form.auto_delete_on_expiry ? '自动删除' : '仅禁用') + '（当天 23:59 失效）' : '留空表示永不过期' }}
             </p>
           </div>
 
@@ -132,7 +132,7 @@
               type="number"
               min="1"
               max="10000"
-              placeholder="100"
+              placeholder="留空不限制"
               class="h-10"
               @update:model-value="(v) => form.rate_limit = parseNumberInput(v, { min: 1, max: 10000 })"
             />
@@ -186,7 +186,7 @@
                     @click.stop
                     @change="toggleSelection('allowed_providers', provider.id)"
                   >
-                  <span class="text-sm">{{ provider.display_name || provider.name }}</span>
+                  <span class="text-sm">{{ provider.name }}</span>
                 </div>
                 <div
                   v-if="providers.length === 0"
@@ -244,55 +244,10 @@
           </div>
 
           <!-- 模型多选下拉框 -->
-          <div class="space-y-2">
-            <Label class="text-sm font-medium">允许的模型</Label>
-            <div class="relative">
-              <button
-                type="button"
-                class="w-full h-10 px-3 border rounded-lg bg-background text-left flex items-center justify-between hover:bg-muted/50 transition-colors"
-                @click="modelDropdownOpen = !modelDropdownOpen"
-              >
-                <span :class="form.allowed_models.length ? 'text-foreground' : 'text-muted-foreground'">
-                  {{ form.allowed_models.length ? `已选择 ${form.allowed_models.length} 个` : '全部可用' }}
-                </span>
-                <ChevronDown
-                  class="h-4 w-4 text-muted-foreground transition-transform"
-                  :class="modelDropdownOpen ? 'rotate-180' : ''"
+          <ModelMultiSelect
+            v-model="form.allowed_models"
+            :models="globalModels"
           />
-              </button>
-              <div
-                v-if="modelDropdownOpen"
-                class="fixed inset-0 z-[80]"
-                @click.stop="modelDropdownOpen = false"
-              />
-              <div
-                v-if="modelDropdownOpen"
-                class="absolute z-[90] w-full mt-1 bg-popover border rounded-lg shadow-lg max-h-48 overflow-y-auto"
-              >
-                <div
-                  v-for="model in globalModels"
-                  :key="model.name"
-                  class="flex items-center gap-2 px-3 py-2 hover:bg-muted/50 cursor-pointer"
-                  @click="toggleSelection('allowed_models', model.name)"
-                >
-                  <input
-                    type="checkbox"
-                    :checked="form.allowed_models.includes(model.name)"
-                    class="h-4 w-4 rounded border-gray-300 cursor-pointer"
-                    @click.stop
-                    @change="toggleSelection('allowed_models', model.name)"
-                  >
-                  <span class="text-sm">{{ model.name }}</span>
-                </div>
-                <div
-                  v-if="globalModels.length === 0"
-                  class="px-3 py-2 text-sm text-muted-foreground"
-                >
-                  暂无可用模型
-                </div>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
     </form>
@@ -325,8 +280,9 @@ import {
   Input,
   Label,
 } from '@/components/ui'
-import { Plus, SquarePen, Key, Shield, ChevronDown } from 'lucide-vue-next'
+import { Plus, SquarePen, Key, Shield, ChevronDown, X } from 'lucide-vue-next'
 import { useFormDialog } from '@/composables/useFormDialog'
+import { ModelMultiSelect } from '@/components/common'
 import { getProvidersSummary } from '@/api/endpoints/providers'
 import { getGlobalModels } from '@/api/global-models'
 import { adminApi } from '@/api/admin'
@@ -338,8 +294,7 @@ export interface StandaloneKeyFormData {
   id?: string
   name: string
   initial_balance_usd?: number
-  expire_days?: number
-  never_expire: boolean
+  expires_at?: string  // ISO 日期字符串，如 "2025-12-31"，undefined = 永不过期
   rate_limit?: number
   auto_delete_on_expiry: boolean
   allowed_providers: string[]
@@ -363,7 +318,6 @@ const saving = ref(false)
 // 下拉框状态
 const providerDropdownOpen = ref(false)
 const apiFormatDropdownOpen = ref(false)
-const modelDropdownOpen = ref(false)
 
 // 选项数据
 const providers = ref<ProviderWithEndpointsSummary[]>([])
@@ -374,22 +328,27 @@ const allApiFormats = ref<string[]>([])
 const form = ref<StandaloneKeyFormData>({
   name: '',
   initial_balance_usd: 10,
-  expire_days: undefined,
-  never_expire: true,
-  rate_limit: 100,
+  expires_at: undefined,
+  rate_limit: undefined,
   auto_delete_on_expiry: false,
   allowed_providers: [],
   allowed_api_formats: [],
   allowed_models: []
 })
 
+// 计算最小可选日期（明天）
+const minExpiryDate = computed(() => {
+  const tomorrow = new Date()
+  tomorrow.setDate(tomorrow.getDate() + 1)
+  return tomorrow.toISOString().split('T')[0]
+})
+
 function resetForm() {
   form.value = {
     name: '',
     initial_balance_usd: 10,
-    expire_days: undefined,
-    never_expire: true,
-    rate_limit: 100,
+    expires_at: undefined,
+    rate_limit: undefined,
     auto_delete_on_expiry: false,
     allowed_providers: [],
     allowed_api_formats: [],
@@ -397,7 +356,6 @@ function resetForm() {
   }
   providerDropdownOpen.value = false
   apiFormatDropdownOpen.value = false
-  modelDropdownOpen.value = false
 }
 
 function loadKeyData() {
@@ -406,9 +364,8 @@ function loadKeyData() {
     id: props.apiKey.id,
     name: props.apiKey.name || '',
     initial_balance_usd: props.apiKey.initial_balance_usd,
-    expire_days: props.apiKey.expire_days,
-    never_expire: props.apiKey.never_expire,
-    rate_limit: props.apiKey.rate_limit || 100,
+    expires_at: props.apiKey.expires_at,
+    rate_limit: props.apiKey.rate_limit,
     auto_delete_on_expiry: props.apiKey.auto_delete_on_expiry,
     allowed_providers: props.apiKey.allowed_providers || [],
     allowed_api_formats: props.apiKey.allowed_api_formats || [],
@@ -452,12 +409,10 @@ function toggleSelection(field: 'allowed_providers' | 'allowed_api_formats' | 'a
   }
 }
 
-// 永不过期切换
-function onNeverExpireChange() {
-  if (form.value.never_expire) {
-    form.value.expire_days = undefined
+// 清空过期日期（同时清空到期删除选项）
+function clearExpiryDate() {
+  form.value.expires_at = undefined
   form.value.auto_delete_on_expiry = false
-  }
 }
 
 // 提交表单

frontend/src/features/auth/components/LoginDialog.vue

@@ -66,19 +66,61 @@
         </div>
       </div>
 
+      <!-- 认证方式切换 -->
+      <div
+        v-if="showAuthTypeTabs"
+        class="auth-type-tabs"
+      >
+        <button
+          type="button"
+          class="auth-tab"
+          :class="[authType === 'local' && 'active']"
+          @click="authType = 'local'"
+        >
+          本地登录
+        </button>
+        <button
+          type="button"
+          class="auth-tab"
+          :class="[authType === 'ldap' && 'active']"
+          @click="authType = 'ldap'"
+        >
+          LDAP 登录
+        </button>
+      </div>
+
+
       <!-- 登录表单 -->
       <form
         class="space-y-4"
         @submit.prevent="handleLogin"
       >
         <div class="space-y-2">
-          <Label for="login-email">邮箱</Label>
+          <div class="flex items-center justify-between">
+            <Label for="login-email">{{ emailLabel }}</Label>
+            <button
+              v-if="ldapExclusive && authType === 'ldap'"
+              type="button"
+              class="text-xs text-muted-foreground/60 hover:text-muted-foreground transition-colors"
+              @click="authType = 'local'"
+            >
+              管理员本地登录
+            </button>
+            <button
+              v-if="ldapExclusive && authType === 'local'"
+              type="button"
+              class="text-xs text-muted-foreground/60 hover:text-muted-foreground transition-colors"
+              @click="authType = 'ldap'"
+            >
+              返回 LDAP 登录
+            </button>
+          </div>
           <Input
             id="login-email"
             v-model="form.email"
-            type="email"
+            type="text"
             required
-            placeholder="hello@example.com"
+            placeholder="username 或 email"
             autocomplete="off"
           />
         </div>
@@ -98,12 +140,27 @@
 
         <!-- 提示信息 -->
         <p
-          v-if="!isDemo"
+          v-if="!isDemo && !allowRegistration"
           class="text-xs text-slate-400 dark:text-muted-foreground/80"
         >
           如需开通账户，请联系管理员配置访问权限
         </p>
       </form>
+
+      <!-- 注册链接 -->
+      <div
+        v-if="allowRegistration"
+        class="mt-4 text-center text-sm"
+      >
+        还没有账户？
+        <Button
+          variant="link"
+          class="h-auto p-0"
+          @click="handleSwitchToRegister"
+        >
+          立即注册
+        </Button>
+      </div>
     </div>
 
     <template #footer>
@@ -124,10 +181,18 @@
       </Button>
     </template>
   </Dialog>
+
+  <!-- Register Dialog -->
+  <RegisterDialog
+    v-model:open="showRegisterDialog"
+    :require-email-verification="requireEmailVerification"
+    @success="handleRegisterSuccess"
+    @switch-to-login="handleSwitchToLogin"
+  />
 </template>
 
 <script setup lang="ts">
-import { ref, watch, computed } from 'vue'
+import { ref, watch, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { Dialog } from '@/components/ui'
 import Button from '@/components/ui/button.vue'
@@ -136,6 +201,8 @@ import Label from '@/components/ui/label.vue'
 import { useAuthStore } from '@/stores/auth'
 import { useToast } from '@/composables/useToast'
 import { isDemoMode, DEMO_ACCOUNTS } from '@/config/demo'
+import RegisterDialog from './RegisterDialog.vue'
+import { authApi } from '@/api/auth'
 
 const props = defineProps<{
   modelValue: boolean
@@ -151,6 +218,33 @@ const { success: showSuccess, warning: showWarning, error: showError } = useToas
 
 const isOpen = ref(props.modelValue)
 const isDemo = computed(() => isDemoMode())
+const showRegisterDialog = ref(false)
+const requireEmailVerification = ref(false)
+const allowRegistration = ref(false) // 由系统配置控制，默认关闭
+
+// LDAP authentication settings
+const PREFERRED_AUTH_TYPE_KEY = 'aether_preferred_auth_type'
+function getStoredAuthType(): 'local' | 'ldap' {
+  const stored = localStorage.getItem(PREFERRED_AUTH_TYPE_KEY)
+  return (stored === 'ldap' || stored === 'local') ? stored : 'local'
+}
+const authType = ref<'local' | 'ldap'>(getStoredAuthType())
+const localEnabled = ref(true)
+const ldapEnabled = ref(false)
+const ldapExclusive = ref(false)
+
+// 保存用户的认证类型偏好
+watch(authType, (newType) => {
+  localStorage.setItem(PREFERRED_AUTH_TYPE_KEY, newType)
+})
+
+const showAuthTypeTabs = computed(() => {
+  return localEnabled.value && ldapEnabled.value && !ldapExclusive.value
+})
+
+const emailLabel = computed(() => {
+  return '用户名/邮箱'
+})
 
 watch(() => props.modelValue, (val) => {
   isOpen.value = val
@@ -184,7 +278,7 @@ async function handleLogin() {
     return
   }
 
-  const success = await authStore.login(form.value.email, form.value.password)
+  const success = await authStore.login(form.value.email, form.value.password, authType.value)
   if (success) {
     showSuccess('登录成功，正在跳转...')
 
@@ -201,4 +295,101 @@ async function handleLogin() {
     showError(authStore.error || '登录失败，请检查邮箱和密码')
   }
 }
+
+function handleSwitchToRegister() {
+  isOpen.value = false
+  showRegisterDialog.value = true
+}
+
+function handleRegisterSuccess() {
+  showRegisterDialog.value = false
+  showSuccess('注册成功！请登录')
+  isOpen.value = true
+}
+
+function handleSwitchToLogin() {
+  showRegisterDialog.value = false
+  isOpen.value = true
+}
+
+// Load authentication and registration settings on mount
+onMounted(async () => {
+  try {
+    // Load registration settings
+    const regSettings = await authApi.getRegistrationSettings()
+    allowRegistration.value = !!regSettings.enable_registration
+    requireEmailVerification.value = !!regSettings.require_email_verification
+
+    // Load authentication settings
+    const authSettings = await authApi.getAuthSettings()
+    localEnabled.value = authSettings.local_enabled
+    ldapEnabled.value = authSettings.ldap_enabled
+    ldapExclusive.value = authSettings.ldap_exclusive
+    // 若仅允许 LDAP 登录，则禁用本地注册入口
+    if (ldapExclusive.value) {
+      allowRegistration.value = false
+    }
+
+    // Set default auth type based on settings
+    if (authSettings.ldap_exclusive) {
+      authType.value = 'ldap'
+    } else if (!authSettings.local_enabled && authSettings.ldap_enabled) {
+      authType.value = 'ldap'
+    } else {
+      authType.value = 'local'
+    }
+  } catch (error) {
+    // If获取失败，保持默认：关闭注册 & 关闭邮箱验证 & 使用本地认证
+    allowRegistration.value = false
+    requireEmailVerification.value = false
+    localEnabled.value = true
+    ldapEnabled.value = false
+    ldapExclusive.value = false
+    authType.value = 'local'
+  }
+})
 </script>
+
+<style scoped>
+.auth-type-tabs {
+  display: flex;
+  border-bottom: 1px solid hsl(var(--border));
+}
+
+.auth-tab {
+  flex: 1;
+  padding: 0.625rem 1rem;
+  font-size: 0.875rem;
+  font-weight: 500;
+  color: hsl(var(--muted-foreground));
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  transition: color 0.15s ease;
+  position: relative;
+}
+
+.auth-tab::after {
+  content: '';
+  position: absolute;
+  bottom: -1px;
+  left: 0;
+  right: 0;
+  height: 2px;
+  background: transparent;
+  transition: background 0.15s ease;
+}
+
+.auth-tab:hover:not(.active) {
+  color: hsl(var(--foreground));
+}
+
+.auth-tab.active {
+  color: var(--book-cloth);
+  font-weight: 600;
+}
+
+.auth-tab.active::after {
+  background: var(--book-cloth);
+}
+</style>

frontend/src/features/auth/components/RegisterDialog.vue

@@ -0,0 +1,640 @@
+<template>
+  <Dialog
+    v-model:open="isOpen"
+    size="lg"
+  >
+    <div class="space-y-6">
+      <!-- Logo 和标题 -->
+      <div class="flex flex-col items-center text-center">
+        <div class="mb-4 rounded-3xl border border-primary/30 dark:border-[#cc785c]/30 bg-primary/5 dark:bg-transparent p-4 shadow-inner shadow-white/40 dark:shadow-[#cc785c]/10">
+          <img
+            src="/aether_adaptive.svg"
+            alt="Logo"
+            class="h-16 w-16"
+          >
+        </div>
+        <h2 class="text-2xl font-semibold text-slate-900 dark:text-white">
+          注册新账户
+        </h2>
+        <p class="mt-1 text-sm text-muted-foreground">
+          请填写您的邮箱和个人信息完成注册
+        </p>
+      </div>
+
+      <!-- 注册表单 -->
+      <form
+        class="space-y-4"
+        autocomplete="off"
+        data-form-type="other"
+        @submit.prevent="handleSubmit"
+      >
+        <!-- Email -->
+        <div class="space-y-2">
+          <Label for="reg-email">邮箱 <span class="text-muted-foreground">*</span></Label>
+          <Input
+            id="reg-email"
+            v-model="formData.email"
+            type="email"
+            placeholder="hello@example.com"
+            required
+            disable-autofill
+            :disabled="isLoading || emailVerified"
+          />
+        </div>
+
+        <!-- Verification Code Section -->
+        <div
+          v-if="requireEmailVerification"
+          class="space-y-3"
+        >
+          <div class="flex items-center justify-between">
+            <Label>验证码 <span class="text-muted-foreground">*</span></Label>
+            <Button
+              type="button"
+              variant="link"
+              size="sm"
+              class="h-auto p-0 text-xs"
+              :disabled="isSendingCode || !canSendCode || emailVerified"
+              @click="handleSendCode"
+            >
+              {{ sendCodeButtonText }}
+            </Button>
+          </div>
+          <div class="flex justify-center gap-2">
+            <!-- 发送中显示 loading -->
+            <div
+              v-if="isSendingCode"
+              class="flex items-center justify-center gap-2 h-14 text-muted-foreground"
+            >
+              <svg
+                class="animate-spin h-5 w-5"
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+              >
+                <circle
+                  class="opacity-25"
+                  cx="12"
+                  cy="12"
+                  r="10"
+                  stroke="currentColor"
+                  stroke-width="4"
+                />
+                <path
+                  class="opacity-75"
+                  fill="currentColor"
+                  d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                />
+              </svg>
+              <span class="text-sm">正在发送验证码...</span>
+            </div>
+            <!-- 验证码输入框 -->
+            <template v-else>
+              <input
+                v-for="(_, index) in 6"
+                :key="index"
+                :ref="(el) => setCodeInputRef(index, el as HTMLInputElement)"
+                v-model="codeDigits[index]"
+                type="text"
+                inputmode="numeric"
+                maxlength="1"
+                autocomplete="off"
+                data-form-type="other"
+                class="w-12 h-14 text-center text-xl font-semibold border-2 rounded-lg bg-background transition-all focus:outline-none focus:ring-2 focus:ring-primary/20"
+                :class="verificationError ? 'border-destructive' : 'border-border focus:border-primary'"
+                :disabled="emailVerified"
+                @input="handleCodeInput(index, $event)"
+                @keydown="handleCodeKeyDown(index, $event)"
+                @paste="handleCodePaste"
+              >
+            </template>
+          </div>
+        </div>
+
+        <!-- Username -->
+        <div class="space-y-2">
+          <Label for="reg-uname">用户名 <span class="text-muted-foreground">*</span></Label>
+          <Input
+            id="reg-uname"
+            v-model="formData.username"
+            type="text"
+            placeholder="请输入用户名"
+            required
+            disable-autofill
+            :disabled="isLoading"
+          />
+        </div>
+
+        <!-- Password -->
+        <div class="space-y-2">
+          <Label :for="`pwd-${formNonce}`">密码 <span class="text-muted-foreground">*</span></Label>
+          <Input
+            :id="`pwd-${formNonce}`"
+            v-model="formData.password"
+            type="text"
+            autocomplete="one-time-code"
+            data-form-type="other"
+            data-lpignore="true"
+            data-1p-ignore="true"
+            :name="`pwd-${formNonce}`"
+            placeholder="至少 6 个字符"
+            required
+            class="-webkit-text-security-disc"
+            :disabled="isLoading"
+          />
+        </div>
+
+        <!-- Confirm Password -->
+        <div class="space-y-2">
+          <Label :for="`pwd-confirm-${formNonce}`">确认密码 <span class="text-muted-foreground">*</span></Label>
+          <Input
+            :id="`pwd-confirm-${formNonce}`"
+            v-model="formData.confirmPassword"
+            type="text"
+            autocomplete="one-time-code"
+            data-form-type="other"
+            data-lpignore="true"
+            data-1p-ignore="true"
+            :name="`pwd-confirm-${formNonce}`"
+            placeholder="再次输入密码"
+            required
+            class="-webkit-text-security-disc"
+            :disabled="isLoading"
+          />
+        </div>
+      </form>
+
+      <!-- 登录链接 -->
+      <div class="text-center text-sm">
+        已有账户？
+        <Button
+          variant="link"
+          class="h-auto p-0"
+          @click="handleSwitchToLogin"
+        >
+          立即登录
+        </Button>
+      </div>
+    </div>
+
+    <template #footer>
+      <Button
+        type="button"
+        variant="outline"
+        class="w-full sm:w-auto border-slate-200 dark:border-slate-600 text-slate-500 dark:text-slate-400 hover:text-primary hover:border-primary/50 hover:bg-primary/5 dark:hover:text-primary dark:hover:border-primary/50 dark:hover:bg-primary/10"
+        :disabled="isLoading"
+        @click="handleCancel"
+      >
+        取消
+      </Button>
+      <Button
+        class="w-full sm:w-auto bg-primary hover:bg-primary/90 text-white border-0"
+        :disabled="isLoading || !canSubmit"
+        @click="handleSubmit"
+      >
+        {{ isLoading ? loadingText : '注册' }}
+      </Button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch, onUnmounted, nextTick } from 'vue'
+import { authApi } from '@/api/auth'
+import { useToast } from '@/composables/useToast'
+import { Dialog } from '@/components/ui'
+import Button from '@/components/ui/button.vue'
+import Input from '@/components/ui/input.vue'
+import Label from '@/components/ui/label.vue'
+
+interface Props {
+  open?: boolean
+  requireEmailVerification?: boolean
+}
+
+interface Emits {
+  (e: 'update:open', value: boolean): void
+  (e: 'success'): void
+  (e: 'switchToLogin'): void
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  open: false,
+  requireEmailVerification: false
+})
+
+const emit = defineEmits<Emits>()
+const { success, error: showError } = useToast()
+
+// Form nonce for password fields (prevent autofill)
+const formNonce = ref(createFormNonce())
+
+function createFormNonce(): string {
+  return Math.random().toString(36).slice(2, 10)
+}
+
+// Verification code inputs
+const codeInputRefs = ref<(HTMLInputElement | null)[]>([])
+const codeDigits = ref<string[]>(['', '', '', '', '', ''])
+
+const setCodeInputRef = (index: number, el: HTMLInputElement | null) => {
+  codeInputRefs.value[index] = el
+}
+
+// Handle verification code input
+const handleCodeInput = (index: number, event: Event) => {
+  const input = event.target as HTMLInputElement
+  const value = input.value
+
+  // Only allow digits
+  if (!/^\d*$/.test(value)) {
+    input.value = codeDigits.value[index]
+    return
+  }
+
+  codeDigits.value[index] = value
+
+  // Auto-focus next input
+  if (value && index < 5) {
+    codeInputRefs.value[index + 1]?.focus()
+  }
+
+  // Check if all digits are filled
+  const fullCode = codeDigits.value.join('')
+  if (fullCode.length === 6 && /^\d+$/.test(fullCode)) {
+    handleCodeComplete(fullCode)
+  }
+}
+
+const handleCodeKeyDown = (index: number, event: KeyboardEvent) => {
+  // Handle backspace
+  if (event.key === 'Backspace') {
+    if (!codeDigits.value[index] && index > 0) {
+      // If current input is empty, move to previous and clear it
+      codeInputRefs.value[index - 1]?.focus()
+      codeDigits.value[index - 1] = ''
+    } else {
+      // Clear current input
+      codeDigits.value[index] = ''
+    }
+  }
+  // Handle arrow keys
+  else if (event.key === 'ArrowLeft' && index > 0) {
+    codeInputRefs.value[index - 1]?.focus()
+  } else if (event.key === 'ArrowRight' && index < 5) {
+    codeInputRefs.value[index + 1]?.focus()
+  }
+}
+
+const handleCodePaste = (event: ClipboardEvent) => {
+  event.preventDefault()
+  const pastedData = event.clipboardData?.getData('text') || ''
+  const cleanedData = pastedData.replace(/\D/g, '').slice(0, 6)
+
+  if (cleanedData) {
+    // Fill digits
+    for (let i = 0; i < 6; i++) {
+      codeDigits.value[i] = cleanedData[i] || ''
+    }
+
+    // Focus the next empty input or the last input
+    const nextEmptyIndex = codeDigits.value.findIndex((d) => !d)
+    const focusIndex = nextEmptyIndex >= 0 ? nextEmptyIndex : 5
+    codeInputRefs.value[focusIndex]?.focus()
+
+    // Check if all digits are filled
+    if (cleanedData.length === 6) {
+      handleCodeComplete(cleanedData)
+    }
+  }
+}
+
+const clearCodeInputs = () => {
+  codeDigits.value = ['', '', '', '', '', '']
+  codeInputRefs.value[0]?.focus()
+}
+
+const isOpen = computed({
+  get: () => props.open,
+  set: (value) => emit('update:open', value)
+})
+
+const formData = ref({
+  email: '',
+  username: '',
+  password: '',
+  confirmPassword: '',
+  verificationCode: ''
+})
+
+const isLoading = ref(false)
+const loadingText = ref('注册中...')
+const isSendingCode = ref(false)
+const emailVerified = ref(false)
+const verificationError = ref(false)
+const codeSentAt = ref<number | null>(null)
+const cooldownSeconds = ref(0)
+const expireMinutes = ref(5)
+const cooldownTimer = ref<number | null>(null)
+
+// Send code cooldown timer
+const canSendCode = computed(() => {
+  if (!formData.value.email) return false
+  if (cooldownSeconds.value > 0) return false
+  return true
+})
+
+const sendCodeButtonText = computed(() => {
+  if (isSendingCode.value) return '发送中...'
+  if (emailVerified.value) return '验证成功'
+  if (cooldownSeconds.value > 0) return `${cooldownSeconds.value}秒后重试`
+  if (codeSentAt.value) return '重新发送验证码'
+  return '发送验证码'
+})
+
+const canSubmit = computed(() => {
+  const hasBasicInfo =
+    formData.value.email &&
+    formData.value.username &&
+    formData.value.password &&
+    formData.value.confirmPassword
+
+  if (!hasBasicInfo) return false
+
+  // If email verification is required, check if verified
+  if (props.requireEmailVerification && !emailVerified.value) {
+    return false
+  }
+
+  // Check password match
+  if (formData.value.password !== formData.value.confirmPassword) {
+    return false
+  }
+
+  // Check password length
+  if (formData.value.password.length < 6) {
+    return false
+  }
+
+  return true
+})
+
+// 查询并恢复验证状态
+const checkAndRestoreVerificationStatus = async (email: string) => {
+  if (!email || !props.requireEmailVerification) return
+
+  try {
+    const status = await authApi.getVerificationStatus(email)
+
+    // 注意：不恢复 is_verified 状态
+    // 刷新页面后需要重新发送验证码并验证，防止验证码被他人使用
+    // 只恢复"有待验证验证码"的状态（冷却时间）
+    if (status.has_pending_code) {
+      codeSentAt.value = Date.now()
+      verificationError.value = false
+
+      // 恢复冷却时间
+      if (status.cooldown_remaining && status.cooldown_remaining > 0) {
+        startCooldown(status.cooldown_remaining)
+      }
+    }
+  } catch {
+    // 查询失败时静默处理，不影响用户体验
+  }
+}
+
+// 邮箱查询防抖定时器
+let emailCheckTimer: number | null = null
+
+// 监听邮箱变化，查询验证状态
+watch(
+  () => formData.value.email,
+  (newEmail, oldEmail) => {
+    // 邮箱变化时重置验证状态
+    if (newEmail !== oldEmail) {
+      emailVerified.value = false
+      verificationError.value = false
+      codeSentAt.value = null
+      cooldownSeconds.value = 0
+      if (cooldownTimer.value !== null) {
+        clearInterval(cooldownTimer.value)
+        cooldownTimer.value = null
+      }
+      codeDigits.value = ['', '', '', '', '', '']
+    }
+
+    // 清除之前的定时器
+    if (emailCheckTimer !== null) {
+      clearTimeout(emailCheckTimer)
+    }
+
+    // 验证邮箱格式
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+    if (!emailRegex.test(newEmail)) return
+
+    // 防抖：500ms 后查询验证状态
+    emailCheckTimer = window.setTimeout(() => {
+      checkAndRestoreVerificationStatus(newEmail)
+    }, 500)
+  }
+)
+
+// Reset form when dialog opens
+watch(isOpen, (newValue) => {
+  if (newValue) {
+    resetForm()
+  }
+})
+
+// Start cooldown timer
+const startCooldown = (seconds: number) => {
+  // Clear existing timer if any
+  if (cooldownTimer.value !== null) {
+    clearInterval(cooldownTimer.value)
+  }
+
+  cooldownSeconds.value = seconds
+  cooldownTimer.value = window.setInterval(() => {
+    cooldownSeconds.value--
+    if (cooldownSeconds.value <= 0) {
+      if (cooldownTimer.value !== null) {
+        clearInterval(cooldownTimer.value)
+        cooldownTimer.value = null
+      }
+    }
+  }, 1000)
+}
+
+// Cleanup timer on unmount
+onUnmounted(() => {
+  if (cooldownTimer.value !== null) {
+    clearInterval(cooldownTimer.value)
+  }
+  if (emailCheckTimer !== null) {
+    clearTimeout(emailCheckTimer)
+  }
+})
+
+const resetForm = () => {
+  formData.value = {
+    email: '',
+    username: '',
+    password: '',
+    confirmPassword: '',
+    verificationCode: ''
+  }
+  emailVerified.value = false
+  verificationError.value = false
+  isSendingCode.value = false
+  codeSentAt.value = null
+  cooldownSeconds.value = 0
+
+  // Reset password field nonce
+  formNonce.value = createFormNonce()
+
+  // Clear timer
+  if (cooldownTimer.value !== null) {
+    clearInterval(cooldownTimer.value)
+    cooldownTimer.value = null
+  }
+
+  // Clear verification code inputs
+  codeDigits.value = ['', '', '', '', '', '']
+}
+
+const handleSendCode = async () => {
+  if (!formData.value.email) {
+    showError('请输入邮箱')
+    return
+  }
+
+  // Basic email validation
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+  if (!emailRegex.test(formData.value.email)) {
+    showError('请输入有效的邮箱地址', '邮箱格式错误')
+    return
+  }
+
+  isSendingCode.value = true
+
+  try {
+    const response = await authApi.sendVerificationCode(formData.value.email)
+
+    if (response.success) {
+      codeSentAt.value = Date.now()
+      if (response.expire_minutes) {
+        expireMinutes.value = response.expire_minutes
+      }
+
+      success(`请查收邮件，验证码有效期 ${expireMinutes.value} 分钟`, '验证码已发送')
+
+      // Start 60 second cooldown
+      startCooldown(60)
+
+      // Focus the first verification code input
+      nextTick(() => {
+        codeInputRefs.value[0]?.focus()
+      })
+    } else {
+      showError(response.message || '请稍后重试', '发送失败')
+    }
+  } catch (error: any) {
+    const errorMsg = error.response?.data?.detail
+      || error.response?.data?.error?.message
+      || error.message
+      || '网络错误，请重试'
+    showError(errorMsg, '发送失败')
+  } finally {
+    isSendingCode.value = false
+  }
+}
+
+const handleCodeComplete = async (code: string) => {
+  if (!formData.value.email || code.length !== 6) return
+
+  // 如果已经验证成功，不再重复验证
+  if (emailVerified.value) return
+
+  isLoading.value = true
+  loadingText.value = '验证中...'
+  verificationError.value = false
+
+  try {
+    const response = await authApi.verifyEmail(formData.value.email, code)
+
+    if (response.success) {
+      emailVerified.value = true
+      success('邮箱验证通过，请继续完成注册', '验证成功')
+    } else {
+      verificationError.value = true
+      showError(response.message || '验证码错误', '验证失败')
+      // Clear the code input
+      clearCodeInputs()
+    }
+  } catch (error: any) {
+    verificationError.value = true
+    const errorMsg = error.response?.data?.detail
+      || error.response?.data?.error?.message
+      || error.message
+      || '验证码错误，请重试'
+    showError(errorMsg, '验证失败')
+    // Clear the code input
+    clearCodeInputs()
+  } finally {
+    isLoading.value = false
+  }
+}
+
+const handleSubmit = async () => {
+  // Validate password match
+  if (formData.value.password !== formData.value.confirmPassword) {
+    showError('两次输入的密码不一致', '密码不匹配')
+    return
+  }
+
+  // Validate password length
+  if (formData.value.password.length < 6) {
+    showError('密码长度至少 6 位', '密码过短')
+    return
+  }
+
+  // Check email verification if required
+  if (props.requireEmailVerification && !emailVerified.value) {
+    showError('请先完成邮箱验证')
+    return
+  }
+
+  isLoading.value = true
+  loadingText.value = '注册中...'
+
+  try {
+    const response = await authApi.register({
+      email: formData.value.email,
+      username: formData.value.username,
+      password: formData.value.password
+    })
+
+    success(response.message || '欢迎加入！请登录以继续', '注册成功')
+
+    emit('success')
+    isOpen.value = false
+  } catch (error: any) {
+    const errorMsg = error.response?.data?.detail
+      || error.response?.data?.error?.message
+      || error.message
+      || '注册失败，请重试'
+    showError(errorMsg, '注册失败')
+  } finally {
+    isLoading.value = false
+  }
+}
+
+const handleCancel = () => {
+  isOpen.value = false
+}
+
+const handleSwitchToLogin = () => {
+  emit('switchToLogin')
+  isOpen.value = false
+}
+</script>

frontend/src/features/models/components/AliasDialog.vue

@@ -1,384 +0,0 @@
-<template>
-  <Dialog
-    :model-value="open"
-    :title="dialogTitle"
-    :description="dialogDescription"
-    :icon="dialogIcon"
-    size="md"
-    @update:model-value="handleDialogUpdate"
-  >
-    <form
-      class="space-y-4"
-      @submit.prevent="handleSubmit"
-    >
-      <!-- 模式选择（仅创建时显示） -->
-      <div
-        v-if="!isEditMode"
-        class="space-y-2"
-      >
-        <Label>创建类型 *</Label>
-        <div class="grid grid-cols-2 gap-3">
-          <button
-            type="button"
-            class="p-3 rounded-lg border-2 text-left transition-all"
-            :class="[
-              form.mapping_type === 'alias'
-                ? 'border-primary bg-primary/5'
-                : 'border-border hover:border-primary/50'
-            ]"
-            @click="form.mapping_type = 'alias'"
-          >
-            <div class="font-medium text-sm">
-              别名
-            </div>
-            <div class="text-xs text-muted-foreground mt-1">
-              名称简写，按目标模型计费
-            </div>
-          </button>
-          <button
-            type="button"
-            class="p-3 rounded-lg border-2 text-left transition-all"
-            :class="[
-              form.mapping_type === 'mapping'
-                ? 'border-primary bg-primary/5'
-                : 'border-border hover:border-primary/50'
-            ]"
-            @click="form.mapping_type = 'mapping'"
-          >
-            <div class="font-medium text-sm">
-              映射
-            </div>
-            <div class="text-xs text-muted-foreground mt-1">
-              模型降级，按源模型计费
-            </div>
-          </button>
-        </div>
-      </div>
-
-      <!-- 模式说明 -->
-      <div class="rounded-lg border border-border bg-muted/50 p-3 text-sm">
-        <p class="text-foreground font-medium mb-1">
-          {{ form.mapping_type === 'alias' ? '别名模式' : '映射模式' }}
-        </p>
-        <p class="text-muted-foreground text-xs">
-          {{ form.mapping_type === 'alias'
-            ? '用户请求此别名时，会路由到目标模型，并按目标模型价格计费。'
-            : '将源模型的请求转发到目标模型处理，按源模型价格计费。' }}
-        </p>
-      </div>
-
-      <!-- Provider 选择/作用范围 -->
-      <div
-        v-if="showProviderSelect"
-        class="space-y-2"
-      >
-        <Label>作用范围</Label>
-        <!-- 固定 Provider 时显示只读 -->
-        <div
-          v-if="fixedProvider"
-          class="px-3 py-2 border rounded-md bg-muted/50 text-sm"
-        >
-          仅 {{ fixedProvider.display_name || fixedProvider.name }}
-        </div>
-        <!-- 否则显示可选择的下拉 -->
-        <Select
-          v-else
-          v-model:open="providerSelectOpen"
-          :model-value="form.provider_id || 'global'"
-          @update:model-value="handleProviderChange"
-        >
-          <SelectTrigger class="w-full">
-            <SelectValue placeholder="选择作用范围" />
-          </SelectTrigger>
-          <SelectContent>
-            <SelectItem value="global">
-              全局（所有 Provider）
-            </SelectItem>
-            <SelectItem
-              v-for="p in providers"
-              :key="p.id"
-              :value="p.id"
-            >
-              仅 {{ p.display_name || p.name }}
-            </SelectItem>
-          </SelectContent>
-        </Select>
-      </div>
-
-      <!-- 别名模式：别名名称 -->
-      <div
-        v-if="form.mapping_type === 'alias'"
-        class="space-y-2"
-      >
-        <Label for="alias-name">别名名称 *</Label>
-        <Input
-          id="alias-name"
-          v-model="form.alias"
-          placeholder="如：sonnet, opus"
-          :disabled="isEditMode"
-          required
-        />
-        <p class="text-xs text-muted-foreground">
-          {{ isEditMode ? '创建后不可修改' : '用户将使用此名称请求模型' }}
-        </p>
-      </div>
-
-      <!-- 映射模式：选择源模型 -->
-      <div
-        v-else
-        class="space-y-2"
-      >
-        <Label>源模型 (用户请求的模型) *</Label>
-        <Select
-          v-model:open="sourceModelSelectOpen"
-          :model-value="form.alias"
-          :disabled="isEditMode"
-          @update:model-value="form.alias = $event"
-        >
-          <SelectTrigger
-            class="w-full"
-            :class="{ 'opacity-50': isEditMode }"
-          >
-            <SelectValue placeholder="请选择源模型" />
-          </SelectTrigger>
-          <SelectContent>
-            <SelectItem
-              v-for="model in availableSourceModels"
-              :key="model.id"
-              :value="model.name"
-            >
-              {{ model.display_name }} ({{ model.name }})
-            </SelectItem>
-          </SelectContent>
-        </Select>
-        <p class="text-xs text-muted-foreground">
-          {{ isEditMode ? '创建后不可修改' : '选择要被映射的源模型，计费将按此模型价格' }}
-        </p>
-      </div>
-
-      <!-- 目标模型选择 -->
-      <div class="space-y-2">
-        <Label>
-          {{ form.mapping_type === 'alias' ? '目标模型 *' : '目标模型 (实际处理请求) *' }}
-        </Label>
-        <!-- 固定目标模型时显示只读信息 -->
-        <div
-          v-if="fixedTargetModel"
-          class="px-3 py-2 border rounded-md bg-muted/50"
-        >
-          <span class="font-medium">{{ fixedTargetModel.display_name }}</span>
-          <span class="text-muted-foreground ml-1">({{ fixedTargetModel.name }})</span>
-        </div>
-        <!-- 否则显示下拉选择 -->
-        <Select
-          v-else
-          v-model:open="targetModelSelectOpen"
-          :model-value="form.global_model_id"
-          @update:model-value="form.global_model_id = $event"
-        >
-          <SelectTrigger class="w-full">
-            <SelectValue placeholder="请选择模型" />
-          </SelectTrigger>
-          <SelectContent>
-            <SelectItem
-              v-for="model in availableTargetModels"
-              :key="model.id"
-              :value="model.id"
-            >
-              {{ model.display_name }} ({{ model.name }})
-            </SelectItem>
-          </SelectContent>
-        </Select>
-      </div>
-    </form>
-
-    <template #footer>
-      <Button
-        type="button"
-        variant="outline"
-        @click="handleCancel"
-      >
-        取消
-      </Button>
-      <Button
-        :disabled="submitting"
-        @click="handleSubmit"
-      >
-        <Loader2
-          v-if="submitting"
-          class="w-4 h-4 mr-2 animate-spin"
-        />
-        {{ isEditMode ? '保存' : '创建' }}
-      </Button>
-    </template>
-  </Dialog>
-</template>
-
-<script setup lang="ts">
-import { ref, computed } from 'vue'
-import { Loader2, Tag, SquarePen } from 'lucide-vue-next'
-import { Dialog, Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui'
-import Button from '@/components/ui/button.vue'
-import Input from '@/components/ui/input.vue'
-import Label from '@/components/ui/label.vue'
-import { useToast } from '@/composables/useToast'
-import { useFormDialog } from '@/composables/useFormDialog'
-import type { ModelAlias, CreateModelAliasRequest, UpdateModelAliasRequest } from '@/api/endpoints/aliases'
-import type { GlobalModelResponse } from '@/api/global-models'
-
-export interface ProviderOption {
-  id: string
-  name: string
-  display_name?: string
-}
-
-interface AliasFormData {
-  alias: string
-  global_model_id: string
-  provider_id: string | null
-  mapping_type: 'alias' | 'mapping'
-  is_active: boolean
-}
-
-const props = withDefaults(defineProps<{
-  open: boolean
-  editingAlias?: ModelAlias | null
-  globalModels: GlobalModelResponse[]
-  providers?: ProviderOption[]
-  fixedTargetModel?: GlobalModelResponse | null  // 用于从模型详情抽屉打开时固定目标模型
-  fixedProvider?: ProviderOption | null  // 用于 Provider 特定别名固定 Provider
-  showProviderSelect?: boolean  // 是否显示 Provider 选择（默认 true）
-}>(), {
-  editingAlias: null,
-  providers: () => [],
-  fixedTargetModel: null,
-  fixedProvider: null,
-  showProviderSelect: true
-})
-
-const emit = defineEmits<{
-  'update:open': [value: boolean]
-  'submit': [data: CreateModelAliasRequest | UpdateModelAliasRequest, isEdit: boolean]
-}>()
-
-const { error: showError } = useToast()
-
-// 状态
-const submitting = ref(false)
-const providerSelectOpen = ref(false)
-const sourceModelSelectOpen = ref(false)
-const targetModelSelectOpen = ref(false)
-const form = ref<AliasFormData>({
-  alias: '',
-  global_model_id: '',
-  provider_id: null,
-  mapping_type: 'alias',
-  is_active: true,
-})
-
-// 处理 Provider 选择变化
-function handleProviderChange(value: string) {
-  form.value.provider_id = value === 'global' ? null : value
-}
-
-// 重置表单
-function resetForm() {
-  form.value = {
-    alias: '',
-    global_model_id: props.fixedTargetModel?.id || '',
-    provider_id: props.fixedProvider?.id || null,
-    mapping_type: 'alias',
-    is_active: true,
-  }
-}
-
-// 加载别名数据（编辑模式）
-function loadAliasData() {
-  if (!props.editingAlias) return
-  form.value = {
-    alias: props.editingAlias.alias,
-    global_model_id: props.editingAlias.global_model_id,
-    provider_id: props.editingAlias.provider_id,
-    mapping_type: props.editingAlias.mapping_type || 'alias',
-    is_active: props.editingAlias.is_active,
-  }
-}
-
-// 使用 useFormDialog 统一处理对话框逻辑
-const { isEditMode, handleDialogUpdate, handleCancel } = useFormDialog({
-  isOpen: () => props.open,
-  entity: () => props.editingAlias,
-  isLoading: submitting,
-  onClose: () => emit('update:open', false),
-  loadData: loadAliasData,
-  resetForm,
-})
-
-// 对话框标题
-const dialogTitle = computed(() => {
-  if (isEditMode.value) {
-    return form.value.mapping_type === 'mapping' ? '编辑映射' : '编辑别名'
-  }
-  if (props.fixedProvider) {
-    return `创建 ${props.fixedProvider.display_name || props.fixedProvider.name} 特定别名/映射`
-  }
-  return '创建别名/映射'
-})
-
-// 对话框描述
-const dialogDescription = computed(() => {
-  if (isEditMode.value) {
-    return form.value.mapping_type === 'mapping' ? '修改模型映射配置' : '修改别名设置'
-  }
-  return '为模型创建别名或映射规则'
-})
-
-// 对话框图标
-const dialogIcon = computed(() => isEditMode.value ? SquarePen : Tag)
-
-// 映射模式下可选的源模型（排除已选择的目标模型）
-const availableSourceModels = computed(() => {
-  return props.globalModels.filter(m => m.id !== form.value.global_model_id)
-})
-
-// 可选的目标模型（映射模式下排除已选择的源模型）
-const availableTargetModels = computed(() => {
-  if (form.value.mapping_type === 'mapping' && form.value.alias) {
-    // 找到源模型对应的 GlobalModel
-    const sourceModel = props.globalModels.find(m => m.name === form.value.alias)
-    if (sourceModel) {
-      return props.globalModels.filter(m => m.id !== sourceModel.id)
-    }
-  }
-  return props.globalModels
-})
-
-// 提交表单
-async function handleSubmit() {
-  if (!form.value.alias) {
-    showError(form.value.mapping_type === 'alias' ? '请输入别名名称' : '请选择源模型', '错误')
-    return
-  }
-
-  const targetModelId = props.fixedTargetModel?.id || form.value.global_model_id
-  if (!targetModelId) {
-    showError('请选择目标模型', '错误')
-    return
-  }
-
-  submitting.value = true
-  try {
-    const data: CreateModelAliasRequest | UpdateModelAliasRequest = {
-      alias: form.value.alias,
-      global_model_id: targetModelId,
-      provider_id: props.fixedProvider?.id || form.value.provider_id,
-      mapping_type: form.value.mapping_type,
-      is_active: form.value.is_active,
-    }
-
-    emit('submit', data, !!props.editingAlias)
-  } finally {
-    submitting.value = false
-  }
-}
-</script>

frontend/src/features/models/components/GlobalModelFormDialog.vue

@@ -2,13 +2,105 @@
   <Dialog
     :model-value="open"
     :title="isEditMode ? '编辑模型' : '创建统一模型'"
-    :description="isEditMode ? '修改模型配置和价格信息' : '添加一个新的全局模型定义'"
+    :description="isEditMode ? '修改模型配置和价格信息' : ''"
     :icon="isEditMode ? SquarePen : Layers"
-    size="xl"
+    size="3xl"
     @update:model-value="handleDialogUpdate"
+  >
+    <div
+      class="flex gap-4"
+      :class="isEditMode ? '' : 'h-[500px]'"
+    >
+      <!-- 左侧：模型选择（仅创建模式） -->
+      <div
+        v-if="!isEditMode"
+        class="w-[260px] shrink-0 flex flex-col h-full"
+      >
+        <!-- 搜索框 -->
+        <div class="relative mb-3">
+          <Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+          <Input
+            v-model="searchQuery"
+            type="text"
+            placeholder="搜索模型、提供商..."
+            class="pl-8 h-8 text-sm"
+          />
+        </div>
+
+        <!-- 模型列表（两级结构） -->
+        <div class="flex-1 overflow-y-auto border rounded-lg min-h-0 scrollbar-thin">
+          <div
+            v-if="loading"
+            class="flex items-center justify-center h-32"
+          >
+            <Loader2 class="w-5 h-5 animate-spin text-muted-foreground" />
+          </div>
+          <template v-else>
+            <!-- 提供商分组 -->
+            <div
+              v-for="group in groupedModels"
+              :key="group.providerId"
+              class="border-b last:border-b-0"
+            >
+              <!-- 提供商标题行 -->
+              <div
+                class="flex items-center gap-2 px-2.5 py-2 cursor-pointer hover:bg-muted text-sm"
+                @click="toggleProvider(group.providerId)"
+              >
+                <ChevronRight
+                  class="w-3.5 h-3.5 text-muted-foreground transition-transform shrink-0"
+                  :class="expandedProvider === group.providerId ? 'rotate-90' : ''"
+                />
+                <img
+                  :src="getProviderLogoUrl(group.providerId)"
+                  :alt="group.providerName"
+                  class="w-4 h-4 rounded shrink-0 dark:invert dark:brightness-90"
+                  @error="handleLogoError"
+                >
+                <span class="truncate font-medium text-xs flex-1">{{ group.providerName }}</span>
+                <span class="text-[10px] text-muted-foreground shrink-0">{{ group.models.length }}</span>
+              </div>
+              <!-- 模型列表 -->
+              <div
+                v-if="expandedProvider === group.providerId"
+                class="bg-muted/30"
+              >
+                <div
+                  v-for="model in group.models"
+                  :key="model.modelId"
+                  class="flex flex-col gap-0.5 pl-7 pr-2.5 py-1.5 cursor-pointer text-xs border-t"
+                  :class="selectedModel?.modelId === model.modelId && selectedModel?.providerId === model.providerId
+                    ? 'bg-primary text-primary-foreground'
+                    : 'hover:bg-muted'"
+                  @click="selectModel(model)"
+                >
+                  <span class="truncate font-medium">{{ model.modelName }}</span>
+                  <span
+                    class="truncate text-[10px]"
+                    :class="selectedModel?.modelId === model.modelId && selectedModel?.providerId === model.providerId
+                      ? 'text-primary-foreground/70'
+                      : 'text-muted-foreground'"
+                  >{{ model.modelId }}</span>
+                </div>
+              </div>
+            </div>
+            <div
+              v-if="groupedModels.length === 0"
+              class="text-center py-8 text-sm text-muted-foreground"
+            >
+              {{ searchQuery ? '未找到模型' : '加载中...' }}
+            </div>
+          </template>
+        </div>
+      </div>
+
+      <!-- 右侧：表单 -->
+      <div
+        class="flex-1 overflow-y-auto h-full scrollbar-thin"
+        :class="isEditMode ? 'max-h-[70vh]' : ''"
       >
         <form
-      class="space-y-5 max-h-[70vh] overflow-y-auto pr-1"
+          class="space-y-5"
           @submit.prevent="handleSubmit"
         >
           <!-- 基本信息 -->
@@ -16,7 +108,6 @@
             <h4 class="font-medium text-sm">
               基本信息
             </h4>
-
             <div class="grid grid-cols-2 gap-3">
               <div class="space-y-1.5">
                 <Label
@@ -30,12 +121,6 @@
                   :disabled="isEditMode"
                   required
                 />
-            <p
-              v-if="!isEditMode"
-              class="text-xs text-muted-foreground"
-            >
-              创建后不可修改
-            </p>
               </div>
               <div class="space-y-1.5">
                 <Label
@@ -50,7 +135,6 @@
                 />
               </div>
             </div>
-
             <div class="space-y-1.5">
               <Label
                 for="model-description"
@@ -58,10 +142,51 @@
               >描述</Label>
               <Input
                 id="model-description"
-            v-model="form.description"
+                :model-value="form.config?.description || ''"
                 placeholder="简短描述此模型的特点"
+                @update:model-value="(v) => setConfigField('description', v || undefined)"
               />
             </div>
+            <div class="grid grid-cols-3 gap-3">
+              <div class="space-y-1.5">
+                <Label
+                  for="model-family"
+                  class="text-xs"
+                >模型系列</Label>
+                <Input
+                  id="model-family"
+                  :model-value="form.config?.family || ''"
+                  placeholder="如 GPT-4、Claude 3"
+                  @update:model-value="(v) => setConfigField('family', v || undefined)"
+                />
+              </div>
+              <div class="space-y-1.5">
+                <Label
+                  for="model-context-limit"
+                  class="text-xs"
+                >上下文限制</Label>
+                <Input
+                  id="model-context-limit"
+                  type="number"
+                  :model-value="form.config?.context_limit ?? ''"
+                  placeholder="如 128000"
+                  @update:model-value="(v) => setConfigField('context_limit', v ? Number(v) : undefined)"
+                />
+              </div>
+              <div class="space-y-1.5">
+                <Label
+                  for="model-output-limit"
+                  class="text-xs"
+                >输出限制</Label>
+                <Input
+                  id="model-output-limit"
+                  type="number"
+                  :model-value="form.config?.output_limit ?? ''"
+                  placeholder="如 8192"
+                  @update:model-value="(v) => setConfigField('output_limit', v ? Number(v) : undefined)"
+                />
+              </div>
+            </div>
           </section>
 
           <!-- 能力配置 -->
@@ -70,50 +195,55 @@
               默认能力
             </h4>
             <div class="flex flex-wrap gap-2">
-          <label class="flex items-center gap-2 px-3 py-1.5 rounded-md border border-border bg-muted/30 cursor-pointer text-sm">
+              <label class="flex items-center gap-2 px-2.5 py-1 rounded-md border bg-muted/30 cursor-pointer text-sm">
                 <input
-              v-model="form.default_supports_streaming"
                   type="checkbox"
+                  :checked="form.config?.streaming !== false"
                   class="rounded"
+                  @change="setConfigField('streaming', ($event.target as HTMLInputElement).checked)"
                 >
                 <Zap class="w-3.5 h-3.5 text-muted-foreground" />
-            <span>流式输出</span>
+                <span>流式</span>
               </label>
-          <label class="flex items-center gap-2 px-3 py-1.5 rounded-md border border-border bg-muted/30 cursor-pointer text-sm">
+              <label class="flex items-center gap-2 px-2.5 py-1 rounded-md border bg-muted/30 cursor-pointer text-sm">
                 <input
-              v-model="form.default_supports_vision"
                   type="checkbox"
+                  :checked="form.config?.vision === true"
                   class="rounded"
+                  @change="setConfigField('vision', ($event.target as HTMLInputElement).checked)"
                 >
                 <Eye class="w-3.5 h-3.5 text-muted-foreground" />
-            <span>视觉理解</span>
+                <span>视觉</span>
               </label>
-          <label class="flex items-center gap-2 px-3 py-1.5 rounded-md border border-border bg-muted/30 cursor-pointer text-sm">
+              <label class="flex items-center gap-2 px-2.5 py-1 rounded-md border bg-muted/30 cursor-pointer text-sm">
                 <input
-              v-model="form.default_supports_function_calling"
                   type="checkbox"
+                  :checked="form.config?.function_calling === true"
                   class="rounded"
+                  @change="setConfigField('function_calling', ($event.target as HTMLInputElement).checked)"
                 >
                 <Wrench class="w-3.5 h-3.5 text-muted-foreground" />
-            <span>工具调用</span>
+                <span>工具</span>
               </label>
-          <label class="flex items-center gap-2 px-3 py-1.5 rounded-md border border-border bg-muted/30 cursor-pointer text-sm">
+              <label class="flex items-center gap-2 px-2.5 py-1 rounded-md border bg-muted/30 cursor-pointer text-sm">
                 <input
-              v-model="form.default_supports_extended_thinking"
                   type="checkbox"
+                  :checked="form.config?.extended_thinking === true"
                   class="rounded"
+                  @change="setConfigField('extended_thinking', ($event.target as HTMLInputElement).checked)"
                 >
                 <Brain class="w-3.5 h-3.5 text-muted-foreground" />
-            <span>深度思考</span>
+                <span>思考</span>
               </label>
-          <label class="flex items-center gap-2 px-3 py-1.5 rounded-md border border-border bg-muted/30 cursor-pointer text-sm">
+              <label class="flex items-center gap-2 px-2.5 py-1 rounded-md border bg-muted/30 cursor-pointer text-sm">
                 <input
-              v-model="form.default_supports_image_generation"
                   type="checkbox"
+                  :checked="form.config?.image_generation === true"
                   class="rounded"
+                  @change="setConfigField('image_generation', ($event.target as HTMLInputElement).checked)"
                 >
                 <Image class="w-3.5 h-3.5 text-muted-foreground" />
-            <span>图像生成</span>
+                <span>生图</span>
               </label>
             </div>
           </section>
@@ -130,7 +260,7 @@
               <label
                 v-for="cap in availableCapabilities"
                 :key="cap.name"
-            class="flex items-center gap-2 px-3 py-1.5 rounded-md border border-border bg-muted/30 cursor-pointer text-sm"
+                class="flex items-center gap-2 px-2.5 py-1 rounded-md border bg-muted/30 cursor-pointer text-sm"
               >
                 <input
                   type="checkbox"
@@ -153,23 +283,23 @@
               v-model="tieredPricing"
               :show-cache1h="form.supported_capabilities?.includes('cache_1h')"
             />
-
-        <!-- 按次计费 -->
             <div class="flex items-center gap-3 pt-2 border-t">
-          <Label class="text-xs whitespace-nowrap">按次计费 ($/次)</Label>
+              <Label class="text-xs whitespace-nowrap">按次计费</Label>
               <Input
                 :model-value="form.default_price_per_request ?? ''"
                 type="number"
                 step="0.001"
                 min="0"
-            class="w-32"
-            placeholder="留空不启用"
+                class="w-24"
+                placeholder="$/次"
                 @update:model-value="(v) => form.default_price_per_request = parseNumberInput(v, { allowFloat: true })"
               />
-          <span class="text-xs text-muted-foreground">每次请求固定费用，可与 Token 计费叠加</span>
+              <span class="text-xs text-muted-foreground">可与 Token 计费叠加</span>
             </div>
           </section>
         </form>
+      </div>
+    </div>
 
     <template #footer>
       <Button
@@ -180,7 +310,7 @@
         取消
       </Button>
       <Button
-        :disabled="submitting"
+        :disabled="submitting || !form.name || !form.display_name"
         @click="handleSubmit"
       >
         <Loader2
@@ -189,19 +319,35 @@
         />
         {{ isEditMode ? '保存' : '创建' }}
       </Button>
+      <Button
+        v-if="selectedModel && !isEditMode"
+        type="button"
+        variant="ghost"
+        @click="clearSelection"
+      >
+        清空
+      </Button>
     </template>
   </Dialog>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import { Eye, Wrench, Brain, Zap, Image, Loader2, Layers, SquarePen } from 'lucide-vue-next'
+import { ref, computed, onMounted, watch } from 'vue'
+import {
+  Eye, Wrench, Brain, Zap, Image, Loader2, Layers, SquarePen,
+  Search, ChevronRight
+} from 'lucide-vue-next'
 import { Dialog, Button, Input, Label } from '@/components/ui'
 import { useToast } from '@/composables/useToast'
 import { useFormDialog } from '@/composables/useFormDialog'
 import { parseNumberInput } from '@/utils/form'
 import { log } from '@/utils/logger'
 import TieredPricingEditor from './TieredPricingEditor.vue'
+import {
+  getModelsDevList,
+  getProviderLogoUrl,
+  type ModelsDevModelItem,
+} from '@/api/models-dev'
 import {
   createGlobalModel,
   updateGlobalModel,
@@ -226,42 +372,147 @@ const { success, error: showError } = useToast()
 const submitting = ref(false)
 const tieredPricingEditorRef = ref<InstanceType<typeof TieredPricingEditor> | null>(null)
 
-// 阶梯计费配置（统一使用，固定价格就是单阶梯）
+// 模型列表相关
+const loading = ref(false)
+const searchQuery = ref('')
+const allModelsCache = ref<ModelsDevModelItem[]>([]) // 全部模型（缓存）
+const selectedModel = ref<ModelsDevModelItem | null>(null)
+const expandedProvider = ref<string | null>(null)
+
+// 当前显示的模型列表：有搜索词时用全部，否则只用官方
+const allModels = computed(() => {
+  if (searchQuery.value) {
+    return allModelsCache.value
+  }
+  return allModelsCache.value.filter(m => m.official)
+})
+
+// 按提供商分组的模型
+interface ProviderGroup {
+  providerId: string
+  providerName: string
+  models: ModelsDevModelItem[]
+}
+
+const groupedModels = computed(() => {
+  let models = allModels.value.filter(m => !m.deprecated)
+  // 搜索（支持空格分隔的多关键词 AND 搜索）
+  if (searchQuery.value) {
+    const keywords = searchQuery.value.toLowerCase().split(/\s+/).filter(k => k.length > 0)
+    models = models.filter(model => {
+      const searchableText = `${model.providerId} ${model.providerName} ${model.modelId} ${model.modelName} ${model.family || ''}`.toLowerCase()
+      return keywords.every(keyword => searchableText.includes(keyword))
+    })
+  }
+
+  // 按提供商分组
+  const groups = new Map<string, ProviderGroup>()
+  for (const model of models) {
+    if (!groups.has(model.providerId)) {
+      groups.set(model.providerId, {
+        providerId: model.providerId,
+        providerName: model.providerName,
+        models: []
+      })
+    }
+    groups.get(model.providerId)!.models.push(model)
+  }
+
+  // 转换为数组并排序
+  const result = Array.from(groups.values())
+
+  // 如果有搜索词，把提供商名称/ID匹配的排在前面
+  if (searchQuery.value) {
+    const keywords = searchQuery.value.toLowerCase().split(/\s+/).filter(k => k.length > 0)
+    result.sort((a, b) => {
+      const aText = `${a.providerId} ${a.providerName}`.toLowerCase()
+      const bText = `${b.providerId} ${b.providerName}`.toLowerCase()
+      const aProviderMatch = keywords.some(k => aText.includes(k))
+      const bProviderMatch = keywords.some(k => bText.includes(k))
+      if (aProviderMatch && !bProviderMatch) return -1
+      if (!aProviderMatch && bProviderMatch) return 1
+      return a.providerName.localeCompare(b.providerName)
+    })
+  } else {
+    result.sort((a, b) => a.providerName.localeCompare(b.providerName))
+  }
+
+  return result
+})
+
+// 搜索时如果只有一个提供商，自动展开
+watch(groupedModels, (groups) => {
+  if (searchQuery.value && groups.length === 1) {
+    expandedProvider.value = groups[0].providerId
+  }
+})
+
+// 切换提供商展开状态
+function toggleProvider(providerId: string) {
+  expandedProvider.value = expandedProvider.value === providerId ? null : providerId
+}
+
+// 阶梯计费配置
 const tieredPricing = ref<TieredPricingConfig | null>(null)
 
 interface FormData {
   name: string
   display_name: string
-  description?: string
   default_price_per_request?: number
-  default_supports_streaming?: boolean
-  default_supports_image_generation?: boolean
-  default_supports_vision?: boolean
-  default_supports_function_calling?: boolean
-  default_supports_extended_thinking?: boolean
   supported_capabilities?: string[]
+  config?: Record<string, any>
   is_active?: boolean
 }
 
 const defaultForm = (): FormData => ({
   name: '',
   display_name: '',
-  description: '',
   default_price_per_request: undefined,
-  default_supports_streaming: true,
-  default_supports_image_generation: false,
-  default_supports_vision: false,
-  default_supports_function_calling: false,
-  default_supports_extended_thinking: false,
   supported_capabilities: [],
+  config: { streaming: true },
   is_active: true,
 })
 
 const form = ref<FormData>(defaultForm())
 
+const KEEP_FALSE_CONFIG_KEYS = new Set(['streaming'])
+
+// 设置 config 字段
+function setConfigField(key: string, value: any) {
+  if (!form.value.config) {
+    form.value.config = {}
+  }
+  if (value === undefined || value === '' || (value === false && !KEEP_FALSE_CONFIG_KEYS.has(key))) {
+    delete form.value.config[key]
+  } else {
+    form.value.config[key] = value
+  }
+}
+
 // Key 能力选项
 const availableCapabilities = ref<CapabilityDefinition[]>([])
 
+// 加载模型列表
+async function loadModels() {
+  if (allModelsCache.value.length > 0) return
+  loading.value = true
+  try {
+    // 只加载一次全部模型，过滤在 computed 中完成
+    allModelsCache.value = await getModelsDevList(false)
+  } catch (err) {
+    log.error('Failed to load models:', err)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 打开对话框时加载数据
+watch(() => props.open, (isOpen) => {
+  if (isOpen && !props.model) {
+    loadModels()
+  }
+})
+
 // 加载可用能力列表
 async function loadCapabilities() {
   try {
@@ -284,38 +535,92 @@ function toggleCapability(capName: string) {
   }
 }
 
-// 组件挂载时加载能力列表
 onMounted(() => {
   loadCapabilities()
 })
 
+// 选择模型并填充表单
+function selectModel(model: ModelsDevModelItem) {
+  selectedModel.value = model
+  expandedProvider.value = model.providerId
+  form.value.name = model.modelId
+  form.value.display_name = model.modelName
+
+  // 构建 config
+  const config: Record<string, any> = {
+    streaming: true,
+  }
+  if (model.supportsVision) config.vision = true
+  if (model.supportsToolCall) config.function_calling = true
+  if (model.supportsReasoning) config.extended_thinking = true
+  if (model.supportsStructuredOutput) config.structured_output = true
+  if (model.supportsTemperature !== false) config.temperature = model.supportsTemperature
+  if (model.supportsAttachment) config.attachment = true
+  if (model.openWeights) config.open_weights = true
+  if (model.contextLimit) config.context_limit = model.contextLimit
+  if (model.outputLimit) config.output_limit = model.outputLimit
+  if (model.knowledgeCutoff) config.knowledge_cutoff = model.knowledgeCutoff
+  if (model.family) config.family = model.family
+  if (model.releaseDate) config.release_date = model.releaseDate
+  if (model.inputModalities?.length) config.input_modalities = model.inputModalities
+  if (model.outputModalities?.length) config.output_modalities = model.outputModalities
+  form.value.config = config
+
+  if (model.inputPrice !== undefined || model.outputPrice !== undefined) {
+    tieredPricing.value = {
+      tiers: [{
+        up_to: null,
+        input_price_per_1m: model.inputPrice || 0,
+        output_price_per_1m: model.outputPrice || 0,
+      }]
+    }
+  } else {
+    tieredPricing.value = null
+  }
+}
+
+// 清除选择（手动填写）
+function clearSelection() {
+  selectedModel.value = null
+  form.value = defaultForm()
+  tieredPricing.value = null
+}
+
+// Logo 加载失败处理
+function handleLogoError(event: Event) {
+  const img = event.target as HTMLImageElement
+  img.style.display = 'none'
+}
+
 // 重置表单
 function resetForm() {
   form.value = defaultForm()
   tieredPricing.value = null
+  searchQuery.value = ''
+  selectedModel.value = null
+  expandedProvider.value = null
 }
 
 // 加载模型数据（编辑模式）
 function loadModelData() {
   if (!props.model) return
+  // 先重置创建模式的残留状态
+  selectedModel.value = null
+  searchQuery.value = ''
+  expandedProvider.value = null
+
   form.value = {
     name: props.model.name,
     display_name: props.model.display_name,
-    description: props.model.description,
     default_price_per_request: props.model.default_price_per_request,
-    default_supports_streaming: props.model.default_supports_streaming,
-    default_supports_image_generation: props.model.default_supports_image_generation,
-    default_supports_vision: props.model.default_supports_vision,
-    default_supports_function_calling: props.model.default_supports_function_calling,
-    default_supports_extended_thinking: props.model.default_supports_extended_thinking,
     supported_capabilities: [...(props.model.supported_capabilities || [])],
+    config: props.model.config ? { ...props.model.config } : { streaming: true },
     is_active: props.model.is_active,
   }
-
-  // 加载阶梯计费配置（深拷贝）
-  if (props.model.default_tiered_pricing) {
-    tieredPricing.value = JSON.parse(JSON.stringify(props.model.default_tiered_pricing))
-  }
+  // 确保 tieredPricing 也被正确设置或重置
+  tieredPricing.value = props.model.default_tiered_pricing
+    ? JSON.parse(JSON.stringify(props.model.default_tiered_pricing))
+    : null
 }
 
 // 使用 useFormDialog 统一处理对话框逻辑
@@ -339,24 +644,22 @@ async function handleSubmit() {
     return
   }
 
-  // 获取包含自动计算缓存价格的最终数据
   const finalTiers = tieredPricingEditorRef.value?.getFinalTiers()
   const finalTieredPricing = finalTiers ? { tiers: finalTiers } : tieredPricing.value
 
+  // 清理空的 config
+  const cleanConfig = form.value.config && Object.keys(form.value.config).length > 0
+    ? form.value.config
+    : undefined
+
   submitting.value = true
   try {
     if (isEditMode.value && props.model) {
       const updateData: GlobalModelUpdate = {
         display_name: form.value.display_name,
-        description: form.value.description,
-        // 使用 null 而不是 undefined 来显式清空字段
+        config: cleanConfig || null,
         default_price_per_request: form.value.default_price_per_request ?? null,
         default_tiered_pricing: finalTieredPricing,
-        default_supports_streaming: form.value.default_supports_streaming,
-        default_supports_image_generation: form.value.default_supports_image_generation,
-        default_supports_vision: form.value.default_supports_vision,
-        default_supports_function_calling: form.value.default_supports_function_calling,
-        default_supports_extended_thinking: form.value.default_supports_extended_thinking,
         supported_capabilities: form.value.supported_capabilities?.length ? form.value.supported_capabilities : null,
         is_active: form.value.is_active,
       }
@@ -366,14 +669,9 @@ async function handleSubmit() {
       const createData: GlobalModelCreate = {
         name: form.value.name!,
         display_name: form.value.display_name!,
-        description: form.value.description,
-        default_price_per_request: form.value.default_price_per_request || undefined,
+        config: cleanConfig,
+        default_price_per_request: form.value.default_price_per_request ?? undefined,
         default_tiered_pricing: finalTieredPricing,
-        default_supports_streaming: form.value.default_supports_streaming,
-        default_supports_image_generation: form.value.default_supports_image_generation,
-        default_supports_vision: form.value.default_supports_vision,
-        default_supports_function_calling: form.value.default_supports_function_calling,
-        default_supports_extended_thinking: form.value.default_supports_extended_thinking,
         supported_capabilities: form.value.supported_capabilities?.length ? form.value.supported_capabilities : undefined,
         is_active: form.value.is_active,
       }

frontend/src/features/models/components/ModelDetailDrawer.vue

@@ -38,12 +38,12 @@
                   >
                     <Copy class="w-3 h-3" />
                   </button>
-                  <template v-if="model.description">
+                  <template v-if="model.config?.description">
                     <span class="shrink-0">·</span>
                     <span
                       class="text-xs truncate"
-                      :title="model.description"
-                    >{{ model.description }}</span>
+                      :title="model.config?.description"
+                    >{{ model.config?.description }}</span>
                   </template>
                 </div>
               </div>
@@ -104,19 +104,6 @@
                 <span class="hidden sm:inline">关联提供商</span>
                 <span class="sm:hidden">提供商</span>
               </button>
-              <button
-                type="button"
-                class="flex-1 px-2 sm:px-4 py-2 text-xs sm:text-sm font-medium rounded-md transition-all duration-200"
-                :class="[
-                  detailTab === 'aliases'
-                    ? 'bg-primary text-primary-foreground shadow-sm'
-                    : 'text-muted-foreground hover:text-foreground hover:bg-background/50'
-                ]"
-                @click="detailTab = 'aliases'"
-              >
-                <span class="hidden sm:inline">别名/映射</span>
-                <span class="sm:hidden">别名</span>
-              </button>
             </div>
 
             <!-- Tab 内容 -->
@@ -156,10 +143,10 @@
                       </p>
                     </div>
                     <Badge
-                      :variant="model.default_supports_streaming ?? false ? 'default' : 'secondary'"
+                      :variant="model.config?.streaming !== false ? 'default' : 'secondary'"
                       class="text-xs"
                     >
-                      {{ model.default_supports_streaming ?? false ? '支持' : '不支持' }}
+                      {{ model.config?.streaming !== false ? '支持' : '不支持' }}
                     </Badge>
                   </div>
                   <div class="flex items-center gap-2 p-3 rounded-lg border">
@@ -173,10 +160,10 @@
                       </p>
                     </div>
                     <Badge
-                      :variant="model.default_supports_image_generation ?? false ? 'default' : 'secondary'"
+                      :variant="model.config?.image_generation === true ? 'default' : 'secondary'"
                       class="text-xs"
                     >
-                      {{ model.default_supports_image_generation ?? false ? '支持' : '不支持' }}
+                      {{ model.config?.image_generation === true ? '支持' : '不支持' }}
                     </Badge>
                   </div>
                   <div class="flex items-center gap-2 p-3 rounded-lg border">
@@ -190,10 +177,10 @@
                       </p>
                     </div>
                     <Badge
-                      :variant="model.default_supports_vision ?? false ? 'default' : 'secondary'"
+                      :variant="model.config?.vision === true ? 'default' : 'secondary'"
                       class="text-xs"
                     >
-                      {{ model.default_supports_vision ?? false ? '支持' : '不支持' }}
+                      {{ model.config?.vision === true ? '支持' : '不支持' }}
                     </Badge>
                   </div>
                   <div class="flex items-center gap-2 p-3 rounded-lg border">
@@ -207,10 +194,10 @@
                       </p>
                     </div>
                     <Badge
-                      :variant="model.default_supports_function_calling ?? false ? 'default' : 'secondary'"
+                      :variant="model.config?.function_calling === true ? 'default' : 'secondary'"
                       class="text-xs"
                     >
-                      {{ model.default_supports_function_calling ?? false ? '支持' : '不支持' }}
+                      {{ model.config?.function_calling === true ? '支持' : '不支持' }}
                     </Badge>
                   </div>
                   <div class="flex items-center gap-2 p-3 rounded-lg border">
@@ -224,10 +211,10 @@
                       </p>
                     </div>
                     <Badge
-                      :variant="model.default_supports_extended_thinking ?? false ? 'default' : 'secondary'"
+                      :variant="model.config?.extended_thinking === true ? 'default' : 'secondary'"
                       class="text-xs"
                     >
-                      {{ model.default_supports_extended_thinking ?? false ? '支持' : '不支持' }}
+                      {{ model.config?.extended_thinking === true ? '支持' : '不支持' }}
                     </Badge>
                   </div>
                 </div>
@@ -409,11 +396,11 @@
                   </div>
                   <div class="p-3 rounded-lg border bg-muted/20">
                     <div class="flex items-center justify-between">
-                      <Label class="text-xs text-muted-foreground">别名数量</Label>
-                      <Tag class="w-4 h-4 text-muted-foreground" />
+                      <Label class="text-xs text-muted-foreground">调用次数</Label>
+                      <BarChart3 class="w-4 h-4 text-muted-foreground" />
                     </div>
                     <p class="text-2xl font-bold mt-1">
-                      {{ model.alias_count || 0 }}
+                      {{ model.usage_count || 0 }}
                     </p>
                   </div>
                 </div>
@@ -473,13 +460,13 @@
                         <TableHead class="h-10 font-semibold">
                           Provider
                         </TableHead>
-                      <TableHead class="w-[120px] h-10 font-semibold">
+                        <TableHead class="w-[100px] h-10 font-semibold">
                           能力
                         </TableHead>
-                      <TableHead class="w-[180px] h-10 font-semibold">
+                        <TableHead class="w-[200px] h-10 font-semibold">
                           价格 ($/M)
                         </TableHead>
-                      <TableHead class="w-[80px] h-10 font-semibold text-center">
+                        <TableHead class="w-[100px] h-10 font-semibold text-center">
                           操作
                         </TableHead>
                       </TableRow>
@@ -497,7 +484,7 @@
                               :class="provider.is_active ? 'bg-green-500' : 'bg-gray-300'"
                               :title="provider.is_active ? '活跃' : '停用'"
                             />
-                          <span class="font-medium truncate">{{ provider.display_name }}</span>
+                            <span class="font-medium truncate">{{ provider.name }}</span>
                           </div>
                         </TableCell>
                         <TableCell class="py-3">
@@ -608,7 +595,7 @@
                             class="w-2 h-2 rounded-full shrink-0"
                             :class="provider.is_active ? 'bg-green-500' : 'bg-gray-300'"
                           />
-                        <span class="font-medium truncate">{{ provider.display_name }}</span>
+                          <span class="font-medium truncate">{{ provider.name }}</span>
                         </div>
                         <div class="flex items-center gap-1 shrink-0">
                           <Button
@@ -684,236 +671,6 @@
                 </div>
               </Card>
             </div>
-
-            <!-- Tab 3: 别名 -->
-            <div v-show="detailTab === 'aliases'">
-              <Card class="overflow-hidden">
-                <!-- 标题栏 -->
-                <div class="px-4 py-3 border-b border-border/60">
-                  <div class="flex items-center justify-between gap-4">
-                    <div>
-                      <h4 class="text-sm font-semibold">
-                        别名与映射
-                      </h4>
-                    </div>
-                    <div class="flex items-center gap-2">
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        class="h-8 w-8"
-                        title="添加别名/映射"
-                        @click="$emit('addAlias')"
-                      >
-                        <Plus class="w-3.5 h-3.5" />
-                      </Button>
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        class="h-8 w-8"
-                        title="刷新"
-                        @click="$emit('refreshAliases')"
-                      >
-                        <RefreshCw
-                          class="w-3.5 h-3.5"
-                          :class="loadingAliases ? 'animate-spin' : ''"
-                        />
-                      </Button>
-                    </div>
-                  </div>
-                </div>
-
-                <!-- 表格内容 -->
-                <div
-                  v-if="loadingAliases"
-                  class="flex items-center justify-center py-12"
-                >
-                  <Loader2 class="w-6 h-6 animate-spin text-primary" />
-                </div>
-
-                <template v-else-if="aliases.length > 0">
-                  <!-- 桌面端表格 -->
-                  <Table class="hidden sm:table">
-                  <TableHeader>
-                    <TableRow class="border-b border-border/60 hover:bg-transparent">
-                      <TableHead class="h-10 font-semibold">
-                        别名
-                      </TableHead>
-                      <TableHead class="w-[80px] h-10 font-semibold">
-                        类型
-                      </TableHead>
-                      <TableHead class="w-[100px] h-10 font-semibold">
-                        作用域
-                      </TableHead>
-                      <TableHead class="w-[100px] h-10 font-semibold text-center">
-                        操作
-                      </TableHead>
-                    </TableRow>
-                  </TableHeader>
-                  <TableBody>
-                    <TableRow
-                      v-for="alias in aliases"
-                      :key="alias.id"
-                      class="border-b border-border/40 hover:bg-muted/30 transition-colors"
-                    >
-                      <TableCell class="py-3">
-                        <div class="flex items-center gap-2">
-                          <span
-                            class="w-2 h-2 rounded-full shrink-0"
-                            :class="alias.is_active ? 'bg-green-500' : 'bg-gray-300'"
-                            :title="alias.is_active ? '活跃' : '停用'"
-                          />
-                          <code class="text-sm font-medium bg-muted px-1.5 py-0.5 rounded">{{ alias.alias }}</code>
-                        </div>
-                      </TableCell>
-                      <TableCell class="py-3">
-                        <Badge
-                          variant="secondary"
-                          class="text-xs"
-                        >
-                          {{ alias.mapping_type === 'mapping' ? '映射' : '别名' }}
-                        </Badge>
-                      </TableCell>
-                      <TableCell class="py-3">
-                        <Badge
-                          v-if="alias.provider_id"
-                          variant="outline"
-                          class="text-xs truncate max-w-[90px]"
-                          :title="alias.provider_name || 'Provider'"
-                        >
-                          {{ alias.provider_name || 'Provider' }}
-                        </Badge>
-                        <Badge
-                          v-else
-                          variant="default"
-                          class="text-xs"
-                        >
-                          全局
-                        </Badge>
-                      </TableCell>
-                      <TableCell class="py-3 text-center">
-                        <div class="flex items-center justify-center gap-0.5">
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            class="h-7 w-7"
-                            title="编辑"
-                            @click="$emit('editAlias', alias)"
-                          >
-                            <Edit class="w-3.5 h-3.5" />
-                          </Button>
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            class="h-7 w-7"
-                            :title="alias.is_active ? '停用' : '启用'"
-                            @click="$emit('toggleAliasStatus', alias)"
-                          >
-                            <Power class="w-3.5 h-3.5" />
-                          </Button>
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            class="h-7 w-7"
-                            title="删除"
-                            @click="$emit('deleteAlias', alias)"
-                          >
-                            <Trash2 class="w-3.5 h-3.5" />
-                          </Button>
-                        </div>
-                      </TableCell>
-                    </TableRow>
-                  </TableBody>
-                  </Table>
-
-                  <!-- 移动端卡片列表 -->
-                  <div class="sm:hidden divide-y divide-border/40">
-                  <div
-                    v-for="alias in aliases"
-                    :key="alias.id"
-                    class="p-4 space-y-2"
-                  >
-                    <div class="flex items-start justify-between gap-3">
-                      <div class="flex items-center gap-2 min-w-0 flex-1">
-                        <span
-                          class="w-2 h-2 rounded-full shrink-0"
-                          :class="alias.is_active ? 'bg-green-500' : 'bg-gray-300'"
-                        />
-                        <code class="text-sm font-medium bg-muted px-1.5 py-0.5 rounded truncate">{{ alias.alias }}</code>
-                      </div>
-                      <div class="flex items-center gap-1 shrink-0">
-                        <Button
-                          variant="ghost"
-                          size="icon"
-                          class="h-7 w-7"
-                          @click="$emit('editAlias', alias)"
-                        >
-                          <Edit class="w-3.5 h-3.5" />
-                        </Button>
-                        <Button
-                          variant="ghost"
-                          size="icon"
-                          class="h-7 w-7"
-                          @click="$emit('toggleAliasStatus', alias)"
-                        >
-                          <Power class="w-3.5 h-3.5" />
-                        </Button>
-                        <Button
-                          variant="ghost"
-                          size="icon"
-                          class="h-7 w-7"
-                          @click="$emit('deleteAlias', alias)"
-                        >
-                          <Trash2 class="w-3.5 h-3.5" />
-                        </Button>
-                      </div>
-                    </div>
-                    <div class="flex items-center gap-2">
-                      <Badge
-                        variant="secondary"
-                        class="text-xs"
-                      >
-                        {{ alias.mapping_type === 'mapping' ? '映射' : '别名' }}
-                      </Badge>
-                      <Badge
-                        v-if="alias.provider_id"
-                        variant="outline"
-                        class="text-xs truncate max-w-[120px]"
-                      >
-                        {{ alias.provider_name || 'Provider' }}
-                      </Badge>
-                      <Badge
-                        v-else
-                        variant="default"
-                        class="text-xs"
-                      >
-                        全局
-                      </Badge>
-                    </div>
-                  </div>
-                  </div>
-                </template>
-
-                <div
-                  v-else
-                  class="text-center py-12"
-                >
-                  <!-- 空状态 -->
-                  <Tag class="w-12 h-12 mx-auto text-muted-foreground/30 mb-3" />
-                  <p class="text-sm text-muted-foreground">
-                    暂无别名或映射
-                  </p>
-                  <Button
-                    size="sm"
-                    variant="outline"
-                    class="mt-4"
-                    @click="$emit('addAlias')"
-                  >
-                    <Plus class="w-4 h-4 mr-1" />
-                    添加别名/映射
-                  </Button>
-                </div>
-              </Card>
-            </div>
           </div>
         </Card>
       </div>
@@ -931,7 +688,6 @@ import {
   Zap,
   Image,
   Building2,
-  Tag,
   Plus,
   Edit,
   Trash2,
@@ -939,9 +695,12 @@ import {
   Loader2,
   RefreshCw,
   Copy,
-  Layers
+  Layers,
+  BarChart3
 } from 'lucide-vue-next'
+import { useEscapeKey } from '@/composables/useEscapeKey'
 import { useToast } from '@/composables/useToast'
+import { useClipboard } from '@/composables/useClipboard'
 import Card from '@/components/ui/card.vue'
 import Badge from '@/components/ui/badge.vue'
 import Button from '@/components/ui/button.vue'
@@ -955,13 +714,11 @@ import TableCell from '@/components/ui/table-cell.vue'
 
 // 使用外部类型定义
 import type { GlobalModelResponse } from '@/api/global-models'
-import type { ModelAlias } from '@/api/endpoints/aliases'
 import type { TieredPricingConfig, PricingTier } from '@/api/endpoints/types'
 import type { CapabilityDefinition } from '@/api/endpoints'
 
 const props = withDefaults(defineProps<Props>(), {
   loadingProviders: false,
-  loadingAliases: false,
   hasBlockingDialogOpen: false,
 })
 const emit = defineEmits<{
@@ -973,21 +730,15 @@ const emit = defineEmits<{
   'deleteProvider': [provider: any]
   'toggleProviderStatus': [provider: any]
   'refreshProviders': []
-  'addAlias': []
-  'editAlias': [alias: ModelAlias]
-  'toggleAliasStatus': [alias: ModelAlias]
-  'deleteAlias': [alias: ModelAlias]
-  'refreshAliases': []
 }>()
 const { success: showSuccess, error: showError } = useToast()
+const { copyToClipboard } = useClipboard()
 
 interface Props {
   model: GlobalModelResponse | null
   open: boolean
   providers: any[]
-  aliases: ModelAlias[]
   loadingProviders?: boolean
-  loadingAliases?: boolean
   hasBlockingDialogOpen?: boolean
   capabilities?: CapabilityDefinition[]
 }
@@ -1014,16 +765,6 @@ function handleClose() {
   }
 }
 
-// 复制到剪贴板
-async function copyToClipboard(text: string) {
-  try {
-    await navigator.clipboard.writeText(text)
-    showSuccess('已复制')
-  } catch {
-    showError('复制失败')
-  }
-}
-
 // 格式化日期
 function formatDate(dateStr: string): string {
   if (!dateStr) return '-'
@@ -1085,6 +826,16 @@ watch(() => props.open, (newOpen) => {
     detailTab.value = 'basic'
   }
 })
+
+// 添加 ESC 键监听
+useEscapeKey(() => {
+  if (props.open) {
+    handleClose()
+  }
+}, {
+  disableOnInput: true,
+  once: false
+})
 </script>
 
 <style scoped>

frontend/src/features/models/components/index.ts

@@ -1,4 +1,3 @@
 export { default as GlobalModelFormDialog } from './GlobalModelFormDialog.vue'
-export { default as AliasDialog } from './AliasDialog.vue'
 export { default as ModelDetailDrawer } from './ModelDetailDrawer.vue'
 export { default as TieredPricingEditor } from './TieredPricingEditor.vue'

frontend/src/features/providers/components/BatchAssignModelsDialog.vue

@@ -1,249 +1,226 @@
 <template>
   <Dialog
     :model-value="open"
-    title="批量添加关联模型"
-    description="为提供商批量添加模型实现，提供商将自动继承模型的价格和能力，可在添加后单独修改"
+    :title="providerName ? `批量管理模型 - ${providerName}` : '批量管理模型'"
+    description="选中的模型将被关联到提供商，取消选中将移除关联"
     :icon="Layers"
-    size="4xl"
-    @update:model-value="$emit('update:open', $event)"
+    size="2xl"
+    @update:model-value="handleDialogUpdate"
   >
     <template #default>
       <div class="space-y-4">
-        <!-- 提供商信息头部 -->
-        <div class="rounded-lg border bg-muted/30 p-4">
-          <div class="flex items-start justify-between">
-            <div>
-              <p class="font-semibold text-lg">
-                {{ providerName }}
-              </p>
-              <p class="text-sm text-muted-foreground font-mono">
-                {{ providerIdentifier }}
-              </p>
+        <!-- 搜索栏 -->
+        <div class="flex items-center gap-2">
+          <div class="flex-1 relative">
+            <Search class="absolute left-2.5 top-1/2 -translate-y-1/2 w-4 h-4 text-muted-foreground" />
+            <Input
+              v-model="searchQuery"
+              placeholder="搜索模型..."
+              class="pl-8 h-9"
+            />
           </div>
-            <Badge
-              variant="outline"
-              class="text-xs"
+          <button
+            v-if="upstreamModelsLoaded"
+            type="button"
+            class="p-2 hover:bg-muted rounded-md transition-colors shrink-0"
+            title="刷新上游模型"
+            :disabled="fetchingUpstreamModels"
+            @click="fetchUpstreamModels(true)"
           >
-              当前 {{ existingModels.length }} 个模型
-            </Badge>
-          </div>
+            <RefreshCw
+              class="w-4 h-4"
+              :class="{ 'animate-spin': fetchingUpstreamModels }"
+            />
+          </button>
+          <button
+            v-else-if="!fetchingUpstreamModels"
+            type="button"
+            class="p-2 hover:bg-muted rounded-md transition-colors shrink-0"
+            title="从提供商获取模型"
+            @click="fetchUpstreamModels()"
+          >
+            <Zap class="w-4 h-4" />
+          </button>
+          <Loader2
+            v-else
+            class="w-4 h-4 animate-spin text-muted-foreground shrink-0"
+          />
         </div>
 
-        <!-- 左右对比布局 -->
-        <div class="flex gap-2 items-stretch">
-          <!-- 左侧：可添加的模型 -->
-          <div class="flex-1 space-y-2">
-            <div class="flex items-center justify-between">
-              <div class="flex items-center gap-2">
-                <p class="text-sm font-medium">
-                  可添加
-                </p>
-                <Button
-                  v-if="availableModels.length > 0"
-                  variant="ghost"
-                  size="sm"
-                  class="h-6 px-2 text-xs"
-                  @click="toggleSelectAllLeft"
-                >
-                  {{ isAllLeftSelected ? '取消全选' : '全选' }}
-                </Button>
-              </div>
-              <Badge
-                variant="secondary"
-                class="text-xs"
-              >
-                {{ availableModels.length }} 个
-              </Badge>
-            </div>
-            <div class="border rounded-lg h-80 overflow-y-auto">
+        <!-- 单列模型列表 -->
+        <div class="border rounded-lg overflow-hidden">
+          <div class="max-h-96 overflow-y-auto">
             <div
               v-if="loadingGlobalModels"
-                class="flex items-center justify-center h-full"
+              class="flex items-center justify-center py-12"
             >
               <Loader2 class="w-6 h-6 animate-spin text-primary" />
             </div>
-              <div
-                v-else-if="availableModels.length === 0"
-                class="flex flex-col items-center justify-center h-full text-muted-foreground"
-              >
-                <Layers class="w-10 h-10 mb-2 opacity-30" />
-                <p class="text-sm">
-                  所有模型均已关联
-                </p>
-              </div>
-              <div
-                v-else
-                class="p-2 space-y-1"
-              >
-                <div
-                  v-for="model in availableModels"
-                  :key="model.id"
-                  class="flex items-center gap-2 p-2 rounded-lg border transition-colors"
-                  :class="selectedLeftIds.includes(model.id)
-                    ? 'border-primary bg-primary/10'
-                    : 'hover:bg-muted/50 cursor-pointer'"
-                  @click="toggleLeftSelection(model.id)"
-                >
-                  <Checkbox
-                    :checked="selectedLeftIds.includes(model.id)"
-                    @update:checked="toggleLeftSelection(model.id)"
-                    @click.stop
-                  />
-                  <div class="flex-1 min-w-0">
-                    <p class="font-medium text-sm truncate">
-                      {{ model.display_name }}
-                    </p>
-                    <p class="text-xs text-muted-foreground truncate font-mono">
-                      {{ model.name }}
-                    </p>
-                  </div>
-                  <Badge
-                    :variant="model.is_active ? 'outline' : 'secondary'"
-                    :class="model.is_active ? 'text-green-600 border-green-500/60' : ''"
-                    class="text-xs shrink-0"
-                  >
-                    {{ model.is_active ? '活跃' : '停用' }}
-                  </Badge>
-                </div>
-              </div>
-            </div>
-          </div>
 
-          <!-- 中间：操作按钮 -->
-          <div class="flex flex-col items-center justify-center w-12 shrink-0 gap-2">
-            <Button
-              variant="outline"
-              size="sm"
-              class="w-9 h-8"
-              :class="selectedLeftIds.length > 0 && !submittingAdd ? 'border-primary' : ''"
-              :disabled="selectedLeftIds.length === 0 || submittingAdd"
-              title="添加选中"
-              @click="batchAddSelected"
+            <template v-else>
+              <!-- 全局模型组 -->
+              <div v-if="filteredGlobalModels.length > 0 || !upstreamModelsLoaded">
+                <div
+                  class="flex items-center justify-between px-3 py-2 bg-muted sticky top-0 z-10 cursor-pointer hover:bg-muted/80 transition-colors"
+                  @click="toggleGroupCollapse('global')"
                 >
-              <Loader2
-                v-if="submittingAdd"
-                class="w-4 h-4 animate-spin"
-              />
-              <ChevronRight
-                v-else
-                class="w-6 h-6 stroke-[3]"
-                :class="selectedLeftIds.length > 0 && !submittingAdd ? 'text-primary' : ''"
-              />
-            </Button>
-            <Button
-              variant="outline"
-              size="sm"
-              class="w-9 h-8"
-              :class="selectedRightIds.length > 0 && !submittingRemove ? 'border-primary' : ''"
-              :disabled="selectedRightIds.length === 0 || submittingRemove"
-              title="移除选中"
-              @click="batchRemoveSelected"
-            >
-              <Loader2
-                v-if="submittingRemove"
-                class="w-4 h-4 animate-spin"
-              />
-              <ChevronLeft
-                v-else
-                class="w-6 h-6 stroke-[3]"
-                :class="selectedRightIds.length > 0 && !submittingRemove ? 'text-primary' : ''"
-              />
-            </Button>
-          </div>
-
-          <!-- 右侧：已添加的模型 -->
-          <div class="flex-1 space-y-2">
-            <div class="flex items-center justify-between">
                   <div class="flex items-center gap-2">
-                <p class="text-sm font-medium">
-                  已添加
-                </p>
-                <Button
-                  v-if="existingModels.length > 0"
-                  variant="ghost"
-                  size="sm"
-                  class="h-6 px-2 text-xs"
-                  @click="toggleSelectAllRight"
-                >
-                  {{ isAllRightSelected ? '取消全选' : '全选' }}
-                </Button>
+                    <ChevronDown
+                      class="w-4 h-4 transition-transform shrink-0"
+                      :class="collapsedGroups.has('global') ? '-rotate-90' : ''"
+                    />
+                    <span class="text-xs font-medium">全局模型</span>
+                    <span class="text-xs text-muted-foreground">({{ filteredGlobalModels.length }})</span>
                   </div>
-              <Badge
-                variant="secondary"
-                class="text-xs"
+                  <button
+                    v-if="filteredGlobalModels.length > 0"
+                    type="button"
+                    class="text-xs text-primary hover:underline shrink-0"
+                    @click.stop="toggleAllGlobalModels"
                   >
-                {{ existingModels.length }} 个
-              </Badge>
+                    {{ isAllGlobalModelsSelected ? '取消全选' : '全选' }}
+                  </button>
                 </div>
-            <div class="border rounded-lg h-80 overflow-y-auto">
                 <div
-                v-if="existingModels.length === 0"
-                class="flex flex-col items-center justify-center h-full text-muted-foreground"
+                  v-show="!collapsedGroups.has('global')"
+                  class="space-y-1 p-2"
+                >
+                  <div
+                    v-if="filteredGlobalModels.length === 0"
+                    class="py-4 text-center text-xs text-muted-foreground"
+                  >
+                    暂无可用全局模型
+                  </div>
+                  <div
+                    v-for="model in filteredGlobalModels"
+                    :key="model.id"
+                    class="flex items-center gap-2 px-2 py-1.5 rounded hover:bg-muted cursor-pointer"
+                    @click="toggleGlobalModelSelection(model.id)"
+                  >
+                    <div
+                      class="w-4 h-4 border rounded flex items-center justify-center shrink-0"
+                      :class="isGlobalModelSelected(model.id) ? 'bg-primary border-primary' : ''"
+                    >
+                      <Check
+                        v-if="isGlobalModelSelected(model.id)"
+                        class="w-3 h-3 text-primary-foreground"
+                      />
+                    </div>
+                    <div class="flex-1 min-w-0">
+                      <p class="text-sm font-medium truncate">{{ model.display_name }}</p>
+                      <p class="text-xs text-muted-foreground truncate font-mono">{{ model.name }}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <!-- 上游模型组 -->
+              <div
+                v-for="group in filteredUpstreamGroups"
+                :key="group.api_format"
+              >
+                <div
+                  class="flex items-center justify-between px-3 py-2 bg-muted sticky top-0 z-10 cursor-pointer hover:bg-muted/80 transition-colors"
+                  @click="toggleGroupCollapse(group.api_format)"
+                >
+                  <div class="flex items-center gap-2">
+                    <ChevronDown
+                      class="w-4 h-4 transition-transform shrink-0"
+                      :class="collapsedGroups.has(group.api_format) ? '-rotate-90' : ''"
+                    />
+                    <span class="text-xs font-medium">{{ API_FORMAT_LABELS[group.api_format] || group.api_format }}</span>
+                    <span class="text-xs text-muted-foreground">({{ group.models.length }})</span>
+                  </div>
+                  <button
+                    type="button"
+                    class="text-xs text-primary hover:underline shrink-0"
+                    @click.stop="toggleAllUpstreamGroup(group.api_format)"
+                  >
+                    {{ isUpstreamGroupAllSelected(group.api_format) ? '取消全选' : '全选' }}
+                  </button>
+                </div>
+                <div
+                  v-show="!collapsedGroups.has(group.api_format)"
+                  class="space-y-1 p-2"
+                >
+                  <div
+                    v-for="model in group.models"
+                    :key="model.id"
+                    class="flex items-center gap-2 px-2 py-1.5 rounded hover:bg-muted cursor-pointer"
+                    @click="toggleUpstreamModelSelection(model.id)"
+                  >
+                    <div
+                      class="w-4 h-4 border rounded flex items-center justify-center shrink-0"
+                      :class="isUpstreamModelSelected(model.id) ? 'bg-primary border-primary' : ''"
+                    >
+                      <Check
+                        v-if="isUpstreamModelSelected(model.id)"
+                        class="w-3 h-3 text-primary-foreground"
+                      />
+                    </div>
+                    <div class="flex-1 min-w-0">
+                      <p class="text-sm font-medium truncate">{{ model.id }}</p>
+                      <p class="text-xs text-muted-foreground truncate font-mono">{{ model.owned_by || model.id }}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <!-- 空状态 -->
+              <div
+                v-if="filteredGlobalModels.length === 0 && filteredUpstreamGroups.length === 0"
+                class="flex flex-col items-center justify-center py-12 text-muted-foreground"
               >
                 <Layers class="w-10 h-10 mb-2 opacity-30" />
-                <p class="text-sm">
-                  暂无关联模型
+                <p class="text-sm">{{ searchQuery ? '无匹配结果' : '暂无可用模型' }}</p>
+                <p
+                  v-if="!upstreamModelsLoaded"
+                  class="text-xs mt-1"
+                >
+                  点击上方按钮从上游获取模型
                 </p>
               </div>
-              <div
-                v-else
-                class="p-2 space-y-1"
-              >
-                <div
-                  v-for="model in existingModels"
-                  :key="'existing-' + model.id"
-                  class="flex items-center gap-2 p-2 rounded-lg border transition-colors cursor-pointer"
-                  :class="selectedRightIds.includes(model.id)
-                    ? 'border-primary bg-primary/10'
-                    : 'hover:bg-muted/50'"
-                  @click="toggleRightSelection(model.id)"
-                >
-                  <Checkbox
-                    :checked="selectedRightIds.includes(model.id)"
-                    @update:checked="toggleRightSelection(model.id)"
-                    @click.stop
-                  />
-                  <div class="flex-1 min-w-0">
-                    <p class="font-medium text-sm truncate">
-                      {{ model.global_model_display_name || model.provider_model_name }}
-                    </p>
-                    <p class="text-xs text-muted-foreground truncate font-mono">
-                      {{ model.provider_model_name }}
-                    </p>
-                  </div>
-                  <Badge
-                    :variant="model.is_active ? 'outline' : 'secondary'"
-                    :class="model.is_active ? 'text-green-600 border-green-500/60' : ''"
-                    class="text-xs shrink-0"
-                  >
-                    {{ model.is_active ? '活跃' : '停用' }}
-                  </Badge>
-                </div>
-              </div>
-            </div>
+            </template>
           </div>
         </div>
       </div>
     </template>
     <template #footer>
+      <div class="flex items-center justify-between w-full">
+        <p class="text-xs text-muted-foreground">
+          {{ hasChanges ? `${pendingChangesCount} 项更改待保存` : '' }}
+        </p>
+        <div class="flex items-center gap-2">
+          <Button
+            :disabled="!hasChanges || saving"
+            @click="handleSave"
+          >
+            <Loader2
+              v-if="saving"
+              class="w-4 h-4 mr-1 animate-spin"
+            />
+            {{ saving ? '保存中...' : '保存' }}
+          </Button>
           <Button
             variant="outline"
-        @click="$emit('update:open', false)"
+            @click="handleClose"
           >
             关闭
           </Button>
+        </div>
+      </div>
     </template>
   </Dialog>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
-import { Layers, Loader2, ChevronRight, ChevronLeft } from 'lucide-vue-next'
+import { Layers, Loader2, ChevronDown, Zap, RefreshCw, Search, Check } from 'lucide-vue-next'
 import Dialog from '@/components/ui/dialog/Dialog.vue'
 import Button from '@/components/ui/button.vue'
-import Badge from '@/components/ui/badge.vue'
-import Checkbox from '@/components/ui/checkbox.vue'
+import Input from '@/components/ui/input.vue'
 import { useToast } from '@/composables/useToast'
+import { useConfirm } from '@/composables/useConfirm'
 import { parseApiError } from '@/utils/errorParser'
 import {
   getGlobalModels,
@@ -253,14 +230,16 @@ import {
   getProviderModels,
   batchAssignModelsToProvider,
   deleteModel,
+  importModelsFromUpstream,
+  API_FORMAT_LABELS,
   type Model
 } from '@/api/endpoints'
+import { useUpstreamModelsCache, type UpstreamModel } from '../composables/useUpstreamModelsCache'
 
 const props = defineProps<{
   open: boolean
   providerId: string
-  providerName: string
-  providerIdentifier: string
+  providerName?: string
 }>()
 
 const emit = defineEmits<{
@@ -268,41 +247,357 @@ const emit = defineEmits<{
   'changed': []
 }>()
 
+const { fetchModels: fetchCachedModels, clearCache, getCachedModels } = useUpstreamModelsCache()
+
 const { error: showError, success } = useToast()
+const { confirmWarning } = useConfirm()
 
 // 状态
 const loadingGlobalModels = ref(false)
-const submittingAdd = ref(false)
-const submittingRemove = ref(false)
+const fetchingUpstreamModels = ref(false)
+const upstreamModelsLoaded = ref(false)
+const saving = ref(false)
 
 // 数据
 const allGlobalModels = ref<GlobalModelResponse[]>([])
 const existingModels = ref<Model[]>([])
+const upstreamModels = ref<UpstreamModel[]>([])
 
-// 选择状态
-const selectedLeftIds = ref<string[]>([])
-const selectedRightIds = ref<string[]>([])
+// 选择状态（本地状态，保存时才提交）
+const selectedGlobalModelIds = ref<Set<string>>(new Set())
+const selectedUpstreamModelIds = ref<Set<string>>(new Set())
 
-// 计算可添加的模型（排除已关联的）
-const availableModels = computed(() => {
-  const existingGlobalModelIds = new Set(
+// 初始状态（用于计算变更）
+const initialGlobalModelIds = ref<Set<string>>(new Set())
+const initialUpstreamModelNames = ref<Set<string>>(new Set())
+
+// 折叠状态
+const collapsedGroups = ref<Set<string>>(new Set())
+
+// 搜索状态
+const searchQuery = ref('')
+
+// 已关联的全局模型 ID 集合（从已有数据计算）
+const existingGlobalModelIds = computed(() => {
+  return new Set(
     existingModels.value
       .filter(m => m.global_model_id)
       .map(m => m.global_model_id)
   )
-  return allGlobalModels.value.filter(m => !existingGlobalModelIds.has(m.id))
 })
 
-// 全选状态
-const isAllLeftSelected = computed(() =>
-  availableModels.value.length > 0 &&
-  selectedLeftIds.value.length === availableModels.value.length
-)
+// 已关联的上游模型名称集合
+const existingUpstreamModelNames = computed(() => {
+  const names = new Set<string>()
+  for (const m of existingModels.value) {
+    names.add(m.provider_model_name)
+    for (const mapping of m.provider_model_mappings ?? []) {
+      if (mapping.name) names.add(mapping.name)
+    }
+  }
+  return names
+})
 
-const isAllRightSelected = computed(() =>
-  existingModels.value.length > 0 &&
-  selectedRightIds.value.length === existingModels.value.length
-)
+// 过滤后的全局模型
+const filteredGlobalModels = computed(() => {
+  const query = searchQuery.value.toLowerCase().trim()
+  return allGlobalModels.value.filter(m => {
+    if (query && !m.name.toLowerCase().includes(query) && !m.display_name.toLowerCase().includes(query)) {
+      return false
+    }
+    return true
+  })
+})
+
+// 过滤后的上游模型（按 API 格式分组）
+const filteredUpstreamGroups = computed(() => {
+  if (!upstreamModelsLoaded.value) return []
+
+  const query = searchQuery.value.toLowerCase().trim()
+  const groups: Record<string, UpstreamModel[]> = {}
+
+  for (const model of upstreamModels.value) {
+    if (query && !model.id.toLowerCase().includes(query)) continue
+
+    const format = model.api_format || 'unknown'
+    if (!groups[format]) groups[format] = []
+    groups[format].push(model)
+  }
+
+  const order = Object.keys(API_FORMAT_LABELS)
+  return Object.entries(groups)
+    .map(([api_format, models]) => ({ api_format, models }))
+    .filter(g => g.models.length > 0)
+    .sort((a, b) => {
+      const aIndex = order.indexOf(a.api_format)
+      const bIndex = order.indexOf(b.api_format)
+      if (aIndex === -1 && bIndex === -1) return a.api_format.localeCompare(b.api_format)
+      if (aIndex === -1) return 1
+      if (bIndex === -1) return -1
+      return aIndex - bIndex
+    })
+})
+
+// 检查全局模型是否已选中
+function isGlobalModelSelected(globalModelId: string): boolean {
+  return selectedGlobalModelIds.value.has(globalModelId)
+}
+
+// 检查上游模型是否已选中
+function isUpstreamModelSelected(modelId: string): boolean {
+  return selectedUpstreamModelIds.value.has(modelId)
+}
+
+// 全局模型是否全选
+const isAllGlobalModelsSelected = computed(() => {
+  if (filteredGlobalModels.value.length === 0) return false
+  return filteredGlobalModels.value.every(m => isGlobalModelSelected(m.id))
+})
+
+// 检查某个上游组是否全选
+function isUpstreamGroupAllSelected(apiFormat: string): boolean {
+  const group = filteredUpstreamGroups.value.find(g => g.api_format === apiFormat)
+  if (!group || group.models.length === 0) return false
+  return group.models.every(m => isUpstreamModelSelected(m.id))
+}
+
+// 计算待添加的全局模型
+const globalModelsToAdd = computed(() => {
+  const toAdd: string[] = []
+  for (const id of selectedGlobalModelIds.value) {
+    if (!initialGlobalModelIds.value.has(id)) {
+      toAdd.push(id)
+    }
+  }
+  return toAdd
+})
+
+// 计算待移除的全局模型
+const globalModelsToRemove = computed(() => {
+  const toRemove: string[] = []
+  for (const id of initialGlobalModelIds.value) {
+    if (!selectedGlobalModelIds.value.has(id)) {
+      toRemove.push(id)
+    }
+  }
+  return toRemove
+})
+
+// 计算待添加的上游模型
+const upstreamModelsToAdd = computed(() => {
+  const toAdd: string[] = []
+  for (const id of selectedUpstreamModelIds.value) {
+    if (!initialUpstreamModelNames.value.has(id)) {
+      toAdd.push(id)
+    }
+  }
+  return toAdd
+})
+
+// 计算待移除的上游模型
+const upstreamModelsToRemove = computed(() => {
+  const toRemove: string[] = []
+  for (const id of initialUpstreamModelNames.value) {
+    if (!selectedUpstreamModelIds.value.has(id)) {
+      toRemove.push(id)
+    }
+  }
+  return toRemove
+})
+
+// 是否有变更
+const hasChanges = computed(() => {
+  return globalModelsToAdd.value.length > 0 ||
+    globalModelsToRemove.value.length > 0 ||
+    upstreamModelsToAdd.value.length > 0 ||
+    upstreamModelsToRemove.value.length > 0
+})
+
+// 待变更数量
+const pendingChangesCount = computed(() => {
+  return globalModelsToAdd.value.length +
+    globalModelsToRemove.value.length +
+    upstreamModelsToAdd.value.length +
+    upstreamModelsToRemove.value.length
+})
+
+// 切换全局模型选择
+function toggleGlobalModelSelection(id: string) {
+  if (selectedGlobalModelIds.value.has(id)) {
+    selectedGlobalModelIds.value.delete(id)
+  } else {
+    selectedGlobalModelIds.value.add(id)
+  }
+  selectedGlobalModelIds.value = new Set(selectedGlobalModelIds.value)
+}
+
+// 切换上游模型选择
+function toggleUpstreamModelSelection(id: string) {
+  if (selectedUpstreamModelIds.value.has(id)) {
+    selectedUpstreamModelIds.value.delete(id)
+  } else {
+    selectedUpstreamModelIds.value.add(id)
+  }
+  selectedUpstreamModelIds.value = new Set(selectedUpstreamModelIds.value)
+}
+
+// 全选/取消全选全局模型
+function toggleAllGlobalModels() {
+  const allIds = filteredGlobalModels.value.map(m => m.id)
+  if (isAllGlobalModelsSelected.value) {
+    // 取消全选
+    for (const id of allIds) {
+      selectedGlobalModelIds.value.delete(id)
+    }
+  } else {
+    // 全选
+    for (const id of allIds) {
+      selectedGlobalModelIds.value.add(id)
+    }
+  }
+  selectedGlobalModelIds.value = new Set(selectedGlobalModelIds.value)
+}
+
+// 全选/取消全选某个上游组
+function toggleAllUpstreamGroup(apiFormat: string) {
+  const group = filteredUpstreamGroups.value.find(g => g.api_format === apiFormat)
+  if (!group) return
+
+  const allIds = group.models.map(m => m.id)
+  if (isUpstreamGroupAllSelected(apiFormat)) {
+    // 取消全选
+    for (const id of allIds) {
+      selectedUpstreamModelIds.value.delete(id)
+    }
+  } else {
+    // 全选
+    for (const id of allIds) {
+      selectedUpstreamModelIds.value.add(id)
+    }
+  }
+  selectedUpstreamModelIds.value = new Set(selectedUpstreamModelIds.value)
+}
+
+// 切换折叠状态
+function toggleGroupCollapse(group: string) {
+  if (collapsedGroups.value.has(group)) {
+    collapsedGroups.value.delete(group)
+  } else {
+    collapsedGroups.value.add(group)
+  }
+  collapsedGroups.value = new Set(collapsedGroups.value)
+}
+
+// 处理关闭
+async function handleClose() {
+  if (hasChanges.value) {
+    const confirmed = await confirmWarning('有未保存的更改，确定要关闭吗？', '放弃更改')
+    if (!confirmed) return
+  }
+  emit('update:open', false)
+}
+
+// 处理对话框状态变更
+async function handleDialogUpdate(value: boolean) {
+  if (!value && hasChanges.value) {
+    const confirmed = await confirmWarning('有未保存的更改，确定要关闭吗？', '放弃更改')
+    if (!confirmed) return
+  }
+  emit('update:open', value)
+}
+
+// 保存变更
+async function handleSave() {
+  if (!hasChanges.value || saving.value) return
+
+  saving.value = true
+  try {
+    let totalSuccess = 0
+    const allErrors: string[] = []
+
+    // 移除全局模型
+    for (const globalModelId of globalModelsToRemove.value) {
+      const existingModel = existingModels.value.find(m => m.global_model_id === globalModelId)
+      if (existingModel) {
+        try {
+          await deleteModel(props.providerId, existingModel.id)
+          totalSuccess++
+        } catch (err: any) {
+          allErrors.push(parseApiError(err, '移除失败'))
+        }
+      }
+    }
+
+    // 移除上游模型
+    for (const modelId of upstreamModelsToRemove.value) {
+      const existingModel = existingModels.value.find(m =>
+        m.provider_model_name === modelId ||
+        m.provider_model_mappings?.some(mapping => mapping.name === modelId)
+      )
+      if (existingModel) {
+        try {
+          await deleteModel(props.providerId, existingModel.id)
+          totalSuccess++
+        } catch (err: any) {
+          allErrors.push(parseApiError(err, '移除失败'))
+        }
+      }
+    }
+
+    // 添加全局模型
+    if (globalModelsToAdd.value.length > 0) {
+      const result = await batchAssignModelsToProvider(props.providerId, globalModelsToAdd.value)
+      totalSuccess += result.success.length
+      if (result.errors.length > 0) {
+        allErrors.push(...result.errors.map(e => e.error))
+      }
+    }
+
+    // 添加上游模型
+    if (upstreamModelsToAdd.value.length > 0) {
+      const result = await importModelsFromUpstream(props.providerId, upstreamModelsToAdd.value)
+      totalSuccess += result.success.length
+      if (result.errors.length > 0) {
+        allErrors.push(...result.errors.map(e => e.error))
+      }
+    }
+
+    if (totalSuccess > 0) {
+      success(`成功处理 ${totalSuccess} 个模型`)
+    }
+
+    if (allErrors.length > 0) {
+      showError(`部分操作失败: ${allErrors.slice(0, 3).join(', ')}${allErrors.length > 3 ? '...' : ''}`, '警告')
+    }
+
+    emit('changed')
+    emit('update:open', false)
+  } catch (err: any) {
+    showError(parseApiError(err, '保存失败'), '错误')
+  } finally {
+    saving.value = false
+  }
+}
+
+// 从已有数据同步选择状态（全局模型）
+function syncGlobalModelSelection() {
+  const globalIds = [...existingGlobalModelIds.value].filter((id): id is string => id !== undefined)
+  selectedGlobalModelIds.value = new Set(globalIds)
+  initialGlobalModelIds.value = new Set(globalIds)
+}
+
+// 从已有数据同步选择状态（上游模型）
+function syncUpstreamModelSelection() {
+  // 只同步当前已加载的上游模型中，与已关联模型匹配的部分
+  const selected = new Set<string>()
+  for (const model of upstreamModels.value) {
+    if (existingUpstreamModelNames.value.has(model.id)) {
+      selected.add(model.id)
+    }
+  }
+  selectedUpstreamModelIds.value = selected
+  initialUpstreamModelNames.value = new Set(selected)
+}
 
 // 监听打开状态
 watch(() => props.open, async (isOpen) => {
@@ -310,14 +605,42 @@ watch(() => props.open, async (isOpen) => {
     await loadData()
   } else {
     // 重置状态
-    selectedLeftIds.value = []
-    selectedRightIds.value = []
+    upstreamModels.value = []
+    upstreamModelsLoaded.value = false
+    collapsedGroups.value = new Set()
+    searchQuery.value = ''
+    selectedGlobalModelIds.value = new Set()
+    selectedUpstreamModelIds.value = new Set()
+    initialGlobalModelIds.value = new Set()
+    initialUpstreamModelNames.value = new Set()
   }
 })
 
 // 加载数据
 async function loadData() {
   await Promise.all([loadGlobalModels(), loadExistingModels()])
+
+  // 同步全局模型选择状态
+  syncGlobalModelSelection()
+
+  // 检查缓存
+  const cachedModels = getCachedModels(props.providerId)
+  if (cachedModels && cachedModels.length > 0) {
+    upstreamModels.value = cachedModels
+    upstreamModelsLoaded.value = true
+    // 同步上游模型选择状态
+    syncUpstreamModelSelection()
+    // 有多个分组时全部折叠
+    const allGroups = new Set(['global'])
+    for (const model of cachedModels) {
+      if (model.api_format) {
+        allGroups.add(model.api_format)
+      }
+    }
+    collapsedGroups.value = allGroups
+  } else {
+    collapsedGroups.value = new Set()
+  }
 }
 
 // 加载全局模型列表
@@ -342,104 +665,35 @@ async function loadExistingModels() {
   }
 }
 
-// 切换左侧选择
-function toggleLeftSelection(id: string) {
-  const index = selectedLeftIds.value.indexOf(id)
-  if (index === -1) {
-    selectedLeftIds.value.push(id)
-  } else {
-    selectedLeftIds.value.splice(index, 1)
+// 从提供商获取模型
+async function fetchUpstreamModels(forceRefresh = false) {
+  if (forceRefresh) {
+    clearCache(props.providerId)
   }
-}
-
-// 切换右侧选择
-function toggleRightSelection(id: string) {
-  const index = selectedRightIds.value.indexOf(id)
-  if (index === -1) {
-    selectedRightIds.value.push(id)
-  } else {
-    selectedRightIds.value.splice(index, 1)
-  }
-}
-
-// 全选/取消全选左侧
-function toggleSelectAllLeft() {
-  if (isAllLeftSelected.value) {
-    selectedLeftIds.value = []
-  } else {
-    selectedLeftIds.value = availableModels.value.map(m => m.id)
-  }
-}
-
-// 全选/取消全选右侧
-function toggleSelectAllRight() {
-  if (isAllRightSelected.value) {
-    selectedRightIds.value = []
-  } else {
-    selectedRightIds.value = existingModels.value.map(m => m.id)
-  }
-}
-
-// 批量添加选中的模型
-async function batchAddSelected() {
-  if (selectedLeftIds.value.length === 0) return
 
   try {
-    submittingAdd.value = true
-    const result = await batchAssignModelsToProvider(props.providerId, selectedLeftIds.value)
-
-    if (result.success.length > 0) {
-      success(`成功添加 ${result.success.length} 个模型`)
+    fetchingUpstreamModels.value = true
+    const result = await fetchCachedModels(props.providerId, forceRefresh)
+    if (result) {
+      if (result.error) {
+        showError(result.error, '错误')
+      } else {
+        upstreamModels.value = result.models
+        upstreamModelsLoaded.value = true
+        // 同步上游模型选择状态
+        syncUpstreamModelSelection()
+        // 有多个分组时全部折叠
+        const allGroups = new Set(['global'])
+        for (const model of result.models) {
+          if (model.api_format) {
+            allGroups.add(model.api_format)
+          }
+        }
+        collapsedGroups.value = allGroups
       }
-
-    if (result.errors.length > 0) {
-      const errorMessages = result.errors.map(e => e.error).join(', ')
-      showError(`部分模型添加失败: ${errorMessages}`, '警告')
     }
-
-    selectedLeftIds.value = []
-    await loadExistingModels()
-    emit('changed')
-  } catch (err: any) {
-    showError(parseApiError(err, '批量添加失败'), '错误')
   } finally {
-    submittingAdd.value = false
-  }
-}
-
-// 批量移除选中的模型
-async function batchRemoveSelected() {
-  if (selectedRightIds.value.length === 0) return
-
-  try {
-    submittingRemove.value = true
-    let successCount = 0
-    const errors: string[] = []
-
-    for (const modelId of selectedRightIds.value) {
-      try {
-        await deleteModel(props.providerId, modelId)
-        successCount++
-      } catch (err: any) {
-        errors.push(parseApiError(err, '删除失败'))
-      }
-    }
-
-    if (successCount > 0) {
-      success(`成功移除 ${successCount} 个模型`)
-    }
-
-    if (errors.length > 0) {
-      showError(`部分模型移除失败: ${errors.join(', ')}`, '警告')
-    }
-
-    selectedRightIds.value = []
-    await loadExistingModels()
-    emit('changed')
-  } catch (err: any) {
-    showError(parseApiError(err, '批量移除失败'), '错误')
-  } finally {
-    submittingRemove.value = false
+    fetchingUpstreamModels.value = false
   }
 }
 </script>

frontend/src/features/providers/components/EndpointFormDialog.vue

@@ -1,52 +1,142 @@
 <template>
   <Dialog
     :model-value="internalOpen"
-    :title="isEditMode ? '编辑 API 端点' : '添加 API 端点'"
-    :description="isEditMode ? `修改 ${provider?.display_name} 的端点配置` : '为提供商添加新的 API 端点'"
-    :icon="isEditMode ? SquarePen : Link"
-    size="xl"
+    title="端点管理"
+    :description="`管理 ${provider?.name} 的 API 端点`"
+    :icon="Settings"
+    size="2xl"
     @update:model-value="handleDialogUpdate"
   >
-    <form
-      class="space-y-6"
-      @submit.prevent="handleSubmit"
-    >
-      <!-- API 配置 -->
     <div class="space-y-4">
-        <h3
-          v-if="isEditMode"
-          class="text-sm font-medium"
+      <!-- 已有端点列表 -->
+      <div
+        v-if="localEndpoints.length > 0"
+        class="space-y-2"
       >
-          API 配置
-        </h3>
-
-        <div class="grid grid-cols-2 gap-4">
-          <!-- API 格式 -->
+        <Label class="text-muted-foreground">已配置的端点</Label>
         <div class="space-y-2">
-            <Label for="api_format">API 格式 *</Label>
-            <template v-if="isEditMode">
-              <Input
-                id="api_format"
-                v-model="form.api_format"
-                disabled
-                class="bg-muted"
-              />
-              <p class="text-xs text-muted-foreground">
-                API 格式创建后不可修改
-              </p>
-            </template>
-            <template v-else>
-              <Select
-                v-model="form.api_format"
-                v-model:open="selectOpen"
-                required
+          <div
+            v-for="endpoint in localEndpoints"
+            :key="endpoint.id"
+            class="rounded-md border px-3 py-2"
+            :class="{ 'opacity-50': !endpoint.is_active }"
           >
-                <SelectTrigger>
-                  <SelectValue placeholder="请选择 API 格式" />
+            <!-- 编辑模式 -->
+            <template v-if="editingEndpointId === endpoint.id">
+              <div class="space-y-2">
+                <div class="flex items-center gap-2">
+                  <span class="text-sm font-medium w-24 shrink-0">{{ API_FORMAT_LABELS[endpoint.api_format] || endpoint.api_format }}</span>
+                  <div class="flex items-center gap-1 ml-auto">
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      class="h-7 w-7"
+                      title="保存"
+                      :disabled="savingEndpointId === endpoint.id"
+                      @click="saveEndpointUrl(endpoint)"
+                    >
+                      <Check class="w-3.5 h-3.5" />
+                    </Button>
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      class="h-7 w-7"
+                      title="取消"
+                      @click="cancelEdit"
+                    >
+                      <X class="w-3.5 h-3.5" />
+                    </Button>
+                  </div>
+                </div>
+                <div class="grid grid-cols-2 gap-2">
+                  <div class="space-y-1">
+                    <Label class="text-xs text-muted-foreground">Base URL</Label>
+                    <Input
+                      v-model="editingUrl"
+                      class="h-8 text-sm"
+                      placeholder="https://api.example.com"
+                      @keyup.escape="cancelEdit"
+                    />
+                  </div>
+                  <div class="space-y-1">
+                    <Label class="text-xs text-muted-foreground">自定义路径 (可选)</Label>
+                    <Input
+                      v-model="editingPath"
+                      class="h-8 text-sm"
+                      :placeholder="editingDefaultPath || '留空使用默认路径'"
+                      @keyup.escape="cancelEdit"
+                    />
+                  </div>
+                </div>
+              </div>
+            </template>
+            <!-- 查看模式 -->
+            <template v-else>
+              <div class="flex items-center gap-3">
+                <div class="w-24 shrink-0">
+                  <span class="text-sm font-medium">{{ API_FORMAT_LABELS[endpoint.api_format] || endpoint.api_format }}</span>
+                </div>
+                <div class="flex-1 min-w-0">
+                  <span class="text-sm text-muted-foreground truncate block">
+                    {{ endpoint.base_url }}{{ endpoint.custom_path ? endpoint.custom_path : '' }}
+                  </span>
+                </div>
+                <div class="flex items-center gap-1 shrink-0">
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    class="h-7 w-7"
+                    title="编辑"
+                    @click="startEdit(endpoint)"
+                  >
+                    <Edit class="w-3.5 h-3.5" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    class="h-7 w-7"
+                    :title="endpoint.is_active ? '停用' : '启用'"
+                    :disabled="togglingEndpointId === endpoint.id"
+                    @click="handleToggleEndpoint(endpoint)"
+                  >
+                    <Power class="w-3.5 h-3.5" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    class="h-7 w-7 text-destructive hover:text-destructive"
+                    title="删除"
+                    :disabled="deletingEndpointId === endpoint.id"
+                    @click="handleDeleteEndpoint(endpoint)"
+                  >
+                    <Trash2 class="w-3.5 h-3.5" />
+                  </Button>
+                </div>
+              </div>
+            </template>
+          </div>
+        </div>
+      </div>
+
+      <!-- 添加新端点 -->
+      <div
+        v-if="availableFormats.length > 0"
+        class="space-y-3 pt-3 border-t"
+      >
+        <Label class="text-muted-foreground">添加新端点</Label>
+        <div class="flex items-end gap-3">
+          <div class="w-32 shrink-0 space-y-1.5">
+            <Label class="text-xs">API 格式</Label>
+            <Select
+              v-model="newEndpoint.api_format"
+              v-model:open="formatSelectOpen"
+            >
+              <SelectTrigger class="h-9">
+                <SelectValue placeholder="选择格式" />
               </SelectTrigger>
               <SelectContent>
                 <SelectItem
-                    v-for="format in apiFormats"
+                  v-for="format in availableFormats"
                   :key="format.value"
                   :value="format.value"
                 >
@@ -54,107 +144,57 @@
                 </SelectItem>
               </SelectContent>
             </Select>
-            </template>
           </div>
-
-          <!-- API URL -->
-          <div class="space-y-2">
-            <Label for="base_url">API URL *</Label>
+          <div class="flex-1 space-y-1.5">
+            <Label class="text-xs">Base URL</Label>
             <Input
-              id="base_url"
-              v-model="form.base_url"
+              v-model="newEndpoint.base_url"
               placeholder="https://api.example.com"
-              required
+              class="h-9"
             />
           </div>
-        </div>
-
-        <!-- 自定义路径 -->
-        <div class="space-y-2">
-          <Label for="custom_path">自定义请求路径（可选）</Label>
+          <div class="w-40 shrink-0 space-y-1.5">
+            <Label class="text-xs">自定义路径</Label>
             <Input
-            id="custom_path"
-            v-model="form.custom_path"
-            :placeholder="defaultPathPlaceholder"
+              v-model="newEndpoint.custom_path"
+              :placeholder="newEndpointDefaultPath || '可选'"
+              class="h-9"
             />
           </div>
+          <Button
+            variant="outline"
+            size="sm"
+            class="h-9 shrink-0"
+            :disabled="!newEndpoint.api_format || !newEndpoint.base_url || addingEndpoint"
+            @click="handleAddEndpoint"
+          >
+            {{ addingEndpoint ? '添加中...' : '添加' }}
+          </Button>
+        </div>
       </div>
 
-      <!-- 请求配置 -->
-      <div class="space-y-4">
-        <h3 class="text-sm font-medium">
-          请求配置
-        </h3>
-
-        <div class="grid grid-cols-3 gap-4">
-          <div class="space-y-2">
-            <Label for="timeout">超时（秒）</Label>
-            <Input
-              id="timeout"
-              v-model.number="form.timeout"
-              type="number"
-              placeholder="300"
-            />
-          </div>
-
-          <div class="space-y-2">
-            <Label for="max_retries">最大重试</Label>
-            <Input
-              id="max_retries"
-              v-model.number="form.max_retries"
-              type="number"
-              placeholder="3"
-            />
-          </div>
-
-          <div class="space-y-2">
-            <Label for="max_concurrent">最大并发</Label>
-            <Input
-              id="max_concurrent"
-              :model-value="form.max_concurrent ?? ''"
-              type="number"
-              placeholder="无限制"
-              @update:model-value="(v) => form.max_concurrent = parseNumberInput(v)"
-            />
+      <!-- 空状态 -->
+      <div
+        v-if="localEndpoints.length === 0 && availableFormats.length === 0"
+        class="text-center py-8 text-muted-foreground"
+      >
+        <p>所有 API 格式都已配置</p>
       </div>
     </div>
 
-        <div class="grid grid-cols-2 gap-4">
-          <div class="space-y-2">
-            <Label for="rate_limit">速率限制（请求/分钟）</Label>
-            <Input
-              id="rate_limit"
-              :model-value="form.rate_limit ?? ''"
-              type="number"
-              placeholder="无限制"
-              @update:model-value="(v) => form.rate_limit = parseNumberInput(v)"
-            />
-          </div>
-        </div>
-      </div>
-    </form>
-
     <template #footer>
       <Button
-        type="button"
         variant="outline"
-        :disabled="loading"
-        @click="handleCancel"
+        @click="handleClose"
       >
-        取消
-      </Button>
-      <Button
-        :disabled="loading || !form.base_url || (!isEditMode && !form.api_format)"
-        @click="handleSubmit"
-      >
-        {{ loading ? (isEditMode ? '保存中...' : '创建中...') : (isEditMode ? '保存修改' : '创建') }}
+        关闭
       </Button>
     </template>
   </Dialog>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import {
   Dialog,
   Button,
@@ -166,14 +206,14 @@ import {
   SelectContent,
   SelectItem,
 } from '@/components/ui'
-import { Link, SquarePen } from 'lucide-vue-next'
+import { Settings, Edit, Trash2, Check, X, Power } from 'lucide-vue-next'
 import { useToast } from '@/composables/useToast'
-import { useFormDialog } from '@/composables/useFormDialog'
-import { parseNumberInput } from '@/utils/form'
 import { log } from '@/utils/logger'
 import {
   createEndpoint,
   updateEndpoint,
+  deleteEndpoint,
+  API_FORMAT_LABELS,
   type ProviderEndpoint,
   type ProviderWithEndpointsSummary
 } from '@/api/endpoints'
@@ -182,7 +222,7 @@ import { adminApi } from '@/api/admin'
 const props = defineProps<{
   modelValue: boolean
   provider: ProviderWithEndpointsSummary | null
-  endpoint?: ProviderEndpoint | null  // 编辑模式时传入
+  endpoints?: ProviderEndpoint[]
 }>()
 
 const emit = defineEmits<{
@@ -192,141 +232,184 @@ const emit = defineEmits<{
 }>()
 
 const { success, error: showError } = useToast()
-const loading = ref(false)
-const selectOpen = ref(false)
+
+// 状态
+const addingEndpoint = ref(false)
+const editingEndpointId = ref<string | null>(null)
+const editingUrl = ref('')
+const editingPath = ref('')
+const savingEndpointId = ref<string | null>(null)
+const deletingEndpointId = ref<string | null>(null)
+const togglingEndpointId = ref<string | null>(null)
+const formatSelectOpen = ref(false)
 
 // 内部状态
 const internalOpen = computed(() => props.modelValue)
 
-// 表单数据
-const form = ref({
+// 新端点表单
+const newEndpoint = ref({
   api_format: '',
   base_url: '',
   custom_path: '',
-  timeout: 300,
-  max_retries: 3,
-  max_concurrent: undefined as number | undefined,
-  rate_limit: undefined as number | undefined,
-  is_active: true
 })
 
 // API 格式列表
-const apiFormats = ref<Array<{ value: string; label: string; default_path: string; aliases: string[] }>>([])
+const apiFormats = ref<Array<{ value: string; label: string; default_path: string }>>([])
 
-// 加载API格式列表
+// 本地端点列表
+const localEndpoints = ref<ProviderEndpoint[]>([])
+
+// 可用的格式（未添加的）
+const availableFormats = computed(() => {
+  const existingFormats = localEndpoints.value.map(e => e.api_format)
+  return apiFormats.value.filter(f => !existingFormats.includes(f.value))
+})
+
+// 获取指定 API 格式的默认路径
+function getDefaultPath(apiFormat: string): string {
+  const format = apiFormats.value.find(f => f.value === apiFormat)
+  return format?.default_path || ''
+}
+
+// 当前编辑端点的默认路径
+const editingDefaultPath = computed(() => {
+  const endpoint = localEndpoints.value.find(e => e.id === editingEndpointId.value)
+  return endpoint ? getDefaultPath(endpoint.api_format) : ''
+})
+
+// 新端点选择的格式的默认路径
+const newEndpointDefaultPath = computed(() => {
+  return getDefaultPath(newEndpoint.value.api_format)
+})
+
+// 加载 API 格式列表
 const loadApiFormats = async () => {
   try {
     const response = await adminApi.getApiFormats()
     apiFormats.value = response.formats
   } catch (error) {
     log.error('加载API格式失败:', error)
-    if (!isEditMode.value) {
-      showError('加载API格式失败', '错误')
-    }
   }
 }
 
-// 根据选择的 API 格式计算默认路径
-const defaultPath = computed(() => {
-  const format = apiFormats.value.find(f => f.value === form.value.api_format)
-  return format?.default_path || '/'
-})
-
-// 动态 placeholder
-const defaultPathPlaceholder = computed(() => {
-  return `留空使用默认路径：${defaultPath.value}`
-})
-
-// 组件挂载时加载API格式
 onMounted(() => {
   loadApiFormats()
 })
 
-// 重置表单
-function resetForm() {
-  form.value = {
-    api_format: '',
-    base_url: '',
-    custom_path: '',
-    timeout: 300,
-    max_retries: 3,
-    max_concurrent: undefined,
-    rate_limit: undefined,
-    is_active: true
+// 监听 props 变化
+watch(() => props.modelValue, (open) => {
+  if (open) {
+    localEndpoints.value = [...(props.endpoints || [])]
+    // 重置编辑状态
+    editingEndpointId.value = null
+    editingUrl.value = ''
+    editingPath.value = ''
+  } else {
+    // 关闭对话框时完全清空新端点表单
+    newEndpoint.value = { api_format: '', base_url: '', custom_path: '' }
   }
+}, { immediate: true })
+
+watch(() => props.endpoints, (endpoints) => {
+  if (props.modelValue) {
+    localEndpoints.value = [...(endpoints || [])]
+  }
+}, { deep: true })
+
+// 开始编辑
+function startEdit(endpoint: ProviderEndpoint) {
+  editingEndpointId.value = endpoint.id
+  editingUrl.value = endpoint.base_url
+  editingPath.value = endpoint.custom_path || ''
 }
 
-// 加载端点数据（编辑模式）
-function loadEndpointData() {
-  if (!props.endpoint) return
-
-  form.value = {
-    api_format: props.endpoint.api_format,
-    base_url: props.endpoint.base_url,
-    custom_path: props.endpoint.custom_path || '',
-    timeout: props.endpoint.timeout,
-    max_retries: props.endpoint.max_retries,
-    max_concurrent: props.endpoint.max_concurrent || undefined,
-    rate_limit: props.endpoint.rate_limit || undefined,
-    is_active: props.endpoint.is_active
-  }
+// 取消编辑
+function cancelEdit() {
+  editingEndpointId.value = null
+  editingUrl.value = ''
+  editingPath.value = ''
 }
 
-// 使用 useFormDialog 统一处理对话框逻辑
-const { isEditMode, handleDialogUpdate, handleCancel } = useFormDialog({
-  isOpen: () => props.modelValue,
-  entity: () => props.endpoint,
-  isLoading: loading,
-  onClose: () => emit('update:modelValue', false),
-  loadData: loadEndpointData,
-  resetForm,
-})
+// 保存端点
+async function saveEndpointUrl(endpoint: ProviderEndpoint) {
+  if (!editingUrl.value) return
 
-// 提交表单
-const handleSubmit = async () => {
-  if (!props.provider && !props.endpoint) return
-
-  loading.value = true
+  savingEndpointId.value = endpoint.id
   try {
-    if (isEditMode.value && props.endpoint) {
-      // 更新端点
-      await updateEndpoint(props.endpoint.id, {
-        base_url: form.value.base_url,
-        custom_path: form.value.custom_path || undefined,
-        timeout: form.value.timeout,
-        max_retries: form.value.max_retries,
-        max_concurrent: form.value.max_concurrent,
-        rate_limit: form.value.rate_limit,
-        is_active: form.value.is_active
+    await updateEndpoint(endpoint.id, {
+      base_url: editingUrl.value,
+      custom_path: editingPath.value || null,  // 空字符串时传 null 清空
     })
-
-      success('端点已更新', '保存成功')
+    success('端点已更新')
     emit('endpointUpdated')
-    } else if (props.provider) {
-      // 创建端点
+    cancelEdit()
+  } catch (error: any) {
+    showError(error.response?.data?.detail || '更新失败', '错误')
+  } finally {
+    savingEndpointId.value = null
+  }
+}
+
+// 添加端点
+async function handleAddEndpoint() {
+  if (!props.provider || !newEndpoint.value.api_format || !newEndpoint.value.base_url) return
+
+  addingEndpoint.value = true
+  try {
     await createEndpoint(props.provider.id, {
       provider_id: props.provider.id,
-        api_format: form.value.api_format,
-        base_url: form.value.base_url,
-        custom_path: form.value.custom_path || undefined,
-        timeout: form.value.timeout,
-        max_retries: form.value.max_retries,
-        max_concurrent: form.value.max_concurrent,
-        rate_limit: form.value.rate_limit,
-        is_active: form.value.is_active
+      api_format: newEndpoint.value.api_format,
+      base_url: newEndpoint.value.base_url,
+      custom_path: newEndpoint.value.custom_path || undefined,
+      is_active: true,
     })
-
-      success('端点创建成功', '成功')
+    success(`已添加 ${API_FORMAT_LABELS[newEndpoint.value.api_format] || newEndpoint.value.api_format} 端点`)
+    // 重置表单，保留 URL
+    const url = newEndpoint.value.base_url
+    newEndpoint.value = { api_format: '', base_url: url, custom_path: '' }
     emit('endpointCreated')
-      resetForm()
-    }
-
-    emit('update:modelValue', false)
   } catch (error: any) {
-    const action = isEditMode.value ? '更新' : '创建'
-    showError(error.response?.data?.detail || `${action}端点失败`, '错误')
+    showError(error.response?.data?.detail || '添加失败', '错误')
   } finally {
-    loading.value = false
+    addingEndpoint.value = false
   }
 }
+
+// 切换端点启用状态
+async function handleToggleEndpoint(endpoint: ProviderEndpoint) {
+  togglingEndpointId.value = endpoint.id
+  try {
+    const newStatus = !endpoint.is_active
+    await updateEndpoint(endpoint.id, { is_active: newStatus })
+    success(newStatus ? '端点已启用' : '端点已停用')
+    emit('endpointUpdated')
+  } catch (error: any) {
+    showError(error.response?.data?.detail || '操作失败', '错误')
+  } finally {
+    togglingEndpointId.value = null
+  }
+}
+
+// 删除端点
+async function handleDeleteEndpoint(endpoint: ProviderEndpoint) {
+  deletingEndpointId.value = endpoint.id
+  try {
+    await deleteEndpoint(endpoint.id)
+    success(`已删除 ${API_FORMAT_LABELS[endpoint.api_format] || endpoint.api_format} 端点`)
+    emit('endpointUpdated')
+  } catch (error: any) {
+    showError(error.response?.data?.detail || '删除失败', '错误')
+  } finally {
+    deletingEndpointId.value = null
+  }
+}
+
+// 关闭对话框
+function handleDialogUpdate(value: boolean) {
+  emit('update:modelValue', value)
+}
+
+function handleClose() {
+  emit('update:modelValue', false)
+}
 </script>

frontend/src/features/providers/components/KeyAllowedModelsDialog.vue

@@ -1,128 +1,160 @@
 <template>
   <Dialog
     :model-value="isOpen"
-    title="配置允许的模型"
-    description="选择该 API Key 允许访问的模型，留空则允许访问所有模型"
-    :icon="Settings2"
+    title="获取上游模型"
+    :description="`使用密钥 ${props.apiKey?.name || props.apiKey?.api_key_masked || ''} 从上游获取模型列表。导入的模型需要关联全局模型后才能参与路由。`"
+    :icon="Layers"
     size="2xl"
     @update:model-value="handleDialogUpdate"
   >
     <div class="space-y-4 py-2">
-      <!-- 已选模型展示 -->
-      <div
-        v-if="selectedModels.length > 0"
-        class="space-y-2"
-      >
-        <div class="flex items-center justify-between px-1">
-          <div class="text-xs font-medium text-muted-foreground">
-            已选模型 ({{ selectedModels.length }})
+      <!-- 操作区域 -->
+      <div class="flex items-center justify-between">
+        <div class="text-sm text-muted-foreground">
+          <span v-if="!hasQueried">点击获取按钮查询上游可用模型</span>
+          <span v-else-if="upstreamModels.length > 0">
+            共 {{ upstreamModels.length }} 个模型，已选 {{ selectedModels.length }} 个
+          </span>
+          <span v-else>未找到可用模型</span>
         </div>
         <Button
-            type="button"
-            variant="ghost"
+          variant="outline"
           size="sm"
-            class="h-6 text-xs hover:text-destructive"
-            @click="clearModels"
+          :disabled="loading"
+          @click="fetchUpstreamModels"
         >
-            清空
+          <RefreshCw
+            class="w-3.5 h-3.5 mr-1.5"
+            :class="{ 'animate-spin': loading }"
+          />
+          {{ hasQueried ? '刷新' : '获取模型' }}
         </Button>
       </div>
-        <div class="flex flex-wrap gap-1.5 p-2 bg-muted/20 rounded-lg border border-border/40 min-h-[40px]">
-          <Badge
-            v-for="modelName in selectedModels"
-            :key="modelName"
-            variant="secondary"
-            class="text-[11px] px-2 py-0.5 bg-background border-border/60 shadow-sm"
-          >
-            {{ getModelLabel(modelName) }}
-            <button
-              class="ml-0.5 hover:text-destructive focus:outline-none"
-              @click.stop="toggleModel(modelName, false)"
-            >
-              &times;
-            </button>
-          </Badge>
-        </div>
-      </div>
-
-      <!-- 模型列表区域 -->
-      <div class="space-y-2">
-        <div class="flex items-center justify-between px-1">
-          <div class="text-xs font-medium text-muted-foreground">
-            可选模型列表
-          </div>
-          <div
-            v-if="!loadingModels && availableModels.length > 0"
-            class="text-[10px] text-muted-foreground/60"
-          >
-            共 {{ availableModels.length }} 个模型
-          </div>
-        </div>
 
       <!-- 加载状态 -->
       <div
-          v-if="loadingModels"
+        v-if="loading"
         class="flex flex-col items-center justify-center py-12 space-y-3"
       >
         <div class="animate-spin rounded-full h-8 w-8 border-2 border-primary/20 border-t-primary" />
-          <span class="text-xs text-muted-foreground">正在加载模型列表...</span>
+        <span class="text-xs text-muted-foreground">正在从上游获取模型列表...</span>
+      </div>
+
+      <!-- 错误状态 -->
+      <div
+        v-else-if="errorMessage"
+        class="flex flex-col items-center justify-center py-12 text-destructive border border-dashed border-destructive/30 rounded-lg bg-destructive/5"
+      >
+        <AlertCircle class="w-10 h-10 mb-2 opacity-50" />
+        <span class="text-sm text-center px-4">{{ errorMessage }}</span>
+        <Button
+          variant="outline"
+          size="sm"
+          class="mt-3"
+          @click="fetchUpstreamModels"
+        >
+          重试
+        </Button>
+      </div>
+
+      <!-- 未查询状态 -->
+      <div
+        v-else-if="!hasQueried"
+        class="flex flex-col items-center justify-center py-12 text-muted-foreground border border-dashed rounded-lg bg-muted/10"
+      >
+        <Layers class="w-10 h-10 mb-2 opacity-20" />
+        <span class="text-sm">点击上方按钮获取模型列表</span>
       </div>
 
       <!-- 无模型 -->
       <div
-          v-else-if="availableModels.length === 0"
+        v-else-if="upstreamModels.length === 0"
         class="flex flex-col items-center justify-center py-12 text-muted-foreground border border-dashed rounded-lg bg-muted/10"
       >
         <Box class="w-10 h-10 mb-2 opacity-20" />
-          <span class="text-sm">暂无可选模型</span>
+        <span class="text-sm">上游 API 未返回可用模型</span>
       </div>
 
       <!-- 模型列表 -->
+      <div v-else class="space-y-2">
+        <!-- 全选/取消 -->
+        <div class="flex items-center justify-between px-1">
+          <div class="flex items-center gap-2">
+            <Checkbox
+              :checked="isAllSelected"
+              :indeterminate="isPartiallySelected"
+              @update:checked="toggleSelectAll"
+            />
+            <span class="text-xs text-muted-foreground">
+              {{ isAllSelected ? '取消全选' : '全选' }}
+            </span>
+          </div>
+          <div class="text-xs text-muted-foreground">
+            {{ newModelsCount }} 个新模型（不在本地）
+          </div>
+        </div>
+
+        <div class="max-h-[320px] overflow-y-auto pr-1 space-y-1 custom-scrollbar">
           <div
-          v-else
-          class="max-h-[320px] overflow-y-auto pr-1 space-y-1.5 custom-scrollbar"
-        >
-          <div
-            v-for="model in availableModels"
-            :key="model.global_model_name"
+            v-for="model in upstreamModels"
+            :key="`${model.id}:${model.api_format || ''}`"
             class="group flex items-center gap-3 px-3 py-2.5 rounded-lg border transition-all duration-200 cursor-pointer select-none"
             :class="[
-              selectedModels.includes(model.global_model_name)
+              selectedModels.includes(model.id)
                 ? 'border-primary/40 bg-primary/5 shadow-sm'
                 : 'border-border/40 bg-background hover:border-primary/20 hover:bg-muted/30'
             ]"
-            @click="toggleModel(model.global_model_name, !selectedModels.includes(model.global_model_name))"
+            @click="toggleModel(model.id)"
           >
-            <!-- Checkbox -->
             <Checkbox
-              :checked="selectedModels.includes(model.global_model_name)"
+              :checked="selectedModels.includes(model.id)"
               class="data-[state=checked]:bg-primary data-[state=checked]:border-primary"
               @click.stop
-              @update:checked="checked => toggleModel(model.global_model_name, checked)"
+              @update:checked="checked => toggleModel(model.id, checked)"
             />
-
-            <!-- Info -->
             <div class="flex-1 min-w-0">
-              <div class="flex items-center justify-between gap-2">
-                <span class="text-sm font-medium truncate text-foreground/90">{{ model.display_name }}</span>
-                <span
-                  v-if="hasPricing(model)"
-                  class="text-[10px] font-mono text-muted-foreground/80 bg-muted/30 px-1.5 py-0.5 rounded border border-border/30 shrink-0"
-                >
-                  {{ formatPricingShort(model) }}
+              <div class="flex items-center gap-2">
+                <span class="text-sm font-medium truncate text-foreground/90">
+                  {{ model.display_name || model.id }}
                 </span>
+                <Badge
+                  v-if="model.api_format"
+                  variant="outline"
+                  class="text-[10px] px-1.5 py-0 shrink-0"
+                >
+                  {{ API_FORMAT_LABELS[model.api_format] || model.api_format }}
+                </Badge>
+                <Badge
+                  v-if="isModelExisting(model.id)"
+                  variant="secondary"
+                  class="text-[10px] px-1.5 py-0 shrink-0"
+                >
+                  已存在
+                </Badge>
               </div>
               <div class="text-[11px] text-muted-foreground/60 font-mono truncate mt-0.5">
-                {{ model.global_model_name }}
+                {{ model.id }}
               </div>
             </div>
+            <div
+              v-if="model.owned_by"
+              class="text-[10px] text-muted-foreground/50 shrink-0"
+            >
+              {{ model.owned_by }}
+            </div>
           </div>
         </div>
       </div>
     </div>
 
     <template #footer>
-      <div class="flex items-center justify-end gap-2 w-full pt-2">
+      <div class="flex items-center justify-between w-full pt-2">
+        <div class="text-xs text-muted-foreground">
+          <span v-if="selectedModels.length > 0 && newSelectedCount > 0">
+            将导入 {{ newSelectedCount }} 个新模型
+          </span>
+        </div>
+        <div class="flex items-center gap-2">
           <Button
             variant="outline"
             class="h-9"
@@ -131,35 +163,38 @@
             取消
           </Button>
           <Button
-          :disabled="saving"
-          class="h-9 min-w-[80px]"
-          @click="handleSave"
+            :disabled="importing || selectedModels.length === 0 || newSelectedCount === 0"
+            class="h-9 min-w-[100px]"
+            @click="handleImport"
           >
             <Loader2
-            v-if="saving"
+              v-if="importing"
               class="w-3.5 h-3.5 mr-1.5 animate-spin"
             />
-          {{ saving ? '保存中' : '保存配置' }}
+            {{ importing ? '导入中' : `导入 ${newSelectedCount} 个模型` }}
           </Button>
         </div>
+      </div>
     </template>
   </Dialog>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
-import { Box, Loader2, Settings2 } from 'lucide-vue-next'
+import { Box, Layers, Loader2, RefreshCw, AlertCircle } from 'lucide-vue-next'
 import { Dialog } from '@/components/ui'
 import Button from '@/components/ui/button.vue'
 import Badge from '@/components/ui/badge.vue'
 import Checkbox from '@/components/ui/checkbox.vue'
 import { useToast } from '@/composables/useToast'
-import { parseApiError } from '@/utils/errorParser'
+import { parseUpstreamModelError } from '@/utils/errorParser'
+import { adminApi } from '@/api/admin'
 import {
-  updateEndpointKey,
-  getProviderAvailableSourceModels,
+  importModelsFromUpstream,
+  getProviderModels,
   type EndpointAPIKey,
-  type ProviderAvailableSourceModel
+  type UpstreamModel,
+  API_FORMAT_LABELS,
 } from '@/api/endpoints'
 
 const props = defineProps<{
@@ -176,103 +211,121 @@ const emit = defineEmits<{
 const { success, error: showError } = useToast()
 
 const isOpen = computed(() => props.open)
-const saving = ref(false)
-const loadingModels = ref(false)
-const availableModels = ref<ProviderAvailableSourceModel[]>([])
+const loading = ref(false)
+const importing = ref(false)
+const hasQueried = ref(false)
+const errorMessage = ref('')
+const upstreamModels = ref<UpstreamModel[]>([])
 const selectedModels = ref<string[]>([])
-const initialModels = ref<string[]>([])
+const existingModelIds = ref<Set<string>>(new Set())
+
+// 计算属性
+const isAllSelected = computed(() =>
+  upstreamModels.value.length > 0 &&
+  selectedModels.value.length === upstreamModels.value.length
+)
+
+const isPartiallySelected = computed(() =>
+  selectedModels.value.length > 0 &&
+  selectedModels.value.length < upstreamModels.value.length
+)
+
+const newModelsCount = computed(() =>
+  upstreamModels.value.filter(m => !existingModelIds.value.has(m.id)).length
+)
+
+const newSelectedCount = computed(() =>
+  selectedModels.value.filter(id => !existingModelIds.value.has(id)).length
+)
+
+// 检查模型是否已存在
+function isModelExisting(modelId: string): boolean {
+  return existingModelIds.value.has(modelId)
+}
 
 // 监听对话框打开
 watch(() => props.open, (open) => {
   if (open) {
-    loadData()
+    resetState()
+    loadExistingModels()
   }
 })
 
-async function loadData() {
-  // 初始化已选模型
-  if (props.apiKey?.allowed_models) {
-    selectedModels.value = [...props.apiKey.allowed_models]
-    initialModels.value = [...props.apiKey.allowed_models]
-  } else {
+function resetState() {
+  hasQueried.value = false
+  errorMessage.value = ''
+  upstreamModels.value = []
   selectedModels.value = []
-    initialModels.value = []
-  }
-
-  // 加载可选模型
-  if (props.providerId) {
-    await loadAvailableModels()
-  }
 }
 
-async function loadAvailableModels() {
+// 加载已存在的模型列表
+async function loadExistingModels() {
   if (!props.providerId) return
   try {
-    loadingModels.value = true
-    const response = await getProviderAvailableSourceModels(props.providerId)
-    availableModels.value = response.models
-  } catch (err: any) {
-    const errorMessage = parseApiError(err, '加载模型列表失败')
-    showError(errorMessage, '错误')
-  } finally {
-    loadingModels.value = false
+    const models = await getProviderModels(props.providerId)
+    existingModelIds.value = new Set(
+      models.map((m: { provider_model_name: string }) => m.provider_model_name)
+    )
+  } catch {
+    existingModelIds.value = new Set()
   }
 }
 
-const modelLabelMap = computed(() => {
-  const map = new Map<string, string>()
-  availableModels.value.forEach(model => {
-    map.set(model.global_model_name, model.display_name || model.global_model_name)
-  })
-  return map
-})
+// 获取上游模型
+async function fetchUpstreamModels() {
+  if (!props.providerId || !props.apiKey) return
 
-function getModelLabel(modelName: string): string {
-  return modelLabelMap.value.get(modelName) ?? modelName
-}
+  loading.value = true
+  errorMessage.value = ''
 
-function hasPricing(model: ProviderAvailableSourceModel): boolean {
-  const input = model.price.input_price_per_1m ?? 0
-  const output = model.price.output_price_per_1m ?? 0
-  return input > 0 || output > 0
-}
+  try {
+    const response = await adminApi.queryProviderModels(props.providerId, props.apiKey.id)
 
-function formatPricingShort(model: ProviderAvailableSourceModel): string {
-  const input = model.price.input_price_per_1m ?? 0
-  const output = model.price.output_price_per_1m ?? 0
-  if (input > 0 || output > 0) {
-    return `$${formatPrice(input)}/$${formatPrice(output)}`
-  }
-  return ''
-}
-
-function formatPrice(value?: number | null): string {
-  if (value === undefined || value === null || value === 0) return '0'
-  if (value >= 1) {
-    return value.toFixed(2)
-  }
-  return value.toFixed(2)
-}
-
-function toggleModel(modelName: string, checked: boolean) {
-  if (checked) {
-    if (!selectedModels.value.includes(modelName)) {
-      selectedModels.value = [...selectedModels.value, modelName]
+    if (response.success && response.data?.models) {
+      upstreamModels.value = response.data.models
+      // 默认选中所有新模型
+      selectedModels.value = response.data.models
+        .filter((m: UpstreamModel) => !existingModelIds.value.has(m.id))
+        .map((m: UpstreamModel) => m.id)
+      hasQueried.value = true
+      // 如果有部分失败，显示警告提示
+      if (response.data.error) {
+        // 使用友好的错误解析
+        showError(`部分格式获取失败: ${parseUpstreamModelError(response.data.error)}`, '警告')
       }
     } else {
-    selectedModels.value = selectedModels.value.filter(name => name !== modelName)
+      // 使用友好的错误解析
+      const rawError = response.data?.error || '获取上游模型失败'
+      errorMessage.value = parseUpstreamModelError(rawError)
+    }
+  } catch (err: any) {
+    // 使用友好的错误解析
+    const rawError = err.response?.data?.detail || err.message || '获取上游模型失败'
+    errorMessage.value = parseUpstreamModelError(rawError)
+  } finally {
+    loading.value = false
   }
 }
 
-function clearModels() {
-  selectedModels.value = []
+// 切换模型选择
+function toggleModel(modelId: string, checked?: boolean) {
+  const shouldSelect = checked !== undefined ? checked : !selectedModels.value.includes(modelId)
+  if (shouldSelect) {
+    if (!selectedModels.value.includes(modelId)) {
+      selectedModels.value = [...selectedModels.value, modelId]
+    }
+  } else {
+    selectedModels.value = selectedModels.value.filter(id => id !== modelId)
+  }
 }
 
-function areArraysEqual(a: string[], b: string[]): boolean {
-  if (a.length !== b.length) return false
-  const sortedA = [...a].sort()
-  const sortedB = [...b].sort()
-  return sortedA.every((value, index) => value === sortedB[index])
+// 全选/取消全选
+function toggleSelectAll(checked: boolean) {
+  if (checked) {
+    selectedModels.value = upstreamModels.value.map(m => m.id)
+  } else {
+    selectedModels.value = []
+  }
 }
 
 function handleDialogUpdate(value: boolean) {
@@ -285,30 +338,44 @@ function handleCancel() {
   emit('close')
 }
 
-async function handleSave() {
-  if (!props.apiKey) return
+// 导入选中的模型
+async function handleImport() {
+  if (!props.providerId || selectedModels.value.length === 0) return
 
-  // 检查是否有变化
-  const hasChanged = !areArraysEqual(selectedModels.value, initialModels.value)
-  if (!hasChanged) {
-    emit('close')
+  // 过滤出新模型（不在已存在列表中的）
+  const modelsToImport = selectedModels.value.filter(id => !existingModelIds.value.has(id))
+  if (modelsToImport.length === 0) {
+    showError('所选模型都已存在', '提示')
     return
   }
 
-  saving.value = true
+  importing.value = true
   try {
-    await updateEndpointKey(props.apiKey.id, {
-      // 空数组时发送 null，表示允许所有模型
-      allowed_models: selectedModels.value.length > 0 ? [...selectedModels.value] : null
-    })
-    success('允许的模型已更新', '成功')
+    const response = await importModelsFromUpstream(props.providerId, modelsToImport)
+
+    const successCount = response.success?.length || 0
+    const errorCount = response.errors?.length || 0
+
+    if (successCount > 0 && errorCount === 0) {
+      success(`成功导入 ${successCount} 个模型`, '导入成功')
       emit('saved')
       emit('close')
+    } else if (successCount > 0 && errorCount > 0) {
+      success(`成功导入 ${successCount} 个模型，${errorCount} 个失败`, '部分成功')
+      emit('saved')
+      // 刷新列表以更新已存在状态
+      await loadExistingModels()
+      // 更新选中列表，移除已成功导入的
+      const successIds = new Set(response.success?.map((s: { model_id: string }) => s.model_id) || [])
+      selectedModels.value = selectedModels.value.filter(id => !successIds.has(id))
+    } else {
+      const errorMsg = response.errors?.[0]?.error || '导入失败'
+      showError(errorMsg, '导入失败')
+    }
   } catch (err: any) {
-    const errorMessage = parseApiError(err, '保存失败')
-    showError(errorMessage, '错误')
+    showError(err.response?.data?.detail || '导入失败', '错误')
   } finally {
-    saving.value = false
+    importing.value = false
   }
 }
 </script>

frontend/src/features/providers/components/KeyAllowedModelsEditDialog.vue

@@ -0,0 +1,640 @@
+<template>
+  <Dialog
+    :model-value="isOpen"
+    :title="props.apiKey?.name ? `模型权限 - ${props.apiKey.name}` : '模型权限'"
+    description="选中的模型将被允许访问，不选择则允许全部"
+    :icon="Shield"
+    size="2xl"
+    @update:model-value="handleDialogUpdate"
+  >
+    <template #default>
+      <div class="space-y-4">
+        <!-- 字典模式警告 -->
+        <div
+          v-if="isDictMode"
+          class="rounded-lg border border-amber-500/50 bg-amber-50 dark:bg-amber-950/30 p-3"
+        >
+          <p class="text-sm text-amber-700 dark:text-amber-400">
+            <strong>注意：</strong>此密钥使用按 API 格式区分的模型权限配置。
+            编辑后将转换为统一列表模式，原有的格式区分信息将丢失。
+          </p>
+        </div>
+
+        <!-- 常驻选择面板 -->
+        <div class="border rounded-lg overflow-hidden">
+          <!-- 搜索 + 操作栏 -->
+          <div class="flex items-center gap-2 p-2 border-b bg-muted/30">
+            <div class="relative flex-1">
+              <Search class="absolute left-2 top-1/2 -translate-y-1/2 w-4 h-4 text-muted-foreground" />
+              <Input
+                v-model="searchQuery"
+                placeholder="搜索模型或添加自定义模型..."
+                class="pl-8 h-8 text-sm"
+              />
+            </div>
+            <!-- 已选数量徽章 -->
+            <span
+              v-if="selectedModels.length === 0"
+              class="h-6 px-2 text-xs rounded flex items-center bg-muted text-muted-foreground shrink-0"
+            >
+              全部模型
+            </span>
+            <span
+              v-else
+              class="h-6 px-2 text-xs rounded flex items-center bg-primary/10 text-primary shrink-0"
+            >
+              已选 {{ selectedModels.length }} 个
+            </span>
+            <button
+              v-if="upstreamModelsLoaded"
+              type="button"
+              class="p-1.5 hover:bg-muted rounded-md transition-colors shrink-0"
+              title="刷新上游模型"
+              :disabled="fetchingUpstreamModels"
+              @click="fetchUpstreamModels()"
+            >
+              <RefreshCw
+                class="w-4 h-4"
+                :class="{ 'animate-spin': fetchingUpstreamModels }"
+              />
+            </button>
+            <Button
+              v-else-if="!fetchingUpstreamModels"
+              variant="outline"
+              size="sm"
+              class="h-8"
+              title="从提供<E68F90><E4BE9B><EFBFBD>获取模型"
+              @click="fetchUpstreamModels()"
+            >
+              <Zap class="w-4 h-4" />
+            </Button>
+            <Loader2
+              v-else
+              class="w-4 h-4 animate-spin text-muted-foreground shrink-0"
+            />
+          </div>
+
+          <!-- 分组列表 -->
+          <div class="max-h-96 overflow-y-auto">
+            <!-- 加载中 -->
+            <div
+              v-if="loadingGlobalModels"
+              class="flex items-center justify-center py-12"
+            >
+              <Loader2 class="w-6 h-6 animate-spin text-primary" />
+            </div>
+
+            <template v-else>
+              <!-- 添加自定义模型（搜索内容不在列表中时显示，固定在顶部） -->
+              <div
+                v-if="searchQuery && canAddAsCustom"
+                class="px-3 py-2 border-b bg-background sticky top-0 z-10"
+              >
+                <div
+                  class="flex items-center justify-between px-3 py-2 rounded-lg border border-dashed hover:border-primary hover:bg-primary/5 cursor-pointer transition-colors"
+                  @click="addCustomModel"
+                >
+                  <div class="flex items-center gap-2">
+                    <Plus class="w-4 h-4 text-muted-foreground" />
+                    <span class="text-sm font-mono">{{ searchQuery }}</span>
+                  </div>
+                  <span class="text-xs text-muted-foreground">添加自定义模型</span>
+                </div>
+              </div>
+
+              <!-- 自定义模型（手动添加的，始终显示全部，搜索命中的排前面） -->
+              <div v-if="customModels.length > 0">
+                <div
+                  class="flex items-center justify-between px-3 py-2 bg-muted sticky top-0 z-10 cursor-pointer hover:bg-muted/80 transition-colors"
+                  @click="toggleGroupCollapse('custom')"
+                >
+                  <div class="flex items-center gap-2">
+                    <ChevronDown
+                      class="w-4 h-4 transition-transform shrink-0"
+                      :class="collapsedGroups.has('custom') ? '-rotate-90' : ''"
+                    />
+                    <span class="text-xs font-medium">自定义模型</span>
+                    <span class="text-xs text-muted-foreground">({{ customModels.length }})</span>
+                  </div>
+                </div>
+                <div
+                  v-show="!collapsedGroups.has('custom')"
+                  class="space-y-1 p-2"
+                >
+                  <div
+                    v-for="model in sortedCustomModels"
+                    :key="model"
+                    class="flex items-center gap-2 px-2 py-1.5 rounded hover:bg-muted cursor-pointer"
+                    @click="toggleModel(model)"
+                  >
+                    <div
+                      class="w-4 h-4 border rounded flex items-center justify-center shrink-0"
+                      :class="selectedModels.includes(model) ? 'bg-primary border-primary' : ''"
+                    >
+                      <Check v-if="selectedModels.includes(model)" class="w-3 h-3 text-primary-foreground" />
+                    </div>
+                    <span class="text-sm font-mono truncate">{{ model }}</span>
+                  </div>
+                </div>
+              </div>
+
+              <!-- 全局模型 -->
+              <div v-if="filteredGlobalModels.length > 0">
+                <div
+                  class="flex items-center justify-between px-3 py-2 bg-muted sticky top-0 z-10 cursor-pointer hover:bg-muted/80 transition-colors"
+                  @click="toggleGroupCollapse('global')"
+                >
+                  <div class="flex items-center gap-2">
+                    <ChevronDown
+                      class="w-4 h-4 transition-transform shrink-0"
+                      :class="collapsedGroups.has('global') ? '-rotate-90' : ''"
+                    />
+                    <span class="text-xs font-medium">全局模型</span>
+                    <span class="text-xs text-muted-foreground">({{ filteredGlobalModels.length }})</span>
+                  </div>
+                  <button
+                    type="button"
+                    class="text-xs text-primary hover:underline"
+                    @click.stop="toggleAllGlobalModels"
+                  >
+                    {{ isAllGlobalModelsSelected ? '取消全选' : '全选' }}
+                  </button>
+                </div>
+                <div
+                  v-show="!collapsedGroups.has('global')"
+                  class="space-y-1 p-2"
+                >
+                  <div
+                    v-for="model in filteredGlobalModels"
+                    :key="model.name"
+                    class="flex items-center gap-2 px-2 py-1.5 rounded hover:bg-muted cursor-pointer"
+                    @click="toggleModel(model.name)"
+                  >
+                    <div
+                      class="w-4 h-4 border rounded flex items-center justify-center shrink-0"
+                      :class="selectedModels.includes(model.name) ? 'bg-primary border-primary' : ''"
+                    >
+                      <Check v-if="selectedModels.includes(model.name)" class="w-3 h-3 text-primary-foreground" />
+                    </div>
+                    <div class="flex-1 min-w-0">
+                      <p class="text-sm font-medium truncate">{{ model.display_name }}</p>
+                      <p class="text-xs text-muted-foreground truncate font-mono">{{ model.name }}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <!-- 上游模型组 -->
+              <div v-for="group in filteredUpstreamGroups" :key="group.api_format">
+                <div
+                  class="flex items-center justify-between px-3 py-2 bg-muted sticky top-0 z-10 cursor-pointer hover:bg-muted/80 transition-colors"
+                  @click="toggleGroupCollapse(group.api_format)"
+                >
+                  <div class="flex items-center gap-2">
+                    <ChevronDown
+                      class="w-4 h-4 transition-transform shrink-0"
+                      :class="collapsedGroups.has(group.api_format) ? '-rotate-90' : ''"
+                    />
+                    <span class="text-xs font-medium">
+                      {{ API_FORMAT_LABELS[group.api_format] || group.api_format }}
+                    </span>
+                    <span class="text-xs text-muted-foreground">({{ group.models.length }})</span>
+                  </div>
+                  <button
+                    type="button"
+                    class="text-xs text-primary hover:underline"
+                    @click.stop="toggleAllUpstreamGroup(group.api_format)"
+                  >
+                    {{ isUpstreamGroupAllSelected(group.api_format) ? '取消全选' : '全选' }}
+                  </button>
+                </div>
+                <div
+                  v-show="!collapsedGroups.has(group.api_format)"
+                  class="space-y-1 p-2"
+                >
+                  <div
+                    v-for="model in group.models"
+                    :key="model.id"
+                    class="flex items-center gap-2 px-2 py-1.5 rounded hover:bg-muted cursor-pointer"
+                    @click="toggleModel(model.id)"
+                  >
+                    <div
+                      class="w-4 h-4 border rounded flex items-center justify-center shrink-0"
+                      :class="selectedModels.includes(model.id) ? 'bg-primary border-primary' : ''"
+                    >
+                      <Check v-if="selectedModels.includes(model.id)" class="w-3 h-3 text-primary-foreground" />
+                    </div>
+                    <span class="text-sm font-mono truncate">{{ model.id }}</span>
+                  </div>
+                </div>
+              </div>
+
+              <!-- 空状态 -->
+              <div
+                v-if="filteredGlobalModels.length === 0 && filteredUpstreamGroups.length === 0 && customModels.length === 0"
+                class="flex flex-col items-center justify-center py-12 text-muted-foreground"
+              >
+                <Shield class="w-10 h-10 mb-2 opacity-30" />
+                <p class="text-sm">{{ searchQuery ? '无匹配结果' : '暂无可选模型' }}</p>
+                <p v-if="!upstreamModelsLoaded" class="text-xs mt-1">点击闪电按钮从上游获取模型</p>
+              </div>
+            </template>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <template #footer>
+      <div class="flex items-center justify-between w-full">
+        <p class="text-xs text-muted-foreground">
+          {{ hasChanges ? '有未保存的更改' : '' }}
+        </p>
+        <div class="flex items-center gap-2">
+          <Button :disabled="saving || !hasChanges" @click="handleSave">
+            {{ saving ? '保存中...' : '保存' }}
+          </Button>
+          <Button variant="outline" @click="handleCancel">取消</Button>
+        </div>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch, onUnmounted } from 'vue'
+import {
+  Shield,
+  Search,
+  RefreshCw,
+  Loader2,
+  Zap,
+  Plus,
+  Check,
+  ChevronDown
+} from 'lucide-vue-next'
+import { Dialog, Button, Input } from '@/components/ui'
+import { useToast } from '@/composables/useToast'
+import { useConfirm } from '@/composables/useConfirm'
+import { parseApiError, parseUpstreamModelError } from '@/utils/errorParser'
+import {
+  updateProviderKey,
+  API_FORMAT_LABELS,
+  type EndpointAPIKey,
+  type AllowedModels,
+} from '@/api/endpoints'
+import { getGlobalModels, type GlobalModelResponse } from '@/api/global-models'
+import { adminApi } from '@/api/admin'
+import type { UpstreamModel } from '@/api/endpoints/types'
+
+interface AvailableModel {
+  name: string
+  display_name: string
+}
+
+const props = defineProps<{
+  open: boolean
+  apiKey: EndpointAPIKey | null
+  providerId: string
+}>()
+
+const emit = defineEmits<{
+  close: []
+  saved: []
+}>()
+
+const { success, error: showError } = useToast()
+const { confirmWarning } = useConfirm()
+
+const isOpen = computed(() => props.open)
+const saving = ref(false)
+const loadingGlobalModels = ref(false)
+const fetchingUpstreamModels = ref(false)
+const upstreamModelsLoaded = ref(false)
+
+// 用于取消异步操作的标志
+let loadingCancelled = false
+
+// 搜索
+const searchQuery = ref('')
+
+// 可用模型列表（全局模型）
+const allGlobalModels = ref<AvailableModel[]>([])
+// 上游模型列表
+const upstreamModels = ref<UpstreamModel[]>([])
+
+// 已选中的模型
+const selectedModels = ref<string[]>([])
+const initialSelectedModels = ref<string[]>([])
+
+// 所有添加过的自定义模型（包括已取消勾选的，保存前不消失）
+const allCustomModels = ref<string[]>([])
+
+// 是否为字典模式（按 API 格式区分）
+const isDictMode = ref(false)
+
+// 折叠状态
+const collapsedGroups = ref<Set<string>>(new Set())
+
+// 是否有更改
+const hasChanges = computed(() => {
+  if (selectedModels.value.length !== initialSelectedModels.value.length) return true
+  const sorted1 = [...selectedModels.value].sort()
+  const sorted2 = [...initialSelectedModels.value].sort()
+  return sorted1.some((v, i) => v !== sorted2[i])
+})
+
+// 所有已知模型的集合（全局 + 上游）
+const allKnownModels = computed(() => {
+  const set = new Set<string>()
+  allGlobalModels.value.forEach(m => set.add(m.name))
+  upstreamModels.value.forEach(m => set.add(m.id))
+  return set
+})
+
+// 自定义模型列表（显示所有添加过的，不因取消勾选而消失）
+const customModels = computed(() => {
+  return allCustomModels.value
+})
+
+// 排序后的自定义模型（搜索命中的排前面）
+const sortedCustomModels = computed(() => {
+  const search = searchQuery.value.toLowerCase().trim()
+  if (!search) return customModels.value
+
+  const matched: string[] = []
+  const unmatched: string[] = []
+  for (const m of customModels.value) {
+    if (m.toLowerCase().includes(search)) {
+      matched.push(m)
+    } else {
+      unmatched.push(m)
+    }
+  }
+  return [...matched, ...unmatched]
+})
+
+// 判断搜索内容是否可以作为自定义模型添加
+const canAddAsCustom = computed(() => {
+  const search = searchQuery.value.trim()
+  if (!search) return false
+  // 已经选中了就不显示
+  if (selectedModels.value.includes(search)) return false
+  // 已经在自定义模型列表中就不显示
+  if (allCustomModels.value.includes(search)) return false
+  // 精确匹配全局模型就不显示
+  if (allGlobalModels.value.some(m => m.name === search)) return false
+  // 精确匹配上游模型就不显示
+  if (upstreamModels.value.some(m => m.id === search)) return false
+  return true
+})
+
+// 搜索过滤后的全局模型
+const filteredGlobalModels = computed(() => {
+  if (!searchQuery.value.trim()) return allGlobalModels.value
+  const query = searchQuery.value.toLowerCase()
+  return allGlobalModels.value.filter(m =>
+    m.name.toLowerCase().includes(query) ||
+    m.display_name.toLowerCase().includes(query)
+  )
+})
+
+// 按 API 格式分组的上游模型（过滤后）
+const filteredUpstreamGroups = computed(() => {
+  if (!upstreamModelsLoaded.value) return []
+
+  const query = searchQuery.value.toLowerCase().trim()
+  const groups: Record<string, UpstreamModel[]> = {}
+
+  for (const model of upstreamModels.value) {
+    // 搜索过滤
+    if (query && !model.id.toLowerCase().includes(query)) continue
+
+    const format = model.api_format || 'unknown'
+    if (!groups[format]) groups[format] = []
+    groups[format].push(model)
+  }
+
+  const order = Object.keys(API_FORMAT_LABELS)
+  return Object.entries(groups)
+    .map(([api_format, models]) => ({ api_format, models }))
+    .filter(g => g.models.length > 0)
+    .sort((a, b) => {
+      const aIndex = order.indexOf(a.api_format)
+      const bIndex = order.indexOf(b.api_format)
+      if (aIndex === -1 && bIndex === -1) return a.api_format.localeCompare(b.api_format)
+      if (aIndex === -1) return 1
+      if (bIndex === -1) return -1
+      return aIndex - bIndex
+    })
+})
+
+// 全局模型是否全选
+const isAllGlobalModelsSelected = computed(() => {
+  if (filteredGlobalModels.value.length === 0) return false
+  return filteredGlobalModels.value.every(m => selectedModels.value.includes(m.name))
+})
+
+// 检查某个上游组是否全选
+function isUpstreamGroupAllSelected(apiFormat: string): boolean {
+  const group = filteredUpstreamGroups.value.find(g => g.api_format === apiFormat)
+  if (!group || group.models.length === 0) return false
+  return group.models.every(m => selectedModels.value.includes(m.id))
+}
+
+// 切换模型选中状态
+function toggleModel(modelId: string) {
+  const idx = selectedModels.value.indexOf(modelId)
+  if (idx === -1) {
+    selectedModels.value.push(modelId)
+  } else {
+    selectedModels.value.splice(idx, 1)
+  }
+}
+
+// 添加自定义模型
+function addCustomModel() {
+  const model = searchQuery.value.trim()
+  if (model && !selectedModels.value.includes(model)) {
+    selectedModels.value.push(model)
+    // 同时添加到自定义模型列表（如果不在已知模型中）
+    if (!allKnownModels.value.has(model) && !allCustomModels.value.includes(model)) {
+      allCustomModels.value.push(model)
+    }
+    searchQuery.value = ''
+  }
+}
+
+// 全选/取消全选全局模型
+function toggleAllGlobalModels() {
+  const allNames = filteredGlobalModels.value.map(m => m.name)
+  if (isAllGlobalModelsSelected.value) {
+    // 取消全选
+    selectedModels.value = selectedModels.value.filter(id => !allNames.includes(id))
+  } else {
+    // 全选
+    allNames.forEach(name => {
+      if (!selectedModels.value.includes(name)) {
+        selectedModels.value.push(name)
+      }
+    })
+  }
+}
+
+// 全选/取消全选某个上游组
+function toggleAllUpstreamGroup(apiFormat: string) {
+  const group = filteredUpstreamGroups.value.find(g => g.api_format === apiFormat)
+  if (!group) return
+
+  const allIds = group.models.map(m => m.id)
+  if (isUpstreamGroupAllSelected(apiFormat)) {
+    // 取消全选
+    selectedModels.value = selectedModels.value.filter(id => !allIds.includes(id))
+  } else {
+    // 全选
+    allIds.forEach(id => {
+      if (!selectedModels.value.includes(id)) {
+        selectedModels.value.push(id)
+      }
+    })
+  }
+}
+
+// 切换折叠状态
+function toggleGroupCollapse(group: string) {
+  if (collapsedGroups.value.has(group)) {
+    collapsedGroups.value.delete(group)
+  } else {
+    collapsedGroups.value.add(group)
+  }
+  collapsedGroups.value = new Set(collapsedGroups.value)
+}
+
+// 加载全局模型
+async function loadGlobalModels() {
+  loadingGlobalModels.value = true
+  try {
+    const response = await getGlobalModels({ limit: 1000 })
+    if (loadingCancelled) return
+    allGlobalModels.value = response.models.map((m: GlobalModelResponse) => ({
+      name: m.name,
+      display_name: m.display_name
+    }))
+  } catch (err) {
+    if (loadingCancelled) return
+    showError('加载全局模型失败', '错误')
+  } finally {
+    loadingGlobalModels.value = false
+  }
+}
+
+// 从提供商获取模型
+async function fetchUpstreamModels() {
+  if (!props.providerId || !props.apiKey) return
+  try {
+    fetchingUpstreamModels.value = true
+    const response = await adminApi.queryProviderModels(props.providerId, props.apiKey.id)
+    if (loadingCancelled) return
+    if (response.success && response.data?.models) {
+      upstreamModels.value = response.data.models
+      upstreamModelsLoaded.value = true
+      // 获取上游模型后，从自定义模型列表中移除已变成已知的模型
+      const upstreamIds = new Set(response.data.models.map((m: UpstreamModel) => m.id))
+      allCustomModels.value = allCustomModels.value.filter(m => !upstreamIds.has(m))
+    } else {
+      const errorMsg = response.data?.error
+        ? parseUpstreamModelError(response.data.error)
+        : '获取上游模型失败'
+      showError(errorMsg, '获取上游模型失败')
+    }
+  } catch (err: any) {
+    if (loadingCancelled) return
+    const rawError = err.response?.data?.detail || err.message || '获取上游模型失败'
+    showError(parseUpstreamModelError(rawError), '获取上游模型失败')
+  } finally {
+    fetchingUpstreamModels.value = false
+  }
+}
+
+// 解析 allowed_models
+function parseAllowedModels(allowed: AllowedModels): string[] {
+  if (allowed === null || allowed === undefined) {
+    isDictMode.value = false
+    return []
+  }
+  if (Array.isArray(allowed)) {
+    isDictMode.value = false
+    return [...allowed]
+  }
+  // 字典模式：合并所有格式的模型，并设置警告标志
+  isDictMode.value = true
+  const all = new Set<string>()
+  for (const models of Object.values(allowed)) {
+    models.forEach(m => all.add(m))
+  }
+  return Array.from(all)
+}
+
+// 监听对话框打开
+watch(() => props.open, async (open) => {
+  if (open && props.apiKey) {
+    loadingCancelled = false
+
+    const parsed = parseAllowedModels(props.apiKey.allowed_models ?? null)
+    selectedModels.value = [...parsed]
+    initialSelectedModels.value = [...parsed]
+    searchQuery.value = ''
+    upstreamModels.value = []
+    upstreamModelsLoaded.value = false
+    allCustomModels.value = []
+
+    await loadGlobalModels()
+
+    // 加载全局模型后，从已选中的模型中提取自定义模型（不在全局模型中的）
+    const globalModelNames = new Set(allGlobalModels.value.map(m => m.name))
+    allCustomModels.value = selectedModels.value.filter(m => !globalModelNames.has(m))
+  } else {
+    loadingCancelled = true
+  }
+})
+
+// 组件卸载时取消所有异步操作
+onUnmounted(() => {
+  loadingCancelled = true
+})
+
+async function handleDialogUpdate(value: boolean) {
+  if (!value && hasChanges.value) {
+    const confirmed = await confirmWarning('有未保存的更改，确定要关闭吗？', '放弃更改')
+    if (!confirmed) return
+  }
+  if (!value) emit('close')
+}
+
+async function handleCancel() {
+  if (hasChanges.value) {
+    const confirmed = await confirmWarning('有未保存的更改，确定要关闭吗？', '放弃更改')
+    if (!confirmed) return
+  }
+  emit('close')
+}
+
+async function handleSave() {
+  if (!props.apiKey) return
+
+  saving.value = true
+  try {
+    const newAllowed: AllowedModels = selectedModels.value.length > 0
+      ? [...selectedModels.value]
+      : null
+
+    await updateProviderKey(props.apiKey.id, { allowed_models: newAllowed })
+    success('模型权限已更新', '成功')
+    emit('saved')
+    emit('close')
+  } catch (err: any) {
+    showError(parseApiError(err, '保存失败'), '错误')
+  } finally {
+    saving.value = false
+  }
+}
+</script>

frontend/src/features/providers/components/KeyFormDialog.vue

@@ -2,22 +2,18 @@
   <Dialog
     :model-value="isOpen"
     :title="isEditMode ? '编辑密钥' : '添加密钥'"
-    :description="isEditMode ? '修改 API 密钥配置' : '为端点添加新的 API 密钥'"
+    :description="isEditMode ? '修改 API 密钥配置' : '为提供商添加新的 API 密钥'"
     :icon="isEditMode ? SquarePen : Key"
-    size="2xl"
+    size="xl"
     @update:model-value="handleDialogUpdate"
   >
     <form
-      class="space-y-5"
+      class="space-y-4"
       autocomplete="off"
       @submit.prevent="handleSave"
     >
       <!-- 基本信息 -->
-      <div class="space-y-3">
-        <h3 class="text-sm font-medium border-b pb-2">
-          基本信息
-        </h3>
-        <div class="grid grid-cols-2 gap-4">
+      <div class="grid grid-cols-2 gap-3">
         <div>
           <Label :for="keyNameInputId">密钥名称 *</Label>
           <Input
@@ -36,23 +32,6 @@
             data-1p-ignore="true"
           />
         </div>
-          <div>
-            <Label for="rate_multiplier">成本倍率 *</Label>
-            <Input
-              id="rate_multiplier"
-              v-model.number="form.rate_multiplier"
-              type="number"
-              step="0.01"
-              min="0.01"
-              required
-              placeholder="1.0"
-            />
-            <p class="text-xs text-muted-foreground mt-1">
-              真实成本 = 表面成本 × 倍率
-            </p>
-          </div>
-        </div>
-
         <div>
           <Label :for="apiKeyInputId">API 密钥 {{ editingKey ? '' : '*' }}</Label>
           <Input
@@ -83,10 +62,12 @@
             v-else-if="editingKey"
             class="text-xs text-muted-foreground mt-1"
           >
-            留空表示不修改，输入新值则覆盖
+            留空表示不修改
           </p>
         </div>
+      </div>
 
+      <!-- 备注 -->
       <div>
         <Label for="note">备注</Label>
         <Input
@@ -95,98 +76,115 @@
           placeholder="可选的备注信息"
         />
       </div>
+
+      <!-- API 格式选择 -->
+      <div v-if="sortedApiFormats.length > 0">
+        <Label class="mb-1.5 block">支持的 API 格式 *</Label>
+        <div class="grid grid-cols-2 gap-2">
+          <div
+            v-for="format in sortedApiFormats"
+            :key="format"
+            class="flex items-center justify-between rounded-md border px-2 py-1.5 transition-colors cursor-pointer"
+            :class="form.api_formats.includes(format)
+              ? 'bg-primary/5 border-primary/30'
+              : 'bg-muted/30 border-border hover:border-muted-foreground/30'"
+            @click="toggleApiFormat(format)"
+          >
+            <div class="flex items-center gap-1.5 min-w-0">
+              <span
+                class="w-4 h-4 rounded border flex items-center justify-center text-xs shrink-0"
+                :class="form.api_formats.includes(format)
+                  ? 'bg-primary border-primary text-primary-foreground'
+                  : 'border-muted-foreground/30'"
+              >
+                <span v-if="form.api_formats.includes(format)">✓</span>
+              </span>
+              <span
+                class="text-sm whitespace-nowrap"
+                :class="form.api_formats.includes(format) ? 'text-primary' : 'text-muted-foreground'"
+              >{{ API_FORMAT_LABELS[format] || format }}</span>
+            </div>
+            <div
+              class="flex items-center shrink-0 ml-2 text-xs text-muted-foreground gap-1"
+              @click.stop
+            >
+              <span>×</span>
+              <input
+                :value="form.rate_multipliers[format] ?? ''"
+                type="number"
+                step="0.01"
+                min="0.01"
+                placeholder="1"
+                class="w-9 bg-transparent text-right outline-none [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                :class="form.api_formats.includes(format) ? 'text-primary' : 'text-muted-foreground'"
+                title="成本倍率"
+                @input="(e) => updateRateMultiplier(format, (e.target as HTMLInputElement).value)"
+              >
+            </div>
+          </div>
+        </div>
       </div>
 
-      <!-- 调度与限流 -->
-      <div class="space-y-3">
-        <h3 class="text-sm font-medium border-b pb-2">
-          调度与限流
-        </h3>
-        <div class="grid grid-cols-2 gap-4">
+      <!-- 配置项 -->
+      <div class="grid grid-cols-4 gap-3">
         <div>
-            <Label for="internal_priority">内部优先级</Label>
+          <Label
+            for="internal_priority"
+            class="text-xs"
+          >优先级</Label>
           <Input
             id="internal_priority"
             v-model.number="form.internal_priority"
             type="number"
             min="0"
+            class="h-8"
           />
-            <p class="text-xs text-muted-foreground mt-1">
-              数字越小越优先
+          <p class="text-xs text-muted-foreground mt-0.5">
+            越小越优先
           </p>
         </div>
         <div>
-            <Label for="max_concurrent">最大并发</Label>
+          <Label
+            for="rpm_limit"
+            class="text-xs"
+          >RPM 限制</Label>
           <Input
-              id="max_concurrent"
-              :model-value="form.max_concurrent ?? ''"
+            id="rpm_limit"
+            :model-value="form.rpm_limit ?? ''"
             type="number"
             min="1"
-              placeholder="留空启用自适应"
-              @update:model-value="(v) => form.max_concurrent = parseNumberInput(v)"
+            max="10000"
+            placeholder="自适应"
+            class="h-8"
+            @update:model-value="(v) => form.rpm_limit = parseNullableNumberInput(v, { min: 1, max: 10000 })"
           />
-            <p class="text-xs text-muted-foreground mt-1">
-              留空 = 自适应模式
+          <p class="text-xs text-muted-foreground mt-0.5">
+            留空自适应
           </p>
         </div>
-        </div>
-
-        <div class="grid grid-cols-3 gap-4">
         <div>
-            <Label for="rate_limit">速率限制(/分钟)</Label>
-            <Input
-              id="rate_limit"
-              :model-value="form.rate_limit ?? ''"
-              type="number"
-              min="1"
-              @update:model-value="(v) => form.rate_limit = parseNumberInput(v)"
-            />
-          </div>
-          <div>
-            <Label for="daily_limit">每日限制</Label>
-            <Input
-              id="daily_limit"
-              :model-value="form.daily_limit ?? ''"
-              type="number"
-              min="1"
-              @update:model-value="(v) => form.daily_limit = parseNumberInput(v)"
-            />
-          </div>
-          <div>
-            <Label for="monthly_limit">每月限制</Label>
-            <Input
-              id="monthly_limit"
-              :model-value="form.monthly_limit ?? ''"
-              type="number"
-              min="1"
-              @update:model-value="(v) => form.monthly_limit = parseNumberInput(v)"
-            />
-          </div>
-        </div>
-      </div>
-
-      <!-- 缓存与熔断 -->
-      <div class="space-y-3">
-        <h3 class="text-sm font-medium border-b pb-2">
-          缓存与熔断
-        </h3>
-        <div class="grid grid-cols-2 gap-4">
-          <div>
-            <Label for="cache_ttl_minutes">缓存 TTL (分钟)</Label>
+          <Label
+            for="cache_ttl_minutes"
+            class="text-xs"
+          >缓存 TTL</Label>
           <Input
             id="cache_ttl_minutes"
             :model-value="form.cache_ttl_minutes ?? ''"
             type="number"
             min="0"
             max="60"
+            class="h-8"
             @update:model-value="(v) => form.cache_ttl_minutes = parseNumberInput(v, { min: 0, max: 60 }) ?? 5"
           />
-            <p class="text-xs text-muted-foreground mt-1">
-              0 = 禁用缓存亲和性
+          <p class="text-xs text-muted-foreground mt-0.5">
+            分钟，0禁用
           </p>
         </div>
         <div>
-            <Label for="max_probe_interval_minutes">熔断探测间隔 (分钟)</Label>
+          <Label
+            for="max_probe_interval_minutes"
+            class="text-xs"
+          >熔断探测</Label>
           <Input
             id="max_probe_interval_minutes"
             :model-value="form.max_probe_interval_minutes ?? ''"
@@ -194,37 +192,31 @@
             min="2"
             max="32"
             placeholder="32"
+            class="h-8"
             @update:model-value="(v) => form.max_probe_interval_minutes = parseNumberInput(v, { min: 2, max: 32 }) ?? 32"
           />
-            <p class="text-xs text-muted-foreground mt-1">
-              范围 2-32 分钟
+          <p class="text-xs text-muted-foreground mt-0.5">
+            分钟，2-32
           </p>
         </div>
       </div>
-      </div>
 
-      <!-- 能力标签配置 -->
-      <div
-        v-if="availableCapabilities.length > 0"
-        class="space-y-3"
-      >
-        <h3 class="text-sm font-medium border-b pb-2">
-          能力标签
-        </h3>
-        <div class="flex flex-wrap gap-2">
-          <label
+      <!-- 能力标签 -->
+      <div v-if="availableCapabilities.length > 0">
+        <Label class="text-xs mb-1.5 block">能力标签</Label>
+        <div class="flex flex-wrap gap-1.5">
+          <button
             v-for="cap in availableCapabilities"
             :key="cap.name"
-            class="flex items-center gap-2 px-3 py-1.5 rounded-md border border-border bg-muted/30 cursor-pointer text-sm"
+            type="button"
+            class="inline-flex items-center gap-1.5 px-2.5 py-1 rounded-md border text-sm transition-colors"
+            :class="form.capabilities[cap.name]
+              ? 'bg-primary/10 border-primary/50 text-primary'
+              : 'bg-card border-border hover:bg-muted/50 text-muted-foreground'"
+            @click="form.capabilities[cap.name] = !form.capabilities[cap.name]"
           >
-            <input
-              type="checkbox"
-              :checked="form.capabilities[cap.name] || false"
-              class="rounded"
-              @change="form.capabilities[cap.name] = !form.capabilities[cap.name]"
-            >
-            <span>{{ cap.display_name }}</span>
-          </label>
+            {{ cap.display_name }}
+          </button>
         </div>
       </div>
     </form>
@@ -240,26 +232,29 @@
         :disabled="saving"
         @click="handleSave"
       >
-        {{ saving ? '保存中...' : '保存' }}
+        {{ saving ? (isEditMode ? '保存中...' : '添加中...') : (isEditMode ? '保存' : '添加') }}
       </Button>
     </template>
   </Dialog>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { Dialog, Button, Input, Label } from '@/components/ui'
 import { Key, SquarePen } from 'lucide-vue-next'
 import { useToast } from '@/composables/useToast'
 import { useFormDialog } from '@/composables/useFormDialog'
 import { parseApiError } from '@/utils/errorParser'
-import { parseNumberInput } from '@/utils/form'
+import { parseNumberInput, parseNullableNumberInput } from '@/utils/form'
 import { log } from '@/utils/logger'
 import {
-  addEndpointKey,
-  updateEndpointKey,
+  addProviderKey,
+  updateProviderKey,
   getAllCapabilities,
+  API_FORMAT_LABELS,
+  sortApiFormats,
   type EndpointAPIKey,
+  type EndpointAPIKeyUpdate,
   type ProviderEndpoint,
   type CapabilityDefinition
 } from '@/api/endpoints'
@@ -269,6 +264,7 @@ const props = defineProps<{
   endpoint: ProviderEndpoint | null
   editingKey: EndpointAPIKey | null
   providerId: string | null
+  availableApiFormats: string[]  // Provider 支持的所有 API 格式
 }>()
 
 const emit = defineEmits<{
@@ -278,6 +274,9 @@ const emit = defineEmits<{
 
 const { success, error: showError } = useToast()
 
+// 排序后的可用 API 格式列表
+const sortedApiFormats = computed(() => sortApiFormats(props.availableApiFormats))
+
 const isOpen = computed(() => props.open)
 const saving = ref(false)
 const formNonce = ref(createFieldNonce())
@@ -296,12 +295,10 @@ const availableCapabilities = ref<CapabilityDefinition[]>([])
 const form = ref({
   name: '',
   api_key: '',
-  rate_multiplier: 1.0,
-  internal_priority: 50,
-  max_concurrent: undefined as number | undefined,
-  rate_limit: undefined as number | undefined,
-  daily_limit: undefined as number | undefined,
-  monthly_limit: undefined as number | undefined,
+  api_formats: [] as string[],  // 支持的 API 格式列表
+  rate_multipliers: {} as Record<string, number>,  // 按 API 格式的成本倍率
+  internal_priority: 10,
+  rpm_limit: undefined as number | null | undefined,  // RPM 限制（null=自适应，undefined=保持原值）
   cache_ttl_minutes: 5,
   max_probe_interval_minutes: 32,
   note: '',
@@ -322,6 +319,43 @@ onMounted(() => {
   loadCapabilities()
 })
 
+// API 格式切换
+function toggleApiFormat(format: string) {
+  const index = form.value.api_formats.indexOf(format)
+  if (index === -1) {
+    // 添加格式
+    form.value.api_formats.push(format)
+  } else {
+    // 移除格式前检查：至少保留一个格式
+    if (form.value.api_formats.length <= 1) {
+      showError('至少需要选择一个 API 格式', '验证失败')
+      return
+    }
+    // 移除格式，但保留倍率配置（用户可能只是临时取消）
+    form.value.api_formats.splice(index, 1)
+  }
+}
+
+// 更新指定格式的成本倍率
+function updateRateMultiplier(format: string, value: string | number) {
+  // 使用对象替换以确保 Vue 3 响应性
+  const newMultipliers = { ...form.value.rate_multipliers }
+
+  if (value === '' || value === null || value === undefined) {
+    // 清空时删除该格式的配置（使用默认倍率）
+    delete newMultipliers[format]
+  } else {
+    const numValue = typeof value === 'string' ? parseFloat(value) : value
+    // 限制倍率范围：0.01 - 100
+    if (!isNaN(numValue) && numValue >= 0.01 && numValue <= 100) {
+      newMultipliers[format] = numValue
+    }
+  }
+
+  // 替换整个对象以触发响应式更新
+  form.value.rate_multipliers = newMultipliers
+}
+
 // API 密钥输入框样式计算
 function getApiKeyInputClass(): string {
   const classes = []
@@ -348,8 +382,8 @@ const apiKeyError = computed(() => {
   }
 
   // 如果输入了值，检查长度
-  if (apiKey.length < 10) {
-    return 'API 密钥至少需要 10 个字符'
+  if (apiKey.length < 3) {
+    return 'API 密钥至少需要 3 个字符'
   }
 
   return ''
@@ -362,12 +396,10 @@ function resetForm() {
   form.value = {
     name: '',
     api_key: '',
-    rate_multiplier: 1.0,
-    internal_priority: 50,
-    max_concurrent: undefined,
-    rate_limit: undefined,
-    daily_limit: undefined,
-    monthly_limit: undefined,
+    api_formats: [],  // 默认不选中任何格式
+    rate_multipliers: {},
+    internal_priority: 10,
+    rpm_limit: undefined,
     cache_ttl_minutes: 5,
     max_probe_interval_minutes: 32,
     note: '',
@@ -376,6 +408,14 @@ function resetForm() {
   }
 }
 
+// 添加成功后清除部分字段以便继续添加
+function clearForNextAdd() {
+  formNonce.value = createFieldNonce()
+  apiKeyFocused.value = false
+  form.value.name = ''
+  form.value.api_key = ''
+}
+
 // 加载密钥数据（编辑模式）
 function loadKeyData() {
   if (!props.editingKey) return
@@ -384,12 +424,13 @@ function loadKeyData() {
   form.value = {
     name: props.editingKey.name,
     api_key: '',
-    rate_multiplier: props.editingKey.rate_multiplier || 1.0,
-    internal_priority: props.editingKey.internal_priority ?? 50,
-    max_concurrent: props.editingKey.max_concurrent || undefined,
-    rate_limit: props.editingKey.rate_limit || undefined,
-    daily_limit: props.editingKey.daily_limit || undefined,
-    monthly_limit: props.editingKey.monthly_limit || undefined,
+    api_formats: props.editingKey.api_formats?.length > 0
+      ? [...props.editingKey.api_formats]
+      : [],  // 编辑模式下保持原有选择，不默认全选
+    rate_multipliers: { ...(props.editingKey.rate_multipliers || {}) },
+    internal_priority: props.editingKey.internal_priority ?? 10,
+    // 保留原始的 null/undefined 状态，null 表示自适应模式
+    rpm_limit: props.editingKey.rpm_limit ?? undefined,
     cache_ttl_minutes: props.editingKey.cache_ttl_minutes ?? 5,
     max_probe_interval_minutes: props.editingKey.max_probe_interval_minutes ?? 32,
     note: props.editingKey.note || '',
@@ -413,7 +454,11 @@ function createFieldNonce(): string {
 }
 
 async function handleSave() {
-  if (!props.endpoint) return
+  // 必须有 providerId
+  if (!props.providerId) {
+    showError('无法保存：缺少提供商信息', '错误')
+    return
+  }
 
   // 提交前验证
   if (apiKeyError.value) {
@@ -427,6 +472,12 @@ async function handleSave() {
     return
   }
 
+  // 验证至少选择一个 API 格式
+  if (form.value.api_formats.length === 0) {
+    showError('请至少选择一个 API 格式', '验证失败')
+    return
+  }
+
   // 过滤出有效的能力配置（只包含值为 true 的）
   const activeCapabilities: Record<string, boolean> = {}
   for (const [key, value] of Object.entries(form.value.capabilities)) {
@@ -438,16 +489,27 @@ async function handleSave() {
 
   saving.value = true
   try {
+    // 准备 rate_multipliers 数据：只保留已选中格式的倍率配置
+    const filteredMultipliers: Record<string, number> = {}
+    for (const format of form.value.api_formats) {
+      if (form.value.rate_multipliers[format] !== undefined) {
+        filteredMultipliers[format] = form.value.rate_multipliers[format]
+      }
+    }
+    const rateMultipliersData = Object.keys(filteredMultipliers).length > 0
+      ? filteredMultipliers
+      : null
+
     if (props.editingKey) {
-      // 更新
-      const updateData: any = {
+      // 更新模式
+      // 注意：rpm_limit 使用 null 表示自适应模式
+      // undefined 表示"保持原值不变"（会在 JSON 序列化时被忽略）
+      const updateData: EndpointAPIKeyUpdate = {
+        api_formats: form.value.api_formats,
         name: form.value.name,
-        rate_multiplier: form.value.rate_multiplier,
+        rate_multipliers: rateMultipliersData,
         internal_priority: form.value.internal_priority,
-        max_concurrent: form.value.max_concurrent,
-        rate_limit: form.value.rate_limit,
-        daily_limit: form.value.daily_limit,
-        monthly_limit: form.value.monthly_limit,
+        rpm_limit: form.value.rpm_limit,
         cache_ttl_minutes: form.value.cache_ttl_minutes,
         max_probe_interval_minutes: form.value.max_probe_interval_minutes,
         note: form.value.note,
@@ -459,26 +521,27 @@ async function handleSave() {
         updateData.api_key = form.value.api_key
       }
 
-      await updateEndpointKey(props.editingKey.id, updateData)
+      await updateProviderKey(props.editingKey.id, updateData)
       success('密钥已更新', '成功')
     } else {
-      // 新增
-      await addEndpointKey(props.endpoint.id, {
-        endpoint_id: props.endpoint.id,
+      // 新增模式
+      await addProviderKey(props.providerId, {
+        api_formats: form.value.api_formats,
         api_key: form.value.api_key,
         name: form.value.name,
-        rate_multiplier: form.value.rate_multiplier,
+        rate_multipliers: rateMultipliersData,
         internal_priority: form.value.internal_priority,
-        max_concurrent: form.value.max_concurrent,
-        rate_limit: form.value.rate_limit,
-        daily_limit: form.value.daily_limit,
-        monthly_limit: form.value.monthly_limit,
+        rpm_limit: form.value.rpm_limit,
         cache_ttl_minutes: form.value.cache_ttl_minutes,
         max_probe_interval_minutes: form.value.max_probe_interval_minutes,
         note: form.value.note,
         capabilities: capabilitiesData || undefined
       })
       success('密钥已添加', '成功')
+      // 添加模式：不关闭对话框，只清除名称和密钥以便继续添加
+      emit('saved')
+      clearForNextAdd()
+      return
     }
 
     emit('saved')

frontend/src/features/providers/components/ModelAliasDialog.vue

@@ -0,0 +1,337 @@
+<template>
+  <Dialog
+    :model-value="open"
+    title="管理模型名称映射"
+    description="配置 Provider 对此模型使用的名称变体，系统会按优先级顺序选择"
+    :icon="Tag"
+    size="lg"
+    @update:model-value="handleClose"
+  >
+    <div class="space-y-4">
+      <!-- 模型信息 -->
+      <div class="rounded-lg border bg-muted/30 p-3">
+        <p class="font-medium">
+          {{ model?.global_model_display_name || model?.provider_model_name }}
+        </p>
+        <p class="text-sm text-muted-foreground font-mono">
+          主名称: {{ model?.provider_model_name }}
+        </p>
+      </div>
+
+      <!-- 映射列表 -->
+      <div class="space-y-3">
+        <div class="flex items-center justify-between">
+          <Label class="text-sm font-medium">名称映射</Label>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            @click="addAlias"
+          >
+            <Plus class="w-4 h-4 mr-1" />
+            添加
+          </Button>
+        </div>
+
+        <!-- 提示信息 -->
+        <div
+          v-if="aliases.length > 0"
+          class="flex items-center gap-2 px-3 py-2 text-xs text-muted-foreground bg-muted/30 rounded-md"
+        >
+          <Info class="w-3.5 h-3.5 shrink-0" />
+          <span>拖拽调整顺序，点击序号可编辑（相同数字为同级，负载均衡）</span>
+        </div>
+
+        <div
+          v-if="aliases.length > 0"
+          class="space-y-2"
+        >
+          <div
+            v-for="(alias, index) in aliases"
+            :key="index"
+            class="group flex items-center gap-3 px-3 py-2.5 rounded-lg border transition-all duration-200"
+            :class="[
+              draggedIndex === index
+                ? 'border-primary/50 bg-primary/5 shadow-md scale-[1.01]'
+                : dragOverIndex === index
+                  ? 'border-primary/30 bg-primary/5'
+                  : 'border-border/50 bg-background hover:border-border hover:bg-muted/30'
+            ]"
+            draggable="true"
+            @dragstart="handleDragStart(index, $event)"
+            @dragend="handleDragEnd"
+            @dragover.prevent="handleDragOver(index)"
+            @dragleave="handleDragLeave"
+            @drop="handleDrop(index)"
+          >
+            <!-- 拖拽手柄 -->
+            <div class="cursor-grab active:cursor-grabbing p-1 rounded hover:bg-muted text-muted-foreground/40 group-hover:text-muted-foreground transition-colors shrink-0">
+              <GripVertical class="w-4 h-4" />
+            </div>
+
+            <!-- 可编辑优先级 -->
+            <div class="shrink-0">
+              <input
+                v-if="editingPriorityIndex === index"
+                type="number"
+                min="1"
+                :value="alias.priority"
+                class="w-8 h-6 rounded-md bg-background border border-primary text-xs font-medium text-center focus:outline-none [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                autofocus
+                @blur="finishEditPriority(index, $event)"
+                @keydown.enter="($event.target as HTMLInputElement).blur()"
+                @keydown.escape="cancelEditPriority"
+              >
+              <div
+                v-else
+                class="w-6 h-6 rounded-md bg-muted/50 flex items-center justify-center text-xs font-medium text-muted-foreground cursor-pointer hover:bg-primary/10 hover:text-primary transition-colors"
+                title="点击编辑优先级，相同数字为同级（负载均衡）"
+                @click.stop="startEditPriority(index)"
+              >
+                {{ alias.priority }}
+              </div>
+            </div>
+
+            <!-- 映射输入框 -->
+            <Input
+              v-model="alias.name"
+              placeholder="映射名称，如 Claude-Sonnet-4.5"
+              class="flex-1"
+            />
+
+            <!-- 删除按钮 -->
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon"
+              class="shrink-0 text-destructive hover:text-destructive h-8 w-8"
+              @click="removeAlias(index)"
+            >
+              <X class="w-4 h-4" />
+            </Button>
+          </div>
+        </div>
+
+        <div
+          v-else
+          class="text-center py-6 text-muted-foreground border rounded-lg border-dashed"
+        >
+          <Tag class="w-8 h-8 mx-auto mb-2 opacity-50" />
+          <p class="text-sm">
+            未配置映射
+          </p>
+          <p class="text-xs mt-1">
+            将只使用主模型名称
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <template #footer>
+      <Button
+        variant="outline"
+        @click="handleClose(false)"
+      >
+        取消
+      </Button>
+      <Button
+        :disabled="submitting"
+        @click="handleSubmit"
+      >
+        <Loader2
+          v-if="submitting"
+          class="w-4 h-4 mr-2 animate-spin"
+        />
+        保存
+      </Button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { Tag, Plus, X, Loader2, GripVertical, Info } from 'lucide-vue-next'
+import { Dialog, Button, Input, Label } from '@/components/ui'
+import { useToast } from '@/composables/useToast'
+import { updateModel } from '@/api/endpoints/models'
+import type { Model, ProviderModelAlias } from '@/api/endpoints'
+
+interface Props {
+  open: boolean
+  providerId: string
+  model: Model | null
+}
+
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  'update:open': [value: boolean]
+  'saved': []
+}>()
+
+const { error: showError, success: showSuccess } = useToast()
+
+const submitting = ref(false)
+const aliases = ref<ProviderModelAlias[]>([])
+
+// 拖拽状态
+const draggedIndex = ref<number | null>(null)
+const dragOverIndex = ref<number | null>(null)
+
+// 优先级编辑状态
+const editingPriorityIndex = ref<number | null>(null)
+
+// 监听 open 变化
+watch(() => props.open, (newOpen) => {
+  if (newOpen && props.model) {
+    // 加载现有映射配置
+    if (props.model.provider_model_mappings && Array.isArray(props.model.provider_model_mappings)) {
+      aliases.value = JSON.parse(JSON.stringify(props.model.provider_model_mappings))
+    } else {
+      aliases.value = []
+    }
+    // 重置状态
+    editingPriorityIndex.value = null
+    draggedIndex.value = null
+    dragOverIndex.value = null
+  }
+})
+
+// 添加映射
+function addAlias() {
+  // 新映射优先级为当前最大优先级 + 1，或者默认为 1
+  const maxPriority = aliases.value.length > 0
+    ? Math.max(...aliases.value.map(a => a.priority))
+    : 0
+  aliases.value.push({ name: '', priority: maxPriority + 1 })
+}
+
+// 移除映射
+function removeAlias(index: number) {
+  aliases.value.splice(index, 1)
+}
+
+// ===== 拖拽排序 =====
+function handleDragStart(index: number, event: DragEvent) {
+  draggedIndex.value = index
+  if (event.dataTransfer) {
+    event.dataTransfer.effectAllowed = 'move'
+  }
+}
+
+function handleDragEnd() {
+  draggedIndex.value = null
+  dragOverIndex.value = null
+}
+
+function handleDragOver(index: number) {
+  if (draggedIndex.value !== null && draggedIndex.value !== index) {
+    dragOverIndex.value = index
+  }
+}
+
+function handleDragLeave() {
+  dragOverIndex.value = null
+}
+
+function handleDrop(targetIndex: number) {
+  const dragIndex = draggedIndex.value
+  if (dragIndex === null || dragIndex === targetIndex) {
+    dragOverIndex.value = null
+    return
+  }
+
+  const items = [...aliases.value]
+  const draggedItem = items[dragIndex]
+
+  // 记录每个映射的原始优先级（在修改前）
+  const originalPriorityMap = new Map<number, number>()
+  items.forEach((alias, idx) => {
+    originalPriorityMap.set(idx, alias.priority)
+  })
+
+  // 重排数组
+  items.splice(dragIndex, 1)
+  items.splice(targetIndex, 0, draggedItem)
+
+  // 按新顺序为每个组分配新的优先级
+  // 同组的映射保持相同的优先级（被拖动的映射单独成组）
+  const groupNewPriority = new Map<number, number>() // 原优先级 -> 新优先级
+  let currentPriority = 1
+
+  // 找到被拖动项在原数组中的索引对应的原始优先级
+  const draggedOriginalPriority = originalPriorityMap.get(dragIndex)!
+
+  items.forEach((alias, newIdx) => {
+    // 找到这个映射在原数组中的索引
+    const originalIdx = aliases.value.findIndex(a => a === alias)
+    const originalPriority = originalIdx >= 0 ? originalPriorityMap.get(originalIdx)! : alias.priority
+
+    if (alias === draggedItem) {
+      // 被拖动的映射是独立的新组，获得当前优先级
+      alias.priority = currentPriority
+      currentPriority++
+    } else {
+      if (groupNewPriority.has(originalPriority)) {
+        // 这个组已经分配过优先级，使用相同的值
+        alias.priority = groupNewPriority.get(originalPriority)!
+      } else {
+        // 这个组第一次出现，分配新优先级
+        groupNewPriority.set(originalPriority, currentPriority)
+        alias.priority = currentPriority
+        currentPriority++
+      }
+    }
+  })
+
+  aliases.value = items
+  draggedIndex.value = null
+  dragOverIndex.value = null
+}
+
+// ===== 优先级编辑 =====
+function startEditPriority(index: number) {
+  editingPriorityIndex.value = index
+}
+
+function finishEditPriority(index: number, event: FocusEvent) {
+  const input = event.target as HTMLInputElement
+  const newPriority = parseInt(input.value) || 1
+  aliases.value[index].priority = Math.max(1, newPriority)
+  editingPriorityIndex.value = null
+}
+
+function cancelEditPriority() {
+  editingPriorityIndex.value = null
+}
+
+// 关闭对话框
+function handleClose(value: boolean) {
+  if (!submitting.value) {
+    emit('update:open', value)
+  }
+}
+
+// 提交保存
+async function handleSubmit() {
+  if (submitting.value || !props.model) return
+
+  submitting.value = true
+  try {
+    // 过滤掉空的映射
+    const validAliases = aliases.value.filter(a => a.name.trim())
+
+    await updateModel(props.providerId, props.model.id, {
+      provider_model_mappings: validAliases.length > 0 ? validAliases : null
+    })
+
+    showSuccess('映射配置已保存')
+    emit('update:open', false)
+    emit('saved')
+  } catch (err: any) {
+    showError(err.response?.data?.detail || '保存失败', '错误')
+  } finally {
+    submitting.value = false
+  }
+}
+</script>

frontend/src/features/providers/components/ModelMappingDialog.vue

@@ -0,0 +1,797 @@
+<template>
+  <Dialog
+    :model-value="open"
+    :title="editingGroup ? '编辑模型映射' : '添加模型映射'"
+    :description="editingGroup ? '修改映射配置' : '为模型添加新的名称映射'"
+    :icon="Tag"
+    size="4xl"
+    @update:model-value="$emit('update:open', $event)"
+  >
+    <div class="space-y-4">
+      <!-- 第一行：目标模型 | 作用域 -->
+      <div class="flex gap-4">
+        <!-- 目标模型 -->
+        <div class="flex-1 space-y-1.5">
+          <Label class="text-xs">目标模型</Label>
+          <Select
+            v-model:open="modelSelectOpen"
+            :model-value="formData.modelId"
+            :disabled="!!editingGroup"
+            @update:model-value="handleModelChange"
+          >
+            <SelectTrigger class="h-9">
+              <SelectValue placeholder="请选择模型" />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem
+                v-for="model in models"
+                :key="model.id"
+                :value="model.id"
+              >
+                {{ model.global_model_display_name || model.provider_model_name }}
+              </SelectItem>
+            </SelectContent>
+          </Select>
+        </div>
+
+        <!-- 作用域 -->
+        <div class="flex-1 space-y-1.5">
+          <Label class="text-xs">作用域 <span class="text-muted-foreground font-normal">(不选则适用全部)</span></Label>
+          <div
+            v-if="providerApiFormats.length > 0"
+            class="flex flex-wrap gap-1.5 p-2 rounded-md border bg-muted/30 min-h-[36px]"
+          >
+            <button
+              v-for="format in providerApiFormats"
+              :key="format"
+              type="button"
+              class="px-2.5 py-0.5 rounded text-xs font-medium transition-colors"
+              :class="[
+                formData.apiFormats.includes(format)
+                  ? 'bg-primary text-primary-foreground'
+                  : 'bg-background border border-border hover:bg-muted'
+              ]"
+              @click="toggleApiFormat(format)"
+            >
+              {{ API_FORMAT_LABELS[format] || format }}
+            </button>
+          </div>
+          <div
+            v-else
+            class="h-9 flex items-center text-xs text-muted-foreground"
+          >
+            无可用格式
+          </div>
+        </div>
+      </div>
+
+      <!-- 第二行：两栏布局 -->
+      <div class="flex gap-4 items-stretch">
+        <!-- 左侧：上游模型列表 -->
+        <div class="flex-1 space-y-2">
+          <div class="flex items-center justify-between gap-2">
+            <span class="text-sm font-medium shrink-0">
+              上游模型
+            </span>
+            <div class="flex-1 relative">
+              <Search class="absolute left-2 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-muted-foreground" />
+              <Input
+                v-model="upstreamModelSearch"
+                placeholder="搜索模型..."
+                class="pl-7 h-7 text-xs"
+              />
+            </div>
+            <button
+              v-if="upstreamModelsLoaded"
+              type="button"
+              class="p-1.5 hover:bg-muted rounded-md transition-colors shrink-0"
+              title="刷新列表"
+              :disabled="refreshingUpstreamModels"
+              @click="refreshUpstreamModels"
+            >
+              <RefreshCw
+                class="w-3.5 h-3.5"
+                :class="{ 'animate-spin': refreshingUpstreamModels }"
+              />
+            </button>
+            <button
+              v-else-if="!fetchingUpstreamModels"
+              type="button"
+              class="p-1.5 hover:bg-muted rounded-md transition-colors shrink-0"
+              title="获取上游模型列表"
+              @click="fetchUpstreamModels"
+            >
+              <Zap class="w-3.5 h-3.5" />
+            </button>
+            <Loader2
+              v-else
+              class="w-3.5 h-3.5 animate-spin text-muted-foreground shrink-0"
+            />
+          </div>
+          <div class="border rounded-lg h-80 overflow-y-auto">
+            <template v-if="upstreamModelsLoaded">
+              <div
+                v-if="groupedAvailableUpstreamModels.length === 0"
+                class="flex flex-col items-center justify-center h-full text-muted-foreground"
+              >
+                <Zap class="w-10 h-10 mb-2 opacity-30" />
+                <p class="text-sm">
+                  {{ upstreamModelSearch ? '没有匹配的模型' : '所有模型已添加' }}
+                </p>
+              </div>
+              <div
+                v-else
+                class="p-2 space-y-2"
+              >
+                <!-- 按分组显示（可折叠） -->
+                <div
+                  v-for="group in groupedAvailableUpstreamModels"
+                  :key="group.api_format"
+                  class="border rounded-lg overflow-hidden"
+                >
+                  <div class="flex items-center gap-2 px-3 py-2 bg-muted/30">
+                    <button
+                      type="button"
+                      class="flex items-center gap-2 flex-1 hover:bg-muted/50 -mx-1 px-1 rounded transition-colors"
+                      @click="toggleGroupCollapse(group.api_format)"
+                    >
+                      <ChevronDown
+                        class="w-4 h-4 transition-transform shrink-0"
+                        :class="collapsedGroups.has(group.api_format) ? '-rotate-90' : ''"
+                      />
+                      <span class="text-xs font-medium">
+                        {{ API_FORMAT_LABELS[group.api_format] || group.api_format }}
+                      </span>
+                      <span class="text-xs text-muted-foreground">
+                        ({{ group.models.length }})
+                      </span>
+                    </button>
+                  </div>
+                  <div
+                    v-show="!collapsedGroups.has(group.api_format)"
+                    class="p-2 space-y-1 border-t"
+                  >
+                    <div
+                      v-for="model in group.models"
+                      :key="model.id"
+                      class="flex items-center gap-2 p-2 rounded-lg border transition-colors hover:bg-muted/30"
+                      :title="model.id"
+                    >
+                      <div class="flex-1 min-w-0">
+                        <p class="font-medium text-sm truncate">
+                          {{ model.id }}
+                        </p>
+                        <p class="text-xs text-muted-foreground truncate font-mono">
+                          {{ model.owned_by || model.id }}
+                        </p>
+                      </div>
+                      <button
+                        type="button"
+                        class="p-1 hover:bg-primary/10 rounded transition-colors shrink-0"
+                        title="添加到映射"
+                        @click="addUpstreamModel(model.id)"
+                      >
+                        <ChevronRight class="w-4 h-4 text-muted-foreground hover:text-primary" />
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <!-- 未加载状态 -->
+            <div
+              v-else
+              class="flex flex-col items-center justify-center h-full text-muted-foreground"
+            >
+              <Zap class="w-10 h-10 mb-2 opacity-30" />
+              <p class="text-sm">
+                点击右上角按钮
+              </p>
+              <p class="text-xs mt-1">
+                从上游获取可用模型
+              </p>
+            </div>
+          </div>
+        </div>
+
+        <!-- 右侧：映射名称列表 -->
+        <div class="flex-1 space-y-2">
+          <div class="flex items-center justify-between">
+            <p class="text-sm font-medium">
+              映射名称
+            </p>
+            <button
+              type="button"
+              class="p-1.5 hover:bg-muted rounded-md transition-colors"
+              title="手动添加"
+              @click="addAliasItem"
+            >
+              <Plus class="w-3.5 h-3.5" />
+            </button>
+          </div>
+          <div class="border rounded-lg h-80 overflow-y-auto">
+            <div
+              v-if="formData.aliases.length === 0"
+              class="flex flex-col items-center justify-center h-full text-muted-foreground"
+            >
+              <Tag class="w-10 h-10 mb-2 opacity-30" />
+              <p class="text-sm">
+                从左侧选择模型
+              </p>
+              <p class="text-xs mt-1">
+                或点击上方"手动添加"
+              </p>
+            </div>
+            <div
+              v-else
+              class="p-2 space-y-1"
+            >
+              <div
+                v-for="(alias, index) in formData.aliases"
+                :key="`alias-${index}`"
+                class="group flex items-center gap-2 p-2 rounded-lg border transition-colors hover:bg-muted/30"
+                :class="[
+                  draggedIndex === index ? 'bg-primary/5' : '',
+                  dragOverIndex === index ? 'bg-primary/10 border-primary' : ''
+                ]"
+                draggable="true"
+                @dragstart="handleDragStart(index, $event)"
+                @dragend="handleDragEnd"
+                @dragover.prevent="handleDragOver(index)"
+                @dragleave="handleDragLeave"
+                @drop="handleDrop(index)"
+              >
+                <!-- 删除按钮 -->
+                <button
+                  type="button"
+                  class="p-1 hover:bg-destructive/10 rounded transition-colors shrink-0"
+                  title="移除"
+                  @click="removeAliasItem(index)"
+                >
+                  <ChevronLeft class="w-4 h-4 text-muted-foreground hover:text-destructive" />
+                </button>
+
+                <!-- 优先级 -->
+                <div class="shrink-0">
+                  <input
+                    v-if="editingPriorityIndex === index"
+                    type="number"
+                    min="1"
+                    :value="alias.priority"
+                    class="w-7 h-6 rounded bg-background border border-primary text-xs text-center focus:outline-none [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                    autofocus
+                    @blur="finishEditPriority(index, $event)"
+                    @keydown.enter="($event.target as HTMLInputElement).blur()"
+                    @keydown.escape="cancelEditPriority"
+                  >
+                  <div
+                    v-else
+                    class="w-6 h-6 rounded bg-muted/50 flex items-center justify-center text-xs text-muted-foreground cursor-pointer hover:bg-primary/10 hover:text-primary"
+                    title="点击编辑优先级"
+                    @click.stop="startEditPriority(index)"
+                  >
+                    {{ alias.priority }}
+                  </div>
+                </div>
+
+                <!-- 名称显示/编辑 -->
+                <div class="flex-1 min-w-0">
+                  <Input
+                    v-if="alias.isEditing"
+                    v-model="alias.name"
+                    placeholder="输入映射名称"
+                    class="h-7 text-xs"
+                    autofocus
+                    @blur="alias.isEditing = false"
+                    @keydown.enter="alias.isEditing = false"
+                  />
+                  <p
+                    v-else
+                    class="font-medium text-sm truncate cursor-pointer hover:text-primary"
+                    title="点击编辑"
+                    @click="alias.isEditing = true"
+                  >
+                    {{ alias.name || '点击输入名称' }}
+                  </p>
+                </div>
+
+                <!-- 拖拽手柄 -->
+                <div class="cursor-grab active:cursor-grabbing text-muted-foreground/30 group-hover:text-muted-foreground shrink-0">
+                  <GripVertical class="w-4 h-4" />
+                </div>
+              </div>
+            </div>
+            <!-- 拖拽提示 -->
+            <div
+              v-if="formData.aliases.length > 1"
+              class="px-3 py-1.5 bg-muted/30 border-t text-xs text-muted-foreground text-center"
+            >
+              拖拽调整优先级顺序
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <template #footer>
+      <Button
+        variant="outline"
+        @click="$emit('update:open', false)"
+      >
+        取消
+      </Button>
+      <Button
+        :disabled="submitting || !formData.modelId || formData.aliases.length === 0 || !hasValidAliases"
+        @click="handleSubmit"
+      >
+        <Loader2
+          v-if="submitting"
+          class="w-4 h-4 mr-2 animate-spin"
+        />
+        {{ editingGroup ? '保存' : '添加' }}
+      </Button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { Tag, Loader2, GripVertical, Zap, Search, RefreshCw, ChevronDown, ChevronRight, ChevronLeft, Plus } from 'lucide-vue-next'
+import {
+  Button,
+  Input,
+  Label,
+  Dialog,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui'
+import { useToast } from '@/composables/useToast'
+import {
+  API_FORMAT_LABELS,
+  type Model,
+  type ProviderModelAlias
+} from '@/api/endpoints'
+import { updateModel } from '@/api/endpoints/models'
+import { useUpstreamModelsCache, type UpstreamModel } from '../composables/useUpstreamModelsCache'
+
+interface FormAlias {
+  name: string
+  priority: number
+  isEditing?: boolean
+}
+
+export interface AliasGroup {
+  model: Model
+  apiFormatsKey: string
+  apiFormats: string[]
+  aliases: ProviderModelAlias[]
+}
+
+const props = defineProps<{
+  open: boolean
+  providerId: string
+  providerApiFormats: string[]
+  models: Model[]
+  editingGroup?: AliasGroup | null
+  preselectedModelId?: string | null
+}>()
+
+const emit = defineEmits<{
+  'update:open': [value: boolean]
+  'saved': []
+}>()
+
+const { error: showError, success: showSuccess } = useToast()
+const { fetchModels: fetchCachedModels, clearCache, getCachedModels } = useUpstreamModelsCache()
+
+// 状态
+const submitting = ref(false)
+const modelSelectOpen = ref(false)
+
+// 拖拽状态
+const draggedIndex = ref<number | null>(null)
+const dragOverIndex = ref<number | null>(null)
+
+// 优先级编辑状态
+const editingPriorityIndex = ref<number | null>(null)
+
+// 快速添加（上游模型）状态
+const fetchingUpstreamModels = ref(false)
+const refreshingUpstreamModels = ref(false)
+const upstreamModelsLoaded = ref(false)
+const upstreamModels = ref<UpstreamModel[]>([])
+const upstreamModelSearch = ref('')
+
+// 分组折叠状态
+const collapsedGroups = ref<Set<string>>(new Set())
+
+// 表单数据
+const formData = ref<{
+  modelId: string
+  apiFormats: string[]
+  aliases: FormAlias[]
+}>({
+  modelId: '',
+  apiFormats: [],
+  aliases: []
+})
+
+// 检查是否有有效的映射
+const hasValidAliases = computed(() => {
+  return formData.value.aliases.some(a => a.name.trim())
+})
+
+// 过滤和排序后的上游模型列表
+const filteredUpstreamModels = computed(() => {
+  const searchText = upstreamModelSearch.value.toLowerCase().trim()
+  let result = [...upstreamModels.value]
+
+  result.sort((a, b) => a.id.localeCompare(b.id))
+
+  if (searchText) {
+    const keywords = searchText.split(/\s+/).filter(k => k.length > 0)
+    result = result.filter(m => {
+      const searchableText = `${m.id} ${m.owned_by || ''} ${m.api_format || ''}`.toLowerCase()
+      return keywords.every(keyword => searchableText.includes(keyword))
+    })
+  }
+
+  return result
+})
+
+// 按 API 格式分组的上游模型列表
+interface UpstreamModelGroup {
+  api_format: string
+  models: Array<{ id: string; owned_by?: string; api_format?: string }>
+}
+
+const groupedAvailableUpstreamModels = computed<UpstreamModelGroup[]>(() => {
+  // 收集当前表单已添加的名称
+  const addedNames = new Set(formData.value.aliases.map(a => a.name.trim()))
+
+  // 收集所有已存在的映射名称（包括主模型名和映射名称）
+  for (const m of props.models) {
+    addedNames.add(m.provider_model_name)
+    for (const mapping of m.provider_model_mappings ?? []) {
+      if (mapping.name) addedNames.add(mapping.name)
+    }
+  }
+
+  const availableModels = filteredUpstreamModels.value.filter(m => !addedNames.has(m.id))
+
+  const groups = new Map<string, UpstreamModelGroup>()
+
+  for (const model of availableModels) {
+    const format = model.api_format || 'UNKNOWN'
+    if (!groups.has(format)) {
+      groups.set(format, { api_format: format, models: [] })
+    }
+    groups.get(format)!.models.push(model)
+  }
+
+  const order = Object.keys(API_FORMAT_LABELS)
+  return Array.from(groups.values()).sort((a, b) => {
+    const aIndex = order.indexOf(a.api_format)
+    const bIndex = order.indexOf(b.api_format)
+    if (aIndex === -1 && bIndex === -1) return a.api_format.localeCompare(b.api_format)
+    if (aIndex === -1) return 1
+    if (bIndex === -1) return -1
+    return aIndex - bIndex
+  })
+})
+
+// 监听打开状态
+watch(() => props.open, (isOpen) => {
+  if (isOpen) {
+    initForm()
+  }
+})
+
+// 初始化表单
+function initForm() {
+  if (props.editingGroup) {
+    formData.value = {
+      modelId: props.editingGroup.model.id,
+      apiFormats: [...props.editingGroup.apiFormats],
+      aliases: props.editingGroup.aliases.map(a => ({ name: a.name, priority: a.priority }))
+    }
+  } else {
+    formData.value = {
+      modelId: props.preselectedModelId || '',
+      apiFormats: [],
+      aliases: []
+    }
+  }
+  // 重置状态
+  editingPriorityIndex.value = null
+  draggedIndex.value = null
+  dragOverIndex.value = null
+  upstreamModelSearch.value = ''
+  collapsedGroups.value = new Set()
+
+  // 检查缓存，如果有缓存数据则直接使用
+  const cachedModels = getCachedModels(props.providerId)
+  if (cachedModels) {
+    upstreamModels.value = cachedModels
+    upstreamModelsLoaded.value = true
+    // 默认折叠所有分组
+    for (const model of cachedModels) {
+      if (model.api_format) {
+        collapsedGroups.value.add(model.api_format)
+      }
+    }
+  } else {
+    upstreamModelsLoaded.value = false
+    upstreamModels.value = []
+  }
+}
+
+// 处理模型选择变更
+function handleModelChange(value: string) {
+  formData.value.modelId = value
+  const selectedModel = props.models.find(m => m.id === value)
+  if (selectedModel) {
+    upstreamModelSearch.value = selectedModel.provider_model_name
+  }
+}
+
+// 切换 API 格式
+function toggleApiFormat(format: string) {
+  const index = formData.value.apiFormats.indexOf(format)
+  if (index >= 0) {
+    formData.value.apiFormats.splice(index, 1)
+  } else {
+    formData.value.apiFormats.push(format)
+  }
+}
+
+// 切换分组折叠状态
+function toggleGroupCollapse(apiFormat: string) {
+  if (collapsedGroups.value.has(apiFormat)) {
+    collapsedGroups.value.delete(apiFormat)
+  } else {
+    collapsedGroups.value.add(apiFormat)
+  }
+}
+
+// 添加映射项
+function addAliasItem() {
+  const maxPriority = formData.value.aliases.length > 0
+    ? Math.max(...formData.value.aliases.map(a => a.priority))
+    : 0
+  formData.value.aliases.push({ name: '', priority: maxPriority + 1, isEditing: true })
+}
+
+// 删除映射项
+function removeAliasItem(index: number) {
+  formData.value.aliases.splice(index, 1)
+}
+
+// ===== 拖拽排序 =====
+function handleDragStart(index: number, event: DragEvent) {
+  draggedIndex.value = index
+  if (event.dataTransfer) {
+    event.dataTransfer.effectAllowed = 'move'
+  }
+}
+
+function handleDragEnd() {
+  draggedIndex.value = null
+  dragOverIndex.value = null
+}
+
+function handleDragOver(index: number) {
+  if (draggedIndex.value !== null && draggedIndex.value !== index) {
+    dragOverIndex.value = index
+  }
+}
+
+function handleDragLeave() {
+  dragOverIndex.value = null
+}
+
+function handleDrop(targetIndex: number) {
+  const dragIndex = draggedIndex.value
+  if (dragIndex === null || dragIndex === targetIndex) {
+    dragOverIndex.value = null
+    return
+  }
+
+  const items = [...formData.value.aliases]
+  const draggedItem = items[dragIndex]
+
+  const originalPriorityMap = new Map<number, number>()
+  items.forEach((alias, idx) => {
+    originalPriorityMap.set(idx, alias.priority)
+  })
+
+  items.splice(dragIndex, 1)
+  items.splice(targetIndex, 0, draggedItem)
+
+  const groupNewPriority = new Map<number, number>()
+  let currentPriority = 1
+
+  items.forEach((alias) => {
+    const originalIdx = formData.value.aliases.findIndex(a => a === alias)
+    const originalPriority = originalIdx >= 0 ? originalPriorityMap.get(originalIdx)! : alias.priority
+
+    if (alias === draggedItem) {
+      alias.priority = currentPriority
+      currentPriority++
+    } else {
+      if (groupNewPriority.has(originalPriority)) {
+        alias.priority = groupNewPriority.get(originalPriority)!
+      } else {
+        groupNewPriority.set(originalPriority, currentPriority)
+        alias.priority = currentPriority
+        currentPriority++
+      }
+    }
+  })
+
+  formData.value.aliases = items
+  draggedIndex.value = null
+  dragOverIndex.value = null
+}
+
+// ===== 优先级编辑 =====
+function startEditPriority(index: number) {
+  editingPriorityIndex.value = index
+}
+
+function finishEditPriority(index: number, event: FocusEvent) {
+  const input = event.target as HTMLInputElement
+  const newPriority = parseInt(input.value) || 1
+  formData.value.aliases[index].priority = Math.max(1, newPriority)
+  editingPriorityIndex.value = null
+}
+
+function cancelEditPriority() {
+  editingPriorityIndex.value = null
+}
+
+// ===== 快速添加（上游模型）=====
+async function fetchUpstreamModels() {
+  if (!props.providerId) return
+
+  upstreamModelSearch.value = ''
+  fetchingUpstreamModels.value = true
+
+  try {
+    const result = await fetchCachedModels(props.providerId)
+    if (result) {
+      if (result.error) {
+        showError(result.error, '错误')
+      } else {
+        upstreamModels.value = result.models
+        upstreamModelsLoaded.value = true
+        // 默认折叠所有分组
+        for (const model of result.models) {
+          if (model.api_format) {
+            collapsedGroups.value.add(model.api_format)
+          }
+        }
+      }
+    }
+  } finally {
+    fetchingUpstreamModels.value = false
+  }
+}
+
+function addUpstreamModel(modelId: string) {
+  if (formData.value.aliases.some(a => a.name === modelId)) {
+    return
+  }
+
+  const maxPriority = formData.value.aliases.length > 0
+    ? Math.max(...formData.value.aliases.map(a => a.priority))
+    : 0
+
+  formData.value.aliases.push({ name: modelId, priority: maxPriority + 1 })
+}
+
+async function refreshUpstreamModels() {
+  if (!props.providerId || refreshingUpstreamModels.value) return
+
+  refreshingUpstreamModels.value = true
+  clearCache(props.providerId)
+
+  try {
+    const result = await fetchCachedModels(props.providerId, true)
+    if (result) {
+      if (result.error) {
+        showError(result.error, '错误')
+      } else {
+        upstreamModels.value = result.models
+      }
+    }
+  } finally {
+    refreshingUpstreamModels.value = false
+  }
+}
+
+// 生成作用域唯一键
+function getApiFormatsKey(formats: string[] | undefined): string {
+  if (!formats || formats.length === 0) return ''
+  return [...formats].sort().join(',')
+}
+
+// 提交表单
+async function handleSubmit() {
+  if (submitting.value) return
+  if (!formData.value.modelId || formData.value.aliases.length === 0) return
+
+  const validAliases = formData.value.aliases.filter(a => a.name.trim())
+  if (validAliases.length === 0) {
+    showError('请至少添加一个有效的映射名称', '错误')
+    return
+  }
+
+  submitting.value = true
+  try {
+    const targetModel = props.models.find(m => m.id === formData.value.modelId)
+    if (!targetModel) {
+      showError('模型不存在', '错误')
+      return
+    }
+
+    const currentAliases = targetModel.provider_model_mappings || []
+    let newAliases: ProviderModelAlias[]
+
+    const buildAlias = (a: FormAlias): ProviderModelAlias => ({
+      name: a.name.trim(),
+      priority: a.priority,
+      ...(formData.value.apiFormats.length > 0 ? { api_formats: formData.value.apiFormats } : {})
+    })
+
+    if (props.editingGroup) {
+      const oldApiFormatsKey = props.editingGroup.apiFormatsKey
+      const oldAliasNames = new Set(props.editingGroup.aliases.map(a => a.name))
+
+      const filteredAliases = currentAliases.filter((a: ProviderModelAlias) => {
+        const currentKey = getApiFormatsKey(a.api_formats)
+        return !(currentKey === oldApiFormatsKey && oldAliasNames.has(a.name))
+      })
+
+      const existingNames = new Set(filteredAliases.map((a: ProviderModelAlias) => a.name))
+      const duplicates = validAliases.filter(a => existingNames.has(a.name.trim()))
+      if (duplicates.length > 0) {
+        showError(`以下映射名称已存在：${duplicates.map(d => d.name).join(', ')}`, '错误')
+        return
+      }
+
+      newAliases = [
+        ...filteredAliases,
+        ...validAliases.map(buildAlias)
+      ]
+    } else {
+      const existingNames = new Set(currentAliases.map((a: ProviderModelAlias) => a.name))
+      const duplicates = validAliases.filter(a => existingNames.has(a.name.trim()))
+      if (duplicates.length > 0) {
+        showError(`以下映射名称已存在：${duplicates.map(d => d.name).join(', ')}`, '错误')
+        return
+      }
+      newAliases = [
+        ...currentAliases,
+        ...validAliases.map(buildAlias)
+      ]
+    }
+
+    await updateModel(props.providerId, targetModel.id, {
+      provider_model_mappings: newAliases
+    })
+
+    showSuccess(props.editingGroup ? '映射组已更新' : '映射已添加')
+    emit('update:open', false)
+    emit('saved')
+  } catch (err: any) {
+    showError(err.response?.data?.detail || '操作失败', '错误')
+  } finally {
+    submitting.value = false
+  }
+}
+</script>

frontend/src/features/providers/components/PriorityManagementDialog.vue

@@ -95,7 +95,7 @@
 
               <!-- 提供商信息 -->
               <div class="flex-1 min-w-0 flex items-center gap-2">
-                <span class="font-medium text-sm truncate">{{ provider.display_name }}</span>
+                <span class="font-medium text-sm truncate">{{ provider.name }}</span>
                 <Badge
                   v-if="!provider.is_active"
                   variant="secondary"
@@ -262,17 +262,17 @@
                       <div class="shrink-0 flex items-center gap-3">
                         <!-- 健康度 -->
                         <div
-                          v-if="key.success_rate !== null"
+                          v-if="key.health_score != null"
                           class="text-xs text-right"
                         >
                           <div
                             class="font-medium tabular-nums"
                             :class="[
-                              key.success_rate >= 0.95 ? 'text-green-600' :
-                              key.success_rate >= 0.8 ? 'text-yellow-600' : 'text-red-500'
+                              key.health_score >= 0.95 ? 'text-green-600' :
+                              key.health_score >= 0.5 ? 'text-yellow-600' : 'text-red-500'
                             ]"
                           >
-                            {{ (key.success_rate * 100).toFixed(0) }}%
+                            {{ ((key.health_score || 0) * 100).toFixed(0) }}%
                           </div>
                           <div class="text-[10px] text-muted-foreground opacity-70">
                             {{ key.request_count }} reqs
@@ -312,9 +312,55 @@
 
     <template #footer>
       <div class="flex items-center justify-between w-full">
+        <div class="flex items-center gap-4">
           <div class="text-xs text-muted-foreground">
             当前模式: <span class="font-medium">{{ activeMainTab === 'provider' ? '提供商优先' : 'Key 优先' }}</span>
           </div>
+          <div class="flex items-center gap-2 pl-4 border-l border-border">
+            <span class="text-xs text-muted-foreground">调度:</span>
+            <div class="flex gap-0.5 p-0.5 bg-muted/40 rounded-md">
+              <button
+                type="button"
+                class="px-2 py-1 text-xs font-medium rounded transition-all"
+                :class="[
+                  schedulingMode === 'cache_affinity'
+                    ? 'bg-primary text-primary-foreground shadow-sm'
+                    : 'text-muted-foreground hover:text-foreground hover:bg-muted/50'
+                ]"
+                title="优先使用已缓存的Provider，利用Prompt Cache"
+                @click="schedulingMode = 'cache_affinity'"
+              >
+                缓存亲和
+              </button>
+              <button
+                type="button"
+                class="px-2 py-1 text-xs font-medium rounded transition-all"
+                :class="[
+                  schedulingMode === 'load_balance'
+                    ? 'bg-primary text-primary-foreground shadow-sm'
+                    : 'text-muted-foreground hover:text-foreground hover:bg-muted/50'
+                ]"
+                title="同优先级内随机轮换，不考虑缓存"
+                @click="schedulingMode = 'load_balance'"
+              >
+                负载均衡
+              </button>
+              <button
+                type="button"
+                class="px-2 py-1 text-xs font-medium rounded transition-all"
+                :class="[
+                  schedulingMode === 'fixed_order'
+                    ? 'bg-primary text-primary-foreground shadow-sm'
+                    : 'text-muted-foreground hover:text-foreground hover:bg-muted/50'
+                ]"
+                title="严格按优先级顺序，不考虑缓存"
+                @click="schedulingMode = 'fixed_order'"
+              >
+                固定顺序
+              </button>
+            </div>
+          </div>
+        </div>
         <div class="flex gap-2">
           <Button
             size="sm"
@@ -349,7 +395,7 @@ import { Dialog } from '@/components/ui'
 import Button from '@/components/ui/button.vue'
 import Badge from '@/components/ui/badge.vue'
 import { useToast } from '@/composables/useToast'
-import { updateProvider, updateEndpointKey } from '@/api/endpoints'
+import { updateProvider, updateProviderKey } from '@/api/endpoints'
 import type { ProviderWithEndpointsSummary } from '@/api/endpoints'
 import { adminApi } from '@/api/admin'
 
@@ -367,6 +413,7 @@ interface KeyWithMeta {
   endpoint_base_url: string
   api_format: string
   capabilities: string[]
+  health_score: number | null
   success_rate: number | null
   avg_response_time_ms: number | null
   request_count: number
@@ -410,6 +457,9 @@ const saving = ref(false)
 // Key 优先级编辑状态
 const editingKeyPriority = ref<Record<string, string | null>>({})  // format -> keyId
 
+// 调度模式状态
+const schedulingMode = ref<'fixed_order' | 'load_balance' | 'cache_affinity'>('cache_affinity')
+
 // 可用的 API 格式
 const availableFormats = computed(() => {
   return Object.keys(keysByFormat.value).sort()
@@ -433,11 +483,22 @@ watch(internalOpen, async (open) => {
 // 加载当前的优先级模式配置
 async function loadCurrentPriorityMode() {
   try {
-    const response = await adminApi.getSystemConfig('provider_priority_mode')
-    const currentMode = response.value || 'provider'
+    const [priorityResponse, schedulingResponse] = await Promise.all([
+      adminApi.getSystemConfig('provider_priority_mode'),
+      adminApi.getSystemConfig('scheduling_mode')
+    ])
+    const currentMode = priorityResponse.value || 'provider'
     activeMainTab.value = currentMode === 'global_key' ? 'key' : 'provider'
+
+    const currentSchedulingMode = schedulingResponse.value || 'cache_affinity'
+    if (currentSchedulingMode === 'fixed_order' || currentSchedulingMode === 'load_balance' || currentSchedulingMode === 'cache_affinity') {
+      schedulingMode.value = currentSchedulingMode
+    } else {
+      schedulingMode.value = 'cache_affinity'
+    }
   } catch {
     activeMainTab.value = 'provider'
+    schedulingMode.value = 'cache_affinity'
   }
 }
 
@@ -611,11 +672,19 @@ async function save() {
 
     const newMode = activeMainTab.value === 'key' ? 'global_key' : 'provider'
 
-    await adminApi.updateSystemConfig(
+    // 保存优先级模式和调度模式
+    await Promise.all([
+      adminApi.updateSystemConfig(
         'provider_priority_mode',
         newMode,
         'Provider/Key 优先级策略：provider(提供商优先模式) 或 global_key(全局Key优先模式)'
+      ),
+      adminApi.updateSystemConfig(
+        'scheduling_mode',
+        schedulingMode.value,
+        '调度模式：fixed_order(固定顺序模式) 或 cache_affinity(缓存亲和模式)'
       )
+    ])
 
     const providerUpdates = sortedProviders.value.map((provider, index) =>
       updateProvider(provider.id, { provider_priority: index + 1 })
@@ -627,7 +696,7 @@ async function save() {
       const keys = keysByFormat.value[format]
       keys.forEach((key) => {
         // 使用用户设置的 priority 值，相同 priority 会做负载均衡
-        keyUpdates.push(updateEndpointKey(key.id, { global_priority: key.priority }))
+        keyUpdates.push(updateProviderKey(key.id, { global_priority: key.priority }))
       })
     }
 

frontend/src/features/providers/components/ProviderFormDialog.vue

@@ -4,47 +4,29 @@
     :title="isEditMode ? '编辑提供商' : '添加提供商'"
     :description="isEditMode ? '更新提供商配置。API 端点和密钥需在详情页面单独管理。' : '创建新的提供商配置。创建后可以为其添加 API 端点和密钥。'"
     :icon="isEditMode ? SquarePen : Server"
-    size="2xl"
+    size="xl"
     @update:model-value="handleDialogUpdate"
   >
     <form
-      class="space-y-6"
+      class="space-y-5"
       @submit.prevent="handleSubmit"
     >
       <!-- 基本信息 -->
-      <div class="space-y-4">
+      <div class="space-y-3">
         <h3 class="text-sm font-medium border-b pb-2">
           基本信息
         </h3>
 
-        <!-- 添加模式显示提供商标识 -->
-        <div
-          v-if="!isEditMode"
-          class="space-y-2"
-        >
-          <Label for="name">提供商标识 *</Label>
+        <div class="grid grid-cols-2 gap-4">
+          <div class="space-y-1.5">
+            <Label for="name">名称 *</Label>
             <Input
               id="name"
               v-model="form.name"
-            placeholder="例如: openai-primary"
-            required
-          />
-          <p class="text-xs text-muted-foreground">
-            唯一ID，创建后不可修改
-          </p>
-        </div>
-
-        <div class="grid grid-cols-2 gap-4">
-          <div class="space-y-2">
-            <Label for="display_name">显示名称 *</Label>
-            <Input
-              id="display_name"
-              v-model="form.display_name"
               placeholder="例如: OpenAI 主账号"
-              required
             />
           </div>
-          <div class="space-y-2">
+          <div class="space-y-1.5">
             <Label for="website">主站链接</Label>
             <Input
               id="website"
@@ -55,24 +37,28 @@
           </div>
         </div>
 
-        <div class="space-y-2">
+        <div class="space-y-1.5">
           <Label for="description">描述</Label>
-          <Textarea
+          <Input
             id="description"
             v-model="form.description"
             placeholder="提供商描述（可选）"
-            rows="2"
           />
         </div>
       </div>
 
-      <!-- 计费与限流 -->
-      <div class="space-y-4">
+      <!-- 计费与限流 / 请求配置 -->
+      <div class="space-y-3">
+        <div class="grid grid-cols-2 gap-4">
           <h3 class="text-sm font-medium border-b pb-2">
             计费与限流
           </h3>
+          <h3 class="text-sm font-medium border-b pb-2">
+            请求配置
+          </h3>
+        </div>
         <div class="grid grid-cols-2 gap-4">
-          <div class="space-y-2">
+          <div class="space-y-1.5">
             <Label>计费类型</Label>
             <Select
               v-model="form.billing_type"
@@ -82,81 +68,131 @@
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                <SelectItem value="monthly_quota">
-                  月卡额度
-                </SelectItem>
-                <SelectItem value="pay_as_you_go">
-                  按量付费
-                </SelectItem>
-                <SelectItem value="free_tier">
-                  免费套餐
-                </SelectItem>
+                <SelectItem value="monthly_quota">月卡额度</SelectItem>
+                <SelectItem value="pay_as_you_go">按量付费</SelectItem>
+                <SelectItem value="free_tier">免费套餐</SelectItem>
               </SelectContent>
             </Select>
           </div>
-          <div class="space-y-2">
-            <Label>RPM 限制</Label>
+          <div class="grid grid-cols-2 gap-4">
+            <div class="space-y-1.5">
+              <Label>超时时间 (秒)</Label>
               <Input
-              :model-value="form.rpm_limit ?? ''"
+                :model-value="form.timeout ?? ''"
+                type="number"
+                min="1"
+                max="600"
+                placeholder="默认 300"
+                @update:model-value="(v) => form.timeout = parseNumberInput(v)"
+              />
+            </div>
+            <div class="space-y-1.5">
+              <Label>最大重试次数</Label>
+              <Input
+                :model-value="form.max_retries ?? ''"
                 type="number"
                 min="0"
-              placeholder="不限制请留空"
-              @update:model-value="(v) => form.rpm_limit = parseNumberInput(v)"
+                max="10"
+                placeholder="默认 2"
+                @update:model-value="(v) => form.max_retries = parseNumberInput(v)"
               />
             </div>
           </div>
+        </div>
 
         <!-- 月卡配置 -->
         <div
           v-if="form.billing_type === 'monthly_quota'"
           class="grid grid-cols-2 gap-4 p-3 border rounded-lg bg-muted/50"
         >
-          <div class="space-y-2">
+          <div class="space-y-1.5">
             <Label class="text-xs">周期额度 (USD)</Label>
             <Input
               :model-value="form.monthly_quota_usd ?? ''"
               type="number"
               step="0.01"
               min="0"
-              class="h-9"
               @update:model-value="(v) => form.monthly_quota_usd = parseNumberInput(v, { allowFloat: true })"
             />
           </div>
-          <div class="space-y-2">
+          <div class="space-y-1.5">
             <Label class="text-xs">重置周期 (天)</Label>
             <Input
               :model-value="form.quota_reset_day ?? ''"
               type="number"
               min="1"
               max="365"
-              class="h-9"
               @update:model-value="(v) => form.quota_reset_day = parseNumberInput(v) ?? 30"
             />
           </div>
-          <div class="space-y-2">
+          <div class="space-y-1.5">
             <Label class="text-xs">
-              周期开始时间
-              <span class="text-red-500">*</span>
+              周期开始时间 <span class="text-red-500">*</span>
             </Label>
             <Input
               v-model="form.quota_last_reset_at"
               type="datetime-local"
-              class="h-9"
             />
-            <p class="text-xs text-muted-foreground">
-              系统会自动统计从该时间点开始的使用量
-            </p>
           </div>
-          <div class="space-y-2">
+          <div class="space-y-1.5">
             <Label class="text-xs">过期时间</Label>
             <Input
               v-model="form.quota_expires_at"
               type="datetime-local"
-              class="h-9"
             />
-            <p class="text-xs text-muted-foreground">
-              留空表示永久有效
-            </p>
+          </div>
+        </div>
+      </div>
+
+      <!-- 代理配置 -->
+      <div class="space-y-3">
+        <div class="flex items-center justify-between">
+          <h3 class="text-sm font-medium">
+            代理配置
+          </h3>
+          <div class="flex items-center gap-2">
+            <Switch
+              :model-value="form.proxy_enabled"
+              @update:model-value="(v: boolean) => form.proxy_enabled = v"
+            />
+            <span class="text-sm text-muted-foreground">启用代理</span>
+          </div>
+        </div>
+        <div
+          v-if="form.proxy_enabled"
+          class="grid grid-cols-2 gap-4 p-3 border rounded-lg bg-muted/50"
+        >
+          <div class="space-y-1.5">
+            <Label class="text-xs">代理地址 *</Label>
+            <Input
+              v-model="form.proxy_url"
+              placeholder="http://proxy:port 或 socks5://proxy:port"
+            />
+          </div>
+          <div class="grid grid-cols-2 gap-3">
+            <div class="space-y-1.5">
+              <Label class="text-xs">用户名</Label>
+              <Input
+                v-model="form.proxy_username"
+                placeholder="可选"
+                autocomplete="off"
+                data-form-type="other"
+                data-lpignore="true"
+                data-1p-ignore="true"
+              />
+            </div>
+            <div class="space-y-1.5">
+              <Label class="text-xs">密码</Label>
+              <Input
+                v-model="form.proxy_password"
+                type="password"
+                placeholder="可选"
+                autocomplete="new-password"
+                data-form-type="other"
+                data-lpignore="true"
+                data-1p-ignore="true"
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -172,7 +208,7 @@
         取消
       </Button>
       <Button
-        :disabled="loading || !form.display_name || (!isEditMode && !form.name)"
+        :disabled="loading || !form.name"
         @click="handleSubmit"
       >
         {{ loading ? (isEditMode ? '保存中...' : '创建中...') : (isEditMode ? '保存' : '创建') }}
@@ -187,13 +223,13 @@ import {
   Dialog,
   Button,
   Input,
-  Textarea,
   Label,
   Select,
   SelectTrigger,
   SelectValue,
   SelectContent,
   SelectItem,
+  Switch,
 } from '@/components/ui'
 import { Server, SquarePen } from 'lucide-vue-next'
 import { useToast } from '@/composables/useToast'
@@ -223,7 +259,6 @@ const internalOpen = computed(() => props.modelValue)
 // 表单数据
 const form = ref({
   name: '',
-  display_name: '',
   description: '',
   website: '',
   // 计费配置
@@ -232,19 +267,25 @@ const form = ref({
   quota_reset_day: 30,
   quota_last_reset_at: '',  // 周期开始时间
   quota_expires_at: '',
-  rpm_limit: undefined as string | number | undefined,
   provider_priority: 999,
   // 状态配置
   is_active: true,
   rate_limit: undefined as number | undefined,
   concurrent_limit: undefined as number | undefined,
+  // 请求配置
+  timeout: undefined as number | undefined,
+  max_retries: undefined as number | undefined,
+  // 代理配置（扁平化便于表单绑定）
+  proxy_enabled: false,
+  proxy_url: '',
+  proxy_username: '',
+  proxy_password: '',
 })
 
 // 重置表单
 function resetForm() {
   form.value = {
     name: '',
-    display_name: '',
     description: '',
     website: '',
     billing_type: 'pay_as_you_go',
@@ -252,11 +293,18 @@ function resetForm() {
     quota_reset_day: 30,
     quota_last_reset_at: '',
     quota_expires_at: '',
-    rpm_limit: undefined,
     provider_priority: 999,
     is_active: true,
     rate_limit: undefined,
     concurrent_limit: undefined,
+    // 请求配置
+    timeout: undefined,
+    max_retries: undefined,
+    // 代理配置
+    proxy_enabled: false,
+    proxy_url: '',
+    proxy_username: '',
+    proxy_password: '',
   }
 }
 
@@ -264,9 +312,9 @@ function resetForm() {
 function loadProviderData() {
   if (!props.provider) return
 
+  const proxy = props.provider.proxy
   form.value = {
     name: props.provider.name,
-    display_name: props.provider.display_name,
     description: props.provider.description || '',
     website: props.provider.website || '',
     billing_type: (props.provider.billing_type as 'monthly_quota' | 'pay_as_you_go' | 'free_tier') || 'pay_as_you_go',
@@ -276,11 +324,18 @@ function loadProviderData() {
       new Date(props.provider.quota_last_reset_at).toISOString().slice(0, 16) : '',
     quota_expires_at: props.provider.quota_expires_at ?
       new Date(props.provider.quota_expires_at).toISOString().slice(0, 16) : '',
-    rpm_limit: props.provider.rpm_limit ?? undefined,
     provider_priority: props.provider.provider_priority || 999,
     is_active: props.provider.is_active,
     rate_limit: undefined,
     concurrent_limit: undefined,
+    // 请求配置
+    timeout: props.provider.timeout ?? undefined,
+    max_retries: props.provider.max_retries ?? undefined,
+    // 代理配置
+    proxy_enabled: proxy?.enabled ?? false,
+    proxy_url: proxy?.url || '',
+    proxy_username: proxy?.username || '',
+    proxy_password: proxy?.password || '',
   }
 }
 
@@ -302,17 +357,37 @@ const handleSubmit = async () => {
     return
   }
 
+  // 启用代理时必须填写代理地址
+  if (form.value.proxy_enabled && !form.value.proxy_url) {
+    showError('启用代理时必须填写代理地址', '验证失败')
+    return
+  }
+
   loading.value = true
   try {
+    // 构建代理配置
+    const proxy = form.value.proxy_enabled ? {
+      url: form.value.proxy_url,
+      username: form.value.proxy_username || undefined,
+      password: form.value.proxy_password || undefined,
+      enabled: true,
+    } : null
+
     const payload = {
-      ...form.value,
-      rpm_limit:
-        form.value.rpm_limit === undefined || form.value.rpm_limit === ''
-          ? null
-          : Number(form.value.rpm_limit),
-      // 空字符串时不发送
+      name: form.value.name,
+      description: form.value.description || undefined,
+      website: form.value.website || undefined,
+      billing_type: form.value.billing_type,
+      monthly_quota_usd: form.value.monthly_quota_usd,
+      quota_reset_day: form.value.quota_reset_day,
       quota_last_reset_at: form.value.quota_last_reset_at || undefined,
       quota_expires_at: form.value.quota_expires_at || undefined,
+      provider_priority: form.value.provider_priority,
+      is_active: form.value.is_active,
+      // 请求配置
+      timeout: form.value.timeout ?? undefined,
+      max_retries: form.value.max_retries ?? undefined,
+      proxy,
     }
 
     if (isEditMode.value && props.provider) {

frontend/src/features/providers/components/index.ts

@@ -2,11 +2,13 @@ export { default as ProviderFormDialog } from './ProviderFormDialog.vue'
 export { default as EndpointFormDialog } from './EndpointFormDialog.vue'
 export { default as KeyFormDialog } from './KeyFormDialog.vue'
 export { default as KeyAllowedModelsDialog } from './KeyAllowedModelsDialog.vue'
+export { default as KeyAllowedModelsEditDialog } from './KeyAllowedModelsEditDialog.vue'
 export { default as PriorityManagementDialog } from './PriorityManagementDialog.vue'
 export { default as ProviderModelFormDialog } from './ProviderModelFormDialog.vue'
 export { default as ProviderDetailDrawer } from './ProviderDetailDrawer.vue'
 export { default as EndpointHealthTimeline } from './EndpointHealthTimeline.vue'
 export { default as BatchAssignModelsDialog } from './BatchAssignModelsDialog.vue'
+export { default as ModelAliasDialog } from './ModelAliasDialog.vue'
 
-export { default as MappingsTab } from './provider-tabs/MappingsTab.vue'
 export { default as ModelsTab } from './provider-tabs/ModelsTab.vue'
+export { default as ModelAliasesTab } from './provider-tabs/ModelAliasesTab.vue'

frontend/src/features/providers/components/provider-tabs/MappingsTab.vue

@@ -1,310 +0,0 @@
-<template>
-  <Card class="overflow-hidden">
-    <!-- 标题头部 -->
-    <div class="p-4 border-b border-border/60">
-      <div class="flex items-center justify-between">
-        <div class="flex items-center gap-2">
-          <h3 class="text-sm font-semibold leading-none">
-            别名与映射管理
-          </h3>
-        </div>
-        <Button
-          v-if="!hideAddButton"
-          variant="outline"
-          size="sm"
-          class="h-8"
-          @click="openCreateDialog"
-        >
-          <Plus class="w-3.5 h-3.5 mr-1.5" />
-          创建别名/映射
-        </Button>
-      </div>
-    </div>
-
-    <!-- 加载状态 -->
-    <div
-      v-if="loading"
-      class="flex items-center justify-center py-12"
-    >
-      <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-primary" />
-    </div>
-
-    <!-- 别名列表 -->
-    <div
-      v-else-if="mappings.length > 0"
-      class="overflow-x-auto"
-    >
-      <table class="w-full text-sm">
-        <thead class="bg-muted/50 text-xs uppercase tracking-wide text-muted-foreground">
-          <tr>
-            <th class="text-left px-4 py-3 font-semibold">
-              名称
-            </th>
-            <th class="text-left px-4 py-3 font-semibold w-24">
-              类型
-            </th>
-            <th class="text-left px-4 py-3 font-semibold">
-              指向模型
-            </th>
-            <th
-              v-if="!hideAddButton"
-              class="px-4 py-3 font-semibold w-28 text-center"
-            >
-              操作
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr
-            v-for="mapping in mappings"
-            :key="mapping.id"
-            class="border-b border-border/40 last:border-b-0 hover:bg-muted/30 transition-colors"
-          >
-            <td class="px-4 py-3">
-              <div class="flex items-center gap-2">
-                <!-- 状态指示灯 -->
-                <span
-                  class="w-2 h-2 rounded-full shrink-0"
-                  :class="mapping.is_active ? 'bg-green-500' : 'bg-gray-300'"
-                  :title="mapping.is_active ? '活跃' : '停用'"
-                />
-                <span class="font-mono">{{ mapping.alias }}</span>
-              </div>
-            </td>
-            <td class="px-4 py-3">
-              <Badge
-                variant="secondary"
-                class="text-xs"
-              >
-                {{ mapping.mapping_type === 'mapping' ? '映射' : '别名' }}
-              </Badge>
-            </td>
-            <td class="px-4 py-3">
-              {{ mapping.global_model_display_name || mapping.global_model_name }}
-            </td>
-            <td
-              v-if="!hideAddButton"
-              class="px-4 py-3"
-            >
-              <div class="flex justify-center gap-1.5">
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  class="h-8 w-8"
-                  title="编辑"
-                  @click="openEditDialog(mapping)"
-                >
-                  <Edit class="w-3.5 h-3.5" />
-                </Button>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  class="h-8 w-8"
-                  :disabled="togglingId === mapping.id"
-                  :title="mapping.is_active ? '点击停用' : '点击启用'"
-                  @click="toggleActive(mapping)"
-                >
-                  <Power class="w-3.5 h-3.5" />
-                </Button>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  class="h-8 w-8 text-destructive hover:text-destructive"
-                  title="删除"
-                  @click="confirmDelete(mapping)"
-                >
-                  <Trash2 class="w-3.5 h-3.5" />
-                </Button>
-              </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <!-- 空状态 -->
-    <div
-      v-else
-      class="p-8 text-center text-muted-foreground"
-    >
-      <ArrowLeftRight class="w-12 h-12 mx-auto mb-3 opacity-50" />
-      <p class="text-sm">
-        暂无特定别名/映射
-      </p>
-      <p class="text-xs mt-1">
-        点击上方按钮添加
-      </p>
-    </div>
-  </Card>
-
-  <!-- 使用共享的 AliasDialog 组件 -->
-  <AliasDialog
-    :open="dialogOpen"
-    :editing-alias="editingAlias"
-    :global-models="availableModels"
-    :fixed-provider="fixedProviderOption"
-    :show-provider-select="true"
-    @update:open="handleDialogVisibility"
-    @submit="handleAliasSubmit"
-  />
-</template>
-
-<script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
-import { ArrowLeftRight, Plus, Edit, Trash2, Power } from 'lucide-vue-next'
-import Card from '@/components/ui/card.vue'
-import Badge from '@/components/ui/badge.vue'
-import Button from '@/components/ui/button.vue'
-import AliasDialog from '@/features/models/components/AliasDialog.vue'
-import { useToast } from '@/composables/useToast'
-import {
-  getAliases,
-  createAlias,
-  updateAlias,
-  deleteAlias,
-  type ModelAlias,
-  type CreateModelAliasRequest,
-  type UpdateModelAliasRequest,
-} from '@/api/endpoints/aliases'
-import { listGlobalModels, type GlobalModelResponse } from '@/api/global-models'
-
-const props = withDefaults(defineProps<{
-  provider: any
-  hideAddButton?: boolean
-}>(), {
-  hideAddButton: false
-})
-
-const emit = defineEmits<{
-  refresh: []
-}>()
-
-const { success, error: showError } = useToast()
-
-// 状态
-const loading = ref(false)
-const submitting = ref(false)
-const togglingId = ref<string | null>(null)
-const mappings = ref<ModelAlias[]>([])
-const availableModels = ref<GlobalModelResponse[]>([])
-const dialogOpen = ref(false)
-const editingAlias = ref<ModelAlias | null>(null)
-
-// 固定的 Provider 选项（传递给 AliasDialog）
-const fixedProviderOption = computed(() => ({
-  id: props.provider.id,
-  name: props.provider.name,
-  display_name: props.provider.display_name
-}))
-
-// 加载映射 (实际返回的是该 Provider 的别名列表)
-async function loadMappings() {
-  try {
-    loading.value = true
-    mappings.value = await getAliases({ provider_id: props.provider.id })
-  } catch (err: any) {
-    showError(err.response?.data?.detail || '加载失败', '错误')
-  } finally {
-    loading.value = false
-  }
-}
-
-// 加载可用的 GlobalModel 列表
-async function loadAvailableModels() {
-  try {
-    const response = await listGlobalModels({ limit: 1000, is_active: true })
-    availableModels.value = response.models || []
-  } catch (err: any) {
-    showError(err.response?.data?.detail || '加载模型列表失败', '错误')
-  }
-}
-
-// 打开创建对话框
-function openCreateDialog() {
-  editingAlias.value = null
-  dialogOpen.value = true
-}
-
-// 打开编辑对话框
-function openEditDialog(alias: ModelAlias) {
-  editingAlias.value = alias
-  dialogOpen.value = true
-}
-
-// 处理对话框可见性变化
-function handleDialogVisibility(value: boolean) {
-  dialogOpen.value = value
-  if (!value) {
-    editingAlias.value = null
-  }
-}
-
-// 处理别名提交（来自 AliasDialog 组件）
-async function handleAliasSubmit(data: CreateModelAliasRequest | UpdateModelAliasRequest, isEdit: boolean) {
-  submitting.value = true
-  try {
-    if (isEdit && editingAlias.value) {
-      // 更新
-      await updateAlias(editingAlias.value.id, data as UpdateModelAliasRequest)
-      success(data.mapping_type === 'mapping' ? '映射已更新' : '别名已更新')
-    } else {
-      // 创建 - 确保 provider_id 设置为当前 Provider
-      const createData = data as CreateModelAliasRequest
-      createData.provider_id = props.provider.id
-      await createAlias(createData)
-      success(data.mapping_type === 'mapping' ? '映射已创建' : '别名已创建')
-    }
-    dialogOpen.value = false
-    editingAlias.value = null
-    await loadMappings()
-    emit('refresh')
-  } catch (err: any) {
-    const detail = err.response?.data?.detail || err.message
-    let errorMessage = detail
-    if (detail === '映射已存在') {
-      errorMessage = '该名称已存在，请使用其他名称'
-    }
-    showError(errorMessage, isEdit ? '更新失败' : '创建失败')
-  } finally {
-    submitting.value = false
-  }
-}
-
-// 切换启用状态
-async function toggleActive(alias: ModelAlias) {
-  if (togglingId.value) return
-
-  togglingId.value = alias.id
-  try {
-    const newStatus = !alias.is_active
-    await updateAlias(alias.id, { is_active: newStatus })
-    alias.is_active = newStatus
-  } catch (err: any) {
-    showError(err.response?.data?.detail || '操作失败', '错误')
-  } finally {
-    togglingId.value = null
-  }
-}
-
-// 确认删除
-async function confirmDelete(alias: ModelAlias) {
-  const typeName = alias.mapping_type === 'mapping' ? '映射' : '别名'
-  if (!confirm(`确定要删除${typeName} "${alias.alias}" 吗？`)) {
-    return
-  }
-
-  try {
-    await deleteAlias(alias.id)
-    success(`${typeName}已删除`)
-    await loadMappings()
-    emit('refresh')
-  } catch (err: any) {
-    showError(err.response?.data?.detail || err.message, '删除失败')
-  }
-}
-
-onMounted(() => {
-  loadMappings()
-  loadAvailableModels()
-})
-</script>

frontend/src/features/providers/components/provider-tabs/ModelAliasesTab.vue

@@ -0,0 +1,435 @@
+<template>
+  <Card class="overflow-hidden">
+    <!-- 标题头部 -->
+    <div class="p-4 border-b border-border/60">
+      <div class="flex items-center justify-between">
+        <h3 class="text-sm font-semibold flex items-center gap-2">
+          模型名称映射
+        </h3>
+        <Button
+          variant="outline"
+          size="sm"
+          class="h-8"
+          @click="openAddDialog"
+        >
+          <Plus class="w-3.5 h-3.5 mr-1.5" />
+          添加映射
+        </Button>
+      </div>
+    </div>
+
+    <!-- 加载状态 -->
+    <div
+      v-if="loading"
+      class="flex items-center justify-center py-12"
+    >
+      <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-primary" />
+    </div>
+
+    <!-- 分组映射列表 -->
+    <div
+      v-else-if="aliasGroups.length > 0"
+      class="divide-y divide-border/40"
+    >
+      <div
+        v-for="group in aliasGroups"
+        :key="`${group.model.id}-${group.apiFormatsKey}`"
+        class="transition-colors"
+      >
+        <!-- 分组头部（可点击展开） -->
+        <div
+          class="flex items-center justify-between px-4 py-3 hover:bg-muted/20 cursor-pointer"
+          @click="toggleAliasGroupExpand(`${group.model.id}-${group.apiFormatsKey}`)"
+        >
+          <div class="flex items-center gap-2 flex-1 min-w-0">
+            <!-- 展开/收起图标 -->
+            <ChevronRight
+              class="w-4 h-4 text-muted-foreground shrink-0 transition-transform"
+              :class="{ 'rotate-90': expandedAliasGroups.has(`${group.model.id}-${group.apiFormatsKey}`) }"
+            />
+            <!-- 模型名称 -->
+            <span class="font-semibold text-sm truncate">
+              {{ group.model.global_model_display_name || group.model.provider_model_name }}
+            </span>
+            <!-- 作用域标签 -->
+            <div class="flex items-center gap-1 shrink-0">
+              <Badge
+                v-if="group.apiFormats.length === 0"
+                variant="outline"
+                class="text-xs"
+              >
+                全部
+              </Badge>
+              <Badge
+                v-for="format in group.apiFormats"
+                v-else
+                :key="format"
+                variant="outline"
+                class="text-xs"
+              >
+                {{ API_FORMAT_LABELS[format] || format }}
+              </Badge>
+            </div>
+            <!-- 映射数量 -->
+            <span class="text-xs text-muted-foreground shrink-0">
+              ({{ group.aliases.length }} 个映射)
+            </span>
+          </div>
+          <!-- 操作按钮 -->
+          <div
+            class="flex items-center gap-1.5 ml-4 shrink-0"
+            @click.stop
+          >
+            <Button
+              variant="ghost"
+              size="icon"
+              class="h-8 w-8"
+              title="编辑映射组"
+              @click="editGroup(group)"
+            >
+              <Edit class="w-3.5 h-3.5" />
+            </Button>
+            <Button
+              variant="ghost"
+              size="icon"
+              class="h-8 w-8 text-destructive hover:text-destructive"
+              title="删除映射组"
+              @click="deleteGroup(group)"
+            >
+              <Trash2 class="w-3.5 h-3.5" />
+            </Button>
+          </div>
+        </div>
+
+        <!-- 展开的映射列表 -->
+        <div
+          v-show="expandedAliasGroups.has(`${group.model.id}-${group.apiFormatsKey}`)"
+          class="bg-muted/30 border-t border-border/30"
+        >
+          <div class="px-4 py-2 space-y-1">
+            <div
+              v-for="mapping in group.aliases"
+              :key="mapping.name"
+              class="flex items-center justify-between gap-2 py-1"
+            >
+              <div class="flex items-center gap-2 flex-1 min-w-0">
+                <!-- 优先级标签 -->
+                <span class="inline-flex items-center justify-center w-5 h-5 rounded bg-background border text-xs font-medium shrink-0">
+                  {{ mapping.priority }}
+                </span>
+                <!-- 映射名称 -->
+                <span class="font-mono text-sm truncate">
+                  {{ mapping.name }}
+                </span>
+              </div>
+              <!-- 测试按钮 -->
+              <Button
+                variant="ghost"
+                size="icon"
+                class="h-7 w-7 shrink-0"
+                title="测试映射"
+                :disabled="testingMapping === `${group.model.id}-${group.apiFormatsKey}-${mapping.name}`"
+                @click="testMapping(group, mapping)"
+              >
+                <Loader2
+                  v-if="testingMapping === `${group.model.id}-${group.apiFormatsKey}-${mapping.name}`"
+                  class="w-3 h-3 animate-spin"
+                />
+                <Play
+                  v-else
+                  class="w-3 h-3"
+                />
+              </Button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 空状态 -->
+    <div
+      v-else
+      class="p-8 text-center text-muted-foreground"
+    >
+      <Tag class="w-12 h-12 mx-auto mb-3 opacity-50" />
+      <p class="text-sm">
+        暂无模型映射
+      </p>
+      <p class="text-xs mt-1">
+        点击上方"添加映射"按钮为模型创建名称映射
+      </p>
+    </div>
+  </Card>
+
+  <!-- 添加/编辑映射对话框 -->
+  <ModelMappingDialog
+    v-model:open="dialogOpen"
+    :provider-id="provider.id"
+    :provider-api-formats="providerApiFormats"
+    :models="models"
+    :editing-group="editingGroup"
+    :preselected-model-id="preselectedModelId"
+    @saved="onDialogSaved"
+  />
+
+  <!-- 删除确认对话框 -->
+  <AlertDialog
+    v-model="deleteConfirmOpen"
+    title="删除映射组"
+    :description="deleteConfirmDescription"
+    confirm-text="删除"
+    cancel-text="取消"
+    type="danger"
+    @confirm="confirmDelete"
+    @cancel="deleteConfirmOpen = false"
+  />
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted, watch } from 'vue'
+import { Tag, Plus, Edit, Trash2, ChevronRight, Loader2, Play } from 'lucide-vue-next'
+import { Card, Button, Badge } from '@/components/ui'
+import AlertDialog from '@/components/common/AlertDialog.vue'
+import ModelMappingDialog, { type AliasGroup } from '../ModelMappingDialog.vue'
+import { useToast } from '@/composables/useToast'
+import {
+  getProviderModels,
+  testModel,
+  API_FORMAT_LABELS,
+  type Model,
+  type ProviderModelAlias
+} from '@/api/endpoints'
+import { updateModel } from '@/api/endpoints/models'
+import { parseTestModelError } from '@/utils/errorParser'
+
+const props = defineProps<{
+  provider: any
+}>()
+
+const emit = defineEmits<{
+  'refresh': []
+}>()
+
+const { error: showError, success: showSuccess } = useToast()
+
+// 状态
+const loading = ref(false)
+const models = ref<Model[]>([])
+const dialogOpen = ref(false)
+const deleteConfirmOpen = ref(false)
+const editingGroup = ref<AliasGroup | null>(null)
+const deletingGroup = ref<AliasGroup | null>(null)
+const testingMapping = ref<string | null>(null)
+const preselectedModelId = ref<string | null>(null)
+
+// 列表展开状态
+const expandedAliasGroups = ref<Set<string>>(new Set())
+
+// 获取 Provider 支持的 API 格式
+const providerApiFormats = computed(() => {
+  const formats = props.provider?.api_formats
+  if (Array.isArray(formats) && formats.length > 0) {
+    const order = Object.keys(API_FORMAT_LABELS)
+    return [...formats].sort((a, b) => order.indexOf(a) - order.indexOf(b))
+  }
+  return []
+})
+
+// 生成作用域唯一键
+function getApiFormatsKey(formats: string[] | undefined): string {
+  if (!formats || formats.length === 0) return ''
+  return [...formats].sort().join(',')
+}
+
+// 按"模型+作用域"分组的映射列表
+const aliasGroups = computed<AliasGroup[]>(() => {
+  const groups: AliasGroup[] = []
+  const groupMap = new Map<string, AliasGroup>()
+
+  for (const model of models.value) {
+    if (!model.provider_model_mappings || !Array.isArray(model.provider_model_mappings)) continue
+
+    for (const alias of model.provider_model_mappings) {
+      const apiFormatsKey = getApiFormatsKey(alias.api_formats)
+      const groupKey = `${model.id}|${apiFormatsKey}`
+
+      if (!groupMap.has(groupKey)) {
+        const group: AliasGroup = {
+          model,
+          apiFormatsKey,
+          apiFormats: alias.api_formats || [],
+          aliases: []
+        }
+        groupMap.set(groupKey, group)
+        groups.push(group)
+      }
+      groupMap.get(groupKey)!.aliases.push(alias)
+    }
+  }
+
+  for (const group of groups) {
+    group.aliases.sort((a, b) => a.priority - b.priority)
+  }
+
+  return groups.sort((a, b) => {
+    const nameA = (a.model.global_model_display_name || a.model.provider_model_name || '').toLowerCase()
+    const nameB = (b.model.global_model_display_name || b.model.provider_model_name || '').toLowerCase()
+    if (nameA !== nameB) return nameA.localeCompare(nameB)
+    return a.apiFormatsKey.localeCompare(b.apiFormatsKey)
+  })
+})
+
+// 加载模型
+async function loadModels() {
+  try {
+    loading.value = true
+    models.value = await getProviderModels(props.provider.id)
+  } catch (err: any) {
+    showError(err.response?.data?.detail || '加载失败', '错误')
+  } finally {
+    loading.value = false
+  }
+}
+
+// 删除确认描述
+const deleteConfirmDescription = computed(() => {
+  if (!deletingGroup.value) return ''
+  const { model, aliases, apiFormats } = deletingGroup.value
+  const modelName = model.global_model_display_name || model.provider_model_name
+  const scopeText = apiFormats.length === 0 ? '全部' : apiFormats.map(f => API_FORMAT_LABELS[f] || f).join(', ')
+  const aliasNames = aliases.map(a => a.name).join(', ')
+  return `确定要删除模型「${modelName}」在作用域「${scopeText}」下的 ${aliases.length} 个映射吗？\n\n映射名称：${aliasNames}`
+})
+
+// 切换映射组展开状态
+function toggleAliasGroupExpand(groupKey: string) {
+  if (expandedAliasGroups.value.has(groupKey)) {
+    expandedAliasGroups.value.delete(groupKey)
+  } else {
+    expandedAliasGroups.value.add(groupKey)
+  }
+}
+
+// 打开添加对话框
+function openAddDialog() {
+  editingGroup.value = null
+  preselectedModelId.value = null
+  dialogOpen.value = true
+}
+
+// 打开添加对话框并预选模型（供外部调用）
+function openAddDialogForModel(modelId: string) {
+  editingGroup.value = null
+  preselectedModelId.value = modelId
+  dialogOpen.value = true
+}
+
+// 编辑分组
+function editGroup(group: AliasGroup) {
+  editingGroup.value = group
+  preselectedModelId.value = null
+  dialogOpen.value = true
+}
+
+// 删除分组
+function deleteGroup(group: AliasGroup) {
+  deletingGroup.value = group
+  deleteConfirmOpen.value = true
+}
+
+// 确认删除
+async function confirmDelete() {
+  if (!deletingGroup.value) return
+
+  const { model, aliases, apiFormatsKey } = deletingGroup.value
+
+  try {
+    const currentAliases = model.provider_model_mappings || []
+    const aliasNamesToRemove = new Set(aliases.map(a => a.name))
+    const newAliases = currentAliases.filter((a: ProviderModelAlias) => {
+      const currentKey = getApiFormatsKey(a.api_formats)
+      return !(currentKey === apiFormatsKey && aliasNamesToRemove.has(a.name))
+    })
+
+    await updateModel(props.provider.id, model.id, {
+      provider_model_mappings: newAliases.length > 0 ? newAliases : null
+    })
+
+    showSuccess('映射组已删除')
+    deleteConfirmOpen.value = false
+    deletingGroup.value = null
+    await loadModels()
+    emit('refresh')
+  } catch (err: any) {
+    showError(err.response?.data?.detail || '删除失败', '错误')
+  }
+}
+
+// 对话框保存后回调
+async function onDialogSaved() {
+  await loadModels()
+  emit('refresh')
+}
+
+// 测试模型映射
+async function testMapping(group: any, mapping: any) {
+  const testingKey = `${group.model.id}-${group.apiFormatsKey}-${mapping.name}`
+  testingMapping.value = testingKey
+
+  try {
+    // 根据分组的 API 格式来确定应该使用的格式
+    let apiFormat = null
+    if (group.apiFormats.length === 1) {
+      apiFormat = group.apiFormats[0]
+    } else if (group.apiFormats.length === 0) {
+      // 如果没有指定格式，但分组显示为"全部"，则使用模型的默认格式
+      apiFormat = group.model.effective_api_format || group.model.api_format
+    }
+
+    const result = await testModel({
+      provider_id: props.provider.id,
+      model_name: mapping.name,  // 使用映射名称进行测试
+      message: "hello",
+      api_format: apiFormat
+    })
+
+    if (result.success) {
+      showSuccess(`映射 "${mapping.name}" 测试成功`)
+
+      // 如果有响应内容，可以显示更多信息
+      if (result.data?.response?.choices?.[0]?.message?.content) {
+        const content = result.data.response.choices[0].message.content
+        showSuccess(`测试成功，响应: ${content.substring(0, 100)}${content.length > 100 ? '...' : ''}`)
+      } else if (result.data?.content_preview) {
+        showSuccess(`流式测试成功，预览: ${result.data.content_preview}`)
+      }
+    } else {
+      showError(`映射测试失败: ${parseTestModelError(result)}`)
+    }
+  } catch (err: any) {
+    const errorMsg = err.response?.data?.detail || err.message || '测试请求失败'
+    showError(`映射测试失败: ${errorMsg}`)
+  } finally {
+    testingMapping.value = null
+  }
+}
+
+// 监听 provider 变化
+watch(() => props.provider?.id, (newId) => {
+  if (newId) {
+    loadModels()
+  }
+}, { immediate: true })
+
+onMounted(() => {
+  if (props.provider?.id) {
+    loadModels()
+  }
+})
+
+// 暴露给父组件
+defineExpose({
+  dialogOpen: computed(() => dialogOpen.value || deleteConfirmOpen.value),
+  openAddDialogForModel
+})
+</script>

frontend/src/features/providers/components/provider-tabs/ModelsTab.vue

@@ -34,16 +34,13 @@
       <table class="w-full text-sm table-fixed">
         <thead class="bg-muted/50 text-xs uppercase tracking-wide text-muted-foreground">
           <tr>
-            <th class="text-left px-4 py-3 font-semibold w-[40%]">
+            <th class="text-left px-4 py-3 font-semibold w-[45%]">
               模型
             </th>
-            <th class="text-left px-4 py-3 font-semibold w-[15%]">
-              能力
-            </th>
-            <th class="text-left px-4 py-3 font-semibold w-[25%]">
+            <th class="text-left px-4 py-3 font-semibold w-[30%]">
               价格 ($/M)
             </th>
-            <th class="text-center px-4 py-3 font-semibold w-[20%]">
+            <th class="text-center px-4 py-3 font-semibold w-[25%]">
               操作
             </th>
           </tr>
@@ -80,42 +77,6 @@
                 </div>
               </div>
             </td>
-            <td class="align-top px-4 py-3">
-              <div
-                v-if="hasAnyCapability(model)"
-                class="grid grid-cols-3 gap-1 w-fit"
-              >
-                <Zap
-                  v-if="model.effective_supports_streaming ?? model.supports_streaming"
-                  class="w-4 h-4 text-muted-foreground"
-                  title="流式输出"
-                />
-                <Image
-                  v-if="model.effective_supports_image_generation ?? model.supports_image_generation"
-                  class="w-4 h-4 text-muted-foreground"
-                  title="图像生成"
-                />
-                <Eye
-                  v-if="model.effective_supports_vision ?? model.supports_vision"
-                  class="w-4 h-4 text-muted-foreground"
-                  title="视觉理解"
-                />
-                <Wrench
-                  v-if="model.effective_supports_function_calling ?? model.supports_function_calling"
-                  class="w-4 h-4 text-muted-foreground"
-                  title="工具调用"
-                />
-                <Brain
-                  v-if="model.effective_supports_extended_thinking ?? model.supports_extended_thinking"
-                  class="w-4 h-4 text-muted-foreground"
-                  title="深度思考"
-                />
-              </div>
-              <span
-                v-else
-                class="text-xs text-muted-foreground"
-              >—</span>
-            </td>
             <td class="align-top px-4 py-3 text-xs whitespace-nowrap">
               <div
                 class="grid gap-1"
@@ -148,7 +109,7 @@
                     ${{ formatPrice(model.effective_price_per_request ?? model.price_per_request) }}/次
                   </span>
                 </template>
-                <!-- 无计费配置 -->
+                <!-- 无计<EFBFBD><EFBFBD>配置 -->
                 <template v-if="!hasTokenPricing(model) && !hasRequestPricing(model)">
                   <span class="text-muted-foreground">—</span>
                 </template>
@@ -156,6 +117,15 @@
             </td>
             <td class="align-top px-4 py-3">
               <div class="flex justify-center gap-1.5">
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  class="h-8 w-8"
+                  title="添加映射"
+                  @click="addMapping(model)"
+                >
+                  <Link class="w-3.5 h-3.5" />
+                </Button>
                 <Button
                   variant="ghost"
                   size="icon"
@@ -178,7 +148,7 @@
                 <Button
                   variant="ghost"
                   size="icon"
-                  class="h-8 w-8 text-destructive hover:text-destructive"
+                  class="h-8 w-8 hover:text-destructive"
                   title="删除"
                   @click="deleteModel(model)"
                 >
@@ -209,10 +179,11 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
-import { Box, Edit, Trash2, Layers, Eye, Wrench, Zap, Brain, Power, Copy, Image } from 'lucide-vue-next'
+import { Box, Edit, Trash2, Layers, Power, Copy, Link } from 'lucide-vue-next'
 import Card from '@/components/ui/card.vue'
 import Button from '@/components/ui/button.vue'
 import { useToast } from '@/composables/useToast'
+import { useClipboard } from '@/composables/useClipboard'
 import { getProviderModels, type Model } from '@/api/endpoints'
 import { updateModel } from '@/api/endpoints/models'
 
@@ -224,9 +195,11 @@ const emit = defineEmits<{
   'editModel': [model: Model]
   'deleteModel': [model: Model]
   'batchAssign': []
+  'addMapping': [model: Model]
 }>()
 
 const { error: showError, success: showSuccess } = useToast()
+const { copyToClipboard } = useClipboard()
 
 // 状态
 const loading = ref(false)
@@ -244,12 +217,7 @@ const sortedModels = computed(() => {
 
 // 复制模型 ID 到剪贴板
 async function copyModelId(modelId: string) {
-  try {
-    await navigator.clipboard.writeText(modelId)
-    showSuccess('已复制到剪贴板')
-  } catch {
-    showError('复制失败', '错误')
-  }
+  await copyToClipboard(modelId)
 }
 
 // 加载模型
@@ -279,17 +247,6 @@ function formatPrice(price: number | null | undefined): string {
   return price.toFixed(4)
 }
 
-// 检查模型是否有任何能力
-function hasAnyCapability(model: Model): boolean {
-  return !!(
-    (model.effective_supports_vision ?? model.supports_vision) ||
-    (model.effective_supports_function_calling ?? model.supports_function_calling) ||
-    (model.effective_supports_streaming ?? model.supports_streaming) ||
-    (model.effective_supports_extended_thinking ?? model.supports_extended_thinking) ||
-    (model.effective_supports_image_generation ?? model.supports_image_generation)
-  )
-}
-
 // 检查是否有按 Token 计费
 function hasTokenPricing(model: Model): boolean {
   const inputPrice = model.effective_input_price
@@ -348,7 +305,7 @@ function getStatusTitle(model: Model): string {
   return '活跃但不可用'
 }
 
-// 编辑模型
+// <EFBFBD><EFBFBD>辑模型
 function editModel(model: Model) {
   emit('editModel', model)
 }
@@ -358,6 +315,11 @@ function deleteModel(model: Model) {
   emit('deleteModel', model)
 }
 
+// 添加映射
+function addMapping(model: Model) {
+  emit('addMapping', model)
+}
+
 // 打开批量关联对话框
 function openBatchAssignDialog() {
   emit('batchAssign')

frontend/src/features/providers/composables/useUpstreamModelsCache.ts

@@ -0,0 +1,117 @@
+/**
+ * 上游模型缓存 - 共享缓存，避免重复请求
+ */
+import { ref } from 'vue'
+import { adminApi } from '@/api/admin'
+import { parseUpstreamModelError } from '@/utils/errorParser'
+import type { UpstreamModel } from '@/api/endpoints/types'
+
+// 扩展类型，包含可能的额外字段
+export type { UpstreamModel }
+
+interface CacheEntry {
+  models: UpstreamModel[]
+  timestamp: number
+}
+
+type FetchResult = { models: UpstreamModel[]; error?: string }
+
+// 全局缓存（模块级别，所有组件共享）
+const cache = new Map<string, CacheEntry>()
+const CACHE_TTL = 5 * 60 * 1000 // 5分钟
+
+// 进行中的请求（用于去重并发请求）
+const pendingRequests = new Map<string, Promise<FetchResult>>()
+
+// 请求状态
+const loadingMap = ref<Map<string, boolean>>(new Map())
+
+export function useUpstreamModelsCache() {
+  /**
+   * 获取上游模型列表
+   * @param providerId 提供商ID
+   * @param forceRefresh 是否强制刷新
+   * @returns 模型列表或 null（如果请求失败）
+   */
+  async function fetchModels(
+    providerId: string,
+    forceRefresh = false
+  ): Promise<FetchResult> {
+    // 检查缓存
+    if (!forceRefresh) {
+      const cached = cache.get(providerId)
+      if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
+        return { models: cached.models }
+      }
+    }
+
+    // 检查是否有进行中的请求（非强制刷新时复用）
+    if (!forceRefresh && pendingRequests.has(providerId)) {
+      return pendingRequests.get(providerId)!
+    }
+
+    // 创建新请求
+    const requestPromise = (async (): Promise<FetchResult> => {
+      try {
+        loadingMap.value.set(providerId, true)
+        const response = await adminApi.queryProviderModels(providerId)
+
+        if (response.success && response.data?.models) {
+          // 存入缓存
+          cache.set(providerId, {
+            models: response.data.models,
+            timestamp: Date.now()
+          })
+          return { models: response.data.models }
+        } else {
+          // 使用友好的错误解析
+          const rawError = response.data?.error || '获取上游模型失败'
+          return { models: [], error: parseUpstreamModelError(rawError) }
+        }
+      } catch (err: any) {
+        // 使用友好的错误解析
+        const rawError = err.response?.data?.detail || err.message || '获取上游模型失败'
+        return { models: [], error: parseUpstreamModelError(rawError) }
+      } finally {
+        loadingMap.value.set(providerId, false)
+        pendingRequests.delete(providerId)
+      }
+    })()
+
+    pendingRequests.set(providerId, requestPromise)
+    return requestPromise
+  }
+
+  /**
+   * 获取缓存的模型（不发起请求）
+   */
+  function getCachedModels(providerId: string): UpstreamModel[] | null {
+    const cached = cache.get(providerId)
+    if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
+      return cached.models
+    }
+    return null
+  }
+
+  /**
+   * 清除指定提供商的缓存
+   */
+  function clearCache(providerId: string) {
+    cache.delete(providerId)
+  }
+
+  /**
+   * 检查是否正在加载
+   */
+  function isLoading(providerId: string): boolean {
+    return loadingMap.value.get(providerId) || false
+  }
+
+  return {
+    fetchModels,
+    getCachedModels,
+    clearCache,
+    isLoading,
+    loadingMap
+  }
+}

frontend/src/features/usage/components/ActivityHeatmapCard.vue

@@ -18,8 +18,22 @@
         <span class="flex-shrink-0">多</span>
       </div>
     </div>
+    <div
+      v-if="isLoading"
+      class="h-full min-h-[160px] flex items-center justify-center text-sm text-muted-foreground"
+    >
+      <Loader2 class="h-5 w-5 animate-spin mr-2" />
+      加载中...
+    </div>
+    <div
+      v-else-if="hasError"
+      class="h-full min-h-[160px] flex items-center justify-center text-sm text-destructive"
+    >
+      <AlertCircle class="h-4 w-4 mr-1.5" />
+      加载失败
+    </div>
     <ActivityHeatmap
-      v-if="hasData"
+      v-else-if="hasData"
       :data="data"
       :show-header="false"
     />
@@ -34,6 +48,7 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
+import { Loader2, AlertCircle } from 'lucide-vue-next'
 import Card from '@/components/ui/card.vue'
 import ActivityHeatmap from '@/components/stats/ActivityHeatmap.vue'
 import type { ActivityHeatmap as ActivityHeatmapData } from '@/types/activity'
@@ -41,6 +56,8 @@ import type { ActivityHeatmap as ActivityHeatmapData } from '@/types/activity'
 const props = defineProps<{
   data: ActivityHeatmapData | null
   title: string
+  isLoading?: boolean
+  hasError?: boolean
 }>()
 
 const legendLevels = [0.08, 0.25, 0.45, 0.65, 0.85]

frontend/src/features/usage/components/HorizontalRequestTimeline.vue

@@ -479,10 +479,25 @@ const groupedTimeline = computed<NodeGroup[]>(() => {
   return groups
 })
 
-// 计算链路总耗时（从第一个节点开始到最后一个节点结束）
+// 计算链路总耗时（使用成功候选的 latency_ms 字段）
+// 优先使用 latency_ms，因为它与 Usage.response_time_ms 使用相同的时间基准
+// 避免 finished_at - started_at 带来的额外延迟（数据库操作时间）
 const totalTraceLatency = computed(() => {
   if (!timeline.value || timeline.value.length === 0) return 0
 
+  // 查找成功的候选，使用其 latency_ms
+  const successCandidate = timeline.value.find(c => c.status === 'success')
+  if (successCandidate?.latency_ms != null) {
+    return successCandidate.latency_ms
+  }
+
+  // 如果没有成功的候选，查找失败但有 latency_ms 的候选
+  const failedWithLatency = timeline.value.find(c => c.status === 'failed' && c.latency_ms != null)
+  if (failedWithLatency?.latency_ms != null) {
+    return failedWithLatency.latency_ms
+  }
+
+  // 回退：使用 finished_at - started_at 计算
   let earliestStart: number | null = null
   let latestEnd: number | null = null
 

frontend/src/features/usage/components/RequestDetailDrawer.vue

@@ -25,7 +25,7 @@
                 </h3>
                 <div class="flex items-center gap-1 text-sm font-mono text-muted-foreground bg-muted px-2 py-0.5 rounded">
                   <span>{{ detail?.model || '-' }}</span>
-                  <template v-if="detail?.target_model">
+                  <template v-if="detail?.target_model && detail.target_model !== detail.model">
                     <svg
                       xmlns="http://www.w3.org/2000/svg"
                       viewBox="0 0 20 20"
@@ -289,14 +289,14 @@
                 />
               </div>
 
-              <!-- 错误信息卡片 -->
+              <!-- 响应客户端错误卡片 -->
               <Card
                 v-if="detail.error_message"
                 class="border-red-200 dark:border-red-800"
               >
                 <div class="p-4">
                   <h4 class="text-sm font-semibold text-red-600 dark:text-red-400 mb-2">
-                    错误信息
+                    响应客户端错误
                   </h4>
                   <div class="bg-red-50 dark:bg-red-900/20 rounded-lg p-3">
                     <p class="text-sm text-red-800 dark:text-red-300">
@@ -431,7 +431,7 @@
 
                     <TabsContent value="response-headers">
                       <JsonContent
-                        :data="detail.response_headers"
+                        :data="actualResponseHeaders"
                         :view-mode="viewMode"
                         :expand-depth="currentExpandDepth"
                         :is-dark="isDark"
@@ -472,6 +472,8 @@
 <script setup lang="ts">
 import { ref, watch, computed } from 'vue'
 import Button from '@/components/ui/button.vue'
+import { useEscapeKey } from '@/composables/useEscapeKey'
+import { useClipboard } from '@/composables/useClipboard'
 import Card from '@/components/ui/card.vue'
 import Badge from '@/components/ui/badge.vue'
 import Separator from '@/components/ui/separator.vue'
@@ -504,6 +506,7 @@ const copiedStates = ref<Record<string, boolean>>({})
 const viewMode = ref<'compare' | 'formatted' | 'raw'>('compare')
 const currentExpandDepth = ref(1)
 const dataSource = ref<'client' | 'provider'>('client')
+const { copyToClipboard } = useClipboard()
 const historicalPricing = ref<{
   input_price: string
   output_price: string
@@ -611,6 +614,25 @@ const tabs = [
   { name: 'metadata', label: '元数据' },
 ]
 
+// 判断数据是否有实际内容（非空对象/数组）
+function hasContent(data: unknown): boolean {
+  if (data === null || data === undefined) return false
+  if (typeof data === 'object') {
+    return Object.keys(data as object).length > 0
+  }
+  return true
+}
+
+// 获取实际的响应头（优先 client_response_headers，回退到 response_headers）
+const actualResponseHeaders = computed(() => {
+  if (!detail.value) return null
+  // 优先返回客户端响应头，如果没有则回退到提供商响应头
+  if (hasContent(detail.value.client_response_headers)) {
+    return detail.value.client_response_headers
+  }
+  return detail.value.response_headers
+})
+
 // 根据实际数据决定显示哪些 Tab
 const visibleTabs = computed(() => {
   if (!detail.value) return []
@@ -618,15 +640,15 @@ const visibleTabs = computed(() => {
   return tabs.filter(tab => {
     switch (tab.name) {
       case 'request-headers':
-        return detail.value!.request_headers && Object.keys(detail.value!.request_headers).length > 0
+        return hasContent(detail.value!.request_headers)
       case 'request-body':
-        return detail.value!.request_body !== null && detail.value!.request_body !== undefined
+        return hasContent(detail.value!.request_body)
       case 'response-headers':
-        return detail.value!.response_headers && Object.keys(detail.value!.response_headers).length > 0
+        return hasContent(actualResponseHeaders.value)
       case 'response-body':
-        return detail.value!.response_body !== null && detail.value!.response_body !== undefined
+        return hasContent(detail.value!.response_body)
       case 'metadata':
-        return detail.value!.metadata && Object.keys(detail.value!.metadata).length > 0
+        return hasContent(detail.value!.metadata)
       default:
         return false
     }
@@ -772,7 +794,7 @@ function copyJsonToClipboard(tabName: string) {
       data = detail.value.request_body
       break
     case 'response-headers':
-      data = detail.value.response_headers
+      data = actualResponseHeaders.value
       break
     case 'response-body':
       data = detail.value.response_body
@@ -783,7 +805,7 @@ function copyJsonToClipboard(tabName: string) {
   }
 
   if (data) {
-    navigator.clipboard.writeText(JSON.stringify(data, null, 2))
+    copyToClipboard(JSON.stringify(data, null, 2), false)
     copiedStates.value[tabName] = true
     setTimeout(() => {
       copiedStates.value[tabName] = false
@@ -897,6 +919,16 @@ const providerHeadersWithDiff = computed(() => {
 
   return result
 })
+
+// 添加 ESC 键监听
+useEscapeKey(() => {
+  if (props.isOpen) {
+    handleClose()
+  }
+}, {
+  disableOnInput: true,
+  once: false
+})
 </script>
 
 <style scoped>

frontend/src/features/usage/components/UsageRecordsTable.vue

@@ -32,6 +32,17 @@
       <!-- 分隔线 -->
       <div class="hidden sm:block h-4 w-px bg-border" />
 
+      <!-- 通用搜索 -->
+      <div class="relative">
+        <Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground z-10 pointer-events-none" />
+        <Input
+          id="usage-records-search"
+          v-model="localSearch"
+          :placeholder="isAdmin ? '搜索用户/密钥/模型/提供商' : '搜索密钥/模型'"
+          class="w-32 sm:w-48 h-8 text-xs border-border/60 pl-8"
+        />
+      </div>
+
       <!-- 用户筛选（仅管理员可见） -->
       <Select
         v-if="isAdmin && availableUsers.length > 0"
@@ -136,11 +147,20 @@
       <!-- 分隔线 -->
       <div class="hidden sm:block h-4 w-px bg-border" />
 
-      <!-- 刷新按钮 -->
-      <RefreshButton
-        :loading="loading"
-        @click="$emit('refresh')"
+      <!-- 自动刷新按钮 -->
+      <Button
+        variant="ghost"
+        size="icon"
+        class="h-8 w-8"
+        :class="autoRefresh ? 'text-primary' : ''"
+        :title="autoRefresh ? '点击关闭自动刷新' : '点击开启自动刷新（每10秒刷新）'"
+        @click="$emit('update:autoRefresh', !autoRefresh)"
+      >
+        <RefreshCcw
+          class="w-3.5 h-3.5"
+          :class="autoRefresh ? 'animate-spin' : ''"
         />
+      </Button>
     </template>
 
     <Table>
@@ -155,6 +175,12 @@
           >
             用户
           </TableHead>
+          <TableHead
+            v-if="!isAdmin"
+            class="h-12 font-semibold w-[100px]"
+          >
+            密钥
+          </TableHead>
           <TableHead class="h-12 font-semibold w-[140px]">
             模型
           </TableHead>
@@ -177,8 +203,9 @@
             费用
           </TableHead>
           <TableHead class="h-12 font-semibold w-[70px] text-right">
-            <div class="inline-block max-w-[2rem] leading-tight">
-              响应时间
+            <div class="flex flex-col items-end text-xs gap-0.5">
+              <span>首字</span>
+              <span class="text-muted-foreground font-normal">总耗时</span>
             </div>
           </TableHead>
         </TableRow>
@@ -186,7 +213,7 @@
       <TableBody>
         <TableRow v-if="records.length === 0">
           <TableCell
-            :colspan="isAdmin ? 9 : 7"
+            :colspan="isAdmin ? 9 : 8"
             class="text-center py-12 text-muted-foreground"
           >
             暂无请求记录
@@ -208,7 +235,34 @@
             class="py-4 w-[100px] truncate"
             :title="record.username || record.user_email || (record.user_id ? `User ${record.user_id}` : '已删除用户')"
           >
+            <div class="flex flex-col text-xs gap-0.5">
+              <span class="truncate">
                 {{ record.username || record.user_email || (record.user_id ? `User ${record.user_id}` : '已删除用户') }}
+              </span>
+              <span
+                v-if="record.api_key?.name"
+                class="text-muted-foreground truncate"
+                :title="record.api_key.name"
+              >
+                {{ record.api_key.name }}
+              </span>
+            </div>
+          </TableCell>
+          <!-- 用户页面的密钥列 -->
+          <TableCell
+            v-if="!isAdmin"
+            class="py-4 w-[100px]"
+            :title="record.api_key?.name || '-'"
+          >
+            <div class="flex flex-col text-xs gap-0.5">
+              <span class="truncate">{{ record.api_key?.name || '-' }}</span>
+              <span
+                v-if="record.api_key?.display"
+                class="text-muted-foreground truncate"
+              >
+                {{ record.api_key.display }}
+              </span>
+            </div>
           </TableCell>
           <TableCell
             class="font-medium py-4 w-[140px]"
@@ -356,15 +410,48 @@
             </div>
           </TableCell>
           <TableCell class="text-right py-4 w-[70px]">
-            <span
-              v-if="record.status === 'pending' || record.status === 'streaming'"
-              class="text-primary tabular-nums"
+            <!-- pending 状态：只显示增长的总时间 -->
+            <div
+              v-if="record.status === 'pending'"
+              class="flex flex-col items-end text-xs gap-0.5"
             >
+              <span class="text-muted-foreground">-</span>
+              <span class="text-primary tabular-nums">
                 {{ getElapsedTime(record) }}
               </span>
-            <span v-else-if="record.response_time_ms">
-              {{ (record.response_time_ms / 1000).toFixed(2) }}s
+            </div>
+            <!-- streaming 状态：首字固定 + 总时间增长 -->
+            <div
+              v-else-if="record.status === 'streaming'"
+              class="flex flex-col items-end text-xs gap-0.5"
+            >
+              <span
+                v-if="record.first_byte_time_ms != null"
+                class="tabular-nums"
+              >{{ (record.first_byte_time_ms / 1000).toFixed(2) }}s</span>
+              <span
+                v-else
+                class="text-muted-foreground"
+              >-</span>
+              <span class="text-primary tabular-nums">
+                {{ getElapsedTime(record) }}
               </span>
+            </div>
+            <!-- 已完成状态：首字 + 总耗时 -->
+            <div
+              v-else-if="record.response_time_ms != null"
+              class="flex flex-col items-end text-xs gap-0.5"
+            >
+              <span
+                v-if="record.first_byte_time_ms != null"
+                class="tabular-nums"
+              >{{ (record.first_byte_time_ms / 1000).toFixed(2) }}s</span>
+              <span
+                v-else
+                class="text-muted-foreground"
+              >-</span>
+              <span class="text-muted-foreground tabular-nums">{{ (record.response_time_ms / 1000).toFixed(2) }}s</span>
+            </div>
             <span
               v-else
               class="text-muted-foreground"
@@ -394,6 +481,8 @@ import { ref, computed, onUnmounted, watch } from 'vue'
 import {
   TableCard,
   Badge,
+  Button,
+  Input,
   Select,
   SelectTrigger,
   SelectValue,
@@ -406,8 +495,8 @@ import {
   TableHead,
   TableCell,
   Pagination,
-  RefreshButton,
 } from '@/components/ui'
+import { RefreshCcw, Search } from 'lucide-vue-next'
 import { formatTokens, formatCurrency } from '@/utils/format'
 import { formatDateTime } from '../composables'
 import { useRowClick } from '@/composables/useRowClick'
@@ -427,6 +516,7 @@ const props = defineProps<{
   // 时间段
   selectedPeriod: string
   // 筛选
+  filterSearch: string
   filterUser: string
   filterModel: string
   filterProvider: string
@@ -439,16 +529,20 @@ const props = defineProps<{
   pageSize: number
   totalRecords: number
   pageSizeOptions: number[]
+  // 自动刷新
+  autoRefresh: boolean
 }>()
 
 const emit = defineEmits<{
   'update:selectedPeriod': [value: string]
+  'update:filterSearch': [value: string]
   'update:filterUser': [value: string]
   'update:filterModel': [value: string]
   'update:filterProvider': [value: string]
   'update:filterStatus': [value: string]
   'update:currentPage': [value: number]
   'update:pageSize': [value: number]
+  'update:autoRefresh': [value: boolean]
   'refresh': []
   'showDetail': [id: string]
 }>()
@@ -460,6 +554,23 @@ const filterModelSelectOpen = ref(false)
 const filterProviderSelectOpen = ref(false)
 const filterStatusSelectOpen = ref(false)
 
+// 通用搜索（输入防抖）
+const localSearch = ref(props.filterSearch)
+let searchDebounceTimer: ReturnType<typeof setTimeout> | null = null
+
+watch(() => props.filterSearch, (value) => {
+  if (value !== localSearch.value) {
+    localSearch.value = value
+  }
+})
+
+watch(localSearch, (value) => {
+  if (searchDebounceTimer) clearTimeout(searchDebounceTimer)
+  searchDebounceTimer = setTimeout(() => {
+    emit('update:filterSearch', value)
+  }, 300)
+})
+
 // 动态计时器相关
 const now = ref(Date.now())
 let timerInterval: ReturnType<typeof setInterval> | null = null
@@ -527,6 +638,10 @@ function handleRowClick(event: MouseEvent, id: string) {
 // 组件卸载时清理
 onUnmounted(() => {
   stopTimer()
+  if (searchDebounceTimer) {
+    clearTimeout(searchDebounceTimer)
+    searchDebounceTimer = null
+  }
 })
 
 // 格式化 API 格式显示名称
@@ -543,13 +658,14 @@ function formatApiFormat(format: string): string {
 }
 
 // 获取实际使用的模型（优先 target_model，其次 model_version）
+// 只有当实际模型与请求模型不同时才返回，用于显示映射箭头
 function getActualModel(record: UsageRecord): string | null {
   // 优先显示模型映射
-  if (record.target_model) {
+  if (record.target_model && record.target_model !== record.model) {
     return record.target_model
   }
   // 其次显示 Provider 返回的实际版本（如 Gemini 的 modelVersion）
-  if (record.request_metadata?.model_version) {
+  if (record.request_metadata?.model_version && record.request_metadata.model_version !== record.model) {
     return record.request_metadata.model_version
   }
   return null

frontend/src/features/usage/composables/useUsageData.ts

@@ -23,6 +23,7 @@ export interface PaginationParams {
 }
 
 export interface FilterParams {
+  search?: string
   user_id?: string
   model?: string
   provider?: string
@@ -64,9 +65,6 @@ export function useUsageData(options: UseUsageDataOptions) {
     }))
   })
 
-  // 活跃度热图数据
-  const activityHeatmapData = computed(() => stats.value.activity_heatmap)
-
   // 加载统计数据（不加载记录）
   async function loadStats(dateRange?: DateRangeParams) {
     isLoadingStats.value = true
@@ -93,7 +91,7 @@ export function useUsageData(options: UseUsageDataOptions) {
           cache_stats: (statsData as any).cache_stats,
           period_start: '',
           period_end: '',
-          activity_heatmap: statsData.activity_heatmap || null
+          activity_heatmap: null
         }
 
         modelStats.value = modelData.map(item => ({
@@ -143,7 +141,7 @@ export function useUsageData(options: UseUsageDataOptions) {
           avg_response_time: userData.avg_response_time || 0,
           period_start: '',
           period_end: '',
-          activity_heatmap: userData.activity_heatmap || null
+          activity_heatmap: null
         }
 
         modelStats.value = (userData.summary_by_model || []).map((item: any) => ({
@@ -237,11 +235,6 @@ export function useUsageData(options: UseUsageDataOptions) {
     pagination: PaginationParams,
     filters?: FilterParams
   ): Promise<void> {
-    if (!isAdminPage.value) {
-      // 用户页面不需要分页加载，记录已在 loadStats 中获取
-      return
-    }
-
     isLoadingRecords.value = true
 
     try {
@@ -255,6 +248,12 @@ export function useUsageData(options: UseUsageDataOptions) {
       }
 
       // 添加筛选条件
+      if (filters?.search?.trim()) {
+        params.search = filters.search.trim()
+      }
+
+      if (isAdminPage.value) {
+        // 管理员页面：使用管理员 API
         if (filters?.user_id) {
           params.user_id = filters.user_id
         }
@@ -269,10 +268,14 @@ export function useUsageData(options: UseUsageDataOptions) {
         }
 
         const response = await usageApi.getAllUsageRecords(params)
-
         currentRecords.value = (response.records || []) as UsageRecord[]
         totalRecords.value = response.total || 0
-
+      } else {
+        // 用户页面：使用用户 API
+        const userData = await meApi.getUsage(params)
+        currentRecords.value = (userData.records || []) as UsageRecord[]
+        totalRecords.value = userData.pagination?.total || currentRecords.value.length
+      }
     } catch (error) {
       log.error('加载记录失败:', error)
       currentRecords.value = []
@@ -305,7 +308,6 @@ export function useUsageData(options: UseUsageDataOptions) {
 
     // 计算属性
     enhancedModelStats,
-    activityHeatmapData,
 
     // 方法
     loadStats,

frontend/src/features/usage/types.ts

@@ -1,5 +1,3 @@
-import type { ActivityHeatmap } from '@/types/activity'
-
 // 统计数据状态
 export interface UsageStatsState {
   total_requests: number
@@ -17,7 +15,6 @@ export interface UsageStatsState {
   }
   period_start: string
   period_end: string
-  activity_heatmap: ActivityHeatmap | null
 }
 
 // 模型统计
@@ -64,6 +61,11 @@ export interface UsageRecord {
   user_id?: string
   username?: string
   user_email?: string
+  api_key?: {
+    id: string | null
+    name: string | null
+    display: string | null
+  } | null
   provider: string
   api_key_name?: string
   rate_multiplier?: number
@@ -78,6 +80,7 @@ export interface UsageRecord {
   cost: number
   actual_cost?: number
   response_time_ms?: number
+  first_byte_time_ms?: number  // 首字时间 (TTFB)
   is_stream: boolean
   status_code?: number
   error_message?: string
@@ -114,7 +117,6 @@ export function createDefaultStats(): UsageStatsState {
     error_rate: undefined,
     cache_stats: undefined,
     period_start: '',
-    period_end: '',
-    activity_heatmap: null
+    period_end: ''
   }
 }

frontend/src/features/users/components/UserFormDialog.vue

@@ -86,6 +86,34 @@
             </p>
           </div>
 
+          <div
+            v-if="isEditMode && form.password.length > 0"
+            class="space-y-2"
+          >
+            <Label class="text-sm font-medium">
+              确认新密码 <span class="text-muted-foreground">*</span>
+            </Label>
+            <Input
+              :id="`pwd-confirm-${formNonce}`"
+              v-model="form.confirmPassword"
+              type="password"
+              autocomplete="new-password"
+              data-form-type="other"
+              data-lpignore="true"
+              :name="`confirm-${formNonce}`"
+              required
+              minlength="6"
+              placeholder="再次输入新密码"
+              class="h-10"
+            />
+            <p
+              v-if="form.confirmPassword.length > 0 && form.password !== form.confirmPassword"
+              class="text-xs text-destructive"
+            >
+              两次输入的密码不一致
+            </p>
+          </div>
+
           <div class="space-y-2">
             <Label
               for="form-email"
@@ -224,7 +252,7 @@
                     @click.stop
                     @change="toggleSelection('allowed_providers', provider.id)"
                   >
-                  <span class="text-sm">{{ provider.display_name || provider.name }}</span>
+                  <span class="text-sm">{{ provider.name }}</span>
                 </div>
                 <div
                   v-if="providers.length === 0"
@@ -245,8 +273,8 @@
                 class="w-full h-10 px-3 border rounded-lg bg-background text-left flex items-center justify-between hover:bg-muted/50 transition-colors"
                 @click="endpointDropdownOpen = !endpointDropdownOpen"
               >
-                <span :class="form.allowed_endpoints.length ? 'text-foreground' : 'text-muted-foreground'">
-                  {{ form.allowed_endpoints.length ? `已选择 ${form.allowed_endpoints.length} 个` : '全部可用' }}
+                <span :class="form.allowed_api_formats.length ? 'text-foreground' : 'text-muted-foreground'">
+                  {{ form.allowed_api_formats.length ? `已选择 ${form.allowed_api_formats.length} 个` : '全部可用' }}
                 </span>
                 <ChevronDown
                   class="h-4 w-4 text-muted-foreground transition-transform"
@@ -266,14 +294,14 @@
                   v-for="format in apiFormats"
                   :key="format.value"
                   class="flex items-center gap-2 px-3 py-2 hover:bg-muted/50 cursor-pointer"
-                  @click="toggleSelection('allowed_endpoints', format.value)"
+                  @click="toggleSelection('allowed_api_formats', format.value)"
                 >
                   <input
                     type="checkbox"
-                    :checked="form.allowed_endpoints.includes(format.value)"
+                    :checked="form.allowed_api_formats.includes(format.value)"
                     class="h-4 w-4 rounded border-gray-300 cursor-pointer"
                     @click.stop
-                    @change="toggleSelection('allowed_endpoints', format.value)"
+                    @change="toggleSelection('allowed_api_formats', format.value)"
                   >
                   <span class="text-sm">{{ format.label }}</span>
                 </div>
@@ -288,55 +316,10 @@
           </div>
 
           <!-- 模型多选下拉框 -->
-          <div class="space-y-2">
-            <Label class="text-sm font-medium">允许的模型</Label>
-            <div class="relative">
-              <button
-                type="button"
-                class="w-full h-10 px-3 border rounded-lg bg-background text-left flex items-center justify-between hover:bg-muted/50 transition-colors"
-                @click="modelDropdownOpen = !modelDropdownOpen"
-              >
-                <span :class="form.allowed_models.length ? 'text-foreground' : 'text-muted-foreground'">
-                  {{ form.allowed_models.length ? `已选择 ${form.allowed_models.length} 个` : '全部可用' }}
-                </span>
-                <ChevronDown
-                  class="h-4 w-4 text-muted-foreground transition-transform"
-                  :class="modelDropdownOpen ? 'rotate-180' : ''"
+          <ModelMultiSelect
+            v-model="form.allowed_models"
+            :models="globalModels"
           />
-              </button>
-              <div
-                v-if="modelDropdownOpen"
-                class="fixed inset-0 z-[80]"
-                @click.stop="modelDropdownOpen = false"
-              />
-              <div
-                v-if="modelDropdownOpen"
-                class="absolute z-[90] w-full mt-1 bg-popover border rounded-lg shadow-lg max-h-48 overflow-y-auto"
-              >
-                <div
-                  v-for="model in globalModels"
-                  :key="model.name"
-                  class="flex items-center gap-2 px-3 py-2 hover:bg-muted/50 cursor-pointer"
-                  @click="toggleSelection('allowed_models', model.name)"
-                >
-                  <input
-                    type="checkbox"
-                    :checked="form.allowed_models.includes(model.name)"
-                    class="h-4 w-4 rounded border-gray-300 cursor-pointer"
-                    @click.stop
-                    @change="toggleSelection('allowed_models', model.name)"
-                  >
-                  <span class="text-sm">{{ model.name }}</span>
-                </div>
-                <div
-                  v-if="globalModels.length === 0"
-                  class="px-3 py-2 text-sm text-muted-foreground"
-                >
-                  暂无可用模型
-                </div>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
     </form>
@@ -376,10 +359,12 @@ import {
 } from '@/components/ui'
 import { UserPlus, SquarePen, ChevronDown } from 'lucide-vue-next'
 import { useFormDialog } from '@/composables/useFormDialog'
+import { ModelMultiSelect } from '@/components/common'
 import { getProvidersSummary } from '@/api/endpoints/providers'
 import { getGlobalModels } from '@/api/global-models'
 import { adminApi } from '@/api/admin'
 import { log } from '@/utils/logger'
+import type { ProviderWithEndpointsSummary, GlobalModelResponse } from '@/api/endpoints/types'
 
 export interface UserFormData {
   id?: string
@@ -389,7 +374,7 @@ export interface UserFormData {
   role: 'admin' | 'user'
   is_active?: boolean
   allowed_providers?: string[] | null
-  allowed_endpoints?: string[] | null
+  allowed_api_formats?: string[] | null
   allowed_models?: string[] | null
 }
 
@@ -412,24 +397,24 @@ const roleSelectOpen = ref(false)
 // 下拉框状态
 const providerDropdownOpen = ref(false)
 const endpointDropdownOpen = ref(false)
-const modelDropdownOpen = ref(false)
 
 // 选项数据
-const providers = ref<any[]>([])
-const globalModels = ref<any[]>([])
+const providers = ref<ProviderWithEndpointsSummary[]>([])
+const globalModels = ref<GlobalModelResponse[]>([])
 const apiFormats = ref<Array<{ value: string; label: string }>>([])
 
 // 表单数据
 const form = ref({
   username: '',
   password: '',
+  confirmPassword: '',
   email: '',
   quota: 10,
   role: 'user' as 'admin' | 'user',
   unlimited: false,
   is_active: true,
   allowed_providers: [] as string[],
-  allowed_endpoints: [] as string[],
+  allowed_api_formats: [] as string[],
   allowed_models: [] as string[]
 })
 
@@ -443,13 +428,14 @@ function resetForm() {
   form.value = {
     username: '',
     password: '',
+    confirmPassword: '',
     email: '',
     quota: 10,
     role: 'user',
     unlimited: false,
     is_active: true,
     allowed_providers: [],
-    allowed_endpoints: [],
+    allowed_api_formats: [],
     allowed_models: []
   }
 }
@@ -461,13 +447,14 @@ function loadUserData() {
   form.value = {
     username: props.user.username,
     password: '',
+    confirmPassword: '',
     email: props.user.email || '',
     quota: props.user.quota_usd == null ? 10 : props.user.quota_usd,
     role: props.user.role,
     unlimited: props.user.quota_usd == null,
     is_active: props.user.is_active ?? true,
     allowed_providers: props.user.allowed_providers || [],
-    allowed_endpoints: props.user.allowed_endpoints || [],
+    allowed_api_formats: props.user.allowed_api_formats || [],
     allowed_models: props.user.allowed_models || []
   }
 }
@@ -486,7 +473,9 @@ const isFormValid = computed(() => {
   const hasUsername = form.value.username.trim().length > 0
   const hasEmail = form.value.email.trim().length > 0
   const hasPassword = isEditMode.value || form.value.password.length >= 6
-  return hasUsername && hasEmail && hasPassword
+  // 编辑模式下如果填写了密码，必须确认密码一致
+  const passwordConfirmed = !isEditMode.value || form.value.password.length === 0 || form.value.password === form.value.confirmPassword
+  return hasUsername && hasEmail && hasPassword && passwordConfirmed
 })
 
 // 加载访问控制选项
@@ -506,7 +495,7 @@ async function loadAccessControlOptions() {
 }
 
 // 切换选择
-function toggleSelection(field: 'allowed_providers' | 'allowed_endpoints' | 'allowed_models', value: string) {
+function toggleSelection(field: 'allowed_providers' | 'allowed_api_formats' | 'allowed_models', value: string) {
   const arr = form.value[field]
   const index = arr.indexOf(value)
   if (index === -1) {
@@ -531,7 +520,7 @@ async function handleSubmit() {
       quota_usd: form.value.unlimited ? null : form.value.quota,
       role: form.value.role,
       allowed_providers: form.value.allowed_providers.length > 0 ? form.value.allowed_providers : null,
-      allowed_endpoints: form.value.allowed_endpoints.length > 0 ? form.value.allowed_endpoints : null,
+      allowed_api_formats: form.value.allowed_api_formats.length > 0 ? form.value.allowed_api_formats : null,
       allowed_models: form.value.allowed_models.length > 0 ? form.value.allowed_models : null
     }
 

frontend/src/layouts/MainLayout.vue

@@ -280,11 +280,30 @@
               class="h-4 w-4"
             />
           </button>
+          <!-- GitHub Link -->
+          <a
+            href="https://github.com/fawney19/Aether"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="flex h-9 w-9 items-center justify-center rounded-lg text-muted-foreground hover:text-foreground hover:bg-muted/50 transition"
+            title="GitHub 仓库"
+          >
+            <GithubIcon class="h-4 w-4" />
+          </a>
         </div>
       </header>
     </template>
 
     <RouterView />
+
+    <!-- 更新提示弹窗 -->
+    <UpdateDialog
+      v-if="updateInfo"
+      v-model="showUpdateDialog"
+      :current-version="updateInfo.current_version"
+      :latest-version="updateInfo.latest_version || ''"
+      :release-url="updateInfo.release_url"
+    />
   </AppShell>
 </template>
 
@@ -294,14 +313,17 @@ import { useRoute, useRouter } from 'vue-router'
 import { useAuthStore } from '@/stores/auth'
 import { useDarkMode } from '@/composables/useDarkMode'
 import { isDemoMode } from '@/config/demo'
+import { adminApi, type CheckUpdateResponse } from '@/api/admin'
 import Button from '@/components/ui/button.vue'
 import AppShell from '@/components/layout/AppShell.vue'
 import SidebarNav from '@/components/layout/SidebarNav.vue'
 import HeaderLogo from '@/components/HeaderLogo.vue'
+import UpdateDialog from '@/components/common/UpdateDialog.vue'
 import {
   Home,
   Users,
   Key,
+  KeyRound,
   BarChart3,
   Cog,
   Settings,
@@ -313,7 +335,6 @@ import {
   Gauge,
   Layers,
   FolderTree,
-  Tag,
   Box,
   LogOut,
   SunMoon,
@@ -321,7 +342,9 @@ import {
   Megaphone,
   Menu,
   X,
+  Mail,
 } from 'lucide-vue-next'
+import GithubIcon from '@/components/icons/GithubIcon.vue'
 
 const router = useRouter()
 const route = useRoute()
@@ -333,17 +356,67 @@ const showAuthError = ref(false)
 const mobileMenuOpen = ref(false)
 let authCheckInterval: number | null = null
 
+// 更新检查相关
+const showUpdateDialog = ref(false)
+const updateInfo = ref<CheckUpdateResponse | null>(null)
+
 // 路由变化时自动关闭移动端菜单
 watch(() => route.path, () => {
   mobileMenuOpen.value = false
 })
 
+// 检查是否应该显示更新提示
+function shouldShowUpdatePrompt(latestVersion: string): boolean {
+  const ignoreKey = 'aether_update_ignore'
+  const ignoreData = localStorage.getItem(ignoreKey)
+  if (!ignoreData) return true
+
+  try {
+    const { version, until } = JSON.parse(ignoreData)
+    // 如果忽略的是同一版本且未过期，则不显示
+    if (version === latestVersion && Date.now() < until) {
+      return false
+    }
+  } catch {
+    // 解析失败，显示提示
+  }
+  return true
+}
+
+// 检查更新
+async function checkForUpdate() {
+  // 只有管理员才检查更新
+  if (authStore.user?.role !== 'admin') return
+
+  // 同一会话内只检查一次
+  const sessionKey = 'aether_update_checked'
+  if (sessionStorage.getItem(sessionKey)) return
+  sessionStorage.setItem(sessionKey, '1')
+
+  try {
+    const result = await adminApi.checkUpdate()
+    if (result.has_update && result.latest_version) {
+      if (shouldShowUpdatePrompt(result.latest_version)) {
+        updateInfo.value = result
+        showUpdateDialog.value = true
+      }
+    }
+  } catch {
+    // 静默失败，不影响用户体验
+  }
+}
+
 onMounted(() => {
   authCheckInterval = setInterval(() => {
     if (authStore.user && !authStore.token) {
       showAuthError.value = true
     }
   }, 5000)
+
+  // 延迟检查更新，避免影响页面加载
+  setTimeout(() => {
+    checkForUpdate()
+  }, 2000)
 })
 
 onUnmounted(() => {
@@ -387,6 +460,7 @@ const navigation = computed(() => {
       items: [
         { name: '模型目录', href: '/dashboard/models', icon: Box },
         { name: 'API 密钥', href: '/dashboard/api-keys', icon: Key },
+        { name: '访问令牌', href: '/dashboard/management-tokens', icon: KeyRound },
       ]
     },
     {
@@ -411,8 +485,8 @@ const navigation = computed(() => {
         { name: '用户管理', href: '/admin/users', icon: Users },
         { name: '提供商', href: '/admin/providers', icon: FolderTree },
         { name: '模型管理', href: '/admin/models', icon: Layers },
-        { name: '别名映射', href: '/admin/aliases', icon: Tag },
         { name: '独立密钥', href: '/admin/keys', icon: Key },
+        { name: '访问令牌', href: '/admin/management-tokens', icon: KeyRound },
         { name: '使用记录', href: '/admin/usage', icon: BarChart3 },
       ]
     },
@@ -423,6 +497,8 @@ const navigation = computed(() => {
         { name: '缓存监控', href: '/admin/cache-monitoring', icon: Gauge },
         { name: 'IP 安全', href: '/admin/ip-security', icon: Shield },
         { name: '审计日志', href: '/admin/audit-logs', icon: AlertTriangle },
+        { name: '邮件配置', href: '/admin/email', icon: Mail },
+        { name: 'LDAP 配置', href: '/admin/ldap', icon: Shield },
         { name: '系统设置', href: '/admin/system', icon: Cog },
       ]
     }

frontend/src/mocks/data.ts

@@ -5,7 +5,7 @@
 
 import type { User, LoginResponse } from '@/api/auth'
 import type { DashboardStatsResponse, RecentRequest, ProviderStatus, DailyStatsResponse } from '@/api/dashboard'
-import type { User as AdminUser, ApiKey } from '@/api/users'
+import type { User as AdminUser } from '@/api/users'
 import type { AdminApiKeysResponse } from '@/api/admin'
 import type { Profile, UsageResponse } from '@/api/me'
 import type { ProviderWithEndpointsSummary, GlobalModelResponse } from '@/api/endpoints/types'
@@ -22,7 +22,7 @@ export const MOCK_ADMIN_USER: User = {
   used_usd: 156.78,
   total_usd: 1234.56,
   allowed_providers: null,
-  allowed_endpoints: null,
+  allowed_api_formats: null,
   allowed_models: null,
   created_at: '2024-01-01T00:00:00Z',
   last_login_at: new Date().toISOString()
@@ -38,7 +38,7 @@ export const MOCK_NORMAL_USER: User = {
   used_usd: 45.32,
   total_usd: 245.32,
   allowed_providers: null,
-  allowed_endpoints: null,
+  allowed_api_formats: null,
   allowed_models: null,
   created_at: '2024-06-01T00:00:00Z',
   last_login_at: new Date().toISOString()
@@ -185,18 +185,20 @@ export const MOCK_DASHBOARD_STATS: DashboardStatsResponse = {
     output: 700000,
     cache_creation: 50000,
     cache_read: 200000
-  }
+  },
+  // 普通用户专用字段
+  monthly_cost: 45.67
 }
 
 export const MOCK_RECENT_REQUESTS: RecentRequest[] = [
-  { id: 'req-001', user: 'alice', model: 'claude-sonnet-4-20250514', tokens: 15234, time: '2 分钟前' },
-  { id: 'req-002', user: 'bob', model: 'gpt-4o', tokens: 8765, time: '5 分钟前' },
-  { id: 'req-003', user: 'charlie', model: 'claude-opus-4-20250514', tokens: 32100, time: '8 分钟前' },
-  { id: 'req-004', user: 'diana', model: 'gemini-2.0-flash', tokens: 4521, time: '12 分钟前' },
-  { id: 'req-005', user: 'eve', model: 'claude-sonnet-4-20250514', tokens: 9876, time: '15 分钟前' },
-  { id: 'req-006', user: 'frank', model: 'gpt-4o-mini', tokens: 2345, time: '18 分钟前' },
-  { id: 'req-007', user: 'grace', model: 'claude-haiku-3-5-20241022', tokens: 6789, time: '22 分钟前' },
-  { id: 'req-008', user: 'henry', model: 'gemini-2.5-pro', tokens: 12345, time: '25 分钟前' }
+  { id: 'req-001', user: 'alice', model: 'claude-sonnet-4-5-20250929', tokens: 15234, time: '2 分钟前' },
+  { id: 'req-002', user: 'bob', model: 'gpt-5.1', tokens: 8765, time: '5 分钟前' },
+  { id: 'req-003', user: 'charlie', model: 'claude-opus-4-5-20251101', tokens: 32100, time: '8 分钟前' },
+  { id: 'req-004', user: 'diana', model: 'gemini-3-pro-preview', tokens: 4521, time: '12 分钟前' },
+  { id: 'req-005', user: 'eve', model: 'claude-sonnet-4-5-20250929', tokens: 9876, time: '15 分钟前' },
+  { id: 'req-006', user: 'frank', model: 'gpt-5.1-codex-mini', tokens: 2345, time: '18 分钟前' },
+  { id: 'req-007', user: 'grace', model: 'claude-haiku-4-5-20251001', tokens: 6789, time: '22 分钟前' },
+  { id: 'req-008', user: 'henry', model: 'gemini-3-pro-preview', tokens: 12345, time: '25 分钟前' }
 ]
 
 export const MOCK_PROVIDER_STATUS: ProviderStatus[] = [
@@ -231,11 +233,11 @@ function generateDailyStats(): DailyStatsResponse {
       unique_models: 8 + Math.floor(Math.random() * 5),
       unique_providers: 4 + Math.floor(Math.random() * 3),
       model_breakdown: [
-        { model: 'claude-sonnet-4-20250514', requests: Math.floor(baseRequests * 0.35), tokens: Math.floor(baseTokens * 0.35), cost: Number((baseCost * 0.35).toFixed(2)) },
-        { model: 'gpt-4o', requests: Math.floor(baseRequests * 0.25), tokens: Math.floor(baseTokens * 0.25), cost: Number((baseCost * 0.25).toFixed(2)) },
-        { model: 'claude-opus-4-20250514', requests: Math.floor(baseRequests * 0.15), tokens: Math.floor(baseTokens * 0.15), cost: Number((baseCost * 0.20).toFixed(2)) },
-        { model: 'gemini-2.0-flash', requests: Math.floor(baseRequests * 0.15), tokens: Math.floor(baseTokens * 0.15), cost: Number((baseCost * 0.10).toFixed(2)) },
-        { model: 'claude-haiku-3-5-20241022', requests: Math.floor(baseRequests * 0.10), tokens: Math.floor(baseTokens * 0.10), cost: Number((baseCost * 0.10).toFixed(2)) }
+        { model: 'claude-sonnet-4-5-20250929', requests: Math.floor(baseRequests * 0.35), tokens: Math.floor(baseTokens * 0.35), cost: Number((baseCost * 0.35).toFixed(2)) },
+        { model: 'gpt-5.1', requests: Math.floor(baseRequests * 0.25), tokens: Math.floor(baseTokens * 0.25), cost: Number((baseCost * 0.25).toFixed(2)) },
+        { model: 'claude-opus-4-5-20251101', requests: Math.floor(baseRequests * 0.15), tokens: Math.floor(baseTokens * 0.15), cost: Number((baseCost * 0.20).toFixed(2)) },
+        { model: 'gemini-3-pro-preview', requests: Math.floor(baseRequests * 0.15), tokens: Math.floor(baseTokens * 0.15), cost: Number((baseCost * 0.10).toFixed(2)) },
+        { model: 'claude-haiku-4-5-20251001', requests: Math.floor(baseRequests * 0.10), tokens: Math.floor(baseTokens * 0.10), cost: Number((baseCost * 0.10).toFixed(2)) }
       ]
     })
   }
@@ -243,11 +245,11 @@ function generateDailyStats(): DailyStatsResponse {
   return {
     daily_stats: dailyStats,
     model_summary: [
-      { model: 'claude-sonnet-4-20250514', requests: 2456, tokens: 8500000, cost: 125.45, avg_response_time: 1.2, cost_per_request: 0.051, tokens_per_request: 3461 },
-      { model: 'gpt-4o', requests: 1823, tokens: 6200000, cost: 98.32, avg_response_time: 0.9, cost_per_request: 0.054, tokens_per_request: 3401 },
-      { model: 'claude-opus-4-20250514', requests: 987, tokens: 4100000, cost: 156.78, avg_response_time: 2.1, cost_per_request: 0.159, tokens_per_request: 4154 },
-      { model: 'gemini-2.0-flash', requests: 1234, tokens: 3800000, cost: 28.56, avg_response_time: 0.6, cost_per_request: 0.023, tokens_per_request: 3079 },
-      { model: 'claude-haiku-3-5-20241022', requests: 2100, tokens: 5200000, cost: 32.10, avg_response_time: 0.5, cost_per_request: 0.015, tokens_per_request: 2476 }
+      { model: 'claude-sonnet-4-5-20250929', requests: 2456, tokens: 8500000, cost: 125.45, avg_response_time: 1.2, cost_per_request: 0.051, tokens_per_request: 3461 },
+      { model: 'gpt-5.1', requests: 1823, tokens: 6200000, cost: 98.32, avg_response_time: 0.9, cost_per_request: 0.054, tokens_per_request: 3401 },
+      { model: 'claude-opus-4-5-20251101', requests: 987, tokens: 4100000, cost: 156.78, avg_response_time: 2.1, cost_per_request: 0.159, tokens_per_request: 4154 },
+      { model: 'gemini-3-pro-preview', requests: 1234, tokens: 3800000, cost: 28.56, avg_response_time: 0.6, cost_per_request: 0.023, tokens_per_request: 3079 },
+      { model: 'claude-haiku-4-5-20251001', requests: 2100, tokens: 5200000, cost: 32.10, avg_response_time: 0.5, cost_per_request: 0.015, tokens_per_request: 2476 }
     ],
     period: {
       start_date: dailyStats[0].date,
@@ -272,7 +274,7 @@ export const MOCK_ALL_USERS: AdminUser[] = [
     used_usd: 156.78,
     total_usd: 1234.56,
     allowed_providers: null,
-    allowed_endpoints: null,
+    allowed_api_formats: null,
     allowed_models: null,
     created_at: '2024-01-01T00:00:00Z'
   },
@@ -286,7 +288,7 @@ export const MOCK_ALL_USERS: AdminUser[] = [
     used_usd: 45.32,
     total_usd: 245.32,
     allowed_providers: null,
-    allowed_endpoints: null,
+    allowed_api_formats: null,
     allowed_models: null,
     created_at: '2024-06-01T00:00:00Z'
   },
@@ -300,7 +302,7 @@ export const MOCK_ALL_USERS: AdminUser[] = [
     used_usd: 23.45,
     total_usd: 123.45,
     allowed_providers: null,
-    allowed_endpoints: null,
+    allowed_api_formats: null,
     allowed_models: null,
     created_at: '2024-03-15T00:00:00Z'
   },
@@ -314,7 +316,7 @@ export const MOCK_ALL_USERS: AdminUser[] = [
     used_usd: 89.12,
     total_usd: 589.12,
     allowed_providers: null,
-    allowed_endpoints: null,
+    allowed_api_formats: null,
     allowed_models: null,
     created_at: '2024-02-20T00:00:00Z'
   },
@@ -328,7 +330,7 @@ export const MOCK_ALL_USERS: AdminUser[] = [
     used_usd: 30.00,
     total_usd: 30.00,
     allowed_providers: null,
-    allowed_endpoints: null,
+    allowed_api_formats: null,
     allowed_models: null,
     created_at: '2024-04-10T00:00:00Z'
   }
@@ -336,7 +338,7 @@ export const MOCK_ALL_USERS: AdminUser[] = [
 
 // ========== API Key 数据 ==========
 
-export const MOCK_USER_API_KEYS: ApiKey[] = [
+export const MOCK_USER_API_KEYS = [
   {
     id: 'key-uuid-001',
     key_display: 'sk-ae...x7f9',
@@ -346,7 +348,8 @@ export const MOCK_USER_API_KEYS: ApiKey[] = [
     is_active: true,
     is_standalone: false,
     total_requests: 1234,
-    total_cost_usd: 45.67
+    total_cost_usd: 45.67,
+    force_capabilities: null
   },
   {
     id: 'key-uuid-002',
@@ -357,7 +360,8 @@ export const MOCK_USER_API_KEYS: ApiKey[] = [
     is_active: true,
     is_standalone: false,
     total_requests: 5678,
-    total_cost_usd: 123.45
+    total_cost_usd: 123.45,
+    force_capabilities: { cache_1h: true }
   },
   {
     id: 'key-uuid-003',
@@ -367,7 +371,8 @@ export const MOCK_USER_API_KEYS: ApiKey[] = [
     is_active: false,
     is_standalone: false,
     total_requests: 100,
-    total_cost_usd: 2.34
+    total_cost_usd: 2.34,
+    force_capabilities: null
   }
 ]
 
@@ -419,8 +424,7 @@ export const MOCK_ADMIN_API_KEYS: AdminApiKeysResponse = {
 export const MOCK_PROVIDERS: ProviderWithEndpointsSummary[] = [
   {
     id: 'provider-001',
-    name: 'duck_coding_free',
-    display_name: 'DuckCodingFree',
+    name: 'DuckCodingFree',
     description: '',
     website: 'https://duckcoding.com',
     provider_priority: 1,
@@ -446,8 +450,7 @@ export const MOCK_PROVIDERS: ProviderWithEndpointsSummary[] = [
   },
   {
     id: 'provider-002',
-    name: 'open_claude_code',
-    display_name: 'OpenClaudeCode',
+    name: 'OpenClaudeCode',
     description: '',
     website: 'https://www.openclaudecode.cn',
     provider_priority: 2,
@@ -472,8 +475,7 @@ export const MOCK_PROVIDERS: ProviderWithEndpointsSummary[] = [
   },
   {
     id: 'provider-003',
-    name: '88_code',
-    display_name: '88Code',
+    name: '88Code',
     description: '',
     website: 'https://www.88code.org/',
     provider_priority: 3,
@@ -498,8 +500,7 @@ export const MOCK_PROVIDERS: ProviderWithEndpointsSummary[] = [
   },
   {
     id: 'provider-004',
-    name: 'ikun_code',
-    display_name: 'IKunCode',
+    name: 'IKunCode',
     description: '',
     website: 'https://api.ikuncode.cc',
     provider_priority: 4,
@@ -526,8 +527,7 @@ export const MOCK_PROVIDERS: ProviderWithEndpointsSummary[] = [
   },
   {
     id: 'provider-005',
-    name: 'duck_coding',
-    display_name: 'DuckCoding',
+    name: 'DuckCoding',
     description: '',
     website: 'https://duckcoding.com',
     provider_priority: 5,
@@ -556,8 +556,7 @@ export const MOCK_PROVIDERS: ProviderWithEndpointsSummary[] = [
   },
   {
     id: 'provider-006',
-    name: 'privnode',
-    display_name: 'Privnode',
+    name: 'Privnode',
     description: '',
     website: 'https://privnode.com',
     provider_priority: 6,
@@ -579,8 +578,7 @@ export const MOCK_PROVIDERS: ProviderWithEndpointsSummary[] = [
   },
   {
     id: 'provider-007',
-    name: 'undying_api',
-    display_name: 'UndyingAPI',
+    name: 'UndyingAPI',
     description: '',
     website: 'https://vip.undyingapi.com',
     provider_priority: 7,
@@ -611,41 +609,42 @@ export const MOCK_GLOBAL_MODELS: GlobalModelResponse[] = [
     id: 'gm-001',
     name: 'claude-haiku-4-5-20251001',
     display_name: 'claude-haiku-4-5',
-    description: 'Anthropic 最快速的 Claude 4 系列模型',
     is_active: true,
     default_tiered_pricing: {
       tiers: [{ up_to: null, input_price_per_1m: 1.00, output_price_per_1m: 5.00, cache_creation_price_per_1m: 1.25, cache_read_price_per_1m: 0.1 }]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'Anthropic 最快速的 Claude 4 系列模型'
+    },
     provider_count: 3,
-    alias_count: 2,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-002',
     name: 'claude-opus-4-5-20251101',
     display_name: 'claude-opus-4-5',
-    description: 'Anthropic 最强大的模型',
     is_active: true,
     default_tiered_pricing: {
       tiers: [{ up_to: null, input_price_per_1m: 5.00, output_price_per_1m: 25.00, cache_creation_price_per_1m: 6.25, cache_read_price_per_1m: 0.5 }]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'Anthropic 最强大的模型'
+    },
     provider_count: 2,
-    alias_count: 1,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-003',
     name: 'claude-sonnet-4-5-20250929',
     display_name: 'claude-sonnet-4-5',
-    description: 'Anthropic 平衡型模型，支持 1h 缓存和 CLI 1M 上下文',
     is_active: true,
     default_tiered_pricing: {
       tiers: [
@@ -677,116 +676,124 @@ export const MOCK_GLOBAL_MODELS: GlobalModelResponse[] = [
         }
       ]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'Anthropic 平衡型模型，支持 1h 缓存和 CLI 1M 上下文'
+    },
     supported_capabilities: ['cache_1h', 'cli_1m'],
     provider_count: 3,
-    alias_count: 2,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-004',
     name: 'gemini-3-pro-image-preview',
     display_name: 'gemini-3-pro-image-preview',
-    description: 'Google Gemini 3 Pro 图像生成预览版',
     is_active: true,
     default_price_per_request: 0.300,
     default_tiered_pricing: {
       tiers: []
     },
-    default_supports_vision: true,
-    default_supports_function_calling: false,
-    default_supports_streaming: true,
-    default_supports_image_generation: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: false,
+      image_generation: true,
+      description: 'Google Gemini 3 Pro 图像生成预览版'
+    },
     provider_count: 1,
-    alias_count: 0,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-005',
     name: 'gemini-3-pro-preview',
     display_name: 'gemini-3-pro-preview',
-    description: 'Google Gemini 3 Pro 预览版',
     is_active: true,
     default_tiered_pricing: {
       tiers: [{ up_to: null, input_price_per_1m: 2.00, output_price_per_1m: 12.00 }]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'Google Gemini 3 Pro 预览版'
+    },
     provider_count: 1,
-    alias_count: 0,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-006',
     name: 'gpt-5.1',
     display_name: 'gpt-5.1',
-    description: 'OpenAI GPT-5.1 模型',
     is_active: true,
     default_tiered_pricing: {
       tiers: [{ up_to: null, input_price_per_1m: 1.25, output_price_per_1m: 10.00 }]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'OpenAI GPT-5.1 模型'
+    },
     provider_count: 2,
-    alias_count: 1,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-007',
     name: 'gpt-5.1-codex',
     display_name: 'gpt-5.1-codex',
-    description: 'OpenAI GPT-5.1 Codex 代码专用模型',
     is_active: true,
     default_tiered_pricing: {
       tiers: [{ up_to: null, input_price_per_1m: 1.25, output_price_per_1m: 10.00 }]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'OpenAI GPT-5.1 Codex 代码专用模型'
+    },
     provider_count: 2,
-    alias_count: 0,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-008',
     name: 'gpt-5.1-codex-max',
     display_name: 'gpt-5.1-codex-max',
-    description: 'OpenAI GPT-5.1 Codex Max 代码专用增强版',
     is_active: true,
     default_tiered_pricing: {
       tiers: [{ up_to: null, input_price_per_1m: 1.25, output_price_per_1m: 10.00 }]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'OpenAI GPT-5.1 Codex Max 代码专用增强版'
+    },
     provider_count: 2,
-    alias_count: 0,
     created_at: '2024-01-01T00:00:00Z'
   },
   {
     id: 'gm-009',
     name: 'gpt-5.1-codex-mini',
     display_name: 'gpt-5.1-codex-mini',
-    description: 'OpenAI GPT-5.1 Codex Mini 轻量代码模型',
     is_active: true,
     default_tiered_pricing: {
       tiers: [{ up_to: null, input_price_per_1m: 1.25, output_price_per_1m: 10.00 }]
     },
-    default_supports_vision: true,
-    default_supports_function_calling: true,
-    default_supports_streaming: true,
-    default_supports_extended_thinking: true,
+    config: {
+      streaming: true,
+      vision: true,
+      function_calling: true,
+      extended_thinking: true,
+      description: 'OpenAI GPT-5.1 Codex Mini 轻量代码模型'
+    },
     provider_count: 2,
-    alias_count: 0,
     created_at: '2024-01-01T00:00:00Z'
   }
 ]
@@ -804,16 +811,16 @@ export const MOCK_USAGE_RESPONSE: UsageResponse = {
   quota_usd: 100,
   used_usd: 45.32,
   summary_by_model: [
-    { model: 'claude-sonnet-4-20250514', requests: 456, input_tokens: 650000, output_tokens: 250000, total_tokens: 900000, total_cost_usd: 18.50, actual_total_cost_usd: 13.50 },
-    { model: 'gpt-4o', requests: 312, input_tokens: 480000, output_tokens: 180000, total_tokens: 660000, total_cost_usd: 12.30, actual_total_cost_usd: 9.20 },
-    { model: 'claude-haiku-3-5-20241022', requests: 289, input_tokens: 420000, output_tokens: 170000, total_tokens: 590000, total_cost_usd: 8.50, actual_total_cost_usd: 6.30 },
-    { model: 'gemini-2.0-flash', requests: 177, input_tokens: 250000, output_tokens: 100000, total_tokens: 350000, total_cost_usd: 6.37, actual_total_cost_usd: 4.33 }
+    { model: 'claude-sonnet-4-5-20250929', requests: 456, input_tokens: 650000, output_tokens: 250000, total_tokens: 900000, total_cost_usd: 18.50, actual_total_cost_usd: 13.50 },
+    { model: 'gpt-5.1', requests: 312, input_tokens: 480000, output_tokens: 180000, total_tokens: 660000, total_cost_usd: 12.30, actual_total_cost_usd: 9.20 },
+    { model: 'claude-haiku-4-5-20251001', requests: 289, input_tokens: 420000, output_tokens: 170000, total_tokens: 590000, total_cost_usd: 8.50, actual_total_cost_usd: 6.30 },
+    { model: 'gemini-3-pro-preview', requests: 177, input_tokens: 250000, output_tokens: 100000, total_tokens: 350000, total_cost_usd: 6.37, actual_total_cost_usd: 4.33 }
   ],
   records: [
     {
       id: 'usage-001',
       provider: 'anthropic',
-      model: 'claude-sonnet-4-20250514',
+      model: 'claude-sonnet-4-5-20250929',
       input_tokens: 1500,
       output_tokens: 800,
       total_tokens: 2300,
@@ -828,7 +835,7 @@ export const MOCK_USAGE_RESPONSE: UsageResponse = {
     {
       id: 'usage-002',
       provider: 'openai',
-      model: 'gpt-4o',
+      model: 'gpt-5.1',
       input_tokens: 2000,
       output_tokens: 500,
       total_tokens: 2500,

frontend/src/mocks/handler.ts

@@ -367,6 +367,11 @@ function generateMockUsageRecords(count: number = 100) {
       user_id: user.id,
       username: user.username,
       user_email: user.email,
+      api_key: {
+        id: `key-${user.id}-${Math.ceil(Math.random() * 2)}`,
+        name: `${user.username} Key ${Math.ceil(Math.random() * 3)}`,
+        display: `sk-ae...${String(1000 + Math.floor(Math.random() * 9000))}`
+      },
       provider: model.provider,
       api_key_name: `${model.provider}-key-${Math.ceil(Math.random() * 3)}`,
       rate_multiplier: 1.0,
@@ -403,26 +408,26 @@ function getUsageRecords() {
   return cachedUsageRecords
 }
 
-// Mock 别名数据
+// Mock 映射数据
 const MOCK_ALIASES = [
-  { id: 'alias-001', source_model: 'claude-4-sonnet', target_global_model_id: 'gm-001', target_global_model_name: 'claude-sonnet-4-20250514', target_global_model_display_name: 'Claude Sonnet 4', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' },
-  { id: 'alias-002', source_model: 'claude-4-opus', target_global_model_id: 'gm-002', target_global_model_name: 'claude-opus-4-20250514', target_global_model_display_name: 'Claude Opus 4', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' },
-  { id: 'alias-003', source_model: 'gpt4o', target_global_model_id: 'gm-004', target_global_model_name: 'gpt-4o', target_global_model_display_name: 'GPT-4o', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' },
-  { id: 'alias-004', source_model: 'gemini-flash', target_global_model_id: 'gm-005', target_global_model_name: 'gemini-2.0-flash', target_global_model_display_name: 'Gemini 2.0 Flash', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' }
+  { id: 'alias-001', source_model: 'claude-4-sonnet', target_global_model_id: 'gm-003', target_global_model_name: 'claude-sonnet-4-5-20250929', target_global_model_display_name: 'Claude Sonnet 4.5', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' },
+  { id: 'alias-002', source_model: 'claude-4-opus', target_global_model_id: 'gm-002', target_global_model_name: 'claude-opus-4-5-20251101', target_global_model_display_name: 'Claude Opus 4.5', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' },
+  { id: 'alias-003', source_model: 'gpt5', target_global_model_id: 'gm-006', target_global_model_name: 'gpt-5.1', target_global_model_display_name: 'GPT-5.1', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' },
+  { id: 'alias-004', source_model: 'gemini-pro', target_global_model_id: 'gm-005', target_global_model_name: 'gemini-3-pro-preview', target_global_model_display_name: 'Gemini 3 Pro Preview', provider_id: null, provider_name: null, scope: 'global', mapping_type: 'alias', is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: '2024-01-01T00:00:00Z' }
 ]
 
 // Mock Endpoint Keys
 const MOCK_ENDPOINT_KEYS = [
-  { id: 'ekey-001', endpoint_id: 'ep-001', api_key_masked: 'sk-ant...abc1', name: 'Primary Key', rate_multiplier: 1.0, internal_priority: 1, health_score: 98, consecutive_failures: 0, request_count: 5000, success_count: 4950, error_count: 50, success_rate: 99, avg_response_time_ms: 1200, is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
-  { id: 'ekey-002', endpoint_id: 'ep-001', api_key_masked: 'sk-ant...def2', name: 'Backup Key', rate_multiplier: 1.0, internal_priority: 2, health_score: 95, consecutive_failures: 1, request_count: 2000, success_count: 1950, error_count: 50, success_rate: 97.5, avg_response_time_ms: 1350, is_active: true, created_at: '2024-02-01T00:00:00Z', updated_at: new Date().toISOString() },
-  { id: 'ekey-003', endpoint_id: 'ep-002', api_key_masked: 'sk-oai...ghi3', name: 'OpenAI Main', rate_multiplier: 1.0, internal_priority: 1, health_score: 97, consecutive_failures: 0, request_count: 3500, success_count: 3450, error_count: 50, success_rate: 98.6, avg_response_time_ms: 900, is_active: true, created_at: '2024-01-15T00:00:00Z', updated_at: new Date().toISOString() }
+  { id: 'ekey-001', provider_id: 'provider-001', api_formats: ['CLAUDE'], api_key_masked: 'sk-ant...abc1', name: 'Primary Key', rate_multiplier: 1.0, internal_priority: 1, health_score: 0.98, consecutive_failures: 0, request_count: 5000, success_count: 4950, error_count: 50, success_rate: 0.99, avg_response_time_ms: 1200, cache_ttl_minutes: 5, max_probe_interval_minutes: 32, is_active: true, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
+  { id: 'ekey-002', provider_id: 'provider-001', api_formats: ['CLAUDE'], api_key_masked: 'sk-ant...def2', name: 'Backup Key', rate_multiplier: 1.0, internal_priority: 2, health_score: 0.95, consecutive_failures: 1, request_count: 2000, success_count: 1950, error_count: 50, success_rate: 0.975, avg_response_time_ms: 1350, cache_ttl_minutes: 5, max_probe_interval_minutes: 32, is_active: true, created_at: '2024-02-01T00:00:00Z', updated_at: new Date().toISOString() },
+  { id: 'ekey-003', provider_id: 'provider-002', api_formats: ['OPENAI'], api_key_masked: 'sk-oai...ghi3', name: 'OpenAI Main', rate_multiplier: 1.0, internal_priority: 1, health_score: 0.97, consecutive_failures: 0, request_count: 3500, success_count: 3450, error_count: 50, success_rate: 0.986, avg_response_time_ms: 900, cache_ttl_minutes: 5, max_probe_interval_minutes: 32, is_active: true, created_at: '2024-01-15T00:00:00Z', updated_at: new Date().toISOString() }
 ]
 
 // Mock Endpoints
 const MOCK_ENDPOINTS = [
-  { id: 'ep-001', provider_id: 'provider-001', provider_name: 'anthropic', api_format: 'claude', base_url: 'https://api.anthropic.com', auth_type: 'bearer', timeout: 120, max_retries: 3, priority: 100, weight: 100, health_score: 98, consecutive_failures: 0, is_active: true, total_keys: 2, active_keys: 2, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
-  { id: 'ep-002', provider_id: 'provider-002', provider_name: 'openai', api_format: 'openai', base_url: 'https://api.openai.com', auth_type: 'bearer', timeout: 60, max_retries: 3, priority: 90, weight: 100, health_score: 97, consecutive_failures: 0, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
-  { id: 'ep-003', provider_id: 'provider-003', provider_name: 'google', api_format: 'gemini', base_url: 'https://generativelanguage.googleapis.com', auth_type: 'api_key', timeout: 60, max_retries: 3, priority: 80, weight: 100, health_score: 96, consecutive_failures: 0, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-15T00:00:00Z', updated_at: new Date().toISOString() }
+  { id: 'ep-001', provider_id: 'provider-001', provider_name: 'anthropic', api_format: 'CLAUDE', base_url: 'https://api.anthropic.com', timeout: 300, max_retries: 2, is_active: true, total_keys: 2, active_keys: 2, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
+  { id: 'ep-002', provider_id: 'provider-002', provider_name: 'openai', api_format: 'OPENAI', base_url: 'https://api.openai.com', timeout: 60, max_retries: 2, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
+  { id: 'ep-003', provider_id: 'provider-003', provider_name: 'google', api_format: 'GEMINI', base_url: 'https://generativelanguage.googleapis.com', timeout: 60, max_retries: 2, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-15T00:00:00Z', updated_at: new Date().toISOString() }
 ]
 
 // Mock 能力定义
@@ -576,7 +581,6 @@ const mockHandlers: Record<string, (config: AxiosRequestConfig) => Promise<Axios
     return createMockResponse(MOCK_PROVIDERS.map(p => ({
       id: p.id,
       name: p.name,
-      display_name: p.display_name,
       is_active: p.is_active
     })))
   },
@@ -685,7 +689,7 @@ const mockHandlers: Record<string, (config: AxiosRequestConfig) => Promise<Axios
       used_usd: 0,
       total_usd: 0,
       allowed_providers: null,
-      allowed_endpoints: null,
+      allowed_api_formats: null,
       allowed_models: null,
       created_at: new Date().toISOString()
     }
@@ -835,10 +839,26 @@ const mockHandlers: Record<string, (config: AxiosRequestConfig) => Promise<Axios
   'GET /api/admin/usage/records': async (config) => {
     await delay()
     requireAdmin()
-    const records = getUsageRecords()
+    let records = getUsageRecords()
     const params = config.params || {}
     const limit = parseInt(params.limit) || 20
     const offset = parseInt(params.offset) || 0
+
+    // 通用搜索：用户名、密钥名、模型名、提供商名
+    // 支持空格分隔的组合搜索，多个关键词之间是 AND 关系
+    if (typeof params.search === 'string' && params.search.trim()) {
+      const keywords = params.search.trim().toLowerCase().split(/\s+/)
+      records = records.filter(r => {
+        // 每个关键词都要匹配至少一个字段
+        return keywords.every((keyword: string) =>
+          (r.username || '').toLowerCase().includes(keyword) ||
+          (r.api_key?.name || '').toLowerCase().includes(keyword) ||
+          (r.model || '').toLowerCase().includes(keyword) ||
+          (r.provider || '').toLowerCase().includes(keyword)
+        )
+      })
+    }
+
     return createMockResponse({
       records: records.slice(offset, offset + limit),
       total: records.length,
@@ -1000,17 +1020,11 @@ const mockHandlers: Record<string, (config: AxiosRequestConfig) => Promise<Axios
         id: m.id,
         name: m.name,
         display_name: m.display_name,
-        description: m.description,
-        icon_url: null,
         is_active: m.is_active,
         default_tiered_pricing: m.default_tiered_pricing,
-        default_price_per_request: null,
-        default_supports_vision: m.default_supports_vision,
-        default_supports_function_calling: m.default_supports_function_calling,
-        default_supports_streaming: m.default_supports_streaming,
-        default_supports_extended_thinking: m.default_supports_extended_thinking || false,
-        default_supports_image_generation: false,
-        supported_capabilities: null
+        default_price_per_request: m.default_price_per_request,
+        supported_capabilities: m.supported_capabilities,
+        config: m.config
       })),
       total: MOCK_GLOBAL_MODELS.length
     })
@@ -1207,13 +1221,8 @@ function generateMockEndpointsForProvider(providerId: string) {
       base_url: format.includes('CLAUDE') ? 'https://api.anthropic.com' :
                 format.includes('OPENAI') ? 'https://api.openai.com' :
                 'https://generativelanguage.googleapis.com',
-      auth_type: format.includes('GEMINI') ? 'api_key' : 'bearer',
-      timeout: 120,
-      max_retries: 3,
-      priority: 100 - index * 10,
-      weight: 100,
-      health_score: healthDetail?.health_score ?? 1.0,
-      consecutive_failures: healthDetail?.health_score && healthDetail.health_score < 0.7 ? 2 : 0,
+      timeout: 300,
+      max_retries: 2,
       is_active: healthDetail?.is_active ?? true,
       total_keys: Math.ceil(Math.random() * 3) + 1,
       active_keys: Math.ceil(Math.random() * 2) + 1,
@@ -1223,11 +1232,16 @@ function generateMockEndpointsForProvider(providerId: string) {
   })
 }
 
-// 为 endpoint 生成 keys
-function generateMockKeysForEndpoint(endpointId: string, count: number = 2) {
+// 为 provider 生成 keys（Key 归属 Provider，通过 api_formats 关联）
+const PROVIDER_KEYS_CACHE: Record<string, any[]> = {}
+function generateMockKeysForProvider(providerId: string, count: number = 2) {
+  const provider = MOCK_PROVIDERS.find(p => p.id === providerId)
+  const formats = provider?.api_formats || []
+
   return Array.from({ length: count }, (_, i) => ({
-    id: `key-${endpointId}-${i + 1}`,
-    endpoint_id: endpointId,
+    id: `key-${providerId}-${i + 1}`,
+    provider_id: providerId,
+    api_formats: i === 0 ? formats : formats.slice(0, 1),
     api_key_masked: `sk-***...${Math.random().toString(36).substring(2, 6)}`,
     name: i === 0 ? 'Primary Key' : `Backup Key ${i}`,
     rate_multiplier: 1.0,
@@ -1239,6 +1253,8 @@ function generateMockKeysForEndpoint(endpointId: string, count: number = 2) {
     error_count: Math.floor(Math.random() * 100),
     success_rate: 0.95 + Math.random() * 0.04,  // 0.95-0.99
     avg_response_time_ms: 800 + Math.floor(Math.random() * 600),
+    cache_ttl_minutes: 5,
+    max_probe_interval_minutes: 32,
     is_active: true,
     created_at: '2024-01-01T00:00:00Z',
     updated_at: new Date().toISOString()
@@ -1448,29 +1464,63 @@ registerDynamicRoute('PUT', '/api/admin/endpoints/:endpointId', async (config, p
 registerDynamicRoute('DELETE', '/api/admin/endpoints/:endpointId', async (_config, _params) => {
   await delay()
   requireAdmin()
-  return createMockResponse({ message: '删除成功（演示模式）' })
+  return createMockResponse({ message: '删除成功（演示模式）', affected_keys_count: 0 })
 })
 
-// Endpoint Keys 列表
-registerDynamicRoute('GET', '/api/admin/endpoints/:endpointId/keys', async (_config, params) => {
+// Provider Keys 列表
+registerDynamicRoute('GET', '/api/admin/endpoints/providers/:providerId/keys', async (_config, params) => {
   await delay()
   requireAdmin()
-  const keys = generateMockKeysForEndpoint(params.endpointId, 2)
-  return createMockResponse(keys)
+  if (!PROVIDER_KEYS_CACHE[params.providerId]) {
+    PROVIDER_KEYS_CACHE[params.providerId] = generateMockKeysForProvider(params.providerId, 2)
+  }
+  return createMockResponse(PROVIDER_KEYS_CACHE[params.providerId])
 })
 
-// 创建 Key
-registerDynamicRoute('POST', '/api/admin/endpoints/:endpointId/keys', async (config, params) => {
+// 为 Provider 创建 Key
+registerDynamicRoute('POST', '/api/admin/endpoints/providers/:providerId/keys', async (config, params) => {
   await delay()
   requireAdmin()
   const body = JSON.parse(config.data || '{}')
-  return createMockResponse({
+  const apiKeyPlain = body.api_key || 'sk-demo'
+  const masked = apiKeyPlain.length >= 12
+    ? `${apiKeyPlain.slice(0, 8)}***${apiKeyPlain.slice(-4)}`
+    : 'sk-***...demo'
+
+  const newKey = {
     id: `key-demo-${Date.now()}`,
-    endpoint_id: params.endpointId,
-    api_key_masked: 'sk-***...demo',
-    ...body,
-    created_at: new Date().toISOString()
-  })
+    provider_id: params.providerId,
+    api_formats: body.api_formats || [],
+    api_key_masked: masked,
+    api_key_plain: null,
+    name: body.name || 'New Key',
+    note: body.note,
+    rate_multiplier: body.rate_multiplier ?? 1.0,
+    rate_multipliers: body.rate_multipliers ?? null,
+    internal_priority: body.internal_priority ?? 50,
+    global_priority: body.global_priority ?? null,
+    rpm_limit: body.rpm_limit ?? null,
+    allowed_models: body.allowed_models ?? null,
+    capabilities: body.capabilities ?? null,
+    cache_ttl_minutes: body.cache_ttl_minutes ?? 5,
+    max_probe_interval_minutes: body.max_probe_interval_minutes ?? 32,
+    health_score: 1.0,
+    consecutive_failures: 0,
+    request_count: 0,
+    success_count: 0,
+    error_count: 0,
+    success_rate: 0.0,
+    avg_response_time_ms: 0.0,
+    is_active: true,
+    created_at: new Date().toISOString(),
+    updated_at: new Date().toISOString(),
+  }
+
+  if (!PROVIDER_KEYS_CACHE[params.providerId]) {
+    PROVIDER_KEYS_CACHE[params.providerId] = []
+  }
+  PROVIDER_KEYS_CACHE[params.providerId].push(newKey)
+  return createMockResponse(newKey)
 })
 
 // Key 更新
@@ -1488,6 +1538,50 @@ registerDynamicRoute('DELETE', '/api/admin/endpoints/keys/:keyId', async (_confi
   return createMockResponse({ message: '删除成功（演示模式）' })
 })
 
+// Key Reveal
+registerDynamicRoute('GET', '/api/admin/endpoints/keys/:keyId/reveal', async (_config, _params) => {
+  await delay()
+  requireAdmin()
+  return createMockResponse({ api_key: 'sk-demo-reveal' })
+})
+
+// Keys grouped by format
+mockHandlers['GET /api/admin/endpoints/keys/grouped-by-format'] = async () => {
+  await delay()
+  requireAdmin()
+
+  // 确保每个 provider 都有 key 数据
+  for (const provider of MOCK_PROVIDERS) {
+    if (!PROVIDER_KEYS_CACHE[provider.id]) {
+      PROVIDER_KEYS_CACHE[provider.id] = generateMockKeysForProvider(provider.id, 2)
+    }
+  }
+
+  const grouped: Record<string, any[]> = {}
+  for (const provider of MOCK_PROVIDERS) {
+    const endpoints = generateMockEndpointsForProvider(provider.id)
+    const baseUrlByFormat = Object.fromEntries(endpoints.map(e => [e.api_format, e.base_url]))
+    const keys = PROVIDER_KEYS_CACHE[provider.id] || []
+    for (const key of keys) {
+      const formats: string[] = key.api_formats || []
+      for (const fmt of formats) {
+        if (!grouped[fmt]) grouped[fmt] = []
+        grouped[fmt].push({
+          ...key,
+          api_format: fmt,
+          provider_name: provider.name,
+          endpoint_base_url: baseUrlByFormat[fmt],
+          global_priority: key.global_priority ?? null,
+          circuit_breaker_open: false,
+          capabilities: [],
+        })
+      }
+    }
+  }
+
+  return createMockResponse(grouped)
+}
+
 // Provider Models 列表
 registerDynamicRoute('GET', '/api/admin/providers/:providerId/models', async (_config, params) => {
   await delay()
@@ -1688,7 +1782,7 @@ registerDynamicRoute('GET', '/api/admin/models/mappings/:mappingId', async (_con
   requireAdmin()
   const alias = MOCK_ALIASES.find(a => a.id === params.mappingId)
   if (!alias) {
-    throw { response: createMockResponse({ detail: '别名不存在' }, 404) }
+    throw { response: createMockResponse({ detail: '映射不存在' }, 404) }
   }
   return createMockResponse(alias)
 })
@@ -1699,7 +1793,7 @@ registerDynamicRoute('PATCH', '/api/admin/models/mappings/:mappingId', async (co
   requireAdmin()
   const alias = MOCK_ALIASES.find(a => a.id === params.mappingId)
   if (!alias) {
-    throw { response: createMockResponse({ detail: '别名不存在' }, 404) }
+    throw { response: createMockResponse({ detail: '映射不存在' }, 404) }
   }
   const body = JSON.parse(config.data || '{}')
   return createMockResponse({ ...alias, ...body, updated_at: new Date().toISOString() })
@@ -1711,7 +1805,7 @@ registerDynamicRoute('DELETE', '/api/admin/models/mappings/:mappingId', async (_
   requireAdmin()
   const alias = MOCK_ALIASES.find(a => a.id === params.mappingId)
   if (!alias) {
-    throw { response: createMockResponse({ detail: '别名不存在' }, 404) }
+    throw { response: createMockResponse({ detail: '映射不存在' }, 404) }
   }
   return createMockResponse({ message: '删除成功（演示模式）' })
 })
@@ -2178,10 +2272,10 @@ function generateIntervalTimelineData(
 
   // 模型列表（用于按模型区分颜色）
   const models = [
-    'claude-sonnet-4-20250514',
-    'claude-3-5-sonnet-20241022',
-    'claude-3-5-haiku-20241022',
-    'claude-opus-4-20250514'
+    'claude-sonnet-4-5-20250929',
+    'claude-haiku-4-5-20251001',
+    'claude-opus-4-5-20251101',
+    'gpt-5.1'
   ]
 
   // 生成模拟的请求间隔数据