style: 修复ruff check告警（未用import/循环变量/zip strict）

fix(ci): 前端脚本改用npm ci（项目用package-lock.json而非pnpm）
fix(ci): 去掉前端脚本DooD嵌套，直接在CI容器内运行
2026-07-23 17:46:40 +08:00 · 2026-07-23 17:37:44 +08:00 · 2026-07-23 17:37:44 +08:00 · 2026-07-23 17:32:34 +08:00 · 2026-07-23 13:58:26 +08:00
1272 changed files with 46733 additions and 169511 deletions
@@ -1,198 +1,60 @@
-# ============================================================
-# 小虾 SaaS 环境变量完整配置
-# ============================================================
-# 本文件列出所有可配置的环境变量及默认值。
-# 复制为 .env 后按需修改；生产环境务必覆盖所有密钥类配置。
-#
-# 配置读取规则（pydantic-settings，大小写不敏感）：
-#   1. 系统环境变量（最高优先级）
-#   2. .env.{APP_ENV} 文件（如 .env.staging）
-#   3. .env 文件
-#   4. 代码中的默认值（最低优先级）
-# ============================================================
+# 小虾 SaaS 环境变量配置

-
-# ==================== 应用基本配置 ====================
-
-# 应用名称
-APP_NAME=xiaoxia-saas
-
-# 应用版本号（展示用，代码中已内置默认）
-APP_VERSION=0.1.61
-
-# 环境标识：development / staging / production
-# 决定读取 .env.{APP_ENV} 还是 .env，也影响部分配置的严格校验
+# ==================== 应用配置 ====================
+APP_NAME=小虾 SaaS
+APP_BASE_URL=http://localhost:3000
 APP_ENV=development

-# 是否开启 Debug 模式（开发环境 true，生产环境 false）
-DEBUG=true
-
-# 应用基础 URL，用于生成认证邮件、回调链接等
-APP_BASE_URL=http://localhost:3000
-
-# API 服务监听地址（容器内绑定，外部暴露由 Docker/Nginx 控制）
-API_HOST=0.0.0.0
-
-# API 服务监听端口
-API_PORT=8000
-
-# 是否自动创建数据库表结构（开发环境可开启，生产环境用 alembic migration）
-AUTO_CREATE_SCHEMA=false
-
-
 # ==================== 数据库配置 ====================
+DATABASE_URL=postgresql://xiaoxia_user:your_password@localhost:5432/xiaoxia_saas

-# 数据库连接串（格式：postgresql+psycopg://user:password@host:port/dbname）
-DATABASE_URL=postgresql+psycopg://postgres:postgres@localhost:5432/xiaoxia_saas
-
-# 连接池大小（常驻连接数）
-DATABASE_POOL_SIZE=20
-
-# 连接池最大溢出连接数（pool_size + max_overflow = 最大并发连接数）
-DATABASE_MAX_OVERFLOW=10
-
-# 获取连接超时时间（秒）
-DATABASE_POOL_TIMEOUT=30
-
-# 连接回收时间（秒），防止数据库端主动断开导致的死连接
-DATABASE_POOL_RECYCLE=3600
-
-# 是否使用内存数据库（SQLite，仅开发/测试可用；生产务必 false）
-USE_IN_MEMORY_DB=false
+# 开发环境：使用内存数据库（不需要 PostgreSQL）
+USE_IN_MEMORY_DB=true

+# 生产环境：使用 PostgreSQL
+# USE_IN_MEMORY_DB=false

 # ==================== Redis 配置 ====================
-
-# Redis 连接 URL（格式：redis://[:password@]host:port/db）
 REDIS_URL=redis://localhost:6379/0

-# 是否使用 Redis 存储 Session（多实例部署时必须开启；开发可用内存存储）
-ENABLE_REDIS_SESSIONS=false
-
-
-# ==================== Celery 任务队列 ====================
-
-# Celery Broker（任务分发），默认用 Redis db0
-CELERY_BROKER_URL=redis://localhost:6379/0
-
-# Celery Result Backend（任务结果存储），默认用 Redis db1
-CELERY_RESULT_BACKEND=redis://localhost:6379/1
-
-
-# ==================== Worker 配置 ====================
-
-# Worker 进程名称
-WORKER_NAME=xiaoxia-saas-worker
-
-# Worker 并发数（同时执行的任务数）
-WORKER_CONCURRENCY=4
-
-# 每个子进程最多处理多少任务后重启（防止内存泄漏）
-WORKER_MAX_TASKS_PER_CHILD=1000
-
-
-# ==================== JWT 认证配置 ====================
-
-# JWT 签名密钥 — 生产环境必须设置为强随机字符串（至少32字符）
-# 内置不安全值会被拒绝：secret / changeme / password / your-secret-key 等
+# ==================== JWT 配置 ====================
 JWT_SECRET_KEY=your-super-secret-key-change-this-in-production-min-32-chars
-
-# JWT 签名算法
 JWT_ALGORITHM=HS256
-
-# Access Token 过期时间（分钟）
 JWT_ACCESS_TOKEN_EXPIRE_MINUTES=30
-
-# Refresh Token 过期时间（天）
 JWT_REFRESH_TOKEN_EXPIRE_DAYS=30

-
 # ==================== 邮件配置 ====================
-
-# 是否启用邮件投递（关闭时邮件内容打印到日志，开发调试用）
-ENABLE_EMAIL_DELIVERY=false
-
-# SMTP 服务器地址
 SMTP_HOST=smtp.gmail.com
-
-# SMTP 端口
 SMTP_PORT=587
-
-# SMTP 用户名
 SMTP_USER=your-email@gmail.com
-
-# SMTP 密码 / 应用专用密码
 SMTP_PASSWORD=your-app-specific-password
-
-# 发件人邮箱
 SMTP_FROM_EMAIL=noreply@xiaoxia-saas.com
-
-# 发件人显示名称
 SMTP_FROM_NAME=小虾 SaaS

-# 是否启用 TLS
-SMTP_USE_TLS=true
-
-
-# ==================== 阿里云 OSS 配置 ====================
-
-# OSS 区域 endpoint
-OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
-
-# OSS Access Key ID — 非开发环境必须设置
-OSS_ACCESS_KEY_ID=your-access-key-id
-
-# OSS Access Key Secret — 非开发环境必须设置
-OSS_ACCESS_KEY_SECRET=your-access-key-secret
-
-# OSS Bucket 名称
-OSS_BUCKET_NAME=xiaoxia-autocut
-
-# 直传最大文件大小（MB）
-OSS_DIRECT_UPLOAD_MAX_MB=2000
-
-# 直传签名有效期（秒）
-OSS_DIRECT_UPLOAD_EXPIRE_SECONDS=900
-
+# ==================== 环境配置 ====================
+ENVIRONMENT=development
+DEBUG=true

 # ==================== CORS 配置 ====================
+# 逗号分隔的域名列表（Settings 读取 CORS_ORIGINS_RAW）
+CORS_ORIGINS_RAW=http://localhost:3000,http://localhost:5173

-# 允许跨域的前端域名列表，逗号分隔
-CORS_ORIGINS_RAW=http://localhost:3000,http://localhost:5173,http://localhost:8000
-
-
-# ==================== 渲染引擎配置 ====================
-
-# 渲染引擎选择：
-#   legacy   — 旧 VideoComposeService（稳定，功能完整）
-#   unified  — 新 UnifiedRenderService（新架构，部分场景仍在验证）
-RENDER_ENGINE=legacy
-
-
-# ==================== CosyVoice 语音合成 ====================
-# 阿里云百灵语音合成服务
-# 模型选择：
-#   cosyvoice-v3-flash  — 推荐，系统音色多，性价比高
-#   cosyvoice-v3-plus   — 高质量，系统音色少
-#   cosyvoice-v3.5-flash / cosyvoice-v3.5-plus — 仅支持克隆/设计音色，无系统音色
-# 音色：v3 系列系统音色带 _v3 后缀，如 longxiaochun_v3 / longxiaoxia_v3 / longanyang
+# ==================== 阿里云 OSS 配置 ====================
+OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
+OSS_ACCESS_KEY_ID=your-access-key-id
+OSS_ACCESS_KEY_SECRET=your-access-key-secret
+OSS_BUCKET_NAME=xiaoxia-autocut

+# ==================== CosyVoice 语音合成配置 ====================
+# 注意：base_url 只需写到 /api/v1，具体路径由代码拼接
+# 模型: cosyvoice-v3-flash (推荐，支持系统音色，性价比高)
+#       cosyvoice-v3-plus (高质量，系统音色少)
+#       cosyvoice-v3.5-flash / cosyvoice-v3.5-plus (仅支持克隆/设计音色，无系统音色)
+# 音色: v3系列系统音色带 _v3 后缀，如 longxiaochun_v3, longxiaoxia_v3, longanyang (无后缀)
+# 注意：COSYVOICE_* 变量由 packages/shared/config.py 的 SharedSettings 读取
 COSYVOICE_API_KEY=your-cosyvoice-api-key
 COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
 COSYVOICE_MODEL=cosyvoice-v3-flash
 COSYVOICE_VOICE=longxiaochun_v3
 COSYVOICE_SAMPLE_RATE=22050
 COSYVOICE_FORMAT=mp3
-
-# 音色克隆模型名（固定为 voice-enrollment，通常不需修改）
-COSYVOICE_CLONE_MODEL=voice-enrollment
-
-
-# ==================== 豆包大模型（火山引擎方舟） ====================
-# 用于 AI 文案生成、智能剪辑等需要大模型能力的场景
-
-DOUBAO_API_KEY=your-doubao-api-key
-DOUBAO_MODEL=doubao-seed-1-6-250615
-DOUBAO_BASE_URL=https://ark.cn-beijing.volces.com/api/v3
-DOUBAO_TIMEOUT=30
-DOUBAO_MAX_RETRIES=2
@@ -1,161 +0,0 @@
-name: ACR Cleanup
-
-on:
-  schedule:
-    - cron: '0 19 * * *'  # UTC 19:00 = 北京时间凌晨3:00
-  workflow_dispatch:
-    inputs:
-      pr_sha:
-        description: "PR commit SHA（仅清理指定PR镜像，留空则全量清理）"
-        required: false
-        default: ""
-      dry_run:
-        description: "预览模式（dry-run），不实际删除"
-        required: false
-        default: "true"
-  pull_request_target:
-    types: [closed]
-    branches: [develop, main]
-
-concurrency:
-  group: acr-cleanup-${{ gitea.ref }}
-  cancel-in-progress: false
-
-jobs:
-  cleanup:
-    name: ACR Image Cleanup
-    runs-on: ci-l2
-    timeout-minutes: 20
-    permissions:
-      contents: read
-    env:
-      ACR_REGISTRY: xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com
-      ACR_NAMESPACE: xiaoxiakeji
-      ACR_SERVICE: registry.aliyuncs.com:cn-hangzhou:china:cri-fvec8o9q4mmxrkaa
-      GITEA_URL: https://git.xiaoxiajianji.com
-      GITEA_REPO: xiaoxia/xiaoxia-saas
-    steps:
-      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
-
-      # ====== Cron模式：获取staging运行中镜像作为白名单 ======
-      - name: Get staging running images (whitelist)
-        id: protected_images
-        if: gitea.event_name != 'pull_request_target' && !gitea.event.inputs.pr_sha
-        env:
-          STAGING_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
-        run: |
-          set +e
-          echo "获取staging服务器运行中镜像作为白名单..."
-          mkdir -p ~/.ssh
-          echo "$STAGING_SSH_KEY" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-
-          staging_host="${STAGING_SSH_HOST:-47.98.113.167}"
-          staging_port="${STAGING_SSH_PORT:-22222}"
-
-          ssh-keyscan -p "$staging_port" -H "$staging_host" >> ~/.ssh/known_hosts 2>/dev/null
-
-          # 获取所有运行容器的镜像，提取tag部分
-          IMAGES=$(ssh -p "$staging_port" -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no \
-            "root@$staging_host" "docker ps --format '{{.Image}}' 2>/dev/null" 2>/dev/null | grep -v "^$" | sort -u)
-
-          PROTECTED_TAGS=""
-          if [ -n "$IMAGES" ]; then
-            while IFS= read -r img; do
-              # 从完整镜像名中提取tag（最后一个冒号后）
-              tag=$(echo "$img" | rev | cut -d: -f1 | rev)
-              if [ -n "$tag" ] && [ "$tag" != "latest" ] && [ ${#tag} -gt 5 ]; then
-                if [ -z "$PROTECTED_TAGS" ]; then
-                  PROTECTED_TAGS="$tag"
-                else
-                  PROTECTED_TAGS="$PROTECTED_TAGS,$tag"
-                fi
-              fi
-            done <<< "$IMAGES"
-          fi
-
-          echo "staging运行中镜像tag: ${PROTECTED_TAGS:-（无）}"
-          echo "protected_tags=$PROTECTED_TAGS" >> $GITEA_OUTPUT
-
-      # ====== Docker登录 ======
-      - name: Docker login to ACR
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-        run: |
-          printf '%s' "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" -u "$ACR_USERNAME" --password-stdin
-
-      # ====== 模式1：PR关闭时清理 ======
-      - name: Cleanup PR images (PR closed)
-        if: gitea.event_name == 'pull_request_target'
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          PR_SHA: ${{ gitea.event.pull_request.head.sha }}
-          PR_NUMBER: ${{ gitea.event.pull_request.number }}
-        run: |
-          echo "============================================"
-          echo "  PR #$PR_NUMBER 已关闭，清理对应镜像"
-          echo "  Head SHA: ${PR_SHA::12}"
-          echo "============================================"
-          echo ""
-          python3 scripts/ci/acr_cleanup.py \
-            --pr-sha "$PR_SHA" \
-            --execute
-
-      # ====== 模式2：Cron全量清理 ======
-      - name: Full cleanup (cron / manual)
-        if: gitea.event_name != 'pull_request_target' && !gitea.event.inputs.pr_sha
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          PROTECTED_TAGS: ${{ steps.protected_images.outputs.protected_tags }}
-          DRY_RUN_INPUT: ${{ gitea.event.inputs.dry_run }}
-        run: |
-          echo "============================================"
-          echo "  ACR 全量清理（${{ gitea.event_name }}）"
-          echo "============================================"
-          echo ""
-
-          # 决定是否dry-run
-          DRY_RUN_FLAG=""
-          if [ "$DRY_RUN_INPUT" = "true" ]; then
-            DRY_RUN_FLAG="--dry-run"
-            echo "模式: 预览模式 (dry-run)"
-          else
-            echo "模式: 执行模式"
-          fi
-          echo ""
-
-          python3 scripts/ci/acr_cleanup.py \
-            --keep 20 \
-            --protected-tags "$PROTECTED_TAGS" \
-            $DRY_RUN_FLAG
-
-      # ====== 模式3：手动指定PR SHA清理 ======
-      - name: Cleanup specific PR image (manual)
-        if: gitea.event_name == 'workflow_dispatch' && gitea.event.inputs.pr_sha
-        env:
-          ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-          ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-          PR_SHA: ${{ gitea.event.inputs.pr_sha }}
-          DRY_RUN_INPUT: ${{ gitea.event.inputs.dry_run }}
-        run: |
-          echo "手动清理PR镜像: ${PR_SHA::12}"
-          echo ""
-
-          DRY_RUN_FLAG=""
-          if [ "$DRY_RUN_INPUT" = "true" ]; then
-            DRY_RUN_FLAG="--dry-run"
-          fi
-
-          python3 scripts/ci/acr_cleanup.py \
-            --pr-sha "$PR_SHA" \
-            $DRY_RUN_FLAG
@@ -1,84 +0,0 @@
-name: API Base Image Build
-
-on:
-  push:
-    branches:
-      - develop
-      - main
-    paths:
-      - 'requirements-base.txt'
-      - 'requirements.txt'
-      - 'infra/docker/api-base.Dockerfile'
-  workflow_dispatch:
-
-jobs:
-  build-api-base:
-    name: Build API Base Image
-    runs-on: runtime-builder
-    timeout-minutes: 45
-    steps:
-    - name: Checkout code
-      shell: sh
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        curl -sH "Authorization: token $GITHUB_TOKEN" \
-          "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
-          | bash
-
-    - name: Docker login to Registry
-      shell: sh
-      env:
-        ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-        ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-        GITEA_REGISTRY_USER: xiaoxia
-        GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-      run: |
-        set -eu
-        for i in 1 2 3; do
-          echo "=== Docker login 尝试 $i/3 ==="
-          if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
-              && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
-            echo "✅ Docker login successful"
-            break
-          fi
-          echo "❌ Docker login 失败（尝试 $i/3），5s 后重试..."
-          sleep 5
-        done
-
-    - name: Build and push API base image
-      shell: sh
-      run: |
-        set -eu
-        ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
-        GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/saas-api-base:latest"
-
-        echo "=== Building API base image ==="
-
-        # 使用普通 docker build（单平台不需要 buildx）
-        docker build \
-          -f infra/docker/api-base.Dockerfile \
-          -t "${ACR_IMAGE}" \
-          .
-
-        echo ""
-        echo "✅ Image built successfully"
-
-        # 推送到 ACR
-        echo "=== Pushing to ACR ==="
-        docker push "${ACR_IMAGE}"
-        echo "✅ Pushed to ACR"
-
-        # 打标签并推送到 Gitea Packages 作为备份
-        echo "=== Pushing to Gitea Packages ==="
-        docker tag "${ACR_IMAGE}" "${GITEA_IMAGE}"
-        docker push "${GITEA_IMAGE}" || echo "⚠️ Gitea Packages push failed (non-fatal)"
-        echo "✅ Gitea backup push completed"
-
-    - name: Cleanup
-      if: always()
-      shell: sh
-      run: |
-        ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
-        docker rmi "${ACR_IMAGE}" 2>/dev/null || true
-        echo "Cleanup done"
@@ -8,7 +8,7 @@ permissions:
 jobs:
  ci-health-report:
    name: CI健康度每日巡检
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 15
    steps:
    - name: Checkout code
@@ -21,7 +21,7 @@ on:
 permissions:
  contents: read
 concurrency:
-  group: ci-pipeline-${{ gitea.ref }}
+  group: ci-pipeline-${{ gitea.event_name }}-${{ gitea.ref }}
  cancel-in-progress: true
 jobs:
  check-frontend-only:
@@ -37,7 +37,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Check changed files
      id: check
      shell: bash
@@ -90,7 +90,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -180,7 +180,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -259,7 +259,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -340,7 +340,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -394,9 +394,7 @@ jobs:
    if: always() && needs.check-frontend-only.outputs.skip_backend != 'true'
    needs:
      - check-frontend-only
-      - validate-code-quality
-      - validate-type-check
-      - validate-migration
+      - validate
    env:
      DATABASE_URL: postgresql+psycopg://postgres:postgres@host.docker.internal:5432/xiaoxia_saas
      USE_IN_MEMORY_DB: 'false'
@@ -411,7 +409,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -457,15 +455,13 @@ jobs:
    name: Frontend Lint
    runs-on: ci-l2
    timeout-minutes: 10
-    needs: check-frontend-only
-    if: needs.check-frontend-only.outputs.skip_frontend != 'true'
    steps:
    - name: Checkout code
      shell: sh
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -527,7 +523,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -577,12 +573,7 @@ jobs:
    name: PR Build ${{ matrix.service_display }} Image
    runs-on: runtime-builder
    timeout-minutes: ${{ matrix.timeout }}
-    needs: check-frontend-only
-    if: |
-      github.event_name == 'pull_request' && (
-        (matrix.service == 'web' && needs.check-frontend-only.outputs.skip_frontend != 'true') ||
-        (matrix.service != 'web' && needs.check-frontend-only.outputs.skip_backend != 'true')
-      )
+    if: github.event_name == 'pull_request'
    strategy:
      fail-fast: false
      matrix:
@@ -611,7 +602,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -633,25 +624,63 @@ jobs:
          echo "Docker login failed ($i/3), retrying in 5s..."
          sleep 5
        done
-    - name: Pre-build worker base image (fallback if not exist)
+    - name: Pre-build worker base images (fallback if not exist)
      if: matrix.service == 'worker'
      id: prebuild
      shell: sh
      run: |
        set -eu
-        REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
-        BASE_IMAGE="${REGISTRY}/saas-worker-base:latest"
+        REGISTRY="git.xiaoxiajianji.com/xiaoxia-saas"
+        BASE_BUILDER="${REGISTRY}/worker-base-builder:latest"
+        BASE_RUNTIME="${REGISTRY}/worker-base-runtime:latest"
        
        # 尝试拉取基础镜像
-        echo "检查 Worker 基础镜像..."
-        if docker pull "$BASE_IMAGE" 2>/dev/null; then
-          echo "✅ 基础镜像已存在"
+        echo "检查基础镜像..."
+        if docker pull "$BASE_BUILDER" 2>/dev/null && docker pull "$BASE_RUNTIME" 2>/dev/null; then
+          echo "基础镜像已存在，使用远程镜像"
          echo "fallback=false" >> $GITHUB_OUTPUT
        else
-          echo "⚠️ 基础镜像不存在，本地构建（fallback模式）..."
-          docker build -f infra/docker/worker-base.Dockerfile -t "$BASE_IMAGE" .
+          echo "基础镜像不存在，本地构建（fallback模式）..."
+          
+          # 构建builder基础镜像
+          echo "构建 worker-base-builder..."
+          # 用buildx docker-container驱动构建（兼容DooD模式：普通docker build看不到容器内文件）
+          BUILDER_NAME="ci-pr-builder-${GITHUB_RUN_ID:-local}"
+          if ! docker buildx inspect "$BUILDER_NAME" > /dev/null 2>&1; then
+            docker buildx create --use --name "$BUILDER_NAME" --driver docker-container
+          else
+            docker buildx use "$BUILDER_NAME"
+          fi
+          docker buildx inspect --bootstrap > /dev/null 2>&1
+          
+          # 构建builder基础镜像（带重试，buildx容器偶发不稳定）
+          echo "构建 worker-base-builder..."
+          for attempt in 1 2 3; do
+            if docker buildx build --load -f infra/docker/worker-base-builder.Dockerfile -t "$BASE_BUILDER" .; then
+              echo "worker-base-builder 构建成功"
+              break
+            fi
+            echo "worker-base-builder 构建失败，重试 $attempt/3..."
+            docker buildx rm "$BUILDER_NAME" 2>/dev/null || true
+            docker buildx create --use --name "$BUILDER_NAME" --driver docker-container
+            sleep 3
+          done
+          
+          # 构建runtime基础镜像
+          echo "构建 worker-base-runtime..."
+          for attempt in 1 2 3; do
+            if docker buildx build --load -f infra/docker/worker-base-runtime.Dockerfile -t "$BASE_RUNTIME" .; then
+              echo "worker-base-runtime 构建成功"
+              break
+            fi
+            echo "worker-base-runtime 构建失败，重试 $attempt/3..."
+            docker buildx rm "$BUILDER_NAME" 2>/dev/null || true
+            docker buildx create --use --name "$BUILDER_NAME" --driver docker-container
+            sleep 3
+          done
+          
          echo "fallback=true" >> $GITHUB_OUTPUT
-          echo "✅ Worker 基础镜像本地构建完成"
+          echo "基础镜像本地构建完成"
        fi

    - name: Build PR image (verify only, no push)
@@ -667,15 +696,15 @@ jobs:
          EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS NGINX_CONF=infra/docker/nginx-staging.conf"
        fi

-        # Worker: 始终用普通docker build（基础镜像已预装全部依赖，无需buildx）
-        if [ "${{ matrix.service }}" = "worker" ]; then
-          echo "Worker: 使用普通docker build"
+        # Worker fallback模式：基础镜像本地已构建，用普通docker build绕过buildx
+        if [ "${{ matrix.service }}" = "worker" ] && [ "${{ steps.prebuild.outputs.fallback }}" = "true" ]; then
+          echo "Fallback模式：用普通docker build（基础镜像本地已构建）"
          BUILD_ARG_STR=""
          for arg in $EXTRA_BUILD_ARGS; do
            BUILD_ARG_STR="$BUILD_ARG_STR --build-arg $arg"
          done
          docker build -f ${{ matrix.dockerfile }} -t "${IMAGE_TAG}" $BUILD_ARG_STR .
-          echo "PR Build successful (worker, no buildx)"
+          echo "Fallback PR Build successful"
          exit 0
        fi

@@ -762,7 +791,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -798,7 +827,6 @@ jobs:
        fi

    - name: Setup buildx builder
-      if: matrix.service != 'worker'
      shell: sh
      run: |
        set -eu
@@ -811,64 +839,41 @@ jobs:
        fi
        docker buildx inspect --bootstrap

-    - name: Pre-build worker base image (fallback if not exist)
-      if: matrix.service == 'worker'
-      shell: sh
-      run: |
-        set -eu
-        REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
-        BASE_IMAGE="${REGISTRY}/saas-worker-base:latest"
-
-        echo "检查 Worker 基础镜像..."
-        if docker pull "$BASE_IMAGE" 2>/dev/null; then
-          echo "✅ 基础镜像已存在"
-        else
-          echo "⚠️ 基础镜像不存在，本地构建（fallback）..."
-          docker build -f infra/docker/worker-base.Dockerfile -t "$BASE_IMAGE" .
-          echo "✅ Worker 基础镜像本地构建完成"
-        fi
-
-    - name: Build and push ${{ matrix.service_display }} image
+    - name: Build and push ${{ matrix.service_display }} image (with retry)
      shell: sh
      run: |
        set -eu
        REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
        IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${GITHUB_SHA}"
+        CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:${GITHUB_REF_NAME}"

-        if [ "${{ matrix.service }}" = "worker" ]; then
-          # Worker: plain docker build（基础镜像已预装全部依赖，无需 buildx）
-          echo "=== Worker: plain docker build ==="
-          docker build -f ${{ matrix.dockerfile }} -t "${IMAGE_TAG}" --build-arg APP_VERSION="${GITHUB_SHA}" .
-          docker push "${IMAGE_TAG}"
-          echo "✅ Worker image pushed: ${IMAGE_TAG}"
-        else
-          # API/Web: buildx with registry cache
-          CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:${GITHUB_REF_NAME}"
-          EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
-          if [ "${{ matrix.service }}" = "web" ]; then
-            EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS NGINX_CONF=infra/docker/nginx-staging.conf"
-          fi
-
-          NO_CACHE_FLAG=""
-          for i in 1 2 3; do
-            echo "=== Docker build 尝试 $i/3 ==="
-            if bash scripts/ci/docker_build_push.sh $NO_CACHE_FLAG ${{ matrix.dockerfile }} "${IMAGE_TAG}" "${CACHE_REF}" $EXTRA_BUILD_ARGS; then
-              echo "✅ Docker build 成功"
-              break
-            fi
-            echo "❌ Docker build 失败（尝试 $i/3）"
-            [ $i -eq 3 ] && exit 1
-            sleep 10
-            if [ $i -eq 2 ]; then
-              NO_CACHE_FLAG="--no-cache"
-              echo "下次重试将使用 --no-cache"
-            fi
-          done
-
-          echo "${{ matrix.service_display }} image pushed: ${IMAGE_TAG}"
+        EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
+        if [ "${{ matrix.service }}" = "web" ]; then
+          EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS NGINX_CONF=infra/docker/nginx-staging.conf"
        fi
+
+        # Docker build 带重试：失败自动重试2次，第2次重试加--no-cache
+        NO_CACHE_FLAG=""
+        for i in 1 2 3; do
+          echo "=== Docker build 尝试 $i/3 ==="
+          if bash scripts/ci/docker_build_push.sh $NO_CACHE_FLAG ${{ matrix.dockerfile }} "${IMAGE_TAG}" "${CACHE_REF}" $EXTRA_BUILD_ARGS; then
+            echo "✅ Docker build 成功"
+            break
+          fi
+          echo "❌ Docker build 失败（尝试 $i/3）"
+          [ $i -eq 3 ] && exit 1
+          sleep 10
+          # 第2次重试使用 --no-cache
+          if [ $i -eq 2 ]; then
+            NO_CACHE_FLAG="--no-cache"
+            echo "下次重试将使用 --no-cache"
+          fi
+        done
+
+        echo
+        echo "${{ matrix.service_display }} image pushed: ${IMAGE_TAG}"
    - name: Cleanup buildx builder
-      if: matrix.service != 'worker' && always()
+      if: always()
      shell: sh
      run: |
        docker buildx rm ci-builder-${GITHUB_RUN_ID}-${GITHUB_JOB}-${{ matrix.cache_name }} 2>/dev/null || true
@@ -918,7 +923,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -1070,14 +1075,23 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
    - name: Run Playwright E2E on staging
-      shell: bash
+      shell: sh
      run: |
-        bash scripts/ci/run_staging_tests.sh e2e
+        set -eu
+        docker run --rm --ipc=host \
+          -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
+          -e E2E_API_BASE=https://staging-api.xiaoxiajianji.com/api/v1 \
+          -e E2E_BROWSER_CHANNEL=chromium \
+          -e PLAYWRIGHT_HEADLESS=1 \
+          -v "$PWD:/workspace" \
+          -w /workspace/apps/web \
+          git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
+          sh -lc "npm ci && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts"

    - name: Job duration summary
      if: always()
@@ -1117,14 +1131,21 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
    - name: Run API integration tests on staging
-      shell: bash
+      shell: sh
      run: |
-        bash scripts/ci/run_staging_tests.sh api
+        set -eu
+        docker run --rm \
+          -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
+          -e E2E_API_BASE=https://staging-api.xiaoxiajianji.com/api/v1 \
+          -v "$PWD:/workspace" \
+          -w /workspace/apps/web \
+          git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
+          sh -lc 'npm ci && npx playwright test --reporter=line e2e/test_auth.spec.ts e2e/test_asset.spec.ts e2e/test_project.spec.ts'

    - name: Job duration summary
      if: always()
@@ -1157,12 +1178,7 @@ jobs:
    runs-on: runtime-builder
    timeout-minutes: ${{ matrix.timeout }}
    needs:
-      - validate-code-quality
-      - validate-type-check
-      - unit-tests
-      - frontend-lint
-      - frontend-unit-test
-    if: startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'push' && github.ref_name == 'main')
+    if: startsWith(github.ref, 'refs/tags/v')
    strategy:
      fail-fast: false
      matrix:
@@ -1191,7 +1207,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -1235,20 +1251,14 @@ jobs:
        docker buildx inspect --bootstrap

    - name: Build and push production ${{ matrix.service_display }} image (with retry)
-      shell: bash
+      shell: sh
      run: |
        set -eu
        REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
-        # 根据ref类型设置镜像标签：tag用版本号，分支用分支名+sha
-        if [[ "$GITHUB_REF" == refs/tags/* ]]; then
-          TAG_NAME="${GITHUB_REF_NAME}"
-        else
-          TAG_NAME="${GITHUB_REF_NAME}-${GITHUB_SHA::8}"
-        fi
-        IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${TAG_NAME}"
+        IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${GITHUB_REF_NAME}"
        CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:main"

-        EXTRA_BUILD_ARGS="APP_VERSION=\"${TAG_NAME}\""
+        EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_REF_NAME}\""
        if [ "${{ matrix.service }}" = "web" ]; then
          EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS NGINX_CONF=infra/docker/nginx-production.conf"
        fi
@@ -1315,7 +1325,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -1446,13 +1456,14 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
    - name: Run production browser E2E
-      shell: bash
+      shell: sh
      run: |
+        set -eu
        docker run --rm --ipc=host \
          -e E2E_BASE_URL=https://saas.xiaoxiajianji.com \
          -e E2E_API_BASE=https://api.xiaoxiajianji.com/api/v1 \
@@ -1461,7 +1472,7 @@ jobs:
          -v "$PWD:/workspace" \
          -w /workspace/apps/web \
          git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
-          bash -c 'for i in 1 2 3; do npm ci --registry=https://registry.npmmirror.com && break; echo "npm ci attempt $i failed, retrying..."; sleep 15; done && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts e2e/core-titles.spec.ts'
+          sh -lc 'npm ci && npx playwright test --reporter=line --project=chromium e2e/auth.spec.ts e2e/auth-guard.spec.ts e2e/core-upload.spec.ts e2e/core-generation.spec.ts e2e/core-titles.spec.ts'

    - name: Job duration summary
      if: always()
@@ -1505,7 +1516,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash
    - name: Record job start time
      shell: sh
      run: bash scripts/ci/step_timer_start.sh
@@ -1545,276 +1556,4 @@ jobs:
        [ ${{ job.status }} = "success" ] || STATUS="error"
        START_TIME=""
        [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-        python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
-
-  canary-release:
-    name: Canary Release to Production
-    runs-on: runtime-builder
-    timeout-minutes: 120
-    concurrency:
-      group: canary-release-production
-      cancel-in-progress: false
-    if: github.event_name == 'push' && github.ref_name == 'main'
-    needs:
-    - build-production
-    - staging-api-tests
-    steps:
-    - name: Checkout code
-      shell: sh
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
-    - name: Record job start time
-      shell: sh
-      run: bash scripts/ci/step_timer_start.sh
-    - name: Notify canary release start
-      continue-on-error: true
-      shell: sh
-      env:
-        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
-      run: |
-        set +e
-        NOTIFY_MODE=start JOB_NAME="Canary Release" python3 scripts/ci_notify.py
-    - name: Install SSH client
-      shell: sh
-      run: |
-        set -eu
-        apt-get update -qq && apt-get install -y -qq openssh-client curl >/dev/null 2>&1
-        echo "openssh-client installed"
-    - name: Run canary release
-      shell: bash
-      env:
-        PRODUCTION_SSH_HOST: ${{ secrets.PRODUCTION_SSH_HOST }}
-        PRODUCTION_SSH_USER: ${{ secrets.PRODUCTION_SSH_USER }}
-        PRODUCTION_SSH_PORT: ${{ secrets.PRODUCTION_SSH_PORT }}
-        PRODUCTION_SSH_KEY: ${{ secrets.PRODUCTION_SSH_KEY }}
-        ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
-        ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
-        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
-      run: |
-        set -eu
-        IMAGE_TAG="main-${GITHUB_SHA::8}"
-        export IMAGE_TAG
-        echo "Canary release version: $IMAGE_TAG"
-        bash scripts/ci/canary_release.sh
-    - name: Job duration summary
-      if: always()
-      shell: sh
-      run: bash scripts/ci/step_timer_end.sh
-    - name: Notify on success
-      continue-on-error: true
-      if: success()
-      shell: sh
-      env:
-        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
-      run: |
-        set +e
-        NOTIFY_MODE=success JOB_NAME="Canary Release" python3 scripts/ci_notify.py
-    - name: Notify on failure
-      continue-on-error: true
-      if: failure()
-      shell: sh
-      env:
-        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
-      run: |
-        set +e
-        NOTIFY_MODE=failure JOB_NAME="Canary Release" python3 scripts/ci_notify.py
-    - name: Report CI trace
-      if: always()
-      shell: sh
-      env:
-        AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
-      run: |
-        STATUS="ok"
-        [ ${{ job.status }} = "success" ] || STATUS="error"
-        START_TIME=""
-        [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-        python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
-
-  ci-gate:
-    name: CI Gate
-    runs-on: ci-l2
-    if: always() && github.event_name == 'pull_request'
-    needs:
-      - check-frontend-only
-      - validate-code-quality
-      - validate-type-check
-      - validate-migration
-      - unit-tests
-      - integration-tests
-      - frontend-lint
-      - frontend-unit-test
-      - build-pr
-    timeout-minutes: 3
-    steps:
-      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          curl -sfH "Authorization: token $GITHUB_TOKEN" -o /tmp/_ci_checkout.sh \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" && bash /tmp/_ci_checkout.sh
-
-      - name: Evaluate CI Gate
-        id: gate
-        shell: bash
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-          RESULT_CHECK_FRONTEND: ${{ needs.check-frontend-only.result }}
-          RESULT_CODE_QUALITY: ${{ needs.validate-code-quality.result }}
-          RESULT_TYPE_CHECK: ${{ needs.validate-type-check.result }}
-          RESULT_MIGRATION: ${{ needs.validate-migration.result }}
-          RESULT_UNIT_TESTS: ${{ needs.unit-tests.result }}
-          RESULT_INTEGRATION: ${{ needs.integration-tests.result }}
-          RESULT_FRONTEND_LINT: ${{ needs.frontend-lint.result }}
-          RESULT_FRONTEND_UNIT: ${{ needs.frontend-unit-test.result }}
-          RESULT_BUILD_PR: ${{ needs.build-pr.result }}
-        run: |
-          set -eu
-          echo "=== CI Gate 评估 ==="
-          echo ""
-          echo "各job结果:"
-          echo "  check-frontend-only: $RESULT_CHECK_FRONTEND"
-          echo "  validate-code-quality: $RESULT_CODE_QUALITY"
-          echo "  validate-type-check: $RESULT_TYPE_CHECK"
-          echo "  validate-migration: $RESULT_MIGRATION"
-          echo "  unit-tests: $RESULT_UNIT_TESTS"
-          echo "  integration-tests: $RESULT_INTEGRATION"
-          echo "  frontend-lint: $RESULT_FRONTEND_LINT"
-          echo "  frontend-unit-test: $RESULT_FRONTEND_UNIT"
-          echo "  build-pr: $RESULT_BUILD_PR"
-
-          # 查询 AI Code Review 状态（跨workflow，读commit status）
-          AI_REVIEW_STATUS="pending"
-          AI_REVIEW_DESC=""
-          STATUS_JSON=$(curl -sfH "Authorization: token $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/commits/${PR_HEAD_SHA}/status" 2>/dev/null || true)
-          if [ -n "$STATUS_JSON" ]; then
-            AI_STATUS=$(echo "$STATUS_JSON" | python3 -c "
-          import json,sys
-          try:
-              data=json.load(sys.stdin)
-              for s in data.get('statuses',[]):
-                  if 'AI Code Review' in s.get('context',''):
-                      print(s['state']+'|'+s.get('description',''))
-                      break
-          except: pass
-          " 2>/dev/null)
-            if [ -n "$AI_STATUS" ]; then
-              AI_REVIEW_STATUS="${AI_STATUS%%|*}"
-              AI_REVIEW_DESC="${AI_STATUS#*|}"
-            fi
-          fi
-          echo "  ai-code-review: $AI_REVIEW_STATUS ($AI_REVIEW_DESC)"
-
-          echo ""
-
-          # 判断PR类型
-          SKIP_BACKEND="${{ needs.check-frontend-only.outputs.skip_backend }}"
-          SKIP_FRONTEND="${{ needs.check-frontend-only.outputs.skip_frontend }}"
-          echo "PR类型: skip_backend=$SKIP_BACKEND, skip_frontend=$SKIP_FRONTEND"
-
-          # 必填检查项（根据PR类型决定）
-          # 通用检查（所有PR都必须过）
-          REQUIRED_GENERAL=(
-            "validate-code-quality:$RESULT_CODE_QUALITY"
-            "validate-type-check:$RESULT_TYPE_CHECK"
-            "validate-migration:$RESULT_MIGRATION"
-            "frontend-lint:$RESULT_FRONTEND_LINT"
-            "build-pr:$RESULT_BUILD_PR"
-            "ai-code-review:$AI_REVIEW_STATUS"
-          )
-
-          # 后端检查
-          REQUIRED_BACKEND=(
-            "unit-tests:$RESULT_UNIT_TESTS"
-            "integration-tests:$RESULT_INTEGRATION"
-          )
-
-          # 前端检查
-          REQUIRED_FRONTEND=(
-            "frontend-unit-test:$RESULT_FRONTEND_UNIT"
-          )
-
-          ALL_PASSED=true
-          FAILED_ITEMS=()
-
-          check_job() {
-            local name=$1
-            local result=$2
-            if [ "$result" = "success" ]; then
-              echo "  ✅ $name: success"
-            elif [ "$result" = "skipped" ]; then
-              echo "  ⏭️  $name: skipped（跳过，不影响）"
-            else
-              echo "  ❌ $name: $result"
-              ALL_PASSED=false
-              FAILED_ITEMS+=("$name=$result")
-            fi
-          }
-
-          echo ""
-          echo "=== 通用检查（所有PR必填）==="
-          for item in "${REQUIRED_GENERAL[@]}"; do
-            name="${item%%:*}"
-            result="${item##*:}"
-            # AI Code Review pending时不阻塞（可能还在跑），等它跑完自然会重跑Gate
-            if [ "$name" = "ai-code-review" ] && [ "$result" = "pending" ]; then
-              echo "  ⏳ $name: pending（审查中，暂不阻塞）"
-              continue
-            fi
-            check_job "$name" "$result"
-          done
-
-          if [ "$SKIP_BACKEND" != "true" ]; then
-            echo ""
-            echo "=== 后端检查 ==="
-            for item in "${REQUIRED_BACKEND[@]}"; do
-              name="${item%%:*}"
-              result="${item##*:}"
-              check_job "$name" "$result"
-            done
-          else
-            echo ""
-            echo "=== 后端检查（纯前端PR，跳过）==="
-          fi
-
-          if [ "$SKIP_FRONTEND" != "true" ]; then
-            echo ""
-            echo "=== 前端检查 ==="
-            for item in "${REQUIRED_FRONTEND[@]}"; do
-              name="${item%%:*}"
-              result="${item##*:}"
-              check_job "$name" "$result"
-            done
-          else
-            echo ""
-            echo "=== 前端检查（纯后端PR，跳过）==="
-          fi
-
-          echo ""
-          if [ "$ALL_PASSED" = "true" ]; then
-            echo "✅ CI Gate: PASSED"
-            echo "gate_result=success" >> $GITHUB_OUTPUT
-            exit 0
-          else
-            echo "❌ CI Gate: FAILED"
-            echo "失败项: ${FAILED_ITEMS[*]}"
-            echo "gate_result=failure" >> $GITHUB_OUTPUT
-            exit 1
-          fi
-
-      - name: Report CI trace
-        if: always()
-        shell: sh
-        env:
-          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
-        run: |
-          STATUS="ok"
-          [ "${{ steps.gate.outputs.gate_result }}" = "success" ] || STATUS="error"
-          START_TIME=""
-          [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
-          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
+        python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
@@ -16,15 +16,15 @@ permissions:
 jobs:
  monitor:
    name: Monitor CI Trigger Reliability
-    runs-on: ci-l2
+    runs-on: ubuntu-latest
    timeout-minutes: 5
    steps:
      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
+        uses: actions/checkout@v3
+        # 网络波动自动重试2次
+        retry:
+          max_attempts: 2
+          retry_on: error
      
      - name: Check CI trigger status for all open PRs
        env:
@@ -15,18 +15,20 @@ concurrency:
 jobs:
  code-review:
    name: AI Code Review
-    runs-on: ci-l2
+    runs-on: ubuntu-latest
    # 跳过草稿 PR
    if: ${{ !gitea.event.pull_request.draft }}

    steps:
      # actions/checkout 由 runner 在宿主机层面处理，不受容器网络影响
      - name: Checkout code
-        shell: sh
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN"             "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"             | bash
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+        # 网络波动自动重试2次
+        retry:
+          max_attempts: 2
+          retry_on: error

      - name: Install dependencies
        run: |
@@ -48,7 +50,6 @@ jobs:
          GITEA_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
          REPO_NAME: ${{ gitea.repository }}
          PR_NUMBER: ${{ gitea.event.pull_request.number }}
-          PR_HEAD_SHA: ${{ gitea.event.pull_request.head.sha }}
          # LLM 提供商: coze (扣子原生Bot) / openai (OpenAI兼容)
          LLM_PROVIDER: "coze"
          # 扣子模式配置（默认国内站 api.coze.cn）
@@ -61,9 +62,8 @@ jobs:
          LLM_TIMEOUT: "120"
        run: |
          python3 scripts/ci_code_review.py
-        # 注意：脚本退出码决定job状态
-        # - 有阻塞级问题 → exit 1 → job失败 → 门禁拦截
-        # - 无阻塞级问题/LLM异常 → exit 0 → 通过（fail-open）
+        # 审查脚本异常不影响 CI 通过
+        continue-on-error: true

      - name: Report CI trace
        if: always()
@@ -1,5 +1,4 @@
 name: Daily Health Check
-# 注意：使用 curl step_checkout.sh 方式以兼容 docker runner

 on:
  schedule:
@@ -13,7 +12,7 @@ jobs:
  # ── 1. 生产环境冒烟测试 ─────────────────────────────────────────────
  production-smoke:
    name: Production Smoke Test
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 8
    outputs:
      report: ${{ steps.smoke.outputs.report }}
@@ -24,9 +23,47 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ github.token }}
        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
-            | bash
+          set -eu
+          python3 - <<'PY'
+          import io, os, tarfile, time, urllib.request, urllib.error
+          url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+          request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+          last_err = None
+          for attempt in range(5):
+              try:
+                  with urllib.request.urlopen(request, timeout=120) as response:
+                      archive = response.read()
+                  break
+              except urllib.error.HTTPError as e:
+                  last_err = e
+                  if e.code >= 500 and attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+              except Exception as e:
+                  last_err = e
+                  if attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+          else:
+              raise last_err
+          with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
+              root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+              for member in tar.getmembers():
+                  name = member.name
+                  if name == root_prefix[:-1]:
+                      continue
+                  if name.startswith(root_prefix):
+                      member.name = name[len(root_prefix):]
+                  if member.name:
+                      tar.extract(member, '.')
+          PY
+
      - name: Production health check & smoke test
        id: smoke
        shell: sh
@@ -84,10 +121,10 @@ jobs:
  # ── 2. Staging API 集成测试 ─────────────────────────────────────────
  staging-api-tests:
    name: Staging API Integration Tests
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 10
    outputs:
-      report: ${{ steps.report.outputs.report }}
+      report: ${{ steps.smoke.outputs.report }}

    steps:
      - name: Checkout code
@@ -95,15 +132,50 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ github.token }}
        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
-            | bash
+          set -eu
+          python3 - <<'PY'
+          import io, os, tarfile, time, urllib.request, urllib.error
+          url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+          request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+          last_err = None
+          for attempt in range(5):
+              try:
+                  with urllib.request.urlopen(request, timeout=120) as response:
+                      archive = response.read()
+                  break
+              except urllib.error.HTTPError as e:
+                  last_err = e
+                  if e.code >= 500 and attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+              except Exception as e:
+                  last_err = e
+                  if attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+          else:
+              raise last_err
+          with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
+              root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+              for member in tar.getmembers():
+                  name = member.name
+                  if name == root_prefix[:-1]:
+                      continue
+                  if name.startswith(root_prefix):
+                      member.name = name[len(root_prefix):]
+                  if member.name:
+                      tar.extract(member, '.')
+          PY
+
      - name: Run API smoke test on staging
        id: smoke
        shell: sh
-        env:
-          STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
-          STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
        run: |
          set +e
          START_TIME=$(date +%s)
@@ -111,8 +183,8 @@ jobs:
          docker run --rm \
            -e BASE_URL=https://staging-api.xiaoxiajianji.com \
            -e WEB_URL=https://staging.xiaoxiajianji.com \
-            -e TEST_USER="$STAGING_TEST_USER" \
-            -e TEST_PASSWORD="$STAGING_TEST_PASSWORD" \
+            -e TEST_USER=18314979086@163.com \
+            -e TEST_PASSWORD=Ying1234 \
            -e CLEANUP_ENABLED=1 \
            -e PERF_CHECK_ENABLED=1 \
            -e PERF_WARN_THRESHOLD_MS=500 \
@@ -198,10 +270,10 @@ jobs:
  # ── 3. Staging 浏览器 E2E ──────────────────────────────────────────
  staging-e2e:
    name: Staging Browser E2E
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 15
    outputs:
-      report: ${{ steps.e2e.outputs.report }}
+      report: ${{ steps.smoke.outputs.report }}

    steps:
      - name: Checkout code
@@ -209,9 +281,47 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ github.token }}
        run: |
-          curl -sH "Authorization: token $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
-            | bash
+          set -eu
+          python3 - <<'PY'
+          import io, os, tarfile, time, urllib.request, urllib.error
+          url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
+          request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
+          last_err = None
+          for attempt in range(5):
+              try:
+                  with urllib.request.urlopen(request, timeout=120) as response:
+                      archive = response.read()
+                  break
+              except urllib.error.HTTPError as e:
+                  last_err = e
+                  if e.code >= 500 and attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+              except Exception as e:
+                  last_err = e
+                  if attempt < 4:
+                      wait = 2 ** attempt
+                      print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
+                      time.sleep(wait)
+                      continue
+                  raise
+          else:
+              raise last_err
+          with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
+              root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
+              for member in tar.getmembers():
+                  name = member.name
+                  if name == root_prefix[:-1]:
+                      continue
+                  if name.startswith(root_prefix):
+                      member.name = name[len(root_prefix):]
+                  if member.name:
+                      tar.extract(member, '.')
+          PY
+
      - name: Run Playwright E2E on staging
        id: e2e
        shell: sh
@@ -261,7 +371,7 @@ jobs:
  # ── 4. 性能基线巡检 ────────────────────────────────────────────────
  performance-check:
    name: Performance Baseline Check
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 8
    outputs:
      report: ${{ steps.report.outputs.report }}
@@ -270,9 +380,6 @@ jobs:
      - name: Run performance baseline checks
        id: perf
        shell: sh
-        env:
-          STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
-          STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
        run: |
          set +e
          START_TIME=$(date +%s)
@@ -308,10 +415,9 @@ jobs:

          # 先登录获取 token
          echo "--- 准备: 获取测试 Token ---"
-          LOGIN_BODY="{\"email\":\"$STAGING_TEST_USER\",\"password\":\"$STAGING_TEST_PASSWORD\"}"
          AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
            -H "Content-Type: application/json" \
-            -d "$LOGIN_BODY" \
+            -d '{"email":"18314979086@163.com","password":"Ying1234"}' \
            "https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
            --max-time 10 2>&1)
          AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
@@ -341,7 +447,7 @@ jobs:
            # 构建 curl 命令
            CURL_ARGS="-s -o /dev/null -w '%{http_code} %{time_total}' --max-time 30"
            if [ "$method" = "POST" ]; then
-              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d \"$LOGIN_BODY\""
+              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d '{\"email\":\"18314979086@163.com\",\"password\":\"Ying1234\"}'"
            fi
            if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
              CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
@@ -389,9 +495,6 @@ jobs:
      - name: Generate performance report
        id: report
        shell: sh
-        env:
-          STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
-          STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
        run: |
          set +e
          echo ""
@@ -406,11 +509,10 @@ jobs:
          RESULTS=""
          START_TIME=$(date +%s)

-          LOGIN_BODY="{\"email\":\"$STAGING_TEST_USER\",\"password\":\"$STAGING_TEST_PASSWORD\"}"
          # 先登录获取 token
          AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
            -H "Content-Type: application/json" \
-            -d "$LOGIN_BODY" \
+            -d '{"email":"18314979086@163.com","password":"Ying1234"}' \
            "https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
            --max-time 10 2>&1)
          AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
@@ -426,7 +528,7 @@ jobs:

            local CURL_ARGS="-s -o /dev/null -w '%{http_code} %{time_total}' --max-time 30"
            if [ "$method" = "POST" ]; then
-              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d \"$LOGIN_BODY\""
+              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d '{\"email\":\"18314979086@163.com\",\"password\":\"Ying1234\"}'"
            fi
            if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
              CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
@@ -529,7 +631,7 @@ jobs:
  # ── 5. 每日巡检汇总报告 ────────────────────────────────────────────
  daily-report:
    name: Daily Check Report
-    runs-on: ci-l2
+    runs-on: saas
    timeout-minutes: 2
    if: always()
    needs:
@@ -8,11 +8,6 @@ on:
 permissions:
  contents: read

-
-concurrency:
-  group: pr-automation-${{ gitea.event.pull_request.number }}
-  cancel-in-progress: true
-
 jobs:
  auto-approve:
    name: Auto Approve on CI Green
@@ -61,7 +56,7 @@ jobs:
    name: Auto Merge on CI Green + Approved
    runs-on: ci-check
    if: github.event_name == 'pull_request' && !github.event.pull_request.draft && github.event.pull_request.base.ref == 'develop'
-    timeout-minutes: 3  # 短作业模式：检查一次，不满足就退出，由pr-auto-scan每5分钟定时兜底
+    timeout-minutes: 45  # 长等待模式：等CI全绿后自动合并，不遗漏任何PR
    steps:
      - name: Checkout code
        shell: sh
@@ -120,7 +120,7 @@ jobs:
        PREVIEW_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
      run: |
        set -eux
-        preview_host="${PREVIEW_SSH_HOST:-47.98.113.167}"
+        preview_host="${PREVIEW_SSH_HOST:-172.30.18.197}"
        preview_user="${PREVIEW_SSH_USER:-deploy}"
        preview_port="${PREVIEW_SSH_PORT:-22222}"
        preview_dir="/var/www/preview/pr-${PR_NUMBER}"
@@ -93,28 +93,44 @@ jobs:
      shell: sh
      run: |
        set -eu
-        cd apps/web
+        NPM_CACHE_VOLUME="xiaoxia-npm-cache"
+        if ! docker volume inspect "$NPM_CACHE_VOLUME" >/dev/null 2>&1; then
+          docker volume create "$NPM_CACHE_VOLUME" >/dev/null
+          echo "Created npm cache volume: $NPM_CACHE_VOLUME"
+        fi

-        # Install dependencies with retry
-        for i in 1 2 3; do
-          npm ci --registry=https://registry.npmmirror.com --no-audit --no-fund && break
-          echo "npm install failed, retry $i/3..."
-          [ $i -eq 3 ] && exit 1
-          rm -rf node_modules
-          sleep 5
-        done
-
-        # TypeScript check
-        echo "=== TypeScript check ==="
-        ./node_modules/.bin/tsc --noEmit
-
-        # Vite build
-        echo "=== Vite build ==="
-        export VITE_API_URL=https://staging-api.xiaoxiajianji.com
-        ./node_modules/.bin/vite build
-
-        echo "=== Build completed ==="
-        ls -la dist/
+        docker run --rm \
+          -v "$PWD:/workspace" \
+          -v "$NPM_CACHE_VOLUME:/workspace/apps/web/node_modules" \
+          -w /workspace/apps/web \
+          -e VITE_API_URL=https://staging-api.xiaoxiajianji.com \
+          docker.m.daocloud.io/library/node:20 \
+          sh -lc '
+            PACKAGE_LOCK_HASH=$(md5sum package-lock.json 2>/dev/null | cut -d" " -f1)
+            CACHE_HASH_FILE="node_modules/.package-lock-hash"
+            CACHE_VALID=false
+            if [ -f "$CACHE_HASH_FILE" ] && [ "$(cat "$CACHE_HASH_FILE")" = "$PACKAGE_LOCK_HASH" ] && [ -x "node_modules/.bin/vite" ] && [ -x "node_modules/.bin/tsc" ]; then
+              CACHE_VALID=true
+              echo "Cache hit: dependencies valid, skipping npm ci"
+            fi
+            if [ "$CACHE_VALID" = "false" ]; then
+              echo "Cache miss or invalid: running npm ci..."
+              if ! npm ci --include=dev; then
+                echo "npm ci failed, cleaning node_modules and retrying..."
+                rm -rf node_modules
+                mkdir -p node_modules
+                npm ci --include=dev
+              fi
+              echo "$PACKAGE_LOCK_HASH" > "$CACHE_HASH_FILE"
+              echo "Dependencies installed, cache updated"
+            fi
+            echo "Running TypeScript check..."
+            npx --no-install tsc
+            echo "Running Vite build..."
+            npx --no-install vite build
+            echo "Build completed successfully"
+            ls -la dist/
+          '

    - name: Install SSH client and rsync
      shell: sh
@@ -7,25 +7,35 @@ on:
      - main
    paths:
      - 'requirements-base.txt'
-      - 'requirements.txt'
      - 'requirements-worker.txt'
-      - 'infra/docker/worker-base.Dockerfile'
-  workflow_dispatch:
+      - 'infra/docker/worker-base-builder.Dockerfile'
+      - 'infra/docker/worker-base-runtime.Dockerfile'
+  workflow_dispatch:  # 支持手动触发

 jobs:
  build-worker-base:
-    name: Build Worker Base Image
+    name: Build Worker Base Images
    runs-on: runtime-builder
-    timeout-minutes: 45
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - name: builder
+          dockerfile: infra/docker/worker-base-builder.Dockerfile
+          image_name: worker-base-builder
+          cache_name: worker-base-builder-cache
+        - name: runtime
+          dockerfile: infra/docker/worker-base-runtime.Dockerfile
+          image_name: worker-base-runtime
+          cache_name: worker-base-runtime-cache
    steps:
    - name: Checkout code
      shell: sh
      env:
        GITHUB_TOKEN: ${{ github.token }}
      run: |
-        curl -sH "Authorization: token $GITHUB_TOKEN" \
-          "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
-          | bash
+        curl -sH "Authorization: token $GITHUB_TOKEN"           "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}"           | bash

    - name: Docker login to Registry
      shell: sh
@@ -38,8 +48,7 @@ jobs:
        set -eu
        for i in 1 2 3; do
          echo "=== Docker login 尝试 $i/3 ==="
-          if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
-              && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
+          if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin              && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
            echo "✅ Docker login successful"
            break
          fi
@@ -47,40 +56,48 @@ jobs:
          sleep 5
        done

-    - name: Build and push Worker base image
+    - name: Setup buildx builder
      shell: sh
      run: |
        set -eu
-        ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
-        GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/saas-worker-base:latest"
-
-        echo "=== Building Worker base image ==="
-
-        # 使用普通 docker build（单平台不需要 buildx）
-        docker build \
-          -f infra/docker/worker-base.Dockerfile \
-          -t "${ACR_IMAGE}" \
-          .
+        BUILDER_NAME="ci-builder-${GITHUB_RUN_ID}-${{ matrix.name }}"
+        if ! docker buildx inspect "$BUILDER_NAME" > /dev/null 2>&1; then
+          docker buildx create --use --name "$BUILDER_NAME" --driver docker-container
+          echo "Created $BUILDER_NAME"
+        else
+          docker buildx use "$BUILDER_NAME"
+          echo "Using existing $BUILDER_NAME"
+        fi
+        docker buildx inspect --bootstrap

+    - name: Build and push base image
+      shell: sh
+      run: |
+        set -eu
+        REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
+        IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:latest"
+        SAFE_REF_NAME=$(echo "${GITHUB_REF_NAME}" | tr '/' '-')
+        CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:${SAFE_REF_NAME}"
+        
+        echo "=== Building ${{ matrix.name }} base image ==="
+        echo "Image: ${IMAGE_TAG}"
+        echo "Cache: ${CACHE_REF}"
+        
+        # 用通用构建脚本
+        bash scripts/ci/docker_build_push.sh           ${{ matrix.dockerfile }}           "${IMAGE_TAG}"           "${CACHE_REF}"
+        
+        # 同时推送到 Gitea Packages 作为备份（可选）
+        GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/${{ matrix.image_name }}:latest"
+        docker tag "${IMAGE_TAG}" "${GITEA_IMAGE}"
+        docker push "${GITEA_IMAGE}" || echo "Gitea Packages push failed (non-fatal)"
+        
        echo ""
-        echo "✅ Image built successfully"
+        echo "✅ ${{ matrix.name }} base image built and pushed"

-        # 推送到 ACR
-        echo "=== Pushing to ACR ==="
-        docker push "${ACR_IMAGE}"
-        echo "✅ Pushed to ACR"
-
-        # 打标签并推送到 Gitea Packages 作为备份
-        echo "=== Pushing to Gitea Packages ==="
-        docker tag "${ACR_IMAGE}" "${GITEA_IMAGE}"
-        docker push "${GITEA_IMAGE}" || echo "⚠️ Gitea Packages push failed (non-fatal)"
-        echo "✅ Gitea backup push completed"
-
-    - name: Cleanup
+    - name: Cleanup buildx builder
      if: always()
      shell: sh
      run: |
-        ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
-        docker rmi "${ACR_IMAGE}" 2>/dev/null || true
-        docker image prune -f 2>/dev/null || true
-        echo "Cleanup done"
+        docker buildx rm "ci-builder-${GITHUB_RUN_ID}-${{ matrix.name }}" 2>/dev/null || true
+        docker buildx prune -f 2>/dev/null || true
+        echo "Builder cleanup done"
@@ -1,222 +0,0 @@
---
-AIGC:
-    Label: "1"
-    ContentProducer: 001191110102MACQD9K64018705
-    ProduceID: 15868733686388_0/project_7655981463858544923-files/docs/1197_preview_generation_proposal.md
-    ReservedCode1: ""
-    ContentPropagator: 001191110102MACQD9K64028705
-    PropagateID: 15868733686388#1785468313901
-    ReservedCode2: ""
---
-# #1197 预览生成接口方案评估
-
-## 背景
-
-智能剪辑「一键生成」流程中，第3步预览生成当前被跳过，直接进入下一步。需要实现真正的预览生成功能，让用户在正式生成前能看到效果预览。
-
-## 现状分析
-
-### 现有生成链路
-
-```
-API 触发生成 → GenerationTask入库 → Celery异步任务 → UnifiedRenderService渲染 → OSS上传 → 更新状态
-```
-
-**关键节点：**
-1. **API层**：`POST /generation-tasks` 或 `POST /templates/{id}/generate` 触发生成
-2. **任务调度**：Celery task `worker.generate_video`
-3. **渲染引擎**：`UnifiedRenderService`（统一渲染引擎，已接入9个效果层）
-4. **输出配置**：默认 720p (1280x720)，支持 `resolution` 字段自定义
-5. **产物存储**：`GeneratedVideo` 表记录，OSS 存储视频文件
-
-### 已有可复用能力
-
-| 能力 | 位置 | 是否可复用 |
-|------|------|-----------|
-| 任务创建与状态管理 | `GenerationTask` + `CreateGenerationTaskUseCase` | ✅ 是 |
-| 素材下载与预处理 | `_download_video_assets` / `_download_voice_asset` | ✅ 是 |
-| 统一渲染引擎 | `UnifiedRenderService` | ✅ 是 |
-| 分辨率配置 | `resolution` 字段已支持 | ✅ 是 |
-| 混音与后处理 | `_render_video` 内流程 | ✅ 是 |
-| OSS 上传与查重 | `_upload_and_dedup` | ✅ 是 |
-| 进度追踪 | `append_log` / `progress` 字段 | ✅ 是 |
-
-## 方案对比
-
-### 方案A：复用现有生成链路 + is_preview 标记（推荐）
-
-**思路**：在现有 GenerationTask 上加 `is_preview` 标记，预览生成走完整链路但参数降级。
-
-**改动点：**
-1. **数据模型**：`GenerationTask` 加 `is_preview: bool` 字段（默认 false）；`GeneratedVideo` 加 `is_preview: bool`
-2. **API 层**：生成接口加 `is_preview` 参数，预览任务不计入配额
-3. **渲染参数**：预览模式下自动调整
-   - 分辨率：480p (854x480)
-   - 时长：限制前 15 秒（或模板第一个片段）
-   - 码率：降低至 1.5Mbps（正式 4Mbps）
-   - 效果层：跳过高级转场/粒子特效等耗时效果
-4. **任务调度**：预览任务走低优先级队列（或复用现有队列，标记优先级）
-5. **前端对接**：预览生成结果带 `is_preview=true` 标记，前端展示"预览"标签
-
-**优点：**
- 代码复用率 90%+，改动最小
- 与正式生成逻辑一致，预览效果真实可信
- 进度查询、结果展示等功能直接复用
- 后续可平滑升级：预览满意后一键转正式生成
-
-**缺点：**
- 需要区分预览和正式任务，避免数据混淆
- 预览任务和正式任务竞争同一队列资源（可后续优化为独立队列）
-
-**开发量估算**：2-3 天
- 数据模型 + 迁移：0.5 天
- API 层改造：0.5 天
- 渲染参数降级：1 天
- 测试 + 联调：1 天
-
---
-
-### 方案B：新建独立预览接口 + 轻量渲染逻辑
-
-**思路**：新建独立的预览生成接口，使用简化的渲染逻辑（如只拼接素材+基础配音，跳过大部分效果）。
-
-**改动点：**
-1. 新增 `PreviewTask` 数据模型
-2. 新增 `POST /api/v1/preview/generate` 接口
-3. 新增独立的 Celery task `worker.generate_preview`
-4. 简化渲染流程：只做素材裁剪+拼接+配音，跳过转场/滤镜/字幕特效等
-
-**优点：**
- 完全隔离，不影响正式生成链路
- 可以做极致优化，预览生成速度快
- 数据模型清晰，不会混淆
-
-**缺点：**
- 代码重复率高，两套生成逻辑维护成本翻倍
- 预览效果与正式生成可能不一致（效果层差异）
- 前端需要对接两套接口
- 无法从预览升级为正式生成（需重新走完整流程）
-
-**开发量估算**：4-5 天
- 数据模型 + 接口：1 天
- 简化渲染逻辑：2 天
- 测试 + 联调：1-2 天
-
---
-
-### 方案C：图片预览（首帧/关键帧截图）
-
-**思路**：不生成视频，只生成几张关键帧的预览图片。
-
-**优点：**
- 生成速度极快（秒级）
- 资源消耗小
-
-**缺点：**
- 预览效果差，用户无法感知动态效果
- 无法验证配音、转场、节奏等时间维度的效果
- 用户体验不佳，不如"真预览"有说服力
-
-**开发量估算**：1-2 天
-
---
-
-## 推荐方案：方案A（复用现有生成链路）
-
-### 核心理由
-
-1. **效果保真**：预览和正式生成用同一套渲染引擎，效果一致，用户信任度高
-2. **开发效率**：90% 代码复用，2-3 天可上线
-3. **可扩展性强**：后续可加「预览转正式」「低分辨率快速预览」等增强功能
-4. **维护成本低**：一套生成逻辑，bug 修复和新功能同时生效
-
-### 详细设计
-
-#### 1. 数据模型变更
-
-```python
-# GenerationTask 新增字段
-is_preview: bool = False
-"""是否为预览生成"""
-
-preview_of: str = ""
-"""预览对应的正式任务 ID（或反向关联）"""
-
-# GeneratedVideo 新增字段
-is_preview: bool = False
-"""是否为预览视频"""
-```
-
-**迁移**：alembic 新增 migration，两个表各加 1-2 个字段。
-
-#### 2. API 层
-
-```
-POST /api/v1/generation-tasks
-  Body 增加 is_preview: bool = false
-  
-POST /api/v1/templates/{id}/generate
-  Query 增加 is_preview: bool = false
-```
-
-**配额处理**：预览生成不计入用户配额，不占用生成次数限制。
-
-#### 3. 渲染参数降级
-
-| 参数 | 正式生成 | 预览生成 |
-|------|---------|---------|
-| 分辨率 | 720p (1280x720) | 480p (854x480) |
-| 码率 | 4 Mbps | 1.5 Mbps |
-| 时长 | 完整时长 | 前 15 秒（或第一段） |
-| 帧率 | 30 fps | 24 fps |
-| 转场效果 | 完整转场 | 仅淡入淡出（或简单切） |
-| 特效滤镜 | 全部启用 | 跳过粒子/光效等高级效果 |
-| 字幕 | 完整渲染 | 正常渲染（字幕是核心信息） |
-| 配音 | 完整混音 | 正常混音（配音是核心信息） |
-
-**实现方式**：在 `_render_video` 或 UnifiedRenderService 入口处，根据 `is_preview` 标记调整渲染配置。
-
-#### 4. 任务调度
-
- 初期复用现有队列，预览任务正常排队
- 后续如需优化，可拆分独立预览队列（低优先级）
- 预览任务可设置较短超时时间
-
-#### 5. 前端对接
-
- 调用生成接口时传 `is_preview=true`
- 结果列表中预览视频带「预览」标签
- 预览满意后可一键「升级为正式生成」（重新触发全分辨率生成，可复用素材下载缓存）
-
-### 实施步骤
-
-**Phase 1（MVP，2天）：**
-1. 数据模型 + 迁移
-2. API 层支持 is_preview 参数
-3. 渲染分辨率降级（480p）
-4. 不计入配额
-5. 基础测试
-
-**Phase 2（优化，1-2天）：**
-1. 时长限制（前15秒）
-2. 效果层降级（跳高级效果）
-3. 预览任务低优先级队列
-4. 预览转正式生成功能
-
-## 与前端对齐点
-
-1. 预览生成的触发时机（第3步自动生成？用户点击才生成？）
-2. 预览时长是固定15秒还是完整但低清？
-3. 是否需要「预览转正式生成」功能
-4. 预览视频的展示形态（和正式视频一样还是有特殊UI）
-
-## 风险与注意事项
-
-1. **数据混淆**：确保统计、计费、列表展示时正确区分预览和正式任务
-2. **存储成本**：预览视频也占 OSS 空间，可设置自动清理（7天后自动删除）
-3. **用户预期**：要明确告诉用户这是预览，效果和正式生成一致但清晰度低
-4. **并发压力**：如果用户频繁生成预览，可能增加系统负载，需要限流
-
---
-
-> 本内容由 Coze AI 生成，请遵循相关法律法规及《人工智能生成合成内容标识办法》使用与传播。
@@ -1,382 +0,0 @@
-# #1197 预览生成接口技术方案（v2）
-
-> 更新说明：v2 新增「多版本预览生成」能力，支持一个模板生成多个不重复的预览视频，左侧列表展示，用户可挑选满意的版本转正式生成。
-
-## 1. 背景与目标
-
-**现状**：智能剪辑「一键生成」第3步预览生成被跳过，用户直接进入正式生成，缺少效果预览环节。
-
-**目标**：
-1. ✅ 实现真正的预览生成（低分辨率快速出片）
-2. ✅ **支持生成 1~N 个不重复的预览版本**（默认 3 个），左侧列表展示
-3. ✅ 预览满意后可一键转正式生成（复用素材下载缓存）
-4. ✅ 不计入用户配额，不占用正式生成次数
-
---
-
-## 2. 现有生成链路分析
-
-### 2.1 链路总览
-
-```
-API 触发生成 → GenerationTask入库 → Celery异步任务
-  → 下载素材 → 构建plan/clips → UnifiedRenderService渲染
-  → 混音后处理 → OSS上传 + 查重 → 更新状态
-```
-
-### 2.2 决定视频差异的变量
-
-要做"多个不重复版本"，先分析哪些环节可以引入变化：
-
-| 变量 | 当前行为 | 能否引入变化 | 影响程度 |
-|------|---------|------------|---------|
-| 素材选择 | 按 asset_ids 顺序全用 | ✅ 可随机选择子集/不同组合 | 大 |
-| 素材排序 | 按 asset_ids 顺序 | ✅ 可 shuffle 重排 | 大 |
-| 配音选择 | 固定 voice_library_id | ✅ 可选不同音色 | 中 |
-| 标题选择 | 固定 title_ids 或随机选 | ✅ 可选不同标题 | 中 |
-| BGM | 固定 bgm_config | ✅ 可选不同BGM | 小 |
-| 转场效果 | 模板固定 | ✅ 可随机化转场类型 | 小 |
-| 播放速度 | 模板固定 | ✅ 可微调速度 | 小 |
-| 分辨率/码率 | 固定 | ✅ 预览可降级 | 不影响内容 |
-
-### 2.3 可复用能力
-
- 任务创建与状态管理：`GenerationTask` + `CreateGenerationTaskUseCase`
- 素材下载与预处理：`_download_all_assets`
- 统一渲染引擎：`UnifiedRenderService`
- 分辨率配置：`resolution` 字段已支持
- 批量任务：`batch_id` 字段已存在（可用于预览组）
-
---
-
-## 3. 总体方案：复用现有链路 + 多变体引擎
-
-**核心思路**：沿用 v1 的"复用现有生成链路 + is_preview 标记"方案，在此基础上增加「多版本生成」能力。
-
-**架构**：
-```
-预览生成请求（count=N）
-    ↓
-创建预览批次（preview_batch）
-    ↓
-变体引擎生成 N 个变体参数（variation seed + 参数组合）
-    ↓
-为每个变体创建 1 个 GenerationTask（is_preview=true）
-    ↓
-N 个 Celery 任务并行执行（走现有生成链路，参数降级）
-    ↓
-N 个结果汇聚，前端左侧列表展示
-```
-
---
-
-## 4. 详细设计
-
-### 4.1 数据模型变更
-
-#### 4.1.1 GenerationTask 新增字段
-
-```python
-# 现有字段保留，新增：
-is_preview: bool = False
-"""是否为预览生成"""
-
-preview_batch_id: str = ""
-"""预览批次 ID（同批次的 N 个预览共享一个 batch）"""
-
-variant_seed: int = 0
-"""变体种子，用于控制随机化行为（素材选择、排序、转场等）"""
-
-variant_params: dict = field(default_factory=dict)
-"""变体参数快照（记录本次使用了哪些素材、标题、配音等，可追溯）
-   {
-     "asset_ids": [...],      # 实际选用的素材子集
-     "title_id": "",         # 选用的标题
-     "voice_id": "",         # 选用的配音
-     "transition_style": "", # 转场风格
-     "bgm_track": "",        # BGM 音轨
-   }
-"""
-```
-
-#### 4.1.2 GeneratedVideo 新增字段
-
-```python
-is_preview: bool = False
-"""是否为预览视频"""
-
-preview_batch_id: str = ""
-"""所属预览批次"""
-
-variant_index: int = 0
-"""在批次中的序号（0, 1, 2...）"""
-```
-
-#### 4.1.3 迁移方案
-
-alembic 新增 migration，两个表各加 4 个字段，默认值为空/false，无数据回填成本。
-
---
-
-### 4.2 变体引擎（Variant Engine）
-
-**核心组件**：根据 count 和 seed，生成 N 组互不相同的生成参数。
-
-#### 4.2.1 变纬度设计
-
-| 维度 | 策略 | 说明 |
-|------|------|------|
-| **素材子集选择** | 从素材池中随机选 M 个（M=min(素材数, 模板clip数*2)） | 版本差异最大的来源 |
-| **素材排序** | 随机打乱顺序 | 影响叙事节奏 |
-| **标题选择** | 从 title_ids 中随机选 1 个 | 影响文案内容 |
-| **配音选择** | 从 voice_ids 中随机选 1 个（如有多个） | 影响听觉体验 |
-| **转场风格** | 从预设转场池中随机选 1 种 | 影响视觉过渡 |
-| **BGM 选择** | 从 bgm 列表中随机选 1 首（如有配置） | 影响氛围 |
-
-#### 4.2.2 去重机制
-
- 同一批次内，变体参数必须两两不同（至少素材组合或排序不同）
- 使用 `variant_seed` 保证可复现（相同 seed → 相同变体）
- 如果素材数量不足导致无法生成 N 个不同版本，按实际能生成的数量返回
-
-#### 4.2.3 接口设计
-
-```python
-def generate_variants(
-    count: int,
-    seed: int,
-    asset_pool: list[str],        # 可用素材 ID 列表
-    title_pool: list[str] = [],    # 可用标题 ID 列表
-    voice_pool: list[str] = [],    # 可用配音 ID 列表
-    template_id: str = "",
-) -> list[dict]:
-    """
-    生成 count 组变体参数。
-    
-    每组参数包含：asset_ids（选用的素材+排序）、title_id、voice_id、
-    transition_style 等，确保两两不同。
-    """
-```
-
---
-
-### 4.3 API 层设计
-
-#### 4.3.1 预览生成接口
-
-```
-POST /api/v1/templates/{template_id}/generate-preview
-```
-
-**请求体**：
-```json
-{
-  "asset_library_id": "lib_xxx",
-  "asset_ids": ["asset_1", "asset_2", ...],
-  "title_ids": ["title_1", "title_2"],
-  "voice_ids": ["voice_1", "voice_2"],
-  "bgm_config": {},
-  "count": 3,
-  "seed": 0
-}
-```
-
-| 参数 | 类型 | 必填 | 默认 | 说明 |
-|------|------|------|------|------|
-| template_id | path | ✅ | - | 模板 ID |
-| asset_library_id | body | ✅ | - | 素材库 ID |
-| asset_ids | body | ✅ | - | 素材池（从中选子集/排序） |
-| title_ids | body | - | [] | 标题池（可选，不传则不用标题） |
-| voice_ids | body | - | [] | 配音池（可选） |
-| bgm_config | body | - | {} | BGM 配置 |
-| count | body | - | 3 | 生成几个预览版本（1~10） |
-| seed | body | - | 0 | 随机种子，0 表示随机 |
-
-**响应**：
-```json
-{
-  "preview_batch_id": "pb_xxx",
-  "count": 3,
-  "tasks": [
-    {
-      "task_id": "gen_xxx_0",
-      "variant_index": 0,
-      "status": "processing"
-    },
-    {
-      "task_id": "gen_xxx_1",
-      "variant_index": 1,
-      "status": "processing"
-    },
-    ...
-  ]
-}
-```
-
-#### 4.3.2 预览批次查询接口
-
-```
-GET /api/v1/preview-batches/{batch_id}
-```
-
-返回批次内所有预览任务的状态、结果（已完成的带 video_url）。
-
-**响应**：
-```json
-{
-  "preview_batch_id": "pb_xxx",
-  "count": 3,
-  "completed_count": 2,
-  "tasks": [
-    {
-      "task_id": "gen_xxx_0",
-      "variant_index": 0,
-      "status": "completed",
-      "video_url": "https://oss.xxx/preview/xxx.mp4",
-      "duration": 15.5,
-      "thumbnail_url": "https://oss.xxx/preview/xxx.jpg"
-    },
-    ...
-  ]
-}
-```
-
-#### 4.3.3 预览转正式生成
-
-```
-POST /api/v1/preview-batches/{batch_id}/tasks/{task_id}/promote
-```
-
-将某个预览版本升级为正式生成（复用素材缓存，重新全分辨率渲染）。
-
---
-
-### 4.4 渲染参数降级
-
-预览模式下自动调整以下参数：
-
-| 参数 | 正式生成 | 预览生成 |
-|------|---------|---------|
-| 分辨率 | 720p (1280x720) | 480p (854x480) |
-| 码率 | 4 Mbps | 1.5 Mbps |
-| 帧率 | 30 fps | 24 fps |
-| 时长 | 完整时长 | 前 15 秒（或第一段完整clip） |
-| 转场效果 | 完整转场 | 仅淡入淡出 |
-| 高级特效 | 全部启用 | 跳过粒子/光效等 |
-| 字幕 | 完整渲染 | 正常渲染 |
-| 配音 | 完整混音 | 正常混音 |
-| 输出质量 | high | medium |
-
-**实现位置**：`_render_video` 函数入口处，根据 `is_preview` 标记调整渲染配置。
-
---
-
-### 4.5 任务调度
-
- **并行执行**：N 个预览任务并行提交到 Celery，不排队等待
- **低优先级**：预览任务走独立队列（`preview_queue`），不抢占正式生成资源
- **超时控制**：预览任务超时时间 5 分钟（正式 30 分钟）
- **自动清理**：预览视频 7 天后自动从 OSS 删除，任务记录标记为 archived
-
---
-
-## 5. 前端对接要点
-
-### 5.1 交互流程
-
-```
-第2步选素材 → 第3步点击"生成预览"
-  → 显示 loading + 进度
-  → 预览陆续完成，左侧列表逐张出现
-  → 用户点击左侧不同版本，右侧预览区切换
-  → 用户选中满意版本 → 点击"正式生成"
-```
-
-### 5.2 需要对齐的接口
-
-1. **预览创建**：`POST /templates/{id}/generate-preview`
-2. **批次状态轮询**：`GET /preview-batches/{id}`（建议 2s 轮询，或走 SSE）
-3. **预览转正式**：`POST /preview-batches/{id}/tasks/{task_id}/promote`
-
-### 5.3 数据格式对齐
-
-预览视频条目结构：
-```json
-{
-  "id": "gen_xxx",
-  "variant_index": 0,
-  "status": "completed",
-  "video_url": "https://...",
-  "duration": 15.5,
-  "file_size": 2850000,
-  "thumbnail_url": "https://...",
-  "is_preview": true
-}
-```
-
---
-
-## 6. 配额与计费
-
- 预览生成**不计入**用户配额
- 同一模板 + 同一素材池，每天最多生成 3 次多版本预览（防滥用）
- 单个预览批次最多 10 个版本
-
---
-
-## 7. 实施步骤
-
-### Phase 1：单版本预览（MVP，2 天）
-1. 数据模型 + 迁移（is_preview 字段）
-2. API 层支持 is_preview 参数
-3. 渲染分辨率降级（480p）
-4. 不计入配额
-5. 基础测试
-
-### Phase 2：多版本预览（3 天）
-1. 变体引擎实现（素材随机选择 + 排序 + 去重）
-2. preview_batch 批次管理
-3. 批量创建 N 个预览任务
-4. 批次查询接口
-5. 前端联调
-
-### Phase 3：预览转正式 + 优化（2 天）
-1. 预览转正式生成接口（promote）
-2. 素材下载缓存复用
-3. 独立预览队列（低优先级）
-4. 自动清理机制
-5. 完整测试 + 压测
-
---
-
-## 8. 风险与注意事项
-
-| 风险 | 影响 | 应对 |
-|------|------|------|
-| 并发预览任务过多打满 worker | 正式生成被阻塞 | 独立预览队列 + 限流 |
-| 变体生成的视频差异不够大 | 用户觉得"都一样" | 优先素材子集+排序差异，保证视觉差异 |
-| 预览视频占用 OSS 存储 | 存储成本上升 | 7 天自动清理 + 低码率 |
-| N 个版本同时下载重复素材 | 带宽浪费 | 批次内共享一次下载（Phase 3 优化） |
-| 用户预期管理 | 以为预览就是最终效果 | 明确标注"预览版"，说明分辨率差异 |
-
---
-
-## 9. 开发量估算
-
-| 阶段 | 后端 | 前端 | 合计 |
-|------|------|------|------|
-| Phase 1 单版本预览 | 2 天 | 1 天 | 3 天 |
-| Phase 2 多版本预览 | 3 天 | 2 天 | 5 天 |
-| Phase 3 转正式+优化 | 2 天 | 1 天 | 3 天 |
-| **总计** | **7 天** | **4 天** | **~7 天（并行）** |
-
---
-
-## 10. 与 v1 方案的差异总结
-
-1. **新增多版本能力**：从"生成1个预览"升级为"生成N个不重复预览"
-2. **新增变体引擎**：负责素材选择/排序/配音/标题的随机化
-3. **新增批次概念**：preview_batch 管理一组预览任务
-4. **新增 promote 接口**：预览转正式生成
-5. **独立队列**：预览不抢占正式生成资源
-6. **开发量**：从 2-3 天增加到约 7 天（后端）
@@ -1,3 +1,4 @@
+import os
 from logging.config import fileConfig

 from sqlalchemy import engine_from_config, pool
@@ -7,17 +8,13 @@ from alembic import context
 # Import your models' Base here
 from packages.adapters.sqlalchemy_impl.models import Base

-# 使用统一配置入口获取 database_url，而非直接读环境变量
-from packages.config import get_shared_settings
-
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config

-# 从统一配置系统获取 database_url，确保与应用使用同一配置源
-settings = get_shared_settings()
-if settings.database_url:
-    config.set_main_option("sqlalchemy.url", settings.database_url)
+database_url = os.getenv("DATABASE_URL")
+if database_url:
+    config.set_main_option("sqlalchemy.url", database_url)

 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
@@ -1,64 +0,0 @@
-"""#642 - 生成任务新增 bgm_config 字段
-
-Revision ID: 052_generation_task_bgm_config
-Revises: 051_generation_task_resolution
-Create Date: 2026-07-25
-
-Changes:
-1. generation_tasks 表新增 bgm_config 字段（JSON类型），存储用户自定义BGM配置
-2. 为空时使用默认空字典
-
-背景：
-#642 一键生成支持自定义BGM 功能在 SQLAlchemy 模型中加了 bgm_config 字段，
-但遗漏了 alembic migration，导致 staging 环境数据库没有该列，
-创建生成任务时直接 500。
-"""
-
-import sqlalchemy as sa
-
-from alembic import context, op
-
-revision = "052_generation_task_bgm_config"
-down_revision = "051_generation_task_resolution"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        # 检查列是否已存在（幂等）
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'bgm_config'"
-            )
-        )
-        if result.scalar() is not None:
-            return
-
-    op.add_column(
-        "generation_tasks",
-        sa.Column(
-            "bgm_config",
-            sa.JSON,
-            nullable=False,
-            server_default=sa.text("'{}'::json"),
-        ),
-    )
-
-
-def downgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        # 检查列是否存在（幂等）
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'bgm_config'"
-            )
-        )
-        if result.scalar() is None:
-            return
-
-    op.drop_column("generation_tasks", "bgm_config")
@@ -1,61 +0,0 @@
-"""#1197 - 预览生成：generation_tasks 表新增 is_preview 字段
-
-Revision ID: 053
-Revises: 052
-Create Date: 2026-08-15
-
-Changes:
-1. generation_tasks 表新增 is_preview 字段，标记是否为预览生成任务（低清 480p）
-2. 默认 False，与现有正式生成任务兼容
-3. 加索引以支持按预览/正式任务筛选
-"""
-
-import sqlalchemy as sa
-
-from alembic import context, op
-
-revision = "053_generation_task_is_preview"
-down_revision = "052_generation_task_bgm_config"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        # 检查列是否已存在（幂等）
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'is_preview'"
-            )
-        )
-        if result.scalar() is not None:
-            return
-
-    op.add_column(
-        "generation_tasks",
-        sa.Column("is_preview", sa.Boolean, nullable=False, server_default=sa.text("false")),
-    )
-    # 加索引
-    op.create_index(
-        "ix_generation_tasks_is_preview",
-        "generation_tasks",
-        ["is_preview"],
-    )
-
-
-def downgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'is_preview'"
-            )
-        )
-        if result.scalar() is None:
-            return
-
-    op.drop_index("ix_generation_tasks_is_preview", table_name="generation_tasks")
-    op.drop_column("generation_tasks", "is_preview")
@@ -1,82 +0,0 @@
-"""确认生成 API 改造：为 generation_tasks 表添加 source_task_id、output_width、output_height、cover_url、custom_title 字段
-
-Revision ID: 054_confirm_gen_fields
-Revises: 053_generation_task_is_preview
-Create Date: 2026-08-16
-
-Changes:
-1. generation_tasks 表新增 source_task_id（来源预览任务 ID，带索引）
-2. generation_tasks 表新增 output_width / output_height（动态输出分辨率）
-3. generation_tasks 表新增 cover_url / custom_title（自定义封面和标题）
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "054_confirm_gen_fields"
-down_revision = "053_generation_task_is_preview"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    is_pg = conn.dialect.name == "postgresql"
-
-    if is_pg:
-        # 幂等检查：source_task_id 列是否已存在
-        result = conn.execute(
-            sa.text(
-                "SELECT column_name FROM information_schema.columns "
-                "WHERE table_name = 'generation_tasks' AND column_name = 'source_task_id'"
-            )
-        )
-        if result.scalar() is not None:
-            return
-
-    # source_task_id
-    op.add_column(
-        "generation_tasks",
-        sa.Column("source_task_id", sa.String(32), nullable=False, server_default=""),
-    )
-
-    # output_width
-    op.add_column(
-        "generation_tasks",
-        sa.Column("output_width", sa.Integer, nullable=False, server_default=sa.text("1280")),
-    )
-
-    # output_height
-    op.add_column(
-        "generation_tasks",
-        sa.Column("output_height", sa.Integer, nullable=False, server_default=sa.text("720")),
-    )
-
-    # cover_url
-    op.add_column(
-        "generation_tasks",
-        sa.Column("cover_url", sa.String(1000), nullable=False, server_default=""),
-    )
-
-    # custom_title
-    op.add_column(
-        "generation_tasks",
-        sa.Column("custom_title", sa.String(500), nullable=False, server_default=""),
-    )
-
-    # 索引
-    op.create_index(
-        "ix_generation_tasks_source_task_id",
-        "generation_tasks",
-        ["source_task_id"],
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_generation_tasks_source_task_id", table_name="generation_tasks")
-    op.drop_column("generation_tasks", "custom_title")
-    op.drop_column("generation_tasks", "cover_url")
-    op.drop_column("generation_tasks", "output_height")
-    op.drop_column("generation_tasks", "output_width")
-    op.drop_column("generation_tasks", "source_task_id")
@@ -1,82 +0,0 @@
-"""封面模板表 cover_templates
-
-Revision ID: 055_cover_templates
-Revises: 054_confirm_gen_fields
-Create Date: 2026-08-09
-
-Changes:
-1. 新建 cover_templates 表，支持系统预置和用户自定义封面模板
-2. user_id 为 NULL 表示系统模板，is_system 标记区分
-3. config 为 JSON 字段，存储封面配置信息
-"""
-
-import sqlalchemy as sa
-
-from alembic import context, op
-
-revision = "055_cover_templates"
-down_revision = "054_confirm_gen_fields"
-branch_labels = None
-depends_on = None
-
-SYSTEM_TEMPLATES = [
-    ("a8b0120fd98e44788f5a6590f983d327", "默认模板", {}),
-    ("6d8c501b11424432b3df3a45ae89b1a9", "大胆红", {"background_color": "#ef4444"}),
-    ("04937fb57fea4bad95e7883e71a6b246", "优雅黑", {"background_color": "#111827"}),
-    ("3ff9cc821174437ca53931073e7f536e", "渐变蓝", {"background_color": "#3b82f6"}),
-    ("db51b3ea8f1a4f4caa94bf2d51f27d11", "渐变紫", {"background_color": "#8b5cf6"}),
-    ("5027d113432a4f798a3b4ee1644d66af", "暖橙", {"background_color": "#f97316"}),
-    ("0e10def2b5a148d686416494474726c2", "清新绿", {"background_color": "#22c55e"}),
-    ("38ea98ac00c04bada064006d880546f0", "科技蓝", {"background_color": "#06b6d4"}),
-]
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    if context.get_context().dialect.name == "postgresql":
-        result = conn.execute(sa.text("SELECT to_regclass('public.cover_templates')"))
-        if result.scalar() is not None:
-            return
-
-    op.create_table(
-        "cover_templates",
-        sa.Column("id", sa.String(36), primary_key=True),
-        sa.Column("user_id", sa.String(36), nullable=True, index=True),
-        sa.Column("name", sa.String(200), nullable=False),
-        sa.Column("thumbnail_url", sa.String(1000), nullable=False, server_default=""),
-        sa.Column("is_system", sa.Boolean, nullable=False, server_default=sa.false(), index=True),
-        sa.Column("config", sa.JSON, nullable=False, server_default="{}"),
-        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()),
-    )
-
-    # 预置系统模板 seed 数据
-    cover_templates = sa.table(
-        "cover_templates",
-        sa.column("id", sa.String),
-        sa.column("user_id", sa.String),
-        sa.column("name", sa.String),
-        sa.column("thumbnail_url", sa.String),
-        sa.column("is_system", sa.Boolean),
-        sa.column("config", sa.JSON),
-        sa.column("created_at", sa.DateTime),
-        sa.column("updated_at", sa.DateTime),
-    )
-
-    for tid, name, config in SYSTEM_TEMPLATES:
-        conn.execute(
-            cover_templates.insert().values(
-                id=tid,
-                user_id=None,
-                name=name,
-                thumbnail_url="",
-                is_system=True,
-                config=config,
-                created_at=sa.func.now(),
-                updated_at=sa.func.now(),
-            )
-        )
-
-
-def downgrade() -> None:
-    op.drop_table("cover_templates")
@@ -1,39 +0,0 @@
-"""修复 cover_templates.config 双重序列化
-
-Revision ID: 056_fix_cover_templates_config
-Revises: 055_cover_templates
-Create Date: 2026-08-13
-
-问题: 055 迁移 seed 数据时 json.dumps(config) 导致 config 被双重序列化为 JSON 字符串
-例如 "{}"（字符串）而不是 {}（对象），导致 Pydantic CoverTemplateResponse 校验失败 500。
-
-修复: 从 JSON 字符串中提取文本值，再 cast 回 json 对象类型。
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "056_fix_cover_templates_config"
-down_revision = "055_cover_templates"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-
-    # PostgreSQL: 从 JSON string scalar 中提取文本内容，cast 为 json object
-    # 例如: JSON string "{}" -> text "{}" -> JSON object {}
-    if conn.dialect.name == "postgresql":
-        conn.execute(
-            sa.text(
-                "UPDATE cover_templates SET config = (config#>>'{}')::json "
-                "WHERE jsonb_typeof(config::jsonb) = 'string'"
-            )
-        )
-
-
-def downgrade() -> None:
-    # No safe rollback — the original data was incorrect
-    pass
@@ -1,18 +1,15 @@
-from app.api.routes.ai import router as ai_router
 from app.api.routes.asset_diagnosis import router as asset_diagnosis_router
 from app.api.routes.asset_libraries import router as asset_libraries_router
 from app.api.routes.assets import router as assets_router
 from app.api.routes.auth import router as auth_router
 from app.api.routes.chunked_upload import router as chunked_upload_router
 from app.api.routes.classification_jobs import router as classification_jobs_router
-from app.api.routes.cover_templates import router as cover_templates_router
 from app.api.routes.duplication import router as duplication_router
 from app.api.routes.feature_flags import router as feature_flags_router
-from app.api.routes.generation_cover import router as generation_cover_router
-from app.api.routes.generation_preview import router as generation_preview_router
 from app.api.routes.generation_tasks import router as generation_tasks_router
 from app.api.routes.health import router as health_check_router
 from app.api.routes.ingest_jobs import router as ingest_jobs_router
+from app.api.routes.ai import router as ai_router
 from app.api.routes.internal_render import router as internal_render_router
 from app.api.routes.projects import router as projects_router
 from app.api.routes.share import router as share_router
@@ -47,10 +44,6 @@ api_router.include_router(
    prefix="/tags",
    tags=["Tag"],
 )
-api_router.include_router(
-    cover_templates_router,
-    tags=["CoverTemplate"],
-)
 api_router.include_router(
    task_center_router,
    tags=["TaskCenter"],
@@ -94,16 +87,6 @@ api_router.include_router(
    prefix="/generation",
    tags=["Generation"],
 )
-api_router.include_router(
-    generation_preview_router,
-    prefix="/generation",
-    tags=["Generation"],
-)
-api_router.include_router(
-    generation_cover_router,
-    prefix="/generation",
-    tags=["Generation"],
-)
 api_router.include_router(
    titles_router,
    prefix="/titles",
@@ -5,9 +5,9 @@

 from __future__ import annotations

-from typing import List, Literal
+from typing import List, Literal, Optional

-from app.services.ai_service import TITLE_STYLES, generate_smart_titles, semantic_match_assets
+from app.services.ai_service import TITLE_STYLES, generate_smart_titles
 from fastapi import APIRouter
 from pydantic import BaseModel, Field

@@ -45,42 +45,6 @@ class TitleStyleInfo(BaseModel):
    description: str


-# ── 素材语义匹配 ────────────────────────────────────────────────────────────
-
-
-class AssetMatchItem(BaseModel):
-    """待匹配素材项."""
-
-    id: str = Field(..., description="素材ID")
-    name: str = Field(default="", description="素材名称")
-    tags: List[str] = Field(default_factory=list, description="标签列表")
-    description: str = Field(default="", description="素材描述")
-
-
-class SemanticMatchRequest(BaseModel):
-    """语义匹配请求."""
-
-    description: str = Field(..., min_length=1, max_length=500, description="目标视频内容描述")
-    assets: List[AssetMatchItem] = Field(..., min_length=1, max_length=100, description="待匹配素材列表")
-    top_k: int = Field(default=0, ge=0, le=100, description="返回前K个，0返回全部")
-
-
-class SemanticMatchResultItem(AssetMatchItem):
-    """匹配结果项."""
-
-    match_score: float = Field(..., description="匹配度评分 0-1")
-    match_reason: str = Field(..., description="匹配方式：doubao_semantic / fallback_keyword / fallback_default")
-
-
-class SemanticMatchResponse(BaseModel):
-    """语义匹配响应."""
-
-    matches: List[SemanticMatchResultItem] = Field(..., description="按匹配度降序排列的素材列表")
-    source: str = Field(..., description="来源：doubao / fallback")
-    description: str = Field(..., description="原始描述")
-    total: int = Field(..., description="输入素材总数")
-
-
 # ── 路由 ────────────────────────────────────────────────────────────────────


@@ -106,31 +70,3 @@ def list_title_styles():
        TitleStyleInfo(key=key, name=info["name"], description=info["description"])
        for key, info in TITLE_STYLES.items()
    ]
-
-
-@router.post("/assets/match", response_model=SemanticMatchResponse)
-def match_assets(request: SemanticMatchRequest):
-    """智能素材语义匹配.
-
-    根据用户描述，对素材列表做语义匹配并按匹配度排序。
-    未配置豆包 API Key 时自动降级为关键词匹配。
-
-    - 支持最多 100 个素材同时匹配
-    - 返回 match_score (0-1)，按降序排列
-    - top_k 可限制返回数量
-    """
-    # 转为 dict 传给服务层
-    assets_dict = [asset.model_dump() for asset in request.assets]
-
-    result = semantic_match_assets(
-        description=request.description,
-        assets=assets_dict,
-        top_k=request.top_k,
-    )
-
-    return SemanticMatchResponse(
-        matches=[SemanticMatchResultItem(**m) for m in result["matches"]],
-        source=result["source"],
-        description=result["description"],
-        total=result["total"],
-    )
@@ -1,5 +1,5 @@
 import logging
-from typing import Any, List, Optional
+from typing import Any, Optional

 from app.api.routes._helpers import check_project_access, format_utc_datetime
 from app.auth import AuthenticatedUser, get_current_user
@@ -14,21 +14,22 @@ from app.schemas.asset import (
    AssetResponse,
    BatchClassifyRequest,
    BatchDeleteRequest,
-    BatchGetRequest,
    BatchMarkRequest,
    BatchOperationResponse,
    BatchTagRequest,
+    CreateAssetRequest,
    ListAssetsResponse,
-    SmartMatchItem,
-    SmartMatchRequest,
-    SmartMatchResponse,
    UpdateAssetRequest,
    UpdateAssetReviewRequest,
 )
 from app.schemas.tag import TagAssetsRequest
 from fastapi import APIRouter, Depends, HTTPException, Query, Response

-from packages.domain.smart_match import smart_select_assets
+from packages.application import (
+    CreateAssetCommand,
+    CreateAssetUseCase,
+)
+from packages.domain import AssetStatus, ClassificationStatus

 logger = logging.getLogger(__name__)

@@ -365,18 +366,6 @@ def update_asset_review_status(
    return _to_asset_response(updated)


-@router.post("/batch", response_model=List[AssetResponse])
-def batch_get_assets(
-    request: BatchGetRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    asset_repository: Any = Depends(get_asset_repository),
-) -> list[AssetResponse]:
-    """批量获取素材详情（根据 ID 列表）。"""
-    items = asset_repository.find_by_ids(request.ids)
-    storage_service = get_storage_service()
-    return [_to_asset_response(item, storage_service) for item in items]
-
-
@router.post("/batch-delete", response_model=BatchOperationResponse)
 def batch_delete_assets(
    request: BatchDeleteRequest,
@@ -530,51 +519,6 @@ def batch_mark_assets(
    )


-@router.post("/smart-match", response_model=SmartMatchResponse)
-def smart_match_assets(
-    request: SmartMatchRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    asset_repository: Any = Depends(get_asset_repository),
-    asset_library_repository: Any = Depends(get_asset_library_repository),
-    project_repository: Any = Depends(get_project_repository),
-) -> SmartMatchResponse:
-    """智能选素材：根据素材库内容，按质量分+时长均衡+新鲜度+未使用偏好综合评分，返回 Top N 素材。"""
-    library = asset_library_repository.get(request.library_id)
-    if library is None:
-        raise HTTPException(status_code=404, detail=f"AssetLibrary {request.library_id} not found")
-    check_project_access(library.project_id, authenticated_user.user.id, project_repository)
-
-    # 获取素材库中所有 ready 素材（DB 层按 kind 过滤，避免加载不必要的数据到内存）
-    # kind → file_type 映射：schema 已校验只允许 video/image/audio，与 file_type 一致
-    if request.kind:
-        filtered_assets = asset_repository.find_by_library_and_file_type(
-            request.library_id, request.kind, status=["ready"], limit=10000
-        )
-    else:
-        filtered_assets = asset_repository.find_by_library(
-            request.library_id, status=["ready"], limit=10000
-        )
-    total_candidates = len(filtered_assets)
-
-    # 调用统一智能选素材算法（kind 已在 DB 层过滤，无需重复过滤）
-    results = smart_select_assets(
-        filtered_assets,
-        limit=request.limit,
-        kind=None,
-    )
-
-    items = [
-        SmartMatchItem(
-            asset=_to_asset_response(r.asset),
-            score=r.score,
-            breakdown=r.breakdown,
-        )
-        for r in results
-    ]
-
-    return SmartMatchResponse(items=items, total_candidates=total_candidates)
-
-
@router.get("/{asset_id}", response_model=AssetResponse)
 def get_asset(
    asset_id: str,
@@ -671,12 +615,43 @@ def untag_asset(


@router.post("", response_model=AssetResponse)
-def create_asset() -> None:
-    """
-    已废弃接口。
-    所有素材上传统一走 uploadAssetDirect → completeDirectUpload → ingest-jobs 流程。
-    """
-    raise HTTPException(
-        status_code=410,
-        detail="此接口已废弃。请使用 uploadAssetDirect 接口上传素材，Worker 会自动处理（视频转码、图片/音频元数据提取）并创建 Asset 记录。",
+def create_asset(
+    request: CreateAssetRequest,
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+    asset_repository: Any = Depends(get_asset_repository),
+    asset_library_repository: Any = Depends(get_asset_library_repository),
+    project_repository: Any = Depends(get_project_repository),
+) -> AssetResponse:
+    project = project_repository.find_by_id(request.project_id)
+    if project is None:
+        raise HTTPException(status_code=404, detail=f"Project {request.project_id} not found")
+    if not project.can_access(authenticated_user.user.id):
+        raise HTTPException(status_code=403, detail="Access denied to project")
+
+    library = asset_library_repository.get(request.library_id)
+    if library is None or library.project_id != request.project_id:
+        raise HTTPException(status_code=404, detail=f"AssetLibrary {request.library_id} not found")
+
+    use_case = CreateAssetUseCase(asset_repository)
+    item = use_case.execute(
+        CreateAssetCommand(
+            project_id=request.project_id,
+            library_id=request.library_id,
+            name=request.name,
+            storage_key=request.storage_key,
+            mime_type=request.mime_type,
+            metadata=request.metadata,
+            file_size=request.file_size,
+            thumbnail_url=request.thumbnail_url,
+            duration=request.duration,
+            width=request.width,
+            height=request.height,
+            fps=request.fps,
+            codec=request.codec,
+            status=AssetStatus(request.status),
+            classification_status=ClassificationStatus(request.classification_status),
+            quality_score=request.quality_score,
+            uploaded_by_user_id=authenticated_user.user.id,
+        )
    )
+    return _to_asset_response(item)
@@ -1,153 +0,0 @@
-"""封面模板 CRUD 路由。
-
-API:
-  GET    /api/v1/cover-templates       - 列出当前用户可见的模板
-  POST   /api/v1/cover-templates       - 创建自定义模板
-  PUT    /api/v1/cover-templates/{id}  - 更新模板
-  DELETE /api/v1/cover-templates/{id}  - 删除自定义模板（系统模板不可删）
-"""
-
-import logging
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_cover_template_repository
-from app.schemas.cover_template import (
-    CoverTemplateResponse,
-    CreateCoverTemplateRequest,
-    ListCoverTemplatesResponse,
-    UpdateCoverTemplateRequest,
-)
-from fastapi import APIRouter, Depends, HTTPException, Response
-from sqlalchemy.exc import OperationalError, ProgrammingError
-
-from packages.domain.cover_template import CoverTemplate
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter(prefix="/cover-templates", tags=["CoverTemplate"])
-
-
-@router.get("", response_model=ListCoverTemplatesResponse)
-def list_cover_templates(
-    skip: int = 0,
-    limit: int = 100,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> ListCoverTemplatesResponse:
-    """列出当前用户可见的封面模板（系统模板 + 用户自定义模板）。
-
-    当数据库表不存在时（迁移未执行），降级返回空列表而非 500。
-    """
-    user_id = authenticated_user.user.id
-    try:
-        items = repo.list_for_user(user_id, skip=skip, limit=limit)
-        total = repo.count_for_user(user_id)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表查询失败（可能未迁移），返回空列表: %s", exc)
-        return ListCoverTemplatesResponse(items=[], total=0)
-    return ListCoverTemplatesResponse(
-        items=[
-            CoverTemplateResponse(
-                id=t.id,
-                name=t.name,
-                thumbnail_url=t.thumbnail_url,
-                is_system=t.is_system,
-                created_at=t.created_at,
-                config=t.config or {},
-            )
-            for t in items
-        ],
-        total=total,
-    )
-
-
-@router.post("", response_model=CoverTemplateResponse, status_code=201)
-def create_cover_template(
-    request: CreateCoverTemplateRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> CoverTemplateResponse:
-    """创建用户自定义封面模板。"""
-    user_id = authenticated_user.user.id
-    config_dict = request.config.model_dump() if request.config else {}
-    template = CoverTemplate.create_user(
-        user_id=user_id,
-        name=request.name,
-        config=config_dict,
-        thumbnail_url=request.thumbnail_url,
-    )
-    try:
-        created = repo.create(template)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表不可用（可能未迁移）: %s", exc)
-        raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
-    return CoverTemplateResponse(
-        id=created.id,
-        name=created.name,
-        thumbnail_url=created.thumbnail_url,
-        is_system=created.is_system,
-        created_at=created.created_at,
-        config=created.config,
-    )
-
-
-@router.put("/{template_id}", response_model=CoverTemplateResponse)
-def update_cover_template(
-    template_id: str,
-    request: UpdateCoverTemplateRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> CoverTemplateResponse:
-    """更新封面模板（仅允许更新自己的模板）。"""
-    user_id = authenticated_user.user.id
-    try:
-        template = repo.get(template_id)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表不可用: %s", exc)
-        raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
-    if template is None:
-        raise HTTPException(status_code=404, detail="模板不存在")
-    if template.is_system:
-        raise HTTPException(status_code=403, detail="系统模板不可修改")
-    if template.user_id != user_id:
-        raise HTTPException(status_code=403, detail="无权修改该模板")
-
-    if request.name is not None:
-        template.update(name=request.name)
-    if request.config is not None:
-        template.update(config=request.config.model_dump())
-    if request.thumbnail_url is not None:
-        template.update(thumbnail_url=request.thumbnail_url)
-
-    updated = repo.update(template)
-    return CoverTemplateResponse(
-        id=updated.id,
-        name=updated.name,
-        thumbnail_url=updated.thumbnail_url,
-        is_system=updated.is_system,
-        created_at=updated.created_at,
-        config=updated.config,
-    )
-
-
-@router.delete("/{template_id}", status_code=204, response_class=Response)
-def delete_cover_template(
-    template_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repo: Any = Depends(get_cover_template_repository),
-) -> None:
-    """删除用户自定义封面模板（系统模板不可删除）。"""
-    user_id = authenticated_user.user.id
-    try:
-        template = repo.get(template_id)
-    except (OperationalError, ProgrammingError) as exc:
-        logger.warning("cover_templates 表不可用: %s", exc)
-        raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
-    if template is None:
-        raise HTTPException(status_code=404, detail="模板不存在")
-    if template.is_system:
-        raise HTTPException(status_code=403, detail="系统模板不可删除")
-    if template.user_id != user_id:
-        raise HTTPException(status_code=403, detail="无权删除该模板")
-    repo.delete(template_id)
@@ -1,364 +0,0 @@
-"""封面生成路由 — Generation 模块.
-
-端点：
- POST /generate-cover     AI 生成封面（从预览视频中抽帧）
-
-挂载路径: /api/v1/generation/generate-cover
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any, List, Optional
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session, get_generated_video_repository
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query
-from pydantic import BaseModel, Field
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.generation_task_repository import (
-    SQLAlchemyGenerationTaskRepository,
-)
-from packages.application import ListGeneratedVideosByTaskUseCase
-from packages.domain.config_schemas import normalize_plan_config
-
-from .templates_editor.dependencies import get_draft_plan_id, get_editor_services
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Generation"])
-
-
-
-
-# ── Schemas ──────────────────────────────────────────────────────────────
-
-
-class GenerateCoverRequest(BaseModel):
-    """AI 封面生成请求体"""
-
-    asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表（确定视频来源）")
-    cover_type: str = Field(
-        default="ai_frame",
-        description="封面类型: ai_frame / manual / upload / ai_regenerate",
-    )
-    frame_time: Optional[float] = Field(
-        default=None,
-        ge=0.0,
-        description="手动选帧时间点（秒），仅 cover_type=manual 时有效",
-    )
-    cover_url: Optional[str] = Field(
-        default=None,
-        description="上传的封面图片 URL，仅 cover_type=upload 时有效",
-    )
-
-
-class GenerateCoverResponse(BaseModel):
-    """AI 封面生成响应体"""
-
-    plan_id: str = Field(..., description="剪辑计划 ID")
-    cover: dict[str, Any] = Field(..., description="封面数据（type / image_url / frame_time 等）")
-
-
-# ── Route ────────────────────────────────────────────────────────────────
-
-
-@router.post("/generate-cover", response_model=GenerateCoverResponse)
-def generate_cover(
-    body: GenerateCoverRequest,
-    template_id: str = Query(..., description="模板 ID"),
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> GenerateCoverResponse:
-    """AI 生成封面 — 从预览视频中抽帧.
-
-    流程（串行）：
-    1. 预览视频已渲染完成（通过 3 步查找获取 URL）
-    2. 用裸 URL 让 MediaKit 下载视频并抽帧
-    3. 帧图下载后上传到 OSS covers/ 路径
-    """
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    # ── upload 类型：直接保存前端上传的封面图片，不需要预览视频 ──────
-    if body.cover_type == "upload":
-        if not body.cover_url:
-            raise HTTPException(
-                status_code=400,
-                detail="cover_type=upload 时必须提供 cover_url",
-            )
-        cover_data = {
-            "type": "upload",
-            "image_url": body.cover_url,
-        }
-        current_config = dict(plan.config) if plan.config else {}
-        current_config["cover"] = cover_data
-        normalized = normalize_plan_config(current_config)
-        plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
-        logger.info(
-            "封面上传完成: plan_id=%s cover_url=%s by user=%s",
-            plan_id,
-            body.cover_url[:80] if body.cover_url else "",
-            current_user.user.id,
-        )
-        return GenerateCoverResponse(plan_id=plan_id, cover=cover_data)
-
-    # ── 3 步查找预览视频 URL ──────────────────────────────────────────
-    # 第一步：从 plan.config 读取
-    logger.info("[封面生成] 步骤1: 从 plan.config 查找 rendered_storage_key: plan_id=%s", plan_id)
-    rendered_storage_key = (plan.config or {}).get("rendered_storage_key", "")
-
-    # 第二步：如果还没有，通过 generation_task_id 查找预览任务的产物
-    if not rendered_storage_key:
-        generation_task_id = (plan.config or {}).get("generation_task_id", "")
-        logger.info(
-            "[封面生成] 步骤2: 通过 generation_task_id 查找: plan_id=%s task_id=%s", plan_id, generation_task_id
-        )
-        if generation_task_id:
-            try:
-                gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-                task = gen_task_repo.get(generation_task_id)
-                if task:
-                    video_repo = get_generated_video_repository(db)
-                    use_case = ListGeneratedVideosByTaskUseCase(video_repo)
-                    videos = use_case.execute(task.id)
-                    if videos:
-                        rendered_storage_key = getattr(videos[0], "file_url", "") or ""
-                        logger.info(
-                            "[封面生成] ✅ 步骤2找到视频: plan_id=%s task_id=%s url=%s",
-                            plan_id,
-                            generation_task_id,
-                            rendered_storage_key[:80],
-                        )
-            except Exception:
-                logger.warning(
-                    "封面生成: 通过 generation_task_id 查找视频失败: plan_id=%s",
-                    plan_id,
-                    exc_info=True,
-                )
-
-    # 第 2.5 步：通过 plan_id 作为 source_edit_plan_id 查找关联的已完成预览任务
-    if not rendered_storage_key:
-        try:
-            gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-            logger.info("[封面生成] 步骤2.5: 通过 source_edit_plan_id 查找: plan_id=%s", plan_id)
-            preview_tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
-            for pt in preview_tasks:
-                if getattr(pt, "status", "") == "completed" and getattr(pt, "is_preview", False):
-                    video_repo = get_generated_video_repository(db)
-                    use_case = ListGeneratedVideosByTaskUseCase(video_repo)
-                    videos = use_case.execute(pt.id)
-                    if videos:
-                        rendered_storage_key = getattr(videos[0], "file_url", "") or ""
-                        logger.info(
-                            "[封面生成] ✅ 步骤2.5找到视频: plan_id=%s task_id=%s url=%s",
-                            plan_id,
-                            pt.id,
-                            rendered_storage_key[:80],
-                        )
-                        break
-        except Exception:
-            logger.warning(
-                "封面生成: 通过 source_edit_plan_id 查找预览任务失败: plan_id=%s",
-                plan_id,
-                exc_info=True,
-            )
-
-    # 第三步：按 user + template 查找最近的已完成预览任务（兜底）
-    if not rendered_storage_key:
-        try:
-            gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-            logger.info("[封面生成] 步骤3: 通过 user+template 查找: plan_id=%s template_id=%s", plan_id, template_id)
-            preview_tasks = gen_task_repo.list_latest_completed_preview(
-                user_id=str(current_user.user.id),
-                template_id=template_id,
-            )
-            if preview_tasks:
-                completed_preview = preview_tasks[0]
-                video_repo = get_generated_video_repository(db)
-                use_case = ListGeneratedVideosByTaskUseCase(video_repo)
-                videos = use_case.execute(completed_preview.id)
-                if videos:
-                    rendered_storage_key = getattr(videos[0], "file_url", "") or ""
-                    logger.info(
-                        "封面视频: 通过 user+template 找到预览任务: plan_id=%s template_id=%s task_id=%s",
-                        plan_id,
-                        template_id,
-                        completed_preview.id,
-                    )
-        except Exception:
-            logger.warning(
-                "封面警告: user+template 查找预览任务失败: plan_id=%s template_id=%s",
-                plan_id,
-                template_id,
-                exc_info=True,
-            )
-
-    # 仍然找不到才报 400
-    if not rendered_storage_key:
-        logger.error("[封面生成] ❌ 找不到预览视频: plan_id=%s", plan_id)
-        raise HTTPException(
-            status_code=400,
-            detail="请先生成预览视频，再生成封面",
-        )
-
-    # 回写到 plan.config
-    plan_svc.update_plan_config(plan_id, {"rendered_storage_key": rendered_storage_key})
-
-    # 使用裸 URL（rendered/* 已配置公开读）
-    primary_video_url = None
-    try:
-        if rendered_storage_key.startswith("http"):
-            primary_video_url = rendered_storage_key
-        else:
-            from packages.shared.storage import get_shared_storage_service
-
-            storage_svc = get_shared_storage_service()
-            primary_video_url = storage_svc.get_url(rendered_storage_key)
-        # 防御性规范化：合并路径中的双斜杠（// -> /），但保留协议头的 ://
-        # 历史数据中 project_id 为空时会产生 projects//tasks/ 路径，
-        # MediaKit 的 HTTP 客户端会规范化 URL 导致 404
-        if primary_video_url:
-            import re as _re
-
-            primary_video_url = _re.sub(r"(?<!:)//", "/", primary_video_url)
-        logger.info(
-            "获取预览视频URL用于封面生成: plan_id=%s url=%s",
-            plan_id,
-            primary_video_url[:80] if primary_video_url else "",
-        )
-    except Exception as e:
-        raise HTTPException(
-            status_code=500,
-            detail=f"获取预览视频URL失败: {e}",
-        ) from e
-
-    # 统一封面管道：优先从 GenerationTask.cover_url 读取渲染后视频抽帧的封面
-    # 多步查找 cover_url，和查找视频 URL 一样的 fallback 逻辑
-    if body.cover_type in ("ai_frame", "ai_regenerate"):
-        cover_url_from_task = None
-        gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-
-        # 步骤 A：通过 generation_task_id 直接查找
-        generation_task_id = (plan.config or {}).get("generation_task_id", "")
-        if generation_task_id:
-            try:
-                task = gen_task_repo.get(generation_task_id)
-                if task and getattr(task, "cover_url", ""):
-                    cover_url_from_task = task.cover_url
-                    logger.info(
-                        "[封面生成] 统一管道封面(步骤A-direct): plan_id=%s task_id=%s url=%s",
-                        plan_id,
-                        generation_task_id,
-                        cover_url_from_task[:80],
-                    )
-            except Exception:
-                logger.warning(
-                    "[封面生成] 步骤A读取 cover_url 失败: plan_id=%s task_id=%s",
-                    plan_id,
-                    generation_task_id,
-                    exc_info=True,
-                )
-
-        # 步骤 B：通过 source_edit_plan_id 查找关联预览任务的 cover_url
-        if not cover_url_from_task:
-            try:
-                preview_tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
-                for pt in preview_tasks:
-                    if getattr(pt, "status", "") == "completed" and getattr(pt, "cover_url", ""):
-                        cover_url_from_task = pt.cover_url
-                        logger.info(
-                            "[封面生成] 统一管道封面(步骤B-source_plan): plan_id=%s task_id=%s url=%s",
-                            plan_id,
-                            pt.id,
-                            cover_url_from_task[:80],
-                        )
-                        break
-            except Exception:
-                logger.warning(
-                    "[封面生成] 步骤B查找 cover_url 失败: plan_id=%s",
-                    plan_id,
-                    exc_info=True,
-                )
-
-        # 步骤 C：通过 user+template 查找最近的已完成预览任务的 cover_url
-        if not cover_url_from_task:
-            try:
-                preview_tasks = gen_task_repo.list_latest_completed_preview(
-                    user_id=str(current_user.user.id),
-                    template_id=template_id,
-                )
-                for pt in preview_tasks:
-                    if getattr(pt, "cover_url", ""):
-                        cover_url_from_task = pt.cover_url
-                        logger.info(
-                            "[封面生成] 统一管道封面(步骤C-user+template): plan_id=%s task_id=%s url=%s",
-                            plan_id,
-                            pt.id,
-                            cover_url_from_task[:80],
-                        )
-                        break
-            except Exception:
-                logger.warning(
-                    "[封面生成] 步骤C查找 cover_url 失败: plan_id=%s template_id=%s",
-                    plan_id,
-                    template_id,
-                    exc_info=True,
-                )
-
-        if cover_url_from_task:
-            # 标题已在预览视频渲染时烧录（ASS字幕），封面帧自然包含标题
-            cover_data = {
-                "type": "ai_frame",
-                "image_url": cover_url_from_task,
-                "frame_time": 0.0,
-                "confidence": 0.95,
-            }
-            current_config = dict(plan.config) if plan.config else {}
-            current_config["cover"] = cover_data
-            normalized = normalize_plan_config(current_config)
-            plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
-            return GenerateCoverResponse(plan_id=plan_id, cover=cover_data)
-
-        logger.warning(
-            "[封面生成] 统一管道未找到 cover_url: plan_id=%s",
-            plan_id,
-        )
-        # ai_frame/ai_regenerate 类型必须从渲染管道获取，不再回退到 AI 服务
-        raise HTTPException(
-            status_code=400,
-            detail="封面尚未生成，请先重新生成预览视频以触发封面自动提取",
-        )
-
-    from packages.shared.ai_service import run_generate_cover
-
-    try:
-        logger.info("[封面生成] 开始调用 AI 封面生成服务: plan_id=%s", plan_id)
-        cover_data = run_generate_cover(
-            plan_id=plan_id,
-            asset_ids=body.asset_ids,
-            cover_type=body.cover_type,
-            frame_time=body.frame_time,
-            primary_video_url=primary_video_url,
-        )
-    except RuntimeError as e:
-        raise HTTPException(status_code=500, detail=str(e)) from e
-
-    current_config = dict(plan.config) if plan.config else {}
-    current_config["cover"] = cover_data
-    normalized = normalize_plan_config(current_config)
-    plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
-
-    logger.info(
-        "封面生成完成: template_id=%s plan_id=%s type=%s by user=%s",
-        template_id,
-        plan_id,
-        body.cover_type,
-        current_user.user.id,
-    )
-
-    return GenerateCoverResponse(plan_id=plan_id, cover=cover_data)
@@ -1,408 +0,0 @@
-"""预览生成路由 — Phase 1：单版本预览接口（创建 + 查询）。
-
-路径前缀：/api/v1/generation/preview（与 /generation/tasks 同体系）
-"""
-
-from __future__ import annotations
-
-import json
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.storage import get_storage_service
-from app.core.task_enqueue import (
-    GLOBAL_PENDING_LIMIT,
-    USER_PENDING_LIMIT,
-    GlobalQueueFull,
-    UserPendingLimitExceeded,
-    safe_enqueue_generation_task,
-)
-from app.dependencies import (
-    get_asset_repository,
-    get_db_session,
-    get_generated_video_repository,
-    get_generation_task_repository,
-)
-from app.schemas.generation_task import (
-    CreatePreviewGenerationTaskRequest,
-    PreviewGenerationTaskResponse,
-)
-from fastapi import APIRouter, Depends, HTTPException
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.edit_template_repository import (
-    SQLAlchemyEditTemplateRepository,
-)
-from packages.adapters.sqlalchemy_impl.template_repository import (
-    SQLAlchemyTemplateRepository,
-)
-from packages.application import (
-    CreateGenerationTaskCommand,
-    CreateGenerationTaskUseCase,
-    GetGenerationTaskUseCase,
-    ListGeneratedVideosByTaskUseCase,
-)
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter()
-
-
-# 模板 mode → 视频比例映射
-_TEMPLATE_MODE_TO_RATIO = {
-    "pip": "9:16",
-    "standard": "16:9",
-    "square": "1:1",
-}
-
-
-def _infer_video_ratio_from_template(template_id: str, db: Session, user_id: str = "") -> str:
-    """从模板 mode 推断视频比例，前端未传 video_ratio 时使用。
-
-    Returns:
-        视频比例字符串（如 "9:16"），查询失败返回空字符串。
-    """
-    if not template_id:
-        return ""
-    try:
-        repo = SQLAlchemyTemplateRepository(db)
-        template = repo.get(template_id, user_id)
-        if template:
-            mode = getattr(template, "mode", "") or ""
-            ratio = _TEMPLATE_MODE_TO_RATIO.get(mode.strip(), "")
-            if ratio:
-                logger.info(
-                    "[预览生成] 从模板 mode=%s 推断 video_ratio=%s",
-                    mode,
-                    ratio,
-                )
-            return ratio
-    except Exception:
-        logger.warning(
-            "[预览生成] 查询模板失败，跳过 video_ratio 推断: template_id=%s",
-            template_id,
-            exc_info=True,
-        )
-    return ""
-
-
-def _resolve_strategy_id_from_template(template_id: str, db: Session, user_id: str = "") -> str:
-    """从模板读取 editing_mode / mode 作为 strategy_id。
-
-    优先查新模板系统（EditTemplate.editing_mode），fallback 旧模板（Template.mode）。
-    Worker 端使用 strategy_id 作为渲染 mode，为空则默认 one_take。
-    """
-    if not template_id:
-        return ""
-
-    # 优先查新模板系统
-    try:
-        new_repo = SQLAlchemyEditTemplateRepository(db)
-        new_template = new_repo.get(template_id)
-        if new_template and getattr(new_template, "editing_mode", ""):
-            mode = new_template.editing_mode.strip()
-            if mode:
-                logger.info(
-                    "[预览生成] 从新模板 editing_mode=%s (template_id=%s)",
-                    mode,
-                    template_id,
-                )
-                # 画中画已下线，pip/voice_pip 统一映射为 one_take
-                if mode in ("pip", "voice_pip"):
-                    logger.info("[预览生成] %s → one_take (画中画已下线)", mode)
-                    mode = "one_take"
-                return mode
-    except Exception:
-        logger.debug(
-            "[预览生成] 新模板查询失败，尝试旧模板: template_id=%s",
-            template_id,
-            exc_info=True,
-        )
-
-    # fallback 旧模板系统
-    try:
-        old_repo = SQLAlchemyTemplateRepository(db)
-        old_template = old_repo.get(template_id, user_id)
-        if old_template:
-            mode = getattr(old_template, "mode", "") or ""
-            mode = mode.strip()
-            if mode:
-                logger.info(
-                    "[预览生成] 从旧模板 mode=%s (template_id=%s)",
-                    mode,
-                    template_id,
-                )
-                # 画中画已下线，pip/voice_pip 统一映射为 one_take
-                if mode in ("pip", "voice_pip"):
-                    logger.info("[预览生成] %s → one_take (画中画已下线)", mode)
-                    mode = "one_take"
-                return mode
-    except Exception:
-        logger.warning(
-            "[预览生成] 旧模板查询也失败，strategy_id 留空: template_id=%s",
-            template_id,
-            exc_info=True,
-        )
-
-    return ""
-
-
-def _mark_task_failed(repo, task, reason: str) -> None:
-    """入队失败时将任务标记为 failed，避免产生僵尸 pending 数据。"""
-    try:
-        task.mark_failed(error_message=f"入队失败：{reason}")
-        repo.update(task)
-    except Exception:
-        logger.exception("[预览生成] 标记任务失败时异常: task_id=%s", task.id)
-
-
-def _to_preview_response(task, generated_videos: list | None = None) -> PreviewGenerationTaskResponse:
-    """将领域任务对象转换为预览响应 DTO。
-
-    Args:
-        task: GenerationTask 领域对象
-        generated_videos: 生成的视频列表（可选），取第一个作为 video_url
-
-    Returns:
-        PreviewGenerationTaskResponse
-    """
-    video_url = ""
-    duration = 0.0
-    file_size = 0
-    if generated_videos:
-        first_video = generated_videos[0]
-        raw_url = getattr(first_video, "file_url", "") or ""
-        # rendered/* 已配置公开读，直接用裸 URL
-        if raw_url.startswith("http"):
-            video_url = raw_url
-        else:
-            storage = get_storage_service()
-            video_url = storage.get_url(raw_url)
-        duration = float(getattr(first_video, "duration", 0.0) or 0.0)
-        file_size = int(getattr(first_video, "file_size", 0) or 0)
-
-    # 从 extra_meta / metadata 中提取统计信息（如果有）
-    extra_meta = getattr(task, "extra_meta", {}) or {}
-    clip_count = int(extra_meta.get("clip_count", len(getattr(task, "asset_ids", [])) or 0))
-    transition_count = int(extra_meta.get("transition_count", max(0, clip_count - 1)))
-    material_usage = extra_meta.get("material_usage", {}) or {}
-
-    # 计算生成耗时
-    generate_duration = 0.0
-    started_at = getattr(task, "started_at", None)
-    completed_at = getattr(task, "completed_at", None)
-    if started_at and completed_at:
-        generate_duration = (completed_at - started_at).total_seconds()
-
-    return PreviewGenerationTaskResponse(
-        task_id=task.id,
-        status=task.status.value if hasattr(task.status, "value") else str(task.status),
-        progress=float(task.progress or 0.0),
-        is_preview=bool(getattr(task, "is_preview", True)),
-        resolution=getattr(task, "resolution", "") or "",
-        video_url=video_url,
-        duration=duration,
-        file_size=file_size,
-        clip_count=clip_count,
-        transition_count=transition_count,
-        material_usage=material_usage,
-        error_message=task.error_message or "",
-        created_at=task.created_at,
-        started_at=started_at,
-        finished_at=completed_at,
-        generate_duration=generate_duration,
-    )
-
-
-@router.post("/preview", response_model=PreviewGenerationTaskResponse, status_code=201)
-def create_preview_generation_task(
-    request: CreatePreviewGenerationTaskRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generation_task_repository=Depends(get_generation_task_repository),
-    db: Session = Depends(get_db_session),
-    asset_repo=Depends(get_asset_repository),
-) -> PreviewGenerationTaskResponse:
-    """创建预览生成任务。
-
-    预览渲染品质与正式生成一致（1080p, CRF 23, medium preset），确认生成时可直接复用预览产物。
-
-    Args:
-        request: 预览任务创建请求（template_id + asset_ids 等）
-
-    Returns:
-        201 + 预览任务详情
-    """
-    user_id = authenticated_user.user.id
-    logger.info(
-        "[预览生成] 接收请求: user_id=%s, template_id=%s, asset_count=%d, preview_count=%d",
-        user_id,
-        request.template_id,
-        len(request.asset_ids),
-        request.preview_count,
-    )
-
-    # 预检查队列限流
-    try:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        global_pending = generation_task_repository.count_pending_total()
-        if user_pending + 1 > USER_PENDING_LIMIT:
-            raise UserPendingLimitExceeded(user_id=user_id, pending_count=user_pending + 1, limit=USER_PENDING_LIMIT)
-        if global_pending + 1 > GLOBAL_PENDING_LIMIT:
-            raise GlobalQueueFull(pending_count=global_pending + 1, limit=GLOBAL_PENDING_LIMIT)
-    except UserPendingLimitExceeded as e:
-        raise HTTPException(
-            status_code=429,
-            detail=f"您的待处理任务过多（当前 {e.pending_count - 1}/{e.limit}），请等待后再提交",
-        ) from e
-    except GlobalQueueFull as e:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from e
-
-    # 确定视频比例：优先前端传入，否则从模板 mode 推断
-    video_ratio = request.video_ratio or ""
-    if not video_ratio and request.template_id:
-        video_ratio = _infer_video_ratio_from_template(request.template_id, db, user_id)
-
-    # 从模板读取 editing_mode / mode 作为 strategy_id（渲染 pipeline 的 mode 参数）
-    strategy_id = _resolve_strategy_id_from_template(request.template_id, db, user_id)
-
-    # 处理标题配置：如果有标题文本，序列化到 custom_title 字段传递给 worker
-    title_config = request.title_config or {}
-    title_text = (title_config.get("text") or "").strip()
-    custom_title_value = ""
-    if title_text:
-        # 将标题文本和样式配置序列化为 JSON 存入 custom_title
-        # Worker 端会解析 JSON 获取完整标题配置
-        custom_title_value = json.dumps(title_config, ensure_ascii=False)
-        logger.info(
-            "[预览生成] 标题配置: text=%s, config_keys=%s",
-            title_text[:30],
-            list(title_config.keys()),
-        )
-
-    use_case = CreateGenerationTaskUseCase(generation_task_repository)
-
-    try:
-        task = use_case.execute(
-            CreateGenerationTaskCommand(
-                project_id="",
-                asset_library_id="",
-                strategy_id=strategy_id,
-                voice_library_id=request.voice_library_id,
-                template_id=request.template_id,
-                asset_ids=list(request.asset_ids),
-                title_ids=list(request.title_ids),
-                voice_ids=list(request.voice_ids),
-                created_by_user_id=user_id,
-                source_edit_plan_id=request.source_edit_plan_id,
-                asset_select_mode="",
-                batch_id="",
-                video_title=request.video_title,
-                resolution="",
-                bgm_config=request.bgm_config or {},
-                auto_retry_enabled=False,
-                auto_retry_max=0,
-                is_preview=True,
-                custom_title=custom_title_value,
-            )
-        )
-    except ValueError as e:
-        logger.warning("[预览生成] 创建失败: %s", e)
-        raise HTTPException(status_code=400, detail=str(e)) from e
-    except Exception as e:
-        logger.error("[预览生成] 创建失败: %s", e, exc_info=True)
-        raise HTTPException(status_code=500, detail="创建预览生成任务失败，请稍后再试") from e
-
-    # 关联编辑计划：如果前端未传 source_edit_plan_id，通过 template_id + user_id 查找
-    if not task.source_edit_plan_id and request.template_id:
-        try:
-            from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
-                SQLAlchemyEditPlanRepository,
-            )
-
-            _plan_repo = SQLAlchemyEditPlanRepository(db)
-            _plans = _plan_repo.list_by_template(request.template_id, limit=20)
-            for _p in _plans:
-                if (_p.created_by_user_id or "") == user_id:
-                    task.source_edit_plan_id = _p.id
-                    generation_task_repository.update(task)
-                    logger.info(
-                        "[预览生成] 自动关联编辑计划: task_id=%s plan_id=%s",
-                        task.id,
-                        _p.id,
-                    )
-                    break
-        except Exception:
-            logger.warning(
-                "[预览生成] 查找关联编辑计划失败（不影响主流程）: task_id=%s",
-                task.id,
-                exc_info=True,
-            )
-
-    # 入队执行；若入队失败则标记任务为 failed 避免僵尸数据
-    try:
-        if not safe_enqueue_generation_task(
-            task,
-            generation_task_repository,
-            user_id=user_id,
-            log_prefix="[预览生成]",
-            log_task_status=True,
-        ):
-            logger.warning("[预览生成] 任务入队失败: task_id=%s", task.id)
-            _mark_task_failed(generation_task_repository, task, "任务入队失败")
-            raise HTTPException(status_code=500, detail="任务入队失败，请稍后重试")
-    except UserPendingLimitExceeded as e:
-        _mark_task_failed(generation_task_repository, task, "待处理任务超限")
-        raise HTTPException(
-            status_code=429,
-            detail=f"您的待处理任务过多（当前 {e.pending_count - 1}/{e.limit}），请等待后再提交",
-        ) from None
-    except GlobalQueueFull:
-        _mark_task_failed(generation_task_repository, task, "系统队列已满")
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
-
-    return _to_preview_response(task)
-
-
-@router.get("/preview/{task_id}", response_model=PreviewGenerationTaskResponse)
-def get_preview_generation_task(
-    task_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generation_task_repository=Depends(get_generation_task_repository),
-    generated_video_repository=Depends(get_generated_video_repository),
-) -> PreviewGenerationTaskResponse:
-    """查询预览生成任务状态。
-
-    Args:
-        task_id: 任务 ID
-
-    Returns:
-        预览任务详情（含状态、进度、结果 URL 等）
-    """
-    use_case = GetGenerationTaskUseCase(generation_task_repository)
-    task = use_case.execute(task_id)
-    if task is None:
-        raise HTTPException(status_code=404, detail=f"预览任务 {task_id} 不存在")
-
-    # 权限校验：任务必须属于当前用户（统一转 str 比较，避免 UUID/str 类型差异）
-    task_user_id = str(getattr(task, "created_by_user_id", "") or "")
-    if not task_user_id or task_user_id != str(authenticated_user.user.id):
-        raise HTTPException(status_code=403, detail="无权访问该任务")
-
-    # 校验是否为预览任务
-    if not getattr(task, "is_preview", False):
-        raise HTTPException(status_code=404, detail=f"预览任务 {task_id} 不存在")
-
-    # 查询生成的视频（取第一个）
-    generated_videos = []
-    status_val = task.status.value if hasattr(task.status, "value") else str(task.status)
-    if status_val == "completed":
-        list_use_case = ListGeneratedVideosByTaskUseCase(generated_video_repository)
-        generated_videos = list_use_case.execute(task_id)
-
-    return _to_preview_response(task, generated_videos=generated_videos)
@@ -26,11 +26,11 @@ from app.schemas.generated_video import (
 )
 from app.schemas.generation_task import (
    BatchGenerationTaskResponse,
-    ConfirmGenerationRequest,
    CreateGenerationTaskRequest,
    GenerationTaskResponse,
    ListGenerationTasksResponse,
 )
+from app.services.smart_asset_selector import SmartAssetSelector
 from fastapi import APIRouter, Depends, HTTPException

 from packages.application import (
@@ -39,7 +39,6 @@ from packages.application import (
    GetGenerationTaskUseCase,
    ListGeneratedVideosByTaskUseCase,
 )
-from packages.domain.smart_match import smart_select_assets

 logger = logging.getLogger(__name__)

@@ -62,13 +61,6 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
        batch_id=getattr(task, "batch_id", ""),
        video_title=getattr(task, "video_title", ""),
        resolution=getattr(task, "resolution", ""),
-        bgm_config=getattr(task, "bgm_config", {}) or {},
-        is_preview=getattr(task, "is_preview", False),
-        source_task_id=getattr(task, "source_task_id", ""),
-        output_width=getattr(task, "output_width", 1280),
-        output_height=getattr(task, "output_height", 720),
-        cover_url=getattr(task, "cover_url", ""),
-        custom_title=getattr(task, "custom_title", ""),
        logs=getattr(task, "logs", "[]"),
        status=task.status,
        progress=task.progress,
@@ -132,11 +124,10 @@ def _select_assets_from_library(
        return [a.id for a in selected]

    if mode == "smart":
-        # 智能匹配：统一使用 packages/domain/smart_match.py 的多维评分+多样性选取
-        # 评分维度：质量分(40%) + 时长适配(30%) + 新鲜度(20%) + 未使用加分(10%)
-        limit = count if count > 0 else None
-        results = smart_select_assets(ready_video_assets, limit=limit, kind="video")
-        return [r.asset.id for r in results]
+        # 智能匹配：多维度综合评分 + 时长多样性保证
+        selector = SmartAssetSelector()
+        result = selector.select(ready_video_assets, count=count, ensure_diversity=True)
+        return result.selected_ids

    # 默认 all 模式：返回全部 ready 视频素材
    return [a.id for a in ready_video_assets]
@@ -271,19 +262,13 @@ def create_generation_task(
            detail="系统繁忙，请稍后再试",
        ) from e

-    # 画中画已下线：strategy_id 中的 pip/voice_pip 统一映射为 one_take
-    effective_strategy_id = request.strategy_id
-    if effective_strategy_id in ("pip", "voice_pip"):
-        logger.info("画中画已下线，strategy_id %s → one_take", effective_strategy_id)
-        effective_strategy_id = "one_take"
-
    try:
        for _ in range(count):
            task = use_case.execute(
                CreateGenerationTaskCommand(
                    project_id=project_id,
                    asset_library_id=asset_library_id,
-                    strategy_id=effective_strategy_id,
+                    strategy_id=request.strategy_id,
                    voice_library_id=request.voice_library_id,
                    template_id=request.template_id,
                    asset_ids=resolved_asset_ids,
@@ -295,15 +280,8 @@ def create_generation_task(
                    batch_id=batch_id,
                    video_title=request.video_title,
                    resolution=request.resolution,
-                    bgm_config=request.bgm_config,
                    auto_retry_enabled=request.auto_retry_enabled,
                    auto_retry_max=request.auto_retry_max,
-                    is_preview=request.is_preview,
-                    source_task_id=request.source_task_id,
-                    output_width=request.output_width,
-                    output_height=request.output_height,
-                    cover_url=request.cover_url,
-                    custom_title=request.custom_title,
                )
            )
            try:
@@ -344,120 +322,6 @@ def create_generation_task(
    return BatchGenerationTaskResponse(items=items, total=len(items))


-@router.post("/tasks/{task_id}/confirm", response_model=BatchGenerationTaskResponse)
-def confirm_generation(
-    task_id: str,
-    request: ConfirmGenerationRequest,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    generation_task_repository: Any = Depends(get_generation_task_repository),
-    project_repository: Any = Depends(get_project_repository),
-) -> BatchGenerationTaskResponse:
-    """确认生成 -- 复用预览渲染产物（预览与正式品质一致）。
-
-    预览已使用 1080p / CRF 23 / medium 渲染，品质与正式生成一致。
-    确认时直接将预览任务标记为正式产出，无需重新渲染，实现秒出。
-    仅当预览任务未完成时，才创建新的正式任务走渲染流程。
-    """
-    # 1. 查找源预览任务
-    source_task = generation_task_repository.get(task_id)
-    if source_task is None:
-        raise HTTPException(status_code=404, detail=f"Preview task {task_id} not found")
-
-    # 2. 权限检查
-    if source_task.created_by_user_id and source_task.created_by_user_id != authenticated_user.user.id:
-        raise HTTPException(status_code=403, detail="Access denied to this task")
-    if source_task.project_id:
-        check_project_access(source_task.project_id, authenticated_user.user.id, project_repository)
-
-    # 3. 如果预览任务已完成，检查分辨率一致性后复用产物（秒出）
-    if source_task.is_completed and getattr(source_task, "is_preview", False):
-        # 校验请求的分辨率是否与预览实际渲染的分辨率一致
-        req_w = request.output_width or 0
-        req_h = request.output_height or 0
-        src_w = getattr(source_task, "output_width", 0) or 0
-        src_h = getattr(source_task, "output_height", 0) or 0
-        resolution_match = (req_w == 0 or req_w == src_w) and (req_h == 0 or req_h == src_h)
-
-        if resolution_match:
-            source_task.mark_confirmed(
-                cover_url=request.cover_url,
-                custom_title=request.custom_title,
-                output_width=request.output_width,
-                output_height=request.output_height,
-            )
-            generation_task_repository.update(source_task)
-            logger.info(
-                "[确认生成] 复用预览产物: task_id=%s, user_id=%s",
-                task_id,
-                authenticated_user.user.id,
-            )
-            return BatchGenerationTaskResponse(
-                items=[_to_generation_task_response(source_task)],
-                total=1,
-            )
-        # 分辨率不一致，跳过复用，走新建任务流程
-        logger.info(
-            "[确认生成] 分辨率不一致，跳过复用: task_id=%s, src=%sx%s, req=%sx%s",
-            task_id,
-            src_w,
-            src_h,
-            req_w,
-            req_h,
-        )
-
-    # 4. 预览任务未完成，创建新的正式任务走渲染流程
-    use_case = CreateGenerationTaskUseCase(generation_task_repository)
-    new_task = use_case.execute(
-        CreateGenerationTaskCommand(
-            project_id=source_task.project_id,
-            asset_library_id=source_task.asset_library_id,
-            strategy_id=source_task.strategy_id,
-            voice_library_id=source_task.voice_library_id,
-            template_id=source_task.template_id,
-            asset_ids=source_task.asset_ids,
-            title_ids=source_task.title_ids,
-            voice_ids=source_task.voice_ids,
-            created_by_user_id=authenticated_user.user.id,
-            source_edit_plan_id=source_task.source_edit_plan_id or "",
-            asset_select_mode=source_task.asset_select_mode,
-            video_title=getattr(source_task, "video_title", ""),
-            resolution=getattr(source_task, "resolution", ""),
-            is_preview=False,
-            source_task_id=task_id,
-            output_width=request.output_width,
-            output_height=request.output_height,
-            cover_url=request.cover_url,
-            custom_title=request.custom_title,
-        )
-    )
-
-    # 5. 调度 worker
-    try:
-        if not safe_enqueue_generation_task(
-            new_task,
-            generation_task_repository,
-            user_id=authenticated_user.user.id,
-            log_prefix="[确认生成]",
-            log_task_status=True,
-        ):
-            logger.warning("[确认生成] 入队失败: task_id=%s", new_task.id)
-    except UserPendingLimitExceeded:
-        raise HTTPException(
-            status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
-        ) from None
-    except GlobalQueueFull:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
-
-    return BatchGenerationTaskResponse(
-        items=[_to_generation_task_response(new_task)],
-        total=1,
-    )
-
-
@router.get("/tasks", response_model=ListGenerationTasksResponse)
 def list_generation_tasks(
    authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -555,12 +419,6 @@ def retry_generation_task(
            asset_select_mode=getattr(task, "asset_select_mode", ""),
            video_title=getattr(task, "video_title", ""),
            resolution=getattr(task, "resolution", ""),
-            is_preview=getattr(task, "is_preview", False),
-            source_task_id=getattr(task, "source_task_id", ""),
-            output_width=getattr(task, "output_width", 1280),
-            output_height=getattr(task, "output_height", 720),
-            cover_url=getattr(task, "cover_url", ""),
-            custom_title=getattr(task, "custom_title", ""),
        )
    )
    try:
@@ -1,6 +1,6 @@
-from datetime import datetime, timezone
+from datetime import datetime

-import psycopg
+import psycopg2
 import redis
 from app.config import settings
 from fastapi import APIRouter, status
@@ -13,7 +13,7 @@ router = APIRouter(tags=["Health"])
 async def health_check():
    return {
        "status": "healthy",
-        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "timestamp": datetime.utcnow().isoformat(),
        "version": settings.APP_VERSION,
    }

@@ -33,7 +33,7 @@ async def startup_check():
    all_ready = all(check["status"] == "healthy" for check in checks.values())
    response = {
        "status": "started" if all_ready else "starting",
-        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "timestamp": datetime.utcnow().isoformat(),
        "checks": checks,
    }
    if not all_ready:
@@ -49,7 +49,7 @@ async def _check_database() -> dict:
            "message": "Using in-memory database",
        }
    try:
-        conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
+        conn = psycopg2.connect(settings.DATABASE_URL, connect_timeout=3)
        with conn.cursor() as cur:
            cur.execute("SELECT 1")
            cur.fetchone()
@@ -124,7 +124,7 @@ async def _check_migrations() -> dict:
            "message": "Using in-memory database, no migrations needed",
        }
    try:
-        conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
+        conn = psycopg2.connect(settings.DATABASE_URL, connect_timeout=3)
        with conn.cursor() as cur:
            cur.execute("""
                SELECT COUNT(*) FROM information_schema.tables
@@ -1,62 +0,0 @@
-"""模板编辑器 API 路由包.
-
-将原来 2560 行的 templates_editor.py 巨无霸拆分为 12 个模块：
- schemas.py:        所有 Pydantic model
- dependencies.py:   依赖注入
- _utils.py:         工具函数
- _fallback.py:      自动兜底逻辑
- draft.py:          草稿管理（详情/更新/发布/版本/回滚）
- clips.py:          片段管理（CRUD/分割/合并/重排/批量删除/从素材创建）
- adjustments.py:    片段调整（速度/音量/裁剪/批量调速）
- bgm.py:            BGM 管理
- effects.py:        转场 + 滤镜
- export.py:         导出配置
- subtitles.py:      字幕管理
- ai_features.py:    AI 推荐
- generation.py:     生成（触发/进度/记录）
- timeline.py:       时间线
-
-挂载路径: /api/v1/templates/{template_id}/editor/
-"""
-
-from __future__ import annotations
-
-# 向后兼容：测试和其他模块可能直接从 templates_editor 导入这些符号
-from app.auth import get_current_user  # noqa: F401
-from app.dependencies import get_db_session  # noqa: F401
-from fastapi import APIRouter
-
-from .adjustments import router as adjustments_router
-from .ai_features import router as ai_features_router
-from .bgm import router as bgm_router
-from .clips import router as clips_router
-from .dependencies import get_draft_plan_id, get_editor_services  # noqa: F401
-from .draft import router as draft_router
-from .effects import router as effects_router
-from .export import router as export_router
-from .generation import router as generation_router
-from .subtitles import router as subtitles_router
-from .timeline import router as timeline_router
-
-# 主 router，所有子路由都合并到这里
-router = APIRouter(tags=["Template Editor"])
-
-# 合并所有子模块的路由（不用 include_router 是因为子路由有空路径 ""）
-_sub_routers = [
-    draft_router,
-    clips_router,
-    adjustments_router,
-    bgm_router,
-    effects_router,
-    export_router,
-    subtitles_router,
-    ai_features_router,
-    generation_router,
-    timeline_router,
-]
-
-for sub in _sub_routers:
-    for route in sub.routes:
-        router.routes.append(route)
-
-__all__ = ["router"]
@@ -1,227 +0,0 @@
-"""模板编辑器自动兜底逻辑.
-
-generate_editor_draft 触发生成前的自动修复流程：
-1. draft → editing 状态迁移
-2. 无片段时从模板复制片段配置
-3. 为无素材片段分配指定素材
-4. 项目有素材库时自动选素材
-"""
-
-from __future__ import annotations
-
-import logging
-import random
-from typing import Any
-
-from app.services.edit_plan_service import EditPlanService
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.template_clip_config_repository import (
-    SQLAlchemyTemplateClipConfigRepository,
-)
-from packages.adapters.sqlalchemy_impl.template_repository import (
-    SQLAlchemyTemplateRepository,
-)
-from packages.domain.edit_plan import EditPlanStatus
-
-logger = logging.getLogger(__name__)
-
-
-def _auto_fallback_draft_to_editing(svc: EditPlanService, plan_id: str, plan_check) -> None:
-    """自动兜底 1: draft → editing"""
-    if plan_check.status == EditPlanStatus.DRAFT:
-        logger.info("模板编辑器自动兜底: plan=%s draft→editing", plan_id)
-        svc.transition_status(plan_id, EditPlanStatus.EDITING)
-
-
-def _auto_fallback_copy_template_clips(svc: EditPlanService, plan_id: str, plan_check, db: Session) -> None:
-    """自动兜底 2: 无片段 + 有 template_id → 从模板复制片段配置"""
-    existing_clips = svc.count_clips(plan_id)
-    if existing_clips == 0 and plan_check.template_id:
-        logger.info(
-            "模板编辑器自动兜底: plan=%s 无片段，从模板 %s 复制片段配置",
-            plan_id,
-            plan_check.template_id,
-        )
-        clip_config_repo = SQLAlchemyTemplateClipConfigRepository(db)
-        configs = clip_config_repo.list_by_template(plan_check.template_id)
-        if configs:
-            for cfg in configs:
-                svc.create_clip(
-                    plan_id=plan_id,
-                    clip_type=cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
-                    order=cfg.order,
-                    template_clip_config_id=cfg.id,
-                    duration=cfg.default_duration,
-                    transition_effect=(
-                        cfg.transition_effect.value
-                        if hasattr(cfg.transition_effect, "value")
-                        else cfg.transition_effect
-                    ),
-                )
-            logger.info(
-                "模板编辑器自动兜底: plan=%s 从 template_clip_configs 复制了 %d 个片段",
-                plan_id,
-                len(configs),
-            )
-        else:
-            tpl_repo = SQLAlchemyTemplateRepository(db)
-            segments = tpl_repo.list_segments(plan_check.template_id)
-            for seg in segments:
-                avg_duration = (seg.duration_min + seg.duration_max) / 2
-                svc.create_clip(
-                    plan_id=plan_id,
-                    clip_type="main",
-                    order=seg.segment_order,
-                    duration=avg_duration,
-                    config={
-                        "material_type": seg.material_type or "",
-                        "template_segment_id": seg.id,
-                    },
-                )
-            logger.info(
-                "模板编辑器自动兜底: plan=%s 从旧模板 segments 复制了 %d 个片段",
-                plan_id,
-                len(segments),
-            )
-
-
-def _auto_fallback_assign_assets(svc: EditPlanService, plan_id: str, plan_check) -> list:
-    """自动兜底 3: 为没有素材的片段分配素材。返回剩余无素材片段列表。"""
-    all_clips = svc.list_clips(plan_id)
-    clips_without_asset = [c for c in all_clips if not c.asset_id]
-    config_asset_ids = (plan_check.config or {}).get("asset_ids", [])
-
-    logger.info(
-        "模板编辑器自动兜底3 诊断: plan=%s total_clips=%d " "clips_without_asset=%d config_asset_ids=%r",
-        plan_id,
-        len(all_clips),
-        len(clips_without_asset),
-        config_asset_ids[:5] if config_asset_ids else [],
-    )
-
-    if clips_without_asset and config_asset_ids:
-        logger.info(
-            "模板编辑器自动兜底3: plan=%s 为 %d 个无素材片段分配 %d 个指定素材",
-            plan_id,
-            len(clips_without_asset),
-            len(config_asset_ids),
-        )
-        assigned = 0
-        for i, clip in enumerate(clips_without_asset):
-            asset_idx = i % len(config_asset_ids)
-            try:
-                svc.assign_asset(clip.id, config_asset_ids[asset_idx])
-                assigned += 1
-            except Exception as exc:
-                logger.error(
-                    "模板编辑器自动兜底3: plan=%s clip=%s 分配素材 %s 失败: %s",
-                    plan_id,
-                    clip.id,
-                    config_asset_ids[asset_idx],
-                    exc,
-                )
-        logger.info(
-            "模板编辑器自动兜底3: plan=%s 素材分配完成 assigned=%d/%d",
-            plan_id,
-            assigned,
-            len(clips_without_asset),
-        )
-        # 重新检查剩余无素材片段
-        all_clips_after = svc.list_clips(plan_id)
-        clips_without_asset = [c for c in all_clips_after if not c.asset_id]
-        if clips_without_asset:
-            logger.warning(
-                "模板编辑器自动兜底3: plan=%s 仍有 %d 个片段无素材",
-                plan_id,
-                len(clips_without_asset),
-            )
-    elif not clips_without_asset:
-        logger.info("模板编辑器自动兜底3: plan=%s 所有片段已有素材，跳过", plan_id)
-    elif not config_asset_ids:
-        logger.info(
-            "模板编辑器自动兜底3: plan=%s config.asset_ids 为空，跳过分配",
-            plan_id,
-        )
-
-    return clips_without_asset
-
-
-def _auto_fallback_auto_material_mode(
-    svc: EditPlanService,
-    plan_id: str,
-    plan_check,
-    clips_without_asset: list,
-    asset_library_repo: Any,
-    asset_repo: Any,
-    user_id: str = "",
-) -> None:
-    """自动兜底 4: 自动选素材分配给无素材片段
-
-    查找策略（按优先级）：
-    1. plan 有 project_id → 从项目素材库查找
-    2. plan 无 project_id 但有 user_id → 从用户上传的素材中查找
-    """
-    if not clips_without_asset:
-        return
-
-    ready_videos: list = []
-    source_desc = ""
-
-    # 策略 1: 通过 project_id 查找项目素材库
-    if plan_check.project_id:
-        libs = asset_library_repo.find_by_project(plan_check.project_id)
-        video_lib = None
-        for lib in libs:
-            lib_kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
-            if lib_kind == "video":
-                video_lib = lib
-                break
-        if video_lib:
-            assets = asset_repo.find_by_library(video_lib.id)
-            ready_videos = [
-                a
-                for a in assets
-                if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
-                and a.mime_type
-                and a.mime_type.startswith("video")
-            ]
-            source_desc = f"素材库 {video_lib.name}"
-
-    # 策略 2: 通过 user_id 查找用户上传的素材
-    if not ready_videos and user_id and hasattr(asset_repo, "find_ready_videos_by_user"):
-        logger.info(
-            "模板编辑器自动兜底4: plan=%s project_id 为空，尝试通过 user_id=%s 查找素材",
-            plan_id,
-            user_id,
-        )
-        ready_videos = asset_repo.find_ready_videos_by_user(user_id)
-        source_desc = f"用户上传 (user_id={user_id[:8]}...)"
-
-    if not ready_videos:
-        logger.warning(
-            "模板编辑器自动兜底4: plan=%s 未找到可用素材 (project_id=%s, user_id=%s)",
-            plan_id,
-            plan_check.project_id or "(empty)",
-            user_id[:8] + "..." if user_id else "(empty)",
-        )
-        return
-
-    logger.info(
-        "模板编辑器自动兜底4: plan=%s 自动选素材分配给 %d 个无素材片段 (来源: %s, 共 %d 个)",
-        plan_id,
-        len(clips_without_asset),
-        source_desc,
-        len(ready_videos),
-    )
-    random.shuffle(ready_videos)
-    for i, clip in enumerate(clips_without_asset):
-        asset = ready_videos[i % len(ready_videos)]
-        svc.assign_asset(clip.id, asset.id)
-    logger.info(
-        "模板编辑器自动兜底4: plan=%s 从 %s 分配了 %d 个素材给 %d 个片段",
-        plan_id,
-        source_desc,
-        len(ready_videos),
-        len(clips_without_asset),
-    )
@@ -1,109 +0,0 @@
-"""模板编辑器内部工具函数.
-
-纯函数，不依赖请求上下文。
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from .schemas import ClipAdjustResponse
-
-# 时间线场景颜色映射
-_CLIP_TYPE_COLORS = {
-    "intro": "#6366f1",
-    "title": "#6366f1",
-    "product": "#818cf8",
-    "showcase": "#10b981",
-    "scene": "#10b981",
-    "subtitle": "#f59e0b",
-    "text": "#f59e0b",
-    "cta": "#ef4444",
-    "outro": "#ef4444",
-    "voiceover": "#8b5cf6",
-    "transition": "#64748b",
-}
-_DEFAULT_COLOR = "#6366f1"
-
-
-def _format_time(seconds: float) -> str:
-    """秒数格式化为 m:ss"""
-    m = int(seconds) // 60
-    s = int(seconds) % 60
-    return f"{m}:{s:02d}"
-
-
-def _clip_type_to_scene_label(clip_type: str, text_content: str) -> str:
-    """片段类型转时间线场景标签"""
-    type_labels = {
-        "intro": "开场",
-        "title": "标题",
-        "product": "产品展示",
-        "showcase": "场景展示",
-        "scene": "场景",
-        "subtitle": "字幕",
-        "text": "文字",
-        "cta": "结尾 CTA",
-        "outro": "结尾",
-        "voiceover": "配音",
-        "transition": "转场",
-    }
-    label = type_labels.get(clip_type, clip_type or "片段")
-    if text_content:
-        short = text_content[:20].strip()
-        if short:
-            return f"{label} - {short}"
-    return label
-
-
-# ── 片段调整相关工具 ────────────────────────────────────────────────────────
-
-
-def _get_clip_config(clip) -> dict:
-    """安全获取 clip.config"""
-    config = getattr(clip, "config", {}) or {}
-    if not isinstance(config, dict):
-        config = {}
-    return config
-
-
-def _get_adjust_volume(clip) -> float:
-    """获取片段音量"""
-    config = _get_clip_config(clip)
-    return float(config.get("volume", 1.0))
-
-
-def _get_adjust_trim(clip) -> tuple[float, float]:
-    """获取片段裁剪起止"""
-    config = _get_clip_config(clip)
-    trim_start = float(config.get("trim_start", 0.0))
-    trim_end = float(config.get("trim_end", 0.0))
-    return trim_start, trim_end
-
-
-def _build_adjust_response(clip) -> ClipAdjustResponse:
-    """构造片段调整响应"""
-    trim_start, trim_end = _get_adjust_trim(clip)
-    return ClipAdjustResponse(
-        clip_id=clip.id,
-        speed=clip.playback_speed,
-        volume=_get_adjust_volume(clip),
-        trim_start=trim_start,
-        trim_end=trim_end,
-        duration=clip.duration,
-    )
-
-
-def _validate_trim(trim_start: float, trim_end: float, total_duration: float) -> None:
-    """校验裁剪时长合法性"""
-    if trim_start + trim_end >= total_duration:
-        raise ValueError(
-            f"裁剪总时长（{trim_start + trim_end:.2f}s）不能大于等于片段总时长（{total_duration:.2f}s）"
-        )
-
-
-def _clip_value(value: Any) -> str:
-    """获取枚举/字符串值的统一方法"""
-    if hasattr(value, "value"):
-        return value.value
-    return str(value)
@@ -1,167 +0,0 @@
-"""片段调整路由.
-
-端点：
- PUT /clips/{clip_id}/speed         调速
- PUT /clips/{clip_id}/volume        调音量
- PUT /clips/{clip_id}/trim          裁剪
- PUT /clips/{clip_id}/adjustments   统一调整
- POST /clips/batch-speed            批量调速
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException
-
-from ._utils import _build_adjust_response, _get_adjust_trim, _get_clip_config, _validate_trim
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    BatchSpeedRequest,
-    BatchSpeedResponse,
-    ClipAdjustmentsRequest,
-    ClipAdjustResponse,
-    SpeedAdjustRequest,
-    TrimAdjustRequest,
-    VolumeAdjustRequest,
-)
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.put("/clips/{clip_id}/speed", response_model=ClipAdjustResponse)
-def adjust_editor_clip_speed(
-    template_id: str,
-    clip_id: str,
-    body: SpeedAdjustRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """调整片段播放速度"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    updated = plan_svc.update_clip(clip_id, playback_speed=body.speed)
-    return _build_adjust_response(updated)
-
-
-@router.put("/clips/{clip_id}/volume", response_model=ClipAdjustResponse)
-def adjust_editor_clip_volume(
-    template_id: str,
-    clip_id: str,
-    body: VolumeAdjustRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """调整片段音量"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(_get_clip_config(clip))
-    config["volume"] = body.volume
-    updated = plan_svc.update_clip(clip_id, config=config)
-    return _build_adjust_response(updated)
-
-
-@router.put("/clips/{clip_id}/trim", response_model=ClipAdjustResponse)
-def adjust_editor_clip_trim(
-    template_id: str,
-    clip_id: str,
-    body: TrimAdjustRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """裁剪片段（trim in/out）"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    try:
-        _validate_trim(body.trim_start, body.trim_end, clip.duration)
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e)) from e
-
-    config = dict(_get_clip_config(clip))
-    config["trim_start"] = body.trim_start
-    config["trim_end"] = body.trim_end
-    updated = plan_svc.update_clip(clip_id, config=config)
-    return _build_adjust_response(updated)
-
-
-@router.put("/clips/{clip_id}/adjustments", response_model=ClipAdjustResponse)
-def adjust_editor_clip_all(
-    template_id: str,
-    clip_id: str,
-    body: ClipAdjustmentsRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipAdjustResponse:
-    """统一调整片段的 speed / volume / trim"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    update_kwargs: dict[str, Any] = {}
-    config_updates: dict[str, Any] = {}
-
-    if body.speed is not None:
-        update_kwargs["playback_speed"] = body.speed
-    if body.volume is not None:
-        config_updates["volume"] = body.volume
-    if body.trim_start is not None:
-        config_updates["trim_start"] = body.trim_start
-    if body.trim_end is not None:
-        config_updates["trim_end"] = body.trim_end
-
-    current_trim_start, current_trim_end = _get_adjust_trim(clip)
-    new_trim_start = body.trim_start if body.trim_start is not None else current_trim_start
-    new_trim_end = body.trim_end if body.trim_end is not None else current_trim_end
-
-    if body.trim_start is not None or body.trim_end is not None:
-        try:
-            _validate_trim(new_trim_start, new_trim_end, clip.duration)
-        except ValueError as e:
-            raise HTTPException(status_code=400, detail=str(e)) from e
-
-    if config_updates:
-        config = dict(_get_clip_config(clip))
-        config.update(config_updates)
-        update_kwargs["config"] = config
-
-    if not update_kwargs:
-        return _build_adjust_response(clip)
-
-    updated = plan_svc.update_clip(clip_id, **update_kwargs)
-    return _build_adjust_response(updated)
-
-
-@router.post("/clips/batch-speed", response_model=BatchSpeedResponse)
-def batch_adjust_editor_speed(
-    template_id: str,
-    body: BatchSpeedRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> BatchSpeedResponse:
-    """批量调整草稿内所有片段的播放速度"""
-    _, plan_svc = services
-    clips = plan_svc.list_clips(plan_id, limit=500, skip=0)
-    count = 0
-    for clip in clips:
-        plan_svc.update_clip(clip.id, playback_speed=body.speed)
-        count += 1
-
-    return BatchSpeedResponse(updated_count=count, plan_id=plan_id)
@@ -1,213 +0,0 @@
-"""AI 功能路由.
-
-端点：
- POST /ai-recommend       AI 推荐片段方案
-"""
-
-from __future__ import annotations
-
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_db_session
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.domain.config_schemas import normalize_plan_config
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import AIRecommendRequest, AIRecommendResponse
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-def _build_asset_analyses(
-    asset_ids: list[str],
-    db: Session,
-) -> dict[str, str]:
-    """调用 MediaKit 视频理解，返回 {asset_id: 分析文本}.
-
-    如果 MediaKit 不可用或分析失败，返回空 dict（调用方降级处理）。
-    """
-    if not asset_ids:
-        return {}
-
-    try:
-        from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRepository
-        from packages.shared.mediakit_client import get_mediakit_client
-        from packages.shared.storage import get_shared_storage_service
-
-        client = get_mediakit_client()
-        if not client.is_available:
-            logger.info("MediaKit 未配置，跳过视频理解分析")
-            return {}
-
-        asset_repo = SQLAlchemyAssetRepository(db)
-        storage_svc = get_shared_storage_service()
-
-        # 查找素材并获取下载 URL（使用并行列表保持索引对应，避免 URL 重复导致映射覆盖）
-        video_urls: list[str] = []
-        valid_asset_ids: list[str] = []
-
-        for aid in asset_ids[:10]:  # MediaKit 单次最多 10 个视频
-            asset = asset_repo.get(aid)
-            if not asset or not asset.storage_key:
-                continue
-            # 只处理视频素材
-            mime = getattr(asset, "mime_type", "")
-            if not mime.startswith("video/"):
-                continue
-            try:
-                url = storage_svc.get_download_url(asset.storage_key)
-                if url:
-                    video_urls.append(url)
-                    valid_asset_ids.append(aid)
-            except Exception as e:
-                logger.warning("获取素材URL失败: asset_id=%s error=%s", aid, str(e))
-
-        if not video_urls:
-            logger.info("无可用视频素材，跳过视频理解分析")
-            return {}
-
-        # 调用 MediaKit 视频理解
-        prompt = (
-            "请简要描述这段视频的主要内容，包括：场景（室内/室外/具体场所）、"
-            "主体（人物/物体/动物）、动作/活动、氛围/情绪、主要色调。"
-            "控制在100字以内。"
-        )
-
-        # 限制轮询参数以适配 API 网关超时（nginx 60s）
-        # 视频理解最多 30s（poll_interval=2s * max_poll_attempts=15）
-        # 剩余 30s 留给 LLM 调用
-        contents = client.analyze_videos(
-            video_urls=video_urls,
-            prompt=prompt,
-            level="Economy",
-            poll_interval=2.0,
-            max_poll_attempts=15,
-        )
-
-        if not contents:
-            logger.warning("MediaKit 视频理解未返回结果")
-            return {}
-
-        # 将结果映射回 asset_id（通过索引对应）
-        analyses: dict[str, str] = {}
-        for i, content in enumerate(contents):
-            if i < len(valid_asset_ids) and content:
-                analyses[valid_asset_ids[i]] = content
-
-        logger.info(
-            "MediaKit 视频理解完成: total=%d analyzed=%d",
-            len(video_urls),
-            len(analyses),
-        )
-        return analyses
-
-    except Exception as e:
-        logger.warning("MediaKit 视频理解异常，将降级到无分析模式: %s", str(e))
-        return {}
-
-
-@router.post("/ai-recommend", response_model=AIRecommendResponse)
-def editor_ai_recommend(
-    template_id: str,
-    body: AIRecommendRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> AIRecommendResponse:
-    """AI 推荐片段方案"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    plan_status = plan.status.value if hasattr(plan.status, "value") else plan.status
-    if plan_status not in ("draft", "editing"):
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="当前草稿状态不支持AI推荐，请先编辑后再试",
-        )
-
-    from packages.shared.ai_service import run_ai_recommend
-
-    # 调用 MediaKit 视频理解，获取素材内容分析
-    asset_analyses = _build_asset_analyses(body.asset_ids, db)
-
-    result = run_ai_recommend(
-        plan_id=plan_id,
-        template_id=plan.template_id,
-        asset_ids=body.asset_ids,
-        editing_mode=body.editing_mode,
-        target_duration=body.target_duration,
-        asset_analyses=asset_analyses,
-    )
-
-    try:
-        plan_svc.delete_all_clips(plan_id)
-
-        for clip_data in result["clips"]:
-            plan_svc.create_clip(
-                plan_id=plan_id,
-                clip_type=clip_data["clip_type"],
-                order=clip_data["order"],
-                text_content=clip_data.get("text_content", ""),
-                duration=clip_data["duration"],
-                transition_effect=clip_data.get("transition_effect", "cut"),
-                asset_id=clip_data.get("asset_id", ""),
-                start_time=clip_data.get("start_time", 0.0),
-                config=clip_data.get("config", {}),
-            )
-
-        normalized_config = normalize_plan_config(result.get("config", {}))
-        plan_svc.update_plan(
-            plan_id,
-            config=normalized_config,
-            total_duration=result["total_duration"],
-        )
-    except Exception as _e:
-        logger.exception(
-            "模板编辑器AI推荐写入失败: template_id=%s plan_id=%s",
-            template_id,
-            plan_id,
-        )
-        try:
-            db.rollback()
-        except Exception:
-            pass
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="AI推荐结果保存失败，请稍后重试",
-        ) from _e
-
-    logger.info(
-        "模板编辑器AI推荐: template_id=%s plan_id=%s clips=%d duration=%.1f by user=%s",
-        template_id,
-        plan_id,
-        len(result["clips"]),
-        result["total_duration"],
-        current_user.user.id,
-    )
-
-    return AIRecommendResponse(
-        plan_id=plan_id,
-        clips=[
-            {
-                "clip_type": c["clip_type"],
-                "order": c["order"],
-                "text_content": c.get("text_content", ""),
-                "duration": c["duration"],
-                "transition_effect": c.get("transition_effect", "cut"),
-                "asset_id": c.get("asset_id", ""),
-                "start_time": c.get("start_time", 0.0),
-                "config": c.get("config", {}),
-            }
-            for c in result["clips"]
-        ],
-        config=normalized_config,
-        total_duration=result["total_duration"],
-        confidence=result["confidence"],
-    )
@@ -1,133 +0,0 @@
-"""BGM 管理路由.
-
-端点：
- GET  /bgm              获取 BGM 配置
- PUT  /bgm              更新 BGM 配置
- GET  /bgm/presets      预设 BGM 列表
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import BGMConfigUpdateRequest
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("/bgm", response_model=dict[str, Any])
-def get_editor_bgm(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取草稿的 BGM 配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    config = plan.config or {}
-    return {
-        "plan_id": plan.id,
-        "bgm": config.get("bgm", {}),
-    }
-
-
-@router.put("/bgm", response_model=dict[str, Any])
-def update_editor_bgm(
-    template_id: str,
-    body: BGMConfigUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-):
-    """更新草稿的 BGM 配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    config = dict(plan.config) if plan.config else {}
-    current_bgm = dict(config.get("bgm", {}))
-    update_data = body.model_dump(exclude_none=True)
-    current_bgm.update(update_data)
-
-    if current_bgm.get("enabled"):
-        has_source = any(
-            current_bgm.get(key)
-            for key in ("asset_id", "preset_id", "audio_url")
-            if current_bgm.get(key)
-        )
-        if not has_source:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="启用 BGM 时需要指定素材来源（asset_id / preset_id / audio_url）",
-            )
-
-    config["bgm"] = current_bgm
-    updated_plan = plan_svc.update_plan_config(plan_id, config)
-
-    logger.info(
-        "模板编辑器更新BGM: template_id=%s plan_id=%s enabled=%s by user=%s",
-        template_id,
-        plan_id,
-        current_bgm.get("enabled", False),
-        current_user.user.id,
-    )
-
-    return {
-        "plan_id": updated_plan.id,
-        "bgm": current_bgm,
-    }
-
-
-@router.get("/bgm/presets", response_model=dict[str, Any])
-def list_editor_bgm_presets(
-    style: str | None = Query(default=None, description="按风格筛选"),
-    keyword: str | None = Query(default=None, description="关键词搜索"),
-    skip: int = Query(default=0, ge=0, description="分页偏移"),
-    limit: int = Query(default=50, ge=1, le=200, description="每页数量"),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取预设 BGM 列表"""
-    from packages.domain.preset_bgm import (
-        BGM_STYLES,
-        PRESET_BGM_LIBRARY,
-        list_preset_bgm_by_style,
-        search_preset_bgm,
-    )
-
-    bgm_list = PRESET_BGM_LIBRARY
-    if keyword:
-        bgm_list = search_preset_bgm(keyword)
-    elif style:
-        bgm_list = list_preset_bgm_by_style(style)
-
-    total = len(bgm_list)
-    paged = bgm_list[skip : skip + limit]
-
-    return {
-        "total": total,
-        "skip": skip,
-        "limit": limit,
-        "styles": BGM_STYLES,
-        "items": [
-            {
-                "id": bgm.id,
-                "name": bgm.name,
-                "style": bgm.style,
-                "style_label": BGM_STYLES.get(bgm.style, bgm.style),
-                "duration": bgm.duration,
-                "artist": bgm.artist,
-                "description": bgm.description,
-                "tags": bgm.tags,
-                "audio_url": bgm.audio_url,
-            }
-            for bgm in paged
-        ],
-    }
@@ -1,393 +0,0 @@
-"""片段管理路由.
-
-端点：
- GET    /clips                    片段列表
- POST   /clips                    创建片段
- GET    /clips/{clip_id}          片段详情
- PUT    /clips/{clip_id}          更新片段
- DELETE /clips/{clip_id}          删除片段
- POST   /clips/{clip_id}/split    分割片段
- POST   /clips/merge              合并片段
- POST   /clips/reorder            重排片段
- POST   /clips/batch-delete       批量删除
- POST   /clips/from-assets        从素材创建片段
-"""
-
-from __future__ import annotations
-
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.storage import get_storage_service
-from app.dependencies import get_asset_repository
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-
-from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRepository
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    ClipBatchDeleteRequest,
-    ClipBatchDeleteResponse,
-    ClipReorderRequest,
-    ClipReorderResponse,
-    ClipsFromAssetsRequest,
-    ClipsFromAssetsResponse,
-    EditorClipCreateRequest,
-    EditorClipListResponse,
-    EditorClipResponse,
-    EditorClipUpdateRequest,
-    MergeClipsRequest,
-    SplitClipRequest,
-)
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-def _clip_to_response(clip, asset_url: str | None = None) -> EditorClipResponse:
-    """统一构造片段响应 — 与 edit_plan_clips 表字段完全对齐"""
-
-    def _enum_str(val) -> str:
-        return val.value if hasattr(val, "value") else str(val)
-
-    def _fmt_dt(val) -> str:
-        if val is None:
-            return ""
-        if hasattr(val, "isoformat"):
-            return val.isoformat()
-        return str(val)
-
-    return EditorClipResponse(
-        id=clip.id,
-        plan_id=clip.plan_id,
-        clip_type=_enum_str(getattr(clip, "clip_type", "")),
-        order=clip.order,
-        duration=clip.duration,
-        start_time=getattr(clip, "start_time", 0.0) or 0.0,
-        text_content=clip.text_content or "",
-        transition_effect=_enum_str(getattr(clip, "transition_effect", "cut")),
-        transition_duration=getattr(clip, "transition_duration", 0.0) or 0.0,
-        playback_speed=clip.playback_speed or 1.0,
-        asset_id=getattr(clip, "asset_id", "") or "",
-        asset_url=asset_url,
-        status=getattr(clip, "status", "pending") or "pending",
-        template_clip_config_id=getattr(clip, "template_clip_config_id", "") or "",
-        config=clip.config or {},
-        created_at=_fmt_dt(getattr(clip, "created_at", None)),
-        updated_at=_fmt_dt(getattr(clip, "updated_at", None)),
-    )
-
-
-def _build_asset_url_map(
-    asset_ids: list[str],
-    asset_repo: SQLAlchemyAssetRepository,
-) -> dict[str, str | None]:
-    """批量查询素材并生成签名URL映射.
-
-    Returns:
-        {asset_id: signed_url_or_None}
-    """
-    if not asset_ids:
-        return {}
-
-    # 去重：多个 clip 可能引用同一个素材
-    # 去重并保持顺序
-    seen: set[str] = set()
-    unique_ids = []
-    for aid in asset_ids:
-        if aid and aid not in seen:
-            seen.add(aid)
-            unique_ids.append(aid)
-
-    result: dict[str, str | None] = {}
-    try:
-        storage = get_storage_service()
-    except Exception:
-        logger.warning("获取存储服务失败，跳过asset_url生成")
-        return {aid: None for aid in asset_ids}
-
-    # 批量查询所有 Asset（单次 SQL IN 查询，避免 N+1）
-    try:
-        assets = asset_repo.find_by_ids(unique_ids)
-        asset_map = {a.id: a for a in assets}
-    except Exception:
-        logger.warning("批量查询素材失败: asset_ids=%s", asset_ids, exc_info=True)
-        return {aid: None for aid in asset_ids if aid}
-
-    for aid in unique_ids:
-        try:
-            asset = asset_map.get(aid)
-            if asset is None:
-                result[aid] = None
-                continue
-            storage_key = getattr(asset, "storage_key", None) or ""
-            if not storage_key:
-                result[aid] = None
-                continue
-            result[aid] = storage.get_download_url(storage_key, expires_seconds=3600)
-        except Exception:
-            logger.warning("生成素材签名URL失败: asset_id=%s", aid, exc_info=True)
-            result[aid] = None
-
-    return result
-
-
-@router.get("/clips", response_model=EditorClipListResponse)
-def list_draft_clips(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    asset_repo: SQLAlchemyAssetRepository = Depends(get_asset_repository),
-    skip: int = Query(default=0, ge=0),
-    limit: int = Query(default=100, ge=1, le=500),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取草稿的片段列表"""
-    _, plan_svc = services
-    clips = plan_svc.list_clips(plan_id, skip=skip, limit=limit)
-    total = plan_svc.count_clips(plan_id)
-
-    # 批量解析素材签名URL
-    asset_ids = [getattr(c, "asset_id", "") or "" for c in clips]
-    asset_ids = [aid for aid in asset_ids if aid]
-    url_map = _build_asset_url_map(asset_ids, asset_repo)
-
-    return EditorClipListResponse(
-        items=[
-            _clip_to_response(c, asset_url=url_map.get(getattr(c, "asset_id", "") or ""))
-            for c in clips
-        ],
-        total=total,
-    )
-
-
-@router.post("/clips", response_model=EditorClipResponse, status_code=status.HTTP_201_CREATED)
-def create_draft_clip(
-    template_id: str,
-    req: EditorClipCreateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """在草稿中创建新片段"""
-    _, plan_svc = services
-    try:
-        clip = plan_svc.create_clip(
-            plan_id,
-            clip_type=req.clip_type,
-            order=req.order,
-            duration=req.duration,
-            text_content=req.text_content,
-            transition_effect=req.transition_effect,
-            config=req.config,
-        )
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    return _clip_to_response(clip)
-
-
-@router.put("/clips/{clip_id}", response_model=EditorClipResponse)
-def update_draft_clip(
-    template_id: str,
-    clip_id: str,
-    req: EditorClipUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """更新草稿中的片段"""
-    _, plan_svc = services
-    try:
-        clip = plan_svc.update_clip(
-            clip_id,
-            order=req.order,
-            duration=req.duration,
-            text_content=req.text_content,
-            transition_effect=req.transition_effect,
-            playback_speed=req.playback_speed,
-            config=req.config,
-        )
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    return _clip_to_response(clip)
-
-
-@router.delete("/clips/{clip_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_draft_clip(
-    template_id: str,
-    clip_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """删除草稿中的片段"""
-    _, plan_svc = services
-    success = plan_svc.delete_clip(clip_id)
-    if not success:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    return None
-
-
-@router.get("/clips/{clip_id}", response_model=EditorClipResponse)
-def get_draft_clip_detail(
-    template_id: str,
-    clip_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    asset_repo: SQLAlchemyAssetRepository = Depends(get_asset_repository),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取草稿中的片段详情"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if clip is None:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    if clip.plan_id != plan_id:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    asset_id = getattr(clip, "asset_id", "") or ""
-    url_map = _build_asset_url_map([asset_id], asset_repo) if asset_id else {}
-    return _clip_to_response(clip, asset_url=url_map.get(asset_id))
-
-
-@router.post("/clips/{clip_id}/split", status_code=status.HTTP_200_OK)
-def split_draft_clip(
-    template_id: str,
-    clip_id: str,
-    body: SplitClipRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    asset_repo: SQLAlchemyAssetRepository = Depends(get_asset_repository),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """将一个片段从指定时间点分割为两个片段"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if clip is None or clip.plan_id != plan_id:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    try:
-        result = plan_svc.split_clip(clip_id, body.split_time)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)
-        ) from exc
-    left = result["left_clip"]
-    right = result["right_clip"]
-    asset_ids = [getattr(left, "asset_id", "") or "", getattr(right, "asset_id", "") or ""]
-    asset_ids = [a for a in asset_ids if a]
-    url_map = _build_asset_url_map(asset_ids, asset_repo)
-    return {
-        "left_clip": _clip_to_response(left, asset_url=url_map.get(getattr(left, "asset_id", "") or "")),
-        "right_clip": _clip_to_response(right, asset_url=url_map.get(getattr(right, "asset_id", "") or "")),
-    }
-
-
-@router.post("/clips/merge", status_code=status.HTTP_200_OK)
-def merge_draft_clips(
-    template_id: str,
-    body: MergeClipsRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    asset_repo: SQLAlchemyAssetRepository = Depends(get_asset_repository),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """将多个连续的同类型片段合并为一个片段"""
-    _, plan_svc = services
-    for cid in body.clip_ids:
-        clip = plan_svc.get_clip(cid)
-        if clip is None or clip.plan_id != plan_id:
-            raise HTTPException(status_code=404, detail=f"片段不存在: {cid}")
-    try:
-        merged = plan_svc.merge_clips(body.clip_ids)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)
-        ) from exc
-    asset_id = getattr(merged, "asset_id", "") or ""
-    url_map = _build_asset_url_map([asset_id], asset_repo) if asset_id else {}
-    return {
-        "merged_clip": _clip_to_response(merged, asset_url=url_map.get(asset_id)),
-        "deleted_clip_ids": body.clip_ids,
-    }
-
-
-@router.post("/clips/reorder", response_model=ClipReorderResponse)
-def reorder_editor_clips(
-    template_id: str,
-    body: ClipReorderRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipReorderResponse:
-    """批量重排片段顺序"""
-    _, plan_svc = services
-    count = 0
-    for item in body.items:
-        try:
-            plan_svc.update_clip(item.clip_id, order=item.new_order)
-            count += 1
-        except ValueError:
-            pass
-
-    return ClipReorderResponse(updated_count=count, plan_id=plan_id)
-
-
-@router.post("/clips/batch-delete", response_model=ClipBatchDeleteResponse)
-def batch_delete_editor_clips(
-    template_id: str,
-    body: ClipBatchDeleteRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipBatchDeleteResponse:
-    """批量删除片段"""
-    _, plan_svc = services
-    deleted = 0
-    for clip_id in body.clip_ids:
-        if plan_svc.delete_clip(clip_id):
-            deleted += 1
-
-    return ClipBatchDeleteResponse(deleted_count=deleted, plan_id=plan_id)
-
-
-@router.post("/clips/from-assets", response_model=ClipsFromAssetsResponse)
-def create_clips_from_assets_editor(
-    template_id: str,
-    body: ClipsFromAssetsRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-) -> ClipsFromAssetsResponse:
-    """从素材批量创建片段"""
-    _, plan_svc = services
-    clips = []
-    for i, asset_id in enumerate(body.asset_ids):
-        try:
-            clip = plan_svc.create_clip(
-                plan_id,
-                clip_type="main",
-                order=body.start_order + i if hasattr(body, "start_order") else i,
-                duration=5.0,
-                asset_id=asset_id,
-            )
-            clips.append(clip)
-        except ValueError:
-            pass
-
-    logger.info(
-        "模板编辑器从素材创建片段: template_id=%s plan_id=%s count=%d by user=%s",
-        template_id,
-        plan_id,
-        len(clips),
-        current_user.user.id,
-    )
-
-    return ClipsFromAssetsResponse(
-        created_count=len(clips),
-        plan_id=plan_id,
-        clip_ids=[c.id for c in clips],
-    )
@@ -1,141 +0,0 @@
-"""模板编辑器依赖注入.
-
-核心依赖：
- get_editor_services: 获取模板+计划服务
- get_draft_plan_id: 根据 template_id 获取或创建草稿，返回 plan_id
- _check_queue_limits: 生成队列限流检查
-"""
-
-from __future__ import annotations
-
-import logging
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.task_enqueue import GLOBAL_PENDING_LIMIT, USER_PENDING_LIMIT
-from app.dependencies import get_db_session
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.template_repository import (
-    SQLAlchemyTemplateRepository,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def get_editor_services(
-    db: Session = Depends(get_db_session),
-) -> tuple[EditTemplateService, EditPlanService]:
-    """获取模板编辑器所需的两个服务"""
-    return EditTemplateService(db), EditPlanService(db)
-
-
-def get_draft_plan_id(
-    template_id: str,
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    db: Session = Depends(get_db_session),
-) -> str:
-    """路径依赖：根据 template_id 获取或创建草稿，返回 plan_id.
-
-    这是模板编辑器路由的核心依赖——所有编辑器端点都先经过这里，
-    确保 template_id → plan_id 的映射始终存在。
-
-    兼容策略：优先从新模板系统（edit_templates 表）查找，
-    若不存在则回退到旧模板系统（templates 表），确保用户自建模板可用。
-    """
-    tpl_svc, plan_svc = services
-    user_id = str(current_user.user.id)
-
-    # 1. 草稿已存在 → 直接返回
-    draft = tpl_svc.get_template_draft(template_id)
-    if draft is not None:
-        return draft.id
-
-    # 2. 新系统有模板 → 用新服务创建草稿
-    if tpl_svc.get_template(template_id) is not None:
-        draft = tpl_svc.create_template_draft(template_id, user_id=user_id)
-        return draft.id
-
-    # 3. 回退到旧模板系统（templates 表）
-    old_repo = SQLAlchemyTemplateRepository(db)
-    old_template = old_repo.get(template_id, user_id=user_id)
-    if old_template is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="模板不存在")
-
-    # 4. 基于旧模板创建草稿计划
-    from app.services.plan_generator_service import PlanGeneratorService
-
-    from packages.domain.edit_template import EditTemplate, EditTemplateStatus
-    from packages.domain.template_clip_config import ClipType, TemplateClipConfig
-
-    # 构造伪 EditTemplate 对象（只填 generate_from_template 需要的字段）
-    pseudo_template = EditTemplate(
-        id=old_template.id,
-        name=old_template.name,
-        editing_mode=old_template.mode,
-        status=EditTemplateStatus.ACTIVE,
-    )
-
-    # 将旧模板 segments 转换为 clip_configs
-    clip_configs: list[TemplateClipConfig] = []
-    for seg in old_template.segments or []:
-        clip_configs.append(
-            TemplateClipConfig(
-                id=f"seg_{seg.id}",
-                template_id=old_template.id,
-                clip_type=ClipType.MAIN,
-                order=seg.segment_order,
-                min_duration=seg.duration_min,
-                max_duration=seg.duration_max,
-            )
-        )
-
-    generator = PlanGeneratorService(db)
-    result = generator.generate_from_template(
-        template=pseudo_template,
-        clip_configs=clip_configs,
-        asset_ids=[],
-        created_by_user_id=user_id,
-        name=f"{old_template.name} - 草稿",
-    )
-    plan = result["plan"]
-
-    # 标记为模板草稿（后续可复用 tpl_svc.get_template_draft 的查找逻辑）
-    plan_svc.update_plan_config(plan.id, {"is_template_draft": True})
-
-    logger.info(
-        "旧模板自动创建草稿: template_id=%s draft_plan_id=%s user_id=%s",
-        template_id,
-        plan.id,
-        user_id,
-    )
-    return plan.id
-
-
-def _check_queue_limits(gen_task_repo, user_id: str) -> None:
-    """队列限流预检查"""
-    try:
-        has_count = (
-            hasattr(gen_task_repo, "count_pending_by_user")
-            and hasattr(gen_task_repo, "count_pending_total")
-        )
-        if has_count:
-            user_pending = gen_task_repo.count_pending_by_user(user_id)
-            global_pending = gen_task_repo.count_pending_total()
-            if user_pending >= USER_PENDING_LIMIT:
-                raise HTTPException(
-                    status_code=429,
-                    detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
-                )
-            if global_pending >= GLOBAL_PENDING_LIMIT:
-                raise HTTPException(
-                    status_code=503,
-                    detail="系统繁忙，请稍后再试",
-                )
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.warning("[模板编辑器队列限流] 检查失败，跳过: %s", e)
@@ -1,164 +0,0 @@
-"""草稿管理路由.
-
-端点：
- GET    /              获取草稿详情
- PUT    /              更新草稿
- POST   /publish       发布草稿到模板
- GET    /versions      模板版本历史
- POST   /rollback      回滚到指定版本
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    EditorDraftResponse,
-    EditorPublishResponse,
-    EditorRollbackRequest,
-    EditorRollbackResponse,
-    EditorTemplateVersionItem,
-    EditorUpdateRequest,
-    EditorVersionListResponse,
-)
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("", response_model=EditorDraftResponse)
-def get_editor_draft(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """获取模板编辑器草稿详情
-
-    首次访问时自动创建草稿。
-    """
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    clips = plan_svc.list_clips(plan_id)
-    return EditorDraftResponse(
-        plan_id=plan.id,
-        template_id=plan.template_id,
-        name=plan.name,
-        status=plan.status.value if hasattr(plan.status, "value") else str(plan.status),
-        config=plan.config or {},
-        total_duration=plan.total_duration,
-        clip_count=len(clips),
-    )
-
-
-@router.put("", response_model=EditorDraftResponse)
-def update_editor_draft(
-    template_id: str,
-    req: EditorUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """更新模板编辑器草稿"""
-    _, plan_svc = services
-    plan = plan_svc.update_plan(
-        plan_id,
-        name=req.name,
-        config=req.config,
-        total_duration=req.total_duration,
-    )
-    clips = plan_svc.list_clips(plan_id)
-    return EditorDraftResponse(
-        plan_id=plan.id,
-        template_id=plan.template_id,
-        name=plan.name,
-        status=plan.status.value if hasattr(plan.status, "value") else str(plan.status),
-        config=plan.config or {},
-        total_duration=plan.total_duration,
-        clip_count=len(clips),
-    )
-
-
-@router.post("/publish", response_model=EditorPublishResponse, status_code=status.HTTP_200_OK)
-def publish_draft_to_template(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """将草稿发布（同步）到正式模板
-
-    草稿的 config 和 clips 会同步覆盖到模板，事务保证一致性。
-    """
-    tpl_svc, plan_svc = services
-    try:
-        tpl = tpl_svc.publish_template_from_draft(template_id, plan_id)
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    clips = plan_svc.list_clips(plan_id)
-    return EditorPublishResponse(
-        template_id=tpl.id,
-        status="published",
-        clip_count=len(clips),
-        version=tpl.version,
-    )
-
-
-@router.get("/versions", response_model=EditorVersionListResponse)
-def list_template_versions(
-    template_id: str,
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-    limit: int = Query(default=50, ge=1, le=200),
-):
-    """查询模板发布版本历史"""
-    tpl_svc, _ = services
-    versions = tpl_svc.list_template_versions(template_id, limit=limit)
-    items = [
-        EditorTemplateVersionItem(
-            version=v.version,
-            name=v.name,
-            editing_mode=v.editing_mode,
-            clip_count=len(v.clip_configs),
-            change_note=v.change_note,
-            published_by=v.published_by,
-            created_at=(
-                v.created_at.isoformat()
-                if hasattr(v.created_at, "isoformat")
-                else str(v.created_at)
-            ),
-        )
-        for v in versions
-    ]
-    return EditorVersionListResponse(versions=items, total=len(items))
-
-
-@router.post("/rollback", response_model=EditorRollbackResponse, status_code=status.HTTP_200_OK)
-def rollback_template(
-    template_id: str,
-    request: EditorRollbackRequest,
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """回滚模板到指定历史版本
-
-    回滚本身也是一次发布，版本号会 +1，可以再次回滚。
-    """
-    tpl_svc, _ = services
-    try:
-        tpl = tpl_svc.rollback_to_version(template_id, request.version)
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    clip_configs = tpl_svc.list_clip_configs(template_id)
-    return EditorRollbackResponse(
-        template_id=tpl.id,
-        status="rolled_back",
-        rollback_to_version=request.version,
-        new_version=tpl.version,
-        clip_count=len(clip_configs),
-    )
@@ -1,195 +0,0 @@
-"""转场 & 滤镜路由.
-
-端点：
- GET  /transition-presets           转场预设列表
- PUT  /clips/{clip_id}/transition   单片段转场
- POST /transitions/batch            批量转场
- GET  /filter-presets               滤镜预设列表
- GET  /filter                       滤镜配置
- PUT  /filter                       更新滤镜
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException
-
-from packages.domain.config_schemas import normalize_plan_config
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import (
-    BatchTransitionRequest,
-    BatchTransitionResponse,
-    ClipTransitionResponse,
-    FilterConfigResponse,
-    FilterPresetListResponse,
-    FilterUpdateRequest,
-    TransitionPresetListResponse,
-    TransitionUpdateRequest,
-)
-
-router = APIRouter(tags=["Template Editor"])
-
-
-# ── 转场 ────────────────────────────────────────────────────────────────────
-
-
-@router.get("/transition-presets", response_model=TransitionPresetListResponse)
-def list_editor_transition_presets(
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> TransitionPresetListResponse:
-    """获取转场预设列表"""
-    from packages.domain.transition_presets import TRANSITION_PRESETS
-
-    items = [
-        {
-            "id": p["id"],
-            "name": p["name"],
-            "category": p.get("category", "通用"),
-            "duration": p.get("default_duration", 0.5),
-            "description": p.get("description", ""),
-        }
-        for p in TRANSITION_PRESETS
-    ]
-    return TransitionPresetListResponse(items=items, total=len(items))
-
-
-@router.put("/clips/{clip_id}/transition", response_model=ClipTransitionResponse)
-def update_editor_clip_transition(
-    template_id: str,
-    clip_id: str,
-    body: TransitionUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ClipTransitionResponse:
-    """设置单个片段的转场效果"""
-    _, plan_svc = services
-    try:
-        clip = plan_svc.update_clip(
-            clip_id,
-            transition_effect=body.effect,
-            transition_duration=body.duration,
-        )
-    except ValueError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
-
-    return ClipTransitionResponse(
-        clip_id=clip.id,
-        effect=clip.transition_effect.value
-        if hasattr(clip.transition_effect, "value")
-        else clip.transition_effect,
-        duration=clip.transition_duration or 0.5,
-    )
-
-
-@router.post("/transitions/batch", response_model=BatchTransitionResponse)
-def batch_update_editor_transitions(
-    template_id: str,
-    body: BatchTransitionRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> BatchTransitionResponse:
-    """批量设置所有片段的转场效果"""
-    _, plan_svc = services
-    clips = plan_svc.list_clips(plan_id, limit=500)
-    updated = 0
-    for clip in clips:
-        if clip.order > 0:  # 第一个片段不加转场
-            try:
-                plan_svc.update_clip(
-                    clip.id,
-                    transition_effect=body.effect,
-                    transition_duration=body.duration,
-                )
-                updated += 1
-            except ValueError:
-                pass
-
-    return BatchTransitionResponse(
-        updated_count=updated,
-        plan_id=plan_id,
-    )
-
-
-# ── 滤镜 ────────────────────────────────────────────────────────────────────
-
-
-@router.get("/filter-presets", response_model=FilterPresetListResponse)
-def list_editor_filter_presets(
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> FilterPresetListResponse:
-    """获取滤镜预设列表"""
-    from packages.domain.filter_presets import FILTER_PRESETS
-
-    items = [
-        {
-            "id": p["id"],
-            "name": p["name"],
-            "category": p.get("category", "通用"),
-            "thumbnail": p.get("thumbnail", ""),
-            "description": p.get("description", ""),
-        }
-        for p in FILTER_PRESETS
-    ]
-    return FilterPresetListResponse(items=items, total=len(items))
-
-
-@router.get("/filter", response_model=FilterConfigResponse)
-def get_editor_filter(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> FilterConfigResponse:
-    """获取草稿的全局滤镜配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    config = plan.config or {}
-    filter_config = config.get("filter", {})
-
-    return FilterConfigResponse(
-        plan_id=plan.id,
-        enabled=filter_config.get("enabled", False),
-        preset_id=filter_config.get("preset_id", ""),
-        intensity=filter_config.get("intensity", 1.0),
-        brightness=filter_config.get("brightness", 0.0),
-        contrast=filter_config.get("contrast", 1.0),
-        saturation=filter_config.get("saturation", 1.0),
-        warmth=filter_config.get("warmth", 0.0),
-    )
-
-
-@router.put("/filter", response_model=FilterConfigResponse)
-def update_editor_filter(
-    template_id: str,
-    body: FilterUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> FilterConfigResponse:
-    """更新草稿的全局滤镜配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    config = dict(plan.config) if plan.config else {}
-    current_filter = dict(config.get("filter", {}))
-    update_data = body.model_dump(exclude_none=True)
-    current_filter.update(update_data)
-
-    config["filter"] = current_filter
-    updated_plan = plan_svc.update_plan_config(plan_id, normalize_plan_config(config))
-
-    return FilterConfigResponse(
-        plan_id=updated_plan.id,
-        enabled=current_filter.get("enabled", False),
-        preset_id=current_filter.get("preset_id", ""),
-        intensity=current_filter.get("intensity", 1.0),
-        brightness=current_filter.get("brightness", 0.0),
-        contrast=current_filter.get("contrast", 1.0),
-        saturation=current_filter.get("saturation", 1.0),
-        warmth=current_filter.get("warmth", 0.0),
-    )
@@ -1,106 +0,0 @@
-"""导出配置路由.
-
-端点：
- GET /export-presets      导出预设列表
- GET /export              导出配置
- PUT /export              更新导出配置
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends
-
-from packages.domain.config_schemas import normalize_plan_config
-
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import ExportConfigResponse, ExportPresetListResponse, ExportUpdateRequest
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("/export-presets", response_model=ExportPresetListResponse)
-def list_editor_export_presets(
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ExportPresetListResponse:
-    """获取导出预设列表"""
-    from packages.domain.export_presets import EXPORT_PRESETS
-
-    items = [
-        {
-            "id": p["id"],
-            "name": p["name"],
-            "resolution": p.get("resolution", "1080p"),
-            "fps": p.get("fps", 30),
-            "video_bitrate": p.get("bitrate", ""),
-            "audio_bitrate": p.get("audio_bitrate", 128),
-            "format": p.get("format", "mp4"),
-            "quality_preset": p.get("quality_preset", "balanced"),
-            "description": p.get("description", ""),
-            "size_hint": p.get("size_hint", ""),
-        }
-        for p in EXPORT_PRESETS
-    ]
-    return ExportPresetListResponse(items=items, total=len(items))
-
-
-@router.get("/export", response_model=ExportConfigResponse)
-def get_editor_export(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ExportConfigResponse:
-    """获取草稿的导出配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    config = plan.config or {}
-    export_config = config.get("export", {})
-
-    return ExportConfigResponse(
-        plan_id=plan.id,
-        resolution=export_config.get("resolution", "1080p"),
-        fps=export_config.get("fps", 30),
-        video_bitrate=export_config.get("video_bitrate", 4000),
-        audio_bitrate=export_config.get("audio_bitrate", 128),
-        format=export_config.get("format", "mp4"),
-        quality_preset=export_config.get("quality_preset", "balanced"),
-        watermark_enabled=export_config.get("watermark_enabled", True),
-        watermark_text=export_config.get("watermark_text", ""),
-    )
-
-
-@router.put("/export", response_model=ExportConfigResponse)
-def update_editor_export(
-    template_id: str,
-    body: ExportUpdateRequest,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> ExportConfigResponse:
-    """更新草稿的导出配置"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-
-    config = dict(plan.config) if plan.config else {}
-    current_export = dict(config.get("export", {}))
-    update_data = body.model_dump(exclude_none=True)
-    current_export.update(update_data)
-
-    config["export"] = current_export
-    updated_plan = plan_svc.update_plan_config(plan_id, normalize_plan_config(config))
-    updated_export = (updated_plan.config or {}).get("export", {})
-
-    return ExportConfigResponse(
-        plan_id=updated_plan.id,
-        resolution=updated_export.get("resolution", "1080p"),
-        fps=updated_export.get("fps", 30),
-        video_bitrate=updated_export.get("video_bitrate", 4000),
-        audio_bitrate=updated_export.get("audio_bitrate", 128),
-        format=updated_export.get("format", "mp4"),
-        quality_preset=updated_export.get("quality_preset", "balanced"),
-        watermark_enabled=updated_export.get("watermark_enabled", True),
-        watermark_text=updated_export.get("watermark_text", ""),
-    )
@@ -1,383 +0,0 @@
-"""草稿生成路由.
-
-端点：
- POST /generate              触发生成
- GET  /generation-status     生成进度
- GET  /generations           生成记录列表
-"""
-
-from __future__ import annotations
-
-import json
-import logging
-from typing import Any, Optional
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
-from app.core.storage import OSSStorageService, get_storage_service
-from app.dependencies import (
-    get_asset_library_repository,
-    get_asset_repository,
-    get_db_session,
-    get_generated_video_repository,
-)
-from app.schemas.generation_task import GenerationTaskResponse
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl.generation_task_repository import (
-    SQLAlchemyGenerationTaskRepository,
-)
-from packages.application.generated_videos import ListGeneratedVideosByTaskUseCase
-from packages.application.generation_tasks import (
-    CreateGenerationTaskCommand,
-    CreateGenerationTaskUseCase,
-)
-from packages.domain.edit_plan import EditPlanStatus
-
-from ._fallback import (
-    _auto_fallback_assign_assets,
-    _auto_fallback_auto_material_mode,
-    _auto_fallback_copy_template_clips,
-    _auto_fallback_draft_to_editing,
-)
-from .dependencies import _check_queue_limits, get_draft_plan_id, get_editor_services
-from .schemas import (
-    ClipStatusItem,
-    EditPlanGenerateRequest,
-    EditPlanGenerateResponse,
-    EditPlanGenerationsResponse,
-    EditPlanGenerationStatusResponse,
-)
-
-logger = logging.getLogger(__name__)
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.post("/generate", response_model=EditPlanGenerateResponse)
-def generate_editor_draft(
-    template_id: str,
-    request: Optional[EditPlanGenerateRequest] = None,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    asset_library_repo: Any = Depends(get_asset_library_repository),
-    asset_repo: Any = Depends(get_asset_repository),
-) -> EditPlanGenerateResponse:
-    """触发模板草稿渲染生成"""
-    req = request or EditPlanGenerateRequest()
-    _, plan_svc = services
-    plan_check = plan_svc.get_plan_or_raise(plan_id)
-
-    # 自动兜底流程
-    _auto_fallback_draft_to_editing(plan_svc, plan_id, plan_check)
-    _auto_fallback_copy_template_clips(plan_svc, plan_id, plan_check, db)
-    clips_without_asset = _auto_fallback_assign_assets(plan_svc, plan_id, plan_check)
-    _auto_fallback_auto_material_mode(
-        plan_svc,
-        plan_id,
-        plan_check,
-        clips_without_asset,
-        asset_library_repo,
-        asset_repo,
-        user_id=str(current_user.user.id),
-    )
-
-    # 检查是否可复用已完成的预览产物（预览品质已与正式一致）
-    gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-    reusable_task = _find_reusable_preview_task(gen_task_repo, plan_id, plan_check)
-    if reusable_task:
-        # 复用预览产物：标记为正式产出，跳过渲染
-        # 如果前端传了 title_config，需要创建新任务（因为预览任务的 custom_title 可能不同）
-        title_config_reuse = req.title_config or {}
-        title_text_reuse = (title_config_reuse.get("text") or "").strip()
-        existing_custom_title = getattr(reusable_task, "custom_title", "") or ""
-        if title_text_reuse and existing_custom_title:
-            # 如果新标题和已有标题不同，不能复用，走新建任务流程
-            new_title_json = json.dumps(title_config_reuse, ensure_ascii=False)
-            if new_title_json != existing_custom_title:
-                logger.info(
-                    "[模板生成] 标题已变更，跳过复用: task_id=%s",
-                    reusable_task.id,
-                )
-                reusable_task = None
-        elif title_text_reuse and not existing_custom_title:
-            # 原来没标题，现在有标题，不能复用
-            logger.info(
-                "[模板生成] 新增标题，跳过复用: task_id=%s",
-                reusable_task.id,
-            )
-            reusable_task = None
-        elif not title_text_reuse and existing_custom_title:
-            # 原来有标题，现在移除了，不能复用
-            logger.info(
-                "[模板生成] 移除标题，跳过复用: task_id=%s",
-                reusable_task.id,
-            )
-            reusable_task = None
-
-    if reusable_task:
-        # 复用预览产物：标记为正式产出，跳过渲染
-        reusable_task.mark_confirmed()
-        gen_task_repo.update(reusable_task)
-
-        # 将产物 URL 写入 plan config
-        rendered_url = _get_task_output_url(reusable_task, gen_task_repo, db)
-        plan_svc.update_plan_config(
-            plan_id,
-            {
-                "generation_task_id": reusable_task.id,
-                "rendered_storage_key": rendered_url,  # 统一用 rendered_storage_key
-            },
-        )
-        plan_svc.transition_status(plan_id, EditPlanStatus.COMPLETED)
-
-        updated_plan = plan_svc.get_plan_or_raise(plan_id)
-        logger.info(
-            "模板编辑器复用预览产物: template_id=%s plan_id=%s task_id=%s by user=%s",
-            template_id,
-            plan_id,
-            reusable_task.id,
-            current_user.user.id,
-        )
-        return EditPlanGenerateResponse(
-            plan_id=plan_id,
-            plan_status=updated_plan.status.value if hasattr(updated_plan.status, "value") else updated_plan.status,
-            generation_task_id=reusable_task.id,
-            clip_count=len((plan_check.config or {}).get("clips", [])),
-        )
-
-    # 检查是否可生成（含最后防线自动修复 + 诊断日志）
-    try:
-        can_gen, reason = plan_svc.can_generate(plan_id)
-    except ValueError as exc:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
-    if not can_gen:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=reason)
-
-    try:
-        clip_count = plan_svc.mark_clips_ready(plan_id)
-
-        user_id = current_user.user.id
-        _check_queue_limits(gen_task_repo, user_id)
-
-        gen_task_use_case = CreateGenerationTaskUseCase(gen_task_repo)
-        plan = plan_svc.get_plan_or_raise(plan_id)
-        config_asset_ids = (plan.config or {}).get("asset_ids", [])
-        # 从 plan config 读取封面 URL（由 generate-cover 保存）
-        cover_url_from_config = (plan.config or {}).get("cover", {}).get("image_url", "")
-
-        # 处理标题配置：序列化 title_config 为 JSON 存入 custom_title
-        title_config = req.title_config or {}
-        title_text = (title_config.get("text") or "").strip()
-        custom_title_value = ""
-        if title_text:
-            custom_title_value = json.dumps(title_config, ensure_ascii=False)
-            logger.info(
-                "[模板生成] 标题配置: text=%s, config_keys=%s",
-                title_text[:30],
-                list(title_config.keys()),
-            )
-
-        gen_task = gen_task_use_case.execute(
-            CreateGenerationTaskCommand(
-                project_id=plan.project_id or "",
-                template_id=plan.template_id,
-                created_by_user_id=current_user.user.id,
-                source_edit_plan_id=plan_id,
-                asset_ids=list(config_asset_ids) if config_asset_ids else [],
-                cover_url=cover_url_from_config,
-                custom_title=custom_title_value,
-            ),
-        )
-
-        plan_svc.update_plan_config(plan_id, {"generation_task_id": gen_task.id})
-        plan_svc.transition_status(plan_id, EditPlanStatus.RENDERING)
-        celery_app.send_task("worker.render_edit_plan", args=[plan_id])
-
-        updated_plan = plan_svc.get_plan_or_raise(plan_id)
-
-        logger.info(
-            "模板编辑器触发生成: template_id=%s plan_id=%s gen_task_id=%s clips=%d by user=%s",
-            template_id,
-            plan_id,
-            gen_task.id,
-            clip_count,
-            current_user.user.id,
-        )
-
-        return EditPlanGenerateResponse(
-            plan_id=plan_id,
-            plan_status=updated_plan.status.value if hasattr(updated_plan.status, "value") else updated_plan.status,
-            generation_task_id=gen_task.id,
-            clip_count=clip_count,
-        )
-    except HTTPException:
-        raise
-    except Exception as _e:
-        logger.exception(
-            "模板编辑器触发生成失败: template_id=%s plan_id=%s",
-            template_id,
-            plan_id,
-        )
-        try:
-            plan_svc.transition_status(plan_id, EditPlanStatus.FAILED)
-        except Exception:
-            pass
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="生成失败，请稍后重试",
-        ) from _e
-
-
-def _find_reusable_preview_task(gen_task_repo, plan_id: str, plan) -> "object | None":
-    """查找该 plan 关联的已完成预览任务，判断是否可复用。
-
-    复用条件：
-    1. 存在 source_edit_plan_id == plan_id 的已完成预览任务
-    2. plan 在预览完成后未被修改（updated_at <= 预览完成时间）
-
-    Returns:
-        可复用的 GenerationTask，或 None
-    """
-    try:
-        tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
-    except Exception:
-        return None
-
-    for task in tasks:
-        if not getattr(task, "is_preview", False):
-            continue
-        if not task.is_completed:
-            continue
-        # 检查 plan 是否在预览完成后被修改
-        completed_at = getattr(task, "completed_at", None)
-        if completed_at and hasattr(plan, "updated_at"):
-            plan_updated = plan.updated_at
-            # 如果 plan.updated_at 为空，无法判断是否修改过，跳过
-            if plan_updated is None:
-                continue
-            # 如果 plan 在预览完成后又被修改了，不能复用
-            if plan_updated > completed_at:
-                continue
-        return task
-    return None
-
-
-def _get_task_output_url(task, gen_task_repo, db) -> str:
-    """获取任务的输出视频 URL。"""
-    try:
-        video_repo = get_generated_video_repository(db)
-        use_case = ListGeneratedVideosByTaskUseCase(video_repo)
-        videos = use_case.execute(task.id)
-        if videos:
-            url = getattr(videos[0], "file_url", "") or ""
-            # 规范化：合并路径中的双斜杠（保留协议头 ://）
-            if url:
-                import re as _re
-                url = _re.sub(r"(?<!:)//", "/", url)
-            return url
-    except Exception:
-        pass
-    return ""
-
-
-@router.get("/generation-status", response_model=EditPlanGenerationStatusResponse)
-def get_editor_generation_status(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanGenerationStatusResponse:
-    """查询草稿生成进度"""
-    _, plan_svc = services
-    try:
-        gen_status = plan_svc.get_generation_status(plan_id)
-    except ValueError as exc:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
-
-    plan = gen_status["plan"]
-    clips = gen_status["clips"]
-
-    clip_items = [
-        ClipStatusItem(
-            clip_id=c.id,
-            clip_type=c.clip_type,
-            order=c.order,
-            status=c.status.value if hasattr(c.status, "value") else c.status,
-            asset_id=c.asset_id or "",
-            text_content=c.text_content or "",
-            duration=c.duration,
-        )
-        for c in clips
-    ]
-
-    raw_video_url = (plan.config or {}).get("rendered_storage_key", "") or (plan.config or {}).get("rendered_url", "")
-    video_url = ""
-    if raw_video_url:
-        if raw_video_url.startswith("http"):
-            video_url = raw_video_url  # 已经是完整 URL
-        else:
-            try:
-                video_url = storage_service.get_url(raw_video_url)  # storage_key -> 完整 URL
-            except Exception as e:
-                logger.warning("生成视频URL获取失败: template_id=%s error=%s", template_id, e)
-                video_url = raw_video_url
-
-    progress = gen_status.get("progress", 0.0)
-    error_message = gen_status.get("error_message", "")
-    gen_task_status = gen_status.get("generation_task_status")
-    plan_status_val = plan.status.value if hasattr(plan.status, "value") else plan.status
-    if plan_status_val == "completed" and progress < 100:
-        progress = 100.0
-
-    return EditPlanGenerationStatusResponse(
-        plan_id=plan_id,
-        plan_status=plan_status_val,
-        generation_task_id=gen_status["generation_task_id"],
-        generation_task_status=gen_task_status,
-        progress=progress,
-        video_url=video_url,
-        error_message=error_message,
-        clips=clip_items,
-    )
-
-
-@router.get("/generations", response_model=EditPlanGenerationsResponse)
-def list_editor_generations(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    db: Session = Depends(get_db_session),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> EditPlanGenerationsResponse:
-    """查询草稿关联的生成记录列表"""
-    _, plan_svc = services
-    plan_svc.get_plan_or_raise(plan_id)
-
-    gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-    tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
-    items = [
-        GenerationTaskResponse(
-            id=t.id,
-            project_id=t.project_id,
-            asset_library_id=t.asset_library_id,
-            strategy_id=t.strategy_id,
-            voice_library_id=t.voice_library_id,
-            template_id=t.template_id,
-            asset_ids=t.asset_ids,
-            title_ids=t.title_ids,
-            voice_ids=t.voice_ids,
-            source_edit_plan_id=t.source_edit_plan_id or "",
-            status=t.status.value if hasattr(t.status, "value") else t.status,
-            progress=t.progress,
-            result_count=t.result_count,
-            error_message=t.error_message,
-        )
-        for t in tasks
-    ]
-    return EditPlanGenerationsResponse(items=items, total=len(items))
@@ -1,582 +0,0 @@
-"""模板编辑器所有 Pydantic Schema 定义.
-
-集中管理，避免在路由文件里散落 40+ 个 model。
-"""
-
-from __future__ import annotations
-
-import re as _re
-from typing import Any, Dict, List, Optional
-
-from app.schemas.generation_task import GenerationTaskResponse
-from pydantic import BaseModel, Field, validator
-
-_EXPORT_RESOLUTION_PATTERN = _re.compile(r"^\d+x\d+$")
-_EXPORT_VALID_QUALITY_PRESETS = {"ultra_fast", "fast", "balanced", "high", "best"}
-_EXPORT_VALID_FORMATS = {"mp4", "mov"}
-
-
-# ── 生成状态相关 ────────────────────────────────────────────────────────────
-
-
-class ClipStatusItem(BaseModel):
-    """片段生成状态"""
-
-    clip_id: str
-    clip_type: str
-    order: int
-    status: str
-    asset_id: str
-    text_content: str
-    duration: float
-
-
-class EditPlanGenerationStatusResponse(BaseModel):
-    """剪辑计划生成进度响应体"""
-
-    plan_id: str
-    plan_status: str
-    generation_task_id: Optional[str] = None
-    generation_task_status: Optional[str] = None
-    progress: float = 0.0
-    video_url: str = ""
-    error_message: str = ""
-    clips: List[ClipStatusItem]
-
-
-class EditPlanGenerateRequest(BaseModel):
-    """模板编辑器触发生成请求体"""
-    title_config: Optional[Dict[str, Any]] = Field(
-        default_factory=dict,
-        description="标题配置（可选），渲染时烧录到视频中。支持字段: text/font/font_size/font_color/position/bold/stroke/shadow",
-    )
-
-
-class EditPlanGenerateResponse(BaseModel):
-    """剪辑计划触发生成响应体"""
-
-    plan_id: str
-    plan_status: str
-    generation_task_id: str
-    clip_count: int
-
-
-class EditPlanGenerationsResponse(BaseModel):
-    """剪辑计划关联的生成记录列表响应体"""
-
-    items: List[GenerationTaskResponse]
-    total: int
-
-
-# ── AI 推荐 ────────────────────────────────────────────────────────────────
-
-
-class AIRecommendRequest(BaseModel):
-    """AI 推荐片段方案请求体"""
-
-    asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
-    editing_mode: str = Field(
-        default="one_take", description="剪辑模式: one_take / pip / voice_over / voice_pip"
-    )
-    target_duration: float = Field(
-        default=30.0, ge=1.0, le=600.0, description="目标时长（秒）"
-    )
-
-
-class AIRecommendClipItem(BaseModel):
-    """AI 推荐的单个片段"""
-
-    clip_type: str = Field(..., description="片段类型: intro / showcase / title / subtitle / cta / outro")
-    order: int = Field(..., ge=0, description="片段顺序")
-    text_content: str = Field(default="", description="文字内容")
-    duration: float = Field(..., ge=0.0, description="片段时长（秒）")
-    transition_effect: str = Field(default="cut", description="转场效果")
-    transition_duration: float = Field(default=0.0, ge=0.0, description="转场时长（秒），0 表示使用默认值")
-    asset_id: str = Field(default="", description="关联素材 ID")
-    start_time: float = Field(default=0.0, ge=0.0, description="素材截取起始时间（秒）")
-    config: dict[str, Any] = Field(default_factory=dict, description="片段额外配置")
-
-
-class AIRecommendResponse(BaseModel):
-    """AI 推荐片段方案响应体"""
-
-    plan_id: str = Field(..., description="剪辑计划 ID")
-    clips: List[AIRecommendClipItem] = Field(..., description="推荐的片段列表")
-    config: dict[str, Any] = Field(..., description="推荐的 plan config（cover/title/subtitle/bgm）")
-    total_duration: float = Field(..., ge=0.0, description="推荐方案总时长（秒）")
-    confidence: float = Field(..., ge=0.0, le=1.0, description="AI 推荐置信度 (0~1)")
-
-
-
-
-# ── BGM ────────────────────────────────────────────────────────────────────
-
-
-class BGMConfigUpdateRequest(BaseModel):
-    """更新BGM配置请求体"""
-
-    enabled: Optional[bool] = Field(default=None, description="是否启用 BGM")
-    source: Optional[str] = Field(default=None, description="BGM 来源: library/upload/ai_recommend")
-    asset_id: Optional[str] = Field(default=None, max_length=64, description="BGM 素材 ID")
-    preset_id: Optional[str] = Field(default=None, max_length=64, description="预设 BGM ID")
-    audio_url: Optional[str] = Field(default=None, max_length=500, description="BGM 音频 URL")
-    volume: Optional[float] = Field(default=None, ge=0.0, le=1.0, description="音量 (0.0 ~ 1.0)")
-    fade_in: Optional[float] = Field(default=None, ge=0.0, le=30.0, description="淡入时长（秒）")
-    fade_out: Optional[float] = Field(default=None, ge=0.0, le=30.0, description="淡出时长（秒）")
-    loop_enabled: Optional[bool] = Field(default=None, description="是否循环播放")
-    sidechain_enabled: Optional[bool] = Field(default=None, description="是否启用人声闪避")
-    sidechain_ratio: Optional[float] = Field(default=None, ge=0.0, le=1.0, description="闪避音量降低比例")
-
-
-# ── 片段调整 ────────────────────────────────────────────────────────────────
-
-
-class SpeedAdjustRequest(BaseModel):
-    """调速请求"""
-
-    speed: float = Field(..., ge=0.25, le=4.0, description="播放速度 0.25~4.0")
-
-
-class VolumeAdjustRequest(BaseModel):
-    """音量调节请求"""
-
-    volume: float = Field(..., ge=0.0, le=2.0, description="音量倍率 0~2.0（1.0=原音量）")
-
-
-class TrimAdjustRequest(BaseModel):
-    """裁剪请求"""
-
-    trim_start: float = Field(0.0, ge=0.0, description="开头裁剪秒数")
-    trim_end: float = Field(0.0, ge=0.0, description="结尾裁剪秒数")
-
-
-class ClipAdjustmentsRequest(BaseModel):
-    """统一调整请求"""
-
-    speed: Optional[float] = Field(default=None, ge=0.25, le=4.0)
-    volume: Optional[float] = Field(default=None, ge=0.0, le=2.0)
-    trim_start: Optional[float] = Field(default=None, ge=0.0)
-    trim_end: Optional[float] = Field(default=None, ge=0.0)
-
-
-class BatchSpeedRequest(BaseModel):
-    """批量调速请求"""
-
-    speed: float = Field(..., ge=0.25, le=4.0, description="播放速度")
-
-
-class ClipAdjustResponse(BaseModel):
-    """片段调整响应"""
-
-    clip_id: str
-    speed: float
-    volume: float
-    trim_start: float
-    trim_end: float
-    duration: float
-
-
-class BatchSpeedResponse(BaseModel):
-    """批量调速响应"""
-
-    updated_count: int
-    plan_id: str
-
-
-# ── 片段批量操作 ────────────────────────────────────────────────────────────
-
-
-class ClipReorderItem(BaseModel):
-    """重排序条目"""
-
-    clip_id: str
-    new_order: int = Field(..., ge=0, description="新的排序序号")
-
-
-class ClipReorderRequest(BaseModel):
-    """片段重排序请求"""
-
-    items: List[ClipReorderItem] = Field(..., min_length=1, max_length=500, description="重排序条目列表")
-
-
-class ClipReorderResponse(BaseModel):
-    """片段重排序响应"""
-
-    success: bool = True
-    updated_count: int
-    message: str = ""
-
-
-class ClipBatchDeleteRequest(BaseModel):
-    """批量删除片段请求"""
-
-    clip_ids: List[str] = Field(..., min_length=1, max_length=500, description="要删除的片段ID列表")
-
-
-class ClipBatchDeleteResponse(BaseModel):
-    """批量删除片段响应"""
-
-    success: bool = True
-    deleted_count: int
-    message: str = ""
-
-
-class ClipsFromAssetsRequest(BaseModel):
-    """从素材批量创建片段请求"""
-
-    asset_ids: List[str] = Field(
-        ..., min_length=1, max_length=200, description="素材 ID 列表，按顺序追加到时间线末尾"
-    )
-    clip_type: str = Field(default="main", description="片段类型，默认 main")
-
-
-class ClipsFromAssetsResponse(BaseModel):
-    """从素材批量创建片段响应"""
-
-    success: bool = True
-    created_count: int
-    plan_id: str = ""
-    message: str = ""
-    clip_ids: List[str] = Field(default_factory=list, description="创建的片段ID列表")
-
-
-# ── 封面配置 ────────────────────────────────────────────────────────────────
-
-
-# ── 导出配置 ────────────────────────────────────────────────────────────────
-
-
-class ExportConfigResponse(BaseModel):
-    """导出配置响应"""
-
-    resolution: str
-    fps: int
-    video_bitrate: int
-    audio_bitrate: int
-    format: str
-    quality_preset: str
-    watermark_enabled: bool
-    watermark_text: str
-
-
-class ExportUpdateRequest(BaseModel):
-    """更新导出配置请求"""
-
-    resolution: Optional[str] = None
-    fps: Optional[int] = Field(default=None, ge=15, le=60)
-    video_bitrate: Optional[int] = Field(default=None, ge=1000, le=20000)
-    audio_bitrate: Optional[int] = Field(default=None, ge=64, le=320)
-    format: Optional[str] = None
-    quality_preset: Optional[str] = None
-    watermark_enabled: Optional[bool] = None
-    watermark_text: Optional[str] = None
-
-    @validator("resolution")
-    def validate_resolution(cls, v):
-        if v is None:
-            return v
-        if not _EXPORT_RESOLUTION_PATTERN.match(v):
-            raise ValueError("分辨率格式错误，应为 宽x高，如 1080x1920")
-        w, h = v.split("x")
-        if int(w) < 100 or int(h) < 100:
-            raise ValueError("分辨率数值过小")
-        if int(w) > 4096 or int(h) > 4096:
-            raise ValueError("分辨率数值过大，最大 4096x4096")
-        return v
-
-    @validator("format")
-    def validate_format(cls, v):
-        if v is None:
-            return v
-        if v not in _EXPORT_VALID_FORMATS:
-            raise ValueError(f"无效格式: {v}，支持: {_EXPORT_VALID_FORMATS}")
-        return v
-
-    @validator("quality_preset")
-    def validate_quality_preset(cls, v):
-        if v is None:
-            return v
-        if v not in _EXPORT_VALID_QUALITY_PRESETS:
-            raise ValueError(f"无效质量预设: {v}，支持: {_EXPORT_VALID_QUALITY_PRESETS}")
-        return v
-
-
-class ExportPresetItem(BaseModel):
-    """导出预设条目"""
-
-    id: str
-    name: str
-    resolution: str
-    fps: int
-    video_bitrate: int
-    audio_bitrate: int
-    format: str
-    quality_preset: str
-    description: str
-    size_hint: str
-
-
-class ExportPresetListResponse(BaseModel):
-    """导出预设列表响应"""
-
-    items: List[ExportPresetItem]
-    total: int
-
-
-# ── 滤镜 ────────────────────────────────────────────────────────────────────
-
-
-class FilterPresetResponse(BaseModel):
-    """滤镜预设响应"""
-
-    id: str
-    name: str
-    category: str
-    description: str
-    tags: List[str] = Field(default_factory=list)
-
-
-class FilterConfigResponse(BaseModel):
-    """滤镜配置响应"""
-
-    enabled: bool
-    preset_id: str
-    intensity: int
-    brightness: float
-    contrast: float
-    saturation: float
-    warmth: float
-
-
-class FilterUpdateRequest(BaseModel):
-    """更新滤镜配置请求"""
-
-    enabled: Optional[bool] = None
-    preset_id: Optional[str] = None
-    intensity: Optional[int] = Field(default=None, ge=0, le=100)
-    brightness: Optional[float] = Field(default=None, ge=-1.0, le=1.0)
-    contrast: Optional[float] = Field(default=None, ge=0.0, le=2.0)
-    saturation: Optional[float] = Field(default=None, ge=0.0, le=3.0)
-    warmth: Optional[float] = Field(default=None, ge=-1.0, le=1.0)
-
-
-class FilterPresetListResponse(BaseModel):
-    """滤镜预设列表响应"""
-
-    items: List[FilterPresetResponse]
-    total: int
-
-
-# ── 转场 ────────────────────────────────────────────────────────────────────
-
-
-class TransitionPresetResponse(BaseModel):
-    """转场预设响应"""
-
-    id: str
-    name: str
-    category: str
-    description: str
-    tags: List[str] = Field(default_factory=list)
-    default_duration: float
-    min_duration: float
-    max_duration: float
-
-
-class TransitionUpdateRequest(BaseModel):
-    """更新转场请求"""
-
-    effect: str = Field(..., description="转场效果 ID")
-    duration: Optional[float] = Field(default=None, ge=0.0, description="转场时长（秒）")
-
-
-class BatchTransitionRequest(BaseModel):
-    """批量设置转场请求"""
-
-    effect: str = Field(..., description="转场效果 ID")
-    duration: Optional[float] = Field(default=None, ge=0.0, description="转场时长（秒）")
-    apply_to: str = Field(
-        default="all",
-        description="应用范围: all=所有片段, except_first=除第一个外, except_last=除最后一个, middle=中间片段",
-    )
-
-
-class ClipTransitionResponse(BaseModel):
-    """片段转场信息响应"""
-
-    clip_id: str
-    effect: str
-    duration: float
-
-
-class BatchTransitionResponse(BaseModel):
-    """批量转场响应"""
-
-    updated_count: int
-    plan_id: str
-
-
-class TransitionPresetListResponse(BaseModel):
-    """转场预设列表响应"""
-
-    items: List[TransitionPresetResponse]
-    total: int
-
-
-# ── 编辑器草稿 & 片段 ───────────────────────────────────────────────────────
-
-
-class EditorDraftResponse(BaseModel):
-    """模板编辑器草稿详情响应"""
-
-    plan_id: str
-    template_id: str
-    name: str
-    status: str
-    config: dict[str, Any]
-    total_duration: float
-    clip_count: int
-    is_draft: bool = True
-
-
-class EditorUpdateRequest(BaseModel):
-    """更新草稿请求"""
-
-    name: Optional[str] = Field(default=None, min_length=1, max_length=200)
-    config: Optional[dict[str, Any]] = Field(default=None)
-    total_duration: Optional[float] = Field(default=None, ge=0.0)
-
-
-class EditorClipResponse(BaseModel):
-    """片段响应 — 与数据库 edit_plan_clips 表字段对齐"""
-
-    id: str
-    plan_id: str
-    clip_type: str
-    order: int
-    duration: float
-    start_time: float = 0.0
-    text_content: str = ""
-    transition_effect: str = "cut"
-    transition_duration: float = 0.0
-    playback_speed: float = 1.0
-    asset_id: str = ""
-    asset_url: str | None = Field(
-        default=None,
-        description="素材视频签名URL（1小时有效），用于前端预览播放",
-    )
-    status: str = "pending"
-    template_clip_config_id: str = ""
-    config: dict[str, Any] = Field(default_factory=dict)
-    created_at: str = ""
-    updated_at: str = ""
-
-
-class EditorClipListResponse(BaseModel):
-    """片段列表响应"""
-
-    items: List[EditorClipResponse]
-    total: int
-
-
-class EditorClipCreateRequest(BaseModel):
-    """创建片段请求"""
-
-    clip_type: str = Field(..., min_length=1, max_length=32)
-    order: int = Field(..., ge=0)
-    duration: float = Field(..., gt=0.0)
-    text_content: str = Field(default="", max_length=2000)
-    transition_effect: str = Field(default="cut", max_length=32)
-    config: dict[str, Any] = Field(default_factory=dict)
-
-
-class EditorClipUpdateRequest(BaseModel):
-    """更新片段请求"""
-
-    order: Optional[int] = Field(default=None, ge=0)
-    duration: Optional[float] = Field(default=None, gt=0.0)
-    text_content: Optional[str] = Field(default=None, max_length=2000)
-    transition_effect: Optional[str] = Field(default=None, max_length=32)
-    playback_speed: Optional[float] = Field(default=None, gt=0.0)
-    config: Optional[dict[str, Any]] = None
-
-
-class EditorPublishResponse(BaseModel):
-    """发布草稿响应"""
-
-    template_id: str
-    status: str = "published"
-    clip_count: int
-    version: int = 1
-
-
-class EditorTemplateVersionItem(BaseModel):
-    """模板版本历史条目"""
-
-    version: int
-    name: str
-    editing_mode: str
-    clip_count: int
-    change_note: str
-    published_by: str
-    created_at: str
-
-
-class EditorVersionListResponse(BaseModel):
-    """模板版本列表响应"""
-
-    versions: list[EditorTemplateVersionItem]
-    total: int
-
-
-class EditorRollbackRequest(BaseModel):
-    """回滚请求体"""
-
-    version: int
-
-
-class EditorRollbackResponse(BaseModel):
-    """回滚响应"""
-
-    template_id: str
-    status: str = "rolled_back"
-    rollback_to_version: int
-    new_version: int
-    clip_count: int
-
-
-# ── 片段分割与合并 ──────────────────────────────────────────────────────────
-
-
-class SplitClipRequest(BaseModel):
-    """分割片段请求体"""
-
-    split_time: float = Field(..., gt=0, description="分割点（秒，相对于片段起始）")
-
-
-class MergeClipsRequest(BaseModel):
-    """合并片段请求体"""
-
-    clip_ids: list[str] = Field(..., min_length=2, description="要合并的片段 ID 列表")
-
-
-# ── 时间线 ──────────────────────────────────────────────────────────────────
-
-
-class EditorTimelineSceneResponse(BaseModel):
-    """时间线场景"""
-
-    scene: str
-    time: str
-    duration: float
-    color: str
-    clip_id: str = ""
-    clip_type: str = ""
-
-
-class EditorTimelineResponse(BaseModel):
-    """时间线响应"""
-
-    plan_id: str
-    total_duration: float
-    scenes: List[EditorTimelineSceneResponse]
@@ -1,173 +0,0 @@
-"""字幕管理路由.
-
-端点：
- GET    /clips/{clip_id}/subtitles              字幕列表
- POST   /clips/{clip_id}/subtitles              新增字幕
- PUT    /clips/{clip_id}/subtitles/{subtitle_id} 更新字幕
- DELETE /clips/{clip_id}/subtitles/{subtitle_id} 删除字幕
- PUT    /clips/{clip_id}/subtitles              批量更新字幕（全量替换）
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends, HTTPException, status
-
-from .dependencies import get_draft_plan_id, get_editor_services
-
-router = APIRouter(tags=["Template Editor"])
-
-
-def _get_clip_subtitles(plan_svc: EditPlanService, clip_id: str, plan_id: str) -> list[dict[str, Any]]:
-    """获取片段字幕列表，统一校验"""
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    if clip.plan_id != plan_id:
-        raise HTTPException(status_code=404, detail="片段不存在")
-    config = clip.config or {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-    return subtitles
-
-
-@router.get("/clips/{clip_id}/subtitles", response_model=list[dict[str, Any]])
-def get_editor_clip_subtitles(
-    template_id: str,
-    clip_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> list[dict[str, Any]]:
-    """获取片段的字幕列表"""
-    _, plan_svc = services
-    return _get_clip_subtitles(plan_svc, clip_id, plan_id)
-
-
-@router.post("/clips/{clip_id}/subtitles", response_model=dict[str, Any])
-def create_editor_clip_subtitle(
-    template_id: str,
-    clip_id: str,
-    body: dict[str, Any],
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> dict[str, Any]:
-    """新增片段字幕"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-
-    new_id = f"sub_{len(subtitles) + 1}"
-    new_subtitle = {
-        "id": body.get("id", new_id),
-        "start_time": body.get("start_time", 0.0),
-        "end_time": body.get("end_time", 0.0),
-        "text": body.get("text", ""),
-        "style": body.get("style", {}),
-    }
-    subtitles.append(new_subtitle)
-    config["subtitles"] = subtitles
-
-    plan_svc.update_clip(clip_id, config=config)
-    return new_subtitle
-
-
-@router.put("/clips/{clip_id}/subtitles/{subtitle_id}", response_model=dict[str, Any])
-def update_editor_clip_subtitle(
-    template_id: str,
-    clip_id: str,
-    subtitle_id: str,
-    body: dict[str, Any],
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> dict[str, Any]:
-    """更新片段字幕"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-
-    found = False
-    for i, sub in enumerate(subtitles):
-        if sub.get("id") == subtitle_id:
-            subtitles[i].update(body)
-            found = True
-            break
-
-    if not found:
-        raise HTTPException(status_code=404, detail="字幕不存在")
-
-    config["subtitles"] = subtitles
-    plan_svc.update_clip(clip_id, config=config)
-    return subtitles[i]
-
-
-@router.delete(
-    "/clips/{clip_id}/subtitles/{subtitle_id}",
-    status_code=status.HTTP_204_NO_CONTENT,
-)
-def delete_editor_clip_subtitle(
-    template_id: str,
-    clip_id: str,
-    subtitle_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-):
-    """删除片段字幕"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    subtitles = config.get("subtitles", [])
-    if not isinstance(subtitles, list):
-        subtitles = []
-
-    new_subtitles = [s for s in subtitles if s.get("id") != subtitle_id]
-    if len(new_subtitles) == len(subtitles):
-        raise HTTPException(status_code=404, detail="字幕不存在")
-
-    config["subtitles"] = new_subtitles
-    plan_svc.update_clip(clip_id, config=config)
-    return None
-
-
-@router.put("/clips/{clip_id}/subtitles", response_model=list[dict[str, Any]])
-def batch_update_editor_clip_subtitles(
-    template_id: str,
-    clip_id: str,
-    body: list[dict[str, Any]],
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> list[dict[str, Any]]:
-    """批量更新片段字幕（全量替换）"""
-    _, plan_svc = services
-    clip = plan_svc.get_clip(clip_id)
-    if not clip:
-        raise HTTPException(status_code=404, detail="片段不存在")
-
-    config = dict(clip.config) if clip.config else {}
-    config["subtitles"] = body
-    plan_svc.update_clip(clip_id, config=config)
-    return body
@@ -1,61 +0,0 @@
-"""时间线路由.
-
-端点：
- GET /timeline       时间线场景数据
-"""
-
-from __future__ import annotations
-
-from app.auth import AuthenticatedUser, get_current_user
-from app.services.edit_plan_service import EditPlanService
-from app.services.edit_template_service import EditTemplateService
-from fastapi import APIRouter, Depends
-
-from ._utils import _CLIP_TYPE_COLORS, _DEFAULT_COLOR, _clip_type_to_scene_label, _format_time
-from .dependencies import get_draft_plan_id, get_editor_services
-from .schemas import EditorTimelineResponse, EditorTimelineSceneResponse
-
-router = APIRouter(tags=["Template Editor"])
-
-
-@router.get("/timeline", response_model=EditorTimelineResponse)
-def get_editor_timeline(
-    template_id: str,
-    plan_id: str = Depends(get_draft_plan_id),
-    services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
-    _: AuthenticatedUser = Depends(get_current_user),
-) -> EditorTimelineResponse:
-    """获取草稿的时间线场景数据"""
-    _, plan_svc = services
-    plan = plan_svc.get_plan_or_raise(plan_id)
-    clips = plan_svc.list_clips(plan_id=plan_id, skip=0, limit=200)
-    clips.sort(key=lambda c: c.order)
-
-    scenes = []
-    current_time = 0.0
-
-    for clip in clips:
-        start = current_time
-        end = start + clip.duration
-        color = _CLIP_TYPE_COLORS.get(clip.clip_type, _DEFAULT_COLOR)
-        scene_label = _clip_type_to_scene_label(clip.clip_type, clip.text_content)
-
-        scenes.append(
-            EditorTimelineSceneResponse(
-                scene=scene_label,
-                time=f"{_format_time(start)} - {_format_time(end)}",
-                duration=clip.duration,
-                color=color,
-                clip_id=clip.id,
-                clip_type=clip.clip_type,
-            )
-        )
-        current_time = end
-
-    total_duration = sum(s.duration for s in scenes) or plan.total_duration
-
-    return EditorTimelineResponse(
-        plan_id=plan_id,
-        total_duration=total_duration,
-        scenes=scenes,
-    )
@@ -6,7 +6,6 @@ import logging
 from typing import Optional

 from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
 from app.dependencies import (
    get_audio_url_signer,
    get_cosyvoice_service,
@@ -182,9 +181,13 @@ def synthesize(

        try:
            if is_segment:
-                celery_app.send_task("worker.process_tts_segment_synthesis", args=[job.id])
+                from worker_app.tasks import process_tts_segment_synthesis
+
+                process_tts_segment_synthesis.delay(job.id)
            else:
-                celery_app.send_task("worker.process_tts_synthesis", args=[job.id])
+                from worker_app.tasks import process_tts_synthesis
+
+                process_tts_synthesis.delay(job.id)
        except Exception as e:
            # Celery 调度失败，标记 job 为 failed
            try:
@@ -206,7 +206,6 @@ async def complete_direct_upload(
                ingest_job_id="",
                duplicated=True,
                asset_id=existing.id,
-                url=storage_service.get_url(normalized_key),
            )

    job = _submit_ingest_job(
@@ -216,7 +215,7 @@ async def complete_direct_upload(
        ingest_job_repository=ingest_job_repository,
        file_hash=request.file_hash,
    )
-    return DirectUploadCompleteResponse(storage_key=normalized_key, ingest_job_id=job.id, url=storage_service.get_url(normalized_key))
+    return DirectUploadCompleteResponse(storage_key=normalized_key, ingest_job_id=job.id)


@router.post(
@@ -6,12 +6,10 @@ import logging
 from typing import Optional

 from app.auth import AuthenticatedUser, get_current_user
-from app.core.celery_app import celery_app
 from app.dependencies import get_cosyvoice_service, get_voice_clone_profile_repository
 from app.schemas.voice_clone import (
    CreateVoiceCloneRequest,
    ListVoiceCloneResponse,
-    VoiceClonePreviewResponse,
    VoiceCloneProfileResponse,
    VoiceCloneStatusResponse,
 )
@@ -20,7 +18,7 @@ from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
 from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import (
    SQLAlchemyVoiceCloneProfileRepository,
 )
-from packages.application.cosyvoice_service import CosyVoiceError, CosyVoiceService
+from packages.application.cosyvoice_service import CosyVoiceService
 from packages.application.voice_clone.use_cases import (
    DeleteVoiceCloneUseCase,
    GetVoiceCloneStatusUseCase,
@@ -37,13 +35,6 @@ logger = logging.getLogger(__name__)

 router = APIRouter()

-# 克隆音色试听缓存（减少重复TTS调用）
-# key: clone_id, value: (audio_url, duration, file_size, text, timestamp)
-_clone_preview_cache: dict[str, tuple[str, float, int, str, float]] = {}
-CLONE_PREVIEW_CACHE_TTL = 7 * 24 * 3600  # 7天TTL
-# 默认试听文本
-CLONE_PREVIEW_TEMPLATE = "你好，这是我的克隆音色，很高兴能为你配音。"
-

 def _to_response(profile) -> VoiceCloneProfileResponse:
    # source_audio_url 是用户传入的原始 URL（可能是外部地址），不做预签名转换
@@ -106,7 +97,9 @@ def create_voice_clone(
    task_id = (profile.metadata or {}).get("cosyvoice_task_id", "")
    if profile.status == "processing" and task_id:
        try:
-            celery_app.send_task("worker.process_voice_clone", args=[profile.id])
+            from worker_app.tasks import process_voice_clone
+
+            process_voice_clone.delay(profile.id)
            logger.info(f"Celery task dispatched for voice clone {profile.id}")
        except Exception as e:
            logger.error(f"Failed to dispatch Celery task: {e}")
@@ -220,7 +213,9 @@ def retry_voice_clone(
    task_id = (profile.metadata or {}).get("cosyvoice_task_id", "")
    if profile.status == "processing" and task_id:
        try:
-            celery_app.send_task("worker.process_voice_clone", args=[profile.id])
+            from worker_app.tasks import process_voice_clone
+
+            process_voice_clone.delay(profile.id)
            logger.info(f"Celery task dispatched for voice clone retry {profile.id}")
        except Exception as e:
            logger.error(f"Failed to dispatch Celery task: {e}")
@@ -231,78 +226,3 @@ def retry_voice_clone(
                logger.error(f"Failed to mark profile as failed after dispatch error: {inner_e}")

    return _to_response(profile)
-
-
-@router.get("/{clone_id}/preview", response_model=VoiceClonePreviewResponse)
-def get_voice_clone_preview(
-    clone_id: str,
-    text: str = Query("", description="自定义试听文本，为空则使用默认示例"),
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    repository: SQLAlchemyVoiceCloneProfileRepository = Depends(get_voice_clone_profile_repository),
-    cosyvoice: CosyVoiceService = Depends(get_cosyvoice_service),
-) -> VoiceClonePreviewResponse:
-    """获取克隆音色试听音频（实时 TTS 合成）。
-
-    - 克隆音色必须处于 ready 状态
-    - 使用默认试听文本时，结果缓存 7 天
-    - 可传入自定义 text 参数试听不同文本
-    """
-    import time
-
-    use_case = GetVoiceCloneUseCase(repository)
-    try:
-        profile = use_case.execute(clone_id, authenticated_user.user.id)
-    except VoiceCloneNotFoundError as _e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice clone not found") from _e
-
-    if not profile.is_ready:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Voice clone is not ready (current status: {profile.status})",
-        )
-
-    # 有自定义文本时不缓存
-    use_cache = not text.strip()
-
-    if use_cache and clone_id in _clone_preview_cache:
-        audio_url, duration, file_size, cached_text, cached_at = _clone_preview_cache[clone_id]
-        if time.time() - cached_at < CLONE_PREVIEW_CACHE_TTL:
-            return VoiceClonePreviewResponse(
-                clone_id=clone_id,
-                voice_id=profile.voice_id,
-                audio_url=audio_url,
-                text=cached_text,
-                duration=duration,
-                file_size=file_size,
-            )
-
-    # 合成试听音频
-    preview_text = text.strip() or CLONE_PREVIEW_TEMPLATE
-    try:
-        result = cosyvoice.synthesize_speech(
-            text=preview_text,
-            voice_id=profile.voice_id,
-            format="mp3",
-            speed=1.0,
-        )
-    except CosyVoiceError as e:
-        raise HTTPException(status_code=502, detail=f"TTS 合成失败: {e}") from e
-
-    # 缓存（仅默认试听文本）
-    if use_cache:
-        _clone_preview_cache[clone_id] = (
-            result.audio_url,
-            result.duration,
-            result.file_size,
-            preview_text,
-            time.time(),
-        )
-
-    return VoiceClonePreviewResponse(
-        clone_id=clone_id,
-        voice_id=profile.voice_id,
-        audio_url=result.audio_url,
-        text=preview_text,
-        duration=result.duration,
-        file_size=result.file_size,
-    )
@@ -5,8 +5,6 @@

 from __future__ import annotations

-import logging
-import time
 from typing import Literal, Optional

 from app.api.routes._helpers import get_user_plan
@@ -44,7 +42,6 @@ from packages.domain.preset_voices import PRESET_VOICES, get_preset_voice_by_id
 from packages.ports.user_repository import UserRepository

 router = APIRouter()
-logger = logging.getLogger(__name__)

 # 预置音色试听音频缓存（内存缓存，减少重复TTS调用）
 # key: voice_id, value: (audio_url, timestamp)
@@ -54,65 +51,6 @@ PREVIEW_CACHE_TTL = 7 * 24 * 3600  # 7天TTL
 PREVIEW_TEMPLATE = "你好，我是{name}，很高兴认识你。"


-def _resolve_preset_preview_url(
-    voice_id: str,
-    fallback_url: str,
-    cosyvoice: CosyVoiceService,
-) -> str:
-    """为预置音色获取有效的 preview_url.
-
-    优先从内存缓存读取；缓存失效时调用 CosyVoice 重新合成；
-    合成失败时降级返回硬编码 URL（可能已过期，但不会报错）。
-    """
-    # 检查缓存
-    if voice_id in _preset_preview_cache:
-        audio_url, cached_at = _preset_preview_cache[voice_id]
-        if time.time() - cached_at < PREVIEW_CACHE_TTL:
-            return audio_url
-
-    # 缓存失效，调用 CosyVoice 合成
-    preset = get_preset_voice_by_id(voice_id)
-    if preset is None:
-        return fallback_url
-
-    preview_text = PREVIEW_TEMPLATE.format(name=preset.name)
-    try:
-        result = cosyvoice.synthesize_speech(
-            text=preview_text,
-            voice_id=voice_id,
-            format="mp3",
-            speed=1.0,
-        )
-        audio_url = result.audio_url
-        _preset_preview_cache[voice_id] = (audio_url, time.time())
-        logger.info("Preset voice preview generated: %s", voice_id)
-        return audio_url
-    except Exception as e:
-        logger.warning("Failed to generate preview for %s, using fallback: %s", voice_id, e)
-        return fallback_url
-
-
-def _resolve_all_preset_preview_urls(
-    presets: list,
-    cosyvoice: CosyVoiceService,
-) -> dict[str, str]:
-    """顺序解析所有预置音色的 preview_url.
-
-    采用顺序调用（而非并行）以避免触发 DashScope API 速率限制。
-    首次调用后结果缓存 7 天，后续请求直接命中缓存。
-
-    Returns:
-        voice_id -> preview_url 映射
-    """
-    result_map: dict[str, str] = {}
-    for p in presets:
-        try:
-            result_map[p.voice_id] = _resolve_preset_preview_url(p.voice_id, p.preview_url, cosyvoice)
-        except Exception:
-            result_map[p.voice_id] = p.preview_url
-    return result_map
-
-
 def _get_voice_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyVoiceLibraryRepository:
    return SQLAlchemyVoiceLibraryRepository(session)

@@ -180,16 +118,8 @@ def _to_unified_response(item, profile_id_map: dict | None = None, sign_url=None
    )


-def _preset_to_unified_response(preset, preview_url_map: dict[str, str] | None = None) -> UnifiedVoiceItemResponse:
-    """将预置音色转换为统一响应格式。
-
-    Args:
-        preset: 预置音色对象
-        preview_url_map: voice_id -> preview_url 动态映射，优先使用
-    """
-    preview_url = preset.preview_url
-    if preview_url_map and preset.voice_id in preview_url_map:
-        preview_url = preview_url_map[preset.voice_id]
+def _preset_to_unified_response(preset) -> UnifiedVoiceItemResponse:
+    """将预置音色转换为统一响应格式。"""
    return UnifiedVoiceItemResponse(
        id=preset.voice_id,
        type="preset",
@@ -199,40 +129,11 @@ def _preset_to_unified_response(preset, preview_url_map: dict[str, str] | None =
        language=preset.language,
        voice_id=preset.voice_id,
        voice_provider="cosyvoice",
-        preview_url=preview_url,
+        preview_url=preset.preview_url,
        tags=preset.tags or [],
    )


-def _clone_profile_to_unified_response(profile) -> UnifiedVoiceItemResponse:
-    """将克隆音色档案转换为统一响应格式。
-
-    注意：克隆音色是「音色模型」（可用于 TTS 合成任意文本），
-    不同于配音库条目（具体的配音作品）。
-    """
-    return UnifiedVoiceItemResponse(
-        id=profile.id,
-        type="clone",
-        name=profile.name,
-        description=profile.description or "",
-        gender=profile.gender or "unknown",
-        language=profile.language or "zh-CN",
-        voice_id=profile.voice_id or "",
-        voice_provider=profile.voice_model or "cosyvoice",
-        audio_url="",  # 克隆音色没有预合成音频，需通过 /voice-clones/{id}/preview 试听
-        preview_url="",  # 试听需实时合成，前端调用 preview 接口
-        duration=0,
-        file_size=0,
-        status=profile.status.value if hasattr(profile.status, "value") else str(profile.status),
-        tags=[],
-        user_id=profile.user_id,
-        project_id=None,
-        voice_clone_profile_id=profile.id,
-        created_at=profile.created_at,
-        updated_at=profile.updated_at,
-    )
-
-
 # ==================== 统一配音列表（预置 + 克隆）====================


@@ -249,7 +150,6 @@ def list_voices_unified(
    voice_repository: SQLAlchemyVoiceLibraryRepository = Depends(_get_voice_repository),
    clone_profile_repository: SQLAlchemyVoiceCloneProfileRepository = Depends(_get_clone_profile_repository),
    sign_url=Depends(get_audio_url_signer),
-    cosyvoice: CosyVoiceService = Depends(get_cosyvoice_service),
 ) -> UnifiedVoiceListResponse:
    """获取配音列表（预置音色 + 用户克隆音色）。

@@ -265,30 +165,19 @@ def list_voices_unified(
    has_preset = type is None or type == "preset"
    has_clone = type is None or type == "clone"

-    # 获取预置音色（动态生成 preview_url）
+    # 获取预置音色
    if has_preset:
-        preview_url_map = _resolve_all_preset_preview_urls(PRESET_VOICES, cosyvoice)
-        preset_items = [_preset_to_unified_response(p, preview_url_map) for p in PRESET_VOICES]
+        preset_items = [_preset_to_unified_response(p) for p in PRESET_VOICES]
        preset_count = len(preset_items)

-    # 获取克隆音色（从 voice_clone_profile 读取，ready 状态的克隆音色）
+    # 获取克隆音色
    if has_clone:
-        # status_filter 映射：不传则默认只返回 ready 状态（可用的克隆音色）
-        # 前端可以传 status=all 获取所有状态，或传具体状态过滤
-        filter_status = None
-        if status_filter and status_filter != "all":
-            filter_status = status_filter
-        elif not status_filter:
-            filter_status = "ready"
-
-        clone_profiles = clone_profile_repository.list_by_user(
-            user_id,
-            status=filter_status,
-            limit=limit,
-            offset=skip,
-        )
-        clone_count = clone_profile_repository.count_by_user(user_id, status=filter_status)
-        clone_items = [_clone_profile_to_unified_response(p) for p in clone_profiles]
+        use_case = ListVoiceLibraryUseCase(voice_repository)
+        clone_items_raw, clone_count = use_case.execute(user_id, status=status_filter, skip=skip, limit=limit)
+        # 批量查询 voice_id → profile_id 映射，填充 voice_clone_profile_id
+        voice_ids = [i.voice_id for i in clone_items_raw if i.voice_id]
+        profile_id_map = clone_profile_repository.find_profile_ids_by_voice_ids(voice_ids) if voice_ids else {}
+        clone_items = [_to_unified_response(i, profile_id_map, sign_url) for i in clone_items_raw]

    # 组装结果
    if type == "preset":
@@ -315,15 +204,11 @@ def list_voices_unified(


@router.get("/presets", response_model=PresetVoiceListResponse)
-def list_preset_voices(
-    cosyvoice: CosyVoiceService = Depends(get_cosyvoice_service),
-) -> PresetVoiceListResponse:
+def list_preset_voices() -> PresetVoiceListResponse:
    """获取预置音色列表。

    不需要认证，返回所有系统预置的 CosyVoice 音色。
-    preview_url 通过 CosyVoice 动态生成，不依赖硬编码的过期 URL。
    """
-    preview_url_map = _resolve_all_preset_preview_urls(PRESET_VOICES, cosyvoice)
    items = [
        PresetVoiceItemResponse(
            voice_id=p.voice_id,
@@ -331,7 +216,7 @@ def list_preset_voices(
            description=p.description,
            gender=p.gender,
            language=p.language,
-            preview_url=preview_url_map.get(p.voice_id, p.preview_url),
+            preview_url=p.preview_url,
            tags=p.tags or [],
        )
        for p in PRESET_VOICES
@@ -351,6 +236,8 @@ def get_preset_voice_preview(
    - 相同 voice_id 重复调用直接返回缓存的音频URL
    - 可传入自定义 text 参数试听不同文本
    """
+    import time
+
    preset = get_preset_voice_by_id(voice_id)
    if preset is None:
        raise HTTPException(status_code=404, detail=f"预置音色不存在: {voice_id}")
@@ -1,28 +1,179 @@
-"""API 服务配置（向后兼容层）。
+import os
+from typing import Optional

-统一配置已迁移到 packages.config.api_settings。
-新代码请使用：
-    from packages.config import APISettings, get_api_settings
+from pydantic import AliasChoices, Field, field_validator
+from pydantic_settings import BaseSettings, SettingsConfigDict

-本文件保留 Settings 类名、get_settings() 函数、settings 模块级单例，
-确保所有旧的 import 路径仍然有效。
-"""

-from packages.config import APISettings as Settings
-from packages.config import get_api_settings as get_settings
-from packages.config import reload_settings_cache
+class Settings(BaseSettings):
+    APP_NAME: str = "xiaoxia-saas"
+    APP_VERSION: str = "0.1.61"
+    ENVIRONMENT: str = "development"
+    DEBUG: bool = True
+
+    # 应用基础 URL，用于生成认证邮件中的链接
+    # 开发环境默认 http://localhost:3000
+    # 生产环境应通过环境变量 APP_BASE_URL 设置
+    APP_BASE_URL: str = "http://localhost:3000"
+
+    # Container bind address; external expose is controlled by Docker/Nginx.
+    API_HOST: str = "0.0.0.0"  # nosec: B104
+    API_PORT: int = 8000
+
+    DATABASE_URL: str = "postgresql+psycopg://postgres:postgres@localhost:5432/xiaoxia_saas"
+    DATABASE_POOL_SIZE: int = 20
+    DATABASE_MAX_OVERFLOW: int = 10  # 调整为合理值：pool_size(20) + max_overflow(10) = 最大30连接
+    DATABASE_POOL_TIMEOUT: int = 30
+    DATABASE_POOL_RECYCLE: int = 3600
+    USE_IN_MEMORY_DB: bool = False
+    AUTO_CREATE_SCHEMA: bool = False
+
+    REDIS_URL: str = "redis://localhost:6379/0"
+    ENABLE_REDIS_SESSIONS: bool = False
+
+    # JWT secret key - MUST be set via environment variable, no default allowed
+    JWT_SECRET_KEY: Optional[str] = None
+
+    # JWT 算法与过期时间（与 .env.example 对齐）
+    JWT_ALGORITHM: str = "HS256"
+    JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
+    JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
+
+    @field_validator("JWT_SECRET_KEY", mode="before")
+    @classmethod
+    def validate_jwt_secret_key(cls, v):
+        if v is None or v == "":
+            raise ValueError(
+                "JWT_SECRET_KEY must be set via environment variable. " "Do not use default value in production!"
+            )
+        # Block known insecure default values
+        insecure_defaults = [
+            "your-secret-key-change-in-production",
+            "your-secret-key",
+            "secret",
+            "changeme",
+            "password",
+        ]
+        if v.lower() in [d.lower() for d in insecure_defaults]:
+            raise ValueError(
+                f"JWT_SECRET_KEY '{v}' is insecure. " "Please set a strong random secret via environment variable."
+            )
+        return v
+
+    ENABLE_EMAIL_DELIVERY: bool = False
+    SMTP_HOST: str = "smtp.gmail.com"
+    SMTP_PORT: int = 587
+    SMTP_USER: str = ""
+    SMTP_PASSWORD: str = ""
+    SMTP_FROM_EMAIL: str = ""
+    SMTP_FROM_NAME: str = "小虾 SaaS"
+    SMTP_USE_TLS: bool = True
+
+    CELERY_BROKER_URL: str = "redis://localhost:6379/0"
+    CELERY_RESULT_BACKEND: str = "redis://localhost:6379/1"
+
+    # OSS 七牛云相关
+    OSS_ENDPOINT: str = "oss-cn-hangzhou.aliyuncs.com"
+    OSS_ACCESS_KEY_ID: str = ""
+    OSS_ACCESS_KEY_SECRET: str = ""
+    OSS_BUCKET_NAME: str = "xiaoxia-autocut"
+
+    @field_validator("OSS_ACCESS_KEY_ID", mode="before")
+    @classmethod
+    def validate_oss_access_key_id(cls, v):
+        if (v is None or v == "") and os.getenv("APP_ENV", "development") != "development":
+            raise ValueError(
+                "OSS_ACCESS_KEY_ID must be set via environment variable in non-development environments. "
+                "Check the server .env file (e.g. /var/lib/xiaoxia-saas-staging/.env)."
+            )
+        return v or ""
+
+    @field_validator("OSS_ACCESS_KEY_SECRET", mode="before")
+    @classmethod
+    def validate_oss_access_key_secret(cls, v):
+        if (v is None or v == "") and os.getenv("APP_ENV", "development") != "development":
+            raise ValueError(
+                "OSS_ACCESS_KEY_SECRET must be set via environment variable in non-development environments. "
+                "Check the server .env file (e.g. /var/lib/xiaoxia-saas-staging/.env)."
+            )
+        return v or ""
+
+    OSS_DIRECT_UPLOAD_MAX_MB: int = Field(
+        default=2000,
+        validation_alias=AliasChoices("OSS_DIRECT_UPLOAD_MAX_MB", "MAX_UPLOAD_SIZE_MB"),
+    )
+    OSS_DIRECT_UPLOAD_EXPIRE_SECONDS: int = 900
+
+    CORS_ORIGINS_RAW: str = "http://localhost:3000,http://localhost:5173,http://localhost:8000"
+
+    # 渲染引擎选择：legacy=旧VideoComposeService，unified=新UnifiedRenderService
+    RENDER_ENGINE: str = "legacy"
+
+    # 豆包大模型配置（火山引擎方舟平台）
+    # 未配置 API Key 时自动降级为本地模拟生成
+    DOUBAO_API_KEY: str = ""
+    DOUBAO_MODEL: str = "doubao-seed-1-6-250615"
+    DOUBAO_BASE_URL: str = "https://ark.cn-beijing.volces.com/api/v3"
+    DOUBAO_TIMEOUT: int = 30
+    DOUBAO_MAX_RETRIES: int = 2
+
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        env_file_encoding="utf-8",
+        case_sensitive=False,
+        extra="ignore",
+    )
+
+    @property
+    def CORS_ORIGINS(self) -> list[str]:
+        return [origin.strip() for origin in self.CORS_ORIGINS_RAW.split(",") if origin.strip()]
+
+    @property
+    def database_url(self) -> str:
+        return self.DATABASE_URL
+
+    @property
+    def redis_url(self) -> str:
+        return self.REDIS_URL
+
+    @property
+    def celery_broker_url(self) -> str:
+        return self.CELERY_BROKER_URL
+
+    @property
+    def celery_result_backend(self) -> str:
+        return self.CELERY_RESULT_BACKEND
+
+    @property
+    def oss_endpoint(self) -> str:
+        return self.OSS_ENDPOINT
+
+    @property
+    def oss_access_key_id(self) -> str:
+        return self.OSS_ACCESS_KEY_ID
+
+    @property
+    def oss_access_key_secret(self) -> str:
+        return self.OSS_ACCESS_KEY_SECRET
+
+    @property
+    def oss_bucket_name(self) -> str:
+        return self.OSS_BUCKET_NAME
+
+
+_settings: Optional[Settings] = None
+
+
+def get_settings() -> Settings:
+    global _settings
+    if _settings is None:
+        env = os.getenv("APP_ENV", "development")
+        env_file = f".env.{env}" if env != "development" else ".env"
+        if os.path.exists(env_file):
+            _settings = Settings(_env_file=env_file)
+        else:
+            _settings = Settings()
+    return _settings
+

-# 模块级单例（向后兼容）
 settings = get_settings()
-
-
-# 暴露旧的 reload_settings 函数名
-def reload_settings():
-    """重新加载配置（测试用）。"""
-    reload_settings_cache()
-    global settings
-    settings = get_settings()
-    return settings
-
-
-__all__ = ["Settings", "get_settings", "settings", "reload_settings"]
@@ -1,20 +1,19 @@
-"""向后兼容层 — 配置已统一到 packages.config。
+"""Compatibility layer for the canonical API settings module.

-新代码请使用：
-    from packages.config import get_api_settings, APISettings
+Use `app.config` as the single source of truth for API configuration.
+This module remains only for older imports during migration.
 """

-from packages.config import APISettings as AppSettings
-from packages.config import get_api_settings as get_settings
-from packages.config import reload_settings_cache
+from app.config import Settings as AppSettings
+from app.config import get_settings, settings


 def reload_settings() -> AppSettings:
-    """重新加载配置（测试用）。"""
-    reload_settings_cache()
-    return get_settings()
+    """Reload settings for tests and legacy callers."""
+    import app.config as canonical_config

+    canonical_config.settings = canonical_config.get_settings()
+    return canonical_config.settings

-settings = get_settings()

 __all__ = ["AppSettings", "get_settings", "reload_settings", "settings"]
@@ -22,9 +22,6 @@ from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRe
 from packages.adapters.sqlalchemy_impl.classification_job_repository import (
    SQLAlchemyClassificationJobRepository,
 )
-from packages.adapters.sqlalchemy_impl.cover_template_repository import (
-    SQLAlchemyCoverTemplateRepository,
-)
 from packages.adapters.sqlalchemy_impl.duplication_repository import (
    SQLAlchemyDuplicationRecordRepository,
 )
@@ -131,13 +128,6 @@ def get_project_repository(
    return SQLAlchemyProjectRepository(session)


-def get_cover_template_repository(
-    session: Session = Depends(get_db_session),
-) -> SQLAlchemyCoverTemplateRepository:
-    """Provide the SQLAlchemy cover template repository implementation."""
-    return SQLAlchemyCoverTemplateRepository(session)
-
-
 def get_tag_repository(
    session: Session = Depends(get_db_session),
 ) -> TagRepository:
@@ -2,7 +2,7 @@ from pydantic import BaseModel, Field


 class CreateAssetRequest(BaseModel):
-    project_id: str | None = Field(default=None, description="可选，不传时从 library.project_id 自动推导")
+    project_id: str = Field(..., min_length=1)
    library_id: str = Field(..., min_length=1)
    name: str = Field(..., min_length=1, max_length=100)
    storage_key: str = Field(..., min_length=1, max_length=255)
@@ -58,12 +58,6 @@ class AssetResponse(BaseModel):
 MAX_BATCH_SIZE = 200


-class BatchGetRequest(BaseModel):
-    """批量获取素材详情请求。"""
-
-    ids: list[str] = Field(..., min_length=1, max_length=MAX_BATCH_SIZE, description="素材 ID 列表")
-
-
 class BatchDeleteRequest(BaseModel):
    """批量删除请求（软删除）。"""

@@ -107,30 +101,3 @@ class ListAssetsResponse(BaseModel):
    total: int = Field(default=0, ge=0)
    skip: int = Field(default=0, ge=0)
    limit: int = Field(default=100, ge=1)
-
-
-class SmartMatchRequest(BaseModel):
-    """智能选素材请求。"""
-
-    library_id: str = Field(..., min_length=1, description="素材库 ID")
-    limit: int | None = Field(default=None, ge=1, le=200, description="最大返回数量，不传则返回全部匹配素材")
-    kind: str | None = Field(
-        default=None,
-        pattern="^(video|image|audio)$",
-        description="按文件类型过滤，不传则返回所有类型",
-    )
-
-
-class SmartMatchItem(BaseModel):
-    """智能选素材结果条目。"""
-
-    asset: AssetResponse
-    score: float = Field(..., ge=0, le=100, description="综合得分 0-100")
-    breakdown: dict[str, float] = Field(default_factory=dict, description="各维度得分明细")
-
-
-class SmartMatchResponse(BaseModel):
-    """智能选素材响应。"""
-
-    items: list[SmartMatchItem]
-    total_candidates: int = Field(default=0, ge=0, description="参与评分的候选素材总数")
@@ -1,54 +0,0 @@
-"""封面模板 Schema。"""
-
-from datetime import datetime
-from typing import Any
-
-from pydantic import BaseModel, Field
-
-
-class CoverTemplateConfig(BaseModel):
-    """封面模板配置。"""
-
-    background_enabled: bool = Field(default=True, description="是否启用背景")
-    background_color: str = Field(default="#000000", description="背景颜色")
-    portrait_enabled: bool = Field(default=True, description="是否显示人像")
-    title_text: str = Field(default="", description="主标题文字")
-    subtitle_text: str = Field(default="", description="副标题文字")
-    mask_enabled: bool = Field(default=False, description="是否启用蒙版")
-
-
-class CreateCoverTemplateRequest(BaseModel):
-    """创建封面模板请求。"""
-
-    name: str = Field(..., min_length=1, max_length=200, description="模板名称")
-    thumbnail_url: str = Field(default="", description="缩略图 URL")
-    config: CoverTemplateConfig | None = Field(default=None, description="模板配置")
-
-
-class UpdateCoverTemplateRequest(BaseModel):
-    """更新封面模板请求。"""
-
-    name: str | None = Field(default=None, min_length=1, max_length=200, description="模板名称")
-    thumbnail_url: str | None = Field(default=None, description="缩略图 URL")
-    config: CoverTemplateConfig | None = Field(default=None, description="模板配置")
-
-
-class CoverTemplateResponse(BaseModel):
-    """封面模板响应。"""
-
-    id: str
-    name: str
-    thumbnail_url: str
-    is_system: bool
-    created_at: datetime
-    config: dict[str, Any] = Field(default_factory=dict)
-
-    class Config:
-        from_attributes = True
-
-
-class ListCoverTemplatesResponse(BaseModel):
-    """封面模板列表响应。"""
-
-    items: list[CoverTemplateResponse]
-    total: int = Field(default=0, ge=0)
@@ -1,18 +1,8 @@
 import json
-from datetime import datetime

 from pydantic import BaseModel, Field, field_validator, model_validator


-class ConfirmGenerationRequest(BaseModel):
-    """确认生成请求体 — 基于预览任务创建正式生成任务"""
-
-    output_width: int = Field(default=1080, ge=100, description="输出视频宽度")
-    output_height: int = Field(default=1920, ge=100, description="输出视频高度")
-    cover_url: str = Field(default="", description="自定义封面图片 URL")
-    custom_title: str = Field(default="", description="自定义视频标题")
-
-
 class CreateGenerationTaskRequest(BaseModel):
    """创建生成任务请求。

@@ -61,18 +51,6 @@ class CreateGenerationTaskRequest(BaseModel):
        default="",
        description="输出分辨率，格式为 WIDTHxHEIGHT，如 1280x720、1080x1920。为空使用默认 1280x720",
    )
-    # ── 自定义 BGM ──
-    bgm_config: dict = Field(
-        default_factory=dict,
-        description="自定义BGM配置，覆盖模板BGM设置。支持 enabled/source/asset_id/preset_id/audio_url/volume 等字段",
-    )
-    # ── 预览 / 确认生成 ──
-    is_preview: bool = Field(default=False, description="是否为预览任务")
-    source_task_id: str = Field(default="", description="来源预览任务 ID（确认生成时传入）")
-    output_width: int = Field(default=1280, description="输出视频宽度")
-    output_height: int = Field(default=720, description="输出视频高度")
-    cover_url: str = Field(default="", description="封面图片 URL")
-    custom_title: str = Field(default="", description="自定义视频标题")

    @model_validator(mode="after")
    def _check_at_least_one_mode(self) -> "CreateGenerationTaskRequest":
@@ -102,13 +80,6 @@ class GenerationTaskResponse(BaseModel):
    batch_id: str = ""
    video_title: str = ""
    resolution: str = ""
-    bgm_config: dict = Field(default_factory=dict)
-    is_preview: bool = False
-    source_task_id: str = ""
-    output_width: int = 1280
-    output_height: int = 720
-    cover_url: str = ""
-    custom_title: str = ""
    status: str
    progress: float
    result_count: int
@@ -145,79 +116,3 @@ class ListGenerationTasksResponse(BaseModel):
    """用户级生成任务列表响应（跨 project）。"""

    items: list[GenerationTaskResponse]
-
-
-# ── 预览生成（Phase 1） ───────────────────────────────────────────────────────
-
-
-class CreatePreviewGenerationTaskRequest(BaseModel):
-    """创建预览生成任务请求。
-
-    仅支持模板模式：template_id + asset_ids 等素材 ID 列表。
-    预览渲染品质与正式生成一致（1080p, CRF 23, medium preset）。
-    """
-
-    template_id: str
-    asset_ids: list[str] = Field(default_factory=list)
-    title_ids: list[str] = Field(default_factory=list)
-    voice_ids: list[str] = Field(default_factory=list)
-    voice_library_id: str = Field(
-        default="", description="配音素材库ID（用户上传的音频或AI配音），对应配音选择页面选择的配音素材"
-    )
-    video_title: str = Field(default="", description="生成视频的标题/名称，为空则使用默认命名")
-    duration: float = Field(default=0.0, ge=0, description="期望视频时长（秒），0 表示由模板决定")
-    video_ratio: str = Field(default="", description="视频比例，如 16:9 / 9:16，为空使用模板默认")
-    bgm_config: dict = Field(
-        default_factory=dict,
-        description="自定义BGM配置，覆盖模板BGM设置。支持 enabled/source/asset_id/preset_id/audio_url/volume 等字段",
-    )
-    preview_count: int = Field(
-        default=1,
-        ge=1,
-        le=10,
-        description="预览视频生成数量，范围 1-10，默认 1",
-    )
-    source_edit_plan_id: str = Field(
-        default="",
-        description="关联的编辑计划ID（可选），用于确认生成时复用预览产物",
-    )
-    title_config: dict = Field(
-        default_factory=dict,
-        description="标题配置（可选），渲染时烧录到预览视频中。支持字段: text/font/font_size/font_color/position/bold/stroke/shadow",
-    )
-
-    @model_validator(mode="after")
-    def _check_template_id(self) -> "CreatePreviewGenerationTaskRequest":
-        if not self.template_id.strip():
-            raise ValueError("template_id 不能为空")
-        return self
-
-    @model_validator(mode="after")
-    def _check_asset_ids(self) -> "CreatePreviewGenerationTaskRequest":
-        if not self.asset_ids and not self.title_ids and not self.voice_ids:
-            raise ValueError("asset_ids/title_ids/voice_ids 至少需要提供一个")
-        return self
-
-
-class PreviewGenerationTaskResponse(BaseModel):
-    """预览生成任务响应。
-
-    包含任务状态、进度、分辨率、生成结果 URL 等关键字段。
-    """
-
-    task_id: str
-    status: str
-    progress: float
-    is_preview: bool = True
-    resolution: str = ""
-    video_url: str = ""
-    duration: float = 0.0
-    file_size: int = 0
-    clip_count: int = 0
-    transition_count: int = 0
-    material_usage: dict = Field(default_factory=dict)
-    error_message: str = ""
-    created_at: datetime | None = None
-    started_at: datetime | None = None
-    finished_at: datetime | None = None
-    generate_duration: float = 0.0
@@ -39,7 +39,6 @@ class DirectUploadCompleteResponse(BaseModel):
    ingest_job_id: str
    duplicated: bool = Field(default=False, description="是否为重复素材（命中去重）")
    asset_id: str = Field(default="", description="重复素材的 asset_id（duplicated=true 时返回）")
-    url: str = Field(default="", description="Public URL of uploaded file")


 class UploadAssetResponse(BaseModel):
@@ -63,25 +63,3 @@ class ListVoiceCloneResponse(BaseModel):

    items: List[VoiceCloneProfileResponse]
    total: int
-
-
-class VoiceClonePreviewResponse(BaseModel):
-    """克隆音色试听响应。"""
-
-    clone_id: str
-    """音色克隆档案 ID"""
-
-    voice_id: str
-    """CosyVoice 音色 ID"""
-
-    audio_url: str
-    """试听音频 URL"""
-
-    text: str
-    """试听文本"""
-
-    duration: float = 0.0
-    """音频时长（秒）"""
-
-    file_size: int = 0
-    """文件大小（字节）"""
@@ -12,14 +12,14 @@

 from __future__ import annotations

+import json
 import logging
+import random
+import time
 from typing import Any, Dict, List, Optional

-from packages.domain.ai_parsing import generate_titles_fallback as _generate_titles_fallback_base
-from packages.domain.ai_parsing import keyword_match_fallback as _semantic_match_fallback_base
-from packages.domain.ai_parsing import parse_semantic_match_response as _parse_semantic_match_base
-from packages.domain.ai_parsing import parse_titles_from_response as _parse_titles_from_response
-from packages.shared.ai_client import get_doubao_client
+import httpx
+from app.config import get_settings

 logger = logging.getLogger(__name__)

@@ -57,6 +57,85 @@ TITLE_STYLES = {
 }


+# ── 豆包 AI 客户端 ──────────────────────────────────────────────────────────
+
+
+class DoubaoAIClient:
+    """豆包大模型 API 客户端.
+
+    使用火山引擎方舟平台的 OpenAI 兼容接口。
+    未配置 API Key 时，is_available 返回 False，调用方应降级处理。
+    """
+
+    def __init__(self) -> None:
+        settings = get_settings()
+        self.api_key: str = settings.DOUBAO_API_KEY
+        self.model: str = settings.DOUBAO_MODEL
+        self.base_url: str = settings.DOUBAO_BASE_URL.rstrip("/")
+        self.timeout: int = settings.DOUBAO_TIMEOUT
+        self.max_retries: int = settings.DOUBAO_MAX_RETRIES
+
+    @property
+    def is_available(self) -> bool:
+        """是否可用（配置了 API Key）."""
+        return bool(self.api_key)
+
+    def _chat_completion(
+        self,
+        messages: List[Dict[str, str]],
+        temperature: float = 0.7,
+        max_tokens: int = 1024,
+    ) -> Optional[str]:
+        """调用豆包 Chat Completion 接口.
+
+        Returns:
+            模型返回的文本内容，失败返回 None
+        """
+        if not self.is_available:
+            return None
+
+        url = f"{self.base_url}/chat/completions"
+        headers = {
+            "Authorization": f"Bearer {self.api_key}",
+            "Content-Type": "application/json",
+        }
+        payload = {
+            "model": self.model,
+            "messages": messages,
+            "temperature": temperature,
+            "max_tokens": max_tokens,
+        }
+
+        last_error: Optional[Exception] = None
+        for attempt in range(self.max_retries + 1):
+            try:
+                response = httpx.post(
+                    url,
+                    headers=headers,
+                    json=payload,
+                    timeout=self.timeout,
+                )
+                response.raise_for_status()
+                data = response.json()
+                content = data["choices"][0]["message"]["content"]
+                return content.strip()
+            except Exception as e:
+                last_error = e
+                if attempt < self.max_retries:
+                    wait = 0.5 * (2**attempt)
+                    logger.warning(
+                        "豆包API调用失败，%s秒后重试 (第%d/%d次): %s",
+                        wait,
+                        attempt + 1,
+                        self.max_retries + 1,
+                        e,
+                    )
+                    time.sleep(wait)
+
+        logger.error("豆包API调用最终失败: %s", last_error)
+        return None
+
+
 # ── 智能标题生成 ─────────────────────────────────────────────────────────────


@@ -65,9 +144,85 @@ def _generate_titles_fallback(
    style: str = "viral",
    count: int = 5,
 ) -> List[str]:
-    """本地降级：基于模板规则生成标题（薄包装，转发到 ai_parsing 模块）."""
+    """本地降级：基于模板规则生成标题.
+
+    当豆包 API 不可用或调用失败时使用，保证接口始终有返回。
+    """
    style_info = TITLE_STYLES.get(style, TITLE_STYLES["viral"])
-    return _generate_titles_fallback_base(description, style_info, count)
+    examples = style_info["examples"]
+
+    # 从描述中提取关键词（取前几个词）
+    keywords = [w for w in description.strip().split() if len(w) > 1][:3]
+    keyword = keywords[0] if keywords else "精彩内容"
+
+    # 基于模板生成
+    templates = [
+        f"「{keyword}」{examples[0][:10]}...",
+        f"{keyword}：{examples[1]}",
+        f"关于{keyword}，你不知道的3件事",
+        f"{keyword}入门指南，新手必看",
+        f"深度解析：{keyword}背后的秘密",
+        f"{keyword}怎么做？手把手教你",
+        f"干货分享 | {keyword}全攻略",
+        f"建议收藏：{keyword}实用技巧",
+        f"{keyword}避坑指南，别再踩雷了",
+        f"一分钟搞懂{keyword}",
+    ]
+
+    random.shuffle(templates)
+    return templates[: min(count, len(templates))]
+
+
+def _parse_titles_from_response(content: str) -> List[str]:
+    """从模型返回中解析标题列表.
+
+    支持多种返回格式：
+    - JSON 数组: ["标题1", "标题2"]
+    - 编号列表: 1. 标题1 / 2. 标题2
+    - 换行分隔: 标题1\n标题2
+    - 带破折号: - 标题1
+    """
+    if not content:
+        return []
+
+    # 尝试解析 JSON
+    try:
+        # 清理可能的 markdown 代码块标记
+        cleaned = content.strip()
+        if cleaned.startswith("```"):
+            cleaned = cleaned.strip("`")
+            if cleaned.lower().startswith("json"):
+                cleaned = cleaned[4:]
+            cleaned = cleaned.strip()
+
+        data = json.loads(cleaned)
+        if isinstance(data, list):
+            return [str(item).strip() for item in data if str(item).strip()]
+        if isinstance(data, dict) and "titles" in data:
+            titles = data["titles"]
+            if isinstance(titles, list):
+                return [str(t).strip() for t in titles if str(t).strip()]
+    except (json.JSONDecodeError, ValueError):
+        pass
+
+    # 尝试按行解析
+    titles: List[str] = []
+    for line in content.strip().split("\n"):
+        line = line.strip()
+        if not line:
+            continue
+        # 去掉编号前缀 "1. " "1、" "（1）"
+        import re
+
+        line = re.sub(r"^[\d]+[\.、\)）]\s*", "", line)
+        # 去掉破折号前缀 "- " "• "
+        line = re.sub(r"^[-•·]\s*", "", line)
+        # 去掉引号
+        line = line.strip('"').strip("'").strip("「」")
+        if line and len(line) < 100:  # 过滤过长的行
+            titles.append(line)
+
+    return titles


 def generate_smart_titles(
@@ -96,7 +251,7 @@ def generate_smart_titles(
    count = max(3, min(10, count))  # 3-10 个
    description = (description or "").strip()

-    client = get_doubao_client()
+    client = DoubaoAIClient()
    if not client.is_available:
        logger.info("豆包API未配置，使用本地降级生成标题")
        titles = _generate_titles_fallback(description, style, count)
@@ -125,7 +280,7 @@ def generate_smart_titles(
        {"role": "user", "content": user_prompt},
    ]

-    result = client.chat_completion(
+    result = client._chat_completion(
        messages=messages,
        temperature=0.8,
        max_tokens=512,
@@ -159,154 +314,6 @@ def generate_smart_titles(
    }


-# ── 智能素材语义匹配 ───────────────────────────────────────────────────────────
-
-
-def _semantic_match_fallback(
-    description: str,
-    assets: List[Dict[str, Any]],
-) -> List[Dict[str, Any]]:
-    """本地降级：基于关键词的简单匹配（薄包装，转发到 ai_parsing 模块）."""
-    return _semantic_match_fallback_base(description, assets)
-
-
-def _parse_semantic_match_response(
-    content: str,
-    asset_ids: List[str],
-) -> Optional[Dict[str, float]]:
-    """从模型返回中解析素材匹配度（薄包装，转发到 ai_parsing 模块）."""
-    result = _parse_semantic_match_base(content, asset_ids)
-    if result is None:
-        return None
-    return dict(result)
-
-
-def semantic_match_assets(
-    description: str,
-    assets: List[Dict[str, Any]],
-    top_k: int = 0,
-) -> Dict[str, Any]:
-    """智能素材语义匹配.
-
-    根据用户描述，评估每个素材的语义匹配度并排序。
-
-    Args:
-        description: 用户描述的目标视频内容
-        assets: 素材列表，每个素材需含 id/name/tags/description 等字段
-        top_k: 返回前K个，0表示返回全部
-
-    Returns:
-        {
-            "matches": [{"asset_id": ..., "match_score": ..., ...}],
-            "source": "doubao" | "fallback",
-            "description": "...",
-            "total": 总数,
-        }
-    """
-    description = (description or "").strip()
-    if not assets:
-        return {"matches": [], "source": "fallback", "description": description, "total": 0}
-
-    client = get_doubao_client()
-    if not client.is_available:
-        logger.info("豆包API未配置，使用本地降级做素材语义匹配")
-        matched = _semantic_match_fallback(description, assets)
-        if top_k > 0:
-            matched = matched[:top_k]
-        return {
-            "matches": matched,
-            "source": "fallback",
-            "description": description,
-            "total": len(assets),
-        }
-
-    # 构建素材信息（控制 token 数量）
-    asset_summaries = []
-    for asset in assets[:50]:  # 最多传50个素材给模型
-        aid = asset.get("id", "")
-        name = asset.get("name", "")[:50]
-        tags = asset.get("tags", [])
-        tags_str = ",".join(str(t) for t in tags[:5])
-        desc = str(asset.get("description", ""))[:80]
-        asset_summaries.append(f"ID:{aid} | 名称:{name} | 标签:[{tags_str}] | 描述:{desc}")
-
-    asset_ids = [str(a.get("id", "")) for a in assets[:50]]
-
-    system_prompt = (
-        "你是一个专业的视频素材匹配助手。"
-        "根据用户的视频目标描述，评估每个素材的匹配程度。\n"
-        "评分规则：\n"
-        "- 0.0-0.3: 完全不相关\n"
-        "- 0.3-0.6: 有一定关联但不够匹配\n"
-        "- 0.6-0.8: 比较匹配，适合使用\n"
-        "- 0.8-1.0: 高度匹配，非常适合\n"
-        "只返回JSON对象，key为素材ID，value为匹配分数（0-1之间的小数）。"
-        "不要其他文字说明。"
-    )
-
-    user_prompt = (
-        f"目标视频描述：{description}\n\n"
-        f"素材列表：\n" + "\n".join(asset_summaries) + "\n\n请返回每个素材的匹配分数JSON："
-    )
-
-    messages = [
-        {"role": "system", "content": system_prompt},
-        {"role": "user", "content": user_prompt},
-    ]
-
-    result = client.chat_completion(
-        messages=messages,
-        temperature=0.3,
-        max_tokens=1024,
-    )
-
-    if result:
-        scores = _parse_semantic_match_response(result, asset_ids)
-        if scores:
-            # 把评分填回素材
-            matched = []
-            for asset in assets:
-                aid = str(asset.get("id", ""))
-                score = scores.get(aid, 0.3)  # 没评分的给默认偏低分
-                matched.append(
-                    {
-                        **asset,
-                        "match_score": round(score, 3),
-                        "match_reason": "doubao_semantic",
-                    }
-                )
-            matched.sort(key=lambda x: x["match_score"], reverse=True)
-
-            logger.info(
-                "豆包语义匹配完成: assets=%d top_score=%.2f description=%s...",
-                len(matched),
-                matched[0]["match_score"] if matched else 0,
-                description[:20],
-            )
-
-            if top_k > 0:
-                matched = matched[:top_k]
-
-            return {
-                "matches": matched,
-                "source": "doubao",
-                "description": description,
-                "total": len(assets),
-            }
-        logger.warning("豆包语义匹配返回解析失败，降级到本地: %s", result[:100])
-
-    # 降级
-    matched = _semantic_match_fallback(description, assets)
-    if top_k > 0:
-        matched = matched[:top_k]
-    return {
-        "matches": matched,
-        "source": "fallback",
-        "description": description,
-        "total": len(assets),
-    }
-
-
 # ── 单例入口 ─────────────────────────────────────────────────────────────────


@@ -325,7 +332,7 @@ class AIService:
    """AI 服务统一入口，便于后续扩展更多能力."""

    def __init__(self) -> None:
-        self._client = get_doubao_client()
+        self._client = DoubaoAIClient()

    @property
    def is_available(self) -> bool:
@@ -338,11 +345,3 @@ class AIService:
        count: int = 5,
    ) -> Dict[str, Any]:
        return generate_smart_titles(description, style, count)
-
-    def semantic_match(
-        self,
-        description: str,
-        assets: List[Dict[str, Any]],
-        top_k: int = 0,
-    ) -> Dict[str, Any]:
-        return semantic_match_assets(description, assets, top_k)
@@ -0,0 +1,276 @@
+"""封面管理服务.
+
+提供封面配置管理和从视频抽帧生成封面的能力。
+抽帧使用 FFmpeg，上传使用共享存储服务。
+"""
+
+from __future__ import annotations
+
+import logging
+import tempfile
+from pathlib import Path
+from typing import Any, Dict
+
+logger = logging.getLogger(__name__)
+
+
+# ── 常量 ──────────────────────────────────────────────────────────────────────
+
+DEFAULT_COVER_WIDTH = 1080
+DEFAULT_COVER_HEIGHT = 1920
+DEFAULT_COVER_QUALITY = 5  # JPEG quality (1-31, 越小越好)
+COVER_STORAGE_PREFIX = "covers"
+
+
+class CoverService:
+    """封面管理服务."""
+
+    def __init__(self, storage_service: Any, asset_repository: Any) -> None:
+        self._storage = storage_service
+        self._asset_repo = asset_repository
+
+    # ── 配置读写 ──────────────────────────────────────────────────────────
+
+    @staticmethod
+    def get_cover_config(plan_config: Dict[str, Any]) -> Dict[str, Any]:
+        """从 plan.config 中提取封面配置.
+
+        Args:
+            plan_config: 剪辑计划的 config 字段
+
+        Returns:
+            封面配置 dict
+        """
+        cover = plan_config.get("cover", {})
+        if not isinstance(cover, dict):
+            cover = {}
+        # 确保默认字段存在
+        return {
+            "type": cover.get("type", "ai_frame"),
+            "image_url": cover.get("image_url", ""),
+            "frame_time": cover.get("frame_time"),
+        }
+
+    # ── 抽帧生成封面 ──────────────────────────────────────────────────────
+
+    def extract_cover_from_clip(
+        self,
+        plan_id: str,
+        asset_id: str,
+        frame_time: float = 1.0,
+        *,
+        width: int = DEFAULT_COVER_WIDTH,
+        height: int = DEFAULT_COVER_HEIGHT,
+        quality: int = DEFAULT_COVER_QUALITY,
+    ) -> Dict[str, Any]:
+        """从指定素材的指定时间点抽取一帧作为封面.
+
+        Args:
+            plan_id: 剪辑计划 ID（用于生成存储路径）
+            asset_id: 素材 ID
+            frame_time: 抽帧时间点（秒）
+            width: 输出宽度
+            height: 输出高度
+            quality: JPEG 质量
+
+        Returns:
+            封面数据 dict，包含 type / image_url / frame_time
+
+        Raises:
+            ValueError: 素材不存在或不是视频
+            RuntimeError: 抽帧或上传失败
+        """
+        # 1. 获取素材
+        asset = self._asset_repo.get(asset_id) if self._asset_repo else None
+        if not asset:
+            raise ValueError(f"素材不存在: {asset_id}")
+
+        storage_key = getattr(asset, "storage_key", "")
+        if not storage_key:
+            raise ValueError(f"素材没有文件: {asset_id}")
+
+        mime_type = getattr(asset, "mime_type", "")
+        if mime_type and not mime_type.startswith("video"):
+            raise ValueError(f"素材不是视频类型: {mime_type}")
+
+        # 2. 下载视频到临时目录
+        with tempfile.TemporaryDirectory(prefix="cover_extract_") as tmp_dir:
+            tmp_path = Path(tmp_dir)
+            video_path = tmp_path / f"source_{asset_id[:8]}"
+
+            logger.info("下载素材用于封面抽帧: asset_id=%s", asset_id)
+            try:
+                self._storage.download_file(storage_key, str(video_path))
+            except Exception as e:
+                raise RuntimeError(f"下载素材失败: {e}") from e
+
+            if not video_path.exists() or video_path.stat().st_size == 0:
+                raise RuntimeError("下载的素材文件为空")
+
+            # 3. FFmpeg 抽帧
+            output_path = tmp_path / "cover.jpg"
+            self._extract_frame(
+                video_path=video_path,
+                output_path=output_path,
+                time_sec=frame_time,
+                width=width,
+                height=height,
+                quality=quality,
+            )
+
+            if not output_path.exists() or output_path.stat().st_size == 0:
+                raise RuntimeError("封面抽帧失败")
+
+            # 4. 上传到 OSS
+            cover_key = f"{COVER_STORAGE_PREFIX}/{plan_id}/cover_{int(frame_time * 1000)}.jpg"
+            logger.info("上传封面到存储: key=%s", cover_key)
+
+            try:
+                self._storage.upload_file(
+                    file_or_path=str(output_path),
+                    storage_key=cover_key,
+                    content_type="image/jpeg",
+                )
+            except Exception as e:
+                raise RuntimeError(f"上传封面失败: {e}") from e
+
+            # 5. 获取访问 URL
+            try:
+                image_url = self._storage.get_url(cover_key)
+            except Exception:
+                image_url = cover_key  # 降级为 storage_key
+
+        logger.info(
+            "封面抽帧完成: plan_id=%s asset_id=%s time=%.2fs size=%d",
+            plan_id,
+            asset_id,
+            frame_time,
+            output_path.stat().st_size if output_path.exists() else 0,
+        )
+
+        return {
+            "type": "manual",
+            "image_url": image_url,
+            "frame_time": frame_time,
+        }
+
+    def generate_smart_cover(
+        self,
+        plan_id: str,
+        asset_id: str,
+        *,
+        width: int = DEFAULT_COVER_WIDTH,
+        height: int = DEFAULT_COVER_HEIGHT,
+        quality: int = DEFAULT_COVER_QUALITY,
+    ) -> Dict[str, Any]:
+        """智能选帧：从视频中选取多帧，选最清晰的一帧.
+
+        Args:
+            plan_id: 剪辑计划 ID
+            asset_id: 素材 ID
+            width: 输出宽度
+            height: 输出高度
+            quality: JPEG 质量
+
+        Returns:
+            封面数据 dict
+        """
+        # 简单实现：取视频 1/3 处的帧作为智能封面
+        # 更复杂的多帧选清晰帧可以后续优化
+        frame_time = 3.0  # 默认第3秒，后续可以根据视频时长动态计算
+
+        result = self.extract_cover_from_clip(
+            plan_id=plan_id,
+            asset_id=asset_id,
+            frame_time=frame_time,
+            width=width,
+            height=height,
+            quality=quality,
+        )
+        result["type"] = "ai_frame"
+        return result
+
+    # ── 内部方法 ──────────────────────────────────────────────────────────
+
+    @staticmethod
+    def _extract_frame(
+        video_path: Path,
+        output_path: Path,
+        *,
+        time_sec: float,
+        width: int,
+        height: int,
+        quality: int,
+    ) -> None:
+        """使用 FFmpeg 从视频中抽取一帧.
+
+        Args:
+            video_path: 视频文件路径
+            output_path: 输出图片路径
+            time_sec: 抽帧时间点（秒）
+            width: 输出宽度
+            height: 输出高度
+            quality: JPEG 质量
+        """
+        import subprocess
+
+        # scale + crop 实现 cover 裁剪
+        vf = f"scale={width}:{height}:force_original_aspect_ratio=increase," f"crop={width}:{height}"
+
+        command = [
+            "ffmpeg",
+            "-y",
+            "-ss",
+            f"{time_sec:.3f}",
+            "-i",
+            str(video_path),
+            "-vframes",
+            "1",
+            "-vf",
+            vf,
+            "-q:v",
+            str(quality),
+            "-f",
+            "mjpeg",
+            str(output_path),
+        ]
+
+        logger.debug("FFmpeg 抽帧命令: %s", " ".join(command))
+
+        try:
+            result = subprocess.run(
+                command,
+                capture_output=True,
+                text=True,
+                timeout=60,
+            )
+            if result.returncode != 0:
+                logger.warning("FFmpeg 抽帧返回非零: %s\nstderr: %s", result.returncode, result.stderr[-500:])
+                # 尝试不使用 scale+crop 的简化命令
+                simple_command = [
+                    "ffmpeg",
+                    "-y",
+                    "-ss",
+                    f"{time_sec:.3f}",
+                    "-i",
+                    str(video_path),
+                    "-vframes",
+                    "1",
+                    "-q:v",
+                    str(quality),
+                    "-f",
+                    "mjpeg",
+                    str(output_path),
+                ]
+                result2 = subprocess.run(
+                    simple_command,
+                    capture_output=True,
+                    text=True,
+                    timeout=60,
+                )
+                if result2.returncode != 0:
+                    raise RuntimeError(f"FFmpeg 抽帧失败: {result2.stderr[-300:]}")
+        except subprocess.TimeoutExpired as e:
+            raise RuntimeError("FFmpeg 抽帧超时") from e
+        except FileNotFoundError as e:
+            raise RuntimeError("FFmpeg 不可用") from e
@@ -16,11 +16,6 @@ from packages.adapters.sqlalchemy_impl import (
    SQLAlchemyEditPlanRepository,
    SQLAlchemyGenerationTaskRepository,
 )
-from packages.domain.clip_operations import calculate_merge as _calc_merge
-from packages.domain.clip_operations import calculate_shift_orders as _calc_shift_orders
-from packages.domain.clip_operations import calculate_split as _calc_split
-from packages.domain.clip_operations import validate_merge_clips as _validate_merge
-from packages.domain.clip_operations import validate_split_time as _validate_split
 from packages.domain.edit_plan import EditPlan, EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus

@@ -389,45 +384,36 @@ class EditPlanService:
        clip = self.get_clip_or_raise(clip_id)
        plan_id = clip.plan_id

-        # 纯逻辑：校验 + 计算
-        _validate_split(split_time, clip.duration)
-        split = _calc_split(
-            duration=clip.duration,
-            split_time=split_time,
-            start_time=clip.start_time,
-        )
+        if split_time <= 0 or split_time >= clip.duration:
+            raise ValueError(f"分割时间必须在 (0, {clip.duration:.3f}) 范围内，当前: {split_time}")

        self._auto_resume_editing(plan_id)

+        original_duration = clip.duration
+        left_duration = round(split_time, 3)
+        right_duration = round(original_duration - split_time, 3)
        original_order = clip.order

        # 更新左半部分（原片段）
-        clip.duration = split.left_duration
+        clip.duration = left_duration
        left_clip = self._clip_repo.update(clip)

        # 后面片段的 order 全部 +1（给右半部分腾位置）
        all_clips = self._clip_repo.list_by_plan(plan_id)
-        shifts = _calc_shift_orders(
-            all_clips,
-            threshold_order=original_order,
-            shift=1,
-            excluded_ids={clip_id},
-            id_attr="id",
-            order_attr="order",
-        )
-        for c, new_order in shifts:
-            c.order = new_order
-            self._clip_repo.update(c)
+        for c in all_clips:
+            if c.order > original_order and c.id != clip_id:
+                c.order += 1
+                self._clip_repo.update(c)

        # 创建右半部分新片段（继承原片段的大部分属性）
        right_config = dict(clip.config) if clip.config else {}
        # 素材裁剪信息
        if clip.asset_id:
            # 右半部分从 split_time 开始播放
-            right_config["trim_start"] = split.right_trim_start
+            right_config["trim_start"] = left_duration
            # 左半部分在 split_time 处结束
            left_config = dict(left_clip.config) if left_clip.config else {}
-            left_config["trim_end"] = split.left_trim_end
+            left_config["trim_end"] = right_duration
            left_clip.config = left_config
            left_clip = self._clip_repo.update(left_clip)

@@ -438,8 +424,8 @@ class EditPlanService:
            template_clip_config_id=clip.template_clip_config_id,
            asset_id=clip.asset_id,
            text_content=clip.text_content,
-            start_time=split.right_start_time,
-            duration=split.right_duration,
+            start_time=clip.start_time + left_duration,
+            duration=right_duration,
            transition_effect=clip.transition_effect,
            transition_duration=clip.transition_duration,
            playback_speed=clip.playback_speed,
@@ -452,8 +438,8 @@ class EditPlanService:
            clip_id,
            plan_id,
            split_time,
-            split.left_duration,
-            split.right_duration,
+            left_duration,
+            right_duration,
        )

        return {
@@ -482,45 +468,70 @@ class EditPlanService:
            clip = self.get_clip_or_raise(cid)
            clips.append(clip)

-        # 纯逻辑：校验 + 计算
-        plan_id, first_order = _validate_merge(clips)
-        merge = _calc_merge(clips)
+        # 校验：同一计划
+        plan_id = clips[0].plan_id
+        for c in clips[1:]:
+            if c.plan_id != plan_id:
+                raise ValueError("只能合并同一计划下的片段")
+
+        # 按 order 排序
+        clips.sort(key=lambda c: c.order)
+
+        # 校验：order 连续
+        for i in range(1, len(clips)):
+            if clips[i].order != clips[i - 1].order + 1:
+                raise ValueError(f"片段不连续：order {clips[i-1].order} → {clips[i].order}")
+
+        # 校验：类型一致
+        clip_type = clips[0].clip_type
+        for c in clips[1:]:
+            if c.clip_type != clip_type:
+                raise ValueError("只能合并相同类型的片段")

        self._auto_resume_editing(plan_id)

+        # 计算合并后的属性
+        first_clip = clips[0]
+        total_duration = round(sum(c.duration for c in clips), 3)
+        first_order = first_clip.order
+
+        # 合并文案（用换行连接）
+        merged_text = "\n".join(c.text_content for c in clips if c.text_content.strip())
+
+        # 合并 config（后面的覆盖前面的）
+        merged_config: Dict[str, Any] = {}
+        for c in clips:
+            if c.config:
+                merged_config.update(c.config)
+        # 清理 trim 相关字段（合并后就是完整片段了）
+        merged_config.pop("trim_start", None)
+        merged_config.pop("trim_end", None)
+
        # 更新第一个片段（保留它作为合并结果）
-        first_clip = sorted(clips, key=lambda c: c.order)[0]
-        first_clip.duration = merge.total_duration
-        first_clip.text_content = merge.merged_text
-        first_clip.config = merge.merged_config
+        first_clip.duration = total_duration
+        first_clip.text_content = merged_text
+        first_clip.config = merged_config
        # 转场保留第一个的（合并后的入点转场）
        # playback_speed 取第一个的
        merged_clip = self._clip_repo.update(first_clip)

        # 删除其余片段
-        rest_ids = [c.id for c in clips if c.id != merged_clip.id]
-        for cid in rest_ids:
-            self._clip_repo.delete(cid)
+        for c in clips[1:]:
+            self._clip_repo.delete(c.id)

        # 后面的片段 order 前移 (len - 1) 位
+        shift = len(clips) - 1
        all_clips = self._clip_repo.list_by_plan(plan_id)
-        shifts = _calc_shift_orders(
-            all_clips,
-            threshold_order=first_order,
-            shift=-merge.shift_amount,
-            excluded_ids={merged_clip.id},
-            id_attr="id",
-            order_attr="order",
-        )
-        for c, new_order in shifts:
-            c.order = new_order
-            self._clip_repo.update(c)
+        for c in all_clips:
+            if c.order > first_order and c.id != merged_clip.id:
+                c.order -= shift
+                self._clip_repo.update(c)

        logger.info(
            "合并片段: plan_id=%s count=%d total_duration=%.3fs",
            plan_id,
            len(clips),
-            merge.total_duration,
+            total_duration,
        )

        return merged_clip
@@ -571,10 +582,6 @@ class EditPlanService:
    def can_generate(self, plan_id: str) -> tuple[bool, str]:
        """检查是否可以触发渲染

-        包含最后一道防线的自动修复：
-        - 如果 clips 存在但都没有 asset_id，且 config.asset_ids 非空，
-          直接在内部执行素材分配，不再依赖前置 fallback 链路。
-
        Returns:
            tuple: (can_generate, reason)
        """
@@ -589,69 +596,10 @@ class EditPlanService:
        if not clips:
            return False, "请先添加片段后再生成视频"

-        # 检查是否至少有一个片段分配了素材
-        has_asset = any(c.asset_id for c in clips)
-        config_asset_ids_count = len((plan.config or {}).get("asset_ids", []))
-        clips_with_asset_count = sum(1 for c in clips if c.asset_id)
-        logger.info(
-            "can_generate 诊断: plan=%s status=%s total_clips=%d " "clips_with_asset=%d config_asset_ids_count=%d",
-            plan_id,
-            plan.status,
-            len(clips),
-            clips_with_asset_count,
-            config_asset_ids_count,
-        )
-        if not has_asset:
-            # ── 最后防线：自动从 config.asset_ids 分配素材 ──
-            config_asset_ids = (plan.config or {}).get("asset_ids", [])
-            if config_asset_ids:
-                logger.warning(
-                    "can_generate 最后防线触发: plan=%s clips=%d 均无素材，" "从 config.asset_ids(%d个) 自动分配",
-                    plan_id,
-                    len(clips),
-                    len(config_asset_ids),
-                )
-                clips_without_asset = [c for c in clips if not c.asset_id]
-                assigned_count = 0
-                for i, clip in enumerate(clips_without_asset):
-                    asset_idx = i % len(config_asset_ids)
-                    try:
-                        self.assign_asset(clip.id, config_asset_ids[asset_idx])
-                        assigned_count += 1
-                    except Exception as exc:
-                        logger.warning(
-                            "can_generate 最后防线: plan=%s clip=%s 分配素材 %s 失败: %s",
-                            plan_id,
-                            clip.id,
-                            config_asset_ids[asset_idx],
-                            exc,
-                        )
-                logger.info(
-                    "can_generate 最后防线: plan=%s 已为 %d/%d 个片段分配素材",
-                    plan_id,
-                    assigned_count,
-                    len(clips_without_asset),
-                )
-                # 重新加载 clips 验证分配结果
-                clips = self._clip_repo.list_by_plan(plan_id)
-                if not any(c.asset_id for c in clips):
-                    return False, "没有可渲染的就绪片段，自动修复后仍未分配素材"
-            else:
-                logger.warning(
-                    "can_generate 失败: plan=%s clips=%d 均无素材，" "且 config.asset_ids 为空，无法自动修复",
-                    plan_id,
-                    len(clips),
-                )
-                return False, "没有可渲染的就绪片段，请确保已选择素材"
-
        return True, ""

    def mark_clips_ready(self, plan_id: str) -> int:
-        """将已分配素材的 pending 片段标记为 ready
-
-        只标记同时满足以下条件的片段：
-        - status == PENDING
-        - asset_id 非空（已分配素材）
+        """将所有 pending 状态的片段标记为 ready

        Returns:
            int: 标记的片段数量
@@ -662,16 +610,10 @@ class EditPlanService:
        )
        count = 0
        for clip in clips:
-            if clip.asset_id:
-                clip.mark_ready()
-                self._clip_repo.update(clip)
-                count += 1
-        logger.info(
-            "标记片段就绪: plan_id=%s marked=%d total_pending=%d",
-            plan_id,
-            count,
-            len(clips),
-        )
+            clip.mark_ready()
+            self._clip_repo.update(clip)
+            count += 1
+        logger.info("标记片段就绪: plan_id=%s count=%d", plan_id, count)
        return count

    def update_plan_config(self, plan_id: str, config_updates: Dict[str, Any]) -> EditPlan:
@@ -23,13 +23,6 @@ from packages.domain.template_clip_config import (
    TemplateClipConfig,
    TransitionEffect,
 )
-from packages.domain.template_clip_converter import (
-    clip_configs_to_snapshots,
-    clips_to_template_clip_configs,
-    filter_plan_config_to_template,
-    snapshots_to_template_clip_configs,
-    validate_template_name,
-)

 logger = logging.getLogger(__name__)

@@ -128,7 +121,9 @@ class EditTemplateService:
            ValueError: 名称为空或重复
        """
        # 名称校验
-        clean_name = validate_template_name(name)
+        clean_name = name.strip()
+        if not clean_name:
+            raise ValueError("模板名称不能为空")

        # 名称重复检查
        existing = self._template_repo.list_all(skip=0, limit=1000)
@@ -476,7 +471,12 @@ class EditTemplateService:
                raise ValueError(f"模板名称已存在: {clean_name}")

        # 从计划 config 中提取模板级配置，去掉运行时/素材相关字段
-        template_config = filter_plan_config_to_template(plan.config)
+        plan_config = plan.config or {}
+        template_config: dict[str, Any] = {}
+        for key, value in plan_config.items():
+            # 跳过明显的运行时/实例字段，保留风格/模式类配置
+            if key not in {"asset_ids", "source_edit_plan_id", "generation_task_id"}:
+                template_config[key] = value

        template = EditTemplate.create(
            name=clean_name,
@@ -497,7 +497,40 @@ class EditTemplateService:

        # 5. 转换每个片段为模板片段配置
        created_configs: List[TemplateClipConfig] = []
-        for clip_config_obj in clips_to_template_clip_configs(created_template.id, clips):
+        for clip in clips:
+            clip_config: dict[str, Any] = {}
+            # 播放速度存入 config
+            if clip.playback_speed and clip.playback_speed != 1.0:
+                clip_config["playback_speed"] = clip.playback_speed
+            # 片段自有 config 合并（优先级：clip.config 覆盖上面的）
+            if clip.config:
+                clip_config.update(clip.config)
+            # 去掉素材相关字段
+            clip_config.pop("asset_info", None)
+            clip_config.pop("source_asset_id", None)
+
+            # 转场效果兼容校验
+            try:
+                transition = TransitionEffect(clip.transition_effect)
+            except ValueError:
+                transition = TransitionEffect.CUT
+
+            # 片段类型兼容校验
+            try:
+                clip_type = ClipType(clip.clip_type)
+            except ValueError:
+                clip_type = ClipType.MAIN
+
+            clip_config_obj = TemplateClipConfig.create(
+                template_id=created_template.id,
+                clip_type=clip_type,
+                order=clip.order,
+                min_duration=clip.duration,
+                max_duration=clip.duration,
+                text_template=clip.text_content or "",
+                transition_effect=transition,
+                config=clip_config,
+            )
            created = self._clip_config_repo.create(clip_config_obj)
            created_configs.append(created)

@@ -646,6 +679,8 @@ class EditTemplateService:
        Raises:
            ValueError: 模板/草稿不存在，或草稿不属于该模板
        """
+        from packages.domain.template_clip_config import TemplateClipConfig
+
        # 1. 校验模板和草稿
        template = self.get_template_or_raise(template_id)
        draft = self._plan_repo.get(draft_plan_id)
@@ -665,14 +700,39 @@ class EditTemplateService:
        editing_mode = config.get("editing_mode", "one_take")

        # 4. 提取模板配置（去掉草稿/运行时字段）
-        template_config = filter_plan_config_to_template(draft.config)
+        draft_config = draft.config or {}
+        template_config: dict[str, Any] = {}
+        skip_keys = {
+            "is_template_draft",
+            "asset_ids",
+            "source_edit_plan_id",
+            "generation_task_id",
+        }
+        for key, value in draft_config.items():
+            if key not in skip_keys:
+                template_config[key] = value

        # 5. 事务更新
        try:
            # 5.0 先保存旧版快照（发布前的状态），用于回滚
            old_version = template.version or 1
            old_clip_configs = self._clip_config_repo.list_by_template(template_id)
-            old_clip_snapshots = clip_configs_to_snapshots(old_clip_configs)
+            old_clip_snapshots = [
+                {
+                    "clip_type": cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
+                    "order": cfg.order,
+                    "min_duration": cfg.min_duration,
+                    "max_duration": cfg.max_duration,
+                    "text_template": cfg.text_template or "",
+                    "transition_effect": (
+                        cfg.transition_effect.value
+                        if hasattr(cfg.transition_effect, "value")
+                        else cfg.transition_effect
+                    ),
+                    "config": cfg.config or {},
+                }
+                for cfg in old_clip_configs
+            ]

            from packages.domain.template_version import EditTemplateVersion

@@ -699,7 +759,46 @@ class EditTemplateService:

            # 创建新的片段配置
            created_configs: list[TemplateClipConfig] = []
-            for config_obj in clips_to_template_clip_configs(template_id, draft_clips):
+            for clip in draft_clips:
+                clip_config: dict[str, Any] = {}
+                # 播放速度存入 config
+                if clip.playback_speed and clip.playback_speed != 1.0:
+                    clip_config["playback_speed"] = clip.playback_speed
+                # 片段自有 config 合并
+                if clip.config:
+                    clip_config.update(clip.config)
+                # 去掉素材相关字段
+                clip_config.pop("asset_info", None)
+                clip_config.pop("source_asset_id", None)
+
+                # 转场效果兼容校验
+                try:
+                    from packages.domain.template_clip_config import (
+                        TransitionEffect,
+                    )
+
+                    transition = TransitionEffect(clip.transition_effect)
+                except (ValueError, ImportError):
+                    transition = TransitionEffect.CUT  # type: ignore
+
+                # 片段类型兼容校验
+                try:
+                    from packages.domain.template_clip_config import ClipType
+
+                    clip_type = ClipType(clip.clip_type)
+                except (ValueError, ImportError):
+                    clip_type = ClipType.MAIN  # type: ignore
+
+                config_obj = TemplateClipConfig.create(
+                    template_id=template_id,
+                    clip_type=clip_type,
+                    order=clip.order,
+                    min_duration=clip.duration,
+                    max_duration=clip.duration,
+                    text_template=clip.text_content or "",
+                    transition_effect=transition,
+                    config=clip_config,
+                )
                created = self._clip_config_repo.create(config_obj)
                created_configs.append(created)

@@ -744,6 +843,8 @@ class EditTemplateService:
        Raises:
            ValueError: 模板/版本不存在
        """
+        from packages.domain.template_clip_config import TemplateClipConfig
+
        template = self.get_template_or_raise(template_id)

        # 1. 读取目标版本快照
@@ -756,7 +857,22 @@ class EditTemplateService:
        try:
            # 2. 先保存当前状态快照（当前版本号），确保回滚可撤销
            old_clip_configs = self._clip_config_repo.list_by_template(template_id)
-            old_clip_snapshots = clip_configs_to_snapshots(old_clip_configs)
+            old_clip_snapshots = [
+                {
+                    "clip_type": cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
+                    "order": cfg.order,
+                    "min_duration": cfg.min_duration,
+                    "max_duration": cfg.max_duration,
+                    "text_template": cfg.text_template or "",
+                    "transition_effect": (
+                        cfg.transition_effect.value
+                        if hasattr(cfg.transition_effect, "value")
+                        else cfg.transition_effect
+                    ),
+                    "config": cfg.config or {},
+                }
+                for cfg in old_clip_configs
+            ]

            from packages.domain.template_version import EditTemplateVersion

@@ -789,7 +905,37 @@ class EditTemplateService:
                synchronize_session=False
            )

-            for config_obj in snapshots_to_template_clip_configs(template_id, target_version.clip_configs):
+            for clip_snap in target_version.clip_configs:
+                # 转场效果兼容校验
+                try:
+                    from packages.domain.template_clip_config import TransitionEffect
+
+                    transition = TransitionEffect(clip_snap.get("transition_effect", "cut"))
+                except (ValueError, ImportError):
+                    from packages.domain.template_clip_config import TransitionEffect
+
+                    transition = TransitionEffect.CUT
+
+                # 片段类型兼容校验
+                try:
+                    from packages.domain.template_clip_config import ClipType
+
+                    clip_type = ClipType(clip_snap.get("clip_type", "main"))
+                except (ValueError, ImportError):
+                    from packages.domain.template_clip_config import ClipType
+
+                    clip_type = ClipType.MAIN
+
+                config_obj = TemplateClipConfig.create(
+                    template_id=template_id,
+                    clip_type=clip_type,
+                    order=clip_snap.get("order", 0),
+                    min_duration=clip_snap.get("min_duration", 0.0),
+                    max_duration=clip_snap.get("max_duration", 0.0),
+                    text_template=clip_snap.get("text_template", ""),
+                    transition_effect=transition,
+                    config=clip_snap.get("config", {}) or {},
+                )
                self._clip_config_repo.create(config_obj)

            self._db.commit()
@@ -26,13 +26,7 @@ from packages.domain.edit_plan import EditPlan
 from packages.domain.edit_plan_clip import EditPlanClip
 from packages.domain.edit_template import EditTemplate
 from packages.domain.editing_mode import EditingMode
-from packages.domain.plan_generator_utils import (
-    create_clips_from_configs,
-    distribute_assets,
-    generate_default_clips,
-    map_clip_types_for_mode,
-)
-from packages.domain.template_clip_config import TemplateClipConfig
+from packages.domain.template_clip_config import ClipType, TemplateClipConfig

 logger = logging.getLogger(__name__)

@@ -49,10 +43,9 @@ class PlanGeneratorService:
    基于模板 + 素材，自动生成 EditPlan 及 EditPlanClip 列表。
    """

-    def __init__(self, db: Session, asset_repo=None) -> None:
+    def __init__(self, db: Session) -> None:
        self._plan_repo = SQLAlchemyEditPlanRepository(db)
        self._clip_repo = SQLAlchemyEditPlanClipRepository(db)
-        self._asset_repo = asset_repo

    # ── 公开接口 ─────────────────────────────────────────────────────────────

@@ -65,7 +58,6 @@ class PlanGeneratorService:
        project_id: str = "",
        created_by_user_id: str = "",
        name: str = "",
-        random_preview: bool = False,
    ) -> dict[str, Any]:
        """基于模板+素材生成剪辑计划

@@ -76,7 +68,6 @@ class PlanGeneratorService:
            project_id: 所属项目 ID
            created_by_user_id: 创建者用户 ID
            name: 计划名称（为空则自动取模板名）
-            random_preview: 是否启用随机预览模式（随机选素材+随机截取片段）

        Returns:
            dict: {"plan": EditPlan, "clips": List[EditPlanClip]}
@@ -118,17 +109,7 @@ class PlanGeneratorService:

        # 4. 按 editing_mode 分配素材
        if asset_ids:
-            # 如果是随机预览模式，获取素材时长信息
-            asset_durations = None
-            if random_preview and self._asset_repo:
-                asset_durations = self._fetch_asset_durations(asset_ids)
-            self._distribute_assets(
-                clips,
-                asset_ids,
-                editing_mode,
-                random_selection=random_preview,
-                asset_durations=asset_durations,
-            )
+            self._distribute_assets(clips, asset_ids, editing_mode)

        # 5. 持久化所有 clips 并计算总时长
        created_clips: List[EditPlanClip] = []
@@ -182,18 +163,83 @@ class PlanGeneratorService:
        plan_id: str,
        clip_configs: List[TemplateClipConfig],
    ) -> List[EditPlanClip]:
-        """从 TemplateClipConfig 列表创建 EditPlanClip 列表（未持久化）.
+        """从 TemplateClipConfig 列表创建 EditPlanClip 列表（未持久化）"""
+        clips: List[EditPlanClip] = []
+        # 按 order 排序
+        sorted_configs = sorted(clip_configs, key=lambda c: c.order)

-        委托给 plan_generator_utils.create_clips_from_configs 纯函数。
-        """
-        return create_clips_from_configs(plan_id, clip_configs)
+        for cfg in sorted_configs:
+            # 计算时长：取 min_duration 和 max_duration 的中间值
+            if cfg.min_duration > 0 and cfg.max_duration > 0:
+                duration = (cfg.min_duration + cfg.max_duration) / 2
+            elif cfg.min_duration > 0:
+                duration = cfg.min_duration
+            elif cfg.max_duration > 0:
+                duration = cfg.max_duration
+            else:
+                duration = _DEFAULT_CLIP_DURATION
+
+            # clip_type 可能是枚举或字符串
+            clip_type = cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type
+
+            # transition_effect 可能是枚举或字符串
+            transition = (
+                cfg.transition_effect.value if hasattr(cfg.transition_effect, "value") else cfg.transition_effect
+            )
+
+            # 从 clip config 中解析 playback_speed（兼容 speed_ratio 字段名）
+            clip_cfg = cfg.config or {}
+            playback_speed = clip_cfg.get("playback_speed", clip_cfg.get("speed_ratio", 1.0)) or 1.0
+
+            clip = EditPlanClip.create(
+                plan_id=plan_id,
+                clip_type=clip_type,
+                order=cfg.order,
+                template_clip_config_id=cfg.id,
+                text_content=getattr(cfg, "text_template", "") or "",
+                duration=duration,
+                transition_effect=transition or "cut",
+                playback_speed=playback_speed,
+                config=clip_cfg,
+            )
+            clips.append(clip)
+
+        return clips

    def _map_clip_types_for_mode(self, clips: List[EditPlanClip], editing_mode: str) -> None:
-        """将 MAIN 类型片段按 editing_mode 映射为对应角色类型.
+        """将模板 clip_config 生成的 MAIN 类型片段，按 editing_mode 映射为对应角色类型。

-        委托给 plan_generator_utils.map_clip_types_for_mode 纯函数。
+        模板的 clip_config 使用 ClipType 枚举（main/intro/outro 等），
+        但 PIP / VOICE_PIP 模式的素材分配和渲染分层依赖特定的 clip_type 命名
+        （overlay / background / corner_voice / b_roll）。
+
+        映射规则（仅修改 MAIN 类型片段，非 MAIN 片段保持原类型）：
+        - PIP: 第1个 MAIN → main（背景），其余 MAIN → overlay（画中画）
+        - VOICE_PIP: 第1个 → background，第2个 → corner_voice，第3+个 → b_roll
+        - ONE_TAKE / VOICE_OVER: 保持 main 不变
        """
-        map_clip_types_for_mode(clips, editing_mode)
+        from packages.domain.template_clip_config import ClipType
+
+        main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
+        if not main_clips:
+            return
+
+        if editing_mode == EditingMode.PIP.value:
+            # 第1个 main 保持（背景层），其余改为 overlay（画中画层）
+            for i, clip in enumerate(main_clips):
+                if i > 0:
+                    clip.clip_type = "overlay"
+
+        elif editing_mode == EditingMode.VOICE_PIP.value:
+            for i, clip in enumerate(main_clips):
+                if i == 0:
+                    clip.clip_type = "background"
+                elif i == 1:
+                    clip.clip_type = "corner_voice"
+                else:
+                    clip.clip_type = "b_roll"
+
+        # ONE_TAKE / VOICE_OVER: 保持 main 不变，无需处理

    def _generate_default_clips(
        self,
@@ -201,45 +247,191 @@ class PlanGeneratorService:
        editing_mode: str,
        asset_count: int,
    ) -> List[EditPlanClip]:
-        """无 clip_configs 时，根据 editing_mode 生成默认 clip 结构.
+        """无 clip_configs 时，根据 editing_mode 生成默认 clip 结构

-        委托给 plan_generator_utils.generate_default_clips 纯函数。
+        - ONE_TAKE: N 个 main clips（N = asset_count，至少1个）
+        - PIP: 1 个 main + (N-1) 个 overlay（N = asset_count）
+        - VOICE_OVER: N 个 main clips + 标记需要配音
+        - VOICE_PIP: 1 个 background + 1 个 corner_voice + (N-2) 个 b_roll
        """
-        return generate_default_clips(plan_id, editing_mode, asset_count)
+        n = max(asset_count, 1)
+        clips: List[EditPlanClip] = []
+        order = 0
+
+        if editing_mode == EditingMode.PIP.value:
+            # 1 个 main（全屏背景）
+            clips.append(
+                EditPlanClip.create(
+                    plan_id=plan_id,
+                    clip_type=ClipType.MAIN.value,
+                    order=order,
+                    duration=_DEFAULT_CLIP_DURATION,
+                )
+            )
+            order += 1
+            # 剩余为 overlay
+            for _ in range(1, n):
+                clips.append(
+                    EditPlanClip.create(
+                        plan_id=plan_id,
+                        clip_type="overlay",
+                        order=order,
+                        duration=_DEFAULT_CLIP_DURATION,
+                    )
+                )
+                order += 1
+
+        elif editing_mode == EditingMode.VOICE_OVER.value:
+            # N 个 main clips（B-roll）
+            for _ in range(n):
+                clips.append(
+                    EditPlanClip.create(
+                        plan_id=plan_id,
+                        clip_type=ClipType.MAIN.value,
+                        order=order,
+                        duration=_DEFAULT_CLIP_DURATION,
+                        config={"role": "b_roll"},
+                    )
+                )
+                order += 1
+
+        elif editing_mode == EditingMode.VOICE_PIP.value:
+            # 1 个 background
+            clips.append(
+                EditPlanClip.create(
+                    plan_id=plan_id,
+                    clip_type="background",
+                    order=order,
+                    duration=_DEFAULT_CLIP_DURATION,
+                )
+            )
+            order += 1
+            # 1 个 corner_voice
+            clips.append(
+                EditPlanClip.create(
+                    plan_id=plan_id,
+                    clip_type="corner_voice",
+                    order=order,
+                    duration=_DEFAULT_CLIP_DURATION,
+                )
+            )
+            order += 1
+            # 剩余为 b_roll
+            for _ in range(2, n):
+                clips.append(
+                    EditPlanClip.create(
+                        plan_id=plan_id,
+                        clip_type="b_roll",
+                        order=order,
+                        duration=_DEFAULT_CLIP_DURATION,
+                    )
+                )
+                order += 1
+
+        else:
+            # ONE_TAKE: N 个 main clips
+            for _ in range(n):
+                clips.append(
+                    EditPlanClip.create(
+                        plan_id=plan_id,
+                        clip_type=ClipType.MAIN.value,
+                        order=order,
+                        duration=_DEFAULT_CLIP_DURATION,
+                    )
+                )
+                order += 1
+
+        return clips

    def _distribute_assets(
        self,
        clips: List[EditPlanClip],
        asset_ids: List[str],
        editing_mode: str,
-        *,
-        random_selection: bool = False,
-        asset_durations: dict[str, float] | None = None,
    ) -> None:
-        """按 editing_mode 将素材分配到 clips（就地修改，未持久化）.
+        """按 editing_mode 将素材分配到 clips（就地修改，未持久化）

-        委托给 plan_generator_utils.distribute_assets 纯函数。
+        分配策略:
+        - ONE_TAKE: 素材按顺序依次分配给 main 类型 clips
+        - PIP: 第1个素材→main(全屏背景)，其余→交替分配给 overlay clips
+        - VOICE_OVER: 素材→main clips (B-roll)
+        - VOICE_PIP: 第1个→background, 第2个→corner_voice, 其余→b_roll
        """
-        distribute_assets(
-            clips,
-            asset_ids,
-            editing_mode,
-            random_selection=random_selection,
-            asset_durations=asset_durations,
-        )
+        if not asset_ids or not clips:
+            return

-    def _fetch_asset_durations(self, asset_ids: List[str]) -> dict[str, float]:
-        """从数据库获取素材时长信息.
+        if editing_mode == EditingMode.ONE_TAKE.value:
+            self._distribute_one_take(clips, asset_ids)
+        elif editing_mode == EditingMode.PIP.value:
+            self._distribute_pip(clips, asset_ids)
+        elif editing_mode == EditingMode.VOICE_OVER.value:
+            self._distribute_voice_over(clips, asset_ids)
+        elif editing_mode == EditingMode.VOICE_PIP.value:
+            self._distribute_voice_pip(clips, asset_ids)
+        else:
+            # 未知模式，退化为 one_take
+            self._distribute_one_take(clips, asset_ids)

-        Args:
-            asset_ids: 素材 ID 列表
+    def _distribute_one_take(
+        self,
+        clips: List[EditPlanClip],
+        asset_ids: List[str],
+    ) -> None:
+        """ONE_TAKE: 素材按顺序依次分配给 main 类型 clips"""
+        main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
+        for i, clip in enumerate(main_clips):
+            if i < len(asset_ids):
+                clip.assign_asset(asset_ids[i])

-        Returns:
-            dict: 素材 ID -> 时长（秒）映射
-        """
-        durations: dict[str, float] = {}
-        for asset_id in asset_ids:
-            asset = self._asset_repo.get(asset_id)
-            if asset and hasattr(asset, "duration"):
-                durations[asset_id] = float(asset.duration or 0.0)
-        return durations
+    def _distribute_pip(
+        self,
+        clips: List[EditPlanClip],
+        asset_ids: List[str],
+    ) -> None:
+        """PIP: 第1个素材→main(全屏背景)，其余→overlay clips"""
+        # 第1个素材 → main clip
+        main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
+        if main_clips and asset_ids:
+            main_clips[0].assign_asset(asset_ids[0])
+
+        # 其余素材 → overlay clips
+        overlay_clips = [c for c in clips if c.clip_type == "overlay"]
+        remaining = asset_ids[1:]
+        for i, clip in enumerate(overlay_clips):
+            if i < len(remaining):
+                clip.assign_asset(remaining[i])
+
+    def _distribute_voice_over(
+        self,
+        clips: List[EditPlanClip],
+        asset_ids: List[str],
+    ) -> None:
+        """VOICE_OVER: 素材→main clips (B-roll)"""
+        main_clips = [c for c in clips if c.clip_type == ClipType.MAIN.value]
+        for i, clip in enumerate(main_clips):
+            if i < len(asset_ids):
+                clip.assign_asset(asset_ids[i])
+
+    def _distribute_voice_pip(
+        self,
+        clips: List[EditPlanClip],
+        asset_ids: List[str],
+    ) -> None:
+        """VOICE_PIP: 第1个→background, 第2个→corner_voice, 其余→b_roll"""
+        bg_clips = [c for c in clips if c.clip_type == "background"]
+        corner_clips = [c for c in clips if c.clip_type == "corner_voice"]
+        broll_clips = [c for c in clips if c.clip_type == "b_roll"]
+
+        # 第1个素材 → background
+        if bg_clips and len(asset_ids) > 0:
+            bg_clips[0].assign_asset(asset_ids[0])
+
+        # 第2个素材 → corner_voice
+        if corner_clips and len(asset_ids) > 1:
+            corner_clips[0].assign_asset(asset_ids[1])
+
+        # 其余素材 → b_roll
+        remaining = asset_ids[2:]
+        for i, clip in enumerate(broll_clips):
+            if i < len(remaining):
+                clip.assign_asset(remaining[i])
@@ -0,0 +1,326 @@
+"""SmartAssetSelector — 智能素材选择服务.
+
+根据多维度评分从素材库中自动选择最优视频素材，
+用于一键生成等需要自动选取素材的场景。
+
+评分维度（加权求和，总分 0-1）：
+  - 质量分（quality_score）：权重 0.5 — 来自人工或AI的质量评分
+  - 分辨率适配：权重 0.2 — 分辨率越接近 1080p 得分越高
+  - 时长合理性：权重 0.2 — 3-30 秒区间最佳，过短/过长扣分
+  - 码率质量：权重 0.1 — 用文件大小/时长估算，码率适中得分高
+
+特性：
+  - 最低质量分门槛：自动过滤低质量素材
+  - 时长多样性：保证选出的素材时长分布均匀（短/中/长各占一定比例）
+  - 兼容全部模式：素材库模式和项目模式都可用
+"""
+
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+
+logger = logging.getLogger(__name__)
+
+# ── 评分权重 ──────────────────────────────────────────────────────────────────
+_WEIGHT_QUALITY = 0.5
+_WEIGHT_RESOLUTION = 0.2
+_WEIGHT_DURATION = 0.2
+_WEIGHT_BITRATE = 0.1
+
+# ── 评分参数 ──────────────────────────────────────────────────────────────────
+_TARGET_WIDTH = 1920  # 目标分辨率宽度基准
+_TARGET_HEIGHT = 1080  # 目标分辨率高度基准
+_MIN_QUALITY_SCORE = 30.0  # 最低质量分门槛（低于此值的素材直接排除）
+_OPTIMAL_DURATION_MIN = 3.0  # 最佳时长区间（秒）
+_OPTIMAL_DURATION_MAX = 30.0
+
+# ── 多样性分桶 ───────────────────────────────────────────────────────────────
+_SHORT_BUCKET_MAX = 5.0  # 短素材：< 5s
+_MEDIUM_BUCKET_MAX = 15.0  # 中素材：5-15s
+# 长素材：> 15s
+
+
+@dataclass
+class SmartSelectResult:
+    """智能选择结果."""
+
+    selected_ids: list[str]
+    total_candidates: int
+    filtered_out: int  # 被质量门槛过滤的数量
+    avg_score: float
+    details: list[AssetScoreDetail]
+
+
+@dataclass
+class AssetScoreDetail:
+    """单个素材的评分详情."""
+
+    asset_id: str
+    total_score: float
+    quality_score: float
+    resolution_score: float
+    duration_score: float
+    bitrate_score: float
+    duration: float | None
+
+
+class SmartAssetSelector:
+    """智能素材选择器.
+
+    从一组素材中按综合评分选择最优的 N 个，
+    同时保证时长分布的多样性。
+    """
+
+    def __init__(
+        self,
+        min_quality_score: float = _MIN_QUALITY_SCORE,
+        target_width: int = _TARGET_WIDTH,
+        target_height: int = _TARGET_HEIGHT,
+    ):
+        self.min_quality_score = min_quality_score
+        self.target_width = target_width
+        self.target_height = target_height
+
+    # ── 公开方法 ──────────────────────────────────────────────────────────────
+
+    def select(
+        self,
+        assets: list,
+        count: int = 0,
+        *,
+        ensure_diversity: bool = True,
+    ) -> SmartSelectResult:
+        """从素材列表中智能选择最优素材.
+
+        Args:
+            assets: Asset 实体列表（需要有 id/quality_score/width/height/duration/file_size 属性）
+            count: 选取数量，0 表示全部符合条件的
+            ensure_diversity: 是否保证时长多样性（默认开启）
+
+        Returns:
+            SmartSelectResult 选择结果
+        """
+        # 1. 过滤：只保留 ready 状态的视频素材 + 最低质量分门槛
+        candidates = []
+        filtered_out = 0
+        for asset in assets:
+            status = getattr(asset, "status", None)
+            status_val = status.value if hasattr(status, "value") else str(status)
+            if status_val != "ready":
+                continue
+            mime_type = getattr(asset, "mime_type", "") or ""
+            if not mime_type.startswith("video"):
+                continue
+            quality = getattr(asset, "quality_score", None)
+            if quality is not None and quality < self.min_quality_score:
+                filtered_out += 1
+                continue
+            candidates.append(asset)
+
+        if not candidates:
+            return SmartSelectResult(
+                selected_ids=[],
+                total_candidates=0,
+                filtered_out=filtered_out,
+                avg_score=0.0,
+                details=[],
+            )
+
+        # 2. 对每个候选素材评分
+        scored: list[AssetScoreDetail] = []
+        for asset in candidates:
+            detail = self._score_asset(asset)
+            scored.append(detail)
+
+        # 3. 按总分降序排列
+        scored.sort(key=lambda d: d.total_score, reverse=True)
+
+        # 4. 多样性选择（如果需要且数量有限制）
+        if ensure_diversity and count > 0 and len(scored) > count:
+            selected = self._diverse_selection(scored, count)
+        else:
+            # 无数量限制或不要求多样性，直接按排名取
+            selected = scored if count <= 0 else scored[:count]
+
+        avg_score = sum(d.total_score for d in selected) / len(selected) if selected else 0.0
+
+        result = SmartSelectResult(
+            selected_ids=[d.asset_id for d in selected],
+            total_candidates=len(candidates),
+            filtered_out=filtered_out,
+            avg_score=avg_score,
+            details=selected,
+        )
+
+        logger.info(
+            "智能素材选择完成: 候选=%d, 过滤=%d, 选中=%d, 平均分=%.3f",
+            result.total_candidates,
+            result.filtered_out,
+            len(result.selected_ids),
+            result.avg_score,
+        )
+        return result
+
+    # ── 内部方法 ──────────────────────────────────────────────────────────────
+
+    def _score_asset(self, asset) -> AssetScoreDetail:
+        """对单个素材进行多维度评分."""
+        # 质量分
+        quality = getattr(asset, "quality_score", None)
+        quality_score = (quality / 100.0) if quality is not None else 0.5
+
+        # 分辨率评分：越接近目标分辨率得分越高
+        width = getattr(asset, "width", None)
+        height = getattr(asset, "height", None)
+        resolution_score = self._score_resolution(width, height)
+
+        # 时长评分：在最佳区间内得分高，过短过长扣分
+        duration = getattr(asset, "duration", None)
+        duration_score = self._score_duration(duration)
+
+        # 码率评分：用 file_size/duration 估算，适中得分高
+        file_size = getattr(asset, "file_size", 0) or 0
+        bitrate_score = self._score_bitrate(file_size, duration)
+
+        # 加权总分
+        total = (
+            _WEIGHT_QUALITY * quality_score
+            + _WEIGHT_RESOLUTION * resolution_score
+            + _WEIGHT_DURATION * duration_score
+            + _WEIGHT_BITRATE * bitrate_score
+        )
+
+        return AssetScoreDetail(
+            asset_id=asset.id,
+            total_score=round(total, 4),
+            quality_score=round(quality_score, 4),
+            resolution_score=round(resolution_score, 4),
+            duration_score=round(duration_score, 4),
+            bitrate_score=round(bitrate_score, 4),
+            duration=duration,
+        )
+
+    def _score_resolution(self, width: int | None, height: int | None) -> float:
+        """分辨率评分：越接近目标分辨率得分越高，低于480p扣分严重."""
+        if width is None or height is None or width <= 0 or height <= 0:
+            return 0.5  # 未知分辨率给中评分
+
+        target_pixels = self.target_width * self.target_height
+        actual_pixels = width * height
+
+        # 计算像素数比例
+        ratio = actual_pixels / target_pixels
+
+        if ratio >= 1.0:
+            # 高于或等于目标分辨率：满分，略高不扣分（4K也给满分）
+            return 1.0
+        else:
+            # 低于目标分辨率：线性衰减，但最低不低于 0.1
+            # 例如：720p (921600) / 1080p (2073600) = 0.44 → 得分 0.6
+            score = 0.3 + 0.7 * ratio
+            return max(0.1, min(1.0, score))
+
+    def _score_duration(self, duration: float | None) -> float:
+        """时长评分：3-30秒最佳，过短或过长都扣分."""
+        if duration is None or duration <= 0:
+            return 0.5  # 未知时长给中评分
+
+        if _OPTIMAL_DURATION_MIN <= duration <= _OPTIMAL_DURATION_MAX:
+            # 最佳区间：满分
+            return 1.0
+
+        if duration < _OPTIMAL_DURATION_MIN:
+            # 太短：线性衰减，1秒以下给 0.3
+            ratio = duration / _OPTIMAL_DURATION_MIN
+            return 0.3 + 0.7 * ratio
+
+        # 太长：每超过最佳区间上限10秒扣 0.1 分，最低 0.2
+        excess = duration - _OPTIMAL_DURATION_MAX
+        penalty = min(0.8, excess / 10.0 * 0.1)
+        return max(0.2, 1.0 - penalty)
+
+    def _score_bitrate(self, file_size: int, duration: float | None) -> float:
+        """码率评分：根据文件大小和时长估算码率，适中得分高."""
+        if not file_size or not duration or duration <= 0:
+            return 0.5  # 未知给中评分
+
+        # 估算码率（bps）
+        bitrate = (file_size * 8) / duration
+
+        # 最佳码率范围：2-8 Mbps
+        optimal_low = 2_000_000  # 2 Mbps
+        optimal_high = 8_000_000  # 8 Mbps
+
+        if optimal_low <= bitrate <= optimal_high:
+            return 1.0
+
+        if bitrate < optimal_low:
+            # 码率太低：线性衰减
+            ratio = bitrate / optimal_low
+            return 0.3 + 0.7 * ratio
+
+        # 码率太高（文件太大）：适度扣分
+        excess = bitrate / optimal_high - 1.0
+        penalty = min(0.5, excess * 0.2)
+        return max(0.5, 1.0 - penalty)
+
+    def _diverse_selection(self, scored: list[AssetScoreDetail], count: int) -> list[AssetScoreDetail]:
+        """多样性选择：按时长分桶，保证每个桶都有素材.
+
+        策略：
+        1. 按时长分为三桶：短(<5s)、中(5-15s)、长(>15s)
+        2. 每个桶配额 = max(1, count / 3)
+        3. 先从每桶按配额取最高分的
+        4. 剩余名额从全局最高分中取（不重复）
+        """
+        # 分桶
+        short_bucket = [d for d in scored if d.duration is not None and d.duration < _SHORT_BUCKET_MAX]
+        medium_bucket = [
+            d for d in scored if d.duration is not None and _SHORT_BUCKET_MAX <= d.duration < _MEDIUM_BUCKET_MAX
+        ]
+        long_bucket = [d for d in scored if d.duration is not None and d.duration >= _MEDIUM_BUCKET_MAX]
+        unknown_bucket = [d for d in scored if d.duration is None]
+
+        buckets = [short_bucket, medium_bucket, long_bucket]
+        bucket_names = ["short", "medium", "long"]
+
+        # 每个桶基础配额（至少1个，如果桶非空且需要的话）
+        base_quota = max(1, count // 3)
+
+        selected: list[AssetScoreDetail] = []
+        selected_ids: set[str] = set()
+
+        # 先按配额从每个桶取
+        for bucket, _name in zip(buckets, bucket_names, strict=False):
+            quota = min(base_quota, len(bucket))
+            if quota <= 0:
+                continue
+            # 桶内已经按分数排好序了，直接取前 quota 个
+            for item in bucket[:quota]:
+                if item.asset_id not in selected_ids:
+                    selected.append(item)
+                    selected_ids.add(item.asset_id)
+                    if len(selected) >= count:
+                        return selected
+
+        # 剩余名额：从全局（未被选中的）中按分数高低取
+        remaining_needed = count - len(selected)
+        if remaining_needed > 0:
+            for item in scored:
+                if item.asset_id not in selected_ids:
+                    selected.append(item)
+                    selected_ids.add(item.asset_id)
+                    if len(selected) >= count:
+                        break
+
+        # 如果还不够（不应该发生），加上未知时长的
+        if len(selected) < count and unknown_bucket:
+            for item in unknown_bucket:
+                if item.asset_id not in selected_ids:
+                    selected.append(item)
+                    selected_ids.add(item.asset_id)
+                    if len(selected) >= count:
+                        break
+
+        return selected[:count]
@@ -29,33 +29,47 @@ from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
 )
 from packages.domain.edit_plan import EditPlanStatus
 from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
-from packages.domain.video_filter_builder import (
-    DEFAULT_FPS,
-    DEFAULT_OUTPUT_HEIGHT,
-    DEFAULT_OUTPUT_WIDTH,
-    DEFAULT_TRANSITION_DURATION,
-    ClipFilterChain,
-    build_clip_filter,
-)
-from packages.domain.video_filter_builder import build_concat_filter as _build_concat_filter_func
-from packages.domain.video_filter_builder import build_filter_complex as _build_filter_complex
-from packages.domain.video_filter_builder import build_xfade_filter as _build_xfade_filter_func
-from packages.domain.video_filter_builder import chain_filters as _chain_filters_func
-from packages.domain.video_filter_builder import has_audio as _has_audio_func
+from packages.domain.template_clip_config import TransitionEffect

 logger = logging.getLogger(__name__)

-# ── 常量（向后兼容别名） ──────────────────────────────────────────────────────
-# 实际定义已迁移至 packages/domain/video_filter_builder.py
+# ── 常量 ──────────────────────────────────────────────────────────────────────

+DEFAULT_OUTPUT_WIDTH = 1280
+DEFAULT_OUTPUT_HEIGHT = 720
+DEFAULT_FPS = 25
 DEFAULT_CODEC = "libx264"
 DEFAULT_CRF = 23
 DEFAULT_PRESET = "medium"

+# xfade 转场映射：TransitionEffect → FFmpeg xfade transition 名称
+_XFADE_TRANSITION_MAP: dict[str, str] = {
+    TransitionEffect.FADE: "fade",
+    TransitionEffect.SLIDE_LEFT: "slideleft",
+    TransitionEffect.SLIDE_RIGHT: "slideright",
+    TransitionEffect.DISSOLVE: "dissolve",
+    TransitionEffect.WIPE: "wipeleft",
+}
+
+# 转场默认时长（秒）
+DEFAULT_TRANSITION_DURATION = 0.5
+

 # ── 数据结构 ──────────────────────────────────────────────────────────────────


+@dataclass(frozen=True)
+class ClipFilterChain:
+    """单个片段的滤镜链描述。"""
+
+    clip_id: str
+    input_index: int
+    video_label: str
+    audio_label: str | None
+    filters: list[str]
+    duration: float
+
+
@dataclass(frozen=True)
 class ComposeCommand:
    """完整的 FFmpeg 合成命令描述。"""
@@ -374,7 +388,7 @@ class VideoComposeService:
                EditPlanStatus.EDITING,
                EditPlanStatus.RENDERING,
            ),
-            "rendered_url": plan.config.get("rendered_storage_key", "") or plan.config.get("rendered_url", ""),
+            "rendered_url": plan.config.get("rendered_url", ""),
        }

    # ── 内部方法 ──────────────────────────────────────────────────────────
@@ -387,8 +401,62 @@ class VideoComposeService:
        output_height: int,
        fps: int,
    ) -> ClipFilterChain:
-        """向后兼容：委托给 video_filter_builder.build_clip_filter。"""
-        return build_clip_filter(clip, input_index, output_width, output_height, fps)
+        """为单个片段构建滤镜链。
+
+        滤镜顺序：
+        1. scale — 等比缩放到目标分辨率（保证覆盖）
+        2. crop — 居中裁剪到目标分辨率
+        3. fps — 统一输出帧率（concat 要求所有输入帧率一致）
+        4. setpts — 重置时间戳 + 偏移
+        5. trim — 视频时长裁剪
+        6. atrim — 音频时长裁剪（如有音频流）
+        """
+        duration = clip.duration if clip.duration > 0 else 5.0  # 默认 5 秒
+        start = clip.start_time
+
+        filters: list[str] = []
+
+        # 1. scale: 等比缩放（保持比例，不裁剪）
+        filters.append(f"scale={output_width}:{output_height}" f":force_original_aspect_ratio=decrease")
+
+        # 2. pad: 居中+留黑边到目标分辨率（保持原始比例，不裁剪内容）
+        filters.append(f"pad={output_width}:{output_height}:(ow-iw)/2:(oh-ih)/2:black")
+
+        # 3. format: 统一像素格式为 yuv420p（H.264 标准格式，concat 要求所有输入像素格式一致）
+        # 不同素材可能是 yuv420p / yuv422p / yuv444p / nv12 等，必须统一
+        filters.append("format=yuv420p")
+
+        # 4. fps: 统一帧率（concat 要求所有输入帧率一致）
+        # 放在 pad 之后、setpts 之前，确保分辨率和帧率都已统一
+        if fps and fps > 0:
+            filters.append(f"fps={fps}")
+
+        # 3. setpts: 重置时间戳
+        if start > 0:
+            filters.append(f"setpts=PTS-STARTPTS+{start}/TB")
+        else:
+            filters.append("setpts=PTS-STARTPTS")
+
+        # 4. trim: 视频时长
+        filters.append(f"trim=0:{duration}")
+        filters.append("setpts=PTS-STARTPTS")  # trim 后需要重置 PTS
+
+        video_label = f"v{input_index}"
+
+        # 5. 音频标签：仅当片段类型可能有音频时才设置
+        # title/subtitle 是纯文字/图片卡片，没有音频流
+        clip_type = clip.clip_type.lower() if clip.clip_type else ""
+        has_audio_stream = clip_type not in ("title", "subtitle")
+        audio_label = f"a{input_index}" if has_audio_stream else None
+
+        return ClipFilterChain(
+            clip_id=clip.id,
+            input_index=input_index,
+            video_label=video_label,
+            audio_label=audio_label,
+            filters=filters,
+            duration=duration,
+        )

    @staticmethod
    def _build_filter_complex(
@@ -398,30 +466,102 @@ class VideoComposeService:
        transition_duration: float,
        transitions: list[str],
    ) -> tuple[str, float]:
-        """向后兼容：委托给 video_filter_builder.build_filter_complex。"""
-        return _build_filter_complex(clip_chains, output_width, output_height, transition_duration, transitions)
+        """构建完整的 filter_complex 字符串。
+
+        策略：
+        - 单片段：直接输出
+        - 多片段 + 全 cut：使用 concat 滤镜（高效）
+        - 多片段 + 有转场：使用 xfade 滤镜链
+
+        返回 (filter_complex_string, estimated_total_duration)。
+        """
+        n = len(clip_chains)
+
+        if n == 0:
+            return "", 0.0
+
+        # ── 单片段 ─────────────────────────────────────────────────────
+        if n == 1:
+            chain = clip_chains[0]
+            filter_str = _chain_filters(chain.filters, chain.video_label)
+            # 音频
+            if chain.audio_label:
+                filter_str += f";[0:a]{chain.audio_label}"
+            total_duration = chain.duration
+            return filter_str, total_duration
+
+        # ── 检查是否有转场 ─────────────────────────────────────────────
+        has_transitions = any(t != TransitionEffect.CUT and t != "cut" for t in transitions)
+
+        if not has_transitions:
+            return _build_concat_filter(clip_chains)
+
+        # ── 有转场：使用 xfade ─────────────────────────────────────────
+        return _build_xfade_filter(
+            clip_chains=clip_chains,
+            transition_duration=transition_duration,
+            transitions=transitions,
+        )

    @staticmethod
    def _has_audio(clip_chains: list[ClipFilterChain]) -> bool:
-        """向后兼容：委托给 video_filter_builder.has_audio。"""
-        return _has_audio_func(clip_chains)
+        """是否有任何片段包含音频流。"""
+        return any(c.audio_label is not None for c in clip_chains)


-# ── 模块级辅助函数（向后兼容别名） ──────────────────────────────────────────
-# 实际实现已迁移至 packages/domain/video_filter_builder.py
-# 保留此处别名以兼容现有测试与调用方
+# ── 模块级辅助函数 ────────────────────────────────────────────────────────────


 def _chain_filters(filters: list[str], output_label: str) -> str:
-    """向后兼容：委托给 video_filter_builder.chain_filters。"""
-    return _chain_filters_func(filters, output_label)
+    """将滤镜列表串联为 FFmpeg 滤镜字符串。"""
+    filter_body = ",".join(filters)
+    return f"[0:v]{filter_body}[{output_label}]"


 def _build_concat_filter(
    clip_chains: list[ClipFilterChain],
 ) -> tuple[str, float]:
-    """向后兼容：委托给 video_filter_builder.build_concat_filter。"""
-    return _build_concat_filter_func(clip_chains)
+    """构建 concat 滤镜（无转场，高效拼接）。
+
+    格式：
+    [0:v]filters[v0]; [1:v]filters[v1]; ...
+    [v0][v1]...[vN]concat=n=N:v=1:a=0[outv]
+    """
+    n = len(clip_chains)
+    parts: list[str] = []
+    total_duration = 0.0
+
+    # 每个片段的滤镜链
+    for idx, chain in enumerate(clip_chains):
+        filter_body = ",".join(chain.filters)
+        parts.append(f"[{idx}:v]{filter_body}[{chain.video_label}]")
+        total_duration += chain.duration
+
+    # concat 滤镜
+    concat_inputs = "".join(f"[{c.video_label}]" for c in clip_chains)
+    concat_filter = f"{concat_inputs}concat=n={n}:v=1:a=0[outv]"
+    parts.append(concat_filter)
+
+    # 音频 concat（如果有）— 先统一音频格式再拼接，否则不同采样率/声道会导致concat失败
+    audio_parts: list[str] = []
+    for idx, chain in enumerate(clip_chains):
+        if chain.audio_label:
+            # aformat: 统一采样率48000Hz + 双声道stereo + fltp采样格式（AAC标准格式）
+            audio_filters = [
+                "aformat=sample_rates=48000:channel_layouts=stereo:sample_fmts=fltp",
+                f"atrim=0:{chain.duration}",
+                "asetpts=PTS-STARTPTS",
+            ]
+            audio_parts.append(f"[{idx}:a]{','.join(audio_filters)}[{chain.audio_label}]")
+
+    if audio_parts:
+        parts.extend(audio_parts)
+        audio_inputs = "".join(f"[{c.audio_label}]" for c in clip_chains if c.audio_label)
+        audio_count = sum(1 for c in clip_chains if c.audio_label)
+        if audio_count > 0:
+            parts.append(f"{audio_inputs}concat=n={audio_count}:v=0:a=1[outa]")
+
+    return ";".join(parts), total_duration


 def _build_xfade_filter(
@@ -429,5 +569,80 @@ def _build_xfade_filter(
    transition_duration: float,
    transitions: list[str],
 ) -> tuple[str, float]:
-    """向后兼容：委托给 video_filter_builder.build_xfade_filter。"""
-    return _build_xfade_filter_func(clip_chains, transition_duration, transitions)
+    """构建 xfade 转场滤镜链。
+
+    每两个相邻片段之间插入 xfade 转场。
+    offset = 前一个片段的累积时长 - 转场时长。
+
+    格式（2 片段）：
+    [0:v]filters[v0]; [1:v]filters[v1];
+    [v0][v1]xfade=transition=fade:duration=0.5:offset=4.5[outv]
+
+    格式（3+ 片段）：
+    [v0][v1]xfade=...[tmp1]; [tmp1][v2]xfade=...[outv]
+    """
+    n = len(clip_chains)
+    parts: list[str] = []
+    total_duration = 0.0
+
+    # 每个片段的滤镜链
+    for idx, chain in enumerate(clip_chains):
+        filter_body = ",".join(chain.filters)
+        parts.append(f"[{idx}:v]{filter_body}[{chain.video_label}]")
+        total_duration += chain.duration
+
+    # xfade 链
+    if n == 1:
+        # 单片段不需要 xfade
+        parts.append(f"[{clip_chains[0].video_label}]copy[outv]")
+        return ";".join(parts), total_duration
+
+    # 计算每个转场的 offset
+    cumulative = 0.0
+    prev_label = clip_chains[0].video_label
+
+    for i in range(1, n):
+        cumulative += clip_chains[i - 1].duration
+        offset = max(0.0, cumulative - transition_duration * i)
+
+        # 获取转场类型
+        transition = transitions[i] if i < len(transitions) else "cut"
+        xfade_transition = _XFADE_TRANSITION_MAP.get(transition, "fade")
+
+        if i == n - 1:
+            # 最后一个转场，输出到 [outv]
+            out_label = "outv"
+        else:
+            out_label = f"xf{i}"
+
+        parts.append(
+            f"[{prev_label}][{clip_chains[i].video_label}]"
+            f"xfade=transition={xfade_transition}"
+            f":duration={transition_duration}"
+            f":offset={offset:.3f}"
+            f"[{out_label}]"
+        )
+        prev_label = out_label
+
+    # 总时长需要减去转场重叠部分
+    total_duration -= transition_duration * (n - 1)
+
+    # 音频：先 aformat 归一化再 concat（不同采样率/声道/采样格式会导致concat失败）
+    audio_chains_with_label = [(c, c.audio_label) for c in clip_chains if c.audio_label]
+    if len(audio_chains_with_label) >= 2:
+        normalized_audio_labels: list[str] = []
+        for chain, _ in audio_chains_with_label:
+            norm_label = f"anorm_{chain.video_label}"
+            audio_filters = [
+                "aformat=sample_rates=48000:channel_layouts=stereo:sample_fmts=fltp",
+                f"atrim=0:{chain.duration}",
+                "asetpts=PTS-STARTPTS",
+            ]
+            parts.append(f"[{chain.audio_label}]{','.join(audio_filters)}[{norm_label}]")
+            normalized_audio_labels.append(norm_label)
+        audio_inputs = "".join(f"[{label}]" for label in normalized_audio_labels)
+        parts.append(f"{audio_inputs}concat=n={len(normalized_audio_labels)}:v=0:a=1[outa]")
+    elif len(audio_chains_with_label) == 1:
+        parts.append(f"[{audio_chains_with_label[0][0].audio_label}]acopy[outa]")
+
+    return ";".join(parts), max(0.0, total_duration)
@@ -0,0 +1,8 @@
+from fastapi import APIRouter
+
+router = APIRouter()
+
+
+@router.get("/health")
+def health():
+    return {"ok": True, "service": "api"}
@@ -50,10 +50,10 @@ type AssetListResponse = {
 }

 test.describe("Core generation flow", () => {
-  test.describe.configure({ timeout: 360_000 })
+  test.describe.configure({ timeout: 180_000 })

  test("walks through 7-step wizard and starts generation", async ({ page, request }) => {
-    test.setTimeout(360_000)
+    test.setTimeout(180_000)

    await routeBrowserApiToTestApi(page)
    const suffix = Date.now().toString(36)
@@ -196,45 +196,37 @@ test.describe("Core generation flow", () => {
    await materialLabel.locator("input[type='checkbox']").check()
    await page.getByRole("button", { name: "下一步" }).click()

-    // Step 3: voice (可选步骤，新注册用户无配音素材，直接跳过)
-    await expect(page.getByRole("heading", { name: /选择配音/ })).toBeVisible({ timeout: 15000 })
+    // Step 3: preview (纯展示页，AI 智能匹配预览)
+    await expect(page.getByRole("heading", { name: /生成预览/ })).toBeVisible()
    await page.getByRole("button", { name: "下一步" }).click()

-    // Step 4: title（新顺序：标题在预览之前）
-    await expect(page.getByRole("heading", { name: /选择标题/ })).toBeVisible({ timeout: 15000 })
-    // 等待组件完全渲染
-    await page.waitForTimeout(2000)
-
-    // Antd AutoComplete 的 placeholder 渲染在 span 上，input 无 placeholder 属性
-    // 使用 Antd AutoComplete 特有的 class 定位输入框
-    const titleInput = page.locator(".ant-select-auto-complete input")
-    await expect(titleInput).toBeVisible({ timeout: 5000 })
-
+    // Step 4: title
+    await expect(page.getByRole("heading", { name: /选择标题/ })).toBeVisible()
    const titleText = `E2E Test ${suffix}`
-    await titleInput.fill(titleText)
+    await page.getByPlaceholder("输入自定义标题…").fill(titleText)
    await page.getByRole("button", { name: "下一步" }).click()

-    // Step 5: preview — 前端实时预览架构改造，无需后端生成预览
-    await expect(page.getByRole("heading", { name: /预览设置/ })).toBeVisible({ timeout: 15000 })
+    // Step 5: voice
+    await expect(page.getByRole("heading", { name: /选择配音/ })).toBeVisible()
+    const firstVoiceCard = page.locator(".xx-voice-choice-item").first()
+    await firstVoiceCard.click()
    await page.getByRole("button", { name: "下一步" }).click()

    // Step 6: cover (默认 AI 智能选帧模式，直接下一步)
-    await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible({ timeout: 15000 })
+    await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible()
    await page.getByRole("button", { name: "下一步" }).click()

    // Step 7: confirm and generate
    await expect(page.getByRole("heading", { name: /确认生成/ })).toBeVisible()

    // Wait for generation API to be called
-    // 前端直接创建生成任务：POST /generation/tasks
+    // 新架构：GET 草稿自动创建 → PUT 更新内容 → POST /generate 触发生成
+    // 等 generate 接口返回，确认生成流程启动
    const generatePromise = page.waitForResponse(
      (response) => {
        const url = response.url()
        const path = new URL(url).pathname
-        return (
-          response.request().method() === "POST" &&
-          path.endsWith("/generation/tasks")
-        )
+        return response.request().method() === "POST" && path.endsWith("/editor/generate")
      },
      { timeout: 30_000 },
    )
@@ -250,18 +242,10 @@ test.describe("Core generation flow", () => {
        `[E2E DEBUG] 触发生成接口失败: status=${genResp.status()} url=${genResp.url()} body=${body.slice(0, 500)}`,
      )
    }
-    // Generate API may return 400 in test env if template has no ready segments
-    // That is OK for a wizard flow smoke test
-    if (genResp.ok()) {
-      const genData = (await genResp.json()) as {
-        items: Array<{ id: string; status: string }>
-        total: number
-      }
-      expect(genData.items.length).toBeGreaterThan(0)
-      expect(genData.items[0].id).toBeTruthy()
-    } else {
-      console.log(`[E2E] Generate API returned ${genResp.status()}, wizard flow test still passes`)
-    }
+    expect(genResp.ok()).toBeTruthy()
+    const genData = (await genResp.json()) as { plan_id: string; generation_task_id: string }
+    expect(genData.plan_id).toBeTruthy()
+    expect(genData.generation_task_id).toBeTruthy()

    // Generation may fail in test env (no worker), that's OK
    // Just verify the flow started - check page shows generation-related UI
@@ -178,7 +178,7 @@ test.describe("素材库流程", () => {
    expect(kinds).toContain("image")
  })

-  test("创建素材记录 — POST /assets 已废弃返回 410", async ({ request }) => {
+  test("创建素材记录", async ({ request }) => {
    const { headers, userId } = await createAuthedUser(request, "asset-create")
    const projectId = await createProject(request, headers, Date.now().toString())

@@ -194,7 +194,7 @@ test.describe("素材库流程", () => {
    expect(lib.ok()).toBeTruthy()
    const libData = await lib.json()

-    // POST /assets 已废弃，应返回 410 Gone
+    // 创建素材记录
    const response = await request.post(`${apiBase}/assets`, {
      headers,
      data: {
@@ -210,9 +210,16 @@ test.describe("素材库流程", () => {
      },
    })

-    expect(response.status()).toBe(410)
+    expect(
+      response.ok(),
+      `创建素材应返回 2xx，实际: ${response.status()} ${await response.text()}`,
+    ).toBeTruthy()
+
    const data = await response.json()
-    expect(data.error?.code).toBe("HTTP_410")
+    expect(data.id, "应返回素材 ID").toBeTruthy()
+    expect(data.name).toContain("test_video")
+    expect(data.mime_type).toBe("video/mp4")
+    expect(data.library_id).toBe(libData.id)
  })

  test("列出素材", async ({ request }) => {
@@ -225,50 +232,51 @@ test.describe("素材库流程", () => {
      data: {
        project_id: projectId,
        name: `List Lib ${Date.now()}`,
-        kind: "image",
+        kind: "video",
      },
    })
    expect(lib.ok(), `创建素材库应成功: ${await lib.text()}`).toBeTruthy()
    const libData = await lib.json()

-    // 通过 multipart upload 上传 2 个小图片作为测试素材
-    // 创建一个 1x1 的 PNG buffer
-    const tinyPng = Buffer.from(
-      "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
-      "base64",
-    )
-
-    await request.post(`${apiBase}/upload`, {
+    // 创建 2 个素材
+    await request.post(`${apiBase}/assets`, {
      headers,
-      multipart: {
+      data: {
        project_id: projectId,
        library_id: libData.id,
-        file: { name: "clip_a.png", mimeType: "image/png", buffer: tinyPng },
+        name: `clip_a_${Date.now()}.mp4`,
+        storage_key: `uploads/e2e/clip_a.mp4`,
+        mime_type: "video/mp4",
+        status: "ready",
+        uploaded_by_user_id: userId,
      },
    })
-    await request.post(`${apiBase}/upload`, {
+    await request.post(`${apiBase}/assets`, {
      headers,
-      multipart: {
+      data: {
        project_id: projectId,
        library_id: libData.id,
-        file: { name: "clip_b.png", mimeType: "image/png", buffer: tinyPng },
+        name: `clip_b_${Date.now()}.mp4`,
+        storage_key: `uploads/e2e/clip_b.mp4`,
+        mime_type: "video/mp4",
+        status: "ready",
+        uploaded_by_user_id: userId,
      },
    })

-    // 列出素材（可能需要等待 ingest job 完成）
-    let items: any[] = []
-    for (let i = 0; i < 10; i++) {
-      const response = await request.get(`${apiBase}/assets`, {
-        headers,
-        params: { library_id: libData.id },
-      })
-      expect(response.ok(), `列出素材应返回 2xx`).toBeTruthy()
-      const data = await response.json()
-      items = data.items || []
-      if (items.length >= 2) break
-      await new Promise((r) => setTimeout(r, 2000))
-    }
+    // 列出素材
+    const response = await request.get(`${apiBase}/assets`, {
+      headers,
+      params: { library_id: libData.id },
+    })

+    expect(
+      response.ok(),
+      `列出素材应返回 2xx，实际: ${response.status()} ${await response.text()}`,
+    ).toBeTruthy()
+
+    const data = await response.json()
+    const items = data.items || []
    expect(items.length, "应至少有 2 个素材").toBeGreaterThanOrEqual(2)
  })

@@ -12,7 +12,6 @@
        "@tanstack/react-query": "^5.45.0",
        "antd": "^5.18.0",
        "axios": "^1.7.2",
-        "mp4box": "^2.4.1",
        "react": "^18.3.1",
        "react-dom": "^18.3.1",
        "react-router-dom": "^6.24.0",
@@ -1848,7 +1847,7 @@
    },
    "node_modules/@testing-library/dom": {
      "version": "10.4.1",
-      "resolved": "https://registry.npmmirror.com/@testing-library/dom/-/dom-10.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
      "dev": true,
      "license": "MIT",
@@ -1938,7 +1937,7 @@
    },
    "node_modules/@types/aria-query": {
      "version": "5.0.4",
-      "resolved": "https://registry.npmmirror.com/@types/aria-query/-/aria-query-5.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
      "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
      "dev": true,
      "license": "MIT",
@@ -3113,7 +3112,7 @@
    },
    "node_modules/dom-accessibility-api": {
      "version": "0.5.16",
-      "resolved": "https://registry.npmmirror.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
      "dev": true,
      "license": "MIT",
@@ -4029,6 +4028,18 @@
        "node": ">= 4"
      }
    },
+    "node_modules/immer": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz",
+      "integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
    "node_modules/import-fresh": {
      "version": "3.3.1",
      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -4457,7 +4468,7 @@
    },
    "node_modules/lz-string": {
      "version": "1.5.0",
-      "resolved": "https://registry.npmmirror.com/lz-string/-/lz-string-1.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
      "dev": true,
      "license": "MIT",
@@ -4624,15 +4635,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/mp4box": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmmirror.com/mp4box/-/mp4box-2.4.1.tgz",
-      "integrity": "sha512-0HGX7nXoDIX6FKLVl4a3wtYjBlwqsN3xuQC3GXzNtKp98FXUOhDSq623azsz8DG5ptd9ZXcXodDkgbdMZOjWvw==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=20.8.1"
-      }
-    },
    "node_modules/mrmime": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
@@ -5008,7 +5010,7 @@
    },
    "node_modules/pretty-format": {
      "version": "27.5.1",
-      "resolved": "https://registry.npmmirror.com/pretty-format/-/pretty-format-27.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
      "dev": true,
      "license": "MIT",
@@ -5024,7 +5026,7 @@
    },
    "node_modules/pretty-format/node_modules/ansi-styles": {
      "version": "5.2.0",
-      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
      "dev": true,
      "license": "MIT",
@@ -5036,6 +5038,14 @@
        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
      }
    },
+    "node_modules/pretty-format/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
    "node_modules/proxy-from-env": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
@@ -5733,14 +5743,6 @@
        "react": "^18.3.1"
      }
    },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
    "node_modules/react-refresh": {
      "version": "0.17.0",
      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
@@ -23,7 +23,6 @@
    "@tanstack/react-query": "^5.45.0",
    "antd": "^5.18.0",
    "axios": "^1.7.2",
-    "mp4box": "^2.4.1",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
    "react-router-dom": "^6.24.0",
@@ -1,2 +0,0 @@
-allowBuilds:
-  esbuild: set this to true or false
@@ -0,0 +1,443 @@
+/**
+ * 素材相关 API
+ * Phase 1 重构：去掉 project_id，素材直接归属用户
+ */
+import apiClient from "./client"
+import { getOrCreateDefaultProject } from "./projects"
+
+/** 素材元数据 */
+export interface AssetMetadata {
+  /** 时长（秒） */
+  duration?: number
+  /** 宽度（像素） */
+  width?: number
+  /** 高度（像素） */
+  height?: number
+  /** 比特率（bps） */
+  bitrate?: number
+  /** 编码格式 */
+  codec?: string
+  /** 帧率 */
+  fps?: number
+  /** 采样率（Hz） */
+  sample_rate?: number
+  /** 声道数 */
+  channels?: number
+  /** 其他扩展字段 */
+  [key: string]: unknown
+}
+
+/** 素材分类状态 */
+export type AssetClassificationStatus = "pending" | "processing" | "completed" | "failed"
+
+/** 素材条目 */
+export interface AssetItem {
+  id: string
+  library_id: string
+  name: string
+  storage_key: string
+  mime_type: string
+  metadata: AssetMetadata
+  file_size?: number
+  file_url?: string
+  thumbnail_url?: string
+  /** 时长（秒），视频/音频素材由后端从 metadata 提取到顶层 */
+  duration?: number
+  status?: string
+  classification_status?: AssetClassificationStatus | null
+  quality_score?: number | null
+  tag_ids?: string[]
+  created_at?: string
+}
+
+/** 素材库 */
+export interface AssetLibraryItem {
+  id: string
+  name: string
+  kind: "video" | "voice" | "image"
+  asset_count?: number
+  total_size?: number
+  created_at?: string
+}
+
+/** 入库任务 */
+export interface IngestJob {
+  id: string
+  library_id: string
+  storage_key: string
+  status: "pending" | "processing" | "completed" | "failed"
+  error_message: string
+  result_asset_id: string
+}
+
+/** 分类任务 */
+export interface ClassificationJob {
+  id: string
+  asset_id: string
+  status: "pending" | "processing" | "completed" | "failed"
+  classification: string
+  confidence: number
+  error_message: string
+}
+
+/** 素材诊断信息 */
+export interface AssetDiagnosis {
+  readiness_score: number
+  readiness_label: string
+  total_assets: number
+  ready_assets: number
+  video_assets: number
+  image_assets: number
+  voice_assets: number
+  total_duration_seconds: number
+  estimated_video_count: number
+  used_assets: number
+  unused_assets: number
+  pending_review_assets: number
+  smart_views: Array<{
+    key: string
+    label: string
+    count: number
+    description: string
+  }>
+  gaps: Array<{
+    key: string
+    severity: "critical" | "warning" | "info"
+    message: string
+    recommendation: string
+  }>
+}
+
+// ─── 素材诊断 ──────────────────────────────────────────────
+
+/** 获取素材诊断信息（可选 asset_id 查单素材，否则全局诊断） */
+export const getAssetDiagnosis = async (assetId?: string): Promise<AssetDiagnosis> => {
+  const params: Record<string, string> = {}
+  if (assetId) params.asset_id = assetId
+  const response = await apiClient.get("/asset-diagnosis", { params })
+  return response.data
+}
+
+// ─── 素材库 ────────────────────────────────────────────────
+
+/** 获取当前用户的所有素材库 */
+export const getAssetLibraries = async (): Promise<AssetLibraryItem[]> => {
+  const response = await apiClient.get("/asset-libraries")
+  return response.data.items || []
+}
+
+/** 创建素材库（自动获取或创建默认项目以提供 project_id） */
+export const createAssetLibrary = async (data: {
+  name: string
+  kind: "video" | "voice" | "image"
+}): Promise<AssetLibraryItem> => {
+  // 后端要求 project_id，前端自动管理默认项目
+  const project = await getOrCreateDefaultProject()
+  const response = await apiClient.post("/asset-libraries", {
+    project_id: project.id,
+    ...data,
+  })
+  return response.data
+}
+
+/** 确保项目下指定 kind 的默认素材库存在（不存在则自动创建） */
+export const ensureDefaultLibrary = async (data: {
+  project_id: string
+  kind: "video" | "voice" | "image"
+}): Promise<AssetLibraryItem> => {
+  const response = await apiClient.post("/asset-libraries/ensure-default", data)
+  return response.data
+}
+
+/** 删除素材库 */
+export const deleteAssetLibrary = async (libraryId: string): Promise<void> => {
+  await apiClient.delete(`/asset-libraries/${libraryId}`)
+}
+
+// ─── 素材 ──────────────────────────────────────────────────
+
+/** 获取素材库下的所有素材 */
+export const getAssets = async (
+  libraryId: string,
+  options?: { status?: string; page?: number; page_size?: number },
+): Promise<{ items: AssetItem[]; total: number }> => {
+  const params: Record<string, string | number> = { library_id: libraryId }
+  // 默认拉取所有非删除状态的素材（ready/ingesting/processing/uploading/error/failed）
+  // 让用户能看到"处理中"的素材，不会以为上传失败了
+  if (options?.status) {
+    params.status = options.status
+  }
+  if (options?.page) params.page = options.page
+  if (options?.page_size) params.page_size = options.page_size
+  const response = await apiClient.get("/assets", { params })
+  const data = response.data || {}
+  const items: AssetItem[] = data.items || []
+  const total: number = typeof data.total === "number" ? data.total : items.length
+  return { items, total }
+}
+
+/** 按类型获取素材（如 voice/video/image），支持可选筛选 */
+export const getAssetsByKind = async (
+  kind: string,
+  filters?: {
+    keyword?: string
+    gender?: string
+    style?: string
+    tag_ids?: string[]
+    limit?: number
+    page?: number
+    page_size?: number
+  },
+): Promise<AssetItem[]> => {
+  const params: Record<string, string | number> = { kind }
+  if (filters?.keyword) params.keyword = filters.keyword
+  if (filters?.gender) params.gender = filters.gender
+  if (filters?.style) params.style = filters.style
+  if (filters?.tag_ids?.length) params.tag_ids = filters.tag_ids.join(",")
+  if (filters?.limit) params.limit = filters.limit
+  if (filters?.page) params.page = filters.page
+  if (filters?.page_size) params.page_size = filters.page_size
+  const response = await apiClient.get("/assets", { params })
+  return response.data.items || []
+}
+
+/** 创建素材（上传文件后调用，附带 metadata） */
+export const createAsset = async (data: {
+  library_id: string
+  name: string
+  storage_key: string
+  mime_type: string
+  metadata?: AssetMetadata
+}): Promise<AssetItem> => {
+  const response = await apiClient.post("/assets", data)
+  return response.data
+}
+
+/** 更新素材（名称、metadata 等） */
+export const updateAsset = async (
+  assetId: string,
+  data: { name?: string; metadata?: AssetMetadata },
+): Promise<AssetItem> => {
+  const response = await apiClient.put(`/assets/${assetId}`, data)
+  return response.data
+}
+
+/** 更新素材审核状态 */
+export const updateAssetReviewStatus = async (
+  assetId: string,
+  reviewStatus: "pending_review" | "approved" | "rejected",
+): Promise<AssetItem> => {
+  const response = await apiClient.patch(`/assets/${assetId}/review`, {
+    review_status: reviewStatus,
+  })
+  return response.data
+}
+
+/** 删除素材 */
+export const deleteAsset = async (assetId: string): Promise<void> => {
+  await apiClient.delete(`/assets/${assetId}`)
+}
+
+// ─── 上传 ──────────────────────────────────────────────────
+
+/** 表单上传素材（小文件） */
+export const uploadAsset = async (
+  formData: FormData,
+): Promise<{ storage_key: string; ingest_job_id: string; url: string }> => {
+  const response = await apiClient.post("/upload", formData, {
+    headers: { "Content-Type": "multipart/form-data" },
+    timeout: 30 * 60 * 1000,
+  })
+  return response.data
+}
+
+/** 预签名直传准备 */
+export const prepareDirectUpload = async (data: {
+  project_id: string
+  library_id: string
+  filename: string
+  content_type: string
+  file_size: number
+}): Promise<{
+  upload_url: string
+  method: string
+  storage_key: string
+  expires_at: string
+  fields: Record<string, string>
+  max_size_bytes: number
+}> => {
+  const response = await apiClient.post("/upload/direct/prepare", data)
+  return response.data
+}
+
+/** 直传完成确认 */
+export const completeDirectUpload = async (data: {
+  project_id: string
+  library_id: string
+  storage_key: string
+}): Promise<{ storage_key: string; ingest_job_id: string }> => {
+  const response = await apiClient.post("/upload/direct/complete", data)
+  return response.data
+}
+
+/** 直传上传（大文件推荐），支持可选进度回调 */
+export const uploadAssetDirect = async (data: {
+  file: File
+  library_id: string
+  onProgress?: (percent: number) => void
+}): Promise<{ storage_key: string; ingest_job_id: string }> => {
+  // 后端要求 project_id，前端自动获取默认项目
+  const project = await getOrCreateDefaultProject()
+
+  const prepared = await prepareDirectUpload({
+    project_id: project.id,
+    library_id: data.library_id,
+    filename: data.file.name,
+    content_type: data.file.type || "application/octet-stream",
+    file_size: data.file.size,
+  })
+
+  const directForm = new FormData()
+  Object.entries(prepared.fields).forEach(([key, value]) => directForm.append(key, value))
+  directForm.append("file", data.file)
+
+  // 使用 XMLHttpRequest 以获取上传进度 + 超时控制 + 详细错误诊断
+  await new Promise<void>((resolve, reject) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open(prepared.method, prepared.upload_url)
+
+    // 超时 10 分钟
+    xhr.timeout = 10 * 60 * 1000
+
+    xhr.upload.onprogress = (e) => {
+      if (e.lengthComputable && data.onProgress) {
+        data.onProgress(Math.round((e.loaded / e.total) * 100))
+      }
+    }
+    xhr.onload = () => {
+      if (xhr.status >= 200 && xhr.status < 300) {
+        resolve()
+      } else {
+        // 解析 OSS 返回的 XML 错误信息
+        let ossError = ""
+        try {
+          const codeMatch = xhr.responseText.match(/<Code>([^<]+)<\/Code>/)
+          const msgMatch = xhr.responseText.match(/<Message>([^<]+)<\/Message>/)
+          if (codeMatch || msgMatch) {
+            ossError = ` [OSS: ${codeMatch?.[1] || "unknown"} - ${msgMatch?.[1] || "unknown"}]`
+          }
+        } catch {
+          // 无法解析响应体
+        }
+        const detail = `OSS 直传失败: HTTP ${xhr.status} ${xhr.statusText}${ossError}`
+        console.error("[OSS Upload] 直传失败:", {
+          url: prepared.upload_url,
+          storage_key: prepared.storage_key,
+          status: xhr.status,
+          statusText: xhr.statusText,
+        })
+        reject(new Error(detail))
+      }
+    }
+    xhr.onerror = () => {
+      console.error("[OSS Upload] 网络错误:", {
+        url: prepared.upload_url,
+        storage_key: prepared.storage_key,
+      })
+      reject(new Error("OSS 上传网络错误，请检查网络连接"))
+    }
+    xhr.ontimeout = () => {
+      console.error("[OSS Upload] 上传超时:", {
+        url: prepared.upload_url,
+        storage_key: prepared.storage_key,
+      })
+      reject(new Error("OSS 上传超时（10分钟），请检查网络或尝试更小的文件"))
+    }
+    xhr.send(directForm)
+  })
+
+  return completeDirectUpload({
+    project_id: project.id,
+    library_id: data.library_id,
+    storage_key: prepared.storage_key,
+  })
+}
+
+// ─── 入库 / 分类任务 ───────────────────────────────────────
+
+/** 查询入库任务状态 */
+export const getIngestJob = async (jobId: string): Promise<IngestJob> => {
+  const response = await apiClient.get(`/ingest-jobs/${jobId}`)
+  return response.data
+}
+
+/** 提交素材分类任务 */
+export const submitClassificationJob = async (data: {
+  asset_id: string
+}): Promise<ClassificationJob> => {
+  const response = await apiClient.post("/classification-jobs", data)
+  return response.data
+}
+
+/** 查询分类任务状态 */
+export const getClassificationJob = async (jobId: string): Promise<ClassificationJob> => {
+  const response = await apiClient.get(`/classification-jobs/${jobId}`)
+  return response.data
+}
+
+// ─── 批量操作 ───────────────────────────────────────────────
+
+/** 批量操作结果 */
+export interface BatchOperationResult {
+  succeeded: string[]
+  failed: string[]
+  total: number
+  success_count: number
+  failure_count: number
+}
+
+/** 统一批量操作结果归一化，防御后端字段缺失或格式不一致 */
+const normalizeBatchResult = (raw: Record<string, unknown>): BatchOperationResult => {
+  const succeeded = Array.isArray(raw.succeeded) ? (raw.succeeded as string[]) : []
+  const failed = Array.isArray(raw.failed) ? (raw.failed as string[]) : []
+  const success_count = typeof raw.success_count === "number" ? raw.success_count : succeeded.length
+  const failure_count = typeof raw.failure_count === "number" ? raw.failure_count : failed.length
+  const total = typeof raw.total === "number" ? raw.total : success_count + failure_count
+  return { succeeded, failed, total, success_count, failure_count }
+}
+
+/** 批量删除素材 */
+export const batchDeleteAssets = async (assetIds: string[]): Promise<BatchOperationResult> => {
+  const response = await apiClient.post("/assets/batch-delete", {
+    asset_ids: assetIds,
+  })
+  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
+}
+
+/** 批量打标签 */
+export const batchTagAssets = async (data: {
+  asset_ids: string[]
+  tags: string[]
+  mode: "add" | "replace"
+}): Promise<BatchOperationResult> => {
+  const response = await apiClient.post("/assets/batch-tag", data)
+  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
+}
+
+/** 批量改分类 */
+export const batchClassifyAssets = async (data: {
+  asset_ids: string[]
+  category: string
+}): Promise<BatchOperationResult> => {
+  const response = await apiClient.post("/assets/batch-classify", data)
+  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
+}
+
+/** 批量智能标记 */
+export const batchMarkAssets = async (data: {
+  asset_ids: string[]
+  smart_view: "recommended" | "caution" | "high_risk"
+}): Promise<BatchOperationResult> => {
+  const response = await apiClient.post("/assets/batch-mark", data)
+  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
+}
@@ -1,86 +0,0 @@
-/**
- * 素材 CRUD API
- */
-import apiClient from "../client"
-import type { AssetItem, AssetMetadata } from "./types"
-
-/** 获取素材库下的所有素材 */
-export const getAssets = async (
-  libraryId: string,
-  options?: {
-    status?: string
-    page?: number
-    page_size?: number
-  },
-): Promise<{ items: AssetItem[]; total: number }> => {
-  const params: Record<string, string | number> = { library_id: libraryId }
-  if (options?.status) params.status = options.status
-  if (options?.page) params.page = options.page
-  if (options?.page_size) params.page_size = options.page_size
-  const response = await apiClient.get("/assets", { params })
-  const data = response.data || {}
-  const items: AssetItem[] = data.items || []
-  const total: number = typeof data.total === "number" ? data.total : items.length
-  return { items, total }
-}
-
-/** 按类型获取素材（如 voice/video/image），支持可选筛选 */
-export const getAssetsByKind = async (
-  kind: string,
-  filters?: {
-    keyword?: string
-    gender?: string
-    style?: string
-    tag_ids?: string[]
-    limit?: number
-    page?: number
-    page_size?: number
-  },
-): Promise<AssetItem[]> => {
-  const params: Record<string, string | number> = { kind }
-  if (filters?.keyword) params.keyword = filters.keyword
-  if (filters?.gender) params.gender = filters.gender
-  if (filters?.style) params.style = filters.style
-  if (filters?.tag_ids?.length) params.tag_ids = filters.tag_ids.join(",")
-  if (filters?.limit) params.limit = filters.limit
-  if (filters?.page) params.page = filters.page
-  if (filters?.page_size) params.page_size = filters.page_size
-  const response = await apiClient.get("/assets", { params })
-  return response.data.items || []
-}
-
-/**
- * 智能匹配素材（后端 AI 选素材）
- * 调用后端 smart-match 端点，由后端根据素材库内容智能选择素材
- */
-export const smartMatchAssets = async (libraryId: string): Promise<{ items: AssetItem[] }> => {
-  const response = await apiClient.post("/assets/smart-match", {
-    library_id: libraryId,
-  })
-  return response.data
-}
-
-/** 更新素材（名称、metadata 等） */
-export const updateAsset = async (
-  assetId: string,
-  data: { name?: string; metadata?: AssetMetadata },
-): Promise<AssetItem> => {
-  const response = await apiClient.put(`/assets/${assetId}`, data)
-  return response.data
-}
-
-/** 更新素材审核状态 */
-export const updateAssetReviewStatus = async (
-  assetId: string,
-  reviewStatus: "pending_review" | "approved" | "rejected",
-): Promise<AssetItem> => {
-  const response = await apiClient.patch(`/assets/${assetId}/review`, {
-    review_status: reviewStatus,
-  })
-  return response.data
-}
-
-/** 删除素材 */
-export const deleteAsset = async (assetId: string): Promise<void> => {
-  await apiClient.delete(`/assets/${assetId}`)
-}
@@ -1,51 +0,0 @@
-/**
- * 素材批量操作 API
- */
-import apiClient from "../client"
-import type { BatchOperationResult } from "./types"
-
-/** 统一批量操作结果归一化，防御后端字段缺失或格式不一致 */
-export const normalizeBatchResult = (raw: Record<string, unknown>): BatchOperationResult => {
-  const succeeded = Array.isArray(raw.succeeded) ? (raw.succeeded as string[]) : []
-  const failed = Array.isArray(raw.failed) ? (raw.failed as string[]) : []
-  const success_count = typeof raw.success_count === "number" ? raw.success_count : succeeded.length
-  const failure_count = typeof raw.failure_count === "number" ? raw.failure_count : failed.length
-  const total = typeof raw.total === "number" ? raw.total : success_count + failure_count
-  return { succeeded, failed, total, success_count, failure_count }
-}
-
-/** 批量删除素材 */
-export const batchDeleteAssets = async (assetIds: string[]): Promise<BatchOperationResult> => {
-  const response = await apiClient.post("/assets/batch-delete", {
-    asset_ids: assetIds,
-  })
-  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
-}
-
-/** 批量打标签 */
-export const batchTagAssets = async (data: {
-  asset_ids: string[]
-  tags: string[]
-  mode: "add" | "replace"
-}): Promise<BatchOperationResult> => {
-  const response = await apiClient.post("/assets/batch-tag", data)
-  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
-}
-
-/** 批量改分类 */
-export const batchClassifyAssets = async (data: {
-  asset_ids: string[]
-  category: string
-}): Promise<BatchOperationResult> => {
-  const response = await apiClient.post("/assets/batch-classify", data)
-  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
-}
-
-/** 批量智能标记 */
-export const batchMarkAssets = async (data: {
-  asset_ids: string[]
-  smart_view: "recommended" | "caution" | "high_risk"
-}): Promise<BatchOperationResult> => {
-  const response = await apiClient.post("/assets/batch-mark", data)
-  return normalizeBatchResult((response.data || {}) as Record<string, unknown>)
-}
@@ -1,13 +0,0 @@
-/**
- * 素材诊断 API
- */
-import apiClient from "../client"
-import type { AssetDiagnosis } from "./types"
-
-/** 获取素材诊断信息（可选 asset_id 查单素材，否则全局诊断） */
-export const getAssetDiagnosis = async (assetId?: string): Promise<AssetDiagnosis> => {
-  const params: Record<string, string> = {}
-  if (assetId) params.asset_id = assetId
-  const response = await apiClient.get("/asset-diagnosis", { params })
-  return response.data
-}
@@ -1,54 +0,0 @@
-/**
- * 素材相关 API — 按模块拆分后的统一入口
- * 保持与原 assets.ts 相同的导出结构，向后兼容
- */
-
-// 类型
-export type {
-  AssetMetadata,
-  AssetClassificationStatus,
-  AssetItem,
-  AssetLibraryItem,
-  IngestJob,
-  ClassificationJob,
-  AssetDiagnosis,
-  BatchOperationResult,
-  DirectUploadPrepareResult,
-  DirectUploadCompleteResult,
-} from "./types"
-
-// 素材诊断
-export { getAssetDiagnosis } from "./diagnosis"
-
-// 素材库
-export {
-  getAssetLibraries,
-  createAssetLibrary,
-  ensureDefaultLibrary,
-  deleteAssetLibrary,
-} from "./libraries"
-
-// 素材 CRUD + 智能匹配
-export {
-  getAssets,
-  getAssetsByKind,
-  smartMatchAssets,
-  updateAsset,
-  updateAssetReviewStatus,
-  deleteAsset,
-} from "./assets"
-
-// 上传
-export { prepareDirectUpload, completeDirectUpload, uploadAssetDirect } from "./upload"
-
-// 任务
-export { getIngestJob, submitClassificationJob, getClassificationJob } from "./jobs"
-
-// 批量操作
-export {
-  normalizeBatchResult,
-  batchDeleteAssets,
-  batchTagAssets,
-  batchClassifyAssets,
-  batchMarkAssets,
-} from "./batch"
@@ -1,25 +0,0 @@
-/**
- * 入库任务 & 分类任务 API
- */
-import apiClient from "../client"
-import type { IngestJob, ClassificationJob } from "./types"
-
-/** 查询入库任务状态 */
-export const getIngestJob = async (jobId: string): Promise<IngestJob> => {
-  const response = await apiClient.get(`/ingest-jobs/${jobId}`)
-  return response.data
-}
-
-/** 提交素材分类任务 */
-export const submitClassificationJob = async (data: {
-  asset_id: string
-}): Promise<ClassificationJob> => {
-  const response = await apiClient.post("/classification-jobs", data)
-  return response.data
-}
-
-/** 查询分类任务状态 */
-export const getClassificationJob = async (jobId: string): Promise<ClassificationJob> => {
-  const response = await apiClient.get(`/classification-jobs/${jobId}`)
-  return response.data
-}
@@ -1,39 +0,0 @@
-/**
- * 素材库 API
- */
-import apiClient from "../client"
-import { getOrCreateDefaultProject } from "../projects"
-import type { AssetLibraryItem } from "./types"
-
-/** 获取当前用户的所有素材库 */
-export const getAssetLibraries = async (): Promise<AssetLibraryItem[]> => {
-  const response = await apiClient.get("/asset-libraries")
-  return response.data.items || []
-}
-
-/** 创建素材库（自动获取或创建默认项目以提供 project_id） */
-export const createAssetLibrary = async (data: {
-  name: string
-  kind: "video" | "voice" | "image"
-}): Promise<AssetLibraryItem> => {
-  const project = await getOrCreateDefaultProject()
-  const response = await apiClient.post("/asset-libraries", {
-    project_id: project.id,
-    ...data,
-  })
-  return response.data
-}
-
-/** 确保项目下指定 kind 的默认素材库存在 */
-export const ensureDefaultLibrary = async (data: {
-  project_id: string
-  kind: "video" | "voice" | "image"
-}): Promise<AssetLibraryItem> => {
-  const response = await apiClient.post("/asset-libraries/ensure-default", data)
-  return response.data
-}
-
-/** 删除素材库 */
-export const deleteAssetLibrary = async (libraryId: string): Promise<void> => {
-  await apiClient.delete(`/asset-libraries/${libraryId}`)
-}
@@ -1,139 +0,0 @@
-/**
- * 素材相关类型定义
- */
-
-/** 素材元数据 */
-export interface AssetMetadata {
-  /** 时长（秒） */
-  duration?: number
-  /** 宽度（像素） */
-  width?: number
-  /** 高度（像素） */
-  height?: number
-  /** 比特率（bps） */
-  bitrate?: number
-  /** 编码格式 */
-  codec?: string
-  /** 帧率 */
-  fps?: number
-  /** 采样率（Hz） */
-  sample_rate?: number
-  /** 声道数 */
-  channels?: number
-  /** 其他扩展字段 */
-  [key: string]: unknown
-}
-
-/** 素材分类状态 */
-export type AssetClassificationStatus = "pending" | "processing" | "completed" | "failed"
-
-/** 素材条目 */
-export interface AssetItem {
-  id: string
-  library_id: string
-  name: string
-  storage_key: string
-  mime_type: string
-  metadata: AssetMetadata
-  file_size?: number
-  file_url?: string
-  thumbnail_url?: string
-  /** 时长（秒），视频/音频素材由后端从 metadata 提取到顶层 */
-  duration?: number
-  status?: string
-  classification_status?: AssetClassificationStatus | null
-  quality_score?: number | null
-  tag_ids?: string[]
-  created_at?: string
-}
-
-/** 素材库 */
-export interface AssetLibraryItem {
-  id: string
-  name: string
-  kind: "video" | "voice" | "image"
-  asset_count?: number
-  total_size?: number
-  created_at?: string
-}
-
-/** 入库任务 */
-export interface IngestJob {
-  id: string
-  library_id: string
-  storage_key: string
-  status: "pending" | "processing" | "completed" | "failed"
-  error_message: string
-  result_asset_id: string
-}
-
-/** 分类任务 */
-export interface ClassificationJob {
-  id: string
-  asset_id: string
-  status: "pending" | "processing" | "completed" | "failed"
-  classification: string
-  confidence: number
-  error_message: string
-}
-
-/** 素材诊断信息 */
-export interface AssetDiagnosis {
-  readiness_score: number
-  readiness_label: string
-  total_assets: number
-  ready_assets: number
-  video_assets: number
-  image_assets: number
-  voice_assets: number
-  total_duration_seconds: number
-  estimated_video_count: number
-  used_assets: number
-  unused_assets: number
-  pending_review_assets: number
-  smart_views: Array<{
-    key: string
-    label: string
-    count: number
-    description: string
-  }>
-  gaps: Array<{
-    key: string
-    severity: "critical" | "warning" | "info"
-    message: string
-    recommendation: string
-  }>
-}
-
-/** 批量操作结果 */
-export interface BatchOperationResult {
-  succeeded: string[]
-  failed: string[]
-  total: number
-  success_count: number
-  failure_count: number
-}
-
-/** 上传返回 */
-export interface UploadResult {
-  storage_key: string
-  ingest_job_id: string
-  url: string
-}
-
-/** 预签名直传准备返回 */
-export interface DirectUploadPrepareResult {
-  upload_url: string
-  method: string
-  storage_key: string
-  expires_at: string
-  fields: Record<string, string>
-  max_size_bytes: number
-}
-
-/** 直传完成确认返回 */
-export interface DirectUploadCompleteResult {
-  storage_key: string
-  ingest_job_id: string
-  url: string
-}
@@ -1,110 +0,0 @@
-/**
- * 上传相关 API（表单上传 + OSS 直传）
- */
-import apiClient from "../client"
-import { getOrCreateDefaultProject } from "../projects"
-import type { DirectUploadPrepareResult, DirectUploadCompleteResult } from "./types"
-
-/** 预签名直传准备 */
-export const prepareDirectUpload = async (data: {
-  project_id: string
-  library_id: string
-  filename: string
-  content_type: string
-  file_size: number
-}): Promise<DirectUploadPrepareResult> => {
-  const response = await apiClient.post("/upload/direct/prepare", data)
-  return response.data
-}
-
-/** 直传完成确认 */
-export const completeDirectUpload = async (data: {
-  project_id: string
-  library_id: string
-  storage_key: string
-}): Promise<DirectUploadCompleteResult> => {
-  const response = await apiClient.post("/upload/direct/complete", data)
-  return response.data
-}
-
-/** 直传上传（大文件推荐），支持可选进度回调 */
-export const uploadAssetDirect = async (data: {
-  file: File
-  library_id: string
-  onProgress?: (percent: number) => void
-}): Promise<DirectUploadCompleteResult> => {
-  const project = await getOrCreateDefaultProject()
-
-  const prepared = await prepareDirectUpload({
-    project_id: project.id,
-    library_id: data.library_id,
-    filename: data.file.name,
-    content_type: data.file.type || "application/octet-stream",
-    file_size: data.file.size,
-  })
-
-  const directForm = new FormData()
-  Object.entries(prepared.fields).forEach(([key, value]) => directForm.append(key, value))
-  directForm.append("file", data.file)
-
-  // 使用 XMLHttpRequest 以获取上传进度 + 超时控制 + 详细错误诊断
-  await new Promise<void>((resolve, reject) => {
-    const xhr = new XMLHttpRequest()
-    xhr.open(prepared.method, prepared.upload_url)
-
-    // 超时 10 分钟
-    xhr.timeout = 10 * 60 * 1000
-
-    xhr.upload.onprogress = (e) => {
-      if (e.lengthComputable && data.onProgress) {
-        data.onProgress(Math.round((e.loaded / e.total) * 100))
-      }
-    }
-    xhr.onload = () => {
-      if (xhr.status >= 200 && xhr.status < 300) {
-        resolve()
-      } else {
-        // 解析 OSS 返回的 XML 错误信息
-        let ossError = ""
-        try {
-          const codeMatch = xhr.responseText.match(/<Code>([^<]+)<\/Code>/)
-          const msgMatch = xhr.responseText.match(/<Message>([^<]+)<\/Message>/)
-          if (codeMatch || msgMatch) {
-            ossError = ` [OSS: ${codeMatch?.[1] || "unknown"} - ${msgMatch?.[1] || "unknown"}]`
-          }
-        } catch {
-          // 无法解析响应体
-        }
-        const detail = `OSS 直传失败: HTTP ${xhr.status} ${xhr.statusText}${ossError}`
-        console.error("[OSS Upload] 直传失败:", {
-          url: prepared.upload_url,
-          storage_key: prepared.storage_key,
-          status: xhr.status,
-          statusText: xhr.statusText,
-        })
-        reject(new Error(detail))
-      }
-    }
-    xhr.onerror = () => {
-      console.error("[OSS Upload] 网络错误:", {
-        url: prepared.upload_url,
-        storage_key: prepared.storage_key,
-      })
-      reject(new Error("OSS 上传网络错误，请检查网络连接"))
-    }
-    xhr.ontimeout = () => {
-      console.error("[OSS Upload] 上传超时:", {
-        url: prepared.upload_url,
-        storage_key: prepared.storage_key,
-      })
-      reject(new Error("OSS 上传超时（10分钟），请检查网络或尝试更小的文件"))
-    }
-    xhr.send(directForm)
-  })
-
-  return completeDirectUpload({
-    project_id: project.id,
-    library_id: data.library_id,
-    storage_key: prepared.storage_key,
-  })
-}
@@ -0,0 +1,188 @@
+/**
+ * 认证相关 API
+ */
+import axios from "axios"
+import apiClient from "./client"
+
+// 类型定义
+export interface LoginRequest {
+  email: string
+  password: string
+}
+
+export interface LoginResponse {
+  access_token: string
+  refresh_token?: string | null
+  token_type: string
+  expires_in: number
+  user_id: string
+  email: string
+  username: string
+  display_name: string
+}
+
+export interface RegisterRequest {
+  email: string
+  password: string
+  username: string
+  display_name?: string
+}
+
+export interface User {
+  id: string
+  user_id: string
+  email: string
+  username: string
+  display_name: string
+  is_email_verified: boolean
+  email_verified: boolean
+  created_at?: string
+}
+
+export interface UserResponse {
+  id?: string
+  user_id?: string
+  email: string
+  username: string
+  display_name: string
+  is_email_verified?: boolean
+  email_verified?: boolean
+  created_at?: string
+}
+
+export const normalizeUser = (data: UserResponse): User => {
+  const userId = data.id ?? data.user_id ?? ""
+  const emailVerified = data.is_email_verified ?? data.email_verified ?? false
+
+  return {
+    id: userId,
+    user_id: userId,
+    email: data.email,
+    username: data.username,
+    display_name: data.display_name,
+    is_email_verified: emailVerified,
+    email_verified: emailVerified,
+    created_at: data.created_at,
+  }
+}
+
+// 登录
+export const login = async (data: LoginRequest): Promise<LoginResponse> => {
+  const response = await apiClient.post("/auth/login", data)
+  return response.data
+}
+
+// 刷新 access_token（使用裸 axios 避免拦截器递归）
+export const refreshAccessToken = async (refreshToken: string): Promise<LoginResponse> => {
+  const baseURL = apiClient.defaults.baseURL ?? ""
+  const response = await axios.post(`${baseURL}/auth/refresh`, {
+    refresh_token: refreshToken,
+  })
+  return response.data
+}
+
+// 注册
+export const register = async (data: RegisterRequest): Promise<{ message: string }> => {
+  const response = await apiClient.post("/auth/register", data)
+  return response.data
+}
+
+// 登出
+export const logout = async (): Promise<void> => {
+  await apiClient.post("/auth/logout")
+}
+
+// 获取当前用户
+export const getCurrentUser = async (): Promise<User> => {
+  const response = await apiClient.get<UserResponse>("/auth/me")
+  return normalizeUser(response.data)
+}
+
+// 请求密码重置
+export const requestPasswordReset = async (email: string): Promise<{ message: string }> => {
+  const response = await apiClient.post("/auth/forgot-password", { email })
+  return response.data
+}
+
+// 重置密码
+export const resetPassword = async (
+  token: string,
+  newPassword: string,
+): Promise<{ message: string }> => {
+  const response = await apiClient.post("/auth/reset-password", {
+    token,
+    new_password: newPassword,
+  })
+  return response.data
+}
+
+// 验证邮箱
+export const verifyEmail = async (token: string): Promise<{ message: string }> => {
+  const response = await apiClient.post("/auth/verify-email", { token })
+  return response.data
+}
+
+/* ========== 微信登录 ========== */
+
+export interface WechatAuthUrlResponse {
+  auth_url: string
+  state: string
+}
+
+export interface WechatCallbackResponse {
+  access_token: string
+  refresh_token?: string | null
+  user_id: string
+  display_name: string
+  avatar_url: string
+  is_new_user: boolean
+  binding_complete: boolean
+  expires_in: number
+}
+
+export interface SendVerificationCodeRequest {
+  target: "email" | "phone"
+  value: string
+  purpose: "bind" | "login" | "reset_password"
+}
+
+export interface BindContactRequest {
+  email?: string
+  email_code?: string
+  phone?: string
+  phone_code?: string
+}
+
+export interface BindContactResponse {
+  success: boolean
+  user: User
+}
+
+// 获取微信授权链接
+export const getWechatAuthUrl = async (): Promise<WechatAuthUrlResponse> => {
+  const response = await apiClient.get("/auth/wechat/url")
+  return response.data
+}
+
+// 微信回调登录
+export const wechatCallback = async (
+  code: string,
+  state: string,
+): Promise<WechatCallbackResponse> => {
+  const response = await apiClient.post("/auth/wechat/callback", { code, state })
+  return response.data
+}
+
+// 发送验证码
+export const sendVerificationCode = async (
+  data: SendVerificationCodeRequest,
+): Promise<{ message: string }> => {
+  const response = await apiClient.post("/auth/send-verification-code", data)
+  return response.data
+}
+
+// 绑定联系方式
+export const bindContact = async (data: BindContactRequest): Promise<BindContactResponse> => {
+  const response = await apiClient.post("/auth/bind-contact", data)
+  return response.data
+}
@@ -1,20 +0,0 @@
-import apiClient from "../client"
-import type { SendVerificationCodeRequest, BindContactRequest, BindContactResponse } from "./types"
-
-/**
- * 发送验证码
- */
-export const sendVerificationCode = async (
-  data: SendVerificationCodeRequest,
-): Promise<{ message: string }> => {
-  const response = await apiClient.post("/auth/send-verification-code", data)
-  return response.data
-}
-
-/**
- * 绑定联系方式
- */
-export const bindContact = async (data: BindContactRequest): Promise<BindContactResponse> => {
-  const response = await apiClient.post("/auth/bind-contact", data)
-  return response.data
-}
@@ -1,11 +0,0 @@
-import apiClient from "../client"
-import type { User, UserResponse } from "./types"
-import { normalizeUser } from "./user"
-
-/**
- * 获取当前用户
- */
-export const getCurrentUser = async (): Promise<User> => {
-  const response = await apiClient.get<UserResponse>("/auth/me")
-  return normalizeUser(response.data)
-}
@@ -1,9 +0,0 @@
-import apiClient from "../client"
-
-/**
- * 验证邮箱
- */
-export const verifyEmail = async (token: string): Promise<{ message: string }> => {
-  const response = await apiClient.post("/auth/verify-email", { token })
-  return response.data
-}
@@ -1,39 +0,0 @@
-/**
- * 认证相关 API
- * 保持向后兼容，从子模块 re-export
- */
-
-// 类型
-export type {
-  LoginRequest,
-  LoginResponse,
-  RegisterRequest,
-  User,
-  UserResponse,
-  WechatAuthUrlResponse,
-  WechatCallbackResponse,
-  SendVerificationCodeRequest,
-  BindContactRequest,
-  BindContactResponse,
-} from "./types"
-
-// 用户工具函数
-export { normalizeUser } from "./user"
-
-// 登录/注册/登出/刷新
-export { login, refreshAccessToken, register, logout } from "./login"
-
-// 当前用户
-export { getCurrentUser } from "./currentUser"
-
-// 密码重置
-export { requestPasswordReset, resetPassword } from "./password"
-
-// 邮箱验证
-export { verifyEmail } from "./email"
-
-// 微信登录
-export { getWechatAuthUrl, wechatCallback } from "./wechat"
-
-// 联系方式
-export { sendVerificationCode, bindContact } from "./contact"
@@ -1,37 +0,0 @@
-import axios from "axios"
-import apiClient from "../client"
-import type { LoginRequest, LoginResponse, RegisterRequest } from "./types"
-
-/**
- * 登录
- */
-export const login = async (data: LoginRequest): Promise<LoginResponse> => {
-  const response = await apiClient.post("/auth/login", data)
-  return response.data
-}
-
-/**
- * 刷新 access_token（使用裸 axios 避免拦截器递归）
- */
-export const refreshAccessToken = async (refreshToken: string): Promise<LoginResponse> => {
-  const baseURL = apiClient.defaults.baseURL ?? ""
-  const response = await axios.post(`${baseURL}/auth/refresh`, {
-    refresh_token: refreshToken,
-  })
-  return response.data
-}
-
-/**
- * 注册
- */
-export const register = async (data: RegisterRequest): Promise<{ message: string }> => {
-  const response = await apiClient.post("/auth/register", data)
-  return response.data
-}
-
-/**
- * 登出
- */
-export const logout = async (): Promise<void> => {
-  await apiClient.post("/auth/logout")
-}
@@ -1,23 +0,0 @@
-import apiClient from "../client"
-
-/**
- * 请求密码重置
- */
-export const requestPasswordReset = async (email: string): Promise<{ message: string }> => {
-  const response = await apiClient.post("/auth/forgot-password", { email })
-  return response.data
-}
-
-/**
- * 重置密码
- */
-export const resetPassword = async (
-  token: string,
-  newPassword: string,
-): Promise<{ message: string }> => {
-  const response = await apiClient.post("/auth/reset-password", {
-    token,
-    new_password: newPassword,
-  })
-  return response.data
-}
@@ -1,109 +0,0 @@
-/**
- * 主动 Token 刷新模块
- *
- * 在 access_token 过期前主动刷新，避免 API 请求触发 401。
- * JWT payload 是 base64 编码的 JSON，无需第三方库即可解码。
- */
-import { useAuthStore } from "@/store/authStore"
-import { refreshAccessToken } from "./login"
-
-let refreshTimer: ReturnType<typeof setTimeout> | null = null
-
-/** 正在执行刷新操作的 Promise，防止主动刷新和 401 被动刷新并发竞争 */
-let activeRefreshPromise: Promise<void> | null = null
-
-/** 提前刷新的缓冲时间（秒） */
-const REFRESH_BUFFER_SECONDS = 60
-
-/**
- * 解码 JWT payload（不验签，仅读取 exp 字段）
- */
-function decodeJwtPayload(token: string): { exp?: number } | null {
-  try {
-    const parts = token.split(".")
-    if (parts.length !== 3) return null
-    // JWT 使用 base64url 编码，需要转换为标准 base64
-    const payload = parts[1].replace(/-/g, "+").replace(/_/g, "/")
-    const padded = payload + "=".repeat((4 - (payload.length % 4)) % 4)
-    const decoded = atob(padded)
-    return JSON.parse(decoded)
-  } catch {
-    return null
-  }
-}
-
-/**
- * 取消已调度的主动刷新
- */
-export function cancelProactiveRefresh(): void {
-  if (refreshTimer) {
-    clearTimeout(refreshTimer)
-    refreshTimer = null
-  }
-}
-
-/**
- * 执行 token 刷新（带并发锁，供主动刷新和被动 401 共用）
- * 返回当前刷新操作的 Promise；若已有刷新进行中则复用该 Promise。
- */
-export function executeTokenRefresh(): Promise<void> | null {
-  // 已有刷新进行中 → 复用
-  if (activeRefreshPromise) {
-    return activeRefreshPromise
-  }
-
-  const { user, refreshToken: refreshTokenValue } = useAuthStore.getState()
-
-  // 安全检查：user 或 refreshToken 为空时跳过刷新
-  if (!user || !refreshTokenValue) {
-    return null
-  }
-
-  activeRefreshPromise = (async () => {
-    try {
-      const data = await refreshAccessToken(refreshTokenValue)
-      const newAccessToken = data.access_token
-      const newRefreshToken = data.refresh_token ?? refreshTokenValue
-
-      // 更新 Zustand store + localStorage
-      useAuthStore.getState().setAuth(user, newAccessToken, newRefreshToken)
-
-      // 递归调度下一次刷新
-      scheduleProactiveRefresh()
-    } catch {
-      // 刷新失败 → 清除认证状态，跳转登录页
-      cancelProactiveRefresh()
-      useAuthStore.getState().clearAuth()
-      window.location.href = "/login"
-    } finally {
-      activeRefreshPromise = null
-    }
-  })()
-
-  return activeRefreshPromise
-}
-
-/**
- * 调度主动刷新：在 token 过期前 REFRESH_BUFFER_SECONDS 秒自动刷新
- */
-export function scheduleProactiveRefresh(): void {
-  cancelProactiveRefresh()
-
-  // 统一从 Zustand store 读取（与 setAuth 写入保持一致）
-  const { accessToken, refreshToken: refreshTokenValue } = useAuthStore.getState()
-
-  if (!accessToken || !refreshTokenValue) return
-
-  const payload = decodeJwtPayload(accessToken)
-  if (!payload?.exp) return
-
-  const now = Math.floor(Date.now() / 1000)
-  const secondsUntilExpiry = payload.exp - now
-
-  // 如果 token 已经过期或即将在缓冲时间内过期，立即刷新
-  const delaySeconds = Math.max(secondsUntilExpiry - REFRESH_BUFFER_SECONDS, 0)
-
-  refreshTimer = setTimeout(() => {
-    executeTokenRefresh()
-  }, delaySeconds * 1000)
-}
@@ -1,82 +0,0 @@
-/**
- * 认证相关类型定义
- */
-
-export interface LoginRequest {
-  email: string
-  password: string
-}
-
-export interface LoginResponse {
-  access_token: string
-  refresh_token?: string | null
-  token_type: string
-  expires_in: number
-  user_id: string
-  email: string
-  username: string
-  display_name: string
-}
-
-export interface RegisterRequest {
-  email: string
-  password: string
-  username: string
-  display_name?: string
-}
-
-export interface User {
-  id: string
-  user_id: string
-  email: string
-  username: string
-  display_name: string
-  is_email_verified: boolean
-  email_verified: boolean
-  created_at?: string
-}
-
-export interface UserResponse {
-  id?: string
-  user_id?: string
-  email: string
-  username: string
-  display_name: string
-  is_email_verified?: boolean
-  email_verified?: boolean
-  created_at?: string
-}
-
-export interface WechatAuthUrlResponse {
-  auth_url: string
-  state: string
-}
-
-export interface WechatCallbackResponse {
-  access_token: string
-  refresh_token?: string | null
-  user_id: string
-  display_name: string
-  avatar_url: string
-  is_new_user: boolean
-  binding_complete: boolean
-  expires_in: number
-}
-
-export interface SendVerificationCodeRequest {
-  target: "email" | "phone"
-  value: string
-  purpose: "bind" | "login" | "reset_password"
-}
-
-export interface BindContactRequest {
-  email?: string
-  email_code?: string
-  phone?: string
-  phone_code?: string
-}
-
-export interface BindContactResponse {
-  success: boolean
-  user: User
-}
@@ -1,20 +0,0 @@
-import type { User, UserResponse } from "./types"
-
-/**
- * 规范化用户数据，兼容不同后端返回格式
- */
-export const normalizeUser = (data: UserResponse): User => {
-  const userId = data.id ?? data.user_id ?? ""
-  const emailVerified = data.is_email_verified ?? data.email_verified ?? false
-
-  return {
-    id: userId,
-    user_id: userId,
-    email: data.email,
-    username: data.username,
-    display_name: data.display_name,
-    is_email_verified: emailVerified,
-    email_verified: emailVerified,
-    created_at: data.created_at,
-  }
-}
@@ -1,21 +0,0 @@
-import apiClient from "../client"
-import type { WechatAuthUrlResponse, WechatCallbackResponse } from "./types"
-
-/**
- * 获取微信授权链接
- */
-export const getWechatAuthUrl = async (): Promise<WechatAuthUrlResponse> => {
-  const response = await apiClient.get("/auth/wechat/url")
-  return response.data
-}
-
-/**
- * 微信回调登录
- */
-export const wechatCallback = async (
-  code: string,
-  state: string,
-): Promise<WechatCallbackResponse> => {
-  const response = await apiClient.post("/auth/wechat/callback", { code, state })
-  return response.data
-}
@@ -0,0 +1,68 @@
+/**
+ * BGM 预设音乐 API
+ * 对接后端 BGM 混音能力：预设列表查询（按风格分类 + 关键词搜索）
+ */
+import apiClient from "./client"
+
+/* ──────────── 类型 ──────────── */
+
+/** BGM 风格分类 */
+export type BgmCategory = "轻快" | "治愈" | "科技" | "电商"
+
+/** BGM 预设项 */
+export interface BgmPreset {
+  id: string
+  name: string
+  category: BgmCategory
+  /** 音频文件 URL */
+  url: string
+  /** 时长（秒） */
+  duration: number
+  /** 关键词标签 */
+  tags: string[]
+  /** 封面图 URL */
+  cover_url?: string
+}
+
+/** BGM 预设列表查询参数 */
+export interface BgmPresetsQuery {
+  category?: BgmCategory | string
+  keyword?: string
+}
+
+/** BGM 混音配置（嵌入模板） */
+export interface BgmMixConfig {
+  /** 是否启用 BGM */
+  enabled: boolean
+  /** 选中的 BGM ID */
+  music_id: string
+  /** BGM 音量 0-100 */
+  volume: number
+  /** 淡入时长（秒） 0-3 */
+  fade_in: number
+  /** 淡出时长（秒） 0-3 */
+  fade_out: number
+  /** 人声闪避（sidechain） */
+  voice_dodge: boolean
+}
+
+/** 默认 BGM 混音配置 */
+export const DEFAULT_BGM_MIX_CONFIG: BgmMixConfig = {
+  enabled: false,
+  music_id: "",
+  volume: 50,
+  fade_in: 0.5,
+  fade_out: 0.5,
+  voice_dodge: true,
+}
+
+/* ──────────── API ──────────── */
+
+/** 获取 BGM 预设列表 */
+export const getBgmPresets = async (params?: BgmPresetsQuery): Promise<BgmPreset[]> => {
+  const searchParams: Record<string, string> = {}
+  if (params?.category) searchParams.category = params.category
+  if (params?.keyword) searchParams.keyword = params.keyword
+  const res = await apiClient.get("/bgm/presets", { params: searchParams })
+  return res.data?.data ?? res.data ?? []
+}
@@ -1,14 +0,0 @@
-/**
- * BGM 预设音乐 API 函数
- */
-import apiClient from "../client"
-import type { BgmPreset, BgmPresetsQuery } from "./types"
-
-/** 获取 BGM 预设列表 */
-export const getBgmPresets = async (params?: BgmPresetsQuery): Promise<BgmPreset[]> => {
-  const searchParams: Record<string, string> = {}
-  if (params?.category) searchParams.category = params.category
-  if (params?.keyword) searchParams.keyword = params.keyword
-  const res = await apiClient.get("/bgm/presets", { params: searchParams })
-  return res.data?.data ?? res.data ?? []
-}
@@ -1,14 +0,0 @@
-/**
- * BGM 相关常量
- */
-import type { BgmMixConfig } from "./types"
-
-/** 默认 BGM 混音配置 */
-export const DEFAULT_BGM_MIX_CONFIG: BgmMixConfig = {
-  enabled: false,
-  music_id: "",
-  volume: 50,
-  fade_in: 0.5,
-  fade_out: 0.5,
-  voice_dodge: true,
-}
@@ -1,13 +0,0 @@
-/**
- * BGM API — 目录化入口
- * 保持与原 bgm.ts 相同导出，向后兼容
- */
-
-// 类型
-export type { BgmCategory, BgmPreset, BgmPresetsQuery, BgmMixConfig } from "./types"
-
-// 常量
-export { DEFAULT_BGM_MIX_CONFIG } from "./constants"
-
-// API 函数
-export { getBgmPresets } from "./bgm"
@@ -1,43 +0,0 @@
-/**
- * BGM 相关类型定义
- */
-
-/** BGM 风格分类 */
-export type BgmCategory = "轻快" | "治愈" | "科技" | "电商"
-
-/** BGM 预设项 */
-export interface BgmPreset {
-  id: string
-  name: string
-  category: BgmCategory
-  /** 音频文件 URL */
-  url: string
-  /** 时长（秒） */
-  duration: number
-  /** 关键词标签 */
-  tags: string[]
-  /** 封面图 URL */
-  cover_url?: string
-}
-
-/** BGM 预设列表查询参数 */
-export interface BgmPresetsQuery {
-  category?: BgmCategory | string
-  keyword?: string
-}
-
-/** BGM 混音配置（嵌入模板） */
-export interface BgmMixConfig {
-  /** 是否启用 BGM */
-  enabled: boolean
-  /** 选中的 BGM ID */
-  music_id: string
-  /** BGM 音量 0-100 */
-  volume: number
-  /** 淡入时长（秒） 0-3 */
-  fade_in: number
-  /** 淡出时长（秒） 0-3 */
-  fade_out: number
-  /** 人声闪避（sidechain） */
-  voice_dodge: boolean
-}
@@ -5,8 +5,7 @@
 import axios, { AxiosError, InternalAxiosRequestConfig } from "axios"
 import { message } from "antd"
 import { useAuthStore } from "@/store/authStore"
-
-import { cancelProactiveRefresh, executeTokenRefresh } from "./auth/tokenRefresh"
+import { refreshAccessToken } from "./auth"

 // 创建 Axios 实例
 const apiClient = axios.create({
@@ -58,21 +57,7 @@ apiClient.interceptors.response.use(
    }

    // 401 → 尝试刷新 Token
-    // 排除 auth 端点：登录/注册/找回密码的 401 是正常业务响应（如密码错误），
-    // 不应触发 token 刷新或登出跳转，走后面的错误提示逻辑即可
-    const requestUrl = originalRequest?.url || ""
-    const isAuthEndpoint =
-      requestUrl.includes("/auth/login") ||
-      requestUrl.includes("/auth/register") ||
-      requestUrl.includes("/auth/forgot-password") ||
-      requestUrl.includes("/auth/reset-password")
-
-    if (
-      error.response?.status === 401 &&
-      originalRequest &&
-      !originalRequest._retry &&
-      !isAuthEndpoint
-    ) {
+    if (error.response?.status === 401 && originalRequest && !originalRequest._retry) {
      const refreshToken = useAuthStore.getState().refreshToken

      // 无 refresh_token → 直接登出
@@ -98,22 +83,14 @@ apiClient.interceptors.response.use(
      isRefreshing = true

      try {
-        // 使用共享的刷新函数（带并发锁 + 安全检查）
-        const refreshPromise = executeTokenRefresh()
-        if (!refreshPromise) {
-          // user 或 refreshToken 为空，无法刷新
-          cancelProactiveRefresh()
-          useAuthStore.getState().clearAuth()
-          window.location.href = "/"
-          return Promise.reject(new Error("Unable to refresh: missing user or refresh token"))
-        }
-        await refreshPromise
+        const data = await refreshAccessToken(refreshToken)
+        const newAccessToken = data.access_token
+        const newRefreshToken = data.refresh_token ?? refreshToken

-        // 获取刷新后的新 token
-        const newAccessToken = useAuthStore.getState().accessToken
-        if (!newAccessToken) {
-          return Promise.reject(new Error("Token refresh failed: no new access token"))
-        }
+        // 更新 Zustand + localStorage
+        useAuthStore
+          .getState()
+          .setAuth(useAuthStore.getState().user!, newAccessToken, newRefreshToken)

        // 处理排队的请求
        processQueue(null, newAccessToken)
@@ -125,7 +102,6 @@ apiClient.interceptors.response.use(
        return apiClient(originalRequest)
      } catch (refreshError) {
        // 刷新失败 → 登出
-        cancelProactiveRefresh()
        processQueue(refreshError, null)
        useAuthStore.getState().clearAuth()
        window.location.href = "/"
@@ -1,53 +0,0 @@
-/**
- * 封面模板 CRUD API
- * 后端路由: /api/v1/cover-templates
- */
-import apiClient from "./client"
-import type { CoverTemplate } from "@/pages/generate/types/cover"
-
-export interface CoverTemplateListResponse {
-  items: CoverTemplate[]
-  total: number
-}
-
-export interface CoverTemplateCreateRequest {
-  name: string
-  config?: {
-    background_enabled?: boolean
-    background_color?: string
-    portrait_enabled?: boolean
-    title_text?: string
-    subtitle_text?: string
-    mask_enabled?: boolean
-  }
-}
-
-export type CoverTemplateUpdateRequest = Partial<CoverTemplateCreateRequest>
-
-/** 获取封面模板列表 */
-export async function fetchCoverTemplates(): Promise<CoverTemplateListResponse> {
-  const response = await apiClient.get<CoverTemplateListResponse>("/cover-templates")
-  return response.data
-}
-
-/** 创建封面模板 */
-export async function createCoverTemplate(
-  data: CoverTemplateCreateRequest,
-): Promise<CoverTemplate> {
-  const response = await apiClient.post<CoverTemplate>("/cover-templates", data)
-  return response.data
-}
-
-/** 更新封面模板 */
-export async function updateCoverTemplate(
-  id: string,
-  data: CoverTemplateUpdateRequest,
-): Promise<CoverTemplate> {
-  const response = await apiClient.put<CoverTemplate>(`/cover-templates/${id}`, data)
-  return response.data
-}
-
-/** 删除封面模板（系统模板不可删） */
-export async function deleteCoverTemplate(id: string): Promise<void> {
-  await apiClient.delete(`/cover-templates/${id}`)
-}
@@ -1,6 +1,8 @@
 /**
- * 查重相关类型定义
+ * 查重 API 模块
+ * 提供视频查重相关接口
 */
+import apiClient from "./client"

 /** 查重记录状态 */
 export type DuplicationStatus = "pending" | "processing" | "completed" | "failed"
@@ -60,3 +62,38 @@ export interface DuplicationUploadResponse {
  /** 消息 */
  message: string
 }
+
+// ============ API 函数 ============
+
+/** 上传视频进行查重 */
+export const uploadForDuplication = async (file: File): Promise<DuplicationUploadResponse> => {
+  const formData = new FormData()
+  formData.append("file", file)
+  const response = await apiClient.post("/duplication/upload", formData, {
+    headers: { "Content-Type": "multipart/form-data" },
+  })
+  return response.data
+}
+
+/** 获取查重记录列表 */
+export const getDuplicationRecords = async (): Promise<DuplicationRecord[]> => {
+  const response = await apiClient.get("/duplication/records")
+  return response.data
+}
+
+/** 获取查重详情 */
+export const getDuplicationDetail = async (recordId: string): Promise<DuplicationDetail> => {
+  const response = await apiClient.get(`/duplication/records/${recordId}`)
+  return response.data
+}
+
+/** 删除查重记录 */
+export const deleteDuplicationRecord = async (recordId: string): Promise<void> => {
+  await apiClient.delete(`/duplication/records/${recordId}`)
+}
+
+/** 重新查重 */
+export const retryDuplication = async (recordId: string): Promise<DuplicationUploadResponse> => {
+  const response = await apiClient.post(`/duplication/records/${recordId}/retry`)
+  return response.data
+}
@@ -1,38 +0,0 @@
-/**
- * 查重 API 函数
- */
-import apiClient from "../client"
-import type { DuplicationDetail, DuplicationRecord, DuplicationUploadResponse } from "./types"
-
-/** 上传视频进行查重 */
-export const uploadForDuplication = async (file: File): Promise<DuplicationUploadResponse> => {
-  const formData = new FormData()
-  formData.append("file", file)
-  const response = await apiClient.post("/duplication/upload", formData, {
-    headers: { "Content-Type": "multipart/form-data" },
-  })
-  return response.data
-}
-
-/** 获取查重记录列表 */
-export const getDuplicationRecords = async (): Promise<DuplicationRecord[]> => {
-  const response = await apiClient.get("/duplication/records")
-  return response.data
-}
-
-/** 获取查重详情 */
-export const getDuplicationDetail = async (recordId: string): Promise<DuplicationDetail> => {
-  const response = await apiClient.get(`/duplication/records/${recordId}`)
-  return response.data
-}
-
-/** 删除查重记录 */
-export const deleteDuplicationRecord = async (recordId: string): Promise<void> => {
-  await apiClient.delete(`/duplication/records/${recordId}`)
-}
-
-/** 重新查重 */
-export const retryDuplication = async (recordId: string): Promise<DuplicationUploadResponse> => {
-  const response = await apiClient.post(`/duplication/records/${recordId}/retry`)
-  return response.data
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiaoxia	6104889633	style: 修复ruff check告警（未用import/循环变量/zip strict）	2026-07-23 17:46:40 +08:00
xiaoxia	555a3f64c8	fix(ci): 前端脚本改用npm ci（项目用package-lock.json而非pnpm） CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 16s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Failing after 1m55s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m9s Details CI/CD Pipeline / Frontend Lint (pull_request) Successful in 40s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Worker Image (pull_request) Failing after 28s Details CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 36s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m27s Details Preview Deploy / Deploy Preview Environment (pull_request) Failing after 28s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 53s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 47s Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 3m41s Details AI Code Review / AI Code Review (pull_request) Successful in 3m36s Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 5m44s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 5m55s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 51s Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details	2026-07-23 17:37:44 +08:00
xiaoxia	5daec0ef97	fix(ci): 去掉前端脚本DooD嵌套，直接在CI容器内运行	2026-07-23 17:37:44 +08:00
xiaoxia	0a424bbc46	style: 用black+isort重新格式化（与CI工具链对齐） CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 6s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m14s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Failing after 1m36s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Failing after 34s Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m3s Details CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 1m4s Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build API Image (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been cancelled Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been cancelled Details AI Code Review / AI Code Review (pull_request) Has been cancelled Details Preview Deploy / Deploy Preview Environment (pull_request) Has been cancelled Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m5s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m27s Details	2026-07-23 17:32:34 +08:00
xiaoxia	570815b487	style: ruff format格式化2个文件 CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 12s Details CI/CD Pipeline / Frontend Lint (pull_request) Failing after 19s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m10s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Failing after 1m41s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m18s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 36s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 51s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m0s Details Preview Deploy / Deploy Preview Environment (pull_request) Failing after 27s Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details AI Code Review / AI Code Review (pull_request) Successful in 2m38s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 5m10s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m50s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 4m24s Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 14m21s Details	2026-07-23 13:58:26 +08:00