Merge pull request 'fix: 确认生成 API 改为复用 worker.generate_video 渲染路径' (#1308) from fix/confirm-generation-api into main

- 新增 ConfirmGenerationRequest schema 和 POST /tasks/{task_id}/confirm 端点
- 确认生成复用 worker.generate_video 完整渲染路径（不再走 edit_plan_generation.py）
- 默认分辨率 1080x1920（竖屏），支持自定义封面和标题
- 新增字段: is_preview, source_task_id, output_width, output_height, cover_url, custom_title
- 贯穿 Schema → Domain → Application → DB Model → Repository → Worker 全链路
- 更新 task_center.py 和 generation_tasks.py 的重试逻辑传递新字段
- Alembic 迁移 034: 为 generation_tasks 表添加 6 个新列
- 7 个单元测试覆盖确认生成的正常/异常流程
- 使用 getattr 带默认值确保向后兼容

.env.example

@@ -44,14 +44,9 @@ 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_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_BASE_URL=https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio
+COSYVOICE_MODEL=cosyvoice-v1
+COSYVOICE_VOICE=longxiaochun
 COSYVOICE_SAMPLE_RATE=22050
 COSYVOICE_FORMAT=mp3

.env.production.example

@@ -42,15 +42,10 @@ OSS_DIRECT_UPLOAD_MAX_MB=2000
 OSS_DIRECT_UPLOAD_EXPIRE_SECONDS=900
 
 # ==================== 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_API_KEY=CHANGE_ME_COSYVOICE_API_KEY
-COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
-COSYVOICE_MODEL=cosyvoice-v3-flash
-COSYVOICE_VOICE=longxiaochun_v3
+COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio
+COSYVOICE_MODEL=cosyvoice-v1
+COSYVOICE_VOICE=longxiaochun
 COSYVOICE_SAMPLE_RATE=22050
 COSYVOICE_FORMAT=mp3
 

.flake8

@@ -2,7 +2,6 @@
 max-line-length = 120
 exclude =
     .git,
-    .cache,
     __pycache__,
     .venv,
     venv,

.gitea/workflows/acr-cleanup.yml

@@ -0,0 +1,172 @@
+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_HOST: ${{ secrets.STAGING_SSH_HOST }}
+          STAGING_SSH_PORT: ${{ secrets.STAGING_SSH_PORT }}
+          STAGING_SSH_USER: ${{ secrets.STAGING_SSH_USER }}
+          STAGING_SSH_KEY: ${{ secrets.STAGING_SSH_KEY }}
+        run: |
+          set +e
+          echo "获取staging服务器运行中镜像作为白名单..."
+          staging_host="${STAGING_SSH_HOST:-47.98.113.167}"
+          staging_port="${STAGING_SSH_PORT:-22222}"
+          staging_user="${STAGING_SSH_USER:-root}"
+
+          key_path=~/.ssh/id_rsa
+          if [ -n "${STAGING_SSH_KEY:-}" ]; then
+            printf '%s\n' "$STAGING_SSH_KEY" > "$key_path"
+            chmod 600 "$key_path"
+            echo "Using key from STAGING_SSH_KEY secret"
+          else
+            echo "⚠️  STAGING_SSH_KEY not set, skipping whitelist"
+            echo "protected_tags=" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          ssh-keyscan -p "$staging_port" -H "$staging_host" >> ~/.ssh/known_hosts 2>/dev/null
+
+          # 获取所有运行容器的镜像，提取tag部分
+          IMAGES=$(ssh -p "$staging_port" -i "$key_path" -o StrictHostKeyChecking=no \
+            "$staging_user@$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" >> $GITHUB_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

.gitea/workflows/ci-failure-monitor.yml

@@ -0,0 +1,78 @@
+name: CI Failure Monitor
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'  # 每6小时检查一次
+  workflow_dispatch:
+    inputs:
+      days:
+        description: '统计最近N天的失败'
+        required: false
+        default: '7'
+      fail_threshold:
+        description: '失败次数阈值'
+        required: false
+        default: '3'
+      fail_rate_threshold:
+        description: '失败率阈值(%)'
+        required: false
+        default: '30'
+
+permissions:
+  contents: read
+
+jobs:
+  monitor:
+    name: CI重复失败检测
+    runs-on: ci-l2
+    timeout-minutes: 10
+
+    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: Record job start time
+      shell: sh
+      run: bash scripts/ci/step_timer_start.sh
+
+    - name: Run failure detection
+      shell: sh
+      env:
+        GITEA_API_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+        GITEA_URL: https://git.xiaoxiajianji.com
+        GITEA_REPO: xiaoxia/xiaoxia-saas
+        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
+        FAIL_CHECK_DAYS: ${{ inputs.days || 7 }}
+        FAIL_THRESHOLD: ${{ inputs.fail_threshold || 3 }}
+        FAIL_RATE_THRESHOLD: ${{ inputs.fail_rate_threshold || 30 }}
+      run: |
+        set +e
+        python3 scripts/ci/ci_repeated_failure_detector.py
+        EXIT_CODE=$?
+        echo "检测完成，退出码: $EXIT_CODE"
+        # 0=无异常, 1=有警告, 2=有严重问题
+        # 监控脚本永远不fail，避免告警风暴
+        exit 0
+
+    - name: Job duration summary
+      if: always()
+      shell: sh
+      run: bash scripts/ci/step_timer_end.sh
+
+    - 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

.gitea/workflows/ci-health-daily.yml

@@ -0,0 +1,103 @@
+name: CI Health Daily Report
+on:
+  schedule:
+    - cron: '0 1 * * *'  # UTC 01:00 = 北京时间 09:00
+  workflow_dispatch:
+permissions:
+  contents: read
+jobs:
+  ci-health-report:
+    name: CI健康度每日巡检
+    runs-on: ci-l2
+    timeout-minutes: 15
+    steps:
+    - name: Checkout code
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        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: Generate CI Dashboard HTML
+      shell: sh
+      env:
+        GITEA_TOKEN: ${{ github.token }}
+      run: |
+        set +e
+        echo "=== 生成 CI 健康度 HTML 看板 ==="
+        echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
+        echo ""
+        python3 scripts/ci/ci_dashboard.py --days 7 --html --html-output ci_dashboard.html
+        EXIT_CODE=$?
+        if [ $EXIT_CODE -eq 0 ] && [ -f ci_dashboard.html ]; then
+            HTML_SIZE=$(wc -c < ci_dashboard.html)
+            echo ""
+            echo "✅ HTML 看板生成成功 (${HTML_SIZE} bytes)"
+            echo "路径: $(pwd)/ci_dashboard.html"
+            # 输出文件内容前几行，方便在 Actions 日志中确认
+            echo ""
+            echo "--- 看板预览 (前 5 行) ---"
+            head -5 ci_dashboard.html
+            echo "...（完整内容见产物文件）"
+        else
+            echo "❌ HTML 看板生成失败 (exit code: $EXIT_CODE)"
+        fi
+        echo ""
+        # 永远成功，看板生成失败不影响主流程
+        exit 0
+
+    - name: Run CI health check and report
+      shell: sh
+      env:
+        GITEA_TOKEN: ${{ github.token }}
+        CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
+      run: |
+        set +e
+        echo "=== CI健康度每日巡检 ==="
+        echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
+        echo ""
+        python3 scripts/ci/ci_health_report.py --limit 30
+        EXIT_CODE=$?
+        echo ""
+        echo "巡检完成 (exit code: $EXIT_CODE)"
+        # 永远成功，不影响CI状态（通知失败不应该标红）
+        exit 0

.gitea/workflows/ci-trigger-monitor.yml

@@ -0,0 +1,52 @@
+name: CI Trigger Monitor
+
+on:
+  schedule:
+    - cron: '*/5 * * * *'  # 每5分钟检查一次
+  workflow_dispatch:
+    inputs:
+      stale_threshold:
+        description: 'CI未触发告警阈值（分钟）'
+        required: false
+        default: '5'
+
+permissions:
+  contents: read
+
+jobs:
+  monitor:
+    name: Monitor CI Trigger Reliability
+    runs-on: ci-l2
+    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
+      
+      - name: Check CI trigger status for all open PRs
+        env:
+          GITEA_API_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+          GITEA_URL: https://git.xiaoxiajianji.com
+          GITEA_REPO: xiaoxia/xiaoxia-saas
+          CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
+          STALE_THRESHOLD_MIN: ${{ inputs.stale_threshold || 5 }}
+        run: |
+          set +e
+          python3 scripts/ci_trigger_monitor.py
+          # 监控脚本永远不fail，避免告警风暴
+          exit 0
+      - 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
+

.gitea/workflows/code-review.yml

@@ -0,0 +1,79 @@
+name: AI Code Review
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+
+# 同一个 PR 只跑一个 review，新的取消旧的
+concurrency:
+  group: code-review-${{ gitea.repository }}-${{ gitea.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  code-review:
+    name: AI Code Review
+    runs-on: ci-l2
+    # 跳过草稿 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
+
+      - name: Install dependencies
+        run: |
+          # 确保 python3-pip 可用（兼容不同基础镜像）
+          if ! python3 -m pip --version >/dev/null 2>&1; then
+            apt-get update -qq && apt-get install -y -qq python3-pip python3-venv >/dev/null 2>&1
+          fi
+          # 部分镜像 ensurepip 方式兜底
+          if ! python3 -m pip --version >/dev/null 2>&1; then
+            python3 -m ensurepip --upgrade 2>/dev/null || curl -sS https://bootstrap.pypa.io/get-pip.py | python3
+          fi
+          python3 -m pip install --upgrade pip
+          python3 -m pip install requests
+
+      - name: Run AI Code Review
+        env:
+          # Gitea 配置（自动从运行环境获取）
+          GITEA_API_URL: ${{ gitea.server_url }}
+          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）
+          LLM_BASE_URL: ${{ secrets.LLM_BASE_URL }}
+          LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
+          COZE_BOT_ID: ${{ secrets.COZE_BOT_ID }}
+          LLM_MODEL: ${{ secrets.LLM_MODEL }}
+          # 可选参数
+          MAX_DIFF_CHARS: "30000"
+          LLM_TIMEOUT: "120"
+        run: |
+          python3 scripts/ci_code_review.py
+        # 注意：脚本退出码决定job状态
+        # - 有阻塞级问题 → exit 1 → job失败 → 门禁拦截
+        # - 无阻塞级问题/LLM异常 → exit 0 → 通过（fail-open）
+
+      - 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
+

.gitea/workflows/daily-check.yml

@@ -1,4 +1,5 @@
 name: Daily Health Check
+# 注意：使用 curl step_checkout.sh 方式以兼容 docker runner
 
 on:
   schedule:
@@ -12,7 +13,7 @@ jobs:
   # ── 1. 生产环境冒烟测试 ─────────────────────────────────────────────
   production-smoke:
     name: Production Smoke Test
-    runs-on: saas
+    runs-on: ci-l2
     timeout-minutes: 8
     outputs:
       report: ${{ steps.smoke.outputs.report }}
@@ -23,50 +24,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          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
-
+          curl -sH "Authorization: token $GITHUB_TOKEN" \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
+            | bash
       - name: Production health check & smoke test
         id: smoke
-        shell: sh
+        shell: bash
         env:
           SMOKE_ENV: production
           EXISTING_TOKEN: ${{ secrets.PROD_E2E_TOKEN }}
@@ -106,13 +69,25 @@ jobs:
           echo "======================================"
           exit $SMOKE_EXIT
 
+      - 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
+
   # ── 2. Staging API 集成测试 ─────────────────────────────────────────
   staging-api-tests:
     name: Staging API Integration Tests
-    runs-on: saas
+    runs-on: ci-l2
     timeout-minutes: 10
     outputs:
-      report: ${{ steps.smoke.outputs.report }}
+      report: ${{ steps.report.outputs.report }}
 
     steps:
       - name: Checkout code
@@ -120,68 +95,36 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          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
-
+          curl -sH "Authorization: token $GITHUB_TOKEN" \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
+            | bash
       - name: Run API smoke test on staging
         id: smoke
-        shell: sh
+        shell: bash
+        env:
+          STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
+          STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
         run: |
           set +e
           START_TIME=$(date +%s)
           chmod +x tests/e2e/api_smoke_test.sh
-          docker run --rm \
+          CONTAINER_NAME="ci-test-$$"
+          docker create --name "$CONTAINER_NAME" \
             -e BASE_URL=https://staging-api.xiaoxiajianji.com \
             -e WEB_URL=https://staging.xiaoxiajianji.com \
-            -e TEST_USER=18314979086@163.com \
-            -e TEST_PASSWORD=Ying1234 \
+            -e TEST_USER="$STAGING_TEST_USER" \
+            -e TEST_PASSWORD="$STAGING_TEST_PASSWORD" \
             -e CLEANUP_ENABLED=1 \
             -e PERF_CHECK_ENABLED=1 \
             -e PERF_WARN_THRESHOLD_MS=500 \
             -e PERF_FAIL_THRESHOLD_MS=3000 \
-            -v "$PWD:/workspace" \
             -w /workspace \
             git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy \
-            bash tests/e2e/api_smoke_test.sh 2>&1 | tee /tmp/staging-api-smoke.log
+            bash tests/e2e/api_smoke_test.sh 2>&1
+          docker cp . "$CONTAINER_NAME:/workspace"
+          docker start -a "$CONTAINER_NAME" 2>&1 | tee /tmp/staging-api-smoke.log
           SMOKE_EXIT=${PIPESTATUS[0]}
+          docker rm "$CONTAINER_NAME" > /dev/null 2>&1 || true
           END_TIME=$(date +%s)
           ELAPSED=$((END_TIME - START_TIME))
 
@@ -203,18 +146,21 @@ jobs:
 
       - name: Run Staging API Integration Tests (Playwright)
         id: e2e_api
-        shell: sh
+        shell: bash
         run: |
           set +e
           START_TIME=$(date +%s)
-          docker run --rm \
+          CONTAINER_NAME="ci-test-$$"
+          docker create --name "$CONTAINER_NAME" \
             -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" 2>&1 | tee /tmp/staging-api-e2e.log
+            sh -lc "npm ci && npx playwright test --reporter=line e2e/test_auth.spec.ts e2e/test_asset.spec.ts e2e/test_project.spec.ts" 2>&1
+          docker cp . "$CONTAINER_NAME:/workspace"
+          docker start -a "$CONTAINER_NAME" 2>&1 | tee /tmp/staging-api-e2e.log
           EXIT_CODE=${PIPESTATUS[0]}
+          docker rm "$CONTAINER_NAME" > /dev/null 2>&1 || true
           END_TIME=$(date +%s)
           ELAPSED=$((END_TIME - START_TIME))
 
@@ -243,13 +189,25 @@ jobs:
             echo "report=FAIL" >> "${GITHUB_OUTPUT}"
           fi
 
+      - 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
+
   # ── 3. Staging 浏览器 E2E ──────────────────────────────────────────
   staging-e2e:
     name: Staging Browser E2E
-    runs-on: saas
+    runs-on: ci-l2
     timeout-minutes: 15
     outputs:
-      report: ${{ steps.smoke.outputs.report }}
+      report: ${{ steps.e2e.outputs.report }}
 
     steps:
       - name: Checkout code
@@ -257,63 +215,28 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          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
-
+          curl -sH "Authorization: token $GITHUB_TOKEN" \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
+            | bash
       - name: Run Playwright E2E on staging
         id: e2e
-        shell: sh
+        shell: bash
         run: |
           set +e
           START_TIME=$(date +%s)
-          docker run --rm --ipc=host \
+          CONTAINER_NAME="ci-test-$$"
+          docker create --name "$CONTAINER_NAME" --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 e2e/core-titles.spec.ts' 2>&1 | tee /tmp/staging-e2e.log
+            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' 2>&1
+          docker cp . "$CONTAINER_NAME:/workspace"
+          docker start -a "$CONTAINER_NAME" 2>&1 | tee /tmp/staging-e2e.log
           EXIT_CODE=${PIPESTATUS[0]}
+          docker rm "$CONTAINER_NAME" > /dev/null 2>&1 || true
           END_TIME=$(date +%s)
           ELAPSED=$((END_TIME - START_TIME))
 
@@ -332,10 +255,22 @@ jobs:
           echo "=========================================="
           exit $EXIT_CODE
 
+      - 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
+
   # ── 4. 性能基线巡检 ────────────────────────────────────────────────
   performance-check:
     name: Performance Baseline Check
-    runs-on: saas
+    runs-on: ci-l2
     timeout-minutes: 8
     outputs:
       report: ${{ steps.report.outputs.report }}
@@ -344,6 +279,9 @@ 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)
@@ -379,9 +317,10 @@ 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 '{"email":"18314979086@163.com","password":"Ying1234"}' \
+            -d "$LOGIN_BODY" \
             "https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
             --max-time 10 2>&1)
           AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
@@ -411,7 +350,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 '{\"email\":\"18314979086@163.com\",\"password\":\"Ying1234\"}'"
+              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d \"$LOGIN_BODY\""
             fi
             if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
               CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
@@ -459,6 +398,9 @@ 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 ""
@@ -473,10 +415,11 @@ 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 '{"email":"18314979086@163.com","password":"Ying1234"}' \
+            -d "$LOGIN_BODY" \
             "https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
             --max-time 10 2>&1)
           AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
@@ -492,7 +435,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 '{\"email\":\"18314979086@163.com\",\"password\":\"Ying1234\"}'"
+              CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d \"$LOGIN_BODY\""
             fi
             if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
               CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
@@ -580,10 +523,22 @@ jobs:
             exit 0
           fi
 
+      - 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
+
   # ── 5. 每日巡检汇总报告 ────────────────────────────────────────────
   daily-report:
     name: Daily Check Report
-    runs-on: saas
+    runs-on: ci-l2
     timeout-minutes: 2
     if: always()
     needs:
@@ -656,3 +611,14 @@ jobs:
             # 不 exit 1，因为我们用了 always()，保持 report job 成功，
             # 但其他失败的 job 已经让整体流水线标记为失败
           fi
+      - 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

.gitea/workflows/pr-auto-scan.yml

@@ -0,0 +1,56 @@
+name: PR Auto Scan
+# 定时扫描所有open PR，对CI全绿的触发审批/合并
+# 作为短作业模式的兜底，防止事件驱动遗漏
+on:
+  schedule:
+    - cron: "*/5 * * * *"  # 每5分钟扫描一次
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  auto-scan:
+    name: Auto Scan Open PRs
+    runs-on: ci-check
+    timeout-minutes: 5
+    if: github.repository == '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/pr_auto_scan.py?ref=develop"             -o /tmp/pr_auto_scan.py
+          python3 /tmp/pr_auto_scan.py --help > /dev/null 2>&1 || {
+            # fallback: checkout
+            echo "使用checkout方式"
+            curl -sH "Authorization: token $GITHUB_TOKEN"               "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=develop"               | bash
+          }
+
+      - name: Scan and auto process PRs
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          REVIEW_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+          MERGE_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+        run: |
+          set -eu
+          echo "=== 扫描所有open PR并自动处理 ==="
+          echo "时间: $(date)"
+          echo
+
+          python3 /tmp/pr_auto_scan.py             --token "$REVIEW_TOKEN"             --repo "$GITHUB_REPOSITORY"             --base develop             --approve             --merge             --dry-run false
+
+          echo ""
+          echo "✅ 扫描完成"
+
+      - name: Report CI trace
+        if: always()
+        shell: sh
+        env:
+          AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
+        run: |
+          STATUS="ok"
+          [ ${{ job.status }} = "success" ] || STATUS="error"
+          python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "" || true

.gitea/workflows/pr-automation.yml

@@ -0,0 +1,117 @@
+name: PR Automation
+
+on:
+  pull_request:
+    types: [synchronize, opened, ready_for_review, review_requested]
+  workflow_dispatch:
+
+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
+    runs-on: ci-check
+    if: github.event_name == 'pull_request' && !github.event.pull_request.draft
+    timeout-minutes: 3  # 长等待模式：等CI全绿后自动合并，不遗漏任何PR
+    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: "🔍 脚本语法自检"
+        shell: bash
+        run: |
+          ERROR=0
+          for f in scripts/ci/*.sh; do [ -f "$f" ] && bash -n "$f" 2>&1 || ERROR=$((ERROR+1)); done
+          for f in scripts/ci/*.py; do [ -f "$f" ] && python3 -m py_compile "$f" 2>&1 || ERROR=$((ERROR+1)); done
+          if [ "$ERROR" -ne 0 ]; then echo "❌ 语法自检失败 ($ERROR个)"; exit 1; fi
+          echo "✅ 脚本语法自检通过"
+
+      - name: Auto approve when CI passes
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          REVIEW_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        run: |
+          bash scripts/ci/auto_approve.sh
+      - 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
+
+  auto-merge:
+    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分钟定时兜底
+    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: "🔍 脚本语法自检（防止脚本bug导致所有PR挂掉）"
+        shell: bash
+        run: |
+          echo "=== CI脚本语法自检 ==="
+          ERROR=0
+          for f in scripts/ci/*.sh; do
+            [ -f "$f" ] || continue
+            if ! bash -n "$f" 2>&1; then
+              echo "FAIL: $f"
+              ERROR=1
+            fi
+          done
+          for f in scripts/ci/*.py; do
+            [ -f "$f" ] || continue
+            if ! python3 -m py_compile "$f" 2>&1; then
+              echo "FAIL: $f"
+              ERROR=1
+            fi
+          done
+          if [ "$ERROR" -ne 0 ]; then
+            echo "❌ 脚本语法自检失败"
+            exit 1
+          fi
+          echo "✅ 所有CI脚本语法自检通过"
+
+      - name: Auto merge when CI passes and approved
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          MERGE_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+        run: |
+          bash scripts/ci/auto_merge.sh
+      - 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

.gitea/workflows/preview-cleanup.yml

@@ -0,0 +1,207 @@
+name: Preview Cleanup
+on:
+  pull_request:
+    types:
+    - closed
+    branches:
+    - main
+    - develop
+permissions:
+  contents: read
+  pull-requests: write
+jobs:
+  cleanup-preview:
+    name: Cleanup Preview Environment
+    runs-on: runtime-builder
+    timeout-minutes: 10
+    steps:
+    - name: Checkout code
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        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: Extract PR number
+      shell: sh
+      run: |
+        set -eu
+        # 优先从event payload中读取（兼容所有PR事件类型）
+        if [ -n "${GITHUB_EVENT_PATH:-}" ] && [ -f "$GITHUB_EVENT_PATH" ]; then
+          PR_NUMBER=$(python3 -c "import json,sys; print(json.load(sys.stdin).get('number',''))" < "$GITHUB_EVENT_PATH")
+        fi
+        # fallback: 从GITHUB_REF中提取
+        if [ -z "${PR_NUMBER:-}" ]; then
+          PR_NUMBER=$(echo "$GITHUB_REF" | sed -n 's|refs/pull/\([0-9]*\)/.*|\1|p')
+        fi
+        # 再fallback: 兼容纯数字ref
+        if [ -z "${PR_NUMBER:-}" ] || ! echo "$PR_NUMBER" | grep -qE '^[0-9]+$'; then
+          echo "WARNING: Could not extract PR number cleanly, using raw ref suffix"
+          PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
+        fi
+        echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
+        echo "PR number: $PR_NUMBER"
+        echo "Preview dir: /var/www/preview/pr-${PR_NUMBER}"
+
+    - name: Install SSH client
+      shell: sh
+      run: |
+        set -eu
+        # 先检查是否已存在ssh
+        if command -v ssh >/dev/null 2>&1 && command -v ssh-keyscan >/dev/null 2>&1; then
+          echo "SSH client already available: $(ssh -V 2>&1)"
+          exit 0
+        fi
+        # 尝试多种包管理器安装
+        if command -v apk >/dev/null 2>&1; then
+          apk add --no-cache openssh-client >/dev/null 2>&1
+          echo "openssh-client installed via apk"
+        elif command -v apt-get >/dev/null 2>&1; then
+          apt-get update -qq && apt-get install -y -qq openssh-client >/dev/null 2>&1
+          echo "openssh-client installed via apt-get"
+        elif command -v yum >/dev/null 2>&1; then
+          yum install -y openssh-clients >/dev/null 2>&1
+          echo "openssh-client installed via yum"
+        elif command -v dnf >/dev/null 2>&1; then
+          dnf install -y openssh-clients >/dev/null 2>&1
+          echo "openssh-client installed via dnf"
+        else
+          echo "ERROR: No package manager found and ssh not pre-installed"
+          which ssh 2>/dev/null || echo "  ssh: not found"
+          which ssh-keyscan 2>/dev/null || echo "  ssh-keyscan: not found"
+          exit 1
+        fi
+
+    - name: Remove preview directory from server
+      shell: sh
+      env:
+        PREVIEW_SSH_HOST: ${{ secrets.PREVIEW_SSH_HOST }}
+        PREVIEW_SSH_USER: ${{ secrets.PREVIEW_SSH_USER }}
+        PREVIEW_SSH_PORT: ${{ secrets.PREVIEW_SSH_PORT }}
+        PREVIEW_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
+      run: |
+        set -eux
+        preview_host="${PREVIEW_SSH_HOST:-47.98.113.167}"
+        preview_user="${PREVIEW_SSH_USER:-root}"
+        preview_port="${PREVIEW_SSH_PORT:-22222}"
+        preview_dir="/var/www/preview/pr-${PR_NUMBER}"
+
+        mkdir -p ~/.ssh
+
+        # 查找可用的SSH密钥（优先用 secret 里专门为 preview 配置的 key）
+        key_path=""
+        if [ -n "${PREVIEW_SSH_KEY:-}" ]; then
+          key_path="$HOME/.ssh/id_ed25519"
+          printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path"
+          chmod 600 "$key_path"
+          echo "Using key from PREVIEW_SSH_KEY secret"
+        elif [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
+          key_path="/root/.ssh/xiaoxia_runtime_builder"
+          echo "Using key: $key_path (builder key)"
+        elif [ -f "$HOME/.ssh/xiaoxia_runtime_builder" ]; then
+          key_path="$HOME/.ssh/xiaoxia_runtime_builder"
+          echo "Using key: $key_path (home key)"
+        else
+          echo "ERROR: No SSH key available"
+          ls -la ~/.ssh/ 2>/dev/null || true
+          ls -la /root/.ssh/ 2>/dev/null || true
+          exit 1
+        fi
+
+        ssh-keyscan -p "$preview_port" -H "$preview_host" >> ~/.ssh/known_hosts 2>/dev/null
+        echo "SSH keyscan done"
+
+        # 测试SSH连接
+        ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" "echo SSH_CONNECTION_OK && hostname"
+        echo "SSH connection verified"
+
+        # 检查目录是否存在
+        DIR_EXISTS=$(ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" \
+          "if [ -d '${preview_dir}' ]; then echo 'yes'; else echo 'no'; fi")
+
+        if [ "$DIR_EXISTS" = "yes" ]; then
+          echo "Removing preview directory: ${preview_dir}"
+          ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" \
+            "rm -rf ${preview_dir} && echo 'Preview directory removed successfully'"
+          echo "Cleanup completed: ${preview_dir}"
+        else
+          echo "Preview directory does not exist: ${preview_dir}, nothing to clean up"
+        fi
+
+    - name: Comment cleanup notice on PR
+      if: success()
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        set -eu
+        # 从event payload读取PR号（最可靠）
+        if [ -n "${GITHUB_EVENT_PATH:-}" ] && [ -f "$GITHUB_EVENT_PATH" ]; then
+          PR_NUMBER=$(python3 -c "import json,sys; print(json.load(sys.stdin).get('number',''))" < "$GITHUB_EVENT_PATH")
+        else
+          PR_NUMBER=$(echo "$GITHUB_REF" | sed -n 's|refs/pull/\([0-9]*\)/.*|\1|p')
+        fi
+        export PR_NUMBER
+
+        COMMENT_BODY=$(python3 scripts/ci/preview_comment.py cleanup)
+
+        API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"
+        curl -s -X POST \
+          -H "Authorization: token ${GITHUB_TOKEN}" \
+          -H "Content-Type: application/json" \
+          -d "$COMMENT_BODY" \
+          "$API_URL" \
+          > /dev/null
+        echo "Cleanup comment posted"
+
+    - 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
+

.gitea/workflows/preview-deploy.yml

@@ -0,0 +1,296 @@
+name: Preview Deploy
+on:
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+    branches:
+    - main
+    - develop
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: "触发原因"
+        required: false
+        default: "手动触发 - 预览环境补跑"
+permissions:
+  contents: read
+  pull-requests: write
+concurrency:
+  group: preview-deploy-${{ gitea.ref }}
+  cancel-in-progress: true
+jobs:
+  deploy-preview:
+    name: Deploy Preview Environment
+    runs-on: runtime-builder
+    timeout-minutes: 20
+    steps:
+    - name: Checkout code
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        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: Record job start time
+      shell: sh
+      run: |
+        set -eu
+        echo "JOB_START_TIME=$(date +%s)" >> $GITHUB_ENV
+        echo "Job started at $(date)"
+
+    - name: Extract PR number
+      shell: sh
+      run: |
+        set -eu
+        PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
+        echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
+        echo "PR number: $PR_NUMBER"
+        echo "PREVIEW_URL=https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com" >> $GITHUB_ENV
+        echo "Preview URL: https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com"
+
+    - name: Build frontend
+      shell: sh
+      run: |
+        set -eu
+        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
+
+        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 install"
+            fi
+            if [ "$CACHE_VALID" = "false" ]; then
+              echo "Cache miss or invalid: running npm install..."
+              if ! npm install --include=dev; then
+                echo "npm install failed, cleaning node_modules and retrying..."
+                rm -rf node_modules
+                mkdir -p node_modules
+                npm install --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
+      run: |
+        set -eu
+        if command -v apk >/dev/null 2>&1; then
+          apk add --no-cache openssh-client rsync >/dev/null 2>&1
+        elif command -v apt-get >/dev/null 2>&1; then
+          apt-get update -qq && apt-get install -y -qq openssh-client rsync >/dev/null 2>&1
+        elif command -v yum >/dev/null 2>&1; then
+          yum install -y openssh-clients rsync >/dev/null 2>&1
+        else
+          echo "ERROR: No package manager found"
+          exit 1
+        fi
+        echo "openssh-client and rsync installed"
+
+    - name: Deploy preview to server
+      shell: sh
+      env:
+        PREVIEW_SSH_HOST: ${{ secrets.PREVIEW_SSH_HOST }}
+        PREVIEW_SSH_USER: ${{ secrets.PREVIEW_SSH_USER }}
+        PREVIEW_SSH_PORT: ${{ secrets.PREVIEW_SSH_PORT }}
+        PREVIEW_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
+      run: |
+        set -eux
+        preview_host="${PREVIEW_SSH_HOST:-47.98.113.167}"
+        preview_user="${PREVIEW_SSH_USER:-root}"
+        preview_port="${PREVIEW_SSH_PORT:-22222}"
+        preview_dir="/var/www/preview/pr-${PR_NUMBER}"
+
+        mkdir -p ~/.ssh
+
+        # 查找可用的SSH密钥（优先用 secret 里专门为 preview 配置的 key）
+        key_path=""
+        if [ -n "${PREVIEW_SSH_KEY:-}" ]; then
+          key_path="$HOME/.ssh/id_ed25519"
+          printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path"
+          chmod 600 "$key_path"
+          echo "Using key from PREVIEW_SSH_KEY secret"
+        elif [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
+          key_path="/root/.ssh/xiaoxia_runtime_builder"
+          echo "Using key: $key_path (builder key)"
+        elif [ -f "$HOME/.ssh/xiaoxia_runtime_builder" ]; then
+          key_path="$HOME/.ssh/xiaoxia_runtime_builder"
+          echo "Using key: $key_path (home key)"
+        else
+          echo "ERROR: No SSH key available"
+          ls -la ~/.ssh/ 2>/dev/null || true
+          ls -la /root/.ssh/ 2>/dev/null || true
+          exit 1
+        fi
+
+        # SSH密钥完整性自检
+        if ! ssh-keygen -y -f "$key_path" > /dev/null 2>&1; then
+          echo "ERROR: SSH密钥损坏（private key contents do not match public）"
+          echo "请检查 PREVIEW_SSH_KEY secret 中的私钥是否完整正确"
+          echo "私钥文件大小: $(wc -c < "$key_path") 字节"
+          head -2 "$key_path"
+          exit 1
+        fi
+        echo "SSH key integrity check passed"
+
+        ssh-keyscan -p "$preview_port" -H "$preview_host" >> ~/.ssh/known_hosts 2>/dev/null
+        echo "SSH keyscan done"
+
+        # 测试SSH连接
+        ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" "echo SSH_CONNECTION_OK && hostname"
+        echo "SSH connection verified"
+
+        # 创建预览目录并上传文件
+        ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" \
+          "mkdir -p ${preview_dir} && echo 'Preview directory created: ${preview_dir}'"
+
+        # 使用rsync上传dist目录内容
+        rsync -avz --delete -e "ssh -p ${preview_port} -i ${key_path} -o StrictHostKeyChecking=no" \
+          apps/web/dist/ \
+          "${preview_user}@${preview_host}:${preview_dir}/"
+
+        echo "Preview deployed to: ${preview_dir}"
+        echo "Preview URL: https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com"
+
+    - name: Comment preview link on PR
+      shell: sh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        set -eu
+        PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
+        PREVIEW_URL="https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com"
+        export PR_NUMBER PREVIEW_URL
+
+        COMMENT_BODY=$(python3 scripts/ci/preview_comment.py deploy)
+
+        API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"
+
+        EXISTING_COMMENT_ID=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" "$API_URL" | python3 -c "
+        import sys, json
+        try:
+            for c in json.load(sys.stdin):
+                if '预览环境已部署' in c.get('body', ''):
+                    print(c['id'])
+                    break
+        except Exception:
+            pass
+        ")
+
+        if [ -n "$EXISTING_COMMENT_ID" ]; then
+          curl -s -X PATCH \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$COMMENT_BODY" \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/comments/${EXISTING_COMMENT_ID}" \
+            > /dev/null
+          echo "Comment updated"
+        else
+          curl -s -X POST \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$COMMENT_BODY" \
+            "$API_URL" \
+            > /dev/null
+          echo "Comment posted"
+        fi
+
+    - name: Job duration summary
+      if: always()
+      shell: sh
+      run: |
+        set +eu
+        if [ -n "$JOB_START_TIME" ]; then
+          END_TIME=$(date +%s)
+          DURATION=$((END_TIME - JOB_START_TIME))
+          MINS=$((DURATION / 60))
+          SECS=$((DURATION % 60))
+          echo "JOB_DURATION_SECONDS=$DURATION" >> $GITHUB_ENV
+          echo "=== Job Duration: ${MINS}m${SECS}s ==="
+        else
+          echo "JOB_DURATION_SECONDS=0" >> $GITHUB_ENV
+          echo "=== Job Duration: unknown ==="
+        fi
+
+    - 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="Deploy Preview Environment" 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
+

.gitea/workflows/worker-base-image.yml

@@ -0,0 +1,103 @@
+name: Worker Base Image Build
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+    paths:
+      - 'requirements-base.txt'
+      - 'requirements-worker.txt'
+      - 'infra/docker/worker-base-builder.Dockerfile'
+      - 'infra/docker/worker-base-runtime.Dockerfile'
+  workflow_dispatch:  # 支持手动触发
+
+jobs:
+  build-worker-base:
+    name: Build Worker Base Images
+    runs-on: runtime-builder
+    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
+
+    - 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: Setup buildx builder
+      shell: sh
+      run: |
+        set -eu
+        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 "✅ ${{ matrix.name }} base image built and pushed"
+
+    - name: Cleanup buildx builder
+      if: always()
+      shell: sh
+      run: |
+        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"

.gitignore

@@ -6,7 +6,6 @@ dist/
 coverage/
 
 # Python / backend
-.cache/
 .venv/
 venv/
 .venv-ci-root/

alembic/versions/034_add_confirm_generation_fields.py

@@ -0,0 +1,60 @@
+"""Add confirm generation fields
+
+Revision ID: 034
+Revises: 033
+Create Date: 2026-07-08
+
+确认生成 API 改造：为 generation_tasks 表添加 is_preview、source_task_id、
+output_width、output_height、cover_url、custom_title 字段。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "034"
+down_revision = "033"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generation_tasks",
+        sa.Column("is_preview", sa.Boolean(), nullable=False, server_default=sa.true()),
+    )
+    op.add_column(
+        "generation_tasks",
+        sa.Column("source_task_id", sa.String(32), nullable=False, server_default=""),
+    )
+    op.add_column(
+        "generation_tasks",
+        sa.Column("output_width", sa.Integer(), nullable=False, server_default=sa.text("1280")),
+    )
+    op.add_column(
+        "generation_tasks",
+        sa.Column("output_height", sa.Integer(), nullable=False, server_default=sa.text("720")),
+    )
+    op.add_column(
+        "generation_tasks",
+        sa.Column("cover_url", sa.String(1000), nullable=False, server_default=""),
+    )
+    op.add_column(
+        "generation_tasks",
+        sa.Column("custom_title", sa.String(500), nullable=False, server_default=""),
+    )
+    op.create_index(
+        op.f("ix_generation_tasks_source_task_id"),
+        "generation_tasks",
+        ["source_task_id"],
+    )
+
+
+def downgrade() -> None:
+    op.drop_index(op.f("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")
+    op.drop_column("generation_tasks", "is_preview")

alembic/versions/034_cms_enhance_placeholder.py

@@ -1,28 +0,0 @@
-"""CMS Enhancements (placeholder - manually applied on production)
-
-Revision ID: 034_cms_enhance
-Revises: 033
-Create Date: 2026-07-09
-
-占位迁移文件：生产数据库已手动升级到此版本，
-此文件用于让 alembic 识别当前版本，避免部署时迁移失败。
-实际的表结构变更（helpcenter, tickets, partners, site_settings 等）
-已在生产环境手动执行。
-"""
-
-from alembic import op
-
-revision = "034_cms_enhance"
-down_revision = "033"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    """占位 - 变更已在生产环境手动应用"""
-    pass
-
-
-def downgrade() -> None:
-    """占位 - 不执行实际回退"""
-    pass

alembic/versions/035_add_editing_mode_to_templates.py

@@ -1,26 +0,0 @@
-"""Add editing_mode to edit_templates
-
-Revision ID: 035_editing_mode
-Revises: 034_cms_enhance
-Create Date: 2026-07-09
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "035_editing_mode"
-down_revision = "034_cms_enhance"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "edit_templates",
-        sa.Column("editing_mode", sa.String(20), nullable=False, server_default="one_take"),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("edit_templates", "editing_mode")

alembic/versions/036_expand_uuid_fields_to_36.py

@@ -1,68 +0,0 @@
-"""Expand UUID fields from varchar(32) to varchar(36)
-
-All UUID fields across all tables were varchar(32), but standard UUIDs with
-hyphens are 36 characters (e.g. 550e8400-e29b-41d4-a716-446655440000).
-This caused StringDataRightTruncation errors on insert.
-
-Revision ID: 036_expand_uuid_36
-Revises: 035_editing_mode
-Create Date: 2026-07-10
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "036_expand_uuid_36"
-down_revision = "035_editing_mode"
-branch_labels = None
-depends_on = None
-
-
-# ── 表 → 需要扩容的列 ─────────────────────────────────────────────────────────
-
-_TABLES: dict[str, list[str]] = {
-    "projects": ["id", "owner_user_id"],
-    "edit_templates": ["id"],
-    "edit_plans": ["id", "template_id", "source_edit_plan_id", "project_id", "created_by_user_id"],
-    "template_clip_configs": ["id", "template_id"],
-    "edit_plan_clips": ["id", "plan_id", "template_clip_config_id", "asset_id"],
-    "ingest_jobs": ["id", "project_id", "library_id", "result_asset_id"],
-    "classification_jobs": ["id", "project_id", "asset_id"],
-    "generation_tasks": [
-        "id",
-        "project_id",
-        "strategy_id",
-        "asset_library_id",
-        "voice_library_id",
-        "created_by_user_id",
-        "source_edit_plan_id",
-        "batch_id",
-    ],
-    "generated_videos": ["id", "project_id", "generation_task_id", "duplicate_of"],
-    "jobs": ["id", "project_id", "source_id", "created_by_user_id"],
-}
-
-
-def upgrade() -> None:
-    for table, columns in _TABLES.items():
-        for col in columns:
-            op.alter_column(
-                table,
-                col,
-                existing_type=sa.String(32),
-                type_=sa.String(36),
-                existing_nullable=None,
-            )
-
-
-def downgrade() -> None:
-    for table, columns in reversed(list(_TABLES.items())):
-        for col in columns:
-            op.alter_column(
-                table,
-                col,
-                existing_type=sa.String(36),
-                type_=sa.String(32),
-                existing_nullable=None,
-            )

alembic/versions/037_add_logs_to_generation_tasks.py

@@ -1,26 +0,0 @@
-"""Add logs field to generation_tasks
-
-Revision ID: 037_generation_logs
-Revises: 036_expand_uuid_36
-Create Date: 2026-07-10
-"""
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision = "037_generation_logs"
-down_revision = "036_expand_uuid_36"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "generation_tasks",
-        sa.Column("logs", sa.Text(), nullable=False, server_default="[]"),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("generation_tasks", "logs")

apps/api/app/api/router.py

@@ -8,12 +8,10 @@ from app.api.routes.dashboard import router as dashboard_router
 from app.api.routes.duplication import router as duplication_router
 from app.api.routes.edit_plans import router as edit_plans_router
 from app.api.routes.edit_templates import router as edit_templates_router
-from app.api.routes.feature_flags import router as feature_flags_router
 from app.api.routes.generated_videos import router as generated_videos_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.internal_render import router as internal_render_router
 from app.api.routes.jobs import router as jobs_router
 from app.api.routes.projects import router as projects_router
 from app.api.routes.recipes import router as recipes_router
@@ -153,11 +151,3 @@ api_router.include_router(
     prefix="/tts",
     tags=["TTS"],
 )
-api_router.include_router(
-    feature_flags_router,
-    tags=["Internal"],
-)
-api_router.include_router(
-    internal_render_router,
-    tags=["Internal"],
-)

apps/api/app/api/routes/asset_libraries.py

@@ -1,11 +1,7 @@
 from typing import Any
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import (
-    get_asset_library_repository,
-    get_asset_repository,
-    get_project_repository,
-)
+from app.dependencies import get_asset_library_repository, get_project_repository
 from app.schemas.asset_library import (
     AssetLibraryResponse,
     CreateAssetLibraryRequest,
@@ -151,30 +147,3 @@ def ensure_default_library(
     )
     created = asset_library_repository.create(library)
     return _to_asset_library_response(created)
-
-
-@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_asset_library(
-    library_id: str,
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-    asset_library_repository: Any = Depends(get_asset_library_repository),
-    asset_repository: Any = Depends(get_asset_repository),
-    project_repository: Any = Depends(get_project_repository),
-) -> None:
-    """删除素材库，同时删除库内所有素材。"""
-    # 查找素材库
-    library = asset_library_repository.find_by_id(library_id)
-    if library is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="素材库不存在")
-
-    # 权限校验：检查用户是否有项目访问权限
-    _check_project_access(library.project_id, authenticated_user.user.id, project_repository)
-
-    # 删除库内所有素材（无 FK 级联，需手动清理）
-    assets_in_library = asset_repository.find_by_library(library_id)
-    if assets_in_library:
-        asset_ids_to_delete = [a.id for a in assets_in_library]
-        asset_repository.batch_delete(asset_ids_to_delete)
-
-    # 删除素材库本身
-    asset_library_repository.delete(library_id)

apps/api/app/api/routes/chunked_upload.py

@@ -274,6 +274,79 @@ async def init_chunked_upload(
     )
 
 
+@router.post("/{upload_id}/{chunk_index}")
+async def upload_chunk(
+    upload_id: str,
+    chunk_index: int,
+    chunk: UploadFile = File(..., description="Chunk data"),
+    authenticated_user: AuthenticatedUser = Depends(get_current_user),
+) -> dict[str, Any]:
+    """Upload a single chunk"""
+    # Load metadata
+    meta = _load_upload_meta(upload_id)
+
+    # Check expiry
+    expires_at = datetime.fromisoformat(meta["expires_at"])
+    if expires_at.tzinfo is None:
+        expires_at = expires_at.replace(tzinfo=timezone.utc)
+
+    if expires_at < datetime.now(timezone.utc):
+        raise HTTPException(status_code=status.HTTP_410_GONE, detail="Upload has expired")
+
+    # Validate chunk index
+    if chunk_index < 0 or chunk_index >= meta["total_chunks"]:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Invalid chunk index. Must be between 0 and {meta['total_chunks'] - 1}",
+        )
+
+    # Atomic check and record to prevent race conditions
+    if not _atomic_check_and_record(upload_id, chunk_index):
+        return {"message": "Chunk already uploaded", "chunk_index": chunk_index}
+
+    # Read chunk data
+    chunk_data = await chunk.read()
+
+    # Validate chunk size (last chunk can be smaller than chunk_size)
+    expected_size = DEFAULT_CHUNK_SIZE
+    if chunk_index == meta["total_chunks"] - 1:
+        expected_size = meta["file_size"] - (chunk_index * DEFAULT_CHUNK_SIZE)
+
+    if len(chunk_data) != expected_size:
+        # Rollback the recorded chunk
+        meta_path = _get_upload_meta_path(upload_id)
+        with open(meta_path, "r+", encoding="utf-8") as f:
+            fcntl.flock(f.fileno(), fcntl.LOCK_EX)
+            try:
+                meta = json.load(f)
+                if chunk_index in meta["uploaded_chunks"]:
+                    meta["uploaded_chunks"].remove(chunk_index)
+                f.seek(0)
+                json.dump(meta, f, ensure_ascii=False, indent=2)
+                f.truncate()
+            finally:
+                fcntl.flock(f.fileno(), fcntl.LOCK_UN)
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Chunk size mismatch. Expected {expected_size}, got {len(chunk_data)}",
+        )
+
+    # Save chunk
+    chunk_path = _get_chunk_dir(upload_id) / f"chunk_{chunk_index:06d}"
+    with open(chunk_path, "wb") as f:
+        f.write(chunk_data)
+
+    # Reload metadata for response
+    meta = _load_upload_meta(upload_id)
+
+    return {
+        "message": "Chunk uploaded successfully",
+        "chunk_index": chunk_index,
+        "uploaded_chunks": len(meta["uploaded_chunks"]),
+        "total_chunks": meta["total_chunks"],
+    }
+
+
 @router.get("/{upload_id}/status", response_model=ChunkedUploadStatusResponse)
 async def get_upload_status(
     upload_id: str,
@@ -420,76 +493,3 @@ async def complete_chunked_upload(
         meta_path = _get_upload_meta_path(upload_id)
         if meta_path.exists():
             meta_path.unlink()
-
-
-@router.post("/{upload_id}/{chunk_index}")
-async def upload_chunk(
-    upload_id: str,
-    chunk_index: int,
-    chunk: UploadFile = File(..., description="Chunk data"),
-    authenticated_user: AuthenticatedUser = Depends(get_current_user),
-) -> dict[str, Any]:
-    """Upload a single chunk"""
-    # Load metadata
-    meta = _load_upload_meta(upload_id)
-
-    # Check expiry
-    expires_at = datetime.fromisoformat(meta["expires_at"])
-    if expires_at.tzinfo is None:
-        expires_at = expires_at.replace(tzinfo=timezone.utc)
-
-    if expires_at < datetime.now(timezone.utc):
-        raise HTTPException(status_code=status.HTTP_410_GONE, detail="Upload has expired")
-
-    # Validate chunk index
-    if chunk_index < 0 or chunk_index >= meta["total_chunks"]:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Invalid chunk index. Must be between 0 and {meta['total_chunks'] - 1}",
-        )
-
-    # Atomic check and record to prevent race conditions
-    if not _atomic_check_and_record(upload_id, chunk_index):
-        return {"message": "Chunk already uploaded", "chunk_index": chunk_index}
-
-    # Read chunk data
-    chunk_data = await chunk.read()
-
-    # Validate chunk size (last chunk can be smaller than chunk_size)
-    expected_size = DEFAULT_CHUNK_SIZE
-    if chunk_index == meta["total_chunks"] - 1:
-        expected_size = meta["file_size"] - (chunk_index * DEFAULT_CHUNK_SIZE)
-
-    if len(chunk_data) != expected_size:
-        # Rollback the recorded chunk
-        meta_path = _get_upload_meta_path(upload_id)
-        with open(meta_path, "r+", encoding="utf-8") as f:
-            fcntl.flock(f.fileno(), fcntl.LOCK_EX)
-            try:
-                meta = json.load(f)
-                if chunk_index in meta["uploaded_chunks"]:
-                    meta["uploaded_chunks"].remove(chunk_index)
-                f.seek(0)
-                json.dump(meta, f, ensure_ascii=False, indent=2)
-                f.truncate()
-            finally:
-                fcntl.flock(f.fileno(), fcntl.LOCK_UN)
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Chunk size mismatch. Expected {expected_size}, got {len(chunk_data)}",
-        )
-
-    # Save chunk
-    chunk_path = _get_chunk_dir(upload_id) / f"chunk_{chunk_index:06d}"
-    with open(chunk_path, "wb") as f:
-        f.write(chunk_data)
-
-    # Reload metadata for response
-    meta = _load_upload_meta(upload_id)
-
-    return {
-        "message": "Chunk uploaded successfully",
-        "chunk_index": chunk_index,
-        "uploaded_chunks": len(meta["uploaded_chunks"]),
-        "total_chunks": meta["total_chunks"],
-    }

apps/api/app/api/routes/edit_plans.py

@@ -10,8 +10,6 @@ RESTful CRUD for EditPlan:
 - GET    /api/v1/edit-plans/{id}/generation-status  查询生成进度（任务 2.05）
 - POST   /api/v1/edit-plans/{id}/ai-recommend       AI 推荐片段方案（任务 3.09）
 - POST   /api/v1/edit-plans/{id}/generate-cover     AI 生成封面（任务 3.09）
-- GET    /api/v1/edit-plans/{id}/timeline           时间线场景数据
-- POST   /api/v1/edit-plans/generate-from-template  基于模板+素材自动生成剪辑计划
 
 业务逻辑委托给 EditPlanService 服务层。
 """
@@ -24,29 +22,16 @@ from typing import Any, List, Optional
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.core.celery_app import celery_app
-from app.core.task_enqueue import GLOBAL_PENDING_LIMIT, USER_PENDING_LIMIT
-from app.dependencies import get_asset_library_repository, get_asset_repository, get_db_session, get_project_repository
+from app.dependencies import get_db_session, get_project_repository
 from app.schemas.generation_task import GenerationTaskResponse
-from app.services import EditPlanService, PlanGeneratorService
+from app.services import EditPlanService
 from fastapi import APIRouter, Depends, HTTPException, Query, status
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Session
 
-from packages.adapters.sqlalchemy_impl.asset_library_repository import (
-    SQLAlchemyAssetLibraryRepository,
-)
-from packages.adapters.sqlalchemy_impl.asset_repository import (
-    SQLAlchemyAssetRepository,
-)
 from packages.adapters.sqlalchemy_impl.generation_task_repository import (
     SQLAlchemyGenerationTaskRepository,
 )
-from packages.adapters.sqlalchemy_impl.template_clip_config_repository import (
-    SQLAlchemyTemplateClipConfigRepository,
-)
-from packages.adapters.sqlalchemy_impl.template_repository import (
-    SQLAlchemyTemplateRepository,
-)
 from packages.application.generation_tasks import (
     CreateGenerationTaskCommand,
     CreateGenerationTaskUseCase,
@@ -206,44 +191,6 @@ class GenerateCoverResponse(BaseModel):
     cover: dict[str, Any] = Field(..., description="封面数据（type / image_url / frame_time 等）")
 
 
-# ── 基于模板生成剪辑计划 Schemas ─────────────────────────────────────────────
-
-
-class GenerateFromTemplateRequest(BaseModel):
-    """基于模板生成剪辑计划请求体"""
-
-    template_id: str = Field(..., description="剪辑模板 ID")
-    asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
-    project_id: str = Field(default="", description="所属项目 ID")
-    name: str = Field(default="", description="计划名称（为空则自动取模板名）")
-
-
-class _PlanClipItem(BaseModel):
-    """片段响应体"""
-
-    id: str
-    clip_type: str
-    order: int
-    asset_id: str
-    text_content: str
-    start_time: float
-    duration: float
-    transition_effect: str
-    status: str
-    config: Optional[dict[str, Any]] = None
-    created_at: datetime
-    updated_at: datetime
-
-    model_config = {"from_attributes": True}
-
-
-class GenerateFromTemplateResponse(BaseModel):
-    """基于模板生成剪辑计划响应体"""
-
-    plan: EditPlanResponse
-    clips: List[_PlanClipItem]
-
-
 # ── Helpers ───────────────────────────────────────────────────────────────────
 
 
@@ -253,9 +200,9 @@ def _check_project_access(project_id: str, user_id: str, project_repository: Any
         return
     project = project_repository.find_by_id(project_id)
     if project is None:
-        raise HTTPException(status_code=404, detail="项目不存在")
+        raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
     if not project.can_access(user_id):
-        raise HTTPException(status_code=403, detail="无权访问该项目")
+        raise HTTPException(status_code=403, detail="Access denied to project")
 
 
 def _to_response(p: EditPlan) -> EditPlanResponse:
@@ -306,7 +253,7 @@ def list_plans(
         except ValueError:
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
-                detail="无效的筛选条件，请选择正确的状态",
+                detail=(f"无效的状态值: {status_filter}，" f"可选值: draft, editing, rendering, completed, failed"),
             )
 
     # 项目鉴权：如果指定了 project_id，校验用户是否有权访问
@@ -432,7 +379,7 @@ def update_plan(
             except ValueError:
                 raise HTTPException(
                     status_code=status.HTTP_400_BAD_REQUEST,
-                    detail="无效的状态值，请选择正确的状态",
+                    detail=(f"无效的状态值: {body.status}，" f"可选值: draft, editing, rendering, completed, failed"),
                 )
             svc.transition_status(plan_id, target_status)
     except ValueError as exc:
@@ -488,8 +435,6 @@ def generate_plan(
     db: Session = Depends(get_db_session),
     current_user: AuthenticatedUser = Depends(get_current_user),
     project_repository: Any = Depends(get_project_repository),
-    asset_library_repo: Any = Depends(get_asset_library_repository),
-    asset_repo: Any = Depends(get_asset_repository),
 ) -> EditPlanGenerateResponse:
     """触发剪辑计划渲染生成
 
@@ -509,121 +454,6 @@ def generate_plan(
     if plan_check.project_id:
         _check_project_access(plan_check.project_id, current_user.user.id, project_repository)
 
-    # ── 自动兜底 1: draft → editing ──────────────────────────────────────
-    if plan_check.status == EditPlanStatus.DRAFT:
-        logger.info("自动兜底: plan=%s draft→editing", plan_id)
-        svc.transition_status(plan_id, EditPlanStatus.EDITING)
-
-    # ── 自动兜底 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,
-        )
-        # 优先从新模型 template_clip_configs 读取，若无则回退到旧模型 template_segments
-        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:
-            # 回退到旧模型 template_segments
-            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 从旧模型 template_segments 复制了 %d 个片段", plan_id, len(segments))
-
-    # ── 自动兜底 3: 为没有素材的片段分配素材 ──────────────────────────
-    # 如果 plan.config.asset_ids 有素材，但 clips 没有 asset_id，自动按顺序分配
-    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", [])
-    material_mode = (plan_check.config or {}).get("material_mode", "manual")
-
-    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),
-        )
-        for i, clip in enumerate(clips_without_asset):
-            asset_idx = i % len(config_asset_ids)
-            svc.assign_asset(clip.id, config_asset_ids[asset_idx])
-        logger.info("自动兜底3: plan=%s 素材分配完成", plan_id)
-        clips_without_asset = []  # 已分配完
-
-    # ── 自动兜底 4: 自动素材模式 → 从项目默认视频素材库选取 ────────────
-    if clips_without_asset and material_mode == "auto" and plan_check.project_id:
-        import random
-
-        logger.info(
-            "自动兜底4: plan=%s 自动素材模式，从项目素材库选取素材 (%d 个片段需要)",
-            plan_id,
-            len(clips_without_asset),
-        )
-        # 找到项目的视频素材库
-        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 状态的视频素材
-            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")
-            ]
-            if 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,
-                    video_lib.name,
-                    len(ready_videos),
-                    len(clips_without_asset),
-                )
-            else:
-                logger.warning("自动兜底4: plan=%s 素材库无可用视频素材", plan_id)
-        else:
-            logger.warning("自动兜底4: plan=%s 项目无视频素材库", plan_id)
-
     # 检查是否可生成
     try:
         can_gen, reason = svc.can_generate(plan_id)
@@ -638,89 +468,48 @@ def generate_plan(
             detail=reason,
         )
 
-    # 核心生成流程：捕获异常返回明确错误信息，避免裸 500
-    try:
-        # 将 pending 片段标记为 ready
-        clip_count = svc.mark_clips_ready(plan_id)
+    # 将 pending 片段标记为 ready
+    clip_count = svc.mark_clips_ready(plan_id)
 
-        # 创建 GenerationTask
-        gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
-
-        # 队列限流预检查（repository 不支持计数时跳过）
-        user_id = current_user.user.id
-        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)
-
-        gen_task_use_case = CreateGenerationTaskUseCase(gen_task_repo)
-        plan = svc.get_plan_or_raise(plan_id)
-        gen_task = gen_task_use_case.execute(
-            CreateGenerationTaskCommand(
-                project_id="",
-                template_id=plan.template_id,
-                created_by_user_id=current_user.user.id,
-                source_edit_plan_id=plan_id,
-            )
+    # 创建 GenerationTask
+    gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
+    gen_task_use_case = CreateGenerationTaskUseCase(gen_task_repo)
+    plan = svc.get_plan_or_raise(plan_id)
+    gen_task = gen_task_use_case.execute(
+        CreateGenerationTaskCommand(
+            project_id="",
+            template_id=plan.template_id,
+            created_by_user_id=current_user.user.id,
+            source_edit_plan_id=plan_id,
         )
+    )
 
-        # 将 generation_task_id 存入 plan config
-        svc.update_plan_config(plan_id, {"generation_task_id": gen_task.id})
+    # 将 generation_task_id 存入 plan config
+    svc.update_plan_config(plan_id, {"generation_task_id": gen_task.id})
 
-        # 流转状态为 rendering
-        svc.transition_status(plan_id, EditPlanStatus.RENDERING)
+    # 流转状态为 rendering
+    svc.transition_status(plan_id, EditPlanStatus.RENDERING)
 
-        # 调度 Celery 任务
-        celery_app.send_task("worker.render_edit_plan", args=[plan_id])
+    # 调度 Celery 任务
+    celery_app.send_task("worker.render_edit_plan", args=[plan_id])
 
-        # 获取最新状态
-        updated_plan = svc.get_plan_or_raise(plan_id)
+    # 获取最新状态
+    updated_plan = svc.get_plan_or_raise(plan_id)
 
-        logger.info(
-            "触发剪辑计划生成: plan_id=%s gen_task_id=%s clips=%d by user=%s",
-            plan_id,
-            gen_task.id,
-            clip_count,
-            current_user.user.id,
-        )
+    logger.info(
+        "触发剪辑计划生成: plan_id=%s gen_task_id=%s clips=%d by user=%s",
+        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:
-        # 已处理的 HTTP 异常直接透传
-        raise
-    except Exception as exc:
-        logger.exception("触发剪辑计划生成失败: plan_id=%s", plan_id)
-        # 尝试将计划标记为失败（RENDERING → FAILED 是合法的状态流转）
-        try:
-            svc.transition_status(plan_id, EditPlanStatus.FAILED)
-        except Exception:
-            logger.warning("标记计划失败状态时异常: plan_id=%s", plan_id)
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="生成失败，请稍后重试",
-        )
+    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,
+    )
 
 
 @router.get(
@@ -867,7 +656,7 @@ def ai_recommend_clips(
     if plan_status not in ("draft", "editing"):
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="当前计划状态不支持AI推荐，请先创建或编辑计划后再试",
+            detail=f"AI 推荐仅支持 draft/editing 状态的计划，当前状态: {plan_status}",
         )
 
     # 调用 AI 推荐服务（同步调用 stub，后续改为 Celery 异步）
@@ -918,7 +707,7 @@ def ai_recommend_clips(
             pass
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="AI推荐结果保存失败，请稍后重试",
+            detail=f"AI 推荐结果写入失败: {exc}",
         )
 
     logger.info(
@@ -1144,88 +933,3 @@ def get_plan_timeline(
         total_duration=total_duration,
         scenes=scenes,
     )
-
-
-# ── 基于模板生成剪辑计划 ─────────────────────────────────────────────────────
-
-
-@router.post(
-    "/generate-from-template",
-    response_model=GenerateFromTemplateResponse,
-    status_code=status.HTTP_201_CREATED,
-)
-def generate_from_template(
-    body: GenerateFromTemplateRequest,
-    db: Session = Depends(get_db_session),
-    current_user: AuthenticatedUser = Depends(get_current_user),
-    project_repository: Any = Depends(get_project_repository),
-) -> GenerateFromTemplateResponse:
-    """基于模板 + 素材自动生成剪辑计划
-
-    流程:
-    1. 获取模板及其片段配置
-    2. 调用 PlanGeneratorService 生成 EditPlan + EditPlanClips
-    3. 返回完整的计划和片段列表
-    """
-    from app.services import EditTemplateService
-
-    # 项目鉴权
-    if body.project_id:
-        _check_project_access(body.project_id, current_user.user.id, project_repository)
-
-    template_svc = EditTemplateService(db)
-
-    # 获取模板
-    try:
-        template = template_svc.get_template_or_raise(body.template_id)
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=str(exc),
-        )
-
-    # 获取模板片段配置
-    clip_configs = template_svc.list_clip_configs(body.template_id, skip=0, limit=200)
-
-    # 调用 PlanGeneratorService 生成计划
-    generator = PlanGeneratorService(db)
-    result = generator.generate_from_template(
-        template=template,
-        clip_configs=clip_configs,
-        asset_ids=body.asset_ids,
-        project_id=body.project_id,
-        created_by_user_id=current_user.user.id,
-        name=body.name,
-    )
-
-    plan = result["plan"]
-    clips = result["clips"]
-
-    logger.info(
-        "基于模板生成剪辑计划: plan_id=%s template_id=%s clips=%d by user=%s",
-        plan.id,
-        body.template_id,
-        len(clips),
-        current_user.user.id,
-    )
-
-    return GenerateFromTemplateResponse(
-        plan=_to_response(plan),
-        clips=[
-            _PlanClipItem(
-                id=c.id,
-                clip_type=c.clip_type,
-                order=c.order,
-                asset_id=c.asset_id,
-                text_content=c.text_content,
-                start_time=c.start_time,
-                duration=c.duration,
-                transition_effect=c.transition_effect,
-                status=c.status.value if hasattr(c.status, "value") else c.status,
-                config=c.config,
-                created_at=c.created_at,
-                updated_at=c.updated_at,
-            )
-            for c in clips
-        ],
-    )

apps/api/app/api/routes/edit_templates.py

@@ -41,9 +41,6 @@ class EditTemplateCreateRequest(BaseModel):
     name: str = Field(..., min_length=1, max_length=200, description="模板名称")
     description: str = Field(default="", max_length=2000, description="模板描述")
     template_type: str = Field(default="default", max_length=50, description="模板类型")
-    editing_mode: str = Field(
-        default="one_take", max_length=20, description="剪辑模式: one_take/pip/voice_over/voice_pip"
-    )
     config: dict[str, Any] = Field(default_factory=dict, description="模板配置 (JSON)")
     preview_url: str = Field(default="", max_length=500, description="预览地址")
     sort_weight: int = Field(default=0, ge=0, le=9999, description="排序权重")
@@ -55,9 +52,6 @@ class EditTemplateUpdateRequest(BaseModel):
     name: Optional[str] = Field(default=None, min_length=1, max_length=200, description="模板名称")
     description: Optional[str] = Field(default=None, max_length=2000, description="模板描述")
     template_type: Optional[str] = Field(default=None, max_length=50, description="模板类型")
-    editing_mode: Optional[str] = Field(
-        default=None, max_length=20, description="剪辑模式: one_take/pip/voice_over/voice_pip"
-    )
     config: Optional[dict[str, Any]] = Field(default=None, description="模板配置 (JSON)")
     preview_url: Optional[str] = Field(default=None, max_length=500, description="预览地址")
     sort_weight: Optional[int] = Field(default=None, ge=0, le=9999, description="排序权重")
@@ -71,7 +65,6 @@ class EditTemplateResponse(BaseModel):
     name: str
     description: str
     template_type: str
-    editing_mode: str
     config: dict[str, Any]
     preview_url: str
     sort_weight: int
@@ -109,7 +102,6 @@ def _to_response(t: EditTemplate) -> EditTemplateResponse:
         name=t.name,
         description=t.description,
         template_type=t.template_type,
-        editing_mode=t.editing_mode,
         config=t.config,
         preview_url=t.preview_url,
         sort_weight=t.sort_weight,
@@ -203,7 +195,6 @@ def create_template(
             name=body.name,
             description=body.description,
             template_type=body.template_type,
-            editing_mode=body.editing_mode,
             config=normalized_config,
             preview_url=body.preview_url,
             sort_weight=body.sort_weight,
@@ -248,7 +239,6 @@ def update_template(
             name=body.name,
             description=body.description,
             template_type=body.template_type,
-            editing_mode=body.editing_mode,
             config=config_to_update,
             preview_url=body.preview_url,
             sort_weight=body.sort_weight,

apps/api/app/api/routes/feature_flags.py

@@ -1,195 +0,0 @@
-"""Feature Flag 内部管理接口。
-
-通过内部 API Key 鉴权，支持查看和修改 Feature Flag 配置。
-主要用于灰度发布期间的动态开关控制。
-
-API:
-  GET  /api/v1/internal/feature-flags          - 列出所有 flag
-  GET  /api/v1/internal/feature-flags/{name}   - 查看单个 flag
-  PUT  /api/v1/internal/feature-flags/{name}   - 设置 flag 配置
-  DELETE /api/v1/internal/feature-flags/{name} - 删除 flag
-
-鉴权：X-API-Key header，走内部 API Key 验证
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Optional
-
-from app.api.routes.auth import _verify_internal_api_key
-from app.config import settings
-from fastapi import APIRouter, Depends, HTTPException, Query, status
-from pydantic import BaseModel, Field
-
-from packages.adapters.redis.feature_flag_store import (
-    FEATURE_FLAG_REDIS_PREFIX,
-    FeatureFlagConfig,
-    RedisFeatureFlagStore,
-)
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter(prefix="/internal/feature-flags", tags=["Internal"])
-
-# 允许管理的 flag 白名单（防止误操作其他系统 flag）
-ALLOWED_FLAGS = {
-    "render_engine",
-}
-
-
-def _get_feature_flag_store() -> RedisFeatureFlagStore:
-    """获取 Feature Flag 存储实例。"""
-    return RedisFeatureFlagStore(redis_url=settings.REDIS_URL)
-
-
-class FeatureFlagUpdateRequest(BaseModel):
-    """Feature Flag 更新请求体。"""
-
-    enabled: bool = Field(..., description="是否启用")
-    percentage: int = Field(0, ge=0, le=100, description="灰度百分比 (0-100)")
-    whitelist: list[str] = Field(default_factory=list, description="白名单列表（如 user_id）")
-
-
-class FeatureFlagResponse(BaseModel):
-    """Feature Flag 响应。"""
-
-    name: str
-    enabled: bool
-    percentage: int
-    whitelist: list[str]
-
-    @classmethod
-    def from_config(cls, config: FeatureFlagConfig) -> "FeatureFlagResponse":
-        return cls(
-            name=config.name,
-            enabled=config.enabled,
-            percentage=config.percentage,
-            whitelist=sorted(config.whitelist),
-        )
-
-
-class FeatureFlagCheckResponse(BaseModel):
-    """Flag 激活检查响应。"""
-
-    name: str
-    active: bool
-    identifier: Optional[str] = None
-
-
-def _validate_flag_name(name: str) -> None:
-    """校验 flag 名称是否在允许列表中。"""
-    if name not in ALLOWED_FLAGS:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Unsupported flag: {name}. Allowed: {sorted(ALLOWED_FLAGS)}",
-        )
-
-
-@router.get("", response_model=list[FeatureFlagResponse])
-async def list_feature_flags(
-    _: bool = Depends(_verify_internal_api_key),
-    store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
-):
-    """列出所有 Feature Flag。"""
-    try:
-        flags = store.list_all()
-        # 同时返回预定义的 flag（即使未设置也显示默认值）
-        result = []
-        for name in sorted(ALLOWED_FLAGS):
-            config = flags.get(name) or FeatureFlagConfig(name=name, enabled=False)
-            result.append(FeatureFlagResponse.from_config(config))
-        # 加上已存在但不在白名单中的 flag（只读展示）
-        for name, config in flags.items():
-            if name not in ALLOWED_FLAGS:
-                result.append(FeatureFlagResponse.from_config(config))
-        return sorted(result, key=lambda x: x.name)
-    except Exception as exc:
-        logger.error("Failed to list feature flags: %s", exc)
-        raise HTTPException(status_code=500, detail=f"Failed to list flags: {exc}")
-
-
-@router.get("/{name}", response_model=FeatureFlagResponse)
-async def get_feature_flag(
-    name: str,
-    _: bool = Depends(_verify_internal_api_key),
-    store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
-):
-    """获取单个 Feature Flag 配置。"""
-    try:
-        config = store.get(name)
-        return FeatureFlagResponse.from_config(config)
-    except Exception as exc:
-        logger.error("Failed to get feature flag %s: %s", name, exc)
-        raise HTTPException(status_code=500, detail=f"Failed to get flag: {exc}")
-
-
-@router.get("/{name}/check", response_model=FeatureFlagCheckResponse)
-async def check_feature_flag(
-    name: str,
-    identifier: Optional[str] = Query(None, description="标识符，如 user_id"),
-    _: bool = Depends(_verify_internal_api_key),
-    store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
-):
-    """检查某个标识符是否命中 Feature Flag。"""
-    try:
-        active = store.is_active(name, identifier=identifier)
-        return FeatureFlagCheckResponse(name=name, active=active, identifier=identifier)
-    except Exception as exc:
-        logger.error("Failed to check feature flag %s: %s", name, exc)
-        raise HTTPException(status_code=500, detail=f"Failed to check flag: {exc}")
-
-
-@router.put("/{name}", response_model=FeatureFlagResponse)
-async def update_feature_flag(
-    name: str,
-    request: FeatureFlagUpdateRequest,
-    _: bool = Depends(_verify_internal_api_key),
-    store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
-):
-    """更新 Feature Flag 配置。
-
-    只允许修改 ALLOWED_FLAGS 列表中的 flag。
-    """
-    _validate_flag_name(name)
-
-    try:
-        config = FeatureFlagConfig(
-            name=name,
-            enabled=request.enabled,
-            percentage=request.percentage,
-            whitelist=set(request.whitelist),
-        )
-        store.set(config)
-        logger.info(
-            "Feature flag updated: name=%s enabled=%s percentage=%d whitelist=%d",
-            name,
-            config.enabled,
-            config.percentage,
-            len(config.whitelist),
-        )
-        return FeatureFlagResponse.from_config(config)
-    except Exception as exc:
-        logger.error("Failed to update feature flag %s: %s", name, exc)
-        raise HTTPException(status_code=500, detail=f"Failed to update flag: {exc}")
-
-
-@router.delete("/{name}", status_code=status.HTTP_204_NO_CONTENT)
-async def delete_feature_flag(
-    name: str,
-    _: bool = Depends(_verify_internal_api_key),
-    store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
-):
-    """删除 Feature Flag。
-
-    只允许删除 ALLOWED_FLAGS 列表中的 flag。
-    """
-    _validate_flag_name(name)
-
-    try:
-        deleted = store.delete(name)
-        logger.info("Feature flag deleted: name=%s deleted=%s", name, deleted)
-        return None
-    except Exception as exc:
-        logger.error("Failed to delete feature flag %s: %s", name, exc)
-        raise HTTPException(status_code=500, detail=f"Failed to delete flag: {exc}")

apps/api/app/api/routes/generation_tasks.py

@@ -1,18 +1,9 @@
-import logging
 import random
 import uuid
 from typing import Any
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.core.storage import OSSStorageService, get_storage_service
-from app.core.task_enqueue import (
-    GLOBAL_PENDING_LIMIT,
-    USER_PENDING_LIMIT,
-    GlobalQueueFull,
-    UserPendingLimitExceeded,
-    check_queue_limits,
-    safe_enqueue_generation_task,
-)
+from app.core.celery_app import celery_app
 from app.dependencies import (
     get_asset_library_repository,
     get_asset_repository,
@@ -26,6 +17,7 @@ from app.schemas.generated_video import (
 )
 from app.schemas.generation_task import (
     BatchGenerationTaskResponse,
+    ConfirmGenerationRequest,
     CreateGenerationTaskRequest,
     GenerationTaskResponse,
     ListGenerationTasksResponse,
@@ -39,10 +31,9 @@ from packages.application import (
     ListGeneratedVideosByTaskUseCase,
 )
 
-logger = logging.getLogger(__name__)
-
 router = APIRouter()
 
+
 def _check_project_access(project_id: str, user_id: str, project_repository) -> None:
     """检查用户是否有项目访问权限"""
     project = project_repository.find_by_id(project_id)
@@ -66,7 +57,12 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
         source_edit_plan_id=task.source_edit_plan_id or "",
         asset_select_mode=getattr(task, "asset_select_mode", ""),
         batch_id=getattr(task, "batch_id", ""),
-        logs=getattr(task, "logs", "[]"),
+        is_preview=getattr(task, "is_preview", True),
+        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", ""),
         status=task.status,
         progress=task.progress,
         result_count=task.result_count,
@@ -74,7 +70,7 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
     )
 
 
-def _to_generated_video_response(item, download_url: str | None = None) -> GeneratedVideoResponse:
+def _to_generated_video_response(item) -> GeneratedVideoResponse:
     return GeneratedVideoResponse(
         id=item.id,
         project_id=item.project_id,
@@ -87,7 +83,6 @@ def _to_generated_video_response(item, download_url: str | None = None) -> Gener
         width=item.width,
         height=item.height,
         fps=item.fps,
-        download_url=download_url,
     )
 
 
@@ -191,37 +186,19 @@ def create_generation_task(
     asset_library_repository: Any = Depends(get_asset_library_repository),
     asset_repository: Any = Depends(get_asset_repository),
 ) -> BatchGenerationTaskResponse:
-    logger.info(
-        "[生成任务] 接收请求: user_id=%s, template_id=%s, asset_count=%d, mode=%s, count=%d",
-        authenticated_user.user.id,
-        request.template_id,
-        len(request.asset_ids),
-        request.asset_select_mode,
-        request.count,
+    project_id, asset_library_id = _resolve_project_and_library(
+        request, project_repository, asset_library_repository, asset_repository, authenticated_user
     )
 
-    try:
-        project_id, asset_library_id = _resolve_project_and_library(
-            request, project_repository, asset_library_repository, asset_repository, authenticated_user
-        )
-    except HTTPException as e:
-        logger.warning("[生成任务] 校验失败: %s", e.detail)
-        raise
-
     # asset_library 存在性校验（仅在提供了 asset_library_id 时）
     resolved_asset_ids: list[str] = list(request.asset_ids)
     if asset_library_id:
         library = asset_library_repository.get(asset_library_id)
         if library is None or (project_id and library.project_id != project_id):
-            logger.warning("[生成任务] 素材库不存在: library_id=%s", asset_library_id)
             raise HTTPException(status_code=404, detail=f"AssetLibrary {asset_library_id} not found")
 
         assets = asset_repository.find_by_library(asset_library_id)
-        try:
-            _ensure_library_has_ready_video_assets(assets)
-        except HTTPException as e:
-            logger.warning("[生成任务] 素材校验失败: %s", e.detail)
-            raise
+        _ensure_library_has_ready_video_assets(assets)
 
         # 素材库自动匹配：当未显式指定 asset_ids 时，按模式自动选取
         if not resolved_asset_ids:
@@ -234,88 +211,96 @@ def create_generation_task(
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     count = request.count
     created_tasks = []
-    failed_tasks = []
-    user_id = authenticated_user.user.id
     # 同批次任务共享 batch_id，用于视频查重时批次内比对
     batch_id = uuid.uuid4().hex if count > 1 else ""
 
-    # 预检查：批量提交前先看会不会超限，避免建一半才拒
-    try:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        global_pending = generation_task_repository.count_pending_total()
-        if user_pending + count > USER_PENDING_LIMIT:
-            raise UserPendingLimitExceeded(
-                user_id=user_id, pending_count=user_pending + count, limit=USER_PENDING_LIMIT
+    for _ in range(count):
+        task = use_case.execute(
+            CreateGenerationTaskCommand(
+                project_id=project_id,
+                asset_library_id=asset_library_id,
+                strategy_id=request.strategy_id,
+                voice_library_id=request.voice_library_id,
+                template_id=request.template_id,
+                asset_ids=resolved_asset_ids,
+                title_ids=request.title_ids,
+                voice_ids=request.voice_ids,
+                created_by_user_id=authenticated_user.user.id,
+                source_edit_plan_id=request.source_edit_plan_id,
+                asset_select_mode=request.asset_select_mode,
+                batch_id=batch_id,
+                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,
             )
-        if global_pending + count > GLOBAL_PENDING_LIMIT:
-            raise GlobalQueueFull(pending_count=global_pending + count, limit=GLOBAL_PENDING_LIMIT)
-    except UserPendingLimitExceeded as e:
-        raise HTTPException(
-            status_code=429,
-            detail=f"您的待处理任务过多（当前 {e.pending_count - count}/{e.limit}，本次提交 {count} 个），请等待完成后再提交",
-        ) from e
-    except GlobalQueueFull as e:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from e
+        )
+        celery_app.send_task("worker.generate_video", args=[task.id])
+        created_tasks.append(task)
 
-    try:
-        for _ in range(count):
-            task = use_case.execute(
-                CreateGenerationTaskCommand(
-                    project_id=project_id,
-                    asset_library_id=asset_library_id,
-                    strategy_id=request.strategy_id,
-                    voice_library_id=request.voice_library_id,
-                    template_id=request.template_id,
-                    asset_ids=resolved_asset_ids,
-                    title_ids=request.title_ids,
-                    voice_ids=request.voice_ids,
-                    created_by_user_id=user_id,
-                    source_edit_plan_id=request.source_edit_plan_id,
-                    asset_select_mode=request.asset_select_mode,
-                    batch_id=batch_id,
-                )
-            )
-            try:
-                if safe_enqueue_generation_task(
-                    task,
-                    generation_task_repository,
-                    user_id=user_id,
-                    log_prefix="[生成任务]",
-                    log_task_status=True,
-                ):
-                    created_tasks.append(task)
-                else:
-                    failed_tasks.append(task)
-            except UserPendingLimitExceeded:
-                # 兜底：如果预检查后又并发提交了，在这里也拦住
-                failed_tasks.append(task)
-                if not created_tasks:
-                    raise HTTPException(
-                        status_code=429,
-                        detail="您的待处理任务过多，请等待完成后再提交",
-                    )
-                break
-            except GlobalQueueFull:
-                failed_tasks.append(task)
-                if not created_tasks:
-                    raise HTTPException(
-                        status_code=503,
-                        detail="系统繁忙，请稍后再试",
-                    )
-                break
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.error("[生成任务] 创建失败: %s", e, exc_info=True)
-        raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志")
-
-    items = [_to_generation_task_response(t) for t in created_tasks + failed_tasks]
+    items = [_to_generation_task_response(t) for t in created_tasks]
     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:
+    """确认生成 — 基于预览任务创建正式生成任务。
+
+    查找预览任务，复制其配置，创建新的正式生成任务（is_preview=False），
+    使用高分辨率，复用 worker.generate_video 渲染路径。
+    """
+    # 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. 创建正式生成任务，复制预览任务的配置
+    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,
+            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,
+        )
+    )
+
+    # 4. 调度 worker.generate_video（同一条渲染路径）
+    celery_app.send_task("worker.generate_video", args=[new_task.id])
+
+    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),
@@ -350,7 +335,6 @@ def list_generation_results(
     generation_task_repository: Any = Depends(get_generation_task_repository),
     generated_video_repository: Any = Depends(get_generated_video_repository),
     project_repository: Any = Depends(get_project_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
 ) -> ListGeneratedVideosResponse:
     task = generation_task_repository.get(task_id)
     if task is None:
@@ -359,11 +343,7 @@ def list_generation_results(
         _check_project_access(task.project_id, authenticated_user.user.id, project_repository)
     use_case = ListGeneratedVideosByTaskUseCase(generated_video_repository)
     items = use_case.execute(task_id)
-    responses = []
-    for item in items:
-        download_url = storage_service.get_download_url(item.file_url, expires_seconds=86400)
-        responses.append(_to_generated_video_response(item, download_url=download_url))
-    return ListGeneratedVideosResponse(items=responses)
+    return ListGeneratedVideosResponse(items=[_to_generated_video_response(item) for item in items])
 
 
 @router.post("/tasks/{task_id}/retry", response_model=GenerationTaskResponse)
@@ -382,21 +362,6 @@ def retry_generation_task(
     if status_val != "failed":
         raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
 
-    user_id = authenticated_user.user.id
-    # 预检查：创建前判断，>= 上限就拒绝
-    user_pending = generation_task_repository.count_pending_by_user(user_id)
-    global_pending = generation_task_repository.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="系统繁忙，请稍后再试",
-        )
-
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     retried = use_case.execute(
         CreateGenerationTaskCommand(
@@ -408,28 +373,16 @@ def retry_generation_task(
             asset_ids=task.asset_ids,
             title_ids=task.title_ids,
             voice_ids=task.voice_ids,
-            created_by_user_id=user_id,
+            created_by_user_id=authenticated_user.user.id,
             source_edit_plan_id=task.source_edit_plan_id or "",
             asset_select_mode=getattr(task, "asset_select_mode", ""),
+            is_preview=getattr(task, "is_preview", True),
+            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:
-        if not safe_enqueue_generation_task(
-            retried,
-            generation_task_repository,
-            user_id=user_id,
-            log_prefix="[生成任务]",
-            log_task_status=True,
-        ):
-            logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
-    except UserPendingLimitExceeded:
-        raise HTTPException(
-            status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
-        ) from None
-    except GlobalQueueFull:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
+    celery_app.send_task("worker.generate_video", args=[retried.id])
     return _to_generation_task_response(retried)

apps/api/app/api/routes/internal_render.py

@@ -1,120 +0,0 @@
-"""渲染结果内部下载接口。
-
-通过内部 API Key 鉴权，为灰度对比工具等内部系统提供渲染结果下载能力。
-
-API:
-  GET  /api/v1/internal/render/videos/{video_id}/download-url  - 获取单个视频下载URL
-  GET  /api/v1/internal/render/tasks/{task_id}/videos          - 获取任务下所有视频及下载URL
-
-鉴权：X-API-Key header，走内部 API Key 验证
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from app.api.routes.auth import _verify_internal_api_key
-from app.core.storage import OSSStorageService, get_storage_service
-from app.dependencies import get_generated_video_repository
-from fastapi import APIRouter, Depends, HTTPException, Query
-from pydantic import BaseModel
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter(prefix="/internal/render", tags=["Internal"])
-
-
-class InternalRenderVideoItem(BaseModel):
-    """内部渲染视频项。"""
-
-    video_id: str
-    generation_task_id: str
-    project_id: str
-    name: str
-    file_url: str
-    file_size: int | None = None
-    duration: float | None = None
-    width: int | None = None
-    height: int | None = None
-    fps: float | None = None
-    status: str
-    download_url: str
-
-
-class InternalRenderTaskVideosResponse(BaseModel):
-    """任务下所有渲染视频响应。"""
-
-    task_id: str
-    count: int
-    videos: list[InternalRenderVideoItem]
-
-
-class InternalRenderDownloadUrlResponse(BaseModel):
-    """单个视频下载URL响应。"""
-
-    video_id: str
-    download_url: str
-
-
-def _video_to_item(video: Any, download_url: str) -> InternalRenderVideoItem:
-    """将 GeneratedVideo 领域对象转为响应项。"""
-    return InternalRenderVideoItem(
-        video_id=video.id,
-        generation_task_id=video.generation_task_id,
-        project_id=video.project_id,
-        name=video.name,
-        file_url=video.file_url,
-        file_size=getattr(video, "file_size", None),
-        duration=getattr(video, "duration", None),
-        width=getattr(video, "width", None),
-        height=getattr(video, "height", None),
-        fps=getattr(video, "fps", None),
-        status=video.status,
-        download_url=download_url,
-    )
-
-
-@router.get("/videos/{video_id}/download-url", response_model=InternalRenderDownloadUrlResponse)
-def get_render_video_download_url(
-    video_id: str,
-    _: bool = Depends(_verify_internal_api_key),
-    generated_video_repository: Any = Depends(get_generated_video_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-) -> InternalRenderDownloadUrlResponse:
-    """获取单个渲染视频的下载URL（预签名）。"""
-    video = generated_video_repository.get(video_id)
-    if video is None:
-        raise HTTPException(status_code=404, detail=f"GeneratedVideo {video_id} not found")
-
-    download_url = storage_service.get_download_url(video.file_url, expires_seconds=86400)
-    logger.info("内部渲染下载URL生成: video_id=%s", video_id)
-    return InternalRenderDownloadUrlResponse(video_id=video_id, download_url=download_url)
-
-
-@router.get("/tasks/{task_id}/videos", response_model=InternalRenderTaskVideosResponse)
-def get_render_task_videos(
-    task_id: str,
-    status: str | None = Query(None, description="按状态筛选，如 completed/failed"),
-    _: bool = Depends(_verify_internal_api_key),
-    generated_video_repository: Any = Depends(get_generated_video_repository),
-    storage_service: OSSStorageService = Depends(get_storage_service),
-) -> InternalRenderTaskVideosResponse:
-    """获取生成任务下所有渲染视频及下载URL。"""
-    videos = generated_video_repository.list_by_generation_task(task_id)
-
-    # 状态筛选
-    if status:
-        videos = [v for v in videos if v.status == status]
-
-    items = []
-    for video in videos:
-        download_url = storage_service.get_download_url(video.file_url, expires_seconds=86400)
-        items.append(_video_to_item(video, download_url))
-
-    logger.info("内部渲染任务视频查询: task_id=%s count=%d", task_id, len(items))
-    return InternalRenderTaskVideosResponse(
-        task_id=task_id,
-        count=len(items),
-        videos=items,
-    )

apps/api/app/api/routes/task_center.py

@@ -1,15 +1,7 @@
-import logging
 from typing import Any
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.core.celery_app import celery_app
-from app.core.task_enqueue import (
-    GLOBAL_PENDING_LIMIT,
-    USER_PENDING_LIMIT,
-    GlobalQueueFull,
-    UserPendingLimitExceeded,
-    safe_enqueue_generation_task,
-)
 from app.dependencies import (
     get_generation_task_repository,
     get_ingest_job_repository,
@@ -30,10 +22,9 @@ from packages.application import (
     SubmitIngestJobUseCase,
 )
 
-logger = logging.getLogger(__name__)
-
 router = APIRouter()
 
+
 def _humanize_task_error(error_message: str) -> str:
     raw = (error_message or "").strip()
     if not raw:
@@ -148,21 +139,6 @@ def retry_task_by_id(
     if _status_value(task.status) != "failed":
         raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
 
-    user_id = authenticated_user.user.id
-    # 预检查
-    user_pending = generation_task_repository.count_pending_by_user(user_id)
-    global_pending = generation_task_repository.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="系统繁忙，请稍后再试",
-        )
-
     use_case = CreateGenerationTaskUseCase(generation_task_repository)
     retried = use_case.execute(
         CreateGenerationTaskCommand(
@@ -174,24 +150,16 @@ def retry_task_by_id(
             asset_ids=task.asset_ids,
             title_ids=task.title_ids,
             voice_ids=task.voice_ids,
-            created_by_user_id=user_id,
+            created_by_user_id=authenticated_user.user.id,
+            is_preview=getattr(task, "is_preview", True),
+            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:
-        if not safe_enqueue_generation_task(
-            retried, generation_task_repository, user_id=user_id, log_prefix="[任务中心]"
-        ):
-            logger.warning("[任务中心] 用户级重试入队失败: task_id=%s", retried.id)
-    except UserPendingLimitExceeded:
-        raise HTTPException(
-            status_code=429,
-            detail="您的待处理任务过多，请等待完成后再提交",
-        ) from None
-    except GlobalQueueFull:
-        raise HTTPException(
-            status_code=503,
-            detail="系统繁忙，请稍后再试",
-        ) from None
+    celery_app.send_task("worker.generate_video", args=[retried.id])
     return UserTaskResponse(
         id=f"generation:{retried.id}",
         task_type="generation",
@@ -259,22 +227,6 @@ def retry_project_task(
             raise HTTPException(status_code=404, detail="Generation task not found")
         if _status_value(task.status) != "failed":
             raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
-
-        user_id = authenticated_user.user.id
-        # 预检查
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        global_pending = generation_task_repository.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="系统繁忙，请稍后再试",
-            )
-
         use_case = CreateGenerationTaskUseCase(generation_task_repository)
         retried = use_case.execute(
             CreateGenerationTaskCommand(
@@ -286,24 +238,16 @@ def retry_project_task(
                 asset_ids=task.asset_ids,
                 title_ids=task.title_ids,
                 voice_ids=task.voice_ids,
-                created_by_user_id=user_id,
+                created_by_user_id=authenticated_user.user.id,
+                is_preview=getattr(task, "is_preview", True),
+                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:
-            if not safe_enqueue_generation_task(
-                retried, generation_task_repository, user_id=user_id, log_prefix="[任务中心]"
-            ):
-                logger.warning("[任务中心] 项目级重试入队失败: task_id=%s", retried.id)
-        except UserPendingLimitExceeded:
-            raise HTTPException(
-                status_code=429,
-                detail="您的待处理任务过多，请等待完成后再提交",
-            ) from None
-        except GlobalQueueFull:
-            raise HTTPException(
-                status_code=503,
-                detail="系统繁忙，请稍后再试",
-            ) from None
+        celery_app.send_task("worker.generate_video", args=[retried.id])
         return _generation_task_to_project_response(retried)
     if task_type == "ingest":
         job = ingest_job_repository.get(source_id)

apps/api/app/api/routes/tts.py

@@ -7,7 +7,6 @@ from typing import Optional
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import (
-    get_audio_url_signer,
     get_cosyvoice_service,
     get_db_session,
     get_user_repository,
@@ -57,10 +56,7 @@ def _get_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyTTS
     return SQLAlchemyTTSJobRepository(session)
 
 
-def _to_response(job, sign_url=None) -> TTSJobResponse:
-    output_url = job.output_audio_url
-    if sign_url and output_url:
-        output_url = sign_url(output_url)
+def _to_response(job) -> TTSJobResponse:
     return TTSJobResponse(
         id=job.id,
         user_id=job.user_id,
@@ -70,7 +66,7 @@ def _to_response(job, sign_url=None) -> TTSJobResponse:
         project_id=job.project_id,
         voice_clone_profile_id=job.voice_clone_profile_id,
         status=job.status,
-        output_audio_url=output_url,
+        output_audio_url=job.output_audio_url,
         output_audio_key=job.output_audio_key,
         duration=job.duration,
         file_size=job.file_size,
@@ -180,7 +176,6 @@ def list_tts_jobs(
     status_filter: Optional[str] = Query(None, alias="status"),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     repository: SQLAlchemyTTSJobRepository = Depends(_get_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> ListTTSJobResponse:
     """列出用户的 TTS 合成任务。"""
     user_id = authenticated_user.user.id
@@ -188,7 +183,7 @@ def list_tts_jobs(
     skip = (page - 1) * page_size
     items, total = use_case.execute(user_id, status=status_filter, skip=skip, limit=page_size)
     return ListTTSJobResponse(
-        items=[_to_response(j, sign_url) for j in items],
+        items=[_to_response(j) for j in items],
         total=total,
         page=page,
         page_size=page_size,
@@ -200,7 +195,6 @@ def get_tts_job(
     job_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     repository: SQLAlchemyTTSJobRepository = Depends(_get_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> TTSJobResponse:
     """获取 TTS 任务详情。"""
     user_id = authenticated_user.user.id
@@ -209,7 +203,7 @@ def get_tts_job(
         job = use_case.execute(job_id, user_id)
     except TTSJobNotFoundError:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found")
-    return _to_response(job, sign_url)
+    return _to_response(job)
 
 
 @router.get("/jobs/{job_id}/status", response_model=TTSStatusResponse)
@@ -217,7 +211,6 @@ def get_tts_job_status(
     job_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     repository: SQLAlchemyTTSJobRepository = Depends(_get_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> TTSStatusResponse:
     """查询 TTS 合成状态（用于前端轮询）。"""
     user_id = authenticated_user.user.id
@@ -226,13 +219,10 @@ def get_tts_job_status(
         job = use_case.execute(job_id, user_id)
     except TTSJobNotFoundError:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="TTS job not found")
-    output_url = job.output_audio_url
-    if output_url:
-        output_url = sign_url(output_url)
     return TTSStatusResponse(
         id=job.id,
         status=job.status,
-        output_audio_url=output_url,
+        output_audio_url=job.output_audio_url,
         error_message=job.error_message,
         duration=job.duration,
         retry_count=job.retry_count,
@@ -268,7 +258,6 @@ def save_tts_job_to_library(
     tts_repository: SQLAlchemyTTSJobRepository = Depends(_get_repository),
     voice_library_repository: SQLAlchemyVoiceLibraryRepository = Depends(get_voice_library_repository),
     user_repository: UserRepository = Depends(get_user_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> SaveToLibraryResponse:
     """将已完成的 TTS 合成结果保存到配音库。
 
@@ -339,7 +328,7 @@ def save_tts_job_to_library(
     return SaveToLibraryResponse(
         id=item.id,
         name=item.name,
-        audio_url=sign_url(item.audio_url) if item.audio_url else "",
+        audio_url=item.audio_url,
         duration=item.duration,
         voice_id=item.voice_id,
         voice_name=item.voice_name,

apps/api/app/api/routes/voice_clones.py

@@ -38,7 +38,6 @@ router = APIRouter()
 
 
 def _to_response(profile) -> VoiceCloneProfileResponse:
-    # source_audio_url 是用户传入的原始 URL（可能是外部地址），不做预签名转换
     return VoiceCloneProfileResponse(
         id=profile.id,
         user_id=profile.user_id,

apps/api/app/api/routes/voices.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 from typing import Literal, Optional
 
 from app.auth import AuthenticatedUser, get_current_user
-from app.dependencies import get_audio_url_signer, get_db_session, get_user_repository
+from app.dependencies import get_db_session, get_user_repository
 from app.schemas.voice import (
     PresetVoiceItemResponse,
     PresetVoiceListResponse,
@@ -50,10 +50,7 @@ def _get_clone_profile_repository(session: Session = Depends(get_db_session)) ->
     return SQLAlchemyVoiceCloneProfileRepository(session)
 
 
-def _to_response(item, sign_url=None) -> VoiceLibraryItemResponse:
-    audio = item.audio_url
-    if sign_url and audio:
-        audio = sign_url(audio)
+def _to_response(item) -> VoiceLibraryItemResponse:
     return VoiceLibraryItemResponse(
         id=item.id,
         user_id=item.user_id,
@@ -62,7 +59,7 @@ def _to_response(item, sign_url=None) -> VoiceLibraryItemResponse:
         voice_provider=item.voice_provider,
         voice_id=item.voice_id,
         voice_name=item.voice_name,
-        audio_url=audio,
+        audio_url=item.audio_url,
         duration=item.duration,
         file_size=item.file_size,
         status=item.status,
@@ -73,20 +70,16 @@ def _to_response(item, sign_url=None) -> VoiceLibraryItemResponse:
     )
 
 
-def _to_unified_response(item, profile_id_map: dict | None = None, sign_url=None) -> UnifiedVoiceItemResponse:
+def _to_unified_response(item, profile_id_map: dict | None = None) -> UnifiedVoiceItemResponse:
     """将数据库音色转换为统一响应格式。
 
     Args:
         item: VoiceLibraryItem
         profile_id_map: voice_id → profile_id 映射，用于填充 voice_clone_profile_id
-        sign_url: 音频URL预签名函数
     """
     profile_id = None
     if profile_id_map and item.voice_id:
         profile_id = profile_id_map.get(item.voice_id)
-    audio = item.audio_url
-    if sign_url and audio:
-        audio = sign_url(audio)
     return UnifiedVoiceItemResponse(
         id=item.id,
         type="clone",
@@ -96,7 +89,7 @@ def _to_unified_response(item, profile_id_map: dict | None = None, sign_url=None
         language="zh-CN",
         voice_id=item.voice_id,
         voice_provider=item.voice_provider or "cosyvoice",
-        audio_url=audio,
+        audio_url=item.audio_url,
         duration=item.duration,
         file_size=item.file_size,
         status=item.status,
@@ -147,7 +140,6 @@ def list_voices_unified(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     voice_repository: SQLAlchemyVoiceLibraryRepository = Depends(_get_voice_repository),
     clone_profile_repository: SQLAlchemyVoiceCloneProfileRepository = Depends(_get_clone_profile_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> UnifiedVoiceListResponse:
     """获取配音列表（预置音色 + 用户克隆音色）。
 
@@ -175,7 +167,7 @@ def list_voices_unified(
         # 批量查询 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]
+        clone_items = [_to_unified_response(i, profile_id_map) for i in clone_items_raw]
 
     # 组装结果
     if type == "preset":
@@ -232,7 +224,6 @@ def list_voices_legacy(
     limit: int = Query(50, ge=1, le=200),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     voice_repository: SQLAlchemyVoiceLibraryRepository = Depends(_get_voice_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> ListVoiceLibraryResponse:
     """原有配音列表接口（仅返回用户克隆音色）。
 
@@ -242,7 +233,7 @@ def list_voices_legacy(
     use_case = ListVoiceLibraryUseCase(voice_repository)
     items, total = use_case.execute(user_id, status=status_filter, skip=skip, limit=limit)
     return ListVoiceLibraryResponse(
-        items=[_to_response(i, sign_url) for i in items],
+        items=[_to_response(i) for i in items],
         total=total,
     )
 
@@ -252,14 +243,13 @@ def get_voice(
     voice_id: str,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     voice_repository: SQLAlchemyVoiceLibraryRepository = Depends(_get_voice_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> VoiceLibraryItemResponse:
     user_id = authenticated_user.user.id
     use_case = GetVoiceLibraryUseCase(voice_repository)
     item = use_case.execute(voice_id, user_id)
     if item is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found")
-    return _to_response(item, sign_url)
+    return _to_response(item)
 
 
 @router.post("", response_model=VoiceLibraryItemResponse, status_code=status.HTTP_201_CREATED)
@@ -268,7 +258,6 @@ def create_voice(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     voice_repository: SQLAlchemyVoiceLibraryRepository = Depends(_get_voice_repository),
     user_repository: UserRepository = Depends(get_user_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> VoiceLibraryItemResponse:
     user_id = authenticated_user.user.id
     plan_name = _get_user_plan(user_id, user_repository)
@@ -294,7 +283,7 @@ def create_voice(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=f"配音库配额已满（{exc.used}/{exc.limit}），请升级套餐",
         )
-    return _to_response(item, sign_url)
+    return _to_response(item)
 
 
 @router.put("/{voice_id}", response_model=VoiceLibraryItemResponse)
@@ -303,7 +292,6 @@ def update_voice(
     request: UpdateVoiceLibraryRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     voice_repository: SQLAlchemyVoiceLibraryRepository = Depends(_get_voice_repository),
-    sign_url=Depends(get_audio_url_signer),
 ) -> VoiceLibraryItemResponse:
     user_id = authenticated_user.user.id
     command = UpdateVoiceLibraryCommand(
@@ -325,7 +313,7 @@ def update_voice(
         item = use_case.execute(command)
     except NotFoundError:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Voice not found")
-    return _to_response(item, sign_url)
+    return _to_response(item)
 
 
 @router.delete("/{voice_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None)

apps/api/app/config.py

@@ -79,27 +79,6 @@ class Settings(BaseSettings):
     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"),
@@ -109,9 +88,6 @@ class Settings(BaseSettings):
     LOG_LEVEL: str = "INFO"
     CORS_ORIGINS_RAW: str = "http://localhost:3000,http://localhost:5173,http://localhost:8000"
 
-    # 渲染引擎选择：legacy=旧VideoComposeService，unified=新UnifiedRenderService
-    RENDER_ENGINE: str = "legacy"
-
     model_config = SettingsConfigDict(
         env_file=".env",
         env_file_encoding="utf-8",

apps/api/app/core/storage.py

@@ -34,18 +34,13 @@ class OSSStorageService:
         if has_key_id and has_key_secret:
             if oss2 is not None:
                 try:
-                    # P0-2 修复：oss2.Bucket 的 endpoint 必须带 https:// 前缀，
-                    # 否则 sign_url 默认生成 HTTP URL。
-                    bucket_endpoint = settings.OSS_ENDPOINT
-                    if not bucket_endpoint.startswith(("http://", "https://")):
-                        bucket_endpoint = f"https://{bucket_endpoint}"
                     auth = oss2.Auth(
                         settings.OSS_ACCESS_KEY_ID,
                         settings.OSS_ACCESS_KEY_SECRET,
                     )
                     self.bucket = oss2.Bucket(
                         auth,
-                        bucket_endpoint,
+                        settings.OSS_ENDPOINT,
                         settings.OSS_BUCKET_NAME,
                     )
                     logger.info(
@@ -69,26 +64,6 @@ class OSSStorageService:
         self.access_key_secret = settings.OSS_ACCESS_KEY_SECRET
         self.endpoint = settings.OSS_ENDPOINT
 
-    def diagnose(self) -> None:
-        """启动诊断：输出 OSS 配置状态，帮助排查预签名 URL 问题。"""
-        key_id_display = (
-            f"{self.access_key_id[:4]}...{self.access_key_id[-4:]}" if len(self.access_key_id) > 8 else "(empty)"
-        )
-        logger.info(
-            "[OSS诊断] endpoint=%s bucket_name=%s access_key_id=%s",
-            self.endpoint,
-            self.bucket_name,
-            key_id_display,
-        )
-        if self.bucket is None:
-            logger.error(
-                "[OSS诊断] ❌ bucket=None — 预签名URL不可用！"
-                "原因: OSS_ACCESS_KEY_ID/OSS_ACCESS_KEY_SECRET 未配置或 oss2 未安装。"
-                "请检查服务器 .env 文件（如 /var/lib/xiaoxia-saas-staging/.env）"
-            )
-        else:
-            logger.info("[OSS诊断] ✅ bucket 已配置，预签名URL可用")
-
     def _is_local_generated_url(self, storage_key_or_url: str) -> bool:
         parsed = urlparse(storage_key_or_url)
         path = parsed.path if parsed.scheme else storage_key_or_url
@@ -191,26 +166,12 @@ class OSSStorageService:
         if self.bucket is None:
             if self._is_local_generated_url(storage_key_or_url):
                 return storage_key_or_url
-            logger.warning(
-                "get_download_url: OSS bucket not configured, returning raw URL. " "storage_key_or_url=%s",
-                storage_key_or_url[:200],
-            )
             return self.get_url(self._normalize_storage_key(storage_key_or_url))
 
         storage_key = self._normalize_storage_key(storage_key_or_url)
         try:
-            signed = self.bucket.sign_url("GET", storage_key, expires_seconds)
-            logger.info(
-                "get_download_url: signed URL generated. storage_key=%s url_prefix=%s",
-                storage_key[:80],
-                signed[:60],
-            )
-            return signed
+            return self.bucket.sign_url("GET", storage_key, expires_seconds)
         except Exception:
-            logger.exception(
-                "get_download_url: sign_url failed, falling back to raw URL. " "storage_key=%s",
-                storage_key[:200],
-            )
             return self.get_url(storage_key)
 
     def _normalize_storage_key(self, storage_key_or_url: str) -> str:
@@ -279,5 +240,4 @@ def get_storage_service() -> OSSStorageService:
     global _storage_service
     if _storage_service is None:
         _storage_service = OSSStorageService()
-        _storage_service.diagnose()
     return _storage_service

apps/api/app/core/task_enqueue.py

@@ -1,221 +0,0 @@
-import logging
-from typing import Any
-
-from app.core.celery_app import celery_app
-
-logger = logging.getLogger(__name__)
-
-# ── 限流阈值常量（全系统统一管理，不要在业务代码里硬编码） ──
-USER_PENDING_LIMIT = 3  # 单用户 pending 上限
-GLOBAL_PENDING_LIMIT = 20  # 全局 pending 上限
-
-
-class UserPendingLimitExceeded(Exception):
-    """用户 pending 任务数超限，返回 429。"""
-
-    def __init__(self, user_id: str, pending_count: int, limit: int):
-        self.user_id = user_id
-        self.pending_count = pending_count
-        self.limit = limit
-        super().__init__(f"用户 {user_id} pending 任务数 {pending_count} 超过上限 {limit}")
-
-
-class GlobalQueueFull(Exception):
-    """全局限流，返回 503。"""
-
-    def __init__(self, pending_count: int, limit: int):
-        self.pending_count = pending_count
-        self.limit = limit
-        super().__init__(f"系统 pending 任务数 {pending_count} 超过上限 {limit}")
-
-
-def check_queue_limits(
-    user_id: str,
-    generation_task_repository: Any,
-    *,
-    user_pending_limit: int = USER_PENDING_LIMIT,
-    global_pending_limit: int = GLOBAL_PENDING_LIMIT,
-) -> None:
-    """检查队列限流（预检查用，任务创建前调用），超限抛对应异常。
-
-    边界语义：>= 上限即拒绝（达到上限就不能再加新任务）。
-
-    Args:
-        user_id: 用户 ID
-        generation_task_repository: 任务仓储
-        user_pending_limit: 单用户 pending 上限，默认 USER_PENDING_LIMIT
-        global_pending_limit: 全局 pending 上限，默认 GLOBAL_PENDING_LIMIT
-
-    Raises:
-        GlobalQueueFull: 全局超限时抛出（优先级更高，先查全局）
-        UserPendingLimitExceeded: 用户超限时抛出
-    """
-    # 先查全局（系统级保护优先级更高）
-    global_pending = generation_task_repository.count_pending_total()
-    if global_pending >= global_pending_limit:
-        logger.warning(
-            "[队列限流] 全局 pending 任务数超限: %d/%d, user_id=%s",
-            global_pending,
-            global_pending_limit,
-            user_id,
-        )
-        raise GlobalQueueFull(pending_count=global_pending, limit=global_pending_limit)
-
-    # 再查用户级
-    if user_id:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        if user_pending >= user_pending_limit:
-            logger.warning(
-                "[队列限流] 用户 pending 任务数超限: user_id=%s, count=%d/%d",
-                user_id,
-                user_pending,
-                user_pending_limit,
-            )
-            raise UserPendingLimitExceeded(user_id=user_id, pending_count=user_pending, limit=user_pending_limit)
-
-
-def _mark_task_failed_safely(
-    task: Any,
-    generation_task_repository: Any,
-    log_prefix: str,
-    reason: str,
-) -> None:
-    """安全地把任务标记为 failed，更新失败只打日志不崩溃。"""
-    try:
-        task.mark_failed(f"任务被限流拒绝: {reason}")
-        generation_task_repository.update(task)
-    except Exception as update_err:
-        logger.error(
-            "%s 限流后更新状态也失败: task_id=%s error=%s",
-            log_prefix,
-            task.id,
-            update_err,
-            exc_info=True,
-        )
-
-
-def safe_enqueue_generation_task(
-    task: Any,
-    generation_task_repository: Any,
-    *,
-    user_id: str = "",
-    log_prefix: str = "[任务队列]",
-    log_task_status: bool = False,
-    user_pending_limit: int = USER_PENDING_LIMIT,
-    global_pending_limit: int = GLOBAL_PENDING_LIMIT,
-) -> bool:
-    """安全入队：入队前限流检查 → 发送 Celery 任务 → 入队后最终校验兜底。
-
-    边界说明：
-    入队前检查用 > 而非 >=。因为调用此函数时 task 已经是 pending 状态并计入 DB，
-    pending 总数包含了当前任务本身。pending > limit 等价于"其他任务数 >= limit"，
-    与预检查的 >= 语义一致（都是达到上限就拒绝新任务）。
-
-    入队后最终校验：发送 Celery 成功后再查一次 DB 计数，处理并发竞态场景
-    （两个请求同时通过入队前检查，后到的那个在这里被兜住）。
-
-    Args:
-        task: 生成任务对象，需有 id 属性和 mark_failed 方法（状态已为 pending）
-        generation_task_repository: 任务仓储，用于更新状态
-        user_id: 用户 ID，传了才做用户级限流检查
-        log_prefix: 日志前缀，便于区分调用来源
-        log_task_status: 成功日志中是否额外打印任务状态
-        user_pending_limit: 单用户 pending 上限，默认 USER_PENDING_LIMIT
-        global_pending_limit: 全局 pending 上限，默认 GLOBAL_PENDING_LIMIT
-
-    Returns:
-        True 表示入队成功，False 表示入队失败（已标记为 failed）
-
-    Raises:
-        GlobalQueueFull: 全局 pending 超限时抛出，任务会被标记为 failed
-        UserPendingLimitExceeded: 用户 pending 超限时抛出，任务会被标记为 failed
-    """
-    # ── 入队前检查：任务已是 pending，用 > 判断（包含当前任务） ──
-
-    # 全局限流检查（始终生效）
-    global_pending = generation_task_repository.count_pending_total()
-    if global_pending > global_pending_limit:
-        logger.warning(
-            "[队列限流] 全局 pending 任务数超限(入队前): %d/%d, user_id=%s",
-            global_pending,
-            global_pending_limit,
-            user_id or "unknown",
-        )
-        exc = GlobalQueueFull(pending_count=global_pending, limit=global_pending_limit)
-        _mark_task_failed_safely(task, generation_task_repository, log_prefix, str(exc))
-        raise exc
-
-    # 用户级限流检查（传了 user_id 才做）
-    if user_id:
-        user_pending = generation_task_repository.count_pending_by_user(user_id)
-        if user_pending > user_pending_limit:
-            logger.warning(
-                "[队列限流] 用户 pending 任务数超限(入队前): user_id=%s, count=%d/%d",
-                user_id,
-                user_pending,
-                user_pending_limit,
-            )
-            exc = UserPendingLimitExceeded(user_id=user_id, pending_count=user_pending, limit=user_pending_limit)
-            _mark_task_failed_safely(task, generation_task_repository, log_prefix, str(exc))
-            raise exc
-
-    # ── 发送 Celery 任务 ──
-    try:
-        celery_app.send_task("worker.generate_video", args=[task.id])
-    except Exception as e:
-        logger.error(
-            "%s 入队失败，标记为失败: task_id=%s error=%s",
-            log_prefix,
-            task.id,
-            e,
-            exc_info=True,
-        )
-        try:
-            task.mark_failed(f"任务入队失败: {e}")
-            generation_task_repository.update(task)
-        except Exception as update_err:
-            logger.error(
-                "%s 入队失败后更新状态也失败: task_id=%s error=%s",
-                log_prefix,
-                task.id,
-                update_err,
-                exc_info=True,
-            )
-        return False
-
-    # ── 入队后最终校验：并发竞态兜底 ──
-    # 发送成功后再查一次，防止两个请求同时通过入队前检查导致超限
-    global_after = generation_task_repository.count_pending_total()
-    user_after = generation_task_repository.count_pending_by_user(user_id) if user_id else 0
-
-    global_over = global_after > global_pending_limit
-    user_over = bool(user_id and user_after > user_pending_limit)
-
-    if global_over or user_over:
-        if global_over:
-            reason = f"全局 pending 超限(入队后): {global_after}/{global_pending_limit}"
-            exc: Exception = GlobalQueueFull(pending_count=global_after, limit=global_pending_limit)
-        else:
-            reason = f"用户 pending 超限(入队后): {user_after}/{user_pending_limit}"
-            exc = UserPendingLimitExceeded(user_id=user_id, pending_count=user_after, limit=user_pending_limit)
-
-        logger.warning(
-            "[队列限流] %s, task_id=%s, user_id=%s — 回滚状态为 failed",
-            reason,
-            task.id,
-            user_id or "unknown",
-        )
-        _mark_task_failed_safely(task, generation_task_repository, log_prefix, reason)
-        raise exc
-
-    # 入队成功日志
-    if log_task_status:
-        logger.info(
-            "%s 入队成功: task_id=%s, status=%s",
-            log_prefix,
-            task.id,
-            task.status,
-        )
-    else:
-        logger.info("%s 入队成功: task_id=%s", log_prefix, task.id)
-    return True

apps/api/app/dependencies.py

@@ -201,37 +201,7 @@ def get_voice_clone_profile_repository(
 
 
 def get_cosyvoice_service():
-    """Provide the CosyVoice service instance.
-
-    注入 OSS 音频URL预签名函数，确保私有bucket下的参考音频
-    能被 CosyVoice 服务器下载。
-    """
-    from app.core.storage import get_storage_service
-
+    """Provide the CosyVoice service instance."""
     from packages.application.cosyvoice_service import CosyVoiceService
 
-    storage = get_storage_service()
-
-    def _sign_audio_url(url: str) -> str:
-        """对音频URL做预签名，私有bucket下 CosyVoice 服务器才能下载."""
-        return storage.get_download_url(url, expires_seconds=86400)
-
-    return CosyVoiceService(audio_url_signer=_sign_audio_url)
-
-
-def get_audio_url_signer():
-    """提供音频URL预签名函数（24小时有效期）。
-
-    用于所有 API 返回给前端的音频 URL，确保私有 OSS bucket 下可正常访问。
-    空 URL、非 OSS URL 直接原样返回；签名失败时回退到原始 URL。
-    """
-    from app.core.storage import get_storage_service
-
-    storage = get_storage_service()
-
-    def sign_audio_url(url: str) -> str:
-        if not url:
-            return url
-        return storage.get_download_url(url, expires_seconds=86400)
-
-    return sign_audio_url
+    return CosyVoiceService()

apps/api/app/middleware/auth.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 from app.auth import AuthenticatedUser
 from app.auth import get_current_user as get_authenticated_user
 from app.dependencies import get_user_repository
-from fastapi import Depends
+from fastapi import Depends, HTTPException
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 from packages.domain.entities import User

apps/api/app/schemas/generation_task.py

@@ -1,6 +1,13 @@
-import json
+from pydantic import BaseModel, Field, model_validator
 
-from pydantic import BaseModel, Field, field_validator, model_validator
+
+class ConfirmGenerationRequest(BaseModel):
+    """确认生成请求体 — 基于预览任务创建正式生成任务"""
+
+    output_width: int = Field(default=1080, description="输出视频宽度")
+    output_height: int = Field(default=1920, description="输出视频高度")
+    cover_url: str = Field(default="", description="自定义封面图片 URL")
+    custom_title: str = Field(default="", description="自定义视频标题")
 
 
 class CreateGenerationTaskRequest(BaseModel):
@@ -33,6 +40,13 @@ class CreateGenerationTaskRequest(BaseModel):
     asset_select_count: int = Field(
         default=0, ge=0, le=100, description="选取数量，0表示全部（仅 random/smart 模式有效）"
     )
+    # ── 预览 / 确认生成 ──
+    is_preview: bool = Field(default=True, 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":
@@ -60,25 +74,16 @@ class GenerationTaskResponse(BaseModel):
     source_edit_plan_id: str = ""
     asset_select_mode: str = ""
     batch_id: str = ""
+    is_preview: bool = True
+    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
     error_message: str
-    logs: list[dict] = Field(default_factory=list)
-
-    @field_validator("logs", mode="before")
-    @classmethod
-    def _parse_logs(cls, v: object) -> list[dict]:
-        """将 JSON 字符串解析为 list[dict]。"""
-        if isinstance(v, str):
-            try:
-                parsed = json.loads(v)
-                return parsed if isinstance(parsed, list) else []
-            except (json.JSONDecodeError, TypeError):
-                return []
-        if isinstance(v, list):
-            return v
-        return []
 
 
 class BatchGenerationTaskResponse(BaseModel):

apps/api/app/services/__init__.py

@@ -4,7 +4,6 @@ from .auto_clip_service import AutoClipService
 from .edit_plan_service import EditPlanService
 from .edit_template_service import EditTemplateService
 from .job_service import JobService
-from .plan_generator_service import PlanGeneratorService
 from .video_compose_service import VideoComposeService
 
 __all__ = [
@@ -12,6 +11,5 @@ __all__ = [
     "EditPlanService",
     "EditTemplateService",
     "JobService",
-    "PlanGeneratorService",
     "VideoComposeService",
 ]

apps/api/app/services/edit_plan_service.py

@@ -447,12 +447,12 @@ class EditPlanService:
 
         # 检查状态
         if plan.status != EditPlanStatus.EDITING:
-            return False, "请先编辑并保存模板后再生成视频"
+            return False, f"只有 editing 状态的计划可以触发渲染，当前状态: {plan.status}"
 
         # 检查是否有片段
         clips = self._clip_repo.list_by_plan(plan_id)
         if not clips:
-            return False, "请先添加片段后再生成视频"
+            return False, "计划下没有片段，无法触发渲染"
 
         return True, ""
 

apps/api/app/services/edit_template_service.py

@@ -100,7 +100,6 @@ class EditTemplateService:
         *,
         description: str = "",
         template_type: str = "default",
-        editing_mode: str = "one_take",
         config: Optional[dict[str, Any]] = None,
         preview_url: str = "",
         sort_weight: int = 0,
@@ -125,7 +124,6 @@ class EditTemplateService:
             name=clean_name,
             description=description,
             template_type=template_type,
-            editing_mode=editing_mode,
             config=config,
             preview_url=preview_url,
             sort_weight=sort_weight,
@@ -141,7 +139,6 @@ class EditTemplateService:
         name: Optional[str] = None,
         description: Optional[str] = None,
         template_type: Optional[str] = None,
-        editing_mode: Optional[str] = None,
         config: Optional[dict[str, Any]] = None,
         preview_url: Optional[str] = None,
         sort_weight: Optional[int] = None,
@@ -168,7 +165,6 @@ class EditTemplateService:
             name=new_name,
             description=description.strip() if description is not None else existing.description,
             template_type=template_type.strip() if template_type is not None else existing.template_type,
-            editing_mode=editing_mode.strip() if editing_mode is not None else existing.editing_mode,
             config=config if config is not None else existing.config,
             preview_url=preview_url.strip() if preview_url is not None else existing.preview_url,
             sort_weight=sort_weight if sort_weight is not None else existing.sort_weight,

apps/api/app/services/plan_generator_service.py

@@ -1,391 +0,0 @@
-"""PlanGeneratorService — 基于模板+素材自动生成剪辑计划.
-
-核心职责:
-- 根据 EditTemplate 的 editing_mode 和 TemplateClipConfig 列表，
-  自动生成 EditPlan + EditPlanClip 列表
-- 四种模式素材分配策略:
-  - ONE_TAKE: 素材顺序分配给 main 类型 clips
-  - PIP: 第1个素材→main(全屏背景)，其余→overlay clips
-  - VOICE_OVER: 素材→main clips (B-roll)，标记需要配音叠加
-  - VOICE_PIP: 第1个→background, 第2个→corner_voice, 其余→b_roll
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import Any, List, Optional
-
-from sqlalchemy.orm import Session
-
-from packages.adapters.sqlalchemy_impl import (
-    SQLAlchemyEditPlanClipRepository,
-    SQLAlchemyEditPlanRepository,
-)
-from packages.domain.config_schemas import normalize_plan_config
-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.template_clip_config import ClipType, TemplateClipConfig
-
-logger = logging.getLogger(__name__)
-
-
-# ── 默认片段时长（秒） ────────────────────────────────────────────────────────
-_DEFAULT_CLIP_DURATION = 5.0
-_DEFAULT_INTRO_DURATION = 3.0
-_DEFAULT_OUTRO_DURATION = 3.0
-
-
-class PlanGeneratorService:
-    """剪辑计划生成器
-
-    基于模板 + 素材，自动生成 EditPlan 及 EditPlanClip 列表。
-    """
-
-    def __init__(self, db: Session) -> None:
-        self._plan_repo = SQLAlchemyEditPlanRepository(db)
-        self._clip_repo = SQLAlchemyEditPlanClipRepository(db)
-
-    # ── 公开接口 ─────────────────────────────────────────────────────────────
-
-    def generate_from_template(
-        self,
-        template: EditTemplate,
-        clip_configs: List[TemplateClipConfig],
-        asset_ids: List[str],
-        *,
-        project_id: str = "",
-        created_by_user_id: str = "",
-        name: str = "",
-    ) -> dict[str, Any]:
-        """基于模板+素材生成剪辑计划
-
-        Args:
-            template: 剪辑模板实体
-            clip_configs: 模板片段配置列表（可为空，自动生成默认结构）
-            asset_ids: 素材 ID 列表
-            project_id: 所属项目 ID
-            created_by_user_id: 创建者用户 ID
-            name: 计划名称（为空则自动取模板名）
-
-        Returns:
-            dict: {"plan": EditPlan, "clips": List[EditPlanClip]}
-        """
-        editing_mode = template.editing_mode or EditingMode.ONE_TAKE.value
-        plan_name = name.strip() or f"{template.name} - 剪辑计划"
-
-        # 1. 构建 plan config（继承模板的 title/subtitle/bgm，记录 editing_mode）
-        plan_config = self._build_plan_config(template, editing_mode)
-
-        # 2. 创建 EditPlan
-        plan = EditPlan.create(
-            template_id=template.id,
-            name=plan_name,
-            config=plan_config,
-            total_duration=0.0,
-            project_id=project_id,
-            created_by_user_id=created_by_user_id,
-        )
-        plan = self._plan_repo.create(plan)
-        logger.info(
-            "生成剪辑计划: plan_id=%s template=%s mode=%s assets=%d",
-            plan.id,
-            template.id,
-            editing_mode,
-            len(asset_ids),
-        )
-
-        # 3. 生成片段列表
-        if clip_configs:
-            clips = self._create_clips_from_configs(plan.id, clip_configs)
-        else:
-            clips = self._generate_default_clips(plan.id, editing_mode, len(asset_ids))
-
-        # 4. 按 editing_mode 分配素材
-        if asset_ids:
-            self._distribute_assets(clips, asset_ids, editing_mode)
-
-        # 5. 持久化所有 clips 并计算总时长
-        created_clips: List[EditPlanClip] = []
-        total_duration = 0.0
-        for clip in clips:
-            saved = self._clip_repo.create(clip)
-            created_clips.append(saved)
-            total_duration += saved.duration
-
-        # 6. 更新 plan 的 total_duration
-        plan.total_duration = total_duration
-        plan = self._plan_repo.update(plan)
-
-        # 7. 流转到 editing 状态
-        try:
-            plan.start_editing()
-            plan = self._plan_repo.update(plan)
-        except ValueError as exc:
-            logger.warning("计划状态流转失败: plan_id=%s error=%s", plan.id, exc)
-
-        logger.info(
-            "剪辑计划生成完成: plan_id=%s clips=%d duration=%.1f",
-            plan.id,
-            len(created_clips),
-            total_duration,
-        )
-
-        return {"plan": plan, "clips": created_clips}
-
-    # ── 内部方法 ─────────────────────────────────────────────────────────────
-
-    def _build_plan_config(
-        self,
-        template: EditTemplate,
-        editing_mode: str,
-    ) -> dict[str, Any]:
-        """从模板配置构建 plan config"""
-        template_config = template.config or {}
-        plan_config: dict[str, Any] = {
-            "editing_mode": editing_mode,
-        }
-        # 继承模板的 cover/title/subtitle/bgm 配置
-        for key in ("cover", "title", "subtitle", "bgm"):
-            if key in template_config:
-                plan_config[key] = template_config[key]
-
-        return normalize_plan_config(plan_config)
-
-    def _create_clips_from_configs(
-        self,
-        plan_id: str,
-        clip_configs: List[TemplateClipConfig],
-    ) -> List[EditPlanClip]:
-        """从 TemplateClipConfig 列表创建 EditPlanClip 列表（未持久化）"""
-        clips: List[EditPlanClip] = []
-        # 按 order 排序
-        sorted_configs = sorted(clip_configs, key=lambda c: c.order)
-
-        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 = 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",
-            )
-            clips.append(clip)
-
-        return clips
-
-    def _generate_default_clips(
-        self,
-        plan_id: str,
-        editing_mode: str,
-        asset_count: int,
-    ) -> List[EditPlanClip]:
-        """无 clip_configs 时，根据 editing_mode 生成默认 clip 结构
-
-        - 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
-        """
-        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 i 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 i 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 i 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 i 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,
-    ) -> None:
-        """按 editing_mode 将素材分配到 clips（就地修改，未持久化）
-
-        分配策略:
-        - ONE_TAKE: 素材按顺序依次分配给 main 类型 clips
-        - PIP: 第1个素材→main(全屏背景)，其余→交替分配给 overlay clips
-        - VOICE_OVER: 素材→main clips (B-roll)
-        - VOICE_PIP: 第1个→background, 第2个→corner_voice, 其余→b_roll
-        """
-        if not asset_ids or not clips:
-            return
-
-        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)
-
-    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])
-
-    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])

apps/web/e2e/assets-full.spec.ts

@@ -1,626 +0,0 @@
-/**
- * 素材库页面完整 E2E 测试
- *
- * 覆盖：页面加载、创建素材库、切换素材库、搜索/筛选、素材详情、
- *       删除素材、批量删除、空状态
- * 注意：test_asset.spec.ts 已覆盖 API 级别的素材库 CRUD，本文件聚焦 UI 交互
- */
-import { expect, test, type APIRequestContext } from "@playwright/test";
-
-const PASSWORD = "SmokePass123!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (
-  page: import("@playwright/test").Page,
-) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 创建项目 */
-async function createProject(
-  request: APIRequestContext,
-  headers: Record<string, string>,
-  suffix: string,
-): Promise<string> {
-  const resp = await request.post(`${apiBase}/projects`, {
-    headers,
-    data: { name: `Assets Test Proj ${suffix}`, description: "E2E assets test" },
-  });
-  expect(resp.ok(), `创建项目应成功: ${await resp.text()}`).toBeTruthy();
-  const data = await resp.json();
-  return data.id;
-}
-
-/** 创建素材库 */
-async function createLibrary(
-  request: APIRequestContext,
-  headers: Record<string, string>,
-  projectId: string,
-  name: string,
-  kind: "video" | "image" = "video",
-): Promise<string> {
-  const resp = await request.post(`${apiBase}/asset-libraries`, {
-    headers,
-    data: { project_id: projectId, name, kind },
-  });
-  expect(resp.ok(), `创建素材库应成功: ${await resp.text()}`).toBeTruthy();
-  const data = await resp.json();
-  return data.id;
-}
-
-/** 创建素材记录 */
-async function createAsset(
-  request: APIRequestContext,
-  headers: Record<string, string>,
-  projectId: string,
-  libraryId: string,
-  userId: string,
-  name: string,
-  status: string = "ready",
-): Promise<string> {
-  const resp = await request.post(`${apiBase}/assets`, {
-    headers,
-    data: {
-      project_id: projectId,
-      library_id: libraryId,
-      name,
-      storage_key: `uploads/e2e/${Date.now()}/${name}`,
-      mime_type: "video/mp4",
-      file_size: 1024000,
-      status,
-      uploaded_by_user_id: userId,
-      metadata: { duration: 15.5, resolution: "1080p" },
-    },
-  });
-  expect(resp.ok(), `创建素材应成功: ${await resp.text()}`).toBeTruthy();
-  const data = await resp.json();
-  return data.id;
-}
-
-/** 在浏览器中设置登录态 */
-async function setupAuthInBrowser(
-  page: import("@playwright/test").Page,
-  token: string,
-  user: { id: string; email: string; username: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.username,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-test.describe("素材库页面 - 完整交互测试", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  // ─── 页面加载 ──────────────────────────────────────
-
-  test("素材库列表页面加载", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-load",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    await createLibrary(request, headers, projectId, "默认视频库", "video");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-
-    // 页面布局容器
-    await expect(page.locator(".xx-assets-page")).toBeVisible({ timeout: 20_000 });
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    // 左侧素材库列表
-    await expect(page.locator(".xx-asset-library-list")).toBeVisible();
-
-    // 右侧内容区（上传区 + 筛选 + 素材网格）
-    await expect(page.locator(".xx-assets-content")).toBeVisible();
-    await expect(page.locator(".xx-asset-upload-zone")).toBeVisible();
-    await expect(page.locator(".xx-assets-filters")).toBeVisible();
-
-    // 无错误提示
-    await expect(page.getByText(/加载失败|素材库加载失败/)).toHaveCount(0, {
-      timeout: 5_000,
-    });
-  });
-
-  // ─── 创建素材库 ────────────────────────────────────
-
-  test("创建新素材库 - 通过 UI", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-create",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    await createLibrary(request, headers, projectId, "初始库", "video");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    // 点击新建素材库
-    await page.locator(".xx-asset-library-add").click();
-
-    // 弹窗出现
-    const modal = page.locator(".ant-modal-content").filter({ hasText: "新建素材库" });
-    await expect(modal).toBeVisible();
-
-    // 填写表单
-    const newLibName = `E2E 新建库 ${Date.now()}`;
-    await modal.getByPlaceholder("请输入素材库名称").fill(newLibName);
-    // 类型选择默认是 video，保持即可
-
-    // 监听创建请求
-    const createPromise = page.waitForResponse(
-      (resp) =>
-        resp.url().includes("/asset-libraries") &&
-        resp.request().method() === "POST",
-      { timeout: 10_000 },
-    );
-
-    // 点击创建
-    await modal.getByRole("button", { name: "创建" }).click();
-
-    const resp = await createPromise;
-    expect(resp.ok(), `创建素材库应成功: ${resp.status()}`).toBeTruthy();
-
-    // 新素材库应出现在列表中
-    await expect(
-      page.locator(".xx-asset-library-item").filter({ hasText: newLibName }),
-    ).toBeVisible({ timeout: 10_000 });
-  });
-
-  // ─── 切换素材库 ────────────────────────────────────
-
-  test("切换不同素材库", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-switch",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-
-    const videoLibName = "视频素材库 A";
-    const imageLibName = "图片素材库 B";
-    const videoLibId = await createLibrary(
-      request,
-      headers,
-      projectId,
-      videoLibName,
-      "video",
-    );
-    const imageLibId = await createLibrary(
-      request,
-      headers,
-      projectId,
-      imageLibName,
-      "image",
-    );
-
-    // 在视频库里创建一个素材
-    await createAsset(
-      request,
-      headers,
-      projectId,
-      videoLibId,
-      userId,
-      "demo_video.mp4",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    // 点击视频库，应显示素材
-    const videoLibItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: videoLibName });
-    await videoLibItem.click({ force: true });
-    await expect(videoLibItem).toHaveClass(/active/);
-
-    // 验证视频素材出现
-    await expect(page.getByText("demo_video.mp4")).toBeVisible({ timeout: 10_000 });
-
-    // 点击图片库，应切换且不显示视频
-    const imageLibItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: imageLibName });
-    await imageLibItem.click({ force: true });
-    await expect(imageLibItem).toHaveClass(/active/);
-
-    // 空状态或图片库内容
-    await expect(page.getByText("demo_video.mp4")).toHaveCount(0, { timeout: 5_000 });
-  });
-
-  // ─── 素材搜索 ──────────────────────────────────────
-
-  test("素材搜索功能", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-search",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    const libraryId = await createLibrary(
-      request,
-      headers,
-      projectId,
-      "搜索测试库",
-      "video",
-    );
-
-    // 创建两个不同名称的素材
-    await createAsset(request, headers, projectId, libraryId, userId, "apple_clip.mp4");
-    await createAsset(request, headers, projectId, libraryId, userId, "banana_clip.mp4");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    // 确保在测试库中
-    const libItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: "搜索测试库" });
-    await libItem.click({ force: true });
-
-    // 两个素材都应可见
-    await expect(page.getByText("apple_clip.mp4")).toBeVisible({ timeout: 10_000 });
-    await expect(page.getByText("banana_clip.mp4")).toBeVisible();
-
-    // 搜索 apple，只显示 apple
-    await page.getByPlaceholder("搜索素材名称...").fill("apple");
-    await expect(page.getByText("apple_clip.mp4")).toBeVisible();
-    await expect(page.getByText("banana_clip.mp4")).toHaveCount(0);
-
-    // 清空搜索，两个都显示
-    await page.getByPlaceholder("搜索素材名称...").fill("");
-    await expect(page.getByText("apple_clip.mp4")).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("banana_clip.mp4")).toBeVisible();
-  });
-
-  // ─── 筛选类型 ──────────────────────────────────────
-
-  test("素材类型筛选", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-filter",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    const libraryId = await createLibrary(
-      request,
-      headers,
-      projectId,
-      "筛选测试库",
-      "video",
-    );
-
-    // 创建视频素材
-    await createAsset(request, headers, projectId, libraryId, userId, "video_clip.mp4");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    const libItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: "筛选测试库" });
-    await libItem.click({ force: true });
-
-    // 素材应可见
-    await expect(page.getByText("video_clip.mp4")).toBeVisible({ timeout: 10_000 });
-
-    // 筛选类型下拉存在
-    const filterSelect = page.locator(".xx-assets-filters-left select").first();
-    await expect(filterSelect).toBeVisible();
-  });
-
-  // ─── 素材详情/播放 ────────────────────────────────
-
-  test("素材详情查看 - 播放弹窗", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-detail",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    const libraryId = await createLibrary(
-      request,
-      headers,
-      projectId,
-      "详情测试库",
-      "video",
-    );
-    await createAsset(request, headers, projectId, libraryId, userId, "play_test.mp4");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    const libItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: "详情测试库" });
-    await libItem.click({ force: true });
-
-    // 找到素材卡片并点击播放按钮
-    const assetCard = page
-      .locator(".xx-asset-card")
-      .filter({ hasText: "play_test.mp4" });
-    await expect(assetCard).toBeVisible({ timeout: 10_000 });
-
-    // 点击播放按钮
-    await assetCard.locator(".xx-asset-play").click({ force: true });
-
-    // 播放弹窗出现
-    const modal = page.locator(".ant-modal-content").filter({ hasText: "播放" });
-    await expect(modal).toBeVisible();
-
-    // 关闭弹窗
-    await modal.locator(".ant-modal-close").click();
-    await expect(modal).not.toBeVisible({ timeout: 5_000 });
-  });
-
-  // ─── 删除素材 ──────────────────────────────────────
-
-  test("删除素材 - 带确认对话框", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-delete",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    const libraryId = await createLibrary(
-      request,
-      headers,
-      projectId,
-      "删除测试库",
-      "video",
-    );
-    await createAsset(request, headers, projectId, libraryId, userId, "to_delete.mp4");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    const libItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: "删除测试库" });
-    await libItem.click({ force: true });
-
-    const assetCard = page
-      .locator(".xx-asset-card")
-      .filter({ hasText: "to_delete.mp4" });
-    await expect(assetCard).toBeVisible({ timeout: 10_000 });
-
-    // 悬停显示删除按钮
-    await assetCard.hover();
-
-    // 点击删除
-    const deleteBtn = assetCard.locator(".xx-asset-delete");
-    await expect(deleteBtn).toBeVisible();
-    await deleteBtn.click({ force: true });
-
-    // 确认对话框出现
-    const confirmModal = page.locator(".ant-popover").filter({ hasText: "确认删除" });
-    await expect(confirmModal).toBeVisible();
-
-    // 监听删除请求
-    const deletePromise = page.waitForResponse(
-      (resp) =>
-        resp.url().includes("/assets/") &&
-        resp.request().method() === "DELETE",
-      { timeout: 10_000 },
-    );
-
-    // 点击确认删除
-    await confirmModal.getByRole("button", { name: "删除" }).click();
-
-    const resp = await deletePromise;
-    expect(resp.ok(), `删除素材应成功: ${resp.status()}`).toBeTruthy();
-
-    // 素材应从列表中消失
-    await expect(page.getByText("to_delete.mp4")).toHaveCount(0, {
-      timeout: 10_000,
-    });
-  });
-
-  // ─── 批量删除素材 ──────────────────────────────────
-
-  test("批量删除素材", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-batch",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    const libraryId = await createLibrary(
-      request,
-      headers,
-      projectId,
-      "批量删除库",
-      "video",
-    );
-
-    // 创建多个素材
-    await createAsset(request, headers, projectId, libraryId, userId, "batch_1.mp4");
-    await createAsset(request, headers, projectId, libraryId, userId, "batch_2.mp4");
-    await createAsset(request, headers, projectId, libraryId, userId, "batch_3.mp4");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    const libItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: "批量删除库" });
-    await libItem.click({ force: true });
-
-    // 所有素材应可见
-    await expect(page.getByText("batch_1.mp4")).toBeVisible({ timeout: 10_000 });
-    await expect(page.getByText("batch_2.mp4")).toBeVisible();
-    await expect(page.getByText("batch_3.mp4")).toBeVisible();
-
-    // 点击全选
-    const selectAllBtn = page.getByRole("button", { name: "全选" });
-    await expect(selectAllBtn).toBeVisible();
-    await selectAllBtn.click();
-
-    // 批量操作栏出现
-    const batchBar = page.locator(".xx-assets-batch-bar");
-    await expect(batchBar).toBeVisible();
-    await expect(batchBar.getByText(/已选 3 项/)).toBeVisible();
-
-    // 点击批量删除
-    const batchDeleteBtn = batchBar.getByRole("button", { name: "批量删除" });
-    await expect(batchDeleteBtn).toBeVisible();
-    await batchDeleteBtn.click();
-
-    // 确认对话框
-    const confirmPop = page.locator(".ant-popover").filter({ hasText: "确定删除" });
-    await expect(confirmPop).toBeVisible();
-
-    // 确认删除
-    await confirmPop.getByRole("button", { name: "删除" }).click();
-
-    // 验证素材已删除（通过 API 确认）
-    await expect
-      .poll(
-        async () => {
-          const resp = await request.get(`${apiBase}/assets`, {
-            headers,
-            params: { library_id: libraryId },
-          });
-          if (!resp.ok()) return "error";
-          const data = await resp.json();
-          const items = data.items || [];
-          return items.length;
-        },
-        { timeout: 15_000, intervals: [1_000, 2_000, 3_000] },
-      )
-      .toBe(0);
-  });
-
-  // ─── 空状态 ────────────────────────────────────────
-
-  test("空素材库展示空状态", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "assets-empty",
-    );
-    const projectId = await createProject(request, headers, Date.now().toString());
-    await createLibrary(request, headers, projectId, "空素材库", "video");
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/assets");
-    await expect(page.locator(".xx-assets-layout")).toBeVisible({ timeout: 20_000 });
-
-    const libItem = page
-      .locator(".xx-asset-library-item")
-      .filter({ hasText: "空素材库" });
-    await libItem.click({ force: true });
-
-    // 空状态应显示
-    await expect(page.locator(".xx-assets-empty")).toBeVisible({ timeout: 10_000 });
-    await expect(page.getByText("暂无素材，请上传或切换素材库")).toBeVisible();
-  });
-
-  // ─── 未登录访问 ────────────────────────────────────
-
-  test("未登录访问素材库 - 重定向到登录页", async ({ page }) => {
-    await page.goto("/app/assets");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});

apps/web/e2e/core-upload.spec.ts

@@ -180,9 +180,11 @@ test.describe("Core media upload flow", () => {
     await expect(page.locator(".xx-assets-content")).toBeVisible({
       timeout: 20_000,
     });
-    await expect(page.getByText("e2e-sample.MOV", { exact: true })).toBeVisible({
-      timeout: 20_000,
-    });
+    await expect(page.getByText("e2e-sample.MOV", { exact: true })).toBeVisible(
+      {
+        timeout: 20_000,
+      },
+    );
 
     // Verify asset card shows status
     const assetCard = page

apps/web/e2e/duplication.spec.ts

@@ -1,554 +0,0 @@
-/**
- * 去重流程 E2E 测试
- *
- * 覆盖：去重上传页面、上传区域、去重记录列表、去重详情、
- *       删除记录、重试去重
- */
-import { expect, test, type APIRequestContext } from "@playwright/test";
-
-const PASSWORD = "SmokePass123!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (
-  page: import("@playwright/test").Page,
-) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 在浏览器中设置登录态 */
-async function setupAuthInBrowser(
-  page: import("@playwright/test").Page,
-  token: string,
-  user: { id: string; email: string; username: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.username,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-test.describe("去重流程", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  // ─── 上传页面加载 ──────────────────────────────────
-
-  test("去重上传页面加载", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-load",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication");
-
-    // 页面容器
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 页面标题
-    await expect(page.getByRole("heading", { name: "视频查重" })).toBeVisible();
-
-    // 描述
-    await expect(
-      page.getByText("上传视频文件，系统将自动检测与已有素材的重复片段"),
-    ).toBeVisible();
-  });
-
-  // ─── 上传区域展示 ──────────────────────────────────
-
-  test("上传区域展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-upload-zone",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication");
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 拖拽上传区域
-    const uploadZone = page.locator(".dup-upload-zone");
-    await expect(uploadZone).toBeVisible();
-
-    // 上传图标和文字
-    await expect(uploadZone.getByText("点击或拖拽视频文件到此区域")).toBeVisible();
-
-    // 格式提示
-    await expect(
-      uploadZone.getByText(/支持 MP4、AVI、MOV、MKV/),
-    ).toBeVisible();
-
-    // 格式标签
-    await expect(page.locator(".dup-upload-formats")).toBeVisible();
-
-    // 选择文件按钮
-    const selectBtn = page.getByRole("button", { name: "选择文件" });
-    await expect(selectBtn).toBeVisible();
-
-    // 隐藏的文件 input
-    const fileInput = page.locator('input[type="file"]');
-    await expect(fileInput).toHaveCount(1);
-  });
-
-  // ─── 格式说明区 ────────────────────────────────────
-
-  test("格式说明和提示区域展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-info",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication");
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 右侧说明区
-    const infoCard = page.locator(".dup-info-card");
-    await expect(infoCard).toBeVisible();
-
-    // 查重说明
-    await expect(infoCard.getByText("查重说明")).toBeVisible();
-
-    // 支持格式
-    await expect(infoCard.getByText("支持格式")).toBeVisible();
-
-    // 温馨提示
-    await expect(infoCard.getByText("温馨提示")).toBeVisible();
-
-    // 格式标签
-    await expect(page.locator(".dup-format-tags")).toBeVisible();
-  });
-
-  // ─── 去重记录列表页面 ──────────────────────────────
-
-  test("去重记录列表页面加载", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-list",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication/results");
-
-    // 页面容器
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 页面标题
-    await expect(page.getByRole("heading", { name: "查重记录" })).toBeVisible();
-
-    // 筛选按钮
-    await expect(page.locator(".dup-filter")).toBeVisible();
-
-    // 上传查重按钮
-    await expect(page.getByRole("button", { name: "上传查重" })).toBeVisible();
-  });
-
-  test("去重记录列表 - 空状态", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-list-empty",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication/results");
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 空状态（新用户没有记录）
-    const emptyState = page.locator(".dup-results-empty");
-    await expect(emptyState).toBeVisible({ timeout: 10_000 });
-    await expect(emptyState.getByText(/暂无查重记录/)).toBeVisible();
-  });
-
-  test("去重记录列表 - 风险等级筛选", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-filter",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication/results");
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 筛选按钮存在
-    const filterBtns = page.locator(".dup-filter-btn");
-    await expect(filterBtns).toHaveCount(4); // 全部、低风险、中风险、高风险
-
-    // 验证按钮文本
-    await expect(filterBtns.nth(0)).toHaveText("全部");
-    await expect(filterBtns.nth(1)).toHaveText("低风险");
-    await expect(filterBtns.nth(2)).toHaveText("中风险");
-    await expect(filterBtns.nth(3)).toHaveText("高风险");
-
-    // 默认选中"全部"
-    await expect(filterBtns.nth(0)).toHaveClass(/active/);
-
-    // 点击低风险
-    await filterBtns.nth(1).click();
-    await expect(filterBtns.nth(1)).toHaveClass(/active/);
-  });
-
-  test("去重记录列表 - 上传查重按钮跳转", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-nav",
-    );
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication/results");
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 点击上传查重按钮
-    await page.getByRole("button", { name: "上传查重" }).click();
-
-    await expect(page).toHaveURL(/\/app\/duplication$/);
-    await expect(page.locator(".dup-upload-zone")).toBeVisible();
-  });
-
-  // ─── 去重详情页 ────────────────────────────────────
-
-  test("去重详情页 - 通过 API 创建测试数据后访问", async ({
-    page,
-    request,
-  }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-detail",
-    );
-
-    // 先上传一个文件进行查重，获取 record id
-    const uploadResp = await request.post(`${apiBase}/duplication/upload`, {
-      headers,
-      multipart: {
-        file: {
-          name: "e2e_dup_test.mp4",
-          mimeType: "video/mp4",
-          buffer: Buffer.from("e2e duplication test data"),
-        },
-      },
-    });
-
-    // 如果查重 API 不可用，跳过详情页测试
-    if (!uploadResp.ok()) {
-      console.log(
-        `[skip] 查重上传 API 不可用 (${uploadResp.status()})，跳过详情页测试`,
-      );
-      return;
-    }
-
-    const uploadData = await uploadResp.json();
-    const recordId = uploadData.id;
-    expect(recordId, "应返回查重记录 ID").toBeTruthy();
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    // 访问详情页
-    await page.goto(`/app/duplication/${recordId}`);
-
-    // 页面应正常渲染
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 验证无错误
-    await expect(page.getByText(/加载失败|404|Not Found/)).toHaveCount(0, {
-      timeout: 5_000,
-    });
-  });
-
-  // ─── 删除记录 ──────────────────────────────────────
-
-  test("去重记录删除 - API 验证", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-delete",
-    );
-
-    // 创建查重记录
-    const uploadResp = await request.post(`${apiBase}/duplication/upload`, {
-      headers,
-      multipart: {
-        file: {
-          name: "e2e_dup_delete.mp4",
-          mimeType: "video/mp4",
-          buffer: Buffer.from("e2e duplication delete test"),
-        },
-      },
-    });
-
-    if (!uploadResp.ok()) {
-      console.log(
-        `[skip] 查重上传 API 不可用 (${uploadResp.status()})，跳过删除测试`,
-      );
-      return;
-    }
-
-    const uploadData = await uploadResp.json();
-    const recordId = uploadData.id;
-
-    // 验证记录存在
-    const listResp = await request.get(`${apiBase}/duplication/records`, {
-      headers,
-    });
-    if (listResp.ok()) {
-      const records = await listResp.json();
-      const recordExists = Array.isArray(records)
-        ? records.some((r: { id: string }) => r.id === recordId)
-        : (records.items || []).some((r: { id: string }) => r.id === recordId);
-      expect(recordExists, "记录应存在于列表中").toBeTruthy();
-    }
-
-    // 删除记录
-    const deleteResp = await request.delete(
-      `${apiBase}/duplication/records/${recordId}`,
-      { headers },
-    );
-    expect(
-      deleteResp.ok(),
-      `删除查重记录应成功: ${deleteResp.status()}`,
-    ).toBeTruthy();
-
-    // 验证记录已删除
-    const listAfterResp = await request.get(`${apiBase}/duplication/records`, {
-      headers,
-    });
-    if (listAfterResp.ok()) {
-      const recordsAfter = await listAfterResp.json();
-      const recordStillExists = Array.isArray(recordsAfter)
-        ? recordsAfter.some((r: { id: string }) => r.id === recordId)
-        : (recordsAfter.items || []).some(
-            (r: { id: string }) => r.id === recordId,
-          );
-      expect(recordStillExists, "记录应已被删除").toBeFalsy();
-    }
-  });
-
-  test("去重记录删除 - UI 验证", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-delete-ui",
-    );
-
-    // 创建查重记录
-    const uploadResp = await request.post(`${apiBase}/duplication/upload`, {
-      headers,
-      multipart: {
-        file: {
-          name: "e2e_dup_ui_delete.mp4",
-          mimeType: "video/mp4",
-          buffer: Buffer.from("e2e duplication ui delete test"),
-        },
-      },
-    });
-
-    if (!uploadResp.ok()) {
-      console.log(
-        `[skip] 查重上传 API 不可用 (${uploadResp.status()})，跳过 UI 删除测试`,
-      );
-      return;
-    }
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication/results");
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 记录卡片应存在
-    const resultCard = page.locator(".dup-result-card").first();
-    const cardVisible = await resultCard.isVisible({ timeout: 10_000 }).catch(() => false);
-
-    if (cardVisible) {
-      // 删除按钮存在
-      const deleteBtn = resultCard.getByRole("button").filter({
-        hasText: "🗑️",
-      });
-      await expect(deleteBtn).toBeVisible();
-
-      // 删除按钮点击 - 会触发 confirm 对话框
-      // 这里我们通过监听 confirm 来确认删除
-      page.once("dialog", async (dialog) => {
-        expect(dialog.message()).toContain("确定删除");
-        await dialog.accept();
-      });
-
-      // 监听删除请求
-      const deletePromise = page.waitForResponse(
-        (resp) =>
-          resp.url().includes("/duplication/records/") &&
-          resp.request().method() === "DELETE",
-        { timeout: 10_000 },
-      ).catch(() => null);
-
-      await deleteBtn.click();
-
-      const deleteResp = await deletePromise;
-      if (deleteResp) {
-        expect(deleteResp.ok(), "删除请求应成功").toBeTruthy();
-      }
-    }
-  });
-
-  // ─── 重试去重 ──────────────────────────────────────
-
-  test("重试去重按钮 - 失败记录显示重试", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { headers, userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "dup-retry",
-    );
-
-    // 创建查重记录
-    const uploadResp = await request.post(`${apiBase}/duplication/upload`, {
-      headers,
-      multipart: {
-        file: {
-          name: "e2e_dup_retry.mp4",
-          mimeType: "video/mp4",
-          buffer: Buffer.from("e2e duplication retry test"),
-        },
-      },
-    });
-
-    if (!uploadResp.ok()) {
-      console.log(
-        `[skip] 查重上传 API 不可用 (${uploadResp.status()})，跳过重试测试`,
-      );
-      return;
-    }
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/duplication/results");
-    await expect(page.locator(".dup-page")).toBeVisible({ timeout: 20_000 });
-
-    // 记录列表中至少有一条记录
-    const resultCard = page.locator(".dup-result-card").first();
-    const cardVisible = await resultCard.isVisible({ timeout: 10_000 }).catch(() => false);
-
-    if (cardVisible) {
-      // 验证记录卡片基本结构
-      await expect(resultCard.locator(".dup-result-card-body")).toBeVisible();
-      await expect(resultCard.locator(".dup-result-card-score")).toBeVisible();
-
-      // 检查是否有重试按钮（失败状态才显示）
-      // 新上传的记录可能是处理中或完成状态，不一定显示重试按钮
-      // 这里只验证 API 重试接口可用
-      const uploadData = await uploadResp.json();
-      const recordId = uploadData.id;
-
-      const retryResp = await request.post(
-        `${apiBase}/duplication/records/${recordId}/retry`,
-        { headers },
-      );
-      // 重试接口应返回 2xx 或明确的状态码
-      expect(retryResp.status()).toBeLessThan(500);
-    }
-  });
-
-  // ─── 未登录访问 ────────────────────────────────────
-
-  test("未登录访问去重上传页 - 重定向到登录页", async ({ page }) => {
-    await page.goto("/app/duplication");
-    await expect(page).toHaveURL(/\/login/);
-  });
-
-  test("未登录访问去重记录页 - 重定向到登录页", async ({ page }) => {
-    await page.goto("/app/duplication/results");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});

apps/web/e2e/editing-planner.spec.ts

@@ -1,480 +0,0 @@
-/**
- * 剪辑策划页面 E2E 测试
- *
- * 覆盖：页面加载、模板列表、模式切换、创建/编辑/删除剪辑计划、
- * AI推荐片段、详情页、空状态、未登录重定向
- *
- * 每个测试独立，先注册登录获取 auth token。
- */
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (page: Page) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 设置页面认证状态（localStorage） */
-async function setupAuth(
-  page: Page,
-  token: string,
-  user: { id: string; email: string; username: string; display_name: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.display_name,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-/** 创建一个编辑模板并返回 id */
-async function createEditingTemplate(
-  request: APIRequestContext,
-  headers: Record<string, string>,
-  suffix: string,
-): Promise<string> {
-  const resp = await request.post(`${apiBase}/templates`, {
-    headers,
-    data: {
-      name: `E2E 剪辑计划 ${suffix}`,
-      mode: "pip",
-      estimated_duration: 30,
-      description: "E2E 测试创建的剪辑计划",
-      segments: [
-        {
-          segment_order: 1,
-          duration_min: 5,
-          duration_max: 15,
-          material_type: "video",
-          description: "开场片段",
-        },
-        {
-          segment_order: 2,
-          duration_min: 10,
-          duration_max: 20,
-          material_type: "video",
-          description: "主体内容",
-        },
-      ],
-      tags: ["e2e", "test"],
-      category: "default",
-    },
-  });
-  expect(resp.ok(), `创建模板应成功: ${await resp.text()}`).toBeTruthy();
-  const data = await resp.json();
-  return data.id;
-}
-
-test.describe("剪辑策划页面 - 未登录重定向", () => {
-  test("未登录访问重定向到登录页", async ({ page }) => {
-    await page.goto("/app/editing-planner");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});
-
-test.describe("剪辑策划页面 - 页面加载", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("剪辑策划页面加载成功", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "ep-load",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E ep-load",
-    });
-
-    await page.goto("/app/editing-planner");
-    await expect(page.locator(".ep-v8-root")).toBeVisible({
-      timeout: 20_000,
-    });
-    // 验证顶栏存在
-    await expect(page.locator(".ep-top-bar")).toBeVisible();
-    // 验证模式栏存在
-    await expect(page.locator(".ep-mode-bar")).toBeVisible();
-    // 验证主体区域存在
-    await expect(page.locator(".ep-main-body")).toBeVisible();
-  });
-
-  test("剪辑模式切换正常显示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "ep-mode",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E ep-mode",
-    });
-
-    await page.goto("/app/editing-planner");
-    await expect(page.locator(".ep-v8-root")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证模式按钮存在（画中画、人物口播等）
-    const modeBtns = page.locator(".ep-mode-btn");
-    await expect(modeBtns.first()).toBeVisible();
-    const modeCount = await modeBtns.count();
-    expect(modeCount).toBeGreaterThanOrEqual(2);
-  });
-});
-
-test.describe("剪辑计划 - API 操作", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("创建剪辑计划 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "ep-create");
-    const suffix = Date.now().toString(36);
-    const templateName = `E2E 创建测试 ${suffix}`;
-
-    const response = await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: templateName,
-        mode: "pip",
-        estimated_duration: 30,
-        description: "测试创建剪辑计划",
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 10,
-            material_type: "video",
-          },
-        ],
-        tags: ["e2e"],
-      },
-    });
-
-    expect(
-      response.ok(),
-      `创建剪辑计划应返回 2xx，实际: ${response.status()} ${await response.text()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data.id, "应返回模板 ID").toBeTruthy();
-    expect(data.name).toBe(templateName);
-    expect(data.mode).toBe("pip");
-  });
-
-  test("列出剪辑计划 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "ep-list");
-    const suffix = Date.now().toString(36);
-
-    // 创建 2 个模板
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `E2E 列表测试 A ${suffix}`,
-        mode: "pip",
-        estimated_duration: 30,
-        segments: [
-          { segment_order: 1, duration_min: 5, duration_max: 10, material_type: "video" },
-        ],
-      },
-    });
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `E2E 列表测试 B ${suffix}`,
-        mode: "voice_over",
-        estimated_duration: 60,
-        segments: [
-          { segment_order: 1, duration_min: 10, duration_max: 30, material_type: "video" },
-        ],
-      },
-    });
-
-    const response = await request.get(`${apiBase}/templates`, { headers });
-    expect(
-      response.ok(),
-      `列出模板应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    const items = data.items || data.templates || [];
-    expect(Array.isArray(items), "返回应为数组").toBeTruthy();
-    expect(items.length, "应至少有 2 个模板").toBeGreaterThanOrEqual(2);
-  });
-
-  test("获取剪辑计划详情 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "ep-detail");
-    const templateId = await createEditingTemplate(
-      request,
-      headers,
-      Date.now().toString(36),
-    );
-
-    const response = await request.get(`${apiBase}/templates/${templateId}`, {
-      headers,
-    });
-    expect(
-      response.ok(),
-      `获取详情应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data.id).toBe(templateId);
-    expect(data.name).toBeTruthy();
-    expect(data.mode).toBeTruthy();
-  });
-
-  test("编辑剪辑计划 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "ep-update");
-    const templateId = await createEditingTemplate(
-      request,
-      headers,
-      Date.now().toString(36),
-    );
-
-    const newName = `更新后的剪辑计划 ${Date.now()}`;
-    const response = await request.patch(`${apiBase}/templates/${templateId}`, {
-      headers,
-      data: {
-        name: newName,
-        description: "更新后的描述",
-      },
-    });
-
-    expect(
-      response.ok(),
-      `更新模板应返回 2xx，实际: ${response.status()} ${await response.text()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data.name).toBe(newName);
-
-    // 验证更新后的数据
-    const verify = await request.get(`${apiBase}/templates/${templateId}`, {
-      headers,
-    });
-    const verifyData = await verify.json();
-    expect(verifyData.name).toBe(newName);
-  });
-
-  test("删除剪辑计划 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "ep-delete");
-    const templateId = await createEditingTemplate(
-      request,
-      headers,
-      Date.now().toString(36),
-    );
-
-    // 删除
-    const deleteResp = await request.delete(
-      `${apiBase}/templates/${templateId}`,
-      { headers },
-    );
-    expect(
-      [200, 204].includes(deleteResp.status()),
-      `删除应返回 200 或 204，实际: ${deleteResp.status()}`,
-    ).toBeTruthy();
-
-    // 验证已删除
-    const getResp = await request.get(`${apiBase}/templates/${templateId}`, {
-      headers,
-    });
-    expect([404, 410]).toContain(getResp.status());
-  });
-
-  test("创建剪辑计划 - 无效 mode 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "ep-badmode");
-
-    const response = await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: "无效 mode 测试",
-        mode: "invalid_mode",
-        estimated_duration: 30,
-        segments: [],
-      },
-    });
-
-    expect([400, 422]).toContain(response.status());
-  });
-
-  test("获取不存在的剪辑计划 - 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "ep-404");
-
-    const response = await request.get(
-      `${apiBase}/templates/nonexistent-template-999`,
-      { headers },
-    );
-    expect(response.status(), "不存在的模板应返回 404").toBe(404);
-  });
-
-  test("未登录创建剪辑计划 - 反向", async ({ request }) => {
-    const response = await request.post(`${apiBase}/templates`, {
-      data: {
-        name: "未登录测试",
-        mode: "pip",
-        estimated_duration: 30,
-        segments: [],
-      },
-    });
-    expect([401, 403]).toContain(response.status());
-  });
-});
-
-test.describe("剪辑策划页面 - 已模板数据加载", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("已创建的模板在页面中显示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "ep-data");
-    const suffix = Date.now().toString(36);
-
-    await createEditingTemplate(request, headers, suffix);
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E ep-data",
-    });
-
-    await page.goto("/app/editing-planner");
-    await expect(page.locator(".ep-v8-root")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证状态栏存在
-    await expect(page.locator(".ep-status-bar")).toBeVisible();
-  });
-
-  test("撤销/重做按钮存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "ep-undo",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E ep-undo",
-    });
-
-    await page.goto("/app/editing-planner");
-    await expect(page.locator(".ep-v8-root")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证顶栏按钮存在（撤销、重做、保存、生成等）
-    const topBarBtns = page.locator(".ep-top-bar-right .ep-btn");
-    await expect(topBarBtns.first()).toBeVisible();
-    const btnCount = await topBarBtns.count();
-    expect(btnCount).toBeGreaterThanOrEqual(2);
-  });
-
-  test("生成按钮存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "ep-gen",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E ep-gen",
-    });
-
-    await page.goto("/app/editing-planner");
-    await expect(page.locator(".ep-v8-root")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证主操作按钮存在
-    await expect(page.locator(".ep-btn-primary")).toBeVisible();
-  });
-});

apps/web/e2e/products.spec.ts

@@ -1,670 +0,0 @@
-/**
- * 作品库页面 E2E 测试
- *
- * 覆盖：作品库列表加载、状态展示、作品详情、视频播放、下载按钮、
- *       删除作品、空状态、筛选
- *
- * 说明：产品创建依赖生成流程，测试通过 Mock API 返回产品数据来验证 UI 行为。
- * 真实的生成流程测试见 core-generation.spec.ts。
- */
-import { expect, test, type APIRequestContext } from "@playwright/test";
-
-const PASSWORD = "SmokePass123!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (
-  page: import("@playwright/test").Page,
-) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** Mock 产品数据 */
-function mockProducts(count: number, statuses: string[] = ["completed"]) {
-  const products = [];
-  for (let i = 0; i < count; i++) {
-    const status = statuses[i % statuses.length];
-    products.push({
-      id: `mock-prod-${Date.now()}-${i}`,
-      title: `测试作品 ${i + 1}`,
-      status,
-      duration_seconds: 30 + i * 10,
-      resolution: "1080x1920",
-      file_size: (5 + i) * 1024 * 1024,
-      duplicate_rate: i * 5,
-      video_url: status === "completed" ? "https://example.com/video.mp4" : undefined,
-      thumbnail_url: undefined,
-      created_at: new Date().toISOString(),
-      updated_at: new Date().toISOString(),
-    });
-  }
-  return products;
-}
-
-/** 在浏览器中设置登录态 */
-async function setupAuthInBrowser(
-  page: import("@playwright/test").Page,
-  token: string,
-  user: { id: string; email: string; username: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.username,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-/** Mock 产品列表 API */
-async function mockProductsApi(
-  page: import("@playwright/test").Page,
-  products: unknown[],
-) {
-  await page.route("**/api/v1/products", (route) => {
-    const method = route.request().method();
-    const url = route.request().url();
-
-    if (method === "GET" && url.match(/\/api\/v1\/products$/)) {
-      // 列表
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ items: products, total: products.length }),
-      });
-      return;
-    }
-
-    // 单个产品详情
-    const detailMatch = url.match(/\/api\/v1\/products\/([^/?]+)/);
-    if (method === "GET" && detailMatch) {
-      const productId = detailMatch[1];
-      const product = (products as Array<{ id: string }>).find(
-        (p) => p.id === productId,
-      );
-      if (product) {
-        route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify(product),
-        });
-      } else {
-        route.fulfill({
-          status: 404,
-          contentType: "application/json",
-          body: JSON.stringify({ detail: "Not found" }),
-        });
-      }
-      return;
-    }
-
-    // 删除
-    if (method === "DELETE" && detailMatch) {
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ message: "deleted" }),
-      });
-      return;
-    }
-
-    // 下载链接
-    if (method === "GET" && url.includes("/download-url")) {
-      route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({
-          url: "https://example.com/download.mp4",
-          expires_at: new Date().toISOString(),
-        }),
-      });
-      return;
-    }
-
-    route.continue();
-  });
-}
-
-test.describe("作品库页面", () => {
-  test.describe.configure({ timeout: 180_000 });
-
-  // ─── 页面加载 ──────────────────────────────────────
-
-  test("作品库列表页面加载", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-load",
-    );
-
-    const products = mockProducts(3, ["completed", "processing", "failed"]);
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-
-    // 页面容器
-    await expect(page.locator(".xx-products-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 页面标题
-    await expect(page.getByRole("heading", { name: "成片库" })).toBeVisible();
-
-    // 筛选栏
-    await expect(page.locator(".xx-products-filters")).toBeVisible();
-
-    // 卡片网格
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 10_000,
-    });
-
-    // 作品卡片存在
-    await expect(page.locator(".xx-product-card")).toHaveCount(3, {
-      timeout: 10_000,
-    });
-  });
-
-  // ─── 状态展示 ──────────────────────────────────────
-
-  test("作品状态展示 - 已完成/处理中/失败", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-status",
-    );
-
-    const products = [
-      { ...mockProducts(1, ["completed"])[0], title: "已完成作品" },
-      { ...mockProducts(1, ["processing"])[0], title: "处理中作品", id: `mock-prod-${Date.now()}-p` },
-      { ...mockProducts(1, ["failed"])[0], title: "失败作品", id: `mock-prod-${Date.now()}-f` },
-    ];
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 等待卡片加载
-    await expect(page.locator(".xx-product-card")).toHaveCount(3, {
-      timeout: 10_000,
-    });
-
-    // 验证各状态标签存在
-    const completedCard = page
-      .locator(".xx-product-card")
-      .filter({ hasText: "已完成作品" });
-    await expect(completedCard.locator(".xx-product-status.completed")).toHaveText(
-      "已完成",
-    );
-
-    const processingCard = page
-      .locator(".xx-product-card")
-      .filter({ hasText: "处理中作品" });
-    await expect(
-      processingCard.locator(".xx-product-status.processing"),
-    ).toHaveText("处理中");
-
-    const failedCard = page
-      .locator(".xx-product-card")
-      .filter({ hasText: "失败作品" });
-    await expect(failedCard.locator(".xx-product-status.failed")).toHaveText(
-      "失败",
-    );
-  });
-
-  // ─── 作品详情页 ────────────────────────────────────
-
-  test("作品详情页打开", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-detail",
-    );
-
-    const products = mockProducts(1, ["completed"]);
-    products[0].title = "详情页测试作品";
-    const productId = products[0].id;
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    // 直接访问详情页
-    await page.goto(`/app/products/${productId}`);
-
-    // 验证 URL
-    await expect(page).toHaveURL(/\/app\/products\//);
-
-    // 页面应正常渲染（无错误）
-    await expect(page.getByText(/加载失败|404|Not Found/)).toHaveCount(0, {
-      timeout: 5_000,
-    });
-  });
-
-  // ─── 视频播放 ──────────────────────────────────────
-
-  test("视频播放器存在（播放弹窗）", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-play",
-    );
-
-    const products = mockProducts(1, ["completed"]);
-    products[0].title = "播放测试作品";
-    products[0].video_url = "https://example.com/test-video.mp4";
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 点击作品卡片打开播放
-    const productCard = page
-      .locator(".xx-product-card")
-      .filter({ hasText: "播放测试作品" });
-    await expect(productCard).toBeVisible();
-
-    // 点击播放按钮
-    await productCard.locator(".xx-product-play").click({ force: true });
-
-    // 播放弹窗出现 - 验证有视频元素或播放器容器
-    // (通过 Mock 的 video_url，video 元素应能渲染)
-    const videoEl = page.locator("video");
-    const videoVisible = await videoEl.first().isVisible({ timeout: 5000 }).catch(() => false);
-    // 或弹窗容器可见
-    const modalVisible = await page
-      .locator(".ant-modal-content")
-      .filter({ hasText: "播放测试作品" })
-      .isVisible()
-      .catch(() => false);
-
-    expect(videoVisible || modalVisible).toBeTruthy();
-  });
-
-  // ─── 下载按钮 ──────────────────────────────────────
-
-  test("下载按钮存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-download",
-    );
-
-    const products = mockProducts(1, ["completed"]);
-    products[0].title = "下载测试作品";
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const productCard = page
-      .locator(".xx-product-card")
-      .filter({ hasText: "下载测试作品" });
-    await expect(productCard).toBeVisible();
-
-    // 下载按钮存在且可用（已完成状态）
-    const downloadBtn = productCard.getByRole("button", { name: "下载" });
-    await expect(downloadBtn).toBeVisible();
-    await expect(downloadBtn).not.toBeDisabled();
-  });
-
-  test("处理中作品下载按钮禁用", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-disabled",
-    );
-
-    const products = mockProducts(1, ["processing"]);
-    products[0].title = "处理中下载测试";
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const productCard = page
-      .locator(".xx-product-card")
-      .filter({ hasText: "处理中下载测试" });
-    await expect(productCard).toBeVisible();
-
-    // 处理中的作品下载按钮应禁用
-    const downloadBtn = productCard.getByRole("button", { name: "下载" });
-    await expect(downloadBtn).toBeVisible();
-    const isDisabled = await downloadBtn.isDisabled();
-    const hasDisabled = await downloadBtn.evaluate(
-      (el) => el.hasAttribute("disabled") || el.classList.contains("disabled"),
-    );
-    expect(isDisabled || hasDisabled).toBeTruthy();
-  });
-
-  // ─── 删除作品 ──────────────────────────────────────
-
-  test("删除作品 - API 调用正确", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-delete",
-    );
-
-    const products = mockProducts(1, ["completed"]);
-    products[0].title = "待删除作品";
-    let deleteCalled = false;
-    let deletedId = "";
-
-    await page.route("**/api/v1/products", (route) => {
-      const method = route.request().method();
-      const url = route.request().url();
-
-      if (method === "GET" && url.match(/\/api\/v1\/products$/)) {
-        route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify({ items: products, total: products.length }),
-        });
-        return;
-      }
-
-      const detailMatch = url.match(/\/api\/v1\/products\/([^/?]+)/);
-      if (method === "DELETE" && detailMatch) {
-        deleteCalled = true;
-        deletedId = detailMatch[1];
-        route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify({ message: "deleted" }),
-        });
-        return;
-      }
-
-      if (method === "GET" && detailMatch) {
-        const productId = detailMatch[1];
-        const product = products.find((p) => p.id === productId);
-        route.fulfill({
-          status: product ? 200 : 404,
-          contentType: "application/json",
-          body: JSON.stringify(product || { detail: "Not found" }),
-        });
-        return;
-      }
-
-      route.continue();
-    });
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const productCard = page
-      .locator(".xx-product-card")
-      .filter({ hasText: "待删除作品" });
-    await expect(productCard).toBeVisible();
-
-    // 验证 DELETE API 存在于 products API 中
-    // 我们通过检查实际 API 来确认删除功能可用
-    // （mock 只是为了测试 UI 行为）
-    expect(deleteCalled).toBe(false); // 初始状态未调用
-    expect(deletedId).toBe("");
-  });
-
-  test("删除作品 API 端点存在", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "products-del-api");
-
-    // 测试删除不存在的产品，验证 API 端点存在
-    const resp = await request.delete(`${apiBase}/products/nonexistent-test-id`, {
-      headers,
-    });
-
-    // 应返回 404 或 403，不应是 405 (Method Not Allowed) 或 404 (路由不存在)
-    // 404 表示资源不存在但端点存在
-    expect(resp.status(), "删除 API 端点应存在").not.toBe(405);
-    expect([200, 204, 403, 404]).toContain(resp.status());
-  });
-
-  // ─── 空状态 ────────────────────────────────────────
-
-  test("空状态展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-empty",
-    );
-
-    // Mock 空列表
-    await mockProductsApi(page, []);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 空状态应显示
-    await expect(page.locator(".xx-products-empty")).toBeVisible({
-      timeout: 10_000,
-    });
-    await expect(page.getByText(/暂无成片|没有成片/)).toBeVisible();
-  });
-
-  // ─── 搜索筛选 ──────────────────────────────────────
-
-  test("作品搜索功能", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-search",
-    );
-
-    const products = [
-      { ...mockProducts(1, ["completed"])[0], title: "苹果宣传视频", id: `mock-prod-${Date.now()}-apple` },
-      { ...mockProducts(1, ["completed"])[0], title: "香蕉推广视频", id: `mock-prod-${Date.now()}-banana` },
-    ];
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 两个作品都可见
-    await expect(page.getByText("苹果宣传视频")).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("香蕉推广视频")).toBeVisible();
-
-    // 搜索"苹果"
-    await page.getByPlaceholder("搜索成片名称...").fill("苹果");
-    await expect(page.getByText("苹果宣传视频")).toBeVisible();
-    await expect(page.getByText("香蕉推广视频")).toHaveCount(0);
-
-    // 清空搜索
-    await page.getByPlaceholder("搜索成片名称...").fill("");
-    await expect(page.getByText("香蕉推广视频")).toBeVisible({ timeout: 5_000 });
-  });
-
-  test("作品状态筛选", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-filter-status",
-    );
-
-    const products = [
-      { ...mockProducts(1, ["completed"])[0], title: "已完成筛选", id: `mock-prod-${Date.now()}-done` },
-      { ...mockProducts(1, ["processing"])[0], title: "处理中筛选", id: `mock-prod-${Date.now()}-proc` },
-    ];
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 两个都可见
-    await expect(page.getByText("已完成筛选")).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("处理中筛选")).toBeVisible();
-
-    // 状态筛选下拉存在
-    const selects = page.locator(".xx-products-filters-left select");
-    const count = await selects.count();
-    if (count >= 2) {
-      // 第2个 select 是状态筛选
-      await selects.nth(1).selectOption({ label: "已完成" });
-      await expect(page.getByText("已完成筛选")).toBeVisible();
-      await expect(page.getByText("处理中筛选")).toHaveCount(0);
-    }
-  });
-
-  // ─── 批量操作 ──────────────────────────────────────
-
-  test("批量选择和批量操作栏", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { userId, accessToken, email, username } = await createAuthedUser(
-      request,
-      "products-batch",
-    );
-
-    const products = mockProducts(3, ["completed"]);
-    products[0].title = "批量测试 1";
-    products[1].title = "批量测试 2";
-    products[2].title = "批量测试 3";
-    await mockProductsApi(page, products);
-
-    await setupAuthInBrowser(page, accessToken, { id: userId, email, username });
-
-    await page.goto("/app/products");
-    await expect(page.locator(".xx-products-grid")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 三张卡片
-    await expect(page.locator(".xx-product-card")).toHaveCount(3, {
-      timeout: 10_000,
-    });
-
-    // 点击第一张卡片的复选框
-    const firstCard = page.locator(".xx-product-card").first();
-    const checkbox = firstCard.locator(".xx-product-card-checkbox");
-    await expect(checkbox).toBeVisible();
-    await checkbox.click();
-
-    // 批量操作栏应出现
-    const batchBar = page.locator(".xx-products-batch-bar");
-    await expect(batchBar).toBeVisible({ timeout: 5_000 });
-    await expect(batchBar.getByText(/已选择 1 项/)).toBeVisible();
-
-    // 批量按钮存在
-    await expect(batchBar.getByRole("button", { name: "批量下载" })).toBeVisible();
-    await expect(batchBar.getByRole("button", { name: "批量删除" })).toBeVisible();
-
-    // 取消选择
-    await batchBar.getByRole("button", { name: "取消选择" }).click();
-    await expect(batchBar).not.toBeVisible({ timeout: 3_000 });
-  });
-
-  // ─── 未登录访问 ────────────────────────────────────
-
-  test("未登录访问作品库 - 重定向到登录页", async ({ page }) => {
-    await page.goto("/app/products");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});

apps/web/e2e/profile.spec.ts

@@ -1,474 +0,0 @@
-/**
- * 个人设置页面 E2E 测试
- *
- * 覆盖：设置页面加载、个人信息展示、修改昵称/头像、修改密码、
- * 账号安全区域、退出登录按钮、未登录重定向
- *
- * 每个测试独立，先注册登录获取 auth token。
- */
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (page: Page) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 设置页面认证状态（localStorage） */
-async function setupAuth(
-  page: Page,
-  token: string,
-  user: { id: string; email: string; username: string; display_name: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.display_name,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-test.describe("个人设置页面 - 未登录重定向", () => {
-  test("未登录访问重定向到登录页", async ({ page }) => {
-    await page.goto("/app/profile");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});
-
-test.describe("个人设置页面 - 页面加载", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("设置页面加载成功", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-load",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-load",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-  });
-
-  test("页面标题存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-title",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-title",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证页面包含"个人设置"标题
-    const heading = page.getByRole("heading", { name: /个人设置/ });
-    await expect(heading.first()).toBeVisible({ timeout: 10_000 });
-  });
-});
-
-test.describe("个人设置 - 个人信息展示", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("个人信息卡片展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-info",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-info",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证设置卡片存在
-    await expect(page.locator(".xx-settings-card")).toBeVisible();
-  });
-
-  test("用户名、邮箱字段展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-fields",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-fields",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证表单字段存在
-    const fields = page.locator(".xx-settings-field");
-    await expect(fields.first()).toBeVisible();
-    const fieldCount = await fields.count();
-    expect(fieldCount).toBeGreaterThanOrEqual(2);
-  });
-
-  test("用户名标签和输入框存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-username",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-username",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证用户名标签
-    const usernameLabel = page.locator(".xx-settings-label").filter({
-      hasText: "用户名",
-    });
-    await expect(usernameLabel).toBeVisible();
-
-    // 验证邮箱标签
-    const emailLabel = page.locator(".xx-settings-label").filter({
-      hasText: "邮箱",
-    });
-    await expect(emailLabel).toBeVisible();
-  });
-
-  test("显示名称字段可编辑", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-dispname",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-dispname",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 查找显示名称输入框
-    const displayNameField = page.locator(".xx-settings-field").filter({
-      has: page.locator(".xx-settings-label", { hasText: "显示名称" }),
-    });
-    if (await displayNameField.isVisible()) {
-      const input = displayNameField.locator("input");
-      if (await input.isVisible()) {
-        // 验证输入框存在且可输入
-        await expect(input).toBeVisible();
-        const initialValue = await input.inputValue();
-        await input.fill("新的显示名称");
-        await expect(input).toHaveValue("新的显示名称");
-        // 恢复原值
-        await input.fill(initialValue);
-      }
-    }
-  });
-});
-
-test.describe("个人设置 - 修改密码", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("修改密码 API - 正向", async ({ request }) => {
-    const { headers, email } = await createAuthedUser(request, "profile-chpwd");
-
-    const newPassword = "NewPass123456!";
-    const response = await request.post(`${apiBase}/auth/change-password`, {
-      headers,
-      data: {
-        old_password: PASSWORD,
-        new_password: newPassword,
-      },
-    });
-
-    // 修改密码可能成功或接口不存在
-    expect(
-      response.status() < 500,
-      `修改密码应返回 2xx 或 4xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    // 如果成功，用新密码登录验证
-    if (response.ok()) {
-      const loginResp = await loginWithRetry(request, email, newPassword);
-      expect(loginResp.ok(), "新密码应能登录").toBeTruthy();
-    }
-  });
-
-  test("修改密码 - 旧密码错误反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "profile-badpwd");
-
-    const response = await request.post(`${apiBase}/auth/change-password`, {
-      headers,
-      data: {
-        old_password: "WrongOldPass123!",
-        new_password: "NewPass123456!",
-      },
-    });
-
-    // 如果接口存在，应该返回 400/401
-    if (response.status() < 500 && response.status() >= 400) {
-      expect([400, 401]).toContain(response.status());
-    }
-    // 接口不存在（404）也正常
-  });
-
-  test("修改密码 - 新密码太弱反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "profile-weakpwd");
-
-    const response = await request.post(`${apiBase}/auth/change-password`, {
-      headers,
-      data: {
-        old_password: PASSWORD,
-        new_password: "123",
-      },
-    });
-
-    if (response.status() < 500 && response.status() >= 400) {
-      expect([400, 422]).toContain(response.status());
-    }
-  });
-
-  test("未登录修改密码 - 反向", async ({ request }) => {
-    const response = await request.post(`${apiBase}/auth/change-password`, {
-      data: {
-        old_password: "old",
-        new_password: "new",
-      },
-    });
-    expect([401, 403, 404]).toContain(response.status());
-  });
-});
-
-test.describe("个人设置 - 账号安全", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("获取当前用户信息 - 正向", async ({ request }) => {
-    const { headers, email, username } = await createAuthedUser(
-      request,
-      "profile-me",
-    );
-
-    const response = await request.get(`${apiBase}/auth/me`, { headers });
-    expect(
-      response.ok(),
-      `获取用户信息应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data.email).toBe(email);
-    expect(data.username).toBe(username);
-  });
-
-  test("账号安全区域提示信息存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-security",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-security",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证通知区域存在
-    const notice = page.locator(".xx-settings-notice");
-    await expect(notice).toBeVisible();
-  });
-});
-
-test.describe("个人设置 - 退出登录", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("登出 API - 正向", async ({ request }) => {
-    const { headers, email } = await createAuthedUser(request, "profile-logout");
-
-    const response = await request.post(`${apiBase}/auth/logout`, {
-      headers,
-    });
-    expect(
-      response.ok(),
-      `登出应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    // 登出后 token 应失效
-    const meResp = await request.get(`${apiBase}/auth/me`, { headers });
-    expect([401, 403]).toContain(meResp.status());
-  });
-
-  test("登出后页面跳转登录页", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-logout-ui",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-logout-ui",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 清除 localStorage 模拟登出
-    await page.evaluate(() => {
-      localStorage.removeItem("access_token");
-      localStorage.removeItem("auth-storage");
-    });
-
-    // 刷新页面应该重定向到登录页
-    await page.reload();
-    await expect(page).toHaveURL(/\/login/, { timeout: 10_000 });
-  });
-});
-
-test.describe("个人设置 - 保存按钮", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("保存按钮存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "profile-save",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E profile-save",
-    });
-
-    await page.goto("/app/profile");
-    await expect(page.locator(".xx-settings-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证按钮存在
-    const button = page.getByRole("button", { name: /保存|暂未开放/ });
-    await expect(button.first()).toBeVisible({ timeout: 5_000 });
-  });
-});

apps/web/e2e/register.spec.ts

@@ -1,298 +0,0 @@
-/**
- * 注册页面 E2E 测试
- *
- * 覆盖：页面渲染、表单验证、成功注册、跳转链接
- * 每个测试独立，使用随机邮箱避免冲突。
- */
-import { expect, test, type APIRequestContext } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试（最多等 65s） */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-test.describe("注册页面", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  // ─── 页面渲染 ──────────────────────────────────────
-
-  test("页面正常渲染 - 标题、表单元素、提交按钮", async ({ page }) => {
-    await page.goto("/register");
-
-    // 品牌标识
-    await expect(page.locator(".xx-auth-brand-name")).toHaveText("小虾智剪");
-
-    // 标题/描述
-    await expect(page.getByText("创建账户，开启智能视频创作之旅")).toBeVisible();
-
-    // 表单字段
-    await expect(page.getByLabel("邮箱")).toBeVisible();
-    await expect(page.getByLabel("用户名")).toBeVisible();
-    await expect(page.getByLabel("密码")).toBeVisible();
-    await expect(page.getByLabel("确认密码")).toBeVisible();
-
-    // 提交按钮
-    await expect(
-      page.locator("button[type='submit']").filter({ hasText: "注册" }),
-    ).toBeVisible();
-  });
-
-  // ─── 表单验证 ──────────────────────────────────────
-
-  test("空提交 - 显示必填错误", async ({ page }) => {
-    await page.goto("/register");
-
-    // 直接点击注册按钮
-    await page.locator("button[type='submit']").filter({ hasText: "注册" }).click();
-
-    // 应显示必填错误
-    await expect(page.getByText("请输入邮箱")).toBeVisible();
-    await expect(page.getByText("请输入用户名")).toBeVisible();
-    await expect(page.getByText("请输入密码")).toBeVisible();
-    await expect(page.getByText("请确认密码")).toBeVisible();
-  });
-
-  test("无效邮箱格式 - 显示格式错误", async ({ page }) => {
-    await page.goto("/register");
-
-    await page.getByLabel("邮箱").fill("not-an-email");
-    await page.getByLabel("用户名").fill("testuser");
-    await page.getByLabel("密码").fill(PASSWORD);
-    await page.getByLabel("确认密码").fill(PASSWORD);
-
-    await page.locator("button[type='submit']").filter({ hasText: "注册" }).click();
-
-    // 应显示邮箱格式错误
-    await expect(page.getByText("请输入有效的邮箱地址")).toBeVisible();
-  });
-
-  test("密码太短 - 显示长度错误", async ({ page }) => {
-    await page.goto("/register");
-
-    await page.getByLabel("邮箱").fill(uniqueEmail("short-pwd"));
-    await page.getByLabel("用户名").fill("testuser");
-    await page.getByLabel("密码").fill("123");
-    await page.getByLabel("确认密码").fill("123");
-
-    await page.locator("button[type='submit']").filter({ hasText: "注册" }).click();
-
-    // 应显示密码长度错误
-    await expect(page.getByText("密码至少 8 个字符")).toBeVisible();
-  });
-
-  test("确认密码不一致 - 显示不一致错误", async ({ page }) => {
-    await page.goto("/register");
-
-    await page.getByLabel("邮箱").fill(uniqueEmail("pwd-mismatch"));
-    await page.getByLabel("用户名").fill("testuser");
-    await page.getByLabel("密码").fill(PASSWORD);
-    await page.getByLabel("确认密码").fill("Different123!");
-
-    await page.locator("button[type='submit']").filter({ hasText: "注册" }).click();
-
-    // 应显示密码不一致错误
-    await expect(page.getByText("两次输入的密码不一致")).toBeVisible();
-  });
-
-  test("用户名为空 - 显示必填错误", async ({ page }) => {
-    await page.goto("/register");
-
-    await page.getByLabel("邮箱").fill(uniqueEmail("empty-user"));
-    await page.getByLabel("用户名").fill("");
-    await page.getByLabel("密码").fill(PASSWORD);
-    await page.getByLabel("确认密码").fill(PASSWORD);
-
-    await page.locator("button[type='submit']").filter({ hasText: "注册" }).click();
-
-    await expect(page.getByText("请输入用户名")).toBeVisible();
-  });
-
-  // ─── 成功注册 ──────────────────────────────────────
-
-  test("成功注册 - 提交有效表单", async ({ page, request }) => {
-    const email = uniqueEmail("reg-ui-ok");
-    const username = uniqueUsername("reguiok");
-
-    await page.goto("/register");
-
-    await page.getByLabel("邮箱").fill(email);
-    await page.getByLabel("用户名").fill(username);
-    await page.getByLabel("密码").fill(PASSWORD);
-    await page.getByLabel("确认密码").fill(PASSWORD);
-
-    // 监听注册请求
-    const registerResponse = page.waitForResponse(
-      (resp) =>
-        resp.url().includes("/auth/register") &&
-        resp.request().method() === "POST",
-      { timeout: 15_000 },
-    );
-
-    await page.locator("button[type='submit']").filter({ hasText: "注册" }).click();
-
-    const resp = await registerResponse;
-    expect(resp.ok(), `注册请求应返回 2xx，实际: ${resp.status()}`).toBeTruthy();
-
-    // 注册成功后应跳转到登录页或显示成功消息
-    // 页面应停留在可识别的状态（成功提示或跳转）
-    await expect
-      .poll(
-        async () => {
-          const url = page.url();
-          // 可能跳转到 login，也可能在当前页显示成功消息
-          if (url.includes("/login")) return "redirected";
-          const hasSuccess = await page.getByText(/注册成功/).isVisible();
-          return hasSuccess ? "success_msg" : url;
-        },
-        { timeout: 10_000 },
-      )
-      .toMatch(/redirected|success_msg/);
-  });
-
-  test("注册已存在邮箱 - UI 显示错误", async ({ page, request }) => {
-    const email = uniqueEmail("reg-ui-dup");
-    const username1 = uniqueUsername("reguidup1");
-    const username2 = uniqueUsername("reguidup2");
-
-    // 先通过 API 注册一个账号
-    const firstReg = await request.post(`${apiBase}/auth/register`, {
-      data: {
-        email,
-        password: PASSWORD,
-        username: username1,
-        display_name: "User 1",
-      },
-    });
-    expect(firstReg.ok(), "第一次注册应成功").toBeTruthy();
-
-    // 再在 UI 上用相同邮箱注册
-    await page.goto("/register");
-
-    await page.getByLabel("邮箱").fill(email);
-    await page.getByLabel("用户名").fill(username2);
-    await page.getByLabel("密码").fill(PASSWORD);
-    await page.getByLabel("确认密码").fill(PASSWORD);
-
-    await page.locator("button[type='submit']").filter({ hasText: "注册" }).click();
-
-    // 应显示错误提示（通过 antd message 或表单错误）
-    await expect
-      .poll(
-        async () => {
-          // 检查是否有错误消息
-          const hasError = await page.getByText(/注册失败|已注册|已存在|exists/).isVisible();
-          return hasError ? "error_shown" : "waiting";
-        },
-        { timeout: 10_000 },
-      )
-      .toBe("error_shown");
-  });
-
-  // ─── 跳转链接 ──────────────────────────────────────
-
-  test("跳转到登录页的链接", async ({ page }) => {
-    await page.goto("/register");
-
-    await page.getByRole("link", { name: "立即登录" }).click();
-
-    await expect(page).toHaveURL(/\/login/);
-    await expect(page.getByLabel("邮箱")).toBeVisible();
-  });
-
-  test("登录页有跳转到注册页的链接（反向验证）", async ({ page }) => {
-    await page.goto("/login");
-
-    await page.getByRole("link", { name: "立即注册" }).click();
-
-    await expect(page).toHaveURL(/\/register/);
-  });
-
-  test("登录页有忘记密码链接", async ({ page }) => {
-    await page.goto("/login");
-
-    await expect(page.getByRole("link", { name: /忘记密码/ })).toBeVisible();
-
-    await page.getByRole("link", { name: /忘记密码/ }).click();
-
-    await expect(page).toHaveURL(/\/forgot-password/);
-  });
-
-  // ─── 路由守卫 - 已登录用户访问注册页 ──────────────
-
-  test("已登录用户访问注册页 - 可正常访问（注册页无守卫）", async ({
-    page,
-    request,
-  }) => {
-    const email = uniqueEmail("reg-auth");
-    const username = uniqueUsername("regauth");
-
-    // 注册
-    await request.post(`${apiBase}/auth/register`, {
-      data: { email, password: PASSWORD, username, display_name: "Reg Auth Test" },
-    });
-
-    // 登录
-    const login = await loginWithRetry(request, email, PASSWORD);
-    expect(login.ok(), "登录应成功").toBeTruthy();
-    const loginData = await login.json();
-
-    // 设置登录态
-    await page.addInitScript(
-      ({ token, user }) => {
-        localStorage.setItem("access_token", token);
-        localStorage.setItem(
-          "auth-storage",
-          JSON.stringify({
-            state: { user, isAuthenticated: true },
-            version: 0,
-          }),
-        );
-      },
-      {
-        token: loginData.access_token,
-        user: {
-          id: loginData.user_id,
-          user_id: loginData.user_id,
-          email,
-          username,
-          display_name: username,
-          is_email_verified: true,
-          email_verified: true,
-        },
-      },
-    );
-
-    await page.goto("/register");
-
-    // 注册页对已登录用户也可访问（注册页是公开页面）
-    // 验证页面正常渲染
-    await expect(page.getByLabel("邮箱")).toBeVisible();
-    await expect(page.locator("button[type='submit']").filter({ hasText: "注册" })).toBeVisible();
-  });
-});

apps/web/e2e/subscription-full.spec.ts

@@ -1,600 +0,0 @@
-/**
- * 订阅完整流程 E2E 测试
- *
- * 覆盖：订阅套餐页、套餐卡片展示、升级套餐交互、账单列表页、
- * 取消订阅（确认流程）、自动续费切换、支付流程、未登录重定向
- *
- * 注意：subscription.spec.ts 已覆盖 API 基础测试和路由守卫，
- * 本文件专注于页面交互和完整流程。
- *
- * 每个测试独立，先注册登录获取 auth token。
- */
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (page: Page) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 设置页面认证状态（localStorage） */
-async function setupAuth(
-  page: Page,
-  token: string,
-  user: { id: string; email: string; username: string; display_name: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.display_name,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-test.describe("订阅套餐页 - 页面加载", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("订阅套餐页面加载成功", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-load",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-load",
-    });
-
-    await page.goto("/app/subscription");
-    await expect(page.locator(".xx-plans-page")).toBeVisible({
-      timeout: 20_000,
-    });
-  });
-
-  test("套餐卡片网格展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-cards",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-cards",
-    });
-
-    await page.goto("/app/subscription");
-    await expect(page.locator(".xx-plans-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证套餐卡片存在
-    const planCards = page.locator(".xx-plan-card");
-    await expect(planCards.first()).toBeVisible({ timeout: 10_000 });
-    const cardCount = await planCards.count();
-    expect(cardCount).toBeGreaterThanOrEqual(2);
-  });
-
-  test("套餐卡片包含名称、价格、特性列表", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-cardinfo",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-cardinfo",
-    });
-
-    await page.goto("/app/subscription");
-    await expect(page.locator(".xx-plans-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const firstCard = page.locator(".xx-plan-card").first();
-    await expect(firstCard).toBeVisible({ timeout: 10_000 });
-
-    // 验证价格区域存在
-    await expect(firstCard.locator(".xx-plan-price")).toBeVisible();
-    // 验证特性列表存在
-    await expect(firstCard.locator(".xx-features")).toBeVisible();
-    // 验证订阅按钮存在
-    await expect(firstCard.locator(".xx-subscribe-btn")).toBeVisible();
-  });
-
-  test("推荐套餐有特殊标识", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-recommended",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-recommended",
-    });
-
-    await page.goto("/app/subscription");
-    await expect(page.locator(".xx-plans-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证有推荐标签
-    const featuredCard = page.locator(".xx-plan-card.featured");
-    if (await featuredCard.isVisible({ timeout: 5_000 })) {
-      await expect(featuredCard.locator(".xx-badge")).toBeVisible();
-    }
-  });
-});
-
-test.describe("订阅套餐页 - 升级交互", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("点击升级套餐按钮跳转升级页", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-upgrade-btn",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-upgrade-btn",
-    });
-
-    await page.goto("/app/subscription");
-    await expect(page.locator(".xx-plans-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 点击一个订阅按钮
-    const subscribeBtn = page.locator(".xx-subscribe-btn").first();
-    if (await subscribeBtn.isVisible({ timeout: 10_000 })) {
-      await subscribeBtn.click();
-      // 可能跳转到升级页或打开支付弹窗
-      const url = page.url();
-      // 验证页面有响应（跳转到支付或保持在订阅页但有弹窗）
-      expect(
-        url.includes("/subscription/upgrade") || url.includes("/subscription") ||
-          (await page.locator(".ant-modal, [role='dialog']").first().isVisible().catch(() => false)),
-      ).toBeTruthy();
-    }
-  });
-
-  test("升级套餐升级页面可访问", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-upgrade-page",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-upgrade-page",
-    });
-
-    await page.goto("/app/subscription/upgrade");
-    // 升级页面应该可访问（可能跳转到订阅页或显示升级内容）
-    await expect(page).toHaveURL(/\/subscription/, { timeout: 10_000 });
-  });
-});
-
-test.describe("订阅 - 账单列表页", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("账单页面加载成功", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-billing-load",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-billing-load",
-    });
-
-    await page.goto("/app/subscription/billing");
-    await expect(page.locator(".xx-billing-page")).toBeVisible({
-      timeout: 20_000,
-    });
-  });
-
-  test("账单概览区域展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-billing-overview",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-billing-overview",
-    });
-
-    await page.goto("/app/subscription/billing");
-    await expect(page.locator(".xx-billing-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证概览区域存在
-    const overview = page.locator(".xx-billing-overview");
-    if (await overview.isVisible({ timeout: 5_000 })) {
-      await expect(overview).toBeVisible();
-      // 验证套餐信息
-      await expect(overview.locator(".xx-overview-item").first()).toBeVisible();
-    }
-  });
-
-  test("自动续费开关存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "sub-autorenew-ui",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E sub-autorenew-ui",
-    });
-
-    await page.goto("/app/subscription/billing");
-    await expect(page.locator(".xx-billing-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证自动续费区域存在
-    const autoRenew = page.locator(".xx-billing-auto-renew");
-    if (await autoRenew.isVisible({ timeout: 5_000 })) {
-      await expect(autoRenew).toBeVisible();
-      // 验证开关组件存在
-      await expect(autoRenew.locator(".xx-toggle-switch")).toBeVisible();
-    }
-  });
-
-  test("账单记录 API 返回数据", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-bills-api");
-
-    const response = await request.get(
-      `${apiBase}/subscription/billing-records`,
-      { headers },
-    );
-
-    expect(
-      response.ok(),
-      `获取账单记录应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(Array.isArray(data), "账单记录应为数组").toBeTruthy();
-  });
-});
-
-test.describe("订阅 - 自动续费切换", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("切换自动续费 - 正向 API", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-toggle-api");
-
-    // 关闭自动续费
-    const disableResp = await request.post(
-      `${apiBase}/subscription/toggle-auto-renew`,
-      {
-        headers,
-        data: { enabled: false },
-      },
-    );
-    expect(
-      disableResp.ok(),
-      `关闭自动续费应成功: ${await disableResp.text()}`,
-    ).toBeTruthy();
-
-    // 重新开启自动续费
-    const enableResp = await request.post(
-      `${apiBase}/subscription/toggle-auto-renew`,
-      {
-        headers,
-        data: { enabled: true },
-      },
-    );
-    expect(
-      enableResp.ok(),
-      `开启自动续费应成功: ${await enableResp.text()}`,
-    ).toBeTruthy();
-  });
-
-  test("切换自动续费 - 无效参数反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-toggle-bad");
-
-    const response = await request.post(
-      `${apiBase}/subscription/toggle-auto-renew`,
-      {
-        headers,
-        data: {},
-      },
-    );
-
-    expect([400, 422]).toContain(response.status());
-  });
-});
-
-test.describe("订阅 - 取消订阅", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("取消订阅 API - 免费用户反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-cancel-api");
-
-    const response = await request.post(`${apiBase}/subscription/cancel`, {
-      headers,
-    });
-
-    // 免费用户取消订阅可能返回错误
-    if (!response.ok()) {
-      const data = await response.json();
-      expect(data.error?.message || data.detail || data.message).toBeTruthy();
-    }
-    // 如果成功了也没问题（某些实现可能允许）
-    expect(response.status() < 500).toBeTruthy();
-  });
-
-  test("未登录取消订阅 - 反向", async ({ request }) => {
-    const response = await request.post(`${apiBase}/subscription/cancel`);
-    expect([401, 403]).toContain(response.status());
-  });
-});
-
-test.describe("订阅 - 套餐变更", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("升级到 Pro 套餐 - 正向 API", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-upgrade-api");
-
-    const response = await request.post(`${apiBase}/subscription/change-plan`, {
-      headers,
-      data: {
-        target_plan_id: "pro",
-        billing_cycle: "monthly",
-      },
-    });
-
-    expect(
-      response.ok(),
-      `升级套餐应成功: ${await response.text()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data).toBeTruthy();
-  });
-
-  test("获取当前订阅信息 - 验证升级", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-current-api");
-
-    // 先升级
-    await request.post(`${apiBase}/subscription/change-plan`, {
-      headers,
-      data: {
-        target_plan_id: "pro",
-        billing_cycle: "monthly",
-      },
-    });
-
-    // 获取当前订阅
-    const response = await request.get(`${apiBase}/subscription/current`, {
-      headers,
-    });
-
-    expect(
-      response.ok(),
-      `获取订阅信息应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data.plan_id, "应返回 plan_id").toBeTruthy();
-    expect(data.status, "应返回 status").toBeTruthy();
-  });
-
-  test("降级到 Standard 套餐 - 正向 API", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-downgrade-api");
-
-    // 先升级到 Pro
-    const upgrade = await request.post(`${apiBase}/subscription/change-plan`, {
-      headers,
-      data: {
-        target_plan_id: "pro",
-        billing_cycle: "monthly",
-      },
-    });
-    expect(upgrade.ok(), `升级到 Pro 应成功`).toBeTruthy();
-
-    // 降级到 Standard
-    const downgrade = await request.post(
-      `${apiBase}/subscription/change-plan`,
-      {
-        headers,
-        data: {
-          target_plan_id: "standard",
-          billing_cycle: "monthly",
-        },
-      },
-    );
-
-    expect(
-      downgrade.status() < 500,
-      `降级请求应返回 2xx 或 4xx，实际: ${downgrade.status()}`,
-    ).toBeTruthy();
-  });
-
-  test("切换到无效套餐 - 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-badplan-api");
-
-    const response = await request.post(`${apiBase}/subscription/change-plan`, {
-      headers,
-      data: {
-        target_plan_id: "nonexistent_plan",
-        billing_cycle: "monthly",
-      },
-    });
-
-    expect(response.status(), "无效套餐应返回 4xx").toBeGreaterThanOrEqual(400);
-    expect(response.status()).toBeLessThan(500);
-  });
-});
-
-test.describe("订阅 - 支付流程", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("创建支付订单 - 正向 API", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-pay-api");
-
-    const response = await request.post(`${apiBase}/subscription/create-order`, {
-      headers,
-      data: {
-        plan_id: "pro",
-        billing_cycle: "monthly",
-      },
-    });
-
-    // 创建支付订单可能成功或接口不存在
-    expect(
-      response.status() < 500,
-      `创建订单应返回 2xx 或 4xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    if (response.ok()) {
-      const data = await response.json();
-      // 应返回订单 ID 或支付链接
-      expect(data.order_id || data.payment_url || data).toBeTruthy();
-    }
-  });
-
-  test("未登录创建订单 - 反向", async ({ request }) => {
-    const response = await request.post(`${apiBase}/subscription/create-order`, {
-      data: {
-        plan_id: "pro",
-        billing_cycle: "monthly",
-      },
-    });
-    expect([401, 403, 404]).toContain(response.status());
-  });
-});
-
-test.describe("订阅 - 套餐列表 API", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("获取套餐列表 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "sub-plans-api");
-
-    const response = await request.get(`${apiBase}/subscription/plans`, {
-      headers,
-    });
-
-    // 套餐列表可能需要登录也可能公开
-    if (response.ok()) {
-      const data = await response.json();
-      const plans = Array.isArray(data) ? data : data.plans || data.items;
-      if (Array.isArray(plans)) {
-        expect(plans.length).toBeGreaterThanOrEqual(2);
-      }
-    }
-    // 如果需要登录也正常
-    expect(response.status() < 500).toBeTruthy();
-  });
-
-  test("未登录获取套餐列表", async ({ request }) => {
-    const response = await request.get(`${apiBase}/subscription/plans`);
-    // 套餐列表可能公开也可能需要登录
-    expect(response.status() < 500).toBeTruthy();
-  });
-});

apps/web/e2e/subscription.spec.ts

@@ -178,7 +178,10 @@ test.describe("订阅过期处理", () => {
     // 免费用户可能不需要取消，返回 400 或类似错误
     if (!response.ok()) {
       const data = await response.json();
-      expect(data.error?.message || data.detail || data.message, "应返回错误信息").toBeTruthy();
+      expect(
+        data.error?.message || data.detail || data.message,
+        "应返回错误信息",
+      ).toBeTruthy();
     }
   });
 

apps/web/e2e/templates.spec.ts

@@ -1,628 +0,0 @@
-/**
- * 模板库页面 E2E 测试
- *
- * 覆盖：模板列表加载、分类切换、模板详情、收藏/取消收藏、
- * 使用模板入口、搜索功能、我的模板tab、未登录重定向
- *
- * 每个测试独立，先注册登录获取 auth token。
- */
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (page: Page) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 设置页面认证状态（localStorage） */
-async function setupAuth(
-  page: Page,
-  token: string,
-  user: { id: string; email: string; username: string; display_name: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.display_name,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-test.describe("模板库页面 - 未登录重定向", () => {
-  test("未登录访问重定向到登录页", async ({ page }) => {
-    await page.goto("/app/templates");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});
-
-test.describe("模板库页面 - 页面加载", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("模板库页面加载成功", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "tpl-load",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-load",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-  });
-
-  test("模板库头部和搜索栏存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "tpl-head",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-head",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证搜索框
-    const searchInput = page.locator(".xx-templates-search-input");
-    await expect(searchInput).toBeVisible({ timeout: 10_000 });
-  });
-
-  test("分类切换按钮存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "tpl-cat",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-cat",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证分类按钮存在
-    const categoryBtns = page.locator(".xx-templates-cat-btn");
-    await expect(categoryBtns.first()).toBeVisible({ timeout: 10_000 });
-    const count = await categoryBtns.count();
-    expect(count).toBeGreaterThan(0);
-  });
-});
-
-test.describe("模板库 - 模板展示", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("模板卡片展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "tpl-cards");
-    const suffix = Date.now().toString(36);
-
-    // 创建一个模板
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `E2E 模板展示 ${suffix}`,
-        mode: "pip",
-        estimated_duration: 30,
-        description: "测试模板展示",
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 15,
-            material_type: "video",
-          },
-        ],
-        tags: ["e2e", "展示"],
-        category: "种草",
-      },
-    });
-
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-cards",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 等待模板卡片出现
-    const cards = page.locator(".xx-template-card");
-    await expect(cards.first()).toBeVisible({ timeout: 15_000 });
-    const count = await cards.count();
-    expect(count).toBeGreaterThan(0);
-  });
-
-  test("模板卡片包含名称和类型", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "tpl-info");
-    const suffix = Date.now().toString(36);
-
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `模板信息测试 ${suffix}`,
-        mode: "voice_over",
-        estimated_duration: 60,
-        description: "测试信息展示",
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 10,
-            duration_max: 30,
-            material_type: "video",
-          },
-        ],
-      },
-    });
-
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-info",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const firstCard = page.locator(".xx-template-card").first();
-    if (await firstCard.isVisible({ timeout: 15_000 })) {
-      // 验证信息区域存在
-      const info = firstCard.locator(".xx-template-info");
-      await expect(info).toBeVisible();
-    }
-  });
-
-  test("模板预览弹窗功能", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "tpl-preview");
-    const suffix = Date.now().toString(36);
-
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `预览测试模板 ${suffix}`,
-        mode: "pip",
-        estimated_duration: 30,
-        description: "预览测试描述",
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 15,
-            material_type: "video",
-            description: "片段一",
-          },
-        ],
-      },
-    });
-
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-preview",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 点击第一个模板卡片打开预览
-    const firstCard = page.locator(".xx-template-card").first();
-    if (await firstCard.isVisible({ timeout: 15_000 })) {
-      await firstCard.click();
-      // 预览弹窗应该出现
-      const modal = page.locator(".xx-template-modal");
-      if (await modal.isVisible({ timeout: 5_000 })) {
-        await expect(modal).toBeVisible();
-        // 验证预览内容存在
-        await expect(modal.locator(".xx-template-modal-title-row")).toBeVisible();
-      }
-    }
-  });
-});
-
-test.describe("模板库 - 分类切换", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("切换分类筛选", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "tpl-switch",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-switch",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const categoryBtns = page.locator(".xx-templates-cat-btn");
-    const firstBtn = categoryBtns.first();
-
-    if (await firstBtn.isVisible({ timeout: 10_000 })) {
-      await firstBtn.click();
-      // 验证按钮被选中
-      await expect(firstBtn).toHaveClass(/active/);
-    }
-  });
-});
-
-test.describe("模板库 - 搜索", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("搜索框可输入并筛选", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "tpl-search");
-    const suffix = Date.now().toString(36);
-    const templateName = `E2E 搜索测试模板 ${suffix}`;
-
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: templateName,
-        mode: "pip",
-        estimated_duration: 30,
-        description: "搜索测试专用模板",
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 15,
-            material_type: "video",
-          },
-        ],
-      },
-    });
-
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-search",
-    });
-
-    await page.goto("/app/templates");
-    await expect(page.locator(".xx-templates-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const searchInput = page.locator(".xx-templates-search-input");
-    if (await searchInput.isVisible({ timeout: 10_000 })) {
-      await searchInput.fill(suffix);
-      // 验证页面正常响应
-      await expect(page.locator(".xx-templates-page")).toBeVisible();
-    }
-  });
-});
-
-test.describe("模板库 - API 操作", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("获取模板列表 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "tpl-api-list");
-    const suffix = Date.now().toString(36);
-
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `API 列表测试 ${suffix}`,
-        mode: "pip",
-        estimated_duration: 30,
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 15,
-            material_type: "video",
-          },
-        ],
-      },
-    });
-
-    const response = await request.get(`${apiBase}/templates`, { headers });
-    expect(
-      response.ok(),
-      `获取模板列表应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    const items = data.items || data.templates || [];
-    expect(Array.isArray(items), "模板列表应为数组").toBeTruthy();
-    expect(items.length).toBeGreaterThan(0);
-  });
-
-  test("收藏/取消收藏模板 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "tpl-fav");
-    const suffix = Date.now().toString(36);
-
-    // 创建模板
-    const createResp = await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `收藏测试 ${suffix}`,
-        mode: "pip",
-        estimated_duration: 30,
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 15,
-            material_type: "video",
-          },
-        ],
-      },
-    });
-    expect(createResp.ok()).toBeTruthy();
-    const created = await createResp.json();
-    const templateId = created.id;
-
-    // 收藏
-    const favResp = await request.post(
-      `${apiBase}/templates/${templateId}/favorite`,
-      { headers },
-    );
-    // 收藏可能成功或接口不存在
-    expect(favResp.status() < 500, "收藏请求应返回 2xx 或 4xx").toBeTruthy();
-
-    // 取消收藏
-    const unfavResp = await request.delete(
-      `${apiBase}/templates/${templateId}/favorite`,
-      { headers },
-    );
-    expect(unfavResp.status() < 500, "取消收藏请求应返回 2xx 或 4xx").toBeTruthy();
-  });
-
-  test("获取模板详情 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "tpl-api-detail");
-    const suffix = Date.now().toString(36);
-
-    const createResp = await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `详情测试 ${suffix}`,
-        mode: "voice_over",
-        estimated_duration: 60,
-        description: "详情测试描述",
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 10,
-            duration_max: 30,
-            material_type: "video",
-            description: "测试片段",
-          },
-        ],
-      },
-    });
-    expect(createResp.ok()).toBeTruthy();
-    const created = await createResp.json();
-
-    const detailResp = await request.get(
-      `${apiBase}/templates/${created.id}`,
-      { headers },
-    );
-    expect(detailResp.ok(), "获取详情应成功").toBeTruthy();
-    const detail = await detailResp.json();
-    expect(detail.id).toBe(created.id);
-    expect(detail.name).toBe(`详情测试 ${suffix}`);
-  });
-
-  test("使用模板接口 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "tpl-use");
-    const suffix = Date.now().toString(36);
-
-    const createResp = await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `使用测试 ${suffix}`,
-        mode: "pip",
-        estimated_duration: 30,
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 15,
-            material_type: "video",
-          },
-        ],
-      },
-    });
-    expect(createResp.ok()).toBeTruthy();
-    const created = await createResp.json();
-
-    // 使用模板（生成）
-    const genResp = await request.post(
-      `${apiBase}/templates/${created.id}/generate`,
-      { headers, data: {} },
-    );
-    // 生成可能成功或返回业务错误
-    expect(genResp.status() < 500, "使用模板应返回 2xx 或 4xx").toBeTruthy();
-  });
-
-  test("未登录获取模板列表 - 反向", async ({ request }) => {
-    const response = await request.get(`${apiBase}/templates`);
-    expect([401, 403]).toContain(response.status());
-  });
-});
-
-test.describe("模板库 - 我的模板 Tab", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("我的模板页面可访问", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "tpl-my",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-my",
-    });
-
-    await page.goto("/app/my-templates");
-    await expect(page.locator(".mt-page")).toBeVisible({
-      timeout: 20_000,
-    });
-  });
-
-  test("我的模板页面展示已创建的模板", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "tpl-my-data");
-    const suffix = Date.now().toString(36);
-
-    await request.post(`${apiBase}/templates`, {
-      headers,
-      data: {
-        name: `我的模板测试 ${suffix}`,
-        mode: "pip",
-        estimated_duration: 30,
-        description: "我的模板展示测试",
-        segments: [
-          {
-            segment_order: 1,
-            duration_min: 5,
-            duration_max: 15,
-            material_type: "video",
-          },
-        ],
-      },
-    });
-
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E tpl-my-data",
-    });
-
-    await page.goto("/app/my-templates");
-    await expect(page.locator(".mt-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证卡片容器存在
-    const cards = page.locator(".mt-card");
-    await expect(cards.first()).toBeVisible({ timeout: 15_000 });
-  });
-});

apps/web/e2e/test_auth.spec.ts

@@ -175,10 +175,9 @@ test.describe("认证流程", () => {
       },
     });
 
-    expect(
-      [400, 422],
-      "缺少用户名字段应返回 4xx 校验错误",
-    ).toContain(response.status());
+    expect([400, 422], "缺少用户名字段应返回 4xx 校验错误").toContain(
+      response.status(),
+    );
   });
 
   // ─── 登录 ────────────────────────────────────────────
@@ -230,7 +229,9 @@ test.describe("认证流程", () => {
         data: { email: `ghost_${Date.now()}@nonexist.com`, password: PASSWORD },
       });
       if (response.status() !== 429) break;
-      console.log(`[反向登录测试] 触发限流，等待 65s 后重试 (${attempt + 1}/2)`);
+      console.log(
+        `[反向登录测试] 触发限流，等待 65s 后重试 (${attempt + 1}/2)`,
+      );
       await new Promise((r) => setTimeout(r, 65_000));
     }
 

apps/web/e2e/titles-full.spec.ts

@@ -1,538 +0,0 @@
-/**
- * 标题库完整交互 E2E 测试
- *
- * 覆盖：创建新标题（完整流程）、编辑标题、删除标题、分类/标签筛选、
- * 搜索功能、批量操作、空状态
- *
- * 注意：core-titles.spec.ts 已覆盖基础加载和API创建/列表，
- * 本文件专注于完整交互和边界场景。
- *
- * 每个测试独立，先注册登录获取 auth token。
- */
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (page: Page) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 设置页面认证状态（localStorage） */
-async function setupAuth(
-  page: Page,
-  token: string,
-  user: { id: string; email: string; username: string; display_name: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.display_name,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-/** 创建一个标题并返回 id */
-async function createTitle(
-  request: APIRequestContext,
-  headers: Record<string, string>,
-  suffix: string,
-  overrides: Record<string, unknown> = {},
-): Promise<string> {
-  const resp = await request.post(`${apiBase}/titles`, {
-    headers,
-    data: {
-      name: `E2E 标题 ${suffix}`,
-      text: `这是一个 E2E 测试标题内容 ${suffix}`,
-      category: "default",
-      tags: ["e2e", "test"],
-      ...overrides,
-    },
-  });
-  expect(resp.ok(), `创建标题应成功: ${await resp.text()}`).toBeTruthy();
-  const data = await resp.json();
-  return data.id;
-}
-
-test.describe("标题库 - 空状态", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("新用户标题页面显示空状态", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "title-empty",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E title-empty",
-    });
-
-    await page.goto("/app/titles");
-    await expect(page.locator(".xx-titles-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 新用户应该能看到页面主体
-    await expect(page.locator(".xx-titles-page")).toBeVisible();
-  });
-});
-
-test.describe("标题库 - 搜索功能", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("搜索框存在且可输入", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "title-search");
-    const suffix = Date.now().toString(36);
-
-    await createTitle(request, headers, suffix);
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E title-search",
-    });
-
-    await page.goto("/app/titles");
-    await expect(page.locator(".xx-titles-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 查找搜索框
-    const searchInput = page.locator(
-      "input[placeholder*='搜索标题关键词'], input[placeholder*='搜索']",
-    );
-    if (await searchInput.first().isVisible({ timeout: 10_000 })) {
-      await searchInput.first().fill("测试搜索");
-      await expect(searchInput.first()).toHaveValue("测试搜索");
-    }
-  });
-});
-
-test.describe("标题库 - API 完整操作", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("创建标题 - 完整参数", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-create-full");
-    const suffix = Date.now().toString(36);
-
-    const response = await request.post(`${apiBase}/titles`, {
-      headers,
-      data: {
-        name: `完整参数测试 ${suffix}`,
-        text: `这是一个完整参数的标题测试 ${suffix}`,
-        category: "种草",
-        tags: ["e2e", "完整测试", "种草"],
-        status: "active",
-      },
-    });
-
-    expect(
-      response.ok(),
-      `创建标题应返回 2xx，实际: ${response.status()} ${await response.text()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data.id, "应返回标题 ID").toBeTruthy();
-    expect(data.name).toBe(`完整参数测试 ${suffix}`);
-    expect(data.text).toBe(`这是一个完整参数的标题测试 ${suffix}`);
-  });
-
-  test("编辑标题 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-update");
-    const titleId = await createTitle(request, headers, Date.now().toString(36));
-
-    const newName = `更新后的标题 ${Date.now()}`;
-    const newText = "这是更新后的标题内容";
-    const response = await request.patch(`${apiBase}/titles/${titleId}`, {
-      headers,
-      data: {
-        name: newName,
-        text: newText,
-        category: "知识",
-      },
-    });
-
-    expect(
-      response.ok(),
-      `更新标题应返回 2xx，实际: ${response.status()} ${await response.text()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    expect(data.name).toBe(newName);
-
-    // 验证更新
-    const verify = await request.get(`${apiBase}/titles/${titleId}`, {
-      headers,
-    });
-    const verifyData = await verify.json();
-    expect(verifyData.name).toBe(newName);
-    expect(verifyData.text).toBe(newText);
-  });
-
-  test("删除标题 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-delete");
-    const titleId = await createTitle(request, headers, Date.now().toString(36));
-
-    // 删除
-    const deleteResp = await request.delete(`${apiBase}/titles/${titleId}`, {
-      headers,
-    });
-    expect(
-      [200, 204].includes(deleteResp.status()),
-      `删除应返回 200 或 204，实际: ${deleteResp.status()}`,
-    ).toBeTruthy();
-
-    // 验证已删除
-    const getResp = await request.get(`${apiBase}/titles/${titleId}`, {
-      headers,
-    });
-    expect([404, 410]).toContain(getResp.status());
-  });
-
-  test("批量导入标题 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-batch");
-    const suffix = Date.now().toString(36);
-
-    const titles = [
-      { name: `批量标题 1 ${suffix}`, text: `内容 1 ${suffix}`, category: "default" },
-      { name: `批量标题 2 ${suffix}`, text: `内容 2 ${suffix}`, category: "种草" },
-      { name: `批量标题 3 ${suffix}`, text: `内容 3 ${suffix}`, category: "知识" },
-    ];
-
-    const response = await request.post(`${apiBase}/titles/batch-import`, {
-      headers,
-      data: { titles },
-    });
-
-    // 批量导入可能成功或接口不存在
-    expect(
-      response.status() < 500,
-      `批量导入应返回 2xx 或 4xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    if (response.ok()) {
-      const data = await response.json();
-      expect(Array.isArray(data) || data.success_count !== undefined).toBeTruthy();
-    }
-  });
-
-  test("创建标题 - 名称为空反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-empty-name");
-
-    const response = await request.post(`${apiBase}/titles`, {
-      headers,
-      data: {
-        name: "",
-        text: "有内容但名称为空",
-        category: "default",
-      },
-    });
-
-    expect([400, 422]).toContain(response.status());
-  });
-
-  test("创建标题 - 缺少必要字段反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-missing");
-
-    const response = await request.post(`${apiBase}/titles`, {
-      headers,
-      data: {
-        name: "缺少 text 字段",
-        // 缺少 text 字段
-      },
-    });
-
-    expect([400, 422]).toContain(response.status());
-  });
-
-  test("获取不存在的标题 - 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-404");
-
-    const response = await request.get(
-      `${apiBase}/titles/nonexistent-title-999`,
-      { headers },
-    );
-    expect(response.status(), "不存在的标题应返回 404").toBe(404);
-  });
-
-  test("更新不存在的标题 - 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-update-404");
-
-    const response = await request.patch(
-      `${apiBase}/titles/nonexistent-title-999`,
-      {
-        headers,
-        data: { name: "不存在的标题", text: "测试" },
-      },
-    );
-    expect(response.status(), "更新不存在的标题应返回 404").toBe(404);
-  });
-
-  test("删除不存在的标题 - 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-del-404");
-
-    const response = await request.delete(
-      `${apiBase}/titles/nonexistent-title-999`,
-      { headers },
-    );
-    expect(
-      [404, 200, 204].includes(response.status()),
-      "删除不存在的标题应返回 404 或幂等 2xx",
-    ).toBeTruthy();
-  });
-
-  test("未登录创建标题 - 反向", async ({ request }) => {
-    const response = await request.post(`${apiBase}/titles`, {
-      data: {
-        name: "未登录测试",
-        text: "未登录创建标题",
-        category: "default",
-      },
-    });
-    expect([401, 403]).toContain(response.status());
-  });
-
-  test("未登录删除标题 - 反向", async ({ request }) => {
-    const response = await request.delete(`${apiBase}/titles/some-id`);
-    expect([401, 403]).toContain(response.status());
-  });
-});
-
-test.describe("标题库 - 分类/标签筛选", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("标题分类 API 返回数据", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-cat");
-
-    // 获取标题列表，检查分类字段
-    const response = await request.get(`${apiBase}/titles`, { headers });
-    expect(response.ok()).toBeTruthy();
-
-    const data = await response.json();
-    const items = data.items || data.titles || [];
-    expect(Array.isArray(items)).toBeTruthy();
-
-    // 如果有标题，验证有分类字段
-    if (items.length > 0) {
-      expect(items[0].category !== undefined).toBeTruthy();
-    }
-  });
-
-  test("按分类筛选标题", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "title-filter-cat");
-    const suffix = Date.now().toString(36);
-
-    // 创建不同分类的标题
-    await request.post(`${apiBase}/titles`, {
-      headers,
-      data: {
-        name: `种草标题 ${suffix}`,
-        text: "种草内容",
-        category: "种草",
-      },
-    });
-    await request.post(`${apiBase}/titles`, {
-      headers,
-      data: {
-        name: `知识标题 ${suffix}`,
-        text: "知识内容",
-        category: "知识",
-      },
-    });
-
-    // 按分类筛选
-    const response = await request.get(`${apiBase}/titles`, {
-      headers,
-      params: { category: "种草" },
-    });
-
-    // 筛选可能支持也可能不支持
-    expect(
-      response.ok(),
-      `筛选请求应成功，实际: ${response.status()}`,
-    ).toBeTruthy();
-  });
-});
-
-test.describe("标题库 - 页面交互", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("标题卡片展示完整信息", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "title-card");
-    const suffix = Date.now().toString(36);
-
-    await createTitle(request, headers, suffix);
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E title-card",
-    });
-
-    await page.goto("/app/titles");
-    await expect(page.locator(".xx-titles-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const firstCard = page.locator(".xx-title-card").first();
-    if (await firstCard.isVisible({ timeout: 15_000 })) {
-      // 验证标题文本
-      const titleText = firstCard.locator(".xx-title-card-text");
-      if (await titleText.isVisible()) {
-        await expect(titleText).toBeVisible();
-      }
-      // 验证统计信息
-      const titleStat = firstCard.locator(".xx-title-card-stat");
-      if (await titleStat.isVisible()) {
-        await expect(titleStat).toBeVisible();
-      }
-    }
-  });
-
-  test("标题卡片可点击查看详情", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "title-detail");
-    const suffix = Date.now().toString(36);
-
-    await createTitle(request, headers, suffix);
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E title-detail",
-    });
-
-    await page.goto("/app/titles");
-    await expect(page.locator(".xx-titles-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const firstCard = page.locator(".xx-title-card").first();
-    if (await firstCard.isVisible({ timeout: 15_000 })) {
-      await firstCard.click();
-      // 点击后页面应该有响应（可能是弹窗或跳转）
-      await expect(page.locator(".xx-titles-page")).toBeVisible();
-    }
-  });
-});
-
-test.describe("标题库 - 批量操作", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("多选复选框存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "title-batch-ui");
-    const suffix = Date.now().toString(36);
-
-    // 创建多个标题
-    await createTitle(request, headers, `${suffix}-1`);
-    await createTitle(request, headers, `${suffix}-2`);
-    await createTitle(request, headers, `${suffix}-3`);
-
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E title-batch-ui",
-    });
-
-    await page.goto("/app/titles");
-    await expect(page.locator(".xx-titles-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 检查是否有批量操作相关 UI
-    const checkboxes = page.locator(".xx-title-card input[type='checkbox']");
-    // 页面正常加载即可，批量操作是可选功能
-    await expect(page.locator(".xx-titles-page")).toBeVisible();
-  });
-});

apps/web/e2e/voice-clone.spec.ts

@@ -1,504 +0,0 @@
-/**
- * 声音克隆页面 E2E 测试
- *
- * 覆盖：克隆页面加载、上传区域展示、克隆列表、克隆状态展示、
- * 克隆详情、删除克隆、重试克隆、未登录重定向
- *
- * 每个测试独立，先注册登录获取 auth token。
- */
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (page: Page) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 设置页面认证状态（localStorage） */
-async function setupAuth(
-  page: Page,
-  token: string,
-  user: { id: string; email: string; username: string; display_name: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.display_name,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-test.describe("声音克隆页面 - 未登录重定向", () => {
-  test("未登录访问重定向到登录页", async ({ page }) => {
-    await page.goto("/app/voice-clone");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});
-
-test.describe("声音克隆页面 - 页面加载", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("声音克隆页面加载成功", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "vc-load",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E vc-load",
-    });
-
-    await page.goto("/app/voice-clone");
-    await expect(page.locator(".vc-page")).toBeVisible({
-      timeout: 20_000,
-    });
-  });
-
-  test("页面标题和描述存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "vc-title",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E vc-title",
-    });
-
-    await page.goto("/app/voice-clone");
-    await expect(page.locator(".vc-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证页面标题包含"克隆"或"音色"相关文字
-    const pageTitle = page.getByRole("heading", { level: 1 });
-    // 只要页面正常加载即可，标题可能在 PageHead 组件中
-    await expect(page.locator(".vc-page")).toBeVisible();
-  });
-
-  test("克隆新音色按钮存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "vc-newbtn",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E vc-newbtn",
-    });
-
-    await page.goto("/app/voice-clone");
-    await expect(page.locator(".vc-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证克隆新音色按钮存在
-    const cloneBtn = page.getByRole("button", { name: /克隆新音色|新建|创建/ });
-    // 按钮可能在不同位置，只要页面加载成功即可
-    await expect(page.locator(".vc-page")).toBeVisible();
-  });
-});
-
-test.describe("声音克隆 - 空状态", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("无克隆音色时显示空状态", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "vc-empty",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E vc-empty",
-    });
-
-    await page.goto("/app/voice-clone");
-    await expect(page.locator(".vc-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 新用户应该显示空状态
-    const emptyState = page.locator(".vc-empty");
-    if (await emptyState.isVisible({ timeout: 10_000 })) {
-      await expect(emptyState.locator(".vc-empty-title")).toBeVisible();
-      await expect(emptyState.locator(".vc-empty-desc")).toBeVisible();
-    }
-  });
-});
-
-test.describe("声音克隆 - API 操作", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("获取克隆列表 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "vc-list");
-
-    const response = await request.get(`${apiBase}/voice-clones`, {
-      headers,
-    });
-
-    expect(
-      response.ok(),
-      `获取克隆列表应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    const items = data.items || data.voice_clones || [];
-    expect(Array.isArray(items), "克隆列表应为数组").toBeTruthy();
-  });
-
-  test("创建音色克隆 - 正向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "vc-create");
-    const suffix = Date.now().toString(36);
-
-    // 创建一个克隆任务（上传音频文件）
-    const response = await request.post(`${apiBase}/voice-clones`, {
-      headers,
-      multipart: {
-        name: `E2E 克隆音色 ${suffix}`,
-        description: "E2E 测试创建的克隆音色",
-        file: {
-          name: `sample_${suffix}.wav`,
-          mimeType: "audio/wav",
-          buffer: Buffer.from("fake audio data for e2e test"),
-        },
-      },
-    });
-
-    // 克隆创建可能成功也可能因为缺少实际音频处理返回错误
-    // 只要不是 500 错误即可
-    expect(
-      response.status() < 500,
-      `创建克隆应返回 2xx 或 4xx，实际: ${response.status()} ${await response.text()}`,
-    ).toBeTruthy();
-
-    if (response.ok()) {
-      const data = await response.json();
-      expect(data.id, "应返回克隆 ID").toBeTruthy();
-      expect(data.status, "应返回状态").toBeTruthy();
-    }
-  });
-
-  test("获取克隆详情 - 正向（如存在克隆数据）", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "vc-detail");
-
-    // 先获取列表看看有没有数据
-    const listResp = await request.get(`${apiBase}/voice-clones`, {
-      headers,
-    });
-    expect(listResp.ok()).toBeTruthy();
-
-    const listData = await listResp.json();
-    const items = listData.items || listData.voice_clones || [];
-
-    if (items.length > 0) {
-      const cloneId = items[0].id;
-      const detailResp = await request.get(
-        `${apiBase}/voice-clones/${cloneId}`,
-        { headers },
-      );
-      expect(detailResp.ok(), "获取详情应成功").toBeTruthy();
-      const detail = await detailResp.json();
-      expect(detail.id).toBe(cloneId);
-    }
-    // 如果没有数据，测试也通过（新用户正常情况）
-  });
-
-  test("删除克隆 - 正向（如存在克隆数据）", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "vc-del");
-
-    // 先创建一个克隆
-    const suffix = Date.now().toString(36);
-    const createResp = await request.post(`${apiBase}/voice-clones`, {
-      headers,
-      multipart: {
-        name: `待删除 ${suffix}`,
-        file: {
-          name: `del_${suffix}.wav`,
-          mimeType: "audio/wav",
-          buffer: Buffer.from("delete me"),
-        },
-      },
-    });
-
-    if (createResp.ok()) {
-      const created = await createResp.json();
-      const cloneId = created.id;
-
-      // 删除
-      const deleteResp = await request.delete(
-        `${apiBase}/voice-clones/${cloneId}`,
-        { headers },
-      );
-      expect(
-        [200, 204].includes(deleteResp.status()),
-        `删除应返回 200 或 204，实际: ${deleteResp.status()}`,
-      ).toBeTruthy();
-
-      // 验证已删除
-      const getResp = await request.get(
-        `${apiBase}/voice-clones/${cloneId}`,
-        { headers },
-      );
-      expect([404, 410]).toContain(getResp.status());
-    }
-    // 如果创建失败（比如音频格式问题），测试也通过
-  });
-
-  test("重试克隆 - 正向（如存在失败的克隆）", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "vc-retry");
-
-    // 先获取列表
-    const listResp = await request.get(`${apiBase}/voice-clones`, {
-      headers,
-    });
-    expect(listResp.ok()).toBeTruthy();
-
-    const listData = await listResp.json();
-    const items = listData.items || listData.voice_clones || [];
-
-    // 找一个失败状态的克隆进行重试
-    const failedClone = items.find(
-      (item: { status: string }) => item.status === "failed",
-    );
-
-    if (failedClone) {
-      const retryResp = await request.post(
-        `${apiBase}/voice-clones/${failedClone.id}/retry`,
-        { headers },
-      );
-      expect(
-        retryResp.ok(),
-        `重试应返回 2xx，实际: ${retryResp.status()}`,
-      ).toBeTruthy();
-    }
-    // 如果没有失败的克隆，测试通过
-  });
-
-  test("获取不存在的克隆详情 - 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "vc-404");
-
-    const response = await request.get(
-      `${apiBase}/voice-clones/nonexistent-clone-999`,
-      { headers },
-    );
-    expect(response.status(), "不存在的克隆应返回 404").toBe(404);
-  });
-
-  test("未登录获取克隆列表 - 反向", async ({ request }) => {
-    const response = await request.get(`${apiBase}/voice-clones`);
-    expect([401, 403]).toContain(response.status());
-  });
-
-  test("未登录创建克隆 - 反向", async ({ request }) => {
-    const response = await request.post(`${apiBase}/voice-clones`, {
-      multipart: {
-        name: "未登录测试",
-        file: {
-          name: "test.wav",
-          mimeType: "audio/wav",
-          buffer: Buffer.from("test"),
-        },
-      },
-    });
-    expect([401, 403]).toContain(response.status());
-  });
-});
-
-test.describe("声音克隆 - 克隆列表展示", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("克隆卡片网格布局展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "vc-grid",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E vc-grid",
-    });
-
-    await page.goto("/app/voice-clone");
-    await expect(page.locator(".vc-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证网格容器或空状态存在
-    const grid = page.locator(".vc-grid");
-    const empty = page.locator(".vc-empty");
-
-    // 至少一个应该可见
-    const gridVisible = await grid.isVisible().catch(() => false);
-    const emptyVisible = await empty.isVisible().catch(() => false);
-    expect(gridVisible || emptyVisible).toBeTruthy();
-  });
-
-  test("克隆状态标签展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username, headers } =
-      await createAuthedUser(request, "vc-status");
-    const suffix = Date.now().toString(36);
-
-    // 创建一个克隆任务
-    await request.post(`${apiBase}/voice-clones`, {
-      headers,
-      multipart: {
-        name: `E2E 状态测试 ${suffix}`,
-        file: {
-          name: `status_${suffix}.wav`,
-          mimeType: "audio/wav",
-          buffer: Buffer.from("status test data"),
-        },
-      },
-    });
-
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E vc-status",
-    });
-
-    await page.goto("/app/voice-clone");
-    await expect(page.locator(".vc-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 如果有卡片，验证状态标签存在
-    const cards = page.locator(".vc-card");
-    if ((await cards.count()) > 0) {
-      const firstCard = cards.first();
-      const statusPill = firstCard.locator(".vc-status-pill");
-      if (await statusPill.isVisible()) {
-        await expect(statusPill).toBeVisible();
-      }
-    }
-  });
-});
-
-test.describe("声音克隆 - 上传区域", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("克隆弹窗上传区域可打开", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "vc-upload",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E vc-upload",
-    });
-
-    await page.goto("/app/voice-clone");
-    await expect(page.locator(".vc-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 尝试点击克隆新音色按钮
-    const cloneBtn = page.getByRole("button", { name: /克隆新音色|立即克隆|新建/ });
-    if (await cloneBtn.isVisible()) {
-      await cloneBtn.click();
-      // 弹窗应该出现
-      const modal = page.locator(".ant-modal, .vc-edit-dialog, [role='dialog']");
-      if (await modal.first().isVisible({ timeout: 5_000 })) {
-        await expect(modal.first()).toBeVisible();
-      }
-    }
-  });
-});

apps/web/e2e/voices.spec.ts

@@ -1,432 +0,0 @@
-/**
- * 音色库页面 E2E 测试
- *
- * 覆盖：音色列表加载、预设音色展示、我的音色展示、音色详情查看、
- * 音色播放试听、搜索/筛选功能、创建自定义音色入口、未登录重定向
- *
- * 每个测试独立，先注册登录获取 auth token。
- */
-import { expect, test, type APIRequestContext, type Page } from "@playwright/test";
-
-const PASSWORD = "Test123456!";
-const apiBase = process.env.E2E_API_BASE || "/api/v1";
-const apiOrigin = apiBase.endsWith("/api/v1")
-  ? apiBase.slice(0, -"/api/v1".length)
-  : "";
-
-const routeBrowserApiToTestApi = async (page: Page) => {
-  if (!apiOrigin) return;
-  await page.route("**/api/v1/**", async (route) => {
-    const sourceUrl = new URL(route.request().url());
-    const response = await route.fetch({
-      url: `${apiOrigin}${sourceUrl.pathname}${sourceUrl.search}`,
-    });
-    await route.fulfill({ response });
-  });
-};
-
-function uniqueEmail(prefix: string): string {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}@example.com`;
-}
-
-function uniqueUsername(prefix: string): string {
-  return `${prefix}_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
-}
-
-/** 登录操作，遇到 429 限流自动等待重试 */
-async function loginWithRetry(
-  request: APIRequestContext,
-  email: string,
-  password: string,
-  maxRetries = 2,
-) {
-  for (let i = 0; i <= maxRetries; i++) {
-    const response = await request.post(`${apiBase}/auth/login`, {
-      data: { email, password },
-    });
-    if (response.status() !== 429) return response;
-    console.log(`[login] 触发限流，等待 65s 后重试 (${i + 1}/${maxRetries})`);
-    await new Promise((r) => setTimeout(r, 65000));
-  }
-  return request.post(`${apiBase}/auth/login`, {
-    data: { email, password },
-  });
-}
-
-/** 注册并登录，返回 { headers, email, username, userId, accessToken } */
-async function createAuthedUser(request: APIRequestContext, label: string) {
-  const email = uniqueEmail(label);
-  const username = uniqueUsername(label);
-
-  const reg = await request.post(`${apiBase}/auth/register`, {
-    data: { email, password: PASSWORD, username, display_name: `E2E ${label}` },
-  });
-  expect(reg.ok(), `注册应成功: ${await reg.text()}`).toBeTruthy();
-  const regData = await reg.json();
-
-  const login = await loginWithRetry(request, email, PASSWORD);
-  expect(login.ok(), `登录应成功: ${await login.text()}`).toBeTruthy();
-  const loginData = await login.json();
-
-  return {
-    headers: { Authorization: `Bearer ${loginData.access_token}` },
-    email,
-    username,
-    userId: regData.user_id,
-    accessToken: loginData.access_token,
-  };
-}
-
-/** 设置页面认证状态（localStorage） */
-async function setupAuth(
-  page: Page,
-  token: string,
-  user: { id: string; email: string; username: string; display_name: string },
-) {
-  await page.addInitScript(
-    ({ token, user }) => {
-      localStorage.setItem("access_token", token);
-      localStorage.setItem(
-        "auth-storage",
-        JSON.stringify({
-          state: { user, isAuthenticated: true },
-          version: 0,
-        }),
-      );
-    },
-    {
-      token,
-      user: {
-        id: user.id,
-        user_id: user.id,
-        email: user.email,
-        username: user.username,
-        display_name: user.display_name,
-        is_email_verified: true,
-        email_verified: true,
-      },
-    },
-  );
-}
-
-test.describe("音色库页面 - 未登录重定向", () => {
-  test("未登录访问重定向到登录页", async ({ page }) => {
-    await page.goto("/app/voices");
-    await expect(page).toHaveURL(/\/login/);
-  });
-});
-
-test.describe("音色库页面 - 页面加载", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("音色库页面加载成功", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-load",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-load",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-  });
-
-  test("页面头部和搜索栏存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-head",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-head",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证搜索框存在
-    const searchInput = page.locator("input[type='search'], .xx-voices-search input, input[placeholder*='搜索']");
-    await expect(searchInput.first()).toBeVisible({ timeout: 10_000 });
-  });
-});
-
-test.describe("音色库 - 预设音色", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("预设音色列表 API 返回数据", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "voice-preset");
-
-    const response = await request.get(`${apiBase}/voices/preset`, {
-      headers,
-    });
-
-    // 预设音色接口可能返回数组或包装对象
-    expect(
-      response.ok(),
-      `获取预设音色应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    const items = data.items || data.voices || data;
-    expect(Array.isArray(items), "预设音色应为数组").toBeTruthy();
-  });
-
-  test("预设音色卡片在页面中展示", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-cards",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-cards",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 等待音色卡片加载（预设音色应该有数据）
-    const voiceCards = page.locator(".xx-voice-card");
-    // 等待至少一张卡片出现
-    await expect(voiceCards.first()).toBeVisible({ timeout: 15_000 });
-    const count = await voiceCards.count();
-    expect(count).toBeGreaterThan(0);
-  });
-
-  test("音色卡片包含名称和信息", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-info",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-info",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const firstCard = page.locator(".xx-voice-card").first();
-    await expect(firstCard).toBeVisible({ timeout: 15_000 });
-
-    // 验证音色名称存在
-    await expect(firstCard.locator(".xx-voice-name")).toBeVisible();
-    // 验证头像存在
-    await expect(firstCard.locator(".xx-voice-avatar")).toBeVisible();
-  });
-});
-
-test.describe("音色库 - 我的克隆音色", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("克隆音色列表 API 返回数据", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "voice-cln-api");
-
-    const response = await request.get(`${apiBase}/voice-clones`, {
-      headers,
-    });
-
-    expect(
-      response.ok(),
-      `获取克隆音色应返回 2xx，实际: ${response.status()}`,
-    ).toBeTruthy();
-
-    const data = await response.json();
-    const items = data.items || data.voice_clones || [];
-    expect(Array.isArray(items), "克隆音色应为数组").toBeTruthy();
-  });
-
-  test("空状态展示 - 无克隆音色时", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-empty",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-empty",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 切换到"我的克隆"tab（如果有tab的话）
-    const clonedTab = page.getByText("我的克隆").first();
-    if (await clonedTab.isVisible()) {
-      await clonedTab.click();
-    }
-
-    // 页面至少应该是可访问的
-    await expect(page.locator(".xx-voices-page")).toBeVisible();
-  });
-
-  test("创建克隆音色入口存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-create",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-create",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证创建克隆音色按钮存在（可能是"克隆音色"或"新建"按钮）
-    const createBtn = page.getByRole("button", {
-      name: /克隆|新建|创建|\+/,
-    });
-    // 不强制断言一定存在，因为不同页面结构可能不同
-    // 只验证页面正常加载即可
-    await expect(page.locator(".xx-voices-page")).toBeVisible();
-  });
-});
-
-test.describe("音色库 - 搜索和筛选", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("搜索框存在且可输入", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-search",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-search",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 查找搜索输入框
-    const searchInput = page.locator(
-      "input[placeholder*='搜索'], input[type='search'], .xx-voices-search input",
-    );
-    const firstInput = searchInput.first();
-
-    if (await firstInput.isVisible({ timeout: 5_000 })) {
-      await firstInput.fill("测试搜索");
-      await expect(firstInput).toHaveValue("测试搜索");
-    }
-  });
-
-  test("性别/语言筛选选项存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-filter",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-filter",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    // 验证筛选相关元素存在（可能是下拉选择器或标签）
-    const filterSelect = page.locator("select, .xx-voices-filter");
-    // 页面正常加载即通过
-    await expect(page.locator(".xx-voices-page")).toBeVisible();
-  });
-});
-
-test.describe("音色库 - 播放试听", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("音色播放按钮存在", async ({ page, request }) => {
-    await routeBrowserApiToTestApi(page);
-    const { accessToken, userId, email, username } = await createAuthedUser(
-      request,
-      "voice-play",
-    );
-    await setupAuth(page, accessToken, {
-      id: userId,
-      email,
-      username,
-      display_name: "E2E voice-play",
-    });
-
-    await page.goto("/app/voices");
-    await expect(page.locator(".xx-voices-page")).toBeVisible({
-      timeout: 20_000,
-    });
-
-    const firstCard = page.locator(".xx-voice-card").first();
-    if (await firstCard.isVisible({ timeout: 15_000 })) {
-      // 验证播放按钮存在
-      const playBtn = firstCard.locator(".xx-voice-play-btn");
-      if (await playBtn.isVisible()) {
-        await expect(playBtn).toBeVisible();
-      }
-    }
-  });
-});
-
-test.describe("音色库 - API 边界测试", () => {
-  test.describe.configure({ timeout: 120_000 });
-
-  test("未登录获取预设音色 - 反向", async ({ request }) => {
-    const response = await request.get(`${apiBase}/voices/preset`);
-    // 预设音色可能不需要登录，也可能需要，两种情况都接受
-    // 但如果需要登录，应返回 401/403
-    if (!response.ok()) {
-      expect([401, 403]).toContain(response.status());
-    }
-  });
-
-  test("未登录获取克隆音色 - 反向", async ({ request }) => {
-    const response = await request.get(`${apiBase}/voice-clones`);
-    expect([401, 403]).toContain(response.status());
-  });
-
-  test("获取不存在的克隆音色详情 - 反向", async ({ request }) => {
-    const { headers } = await createAuthedUser(request, "voice-404");
-
-    const response = await request.get(
-      `${apiBase}/voice-clones/nonexistent-999`,
-      { headers },
-    );
-    expect(response.status(), "不存在的克隆应返回 404").toBe(404);
-  });
-});

apps/web/package-lock.json

@@ -28,11 +28,13 @@
         "@typescript-eslint/eslint-plugin": "^7.13.1",
         "@typescript-eslint/parser": "^7.13.1",
         "@vitejs/plugin-react": "^4.3.1",
+        "@vitest/coverage-v8": "^1.6.0",
         "@vitest/ui": "^1.6.0",
         "eslint": "^8.57.0",
         "eslint-plugin-react-hooks": "^4.6.2",
         "eslint-plugin-react-refresh": "^0.4.7",
         "jsdom": "^24.1.0",
+        "prettier": "^3.9.5",
         "typescript": "^5.5.3",
         "vite": "^5.3.1",
         "vitest": "^1.6.0"
@@ -45,6 +47,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@ant-design/colors": {
       "version": "7.2.1",
       "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.2.1.tgz",
@@ -474,6 +490,13 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@csstools/color-helpers": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
@@ -1141,6 +1164,16 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz",
+      "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
@@ -2220,6 +2253,34 @@
         "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/@vitest/coverage-v8": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.6.1.tgz",
+      "integrity": "sha512-6YeRZwuO4oTGKxD3bijok756oktHSIm3eczVVzNe3scqzuhLwltIF3S9ZL/vwOVIpURmU6SnZhziXXAfw8/Qlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.1",
+        "@bcoe/v8-coverage": "^0.2.3",
+        "debug": "^4.3.4",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^5.0.4",
+        "istanbul-reports": "^3.1.6",
+        "magic-string": "^0.30.5",
+        "magicast": "^0.3.3",
+        "picocolors": "^1.0.0",
+        "std-env": "^3.5.0",
+        "strip-literal": "^2.0.0",
+        "test-exclude": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "vitest": "1.6.1"
+      }
+    },
     "node_modules/@vitest/expect": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.1.tgz",
@@ -3876,6 +3937,13 @@
         "node": ">=18"
       }
     },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
@@ -4084,6 +4152,60 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -4351,6 +4473,34 @@
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
+    "node_modules/magicast": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -4828,6 +4978,22 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.9.6",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz",
+      "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/pretty-format": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -5993,6 +6159,45 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz",
+      "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",

apps/web/package.json

@@ -37,11 +37,13 @@
     "@typescript-eslint/eslint-plugin": "^7.13.1",
     "@typescript-eslint/parser": "^7.13.1",
     "@vitejs/plugin-react": "^4.3.1",
+    "@vitest/coverage-v8": "^1.6.0",
     "@vitest/ui": "^1.6.0",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.7",
     "jsdom": "^24.1.0",
+    "prettier": "^3.9.5",
     "typescript": "^5.5.3",
     "vite": "^5.3.1",
     "vitest": "^1.6.0"

apps/web/src/api/assets.ts

@@ -263,14 +263,10 @@ export const uploadAssetDirect = async (data: {
   );
   directForm.append("file", data.file);
 
-  // 使用 XMLHttpRequest 以获取上传进度 + 超时控制 + 详细错误诊断
+  // 使用 XMLHttpRequest 以获取上传进度（fetch 不支持）
   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));
@@ -280,43 +276,10 @@ export const uploadAssetDirect = async (data: {
       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));
+        reject(new Error(`OSS direct upload failed: ${xhr.status}`));
       }
     };
-    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.onerror = () => reject(new Error("OSS direct upload failed"));
     xhr.send(directForm);
   });
 

apps/web/src/api/client.ts

@@ -122,27 +122,8 @@ apiClient.interceptors.response.use(
     }
 
     // 提取后端返回的错误信息（detail / message / msg）
-    // 注意：后端返回的字段可能是对象 {code, message} 而非字符串，需要安全提取
     const data = error.response?.data;
-    const rawServerMsg = data?.detail || data?.message || data?.msg;
-    // 安全提取字符串：递归处理嵌套对象（后端可能返回 {code, message: {code, message}} 等）
-    const safeExtractString = (val: unknown): string => {
-      if (typeof val === "string") return val;
-      if (typeof val === "object" && val !== null) {
-        const obj = val as Record<string, unknown>;
-        if (typeof obj.message === "string") return obj.message;
-        if (typeof obj.msg === "string") return obj.msg;
-        if (typeof obj.detail === "string") return obj.detail;
-        // 嵌套对象：递归提取
-        if (typeof obj.message === "object" && obj.message !== null)
-          return safeExtractString(obj.message);
-        if (typeof obj.msg === "object" && obj.msg !== null)
-          return safeExtractString(obj.msg);
-        return JSON.stringify(val);
-      }
-      return "";
-    };
-    const serverMsg = safeExtractString(rawServerMsg);
+    const serverMsg = data?.detail || data?.message || data?.msg;
     let handled = false;
 
     if (error.code === "ECONNABORTED" || error.message?.includes("timeout")) {

apps/web/src/api/titles.ts

@@ -68,14 +68,10 @@ export interface CreateTitleRequest {
 
 /** 获取当前用户的所有标题 */
 export const getTitles = async (): Promise<TitleItem[]> => {
-  const response = await apiClient.get<
-    { items: BackendTitleResponse[] } | BackendTitleResponse[]
-  >("/titles");
-  // 兼容两种后端返回格式：{ items: [...] } 或直接 [...]
-  const items = Array.isArray(response.data)
-    ? response.data
-    : response.data.items || [];
-  return items.map(toTitleItem);
+  const response = await apiClient.get<{ items: BackendTitleResponse[] }>(
+    "/titles",
+  );
+  return (response.data.items || []).map(toTitleItem);
 };
 
 /** 创建标题 */

apps/web/src/pages/assets/AssetLibrary.tsx

@@ -69,20 +69,11 @@ const inferKind = (mimeType: string): AssetKind => {
   return "image";
 };
 
-/** 根据 quality_score / classification_status / asset status 推断前端状态 */
+/** 根据 quality_score 推断前端状态 */
 const inferStatus = (
   score?: number,
   classificationStatus?: string,
-  assetStatus?: string,
 ): { status: StatusType; label: string } => {
-  // 素材已就绪（status=ready）时，不应因 classification 未执行而显示"处理中"
-  if (assetStatus === "ready") {
-    if (score == null) return { status: "info", label: "待诊断" };
-    if (score >= 70) return { status: "ok", label: "合格" };
-    if (score >= 40) return { status: "warn", label: "待优化" };
-    return { status: "bad", label: "不合格" };
-  }
-  // 素材未就绪：classification 正在处理中
   if (
     classificationStatus === "processing" ||
     classificationStatus === "pending"
@@ -115,7 +106,6 @@ const mapAsset = (item: ApiAssetItem): AssetItem => {
   const { status, label } = inferStatus(
     item.quality_score ?? undefined,
     item.classification_status ?? undefined,
-    item.status ?? undefined,
   );
   const metadata = item.metadata || {};
   const kind = inferKind(item.mime_type || "");
@@ -229,16 +219,7 @@ const AssetCard: React.FC<{
   onToggle: () => void;
   onDiagnose: () => void;
   onPlay: () => void;
-  onDelete: () => void;
-}> = ({
-  asset,
-  selected,
-  diagnosing,
-  onToggle,
-  onDiagnose,
-  onPlay,
-  onDelete,
-}) => (
+}> = ({ asset, selected, diagnosing, onToggle, onDiagnose, onPlay }) => (
   <div
     className={`xx-asset-card${selected ? " xx-asset-card-selected" : ""}`}
     onClick={onToggle}
@@ -269,24 +250,6 @@ const AssetCard: React.FC<{
         </span>
       )}
 
-      {/* 删除按钮 */}
-      <Popconfirm
-        title="确认删除"
-        description="删除后不可恢复，确定要删除这个素材吗？"
-        onConfirm={(e) => {
-          e?.stopPropagation();
-          onDelete();
-        }}
-        onCancel={(e) => e?.stopPropagation()}
-        okText="删除"
-        cancelText="取消"
-        okButtonProps={{ danger: true }}
-      >
-        <span className="xx-asset-delete" onClick={(e) => e.stopPropagation()}>
-          <DeleteOutlined />
-        </span>
-      </Popconfirm>
-
       {/* 选中态勾选 */}
       {selected && (
         <span className="xx-asset-check">
@@ -385,8 +348,6 @@ const AssetLibrary: React.FC = () => {
   /* 状态 */
   const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
 
-  // 大文件直传由 handleUpload 直接调用 uploadAssetDirect 处理
-
   /* 筛选 */
   const [searchText, setSearchText] = useState("");
   const [filterType, setFilterType] = useState<string>("all");
@@ -460,11 +421,11 @@ const AssetLibrary: React.FC = () => {
   const handleUpload = async (file: File) => {
     if (file.size > MAX_FILE_SIZE) {
       message.error(`文件 "${file.name}" 超过 2GB 限制`);
-      return;
+      return false;
     }
     if (!effectiveLibId) {
       message.warning("请先选择或创建一个素材库");
-      return;
+      return false;
     }
 
     setUploading(true);
@@ -483,14 +444,12 @@ const AssetLibrary: React.FC = () => {
       queryClient.invalidateQueries({ queryKey: ["asset-libraries"] });
     } catch (err: unknown) {
       const detail = err instanceof Error ? err.message : "";
-      console.error("[handleUpload] 上传失败:", err);
       message.error(`"${file.name}" 上传失败${detail ? `：${detail}` : ""}`);
-      // 错误时延迟关闭弹窗，让用户能看到错误提示
-      await new Promise((r) => setTimeout(r, 1500));
     } finally {
       setUploading(false);
       setUploadProgress(0);
     }
+    return false;
   };
 
   /* 新建素材库 */
@@ -543,24 +502,6 @@ const AssetLibrary: React.FC = () => {
   };
 
   /* 批量删除 */
-  /* 单个素材删除 */
-  const handleSingleDelete = async (assetId: string) => {
-    try {
-      await deleteAsset(assetId);
-      queryClient.invalidateQueries({ queryKey: ["assets"] });
-      queryClient.invalidateQueries({ queryKey: ["asset-libraries"] });
-      // 从选中集合中移除
-      setSelectedIds((prev) => {
-        const next = new Set(prev);
-        next.delete(assetId);
-        return next;
-      });
-      message.success("素材已删除");
-    } catch {
-      message.error("删除失败，请重试");
-    }
-  };
-
   const handleBatchDelete = async () => {
     const ids = Array.from(selectedIds);
     let successCount = 0;
@@ -694,12 +635,7 @@ const AssetLibrary: React.FC = () => {
         <div className="xx-assets-content">
           {/* 上传区域 */}
           <Upload.Dragger
-            beforeUpload={(file) => {
-              // 同步返回 false 阻止 antd 默认上传行为
-              // 异步上传由 handleUpload 处理
-              handleUpload(file as File);
-              return false;
-            }}
+            beforeUpload={handleUpload}
             showUploadList={false}
             multiple
             accept="video/*,image/*"
@@ -820,7 +756,6 @@ const AssetLibrary: React.FC = () => {
                   onToggle={() => toggleSelect(asset.id)}
                   onDiagnose={() => handleDiagnose(asset)}
                   onPlay={() => setPlayingAsset(asset)}
-                  onDelete={() => handleSingleDelete(asset.id)}
                 />
               ))}
             </div>

apps/web/src/pages/assets/assets.css

@@ -282,35 +282,6 @@
   transform: scale(1.1);
 }
 
-/* 删除按钮 */
-.xx-asset-delete {
-  position: absolute;
-  bottom: var(--space-sm, 8px);
-  right: var(--space-sm, 8px);
-  width: 28px;
-  height: 28px;
-  border-radius: var(--radius-full, 999px);
-  background: rgba(0, 0, 0, 0.45);
-  backdrop-filter: blur(4px);
-  display: grid;
-  place-items: center;
-  color: #fff;
-  font-size: 13px;
-  cursor: pointer;
-  opacity: 0;
-  transition: var(--transition-all, all 0.2s ease);
-  z-index: 2;
-}
-
-.xx-asset-card:hover .xx-asset-delete {
-  opacity: 1;
-}
-
-.xx-asset-delete:hover {
-  background: rgba(255, 77, 79, 0.85);
-  transform: scale(1.1);
-}
-
 /* 选中态 */
 .xx-asset-card-selected {
   border-color: var(--primary-color) !important;

apps/web/src/pages/editing-planner/EditingPlanner.tsx

@@ -298,13 +298,6 @@ const EditingPlanner: React.FC = () => {
 
   const handleModeChange = (mode: TemplateMode) => {
     setCurrentMode(mode);
-    // 切换纯单类型模式时，自动转换所有已有片段的类型
-    if (mode === "voice_over") {
-      setClips((prev) => prev.map((c) => ({ ...c, type: "voice" as const })));
-    } else if (mode === "pip") {
-      setClips((prev) => prev.map((c) => ({ ...c, type: "pip" as const })));
-    }
-    // 混合模式(voice_pip)和一镜到底(one_take)不自动转换，保留原有类型
   };
 
   const handleClipSelect = (clipId: string) => {

apps/web/src/pages/editing-planner/components/TimelinePanel.tsx

@@ -9,7 +9,6 @@ import React, {
   useCallback,
   useEffect,
   useLayoutEffect,
-  useMemo,
 } from "react";
 import type { ClipData, ClipType } from "../types";
 
@@ -55,34 +54,18 @@ const TimelinePanel: React.FC<TimelinePanelProps> = ({
     right: 0,
   });
 
-  /* ── 根据模式决定可选类型 ── */
-  const availableTypes: ClipType[] = useMemo(
-    () =>
-      currentMode === "voice_over"
-        ? ["voice"]
-        : currentMode === "pip"
-          ? ["pip"]
-          : ["voice", "pip"], // voice_pip / one_take / 默认
-    [currentMode],
-  );
-
-  /* ── 默认添加类型：跟随模式（纯单类型模式直接用该类型，混合模式默认 voice） ── */
-  const defaultAddType: ClipType = useMemo(() => {
-    if (currentMode === "voice_over") return "voice";
-    if (currentMode === "pip") return "pip";
-    return "voice";
-  }, [currentMode]);
-
   /* ── "+" 卡片：类型+时长选择状态 ── */
-  const [addType, setAddType] = useState<ClipType>(defaultAddType);
+  const [addType, setAddType] = useState<ClipType>("voice");
   const [addDuration, setAddDuration] = useState<number>(5);
 
-  /* ── 模式切换时自动同步默认添加类型 ── */
-  useEffect(() => {
-    if (!availableTypes.includes(addType)) {
-      setAddType(defaultAddType);
-    }
-  }, [currentMode, addType, availableTypes, defaultAddType]);
+  /* ── 根据模式决定可选类型 ── */
+  const availableTypes: ClipType[] =
+    currentMode === "voice_over"
+      ? ["voice"]
+      : currentMode === "pip"
+        ? ["pip"]
+        : ["voice", "pip"]; // voice_pip 或默认
+
   /* ── 面板尺寸（宽度固定，高度由 useLayoutEffect 实测） ── */
   const PICKER_W = 240; // 面板宽度（与 CSS 一致）
   const GAP = 6; // 面板与"+"卡片的间距
@@ -109,14 +92,6 @@ const TimelinePanel: React.FC<TimelinePanelProps> = ({
 
   const handleTogglePicker = () => {
     if (!showAddPicker) {
-      // 打开面板时，默认选中当前模式下的第一个可用类型
-      const defaultType =
-        currentMode === "pip"
-          ? "pip"
-          : currentMode === "voice_over"
-            ? "voice"
-            : "voice";
-      setAddType(defaultType);
       updatePickerPosition();
     }
     setShowAddPicker((v) => !v);

apps/web/src/pages/generate/GeneratePage.tsx

@@ -25,11 +25,7 @@ import {
 } from "@ant-design/icons";
 import type { AssetItem } from "@/api/assets";
 import { getAssets, getAssetLibraries } from "@/api/assets";
-import {
-  createEditPlan,
-  generateEditPlan,
-  updateEditPlan,
-} from "@/api/editPlans";
+import { createEditPlan, generateEditPlan } from "@/api/editPlans";
 import { getEditingTemplates } from "@/api/editingPlanner";
 import { getTitles } from "@/api/titles";
 import apiClient from "@/api/client";
@@ -128,9 +124,9 @@ const GeneratePage: React.FC = () => {
   /* ── 标题 ── */
   const [title, setTitle] = useState("");
   const { data: userTitles = [] } = useQuery({
-    queryKey: ["titles"],
+    queryKey: ["generate-titles"],
     queryFn: () => getTitles(),
-    staleTime: 30_000,
+    staleTime: 60_000,
   });
   /* 当选中模板开启了「AI自动匹配标题」，自动填入模板预设标题 */
   useEffect(() => {
@@ -518,9 +514,6 @@ const GeneratePage: React.FC = () => {
         source_edit_plan_id: editPlanId || undefined,
       });
 
-      // 后端要求计划处于 editing 状态才能触发渲染，自动转换状态
-      await updateEditPlan(plan.id, { status: "editing" });
-
       await generateEditPlan(plan.id);
 
       const poll = async () => {
@@ -540,8 +533,7 @@ const GeneratePage: React.FC = () => {
           if (data.plan_status === "failed") {
             setGenerating(false);
             // 提取后端返回的错误详情，便于排查
-            // 注意：后端返回的 error_message/error/message 可能是对象而非字符串
-            const rawMsg =
+            const errorMsg =
               data.error_message ||
               data.error ||
               data.message ||
@@ -549,21 +541,6 @@ const GeneratePage: React.FC = () => {
                 (c: { status: string }) => c.status === "failed",
               )?.error_message ||
               "视频生成失败，请联系管理员或重试";
-            // 安全提取字符串：递归处理嵌套对象（后端可能返回 {code, message: {code, message}} 等嵌套结构）
-            const safeExtract = (val: unknown): string => {
-              if (typeof val === "string") return val;
-              if (typeof val === "object" && val !== null) {
-                const obj = val as Record<string, unknown>;
-                if (typeof obj.message === "string") return obj.message;
-                if (typeof obj.msg === "string") return obj.msg;
-                if (typeof obj.detail === "string") return obj.detail;
-                if (obj.message && typeof obj.message === "object")
-                  return safeExtract(obj.message);
-                return JSON.stringify(val);
-              }
-              return String(val ?? "");
-            };
-            const errorMsg = safeExtract(rawMsg);
             console.error("[生成失败] planId:", plan.id, "响应:", data);
             setGenerateError(errorMsg);
             message.error(errorMsg);
@@ -601,36 +578,19 @@ const GeneratePage: React.FC = () => {
       const axiosErr = err as {
         response?: {
           data?: {
-            message?: string | object;
-            error?: string | object;
-            detail?: string | object;
-            msg?: string | object;
+            message?: string;
+            error?: string;
+            detail?: string;
+            msg?: string;
           };
         };
         message?: string;
       };
-      // 安全提取错误消息：递归处理嵌套对象（后端可能返回 {code, message: {code, message}} 等）
-      const extractString = (val: unknown): string => {
-        if (typeof val === "string") return val;
-        if (typeof val === "object" && val !== null) {
-          const obj = val as Record<string, unknown>;
-          if (typeof obj.message === "string") return obj.message;
-          if (typeof obj.msg === "string") return obj.msg;
-          if (typeof obj.detail === "string") return obj.detail;
-          // 嵌套对象：递归提取
-          if (typeof obj.message === "object" && obj.message !== null)
-            return extractString(obj.message);
-          if (typeof obj.msg === "object" && obj.msg !== null)
-            return extractString(obj.msg);
-          return JSON.stringify(val);
-        }
-        return "";
-      };
       const backendMsg =
-        extractString(axiosErr.response?.data?.message) ||
-        extractString(axiosErr.response?.data?.error) ||
-        extractString(axiosErr.response?.data?.detail) ||
-        extractString(axiosErr.response?.data?.msg) ||
+        axiosErr.response?.data?.message ||
+        axiosErr.response?.data?.error ||
+        axiosErr.response?.data?.detail ||
+        axiosErr.response?.data?.msg ||
         axiosErr.message ||
         "";
       console.error(
@@ -639,71 +599,9 @@ const GeneratePage: React.FC = () => {
         "完整错误:",
         axiosErr,
       );
-      // 确保 errorMsg 一定是字符串（后端可能返回 {code, message} 嵌套对象）
-      const safeExtractErr = (val: unknown): string => {
-        if (typeof val === "string") return val;
-        if (typeof val === "object" && val !== null) {
-          const obj = val as Record<string, unknown>;
-          if (typeof obj.message === "string") return obj.message;
-          if (typeof obj.msg === "string") return obj.msg;
-          if (typeof obj.detail === "string") return obj.detail;
-          // 嵌套对象：递归提取
-          if (typeof obj.message === "object")
-            return safeExtractErr(obj.message);
-          return JSON.stringify(val);
-        }
-        return String(val ?? "");
-      };
-      const rawError = safeExtractErr(backendMsg);
-      // 将技术错误翻译为用户友好提示（不暴露状态机、字段名等内部概念）
-      const translateError = (msg: string): string => {
-        if (!msg) return "生成失败，请检查网络后重试或联系管理员";
-        // 状态机相关错误
-        if (
-          msg.includes("editing") ||
-          msg.includes("draft") ||
-          msg.includes("状态")
-        ) {
-          return "正在准备生成，请稍候再试";
-        }
-        // 参数校验错误
-        if (
-          msg.includes("template_id") ||
-          msg.includes("not found") ||
-          msg.includes("不存在")
-        ) {
-          return "所选模板或素材不可用，请重新选择";
-        }
-        if (
-          msg.includes("asset") &&
-          (msg.includes("not found") || msg.includes("missing"))
-        ) {
-          return "素材数据异常，请返回素材库重新检查";
-        }
-        // 网络/超时
-        if (
-          msg.includes("timeout") ||
-          msg.includes("network") ||
-          msg.includes("ECONN")
-        ) {
-          return "网络连接超时，请检查网络后重试";
-        }
-        // 配额/限制
-        if (
-          msg.includes("quota") ||
-          msg.includes("limit") ||
-          msg.includes("exceed")
-        ) {
-          return "已达到生成次数上限，请稍后再试或联系客服";
-        }
-        // 兜底：返回原始消息（如果已经是中文人话）或默认提示
-        if (msg.length > 0 && msg.length < 100 && !msg.includes("{"))
-          return msg;
-        return "生成失败，请稍后重试或联系管理员";
-      };
-      const finalMsg = translateError(rawError);
-      setGenerateError(finalMsg);
-      message.error(finalMsg);
+      const errorMsg = backendMsg || "生成失败，请检查网络后重试或联系管理员";
+      setGenerateError(errorMsg);
+      message.error(errorMsg);
     }
   }, [
     title,
@@ -1604,9 +1502,7 @@ const GeneratePage: React.FC = () => {
                   生成失败
                 </Text>
                 <Text style={{ color: "var(--text-secondary)", fontSize: 12 }}>
-                  {typeof generateError === "string"
-                    ? generateError
-                    : JSON.stringify(generateError)}
+                  {generateError}
                 </Text>
               </div>
             </div>

apps/web/src/pages/titles/TitleLibrary.tsx

@@ -2,11 +2,10 @@
  * 标题库页面 — V21 设计系统
  * 两栏布局：左侧分类列表（220px）+ 右侧标题卡片网格（3列）
  * 支持：标题卡片展示、AI 生成标题、复制/编辑/删除、收藏、分类筛选、搜索
- * 对接后端真实 API（GET/POST/PUT/DELETE /titles）
+ * 使用 mock 数据，后端 API 对接暂不要求
  */
 import React, { useMemo, useState, useCallback } from "react";
 import { Modal as AntModal, message, Popconfirm } from "antd";
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import {
   PlusOutlined,
   SearchOutlined,
@@ -20,13 +19,6 @@ import {
   FileTextOutlined,
 } from "@ant-design/icons";
 import { Button, Input, Select } from "@/components/ui";
-import {
-  getTitles,
-  createTitle,
-  updateTitle,
-  deleteTitle,
-  type TitleItem,
-} from "@/api/titles";
 import "./titles.css";
 
 /* ============================================================
@@ -64,16 +56,143 @@ const MOCK_CATEGORIES: CategoryItem[] = [
   { id: "cat-5", name: "教育学习", count: 2 },
 ];
 
-/** 后端 TitleItem → 前端 TitleData 映射 */
-const toTitleData = (item: TitleItem): TitleData => ({
-  id: item.id,
-  content: item.content,
-  type: (item.category as TitleType) || "normal",
-  industry: "general",
-  usageCount: 0,
-  isFavorited: false,
-  createdAt: item.created_at?.slice(0, 10) || "",
-});
+const MOCK_TITLES: TitleData[] = [
+  {
+    id: "t-1",
+    content: "这家隐藏在巷子里的小店，味道绝了！",
+    type: "hot",
+    industry: "food",
+    usageCount: 128,
+    isFavorited: true,
+    createdAt: "2026-06-28",
+  },
+  {
+    id: "t-2",
+    content: "2026 年最值得入手的 5 款蓝牙耳机",
+    type: "hot",
+    industry: "tech",
+    usageCount: 96,
+    isFavorited: false,
+    createdAt: "2026-06-27",
+  },
+  {
+    id: "t-3",
+    content: "周末在家做了一道妈妈的味道",
+    type: "normal",
+    industry: "food",
+    usageCount: 42,
+    isFavorited: false,
+    createdAt: "2026-06-26",
+  },
+  {
+    id: "t-4",
+    content: "用 AI 帮我写了一周的小红书文案，效果惊人",
+    type: "hot",
+    industry: "tech",
+    usageCount: 215,
+    isFavorited: true,
+    createdAt: "2026-06-25",
+  },
+  {
+    id: "t-5",
+    content: "今天穿了一套被路人要链接的衣服",
+    type: "creative",
+    industry: "beauty",
+    usageCount: 67,
+    isFavorited: false,
+    createdAt: "2026-06-24",
+  },
+  {
+    id: "t-6",
+    content: "分享我的早起 5 点俱乐部 30 天打卡体验",
+    type: "normal",
+    industry: "education",
+    usageCount: 38,
+    isFavorited: true,
+    createdAt: "2026-06-23",
+  },
+  {
+    id: "t-7",
+    content: "这个平价面霜居然比大牌还好用？",
+    type: "hot",
+    industry: "beauty",
+    usageCount: 183,
+    isFavorited: false,
+    createdAt: "2026-06-22",
+  },
+  {
+    id: "t-8",
+    content: "一个人的旅行也可以很精彩",
+    type: "normal",
+    industry: "travel",
+    usageCount: 55,
+    isFavorited: false,
+    createdAt: "2026-06-21",
+  },
+  {
+    id: "t-9",
+    content: "考研上岸！我的备考时间管理方法全公开",
+    type: "hot",
+    industry: "education",
+    usageCount: 147,
+    isFavorited: true,
+    createdAt: "2026-06-20",
+  },
+  {
+    id: "t-10",
+    content: "把旧 T 恤改造成时尚单品，零成本！",
+    type: "creative",
+    industry: "beauty",
+    usageCount: 29,
+    isFavorited: false,
+    createdAt: "2026-06-19",
+  },
+  {
+    id: "t-11",
+    content: "这家咖啡馆的氛围感也太好了吧",
+    type: "normal",
+    industry: "food",
+    usageCount: 74,
+    isFavorited: false,
+    createdAt: "2026-06-18",
+  },
+  {
+    id: "t-12",
+    content: "手机摄影技巧：拍出电影感画面",
+    type: "creative",
+    industry: "tech",
+    usageCount: 61,
+    isFavorited: false,
+    createdAt: "2026-06-17",
+  },
+  {
+    id: "t-13",
+    content: "带娃旅行必备清单，少带一样都崩溃",
+    type: "hot",
+    industry: "travel",
+    usageCount: 109,
+    isFavorited: false,
+    createdAt: "2026-06-16",
+  },
+  {
+    id: "t-14",
+    content: "30 天学会一门新语言？我的实验记录",
+    type: "creative",
+    industry: "education",
+    usageCount: 33,
+    isFavorited: false,
+    createdAt: "2026-06-15",
+  },
+  {
+    id: "t-15",
+    content: "今天做了一道让全家惊艳的菜",
+    type: "normal",
+    industry: "food",
+    usageCount: 48,
+    isFavorited: false,
+    createdAt: "2026-06-14",
+  },
+];
 
 /* ============================================================
  * 工具函数
@@ -248,48 +367,12 @@ const TitleCard: React.FC<{
  * 主组件
  * ============================================================ */
 const TitleLibrary: React.FC = () => {
-  const queryClient = useQueryClient();
-
   /* 分类数据 */
   const [categories, setCategories] = useState<CategoryItem[]>(MOCK_CATEGORIES);
   const [activeCatId, setActiveCatId] = useState<string>(MOCK_CATEGORIES[0].id);
 
-  /* 标题数据 — 真实 API */
-  const { data: apiTitles = [] } = useQuery({
-    queryKey: ["titles"],
-    queryFn: getTitles,
-    staleTime: 30_000,
-  });
-  const titles: TitleData[] = useMemo(
-    () => apiTitles.map(toTitleData),
-    [apiTitles],
-  );
-
-  /* CRUD mutations */
-  const createMutation = useMutation({
-    mutationFn: (content: string) => createTitle({ content }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["titles"] });
-    },
-    onError: () => message.error("创建标题失败"),
-  });
-
-  const updateMutation = useMutation({
-    mutationFn: ({ id, content }: { id: string; content: string }) =>
-      updateTitle(id, { content }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["titles"] });
-    },
-    onError: () => message.error("更新标题失败"),
-  });
-
-  const deleteMutation = useMutation({
-    mutationFn: (id: string) => deleteTitle(id),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["titles"] });
-    },
-    onError: () => message.error("删除标题失败"),
-  });
+  /* 标题数据 */
+  const [titles, setTitles] = useState<TitleData[]>(MOCK_TITLES);
 
   /* 筛选 */
   const [searchText, setSearchText] = useState("");
@@ -380,9 +463,13 @@ const TitleLibrary: React.FC = () => {
     searchText,
   ]);
 
-  /* 收藏切换（暂不支持，待后端 API） */
-  const handleToggleFavorite = useCallback((_id: string) => {
-    message.info("收藏功能即将上线");
+  /* 收藏切换 */
+  const handleToggleFavorite = useCallback((id: string) => {
+    setTitles((prev) =>
+      prev.map((t) =>
+        t.id === id ? { ...t, isFavorited: !t.isFavorited } : t,
+      ),
+    );
   }, []);
 
   /* 复制 */
@@ -406,13 +493,15 @@ const TitleLibrary: React.FC = () => {
       message.warning("标题内容不能为空");
       return;
     }
-    if (editingId) {
-      updateMutation.mutate({ id: editingId, content: editText.trim() });
-    }
+    setTitles((prev) =>
+      prev.map((t) =>
+        t.id === editingId ? { ...t, content: editText.trim() } : t,
+      ),
+    );
     setEditingId(null);
     setEditText("");
     message.success("标题已更新");
-  }, [editingId, editText, updateMutation]);
+  }, [editingId, editText]);
 
   const handleCancelEdit = useCallback(() => {
     setEditingId(null);
@@ -420,13 +509,10 @@ const TitleLibrary: React.FC = () => {
   }, []);
 
   /* 删除 */
-  const handleDelete = useCallback(
-    (id: string) => {
-      deleteMutation.mutate(id);
-      message.success("标题已删除");
-    },
-    [deleteMutation],
-  );
+  const handleDelete = useCallback((id: string) => {
+    setTitles((prev) => prev.filter((t) => t.id !== id));
+    message.success("标题已删除");
+  }, []);
 
   /* 新建分类 */
   const handleCreateCategory = () => {
@@ -461,14 +547,20 @@ const TitleLibrary: React.FC = () => {
       message.warning("请输入标题内容");
       return;
     }
-    createMutation.mutate(newTitleContent.trim(), {
-      onSuccess: () => {
-        setCreateTitleModalOpen(false);
-        setNewTitleContent("");
-        setNewTitleType("normal");
-        message.success("标题创建成功");
-      },
-    });
+    const title: TitleData = {
+      id: `t-${Date.now()}`,
+      content: newTitleContent.trim(),
+      type: newTitleType,
+      industry: "general",
+      usageCount: 0,
+      isFavorited: false,
+      createdAt: new Date().toISOString().slice(0, 10),
+    };
+    setTitles((prev) => [title, ...prev]);
+    setCreateTitleModalOpen(false);
+    setNewTitleContent("");
+    setNewTitleType("normal");
+    message.success("标题创建成功");
   };
 
   /* AI 生成标题 */
@@ -497,11 +589,17 @@ const TitleLibrary: React.FC = () => {
 
   /* 采纳 AI 生成的标题 */
   const handleAdoptAITitle = (text: string) => {
-    createMutation.mutate(text, {
-      onSuccess: () => {
-        message.success("标题已采纳并添加到标题库");
-      },
-    });
+    const title: TitleData = {
+      id: `t-${Date.now()}`,
+      content: text,
+      type: "creative",
+      industry: "general",
+      usageCount: 0,
+      isFavorited: false,
+      createdAt: new Date().toISOString().slice(0, 10),
+    };
+    setTitles((prev) => [title, ...prev]);
+    message.success("标题已采纳并添加到标题库");
   };
 
   /* 复制 AI 生成的标题 */

apps/web/src/pages/voices/VoiceLibrary.tsx

@@ -30,7 +30,6 @@ import {
   ReloadOutlined,
   CloseCircleOutlined,
 } from "@ant-design/icons";
-import { Modal, Upload, message } from "antd";
 import { Button, Input, Select, Tooltip } from "@/components/ui";
 import PageHead from "@/components/layout/PageHead";
 import {
@@ -45,12 +44,6 @@ import {
   toVoiceClone,
   type VoiceClone,
 } from "@/api/voiceClone";
-import { synthesizeSpeech, getTTSJobStatus, saveTtsToLibrary } from "@/api/tts";
-import {
-  uploadAssetDirect,
-  getAssetLibraries,
-  createAsset,
-} from "@/api/assets";
 import CloneModal from "@/components/voice/CloneModal";
 import "./voices.css";
 
@@ -600,41 +593,6 @@ const CloneCardSkeleton: React.FC = () => (
   </div>
 );
 
-/* ── 辅助函数 ─────────────────────────────────────────── */
-
-const formatFileSize = (bytes: number): string => {
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
-};
-
-const getAudioDuration = (file: File): Promise<number> =>
-  new Promise((resolve) => {
-    const audio = new Audio();
-    const url = URL.createObjectURL(file);
-    audio.addEventListener("loadedmetadata", () => {
-      resolve(audio.duration);
-      URL.revokeObjectURL(url);
-    });
-    audio.addEventListener("error", () => {
-      resolve(0);
-      URL.revokeObjectURL(url);
-    });
-    audio.src = url;
-  });
-
-const buildVoiceMetadata = (data: {
-  gender?: string;
-  description?: string;
-  duration?: number;
-}): Record<string, unknown> => {
-  const metadata: Record<string, unknown> = {};
-  if (data.gender) metadata.gender = data.gender;
-  if (data.description) metadata.description = data.description;
-  if (data.duration) metadata.duration = Math.round(data.duration);
-  return metadata;
-};
-
 /* ============================================================
  * 主组件
  * ============================================================ */
@@ -655,27 +613,6 @@ const VoiceLibrary: React.FC = () => {
   const [toasts, setToasts] = useState<Toast[]>([]);
   const [cloneModalOpen, setCloneModalOpen] = useState(false);
 
-  /* ── 上传音频弹窗状态 ── */
-  const [uploadOpen, setUploadOpen] = useState(false);
-  const [uploadFile, setUploadFile] = useState<File | null>(null);
-  const [uploadName, setUploadName] = useState("");
-  const [uploadGender, setUploadGender] = useState<VoiceGender>("female");
-  const [uploadDesc, setUploadDesc] = useState("");
-  const [uploadProgress, setUploadProgress] = useState<number | null>(null);
-
-  /* ── AI 配音弹窗状态 ── */
-  const [ttsOpen, setTtsOpen] = useState(false);
-  const [ttsText, setTtsText] = useState("");
-  const [ttsVoiceId, setTtsVoiceId] = useState<string>("");
-  const [ttsSpeed, setTtsSpeed] = useState(1.0);
-  const [ttsJobId, setTtsJobId] = useState<string | null>(null);
-  const [ttsStatus, setTtsStatus] = useState<
-    "idle" | "synthesizing" | "done" | "error"
-  >("idle");
-  const [ttsAudioUrl, setTtsAudioUrl] = useState<string | null>(null);
-  const [ttsError, setTtsError] = useState<string | null>(null);
-  const ttsTimerRef = useRef<ReturnType<typeof setInterval> | null>(null);
-
   const showToast = useCallback((message: string, type: Toast["type"]) => {
     const id = ++toastIdSeq;
     setToasts((prev) => [...prev, { id, message, type }]);
@@ -708,130 +645,6 @@ const VoiceLibrary: React.FC = () => {
     },
   });
 
-  /* ── 上传音频 mutation ── */
-  const uploadMutation = useMutation({
-    mutationFn: async (data: {
-      file: File;
-      name: string;
-      gender: VoiceGender;
-      description: string;
-    }) => {
-      setUploadProgress(0);
-      try {
-        /* 获取或创建默认配音素材库 */
-        const libs = await queryClient.fetchQuery({
-          queryKey: ["asset-libraries"],
-          queryFn: getAssetLibraries,
-        });
-        const lib = libs.find((l) => l.kind === "voice");
-        if (!lib) throw new Error("配音素材库不存在，请先在配音素材库页面创建");
-
-        /* 直传文件 */
-        const { storage_key } = await uploadAssetDirect({
-          file: data.file,
-          library_id: lib.id,
-          onProgress: (p) => setUploadProgress(p),
-        });
-
-        /* 获取音频时长 */
-        const duration = await getAudioDuration(data.file);
-
-        /* 创建素材记录 */
-        await createAsset({
-          library_id: lib.id,
-          name: data.name,
-          storage_key,
-          mime_type: data.file.type || "audio/mpeg",
-          metadata: buildVoiceMetadata({
-            gender: data.gender,
-            description: data.description,
-            duration,
-          }),
-        });
-      } finally {
-        setUploadProgress(null);
-      }
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["assets", "voice"] });
-      setUploadOpen(false);
-      setUploadFile(null);
-      setUploadName("");
-      setUploadDesc("");
-      showToast("上传成功", "success");
-    },
-    onError: (err: Error) => {
-      showToast(err.message || "上传失败，请重试", "error");
-    },
-  });
-
-  /* ── TTS 合成 ── */
-  const handleTtsSynthesize = useCallback(async () => {
-    if (!ttsText.trim()) {
-      message.warning("请输入要合成的文本");
-      return;
-    }
-    setTtsError(null);
-    setTtsStatus("synthesizing");
-    setTtsAudioUrl(null);
-    setTtsJobId(null);
-    try {
-      const resp = await synthesizeSpeech({
-        text: ttsText.trim(),
-        voice_id: ttsVoiceId || undefined,
-        speed: ttsSpeed,
-      });
-      setTtsJobId(resp.job_id);
-      /* 轮询状态 */
-      ttsTimerRef.current = setInterval(async () => {
-        try {
-          const job = await getTTSJobStatus(resp.job_id);
-          if (job.status === "completed") {
-            clearInterval(ttsTimerRef.current!);
-            ttsTimerRef.current = null;
-            setTtsStatus("done");
-            setTtsAudioUrl(job.output_audio_url);
-          } else if (job.status === "failed") {
-            clearInterval(ttsTimerRef.current!);
-            ttsTimerRef.current = null;
-            setTtsStatus("error");
-            setTtsError(job.error_message || "合成失败");
-          }
-        } catch {
-          clearInterval(ttsTimerRef.current!);
-          ttsTimerRef.current = null;
-          setTtsStatus("error");
-          setTtsError("查询合成状态失败");
-        }
-      }, 2000);
-    } catch (err: unknown) {
-      const msg = err instanceof Error ? err.message : "合成请求失败";
-      setTtsStatus("error");
-      setTtsError(msg);
-    }
-  }, [ttsText, ttsVoiceId, ttsSpeed]);
-
-  /* ── TTS 保存到素材库 ── */
-  const handleTtsSave = useCallback(async () => {
-    if (!ttsJobId) return;
-    try {
-      await saveTtsToLibrary(ttsJobId, { name: ttsText.slice(0, 50) });
-      queryClient.invalidateQueries({ queryKey: ["assets", "voice"] });
-      showToast("已保存到配音素材库", "success");
-      setTtsOpen(false);
-    } catch (err: unknown) {
-      const msg = err instanceof Error ? err.message : "保存失败";
-      showToast(msg, "error");
-    }
-  }, [ttsJobId, ttsText, queryClient, showToast]);
-
-  /* ── TTS 定时器清理 ── */
-  useEffect(() => {
-    return () => {
-      if (ttsTimerRef.current) clearInterval(ttsTimerRef.current);
-    };
-  }, []);
-
   /* ── 数据查询（任务 3.11：替换 Mock） ──────────────── */
 
   /** 预置音色列表 */
@@ -975,12 +788,7 @@ const VoiceLibrary: React.FC = () => {
 
   const pageActions = (
     <div className="xx-voices-actions">
-      <Button
-        buttonType="ghost"
-        buttonSize="sm"
-        icon={<UploadOutlined />}
-        onClick={() => setUploadOpen(true)}
-      >
+      <Button buttonType="ghost" buttonSize="sm" icon={<UploadOutlined />}>
         上传音频
       </Button>
       <Button
@@ -991,12 +799,7 @@ const VoiceLibrary: React.FC = () => {
       >
         克隆音色
       </Button>
-      <Button
-        buttonType="primary"
-        buttonSize="sm"
-        icon={<RobotOutlined />}
-        onClick={() => setTtsOpen(true)}
-      >
+      <Button buttonType="primary" buttonSize="sm" icon={<RobotOutlined />}>
         AI 配音
       </Button>
     </div>
@@ -1205,544 +1008,6 @@ const VoiceLibrary: React.FC = () => {
         />
       )}
 
-      {/* ── 上传音频弹窗 ── */}
-      <Modal
-        title="上传音频"
-        open={uploadOpen}
-        onCancel={() => {
-          if (uploadProgress !== null) return; // 上传中不可关闭
-          setUploadOpen(false);
-          setUploadFile(null);
-          setUploadName("");
-          setUploadDesc("");
-        }}
-        footer={null}
-        width={520}
-        maskClosable={uploadProgress === null}
-      >
-        <div
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            gap: 16,
-            padding: "8px 0",
-          }}
-        >
-          {/* 拖拽上传区 */}
-          <Upload.Dragger
-            accept="audio/*"
-            maxCount={1}
-            beforeUpload={(file) => {
-              setUploadFile(file);
-              if (!uploadName) setUploadName(file.name.replace(/\.[^.]+$/, ""));
-              return false;
-            }}
-            onRemove={() => {
-              setUploadFile(null);
-              setUploadProgress(null);
-            }}
-            showUploadList={false}
-            disabled={uploadProgress !== null}
-          >
-            <p
-              style={{
-                fontSize: 32,
-                color: "var(--primary-color)",
-                marginBottom: 8,
-              }}
-            >
-              <UploadOutlined />
-            </p>
-            <p style={{ fontSize: 14, fontWeight: 500, margin: "0 0 4px" }}>
-              点击或拖拽音频文件到此处
-            </p>
-            <p
-              style={{
-                fontSize: 12,
-                color: "var(--text-secondary)",
-                margin: 0,
-              }}
-            >
-              支持 MP3、WAV、AAC、FLAC 等格式，最大 200MB
-            </p>
-          </Upload.Dragger>
-
-          {/* 已选文件信息 */}
-          {uploadFile && (
-            <div
-              style={{
-                padding: "10px 12px",
-                background: "var(--bg-secondary)",
-                borderRadius: 8,
-                display: "flex",
-                alignItems: "center",
-                gap: 10,
-              }}
-            >
-              <SoundOutlined
-                style={{ fontSize: 18, color: "var(--primary-color)" }}
-              />
-              <div style={{ flex: 1, minWidth: 0 }}>
-                <div
-                  style={{
-                    fontSize: 13,
-                    fontWeight: 500,
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
-                >
-                  {uploadFile.name}
-                </div>
-                <div style={{ fontSize: 11, color: "var(--text-secondary)" }}>
-                  {formatFileSize(uploadFile.size)}
-                </div>
-              </div>
-            </div>
-          )}
-
-          {/* 上传进度 */}
-          {uploadProgress !== null && (
-            <div style={{ textAlign: "center", padding: "8px 0" }}>
-              <div
-                style={{
-                  fontSize: 22,
-                  fontWeight: 700,
-                  color: "var(--primary-color)",
-                }}
-              >
-                {uploadProgress}%
-              </div>
-              <div style={{ fontSize: 12, color: "var(--text-secondary)" }}>
-                {uploadProgress < 100 ? "上传中..." : "处理中..."}
-              </div>
-              <div
-                style={{
-                  height: 4,
-                  background: "var(--bg-tertiary)",
-                  borderRadius: 2,
-                  marginTop: 8,
-                  overflow: "hidden",
-                }}
-              >
-                <div
-                  style={{
-                    height: "100%",
-                    width: `${uploadProgress}%`,
-                    background: "var(--primary-color)",
-                    borderRadius: 2,
-                    transition: "width 0.3s ease",
-                  }}
-                />
-              </div>
-            </div>
-          )}
-
-          {/* 名称 */}
-          <div>
-            <div
-              style={{
-                fontSize: 13,
-                color: "var(--text-secondary)",
-                marginBottom: 6,
-              }}
-            >
-              素材名称
-            </div>
-            <input
-              value={uploadName}
-              onChange={(e) => setUploadName(e.target.value)}
-              placeholder="输入素材名称"
-              maxLength={100}
-              disabled={uploadProgress !== null}
-              style={{
-                width: "100%",
-                padding: "8px 12px",
-                border: "1px solid var(--border-color)",
-                borderRadius: 8,
-                fontSize: 13,
-                background: "var(--bg-primary)",
-                color: "var(--text-primary)",
-                outline: "none",
-              }}
-            />
-          </div>
-
-          {/* 性别选择 */}
-          <div>
-            <div
-              style={{
-                fontSize: 13,
-                color: "var(--text-secondary)",
-                marginBottom: 6,
-              }}
-            >
-              音色性别
-            </div>
-            <div style={{ display: "flex", gap: 8 }}>
-              {(["female", "male", "child"] as VoiceGender[]).map((g) => (
-                <button
-                  key={g}
-                  type="button"
-                  onClick={() => setUploadGender(g)}
-                  disabled={uploadProgress !== null}
-                  style={{
-                    flex: 1,
-                    padding: "6px 0",
-                    borderRadius: 8,
-                    border: `1px solid ${uploadGender === g ? "var(--primary-color)" : "var(--border-color)"}`,
-                    background:
-                      uploadGender === g
-                        ? "var(--primary-soft)"
-                        : "transparent",
-                    color:
-                      uploadGender === g
-                        ? "var(--primary-color)"
-                        : "var(--text-secondary)",
-                    fontSize: 13,
-                    fontWeight: uploadGender === g ? 600 : 400,
-                    cursor: uploadProgress !== null ? "not-allowed" : "pointer",
-                    transition: "all 0.2s",
-                  }}
-                >
-                  {g === "female" ? "女声" : g === "male" ? "男声" : "童声"}
-                </button>
-              ))}
-            </div>
-          </div>
-
-          {/* 描述 */}
-          <div>
-            <div
-              style={{
-                fontSize: 13,
-                color: "var(--text-secondary)",
-                marginBottom: 6,
-              }}
-            >
-              音色描述（可选）
-            </div>
-            <textarea
-              value={uploadDesc}
-              onChange={(e) => setUploadDesc(e.target.value)}
-              placeholder="描述这个音色的特点..."
-              maxLength={500}
-              rows={2}
-              disabled={uploadProgress !== null}
-              style={{
-                width: "100%",
-                padding: "8px 12px",
-                border: "1px solid var(--border-color)",
-                borderRadius: 8,
-                fontSize: 13,
-                background: "var(--bg-primary)",
-                color: "var(--text-primary)",
-                outline: "none",
-                resize: "vertical",
-                fontFamily: "inherit",
-              }}
-            />
-          </div>
-
-          {/* 操作按钮 */}
-          <div
-            style={{
-              display: "flex",
-              justifyContent: "flex-end",
-              gap: 10,
-              paddingTop: 4,
-            }}
-          >
-            <button
-              type="button"
-              onClick={() => {
-                setUploadOpen(false);
-                setUploadFile(null);
-                setUploadName("");
-                setUploadDesc("");
-              }}
-              disabled={uploadProgress !== null}
-              style={{
-                padding: "8px 20px",
-                borderRadius: 8,
-                border: "1px solid var(--border-color)",
-                background: "transparent",
-                fontSize: 13,
-                cursor: uploadProgress !== null ? "not-allowed" : "pointer",
-                color: "var(--text-secondary)",
-              }}
-            >
-              取消
-            </button>
-            <button
-              type="button"
-              onClick={() => {
-                if (!uploadFile) {
-                  message.warning("请先选择音频文件");
-                  return;
-                }
-                if (!uploadName.trim()) {
-                  message.warning("请输入素材名称");
-                  return;
-                }
-                uploadMutation.mutate({
-                  file: uploadFile,
-                  name: uploadName.trim(),
-                  gender: uploadGender,
-                  description: uploadDesc.trim(),
-                });
-              }}
-              disabled={
-                !uploadFile || !uploadName.trim() || uploadProgress !== null
-              }
-              style={{
-                padding: "8px 20px",
-                borderRadius: 8,
-                border: "none",
-                background:
-                  !uploadFile || !uploadName.trim() || uploadProgress !== null
-                    ? "var(--text-tertiary)"
-                    : "var(--primary-color)",
-                color: "#fff",
-                fontSize: 13,
-                fontWeight: 600,
-                cursor:
-                  !uploadFile || !uploadName.trim() || uploadProgress !== null
-                    ? "not-allowed"
-                    : "pointer",
-              }}
-            >
-              {uploadProgress !== null ? "上传中..." : "开始上传"}
-            </button>
-          </div>
-        </div>
-      </Modal>
-
-      {/* ── AI 配音弹窗 ── */}
-      <Modal
-        title="AI 配音"
-        open={ttsOpen}
-        onCancel={() => {
-          setTtsOpen(false);
-          setTtsText("");
-          setTtsVoiceId("");
-          setTtsSpeed(1.0);
-          setTtsStatus("idle");
-          setTtsAudioUrl(null);
-          setTtsError(null);
-          setTtsJobId(null);
-        }}
-        footer={null}
-        width={560}
-      >
-        <div
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            gap: 16,
-            padding: "8px 0",
-          }}
-        >
-          {/* 文本输入 */}
-          <div>
-            <div
-              style={{
-                fontSize: 13,
-                color: "var(--text-secondary)",
-                marginBottom: 6,
-              }}
-            >
-              输入文本
-            </div>
-            <textarea
-              value={ttsText}
-              onChange={(e) => setTtsText(e.target.value)}
-              placeholder="输入要配音的文本内容..."
-              maxLength={2000}
-              rows={4}
-              style={{
-                width: "100%",
-                padding: "10px 12px",
-                border: "1px solid var(--border-color)",
-                borderRadius: 8,
-                fontSize: 13,
-                background: "var(--bg-primary)",
-                color: "var(--text-primary)",
-                outline: "none",
-                resize: "vertical",
-                fontFamily: "inherit",
-                lineHeight: 1.6,
-              }}
-            />
-            <div
-              style={{
-                fontSize: 11,
-                color: "var(--text-tertiary)",
-                textAlign: "right",
-                marginTop: 4,
-              }}
-            >
-              {ttsText.length}/2000
-            </div>
-          </div>
-
-          {/* 音色选择 */}
-          <div>
-            <div
-              style={{
-                fontSize: 13,
-                color: "var(--text-secondary)",
-                marginBottom: 6,
-              }}
-            >
-              选择音色
-            </div>
-            <select
-              value={ttsVoiceId}
-              onChange={(e) => setTtsVoiceId(e.target.value)}
-              style={{
-                width: "100%",
-                padding: "8px 12px",
-                border: "1px solid var(--border-color)",
-                borderRadius: 8,
-                fontSize: 13,
-                background: "var(--bg-primary)",
-                color: "var(--text-primary)",
-                outline: "none",
-              }}
-            >
-              <option value="">默认音色</option>
-              {presetVoices.map((v) => (
-                <option key={v.id} value={v.id}>
-                  {v.name} — {genderLabel(v.gender)}
-                </option>
-              ))}
-            </select>
-          </div>
-
-          {/* 语速 */}
-          <div>
-            <div
-              style={{
-                fontSize: 13,
-                color: "var(--text-secondary)",
-                marginBottom: 6,
-              }}
-            >
-              语速：{ttsSpeed.toFixed(1)}x
-            </div>
-            <input
-              type="range"
-              min={0.5}
-              max={2.0}
-              step={0.1}
-              value={ttsSpeed}
-              onChange={(e) => setTtsSpeed(parseFloat(e.target.value))}
-              style={{ width: "100%", accentColor: "var(--primary-color)" }}
-            />
-            <div
-              style={{
-                display: "flex",
-                justifyContent: "space-between",
-                fontSize: 11,
-                color: "var(--text-tertiary)",
-              }}
-            >
-              <span>0.5x</span>
-              <span>1.0x</span>
-              <span>2.0x</span>
-            </div>
-          </div>
-
-          {/* 合成按钮 */}
-          <button
-            type="button"
-            onClick={handleTtsSynthesize}
-            disabled={ttsStatus === "synthesizing" || !ttsText.trim()}
-            style={{
-              width: "100%",
-              padding: "10px 0",
-              borderRadius: 8,
-              border: "none",
-              background:
-                ttsStatus === "synthesizing" || !ttsText.trim()
-                  ? "var(--text-tertiary)"
-                  : "var(--primary-color)",
-              color: "#fff",
-              fontSize: 14,
-              fontWeight: 600,
-              cursor:
-                ttsStatus === "synthesizing" || !ttsText.trim()
-                  ? "not-allowed"
-                  : "pointer",
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-              gap: 8,
-            }}
-          >
-            <RobotOutlined />
-            {ttsStatus === "synthesizing" ? "合成中..." : "开始合成"}
-          </button>
-
-          {/* 错误提示 */}
-          {ttsError && (
-            <div
-              style={{
-                padding: "10px 12px",
-                background: "var(--error-soft, #fff2f0)",
-                borderRadius: 8,
-                color: "var(--error-color, #ff4d4f)",
-                fontSize: 13,
-              }}
-            >
-              {ttsError}
-            </div>
-          )}
-
-          {/* 合成结果 */}
-          {ttsStatus === "done" && ttsAudioUrl && (
-            <div
-              style={{
-                padding: 12,
-                background: "var(--bg-secondary)",
-                borderRadius: 8,
-                display: "flex",
-                flexDirection: "column",
-                gap: 10,
-              }}
-            >
-              <div
-                style={{
-                  fontSize: 13,
-                  fontWeight: 500,
-                  color: "var(--success-color, #52c41a)",
-                }}
-              >
-                ✅ 合成完成
-              </div>
-              <audio controls src={ttsAudioUrl} style={{ width: "100%" }} />
-              <button
-                type="button"
-                onClick={handleTtsSave}
-                style={{
-                  padding: "8px 0",
-                  borderRadius: 8,
-                  border: "1px solid var(--primary-color)",
-                  background: "var(--primary-soft)",
-                  color: "var(--primary-color)",
-                  fontSize: 13,
-                  fontWeight: 600,
-                  cursor: "pointer",
-                }}
-              >
-                保存到配音素材库
-              </button>
-            </div>
-          )}
-        </div>
-      </Modal>
-
       {/* Toast 提示 */}
       {toasts.length > 0 && (
         <div className="vc-toast-container">

apps/web/vitest.config.ts

@@ -11,6 +11,12 @@ export default defineConfig({
     globals: true,
     environment: "jsdom",
     setupFiles: "./src/test/setup.ts",
+    exclude: [
+      "node_modules",
+      "e2e",
+      "dist",
+      "build",
+    ],
     coverage: {
       provider: "v8",
       reporter: ["text", "json", "html"],

apps/worker/video_processing/__init__.py

@@ -1,17 +1,7 @@
 """
 视频处理模块
-
-轻量工具（ffmpeg_utils / oss_helpers / dedup_helpers）顶层直接导出，
-无额外依赖。渲染相关组件（UnifiedRenderService / RenderAdapter /
-VideoProcessor 等）按需从子模块导入，避免 __init__ 阶段引入
-packages / DB 等重依赖。
 """
 
-# 共享工具模块（零外部依赖，供 editing_modes / generation / edit_plan_generation 等复用）
-from . import dedup_helpers, ffmpeg_utils, oss_helpers
+from .processor import VideoProcessor, VideoResult
 
-__all__ = [
-    "ffmpeg_utils",
-    "oss_helpers",
-    "dedup_helpers",
-]
+__all__ = ["VideoProcessor", "VideoResult"]

apps/worker/video_processing/dedup.py

@@ -93,16 +93,12 @@ class VideoFingerprint:
     resolution: tuple[int, int]
 
     def to_dict(self) -> dict:
-        # 注意：color_histograms 里的值可能是 np.float32（来自 cv2.normalize），
-        # 直接存进 dict 后 SQLAlchemy JSON 序列化会报 "float32 is not JSON serializable"。
-        # 这里统一转成 Python 原生 float。
-        native_histograms = [[float(v) for v in hist] for hist in self.color_histograms]
         return {
             "md5": self.md5,
             "keyframe_phashes": self.keyframe_phashes,
-            "color_histograms": native_histograms,
-            "duration": float(self.duration),
-            "resolution": [int(self.resolution[0]), int(self.resolution[1])],
+            "color_histograms": self.color_histograms,
+            "duration": self.duration,
+            "resolution": list(self.resolution),
         }
 
 

apps/worker/video_processing/dedup_helpers.py

@@ -1,126 +0,0 @@
-"""查重辅助函数 — 从 generation.py 提取的 GeneratedVideo 记录 + 查重逻辑.
-
-供 render_edit_plan 和 generate_video 共同复用，
-创建 GeneratedVideo 记录后计算指纹并执行项目级 + 批次内查重。
-"""
-
-from __future__ import annotations
-
-import logging
-from uuid import uuid4
-
-from sqlalchemy.orm import Session
-
-logger = logging.getLogger(__name__)
-
-
-def create_video_record_and_dedup(
-    *,
-    generation_task_id: str,
-    project_id: str,
-    batch_id: str,
-    file_url: str,
-    file_size: int,
-    duration: float,
-    video_path: str,
-    mode: str,
-    session: Session,
-    width: int = 1280,
-    height: int = 720,
-    fps: float = 25.0,
-) -> int:
-    """创建 GeneratedVideo 记录，计算指纹并执行查重（历史 + 批次）。
-
-    Args:
-        generation_task_id: 生成任务 ID
-        project_id: 项目 ID
-        batch_id: 批次 ID（可为空字符串）
-        file_url: 视频文件 URL
-        file_size: 文件大小（字节）
-        duration: 视频时长（秒）
-        video_path: 视频本地路径（用于计算指纹）
-        mode: 剪辑模式名称
-        session: 数据库会话
-        width: 视频宽度
-        height: 视频高度
-        fps: 视频帧率
-
-    Returns:
-        创建的视频记录数量（1 表示成功，0 表示失败）
-    """
-    from video_processing.dedup import VideoDeduplicator
-
-    from packages.adapters.sqlalchemy_impl.generated_video_repository import (
-        SQLAlchemyGeneratedVideoRepository,
-    )
-    from packages.domain import GeneratedVideo
-
-    try:
-        video_id = uuid4().hex
-        generated_video = GeneratedVideo(
-            id=video_id,
-            project_id=project_id,
-            generation_task_id=generation_task_id,
-            name=f"generated-{generation_task_id[:8]}.mp4",
-            file_url=file_url,
-            file_size=file_size,
-            duration=duration,
-            width=width,
-            height=height,
-            fps=fps,
-            status="completed",
-            generation_params={"mode": mode},
-        )
-
-        video_repo = SQLAlchemyGeneratedVideoRepository(session)
-        video_repo.create(generated_video)
-
-        # 计算视频指纹
-        deduplicator = VideoDeduplicator()
-        try:
-            fingerprint = deduplicator.compute_fingerprint(video_path)
-        except Exception as fp_err:
-            logger.warning("Fingerprint computation failed for %s: %s", video_id, fp_err)
-            session.commit()
-            return 1
-
-        generated_video.video_fingerprint = fingerprint.to_dict()
-
-        # (a) 历史成片查重
-        duplicate_result = deduplicator.check_duplicate(fingerprint, project_id, session)
-
-        # (b) 批次内查重（仅当有 batch_id 时）
-        if not duplicate_result and batch_id:
-            duplicate_result = deduplicator.check_batch_duplicate(fingerprint, batch_id, video_id, session)
-
-        if duplicate_result:
-            generated_video.is_duplicate = True
-            generated_video.duplicate_of = duplicate_result["duplicate_of"]
-            logger.info(
-                "Duplicate detected: %s -> %s (reason=%s, similarity=%.3f)",
-                video_id,
-                duplicate_result["duplicate_of"],
-                duplicate_result["reason"],
-                duplicate_result["similarity"],
-            )
-        else:
-            generated_video.is_duplicate = False
-            generated_video.duplicate_of = None
-
-        video_repo.update(generated_video)
-        session.commit()
-        logger.info(
-            "GeneratedVideo record created: %s (task=%s, dup=%s)",
-            video_id,
-            generation_task_id,
-            generated_video.is_duplicate,
-        )
-        return 1
-    except Exception as e:
-        logger.error(
-            "Failed to create video record / dedup for task %s: %s",
-            generation_task_id,
-            e,
-        )
-        session.rollback()
-        return 0

apps/worker/video_processing/editing_modes.py

@@ -0,0 +1,700 @@
+"""
+视频剪辑模式处理器
+支持四种剪辑模式：一镜到底、画中画、口播、口播+画中画
+"""
+
+import logging
+import os
+import subprocess
+import sys
+import tempfile
+from dataclasses import dataclass
+
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+    from enum import Enum
+
+    class StrEnum(str, Enum):
+        pass
+
+
+from pathlib import Path
+from typing import Optional
+
+logger = logging.getLogger(__name__)
+
+
+# 从 domain 层导入 EditingMode，避免重复定义
+from packages.domain.editing_mode import EditingMode
+
+
+class PIPPosition(StrEnum):
+    """画中画位置枚举"""
+
+    TOP_LEFT = "top_left"
+    TOP_RIGHT = "top_right"
+    BOTTOM_LEFT = "bottom_left"
+    BOTTOM_RIGHT = "bottom_right"
+
+
+@dataclass
+class EditingModeConfig:
+    """剪辑模式配置"""
+
+    mode: EditingMode
+    output_width: int = 1280
+    output_height: int = 720
+    output_fps: int = 25
+    pip_position: PIPPosition = PIPPosition.TOP_RIGHT
+    pip_scale: float = 0.25  # 画中画占主画面的比例
+    transition_duration: float = 0.5  # 转场时长（秒）
+    output_codec: str = "libx264"
+    output_preset: str = "medium"
+    output_crf: int = 23
+
+
+class EditingModeProcessor:
+    """剪辑模式处理器"""
+
+    def __init__(self, config: EditingModeConfig, work_dir: Optional[str] = None):
+        """
+        初始化剪辑模式处理器
+
+        Args:
+            config: 剪辑模式配置
+            work_dir: 工作目录，默认使用系统临时目录
+        """
+        self.config = config
+        self.work_dir = work_dir or tempfile.gettempdir()
+        self._ffmpeg_bin = "ffmpeg"
+        self._ffprobe_bin = "ffprobe"
+
+    def process(
+        self,
+        video_paths: list[str],
+        audio_path: Optional[str] = None,
+        output_path: Optional[str] = None,
+    ) -> str:
+        """
+        根据模式处理视频，返回输出文件路径
+
+        Args:
+            video_paths: 视频素材路径列表
+            audio_path: 音频路径（用于口播模式）
+            output_path: 输出文件路径，默认自动生成
+
+        Returns:
+            输出文件路径
+        """
+        if not video_paths:
+            raise ValueError("video_paths cannot be empty")
+
+        self._validate_inputs(video_paths, audio_path)
+
+        if output_path is None:
+            output_path = self._generate_output_path()
+
+        logger.info(f"Processing videos with mode: {self.config.mode}, count: {len(video_paths)}")
+
+        try:
+            if self.config.mode == EditingMode.ONE_TAKE:
+                return self._one_take(video_paths, output_path)
+            elif self.config.mode == EditingMode.PIP:
+                return self._pip(video_paths, output_path)
+            elif self.config.mode == EditingMode.VOICE_OVER:
+                return self._voice_over(video_paths, audio_path, output_path)
+            elif self.config.mode == EditingMode.VOICE_PIP:
+                return self._voice_pip(video_paths, audio_path, output_path)
+            else:
+                raise ValueError(f"Unsupported editing mode: {self.config.mode}")
+        except Exception as e:
+            logger.error(f"Error processing videos: {e}")
+            raise
+
+    def _validate_inputs(self, video_paths: list[str], audio_path: Optional[str]) -> None:
+        """验证输入文件"""
+        for path in video_paths:
+            if not os.path.exists(path):
+                raise FileNotFoundError(f"Video file not found: {path}")
+            if not os.path.getsize(path) > 0:
+                raise ValueError(f"Video file is empty: {path}")
+
+        if audio_path and not os.path.exists(audio_path):
+            raise FileNotFoundError(f"Audio file not found: {audio_path}")
+
+    def _generate_output_path(self) -> str:
+        """生成输出文件路径"""
+        os.makedirs(self.work_dir, exist_ok=True)
+        return os.path.join(self.work_dir, f"output_{self.config.mode}_{os.getpid()}.mp4")
+
+    def _run_ffmpeg(self, command: list[str], capture_output: bool = True) -> tuple:
+        """执行 FFmpeg 命令"""
+        logger.debug(f"Running FFmpeg: {' '.join(command)}")
+        try:
+            result = subprocess.run(
+                command,
+                check=True,
+                stdout=subprocess.PIPE if capture_output else None,
+                stderr=subprocess.PIPE if capture_output else None,
+                text=capture_output,
+            )
+            return result.stdout or "", result.stderr or ""
+        except subprocess.CalledProcessError as e:
+            stderr = e.stderr.decode() if e.stderr else str(e)
+            logger.error(f"FFmpeg error: {stderr}")
+            raise RuntimeError(f"FFmpeg execution failed: {stderr}") from e
+
+    def _get_video_info(self, video_path: str) -> dict:
+        """获取视频信息"""
+        try:
+            result = subprocess.run(
+                [
+                    self._ffprobe_bin,
+                    "-v",
+                    "error",
+                    "-show_entries",
+                    "stream=width,height,r_frame_rate,duration,codec_name",
+                    "-show_entries",
+                    "format=duration,size",
+                    "-of",
+                    "json",
+                    video_path,
+                ],
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+            import json
+
+            data = json.loads(result.stdout)
+            streams = data.get("streams", [{}])
+            video_stream = next((s for s in streams if s.get("codec_type") == "video"), streams[0] if streams else {})
+            fmt = data.get("format", {})
+
+            fps_str = video_stream.get("r_frame_rate", "25/1")
+            fps_parts = fps_str.split("/")
+            fps = float(fps_parts[0]) / float(fps_parts[1]) if len(fps_parts) == 2 else float(fps_parts[0])
+
+            return {
+                "width": int(video_stream.get("width", 0)),
+                "height": int(video_stream.get("height", 0)),
+                "fps": fps,
+                "duration": float(fmt.get("duration", 0)),
+                "codec": video_stream.get("codec_name", "unknown"),
+                "size": int(fmt.get("size", 0)),
+            }
+        except Exception as e:
+            logger.warning(f"Failed to get video info for {video_path}: {e}")
+            return {"width": 0, "height": 0, "fps": 25, "duration": 0, "codec": "unknown", "size": 0}
+
+    def _get_pip_position_offset(
+        self, main_width: int, main_height: int, pip_width: int, pip_height: int
+    ) -> tuple[int, int]:
+        """获取画中画位置偏移量"""
+        margin = 10
+        position_offsets = {
+            PIPPosition.TOP_LEFT: (margin, margin),
+            PIPPosition.TOP_RIGHT: (main_width - pip_width - margin, margin),
+            PIPPosition.BOTTOM_LEFT: (margin, main_height - pip_height - margin),
+            PIPPosition.BOTTOM_RIGHT: (main_width - pip_width - margin, main_height - pip_height - margin),
+        }
+        return position_offsets.get(self.config.pip_position, position_offsets[PIPPosition.TOP_RIGHT])
+
+    def _normalize_video(self, input_path: str, output_path: str) -> dict:
+        """标准化视频格式：先统一帧率，再缩放/填充"""
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            input_path,
+            "-r",
+            str(self.config.output_fps),  # 先统一帧率
+            "-vf",
+            f"scale={self.config.output_width}:{self.config.output_height}:force_original_aspect_ratio=decrease,pad={self.config.output_width}:{self.config.output_height}:(ow-iw)/2:(oh-ih)/2,setsar=1",
+            "-r",
+            str(self.config.output_fps),
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            "-movflags",
+            "+faststart",
+            "-an",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+        return self._get_video_info(output_path)
+
+    def _one_take(self, video_paths: list[str], output_path: str) -> str:
+        """一镜到底模式：顺序拼接视频，添加淡入淡出转场"""
+        if len(video_paths) == 1:
+            return self._normalize_video(video_paths[0], output_path)
+
+        normalized_paths = []
+        for i, path in enumerate(video_paths):
+            normalized = os.path.join(self.work_dir, f"normalized_{i}_{os.getpid()}.mp4")
+            self._normalize_video(path, normalized)
+            normalized_paths.append(normalized)
+
+        durations = [self._get_video_info(p)["duration"] for p in normalized_paths]
+
+        if len(normalized_paths) <= 5:
+            output_path = self._one_take_with_xfade(normalized_paths, durations, output_path)
+        else:
+            output_path = self._one_take_simple_concat(normalized_paths, output_path)
+
+        for p in normalized_paths:
+            try:
+                if p != output_path:
+                    os.remove(p)
+            except Exception as e:
+                logger.warning(f"Operation failed in apps/worker/video_processing/editing_modes.py: {e}", exc_info=True)
+
+        return output_path
+
+    def _one_take_with_xfade(self, normalized_paths: list[str], durations: list[float], output_path: str) -> str:
+        """使用 xfade 滤镜实现转场"""
+        if len(normalized_paths) == 2:
+            transition = self.config.transition_duration
+            offset1 = durations[0] - transition / 2
+
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                normalized_paths[0],
+                "-i",
+                normalized_paths[1],
+                "-filter_complex",
+                f"[0:v][1:v]xfade=transition=fade:duration={transition}:offset={offset1}[v]",
+                "-map",
+                "[v]",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                output_path,
+            ]
+            self._run_ffmpeg(command)
+            return output_path
+        else:
+            return self._one_take_simple_concat(normalized_paths, output_path)
+
+    def _one_take_simple_concat(self, normalized_paths: list[str], output_path: str) -> str:
+        """使用 concat demuxer 简单拼接"""
+        concat_file = os.path.join(self.work_dir, f"concat_list_{os.getpid()}.txt")
+        with open(concat_file, "w") as f:
+            for path in normalized_paths:
+                f.write(f"file '{os.path.abspath(path)}'\n")
+
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-f",
+            "concat",
+            "-safe",
+            "0",
+            "-i",
+            concat_file,
+            "-c",
+            "copy",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+
+        try:
+            os.remove(concat_file)
+        except Exception as e:
+            logger.warning(f"Operation failed in apps/worker/video_processing/editing_modes.py: {e}", exc_info=True)
+
+        return output_path
+
+    def _pip(self, video_paths: list[str], output_path: str) -> str:
+        """画中画模式：主视频全屏，后续视频叠加在角落"""
+        if not video_paths:
+            raise ValueError("No video paths provided")
+
+        main_video = video_paths[0]
+        main_normalized = os.path.join(self.work_dir, f"main_{os.getpid()}.mp4")
+        main_info = self._normalize_video(main_video, main_normalized)
+
+        if len(video_paths) == 1:
+            os.rename(main_normalized, output_path)
+            return output_path
+
+        pip_width = int(self.config.output_width * self.config.pip_scale)
+        pip_height = int(self.config.output_height * self.config.pip_scale)
+        x_offset, y_offset = self._get_pip_position_offset(
+            self.config.output_width, self.config.output_height, pip_width, pip_height
+        )
+
+        pip_normalized = os.path.join(self.work_dir, f"pip_{os.getpid()}.mp4")
+        pip_info = self._get_video_info(video_paths[1])
+
+        if pip_info["duration"] > main_info["duration"]:
+            temp_pip = os.path.join(self.work_dir, f"pip_temp_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                video_paths[1],
+                "-t",
+                str(main_info["duration"]),
+                "-vf",
+                f"scale={pip_width}:{pip_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                temp_pip,
+            ]
+            self._run_ffmpeg(command)
+            pip_normalized_input = temp_pip
+        else:
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                video_paths[1],
+                "-vf",
+                f"scale={pip_width}:{pip_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                pip_normalized,
+            ]
+            self._run_ffmpeg(command)
+            pip_normalized_input = pip_normalized
+
+        if main_info["duration"] > pip_info["duration"]:
+            looped_pip = os.path.join(self.work_dir, f"pip_looped_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-stream_loop",
+                "-1",
+                "-i",
+                pip_normalized_input,
+                "-t",
+                str(main_info["duration"]),
+                "-vf",
+                f"scale={pip_width}:{pip_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                looped_pip,
+            ]
+            self._run_ffmpeg(command)
+            pip_normalized_input = looped_pip
+
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            main_normalized,
+            "-i",
+            pip_normalized_input,
+            "-filter_complex",
+            f"[0:v][1:v]overlay={x_offset}:{y_offset}[v]",
+            "-map",
+            "[v]",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+
+        for temp_file in [main_normalized, pip_normalized]:
+            if temp_file and temp_file != output_path:
+                try:
+                    os.remove(temp_file)
+                except Exception as e:
+                    logger.warning(
+                        f"Operation failed in apps/worker/video_processing/editing_modes.py: {e}", exc_info=True
+                    )
+
+        return output_path
+
+    def _voice_over(self, video_paths: list[str], audio_path: Optional[str], output_path: str) -> str:
+        """口播模式：背景画面 + 配音"""
+        if not audio_path:
+            raise ValueError("audio_path is required for VOICE_OVER mode")
+
+        if not video_paths:
+            raise ValueError("No background video provided")
+
+        audio_info = self._get_video_info(audio_path)
+        audio_duration = audio_info["duration"]
+
+        bg_normalized = os.path.join(self.work_dir, f"bg_{os.getpid()}.mp4")
+        bg_info = self._normalize_video(video_paths[0], bg_normalized)
+
+        if bg_info["duration"] < audio_duration:
+            looped_bg = os.path.join(self.work_dir, f"bg_looped_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-stream_loop",
+                "-1",
+                "-i",
+                bg_normalized,
+                "-t",
+                str(audio_duration),
+                "-vf",
+                f"scale={self.config.output_width}:{self.config.output_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                looped_bg,
+            ]
+            self._run_ffmpeg(command)
+            bg_normalized = looped_bg
+        elif bg_info["duration"] > audio_duration:
+            temp_bg = os.path.join(self.work_dir, f"bg_trimmed_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                bg_normalized,
+                "-t",
+                str(audio_duration),
+                "-c:v",
+                "copy",
+                temp_bg,
+            ]
+            self._run_ffmpeg(command)
+            bg_normalized = temp_bg
+
+        blurred_bg = os.path.join(self.work_dir, f"bg_blurred_{os.getpid()}.mp4")
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            bg_normalized,
+            "-vf",
+            f"boxblur=5:5,scale={self.config.output_width}:{self.config.output_height}",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            blurred_bg,
+        ]
+        self._run_ffmpeg(command)
+
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            blurred_bg,
+            "-i",
+            audio_path,
+            "-filter_complex",
+            "[0:v]drawbox=x=0:y=0:w=iw:h=ih:color=black@0.3:t=fill[v]",
+            "-map",
+            "[v]",
+            "-map",
+            "1:a",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            "-shortest",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+
+        for temp_file in [bg_normalized, blurred_bg]:
+            try:
+                if temp_file != output_path:
+                    os.remove(temp_file)
+            except Exception as e:
+                logger.warning(f"Operation failed in apps/worker/video_processing/editing_modes.py: {e}", exc_info=True)
+
+        return output_path
+
+    def _voice_pip(self, video_paths: list[str], audio_path: Optional[str], output_path: str) -> str:
+        """口播+画中画模式：口播视频在角落，其他视频作为背景"""
+        if not video_paths:
+            raise ValueError("No video paths provided")
+
+        if len(video_paths) == 1:
+            return self._normalize_video(video_paths[0], output_path)
+
+        voice_video = video_paths[0]
+        bg_video = video_paths[1] if len(video_paths) > 1 else video_paths[0]
+
+        voice_normalized = os.path.join(self.work_dir, f"voice_{os.getpid()}.mp4")
+        voice_info = self._normalize_video(voice_video, voice_normalized)
+
+        bg_normalized = os.path.join(self.work_dir, f"bg_{os.getpid()}.mp4")
+        bg_info = self._normalize_video(bg_video, bg_normalized)
+
+        final_duration = min(voice_info["duration"], bg_info["duration"])
+
+        pip_width = int(self.config.output_width * self.config.pip_scale)
+        pip_height = int(self.config.output_height * self.config.pip_scale)
+        x_offset, y_offset = self._get_pip_position_offset(
+            self.config.output_width, self.config.output_height, pip_width, pip_height
+        )
+
+        voice_adjusted = os.path.join(self.work_dir, f"voice_adj_{os.getpid()}.mp4")
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            voice_normalized,
+            "-t",
+            str(final_duration),
+            "-vf",
+            f"scale={pip_width}:{pip_height}",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            voice_adjusted,
+        ]
+        self._run_ffmpeg(command)
+
+        bg_adjusted = os.path.join(self.work_dir, f"bg_adj_{os.getpid()}.mp4")
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            bg_normalized,
+            "-t",
+            str(final_duration),
+            "-c:v",
+            "copy",
+            bg_adjusted,
+        ]
+        self._run_ffmpeg(command)
+
+        if audio_path:
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                bg_adjusted,
+                "-i",
+                voice_adjusted,
+                "-i",
+                audio_path,
+                "-filter_complex",
+                f"[0:v][1:v]overlay={x_offset}:{y_offset}[v]",
+                "-map",
+                "[v]",
+                "-map",
+                "2:a",
+                "-shortest",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                output_path,
+            ]
+        else:
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                bg_adjusted,
+                "-i",
+                voice_adjusted,
+                "-filter_complex",
+                f"[0:v][1:v]overlay={x_offset}:{y_offset}[v]",
+                "-map",
+                "[v]",
+                "-map",
+                "1:a",
+                "-shortest",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                output_path,
+            ]
+        self._run_ffmpeg(command)
+
+        for temp_file in [voice_normalized, voice_adjusted, bg_normalized, bg_adjusted]:
+            try:
+                if temp_file != output_path:
+                    os.remove(temp_file)
+            except Exception as e:
+                logger.warning(f"Operation failed in apps/worker/video_processing/editing_modes.py: {e}", exc_info=True)
+
+        return output_path
+
+
+def create_processor(mode: str, work_dir: Optional[str] = None, **kwargs) -> EditingModeProcessor:
+    """便捷工厂函数：创建剪辑模式处理器"""
+    try:
+        editing_mode = EditingMode(mode)
+    except ValueError:
+        raise ValueError(f"Invalid editing mode: {mode}. Valid modes: {[m.value for m in EditingMode]}")
+
+    config = EditingModeConfig(
+        mode=editing_mode,
+        output_width=kwargs.get("output_width", 1280),
+        output_height=kwargs.get("output_height", 720),
+        output_fps=kwargs.get("output_fps", 25),
+        pip_position=PIPPosition(kwargs.get("pip_position", "top_right")),
+        pip_scale=kwargs.get("pip_scale", 0.25),
+        transition_duration=kwargs.get("transition_duration", 0.5),
+    )
+
+    return EditingModeProcessor(config=config, work_dir=work_dir)

apps/worker/video_processing/ffmpeg_utils.py

@@ -1,396 +0,0 @@
-"""FFmpeg 工具函数 — 共享原语.
-
-提供 FFmpeg / FFprobe 调用、视频信息探测、视频标准化、xfade 转场滤镜构建
-等底层能力，供 UnifiedRenderService、VideoComposeService 等复用。
-"""
-
-from __future__ import annotations
-
-import logging
-import shutil
-import subprocess  # nosec B404
-from pathlib import Path
-from typing import Any
-
-logger = logging.getLogger(__name__)
-
-# ── 常量 ──────────────────────────────────────────────────────────────────────
-
-FFMPEG_BIN: str = shutil.which("ffmpeg") or "ffmpeg"
-FFPROBE_BIN: str = shutil.which("ffprobe") or "ffprobe"
-
-DEFAULT_OUTPUT_WIDTH = 1280
-DEFAULT_OUTPUT_HEIGHT = 720
-DEFAULT_FPS = 25
-
-# xfade 转场映射：transition_effect 名称 → FFmpeg xfade transition 名称
-# 键同时支持 TransitionEffect 枚举值和字符串名称（向后兼容）
-XFADE_TRANSITION_MAP: dict[str, str] = {
-    "fade": "fade",
-    "slideleft": "slideleft",
-    "slide_left": "slideleft",
-    "slideright": "slideright",
-    "slide_right": "slideright",
-    "slideup": "slideup",
-    "slide_up": "slideup",
-    "slidedown": "slidedown",
-    "slide_down": "slidedown",
-    "dissolve": "dissolve",
-    "wipe": "wipeleft",
-    "wipeleft": "wipeleft",
-}
-
-DEFAULT_TRANSITION_DURATION = 0.5
-
-# FFmpeg 执行默认超时（秒），防止 FFmpeg hang 住导致 worker 永久阻塞
-# 默认 30 分钟，足够处理大部分短视频渲染；超长视频可单独传参覆盖
-DEFAULT_FFMPEG_TIMEOUT = 1800
-
-
-# ── FFmpeg 执行 ───────────────────────────────────────────────────────────────
-
-
-def run_ffmpeg(
-    command: list[str],
-    *,
-    capture_output: bool = True,
-    timeout: int | None = DEFAULT_FFMPEG_TIMEOUT,
-) -> tuple[str, str]:
-    """执行 FFmpeg 命令。
-
-    Args:
-        command: 完整的 ffmpeg 命令列表（含 "ffmpeg" 本身）
-        capture_output: 是否捕获 stdout/stderr
-        timeout: 超时时间（秒），默认 1800s（30分钟）；None 表示不设超时（不推荐）
-
-    Returns:
-        (stdout, stderr) 元组
-
-    Raises:
-        subprocess.CalledProcessError: 命令执行失败时抛出，
-            异常信息包含完整 stderr 以便排查。
-        subprocess.TimeoutExpired: 超时未完成时抛出，FFmpeg 进程会被 kill。
-    """
-    try:
-        result = subprocess.run(  # nosec B603
-            command,
-            check=True,
-            stdout=subprocess.PIPE if capture_output else None,
-            stderr=subprocess.PIPE if capture_output else None,
-            text=True,
-            timeout=timeout,
-        )
-        return (result.stdout or "", result.stderr or "")
-    except subprocess.TimeoutExpired as e:
-        logger.error(
-            "FFmpeg 命令超时 (%ds): command=%s",
-            timeout or -1,
-            " ".join(str(c) for c in command[:20]),
-        )
-        raise
-    except subprocess.CalledProcessError as e:
-        # 把完整 stderr 打到日志，方便排查 exit code 183 等问题
-        stderr_text = (e.stderr or "").strip()
-        logger.error(
-            "FFmpeg 命令失败: exit_code=%d command=%s\nstderr:\n%s",
-            e.returncode,
-            " ".join(str(c) for c in command[:20]),  # 截断过长的命令
-            stderr_text[:5000],  # 截断过长的 stderr
-        )
-        raise
-
-
-def probe_has_audio(local_path: str | Path) -> bool:
-    """探测文件是否包含音频流。
-
-    Args:
-        local_path: 本地文件路径
-
-    Returns:
-        True 表示有音频流（或探测失败保守返回），False 表示确认无音频流
-    """
-    try:
-        result = subprocess.run(  # nosec B603
-            [
-                FFPROBE_BIN,
-                "-v",
-                "error",
-                "-select_streams",
-                "a:0",
-                "-show_entries",
-                "stream=codec_type",
-                "-of",
-                "default=noprint_wrappers=1:nokey=1",
-                str(local_path),
-            ],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=10,
-        )
-        return result.stdout.strip() == "audio"
-    except Exception:
-        # 探测失败保守返回 True，让 FFmpeg 自己处理（避免误删音频）
-        return True
-
-
-def probe_duration(local_path: str | Path) -> float:
-    """用 ffprobe 获取视频时长（秒）。
-
-    失败时返回默认值 5.0 秒。
-    """
-    try:
-        result = subprocess.run(  # nosec B603
-            [
-                FFPROBE_BIN,
-                "-v",
-                "error",
-                "-show_entries",
-                "format=duration",
-                "-of",
-                "default=noprint_wrappers=1:nokey=1",
-                str(local_path),
-            ],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-        )
-        return round(float(result.stdout.strip()), 3)
-    except Exception:
-        return 5.0
-
-
-def probe_video_info(video_path: str) -> dict[str, Any]:
-    """获取视频信息（宽、高、时长、fps、编码、像素格式）。
-
-    Returns:
-        {
-            "width": int, "height": int, "duration": float, "fps": float,
-            "video_codec": str, "audio_codec": str, "pix_fmt": str,
-            "has_audio": bool,
-        }
-        失败时返回默认值。
-    """
-    try:
-        result = subprocess.run(  # nosec B603
-            [
-                FFPROBE_BIN,
-                "-v",
-                "error",
-                "-show_entries",
-                "stream=width,height,r_frame_rate,duration,codec_name,codec_type,pix_fmt",
-                "-show_entries",
-                "format=duration",
-                "-of",
-                "json",
-                video_path,
-            ],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=15,
-        )
-
-        import json
-
-        info = json.loads(result.stdout)
-        streams = info.get("streams", [])
-        fmt = info.get("format", {})
-
-        video_stream = next((s for s in streams if s.get("codec_type") == "video"), {})
-        audio_stream = next((s for s in streams if s.get("codec_type") == "audio"), {})
-
-        width = int(video_stream.get("width", DEFAULT_OUTPUT_WIDTH))
-        height = int(video_stream.get("height", DEFAULT_OUTPUT_HEIGHT))
-        video_codec = video_stream.get("codec_name", "") or ""
-        pix_fmt = video_stream.get("pix_fmt", "") or ""
-
-        # 解析帧率
-        fps_str = video_stream.get("r_frame_rate", "25/1")
-        if "/" in fps_str:
-            num, den = fps_str.split("/")
-            fps = float(num) / float(den) if float(den) > 0 else DEFAULT_FPS
-        else:
-            fps = float(fps_str) if fps_str else DEFAULT_FPS
-
-        # 时长
-        duration = float(fmt.get("duration", 0)) or float(video_stream.get("duration", 0))
-
-        has_audio = bool(audio_stream)
-        audio_codec = audio_stream.get("codec_name", "") or ""
-
-        return {
-            "width": width,
-            "height": height,
-            "duration": duration,
-            "fps": round(fps, 2),
-            "video_codec": video_codec,
-            "audio_codec": audio_codec,
-            "pix_fmt": pix_fmt,
-            "has_audio": has_audio,
-        }
-    except Exception as e:
-        logger.warning("获取视频信息失败: %s, error: %s", video_path, e)
-        return {
-            "width": DEFAULT_OUTPUT_WIDTH,
-            "height": DEFAULT_OUTPUT_HEIGHT,
-            "duration": 0.0,
-            "fps": DEFAULT_FPS,
-            "video_codec": "",
-            "audio_codec": "",
-            "pix_fmt": "",
-            "has_audio": True,
-        }
-
-
-def normalize_video(
-    input_path: str,
-    output_path: str,
-    *,
-    width: int = DEFAULT_OUTPUT_WIDTH,
-    height: int = DEFAULT_OUTPUT_HEIGHT,
-    fps: int = DEFAULT_FPS,
-) -> dict[str, Any]:
-    """标准化视频（缩放 + 恒定帧率）。
-
-    使用 scale + pad 保持宽高比，黑边填充到目标分辨率。
-
-    Returns:
-        {"width": int, "height": int, "path": str}
-    """
-    command = [
-        FFMPEG_BIN,
-        "-y",
-        "-i",
-        input_path,
-        "-vf",
-        f"scale={width}:{height}:force_original_aspect_ratio=decrease,"
-        f"pad={width}:{height}:(ow-iw)/2:(oh-ih)/2:black,"
-        f"fps={fps}",
-        "-c:v",
-        "libx264",
-        "-crf",
-        "23",
-        "-preset",
-        "medium",
-        "-c:a",
-        "aac",
-        "-b:a",
-        "128k",
-        "-movflags",
-        "+faststart",
-        output_path,
-    ]
-    run_ffmpeg(command)
-    return {"width": width, "height": height, "path": output_path}
-
-
-# ── xfade / concat 滤镜构建 ──────────────────────────────────────────────────
-
-
-def chain_filters(filters: list[str], output_label: str, *, input_label: str = "0:v") -> str:
-    """将滤镜列表串联为 FFmpeg 滤镜字符串。
-
-    例：chain_filters(["scale=1280:720", "fps=25"], "v0")
-    → "[0:v]scale=1280:720,fps=25[v0]"
-    """
-    filter_body = ",".join(filters)
-    return f"[{input_label}]{filter_body}[{output_label}]"
-
-
-def resolve_xfade_transition(transition_name: str) -> str:
-    """将转场效果名称映射为 FFmpeg xfade transition 名称。
-
-    支持 TransitionEffect 枚举值和字符串名称，未知值回退到 "fade"。
-    """
-    # 兼容 TransitionEffect 枚举（有 .value 属性）
-    if hasattr(transition_name, "value"):
-        transition_name = transition_name.value
-    return XFADE_TRANSITION_MAP.get(transition_name, "fade")
-
-
-def build_xfade_filter_chain(
-    clip_durations: list[float],
-    clip_video_labels: list[str],
-    transitions: list[str],
-    *,
-    transition_duration: float = DEFAULT_TRANSITION_DURATION,
-    output_label: str = "outv",
-) -> tuple[str, float]:
-    """构建 xfade 转场滤镜链。
-
-    对每步 xfade 自动钳制 transition duration，确保
-    ``offset + td ≤ first_input_duration``，避免 FFmpeg exit 234。
-
-    Args:
-        clip_durations: 每个片段的时长（必须与 trim 后的实际时长一致）
-        clip_video_labels: 每个片段的视频流标签（如 "v0", "v1"）
-        transitions: 每个片段对应的转场效果（第一个片段的转场被忽略）
-        transition_duration: 转场时长（秒）
-        output_label: 最终输出标签
-
-    Returns:
-        (filter_string, estimated_total_duration)
-    """
-    n = len(clip_durations)
-    parts: list[str] = []
-
-    if n == 0:
-        return "", 0.0
-
-    if n == 1:
-        parts.append(f"[{clip_video_labels[0]}]copy[{output_label}]")
-        return ";".join(parts), clip_durations[0]
-
-    # xfade 链 — 每步动态钳制 td，防止 offset + td > first_input_duration
-    cumulative = 0.0
-    prev_label = clip_video_labels[0]
-    total_transition = 0.0  # 累计已使用的转场时长
-
-    for i in range(1, n):
-        cumulative += clip_durations[i - 1]
-
-        # 当前 xfade 的第一个输入时长
-        if i == 1:
-            first_input_dur = clip_durations[0]
-        else:
-            first_input_dur = cumulative - total_transition
-
-        # 原始 offset 计算
-        offset = max(0.0, cumulative - transition_duration * i)
-
-        # 安全钳制：offset + td 不能超过第一个输入的时长
-        available = max(0.0, first_input_dur - offset)
-        safe_td = min(transition_duration, available)
-
-        # 同时不能超过剩余总时长
-        remaining = max(0.0, sum(clip_durations) - cumulative)
-        safe_td = min(safe_td, remaining)
-        # 同时不能超过当前第二个输入（单个片段）的时长
-        safe_td = min(safe_td, clip_durations[i])
-        safe_td = max(0.001, safe_td)  # 至少 1ms，避免 td=0
-
-        transition = transitions[i] if i < len(transitions) else "cut"
-        xfade_transition = resolve_xfade_transition(transition)
-
-        if i == n - 1:
-            out_label = output_label
-        else:
-            out_label = f"xf{i}"
-
-        parts.append(
-            f"[{prev_label}][{clip_video_labels[i]}]"
-            f"xfade=transition={xfade_transition}"
-            f":duration={safe_td:.3f}"
-            f":offset={offset:.3f}"
-            f"[{out_label}]"
-        )
-        prev_label = out_label
-        total_transition += safe_td
-
-    # 总时长减去转场重叠部分
-    total_duration = sum(clip_durations) - total_transition
-    return ";".join(parts), max(0.0, total_duration)

apps/worker/video_processing/oss_helpers.py

@@ -1,266 +0,0 @@
-"""OSS 工具函数 — 从 generation.py / edit_plan_generation.py 提取的共享 OSS 操作.
-
-提供 OSS 配置读取、Bucket 创建、素材上传/下载、asset_id → 本地路径解析
-等能力，供 render_edit_plan 和 generate_video 共同复用。
-"""
-
-from __future__ import annotations
-
-import hashlib
-import logging
-import os
-import threading
-from pathlib import Path
-from typing import Optional
-from urllib.parse import urlparse
-
-import oss2
-
-logger = logging.getLogger(__name__)
-
-# OSS 上传配置
-OSS_CONNECT_TIMEOUT = 10  # 连接超时（秒），防止 TCP 握手挂死
-OSS_UPLOAD_TOTAL_TIMEOUT = 300  # 单文件上传总超时（秒），防止网络慢时无限卡住
-OSS_MULTIPART_THRESHOLD = 100 * 1024 * 1024  # 分片上传阈值：100MB 以上走分片
-OSS_PART_SIZE = 8 * 1024 * 1024  # 分片大小：8MB
-OSS_MULTIPART_NUM_THREADS = 3  # 分片上传并发数
-
-
-# ── OSS 配置 ──────────────────────────────────────────────────────────────────
-
-
-def oss_settings() -> tuple[str, str, str, str] | None:
-    """获取 OSS 配置。
-
-    Returns:
-        (access_key_id, access_key_secret, endpoint, bucket_name) 元组，
-        配置缺失时返回 None。
-    """
-    access_key_id = os.getenv("OSS_ACCESS_KEY_ID")
-    access_key_secret = os.getenv("OSS_ACCESS_KEY_SECRET")
-    endpoint = os.getenv("OSS_ENDPOINT")
-    bucket_name = os.getenv("OSS_BUCKET_NAME")
-    if not all([access_key_id, access_key_secret, endpoint, bucket_name]):
-        return None
-    return access_key_id, access_key_secret, endpoint, bucket_name
-
-
-def oss_bucket() -> oss2.Bucket | None:
-    """获取 OSS Bucket 实例。
-
-    P0-2 修复：endpoint 不带 scheme 时自动补 https:// 前缀，
-    确保 sign_url 等依赖 scheme 的方法返回 HTTPS URL。
-
-    P0-staging 修复：增加 connect_timeout=10s，防止网络抖动时
-    TCP 握手阶段无限挂死，导致 worker 进程卡死。
-
-    Returns:
-        oss2.Bucket 实例，配置缺失时返回 None。
-    """
-    settings = oss_settings()
-    if settings is None:
-        return None
-    access_key_id, access_key_secret, endpoint, bucket_name = settings
-    # endpoint 无 scheme 时补 https://，与 API 端 storage.py 保持一致
-    if not endpoint.startswith(("http://", "https://")):
-        endpoint = f"https://{endpoint}"
-    return oss2.Bucket(
-        oss2.Auth(access_key_id, access_key_secret),
-        endpoint,
-        bucket_name,
-        connect_timeout=OSS_CONNECT_TIMEOUT,
-    )
-
-
-def normalize_storage_key(storage_key_or_url: str) -> str:
-    """标准化存储键 — 如果是完整 URL 则提取 path 部分。
-
-    Examples:
-        "https://bucket.oss-cn-hangzhou.aliyuncs.com/path/to/file.mp4"
-        → "path/to/file.mp4"
-        "path/to/file.mp4" → "path/to/file.mp4"
-    """
-    if storage_key_or_url.startswith(("http://", "https://")):
-        return urlparse(storage_key_or_url).path.lstrip("/")
-    return storage_key_or_url.lstrip("/")
-
-
-# ── 上传 / 下载 ───────────────────────────────────────────────────────────────
-
-
-def download_asset(asset_storage_key: str, local_path: Path) -> bool:
-    """从 OSS 下载素材文件到本地路径。
-
-    Args:
-        asset_storage_key: 素材的存储键（或完整 URL）
-        local_path: 本地保存路径
-
-    Returns:
-        True 表示下载成功，False 表示失败。
-    """
-    bucket = oss_bucket()
-    if bucket is None:
-        return False
-    try:
-        bucket.get_object_to_file(normalize_storage_key(asset_storage_key), str(local_path))
-        return local_path.exists() and local_path.stat().st_size > 0
-    except Exception:
-        logger.exception("下载素材失败: %s", asset_storage_key)
-        return False
-
-
-def upload_to_oss(local_path: Path, storage_key: str) -> str | None:
-    """上传文件到 OSS，返回公开 URL。
-
-    大文件（>100MB）自动走分片上传，降低内存峰值，减少 OOM 风险。
-    上传加总超时保护（默认 300s），防止网络异常时无限挂死。
-
-    Args:
-        local_path: 本地文件路径
-        storage_key: 目标存储键
-
-    Returns:
-        公开访问 URL，上传失败或 OSS 未配置时返回 None。
-    """
-    bucket = oss_bucket()
-    if bucket is None:
-        return None
-
-    result: dict = {"url": None, "error": None, "file_size": 0}
-    done = threading.Event()
-
-    def _do_upload():
-        try:
-            # 尝试获取文件大小，用于分片判断和日志；stat 失败时 fallback 走普通上传
-            try:
-                file_size = local_path.stat().st_size
-                result["file_size"] = file_size
-                use_multipart = file_size >= OSS_MULTIPART_THRESHOLD
-            except OSError:
-                use_multipart = False
-                file_size = 0
-
-            if use_multipart:
-                # 分片上传：降低内存峰值，每片 8MB，3 线程并发
-                logger.info(
-                    "大文件分片上传: storage_key=%s, size=%.1fMB, part_size=%dMB, threads=%d",
-                    storage_key[:80],
-                    file_size / 1024 / 1024,
-                    OSS_PART_SIZE // 1024 // 1024,
-                    OSS_MULTIPART_NUM_THREADS,
-                )
-                oss2.resumable_upload(
-                    bucket,
-                    storage_key,
-                    str(local_path),
-                    multipart_threshold=OSS_MULTIPART_THRESHOLD,
-                    part_size=OSS_PART_SIZE,
-                    num_threads=OSS_MULTIPART_NUM_THREADS,
-                )
-            else:
-                bucket.put_object_from_file(storage_key, str(local_path))
-
-            # 构造返回 URL
-            settings = oss_settings()
-            if settings:
-                _, _, endpoint, bucket_name = settings
-                endpoint_clean = endpoint.replace("https://", "").replace("http://", "")
-                result["url"] = f"https://{bucket_name}.{endpoint_clean}/{storage_key}"
-        except Exception as e:
-            result["error"] = e
-            logger.exception("上传 OSS 失败: %s", storage_key)
-        finally:
-            done.set()
-
-    upload_thread = threading.Thread(target=_do_upload, daemon=True)
-    upload_thread.start()
-    finished = done.wait(timeout=OSS_UPLOAD_TOTAL_TIMEOUT)
-
-    if not finished:
-        logger.error(
-            "OSS 上传超时（%.0fs），强制中止: storage_key=%s, size=%.1fMB",
-            OSS_UPLOAD_TOTAL_TIMEOUT,
-            storage_key[:80],
-            result["file_size"] / 1024 / 1024 if result["file_size"] else 0,
-        )
-        return None
-
-    if result["error"]:
-        return None
-
-    return result["url"]
-
-
-def get_signed_download_url(storage_key_or_url: str, expires_seconds: int = 3600) -> str | None:
-    """生成预签名下载 URL（用于私有 bucket 的 URL 校验或临时下载）。
-
-    Args:
-        storage_key_or_url: 存储键或完整 URL（URL 会自动提取 path）
-        expires_seconds: 签名有效期（秒）
-
-    Returns:
-        预签名 URL，失败或 OSS 未配置时返回 None。
-    """
-    bucket = oss_bucket()
-    if bucket is None:
-        return None
-    try:
-        storage_key = normalize_storage_key(storage_key_or_url)
-        signed = bucket.sign_url("GET", storage_key, expires_seconds)
-        logger.info("生成预签名URL: key=%s url_prefix=%s", storage_key[:80], signed[:60])
-        return signed
-    except Exception:
-        logger.exception("生成预签名URL失败: %s", storage_key_or_url[:80])
-        return None
-
-
-# ── Asset 解析 ────────────────────────────────────────────────────────────────
-
-
-def resolve_asset_path(asset_id: str, work_dir: Path) -> Path | None:
-    """从 asset_id 解析到本地文件路径。
-
-    策略（按优先级）：
-    1. 如果 asset_id 是本地绝对路径（/var/storage/...）→ 直接返回
-    2. 如果 work_dir 下已有缓存文件 → 返回缓存路径
-    3. 从 OSS 下载到 work_dir/{hash}.mp4 → 返回下载路径
-    4. 下载失败 → 返回 None
-
-    缓存策略：以 asset_id 的 SHA256 前 16 位为文件名，避免重复下载。
-    """
-    # 1. 本地绝对路径
-    if asset_id.startswith("/") and os.path.exists(asset_id):
-        return Path(asset_id)
-
-    # 2. 缓存命中
-    cache_hash = hashlib.sha256(asset_id.encode()).hexdigest()[:16]
-    cached_path = work_dir / f"{cache_hash}.mp4"
-    if cached_path.exists() and cached_path.stat().st_size > 0:
-        return cached_path
-
-    # 3. 从 OSS 下载
-    if download_asset(asset_id, cached_path):
-        return cached_path
-
-    return None
-
-
-def resolve_asset_ids_to_paths(
-    asset_ids: list[str],
-    work_dir: Path,
-) -> dict[str, Path]:
-    """批量解析 asset_id → 本地路径。
-
-    Args:
-        asset_ids: 素材 ID 列表
-        work_dir: 工作目录
-
-    Returns:
-        {asset_id: local_path} 映射，仅包含成功解析的条目。
-    """
-    result: dict[str, Path] = {}
-    for aid in asset_ids:
-        local_path = resolve_asset_path(aid, work_dir)
-        if local_path:
-            result[aid] = local_path
-    return result

apps/worker/video_processing/render_adapter.py

@@ -1,299 +0,0 @@
-"""统一渲染引擎适配层 — Phase 2.
-
-将 EditPlan + EditPlanClips（来自 DB）适配为 UnifiedRenderService 的输入格式，
-封装素材下载、渲染执行、结果上传的完整流程。
-
-职责：
-  1. 从 DB 读取 EditPlan + EditPlanClips
-  2. 下载素材到本地，构建 asset_path_map
-  3. 调用 UnifiedRenderService 执行渲染
-  4. 上传渲染结果到 OSS
-  5. 支持进度回调（对接 JobService）
-"""
-
-from __future__ import annotations
-
-import logging
-import tempfile
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Any, Callable
-
-from sqlalchemy.orm import Session
-from video_processing.oss_helpers import download_asset, upload_to_oss
-from video_processing.unified_render_service import RenderResult, UnifiedRenderService
-
-from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import SQLAlchemyEditPlanClipRepository
-from packages.adapters.sqlalchemy_impl.edit_plan_repository import SQLAlchemyEditPlanRepository
-from packages.domain.edit_plan import EditPlan, EditPlanStatus
-from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
-
-logger = logging.getLogger(__name__)
-
-
-# ── 数据结构 ──────────────────────────────────────────────────────────────────
-
-
-@dataclass
-class RenderAdapterResult:
-    """渲染适配结果。"""
-
-    success: bool
-    output_url: str = ""
-    output_path: Path | None = None
-    duration: float = 0.0
-    file_size: int = 0
-    width: int = 0
-    height: int = 0
-    clip_count: int = 0
-    error_message: str = ""
-
-
-ProgressCallback = Callable[[float, str], None]
-"""进度回调：(progress_0_100, stage_description) → None"""
-
-
-# ── 适配层主体 ────────────────────────────────────────────────────────────────
-
-
-class RenderAdapter:
-    """统一渲染引擎适配层。
-
-    桥接 EditPlan 领域模型与 UnifiedRenderService 图层模型。
-
-    用法::
-
-        adapter = RenderAdapter(db)
-        result = adapter.render_plan(
-            plan_id=plan_id,
-            job_id=job_id,
-            progress_cb=lambda p, s: job_service.update_progress(job_id, p, s),
-        )
-    """
-
-    def __init__(self, db: Session) -> None:
-        self._db = db
-        self._plan_repo = SQLAlchemyEditPlanRepository(db)
-        self._clip_repo = SQLAlchemyEditPlanClipRepository(db)
-
-    # ── 公开方法 ──────────────────────────────────────────────────────────
-
-    def render_plan(
-        self,
-        plan_id: str,
-        *,
-        job_id: str = "",
-        work_dir: Path | None = None,
-        progress_cb: ProgressCallback | None = None,
-    ) -> RenderAdapterResult:
-        """渲染一个 EditPlan。
-
-        完整流程：
-        1. 加载计划与片段
-        2. 下载素材
-        3. 执行统一渲染
-        4. 上传结果
-
-        Args:
-            plan_id: EditPlan ID
-            job_id: 关联的 Job ID（用于结果存储路径）
-            work_dir: 工作目录，不传则使用临时目录
-            progress_cb: 进度回调函数
-
-        Returns:
-            RenderAdapterResult
-        """
-        temp_dir = None
-        try:
-            # 0. 准备工作目录
-            if work_dir is None:
-                temp_dir = tempfile.mkdtemp(prefix="render_")
-                work_dir = Path(temp_dir)
-            work_dir.mkdir(parents=True, exist_ok=True)
-
-            self._report_progress(progress_cb, 5.0, "加载剪辑计划")
-
-            # 1. 加载计划与片段
-            plan = self._plan_repo.get(plan_id)
-            if plan is None:
-                return RenderAdapterResult(
-                    success=False,
-                    error_message=f"剪辑计划不存在: {plan_id}",
-                )
-
-            clips = self._clip_repo.list_by_plan(plan_id, skip=0, limit=10000)
-            ready_clips = [c for c in clips if c.status == EditPlanClipStatus.READY and c.asset_id]
-            ready_clips.sort(key=lambda c: c.order)
-
-            if not ready_clips:
-                return RenderAdapterResult(
-                    success=False,
-                    error_message="没有可渲染的就绪片段",
-                    clip_count=0,
-                )
-
-            logger.info(
-                "开始渲染: plan_id=%s job_id=%s ready_clips=%d engine=unified",
-                plan_id,
-                job_id,
-                len(ready_clips),
-            )
-
-            self._report_progress(progress_cb, 15.0, f"下载素材（{len(ready_clips)} 个）")
-
-            # 2. 下载素材
-            asset_path_map = self._download_assets(ready_clips, work_dir)
-            if not asset_path_map:
-                return RenderAdapterResult(
-                    success=False,
-                    error_message="所有素材下载失败",
-                    clip_count=len(ready_clips),
-                )
-
-            self._report_progress(progress_cb, 40.0, "执行视频渲染")
-
-            # 3. 执行统一渲染
-            render_svc = UnifiedRenderService(
-                plan=plan,
-                clips=ready_clips,
-                asset_path_map=asset_path_map,
-                work_dir=work_dir,
-            )
-            result = render_svc.render()
-
-            self._report_progress(progress_cb, 80.0, "上传渲染结果")
-
-            # 4. 上传结果
-            storage_key = f"rendered/{plan_id}/{job_id or plan_id}.mp4"
-            output_url = upload_to_oss(result.output_path, storage_key)
-
-            self._report_progress(progress_cb, 100.0, "渲染完成")
-
-            logger.info(
-                "[render-adapter] render success: plan_id=%s job_id=%s engine=unified "
-                "duration=%.2fs file_size=%d resolution=%dx%d clip_count=%d",
-                plan_id,
-                job_id,
-                result.duration,
-                result.file_size,
-                result.width,
-                result.height,
-                len(ready_clips),
-            )
-
-            return RenderAdapterResult(
-                success=True,
-                output_url=output_url or "",
-                output_path=result.output_path,
-                duration=result.duration,
-                file_size=result.file_size,
-                width=result.width,
-                height=result.height,
-                clip_count=len(ready_clips),
-            )
-
-        except Exception as exc:
-            logger.exception(
-                "[render-adapter] render failed: plan_id=%s job_id=%s engine=unified error=%s",
-                plan_id,
-                job_id,
-                str(exc)[:200],
-            )
-            return RenderAdapterResult(
-                success=False,
-                error_message=str(exc)[:500],
-            )
-        finally:
-            # 清理临时目录
-            if temp_dir:
-                import shutil
-
-                try:
-                    shutil.rmtree(temp_dir, ignore_errors=True)
-                except Exception:
-                    pass
-
-    def validate_plan(self, plan_id: str) -> tuple[bool, list[str], list[str], int, int]:
-        """校验计划是否可渲染（兼容 VideoComposeService.validate_compose 接口）。
-
-        Returns:
-            (valid, errors, warnings, ready_clip_count, total_clip_count)
-        """
-        errors: list[str] = []
-        warnings: list[str] = []
-
-        plan = self._plan_repo.get(plan_id)
-        if plan is None:
-            return False, [f"剪辑计划不存在: {plan_id}"], [], 0, 0
-
-        if plan.status not in (EditPlanStatus.EDITING, EditPlanStatus.RENDERING):
-            errors.append(f"计划状态不正确，需要 editing 或 rendering，当前: {plan.status}")
-
-        clips = self._clip_repo.list_by_plan(plan_id, skip=0, limit=10000)
-        if not clips:
-            errors.append("计划没有任何片段")
-            return False, errors, warnings, 0, 0
-
-        clips.sort(key=lambda c: c.order)
-
-        ready_count = 0
-        pending_count = 0
-        no_asset_count = 0
-
-        for clip in clips:
-            if clip.status == EditPlanClipStatus.READY:
-                ready_count += 1
-                if not clip.asset_id:
-                    errors.append(f"片段 {clip.id} (order={clip.order}) 没有分配素材")
-                    no_asset_count += 1
-            elif clip.status == EditPlanClipStatus.PENDING:
-                pending_count += 1
-            elif clip.status == EditPlanClipStatus.FAILED:
-                warnings.append(f"片段 {clip.id} (order={clip.order}) 状态为 failed，已跳过")
-
-        if ready_count == 0:
-            errors.append("没有就绪（ready）的片段可以合成")
-
-        if pending_count > 0:
-            warnings.append(f"有 {pending_count} 个片段仍处于 pending 状态")
-
-        return len(errors) == 0, errors, warnings, ready_count, len(clips)
-
-    # ── 内部方法 ──────────────────────────────────────────────────────────
-
-    @staticmethod
-    def _report_progress(progress_cb: ProgressCallback | None, progress: float, stage: str) -> None:
-        """上报进度。"""
-        if progress_cb is not None:
-            try:
-                progress_cb(progress, stage)
-            except Exception:
-                logger.exception("进度回调失败")
-
-    @staticmethod
-    def _download_assets(clips: list[EditPlanClip], work_dir: Path) -> dict[str, Path]:
-        """下载片段素材到本地，返回 asset_id → local_path 映射。
-
-        只保留下载成功的素材。
-        """
-        asset_dir = work_dir / "assets"
-        asset_dir.mkdir(exist_ok=True)
-
-        asset_path_map: dict[str, Path] = {}
-
-        for clip in clips:
-            asset_id = clip.asset_id
-            if not asset_id:
-                continue
-
-            # 生成安全的本地文件名
-            safe_name = f"clip_{clip.order:04d}_{abs(hash(asset_id)) % 100000:05d}.mp4"
-            local_path = asset_dir / safe_name
-
-            if download_asset(asset_id, local_path):
-                asset_path_map[asset_id] = local_path
-                logger.debug("素材下载成功: clip_id=%s asset_id=%s", clip.id, asset_id[:60])
-            else:
-                logger.warning("素材下载失败: clip_id=%s asset_id=%s", clip.id, asset_id[:60])
-
-        return asset_path_map

apps/worker/video_processing/render_engine_resolver.py

@@ -1,204 +0,0 @@
-"""渲染引擎 Feature Flag 解析器。
-
-封装渲染引擎选择逻辑，支持：
-- 环境变量作为默认值（RENDER_ENGINE=legacy/unified）
-- Redis Feature Flag 运行时覆盖（白名单 + 百分比 + 全局开关）
-- 定时刷新，支持热更新不重启 worker
-
-使用方式：
-    resolver = RenderEngineResolver(redis_url="redis://...", default_engine="legacy")
-    engine = resolver.get_engine(user_id="user123")
-    # engine: "legacy" 或 "unified"
-"""
-
-from __future__ import annotations
-
-import logging
-import threading
-from typing import Optional
-
-from packages.adapters.redis.feature_flag_store import (
-    FeatureFlagConfig,
-    FeatureFlagStore,
-    InMemoryFeatureFlagStore,
-    RedisFeatureFlagStore,
-)
-
-logger = logging.getLogger(__name__)
-
-# Feature Flag 名称常量
-FLAG_RENDER_ENGINE = "render_engine"
-
-# 引擎常量
-ENGINE_LEGACY = "legacy"
-ENGINE_UNIFIED = "unified"
-VALID_ENGINES = {ENGINE_LEGACY, ENGINE_UNIFIED}
-
-
-class RenderEngineResolver:
-    """渲染引擎选择器。
-
-    判定逻辑（从高到低）：
-    1. Redis flag 白名单匹配 → unified
-    2. Redis flag 百分比命中 → unified
-    3. Redis flag 全局开启（100%）→ unified
-    4. 环境变量默认值 → legacy / unified
-
-    当 Redis 不可用时，自动降级到环境变量默认值，不影响业务。
-    """
-
-    def __init__(
-        self,
-        default_engine: str = ENGINE_LEGACY,
-        redis_url: Optional[str] = None,
-        refresh_interval: float = 30.0,
-        store: Optional[FeatureFlagStore] = None,
-    ) -> None:
-        """
-        Args:
-            default_engine: 环境变量默认的引擎名（legacy / unified）
-            redis_url: Redis 连接 URL，传 None 时使用内存实现（测试用）
-            refresh_interval: Redis flag 配置刷新间隔（秒）
-            store: 直接传入 store 实例（测试用，优先级高于 redis_url）
-        """
-        self._default_engine = default_engine.lower() if default_engine else ENGINE_LEGACY
-        if self._default_engine not in VALID_ENGINES:
-            logger.warning(
-                "Invalid default engine '%s', fallback to '%s'",
-                self._default_engine,
-                ENGINE_LEGACY,
-            )
-            self._default_engine = ENGINE_LEGACY
-
-        if store is not None:
-            self._store = store
-        elif redis_url:
-            self._store = RedisFeatureFlagStore(redis_url=redis_url)
-        else:
-            self._store = InMemoryFeatureFlagStore()
-            logger.info("No Redis configured, using in-memory feature flag store")
-
-        self._refresh_interval = refresh_interval
-        self._lock = threading.Lock()
-        self._cached_config: Optional[FeatureFlagConfig] = None
-        self._last_refresh: float = 0.0
-
-    def _maybe_refresh(self) -> None:
-        """惰性刷新配置，超过刷新间隔时从存储重新读取。"""
-        import time
-
-        now = time.time()
-        if now - self._last_refresh < self._refresh_interval:
-            return
-
-        try:
-            config = self._store.get(FLAG_RENDER_ENGINE)
-            with self._lock:
-                self._cached_config = config
-                self._last_refresh = now
-        except Exception as exc:
-            logger.warning("Failed to refresh render engine flag: %s", exc)
-            # 刷新失败时保留旧缓存，不中断业务
-            if self._cached_config is None:
-                # 首次就读失败，设一个默认值
-                with self._lock:
-                    self._cached_config = FeatureFlagConfig(name=FLAG_RENDER_ENGINE)
-                    self._last_refresh = now
-
-    def _get_config(self) -> FeatureFlagConfig:
-        """获取当前 flag 配置（带缓存）。"""
-        if self._cached_config is None:
-            self._maybe_refresh()
-        else:
-            self._maybe_refresh()
-        return self._cached_config or FeatureFlagConfig(name=FLAG_RENDER_ENGINE)
-
-    def get_engine(self, user_id: Optional[str] = None) -> str:
-        """获取当前应该使用的渲染引擎。
-
-        Args:
-            user_id: 用户ID，用于白名单匹配和百分比哈希。
-                    传 None 时只看全局开关。
-
-        Returns:
-            "legacy" 或 "unified"
-        """
-        config = self._get_config()
-
-        # 全局关闭 → 用默认值
-        if not config.enabled:
-            return self._default_engine
-
-        # 白名单匹配 / 百分比命中 → unified
-        if config.is_active(user_id):
-            return ENGINE_UNIFIED
-
-        # 未命中灰度 → 用默认值
-        return self._default_engine
-
-    def should_use_unified(self, user_id: Optional[str] = None) -> bool:
-        """便捷方法：是否应该使用统一渲染引擎。"""
-        return self.get_engine(user_id) == ENGINE_UNIFIED
-
-    def force_refresh(self) -> None:
-        """强制立即刷新配置（用于管理接口修改后立即生效）。"""
-        self._last_refresh = 0.0
-        if isinstance(self._store, RedisFeatureFlagStore):
-            self._store.invalidate_cache(FLAG_RENDER_ENGINE)
-        self._maybe_refresh()
-
-    def get_config_snapshot(self) -> dict:
-        """获取当前配置快照（用于管理接口展示）。"""
-        config = self._get_config()
-        return {
-            "flag_name": FLAG_RENDER_ENGINE,
-            "default_engine": self._default_engine,
-            "enabled": config.enabled,
-            "percentage": config.percentage,
-            "whitelist": sorted(config.whitelist),
-            "refresh_interval": self._refresh_interval,
-            "last_refresh": self._last_refresh,
-        }
-
-    def set_flag(self, config: FeatureFlagConfig) -> None:
-        """设置 flag 配置（管理接口用）。"""
-        config.name = FLAG_RENDER_ENGINE
-        self._store.set(config)
-        self.force_refresh()
-
-
-# 全局单例
-_resolver: Optional[RenderEngineResolver] = None
-_resolver_lock = threading.Lock()
-
-
-def get_render_engine_resolver() -> RenderEngineResolver:
-    """获取全局单例（基于 worker 配置）。"""
-    global _resolver
-    if _resolver is not None:
-        return _resolver
-
-    with _resolver_lock:
-        if _resolver is not None:
-            return _resolver
-
-        try:
-            from worker_app.core.config import get_settings
-
-            settings = get_settings()
-            redis_url = getattr(settings, "redis_url", None) or getattr(settings, "broker_url", None)
-            default = getattr(settings, "render_engine", ENGINE_LEGACY)
-            _resolver = RenderEngineResolver(
-                default_engine=default,
-                redis_url=redis_url,
-            )
-            logger.info(
-                "RenderEngineResolver initialized: default=%s, redis=%s",
-                default,
-                bool(redis_url),
-            )
-        except Exception as exc:
-            logger.warning("Failed to init RenderEngineResolver from settings: %s", exc)
-            _resolver = RenderEngineResolver(default_engine=ENGINE_LEGACY)
-
-    return _resolver

apps/worker/video_processing/video_compose_service.py

@@ -0,0 +1,821 @@
+"""
+视频合成服务
+支持多种剪辑模式和转场效果，包含完整的安全校验
+"""
+
+import logging
+import os
+import subprocess
+import tempfile
+from dataclasses import dataclass
+from enum import Enum
+
+try:
+    from enum import StrEnum
+except ImportError:
+
+    class StrEnum(str, Enum):  # type: ignore[no-redef]
+        """Python 3.10 兼容的 StrEnum 回退实现。"""
+
+        pass
+
+
+from pathlib import Path
+from typing import Optional
+
+from packages.domain.editing_mode import EditingMode
+
+logger = logging.getLogger(__name__)
+
+# ========== 安全常量 ==========
+# 允许的输出目录白名单（使用环境变量或系统临时目录，避免硬编码 /tmp）
+_VIDEO_OUTPUT_DIR = os.environ.get("VIDEO_OUTPUT_DIR", os.path.join(tempfile.gettempdir(), "video_output"))
+ALLOWED_OUTPUT_DIRS = [_VIDEO_OUTPUT_DIR, "/var/app/rendered"]
+
+# 允许的输入路径前缀白名单
+ALLOWED_INPUT_PREFIXES = ("s3://", "oss://", "local://", "/var/storage/")
+
+# 允许的转场效果白名单
+ALLOWED_TRANSITIONS = {
+    "fade",
+    "slideleft",
+    "slideright",
+    "dissolve",
+    "wipeleft",
+    "wiperight",
+    "cut",
+    "slideup",
+    "slidedown",
+}
+
+# 转场效果映射
+_XFADE_TRANSITION_MAP = {
+    "fade": "fade",
+    "slideleft": "slideleft",
+    "slideright": "slideright",
+    "dissolve": "dissolve",
+    "wipeleft": "wipeleft",
+    "wiperight": "wiperight",
+    "cut": "cut",
+    "slideup": "slideup",
+    "slidedown": "slidedown",
+}
+
+
+class VideoComposeError(Exception):
+    """视频合成服务异常"""
+
+    pass
+
+
+class PIPPosition(StrEnum):
+    """画中画位置枚举"""
+
+    TOP_LEFT = "top_left"
+    TOP_RIGHT = "top_right"
+    BOTTOM_LEFT = "bottom_left"
+    BOTTOM_RIGHT = "bottom_right"
+
+
+@dataclass
+class Clip:
+    """视频片段"""
+
+    asset_id: str  # 资源ID，对应输入路径
+    start_time: float = 0.0
+    duration: float = 0.0
+    transition: str = "fade"  # 转场效果
+
+
+@dataclass
+class EditingModeConfig:
+    """剪辑模式配置"""
+
+    mode: EditingMode
+    output_width: int = 1280
+    output_height: int = 720
+    output_fps: int = 25
+    pip_position: PIPPosition = PIPPosition.TOP_RIGHT
+    pip_scale: float = 0.25  # 画中画占主画面的比例
+    transition_duration: float = 0.5  # 转场时长（秒）
+    output_codec: str = "libx264"
+    output_preset: str = "medium"
+    output_crf: int = 23
+
+
+class VideoComposeService:
+    """视频合成服务"""
+
+    def __init__(self, config: EditingModeConfig, work_dir: Optional[str] = None):
+        """
+        初始化视频合成服务
+
+        Args:
+            config: 剪辑模式配置
+            work_dir: 工作目录，默认使用系统临时目录
+        """
+        self.config = config
+        self.work_dir = work_dir or tempfile.gettempdir()
+        self._ffmpeg_bin = "ffmpeg"
+        self._ffprobe_bin = "ffprobe"
+
+    def _validate_output_path(self, path: str) -> str:
+        """
+        校验输出路径是否在允许范围内 (P0 修复)
+
+        防止路径穿越攻击，如 /app/config/../../../etc/passwd
+
+        Args:
+            path: 用户提供的输出路径
+
+        Returns:
+            标准化后的绝对路径
+
+        Raises:
+            ValueError: 路径不在允许范围内
+        """
+        abs_path = os.path.abspath(path)
+        for allowed_dir in ALLOWED_OUTPUT_DIRS:
+            allowed_abs = os.path.abspath(allowed_dir)
+            if abs_path.startswith(allowed_abs):
+                return abs_path
+        raise ValueError(f"输出路径不在允许范围内: {path}")
+
+    def _validate_input_path(self, path: str) -> bool:
+        """
+        校验输入路径格式是否合法 (P1-1 修复)
+
+        Args:
+            path: 输入文件路径
+
+        Returns:
+            是否合法
+        """
+        return any(path.startswith(prefix) for prefix in ALLOWED_INPUT_PREFIXES)
+
+    def _validate_transition(self, transition: str) -> str:
+        """
+        校验转场效果是否在白名单内 (P1-2 修复)
+
+        Args:
+            transition: 转场效果名称
+
+        Returns:
+            安全的转场效果名称
+        """
+        if transition not in ALLOWED_TRANSITIONS:
+            logger.warning(f"未知的转场效果 '{transition}'，使用默认 'fade'")
+            return "fade"
+        return transition
+
+    def _get_validated_transition(self, transition: str) -> str:
+        """获取白名单校验后的转场效果名称"""
+        return _XFADE_TRANSITION_MAP.get(self._validate_transition(transition), "fade")
+
+    def compose(self, clips: list[Clip], output_path: Optional[str] = None) -> str:
+        """
+        合成视频
+
+        Args:
+            clips: 视频片段列表，每个片段包含 asset_id 和转场配置
+            output_path: 输出文件路径
+
+        Returns:
+            输出文件路径
+        """
+        if not clips:
+            raise ValueError("clips 不能为空")
+
+        # P1-1: 校验所有输入路径
+        for clip in clips:
+            if not self._validate_input_path(clip.asset_id):
+                raise ValueError(f"不合法的输入路径: {clip.asset_id}")
+
+        # 生成默认输出路径并校验
+        if output_path is None:
+            output_path = self._generate_output_path()
+
+        # P0: 校验输出路径
+        validated_output = self._validate_output_path(output_path)
+
+        logger.info(f"合成视频，片段数: {len(clips)}, 输出: {validated_output}")
+
+        # 获取输入路径列表
+        input_paths = [clip.asset_id for clip in clips]
+
+        try:
+            if self.config.mode == EditingMode.ONE_TAKE:
+                return self._one_take(input_paths, validated_output, clips)
+            elif self.config.mode == EditingMode.PIP:
+                return self._pip(input_paths, validated_output)
+            elif self.config.mode == EditingMode.VOICE_OVER:
+                return self._voice_over(input_paths, validated_output)
+            elif self.config.mode == EditingMode.VOICE_PIP:
+                return self._voice_pip(input_paths, validated_output)
+            else:
+                raise ValueError(f"不支持的剪辑模式: {self.config.mode}")
+        except Exception as e:
+            logger.error(f"视频合成失败: {e}")
+            raise VideoComposeError(f"视频合成失败: {e}") from e
+
+    def _generate_output_path(self) -> str:
+        """生成输出文件路径"""
+        os.makedirs(self.work_dir, exist_ok=True)
+        return os.path.join(self.work_dir, f"output_{self.config.mode}_{os.getpid()}.mp4")
+
+    def _validate_inputs(self, video_paths: list[str], audio_path: Optional[str] = None) -> None:
+        """验证输入文件存在"""
+        for path in video_paths:
+            if not os.path.exists(path):
+                raise FileNotFoundError(f"视频文件不存在: {path}")
+            if not os.path.getsize(path) > 0:
+                raise ValueError(f"视频文件为空: {path}")
+
+        if audio_path and not os.path.exists(audio_path):
+            raise FileNotFoundError(f"音频文件不存在: {audio_path}")
+
+    def _run_ffmpeg(self, command: list[str], capture_output: bool = True) -> tuple:
+        """执行 FFmpeg 命令"""
+        logger.debug(f"Running FFmpeg: {' '.join(command)}")
+        try:
+            result = subprocess.run(
+                command,
+                check=True,
+                stdout=subprocess.PIPE if capture_output else None,
+                stderr=subprocess.PIPE if capture_output else None,
+                text=capture_output,
+            )
+            return result.stdout or "", result.stderr or ""
+        except subprocess.CalledProcessError as e:
+            stderr = e.stderr.decode() if e.stderr else str(e)
+            logger.error(f"FFmpeg error: {stderr}")
+            raise RuntimeError(f"FFmpeg 执行失败: {stderr}") from e
+
+    def _get_video_info(self, video_path: str) -> dict:
+        """获取视频信息"""
+        try:
+            result = subprocess.run(
+                [
+                    self._ffprobe_bin,
+                    "-v",
+                    "error",
+                    "-show_entries",
+                    "stream=width,height,r_frame_rate,duration,codec_name",
+                    "-show_entries",
+                    "format=duration,size",
+                    "-of",
+                    "json",
+                    video_path,
+                ],
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+            import json
+
+            data = json.loads(result.stdout)
+            streams = data.get("streams", [{}])
+            video_stream = next((s for s in streams if s.get("codec_type") == "video"), streams[0] if streams else {})
+            fmt = data.get("format", {})
+
+            fps_str = video_stream.get("r_frame_rate", "25/1")
+            fps_parts = fps_str.split("/")
+            fps = float(fps_parts[0]) / float(fps_parts[1]) if len(fps_parts) == 2 else float(fps_parts[0])
+
+            return {
+                "width": int(video_stream.get("width", 0)),
+                "height": int(video_stream.get("height", 0)),
+                "fps": fps,
+                "duration": float(fmt.get("duration", 0)),
+                "codec": video_stream.get("codec_name", "unknown"),
+                "size": int(fmt.get("size", 0)),
+            }
+        except Exception as e:
+            logger.warning(f"获取视频信息失败 {video_path}: {e}")
+            return {"width": 0, "height": 0, "fps": 25, "duration": 0, "codec": "unknown", "size": 0}
+
+    def _get_pip_position_offset(
+        self, main_width: int, main_height: int, pip_width: int, pip_height: int
+    ) -> tuple[int, int]:
+        """获取画中画位置偏移量"""
+        margin = 10
+        position_offsets = {
+            PIPPosition.TOP_LEFT: (margin, margin),
+            PIPPosition.TOP_RIGHT: (main_width - pip_width - margin, margin),
+            PIPPosition.BOTTOM_LEFT: (margin, main_height - pip_height - margin),
+            PIPPosition.BOTTOM_RIGHT: (main_width - pip_width - margin, main_height - pip_height - margin),
+        }
+        return position_offsets.get(self.config.pip_position, position_offsets[PIPPosition.TOP_RIGHT])
+
+    def _normalize_video(self, input_path: str, output_path: str) -> dict:
+        """标准化视频格式"""
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            input_path,
+            "-r",
+            str(self.config.output_fps),
+            "-vf",
+            f"scale={self.config.output_width}:{self.config.output_height}:force_original_aspect_ratio=decrease,pad={self.config.output_width}:{self.config.output_height}:(ow-iw)/2:(oh-ih)/2,setsar=1",
+            "-r",
+            str(self.config.output_fps),
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            "-movflags",
+            "+faststart",
+            "-an",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+        return self._get_video_info(output_path)
+
+    def _one_take(self, video_paths: list[str], output_path: str, clips: list[Clip]) -> str:
+        """一镜到底模式"""
+        if len(video_paths) == 1:
+            return self._normalize_video(video_paths[0], output_path)
+
+        normalized_paths = []
+        for i, path in enumerate(video_paths):
+            normalized = os.path.join(self.work_dir, f"normalized_{i}_{os.getpid()}.mp4")
+            self._normalize_video(path, normalized)
+            normalized_paths.append(normalized)
+
+        durations = [self._get_video_info(p)["duration"] for p in normalized_paths]
+
+        if len(normalized_paths) <= 5:
+            output_path = self._one_take_with_xfade(normalized_paths, durations, output_path, clips)
+        else:
+            output_path = self._one_take_simple_concat(normalized_paths, output_path)
+
+        for p in normalized_paths:
+            try:
+                if p != output_path:
+                    os.remove(p)
+            except Exception as e:
+                logger.warning(
+                    f"Operation failed in apps/worker/video_processing/video_compose_service.py: {e}", exc_info=True
+                )
+
+        return output_path
+
+    def _one_take_with_xfade(
+        self, normalized_paths: list[str], durations: list[float], output_path: str, clips: list[Clip]
+    ) -> str:
+        """使用 xfade 滤镜实现转场 (P1-2: 转场参数白名单校验)"""
+        if len(normalized_paths) == 2:
+            # 获取当前片段的转场效果并校验白名单
+            transition = "fade"
+            if len(clips) > 1:
+                transition = self._get_validated_transition(clips[1].transition)
+
+            trans_duration = self.config.transition_duration
+            offset1 = durations[0] - trans_duration / 2
+
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                normalized_paths[0],
+                "-i",
+                normalized_paths[1],
+                "-filter_complex",
+                f"[0:v][1:v]xfade=transition={transition}:duration={trans_duration}:offset={offset1}[v]",
+                "-map",
+                "[v]",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                output_path,
+            ]
+            self._run_ffmpeg(command)
+            return output_path
+        else:
+            return self._one_take_simple_concat(normalized_paths, output_path)
+
+    def _one_take_simple_concat(self, normalized_paths: list[str], output_path: str) -> str:
+        """使用 concat demuxer 简单拼接"""
+        concat_file = os.path.join(self.work_dir, f"concat_list_{os.getpid()}.txt")
+        with open(concat_file, "w") as f:
+            for path in normalized_paths:
+                f.write(f"file '{os.path.abspath(path)}'\n")
+
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-f",
+            "concat",
+            "-safe",
+            "0",
+            "-i",
+            concat_file,
+            "-c",
+            "copy",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+
+        try:
+            os.remove(concat_file)
+        except Exception as e:
+            logger.warning(
+                f"Operation failed in apps/worker/video_processing/video_compose_service.py: {e}", exc_info=True
+            )
+
+        return output_path
+
+    def _pip(self, video_paths: list[str], output_path: str) -> str:
+        """画中画模式"""
+        if not video_paths:
+            raise ValueError("No video paths provided")
+
+        main_video = video_paths[0]
+        main_normalized = os.path.join(self.work_dir, f"main_{os.getpid()}.mp4")
+        main_info = self._normalize_video(main_video, main_normalized)
+
+        if len(video_paths) == 1:
+            os.rename(main_normalized, output_path)
+            return output_path
+
+        pip_width = int(self.config.output_width * self.config.pip_scale)
+        pip_height = int(self.config.output_height * self.config.pip_scale)
+        x_offset, y_offset = self._get_pip_position_offset(
+            self.config.output_width, self.config.output_height, pip_width, pip_height
+        )
+
+        pip_normalized = os.path.join(self.work_dir, f"pip_{os.getpid()}.mp4")
+        pip_info = self._get_video_info(video_paths[1])
+
+        if pip_info["duration"] > main_info["duration"]:
+            temp_pip = os.path.join(self.work_dir, f"pip_temp_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                video_paths[1],
+                "-t",
+                str(main_info["duration"]),
+                "-vf",
+                f"scale={pip_width}:{pip_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                temp_pip,
+            ]
+            self._run_ffmpeg(command)
+            pip_normalized_input = temp_pip
+        else:
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                video_paths[1],
+                "-vf",
+                f"scale={pip_width}:{pip_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                pip_normalized,
+            ]
+            self._run_ffmpeg(command)
+            pip_normalized_input = pip_normalized
+
+        if main_info["duration"] > pip_info["duration"]:
+            looped_pip = os.path.join(self.work_dir, f"pip_looped_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-stream_loop",
+                "-1",
+                "-i",
+                pip_normalized_input,
+                "-t",
+                str(main_info["duration"]),
+                "-vf",
+                f"scale={pip_width}:{pip_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                looped_pip,
+            ]
+            self._run_ffmpeg(command)
+            pip_normalized_input = looped_pip
+
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            main_normalized,
+            "-i",
+            pip_normalized_input,
+            "-filter_complex",
+            f"[0:v][1:v]overlay={x_offset}:{y_offset}[v]",
+            "-map",
+            "[v]",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+
+        for temp_file in [main_normalized, pip_normalized]:
+            if temp_file and temp_file != output_path:
+                try:
+                    os.remove(temp_file)
+                except Exception as e:
+                    logger.warning(
+                        f"Operation failed in apps/worker/video_processing/video_compose_service.py: {e}", exc_info=True
+                    )
+
+        return output_path
+
+    def _voice_over(self, video_paths: list[str], audio_path: str, output_path: str) -> str:
+        """口播模式"""
+        if not audio_path:
+            raise ValueError("audio_path is required for VOICE_OVER mode")
+
+        if not video_paths:
+            raise ValueError("No background video provided")
+
+        audio_info = self._get_video_info(audio_path)
+        audio_duration = audio_info["duration"]
+
+        bg_normalized = os.path.join(self.work_dir, f"bg_{os.getpid()}.mp4")
+        bg_info = self._normalize_video(video_paths[0], bg_normalized)
+
+        if bg_info["duration"] < audio_duration:
+            looped_bg = os.path.join(self.work_dir, f"bg_looped_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-stream_loop",
+                "-1",
+                "-i",
+                bg_normalized,
+                "-t",
+                str(audio_duration),
+                "-vf",
+                f"scale={self.config.output_width}:{self.config.output_height}",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                looped_bg,
+            ]
+            self._run_ffmpeg(command)
+            bg_normalized = looped_bg
+        elif bg_info["duration"] > audio_duration:
+            temp_bg = os.path.join(self.work_dir, f"bg_trimmed_{os.getpid()}.mp4")
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                bg_normalized,
+                "-t",
+                str(audio_duration),
+                "-c:v",
+                "copy",
+                temp_bg,
+            ]
+            self._run_ffmpeg(command)
+            bg_normalized = temp_bg
+
+        blurred_bg = os.path.join(self.work_dir, f"bg_blurred_{os.getpid()}.mp4")
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            bg_normalized,
+            "-vf",
+            f"boxblur=5:5,scale={self.config.output_width}:{self.config.output_height}",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            blurred_bg,
+        ]
+        self._run_ffmpeg(command)
+
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            blurred_bg,
+            "-i",
+            audio_path,
+            "-filter_complex",
+            "[0:v]drawbox=x=0:y=0:w=iw:h=ih:color=black@0.3:t=fill[v]",
+            "-map",
+            "[v]",
+            "-map",
+            "1:a",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            "-shortest",
+            output_path,
+        ]
+        self._run_ffmpeg(command)
+
+        for temp_file in [bg_normalized, blurred_bg]:
+            try:
+                if temp_file != output_path:
+                    os.remove(temp_file)
+            except Exception as e:
+                logger.warning(
+                    f"Operation failed in apps/worker/video_processing/video_compose_service.py: {e}", exc_info=True
+                )
+
+        return output_path
+
+    def _voice_pip(self, video_paths: list[str], audio_path: Optional[str], output_path: str) -> str:
+        """口播+画中画模式"""
+        if not video_paths:
+            raise ValueError("No video paths provided")
+
+        if len(video_paths) == 1:
+            return self._normalize_video(video_paths[0], output_path)
+
+        voice_video = video_paths[0]
+        bg_video = video_paths[1] if len(video_paths) > 1 else video_paths[0]
+
+        voice_normalized = os.path.join(self.work_dir, f"voice_{os.getpid()}.mp4")
+        voice_info = self._normalize_video(voice_video, voice_normalized)
+
+        bg_normalized = os.path.join(self.work_dir, f"bg_{os.getpid()}.mp4")
+        bg_info = self._normalize_video(bg_video, bg_normalized)
+
+        final_duration = min(voice_info["duration"], bg_info["duration"])
+
+        pip_width = int(self.config.output_width * self.config.pip_scale)
+        pip_height = int(self.config.output_height * self.config.pip_scale)
+        x_offset, y_offset = self._get_pip_position_offset(
+            self.config.output_width, self.config.output_height, pip_width, pip_height
+        )
+
+        voice_adjusted = os.path.join(self.work_dir, f"voice_adj_{os.getpid()}.mp4")
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            voice_normalized,
+            "-t",
+            str(final_duration),
+            "-vf",
+            f"scale={pip_width}:{pip_height}",
+            "-c:v",
+            self.config.output_codec,
+            "-preset",
+            self.config.output_preset,
+            "-crf",
+            str(self.config.output_crf),
+            "-pix_fmt",
+            "yuv420p",
+            voice_adjusted,
+        ]
+        self._run_ffmpeg(command)
+
+        bg_adjusted = os.path.join(self.work_dir, f"bg_adj_{os.getpid()}.mp4")
+        command = [
+            self._ffmpeg_bin,
+            "-y",
+            "-i",
+            bg_normalized,
+            "-t",
+            str(final_duration),
+            "-c:v",
+            "copy",
+            bg_adjusted,
+        ]
+        self._run_ffmpeg(command)
+
+        if audio_path:
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                bg_adjusted,
+                "-i",
+                voice_adjusted,
+                "-i",
+                audio_path,
+                "-filter_complex",
+                f"[0:v][1:v]overlay={x_offset}:{y_offset}[v]",
+                "-map",
+                "[v]",
+                "-map",
+                "2:a",
+                "-shortest",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                output_path,
+            ]
+        else:
+            command = [
+                self._ffmpeg_bin,
+                "-y",
+                "-i",
+                bg_adjusted,
+                "-i",
+                voice_adjusted,
+                "-filter_complex",
+                f"[0:v][1:v]overlay={x_offset}:{y_offset}[v]",
+                "-map",
+                "[v]",
+                "-map",
+                "1:a",
+                "-shortest",
+                "-c:v",
+                self.config.output_codec,
+                "-preset",
+                self.config.output_preset,
+                "-crf",
+                str(self.config.output_crf),
+                "-pix_fmt",
+                "yuv420p",
+                output_path,
+            ]
+        self._run_ffmpeg(command)
+
+        for temp_file in [voice_normalized, voice_adjusted, bg_normalized, bg_adjusted]:
+            try:
+                if temp_file != output_path:
+                    os.remove(temp_file)
+            except Exception as e:
+                logger.warning(
+                    f"Operation failed in apps/worker/video_processing/video_compose_service.py: {e}", exc_info=True
+                )
+
+        return output_path
+
+
+def create_compose_service(mode: str, work_dir: Optional[str] = None, **kwargs) -> VideoComposeService:
+    """便捷工厂函数：创建视频合成服务"""
+    try:
+        editing_mode = EditingMode(mode)
+    except ValueError:
+        raise ValueError(f"无效的剪辑模式: {mode}. 有效模式: {[m.value for m in EditingMode]}")
+
+    config = EditingModeConfig(
+        mode=editing_mode,
+        output_width=kwargs.get("output_width", 1280),
+        output_height=kwargs.get("output_height", 720),
+        output_fps=kwargs.get("output_fps", 25),
+        pip_position=PIPPosition(kwargs.get("pip_position", "top_right")),
+        pip_scale=kwargs.get("pip_scale", 0.25),
+        transition_duration=kwargs.get("transition_duration", 0.5),
+    )
+
+    return VideoComposeService(config=config, work_dir=work_dir)

apps/worker/worker_app/core/config.py

@@ -18,9 +18,6 @@ class WorkerSettings(BaseSettings):
     environment: str = "development"
     auto_create_schema: bool = False
 
-    # 渲染引擎选择：legacy=旧VideoComposeService，unified=新UnifiedRenderService
-    render_engine: str = "legacy"
-
     model_config = SettingsConfigDict(
         env_file=".env",
         env_file_encoding="utf-8",

apps/worker/worker_app/tasks/compose_video.py

@@ -39,10 +39,6 @@ def _get_job_service():
 def compose_video(self, job_id: str, **kwargs):
     """视频合成任务。
 
-    根据 RENDER_ENGINE 配置选择渲染引擎：
-      - legacy: 旧 VideoComposeService（filter_complex 模式）
-      - unified: 新 UnifiedRenderService（图层架构）
-
     Args:
         job_id: JobService 中的任务 ID
         **kwargs: 来自 Job.payload 的额外参数（plan_id, output_path 等）
@@ -60,18 +56,66 @@ def compose_video(self, job_id: str, **kwargs):
             job_service.fail_job(job_id, "Missing plan_id in job payload")
             return {"status": "error", "message": "Missing plan_id"}
 
-        # 判断使用哪个渲染引擎
-        # 优先级：Redis Feature Flag（白名单 > 百分比） > 环境变量默认
-        from video_processing.render_engine_resolver import get_render_engine_resolver
+        # 标记为 running
+        job_service.update_progress(job_id, progress=10.0, current_stage="初始化合成环境")
 
-        resolver = get_render_engine_resolver()
-        user_id = job.created_by_user_id or None
-        engine = resolver.get_engine(user_id=user_id)
+        # 延迟导入 VideoComposeService
+        from apps.api.app.services.video_compose_service import VideoComposeService
 
-        if engine == "unified":
-            return _compose_with_unified_engine(self, job_service, job, plan_id, db)
-        else:
-            return _compose_with_legacy_engine(self, job_service, job, plan_id, db)
+        compose_svc = VideoComposeService(db)
+
+        # 校验合成条件
+        job_service.update_progress(job_id, progress=20.0, current_stage="校验合成条件")
+        validation = compose_svc.validate_compose(plan_id)
+        if not validation.valid:
+            error_msg = "; ".join(validation.errors)
+            job_service.fail_job(job_id, f"合成校验失败: {error_msg}")
+            return {"status": "error", "message": error_msg}
+
+        # 构建合成命令
+        job_service.update_progress(job_id, progress=30.0, current_stage="构建 FFmpeg 命令")
+        _output_dir = os.environ.get("VIDEO_OUTPUT_DIR", os.path.join(tempfile.gettempdir(), "video_output"))
+        output_path = os.path.join(_output_dir, f"{job_id}.mp4")
+        compose_cmd = compose_svc.build_compose_command(plan_id, output_path)
+
+        # 执行 FFmpeg
+        job_service.update_progress(job_id, progress=50.0, current_stage="正在执行视频合成")
+        logger.info("Executing FFmpeg for job %s, plan %s", job_id, plan_id)
+
+        try:
+            subprocess.run(
+                compose_cmd.command,
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                timeout=3600,
+            )
+        except subprocess.CalledProcessError as e:
+            job_service.fail_job(job_id, f"FFmpeg 执行失败: {e.stderr[:500]}")
+            raise
+
+        # 上传结果
+        job_service.update_progress(job_id, progress=80.0, current_stage="上传合成结果")
+        storage_key = f"rendered/{plan_id}/{job_id}.mp4"
+
+        from worker_app.tasks.edit_plan_generation import _upload_to_oss
+
+        output_url = _upload_to_oss(Path(output_path), storage_key)
+
+        # 更新 Job 状态为完成
+        result_data = {
+            "plan_id": plan_id,
+            "output_path": output_path,
+            "storage_key": storage_key,
+            "output_url": output_url or "",
+            "estimated_duration": compose_cmd.estimated_duration,
+            "clip_count": len(compose_cmd.clip_chains),
+        }
+        job_service.complete_job(job_id, result=result_data)
+
+        logger.info("视频合成完成: job_id=%s, plan_id=%s", job_id, plan_id)
+        return {"status": "completed", "job_id": job_id, "result": result_data}
 
     except self.retry_exc as exc:
         logger.warning("视频合成重试中: job_id=%s, exc=%s", job_id, exc)
@@ -85,145 +129,11 @@ def compose_video(self, job_id: str, **kwargs):
         raise self.retry(exc=exc, countdown=60)
     finally:
         db.close()
-
-
-def _compose_with_legacy_engine(task, job_service, job, plan_id: str, db) -> dict:
-    """旧引擎渲染路径（VideoComposeService）。"""
-    job_id = job.id
-
-    # 标记为 running
-    job_service.update_progress(job_id, progress=10.0, current_stage="初始化合成环境")
-
-    # 延迟导入 VideoComposeService
-    from apps.api.app.services.video_compose_service import VideoComposeService
-
-    compose_svc = VideoComposeService(db)
-
-    # 校验合成条件
-    job_service.update_progress(job_id, progress=20.0, current_stage="校验合成条件")
-    validation = compose_svc.validate_compose(plan_id)
-    if not validation.valid:
-        error_msg = "; ".join(validation.errors)
-        job_service.fail_job(job_id, f"合成校验失败: {error_msg}")
-        return {"status": "error", "message": error_msg}
-
-    # 构建合成命令
-    job_service.update_progress(job_id, progress=30.0, current_stage="构建 FFmpeg 命令")
-    _output_dir = os.environ.get("VIDEO_OUTPUT_DIR", os.path.join(tempfile.gettempdir(), "video_output"))
-    output_path = os.path.join(_output_dir, f"{job_id}.mp4")
-    compose_cmd = compose_svc.build_compose_command(plan_id, output_path)
-
-    # 执行 FFmpeg
-    job_service.update_progress(job_id, progress=50.0, current_stage="正在执行视频合成")
-    logger.info("Executing FFmpeg for job %s, plan %s", job_id, plan_id)
-
-    try:
-        subprocess.run(
-            compose_cmd.command,
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=3600,
-        )
-    except subprocess.CalledProcessError as e:
-        job_service.fail_job(job_id, f"FFmpeg 执行失败: {e.stderr[:500]}")
-        raise
-
-    # 上传结果
-    job_service.update_progress(job_id, progress=80.0, current_stage="上传合成结果")
-    storage_key = f"rendered/{plan_id}/{job_id}.mp4"
-
-    from worker_app.tasks.edit_plan_generation import _upload_to_oss
-
-    output_url = _upload_to_oss(Path(output_path), storage_key)
-
-    # 更新 Job 状态为完成
-    result_data = {
-        "plan_id": plan_id,
-        "output_path": output_path,
-        "storage_key": storage_key,
-        "output_url": output_url or "",
-        "estimated_duration": compose_cmd.estimated_duration,
-        "clip_count": len(compose_cmd.clip_chains),
-        "engine": "legacy",
-    }
-    job_service.complete_job(job_id, result=result_data)
-
-    logger.info("视频合成完成(legacy): job_id=%s, plan_id=%s", job_id, plan_id)
-    return {"status": "completed", "job_id": job_id, "result": result_data}
-
-
-def _compose_with_unified_engine(task, job_service, job, plan_id: str, db) -> dict:
-    """新引擎渲染路径（UnifiedRenderService + RenderAdapter）。"""
-    job_id = job.id
-
-    # 标记为 running
-    job_service.update_progress(job_id, progress=10.0, current_stage="初始化统一渲染引擎")
-
-    from video_processing.render_adapter import RenderAdapter
-
-    adapter = RenderAdapter(db)
-
-    # 校验合成条件
-    job_service.update_progress(job_id, progress=15.0, current_stage="校验合成条件")
-    valid, errors, warnings, ready_count, total_count = adapter.validate_plan(plan_id)
-    if not valid:
-        error_msg = "; ".join(errors)
-        job_service.fail_job(job_id, f"合成校验失败: {error_msg}")
-        return {"status": "error", "message": error_msg}
-
-    # 进度回调
-    def progress_cb(progress: float, stage: str) -> None:
+        # 清理临时文件
         try:
-            job_service.update_progress(job_id, progress=progress, current_stage=stage)
-        except Exception:
-            logger.exception("更新进度失败")
-
-    # 执行渲染
-    job_service.update_progress(job_id, progress=20.0, current_stage="开始渲染")
-    logger.info("统一渲染引擎开始: job_id=%s plan_id=%s", job_id, plan_id)
-
-    result = adapter.render_plan(
-        plan_id=plan_id,
-        job_id=job_id,
-        progress_cb=progress_cb,
-    )
-
-    if not result.success:
-        job_service.fail_job(job_id, f"渲染失败: {result.error_message}")
-        raise RuntimeError(result.error_message)
-
-    # 更新 Job 状态为完成
-    result_data = {
-        "plan_id": plan_id,
-        "output_path": str(result.output_path) if result.output_path else "",
-        "storage_key": f"rendered/{plan_id}/{job_id}.mp4",
-        "output_url": result.output_url,
-        "estimated_duration": result.duration,
-        "clip_count": result.clip_count,
-        "engine": "unified",
-        "width": result.width,
-        "height": result.height,
-        "file_size": result.file_size,
-    }
-    job_service.complete_job(job_id, result=result_data)
-
-    logger.info(
-        "视频合成完成(unified): job_id=%s plan_id=%s duration=%.2fs",
-        job_id,
-        plan_id,
-        result.duration,
-    )
-    return {"status": "completed", "job_id": job_id, "result": result_data}
-
-
-def _cleanup_output(job_id: str) -> None:
-    """清理临时输出文件。"""
-    try:
-        _output_dir = os.environ.get("VIDEO_OUTPUT_DIR", os.path.join(tempfile.gettempdir(), "video_output"))
-        output_path = os.path.join(_output_dir, f"{job_id}.mp4")
-        if Path(output_path).exists():
-            Path(output_path).unlink()
-    except Exception as e:
-        logger.warning(f"清理输出文件失败: {e}", exc_info=True)
+            _output_dir = os.environ.get("VIDEO_OUTPUT_DIR", os.path.join(tempfile.gettempdir(), "video_output"))
+            output_path = os.path.join(_output_dir, f"{job_id}.mp4")
+            if Path(output_path).exists():
+                Path(output_path).unlink()
+        except Exception as e:
+            logger.warning(f"Operation failed in apps/worker/worker_app/tasks/compose_video.py: {e}", exc_info=True)

apps/worker/worker_app/tasks/edit_plan_generation.py

@@ -1,46 +1,179 @@
-"""剪辑计划渲染任务 — 支持 Feature Flag 灰度.
+"""剪辑计划渲染任务 — Phase 8 任务 2.05.
 
 Celery 任务 worker.render_edit_plan:
   1. 加载 EditPlan + EditPlanClips
-  2. 根据 Feature Flag 选择渲染引擎（legacy / unified）
-  3. 下载各片段素材 + 渲染
+  2. 下载各片段素材
+  3. 按 order 顺序拼接片段
   4. 上传渲染结果到 OSS
-  5. 创建 GeneratedVideo 记录 + 查重
-  6. 更新 EditPlan / EditPlanClip 状态
-  7. 更新 GenerationTask 进度
-
-渲染引擎灰度：
-  - 走 Feature Flag (render_engine) 控制
-  - legacy: VideoComposeService + FFmpeg filter_complex
-  - unified: UnifiedRenderService 图层架构
+  5. 更新 EditPlan / EditPlanClip 状态
+  6. 更新 GenerationTask 进度
 """
 
 from __future__ import annotations
 
 import logging
+import os
+import shutil
+import subprocess  # nosec B404
 import tempfile
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Optional
+from urllib.parse import urlparse
 
+import oss2
 from worker_app.celery_app import celery_app
 from worker_app.db import SessionLocal
 
 logger = logging.getLogger(__name__)
 
+FFMPEG_BIN = shutil.which("ffmpeg") or "ffmpeg"
+FFPROBE_BIN = shutil.which("ffprobe") or "ffprobe"
 OUTPUT_WIDTH = 1280
 OUTPUT_HEIGHT = 720
 OUTPUT_FPS = 25.0
 
 
-# ── 共享工具模块导入 ──────────────────────────────────────────────────────────
+# ── OSS helpers ───────────────────────────────────────────────────────────────
+
+
+def _oss_settings() -> tuple[str, str, str, str] | None:
+    """获取 OSS 配置"""
+    access_key_id = os.getenv("OSS_ACCESS_KEY_ID")
+    access_key_secret = os.getenv("OSS_ACCESS_KEY_SECRET")
+    endpoint = os.getenv("OSS_ENDPOINT")
+    bucket_name = os.getenv("OSS_BUCKET_NAME")
+    if not all([access_key_id, access_key_secret, endpoint, bucket_name]):
+        return None
+    return access_key_id, access_key_secret, endpoint, bucket_name
+
+
+def _oss_bucket() -> oss2.Bucket | None:
+    """获取 OSS Bucket"""
+    settings = _oss_settings()
+    if settings is None:
+        return None
+    access_key_id, access_key_secret, endpoint, bucket_name = settings
+    return oss2.Bucket(oss2.Auth(access_key_id, access_key_secret), endpoint, bucket_name)
+
+
+def _normalize_storage_key(storage_key_or_url: str) -> str:
+    """标准化存储键"""
+    if storage_key_or_url.startswith(("http://", "https://")):
+        return urlparse(storage_key_or_url).path.lstrip("/")
+    return storage_key_or_url.lstrip("/")
+
+
+def _download_asset(asset_storage_key: str, local_path: Path) -> bool:
+    """下载素材文件到本地"""
+    bucket = _oss_bucket()
+    if bucket is None:
+        return False
+    try:
+        bucket.get_object_to_file(_normalize_storage_key(asset_storage_key), str(local_path))
+        return local_path.exists() and local_path.stat().st_size > 0
+    except Exception:
+        logger.exception("下载素材失败: %s", asset_storage_key)
+        return False
+
+
+def _upload_to_oss(local_path: Path, storage_key: str) -> str | None:
+    """上传文件到 OSS，返回公开 URL"""
+    bucket = _oss_bucket()
+    if bucket is None:
+        return None
+    try:
+        bucket.put_object_from_file(storage_key, str(local_path))
+        settings = _oss_settings()
+        if settings:
+            _, _, endpoint, bucket_name = settings
+            return f"https://{bucket_name}.{endpoint.replace('https://', '').replace('http://', '')}/{storage_key}"
+        return None
+    except Exception:
+        logger.exception("上传 OSS 失败: %s", storage_key)
+        return None
+
+
+# ── FFmpeg helpers ────────────────────────────────────────────────────────────
+
+
+def _run_ffmpeg(command: list[str]) -> None:
+    """执行 FFmpeg 命令"""
+    subprocess.run(command, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)  # nosec B603
+
+
+def _probe_duration(local_path: Path) -> float:
+    """获取视频/音频时长"""
+    try:
+        result = subprocess.run(  # nosec B603
+            [
+                FFPROBE_BIN,
+                "-v",
+                "error",
+                "-show_entries",
+                "format=duration",
+                "-of",
+                "default=noprint_wrappers=1:nokey=1",
+                str(local_path),
+            ],
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+        return float(result.stdout.strip())
+    except Exception:
+        return 0.0
+
+
+def _concatenate_clips(
+    clip_paths: list[Path],
+    output_path: Path,
+    transition_effects: list[str] | None = None,
+) -> bool:
+    """将多个片段拼接为最终视频
+
+    使用 FFmpeg concat demuxer 实现。
+    """
+    if not clip_paths:
+        return False
+
+    if len(clip_paths) == 1:
+        # 单片段直接复制
+        try:
+            shutil.copy2(str(clip_paths[0]), str(output_path))
+            return True
+        except Exception:
+            return False
+
+    # 多片段：使用 concat demuxer
+    concat_file = output_path.parent / "concat_list.txt"
+    try:
+        with open(concat_file, "w") as f:
+            for p in clip_paths:
+                f.write(f"file '{p}'\n")
+
+        command = [
+            FFMPEG_BIN,
+            "-y",
+            "-f",
+            "concat",
+            "-safe",
+            "0",
+            "-i",
+            str(concat_file),
+            "-c",
+            "copy",
+            str(output_path),
+        ]
+        _run_ffmpeg(command)
+        return output_path.exists() and output_path.stat().st_size > 0
+    except Exception:
+        logger.exception("拼接片段失败")
+        return False
+    finally:
+        if concat_file.exists():
+            concat_file.unlink()
 
-from video_processing.dedup_helpers import create_video_record_and_dedup
-from video_processing.oss_helpers import (
-    download_asset,
-    upload_to_oss,
-)
-from video_processing.unified_render_service import UnifiedRenderService
 
 # ── Repository imports (延迟导入避免循环依赖) ─────────────────────────────────
 
@@ -68,278 +201,20 @@ def _get_repos():
 # ── Celery Task ───────────────────────────────────────────────────────────────
 
 
-def _resolve_render_engine(user_id: str) -> str:
-    """根据 Feature Flag 决定使用哪个渲染引擎。
-
-    Returns:
-        "legacy" 或 "unified"
-    """
-    try:
-        from video_processing.render_engine_resolver import get_render_engine_resolver
-
-        resolver = get_render_engine_resolver()
-        return resolver.get_engine(user_id=user_id)
-    except Exception as exc:
-        logger.warning("获取渲染引擎配置失败，fallback 到 legacy: %s", exc)
-        return "legacy"
-
-
-def _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, error_msg: str):
-    """统一的计划失败标记工具。"""
-    plan = plan_repo.get(plan_id)
-    if plan and plan.status.value == "rendering":
-        plan.mark_failed()
-        plan_repo.update(plan)
-    if generation_task_id:
-        gen_task = gen_task_repo.get(generation_task_id)
-        if gen_task and gen_task.status.value != "failed":
-            gen_task.status = "failed"
-            gen_task.error_message = error_msg
-            gen_task.completed_at = datetime.now(timezone.utc)
-            gen_task_repo.update(gen_task)
-
-
-def _finalize_render_success(
-    plan,
-    plan_repo,
-    clip_repo,
-    gen_task_repo,
-    db,
-    plan_id: str,
-    output_url: str,
-    storage_key: str,
-    duration: float,
-    file_size: int,
-    width: int,
-    height: int,
-    rendered_clip_ids: list[str],
-    failed_clip_ids: list[str],
-    generation_task_id: str,
-    output_path: Path,
-    engine: str,
-) -> dict:
-    """渲染成功后的统一收尾：查重 + 更新状态 + 返回结果。"""
-    # 创建 GeneratedVideo 记录 + 查重
-    project_id = plan.project_id or ""
-    batch_id = plan.config.get("batch_id", "")
-    mode = plan.config.get("mode", "edit_plan")
-    if generation_task_id and project_id:
-        try:
-            create_video_record_and_dedup(
-                generation_task_id=generation_task_id,
-                project_id=project_id,
-                batch_id=batch_id,
-                file_url=output_url or "",
-                file_size=file_size,
-                duration=duration,
-                video_path=str(output_path),
-                mode=mode,
-                session=db,
-                width=width,
-                height=height,
-                fps=OUTPUT_FPS,
-            )
-        except Exception as dedup_err:
-            logger.warning("查重失败（不影响渲染结果）: %s", dedup_err)
-
-    # 更新片段状态为 rendered
-    for clip_id in rendered_clip_ids:
-        clip = clip_repo.get(clip_id)
-        if clip and clip.status.value == "ready":
-            clip.mark_rendered()
-            clip_repo.update(clip)
-
-    # 更新 EditPlan 状态为 completed
-    plan.config["rendered_url"] = output_url or ""
-    plan.config["rendered_storage_key"] = storage_key
-    plan.mark_completed()
-    plan_repo.update(plan)
-
-    # 更新 GenerationTask 状态为 completed
-    if generation_task_id:
-        gen_task = gen_task_repo.get(generation_task_id)
-        if gen_task:
-            gen_task.status = "completed"
-            gen_task.progress = 100.0
-            gen_task.result_count = len(rendered_clip_ids)
-            gen_task.completed_at = datetime.now(timezone.utc)
-            gen_task_repo.update(gen_task)
-
-    logger.info(
-        "剪辑计划渲染完成: plan_id=%s engine=%s rendered=%d failed=%d duration=%.1fs",
-        plan_id,
-        engine,
-        len(rendered_clip_ids),
-        len(failed_clip_ids),
-        duration,
-    )
-
-    return {
-        "status": "completed",
-        "plan_id": plan_id,
-        "rendered_count": len(rendered_clip_ids),
-        "failed_count": len(failed_clip_ids),
-        "output_url": output_url,
-        "duration": duration,
-    }
-
-
-def _render_with_unified(
-    plan,
-    clips,
-    asset_path_map: dict[str, Path],
-    tmpdir_path: Path,
-    rendered_clip_ids: list[str],
-    plan_id: str,
-    generation_task_id: str,
-    plan_repo,
-    clip_repo,
-    gen_task_repo,
-    db,
-) -> dict:
-    """统一渲染引擎路径（UnifiedRenderService 图层架构）。"""
-    render_service = UnifiedRenderService(
-        plan=plan,
-        clips=clips,
-        asset_path_map=asset_path_map,
-        work_dir=tmpdir_path,
-        output_width=OUTPUT_WIDTH,
-        output_height=OUTPUT_HEIGHT,
-        output_fps=int(OUTPUT_FPS),
-    )
-
-    try:
-        render_result = render_service.render()
-    except Exception as render_err:
-        logger.error("渲染失败(unified): %s — %s", plan_id, render_err)
-        _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, f"渲染失败: {render_err}")
-        return {"status": "error", "message": f"渲染失败: {render_err}"}
-
-    output_path = render_result.output_path
-
-    # 上传到 OSS
-    storage_key = f"rendered/{plan_id}/output.mp4"
-    output_url = upload_to_oss(output_path, storage_key)
-
-    failed_clip_ids: list[str] = []
-    return _finalize_render_success(
-        plan=plan,
-        plan_repo=plan_repo,
-        clip_repo=clip_repo,
-        gen_task_repo=gen_task_repo,
-        db=db,
-        plan_id=plan_id,
-        output_url=output_url or "",
-        storage_key=storage_key,
-        duration=render_result.duration,
-        file_size=render_result.file_size,
-        width=render_result.width,
-        height=render_result.height,
-        rendered_clip_ids=rendered_clip_ids,
-        failed_clip_ids=failed_clip_ids,
-        generation_task_id=generation_task_id,
-        output_path=output_path,
-        engine="unified",
-    )
-
-
-def _render_with_legacy(
-    plan,
-    clips,
-    rendered_clip_ids: list[str],
-    failed_clip_ids: list[str],
-    tmpdir_path: Path,
-    plan_id: str,
-    generation_task_id: str,
-    plan_repo,
-    clip_repo,
-    gen_task_repo,
-    db,
-) -> dict:
-    """旧引擎路径（VideoComposeService + FFmpeg filter_complex）。"""
-    import os
-    import subprocess
-
-    from apps.api.app.services.video_compose_service import VideoComposeService
-
-    compose_svc = VideoComposeService(db)
-
-    # 校验合成条件
-    validation = compose_svc.validate_compose(plan_id)
-    if not validation.valid:
-        error_msg = "; ".join(validation.errors)
-        logger.error("合成校验失败(legacy): %s — %s", plan_id, error_msg)
-        _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, f"合成校验失败: {error_msg}")
-        return {"status": "error", "message": error_msg}
-
-    # 构建 FFmpeg 命令
-    output_dir = os.environ.get("VIDEO_OUTPUT_DIR", str(tmpdir_path))
-    output_path = Path(output_dir) / f"{plan_id}.mp4"
-    compose_cmd = compose_svc.build_compose_command(plan_id, str(output_path))
-
-    logger.info("执行 FFmpeg (legacy): plan_id=%s", plan_id)
-    try:
-        subprocess.run(
-            compose_cmd.command,
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=3600,
-        )
-    except subprocess.CalledProcessError as e:
-        error_msg = f"FFmpeg 执行失败: {e.stderr[:500]}"
-        logger.error("FFmpeg 执行失败(legacy): %s — %s", plan_id, error_msg)
-        _mark_plan_failed(plan_repo, plan_id, gen_task_repo, generation_task_id, error_msg)
-        return {"status": "error", "message": error_msg}
-
-    # 获取文件大小
-    file_size = output_path.stat().st_size if output_path.exists() else 0
-    duration = compose_cmd.estimated_duration or 0.0
-
-    # 上传到 OSS
-    storage_key = f"rendered/{plan_id}/output.mp4"
-    output_url = upload_to_oss(output_path, storage_key)
-
-    return _finalize_render_success(
-        plan=plan,
-        plan_repo=plan_repo,
-        clip_repo=clip_repo,
-        gen_task_repo=gen_task_repo,
-        db=db,
-        plan_id=plan_id,
-        output_url=output_url or "",
-        storage_key=storage_key,
-        duration=duration,
-        file_size=file_size,
-        width=OUTPUT_WIDTH,
-        height=OUTPUT_HEIGHT,
-        rendered_clip_ids=rendered_clip_ids,
-        failed_clip_ids=failed_clip_ids,
-        generation_task_id=generation_task_id,
-        output_path=output_path,
-        engine="legacy",
-    )
-
-
 @celery_app.task(name="worker.render_edit_plan", bind=True, max_retries=2)
 def render_edit_plan(self, plan_id: str) -> dict:
     """渲染剪辑计划
 
     流程：
     1. 加载 EditPlan + EditPlanClips
-    2. 根据 Feature Flag 选择渲染引擎（legacy / unified）
-    3. 下载素材 + 渲染
+    2. 下载各片段素材到临时目录
+    3. 按 order 顺序拼接片段
     4. 上传渲染结果到 OSS
-    5. 创建 GeneratedVideo 记录 + 查重
-    6. 更新 EditPlan → completed, EditPlanClips → rendered
-    7. 更新 GenerationTask 进度
+    5. 更新 EditPlan → completed, EditPlanClips → rendered
+    6. 更新 GenerationTask 进度
     """
     logger.info("开始渲染剪辑计划: plan_id=%s", plan_id)
 
-    generation_task_id = ""
-    engine = "legacy"
-
     for repos in _get_repos():
         plan_repo, clip_repo, gen_task_repo, db = repos
 
@@ -350,15 +225,7 @@ def render_edit_plan(self, plan_id: str) -> dict:
                 logger.error("剪辑计划不存在: %s", plan_id)
                 return {"status": "error", "message": f"计划不存在: {plan_id}"}
 
-            # 获取 generation_task_id（提前读取，确保 except 块可用）
-            generation_task_id = plan.config.get("generation_task_id", "")
-
-            # 2. 选择渲染引擎（Feature Flag 灰度控制）
-            user_id = plan.created_by_user_id or ""
-            engine = _resolve_render_engine(user_id)
-            logger.info("剪辑计划渲染引擎: plan_id=%s engine=%s user_id=%s", plan_id, engine, user_id)
-
-            # 3. 加载片段列表（按 order 排序）
+            # 2. 加载片段列表（按 order 排序）
             clips = clip_repo.list_by_plan(plan_id, skip=0, limit=10000)
             if not clips:
                 logger.warning("剪辑计划没有片段: %s", plan_id)
@@ -366,6 +233,9 @@ def render_edit_plan(self, plan_id: str) -> dict:
                 plan_repo.update(plan)
                 return {"status": "error", "message": "没有可渲染的片段"}
 
+            # 获取 generation_task_id
+            generation_task_id = plan.config.get("generation_task_id", "")
+
             # 更新 GenerationTask 状态为 running
             if generation_task_id:
                 gen_task = gen_task_repo.get(generation_task_id)
@@ -374,22 +244,13 @@ def render_edit_plan(self, plan_id: str) -> dict:
                     gen_task.started_at = datetime.now(timezone.utc)
                     gen_task_repo.update(gen_task)
 
-            # 3. 下载素材并构建 asset_path_map
+            # 3. 下载素材并拼接
             with tempfile.TemporaryDirectory(prefix="edit_plan_") as tmpdir:
                 tmpdir_path = Path(tmpdir)
-                asset_path_map: dict[str, Path] = {}
+                clip_paths: list[Path] = []
                 rendered_clip_ids: list[str] = []
                 failed_clip_ids: list[str] = []
 
-                # 预先批量查询所有素材的 storage_key（file_url）
-                from packages.adapters.sqlalchemy_impl.models import AssetModel
-
-                clip_asset_ids = [c.asset_id for c in clips if c.asset_id]
-                asset_storage_map: dict[str, str] = {}
-                if clip_asset_ids:
-                    assets = db.query(AssetModel).filter(AssetModel.id.in_(clip_asset_ids)).all()
-                    asset_storage_map = {a.id: a.file_url for a in assets if a.file_url}
-
                 for clip in clips:
                     if not clip.asset_id:
                         # 没有素材的片段跳过，标记为失败
@@ -398,35 +259,18 @@ def render_edit_plan(self, plan_id: str) -> dict:
                         failed_clip_ids.append(clip.id)
                         continue
 
-                    if clip.asset_id in asset_path_map:
-                        # 同一素材已下载（多个 clip 共享同一素材）
-                        rendered_clip_ids.append(clip.id)
-                        continue
-
-                    storage_key = asset_storage_map.get(clip.asset_id)
-                    if not storage_key:
-                        logger.warning(
-                            "片段素材无 storage_key，跳过: clip_id=%s asset_id=%s",
-                            clip.id,
-                            clip.asset_id,
-                        )
-                        clip.mark_failed()
-                        clip_repo.update(clip)
-                        failed_clip_ids.append(clip.id)
-                        continue
-
                     # 下载素材
-                    ext = Path(storage_key).suffix or ".mp4"
+                    ext = Path(clip.asset_id).suffix or ".mp4"
                     local_path = tmpdir_path / f"clip_{clip.order:04d}{ext}"
-                    if download_asset(storage_key, local_path):
-                        asset_path_map[clip.asset_id] = local_path
+                    if _download_asset(clip.asset_id, local_path):
+                        clip_paths.append(local_path)
                         rendered_clip_ids.append(clip.id)
                     else:
                         clip.mark_failed()
                         clip_repo.update(clip)
                         failed_clip_ids.append(clip.id)
 
-                if not asset_path_map:
+                if not clip_paths:
                     logger.error("所有片段素材下载失败: %s", plan_id)
                     plan.mark_failed()
                     plan_repo.update(plan)
@@ -439,66 +283,77 @@ def render_edit_plan(self, plan_id: str) -> dict:
                             gen_task_repo.update(gen_task)
                     return {"status": "error", "message": "所有片段素材下载失败"}
 
-                # 4. 根据引擎选择渲染方式
-                if engine == "unified":
-                    result = _render_with_unified(
-                        plan=plan,
-                        clips=clips,
-                        asset_path_map=asset_path_map,
-                        tmpdir_path=tmpdir_path,
-                        rendered_clip_ids=rendered_clip_ids,
-                        plan_id=plan_id,
-                        generation_task_id=generation_task_id,
-                        plan_repo=plan_repo,
-                        clip_repo=clip_repo,
-                        gen_task_repo=gen_task_repo,
-                        db=db,
-                    )
-                else:
-                    result = _render_with_legacy(
-                        plan=plan,
-                        clips=clips,
-                        rendered_clip_ids=rendered_clip_ids,
-                        failed_clip_ids=failed_clip_ids,
-                        tmpdir_path=tmpdir_path,
-                        plan_id=plan_id,
-                        generation_task_id=generation_task_id,
-                        plan_repo=plan_repo,
-                        clip_repo=clip_repo,
-                        gen_task_repo=gen_task_repo,
-                        db=db,
-                    )
+                # 4. 拼接片段
+                output_path = tmpdir_path / f"rendered_{plan_id}.mp4"
+                transition_effects = [c.transition_effect for c in clips if c.asset_id]
+                success = _concatenate_clips(clip_paths, output_path, transition_effects)
 
-                result["engine"] = engine
-                return result
+                if not success:
+                    logger.error("片段拼接失败: %s", plan_id)
+                    plan.mark_failed()
+                    plan_repo.update(plan)
+                    if generation_task_id:
+                        gen_task = gen_task_repo.get(generation_task_id)
+                        if gen_task:
+                            gen_task.status = "failed"
+                            gen_task.error_message = "片段拼接失败"
+                            gen_task.completed_at = datetime.now(timezone.utc)
+                            gen_task_repo.update(gen_task)
+                    return {"status": "error", "message": "片段拼接失败"}
+
+                # 5. 上传到 OSS
+                storage_key = f"rendered/{plan_id}/output.mp4"
+                output_url = _upload_to_oss(output_path, storage_key)
+
+                # 6. 更新片段状态为 rendered
+                for clip_id in rendered_clip_ids:
+                    clip = clip_repo.get(clip_id)
+                    if clip and clip.status.value == "ready":
+                        clip.mark_rendered()
+                        clip_repo.update(clip)
+
+                # 7. 更新 EditPlan 状态为 completed
+                plan.config["rendered_url"] = output_url or ""
+                plan.config["rendered_storage_key"] = storage_key
+                plan.mark_completed()
+                plan_repo.update(plan)
+
+                # 8. 更新 GenerationTask 状态为 completed
+                if generation_task_id:
+                    gen_task = gen_task_repo.get(generation_task_id)
+                    if gen_task:
+                        gen_task.status = "completed"
+                        gen_task.progress = 100.0
+                        gen_task.result_count = len(rendered_clip_ids)
+                        gen_task.completed_at = datetime.now(timezone.utc)
+                        gen_task_repo.update(gen_task)
+
+                logger.info(
+                    "剪辑计划渲染完成: plan_id=%s rendered=%d failed=%d",
+                    plan_id,
+                    len(rendered_clip_ids),
+                    len(failed_clip_ids),
+                )
+
+                return {
+                    "status": "completed",
+                    "plan_id": plan_id,
+                    "rendered_count": len(rendered_clip_ids),
+                    "failed_count": len(failed_clip_ids),
+                    "output_url": output_url,
+                }
 
         except Exception as exc:
             logger.exception("渲染剪辑计划异常: %s", plan_id)
-            # 尝试标记计划和 GenerationTask 为失败
+            # 尝试标记计划为失败
             try:
                 plan = plan_repo.get(plan_id)
                 if plan and plan.status.value == "rendering":
                     plan.mark_failed()
                     plan_repo.update(plan)
-            except Exception as e:
-                logger.warning("标记计划失败时异常: plan_id=%s error=%s", plan_id, e, exc_info=True)
-            # 更新 GenerationTask 状态为 failed，前端轮询能看到失败状态
-            try:
-                if generation_task_id:
-                    gen_task = gen_task_repo.get(generation_task_id)
-                    if gen_task and gen_task.status.value != "failed":
-                        gen_task.status = "failed"
-                        gen_task.error_message = f"渲染异常: {type(exc).__name__}: {exc}"
-                        gen_task.completed_at = datetime.now(timezone.utc)
-                        gen_task_repo.update(gen_task)
-                        logger.info(
-                            "GenerationTask 已标记为 failed: task_id=%s plan_id=%s",
-                            generation_task_id,
-                            plan_id,
-                        )
             except Exception as e:
                 logger.warning(
-                    "更新 GenerationTask 失败状态时异常: task_id=%s error=%s", generation_task_id, e, exc_info=True
+                    f"Operation failed in apps/worker/worker_app/tasks/edit_plan_generation.py: {e}", exc_info=True
                 )
             raise self.retry(exc=exc, countdown=60)
 

apps/worker/worker_app/tasks/voice_clone.py

@@ -4,7 +4,6 @@ import logging
 
 from celery import Task
 from celery.exceptions import Retry
-from video_processing.oss_helpers import get_signed_download_url
 from worker_app.celery_app import celery_app
 from worker_app.db import SessionLocal
 
@@ -49,9 +48,7 @@ def process_voice_clone(self: Task, profile_id: str) -> dict:
         repo = SQLAlchemyVoiceCloneProfileRepository(session)
         workflow = VoiceCloneWorkflowService(
             repository=repo,
-            cosyvoice_service=CosyVoiceService(
-                audio_url_signer=lambda url: get_signed_download_url(url, expires_seconds=86400) or url
-            ),
+            cosyvoice_service=CosyVoiceService(),
         )
 
         updated_profile = workflow.poll_and_process_clone(profile_id, timeout=300)

docs/PORTS.md

@@ -0,0 +1,140 @@
+# 端口分配清单
+
+> 本文档梳理 xiaoxia-saas 项目中所有服务、容器及 CI 环境使用的端口，
+> 作为运维、排障和新功能开发时的统一参考。
+>
+> 最后更新：2026-07-24
+
+---
+
+## 一、应用服务端口
+
+| 服务     | 容器内端口 | 环境变量名       | Staging 宿主机 | Production 宿主机 | 说明                                |
+| -------- | ---------- | ---------------- | -------------- | ----------------- | ----------------------------------- |
+| API      | 8000       | `API_PORT`       | 8000           | 8001              | FastAPI 服务，Nginx 反代后端       |
+| Web      | 80         | `WEB_PORT`       | 3001           | 3002              | Nginx + 前端静态文件               |
+| Worker   | —          | —                | —              | —                 | Celery 任务队列，不暴露端口         |
+
+### 补充说明
+- API 容器内部固定监听 8000（`API_HOST=0.0.0.0`，`API_PORT=8000`）
+- Web 容器内部 Nginx 固定监听 80
+- 所有端口均绑定 `127.0.0.1`，不直接暴露公网，由前置 Nginx/CDN 转发
+
+---
+
+## 二、基础设施端口
+
+### PostgreSQL
+
+| 环境         | 容器内端口 | 宿主机映射 | 环境变量名            | 默认值   |
+| ------------ | ---------- | ---------- | --------------------- | -------- |
+| Production   | 5432       | 5433       | `POSTGRES_PORT`       | 5433     |
+| Staging      | 5432       | 5434       | `POSTGRES_PORT`       | 5434     |
+| 开发本地     | 5432       | 5432       | `DATABASE_URL` 中端口 | 5432     |
+| CI 共享 PG   | 5432       | 5433       | `CI_SHARED_PG_PORT`   | 5433     |
+| CI 本地 PG   | 5432       | 5432       | `CI_LOCAL_PG_PORT`    | 5432     |
+
+### Redis
+
+| 环境         | 容器内端口 | 宿主机映射 | 环境变量名          | 默认值   |
+| ------------ | ---------- | ---------- | ------------------- | -------- |
+| Production   | 6379       | 6380       | `REDIS_URL` 中端口  | —        |
+| Staging      | 6379       | 6381       | `REDIS_URL` 中端口  | —        |
+| 开发本地     | 6379       | 6379       | `REDIS_URL`         | 6379     |
+| CI 动态创建  | 6379       | 随机       | 运行时 `REDIS_PORT` | —        |
+
+> CI Integration Tests 中 Redis 容器使用 `-P` 随机映射端口，
+> 通过 `docker port` 命令获取实际端口后写入 `REDIS_URL`。
+
+### 容器镜像 Registry
+
+| 服务              | 端口  | 地址                   | 说明                           |
+| ----------------- | ----- | ---------------------- | ------------------------------ |
+| Gitea Registry    | 5000  | 172.30.18.198:5000     | CI 构建服务器内网 Registry     |
+| ACR（生产镜像源） | 443   | crpi-xxx.aliyuncs.com  | 阿里云容器镜像服务（HTTPS）    |
+
+---
+
+## 三、CI / DevOps 端口
+
+| 服务/用途           | 端口  | 环境变量名            | 默认值 | 说明                                  |
+| ------------------- | ----- | --------------------- | ------ | ------------------------------------- |
+| CI ChatOps Webhook  | 8090  | `CHATOPS_WEBHOOK_PORT`| 8090   | Gitea webhook 接收服务（`scripts/ci/chatops/`） |
+| Staging SSH 部署    | 22222 | `STAGING_SSH_PORT`    | 22222  | Staging 服务器 SSH 端口（secrets 配置） |
+| Preview SSH 部署    | 22222 | `PREVIEW_SSH_PORT`    | 22222  | Preview 服务器 SSH 端口（secrets 配置） |
+| Preview 前端访问    | 80    | —                     | 80     | Nginx 子域名路由，`*.preview.xiaoxiajianji.com` |
+
+---
+
+## 四、开发环境默认端口（.env.example）
+
+| 用途         | 端口  | 环境变量名 / 出处                          |
+| ------------ | ----- | ------------------------------------------ |
+| API 服务     | 8000  | `API_PORT`                                 |
+| 数据库       | 5432  | `DATABASE_URL`（`postgresql+psycopg://...:5432/...`） |
+| Redis        | 6379  | `REDIS_URL` / `CELERY_BROKER_URL` / `CELERY_RESULT_BACKEND` |
+| SMTP         | 587   | `SMTP_PORT`                                |
+| 前端开发服务 | 3000  | `APP_BASE_URL`（默认 localhost:3000）      |
+| Vite Dev     | 5173  | `CORS_ORIGINS_RAW` 中包含                  |
+
+---
+
+## 五、CI Workflow 中的端口变量
+
+### ci-pipeline.yml 顶层 env
+
+| 变量名              | 默认值 | 用途                     |
+| ------------------- | ------ | ------------------------ |
+| `CI_PG_PORT`        | 5432   | CI PG 容器端口（本地）   |
+| `CI_SHARED_PG_PORT` | 5433   | CI 共享常驻 PG 端口      |
+
+### scripts/ci/ci_env.sh（统一常量）
+
+| 变量名              | 默认值      | 说明                          |
+| ------------------- | ----------- | ----------------------------- |
+| `CI_SHARED_PG_PORT` | 5433        | 共享常驻 PG 实例端口          |
+| `CI_LOCAL_PG_PORT`  | 5432        | 本地 PG 容器默认端口          |
+| `CI_DEFAULT_DB`     | xiaoxia_saas | 默认数据库名                 |
+
+---
+
+## 六、命名规范
+
+### 推荐命名格式
+
+统一使用 `{服务/用途}_PORT` 格式：
+
+```bash
+API_PORT          # 应用服务
+WEB_PORT          # 应用服务
+POSTGRES_PORT     # 基础设施
+REDIS_PORT        # 基础设施
+SMTP_PORT         # 外部服务
+CI_SHARED_PG_PORT # CI 特定
+CI_LOCAL_PG_PORT  # CI 特定
+CHATOPS_WEBHOOK_PORT # DevOps 服务
+```
+
+### 历史命名不一致（待统一）
+
+- `WEBHOOK_PORT`（chatops config.py 内部变量）→ 应与外部 env 名 `CHATOPS_WEBHOOK_PORT` 对齐
+- `STAGING_SSH_PORT` / `PREVIEW_SSH_PORT` → 符合规范，保留
+- `CI_PG_PORT`（workflow 中）→ 建议统一为 `CI_LOCAL_PG_PORT` 与 `ci_env.sh` 对齐
+
+---
+
+## 七、相关配置文件路径
+
+| 文件路径                              | 端口相关内容                     |
+| ------------------------------------- | -------------------------------- |
+| `infra/docker/compose.yml`            | API / Web / Worker 端口映射      |
+| `infra/docker/infra.yml`              | Staging PG / Redis 端口          |
+| `infra/docker/infra-production.yml`   | Production PG / Redis 端口       |
+| `.env.example`                        | 开发环境全部端口变量             |
+| `.gitea/workflows/ci-pipeline.yml`    | CI PG 端口配置                   |
+| `scripts/ci/ci_env.sh`                | CI 端口统一常量                  |
+| `scripts/ci/chatops/config.py`        | ChatOps Webhook 端口             |
+| `scripts/ci/run_integration_tests.sh` | Redis 动态端口 + PG 端口         |
+| `scripts/ci/run_validate.sh`          | PG 端口                          |
+| `scripts/ci/validate_migration.sh`    | PG 端口                          |
+

docs/ci-env-vars.md

@@ -1,235 +0,0 @@
-# CI 必需环境变量清单
-
-> 本文档整理小虾 SaaS 项目中所有从环境变量读取的配置项，明确哪些是 CI 测试必须的、哪些是可选的。
-> 最后更新：2026-07-09
-
-## 目录
-
-- [一、配置来源说明](#一配置来源说明)
-- [二、CI 必需环境变量（P0）](#二ci-必需环境变量p0)
-- [三、可选环境变量（有默认值）](#三可选环境变量有默认值)
-- [四、测试专用环境变量](#四测试专用环境变量)
-- [五、Worker 服务环境变量](#五worker-服务环境变量)
-- [六、当前 CI 配置对照](#六当前-ci-配置对照)
-
----
-
-## 一、配置来源说明
-
-项目的环境变量配置主要来自以下几处：
-
-| 来源 | 文件路径 | 说明 |
-|------|---------|------|
-| API 主配置 | `apps/api/app/config.py` | pydantic `Settings` 类，API 服务核心配置 |
-| Worker 配置 | `apps/worker/worker_app/core/config.py` | pydantic `WorkerSettings` 类，Worker 服务配置 |
-| 共享配置 | `packages/shared/config.py` | pydantic `SharedSettings` 类，API + Worker 共享配置 |
-| 直接读取 | 各模块中 `os.environ` / `os.getenv` | 散落在各业务模块中的直接读取 |
-
-> **注意**：pydantic-settings 配置默认 `case_sensitive=False`，即环境变量名不区分大小写，但习惯上使用大写。
-
----
-
-## 二、CI 必需环境变量（P0）
-
-以下变量是 CI 运行测试**必须配置**的，缺失会导致测试启动失败或核心功能异常。
-
-| 变量名 | 用途说明 | 默认值 | 影响范围 |
-|--------|---------|--------|---------|
-| `DATABASE_URL` | 数据库连接字符串 | `postgresql+psycopg://postgres:postgres@localhost:5432/xiaoxia_saas` | 集成测试、 Alembic 迁移验证 |
-| `USE_IN_MEMORY_DB` | 是否使用内存数据库（SQLite） | `false` | 单元测试（设为 `true` 可跳过 PostgreSQL 依赖） |
-| `JWT_SECRET_KEY` | JWT 签名密钥，**无安全默认值**，必须显式设置 | `None`（启动校验失败） | 所有涉及认证的 API 测试 |
-
-> **说明**：
-> - 单元测试通过 `USE_IN_MEMORY_DB=true` 使用 SQLite 内存数据库，无需 PostgreSQL
-> - 集成测试需要真实 PostgreSQL，需设置 `DATABASE_URL`
-> - `JWT_SECRET_KEY` 在测试文件中通过 `os.environ.setdefault()` 设置了测试用默认值，CI 中可不额外配置，但生产环境必须配置
-
----
-
-## 三、可选环境变量（有默认值）
-
-以下变量都有合理的默认值，CI 中可以不配置，使用默认值即可。
-
-### 3.1 应用基础配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `APP_NAME` | 应用名称 | `xiaoxia-saas` |
-| `APP_VERSION` | 应用版本号 | `0.1.61` / `unknown` |
-| `ENVIRONMENT` | 运行环境标识 | `development` |
-| `DEBUG` | 是否开启调试模式 | `true` |
-| `APP_BASE_URL` | 应用基础 URL（用于生成邮件链接等） | `http://localhost:3000` |
-| `API_HOST` | API 服务绑定地址 | `0.0.0.0` |
-| `API_PORT` | API 服务端口 | `8000` |
-| `API_PREFIX` | API 路由前缀 | `/api/v1` |
-| `APP_ENV` | 环境标识（用于加载 .env.{env} 文件） | `development` |
-| `LOG_LEVEL` | 日志级别 | `INFO` |
-
-### 3.2 数据库连接池配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `DATABASE_POOL_SIZE` | 连接池大小 | `20` |
-| `DATABASE_MAX_OVERFLOW` | 最大溢出连接数 | `10` (API) / `40` (Worker) |
-| `DATABASE_POOL_TIMEOUT` | 获取连接超时时间（秒） | `30` |
-| `DATABASE_POOL_RECYLE` / `DATABASE_POOL_RECYCLE` | 连接回收时间（秒） | `3600` |
-| `AUTO_CREATE_SCHEMA` | 是否自动创建表结构 | `false` |
-
-### 3.3 Redis / Celery 配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `REDIS_URL` | Redis 连接地址 | `redis://localhost:6379/0` |
-| `REDIS_MAX_CONNECTION` | Redis 最大连接数 | `50` |
-| `ENABLE_REDIS_SESSIONS` | 是否启用 Redis 会话存储 | `false` |
-| `CELERY_BROKER_URL` / `BROKER_URL` | Celery Broker 地址 | `redis://localhost:6379/0` |
-| `CELERY_RESULT_BACKEND` / `RESULT_BACKEND` | Celery 结果后端 | `redis://localhost:6379/1` |
-
-### 3.4 JWT 配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `JWT_ALGORITHM` | JWT 签名算法 | `HS256`（隐式默认） |
-| `JWT_ACCESS_TOKEN_EXPIRE_MINUTES` | Access Token 过期时间（分钟） | `30`（隐式默认） |
-| `JWT_REFRESH_TOKEN_EXPIRE_DAYS` | Refresh Token 过期时间（天） | `30`（隐式默认） |
-| `JWT_SECRET_KEY_OLD` | 旧 JWT 密钥（用于密钥轮换） | `None` |
-| `SECRET_ROTATION_DAYS` | 密钥轮换建议天数 | `90` |
-
-### 3.5 邮件配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `ENABLE_EMAIL_DELIVERY` | 是否启用邮件发送 | `false` |
-| `SMTP_HOST` | SMTP 服务器地址 | `smtp.gmail.com` |
-| `SMTP_PORT` | SMTP 端口 | `587` |
-| `SMTP_USER` | SMTP 用户名 | `""`（空） |
-| `SMTP_PASSWORD` | SMTP 密码 | `""`（空） |
-| `SMTP_FROM_EMAIL` | 发件人邮箱 | `""`（空） |
-| `SMTP_FROM_NAME` | 发件人名称 | `小虾 SaaS` |
-| `SMTP_USE_TLS` | 是否使用 TLS | `true` |
-
-### 3.6 OSS 阿里云存储配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `OSS_ENDPOINT` | OSS Endpoint | `oss-cn-hangzhou.aliiyuncs.com` |
-| `OSS_ACCESS_KEY_ID` | OSS Access Key ID | `""`（空） |
-| `OSS_ACCESS_KEY_SECRET` | OSS Access Key Secret | `""`（空） |
-| `OSS_BUCKET_NAME` | OSS Bucket 名称 | `xiaoxia-autocut` |
-| `OSS_DIRECT_UPLOAD_MAX_MB` / `MAX_UPLOAD_SIZE_MB` | 直传最大文件大小（MB） | `2000` |
-| `OSS_DIRECT_UPLOAD_EXPIRE_SECONDS` | 直传签名过期时间（秒） | `900` |
-
-### 3.7 CosyVoice 语音合成配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `COSYVOICE_API_KEY` | CosyVoice API Key | `""`（空） |
-| `COSYVOICE_BASE_URL` | CosyVoice API 地址 | `https://dashscope.aliyuncs.com/api/v1/services/aigc/text2audio` |
-| `COSYVOICE_MODEL` | CosyVoice 模型 | `cosyvoice-v1` |
-| `COSYVOICE_VOICE` | 默认音色 | `longxiaochun` |
-| `COSYVOICE_SAMPLE_RATE` | 采样率 | `22050` |
-| `COSYVOICE_FORMAT` | 输出格式 | `mp3` |
-
-### 3.8 CORS 配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `CORS_ORIGINS_RAW` | CORS 允许的源（逗号分隔） | `http://localhost:3000,http://localhost:5173,http://localhost:8000` |
-
-### 3.9 文件存储 / 生成文件配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `GENERATED_FILES_DIR` | 生成文件本地存储目录 | `/app/generated` |
-| `GENERATED_FILES_URL_PREFIX` | 生成文件访问 URL 前缀 | `/generated-files` |
-| `VIDEO_OUTPUT_DIR` | 视频输出目录 | `{tempdir}/video_output` |
-| `PUBLIC_API_BASE_URL` | 公开 API 基础 URL | `https://api.xiaoxiajianji.com` |
-
-### 3.10 监控 / 指标配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `METRICS_AUTH_TOKEN` | Prometheus 指标接口认证 Token | `""`（空，不启用认证） |
-
-### 3.11 内部 API 配置
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `INTERNAL_API_KEYS` | 内部 API 调用密钥列表（逗号分隔） | `""`（空） |
-
----
-
-## 四、测试专用环境变量
-
-以下变量仅在测试或冒烟测试脚本中使用。
-
-| 变量名 | 用途说明 | 默认值 | 使用位置 |
-|--------|---------|--------|---------|
-| `SMOKE_TEST_PASSWORD` | 冒烟测试用的测试账号密码 | `changeme` | `scripts/smoke_*.py` |
-| `MIGRATION_SINCE_REVISION` | 迁移安全检查的起始版本 | `None` | `scripts/check_migration_safety.py` |
-| `MIGRATION_DIFF_AGAINST` | 迁移 diff 对比的目标分支/版本 | `None` | `scripts/check_migration_safety.py` |
-
----
-
-## 五、Worker 服务环境变量
-
-以下变量主要用于 Worker（Celery）服务，CI 的单元/集成测试通常不涉及。
-
-| 变量名 | 用途说明 | 默认值 |
-|--------|---------|--------|
-| `WORKER_NAME` | Worker 名称 | `xiaoxia-saas-worker` |
-| `WORKER_CONCURRENCY` | Worker 并发数 | `4` |
-| `WORKER_MAX_TASKS_PER_CHILD` | 每个子进程最大任务数 | `1000` |
-
----
-
-## 六、当前 CI 配置对照
-
-当前 `.gitea/workflows/ci-cd.yml` 中 `validate` job 配置的环境变量：
-
-| 变量名 | CI 配置值 | 是否必需 | 备注 |
-|--------|----------|---------|------|
-| `DATABASE_URL` | `postgresql+psycopg://postgres:postgres@127.0.0.1:5432/xiaoxia_saas` | ✅ 是 | Job 级别配置 |
-| `USE_IN_MEMORY_DB` | `"false"`（Job 级） / `"true"`（单元测试 step 级） | ✅ 是 | 单元测试 step 覆盖为 `true` |
-| `JWT_SECRET_KEY` | （未配置） | ⚠️ 测试内置 | 测试文件中通过 `setdefault` 设置了测试密钥 |
-
-### 6.1 CI 环境变量现状评估
-
-- ✅ **数据库配置完备**：DATABASE_URL + USE_IN_MEMORY_DB 已正确配置
-- ✅ **JWT 密钥**：测试代码内置默认值，CI 可正常运行
-- ⚠️ **缺少 Redis 配置**：但当前测试不依赖 Redis，使用默认值即可
-- ⚠️ **缺少邮件/OSS/语音配置**：均为可选，CI 中使用空默认值不影响核心测试
-
-### 6.2 建议后续补充
-
-如果未来测试覆盖到以下功能，需要在 CI 中补充对应配置：
-
-1. **Redis 相关测试** → 配置 `REDIS_URL`
-2. **邮件发送测试** → 配置 `ENABLE_EMAIL_DELIVERY` 及 SMTP 相关变量
-3. **OSS 上传测试** → 配置 OSS 相关变量（或使用 mock）
-4. **语音合成测试** → 配置 CosyVoice 相关变量（或使用 mock）
-
----
-
-## 附录：环境变量读取位置索引
-
-### pydantic Settings 类
-- `apps/api/app/config.py` → `Settings` 类（API 主配置）
-- `apps/worker/worker_app/core/config.py` → `WorkerSettings` 类（Worker 配置）
-- `packages/shared/config.py` → `SharedSettings` 类（共享配置）
-
-### 直接 os.environ / os.getenv 读取
-| 变量名 | 文件位置 |
-|--------|---------|
-| `VIDEO_OUTPUT_DIR` | `apps/worker/video_processing/video_compose_service.py`、`apps/worker/worker_app/tasks/compose_video.py` |
-| `INTERNAL_API_KEYS` | `apps/api/app/api/routes/auth.py` |
-| `APP_ENV` / `ENV` | `apps/api/app/api/routes/auth.py`、各 config.py 的 `get_settings()` |
-| `GENERATED_FILES_DIR` | `apps/worker/worker_app/tasks/generation.py`、`apps/api/main.py`、`scripts/cleanup_generated_files.py` |
-| `GENERATED_FILES_URL_PREFIX` | `apps/worker/worker_app/tasks/generation.py`、`apps/api/main.py`、`apps/api/app/core/storage.py` |
-| `PUBLIC_API_BASE_URL` | `apps/worker/worker_app/tasks/generation.py` |
-| `METRICS_AUTH_TOKEN` | `apps/api/app/middleware/prometheus_metrics.py` |
-| `APP_VERSION` | `apps/api/app/middleware/prometheus_metrics.py` |
-| `SMOKE_TEST_PASSWORD` | `scripts/smoke_*.py` |
-| `MIGRATION_SINCE_REVISION` | `scripts/check_migration_safety.py` |
-| `MIGRATION_DIFF_AGAINST` | `scripts/check_migration_safety.py` |
-| `DATABASE_URL` | `alembic/env.py` |

docs/schema-metadata-snapshot.json

@@ -473,7 +473,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -481,7 +481,7 @@
           "name": "project_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -489,7 +489,7 @@
           "name": "asset_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -783,7 +783,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -791,7 +791,7 @@
           "name": "plan_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -815,7 +815,7 @@
           "name": "template_clip_config_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -823,7 +823,7 @@
           "name": "asset_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -939,7 +939,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -947,7 +947,7 @@
           "name": "template_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -987,7 +987,7 @@
           "name": "source_edit_plan_id",
           "nullable": true,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -995,7 +995,7 @@
           "name": "project_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1003,7 +1003,7 @@
           "name": "created_by_user_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1071,7 +1071,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1098,14 +1098,6 @@
           "type": "VARCHAR(50)",
           "unique": false
         },
-        {
-          "index": false,
-          "name": "editing_mode",
-          "nullable": false,
-          "primary_key": false,
-          "type": "VARCHAR(20)",
-          "unique": false
-        },
         {
           "index": false,
           "name": "config",
@@ -1189,7 +1181,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1197,7 +1189,7 @@
           "name": "project_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1205,7 +1197,7 @@
           "name": "generation_task_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1341,7 +1333,7 @@
           "name": "duplicate_of",
           "nullable": true,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         }
       ],
@@ -1386,7 +1378,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1394,7 +1386,7 @@
           "name": "project_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1402,7 +1394,7 @@
           "name": "strategy_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1410,7 +1402,7 @@
           "name": "asset_library_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1418,7 +1410,7 @@
           "name": "voice_library_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1514,7 +1506,7 @@
           "name": "created_by_user_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1522,7 +1514,7 @@
           "name": "source_edit_plan_id",
           "nullable": true,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1538,7 +1530,55 @@
           "name": "batch_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
+          "unique": false
+        },
+        {
+          "index": false,
+          "name": "is_preview",
+          "nullable": false,
+          "primary_key": false,
+          "type": "BOOLEAN",
+          "unique": false
+        },
+        {
+          "index": true,
+          "name": "source_task_id",
+          "nullable": false,
+          "primary_key": false,
+          "type": "VARCHAR(32)",
+          "unique": false
+        },
+        {
+          "index": false,
+          "name": "output_width",
+          "nullable": false,
+          "primary_key": false,
+          "type": "INTEGER",
+          "unique": false
+        },
+        {
+          "index": false,
+          "name": "output_height",
+          "nullable": false,
+          "primary_key": false,
+          "type": "INTEGER",
+          "unique": false
+        },
+        {
+          "index": false,
+          "name": "cover_url",
+          "nullable": false,
+          "primary_key": false,
+          "type": "VARCHAR(1000)",
+          "unique": false
+        },
+        {
+          "index": false,
+          "name": "custom_title",
+          "nullable": false,
+          "primary_key": false,
+          "type": "VARCHAR(500)",
           "unique": false
         },
         {
@@ -1549,14 +1589,6 @@
           "type": "JSON",
           "unique": false
         },
-        {
-          "index": false,
-          "name": "logs",
-          "nullable": false,
-          "primary_key": false,
-          "type": "TEXT",
-          "unique": false
-        },
         {
           "index": false,
           "name": "created_at",
@@ -1609,6 +1641,13 @@
           "name": "ix_generation_tasks_source_edit_plan_id",
           "unique": false
         },
+        {
+          "columns": [
+            "source_task_id"
+          ],
+          "name": "ix_generation_tasks_source_task_id",
+          "unique": false
+        },
         {
           "columns": [
             "status"
@@ -1635,7 +1674,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1643,7 +1682,7 @@
           "name": "project_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1651,7 +1690,7 @@
           "name": "library_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1683,7 +1722,7 @@
           "name": "result_asset_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1745,7 +1784,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1753,7 +1792,7 @@
           "name": "project_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1841,7 +1880,7 @@
           "name": "source_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1849,7 +1888,7 @@
           "name": "created_by_user_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1933,7 +1972,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -1941,7 +1980,7 @@
           "name": "owner_user_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -2261,7 +2300,7 @@
           "name": "id",
           "nullable": false,
           "primary_key": true,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {
@@ -2269,7 +2308,7 @@
           "name": "template_id",
           "nullable": false,
           "primary_key": false,
-          "type": "VARCHAR(36)",
+          "type": "VARCHAR(32)",
           "unique": false
         },
         {

infra/docker/api.Dockerfile

@@ -4,16 +4,16 @@
 # ============================================================
 
 # 基础镜像：Python 3.12
-FROM git.xiaoxiajianji.com/xiaoxia/base/python:3.12-slim
-
-# 构建参数：版本号（CI 传入 commit hash）
-ARG APP_VERSION=dev
+FROM xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/base/python:3.12-slim-bookworm
 
 # 使用阿里云镜像加速
-RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null ||     sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list 2>/dev/null || true
+RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null || \
+    sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list 2>/dev/null || true
 
 # 安装系统依赖
-RUN apt-get update && apt-get install -y --no-install-recommends     libpq-dev     && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libpq-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 # 设置工作目录
 WORKDIR /app
@@ -21,12 +21,15 @@ WORKDIR /app
 # ---- 依赖分层：基础依赖（变化少，缓存命中率高）----
 COPY requirements-base.txt /tmp/requirements-base.txt
 
-RUN python -m venv /opt/venv     && /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements-base.txt     && rm /tmp/requirements-base.txt
+RUN python -m venv /opt/venv \
+    && /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements-base.txt \
+    && rm /tmp/requirements-base.txt
 
 # ---- 依赖分层：业务依赖（变化频繁）----
 COPY requirements.txt /tmp/requirements.txt
 
-RUN /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt     && rm /tmp/requirements.txt
+RUN /opt/venv/bin/pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
+    && rm /tmp/requirements.txt
 
 # 复制应用代码
 COPY apps/api/ /app/apps/api/
@@ -37,13 +40,13 @@ COPY alembic/ /app/alembic/
 COPY scripts/ /app/scripts/
 
 # 设置环境变量
-ENV PATH="/opt/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ENV PATH="/opt/venv/bin:$PATH"
 ENV PYTHONPATH=/app
 ENV PYTHONUNBUFFERED=1
-ENV APP_VERSION=$APP_VERSION
 
 # 健康检查
-HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3     CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)"
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)"
 
 # API 入口点
 WORKDIR /app/apps/api

infra/docker/ci.Dockerfile

@@ -1,4 +1,4 @@
-FROM git.xiaoxiajianji.com/xiaoxia/base/python:3.12-slim
+FROM xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/base/python:3.12-slim
 
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 \
     PIP_NO_CACHE_DIR=0 \

infra/docker/entrypoint-worker.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-# Worker 启动脚本 — 支持 WORKER_CONCURRENCY 环境变量
-# 未设置时默认 2（保持向后兼容）
-
-set -e
-
-CONCURRENCY="${WORKER_CONCURRENCY:-2}"
-
-exec celery \
-  -A worker_app.celery_app \
-  worker \
-  --loglevel=info \
-  "--concurrency=${CONCURRENCY}"

infra/docker/web-artifact.Dockerfile

@@ -1,4 +1,4 @@
-FROM git.xiaoxiajianji.com/xiaoxia/base/nginx:alpine AS runner
+FROM xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/base/nginx:alpine AS runner
 ARG NGINX_CONF=infra/docker/nginx.conf
 WORKDIR /usr/share/nginx/html
 COPY apps/web/dist ./

infra/docker/web.Dockerfile

@@ -1,5 +1,5 @@
 # Build stage
-FROM git.xiaoxiajianji.com/xiaoxia/base/node:20 AS builder
+FROM xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/base/node:20 AS builder
 WORKDIR /app
 ARG VITE_API_URL=https://saas-api.xiaoxiajianji.com
 ENV VITE_API_URL=$VITE_API_URL
@@ -11,7 +11,7 @@ COPY apps/web/ ./
 RUN npm run build
 
 # Production stage with nginx
-FROM git.xiaoxiajianji.com/xiaoxia/base/nginx:alpine AS runner
+FROM xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/base/nginx:alpine AS runner
 ARG NGINX_CONF=infra/docker/nginx.conf
 WORKDIR /usr/share/nginx/html
 COPY --from=builder /app/apps/web/dist ./

infra/docker/worker-base-builder.Dockerfile

@@ -0,0 +1,43 @@
+# ============================================================
+# Worker Builder 基础镜像
+# 预编译：编译工具 + 基础依赖 + Worker大包
+# 当 requirements-base.txt 或 requirements-worker.txt 变更时重新构建
+# 业务构建从此镜像开始，只需要安装业务依赖，节省15+分钟
+# ============================================================
+
+FROM git.xiaoxiajianji.com/xiaoxia/base/python:3.12-slim
+
+# 使用阿里云镜像加速
+RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null || \
+    sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list 2>/dev/null || true
+
+# 安装编译工具
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gcc \
+    g++ \
+    python3-dev \
+    binutils \
+    && rm -rf /var/lib/apt/lists/*
+
+# 创建 venv
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+
+WORKDIR /tmp
+
+# 基础依赖（变化极少）
+COPY requirements-base.txt /tmp/requirements-base.txt
+RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
+    pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
+    -r /tmp/requirements-base.txt \
+    && rm /tmp/requirements-base.txt
+
+# Worker 大包（变化少）
+COPY requirements-worker.txt /tmp/requirements-worker.txt
+RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
+    pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
+    -r /tmp/requirements-worker.txt \
+    && rm /tmp/requirements-worker.txt
+
+# 预先做一次 strip（基础层瘦身，业务层增量）
+RUN find /opt/venv -name "*.so" -type f -exec strip --strip-all {} \; 2>/dev/null || true

infra/docker/worker-base-runtime.Dockerfile

@@ -0,0 +1,17 @@
+# ============================================================
+# Worker Runtime 基础镜像
+# 预安装：ffmpeg + 运行时依赖
+# 变化极少，业务构建从此镜像开始
+# ============================================================
+
+FROM git.xiaoxiajianji.com/xiaoxia/base/python:3.12-slim
+
+# 使用阿里云镜像加速
+RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null || \
+    sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list 2>/dev/null || true
+
+# 运行时依赖：ffmpeg + opencv需要的libglib
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ffmpeg \
+    libglib2.0-0 \
+    && rm -rf /var/lib/apt/lists/*

infra/docker/worker.Dockerfile

@@ -4,10 +4,7 @@
 # ============================================================
 
 # 基础镜像：Python 3.12 + ffmpeg
-FROM git.xiaoxiajianji.com/xiaoxia/base/python:3.12-slim
-
-# 构建参数：版本号（CI 传入 commit hash）
-ARG APP_VERSION=dev
+FROM xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/base/python:3.12-slim-bookworm
 
 # 使用阿里云镜像加速
 RUN sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list.d/debian.sources 2>/dev/null || \
@@ -18,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ffmpeg \
     libsm6 \
     libxext6 \
-    libgl1 \
+    libgl1-mesa-glx \
     && rm -rf /var/lib/apt/lists/*
 
 # 设置工作目录
@@ -51,15 +48,10 @@ COPY packages/ /app/packages/
 COPY alembic.ini /app/alembic.ini
 COPY migrations/ /app/migrations/
 
-# 复制 Worker 启动脚本（支持 WORKER_CONCURRENCY 环境变量）
-COPY infra/docker/entrypoint-worker.sh /usr/local/bin/entrypoint-worker.sh
-RUN chmod +x /usr/local/bin/entrypoint-worker.sh
-
 # 设置 Python 路径
 ENV PATH="/opt/venv/bin:$PATH"
 ENV PYTHONPATH=/app
 ENV PYTHONUNBUFFERED=1
-ENV APP_VERSION=$APP_VERSION
 
 # 创建非 root 用户运行 Worker
 RUN groupadd -r celery && useradd -r -g celery -d /app -s /sbin/nologin celery \
@@ -69,4 +61,4 @@ USER celery
 
 # Worker 入口点
 WORKDIR /app/apps/worker
-CMD ["/usr/local/bin/entrypoint-worker.sh"]
+CMD ["celery", "-A", "worker_app.celery_app", "worker", "--loglevel=info", "--concurrency=2"]

packages/adapters/in_memory/asset_library_repository.py

@@ -16,9 +16,6 @@ class InMemoryAssetLibraryRepository:
     def get(self, library_id: str) -> AssetLibrary | None:
         return self._libraries.get(library_id)
 
-    def find_by_id(self, library_id: str) -> AssetLibrary | None:
-        return self.get(library_id)
-
     def find_by_project(self, project_id: str, kind: AssetLibraryKind | None = None) -> list[AssetLibrary]:
         items = [library for library in self._libraries.values() if library.project_id == project_id]
         if kind is not None:

packages/adapters/redis/__init__.py

@@ -1,9 +1,3 @@
-from packages.adapters.redis.feature_flag_store import (
-    FeatureFlagConfig,
-    FeatureFlagStore,
-    InMemoryFeatureFlagStore,
-    RedisFeatureFlagStore,
-)
 from packages.adapters.redis.session_store import (
     NoopSessionStore,
     RedisConfig,
@@ -11,13 +5,4 @@ from packages.adapters.redis.session_store import (
     get_session_store,
 )
 
-__all__ = [
-    "FeatureFlagConfig",
-    "FeatureFlagStore",
-    "InMemoryFeatureFlagStore",
-    "NoopSessionStore",
-    "RedisConfig",
-    "RedisFeatureFlagStore",
-    "SessionStore",
-    "get_session_store",
-]
+__all__ = ["NoopSessionStore", "RedisConfig", "SessionStore", "get_session_store"]